Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Sep 2, 2025

After the switch to Weblate, we now only use the .weblate.json file instead of the previous .tx/config file.

Forward-Port-Of: #14471

@robodoo
Copy link
Collaborator

robodoo commented Sep 2, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Sep 2, 2025

@dylankiss @ticodoo cherrypicking of pull request #14471 failed.

stdout:

CONFLICT (modify/delete): .tx/config deleted in 8436065b3ab5819afa1981242685013963c870ec and modified in 71e11f109d31d8ff534cf6e823cea619e2728a90.  Version 71e11f109d31d8ff534cf6e823cea619e2728a90 of .tx/config 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

After the switch to Weblate, we now only use the `.weblate.json` file
instead of the previous `.tx/config` file.

X-original-commit: 57ffc65
@dylankiss dylankiss force-pushed the 18.0-17.0-rem-tx-config-dyki-460179-fw branch from c40ae89 to 36a30d0 Compare September 2, 2025 18:09
@dylankiss
Copy link
Contributor

@robodoo r+

@C3POdoo C3POdoo requested review from a team September 2, 2025 18:13
@robodoo
Copy link
Collaborator

robodoo commented Sep 2, 2025

@dylankiss @ticodoo linked pull request(s) odoo/design-themes#1135, odoo/enterprise#93751, odoo/odoo#225225 not ready. Linked PRs are not staged until all of them are ready.

robodoo pushed a commit to odoo/odoo that referenced this pull request Sep 2, 2025
After the switch to Weblate, we now only use the `.weblate.json` file
instead of the previous `.tx/config` file.

Meanwhile added a new entry that was still added to the `.tx/config`.

closes #225225

X-original-commit: f40701d
Related: odoo/enterprise#93751
Related: odoo/documentation#14473
Related: odoo/design-themes#1135
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
Signed-off-by: Dylan Kiss (dyki) <dyki@odoo.com>
robodoo pushed a commit to odoo/design-themes that referenced this pull request Sep 2, 2025
After the switch to Weblate, we now only use the `.weblate.json` file
instead of the previous `.tx/config` file.

closes #1135

X-original-commit: 00d359e
Related: odoo/odoo#225225
Related: odoo/enterprise#93751
Related: odoo/documentation#14473
Signed-off-by: Louis Wicket (wil) <wil@odoo.com>
Signed-off-by: Dylan Kiss (dyki) <dyki@odoo.com>
@robodoo robodoo closed this in cae8125 Sep 2, 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.

4 participants