New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

translate into Chinese (simplified) under install/SetupWizard/ #3204

Merged
merged 16 commits into from Jan 7, 2018

Conversation

3 participants
@node
Contributor

node commented Dec 21, 2017

Please help to review @oleg-nenashev @LinuxSuRen .

node added some commits Dec 5, 2017

@oleg-nenashev

From what I see all tags are correct, have not reviewed the text.

CC @kzantow @tfennelly who originally put these HTML tags to messages. IMHO it's a bug, not a feature

installWizard_jenkinsVersionTitle=Jenkins
installWizard_offline_title=\u79bb\u7ebf
installWizard_offline_message=\u8be5jenkins\u5b9e\u4f8b\u4f3c\u4e4e\u5df2\u79bb\u7ebf\u3002\
<p style="font-size:18px; margin-top: 6%"> \

This comment has been minimized.

@oleg-nenashev

oleg-nenashev Dec 22, 2017

Member

Wow, it is really being stored in localization files 🤦‍♂️

This comment has been minimized.

@node

node Dec 23, 2017

Contributor

Should I remove all HTML tags in the property file when translate ? Include tag ?

This comment has been minimized.

@oleg-nenashev

oleg-nenashev Dec 23, 2017

Member

It's not your problem, I'd say. It was introduced by the Setup Wizard developers. I would keep it as is in the current pull request.

installWizard_upgradeSkipped_title=\u66f4\u65b0
installWizard_upgradeSkipped_banner=\u7279\u6027\u672a\u5b89\u88c5
installWizard_upgradeSkipped_message=<div class="alert alert-warning fade in">\u5efa\u8bae\u7684\u63d2\u4ef6\u5c06\u4e0d\u88ab\u5b89\u88c5\u3002</div> \
<p style="padding: 0 4px">\u5982\u679c\u4f60\u6539\u53d8\u4e3b\u610f\u4e86\uff0c\u8fd8\u53ef\u4ee5\u4ece\u63d2\u4ef6\u7ba1\u7406\u5668\u5b89\u88c5\u65b0\u7279\u6027\u3002</p>\

This comment has been minimized.

@oleg-nenashev
@LinuxSuRen

This comment has been minimized.

Member

LinuxSuRen commented Dec 23, 2017

do all these commits will squash in the merge progress?
@oleg-nenashev

installWizard_welcomePanel_customizeActionTitle=选择插件来安装
installWizard_welcomePanel_customizeActionDetails=选择并安装最适合的插件。
installWizard_welcomePanel_title=\u65b0\u624b\u5165\u95e8
installWizard_welcomePanel_banner=\u81ea\u5b9a\u4e49jenkins

This comment has been minimized.

@LinuxSuRen

LinuxSuRen Dec 26, 2017

Member

here 'jenkins' should be 'Jenkins'

This comment has been minimized.

@LinuxSuRen

LinuxSuRen Dec 26, 2017

Member

应该统一是Jenkins,首字母大写的吧

# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
HTTP\ Proxy\ Configuration=\u914d\u7f6eHTTP\u4ee3\u7406

This comment has been minimized.

@LinuxSuRen

LinuxSuRen Dec 26, 2017

Member

个人感觉这里应该是个名词,如果“配置”在前的话则是动词
HTTP代理配置

This comment has been minimized.

@node

node Jan 3, 2018

Contributor

是的,先merge后面我再更新下吧。

This comment has been minimized.

@LinuxSuRen
@oleg-nenashev

This comment has been minimized.

Member

oleg-nenashev commented Dec 29, 2017

@LinuxSuRen I do not squash commits while commits are atomic and have good commit messages

@oleg-nenashev

This comment has been minimized.

Member

oleg-nenashev commented Dec 29, 2017

In this case I have no strong preference

@oleg-nenashev

This comment has been minimized.

Member

oleg-nenashev commented Jan 7, 2018

There are update/create cycles for the same entries, so I will squash the PR

@oleg-nenashev oleg-nenashev merged commit adba0d3 into jenkinsci:master Jan 7, 2018

1 check passed

continuous-integration/jenkins/pr-head This commit looks good
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment