Skip to content

De-duplicate contributor graph translations #29247

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

Merged
merged 1 commit into from
Feb 18, 2024

Conversation

sahinakkaya
Copy link
Contributor

I was using duplicate translations and @denyskon suggested to use %s's in translations in their review. I will make use of these translations in other PRs of mine (#29210 and #29191). If we want to include the two PRs I mentioned in v1.22, we should merge this asap.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 18, 2024
@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 Feb 18, 2024
@denyskon denyskon added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Feb 18, 2024
@sahinakkaya
Copy link
Contributor Author

I want to ask maintainers, can I merge this PR into other PR's of mine in my local and keep working? Can I assume that I will be good if this PR is eventually merged into upstream? Or should I wait until it is really merged to upstream then fetch changes?

@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 Feb 18, 2024
@delvh
Copy link
Member

delvh commented Feb 18, 2024

No, both are fine.
The first one simply means that as long as this PR is not merged, these changes will be shown in the other PRs as well.

@delvh delvh added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 18, 2024
@delvh delvh changed the title Improve translations for future PRs De-duplicate contributor graph translations Feb 18, 2024
@delvh delvh merged commit 20f6a7c into go-gitea:main Feb 18, 2024
@GiteaBot GiteaBot added this to the 1.22.0 milestone Feb 18, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 18, 2024
silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024
6543 pushed a commit to 6543-forks/gitea that referenced this pull request Feb 26, 2024
Copy link

Automatically locked because of our CONTRIBUTING guidelines

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 28, 2024
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. modifies/translation 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.

4 participants