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.

Sign up for GitHub

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

Jump to bottom

Add missing translation #26926

Merged
merged 1 commit into from
Sep 6, 2023
Merged

Add missing translation #26926

merged 1 commit into from
Sep 6, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented Sep 6, 2023

Fix #26923

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 6, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 6, 2023
@lunny lunny added the backport/v1.20 This PR should be backported to Gitea 1.20 label Sep 6, 2023
@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 Sep 6, 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 Sep 6, 2023
@techknowlogick techknowlogick merged commit 31c92d9 into go-gitea:main Sep 6, 2023
23 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Sep 6, 2023
@GiteaBot
Copy link
Contributor

GiteaBot commented Sep 6, 2023

I was unable to create a backport for 1.20. @lunny, please send one manually. 🍵

go run ./contrib/backport 26926
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Sep 6, 2023
@lunny lunny deleted the lunny/add_missing_translation branch September 6, 2023 02:15
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 6, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
dc4aa3f 
* giteaofficial/main:
  Add missing translation (go-gitea#26926)
  Vendor `jquery.are-you-sure` with strict mode fixes (go-gitea#26901)
  Fix the secret regexp pattern on web page (go-gitea#26910)
  Add @chenrui333 as maintainer (go-gitea#26917)
  Move notification interface to services layer (go-gitea#26915)
  fetch emails of currently displayed user on admin page (go-gitea#26918)
  Improve LDAP group config documentation, fixes go-gitea#21159 (go-gitea#21227)
  update footer link to new landing page (go-gitea#26916)
  Remove `Named` interface (go-gitea#26913)
  Refactor secrets modification logic (go-gitea#26873)
  Add missing `reqToken()` to notifications endpoints (go-gitea#26914)
  feat(API): add routes and functions for managing user's secrets (go-gitea#26909)
  Move feed notification service layer (go-gitea#26908)
  Extract common code to new template (go-gitea#26903)
  Move ui notification to service layer (go-gitea#26907)
  Remove duplicated notify mail configuration on tests (go-gitea#26912)
  Move indexer notification to service layer (go-gitea#26906)

# Conflicts:
#	templates/base/footer_content.tmpl
@techknowlogick techknowlogick modified the milestones: 1.22.0, 1.21.0 Sep 6, 2023
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 5, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

@silverwind silverwind silverwind approved these changes

Assignees
No one assigned
Labels
backport/manual No power to the bots! Create your backport yourself! backport/v1.20 This PR should be backported to Gitea 1.20 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/translation size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.

Translation missing: "repo.pulls.has_merged"
4 participants
@lunny @GiteaBot @silverwind @techknowlogick