Skip to content

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

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

From: https://github.com/frappe/erpnext/pull/41411
Date: 2024-05-19 20:44:23+05:30

  • fix: sync translations from crowdin (#41411)


Diagnostics

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




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


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

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

# 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