| Project website | www.ooops404.com |
|---|---|
| Translation process |
|
| Translation license | Proprietary |
| Source code repository |
git@github.com:ooops404/ooops-mrp.git
|
| Repository branch | 14.0 |
| Last remote commit |
Translated using Weblate (Italian)
20cced7
 giovanni-ooops authored 2 days ago |
| Weblate repository |
http://weblate.ops404.it/git/ooops-mrp-14-0/ooops_mrp_subcontracting_reordering_rules/
|
| Filemask | ooops_mrp_subcontracting_reordering_rules/i18n/*.po |
| Languages | 2 |
| Source strings | 11 |
| Source words | 19 |
| Source characters | 120 |
| Hosted strings | 22 |
| Hosted words | 38 |
| Hosted characters | 240 |
First, rewinding head to replay your work on top of it... Applying: [IMP] oopos_mrp_subcontracting_multi_phase: enhance product and template search to resolve delivered products Applying: [UPD] README.rst Using index info to reconstruct a base tree... M ooops_mrp_subcontracting_multi_phase/README.rst M ooops_mrp_subcontracting_multi_phase/static/description/index.html Falling back to patching base and 3-way merge... Auto-merging ooops_mrp_subcontracting_multi_phase/static/description/index.html CONFLICT (content): Merge conflict in ooops_mrp_subcontracting_multi_phase/static/description/index.html Auto-merging ooops_mrp_subcontracting_multi_phase/README.rst CONFLICT (content): Merge conflict in ooops_mrp_subcontracting_multi_phase/README.rst error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0002 [UPD] README.rst Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)3 days ago
None