[GitHub] jmeter pull request #412: add i18nEdit zh-cn

[liushilive]

GitHub user liushilive opened a pull request:

    https://github.com/apache/jmeter/pull/412

    add i18nEdit zh-cn

    ## Description
    Add Chinese translation words
    
    ## Types of changes
    Translate into Chinese
    
    ## Checklist:
    - [x] My code follows the [code style][style-guide] of this project.
    - [x] I have updated the documentation accordingly.


You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/liushilive/jmeter trunk

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/jmeter/pull/412.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #412
    
----
commit f00ff2e4fe557f4f40089988ff191a4f31494c41
Author: 刘士 <liushilive@...>
Date:   2018-09-29T02:58:31Z

    Merge pull request #1 from apache/trunk
    
    合并上游代码

commit b857c14ba23e01d6dab08c3c140d78c76996a77a
Author: 刘士 <liushilive@...>
Date:   2018-10-21T04:04:18Z

    Merge pull request #2 from apache/trunk
    
    合并上游代码

commit d6417243ae1431f8f792dec041d883ae62dd6895
Author: 刘士 <liushilive@...>
Date:   2018-10-21T09:19:20Z

    添加中文翻译

commit c80dc5c78b5b63b8c3745e0d7e8b6787a106a568
Author: 刘士 <liushilive@...>
Date:   2018-10-25T03:12:47Z

    Merge pull request #3 from apache/trunk
    
    合并上游代码

commit d70a292e95370a60c0be4357ec571144856ac2e6
Author: 刘士 <liushilive@...>
Date:   2018-10-25T03:18:25Z

    调整被工具覆盖的属性

commit 329b020bc4b63b445c8820ba21f3da18646ccfb0
Author: 刘士 <liushilive@...>
Date:   2018-10-25T03:43:44Z

    add License
    
    添加 协议

commit a280e08709e801a10e7d043c4946b34319989d55
Author: 刘士 <liushilive@...>
Date:   2018-10-25T03:50:04Z

    还原由工具覆盖的原文注释

----


---