This is an automated email from the ASF dual-hosted git repository.

vlsi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 91318b5953 i18n: drop `?` from checkbox labels across all locales
91318b5953 is described below

commit 91318b59533fdf166e56692467912ed08da60524
Author: Vladimir Sitnikov <[email protected]>
AuthorDate: Thu May 28 11:15:36 2026 +0300

    i18n: drop `?` from checkbox labels across all locales
    
    Follow-up to 9aa4e54ca (ru). The same 27 resourceids render as
    checkboxes (and two boolean table-column headers, encode? and
    include_equals) in every locale, so the trailing `?` is dropped
    in en, de, es, fr, ja, ko, pl, pt_BR, tr, zh_CN, zh_TW. Spanish
    also loses the opening `¿`; the CJK files lose the full-width `?`.
    
    Two more messages checkboxes carried a `?` only in the French
    value while English was already clean: clear_cache_each_iteration
    (DNSCachePanel) and proxy_regex (ProxyControlGui).
    
    TestBean components were missed by the messages-only walk. The
    boolean properties below render as checkboxes, so their
    `.displayName` labels and `.shortDescription` tooltips drop the
    `?` too (es `¿…?`, CJK `?` handled as well):
    
    * CSVDataSet: recycle, stopThread, quotedData
    * RandomVariableConfig: perThread
    * DebugSampler / DebugPostProcessor: displayJMeterProperties,
      displayJMeterVariables, displaySamplerProperties,
      displaySystemProperties
    
    Strings phrased as full questions rather than a statement plus
    `?` are reworded to declarative form: the CJK messages keys
    (clear_cookies_per_iter ja, if_controller_evaluate_all ko,
    ldap_trust_all ko), the German Debug tooltips, the CSVDataSet
    recycle/stopThread/quotedData tooltips in en/de/es/fr/ko/pl/tr/zh_CN,
    and two non-dialog labels where one locale had added a question:
    include_path (de, FilePanel) and sampler_on_error_action (pl,
    TitledBorder).
    
    Question marks are kept where they belong: dialog confirms and
    titles (save?, revert_project?, template_load?, cancel_*,
    remove_confirm_*, should_save, web_parameters_lost_message,
    ask_existing_file, schematic_view_outputfile), the help_node menu
    item and property_returnvalue_param description, and the literal
    `?` in the Bolt URI example.
    
    The user manual (component_reference.xml and two build-*.xml
    tutorials) is synced to the new labels; changes_history is left
    untouched. The encode? key name is untouched; only its value
    changes.
    
    Co-Authored-By: Claude Opus 4.7 (1M context) <[email protected]>
---
 .../jmeter/config/CSVDataSetResources.properties   | 12 ++---
 .../config/CSVDataSetResources_de.properties       |  8 ++--
 .../config/CSVDataSetResources_es.properties       | 12 ++---
 .../config/CSVDataSetResources_fr.properties       | 12 ++---
 .../config/CSVDataSetResources_ko.properties       | 12 ++---
 .../config/CSVDataSetResources_pl.properties       | 12 ++---
 .../config/CSVDataSetResources_pt_BR.properties    | 10 ++--
 .../config/CSVDataSetResources_tr.properties       |  8 ++--
 .../config/CSVDataSetResources_zh_CN.properties    | 12 ++---
 .../RandomVariableConfigResources.properties       |  4 +-
 .../RandomVariableConfigResources_es.properties    |  4 +-
 .../RandomVariableConfigResources_fr.properties    |  4 +-
 .../RandomVariableConfigResources_ko.properties    |  4 +-
 .../RandomVariableConfigResources_pl.properties    |  4 +-
 .../RandomVariableConfigResources_pt_BR.properties |  4 +-
 .../RandomVariableConfigResources_zh_CN.properties |  4 +-
 .../DebugPostProcessorResources.properties         |  8 ++--
 .../DebugPostProcessorResources_de.properties      |  2 +-
 .../DebugPostProcessorResources_fr.properties      |  8 ++--
 .../DebugPostProcessorResources_ko.properties      |  8 ++--
 .../DebugPostProcessorResources_pt_BR.properties   | 10 ++--
 .../DebugPostProcessorResources_tr.properties      |  8 ++--
 .../DebugPostProcessorResources_zh_CN.properties   |  8 ++--
 .../sampler/DebugSamplerResources.properties       |  6 +--
 .../sampler/DebugSamplerResources_de.properties    |  2 +-
 .../sampler/DebugSamplerResources_fr.properties    |  6 +--
 .../sampler/DebugSamplerResources_ko.properties    |  6 +--
 .../sampler/DebugSamplerResources_pt_BR.properties |  6 +--
 .../sampler/DebugSamplerResources_tr.properties    |  6 +--
 .../sampler/DebugSamplerResources_zh_CN.properties |  6 +--
 .../apache/jmeter/resources/messages.properties    | 54 +++++++++++-----------
 .../apache/jmeter/resources/messages_de.properties | 18 ++++----
 .../apache/jmeter/resources/messages_es.properties | 40 ++++++++--------
 .../apache/jmeter/resources/messages_fr.properties | 48 +++++++++----------
 .../apache/jmeter/resources/messages_ja.properties |  4 +-
 .../apache/jmeter/resources/messages_ko.properties | 50 ++++++++++----------
 .../apache/jmeter/resources/messages_pl.properties | 12 ++---
 .../jmeter/resources/messages_pt_BR.properties     | 32 ++++++-------
 .../apache/jmeter/resources/messages_tr.properties | 24 +++++-----
 .../jmeter/resources/messages_zh_CN.properties     | 24 +++++-----
 .../jmeter/resources/messages_zh_TW.properties     |  8 ++--
 xdocs/usermanual/build-adv-web-test-plan.xml       |  2 +-
 xdocs/usermanual/build-ldapext-test-plan.xml       |  2 +-
 xdocs/usermanual/component_reference.xml           | 44 +++++++++---------
 44 files changed, 289 insertions(+), 289 deletions(-)

diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources.properties
index 9370a6b223..3241916e85 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources.properties
@@ -27,12 +27,12 @@ variableNames.displayName=Variable Names (comma-delimited)
 variableNames.shortDescription=List your variable names in order to match the 
order of columns in your csv data. Keep it empty to use the first line of the 
file for variable names.
 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) ?
+quotedData.displayName=Allow quoted data
+quotedData.shortDescription=Allow CSV data values to be quoted
+recycle.displayName=Recycle on EOF
+recycle.shortDescription=Re-read the file from the start on reaching EOF
+stopThread.displayName=Stop thread on EOF
+stopThread.shortDescription=Stop the thread 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
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_de.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_de.properties
index 7b0c24d33f..2a77514da0 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_de.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_de.properties
@@ -23,9 +23,9 @@ fileEncoding.displayName=Zeichensatz der Datei
 fileEncoding.shortDescription=Der in der Datei benutzte Zeichensatz
 filename.displayName=Dateiname
 filename.shortDescription=Name der Datei, die die CSV Daten enthält (relativer 
oder absoluter Pfadname möglich)
-recycle.displayName=Datei erneut einlesen?
-recycle.shortDescription=Soll die Datei nach dem erreichen des Dateiendes 
erneut eingelesen werden?
-stopThread.displayName=Thread stoppen?
-stopThread.shortDescription=Bei erreichen des Dateiende den Thread stoppen?
+recycle.displayName=Datei erneut einlesen
+recycle.shortDescription=Datei nach Erreichen des Dateiendes erneut einlesen
+stopThread.displayName=Thread stoppen
+stopThread.shortDescription=Bei erreichen des Dateiende den Thread stoppen
 variableNames.displayName=Variablennamen (getrennt durch Komma)
 variableNames.shortDescription=Geben sie die Variablennamen ein, die den 
Spalten ihrer CSV Datei entsprechen. Die Variablennamen müssen der Reihenfolge 
der CSV Datei entsprechen\!
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_es.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_es.properties
index 17864acc97..0e3a3d78f9 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_es.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_es.properties
@@ -25,16 +25,16 @@ fileEncoding.shortDescription=El conjunto de caracteres 
usado en el fichero
 filename.displayName=Nombre de Archivo
 filename.shortDescription=Nombre del archivo (dentro de su directorio de 
archivos) que mantiene los datos CVS
 ignoreFirstLine.displayName=Utilice la primera línea como Nombres de Variable
-quotedData.displayName=¿Permitir datos entrecomillados?
-quotedData.shortDescription=¿Permitir que  valores de datos CSV sean 
entrecomillados?
-recycle.displayName=¿Reciclar en el fin de fichero (EOF)?
-recycle.shortDescription=¿Debería el fichero ser releído desde el comiendo 
cuando se alcance el final del fichero (EOF)?
+quotedData.displayName=Permitir datos entrecomillados
+quotedData.shortDescription=Permitir que  valores de datos CSV sean 
entrecomillados
+recycle.displayName=Reciclar en el fin de fichero (EOF)
+recycle.shortDescription=Releer el fichero desde el comienzo al alcanzar el 
final del fichero (EOF)
 shareMode.all=Todos los hilos
 shareMode.displayName=Modo compartido
 shareMode.group=Actual grupo de hilos
 shareMode.shortDescription=Seleccionar que hilos comparten el mismo puntero a 
fichero
 shareMode.thread=Hilo actual
-stopThread.displayName=¿Para el hilo al final del fichero (EOF)?
-stopThread.shortDescription=¿Debería el hilo ser parado cuando se alcance el 
final del fichero(EOF) (Si 'Reciclar' es falso?)
+stopThread.displayName=Para el hilo al final del fichero (EOF)
+stopThread.shortDescription=Parar el hilo al alcanzar el final del fichero 
(EOF) (si 'Reciclar' es falso)
 variableNames.displayName=Nombres de Variable (delimitados por coma)
 variableNames.shortDescription=Lista sus nombres de variable para ordenar las 
