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

Update the Japanese translation #760

Merged
merged 8 commits into from
Oct 16, 2017

Conversation

classicarma
Copy link
Contributor

  • support to new entyrs
  • fix to wrong translations
  • a little fix

just fix for miss translation
added the Japanese translation for new entry
support to new entrys and fix to miss translation.
support to new entrys and a little tweak.
<Chinese>此項設定被任務給覆寫。</Chinese>
<Chinesesimp>此项设定被任务给覆写。</Chinesesimp>
</Key>
<Key ID="STR_cba_settings_overwritten_by_server_tooltip">
<English>This setting is overwritten by the server.</English>
<German>Diese Einstellung wird vom Server überschrieben.</German>
<Japanese>この設定はサーバーによって上書きされます。</Japanese>
<Chinese>此項設定被伺服器給覆寫。</Chinese>
<Chinesesimp>此项设定被伺服器给覆写。</Chinesesimp>
</Key>
<Key ID="STR_cba_settings_overwritten_by_client_tooltip_server">
<English>This setting is overwritten by the clients and only applies to the server.</English>
Copy link
Member

Choose a reason for hiding this comment

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

Can you indent the other lines as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sure, please reject this pull request. I will do fix and re-pull request.

Copy link
Member

Choose a reason for hiding this comment

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

Just add it to this one.

Copy link
Contributor Author

@classicarma classicarma Oct 16, 2017

Choose a reason for hiding this comment

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

ahh, I got it. I did not know how edit when after pull request. and now fixed.

Copy link
Member

Choose a reason for hiding this comment

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

No worries, now you do! :)

I meant this whole key, since they are all not indented correctly. Line 188 to including line 193 should be indented one forward. It's not your fault, I just noticed now and thought it would be fastest to fix with this PR rather.

Copy link
Contributor

Choose a reason for hiding this comment

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

jonpas, this PR is on this repository. You could've just indented it yourself. :P

Copy link
Member

Choose a reason for hiding this comment

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

Was on phone, not home, not going to bother with Git on phone, thank you! 😆

@jonpas jonpas added this to the 3.5 milestone Oct 16, 2017
@commy2 commy2 merged commit bf5b403 into CBATeam:master Oct 16, 2017
@classicarma classicarma deleted the jpn-translate-458e571 branch January 9, 2018 04:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants