Skip to content

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

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

From: https://github.com/frappe/frappe/pull/26806
Date: 2024-06-25 17:43:12+02:00

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


Diagnostics

Suspicious merge commit detected: 445118a728699911224ab78e53415ef8e9d192e0


Suspicious changes found (dokos|telemetry|shipping_rule|capture_doc|sentry|marketplace_apps|subscription_conf):
  3cda099a19b0585db666738a0cc78e6f35816344 fix: French translations


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

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

# 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