Skip to content
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

Add localization for Bitbucket Branch Source plugin #12

Merged
merged 5 commits into from
Oct 10, 2018

Conversation

cizezsy
Copy link
Contributor

@cizezsy cizezsy commented Oct 9, 2018

@jenkinsci/chinese-localization-sig

@cizezsy
Copy link
Contributor Author

cizezsy commented Oct 9, 2018

为啥这个commit hisotry这么奇怪,你合并的时候是不是用的rebase啊 😂

@LinuxSuRen
Copy link
Member

你是基于最新的 master 分支来新建的分支吗?

@cizezsy
Copy link
Contributor Author

cizezsy commented Oct 9, 2018

是啊,修改前我也pull下来更新了。

@LinuxSuRen
Copy link
Member

那不应该出现这种情况的,你先把 master 更新为最新的,然后再基于 master 创建新的分支,最后修改(添加)文件。

@cizezsy
Copy link
Contributor Author

cizezsy commented Oct 9, 2018

@LinuxSuRen 这个PR merge掉吧,还是我改改我本地的hisotry,然后强制push上来?下次我注意一下。

@LinuxSuRen
Copy link
Member

晚一点 review 下,我也可以 squash

@cizezsy
Copy link
Contributor Author

cizezsy commented Oct 9, 2018

OK,谢谢啦

@LinuxSuRen
Copy link
Member

Jenkins 中其他地方的 Credentials 翻译为凭据,我们需要统一下

@@ -0,0 +1,2 @@
Name=\u547d\u540d
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里不应该是名称吗?

Copy link
Contributor Author

@cizezsy cizezsy Oct 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

因为这里是给一个 server endpoint 设置名称

The human friendly name for this Bitbucket server endpoint.

我当时觉得命名这个翻译会好一点,不过好像名称就行了。

@LinuxSuRen
Copy link
Member

LGTM

@LinuxSuRen LinuxSuRen merged commit 247c31e into jenkinsci:master Oct 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants