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 zh-cn.cfg #157

Merged
merged 3 commits into from
Feb 6, 2023
Merged

Update zh-cn.cfg #157

merged 3 commits into from
Feb 6, 2023

Conversation

Peter-JY
Copy link

@Peter-JY Peter-JY commented Feb 6, 2023

updates #11
updates #6

@Peter-JY Peter-JY closed this Feb 6, 2023
@zer0Kerbal zer0Kerbal reopened this Feb 6, 2023
@zer0Kerbal zer0Kerbal changed the base branch from master to 1.4.4.0-release February 6, 2023 07:24
@zer0Kerbal zer0Kerbal added state: approved Approved to proceed. type: localization related to localization and translations labels Feb 6, 2023
@zer0Kerbal zer0Kerbal added this to the Localization - Master milestone Feb 6, 2023
@zer0Kerbal zer0Kerbal linked an issue Feb 6, 2023 that may be closed by this pull request
17 tasks
@zer0Kerbal zer0Kerbal changed the base branch from 1.4.4.0-release to zh-cn February 6, 2023 07:30
@@ -2,7 +2,7 @@

| modName | Taerobee (TBEE) |
| ---------- | ---------------------------------------------------------------- |
| license | CC-BY-ND-3.0 |
| license | CC-BY-NC-SA-4.0 |
Copy link
Owner

Choose a reason for hiding this comment

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

The license is CC BY-ND 3.0 Unported, except for the localization config files - all submissions are subject to this license.

@@ -3,7 +3,7 @@ Taerobee (TBEE)
created: 17 Jul 2017
updated: 17 Jan 2023 -->

<!--this file: CC BY-ND 4.0 by zer0Kerbal-->
Copy link
Owner

Choose a reason for hiding this comment

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

the license for this file remains CC BY-ND 4.0 by zer0Kerbal.

@zer0Kerbal zer0Kerbal marked this pull request as draft February 6, 2023 07:35
@zer0Kerbal zer0Kerbal added issue: license having to do with license/licensing and removed state: approved Approved to proceed. labels Feb 6, 2023
// created: 2023-02-04
// updated: 2923-02-04

Localization #仅限原版 For stock only
Copy link
Owner

Choose a reason for hiding this comment

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

config formatting issue:

//  #仅限原版 For stock only
Localization

@zer0Kerbal zer0Kerbal marked this pull request as ready for review February 6, 2023 20:20
Copy link
Owner

@zer0Kerbal zer0Kerbal left a comment

Choose a reason for hiding this comment

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

thank you for the translation!;

I will revert the changes to the licenses before merging into the dev branch.

@zer0Kerbal zer0Kerbal merged commit e8b68a7 into zer0Kerbal:zh-cn Feb 6, 2023
@zer0Kerbal
Copy link
Owner

changes fully deleted, branch deleted. RE: political statements and attempted poison pill.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
issue: license having to do with license/licensing type: localization related to localization and translations
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Localization - Simplified Chinese (简体中文) <zh-cn.cfg>
2 participants