Skip to content

chore: update POT file by frappe-pr-bot [frappe] PR#27300

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

From: https://github.com/frappe/frappe/pull/27300
Date: 2024-08-04 21:09:39+05:30

  • chore: update POT file (#27300)


Diagnostics

Conflicts detected for source commit: c06a854ea8335354a1ae85e1704ad264a63c7436
- DU frappe/locale/main.pot
- ?? "frappe/locale/main.pot~c06a854ea83 (chore: update POT file (#27300))"


Suspicious changes found (dokos|telemetry|shipping_rule|capture_doc|sentry|marketplace_apps|subscription_conf):
  859b68ee3e6371d237f98495601f5890b4177226 chore: update POT file (#27300)


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

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

# 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