jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject [jmeter] branch master updated: Correct Chinese translation for "Ignore Sub-Controller blocks"
Date Mon, 23 Dec 2019 09:20:23 GMT
This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 7173245  Correct Chinese translation for "Ignore Sub-Controller blocks"
7173245 is described below

commit 71732456b29ba558f68ede6adad435f31f83d792
Author: Felix Schumacher <felix.schumacher@internetallee.de>
AuthorDate: Mon Dec 23 10:18:23 2019 +0100

    Correct Chinese translation for "Ignore Sub-Controller blocks"
    
    Provided by yangxiaofei77 at gmail.com
    
    Bugzilla Id: 64022
---
 .../resources/org/apache/jmeter/resources/messages_zh_CN.properties     | 2 +-
 xdocs/changes.xml                                                       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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 67c6c44..80c9601 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
@@ -442,7 +442,7 @@ id_prefix=ID前缀
 id_suffix=ID后缀
 if_controller_label=条件
 if_controller_title=如果(If)控制器
-ignore_subcontrollers=忽略资控制器块
+ignore_subcontrollers=忽略子控制器块
 include_controller=Include控制器
 include_equals=包含等于?
 increment=递增
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 1517e81..d973b16 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -160,6 +160,7 @@ to view the last release notes of version 5.2.1.
 <h3>Documentation</h3>
 <ul>
   <li><pr>547</pr>Correct Log level documentation. Contributed by jmetertea</li>
+  <li><bug>64022</bug>Correct Chinese translation for "Ignore Sub-Controller
blocks". Provided by yangxiaofei77 (yangxiaofei77 at gmail.com)</li>
 </ul>
 
 <h3>General</h3>
@@ -179,6 +180,7 @@ to view the last release notes of version 5.2.1.
 <ul>
   <li>Michael McDermott (mcdermott.michaelj at gmail.com)</li>
   <li>jmetertea</li>
+  <li>yangxiaofei77 (yangxiaofei77 at gmail.com)</li>
 </ul>
 <p>
 Apologies if we have omitted anyone else.


Mime
View raw message