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

zh-CN: Apply #2492 #2501 + Some minor changes #2508

Merged
merged 1 commit into from
Dec 17, 2022
Merged

zh-CN: Apply #2492 #2501 + Some minor changes #2508

merged 1 commit into from
Dec 17, 2022

Conversation

LPR-Michael
Copy link
Contributor

Applying for issue(s):

Minor changes:
Add some ‘{NEWLINE}’ In some lines which been used in New Games window to make sure that string display well on all Fonts.

@github-actions
Copy link

Check results

For details go to Translation Check -> Details. Expand Run checks build stage and use the build-in search to find your language (e.g. pl-PL)

MissingThe translation is not added to translation file. (e.g. STR_9999 is in en-GB but is not available in given language)

Not neededThe translation file contains entries that are not in en-GB and should be removed (e.g. STR_9999 exits in given language but is not in en-GB)

SameThe translation and source string is exactly the same. (e.g. STR_9999 is Umbrella in both en-GB and given language). This may be desired in some cases (e.g. April is the same in English and German)

zh-CN 0 (-2) 0 89

Other translations

MissingThe translation is not added to translation file. (e.g. STR_9999 is in en-GB but is not available in given language)

Not neededThe translation file contains entries that are not in en-GB and should be removed (e.g. STR_9999 exits in given language but is not in en-GB)

SameThe translation and source string is exactly the same. (e.g. STR_9999 is Umbrella in both en-GB and given language). This may be desired in some cases (e.g. April is the same in English and German)

ar-EG 34 1 1963
ca-ES 2 0 104
cs-CZ 269 0 246
da-DK 7 0 481
de-DE 10 0 329
en-US 3265 0 390
eo-ZZ 0 0 84
es-ES 0 0 291
fi-FI 33 0 109
fr-FR 0 0 149
hu-HU 211 0 90
it-IT 10 0 300
ja-JP 176 0 611
ko-KR 0 0 172
nb-NO 196 0 2166
nl-NL 2 12 412
pl-PL 18 0 389
pt-BR 0 0 133
ru-RU 1374 0 105
sv-SE 40 0 341
tr-TR 239 0 396
vi-VN 98 2 3272
zh-TW 49 0 331

@Gymnasiast
Copy link
Member

There are merge conflicts, so I cannot merge it. You need to fix these, or enable to option to allow me to do it.

@github-actions
Copy link

github-actions bot commented Dec 2, 2022

Check results

For details go to Translation Check -> Details. Expand Run checks build stage and use the build-in search to find your language (e.g. pl-PL)

MissingThe translation is not added to translation file. (e.g. STR_9999 is in en-GB but is not available in given language)

Not neededThe translation file contains entries that are not in en-GB and should be removed (e.g. STR_9999 exits in given language but is not in en-GB)

SameThe translation and source string is exactly the same. (e.g. STR_9999 is Umbrella in both en-GB and given language). This may be desired in some cases (e.g. April is the same in English and German)

zh-CN 60 (-2) 8 89

Other translations

MissingThe translation is not added to translation file. (e.g. STR_9999 is in en-GB but is not available in given language)

Not neededThe translation file contains entries that are not in en-GB and should be removed (e.g. STR_9999 exits in given language but is not in en-GB)

SameThe translation and source string is exactly the same. (e.g. STR_9999 is Umbrella in both en-GB and given language). This may be desired in some cases (e.g. April is the same in English and German)

ar-EG 94 9 1963
ca-ES 62 8 104
cs-CZ 321 0 246
da-DK 67 8 481
de-DE 4 8 345
en-US 3317 0 390
eo-ZZ 60 8 84
es-ES 60 8 291
fi-FI 93 8 109
fr-FR 3 8 157
hu-HU 215 8 94
it-IT 70 8 300
ja-JP 236 8 611
ko-KR 3 8 190
nb-NO 248 0 2166
nl-NL 62 20 412
pl-PL 78 8 381
pt-BR 60 8 133
ru-RU 1426 0 105
sv-SE 100 8 341
tr-TR 299 8 396
vi-VN 158 10 3264
zh-TW 101 0 331

@LPR-Michael
Copy link
Contributor Author

@Gymnasiast I'm sorry for that, How about now?

