turtle/stockpile
1
11
Fork
You've already forked stockpile
8

Translations update from Codeberg Translate #65

Open
translate wants to merge 1 commit from translate/jellybean:weblate-jellybean-jellybean into main
pull from: translate/jellybean:weblate-jellybean-jellybean
merge into: turtle:main
turtle:main
turtle:usage_interval
turtle:adw_navigation_split_view
Contributor
Copy link

Translations update from Codeberg Translate for Stockpile/Stockpile.

Current translation status:

Weblate translation status

Translations update from [Codeberg Translate](https://translate.codeberg.org) for [Stockpile/Stockpile](https://translate.codeberg.org/projects/jellybean/jellybean/). Current translation status: ![Weblate translation status](https://translate.codeberg.org/widget/jellybean/jellybean/horizontal-auto.svg)
Currently translated at 100.0% (109 of 109 strings)
Translation: Stockpile/Stockpile
Translate-URL: https://translate.codeberg.org/projects/jellybean/jellybean/es/
This pull request has changes conflicting with the target branch.
  • po/es.po
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u weblate-jellybean-jellybean:translate-weblate-jellybean-jellybean
git switch translate-weblate-jellybean-jellybean

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff translate-weblate-jellybean-jellybean
git switch translate-weblate-jellybean-jellybean
git rebase main
git switch main
git merge --ff-only translate-weblate-jellybean-jellybean
git switch translate-weblate-jellybean-jellybean
git rebase main
git switch main
git merge --no-ff translate-weblate-jellybean-jellybean
git switch main
git merge --squash translate-weblate-jellybean-jellybean
git switch main
git merge --ff-only translate-weblate-jellybean-jellybean
git switch main
git merge translate-weblate-jellybean-jellybean
git push origin main
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Reference
turtle/stockpile!65
Reference in a new issue
turtle/stockpile
No description provided.
Delete branch "translate/jellybean:weblate-jellybean-jellybean"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?