[go: up one dir, main page]

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

From: https://github.com/frappe/frappe/pull/35104
Date: 2025-12-09 11:58:52+05:30

  • chore: update POT file (#35104)



Diagnostics

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


Suspicious changes found (Telemetry / telemetry):
* 4f7bdb3165fbf537df4914798ab363e3d6c7dbf7 chore: update POT file (#35104)
```diff

```



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

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

# 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

Loading