Skip to content

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

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

From: https://github.com/frappe/erpnext/pull/40917
Date: 2024-04-10 21:24:53+05:30

  • Merge pull request #40917 from frappe/l10n_develop
  • fix: Bosnian translations
  • fix: Persian translations
  • fix: Bosnian translations
  • fix: Esperanto translations
  • fix: Turkish translations
  • fix: Arabic translations
  • fix: Persian translations
  • fix: Spanish translations
  • fix: German translations


Diagnostics

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


Conflicts detected for source commit: 9f3a1567b5af17721f96056dc51cd4d7269031ca
- DU erpnext/locale/eo.po
Conflicts detected for source commit: 0ade33dd1afff3b7c938b28142289c42254363eb
- DU erpnext/locale/bs.po
Conflicts detected for source commit: 165641e495375a6ed28d536d1e1c637fde737b6a
- DU erpnext/locale/fr.po
Cleaning files from denylist:
 erpnext/locale/fr.po | 83615 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83615 insertions(+)


Suspicious merge commit detected: 165641e495375a6ed28d536d1e1c637fde737b6a


Suspicious changes found (dokos|telemetry|shipping_rule|capture_doc):
  53f7fc055ecc590b36c2bc42d63c520c90a7238e fix: Bosnian translations
  93da7e0c392078cdf9adb9e7d8c4e24326dddef1 fix: Esperanto translations


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

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

# 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