columnas en sus datos CSV.
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_fr.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_fr.properties
index ef63520739..48cc70ccc9 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_fr.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_fr.properties
@@ -26,16 +26,16 @@ filename.displayName=Nom de fichier
 filename.shortDescription=Nom du fichier qui contient des données CSV (chemin 
relatif ou absolu)
 ignoreFirstLine.displayName=Ignorer la première ligne (utilisé uniquement si 
Noms des Variables n'est pas vide)
 ignoreFirstLine.shortDescription=Ignorer la première ligne du fichier CSV, 
utilisé uniquement si Noms des Variables n'est pas vide, si si Noms des 
Variables est vide la première doit contenir les entètes.
-quotedData.displayName=Autoriser les données avec des quotes ?
-quotedData.shortDescription=Permettre aux valeurs des données CSV d'être 
quotées ?
-recycle.displayName=Recycler en fin de fichier (EOF) ?
-recycle.shortDescription=Voulez-vous que le fichier soit relu depuis son début 
après avoir atteint la fin de fichier (EOF) ?
+quotedData.displayName=Autoriser les données avec des quotes
+quotedData.shortDescription=Permettre aux valeurs des données CSV d'être 
quotées
+recycle.displayName=Recycler en fin de fichier (EOF)
+recycle.shortDescription=Relire le fichier depuis son début après avoir 
atteint la fin de fichier (EOF)
 shareMode.all=Toutes les unités
 shareMode.displayName=Mode de partage
 shareMode.group=Groupe d'unités courant
 shareMode.shortDescription=Sélectionner les unités partageant le même pointeur 
de fichier
 shareMode.thread=Unité courante
-stopThread.displayName=Arrêter l'unité à la fin de fichier (EOF) ?
-stopThread.shortDescription=L'unité sera arrêtée en atteignant la fin de 
fichier (EOF) (si Recycler est à faux) ?
+stopThread.displayName=Arrêter l'unité à la fin de fichier (EOF)
+stopThread.shortDescription=L'unité sera arrêtée en atteignant la fin de 
fichier (EOF) (si Recycler est à faux)
 variableNames.displayName=Noms des variables (séparés par des virgules)
 variableNames.shortDescription=Liste de vos variables dans l'ordre des 
colonnes de vos données CSV. Laissez vide pour utiliser la première ligne du 
fichier pour les noms de variable
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_ko.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_ko.properties
index 5aab8865d0..b9addefb2b 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_ko.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_ko.properties
@@ -27,12 +27,12 @@ variableNames.displayName=변수 이름들 (구분자는 쉼표)
 variableNames.shortDescription=CSV 파일 내의 컬럼들의 순서와 매치시키기 위한 변수 이름들의 목록. 파일의 첫번째 
줄의 헤더들을 변수 이름들로 사용하고자 할 때에는 이것을 빈 문자열로 두십시오.
 delimiter.displayName=구분자 (예를 들어 탭을 구분자로 할 경우, '\\t')
 delimiter.shortDescription=구분자를 입력하십시오 (예를 들어 탭을 구분자로 할 경우, '\\t')
-quotedData.displayName=인용부호로 감싸진 데이터 허용?
-quotedData.shortDescription=CSV 데이터 값들이 인용부호로 감싸진 형태를 허용하겠습니까?
-recycle.displayName=EOF 도달 시 재순환 읽기?
-recycle.shortDescription=EOF에 도달하게 되면 파일을 처음부터 다시 읽겠습니까?
-stopThread.displayName=EOF 도달 시 읽기 중단?
-stopThread.shortDescription=EOF에 도달하게 되면 읽기를 중단하겠습니까? (재순환 읽기 옵션이 false인 경우)?
+quotedData.displayName=인용부호로 감싸진 데이터 허용
+quotedData.shortDescription=CSV 데이터 값들이 인용부호로 감싸진 형태를 허용
+recycle.displayName=EOF 도달 시 재순환 읽기
+recycle.shortDescription=EOF에 도달하면 파일을 처음부터 다시 읽기
+stopThread.displayName=EOF 도달 시 읽기 중단
+stopThread.shortDescription=EOF에 도달하면 읽기를 중단 (재순환 읽기 옵션이 false인 경우)
 shareMode.displayName=공유 모드
 shareMode.shortDescription=쓰레드들이 동일한 파일 포인터를 공유하도록 허용하는 모드 선택
 shareMode.all=모든 쓰레드들
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_pl.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_pl.properties
index ad0146ecba..0e9a4827bb 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_pl.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_pl.properties
@@ -24,16 +24,16 @@ fileEncoding.shortDescription=Strona kodowa znaków używana 
w pliku
 filename.displayName=Nazwa pliku
 filename.shortDescription=Nazwa pliku CSV (względna lub absolutna)
 ignoreFirstLine.displayName=Ignoruj pierwszą linię (używana tylko wtedy, gdy 
nazwy zmiennych nie są puste)
-quotedData.displayName=Zezwalać na dane "w cudzysłowiach" ?
-quotedData.shortDescription=Zezwalać na "otaczanie danych" cudzysłowami?
-recycle.displayName=Recycle on EOF ?
-recycle.shortDescription=Jeśli zacznę czytać plik w środku i dojdę do końca 
(EOF) to mam doczytać brakującą część z początku pliku?\r\n
+quotedData.displayName=Zezwalać na dane "w cudzysłowiach"
+quotedData.shortDescription=Zezwalać na "otaczanie danych" cudzysłowami
+recycle.displayName=Recycle on EOF
+recycle.shortDescription=Po dojściu do końca pliku (EOF) doczytać brakującą 
część z początku pliku\r\n
 shareMode.all=Wszystkie wątki
 shareMode.displayName=Tryb współdzielenia
 shareMode.group=Bieżąca grupa wątków
 shareMode.shortDescription=Wybierz wątki, które powinny dzielić ten sam 
wskaźnik do pliku
 shareMode.thread=Bieżący wątek
-stopThread.displayName=Zatrzymać wątek  na EOF ?
-stopThread.shortDescription=Zatrzymać wątek gdy dojdzie do końca pliku (EOF, 
jeśli nie wybrałeś doczytywania brakującego fragmentu pliku z początku)?
+stopThread.displayName=Zatrzymać wątek  na EOF
+stopThread.shortDescription=Zatrzymać wątek gdy dojdzie do końca pliku (EOF, 
jeśli nie wybrałeś doczytywania brakującego fragmentu pliku z początku)
 variableNames.displayName=Nazwy zmiennych (oddzielane przecinkami)
 variableNames.shortDescription=Wpisz nazwy Twoich zmiennych, w odpowieniej 
kolejności, tak by pasowały Ci do kolumn w pliku CSV.
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_pt_BR.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_pt_BR.properties
index 3b166e1174..beb16253dd 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_pt_BR.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_pt_BR.properties
@@ -24,16 +24,16 @@ fileEncoding.shortDescription=O conjunto de caracteres 
(charset) usado no arquiv
 filename.displayName=Nome do arquivo
 filename.shortDescription=Nome do arquivo que contém os dados csv (nome do 
arquivo relativo ou absoluto)
 ignoreFirstLine.displayName=Ignore a primeira linha (usada apenas se os Nomes 
de variáveis não estiverem vazios)
-quotedData.displayName=Permitir dados com citações?
+quotedData.displayName=Permitir dados com citações
 quotedData.shortDescription=Permitir que valores de dados CSV possuam citações 
(aspas)
-recycle.displayName=Reciclar no final do arquivo (EOF)?
-recycle.shortDescription=Os dados do arquivo devem ser lidos novamente a 
partir do início ao alcançar o fim do arquivo (EOF)?
+recycle.displayName=Reciclar no final do arquivo (EOF)
+recycle.shortDescription=Os dados do arquivo devem ser lidos novamente a 
partir do início ao alcançar o fim do arquivo (EOF)
 shareMode.all=Todos os usuários virtuais
 shareMode.displayName=Modo de compartilhamento
 shareMode.group=Grupo de usuários atual
 shareMode.shortDescription=Selecionar quais usuários virtuais compartilham o 
mesmo ponteiro para o arquivo
 shareMode.thread=Usuário virtual atual
-stopThread.displayName=Finalizar usuário virtual no final do arquivo?
-stopThread.shortDescription=O usuário virtual deverá ser parado quando o fim 
do arquivo for alcançado (se Reciclar não está configurado)?
+stopThread.displayName=Finalizar usuário virtual no final do arquivo
+stopThread.shortDescription=O usuário virtual deverá ser parado quando o fim 
do arquivo for alcançado (se Reciclar não está configurado)
 variableNames.displayName=Nomes das variáveis (separados por vírgula)
 variableNames.shortDescription=Informar os nomes das variáveis que representam 
as colunas na sua fonte de dados CSV.
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_tr.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_tr.properties
index 12e3a53ac8..fdd0280582 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_tr.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_tr.properties
@@ -24,9 +24,9 @@ fileEncoding.displayName=Dosya Kodlaması
 fileEncoding.shortDescription=Dosyada kullanılan karakter kodlaması
 filename.displayName=Dosya adı
 filename.shortDescription=cvs verisini tutan dosyanın adı (göreli veya tam 
dosya yolu)
-recycle.displayName=Dosya sonunda geri dönüşüm ?
-recycle.shortDescription=Dosya sonundan itibaren tekrar okunsun mu?
-stopThread.displayName=Dosya sonunda iş parçacığını durdur ?
-stopThread.shortDescription=İş parçacıcığı dosya sonuna varıldığında 
durdurulsun mu (eğer geri dönüşüm etkin değilse) ?
+recycle.displayName=Dosya sonunda geri dönüşüm
+recycle.shortDescription=Dosya sonuna ulaşıldığında baştan tekrar okunsun
+stopThread.displayName=Dosya sonunda iş parçacığını durdur
+stopThread.shortDescription=İş parçacığı dosya sonuna varıldığında durdurulsun 
(eğer geri dönüşüm etkin değilse)
 variableNames.displayName=Değişken isimleri (virgülle ayrılmış)
 variableNames.shortDescription=Değişken isimlerini csv verisindeki kolon 
sırasıyla örtüşecek şekilde listele.
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_zh_CN.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_zh_CN.properties
index e4b72cac50..b66cb7d600 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_zh_CN.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/CSVDataSetResources_zh_CN.properties
@@ -28,12 +28,12 @@ variableNames.displayName=变量名称(西文逗号间隔)
 variableNames.shortDescription=与CSV数据文件相对应的变量卖出,以西文逗号间隔
 delimiter.displayName=分隔符 (用'\\t'代替制表符)
 delimiter.shortDescription=输入分隔符 (用'\\t'代替制表符)
-quotedData.displayName=是否允许带引号?
-quotedData.shortDescription=是否允许CSV数据中被引号包住?
-recycle.displayName=遇到文件结束符再次循环?
-recycle.shortDescription=当文件结束时是否从头重新读取文件?
-stopThread.displayName=遇到文件结束符停止线程?
-stopThread.shortDescription=当文件结束时是否停止线程(只有当再次循环关闭情况下)?
+quotedData.displayName=允许带引号
+quotedData.shortDescription=允许CSV数据中被引号包住
+recycle.displayName=遇到文件结束符再次循环
+recycle.shortDescription=当文件结束时从头重新读取文件
+stopThread.displayName=遇到文件结束符停止线程
+stopThread.shortDescription=当文件结束时停止线程(仅当关闭再次循环时)
 shareMode.displayName=线程共享模式
 shareMode.shortDescription=选择哪些线程会共享同一个文件句柄
 shareMode.all=所有线程
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources.properties
index 2a5126dbf7..9f18d769c6 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources.properties
@@ -31,5 +31,5 @@ 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) ?
+perThread.displayName=Per Thread(User)
+perThread.shortDescription=Use independent random generators for each 
thread(user)
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_es.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_es.properties
index 5fa5881534..2b53236418 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_es.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_es.properties
@@ -24,8 +24,8 @@ minimumValue.shortDescription=Valor mínimo
 options.displayName=Opciones
 outputFormat.displayName=Formato de salida
 outputFormat.shortDescription=Formato de salida, e.g. \#\#\#\#
-perThread.displayName=¿Por hilo(Usuario)?
-perThread.shortDescription=¿Usar generadores aleatorios independientes para 
cada hilo (usuario)?
+perThread.displayName=Por hilo(Usuario)
+perThread.shortDescription=Usar generadores aleatorios independientes para 
cada hilo (usuario)
 random.displayName=Configurar el generador aleatorio
 randomSeed.displayName=Semilla para la función aleatoria
 randomSeed.shortDescription=Semilla para la función aleatoria - número long 
(por defecto para la hora actual)
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_fr.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_fr.properties
index 05e35afd34..5c4f87d792 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_fr.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_fr.properties
@@ -24,8 +24,8 @@ minimumValue.shortDescription=Valeur minimum
 options.displayName=Options
 outputFormat.displayName=Format de sortie
 outputFormat.shortDescription=Format de sortie, i.e. \#\#\#\#
-perThread.displayName=Par unité (utilisateur) ?
-perThread.shortDescription=Utiliser des générateurs aléatoires indépendants 
pour chaque unité (utilisateur) ?
+perThread.displayName=Par unité (utilisateur)
+perThread.shortDescription=Utiliser des générateurs aléatoires indépendants 
pour chaque unité (utilisateur)
 random.displayName=Paramétrer le générateur aléatoire
 randomSeed.displayName=Sels pour la fonction aléatoire
 randomSeed.shortDescription=Sels pour la fonction aléatoire - chiffre long 
(par défaut à l'heure courante)
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_ko.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_ko.properties
index b30a45d8f4..cd111d0a5e 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_ko.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_ko.properties
@@ -31,5 +31,5 @@ outputFormat.displayName=출력 포맷
 outputFormat.shortDescription=출력 포맷. 예\: ####
 randomSeed.displayName=난수 발생 함수를 위한 Seed 숫자
 randomSeed.shortDescription=난수 발생 함수를 위한 Seed 숫자 (long). 기본 값은 현재 시간.
-perThread.displayName=쓰레드(사용자)별 독립 난수발생기 사용?
-perThread.shortDescription=각 쓰레드(사용자)마다 별개의 독립적 난수발생기 사용?
+perThread.displayName=쓰레드(사용자)별 독립 난수발생기 사용
+perThread.shortDescription=각 쓰레드(사용자)마다 별개의 독립적 난수발생기 사용
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_pl.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_pl.properties
index 2a5126dbf7..9f18d769c6 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_pl.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_pl.properties
@@ -31,5 +31,5 @@ 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) ?
+perThread.displayName=Per Thread(User)
+perThread.shortDescription=Use independent random generators for each 
thread(user)
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_pt_BR.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_pt_BR.properties
index 4a41aceb60..767c672bb1 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_pt_BR.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_pt_BR.properties
@@ -23,8 +23,8 @@ minimumValue.shortDescription=Valor Mínimo
 options.displayName=Opções
 outputFormat.displayName=Formato de saída
 outputFormat.shortDescription=Formato de saída, ex\: \#\#\#\#
-perThread.displayName=Por usuário virtual (thread)?
-perThread.shortDescription=Utilizar geradores aleatórios independentes para 
cada usuário virtual (thread)?
+perThread.displayName=Por usuário virtual (thread)
+perThread.shortDescription=Utilizar geradores aleatórios independentes para 
cada usuário virtual (thread)
 random.displayName=Configurar o gerador aleatório
 randomSeed.displayName=Semente para a função aleatória
 randomSeed.shortDescription=Semente para a função aleatória - número do tipo 
long (valor padrão para o tempo atual)
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_zh_CN.properties
 
b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_zh_CN.properties
index 545a930897..65598a9a62 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_zh_CN.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/config/RandomVariableConfigResources_zh_CN.properties
@@ -31,5 +31,5 @@ outputFormat.displayName=输出格式
 outputFormat.shortDescription=输出格式,如:####
 randomSeed.displayName=随机种子
 randomSeed.shortDescription=随机种子,需要long型(默认是当前时间)
-perThread.displayName=每线程(用户)?
-perThread.shortDescription=为每个线程(用户)分配独立的随机发生器?
+perThread.displayName=每线程(用户)
+perThread.shortDescription=为每个线程(用户)分配独立的随机发生器
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources.properties
 
b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources.properties
index 694fa658a3..5198d0dbb0 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources.properties
@@ -16,11 +16,11 @@
 #
 
 displayJMeterProperties.displayName=JMeter properties
-displayJMeterProperties.shortDescription=Display JMeter properties ?
+displayJMeterProperties.shortDescription=Display JMeter properties
 displayJMeterVariables.displayName=JMeter variables
-displayJMeterVariables.shortDescription=Display JMeter variables ?
+displayJMeterVariables.shortDescription=Display JMeter variables
 displayName=Debug PostProcessor
 displaySamplerProperties.displayName=Sampler properties
-displaySamplerProperties.shortDescription=Display Sampler properties ?
+displaySamplerProperties.shortDescription=Display Sampler properties
 displaySystemProperties.displayName=System properties
-displaySystemProperties.shortDescription=Display System properties ?
+displaySystemProperties.shortDescription=Display System properties
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_de.properties
 
b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_de.properties
index 9938a780b5..e99f7767dd 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_de.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_de.properties
@@ -16,7 +16,7 @@
 #
 
 displayJMeterProperties.displayName=JMeter Eigenschaften
-displayJMeterProperties.shortDescription=Sollen die JMeter Eigenschaften 
angezeigt werden?
+displayJMeterProperties.shortDescription=JMeter-Eigenschaften anzeigen
 displayJMeterVariables.displayName=JMeter Variablen
 displayJMeterVariables.shortDescription=Sollen die JMeter Variablen angezeigt 
werden
 displayName=Debug Post-Prozessor
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_fr.properties
 
b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_fr.properties
index e6bee6c68c..77894e9156 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_fr.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_fr.properties
@@ -17,11 +17,11 @@
 
 #Stored by I18NEdit, may be edited!
 displayJMeterProperties.displayName=Propriétés JMeter
-displayJMeterProperties.shortDescription=Afficher les propriétés JMeter ?
+displayJMeterProperties.shortDescription=Afficher les propriétés JMeter
 displayJMeterVariables.displayName=Variables JMeter
-displayJMeterVariables.shortDescription=Afficher les variables JMeter ?
+displayJMeterVariables.shortDescription=Afficher les variables JMeter
 displayName=Post-Processeur Débogage
 displaySamplerProperties.displayName=Propriétés Echantillon
-displaySamplerProperties.shortDescription=Afficher les propriétés Echantillon ?
+displaySamplerProperties.shortDescription=Afficher les propriétés Echantillon
 displaySystemProperties.displayName=Propriétés Système
-displaySystemProperties.shortDescription=Afficher les propriétés systèmes ?
+displaySystemProperties.shortDescription=Afficher les propriétés systèmes
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_ko.properties
 
b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_ko.properties
index ff33df1646..8cd5ca4d62 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_ko.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_ko.properties
@@ -16,11 +16,11 @@
 #
 
 displayJMeterProperties.displayName=JMeter 프로퍼티들
-displayJMeterProperties.shortDescription=JMeter 프로퍼티들을 표시?
+displayJMeterProperties.shortDescription=JMeter 프로퍼티들을 표시
 displayJMeterVariables.displayName=JMeter 변수들
-displayJMeterVariables.shortDescription=JMeter 변수들을 표시?
+displayJMeterVariables.shortDescription=JMeter 변수들을 표시
 displayName=디버그 사후처리기
 displaySamplerProperties.displayName=표본추출기 프로퍼티들
-displaySamplerProperties.shortDescription=표본추출기 프로퍼티들을 표시?
+displaySamplerProperties.shortDescription=표본추출기 프로퍼티들을 표시
 displaySystemProperties.displayName=시스템 프로퍼티들
-displaySystemProperties.shortDescription=시스템 프로퍼티들을 표시?
+displaySystemProperties.shortDescription=시스템 프로퍼티들을 표시
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_pt_BR.properties
 
b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_pt_BR.properties
index 8a4ae4fc9a..f5a13097ba 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_pt_BR.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_pt_BR.properties
@@ -16,11 +16,11 @@
 #
 
 displayJMeterProperties.displayName=Propriedades do JMeter
-displayJMeterProperties.shortDescription=Exibir propriedades do JMeter?
+displayJMeterProperties.shortDescription=Exibir propriedades do JMeter
 displayJMeterVariables.displayName=Variáveis do JMeter
-displayJMeterVariables.shortDescription=Exibir variáveis do JMeter?
+displayJMeterVariables.shortDescription=Exibir variáveis do JMeter
 displayName=Debug Pós-Processador
-displaySamplerProperties.displayName=Propriedades do testador?
-displaySamplerProperties.shortDescription=Exibir propriedades do testador?
+displaySamplerProperties.displayName=Propriedades do testador
+displaySamplerProperties.shortDescription=Exibir propriedades do testador
 displaySystemProperties.displayName=Propriedades do sistema
-displaySystemProperties.shortDescription=Exibir propriedades do sistema?
+displaySystemProperties.shortDescription=Exibir propriedades do sistema
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_tr.properties
 
