[FW][REF] website_sale_ux: translation corrected

[fw-bot-adhoc]

Forward-Port-Of: ingadhoc/website#326

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

@matiasperalta1 @lef-adhoc cherrypicking of pull request ingadhoc/website#326 failed.

stdout:

Auto-merging website_sale_ux/i18n/es.po
CONFLICT (content): Merge conflict in website_sale_ux/i18n/es.po
Auto-merging website_sale_ux/README.rst

stderr:

15:21:34.149316 git.c:444               trace: built-in: git cherry-pick 3e54263dffbb3d69168c44a829019043c4251101
error: could not apply 3e54263... [REF] website_sale_ux: translation corrected
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
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.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

[matiasperalta1]

@fw-bot-adhoc r+

[fw-bot-adhoc]

@matiasperalta1 I can only do this on unmodified forward-port PRs, ask roboadhoc.