duckgo/survivetest
1
0
Fork
You've already forked survivetest
2

Translate a bunch of mods to German #31

Open
Wuzzy wants to merge 7 commits from Wuzzy/survivetest:de2 into main
pull from: Wuzzy/survivetest:de2
merge into: duckgo:main
duckgo:main
First-time contributor
Copy link

I have translated a bunch of mods to German, but not everything.

In the first commit, I also updated the translation templates so other translators can contribute, too.

I have translated a bunch of mods to German, but not everything. In the first commit, I also updated the translation templates so other translators can contribute, too.

this is fantastic, it's going to be great, I'm definitely going to add it after the projects I'm currently doing, and I'm going to add it in version 0.8.5 that I want to add some new things.. thank you very much 🤩😊

this is fantastic, it's going to be great, I'm definitely going to add it after the projects I'm currently doing, and I'm going to add it in version 0.8.5 that I want to add some new things.. thank you very much 🤩😊
This pull request has changes conflicting with the target branch.
  • mods/3d_armor/3d_armor_ui/locale/3d_armor_ui.de.tr
  • mods/AGRICULTURE/barrels/locale/barrels.de.tr
  • mods/AGRICULTURE/dfarm/locale/dfarm.de.tr
  • mods/AGRICULTURE/dfarm/locale/dfarm.pt_BR.tr
  • mods/AGRICULTURE/dfarm/locale/template.txt
  • mods/ENTITIES/mobs/locale/mobs.de.tr
  • mods/ENTITIES/mobs/locale/mobs.en.tr
  • mods/ENTITIES/mobs/locale/mobs.es.tr
  • mods/ENTITIES/mobs/locale/mobs.fr.tr
  • mods/ENTITIES/mobs/locale/mobs.it.tr
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 de2:Wuzzy-de2
git switch Wuzzy-de2

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 Wuzzy-de2
git switch Wuzzy-de2
git rebase main
git switch main
git merge --ff-only Wuzzy-de2
git switch Wuzzy-de2
git rebase main
git switch main
git merge --no-ff Wuzzy-de2
git switch main
git merge --squash Wuzzy-de2
git switch main
git merge --ff-only Wuzzy-de2
git switch main
git merge Wuzzy-de2
git push origin main
Sign in to join this conversation.
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
duckgo/survivetest!31
Reference in a new issue
duckgo/survivetest
No description provided.
Delete branch "Wuzzy/survivetest:de2"

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?