Skip to content

Update japanese translation - #1398

Closed
TakehideMorimoto wants to merge 2 commits into
gitblit-org:masterfrom
TakehideMorimoto:master
Closed

TakehideMorimoto wants to merge 2 commits into
gitblit-org:masterfrom
TakehideMorimoto:master

Conversation

@TakehideMorimoto

@TakehideMorimoto TakehideMorimoto commented Dec 6, 2021 •

Copy link
Copy Markdown

I made a Japanese translate here.

@TakehideMorimoto
TakehideMorimoto marked this pull request as ready for review December 6, 2021 03:41

@flaix flaix left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hi! This is awesome!

I found some issues in your files, so you may want to go over them again and make sure you have no duplicate keys, no incorrect keys and no empty definitions.

What is more, though, is a technical issue. Your changes are based on a rather old commit and then merged into your master. This way I cannot merge them. A merge request should always come from a separate branch, not from master. (And only contain the changes for one feature/topic.) So can you create a new branch on top of the current master of gitblit/gitblit and cherry-pick only the one commit 17da704 onto it? I do think that you will probably have to create a new merge request for it.

If you don't know how to do that, that is also not a problem. In that case you can also add a new commit to fix the issues and I will then create new commit from your commits for you.

Please be advised that several issues with language files have been fixed (see PR #1380), which also touched the Japanese properties file.

In any case, thank you very much for taking the time and improving the Japanase translation!

Comment thread src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
Comment thread src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
Comment thread src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
Comment thread src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
Comment thread src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
Comment thread src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
Comment thread src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
Comment thread src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
Comment thread src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
Comment thread src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
@flaix flaix added this to the 1.9.2 milestone Dec 6, 2021
@TakehideMorimoto

Copy link
Copy Markdown
Author

Sorry. I will go over some issues that you point out, and make sure keys.
And I create new branch and new merge request another day.

@flaix

flaix commented Jan 15, 2022

Copy link
Copy Markdown
Member

I have fixed the submission and added it under a new commit to the main branch.
Closing this as done.

@flaix flaix closed this Jan 15, 2022
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