Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Nov 19, 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: #15341
Forward-Port-Of: #15335

@robodoo
Copy link
Collaborator

robodoo commented Nov 19, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Nov 19, 2025

@ticodoo cherrypicking of pull request #15335 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/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/services.pot
CONFLICT (content): Merge conflict in locale/sources/services.pot
Auto-merging locale/sources/websites.pot
CONFLICT (content): Merge conflict in locale/sources/websites.pot

stderr:

WARN Using Git v2.44.0 or above is recommended to get meaningful revision names on conflict markers when using Mergiraf.
WARN Using Git v2.44.0 or above is recommended to get meaningful revision names on conflict markers when using Mergiraf.
WARN Using Git v2.44.0 or above is recommended to get meaningful revision names on conflict markers when using Mergiraf.
WARN Using Git v2.44.0 or above is recommended to get meaningful revision names on conflict markers when using Mergiraf.
WARN Using Git v2.44.0 or above is recommended to get meaningful revision names on conflict markers when using Mergiraf.
WARN Using Git v2.44.0 or above is recommended to get meaningful revision names on conflict markers when using Mergiraf.
WARN Using Git v2.44.0 or above is recommended to get meaningful revision names on conflict markers when using Mergiraf.
WARN Using Git v2.44.0 or above is recommended to get meaningful revision names on conflict markers when using Mergiraf.
WARN Using Git v2.44.0 or above is recommended to get meaningful revision names on conflict markers when using Mergiraf.
WARN Using Git v2.44.0 or above is recommended to get meaningful revision names on conflict markers when using Mergiraf.

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-478318-fw branch from 8a95baf to 73b5326 Compare November 19, 2025 08:49
@ticodoo
Copy link
Contributor

ticodoo commented Nov 19, 2025

@robodoo r+

robodoo pushed a commit that referenced this pull request Nov 19, 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 #15363

Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
robodoo pushed a commit that referenced this pull request Nov 19, 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 #15363

Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
@robodoo robodoo closed this in 0419452 Nov 19, 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