[FW][I18N] *: export 15.0 translations

[fw-bot]

Forward-Port-Of: #7436
Forward-Port-Of: #7435

[robodoo]

Pull request status dashboard.

[fw-bot]

@mart-e cherrypicking of pull request #7435 failed.

stdout:

Auto-merging locale/sources/administration.pot
CONFLICT (content): Merge conflict in locale/sources/administration.pot
Auto-merging locale/sources/developer.pot
CONFLICT (content): Merge conflict in locale/sources/developer.pot
Auto-merging locale/sources/finance.pot
CONFLICT (content): Merge conflict in locale/sources/finance.pot
Auto-merging locale/sources/general.pot
CONFLICT (content): Merge conflict in locale/sources/general.pot
Auto-merging locale/sources/inventory_and_mrp.pot
CONFLICT (content): Merge conflict in locale/sources/inventory_and_mrp.pot
Auto-merging locale/sources/legal.pot
CONFLICT (content): Merge conflict in locale/sources/legal.pot
Auto-merging locale/sources/productivity.pot
CONFLICT (content): Merge conflict in locale/sources/productivity.pot
Auto-merging locale/sources/sales.pot
CONFLICT (content): Merge conflict in locale/sources/sales.pot
Auto-merging locale/sources/websites.pot
CONFLICT (content): Merge conflict in locale/sources/websites.pot

stderr:

09:02:08.207058 git.c:463               trace: built-in: git cherry-pick 265a18bce96d41ec55cd6d06a3bd361783046425
error: could not apply 265a18bce... [I18N] *: export 15.0 translations
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

[mart-e]

robodoo r+