Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FW][I18N] *: export latest terms #11505

Closed
wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Dec 2, 2024

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: #11495
Forward-Port-Of: #11493

@robodoo
Copy link
Collaborator

robodoo commented Dec 2, 2024

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Dec 2, 2024

@ticodoo cherrypicking of pull request #11493 failed.

stdout:

Auto-merging locale/sources/administration.pot
CONFLICT (content): Merge conflict in locale/sources/administration.pot
Auto-merging locale/sources/finance.pot
CONFLICT (content): Merge conflict in locale/sources/finance.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/marketing.pot
CONFLICT (content): Merge conflict in locale/sources/marketing.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

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 18.0-16.0-i18n-export-sources-tic-NILw-fw branch from 1eb1aad to ad1dd27 Compare December 2, 2024 17:01
@ticodoo
Copy link
Contributor

ticodoo commented Dec 2, 2024

@robodoo r+

@robodoo robodoo closed this in eb714d1 Dec 2, 2024
@ticodoo ticodoo deleted the 18.0-16.0-i18n-export-sources-tic-NILw-fw branch January 28, 2025 08:21
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