b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_tr.properties
index e36db1c006..d4c6788729 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_tr.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_tr.properties
@@ -17,11 +17,11 @@
 
 #Stored by I18NEdit, may be edited!
 displayJMeterProperties.displayName=JMeter ayarları
-displayJMeterProperties.shortDescription=JMeter ayarlarını göster ?
+displayJMeterProperties.shortDescription=JMeter ayarlarını göster
 displayJMeterVariables.displayName=JMeter değişkenleri
-displayJMeterVariables.shortDescription=JMeter değişkenlerini göster ?
+displayJMeterVariables.shortDescription=JMeter değişkenlerini göster
 displayName=Ayıklama Son İşlemcisi
 displaySamplerProperties.displayName=Örnekleyicisi ayarları
-displaySamplerProperties.shortDescription=Örnekleyicisi ayarlarını göster ?
+displaySamplerProperties.shortDescription=Örnekleyicisi ayarlarını göster
 displaySystemProperties.displayName=Sistem ayarları
-displaySystemProperties.shortDescription=Sistem ayarlarını göster ?
+displaySystemProperties.shortDescription=Sistem ayarlarını göster
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_zh_CN.properties
 
b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_zh_CN.properties
index 1a18c232c4..8a5601aa43 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_zh_CN.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/extractor/DebugPostProcessorResources_zh_CN.properties
@@ -17,11 +17,11 @@
 
 #Stored by I18NEdit, may be edited!
 displayJMeterProperties.displayName=JMeter 属性
-displayJMeterProperties.shortDescription=显示 JMeter 属性?
+displayJMeterProperties.shortDescription=显示 JMeter 属性
 displayJMeterVariables.displayName=JMeter 变量
-displayJMeterVariables.shortDescription=显示 JMeter 变量?
+displayJMeterVariables.shortDescription=显示 JMeter 变量
 displayName=调试后置处理程序
 displaySamplerProperties.displayName=取样器属性
-displaySamplerProperties.shortDescription=显示取样器属性?
+displaySamplerProperties.shortDescription=显示取样器属性
 displaySystemProperties.displayName=系统属性
-displaySystemProperties.shortDescription=显示系统属性?
+displaySystemProperties.shortDescription=显示系统属性
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources.properties
 
b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources.properties
index 99f2c53e8f..ed234982db 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources.properties
@@ -19,6 +19,6 @@ 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 ?
+displayJMeterVariables.shortDescription=Display JMeter variables
+displayJMeterProperties.shortDescription=Display JMeter properties
+displaySystemProperties.shortDescription=Display System properties
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_de.properties
 
b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_de.properties
index 24236c7fbf..b3bd4fb0e4 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_de.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_de.properties
@@ -16,7 +16,7 @@
 #
 
 displayJMeterProperties.displayName=JMeter Eigenschaften
-displayJMeterProperties.shortDescription=Sollen die JMeter Eigenschaften 
angezeigt werden?
+displayJMeterProperties.shortDescription=JMeter-Eigenschaften anzeigen
 displayJMeterVariables.displayName=JMeter Variablen
 displayJMeterVariables.shortDescription=Sollen die JMeter Variablen angezeigt 
werden
 displayName=Debug Sampler
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_fr.properties
 
b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_fr.properties
index cd6fed09d8..b0feb8d768 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_fr.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_fr.properties
@@ -17,9 +17,9 @@
 
 #Stored by I18NEdit, may be edited!
 displayJMeterProperties.displayName=Propriétés JMeter
-displayJMeterProperties.shortDescription=Afficher les propriétés JMeter ?
+displayJMeterProperties.shortDescription=Afficher les propriétés JMeter
 displayJMeterVariables.displayName=Variables JMeter
-displayJMeterVariables.shortDescription=Afficher les variables JMeter ?
+displayJMeterVariables.shortDescription=Afficher les variables JMeter
 displayName=Echantillon Débogage
 displaySystemProperties.displayName=Propriétés Système
-displaySystemProperties.shortDescription=Afficher les propriétés systèmes ?
+displaySystemProperties.shortDescription=Afficher les propriétés systèmes
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_ko.properties
 
b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_ko.properties
index 3d876349e3..aec06b9c68 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_ko.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_ko.properties
@@ -19,6 +19,6 @@ displayName=디버그 표본추출기
 displayJMeterVariables.displayName=JMeter 변수들
 displayJMeterProperties.displayName=JMeter 프로퍼티들
 displaySystemProperties.displayName=System 프로퍼티들
-displayJMeterVariables.shortDescription=JMeter 변수들을 표시?
-displayJMeterProperties.shortDescription=JMeter 프로퍼티들을 표시?
-displaySystemProperties.shortDescription=시스템 프로퍼티들을 표시?
+displayJMeterVariables.shortDescription=JMeter 변수들을 표시
+displayJMeterProperties.shortDescription=JMeter 프로퍼티들을 표시
+displaySystemProperties.shortDescription=시스템 프로퍼티들을 표시
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_pt_BR.properties
 
b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_pt_BR.properties
index ffbfc6cd93..34248f0294 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_pt_BR.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_pt_BR.properties
@@ -16,9 +16,9 @@
 #
 
 displayJMeterProperties.displayName=Propriedades do JMeter
-displayJMeterProperties.shortDescription=Exibir propriedades do JMeter?
+displayJMeterProperties.shortDescription=Exibir propriedades do JMeter
 displayJMeterVariables.displayName=Variáveis do JMeter
-displayJMeterVariables.shortDescription=Exibir variáveis do JMeter?
+displayJMeterVariables.shortDescription=Exibir variáveis do JMeter
 displayName=Debug testador
 displaySystemProperties.displayName=Propriedades do sistema
-displaySystemProperties.shortDescription=Exibir propriedades do sistema?
+displaySystemProperties.shortDescription=Exibir propriedades do sistema
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_tr.properties
 
b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_tr.properties
index 0d4285e31e..1bee2958d9 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_tr.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_tr.properties
@@ -17,9 +17,9 @@
 
 #Stored by I18NEdit, may be edited!
 displayJMeterProperties.displayName=JMeter ayarları
-displayJMeterProperties.shortDescription=JMeter ayarlarını göster ?
+displayJMeterProperties.shortDescription=JMeter ayarlarını göster
 displayJMeterVariables.displayName=JMeter değişkenleri
-displayJMeterVariables.shortDescription=JMeter değişkenlerini göster ?
+displayJMeterVariables.shortDescription=JMeter değişkenlerini göster
 displayName=Ayıklama Örnekleyicisi
 displaySystemProperties.displayName=Sistem ayarları
-displaySystemProperties.shortDescription=Sistem ayarlarını göster ?
+displaySystemProperties.shortDescription=Sistem ayarlarını göster
diff --git 
a/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_zh_CN.properties
 
b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_zh_CN.properties
index 30eb5df64e..2b9cad4278 100644
--- 
a/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_zh_CN.properties
+++ 
b/src/components/src/main/resources/org/apache/jmeter/sampler/DebugSamplerResources_zh_CN.properties
@@ -17,9 +17,9 @@
 
 #Stored by I18NEdit, may be edited!
 displayJMeterProperties.displayName=JMeter 属性
-displayJMeterProperties.shortDescription=显示 JMeter 属性?
+displayJMeterProperties.shortDescription=显示 JMeter 属性
 displayJMeterVariables.displayName=JMeter 变量
-displayJMeterVariables.shortDescription=显示 JMeter 变量?
+displayJMeterVariables.shortDescription=显示 JMeter 变量
 displayName=调试取样器
 displaySystemProperties.displayName=系统属性
-displaySystemProperties.shortDescription=显示系统属性?
+displaySystemProperties.shortDescription=显示系统属性
diff --git 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
index 23721c4b4c..3137d879e7 100644
--- 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
+++ 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
@@ -46,7 +46,7 @@ aggregate_graph_column_settings=Column settings
 aggregate_graph_columns_to_display=Columns to display\:
 aggregate_graph_dimension=Graph size
 aggregate_graph_display=Display Graph
-aggregate_graph_draw_outlines=Draw outlines bar?
+aggregate_graph_draw_outlines=Draw outlines bar
 aggregate_graph_dynamic_size=Dynamic graph size
 aggregate_graph_font=Font\:
 aggregate_graph_height=Height\:
@@ -60,7 +60,7 @@ aggregate_graph_legend_placement=Placement\:
 aggregate_graph_max_length_xaxis_label=Max length of x-axis label\:
 aggregate_graph_ms=Milliseconds
 aggregate_graph_no_values_to_graph=No values to graph
-aggregate_graph_number_grouping=Show number grouping?
+aggregate_graph_number_grouping=Show number grouping
 aggregate_graph_response_time=Response Time
 aggregate_graph_save=Save Graph
 aggregate_graph_save_table=Save Table Data
@@ -72,10 +72,10 @@ aggregate_graph_tab_graph=Graph
 aggregate_graph_tab_settings=Settings
 aggregate_graph_title=Aggregate Graph
 aggregate_graph_title_group=Title
-aggregate_graph_use_group_name=Include group name in label?
+aggregate_graph_use_group_name=Include group name in label
 aggregate_graph_user_title=Graph title\:
 aggregate_graph_value_font=Value font\:
-aggregate_graph_value_labels_vertical=Value labels vertical?
+aggregate_graph_value_labels_vertical=Value labels vertical
 aggregate_graph_width=Width\:
 aggregate_graph_xaxis_group=X Axis
 aggregate_graph_yaxis_group=Y Axis (milli-seconds)
@@ -138,7 +138,7 @@ attribute=Attribute
 attribute_field=Attribute\:
 attrs=Attributes
 auth_base_url=Base URL
-auth_manager_clear_per_iter=Clear auth on each iteration?
+auth_manager_clear_per_iter=Clear auth on each iteration
 auth_manager_clear_controlled_by_threadgroup=Use Thread Group configuration to 
control clearing
 auth_manager_options=Options
 auth_manager_title=HTTP Authorization Manager
@@ -177,7 +177,7 @@ bsh_script_variables=The following variables are defined 
for the script\:\nSampl
 busy_testing=I'm busy testing, please stop the test before changing settings
 cache_manager_size=Max Number of elements in cache
 cache_manager_title=HTTP Cache Manager
-cache_session_id=Cache Session Id?
+cache_session_id=Cache Session Id
 cache_clear_controlled_by_threadgroup=Use Thread Group configuration to 
control cache clearing
 cancel=Cancel
 cancel_exit_to_save=There are test items that have not been saved. Do you wish 
to save before exiting?
@@ -194,8 +194,8 @@ choose_language=Choose Language
 clear=Clear
 clear_all=Clear All
 clear_cache_each_iteration=Clear cache each iteration
-clear_cache_per_iter=Clear cache each iteration?
-clear_cookies_per_iter=Clear cookies each iteration?
+clear_cache_per_iter=Clear cache each iteration
+clear_cookies_per_iter=Clear cookies each iteration
 clipboard_node_read_error=An error occurred while copying node
 close=Close
 closeconnection=Close connection
@@ -320,7 +320,7 @@ email_results_title=Email Results
 en=English
 enable=Enable
 encode=URL Encode
-encode?=URL Encode?
+encode?=URL Encode
 encoded_value=URL Encoded Value
 entry_dn=Entry DN
 entrydn=Entry DN
@@ -376,17 +376,17 @@ foreach_end_index=End index for loop (inclusive)
 foreach_input=Input variable prefix
 foreach_output=Output variable name
 foreach_start_index=Start index for loop (exclusive)
-foreach_use_separator=Add "_" before number ?
+foreach_use_separator=Add "_" before number
 format=Number format
 fr=French
-ftp_binary_mode=Use Binary mode ?
+ftp_binary_mode=Use Binary mode
 ftp_get=get(RETR)
 ftp_local_file=Local File:
 ftp_local_file_contents=Local File Contents:
 ftp_put=put(STOR)
 ftp_remote_file=Remote File:
 ftp_sample_title=FTP Request Defaults
-ftp_save_response_data=Save File in Response ?
+ftp_save_response_data=Save File in Response
 ftp_testing_title=FTP Request
 function_dialog_menu_item=Function Helper Dialog
 function_helper_dialog_result_warn=If function uses variables or a running 
context, results will not reflect reality
@@ -483,8 +483,8 @@ httpmirror_settings=Settings
 httpmirror_title=HTTP Mirror Server
 id_prefix=ID Prefix
 id_suffix=ID Suffix
-if_controller_evaluate_all=Evaluate for all children?
-if_controller_expression=Interpret Condition as Variable Expression?
+if_controller_evaluate_all=Evaluate for all children
+if_controller_expression=Interpret Condition as Variable Expression
 if_controller_expression_label=Expression (must evaluate to true or false)
 if_controller_label=Condition (evaluated with javascript)
 if_controller_use_last_sample_ok=Use status of last sample
@@ -494,7 +494,7 @@ if_controller_warning=<html>For performance it is advised 
to check "Interpret Co
 ignore_subcontrollers=Ignore sub-controller blocks
 import_curl=Import from cURL
 include_controller=Include Controller
-include_equals=Include Equals?
+include_equals=Include Equals
 include_path=Include Test Plan
 increment=Increment
 infinite=Infinite
@@ -573,7 +573,7 @@ jms_sample_title=JMS Default Request
 jms_selector=JMS Selector
 jms_send_queue=JNDI name Request queue
 jms_separator=Separator
-jms_stop_between_samples=Stop between samples?
+jms_stop_between_samples=Stop between samples
 jms_store_response=Store Response
 jms_subscriber_on_message=Use MessageListener.onMessage()
 jms_subscriber_receive=Use MessageConsumer.receive()
@@ -583,9 +583,9 @@ jms_text_area=Text Message or Object Message serialized to 
XML by XStream
 jms_text_message=Text Message
 jms_timeout=Timeout (ms)
 jms_topic=Destination
-jms_use_auth=Use Authorization?
+jms_use_auth=Use Authorization
 jms_use_file=From file
-jms_use_non_persistent_delivery=Use non-persistent delivery mode?
+jms_use_non_persistent_delivery=Use non-persistent delivery mode
 jms_use_properties_file=Use jndi.properties file
 jms_use_random_file=Random File from folder specified below
 jms_use_req_msgid_as_correlid=Use Request Message Id
@@ -666,13 +666,13 @@ action_check_title=Test Running
 laf_quit_after_change=Changing LAF requires a restart to work correctly. Click 
yes to exit JMeter.
 ldap_argument_list=LDAPArgument List
 ldap_connto=Connection timeout (in milliseconds)
-ldap_parse_results=Parse the search results ?
+ldap_parse_results=Parse the search results
 ldap_sample_title=LDAP Request Defaults
 ldap_search_baseobject=Perform baseobject search
 ldap_search_onelevel=Perform onelevel search
 ldap_search_subtree=Perform subtree search
-ldap_secure=Use Secure LDAP Protocol ?
-ldap_trust_all=Trust All Certificates ?
+ldap_secure=Use Secure LDAP Protocol
+ldap_trust_all=Trust All Certificates
 ldap_testing_title=LDAP Request
 ldapext_sample_title=LDAP Extended Request Defaults
 ldapext_testing_title=LDAP Extended Request
@@ -998,7 +998,7 @@ reportgenerator_summary_statistics_throughput=Transactions/s
 reportgenerator_summary_total=Total
 request_data=Request Data
 reset=Reset
