Fix locale #32937
Merged
Fix locale #32937
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GiteaBot
added
the
lgtm/need 2
wxiaoguang
added
skip-changelog
delvh
approved these changes
Dec 21, 2024
GiteaBot
added
lgtm/need 1
hiifong
reviewed
Dec 21, 2024
| @@ -1946,8 +1946,8 @@ pulls.delete.title = Delete this pull request? | |||
| pulls.delete.text = Do you really want to delete this pull request? (This will permanently remove all content. Consider closing it instead, if you intend to keep it archived) | |||
|
|
|||
| pulls.recently_pushed_new_branches = You pushed on branch <strong>%[1]s</strong> %[2]s | |||
| pulls.upstream_diverging_prompt_behind_1 = This branch is %d commit behind %s | |||
| pulls.upstream_diverging_prompt_behind_n = This branch is %d commits behind %s | |||
| pulls.upstream_diverging_prompt_behind_1 = This branch is %[1]d commit behind %[2]s | |||
There was a problem hiding this comment.
No modification is required here
There was a problem hiding this comment.
What we need to modify should be options/locale/locale_zh-CN.ini
pulls.upstream_diverging_prompt_behind_1=该分支落后于 %[2]s %[1]d 个提交
pulls.upstream_diverging_prompt_behind_n=该分支落后于 %[2]s %[1]d 个提交There was a problem hiding this comment.
No, it can't be done on main branch. The backport needs to manually fix it.
There was a problem hiding this comment.
Maybe some maintainers should document how the Crowdin works @techknowlogick @lunny
There was a problem hiding this comment.
Sorry, I don't understand this workflow yet
There was a problem hiding this comment.
Yup, I do not quite understand either, so I mentioned techknowlogick & lunny
There was a problem hiding this comment.
Crowdin sync will only happen on the main branch. For other branches, we have to backport manually.
lunny
approved these changes
Dec 21, 2024
GiteaBot
added
lgtm/done
lunny
added
the
reviewed/wait-merge
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Dec 21, 2024
Merged
GiteaBot
added
backport/done
techknowlogick
pushed a commit
that referenced
this pull request
Dec 22, 2024
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Dec 23, 2024
* giteaofficial/main: (62 commits) Fix repo avatar conflict (go-gitea#32958) [skip ci] Updated licenses and gitignores fix trailing comma not matched in the case of alphanumeric issue (go-gitea#32945) Add auto-expanding running actions step (go-gitea#30058) Fix go-gitea#32954 (go-gitea#32955) Use Alpine 3.21 for the docker images (go-gitea#32924) Refactor template & test related code (go-gitea#32938) Use primary as button color (go-gitea#32949) [skip ci] Updated translations via Crowdin Add action auto-scroll (go-gitea#30057) Fix locale (go-gitea#32937) Enable Typescript `strictFunctionTypes` (go-gitea#32911) Fix areYouSure confirm (go-gitea#32941) Update i18n.go - Language Picker (go-gitea#32933) Move some errors to their own sub packages (go-gitea#32880) Improve navbar: add "admin" tip, add "active" style (go-gitea#32927) Refactor db package and remove unnecessary `DumpTables` (go-gitea#32930) show warning on navigation if currently editing comment or title (go-gitea#32920) Refactor pprof labels and process desc (go-gitea#32909) [skip ci] Updated translations via Crowdin ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #32936