Changes in FoE Helper @ Weblate

2016 / 2496

/ 2496

TH3C0D3R

Component locked

FoE Helper / Extension

Component locked 3 years ago

TH3C0D3R

Component unlocked

FoE Helper / Extension

Component unlocked 3 years ago

None

Failed merge on repository

FoE Helper / Extension

Auto-merging js/web/_i18n/it.json
CONFLICT (content): Merge conflict in js/web/_i18n/it.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)

3 years ago

TH3C0D3R

Component locked

FoE Helper / Extension

Component locked 3 years ago

None

Failed merge on repository

FoE Helper / Extension

Auto-merging js/web/_i18n/it.json
CONFLICT (content): Merge conflict in js/web/_i18n/it.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)

3 years ago

None

Failed merge on repository

FoE Helper / Extension

Auto-merging js/web/_i18n/it.json
CONFLICT (content): Merge conflict in js/web/_i18n/it.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)

3 years ago

None

New alert

FoE Helper / Extension

Could not merge the repository. 3 years ago

None

Failed rebase on repository

FoE Helper / Extension

First, rewinding head to replay your work on top of it...
Applying: Currently translated at 87.4% (633 of 724 strings)
Using index info to reconstruct a base tree...
M	js/web/_i18n/it.json
Falling back to patching base and 3-way merge...
Auto-merging js/web/_i18n/it.json
CONFLICT (content): Merge conflict in js/web/_i18n/it.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Currently translated at 87.4% (633 of 724 strings)

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 years ago

None

Committed changes

FoE Helper / Extension — Italian

Committed changes 3 years ago