Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Dec 10, 2025

As per usual, leave off developer.pot and contributing.pot since we don't translate them (not useful, can't really contribute to/dev in Odoo without knowing English)

Forward-Port-Of: #15606
Forward-Port-Of: #15601

@robodoo
Copy link
Collaborator

robodoo commented Dec 10, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Dec 10, 2025

@ticodoo @dylankiss cherrypicking of pull request #15601 failed.

stdout:

Auto-merging locale/sources/administration.pot
CONFLICT (content): Merge conflict in locale/sources/administration.pot
Auto-merging locale/sources/essentials.pot
CONFLICT (content): Merge conflict in locale/sources/essentials.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/hr.pot
CONFLICT (content): Merge conflict in locale/sources/hr.pot
Auto-merging locale/sources/inventory_and_mrp.pot
CONFLICT (content): Merge conflict in locale/sources/inventory_and_mrp.pot
Auto-merging locale/sources/sales.pot
CONFLICT (content): Merge conflict in locale/sources/sales.pot
Auto-merging locale/sources/studio.pot
CONFLICT (content): Merge conflict in locale/sources/studio.pot

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.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

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

As per usual, leave off developer.pot and contributing.pot since we
don't translate them (not useful, can't really contribute to/dev in
Odoo without knowing English)
@ticodoo ticodoo force-pushed the 19.0-17.0-i18n-reexport-sources-tic-483533-fw branch from 51889f2 to e93500f Compare December 11, 2025 10:27
@ticodoo
Copy link
Contributor

ticodoo commented Dec 11, 2025

@robodoo r+

robodoo pushed a commit that referenced this pull request Dec 11, 2025
As per usual, leave off developer.pot and contributing.pot since we
don't translate them (not useful, can't really contribute to/dev in
Odoo without knowing English)

closes #15640

Signed-off-by: Dylan Kiss (dyki) <dyki@odoo.com>
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
@robodoo robodoo closed this in 6874b14 Dec 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants