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

refactor(Translations): prisoner exchange with HRMS (backport #37376) #37403

Merged
merged 7 commits into from
Nov 28, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 9, 2023

This is an automatic backport of pull request #37376 done by Mergify.


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 4b4efbc)

# Conflicts:
#	erpnext/translations/af.csv
#	erpnext/translations/am.csv
#	erpnext/translations/ar.csv
#	erpnext/translations/bg.csv
#	erpnext/translations/bn.csv
#	erpnext/translations/bs.csv
#	erpnext/translations/ca.csv
#	erpnext/translations/cs.csv
#	erpnext/translations/da.csv
#	erpnext/translations/de.csv
#	erpnext/translations/el.csv
#	erpnext/translations/es.csv
#	erpnext/translations/et.csv
#	erpnext/translations/fa.csv
#	erpnext/translations/fi.csv
#	erpnext/translations/fr.csv
#	erpnext/translations/gu.csv
#	erpnext/translations/he.csv
#	erpnext/translations/hi.csv
#	erpnext/translations/hr.csv
#	erpnext/translations/hu.csv
#	erpnext/translations/id.csv
#	erpnext/translations/is.csv
#	erpnext/translations/it.csv
#	erpnext/translations/ja.csv
#	erpnext/translations/km.csv
#	erpnext/translations/kn.csv
#	erpnext/translations/ko.csv
#	erpnext/translations/ku.csv
#	erpnext/translations/lo.csv
#	erpnext/translations/lt.csv
#	erpnext/translations/lv.csv
#	erpnext/translations/mk.csv
#	erpnext/translations/ml.csv
#	erpnext/translations/mr.csv
#	erpnext/translations/ms.csv
#	erpnext/translations/my.csv
#	erpnext/translations/nl.csv
#	erpnext/translations/no.csv
#	erpnext/translations/pl.csv
#	erpnext/translations/ps.csv
#	erpnext/translations/pt-BR.csv
#	erpnext/translations/pt.csv
#	erpnext/translations/ro.csv
#	erpnext/translations/ru.csv
#	erpnext/translations/rw.csv
#	erpnext/translations/si.csv
#	erpnext/translations/sk.csv
#	erpnext/translations/sl.csv
#	erpnext/translations/sq.csv
#	erpnext/translations/sr-SP.csv
#	erpnext/translations/sr.csv
#	erpnext/translations/sv.csv
#	erpnext/translations/sw.csv
#	erpnext/translations/ta.csv
#	erpnext/translations/te.csv
#	erpnext/translations/th.csv
#	erpnext/translations/tr.csv
#	erpnext/translations/uk.csv
#	erpnext/translations/ur.csv
#	erpnext/translations/uz.csv
#	erpnext/translations/vi.csv
#	erpnext/translations/zh-TW.csv
#	erpnext/translations/zh.csv
(cherry picked from commit 4b8dc8a)

# Conflicts:
#	erpnext/translations/af.csv
#	erpnext/translations/am.csv
#	erpnext/translations/ar.csv
#	erpnext/translations/bg.csv
#	erpnext/translations/bn.csv
#	erpnext/translations/bs.csv
#	erpnext/translations/ca.csv
#	erpnext/translations/cs.csv
#	erpnext/translations/da.csv
#	erpnext/translations/de.csv
#	erpnext/translations/el.csv
#	erpnext/translations/es.csv
#	erpnext/translations/et.csv
#	erpnext/translations/fa.csv
#	erpnext/translations/fi.csv
#	erpnext/translations/fr.csv
#	erpnext/translations/gu.csv
#	erpnext/translations/he.csv
#	erpnext/translations/hi.csv
#	erpnext/translations/hr.csv
#	erpnext/translations/hu.csv
#	erpnext/translations/id.csv
#	erpnext/translations/is.csv
#	erpnext/translations/it.csv
#	erpnext/translations/ja.csv
#	erpnext/translations/km.csv
#	erpnext/translations/kn.csv
#	erpnext/translations/ko.csv
#	erpnext/translations/ku.csv
#	erpnext/translations/lo.csv
#	erpnext/translations/lt.csv
#	erpnext/translations/lv.csv
#	erpnext/translations/mk.csv
#	erpnext/translations/ml.csv
#	erpnext/translations/mr.csv
#	erpnext/translations/ms.csv
#	erpnext/translations/my.csv
#	erpnext/translations/nl.csv
#	erpnext/translations/no.csv
#	erpnext/translations/pl.csv
#	erpnext/translations/ps.csv
#	erpnext/translations/pt-BR.csv
#	erpnext/translations/pt.csv
#	erpnext/translations/ro.csv
#	erpnext/translations/ru.csv
#	erpnext/translations/rw.csv
#	erpnext/translations/si.csv
#	erpnext/translations/sk.csv
#	erpnext/translations/sl.csv
#	erpnext/translations/sq.csv
#	erpnext/translations/sr.csv
#	erpnext/translations/sv.csv
#	erpnext/translations/sw.csv
#	erpnext/translations/ta.csv
#	erpnext/translations/te.csv
#	erpnext/translations/th.csv
#	erpnext/translations/tr.csv
#	erpnext/translations/uk.csv
#	erpnext/translations/ur.csv
#	erpnext/translations/uz.csv
#	erpnext/translations/vi.csv
#	erpnext/translations/zh-TW.csv
#	erpnext/translations/zh.csv
@ruchamahabal
Copy link
Member

Backporting this first: #36343

@stale
Copy link

stale bot commented Oct 28, 2023

This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

@stale stale bot added the inactive label Oct 28, 2023
@stale stale bot removed the inactive label Oct 28, 2023
@barredterra barredterra reopened this Oct 28, 2023
@barredterra
Copy link
Collaborator

This has to wait until frappe/hrms#952 is merged.

@barredterra barredterra marked this pull request as draft October 28, 2023 20:40
Copy link

stale bot commented Nov 28, 2023

This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

@barredterra barredterra marked this pull request as ready for review November 28, 2023 09:26
To make the linter happy
@barredterra barredterra removed their assignment Nov 28, 2023
@ruchamahabal ruchamahabal merged commit e490bd7 into version-14-hotfix Nov 28, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-37376 branch November 28, 2023 12:21
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.51.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 Jan 3, 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.

3 participants