@Gymnasiast
Copy link
Member

Unfortunately, it is still not mergeable.
I can fix it for you, but you have to check a box labelled "Allow maintainers to make changed" or something like that.

@LPR-Michael
Copy link
Contributor Author

截屏2022-12-17 09 59 00

But this check box is already checked

@github-actions
Copy link

Check results

For details go to Translation Check -> Details. Expand Run checks build stage and use the build-in search to find your language (e.g. pl-PL)

MissingThe translation is not added to translation file. (e.g. STR_9999 is in en-GB but is not available in given language)

Not neededThe translation file contains entries that are not in en-GB and should be removed (e.g. STR_9999 exits in given language but is not in en-GB)

SameThe translation and source string is exactly the same. (e.g. STR_9999 is Umbrella in both en-GB and given language). This may be desired in some cases (e.g. April is the same in English and German)

zh-CN 61 (-2) 0 89

Other translations

MissingThe translation is not added to translation file. (e.g. STR_9999 is in en-GB but is not available in given language)

Not neededThe translation file contains entries that are not in en-GB and should be removed (e.g. STR_9999 exits in given language but is not in en-GB)

SameThe translation and source string is exactly the same. (e.g. STR_9999 is Umbrella in both en-GB and given language). This may be desired in some cases (e.g. April is the same in English and German)

ar-EG 95 1 1963
ca-ES 63 0 104
cs-CZ 322 0 246
da-DK 60 0 484
de-DE 1 0 345
en-US 3318 0 390
eo-ZZ 0 0 86
es-ES 0 0 298
fi-FI 94 0 109
fr-FR 0 0 157
hu-HU 114 0 110
it-IT 71 0 300
ja-JP 237 0 611
ko-KR 0 0 190
nb-NO 249 0 2166
nl-NL 0 12 441
pl-PL 79 0 381
pt-BR 0 0 142
ru-RU 1427 0 105
sv-SE 101 0 341
tr-TR 300 0 396
vi-VN 159 2 3264
zh-TW 102 0 331

@LPR-Michael
Copy link
Contributor Author

Should I close this pull request and start a new one?

@github-actions
Copy link

Check results

For details go to Translation Check -> Details. Expand Run checks build stage and use the build-in search to find your language (e.g. pl-PL)

MissingThe translation is not added to translation file. (e.g. STR_9999 is in en-GB but is not available in given language)

Not neededThe translation file contains entries that are not in en-GB and should be removed (e.g. STR_9999 exits in given language but is not in en-GB)

SameThe translation and source string is exactly the same. (e.g. STR_9999 is Umbrella in both en-GB and given language). This may be desired in some cases (e.g. April is the same in English and German)

zh-CN 61 (-2) 0 89

Other translations

MissingThe translation is not added to translation file. (e.g. STR_9999 is in en-GB but is not available in given language)

Not neededThe translation file contains entries that are not in en-GB and should be removed (e.g. STR_9999 exits in given language but is not in en-GB)

SameThe translation and source string is exactly the same. (e.g. STR_9999 is Umbrella in both en-GB and given language). This may be desired in some cases (e.g. April is the same in English and German)

ar-EG 95 1 1963
ca-ES 63 0 104
cs-CZ 322 0 246
da-DK 60 0 484
de-DE 1 0 345
en-US 3318 0 390
eo-ZZ 0 0 86
es-ES 0 0 298
fi-FI 94 0 109
fr-FR 0 0 157
hu-HU 114 0 110
it-IT 71 0 300
ja-JP 237 0 611
ko-KR 0 0 190
nb-NO 249 0 2166
nl-NL 0 12 441
pl-PL 79 0 381
pt-BR 0 0 142
ru-RU 1427 0 105
sv-SE 101 0 341
tr-TR 300 0 396
vi-VN 159 2 3264
zh-TW 102 0 331

@Gymnasiast
Copy link
Member

I fixed your branch now. For some reason, the GitHub interface didn’t let me, so I used the command line.

Closing a PR and creating a new one wouldn’t have helped you in this case, as your master branch was "dirty".

@Gymnasiast Gymnasiast merged commit 3b8e9bf into OpenRCT2:master Dec 17, 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