You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2013/03/08 09:36:28 UTC

svn commit: r1454282 - in /jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb: config/ sampler/

Author: milamber
Date: Fri Mar  8 08:36:27 2013
New Revision: 1454282

URL: http://svn.apache.org/r1454282
Log:
Add French translation, add AL header on resources properties files, litte javadoc and serial id.
Bugzilla Id: 54584

Modified:
    jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
    jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties
    jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties
    jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
    jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties
    jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties

Modified: jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java?rev=1454282&r1=1454281&r2=1454282&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java (original)
+++ jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.java Fri Mar  8 08:36:27 2013
@@ -38,6 +38,11 @@ public class MongoSourceElement
     extends AbstractTestElement
         implements ConfigElement, TestStateListener, TestBean {
 
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 2100L;
+
     private static final Logger log = LoggingManager.getLoggerForClass();
 
     public final static String CONNECTION = "MongoSourceElement.connection"; //$NON-NLS-1$

Modified: jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties?rev=1454282&r1=1454281&r2=1454282&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties (original)
+++ jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources.properties Fri Mar  8 08:36:27 2013
@@ -1,46 +1,53 @@
-displayName=MongoDB Source Config
-
-mongodb.displayName=MongoDB Connection
-mongodb.shortDescription=Configure the connection
+#   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.
 
+#Stored by I18NEdit, may be edited!
+autoConnectRetry.displayName=Keep trying
+autoConnectRetry.shortDescription=If true, the driver will keep trying to connect to the same server in case that the socket cannot be established.<br><br>There is maximum amount of time to keep retrying, which is 15s by default.<br><br>This can be useful to avoid some exceptions being thrown when a server is down temporarily by blocking the operations.<br><br>It also can be useful to smooth the transition to a new master (so that a new master is elected within the retry time).<br><br>Note that when using this flag\:<br>- for a replica set, the driver will trying to connect to the old master for that time, instead of failing over to the new one right away -<br> this does not prevent exception from being thrown in read/write operations on the socket, which must be handled by application.<br><br>Even if this flag is false, the driver already has mechanisms to automatically recreate broken connections and retry the read operations. <br><br>Default is false.
+connectTimeout.displayName=Connection timeout
+connectTimeout.shortDescription=The connection timeout in milliseconds.<br><br>It is used solely when establishing a new connection Socket.connect(java.net.SocketAddress, int)<br><br>Default is 0 and means no timeout.
 connection.displayName=Server Address List
 connection.shortDescription=Server Address List
-
-source.displayName=MongoDB Source
-source.shortDescription=Configure the Source
-
-options.displayName=MongoDB Options
-options.shortDescription=Various settings for the driver
-
-autoConnectRetry.displayName=Keep trying
 connectionsPerHost.displayName=Maximum connections Per Host
-connectTimeout.displayName=Connection timeout
+connectionsPerHost.shortDescription=The maximum number of connections allowed per host for this Mongo instance.<br><br>Those connections will be kept in a pool when idle.<br><br>Once the pool is exhausted, any operation requiring a connection will block waiting for an available connection.<br><br>Default is 10.
+displayName=MongoDB Source Config
+fsync.displayName=Fsync
+fsync.shortDescription=The fsync value of the global WriteConcern.<br><br>Default is false.
 maxAutoConnectRetryTime.displayName=Maximum retry time
+maxAutoConnectRetryTime.shortDescription=The maximum amount of time in MS to spend retrying to open connection to the same server.<br><br>Default is 0, which means to use the default 15s if autoConnectRetry is on.
 maxWaitTime.displayName=Maximum wait time
+maxWaitTime.shortDescription=The maximum wait time in ms that a thread may wait for a connection to become available.<br><br>Default is 120,000.
+mongodb.displayName=MongoDB Connection
+mongodb.shortDescription=Configure the connection
+options.displayName=MongoDB Options
+options.shortDescription=Various settings for the driver
+safe.displayName=Safe
+safe.shortDescription=If true the driver will use a WriteConcern of WriteConcern.SAFE for all operations.<br><br>If w, wtimeout, fsync or j are specified, this setting is ignored.<br><br>Default is false.
 socketKeepAlive.displayName=Socket keep alive
+socketKeepAlive.shortDescription=This flag controls the socket keep alive feature that keeps a connection alive through firewalls Socket.setKeepAlive(boolean)<br><br>Default is false.
 socketTimeout.displayName=Socket timeout
+socketTimeout.shortDescription=The socket timeout in milliseconds It is used for I/O socket read and write operations Socket.setSoTimeout(int)<br><br>Default is 0 and means no timeout. 
+source.displayName=MongoDB Source
+source.shortDescription=Configure the Source
 threadsAllowedToBlockForConnectionMultiplier.displayName=Block Multiplier
-
-autoConnectRetry.shortDescription=If true, the driver will keep trying to connect to the same server in case that the socket cannot be established.<br><br>There is maximum amount of time to keep retrying, which is 15s by default.<br><br>This can be useful to avoid some exceptions being thrown when a server is down temporarily by blocking the operations.<br><br>It also can be useful to smooth the transition to a new master (so that a new master is elected within the retry time).<br><br>Note that when using this flag:<br>- for a replica set, the driver will trying to connect to the old master for that time, instead of failing over to the new one right away -<br> this does not prevent exception from being thrown in read/write operations on the socket, which must be handled by application.<br><br>Even if this flag is false, the driver already has mechanisms to automatically recreate broken connections and retry the read operations. <br><br>Default is false.
-connectionsPerHost.shortDescription=The maximum number of connections allowed per host for this Mongo instance.<br><br>Those connections will be kept in a pool when idle.<br><br>Once the pool is exhausted, any operation requiring a connection will block waiting for an available connection.<br><br>Default is 10.
-connectTimeout.shortDescription=The connection timeout in milliseconds.<br><br>It is used solely when establishing a new connection Socket.connect(java.net.SocketAddress, int)<br><br>Default is 0 and means no timeout.
-maxAutoConnectRetryTime.shortDescription=The maximum amount of time in MS to spend retrying to open connection to the same server.<br><br>Default is 0, which means to use the default 15s if autoConnectRetry is on.
-maxWaitTime.shortDescription=The maximum wait time in ms that a thread may wait for a connection to become available.<br><br>Default is 120,000.
-socketKeepAlive.shortDescription=This flag controls the socket keep alive feature that keeps a connection alive through firewalls Socket.setKeepAlive(boolean)<br><br>Default is false.
-socketTimeout.shortDescription=The socket timeout in milliseconds It is used for I/O socket read and write operations Socket.setSoTimeout(int)<br><br>Default is 0 and means no timeout.
 threadsAllowedToBlockForConnectionMultiplier.shortDescription=This multiplier, multiplied with the connectionsPerHost setting, gives the maximum number of threads that may be waiting for a connection to become available from the pool.<br><br>All further threads will get an exception right away.<br><br>For example if connectionsPerHost is 10 and threadsAllowedToBlockForConnectionMultiplier is 5, then up to 50 threads can wait for a connection.<br><br>Default is 5.
-
+waitForJournaling.displayName=Wait for Journal
+waitForJournaling.shortDescription=The j value of the global WriteConcern.<br><br>Default is false.
 writeConcern.displayName=Write Concern Options
 writeConcern.shortDescription=Various settings for the driver
-
-fsync.displayName=Fsync
-safe.displayName=Safe
-waitForJournaling.displayName=Wait for Journal
 writeOperationNumberOfServers.displayName=Wait for Servers
-writeOperationTimeout.displayName=Wait Timeout
-
-fsync.shortDescription=The fsync value of the global WriteConcern.<br><br>Default is false.
-safe.shortDescription=If true the driver will use a WriteConcern of WriteConcern.SAFE for all operations.<br><br>If w, wtimeout, fsync or j are specified, this setting is ignored.<br><br>Default is false.
-waitForJournaling.shortDescription=The j value of the global WriteConcern.<br><br>Default is false.
 writeOperationNumberOfServers.shortDescription=The w value of the global WriteConcern.<br><br>Default is 0.
-writeOperationTimeout.shortDescription=The wtimeout value of the global WriteConcern.<br><br>Default is 0.
\ No newline at end of file
+writeOperationTimeout.displayName=Wait Timeout
+writeOperationTimeout.shortDescription=The wtimeout value of the global WriteConcern.<br><br>Default is 0.

Modified: jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties?rev=1454282&r1=1454281&r2=1454282&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties (original)
+++ jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoSourceElementResources_fr.properties Fri Mar  8 08:36:27 2013
@@ -1,46 +1,53 @@
-displayName=MongoDB Source Config
-
-mongodb.displayName=MongoDB Connection
-mongodb.shortDescription=Configure the connection
-
-connection.displayName=Server Address List
-connection.shortDescription=Server Address List
-
-source.displayName=MongoDB Source
-source.shortDescription=Configure the Source
-
-options.displayName=MongoDB Options
-options.shortDescription=Various settings for the driver
-
-autoConnectRetry.displayName=Keep trying
-connectionsPerHost.displayName=Maximum connections Per Host
-connectTimeout.displayName=Connection timeout
-maxAutoConnectRetryTime.displayName=Maximum retry time
-maxWaitTime.displayName=Maximum wait time
-socketKeepAlive.displayName=Socket keep alive
-socketTimeout.displayName=Socket timeout
-threadsAllowedToBlockForConnectionMultiplier.displayName=Block Multiplier
-
-autoConnectRetry.shortDescription=If true, the driver will keep trying to connect to the same server in case that the socket cannot be established.<br><br>There is maximum amount of time to keep retrying, which is 15s by default.<br><br>This can be useful to avoid some exceptions being thrown when a server is down temporarily by blocking the operations.<br><br>It also can be useful to smooth the transition to a new master (so that a new master is elected within the retry time).<br><br>Note that when using this flag:<br>- for a replica set, the driver will trying to connect to the old master for that time, instead of failing over to the new one right away -<br> this does not prevent exception from being thrown in read/write operations on the socket, which must be handled by application.<br><br>Even if this flag is false, the driver already has mechanisms to automatically recreate broken connections and retry the read operations. <br><br>Default is false.
-connectionsPerHost.shortDescription=The maximum number of connections allowed per host for this Mongo instance.<br><br>Those connections will be kept in a pool when idle.<br><br>Once the pool is exhausted, any operation requiring a connection will block waiting for an available connection.<br><br>Default is 10.
-connectTimeout.shortDescription=The connection timeout in milliseconds.<br><br>It is used solely when establishing a new connection Socket.connect(java.net.SocketAddress, int)<br><br>Default is 0 and means no timeout.
-maxAutoConnectRetryTime.shortDescription=The maximum amount of time in MS to spend retrying to open connection to the same server.<br><br>Default is 0, which means to use the default 15s if autoConnectRetry is on.
-maxWaitTime.shortDescription=The maximum wait time in ms that a thread may wait for a connection to become available.<br><br>Default is 120,000.
-socketKeepAlive.shortDescription=This flag controls the socket keep alive feature that keeps a connection alive through firewalls Socket.setKeepAlive(boolean)<br><br>Default is false.
-socketTimeout.shortDescription=The socket timeout in milliseconds It is used for I/O socket read and write operations Socket.setSoTimeout(int)<br><br>Default is 0 and means no timeout.
-threadsAllowedToBlockForConnectionMultiplier.shortDescription=This multiplier, multiplied with the connectionsPerHost setting, gives the maximum number of threads that may be waiting for a connection to become available from the pool.<br><br>All further threads will get an exception right away.<br><br>For example if connectionsPerHost is 10 and threadsAllowedToBlockForConnectionMultiplier is 5, then up to 50 threads can wait for a connection.<br><br>Default is 5.
-
-writeConcern.displayName=Write Concern Options
-writeConcern.shortDescription=Various settings for the driver
-
-fsync.displayName=Fsync
-safe.displayName=Safe
-waitForJournaling.displayName=Wait for Journal
-writeOperationNumberOfServers.displayName=Wait for Servers
-writeOperationTimeout.displayName=Wait Timeout
-
-fsync.shortDescription=The fsync value of the global WriteConcern.<br><br>Default is false.
-safe.shortDescription=If true the driver will use a WriteConcern of WriteConcern.SAFE for all operations.<br><br>If w, wtimeout, fsync or j are specified, this setting is ignored.<br><br>Default is false.
-waitForJournaling.shortDescription=The j value of the global WriteConcern.<br><br>Default is false.
-writeOperationNumberOfServers.shortDescription=The w value of the global WriteConcern.<br><br>Default is 0.
-writeOperationTimeout.shortDescription=The wtimeout value of the global WriteConcern.<br><br>Default is 0.
\ No newline at end of file
+#   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.
+
+#Stored by I18NEdit, may be edited!
+autoConnectRetry.displayName=Essayer de garder la connexion 
+autoConnectRetry.shortDescription=Si positionn\u00E9 \u00E0 True, le gestionnaire continuera d'essayer de se reconnecter au m\u00EAme serveur dans le cas o\u00F9 la connexion socket ne peut \u00EAtre \u00E9tablie. <br> Le d\u00E9lai d'attente maximum pour ressayer est de 15 sec par d\u00E9faut.<br> <br>Cela peut \u00EAtre utile pour \u00E9viter certaines exceptions lev\u00E9es quand un serveur est arr\u00EAt\u00E9 temporairement, bloquant ainsi les op\u00E9rations.<br>Il peut \u00E9galement \u00EAtre utile pour adoucir la transition vers un nouveau ma\u00EEtre (de sorte qu'un nouveau ma\u00EEtre est \u00E9lu au sein le nombre de tentatives de temps) <br><br>N.B. Lorsque vous utilisez cette option \:<br>- pour un jeu de r\u00E9plica, le gestionnaire tente de se connecter \u00E0 l'ancien ma\u00EEtre de ce moment-l\u00E0, au lieu de basculer vers le nouveau -<br>cela n'emp\u00EAche pas l'exception d'\u00EAtre lev\u00E9e en lecture / \u00E9criture sur la socket, qui doit \u00EAt
 re trait\u00E9e par l'application <br>M\u00EAme si cet indicateur est False, le gestionnaire dispose d\u00E9j\u00E0 de m\u00E9canismes pour recr\u00E9er automatiquement connexions interrompues et de r\u00E9essayer les op\u00E9rations de lecture.<br><br> La valeur par d\u00E9faut est False.
+connectTimeout.displayName=Delai d'expiration de connexion 
+connectTimeout.shortDescription=Le d\u00E9lai d'expiration de connexion, en millisecondes.<br> Il est utilis\u00E9 uniquement lors de l'\u00E9tablissement d'une nouvelle connexion Socket.connect(java.net.SocketAddress, int)<br><br>La valeur par d\u00E9faut est 0 et signifie aucun d\u00E9lai d'attente.
+connection.displayName=Liste adresse serveur 
+connection.shortDescription=Liste adresse serveur
+connectionsPerHost.displayName=Maximum de connexions par h\u00F4te 
+connectionsPerHost.shortDescription=Le nombre maximum de connexions autoris\u00E9es par h\u00F4te for cette instance de Mongo.<br><br>Ces connexions seront gard\u00E9es dans un pool quand elles seront disponibles.<br><br>Une fois que le pool est atteint, toute op\u00E9ration qui n\u00E9cessite une connexion sera bloqu\u00E9e en attendant une connexion disponible.<br><br>La valeur par d\u00E9faut est 10.
+displayName=Gestionnaire de connexion MongoDB
+fsync.displayName=Fsync 
+fsync.shortDescription=Valeur Fsync pour l'\u00E9l\u00E9ment global WriteConcern.<br><br>La valeur par d\u00E9faut est False.
+maxAutoConnectRetryTime.displayName=Temps de re-tentative maximum 
+maxAutoConnectRetryTime.shortDescription=Le d\u00E9lai maximal de temps en milli-secondes pour tenter d'ouvrir une connexion au m\u00EAme serveur.<br><br>La valeur par d\u00E9faut est 0, ce qui signifie que pour utiliser les 15 sec. par d\u00E9faut si autoConnectRetry est activ\u00E9.
+maxWaitTime.displayName=Temps d'attente maximum 
+maxWaitTime.shortDescription=Le temps d'attente maximum in milli-secondes qu'une unit\u00E9 d'ex\u00E9cution peut attendre pour qu'une connexion devienne disponible.<br><br>La valeur par d\u00E9faut est 120000.
+mongodb.displayName=Connexion MongoDB
+mongodb.shortDescription=Configurer la connexion
+options.displayName=Options MongoDB
+options.shortDescription=Divers param\u00E8tres pour le gestionnaire
+safe.displayName=S\u00FBret\u00E9 (Safe) 
+safe.shortDescription=Si positionn\u00E9 \u00E0 True, le gestionnaire utilisera un WriteConcern de WriteConcern.SAFE pour toutes les op\u00E9rations.<br><br>Si w, wtimeout, fsync or j sont sp\u00E9cifi\u00E9s, ce param\u00E8tre est ignor\u00E9.<br><br>La valeur par d\u00E9faut est False.
+socketKeepAlive.displayName=Socket persistante 
+socketKeepAlive.shortDescription=Cet indicateur contr\u00F4le la fonctionnalit\u00E9 de garder la socket persistante \u00E0 travers un pare-feu Socket.setKeepAlive(boolean)<br><br>La valeur par d\u00E9faut est false.
+socketTimeout.displayName=D\u00E9lai d'expiration Socket 
+socketTimeout.shortDescription=Le d\u00E9lai d'expiration de Socket en milli-secondes. Il est utilis\u00E9 pour en E/S de socket pour les op\u00E9rations de lecture et \u00E9criture Socket.setSoTimeout(int)<br><br>La valeur par d\u00E9faut est 0 et signifie \: pas de d\u00E9lai.
+source.displayName=Source MongoDB 
+source.shortDescription=Configurer la source
+threadsAllowedToBlockForConnectionMultiplier.displayName=Multiplicateur de blocage 
+threadsAllowedToBlockForConnectionMultiplier.shortDescription=Ce multiplicateur, multipli\u00E9 avec le param\u00E8tre connectionsPerHost, donne le nombre maximal d'unit\u00E9s qui peuvent \u00EAtre en attente qu'une connexion se lib\u00E8re du pool.<br>Au d\u00E9l\u00E0 une exception sera lev\u00E9e imm\u00E9diatement.<br><br>Par exemple, si connectionsPerHost est de 10 et threadsAllowedToBlockForConnectionMultiplier est de 5, Alors jusqu'\u00E0 50 threads peuvent attendre une connexion.<br>La valeur par d\u00E9faut est 5.
+waitForJournaling.displayName=Attente du Journal 
+waitForJournaling.shortDescription=La valeur j pour l'\u00E9l\u00E9ment global WriteConcern.<br><br>La valeur par d\u00E9faut est False.
+writeConcern.displayName=Options Write Concern
+writeConcern.shortDescription=Divers param\u00E8tres pour le gestionnaire
+writeOperationNumberOfServers.displayName=Attente des serveurs 
+writeOperationNumberOfServers.shortDescription=La valeur w pour l'\u00E9l\u00E9ment global WriteConcern.<br><br>La valeur par d\u00E9faut est 0.
+writeOperationTimeout.displayName=D\u00E9lai d'attente 
+writeOperationTimeout.shortDescription=La valeur wtimeout pour l'\u00E9l\u00E9ment global WriteConcern.<br><br>La valeur par d\u00E9faut est 0.

Modified: jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java?rev=1454282&r1=1454281&r2=1454282&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java (original)
+++ jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java Fri Mar  8 08:36:27 2013
@@ -37,7 +37,7 @@ public class MongoScriptRunner {
      * 
      * @param db
      * @param script
-     * @return
+     * @return Object
      * @throws Exception
      */
     public Object evaluate(DB db, String script)

Modified: jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties?rev=1454282&r1=1454281&r2=1454282&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties (original)
+++ jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources.properties Fri Mar  8 08:36:27 2013
@@ -1,14 +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.
+
+#Stored by I18NEdit, may be edited!
+database.displayName=Database Name
 displayName=MongoDB Script
 mongodb.displayName=MongoDB Connection
 mongodb.shortDescription=Configure the connection
-
-source.displayName=MongoDB Source
-source.shortDescription=Configure the Source
-
-database.displayName=Database Name
-username.displayName=Username
 password.displayName=Password
-
 sampler.displayName=Script
 script.displayName=The script to run
-script.shortDescription=Add your mongo shell script as you would via the mongo shell.
+script.shortDescription=Add your mongo shell script as you would via the mongo shell. 
+source.displayName=MongoDB Source
+source.shortDescription=Configure the Source
+username.displayName=Username

Modified: jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties?rev=1454282&r1=1454281&r2=1454282&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties (original)
+++ jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptSamplerResources_fr.properties Fri Mar  8 08:36:27 2013
@@ -1,14 +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.
+
+#Stored by I18NEdit, may be edited!
+database.displayName=Nom base de donn\u00E9es 
 displayName=Script MongoDB
-mongodb.displayName=Connexion MongoDB
+mongodb.displayName=Connexion MongoDB 
 mongodb.shortDescription=Configurer la connexion
-
-source.displayName=Source MongoDB
-source.shortDescription=Configurer la Source
-
-database.displayName=Database Name
-username.displayName=Utilisateur
-password.displayName=Mot de passe
-
+password.displayName=Mot de passe 
 sampler.displayName=Script
-script.displayName=Le script \u00E0 ex\u00E9cuter
-script.shortDescription=Ajouter votre script shell Mongo comme vous le feriez dans le shell mongo.
+script.displayName=Le script \u00E0 ex\u00E9cuter 
+script.shortDescription=Ajouter votre script shell mongo comme vous le feriez dans le shell mongo.
+source.displayName=Source MongoDB 
+source.shortDescription=Configurer la Source
+username.displayName=Utilisateur