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

Manual backport of locale for 1.20 (2nd) #25668

Merged
merged 2 commits into from
Jul 4, 2023

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Jul 4, 2023

The backport needs manually checking because some 1.21 strings might not be right for 1.20

This backport also includes most fixes from #25291 (comment) (thanks to lunny's manual fix on Crowdin side)

Close #25638

@GiteaBot GiteaBot added this to the 1.20.0 milestone Jul 4, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 4, 2023
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 4, 2023
@wxiaoguang wxiaoguang mentioned this pull request Jul 4, 2023
@@ -328,7 +328,7 @@ reset_password=حساب خود را دوباره فعال کنید
reset_password.title=%s، شما برای بازیابی حسابتان درخواست کرده‌اید
reset_password.text=لطفاً روی پیوند زیر کلیک کنید تا حساب خود را در <b>%s</b> بازیابی کنید:
register_success=ثبت‌نام با موفقیت انجام شد
issue_assigned.pull=@%[1] به شما برای درخواست pull %[2] در ریپازیتوری %[3] محول شده.
issue_assigned.pull=@%[1]s به شما برای درخواست pull %[2]s در ریپازیتوری %[3]s محول شده.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I edited this string on Crowdin side, and it should be not wrong at least:

image

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 4, 2023
@go-gitea go-gitea deleted a comment from GiteaBot Jul 4, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 4, 2023
@silverwind silverwind changed the title Manuall backport of locale for 1.20 (2nd) Manual backport of locale for 1.20 (2nd) Jul 4, 2023
@silverwind silverwind added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Jul 4, 2023
@6543 6543 enabled auto-merge (squash) July 4, 2023 11:39
@6543 6543 added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 4, 2023
@6543 6543 merged commit 9111d2d into go-gitea:release/v1.20 Jul 4, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 4, 2023
@wxiaoguang wxiaoguang deleted the backport-locale-manual branch July 4, 2023 11:48
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Oct 2, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants