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

Merge two translation contributing documents #23939

Merged
merged 7 commits into from
May 25, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented Apr 6, 2023

This PR also adjusts the weights.

@lunny lunny added the type/docs This PR mainly updates/creates documentation label Apr 6, 2023
@wolfogre

This comment was marked as outdated.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 6, 2023
@delvh delvh added this to the 1.20.0 milestone Apr 6, 2023
@delvh delvh added the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Apr 6, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 22, 2023
@lunny lunny requested review from wolfogre and delvh May 22, 2023 09:09
@lunny
Copy link
Member Author

lunny commented May 22, 2023

@wolfogre @delvh please review again

@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 May 22, 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 May 25, 2023
@techknowlogick techknowlogick enabled auto-merge (squash) May 25, 2023 15:49
@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 25, 2023
@techknowlogick techknowlogick merged commit 19722cf into go-gitea:main May 25, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 25, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 25, 2023
This PR also adjusts the weights.

---------

Co-authored-by: delvh <dev.lh@web.de>
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label May 25, 2023
@lunny lunny deleted the lunny/merge_translation_doc branch May 25, 2023 16:04
techknowlogick pushed a commit that referenced this pull request May 25, 2023
Backport #23939 by @lunny

This PR also adjusts the weights.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 26, 2023
* upstream/main:
  Use the type RefName for all the needed places and fix pull mirror sync bugs (go-gitea#24634)
  [skip ci] Updated translations via Crowdin
  Add Link to Stars and Forks Page to Repo List (go-gitea#24931)
  Fix documentation ref (go-gitea#24934)
  Add Chinese docs for help, contribution and development (go-gitea#24925)
  Merge two translation contributing documents (go-gitea#23939)
  Add the ability to pin Issues (go-gitea#24406)
  Use `shared/issueicon` template in projects (go-gitea#24922)
  Allow skipping forks and mirrors from being indexed (go-gitea#23187)
  Add Chinese documentations for Actions (go-gitea#24902)

# Conflicts:
#	templates/repo/issue/view_content/sidebar.tmpl
Codeberg-org pushed a commit to Codeberg-org/gitea that referenced this pull request Jun 3, 2023
…ea#24933)

Backport go-gitea#23939 by @lunny

This PR also adjusts the weights.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
(cherry picked from commit d1af0a3)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/docs This PR mainly updates/creates documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants