Skip to content

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

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

From: https://github.com/frappe/erpnext/pull/40772
Date: 2024-04-09 05:10:28+05:30

  • fix: sync translations from crowdin (#40772)


Diagnostics

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




Suspicious changes found (dokos|telemetry|shipping_rule|capture_doc):
  a2271bf835ef30470bd4f64d5435d8036fd81fd0 fix: sync translations from crowdin (#40772)


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

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

# 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