You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jmeter.apache.org by se...@apache.org on 2013/07/09 20:40:48 UTC

svn commit: r1501450 - /jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties

Author: sebb
Date: Tue Jul  9 18:40:48 2013
New Revision: 1501450

URL: http://svn.apache.org/r1501450
Log:
Add missing entry

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

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1501450&r1=1501449&r2=1501450&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Tue Jul  9 18:40:48 2013
@@ -1041,6 +1041,7 @@ template_choose=Choisir le mod\u00E8le
 template_create_from=Cr\u00E9er
 template_field=Canevas \:
 template_load?=Charger le mod\u00E8le ?
+template_merge_from=Fusionner
 template_title=Cr\u00E9er \u00E0 partir du mod\u00E8le
 test=Test
 test_action_action=Action \: