Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Mar 21, 2024

This commit does 2 things:

  • exports the latest terms to be translated
  • adds missing pot files + adds them to be translated on transifex (essentials, hr, and studio)

Forward-Port-Of: #8242

@robodoo
Copy link
Collaborator

robodoo commented Mar 21, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Mar 21, 2024

@ticodoo @mart-e cherrypicking of pull request #8242 failed.

stdout:

Auto-merging .tx/config
CONFLICT (content): Merge conflict in .tx/config
Auto-merging locale/sources/administration.pot
CONFLICT (content): Merge conflict in locale/sources/administration.pot
Auto-merging locale/sources/contributing.pot
CONFLICT (content): Merge conflict in locale/sources/contributing.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 (add/add): 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/websites.pot
CONFLICT (content): Merge conflict in locale/sources/websites.pot

stderr:

16:37:04.898624 git.c:463               trace: built-in: git cherry-pick 49119ff98eda6cd8e95755802ceaf929467a715c
error: could not apply 49119ff98... [I18N] *: export latest terms + add missing resources
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

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

@ticodoo ticodoo force-pushed the 16.0-15.0-i18n-export-sources-tic-cvXC-fw branch from 57762a6 to f6d8346 Compare March 21, 2024 18:24
@C3POdoo C3POdoo requested review from a team March 21, 2024 18:26
This commit does 2 things:

- exports the latest terms to be translated
- adds missing pot files + adds them to be translated on transifex
  (essentials and studio)

Notes:
- hr (source) was already in v16, but was missing from v15 and v17,
  hence the commits being slightly different
- latest pot files of `contributing`, `developer`, and `legal` were
  purposely left off this PR because they are either not translated
  or not translated via Transifex, so these pot files serve no purpose

X-original-commit: ee34727
@ticodoo ticodoo force-pushed the 16.0-15.0-i18n-export-sources-tic-cvXC-fw branch from f6d8346 to 8dca244 Compare March 21, 2024 18:37
@ticodoo
Copy link
Contributor

ticodoo commented Mar 21, 2024

@robodoo r+

robodoo pushed a commit that referenced this pull request Mar 21, 2024
This commit does 2 things:

- exports the latest terms to be translated
- adds missing pot files + adds them to be translated on transifex
  (essentials and studio)

Notes:
- hr (source) was already in v16, but was missing from v15 and v17,
  hence the commits being slightly different
- latest pot files of `contributing`, `developer`, and `legal` were
  purposely left off this PR because they are either not translated
  or not translated via Transifex, so these pot files serve no purpose

closes #8295

X-original-commit: ee34727
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
@robodoo robodoo closed this Mar 21, 2024
@ticodoo ticodoo deleted the 16.0-15.0-i18n-export-sources-tic-cvXC-fw branch October 7, 2024 08:34
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