-response_save_as_md5=Save response as MD5 hash?
+response_save_as_md5=Save response as MD5 hash
 response_time_distribution_satisfied_label=Requests having \nresponse time <= 
{0}ms
 response_time_distribution_tolerated_label= Requests having \nresponse time > 
{0}ms and <= {1}ms
 response_time_distribution_untolerated_label=Requests having \nresponse time > 
{0}ms
@@ -1182,7 +1182,7 @@ smtp_bcc=Address To BCC:
 smtp_cc=Address To CC:
 smtp_default_port=(Defaults: SMTP:25, SSL:465, StartTLS:587)
 smtp_eml=Send .eml:
-smtp_enabledebug=Enable debug logging?
+smtp_enabledebug=Enable debug logging
 smtp_enforcestarttls=Enforce StartTLS
 smtp_enforcestarttls_tooltip=<html><b>Enforces</b> the server to use 
StartTLS.<br />If not selected and the SMTP-Server doesn't support StartTLS, 
<br />a normal SMTP-Connection will be used as fallback instead. <br 
/><i>Please note</i> that this checkbox creates a file in "/tmp/", <br />so 
this will cause problems under windows.</html>
 smtp_from=Address From:
@@ -1401,8 +1401,8 @@ view_graph_tree_title=View Graph Tree
 view_results_assertion_error=Assertion error:
 view_results_assertion_failure=Assertion failure:
 view_results_assertion_failure_message=Assertion failure message:
-view_results_autoscroll=Scroll automatically?
-view_results_childsamples=Child samples?
+view_results_autoscroll=Scroll automatically
+view_results_childsamples=Child samples
 view_results_datatype=Data type ("text"|"bin"|""):
 view_results_desc=Shows the text results of sampling in tree form
 view_results_error_count=Error Count:
@@ -1517,7 +1517,7 @@ xpath_assertion_valid=Valid XPath Expression
 xpath_assertion_validation=Validate the XML against the DTD
 xpath_assertion_whitespace=Ignore whitespace
 xpath_expression=XPath expression to match against
-xpath_extractor_fragment=Return entire XPath fragment instead of text content?
+xpath_extractor_fragment=Return entire XPath fragment instead of text content
 xpath_extractor_query=XPath query:
 xpath_extractor_user_namespaces=<html>Namespaces aliases list <br>(prefix=full 
namespace, 1 per line) :</html>
 xpath_extractor_title=XPath Extractor
@@ -1532,7 +1532,7 @@ xpath2_tester=XPath2 Tester
 xpath_namespaces=Show namespaces aliases
 xpath_tester_button_test=Test
 xpath_tester_field=XPath query \:
-xpath_tester_fragment=Return entire XPath fragment instead of text content?
+xpath_tester_fragment=Return entire XPath fragment instead of text content
 xpath_tester_no_text=Data response result isn't text.
 xpath_tester_title=XPath Tester
 xpath_tidy_quiet=Quiet
diff --git 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_de.properties
 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_de.properties
index f7ebe01ce3..f127867011 100644
--- 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_de.properties
+++ 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_de.properties
@@ -85,7 +85,7 @@ bsh_script=Script (untenstehende Variablen sind definiert)
 bsh_script_file=Script-Datei
 bsh_script_variables=Folgende Variablen wurden für das Script 
definiert\:\nSampleResult, ResponseCode, ResponseMessage, IsSuccess, Label, 
FileName, ctx, vars, props, log
 busy_testing=Ich bin mit dem Testen beschäftigt, bitte stoppen sie den Test 
bevor sie die Einstellungen ändern.
-cache_session_id=Session ID zwischenspeichern?
+cache_session_id=Session ID zwischenspeichern
 cancel=Abbrechen
 cancel_exit_to_save=Es gibt Tests die noch nicht gespeichert wurden. Möchten 
sie diese vor dem Beenden speichern?
 cancel_new_to_save=Es gibt Tests die noch nicht gespeichert wurden. Möchten 
sie diese vor dem Bereinigen speichern?
@@ -94,7 +94,7 @@ choose_function=Wählen Sie eine Funktion
 choose_language=Wählen sie eine Sprache
 clear=Löschen
 clear_all=Alle Löschen
-clear_cookies_per_iter=Cookies bei jedem Durchgang löschen?
+clear_cookies_per_iter=Cookies bei jedem Durchgang löschen
 column_delete_disallowed=Das löschen dieser Spalte ist nicht erlaubt
 column_number=Spaltennummer der CSV Datei file | next | *alias
 compare=Vergleichen
@@ -153,7 +153,7 @@ edit=Bearbeiten
 email_results_title=Ergebnisse per eMail verschicken
 en=Englisch
 enable=Aktivieren
-encode?=Encodieren?
+encode?=Encodieren
 encoded_value=URL-Encodierter Wert
 entry_dn=Ausgangs DN
 entrydn=Ausgangs DN
@@ -188,14 +188,14 @@ follow_redirects=Folge Redirects
 follow_redirects_auto=Automatisch Redirects folgen
 foreach_input=Prefix der Eingabe-Variable
 foreach_output=Name der Ausgabe-Variable
-foreach_use_separator=Trennzeichen "_" vor jeder Nummer einfügen?
+foreach_use_separator=Trennzeichen "_" vor jeder Nummer einfügen
 format=Zahlenformat
 fr=Französisch
-ftp_binary_mode=Binär-Modus verwenden?
+ftp_binary_mode=Binär-Modus verwenden
 ftp_local_file=Lokale Datei\:
 ftp_remote_file=Entfernte Datei
 ftp_sample_title=Vorgaben zum FTP Request
-ftp_save_response_data=Datei in Antwort speichern?
+ftp_save_response_data=Datei in Antwort speichern
 ftp_testing_title=FTP Anfrage
 function_dialog_menu_item=Funktions Hilfe-Dialog
 function_helper_title=Funktions Hilfe
@@ -238,13 +238,13 @@ html_assertion_title=Titel des HTML Bericht
 http_url_rewriting_modifier_title=HTTP URL Re-writing Bezeichner
 http_user_parameter_modifier=HTTP User Parameter Bezeichner
 httpmirror_title=HTTP Spiegel
-if_controller_evaluate_all=Für alle Unterelemente auswerten?
+if_controller_evaluate_all=Für alle Unterelemente auswerten
 if_controller_label=Bedingung (Javascript)
 if_controller_title=If-Controller
 ignore_subcontrollers=Ignoriere Sub-Controller Blöcke
 include_controller=Controller einschließen
-include_equals=Gleichheitszeichen mit einbeziehen?
-include_path=Test-Plan mit einbeziehen?
+include_equals=Gleichheitszeichen mit einbeziehen
+include_path=Test-Plan mit einbeziehen
 increment=Zunahme
 infinite=endlos Wiederholen
 insert_after=Dahinter einfügen
diff --git 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_es.properties
 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_es.properties
index 47642121ba..8fe4fb5a53 100644
--- 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_es.properties
+++ 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_es.properties
@@ -36,7 +36,7 @@ aggregate_graph_save=Guardar gráfico
 aggregate_graph_save_table=Guardar la tabla de datos
 aggregate_graph_save_table_header=Guardar la cabecera de la tabla
 aggregate_graph_title=Gráfico
-aggregate_graph_use_group_name=¿Incluir el nombre del grupo en la etiqueta?
+aggregate_graph_use_group_name=Incluir el nombre del grupo en la etiqueta
 aggregate_graph_user_title=Título del gráfico
 aggregate_graph_width=Anchura
 aggregate_report=Informe Agregado
@@ -102,7 +102,7 @@ bsh_script_reset_interpreter=Resetear el intérprete bsh 
antes de cada llamada
 bsh_script_variables=Las siguientes variables están definidas para el 
script\:\nSampleResult, ResponseCode, ResponseMessage, IsSuccess, Label, 
FileName, ctx, vars, props, log
 busy_testing=Estoy ocupado probando, por favor pare el test antes de cambiar 
la configuración
 cache_manager_title=Gestionador de la Caché HTTP
-cache_session_id=¿Identificador de la sesión de caché?
+cache_session_id=Identificador de la sesión de caché
 cancel=Cancelar
 cancel_exit_to_save=¿Hay elementos de prueba que no han sido salvados. ¿Quiere 
salvar antes de salir?
 cancel_new_to_save=¿Hay elementos del test que no han sido salvados. ¿Quiere 
salvar antes de limpiar el plan de pruebas?
@@ -112,8 +112,8 @@ choose_function=Elija una función
 choose_language=Elija lenguaje
 clear=Limpiar
 clear_all=Limpiar Todo
-clear_cache_per_iter=¿Limpiar la caché en cada iteración?
-clear_cookies_per_iter=¿Limpiar las cookies en cada iteración?
+clear_cache_per_iter=Limpiar la caché en cada iteración
+clear_cookies_per_iter=Limpiar las cookies en cada iteración
 column_delete_disallowed=Borrar esta columna no está permitido
 column_number=Número de columna del archivo CSV | siguiente | *alias
 compare=Comparar
@@ -183,7 +183,7 @@ edit=Editar
 email_results_title=Resultados del Email
 en=Inglés
 enable=Habilitar
-encode?=¿Codificar?
+encode?=Codificar
 encoded_value=Valor de URL Codificada
 entry_dn=Introduzca DN
 entrydn=Introduzca DN
@@ -220,17 +220,17 @@ follow_redirects_auto=Redirigir Automáticamente
 foreach_controller_title=Controlador ForEach
 foreach_input=Prefijo de variable de entrada
 foreach_output=Nombre de variable de salida
-foreach_use_separator=¿Añadir "_" antes de número?
+foreach_use_separator=Añadir "_" antes de número
 format=Formato del número
 fr=Francés
-ftp_binary_mode=¿Usar modo binario?
+ftp_binary_mode=Usar modo binario
 ftp_get=get(RETR)
 ftp_local_file=Fichero local\:
 ftp_local_file_contents=Contenidos del fichero local\:
 ftp_put=put(STOR)
 ftp_remote_file=Fichero remoto\:
 ftp_sample_title=Valores por defecto para petición FTP
-ftp_save_response_data=¿Guardar fichero en la respuesta?
+ftp_save_response_data=Guardar fichero en la respuesta
 ftp_testing_title=Petición FTP
 function_dialog_menu_item=Diálogo de Ayuda de Función
 function_helper_title=Ayuda de Función
@@ -279,13 +279,13 @@ http_user_parameter_modifier=Modificador de Parámetro de 
Usuario HTTP
 httpmirror_title=Servidor espejo HTTP
 id_prefix=Prefijo ID
 id_suffix=Sufijo ID
-if_controller_evaluate_all=¿Evaluar para todos los hijos?
-if_controller_expression=¿Interpretar la condición como una variable de 
expresión?
+if_controller_evaluate_all=Evaluar para todos los hijos
+if_controller_expression=Interpretar la condición como una variable de 
expresión
 if_controller_label=Condición
 if_controller_title=Controlador If
 ignore_subcontrollers=Ignorar bloques sub-controladores
 include_controller=Incluir Controlador
-include_equals=¿Incluir Equals?
+include_equals=Incluir Equals
 include_path=Incluir Plan de Pruebas
 increment=Incrementar
 infinite=Sin fín
@@ -346,7 +346,7 @@ jms_request=Sólo Petición
 jms_requestreply=Respuesta a Petición
 jms_sample_title=Petición JMS por defecto
 jms_send_queue=Nombre JNDI Cola Petición
-jms_stop_between_samples=¿Parar entre muestras?
+jms_stop_between_samples=Parar entre muestras
 jms_store_response=Guarde la respuesta
 jms_subscriber_on_message=Utilizar MessageListener.onMessage()
 jms_subscriber_receive=Utilizar TopicSubscriber.receive()
@@ -355,9 +355,9 @@ jms_testing_title=Petición Mensajería
 jms_text_message=Mensaje Texto
 jms_timeout=Timeout (milisegundos)
 jms_topic=Tópico
-jms_use_auth=¿Usar Autorización?
+jms_use_auth=Usar Autorización
 jms_use_file=Desde archivo
-jms_use_non_persistent_delivery=¿Usar modo de entrega no persistente?
+jms_use_non_persistent_delivery=Usar modo de entrega no persistente
 jms_use_properties_file=Utilizar archivo jndi.properties
 jms_use_random_file=Archivo Aleatorio
 jms_use_req_msgid_as_correlid=Usar el identificador del mensaje Request
@@ -403,13 +403,13 @@ junit_test_config=Parámetros del test JUnit
 junit_test_method=Método de Test
 ldap_argument_list=Lista de LDAPArgument
 ldap_connto=Timeout de conexión (en milisegundos)
-ldap_parse_results=¿Parsear los resultados de la búsqueda?
+ldap_parse_results=Parsear los resultados de la búsqueda
 ldap_sample_title=Valores por defecto Petición LDAP
 ldap_search_baseobject=Realizar la búsqueda 'baseobject'
 ldap_search_onelevel=Realizar la búsqueda 'onelevel'
 ldap_search_subtree=Realizar la búsqueda 'subtree'
-ldap_secure=Usar el Protocolo LDAP Seguro?
-ldap_trust_all=Confíe en todos los certificados?
+ldap_secure=Usar el Protocolo LDAP Seguro
+ldap_trust_all=Confíe en todos los certificados
 ldap_testing_title=Petición LDAP
 ldapext_sample_title=Valores por defecto Petición Extendidad LDAP
 ldapext_testing_title=Petición Extendida LDAP
@@ -613,7 +613,7 @@ report_table=Tabla de informe
 report_writer=Escritor del reporte
 report_writer_html=Escritor HTML del reporte
 request_data=Pedir Datos
-response_save_as_md5=¿Guardar la respuesta como MD5 hash?
+response_save_as_md5=Guardar la respuesta como MD5 hash
 restart=Rearranque
 resultaction_title=Manejador de Acción para Status de Resultados
 resultsaver_errors=Guardar Respuestas Fallidas Solamente
@@ -745,7 +745,7 @@ smtp_bcc=Direcciones en copia oculta (BCC)\:
 smtp_cc=Direcciones en copia(CC)\:
 smtp_default_port=(Por defecto\: SMTP\:25, SSL\:465, StartTLS\:587)
 smtp_eml=Enviar .eml\:
-smtp_enabledebug=¿Activar las trazas de depuración?
+smtp_enabledebug=Activar las trazas de depuración
 smtp_enforcestarttls=Imponer StartTLS
 smtp_enforcestarttls_tooltip=<html><b>Forza</b> al servidor a usar 
StartTLS.<br />Si no es seleccionado el servidor SMTP no soporta  StartTLS, <br 
/>una conexión normal SMTP será usada como reserva. <br /><i>Por favor 
advierta</i> que este objeto crea un fichero en "/tmp/", <br />so Esto causará 
problemas bajo Windows.</html>
 smtp_from=Dirección Desde\:
@@ -992,7 +992,7 @@ xpath_assertion_valid=Expresión XPath Válida
 xpath_assertion_validation=Validar el XML contra el DTD
 xpath_assertion_whitespace=Ignorar espacios
 xpath_expression=Expresión XPath contra la que comparar
-xpath_extractor_fragment=¿Retornar el fragmento XPATH en el caso de contenido 
de texto?
+xpath_extractor_fragment=Retornar el fragmento XPATH en el caso de contenido 
de texto
 xpath_extractor_query=Consulta XPath\:
 xpath_extractor_title=Extractor XPath
 xpath_file_file_name=Archivo XML del que obtener valores
