[go: up one dir, main page]

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

Bot Dokosrequested to merge
ft-pr-46563 into develop

From: https://github.com/frappe/erpnext/pull/46563
Date: 2025-03-17 16:56:17+05:30

  • fix: Croatian translations
  • fix: Bosnian translations
  • fix: Persian translations
  • fix: Swedish translations


Diagnostics

Conflicts detected for source commit: addc26fb2b140bd900a71fd6e3af257c6376b044
- DU erpnext/locale/fr_FR.po
Cleaning files from denylist:
 erpnext/locale/fr_FR.po | 60609 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60609 insertions(+)


Conflicts detected for source commit: a70354a0a4302475b5043e5a817c856727c12e26
- DU erpnext/locale/fr_FR.po
Cleaning files from denylist:
 erpnext/locale/fr_FR.po | 60609 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60609 insertions(+)


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

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

# 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