svn commit: r1501389 - /jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties

[se...@apache.org]

Author: sebb
Date: Tue Jul  9 17:17:24 2013
New Revision: 1501389

URL: http://svn.apache.org/r1501389
Log:
Templates can be merged as well

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1501389&r1=1501388&r2=1501389&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Tue Jul  9 17:17:24 2013
@@ -207,7 +207,7 @@ counter_config_title=Counter
 counter_per_user=Track counter independently for each user
 counter_reset_per_tg_iteration=Reset counter on each Thread Group Iteration
 countlim=Size limit
-create_from_template=New from templates...
+create_from_template=Templates...
 csvread_file_file_name=CSV file to get values from | *alias
 cut=Cut
 cut_paste_function=Copy and paste function string
@@ -1048,6 +1048,7 @@ template_choose=Select Template
 template_create_from=Create
 template_field=Template\:
 template_load?=Load template ?
+template_merge_from=Merge
 template_title=Create from Template
 test=Test
 test_action_action=Action