Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Jul 15, 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: #14029

@robodoo
Copy link
Collaborator

robodoo commented Jul 15, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 15, 2025

@ticodoo cherrypicking of pull request #14029 failed.

stdout:

Auto-merging locale/sources/finance.pot
CONFLICT (content): Merge conflict in locale/sources/finance.pot
Auto-merging locale/sources/sales.pot
CONFLICT (content): Merge conflict in locale/sources/sales.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 17.0-16.0-i18n-reexport-sources-tic-450223-fw branch from a1845b0 to 6570ca0 Compare July 15, 2025 08:52
@ticodoo
Copy link
Contributor

ticodoo commented Jul 15, 2025

@robodoo r+

robodoo pushed a commit that referenced this pull request Jul 15, 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 #14034

Signed-off-by: Tiffany Chang (tic) <[email protected]>
@robodoo robodoo closed this Jul 15, 2025
@ticodoo ticodoo deleted the 17.0-16.0-i18n-reexport-sources-tic-450223-fw branch September 29, 2025 07:44
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.

4 participants