Skip to content

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

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

From: https://github.com/frappe/erpnext/pull/40683
Date: 2024-03-27 04:55:03+05:30

  • fix: sync translations from crowdin (#40683)


Diagnostics

Conflicts detected for source commit: edced3fd21412eb381d893b3ddcc254b3ee142bf
- DU erpnext/locale/ar.po
- DU erpnext/locale/fr.po
Cleaning files from denylist:
 erpnext/locale/fr.po | 82753 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82753 insertions(+)




Suspicious changes found (dokos|telemetry|shipping_rule|capture_doc):
  5a158e3f507b08f8ad13f095714fb5bfeac31013 fix: sync translations from crowdin (#40683)


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

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

# 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