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

chore: add german translations (backport #34167) #34222

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 27, 2023

This is an automatic backport of pull request #34167 done by Mergify.
Cherry-pick of bbb6a62 has failed:

On branch mergify/bp/version-13-hotfix/pr-34167
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit bbb6a62a7d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/translations/de.csv

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* chore: add german translations

* Apply suggestions from code review

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit bbb6a62)

# Conflicts:
#	erpnext/translations/de.csv
@mergify mergify bot added the conflicts label Feb 27, 2023
@deepeshgarg007 deepeshgarg007 merged commit 1b2c4bf into version-13-hotfix Mar 7, 2023
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-34167 branch March 7, 2023 06:17
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.49.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 20, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants