[FW][I18N] *: re-export all pot files #176659
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stdout: Auto-merging addons/bus/i18n/bus.pot CONFLICT (content): Merge conflict in addons/bus/i18n/bus.pot Auto-merging addons/loyalty/i18n/loyalty.pot Auto-merging addons/mail/i18n/mail.pot Auto-merging addons/mass_mailing_sms/i18n/mass_mailing_sms.pot CONFLICT (content): Merge conflict in addons/mass_mailing_sms/i18n/mass_mailing_sms.pot Auto-merging addons/website/i18n/website.pot Auto-merging addons/website_sale/i18n/website_sale.pot CONFLICT (modify/delete): addons/website_twitter/i18n/website_twitter.pot deleted in ba536f3 and modified in 2f4aba8. Version 2f4aba8 of addons/website_twitter/i18n/website_twitter.pot left in tree. stderr:
|
|
|
@ticodoo @oomsveta cherrypicking of pull request #175890 failed. stdout: 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. More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port |
robodoo
added
forwardport
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some didn't export correctly during the last mass export
Forward-Port-Of: #175890