8000 [FW][I18N] *: re-export pot files by fw-bot · Pull Request #13147 · odoo/documentation · GitHub
[go: up one dir, main page]
Skip to content

[FW][I18N] *: re-export pot files #13147

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

[FW][I18N] *: re-export pot files #13147

wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Collaborator
@fw-bot fw-bot commented Apr 30, 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: #13143
Forward-Port-Of: #13142

@robodoo
Copy link
Collaborator
robodoo commented Apr 30, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author
fw-bot commented Apr 30, 2025

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

@fw-bot fw-bot mentioned this pull request Apr 30, 2025
Closed
@ticodoo
[I18N] *: re-export pot files
e5c53e0 
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)

X-original-commit: 51c9a6c
@ticodoo ticodoo force-pushed the 18.0-16.0-i18n-reexport-sources-tic-433022-fw branch from 9818131 to e5c53e0 Compare April 30, 2025 15:04
@ticodoo
Copy link
Contributor
ticodoo commented Apr 30, 2025

@robodoo r+

@robodoo robodoo closed this in af12190 Apr 30, 2025
This was referenced Apr 30, 2025
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
conflict forwardport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fw-bot @robodoo @ticodoo
0