Skip to content

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Oct 17, 2025

PR does 2 things:

  • Re-export pots, including if no terms have been updated due to some languages not being in sync with the pot file in Weblate (i.e. po files already existed and msgmerge is not run until Weblate detects a change in the pot file)
  • remove settings.pot + its translations/references since it appears to be leftover from v14 (i.e. was probably deleted in a refactoring). We remove it in stable so translators don't waste time translating things that are never seen by users.

Forward-Port-Of: #14884
Forward-Port-Of: #14882

@robodoo
Copy link
Collaborator

robodoo commented Oct 17, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 17, 2025

@ticodoo @oomsveta cherrypicking of pull request #14882 failed.

stdout:

CONFLICT (modify/delete): .weblate.json deleted in 0164c54c05db6d8611819f6cd5020d2ec701d4c2 and modified in 28cbfd2f80947a0d9e8be7cb7ca880e2d0d2d7ec.  Version 28cbfd2f80947a0d9e8be7cb7ca880e2d0d2d7ec of .weblate.json left in tree.
CONFLICT (modify/delete): locale/de/LC_MESSAGES/settings.po deleted in 28cbfd2f80947a0d9e8be7cb7ca880e2d0d2d7ec and modified in 0164c54c05db6d8611819f6cd5020d2ec701d4c2.  Version 0164c54c05db6d8611819f6cd5020d2ec701d4c2 of locale/de/LC_MESSAGES/settings.po left in tree.
CONFLICT (modify/delete): locale/es/LC_MESSAGES/settings.po deleted in 28cbfd2f80947a0d9e8be7cb7ca880e2d0d2d7ec and modified in 0164c54c05db6d8611819f6cd5020d2ec701d4c2.  Version 0164c54c05db6d8611819f6cd5020d2ec701d4c2 of locale/es/LC_MESSAGES/settings.po left in tree.
CONFLICT (modify/delete): locale/es_419/LC_MESSAGES/settings.po deleted in 28cbfd2f80947a0d9e8be7cb7ca880e2d0d2d7ec and modified in 0164c54c05db6d8611819f6cd5020d2ec701d4c2.  Version 0164c54c05db6d8611819f6cd5020d2ec701d4c2 of locale/es_419/LC_MESSAGES/settings.po left in tree.
CONFLICT (modify/delete): locale/fr/LC_MESSAGES/settings.po deleted in 28cbfd2f80947a0d9e8be7cb7ca880e2d0d2d7ec and modified in 0164c54c05db6d8611819f6cd5020d2ec701d4c2.  Version 0164c54c05db6d8611819f6cd5020d2ec701d4c2 of locale/fr/LC_MESSAGES/settings.po left in tree.
CONFLICT (modify/delete): locale/nl/LC_MESSAGES/settings.po deleted in 28cbfd2f80947a0d9e8be7cb7ca880e2d0d2d7ec and modified in 0164c54c05db6d8611819f6cd5020d2ec701d4c2.  Version 0164c54c05db6d8611819f6cd5020d2ec701d4c2 of locale/nl/LC_MESSAGES/settings.po left in tree.
CONFLICT (modify/delete): locale/pt_BR/LC_MESSAGES/settings.po deleted in 28cbfd2f80947a0d9e8be7cb7ca880e2d0d2d7ec and modified in 0164c54c05db6d8611819f6cd5020d2ec701d4c2.  Version 0164c54c05db6d8611819f6cd5020d2ec701d4c2 of locale/pt_BR/LC_MESSAGES/settings.po left in tree.
CONFLICT (modify/delete): locale/uk/LC_MESSAGES/settings.po deleted in 28cbfd2f80947a0d9e8be7cb7ca880e2d0d2d7ec and modified in 0164c54c05db6d8611819f6cd5020d2ec701d4c2.  Version 0164c54c05db6d8611819f6cd5020d2ec701d4c2 of locale/uk/LC_MESSAGES/settings.po left in tree.
CONFLICT (modify/delete): locale/zh_CN/LC_MESSAGES/settings.po deleted in 28cbfd2f80947a0d9e8be7cb7ca880e2d0d2d7ec and modified in 0164c54c05db6d8611819f6cd5020d2ec701d4c2.  Version 0164c54c05db6d8611819f6cd5020d2ec701d4c2 of locale/zh_CN/LC_MESSAGES/settings.po left in tree.

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

Includes pot files with no term changes to force Weblate to correctly
sync the terms to translate within it (otherwise it uses what was in the
existing .po file which may be incorrect).

Part-of: #14884
Signed-off-by: Louis Wicket (wil) <wil@odoo.com>
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
settings.pot hasn't been exported since 14.0 and doesn't seem to
correspond to anything in the documentation anymore so it's probably
leftover from an old refactoring.

Note that an audit of the other pot files was done and this was the only
obsolete one found.
@ticodoo ticodoo force-pushed the saas-18.2-17.0-i18n-reexport-sources-tic-471045-fw branch from c1ad504 to 1d4ed72 Compare October 20, 2025 07:14
@ticodoo
Copy link
Contributor

ticodoo commented Oct 20, 2025

@robodoo r+

robodoo pushed a commit that referenced this pull request Oct 20, 2025
Includes pot files with no term changes to force Weblate to correctly
sync the terms to translate within it (otherwise it uses what was in the
existing .po file which may be incorrect).

Part-of: #14927
Signed-off-by: Louis Wicket (wil) <wil@odoo.com>
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
robodoo pushed a commit that referenced this pull request Oct 20, 2025
settings.pot hasn't been exported since 14.0 and doesn't seem to
correspond to anything in the documentation anymore so it's probably
leftover from an old refactoring.

Note that an audit of the other pot files was done and this was the only
obsolete one found.

closes #14927

Signed-off-by: Louis Wicket (wil) <wil@odoo.com>
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
@robodoo robodoo closed this Oct 20, 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