jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1209959 - in /jmeter/trunk: src/components/org/apache/jmeter/assertions/ src/components/org/apache/jmeter/config/ src/components/org/apache/jmeter/extractor/ src/components/org/apache/jmeter/modifiers/ src/components/org/apache/jmeter/samp...
Date Sat, 03 Dec 2011 17:31:12 GMT
Author: pmouawad
Date: Sat Dec  3 17:31:11 2011
New Revision: 1209959

URL: http://svn.apache.org/viewvc?rev=1209959&view=rev
Log:
Bug 52280 - The menu item Options / Choose Language does not change all the displayed text to the new language

Issue is due to the fact that on a french computer, default locale is fr_FR , so as _en bundles are missing it stays in French. Would be the same for all non english computers.

Added:
    jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfigResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfigResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSamplerResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimerResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimerResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListenerResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_en.properties   (with props)
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223ListenerResources_en.properties   (with props)
    jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources_en.properties   (with props)
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_en.properties   (with props)
    jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_en.properties   (with props)
    jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_en.properties   (with props)
    jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_en.properties   (with props)
    jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_en.properties   (with props)
    jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_en.properties   (with props)
Modified:
    jmeter/trunk/xdocs/changes.xml

Added: jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,28 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=BSF Assertion
+scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, jexl)
+scriptLanguage.displayName=Language
+scriptLanguage.shortDescription=Name of BSF language, e.g. beanshell, javascript, jexl
+scripting.displayName=Script (variables: ctx vars props SampleResult (aka prev) AssertionResult sampler log Label Filename Parameters args[] OUT)
+script.displayName=Script
+script.shortDescription=Script in the appropriate BSF language
+parameterGroup.displayName=Parameters to be passed to script (=> String Parameters and String []args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to the file or script
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=Script file (overrides script)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,24 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=Compare Assertion
+compareChoices.displayName=Select Comparison Operators
+compareContent.displayName=Compare Content
+compareContent.shortDescription=Verify that all Samplers within the Controller return the same data
+compareTime.displayName=Compare Time
+compareTime.shortDescription=Verify that all Samplers' return times are within a given number of milliseconds
+comparison_filters.displayName=Comparison Filters
+stringsToSkip.displayName=Regular Expression Substitutions
+stringsToSkip.shortDescription=Regular expressions to match elements of response data to be substituted when comparing

Propchange: jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,28 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=JSR223 Assertion
+scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, jexl)
+scriptLanguage.displayName=Language
+scriptLanguage.shortDescription=Name of JSR223 language, e.g. beanshell, javascript, jexl
+scripting.displayName=Script (variables: ctx vars props SampleResult (aka prev) AssertionResult sampler log Label Filename Parameters args[] OUT)
+script.displayName=Script
+script.shortDescription=Script in the appropriate BSF language
+parameterGroup.displayName=Parameters to be passed to script (=> String Parameters and String []args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to the file or script
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=Script file (overrides script)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,36 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=CSV Data Set Config
+csv_data.displayName=Configure the CSV Data Source
+filename.displayName=Filename
+filename.shortDescription=Name of the file that holds the cvs data (relative or absolute filename)
+fileEncoding.displayName=File encoding
+fileEncoding.shortDescription=The character set encoding used in the file
+variableNames.displayName=Variable Names (comma-delimited)
+variableNames.shortDescription=List your variable names in order to match the order of columns in your csv data.  Separate by commas.
+delimiter.displayName=Delimiter (use '\\t' for tab)
+delimiter.shortDescription=Enter the delimiter ('\\t' for tab)
+quotedData.displayName=Allow quoted data?
+quotedData.shortDescription=Allow CSV data values to be quoted?
+recycle.displayName=Recycle on EOF ?
+recycle.shortDescription=Should the file be re-read from the start on reaching EOF ?
+stopThread.displayName=Stop thread on EOF ?
+stopThread.shortDescription=Should the thread be stopped on reaching EOF (if Recycle is false) ?
+shareMode.displayName=Sharing mode
+shareMode.shortDescription=Select which threads share the same file pointer
+shareMode.all=All threads
+shareMode.group=Current thread group
+shareMode.thread=Current thread

Propchange: jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfigResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfigResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfigResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfigResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,25 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=Keystore Configuration
+# Groups
+aliases.displayName=Aliases selection configuration
+# fields
+preload.displayName=Preload
+preload.shortDescription=Preload Keystore before test
+startIndex.displayName=Alias Start index
+startIndex.shortDescription=First index of Alias in Keystore
+endIndex.displayName=Alias End index
+endIndex.shortDescription=Last index of Alias in Keystore

Propchange: jmeter/trunk/src/components/org/apache/jmeter/config/KeystoreConfigResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfigResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfigResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfigResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfigResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,33 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=Random Variable
+# Groups
+variable.displayName=Output variable
+random.displayName=Configure the Random generator
+options.displayName=Options
+# fields
+minimumValue.displayName=Minimum Value
+minimumValue.shortDescription=Minimum Value
+maximumValue.displayName=Maximum Value
+maximumValue.shortDescription=Maximum Value
+variableName.displayName=Variable Name
+variableName.shortDescription=Variable Name
+outputFormat.displayName=Output Format
+outputFormat.shortDescription=Output Format, e.g. ####
+randomSeed.displayName=Seed for Random function
+randomSeed.shortDescription=Seed for Random function - long number (defaults to current time)
+perThread.displayName=Per Thread(User) ?
+perThread.shortDescription=Use independent random generators for each thread(user) ?

Propchange: jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfigResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,28 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=BSF PostProcessor
+scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, jexl)
+scriptLanguage.displayName=Language
+scriptLanguage.shortDescription=Name of BSF language, e.g. beanshell, javascript, jexl
+scripting.displayName=Script (variables: ctx vars props prev sampler log Label Filename Parameters args[] OUT)
+script.displayName=Script
+script.shortDescription=Script in the appropriate BSF language
+parameterGroup.displayName=Parameters to be passed to script (=> String Parameters and String []args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to the file or script
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=Script file (overrides script)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,27 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=BeanShell PostProcessor
+scripting.displayName=Script (variables: ctx vars props prev data log)
+script.displayName=
+script.shortDescription=Beanshell script
+resetGroup.displayName=Reset bsh.Interpreter before each call
+resetInterpreter.displayName=Reset Interpreter
+parameterGroup.displayName=Parameters to be passed to BeanShell (=> String Parameters and String []bsh.args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to BeanShell (file or script)
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=BeanShell script file (overrides script)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,16 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=Debug PostProcessor
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,28 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=JSR223 PostProcessor
+scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, jexl)
+scriptLanguage.displayName=Language
+scriptLanguage.shortDescription=Name of JSR223 language, e.g. beanshell, javascript, jexl
+scripting.displayName=Script (variables: ctx vars props prev sampler log Label Filename Parameters args[] OUT)
+script.displayName=Script
+script.shortDescription=Script in the appropriate JSR223 language
+parameterGroup.displayName=Parameters to be passed to script (=> String Parameters and String []args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to the file or script
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=Script file (overrides script)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,28 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=BSF PreProcessor
+scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, jexl)
+scriptLanguage.displayName=Language
+scriptLanguage.shortDescription=Name of BSF language, e.g. beanshell, javascript, jexl
+scripting.displayName=Script (variables: ctx vars props sampler log Label Filename Parameters args[] OUT)
+script.displayName=Script
+script.shortDescription=Script in the appropriate BSF language
+parameterGroup.displayName=Parameters to be passed to script (=> String Parameters and String []args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to the file or script
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=Script file (overrides script)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,27 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=BeanShell PreProcessor
+scripting.displayName=Script (variables: ctx vars props prev sampler log)
+script.displayName=
+script.shortDescription=Beanshell script
+resetGroup.displayName=Reset bsh.Interpreter before each call
+resetInterpreter.displayName=Reset Interpreter
+parameterGroup.displayName=Parameters to be passed to BeanShell (=> String Parameters and String []bsh.args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to BeanShell (file or script)
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=BeanShell script file (overrides script)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,28 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=JSR223 PreProcessor
+scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, jexl)
+scriptLanguage.displayName=Language
+scriptLanguage.shortDescription=Name of JSR223 language, e.g. beanshell, javascript, jexl
+scripting.displayName=Script (variables: ctx vars props sampler log Label Filename Parameters args[] OUT)
+script.displayName=Script
+script.shortDescription=Script in the appropriate JSR223 language
+parameterGroup.displayName=Parameters to be passed to script (=> String Parameters and String []args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to the file or script
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=Script file (overrides script)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSamplerResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSamplerResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSamplerResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSamplerResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,22 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=Debug Sampler
+displayJMeterVariables.displayName=JMeter variables
+displayJMeterProperties.displayName=JMeter properties
+displaySystemProperties.displayName=System properties
+displayJMeterVariables.shortDescription=Display JMeter variables ?
+displayJMeterProperties.shortDescription=Display JMeter properties ?
+displaySystemProperties.shortDescription=Display System properties ?
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSamplerResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimerResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimerResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimerResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimerResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,28 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=BSF Timer
+scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, jexl)
+scriptLanguage.displayName=Language
+scriptLanguage.shortDescription=Name of BSF language, e.g. beanshell, javascript, jexl
+scripting.displayName=Script (variables: ctx vars props sampler log Label Filename Parameters args[] OUT)
+script.displayName=Script
+script.shortDescription=Script in the appropriate BSF language
+parameterGroup.displayName=Parameters to be passed to script (=> String Parameters and String []args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to the file or script
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=Script file (overrides script)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimerResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,27 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=BeanShell Timer
+scripting.displayName=Script (variables: ctx vars props log prev)
+script.displayName=
+script.shortDescription=Beanshell script to generate delay
+resetGroup.displayName=Reset bsh.Interpreter before each call
+resetInterpreter.displayName=Reset Interpreter
+parameterGroup.displayName=Parameters to be passed to BeanShell (=> String Parameters and String []bsh.args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to BeanShell (file or script)
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=BeanShell script file (overrides script)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,26 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=Constant Throughput Timer
+delay.displayName=Delay before each affected sampler
+throughput.displayName=Target throughput (in samples per minute)
+throughput.shortDescription=Maximum number of samples you want to obtain per minute, per thread, from all affected samplers.
+calcMode.displayName=Calculate Throughput based on
+calcMode.shortDescription=The Constant Throughput Timer used to delay each thread as though it was the only thread in the test.  Now, it calculates the delay taking into account the number of active threads in the test or the thread group.
+calcMode.1=this thread only
+calcMode.2=all active threads
+calcMode.3=all active threads in current thread group
+calcMode.4=all active threads (shared)
+calcMode.5=all active threads in current thread group (shared)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,28 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=JSR223 Timer
+scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, jexl)
+scriptLanguage.displayName=Language
+scriptLanguage.shortDescription=Name of JSR223 language, e.g. beanshell, javascript, jexl
+scripting.displayName=Script (variables: ctx vars props sampler log Label Filename Parameters args[] OUT)
+script.displayName=Script
+script.shortDescription=Script in the appropriate JSR223 language
+parameterGroup.displayName=Parameters to be passed to script (=> String Parameters and String []args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to the file or script
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=Script file (overrides script)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimerResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimerResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimerResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimerResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,19 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=Synchronizing Timer
+grouping.displayName=Grouping
+groupSize.displayName=Number of Simulated Users to Group by
+groupSize.shortDescription=Define how many simulated users trigger the release of the synchronizing block (default value of '0' means all users)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimerResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListenerResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListenerResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListenerResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListenerResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,28 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=BSF Listener
+scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, jexl)
+scriptLanguage.displayName=Language
+scriptLanguage.shortDescription=Name of BSF language, e.g. beanshell, javascript, jexl
+scripting.displayName=Script (variables: ctx vars props sampleResult (aka prev) sampleEvent sampler log Label Filename Parameters args[] OUT)
+script.displayName=Script
+script.shortDescription=Script in the appropriate BSF language
+parameterGroup.displayName=Parameters to be passed to script (=> String Parameters and String []args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to the file or script
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=Script file (overrides script)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/visualizers/BSFListenerResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,27 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=BeanShell Listener
+scripting.displayName=Script (variables: ctx vars props sampleEvent sampleResult log prev)
+script.displayName=
+script.shortDescription=Beanshell script
+resetGroup.displayName=Reset bsh.Interpreter before each call
+resetInterpreter.displayName=Reset Interpreter
+parameterGroup.displayName=Parameters to be passed to BeanShell (=> String Parameters and String []bsh.args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to BeanShell (file or script)
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=BeanShell script file (overrides script)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223ListenerResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223ListenerResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223ListenerResources_en.properties (added)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223ListenerResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,28 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=JSR223 Listener
+scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, jexl)
+scriptLanguage.displayName=Language
+scriptLanguage.shortDescription=Name of JSR 223 language, e.g. beanshell, javascript, jexl
+scripting.displayName=Script (variables: ctx vars props sampleResult (aka prev) sampleEvent sampler log Label Filename Parameters args[] OUT)
+script.displayName=Script
+script.shortDescription=Script in the appropriate JSR 223 language
+parameterGroup.displayName=Parameters to be passed to script (=> String Parameters and String []args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to the file or script
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=Script file (overrides script)
\ No newline at end of file

Propchange: jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223ListenerResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources_en.properties (added)
+++ jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,17 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=Example2
+myStringProperty.displayName=A String
\ No newline at end of file

Propchange: jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2Resources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_en.properties (added)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,31 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=Access Log Sampler
+plugins.displayName=Plugin Classes
+accesslogfile.displayName=Log File Location
+defaults.displayName=Default Test Values
+logFile.displayName=Log File
+logFile.shortDescription=Location of log file to parse for requests
+parserClassName.displayName=Parser
+parserClassName.shortDescription=Choose a parser implementation to parser your log file.
+filterClassName.displayName=Filter (Optional)
+filterClassName.shortDescription=Choose a filter implementation to filter your log file entries (optional).
+domain.displayName=Server
+domain.shortDescription=Host name of the server to test against
+portString.displayName=Port
+portString.shortDescription=Port Number to test against
+imageParsing.displayName=Parse Images
+imageParsing.shortDescription=If turned on, JMeter will download images and resources contained in each web page
\ No newline at end of file

Propchange: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_en.properties (added)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,28 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=JSR223 Sampler
+scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, jexl)
+scriptLanguage.displayName=Language
+scriptLanguage.shortDescription=Name of JSR 223 language, e.g. beanshell, javascript, jexl
+scripting.displayName=Script (variables: ctx vars props SampleResult sampler log Label Filename Parameters args[] OUT)
+script.displayName=Script
+script.shortDescription=Script in the appropriate JSR 223 language
+parameterGroup.displayName=Parameters to be passed to script (=> String Parameters and String []args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to the file or script
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=Script file (overrides script)
\ No newline at end of file

Propchange: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_en.properties (added)
+++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,46 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=JDBC Connection Configuration
+pool.displayName=Connection Pool Configuration
+varName.displayName=Variable Name Bound to Pool
+keep-alive.displayName=Connection Validation by Pool
+database.displayName=Database Connection Configuration
+autocommit.displayName=Auto Commit
+autocommit.shortDescription=Whether queries should be auto committed.
+poolMax.displayName=Max Number of Connections
+poolMax.shortDescription=Maximum number of connections the pool will open at one time
+connectionAge.displayName=Max Connection age (ms)
+connectionAge.shortDescription=Maximum number of milliseconds an idle connection is kept before discarding
+driver.displayName=JDBC Driver class
+driver.shortDescription=Full package and class name of the JDBC driver to be used (Must be in JMeter's classpath)
+dbUrl.displayName=Database URL
+dbUrl.shortDescription=Full URL for the database, including jdbc protocol parts
+username.displayName=Username
+username.shortDescription=Username to use in connecting to database
+password.displayName=Password
+password.shortDescription=Password used to connect to database
+checkQuery.displayName=Validation Query
+checkQuery.shortDescription=A query used to validate a connection still works.  Only relevant if Keep Alive is true.
+dataSource.displayName=Variable Name
+dataSource.shortDescription=Name of the JMeter variable that the pool will be bound to.
+timeout.displayName=Pool Timeout
+timeout.shortDescription=The pool blocks requests for connection until a connection is available. This is the maximum blocking time before an exception is returned.
+trimInterval.displayName=Idle Cleanup Interval (ms)
+trimInterval.shortDescription=The pool removes extra idle connections at regular intervals
+keepAlive.displayName=Keep-Alive
+keepAlive.shortDescription=Whether the pool should validate connections.  If no, Connection Age and Validation Query are ignored.
+transactionIsolation.displayName=Transaction Isolation
+transactionIsolation.shortDescription=Transaction Isolation Level
\ No newline at end of file

Propchange: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_en.properties (added)
+++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,33 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=JDBC PostProcessor
+varName.displayName=Variable Name Bound to Pool
+sql.displayName=SQL Query
+query.displayName=Query
+query.shortDescription=SQL Query to send to database
+queryType.displayName=Query Type
+queryType.shortDescription=Determines if the SQL statement should be run as a select statement or an update statement.
+dataSource.displayName=Variable Name
+dataSource.shortDescription=Name of the JMeter variable that the connection pool is bound to.
+queryArguments.displayName=Parameter values
+queryArguments.shortDescription=SQL parameter values (comma separated)
+queryArgumentsTypes.displayName=Parameter types
+queryArgumentsTypes.shortDescription=JDBC Type names from java.sql.Types. VARCHAR, INTEGER, etc. (comma separated)
+variableNames.displayName=Variable names
+variableNames.shortDescription=Output variable names for each column  (comma separated)
+resultVariable.displayName=Result variable name
+resultVariable.shortDescription=Name of the JMeter variable that stores the result set objects in a list of maps for looking up results by column name.
+

Propchange: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_en.properties (added)
+++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,33 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=JDBC PreProcessor
+varName.displayName=Variable Name Bound to Pool
+sql.displayName=SQL Query
+query.displayName=Query
+query.shortDescription=SQL Query to send to database
+queryType.displayName=Query Type
+queryType.shortDescription=Determines if the SQL statement should be run as a select statement or an update statement.
+dataSource.displayName=Variable Name
+dataSource.shortDescription=Name of the JMeter variable that the connection pool is bound to.
+queryArguments.displayName=Parameter values
+queryArguments.shortDescription=SQL parameter values (comma separated)
+queryArgumentsTypes.displayName=Parameter types
+queryArgumentsTypes.shortDescription=JDBC Type names from java.sql.Types. VARCHAR, INTEGER, etc. (comma separated)
+variableNames.displayName=Variable names
+variableNames.shortDescription=Output variable names for each column  (comma separated)
+resultVariable.displayName=Result variable name
+resultVariable.shortDescription=Name of the JMeter variable that stores the result set objects in a list of maps for looking up results by column name.
+

Propchange: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPreProcessorResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_en.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_en.properties?rev=1209959&view=auto
==============================================================================
--- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_en.properties (added)
+++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_en.properties Sat Dec  3 17:31:11 2011
@@ -0,0 +1,33 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+displayName=JDBC Request
+varName.displayName=Variable Name Bound to Pool
+sql.displayName=SQL Query
+query.displayName=Query
+query.shortDescription=SQL Query to send to database
+queryType.displayName=Query Type
+queryType.shortDescription=Determines if the SQL statement should be run as a select statement or an update statement.
+dataSource.displayName=Variable Name
+dataSource.shortDescription=Name of the JMeter variable that the connection pool is bound to.
+queryArguments.displayName=Parameter values
+queryArguments.shortDescription=SQL parameter values (comma separated)
+queryArgumentsTypes.displayName=Parameter types
+queryArgumentsTypes.shortDescription=JDBC Type names from java.sql.Types. VARCHAR, INTEGER, etc. (comma separated)
+variableNames.displayName=Variable names
+variableNames.shortDescription=Output variable names for each column  (comma separated)
+resultVariable.displayName=Result variable name
+resultVariable.shortDescription=Name of the JMeter variable that stores the result set objects in a list of maps for looking up results by column name.
+

Propchange: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_en.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1209959&r1=1209958&r2=1209959&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sat Dec  3 17:31:11 2011
@@ -155,6 +155,7 @@ This behaviour can be changed with prope
 <li>Bug 43294 - XPath Extractor namespace problems</li>
 <li>Bug 52224 - TestBeanHelper does not support NOT_UNDEFINED == Boolean.FALSE</li>
 <li>Bug 52279 - Switching to another language loses icons in Tree and logs error Can't obtain GUI class from ...</li>
+<li>Bug 52280 - The menu item Options / Choose Language does not change all the displayed text to the new language</li>
 </ul>
 
 <!-- =================== Improvements =================== -->



Mime
View raw message