Skip to content

fix: sync translations from crowdin by frappe-pr-bot [frappe] PR#41262

Bot Dokos requested to merge ft-pr-41262 into develop

From: https://github.com/frappe/erpnext/pull/41262
Date: 2024-05-10 19:58:17+05:30

  • fix: sync translations from crowdin (#41262)


Diagnostics

Conflicts detected for source commit: f92aabd0f315df85d59ab2946142e16f88baf811
- DU erpnext/locale/bs.po
- DU erpnext/locale/eo.po
- DU erpnext/locale/fr.po
Cleaning files from denylist:
 erpnext/locale/fr.po | 83830 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83830 insertions(+)




Suspicious changes found (dokos|telemetry|shipping_rule|capture_doc|sentry|marketplace_apps|subscription_conf):
  0825a442ae9b3a7978545ad7e27ec729c72fd9a6 fix: sync translations from crowdin (#41262)


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-41262

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-41262

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports