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

fix: german translations (backport #17663) #20114

Merged
merged 2 commits into from
Feb 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 21, 2023

This is an automatic backport of pull request #17663 done by Mergify.
Cherry-pick of 769abcf has failed:

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

You are currently cherry-picking commit 769abcf4c4.
  (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)

Changes to be committed:
	modified:   frappe/translations/de.csv

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/public/js/frappe/form/link_selector.js
	both modified:   frappe/public/js/frappe/ui/filters/filter.js

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

(cherry picked from commit 769abcf)

# Conflicts:
#	frappe/public/js/frappe/form/link_selector.js
#	frappe/public/js/frappe/ui/filters/filter.js
@mergify mergify bot requested review from a team and ankush and removed request for a team February 21, 2023 16:58
@mergify mergify bot added the conflicts label Feb 21, 2023
@barredterra barredterra removed their assignment Feb 21, 2023
@ankush ankush merged commit 1a38314 into version-13-hotfix Feb 22, 2023
@ankush ankush deleted the mergify/bp/version-13-hotfix/pr-17663 branch February 22, 2023 05:26
frappe-pr-bot pushed a commit that referenced this pull request Feb 28, 2023
# [13.50.0](v13.49.3...v13.50.0) (2023-02-28)

### Bug Fixes

* german translations (backport [#17663](#17663)) ([#20114](#20114)) ([1a38314](1a38314))
* hide invalid filters for 'HTML Editor' and 'Markdown Editor' ([#20119](#20119)) ([#20127](#20127)) ([1c69d43](1c69d43))
* prevent overwriting of the warnings by PyPDF2 ([#20170](#20170)) ([dca7c38](dca7c38))
* raise_exception=False for has_permission in filter_allowed_users ([#20113](#20113)) ([#20122](#20122)) ([23137f2](23137f2))
* Reload frm doc doc_update trigger to avoid timestamp conflict ([df4d3a2](df4d3a2))
* support for different delimiter for timeline email linking (backport [#19751](#19751)) ([#20154](#20154)) ([ea78695](ea78695))
* **UX:** Freeze form while applying workflow ([db93700](db93700))
* **UX:** invalid filters, incorrect std fieldtypes (backport [#19657](#19657)) ([#20118](#20118)) ([a612baa](a612baa))
* **workflow:** move dom unfreeze to `finally` (backport [#20161](#20161)) ([#20176](#20176)) ([14abb0e](14abb0e))

### Features

* Request, Job Hooks {Before/After} (backport [#19971](#19971)) ([#20073](#20073)) ([17adda2](17adda2))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.50.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 15, 2023
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.

3 participants