diff --git 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
index ed0f7be54d..044d7ba835 100644
--- 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
+++ 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
@@ -42,7 +42,7 @@ aggregate_graph_column_settings=Paramètres colonne
 aggregate_graph_columns_to_display=Colonnes à afficher \:
 aggregate_graph_dimension=Taille graphique
 aggregate_graph_display=Générer le graphique
-aggregate_graph_draw_outlines=Bordure de barre ?
+aggregate_graph_draw_outlines=Bordure de barre
 aggregate_graph_dynamic_size=Taille de graphique dynamique
 aggregate_graph_font=Police \:
 aggregate_graph_height=Hauteur \:
@@ -56,7 +56,7 @@ aggregate_graph_legend_placement=Position \:
 aggregate_graph_max_length_xaxis_label=Longueur maximum du libellé de l'axe 
des abscisses \:
 aggregate_graph_ms=Millisecondes
 aggregate_graph_no_values_to_graph=Pas de valeurs pour le graphique
-aggregate_graph_number_grouping=Séparateur de milliers ?
+aggregate_graph_number_grouping=Séparateur de milliers
 aggregate_graph_response_time=Temps de réponse
 aggregate_graph_save=Enregistrer le graphique
 aggregate_graph_save_table=Enregistrer le tableau de données
@@ -71,7 +71,7 @@ aggregate_graph_title_group=Titre
 aggregate_graph_use_group_name=Ajouter le nom du groupe aux libellés
 aggregate_graph_user_title=Titre du graphique \:
 aggregate_graph_value_font=Police de la valeur \:
-aggregate_graph_value_labels_vertical=Libellé de valeurs vertical ?
+aggregate_graph_value_labels_vertical=Libellé de valeurs vertical
 aggregate_graph_width=Largeur \:
 aggregate_graph_xaxis_group=Abscisses
 aggregate_graph_yaxis_group=Ordonnées (milli-secondes)
@@ -133,7 +133,7 @@ attribute=Attribut \:
 attribute_field=Attribut \:
 attrs=Attributs
 auth_base_url=URL de base
-auth_manager_clear_per_iter=Réauthentifier à chaque itération ?
+auth_manager_clear_per_iter=Réauthentifier à chaque itération
 auth_manager_clear_controlled_by_threadgroup=Utiliser la configuration du 
groupe de threads pour contrôler la Réauthentification
 auth_manager_options=Options
 auth_manager_title=Gestionnaire d'autorisation HTTP
@@ -172,7 +172,7 @@ bsh_script_variables=Les variables suivantes sont définies 
pour le script \:\nS
 busy_testing=Je suis occupé à tester, veuillez arrêter le test avant de 
changer le paramètrage
 cache_manager_size=Nombre maximum d'éléments dans le cache
 cache_manager_title=Gestionnaire de cache HTTP
-cache_session_id=Identifiant de session de cache ?
+cache_session_id=Identifiant de session de cache
 cache_clear_controlled_by_threadgroup=Utiliser thread group pour contrôler 
l'effacement de cache
 cancel=Annuler
 cancel_exit_to_save=Il y a des éléments qui n'ont pas été sauvés. Voulez-vous 
enregistrer avant de sortir ?
@@ -188,9 +188,9 @@ choose_function=Choisir une fonction
 choose_language=Choisir une langue
 clear=Nettoyer
 clear_all=Nettoyer tout
-clear_cache_each_iteration=Vider le cache à chaque itération ?
-clear_cache_per_iter=Nettoyer le cache à chaque itération ?
-clear_cookies_per_iter=Nettoyer les cookies à chaque itération ?
+clear_cache_each_iteration=Vider le cache à chaque itération
+clear_cache_per_iter=Nettoyer le cache à chaque itération
+clear_cookies_per_iter=Nettoyer les cookies à chaque itération
 clipboard_node_read_error=Une erreur est survenue lors de la copie du noeud
 close=Fermer
 closeconnection=Fermer la connexion
@@ -370,17 +370,17 @@ foreach_end_index=Indice de fin de la boucle (inclus)
 foreach_input=Préfixe de la variable d'entrée \:
 foreach_output=Nom de la variable de sortie \:
 foreach_start_index=Indice de début de la boucle(exclus)
-foreach_use_separator=Ajouter un souligné "_" avant le nombre ?
+foreach_use_separator=Ajouter un souligné "_" avant le nombre
 format=Format du nombre \:
 fr=Français
-ftp_binary_mode=Utiliser le mode binaire ?
+ftp_binary_mode=Utiliser le mode binaire
 ftp_get=Récupérer (get)
 ftp_local_file=Fichier local \:
 ftp_local_file_contents=Contenus fichier local \:
 ftp_put=Déposer (put)
 ftp_remote_file=Fichier distant \:
 ftp_sample_title=Paramètres FTP par défaut
-ftp_save_response_data=Enregistrer le fichier dans la réponse ?
+ftp_save_response_data=Enregistrer le fichier dans la réponse
 ftp_testing_title=Requête FTP
 function_dialog_menu_item=Assistant de fonctions
 function_helper_dialog_result_warn=Si la fonction utilise des variables ou le 
contexte d'exécution, le résultat affiché ne reflète pas la réalité
@@ -477,7 +477,7 @@ httpmirror_settings=Paramètres
 httpmirror_title=Serveur HTTP miroir
 id_prefix=Préfixe d'ID
 id_suffix=Suffixe d'ID
-if_controller_evaluate_all=Evaluer pour tous les fils ?
+if_controller_evaluate_all=Evaluer pour tous les fils
 if_controller_expression=Interpréter la condition comme une expression
 if_controller_expression_label=Expression (doit contenir true ou false)
 if_controller_label=Condition (évalué en Javascript) \:
@@ -488,7 +488,7 @@ if_controller_warning=<html>Pour les performances il est 
conseillé de cocher  "
 ignore_subcontrollers=Ignorer les sous-blocs de contrôleurs
 import_curl=Importer de cURL
 include_controller=Contrôleur Inclusion
-include_equals=Inclure égal ?
+include_equals=Inclure égal
 include_path=Plan de test à inclure
 increment=Incrément \:
 infinite=Infini
@@ -567,7 +567,7 @@ jms_sample_title=Requête JMS par défaut
 jms_selector=Sélecteur JMS
 jms_send_queue=Nom JNDI de la file d'attente Request
 jms_separator=Séparateur
-jms_stop_between_samples=Arrêter entre les échantillons ?
+jms_stop_between_samples=Arrêter entre les échantillons
 jms_store_response=Stocker la réponse
 jms_subscriber_on_message=Utiliser MessageListener.onMessage()
 jms_subscriber_receive=Utiliser MessageConsumer.receive()
@@ -577,9 +577,9 @@ jms_text_area=Message texte ou Message Objet sérialisé en 
XML par XStream
 jms_text_message=Message texte
 jms_timeout=Délai (ms)
 jms_topic=Destination
-jms_use_auth=Utiliser l'authentification ?
+jms_use_auth=Utiliser l'authentification
 jms_use_file=Depuis un fichier
-jms_use_non_persistent_delivery=Utiliser un mode de livraison non persistant ?
+jms_use_non_persistent_delivery=Utiliser un mode de livraison non persistant
 jms_use_properties_file=Utiliser le fichier jndi.properties
 jms_use_random_file=Fichier aléatoire
 jms_use_req_msgid_as_correlid=Utiliser l'ID du message Request
@@ -655,13 +655,13 @@ ko=Coréenne
 laf_quit_after_change=Changer de LAF nécessite un redémarrage pour fonctionner 
correctement. Cliquez sur oui pour quitter JMeter.
 ldap_argument_list=Liste d'arguments LDAP
 ldap_connto=Délai d'attente de connexion (millisecondes)
-ldap_parse_results=Examiner les résultats de recherche ?
+ldap_parse_results=Examiner les résultats de recherche
 ldap_sample_title=Requête LDAP par défaut
 ldap_search_baseobject=Effectuer une recherche 'baseobject'
 ldap_search_onelevel=Effectuer une recherche 'onelevel'
 ldap_search_subtree=Effectuer une recherche 'subtree'
-ldap_secure=Utiliser le protocole LDAP sécurisé (ldaps) ?
-ldap_trust_all=Faire confiance à tous les certificats ?
+ldap_secure=Utiliser le protocole LDAP sécurisé (ldaps)
+ldap_trust_all=Faire confiance à tous les certificats
 ldap_testing_title=Requête LDAP
 ldapext_sample_title=Requête LDAP étendue par défaut
 ldapext_testing_title=Requête LDAP étendue
@@ -865,7 +865,7 @@ proxy_general_settings=Paramètres généraux
 proxy_headers=Capturer les entêtes HTTP
 proxy_pause_http_sampler=Créer une nouvelle transaction après la requête (ms) 
\:
 proxy_recorder_dialog=Enregistreur\: Contrôle des transactions
-proxy_regex=Correspondance des variables par regex ?
+proxy_regex=Correspondance des variables par regex
 proxy_sampler_graphql_settings=Configuration de la requête GraphQL
 proxy_sampler_settings=Paramètres Echantillon HTTP
 proxy_sampler_type=Type \:
@@ -1171,7 +1171,7 @@ smtp_bcc=Adresse en copie cachée (Bcc) \:
 smtp_cc=Adresse en copie (CC) \:
 smtp_default_port=(Défauts \: SMTP \: 25, SSL \: 465, StartTLS \: 587)
 smtp_eml=Envoyer un message .eml \:
-smtp_enabledebug=Activer les traces de débogage ?
+smtp_enabledebug=Activer les traces de débogage
 smtp_enforcestarttls=Forcer le StartTLS
 smtp_enforcestarttls_tooltip=<html><b>Force</b> le serveur a utiliser 
StartTLS.<br />Si il n'est pas sélectionné et que le serveur SMTP ne supporte 
pas StartTLS, <br />une connexion SMTP normale sera utilisée à la place. <br 
/><i>Merci de noter</i> que la case à cocher créée un fichier dans /tmp/, <br 
/>donc cela peut poser des problèmes sous Windows.</html>
 smtp_from=Adresse expéditeur (From) \:
@@ -1390,8 +1390,8 @@ view_graph_tree_title=Voir le graphique en arbre
 view_results_assertion_error=Erreur d'assertion \:
 view_results_assertion_failure=Echec d'assertion \:
 view_results_assertion_failure_message=Message d'échec d'assertion \:
-view_results_autoscroll=Défilement automatique ?
-view_results_childsamples=Echantillons enfants?
+view_results_autoscroll=Défilement automatique
+view_results_childsamples=Echantillons enfants
 view_results_connect_time=Temps établissement connexion \:
 view_results_datatype=Type de données ("text"|"bin"|"")\:
 view_results_desc=Affiche les résultats d'un échantillon dans un arbre de 
résultats
@@ -1521,7 +1521,7 @@ xpath2_tester=Testeur XPath2
 xpath_namespaces=Voir alias namespaces
 xpath_tester_button_test=Tester
 xpath_tester_field=Expression XPath
-xpath_tester_fragment=Retourner le fragment XPath entier au lieu du contenu ?
+xpath_tester_fragment=Retourner le fragment XPath entier au lieu du contenu
 xpath_tester_no_text=Les données de réponse ne sont pas du texte.
 xpath_tester_title=Testeur XPath
 xpath_tidy_quiet=Silencieux
diff --git 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_ja.properties
 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_ja.properties
index 2af6236635..561489d9e2 100644
--- 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_ja.properties
+++ 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_ja.properties
@@ -70,7 +70,7 @@ choose_function=関数の選択
 choose_language=言語の選択
 clear=消去
 clear_all=全て消去
-clear_cookies_per_iter=繰り返しごとにクッキーを破棄しますか?
+clear_cookies_per_iter=繰り返しごとにクッキーを破棄
 column_delete_disallowed=このカラムの削除権限がありません
 column_number=CSVファイルのカラム番号
 config_element=設定エレメント
@@ -184,7 +184,7 @@ id_suffix=ID 接尾辞
 if_controller_label=条件
 if_controller_title=If コントローラ
 ignore_subcontrollers=サブコントローラブロックを無視
-include_equals=等号含む?
+include_equals=等号含む
 increment=増分
 infinite=無限ループ
 insert_after=後へ挿入
diff --git 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_ko.properties
 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_ko.properties
index 4d337f1d16..8b963980d2 100644
--- 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_ko.properties
+++ 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_ko.properties
@@ -46,7 +46,7 @@ aggregate_graph_column_settings=컬럼 설정
 aggregate_graph_columns_to_display=표시할 컬럼들\:
 aggregate_graph_dimension=그래프 크기
 aggregate_graph_display=그래프 보기
-aggregate_graph_draw_outlines=윤곽선 표시?
+aggregate_graph_draw_outlines=윤곽선 표시
 aggregate_graph_dynamic_size=동적 그래프 크기
 aggregate_graph_font=글꼴\:
 aggregate_graph_height=높이\:
@@ -60,7 +60,7 @@ aggregate_graph_legend_placement=위치\:
 aggregate_graph_max_length_xaxis_label=X축 라벨 최대 길이\:
 aggregate_graph_ms=밀리초
 aggregate_graph_no_values_to_graph=그래프로 표시할 값들이 없습니다.
-aggregate_graph_number_grouping=Y축에 숫자 그룹 표시?
+aggregate_graph_number_grouping=Y축에 숫자 그룹 표시
 aggregate_graph_response_time=응답 시간
 aggregate_graph_save=그래프 저장
 aggregate_graph_save_table=테이블 데이터 저장
@@ -72,10 +72,10 @@ aggregate_graph_tab_graph=그래프
 aggregate_graph_tab_settings=설정
 aggregate_graph_title=총합 그래프
 aggregate_graph_title_group=제목
-aggregate_graph_use_group_name=그룹 이름을 라벨에 포함?
+aggregate_graph_use_group_name=그룹 이름을 라벨에 포함
 aggregate_graph_user_title=그래프 제목\:
 aggregate_graph_value_font=값 표시 글꼴\:
-aggregate_graph_value_labels_vertical=값의 라벨을 수직 방향으로 표시?
+aggregate_graph_value_labels_vertical=값의 라벨을 수직 방향으로 표시
 aggregate_graph_width=폭\:
 aggregate_graph_xaxis_group=X축
 aggregate_graph_yaxis_group=Y축 (밀리초)
@@ -138,7 +138,7 @@ attribute=속성
 attribute_field=속성\:
 attrs=속성들
 auth_base_url=Base URL
-auth_manager_clear_per_iter=각 반복 실행 시마다 인증 정보 초기화?
+auth_manager_clear_per_iter=각 반복 실행 시마다 인증 정보 초기화
 auth_manager_clear_controlled_by_threadgroup=쓰레드 그룹 설정을 인증 정보 초기화 설정을 위해 사용
 auth_manager_options=옵션들
 auth_manager_title=HTTP 인증 관리자
@@ -177,7 +177,7 @@ bsh_script_variables=해당 스크립트를 위해 아래 변수들이 정의되
 busy_testing=현재 테스트 중입니다. 설정을 변경하시기 전에 테스트를 중지시키십시오.
 cache_manager_size=캐시에 저장할 최대 개수
 cache_manager_title=HTTP 캐시 관리자
-cache_session_id=세션 ID를 캐시에 저장?
+cache_session_id=세션 ID를 캐시에 저장
 cache_clear_controlled_by_threadgroup=쓰레드 그룹 설정을 캐시 초기화 설정을 위해 사용
 cancel=취소
 cancel_exit_to_save=아직 저장되지 않은 테스트 항목들이 있습니다. 종료하시기 전에 먼저 저장하겠습니까?
@@ -194,8 +194,8 @@ choose_language=언어 선택
 clear=초기화
 clear_all=모두 초기화
 clear_cache_each_iteration=각 반복 실행 시마다 캐시 초기화
-clear_cache_per_iter=각 반복 실행 시마다 캐시 초기화?
-clear_cookies_per_iter=각 반복 실행 시마다 쿠키 초기화?
+clear_cache_per_iter=각 반복 실행 시마다 캐시 초기화
+clear_cookies_per_iter=각 반복 실행 시마다 쿠키 초기화
 clipboard_node_read_error=노드를 복사하는 중 오류 발생
 close=닫기
 closeconnection=연결 닫기
@@ -318,7 +318,7 @@ email_results_title=결과들을 전자우편으로 보내기
 en=영어
 enable=활성화
 encode=URL 인코드
-encode?=URL 인코드?
+encode?=URL 인코드
 encoded_value=URL 인코딩된 값
 entry_dn=엔트리 식별 이름 (DN)
 entrydn=엔트리 식별 이름 (DN)
@@ -374,17 +374,17 @@ foreach_end_index=루프에서 마지막 인덱스 (루프 처리 시 마지막
 foreach_input=입력 변수 접두어
 foreach_output=출력 변수 이름
 foreach_start_index=루프에서 시작 인덱스 (루프 처리 시 시작 인덱스는 포함안됨)
-foreach_use_separator=숫자 앞에 "_" 를 추가?
+foreach_use_separator=숫자 앞에 "_" 를 추가
 format=숫자 포맷
 fr=프랑스어
-ftp_binary_mode=바이너리 모드 사용?
+ftp_binary_mode=바이너리 모드 사용
 ftp_get=get(RETR)
 ftp_local_file=로컬 파일\:
 ftp_local_file_contents=로컬 파일 내용\:
 ftp_put=put(STOR)
 ftp_remote_file=원격 파일\:
 ftp_sample_title=FTP 요청 기본 설정
-ftp_save_response_data=응답 데이터에 포함된 파일 저장?
+ftp_save_response_data=응답 데이터에 포함된 파일 저장
 ftp_testing_title=FTP 요청
 function_dialog_menu_item=함수 도우미 다이얼로그
 function_helper_dialog_result_warn=만일 함수가 변수들이나 실행 중인 컨텍스트를 사용하면, 결과가 실제를 반영하지 
않을 수 있습니다.
@@ -481,7 +481,7 @@ httpmirror_settings=설정
 httpmirror_title=HTTP 미러 서버
 id_prefix=ID 접두어
 id_suffix=ID 접미어
-if_controller_evaluate_all=모든 자식들을 위해 표현식을 실행하시겠습니까?
+if_controller_evaluate_all=모든 자식들을 위해 표현식을 실행
 if_controller_expression=Boolean 값을 반환하는 하나의 변수 표현식으로서 실행
 if_controller_expression_label=표현식 (반드시 true 또는 false로 구해져야 함)
 if_controller_label=조건 (자바스크립트 실행)
@@ -492,7 +492,7 @@ if_controller_warning=<html>성능을 위해서, "Boolean 값을 반환하는 
 ignore_subcontrollers=하위 컨트롤러 블럭들을 무시
 import_curl=cURL로부터 읽어 오기
 include_controller=Include 컨트롤러
-include_equals=Include Equals?
+include_equals=Include Equals
 include_path=포함시킬 테스트 계획 파일
 increment=증분
 infinite=무한
@@ -571,7 +571,7 @@ jms_sample_title=JMS 기본 요청
 jms_selector=JMS Selector
 jms_send_queue=메시지 전송 큐를 위한 JNDI 이름
 jms_separator=구분자
-jms_stop_between_samples=각 표본추출 후 연결 종료?
+jms_stop_between_samples=각 표본추출 후 연결 종료
 jms_store_response=응답 저장
 jms_subscriber_on_message=MessageListener.onMessage() 사용
 jms_subscriber_receive=MessageConsumer.receive() 사용
@@ -581,9 +581,9 @@ jms_text_area=XStream에 의해 XML로 저장될 텍스트 메시 또는 객체
 jms_text_message=텍스트 메시지
 jms_timeout=타임아웃 (밀리초)
 jms_topic=목적지
-jms_use_auth=인증 사용?
+jms_use_auth=인증 사용
 jms_use_file=파일에서 읽어 오기
-jms_use_non_persistent_delivery=Non-persistent 배달 모드?
+jms_use_non_persistent_delivery=Non-persistent 배달 모드
 jms_use_properties_file=jndi.properties 파일 사용
 jms_use_random_file=아래 지정된 폴더에서 무작위로 파일 선택하여 읽어 오기
 jms_use_req_msgid_as_correlid=요청 메시지 ID를 사용
@@ -669,8 +669,8 @@ ldap_sample_title=LDAP 요청 기본 설정
 ldap_search_baseobject=baseobject 검색 수행
 ldap_search_onelevel=onelevel 검색 수행
 ldap_search_subtree=subtree 검색 수행
-ldap_secure=Secure LDAP 프로토콜 사용?
-ldap_trust_all=모든 인증서들을 신뢰할까요?
+ldap_secure=Secure LDAP 프로토콜 사용
+ldap_trust_all=모든 인증서들을 신뢰
 ldap_testing_title=LDAP 요청
 ldapext_sample_title=LDAP 확장 요청 기본 설정
 ldapext_testing_title=LDAP 확장 요청
@@ -990,7 +990,7 @@ reportgenerator_summary_statistics_throughput=트랜잭션(초당)
 reportgenerator_summary_total=총계
 request_data=요청 데이터
 reset=초기화
-response_save_as_md5=응답을 MD5 부호화 문자열로 저장?
+response_save_as_md5=응답을 MD5 부호화 문자열로 저장
 response_time_distribution_satisfied_label=요청 수 \n(응답시간 <= {0}ms)
 response_time_distribution_tolerated_label=요청 수 \n(응답시간 > {0}ms 및 <= {1}ms)
 response_time_distribution_untolerated_label=요청 수 \n(응답시간 > {0}ms)
@@ -1174,7 +1174,7 @@ smtp_bcc=숨은 참조 (BCC) 전자우편 주소:
 smtp_cc=참조 (CC) 전자우편 주소\:
 smtp_default_port=(기본 값들\: SMTP\:25, SSL\:465, StartTLS\:587)
 smtp_eml=.eml 파일 전송\:
-smtp_enabledebug=디버그 로그 활성화?
+smtp_enabledebug=디버그 로그 활성화
 smtp_enforcestarttls=StartTLS 강제
 smtp_enforcestarttls_tooltip=<html>서버가 StartTLS를 적용하도록 <b>강제</b>합니다.<br />만일 이 
설정을 선택하지 않고 SMTP 서버가 StartTLS를 지원하지 않으면,<br />일반 SMTP 연결이 대신 사용됩니다.<br 
/><i>주의\:</i> 이 체크박스 선택은 "/tmp/" 디렉토리에 파일을 생성하므로,<br />윈도우 환경에서는 문제를 일으킬 수 
있습니다.</html>
 smtp_from=보내는 이 전자우편 주소:
@@ -1392,8 +1392,8 @@ view_graph_tree_title=그래프 트리 보기
 view_results_assertion_error=Assertion 오류\:
 view_results_assertion_failure=Assertion 실패\:
 view_results_assertion_failure_message=Assertion 실패 메시지:
-view_results_autoscroll=자동 스크롤?
-view_results_childsamples=자식 표본들?
+view_results_autoscroll=자동 스크롤
+view_results_childsamples=자식 표본들
 view_results_datatype=데이터 타입 ("text"|"bin"|"")\:
 view_results_desc=트리 형태로 표본추출 텍스트 결과들을 보기
 view_results_error_count=오류 수\:
@@ -1508,7 +1508,7 @@ xpath_assertion_valid=XPath 표현식 유효성 검증
 xpath_assertion_validation=DTD를 사용하여 XML 유효성 검증
 xpath_assertion_whitespace=공백 문자 무시
 xpath_expression=매치를 테스트할 XPath 표현식
-xpath_extractor_fragment=테스트 컨텐트 대신에 전체 XPath 프래그먼트를 반환?
+xpath_extractor_fragment=테스트 컨텐트 대신에 전체 XPath 프래그먼트를 반환
 xpath_extractor_query=XPath 질의:
 xpath_extractor_user_namespaces=<html>네임스페이스들의 별칭 목록 <br>(prefix=전체 네임스페이스, 한 
줄에 하나씩)\:</html>
 xpath_extractor_title=XPath 추출기
@@ -1523,7 +1523,7 @@ xpath2_tester=XPath2 테스터
 xpath_namespaces=네임스페이스들의 별칭들 보기
 xpath_tester_button_test=테스트
 xpath_tester_field=XPath 질의\:
-xpath_tester_fragment=테스트 컨텐트 대신에 전체 XPath 프래그먼트를 반환?
+xpath_tester_fragment=테스트 컨텐트 대신에 전체 XPath 프래그먼트를 반환
 xpath_tester_no_text=데이터 응답 결과가 텍스트가 아닙니다.
 xpath_tester_title=XPath 테스터
 xpath_tidy_quiet=Quiet
diff --git 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_pl.properties
 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_pl.properties
index 8f4118ef87..fb5aedd2f2 100644
--- 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_pl.properties
+++ 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_pl.properties
@@ -41,7 +41,7 @@ aggregate_graph_column_settings=Ustawienia kolumny
 aggregate_graph_columns_to_display=Kolumny do wyświetlenia\:
 aggregate_graph_dimension=Rozmiar wykresu
 aggregate_graph_display=Wyświetl wykres
-aggregate_graph_draw_outlines=Wyświetl pasek zarysu ?
+aggregate_graph_draw_outlines=Wyświetl pasek zarysu
 aggregate_graph_dynamic_size=Dynamiczny rozmiar wykresu
 aggregate_graph_font=Czcionka\:
 aggregate_graph_height=Wysokość\:
@@ -55,7 +55,7 @@ aggregate_graph_legend_placement=Umieszczenie\:
 aggregate_graph_max_length_xaxis_label=Maksymalna wysokość etykiety osi OX
 aggregate_graph_ms=Milisekund
 aggregate_graph_no_values_to_graph=Na wykresie nie ma żadnych wartości
-aggregate_graph_number_grouping=Pokaż liczbę grupowania?
+aggregate_graph_number_grouping=Pokaż liczbę grupowania
 aggregate_graph_response_time=Czas odpowiedzi
 aggregate_graph_save=Zapisz wykres
 aggregate_graph_save_table=Zapisz dane z tabeli
@@ -67,10 +67,10 @@ aggregate_graph_tab_graph=Wykres
 aggregate_graph_tab_settings=Ustawienia
 aggregate_graph_title=Wykres skumulowany
 aggregate_graph_title_group=Tytuł
-aggregate_graph_use_group_name=Dodaj nazwę grupy w napisie?
+aggregate_graph_use_group_name=Dodaj nazwę grupy w napisie
 aggregate_graph_user_title=Tytuł wykresu
 aggregate_graph_value_font=Rozmiar czcionki\:
-aggregate_graph_value_labels_vertical=Nazwy pionowe?
+aggregate_graph_value_labels_vertical=Nazwy pionowe
 aggregate_graph_width=Szerokość
 aggregate_graph_xaxis_group=Oś X
 aggregate_graph_yaxis_group=Oś Y (milisekundy)
@@ -121,7 +121,7 @@ choose_function=Wybierz funkcję
 choose_language=Wybierz język
 clear=Wyczyść
 clear_all=Wyczyść wszystko
-clear_cache_per_iter=Czyścić cache po każdej iteracji?
+clear_cache_per_iter=Czyścić cache po każdej iteracji
 column_delete_disallowed=Tej kolumny nie można usuwać
 compare=Porównaj
 config_element=Element konfigurujący
@@ -227,7 +227,7 @@ revert_project=Cofnij
 run=Uruchom
 sample_scope=Które próbki testować
 sampler_label=Etykieta
-sampler_on_error_action=Co robić jeśli Próbnik zgłosi błąd?
+sampler_on_error_action=Akcja po błędzie próbnika
 sampler_on_error_continue=Kontunuuj
 sampler_on_error_stop_test=Przerwij test
 sampler_on_error_stop_test_now=Natychmiast przerwij test
diff --git 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_pt_BR.properties
 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_pt_BR.properties
index 25df316265..e9960bf871 100644
--- 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_pt_BR.properties
+++ 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_pt_BR.properties
@@ -42,7 +42,7 @@ aggregate_graph_save=Salvar Gráfico
 aggregate_graph_save_table=Salvar Dados da Tabela
 aggregate_graph_save_table_header=Salvar Cabeçalho da Tabela
 aggregate_graph_title=Gráfico Agregado
-aggregate_graph_use_group_name=Incluir nome do grupo no rótulo?
+aggregate_graph_use_group_name=Incluir nome do grupo no rótulo
 aggregate_graph_user_title=Título para o Gráfico
 aggregate_graph_width=Largura
 aggregate_report=Relatório Agregado
@@ -105,7 +105,7 @@ bsh_script_reset_interpreter=Reiniciar bsh.Interpreter 
antes de cada chamada
 bsh_script_variables=As seguintes variáveis estão definidas para o 
script\:\nSampleResult, RespondeCode, ResponseMessage, IsSuccess, Label, 
FileName, ctx, vars, props, log
 busy_testing=Eu estou ocupado testando, por favor pare o teste antes de 
alterar as configurações
 cache_manager_title=Gerenciador de Cache HTTP
-cache_session_id=Fazer cache do ID da sessão?
+cache_session_id=Fazer cache do ID da sessão
 cancel=Cancelar
 cancel_exit_to_save=Existem itens não salvos. Você deseja salvar antes de sair?
 cancel_new_to_save=Existem itens não salvos. Você deseja salvar antes de 
limpar o plano de teste?
@@ -115,8 +115,8 @@ choose_function=Escolher Função
 choose_language=Escolher Linguagem
 clear=Limpar
 clear_all=Limpar Tudo
-clear_cache_per_iter=Limpar cache a cada iteração?
-clear_cookies_per_iter=Limpar cookies a cada iteração?
+clear_cache_per_iter=Limpar cache a cada iteração
+clear_cookies_per_iter=Limpar cookies a cada iteração
 column_delete_disallowed=Não é permitida a exclusão desta coluna.
 column_number=Número da coluna no arquivo CSV | próx | *apelido
 compare=Comparar
@@ -175,7 +175,7 @@ edit=Editar
 email_results_title=Enviar Resultados por Email
 en=Inglês
 enable=Habilitar
-encode?=Codificar?
+encode?=Codificar
 encoded_value=Valor da URL Codificada
 entry_dn=Entrada DN
 entrydn=Entrada DN
@@ -212,15 +212,15 @@ follow_redirects_auto=Redirecionar automaticamente
 foreach_controller_title=Controlador ParaCada (ForEach)
 foreach_input=Prefixo da variável de entrada
 foreach_output=Nome da variável de saída
-foreach_use_separator=Adicionar "_" antes do número?
+foreach_use_separator=Adicionar "_" antes do número
 format=Formato do número
 fr=Francês
-ftp_binary_mode=Usar modo binário?
+ftp_binary_mode=Usar modo binário
 ftp_local_file=Arquivo local\:
 ftp_local_file_contents=Conteúdo do Arquivo Local\:
 ftp_remote_file=Arquivo remoto\:
 ftp_sample_title=Padrões para Requisiçao FTP
-ftp_save_response_data=Salvar Arquivos na Resposta?
+ftp_save_response_data=Salvar Arquivos na Resposta
 ftp_testing_title=Requisição FTP
 function_dialog_menu_item=Diálogo de Função de Ajuda
 function_helper_title=Função de Ajuda
@@ -267,13 +267,13 @@ http_user_parameter_modifier=Modificador de Parâmetros 
HTTP do Usuário
 httpmirror_title=Servidor Espelho HTTP
 id_prefix=Prefixo do ID
 id_suffix=Sufixo do ID
-if_controller_evaluate_all=Avaliar para todos os filhos?
-if_controller_expression=Interpretar Condição como Expressão de Variável?
+if_controller_evaluate_all=Avaliar para todos os filhos
+if_controller_expression=Interpretar Condição como Expressão de Variável
 if_controller_label=Condição (padrão\: Javascript)
 if_controller_title=Controlador Se
 ignore_subcontrollers=Ignorar blocos de sub-controladores
 include_controller=Controlador de Inclusão
-include_equals=Incluir Igual?
+include_equals=Incluir Igual
 include_path=Incluir Plano de Teste
 increment=Incremento
 infinite=Infinito
@@ -337,7 +337,7 @@ jms_testing_title=Requisição de Mensagens
 jms_text_message=Mensagem de Texto
 jms_timeout=Tempo limite (timeout) em milisegundos
 jms_topic=Tópico
-jms_use_auth=Usar Autorização?
+jms_use_auth=Usar Autorização
 jms_use_file=Do Arquivo
 jms_use_non_persistent_delivery=Utilizar modo de entrega não persistente
 jms_use_properties_file=Utilizar aquivo jndi.properties
@@ -380,13 +380,13 @@ junit_test_config=Parâmetros de Teste JUnit
 junit_test_method=Método de Teste
 ldap_argument_list=Lista de Argumentos LDAP
 ldap_connto=Tempo limite de Conexão (timeout) em milisegundos
-ldap_parse_results=Processar os resultados da busca?
+ldap_parse_results=Processar os resultados da busca
 ldap_sample_title=Padrões de Requisição LDAP
 ldap_search_baseobject=Realizar busca básica de objetos
 ldap_search_onelevel=Realizar busca de um nível
 ldap_search_subtree=Realizar busca em sub-árvore
-ldap_secure=Utilizar Protocolo LDAP Seguro?
-ldap_trust_all=Trust Todos os Certificados ?
+ldap_secure=Utilizar Protocolo LDAP Seguro
+ldap_trust_all=Trust Todos os Certificados
 ldap_testing_title=Requisição LDAP
 ldapext_sample_title=Padrões de Requisição LDAP Estendidas
 ldapext_testing_title=Requisição LDAP Estendida
@@ -571,7 +571,7 @@ report_table=Tabela do Relatório
 report_writer=Escritor de Relatório
 report_writer_html=Escritor de Relatório HTML
 request_data=Requisitar Dados
-response_save_as_md5=Salvar respostas como chave MD5?
+response_save_as_md5=Salvar respostas como chave MD5
 restart=Reiniciar
 resultaction_title=Manuseador de Ações de Estados do Resultado
 resultsaver_errors=Somente Salvar Respostas que Falharam
diff --git 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_tr.properties
 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_tr.properties
index 556b934cdb..352f8bd7e7 100644
--- 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_tr.properties
+++ 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_tr.properties
@@ -94,7 +94,7 @@ bsh_script_file=Betik Dosyası
 bsh_script_parameters=Parametreler (-> Dizgi (String) Parametreler ve String 
[]bsh.args)
 bsh_script_variables=Betik için şu değişkenler tanımlıdır\:\nSampleResult, 
ResponseCode, ResponseMessage, IsSuccess, Label, FileName, ctx, vars, props, log
 busy_testing=Testle meşgulüm, lütfen ayarları değiştirmeden önce testi durdurun
-cache_session_id=Önbellek oturum Id'si?
+cache_session_id=Önbellek oturum Id'si
 cancel=İptal
 cancel_exit_to_save=Kaydedilmemiş test maddeleri var. Çıkmadan önce kaydetmek 
ister misiniz?
 cancel_new_to_save=Kaydedilmemiş test maddeleri var. Testi temizlemeden önce 
kaydetmek ister misin?
@@ -103,7 +103,7 @@ choose_function=Fonksiyon seçin
 choose_language=Dil seçin
 clear=Temizle
 clear_all=Hepsini Temizle
-clear_cookies_per_iter=Her tekrar için çerezleri temizle?
+clear_cookies_per_iter=Her tekrar için çerezleri temizle
 column_delete_disallowed=Bu kolonu silmek için izin yok
 column_number=CSV dosyası için kolon numarası | ileri | *takma ad
 compare=Karşılaştır
@@ -162,7 +162,7 @@ edit=Düzenle
 email_results_title=E-posta Sonuçları
 en=İngilizce
 enable=Etkinleştir
-encode?=Kodlama?
+encode?=Kodlama
 encoded_value=URL Kodlanmış Değer
 entry_dn=Giriş DN'i
 entrydn=Giriş DN'i
@@ -198,14 +198,14 @@ follow_redirects_auto=Otomatik Olarak Yönlendir
 foreach_controller_title=ForEach Denetçisi
 foreach_input=Giriş değişkeni öneki
 foreach_output=Çıkış değişkeni ismi
-foreach_use_separator=Numara önüne "_" ekle ?
+foreach_use_separator=Numara önüne "_" ekle
 format=Numara biçimi
 fr=Fransızca
-ftp_binary_mode=İkili kipi kullan ?
+ftp_binary_mode=İkili kipi kullan
 ftp_local_file=Yerel Dosya\:
 ftp_remote_file=Uzak Dosya\:
 ftp_sample_title=FTP İsteği Öntanımlı Değerleri
-ftp_save_response_data=Cevabı Dosyaya Kaydet ?
+ftp_save_response_data=Cevabı Dosyaya Kaydet
 ftp_testing_title=FTP İsteği
 function_dialog_menu_item=Fonksiyon Yardımı Diyaloğu
 function_helper_title=Fonksiyon Yardımı
@@ -252,12 +252,12 @@ http_user_parameter_modifier=HTTP Kullanıcı Parametresi 
Niteleyicisi
 httpmirror_title=HTTP Ayna Sunucusu
 id_prefix=ID Öneki
 id_suffix=ID Soneki
-if_controller_evaluate_all=Tüm çocuklar için hesapla?
+if_controller_evaluate_all=Tüm çocuklar için hesapla
 if_controller_label=Durum (Javascript)
 if_controller_title=If Denetçisi
 ignore_subcontrollers=Alt denetçi bloklarını yoksay
 include_controller=İçerme Denetçisi
-include_equals=Eşleniyorsa içer?
+include_equals=Eşleniyorsa içer
 include_path=Test Planını İçer
 increment=Arttır
 infinite=Her zaman
@@ -321,7 +321,7 @@ jms_text_message=Metin Mesajı
 jms_timeout=Zaman Aşımı (milisaniye)
 jms_topic=Konu
 jms_use_file=Dosyadan
-jms_use_non_persistent_delivery=Sürekli olmayan dağıtım kipini kullan?
+jms_use_non_persistent_delivery=Sürekli olmayan dağıtım kipini kullan
 jms_use_properties_file=jndi.properties dosyasını kullan
 jms_use_random_file=Rastgele Dosyası
 jms_use_text=Metin alanı
@@ -361,13 +361,13 @@ junit_test_config=JUnit Test Parametreleri
 junit_test_method=Test Metodu
 ldap_argument_list=LDAP Argüman Listesi
 ldap_connto=Bağlantı zaman aşımı (milisaniye)
-ldap_parse_results=Arama sonuçlarını ayrıştır ?
+ldap_parse_results=Arama sonuçlarını ayrıştır
 ldap_sample_title=LDAP İsteği Öntanımlı Ayarları
 ldap_search_baseobject=Temel-nesne araması gerçekleştir
 ldap_search_onelevel=Tek-seviye araması gerçekleştir
 ldap_search_subtree=Alt-ağaç araması gerçekleştir
-ldap_secure=Güvenli LDAP Protokulu kullan ?
-ldap_trust_all=Tüm Sertifikalara Güven?
+ldap_secure=Güvenli LDAP Protokulu kullan
+ldap_trust_all=Tüm Sertifikalara Güven
 ldap_testing_title=LDAP İsteği
 ldapext_sample_title=LDAP Gelişmiş İsteği Öntanımlı Değerleri
 ldapext_testing_title=LDAP Gelişmiş İsteği
diff --git 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
index 26cff3b953..1763f2be64 100644
--- 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
+++ 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_CN.properties
@@ -47,7 +47,7 @@ aggregate_graph_column_settings=列设置
 aggregate_graph_columns_to_display=列显示:
 aggregate_graph_dimension=图表大小
 aggregate_graph_display=显示图表
-aggregate_graph_draw_outlines=绘制轮廓?
+aggregate_graph_draw_outlines=绘制轮廓
 aggregate_graph_dynamic_size=动态图形大小
 aggregate_graph_font=字体:
 aggregate_graph_height=高度:
@@ -61,7 +61,7 @@ aggregate_graph_legend_placement=放置:
 aggregate_graph_max_length_xaxis_label=X轴标签的最大长度
 aggregate_graph_ms=毫秒
 aggregate_graph_no_values_to_graph=没有要绘制的值
-aggregate_graph_number_grouping=显示号码分组?
+aggregate_graph_number_grouping=显示号码分组
 aggregate_graph_response_time=响应时间
 aggregate_graph_save=保存图表
 aggregate_graph_save_table=保存表格数据
@@ -73,7 +73,7 @@ aggregate_graph_tab_graph=图形
 aggregate_graph_tab_settings=设置
 aggregate_graph_title=汇总图
 aggregate_graph_title_group=标题
-aggregate_graph_use_group_name=在标签中包含组名称?
+aggregate_graph_use_group_name=在标签中包含组名称
 aggregate_graph_user_title=图表标题:
 aggregate_graph_value_font=值字体:
 aggregate_graph_value_labels_vertical=列标签值
@@ -138,7 +138,7 @@ attribute=属性
 attribute_field=属性:
 attrs=属性
 auth_base_url=基础URL
-auth_manager_clear_per_iter=在每次迭代中清除认证?
+auth_manager_clear_per_iter=在每次迭代中清除认证
 auth_manager_options=选项
 auth_manager_title=HTTP授权管理器
 auths_stored=存储在授权管理器中的授权
@@ -176,7 +176,7 @@ bsh_script_variables=为脚本定义了下列变量:\nSampleResult, ResponseCo
 busy_testing=正在测试,请在修改设置前停止测试
 cache_manager_size=缓存中元素的最大数量
 cache_manager_title=HTTP缓存管理器
-cache_session_id=缓存会话 Id ?
+cache_session_id=缓存会话 Id
 cancel=取消
 cancel_exit_to_save=测试条目未存储。你想在退出前存储吗?
 cancel_new_from_template=有一些测试项目没有被保存。在从选定的模板创建测试计划之前,您希望保存吗?
@@ -192,8 +192,8 @@ choose_language=选择语言
 clear=清除
 clear_all=清除全部
 clear_cache_each_iteration=在每次迭代中清除缓存
-clear_cache_per_iter=在每次迭代中清除缓存?
-clear_cookies_per_iter=每次反复清除Cookies?
+clear_cache_per_iter=在每次迭代中清除缓存
+clear_cookies_per_iter=每次反复清除Cookies
 clipboard_node_read_error=复制节点时发生异常
 close=关闭
 closeconnection=关闭连接
@@ -304,7 +304,7 @@ email_results_title=电子邮件结果
 en=英语
 enable=启用
 encode=URL编码
-encode?=编码?
+encode?=编码
 encoded_value=URL编码后的值
 entry_dn=DN入口
 entrydn=DN入口
@@ -359,15 +359,15 @@ foreach_end_index=结束循环字段(含)
 foreach_input=输入变量前缀
 foreach_output=输出变量名称
 foreach_start_index=开始循环字段(不包含)
-foreach_use_separator=数字之前加上下划线 "_" ?
+foreach_use_separator=数字之前加上下划线 "_"
 format=数字格式
 fr=法语
-ftp_binary_mode=使用二进制模式?
+ftp_binary_mode=使用二进制模式
 ftp_local_file=本地文件:
 ftp_local_file_contents=本地文件内容:
 ftp_remote_file=远程文件:
 ftp_sample_title=FTP默认请求
-ftp_save_response_data=保存文件响应?
+ftp_save_response_data=保存文件响应
 ftp_testing_title=FTP请求
 function_dialog_menu_item=函数助手对话框
 function_helper_dialog_result_warn=如果函数使用变量或运行上下文,结果将无法反映真实情况
@@ -446,7 +446,7 @@ if_controller_label=条件
 if_controller_title=IF 控制器
 ignore_subcontrollers=忽略子控制器块
 include_controller=Include控制器
-include_equals=包含等于?
+include_equals=包含等于
 increment=递增
 infinite=永远
 insert_after=之后插入
diff --git 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_TW.properties
 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_TW.properties
index a1681b42a3..93107f3298 100644
--- 
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_TW.properties
+++ 
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_zh_TW.properties
@@ -82,7 +82,7 @@ choose_function=選擇一個功能
 choose_language=選擇一種語言
 clear=清除
 clear_all=全部清除
-clear_cookies_per_iter=每回合都先清除 Cookies?
+clear_cookies_per_iter=每回合都先清除 Cookies
 column_delete_disallowed=此欄位不允許刪除
 compare=比較
 comparefilt=比較過濾器
@@ -135,7 +135,7 @@ edit=編輯
 email_results_title=電郵結果
 en=英文
 enable=啟動
-encode?=編碼?
+encode?=編碼
 encoded_value=URL 編碼值
 entry_dn=進入 DN
 entrydn=進入 DN
@@ -166,7 +166,7 @@ follow_redirects_auto=自動跟隨重導
 foreach_controller_title=ForEach 控制器
 foreach_input=變數前置字串
 foreach_output=輸出變數名稱
-foreach_use_separator=在編號前加上底線符號?
+foreach_use_separator=在編號前加上底線符號
 fr=法文
 ftp_sample_title=FTP 要求預設值
 ftp_testing_title=FTP 要求
@@ -214,7 +214,7 @@ id_suffix=ID 後置字串
 if_controller_label=條件
 if_controller_title=若...控制器
 ignore_subcontrollers=忽略子控制器內容
-include_equals=包含相等?
+include_equals=包含相等
 increment=增量
 infinite=永久
 insert_after=加在之後
diff --git a/xdocs/usermanual/build-adv-web-test-plan.xml 
b/xdocs/usermanual/build-adv-web-test-plan.xml
index 768bf1e9bd..89de5d28fc 100644
--- a/xdocs/usermanual/build-adv-web-test-plan.xml
+++ b/xdocs/usermanual/build-adv-web-test-plan.xml
@@ -42,7 +42,7 @@ then you'll need to do a bit of extra work to test your 
site.</p>
 received from the server and retrieve the unique session ID.  Use the 
appropriate <complink name="HTTP URL Re-writing Modifier"/>
 to accomplish this.  Simply enter the name of your session ID parameter into 
the modifier, and it
 will find it and add it to each request.  If the request already has a value, 
it will be replaced.
-If "Cache Session Id?" is checked, then the last found session id will be 
saved,
+If "Cache Session Id" is checked, then the last found session id will be saved,
 and will be used if the previous HTTP sample does not contain a session id.
 </p>
 
diff --git a/xdocs/usermanual/build-ldapext-test-plan.xml 
b/xdocs/usermanual/build-ldapext-test-plan.xml
index c60e746c87..f8c3742e8c 100644
--- a/xdocs/usermanual/build-ldapext-test-plan.xml
+++ b/xdocs/usermanual/build-ldapext-test-plan.xml
@@ -244,7 +244,7 @@ Unchecked will mean no java-object attributes will be 
returned.
 <i>(Optional)</i> Dereference aliases. Checked will mean it will follow 
references, Unchecked says it will not.
 </li>
 <li>
-<i>(Optional)</i> Parse the search results?. Checked will mean it gets all 
results in response data, Unchecked says it will not.
+<i>(Optional)</i> Parse the search results. Checked will mean it gets all 
results in response data, Unchecked says it will not.
 </li>
 </ol>
 </p>
diff --git a/xdocs/usermanual/component_reference.xml 
b/xdocs/usermanual/component_reference.xml
index 063fed59a6..663b24fe6e 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -86,8 +86,8 @@ Latency is set to the time it takes to login.
         <property name="Local File:" required="Yes, if uploading (*)">File to 
upload, or destination for downloads (defaults to remote file name).</property>
         <property name="Local File Contents:" required="Yes, if uploading 
(*)">Provides the contents for the upload, overrides the Local File 
property.</property>
         <property name="get(RETR) / put(STOR)" required="Yes">Whether to 
retrieve or upload a file.</property>
-        <property name="Use Binary mode?" required="Yes">Check this to use 
Binary mode (default ASCII)</property>
-        <property name="Save File in Response?" required="Yes, if downloading">
+        <property name="Use Binary mode" required="Yes">Check this to use 
Binary mode (default ASCII)</property>
+        <property name="Save File in Response" required="Yes, if downloading">
         Whether to store contents of retrieved file in response data.
         If the mode is ASCII, then the contents will be visible in the 
<complink name="View Results Tree"/>.
         </property>
@@ -343,7 +343,7 @@ so unsafe characters may need to be encoded to avoid errors 
such as <code>URISyn
 and send HTTP/HTTPS requests for all images, Java applets, JavaScript files, 
CSSs, etc. referenced in the file.
         See below for more details.
         </property>
-       <property name="Save response as MD5 hash?" required="No">
+       <property name="Save response as MD5 hash" required="No">
        If this is selected, then the response is not stored in the sample 
result.
        Instead, the 32 character MD5 hash of the data is calculated and stored 
instead.
        This is intended for testing large amounts of data.
@@ -911,7 +911,7 @@ This will not have any impact on existing Test plans.
          <property name="Attributes" required="No">Specify the attributes you 
want to have returned, separated by a semicolon. An empty field will return all 
attributes</property>
          <property name="Return object" required="No">Whether the object will 
be returned (<code>true</code>) or not (<code>false</code>). 
Default=<code>false</code></property>
          <property name="Dereference aliases" required="No">If 
<code>true</code>, it will dereference aliases, if <code>false</code>, it will 
not follow them (default=<code>false</code>)</property>
-         <property name="Parse the search results?" required="No">If 
<code>true</code>, the search results will be added to the response data. If 
<code>false</code>, a marker - whether results where found or not - will be 
added to the response data.</property>
+         <property name="Parse the search results" required="No">If 
<code>true</code>, the search results will be added to the response data. If 
<code>false</code>, a marker - whether results where found or not - will be 
added to the response data.</property>
        </properties>
      </dd>
      <dt><b>Modification test</b></dt>
@@ -1414,7 +1414,7 @@ Currently the only way to changes these is via the 
<apilink href="org/apache/jme
     <dt><code>Standard charsets</code>:</dt><dd>The specified encoding (valid 
or not) is used for reading the file and processing variables</dd>
   </dl>
   </property>
-  <property name="Use non-persistent delivery mode?" required="No">
+  <property name="Use non-persistent delivery mode" required="No">
       Whether to set <code>DeliveryMode.NON_PERSISTENT</code> (defaults to 
<code>false</code>)
   </property>
   <property name="JMS Properties" required="No">
@@ -1518,7 +1518,7 @@ The following table shows some values which may be useful 
when configuring JMS:
   This is best suited to Topic subscriptions.</dd>
   </dl>
   </property>
-  <property name="Stop between samples?" required="Yes">
+  <property name="Stop between samples" required="Yes">
   If selected, then JMeter calls <code>Connection.stop()</code> at the end of 
each sample (and calls <code>start()</code> before each sample).
   This may be useful in some cases where multiple samples/threads have 
connections to the same queue.
   If not selected, JMeter calls <code>Connection.start()</code> at the start 
of the thread, and does not call <code>stop()</code> until the end of the 
thread.
@@ -1629,7 +1629,7 @@ The following table shows some values which may be useful 
when configuring JMS:
       The priority level of the message. There are ten priority levels from 
<code>0</code> (lowest) to <code>9</code> (highest).
       If you do not specify a priority level, the default level is 
<code>4</code>.
   </property>
-  <property name="Use non-persistent delivery mode?" required="Yes">
+  <property name="Use non-persistent delivery mode" required="Yes">
       Whether to set <code>DeliveryMode.NON_PERSISTENT</code>.
   </property>
   <property name="Content" required="No">
@@ -1877,7 +1877,7 @@ Note: If the message body is not empty, and there is at 
least one attached file,
 <property name="Attach files" required="">Files to be attached to the 
message.</property>
 <property name="Send .eml" required="">If set, the <code>.eml</code> file will 
be sent instead of the entries in the <code>Subject</code>, 
<code>Message</code>, and <code>Attach file(s)</code> fields</property>
 <property name="Calculate message size" required="">Calculates the message 
size and stores it in the sample result.</property>
-<property name="Enable debug logging?" required="">If set, then the 
"<code>mail.debug</code>" property is set to "<code>true</code>"</property>
+<property name="Enable debug logging" required="">If set, then the 
"<code>mail.debug</code>" property is set to "<code>true</code>"</property>
 </properties>
 </component>
 
@@ -2234,7 +2234,7 @@ Please refer to the <complink name="Constant Throughput 
Timer"/> for an element
         By default, the condition is evaluated only once on initial entry, but 
you have the option to have it evaluated for every runnable element contained 
in the controller.
         </p>
         <p>
-        The best option (default one) is to check <code>Interpret Condition as 
Variable Expression?</code>, then in the condition field you have 2 options:
+        The best option (default one) is to check <code>Interpret Condition as 
Variable Expression</code>, then in the condition field you have 2 options:
         <ul>
             <li>Option 1: Use a variable that contains <code>true</code> or 
<code>false</code>
             <note>If you want to test if last sample was successful, you can 
use <code>${JMeterThread.last_sample_ok}</code>
@@ -2257,7 +2257,7 @@ Please refer to the <complink name="Constant Throughput 
Timer"/> for an element
         <source>"${myVar}" != "\${myVar}"</source>
         to test if a variable is defined and is not null.
         </note>
-        If you uncheck <code>Interpret Condition as Variable 
Expression?</code>, <code>If Controller</code> will internally use javascript 
to evaluate the condition
+        If you uncheck <code>Interpret Condition as Variable 
Expression</code>, <code>If Controller</code> will internally use javascript to 
evaluate the condition
         which has a performance penalty that can be very big and make your 
test less scalable.
         <figure width="819" height="265" 
image="if_controller_javascript.png">If Controller using javascript</figure>
     </description>
@@ -2265,7 +2265,7 @@ Please refer to the <complink name="Constant Throughput 
Timer"/> for an element
     <property name="Name" required="No">Descriptive name for this controller 
that is shown in the tree.</property>
     <property name="Condition (default JavaScript)" required="Yes">By default 
the condition is interpreted as <b>JavaScript</b> code that returns 
"<code>true</code>" or "<code>false</code>",
     but this can be overridden (see below)</property>
-    <property name="Interpret Condition as Variable Expression?" 
required="Yes">If this is selected, then the condition must be an expression 
that evaluates to "<code>true</code>" (case is ignored).
+    <property name="Interpret Condition as Variable Expression" 
required="Yes">If this is selected, then the condition must be an expression 
that evaluates to "<code>true</code>" (case is ignored).
     For example, <code>${FOUND}</code> or <code>${__jexl3(${VAR} &gt; 
100)}</code>.
     Unlike the JavaScript case, the condition is only checked to see if it 
matches "<code>true</code>" (case is ignored).
     <note>Checking this and using <code><funclink name="__jexl3"/></code> or 
<code><funclink name="__groovy"/></code> function in Condition is advised for 
performances</note>
@@ -2909,7 +2909,7 @@ The "<code>Test</code>" button allows the user to apply 
the Boundary Extractor q
 will be displayed in the lower panel.<br/>
 </td></tr>
 </table>
-<p><code>Scroll automatically?</code> option permit to have last node display 
in tree selection</p>
+<p><code>Scroll automatically</code> option permit to have last node display 
in tree selection</p>
 <note>Starting with version 3.2 the number of entries in the View is 
restricted to the value of the
 property <code>view.results.tree.max_results</code> which defaults to 
<code>500</code> entries. The old
 behaviour can be restored by setting the property to <code>0</code>. Beware, 
that this might consume
@@ -2986,7 +2986,7 @@ Starting with JMeter 2.12, you can configure the 3 
percentile values you want to
 </note>
 <ul>
 <li><code>Label</code> - The label of the sample.
-If "<code>Include group name in label?</code>" is selected, then the name of 
the thread group is added as a prefix.
+If "<code>Include group name in label</code>" is selected, then the name of 
the thread group is added as a prefix.
 This allows identical labels from different thread groups to be collated 
separately if required.
 </li>
 <li><code># Samples</code> - The number of samples with the same label</li>
@@ -3025,7 +3025,7 @@ i.e. 30.0 requests/minute is saved as 0.5.
 Like the <complink name="View Results Tree"/>, this visualizer uses a lot of 
memory.
 <p>
 By default, it only displays the main (parent) samples; it does not display 
the sub-samples (child samples).
-JMeter has a "<code>Child Samples?</code>" check-box.
+JMeter has a "<code>Child Samples</code>" check-box.
 If this is selected, then the sub-samples are displayed instead of the main 
samples.
 </p>
 </description>
@@ -3059,9 +3059,9 @@ the graph as a PNG file.</description>
         <li><code>Rectangles color:</code> Click on right color rectangle open 
a popup dialog to choose a custom color for column.</li>
         <li><code>Foreground color</code> Allow to change the value text 
color.</li>
         <li><code>Value font:</code> Allow to define font settings for the 
text.</li>
-        <li><code>Draw outlines bar?</code> To draw or not the border line on 
bar chart</li>
-        <li><code>Show number grouping?</code> Show or not the number grouping 
in Y Axis labels.</li>
-        <li><code>Value labels vertical?</code> Change orientation for value 
label. (Default is horizontal)</li>
+        <li><code>Draw outlines bar</code> To draw or not the border line on 
bar chart</li>
+        <li><code>Show number grouping</code> Show or not the number grouping 
in Y Axis labels.</li>
+        <li><code>Value labels vertical</code> Change orientation for value 
label. (Default is horizontal)</li>
         <li><code>Column label selection:</code> Filter by result label. A 
regular expression can be used, example: <code>.*Transaction.*</code>
         <br></br>Before display the graph, click on <code>Apply filter</code> 
button to refresh internal data.</li>
         </ul>
@@ -3197,7 +3197,7 @@ the Report.
 </p>
 <ul>
 <li><code>Label</code> - The label of the sample.
-If "<code>Include group name in label?</code>" is selected, then the name of 
the thread group is added as a prefix.
+If "<code>Include group name in label</code>" is selected, then the name of 
the thread group is added as a prefix.
 This allows identical labels from different thread groups to be collated 
separately if required.
 </li>
 <li><code># Samples</code> - The number of samples with the same label</li>
@@ -3703,7 +3703,7 @@ These can be set up using a <complink name="CSV Data Set 
Config"/> Element (for
 
 <properties>
         <property name="Name" required="No">Descriptive name for this element 
that is shown in the tree. </property>
-        <property name="Clear auth on each iteration?" required="Yes">Used by 
Kerberos authentication. If checked, authentication will be done on each 
iteration of Main Thread Group loop even if it has already been done in a 
previous one.
+        <property name="Clear auth on each iteration" required="Yes">Used by 
Kerberos authentication. If checked, authentication will be done on each 
iteration of Main Thread Group loop even if it has already been done in a 
previous one.
         This is usually useful if each main thread group iteration represents 
behaviour of one Virtual User.
         </property>
   <property name="Base URL" required="Yes">A partial or complete URL that 
matches one or more HTTP Request URLs.  As an example,
@@ -5435,7 +5435,7 @@ Clever users will even determine that this modifier can 
be used to grab values t
         a semi-colon plus the session id parameter.  Check this box if that is 
so.</property>
         <property name="Do not use equals in path extension" 
required="No">Some web apps rewrite URLs without using an 
&quot;<code>=</code>&quot; sign between the parameter name and value (such as 
Intershop Enfinity).</property>
         <property name="Do not use questionmark in path extension" 
required="No">Prevents the query string to end up in the path extension (such 
as Intershop Enfinity).</property>
-        <property name="Cache Session Id?" required="Yes">
+        <property name="Cache Session Id" required="Yes">
         Should the value of the session Id be saved for later use when the 
session Id is not present?
         </property>
         <property name="URL Encode" required="No">
@@ -5911,7 +5911,7 @@ extracting the node as text or attribute value and store 
the result into the giv
         </ul>
         XPath matching is applied to all qualifying samples in turn, and all 
the matching results will be returned.
        </property>
-    <property name="Return entire XPath fragment instead of text content?" 
required="Yes">
+    <property name="Return entire XPath fragment instead of text content" 
required="Yes">
     If selected, the fragment will be returned rather than the text 
content.<br></br>
     For example <code>//title</code> would return "<code>&lt;title&gt;Apache 
JMeter&lt;/title&gt;</code>" rather than "<code>Apache JMeter</code>".<br></br>
     In this case, <code>//title/text()</code> would return "<code>Apache 
JMeter</code>".
@@ -5982,7 +5982,7 @@ extracting the node as text or attribute value and store 
the result into the giv
     <property name="Validate XML"   required="If Tidy is not selected">Check 
the document against its schema.</property>
     <property name="Ignore Whitespace"  required="If Tidy is not 
selected">Ignore Element Whitespace.</property>
     <property name="Fetch External DTDs"  required="If Tidy is not 
selected">If selected, external DTDs are fetched.</property>
-    <property name="Return entire XPath fragment instead of text content?" 
required="Yes">
+    <property name="Return entire XPath fragment instead of text content" 
required="Yes">
     If selected, the fragment will be returned rather than the text 
content.<br></br>
     For example <code>//title</code> would return "<code>&lt;title&gt;Apache 
JMeter&lt;/title&gt;</code>" rather than "<code>Apache JMeter</code>".<br></br>
     In this case, <code>//title/text()</code> would return "<code>Apache 
JMeter</code>".

Reply via email to