2. Changes

Component locked 4 years ago

First, rewinding head to replay your work on top of it...
Applying: Added translation using Weblate (Finnish)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging resources/langs/nheko_fi.ts
CONFLICT (add/add): Merge conflict in resources/langs/nheko_fi.ts
error: Failed to merge in the changes.
Patch failed at 0001 Added translation using Weblate (Finnish)
Use 'git am --show-current-patch' to see the failed patch

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".

 (128)

4 years ago

Could not parse translation files. 4 years ago

The "resources/langs/nheko_zh_CN.ts" file was changed. 4 years ago

The "resources/langs/nheko_ru.ts" file was changed. 4 years ago

The "resources/langs/nheko_fi.ts" file was changed. 4 years ago

The "resources/langs/nheko_pl.ts" file was changed. 4 years ago

The "resources/langs/nheko_nl.ts" file was changed. 4 years ago

The "resources/langs/nheko_el.ts" file was changed. 4 years ago

The "resources/langs/nheko_de.ts" file was changed. 4 years ago

The "resources/langs/nheko_fr.ts" file was changed. 4 years ago

The "resources/langs/nheko_en.ts" file was changed. 4 years ago

resources/langs/nheko_fi.ts: StartTag: invalid element name, line 5, column 2 (<string>, line 5) 4 years ago

The "resources/langs/nheko_en.ts" file was changed. 4 years ago

First, rewinding head to replay your work on top of it...
Applying: Added translation using Weblate (Finnish)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging resources/langs/nheko_fi.ts
CONFLICT (add/add): Merge conflict in resources/langs/nheko_fi.ts
error: Failed to merge in the changes.
Patch failed at 0001 Added translation using Weblate (Finnish)
Use 'git am --show-current-patch' to see the failed patch

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".

 (128)

4 years ago

First, rewinding head to replay your work on top of it...
Applying: Added translation using Weblate (Finnish)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging resources/langs/nheko_fi.ts
CONFLICT (add/add): Merge conflict in resources/langs/nheko_fi.ts
error: Failed to merge in the changes.
Patch failed at 0001 Added translation using Weblate (Finnish)
Use 'git am --show-current-patch' to see the failed patch

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".

 (128)

4 years ago

Could not merge the repository. 4 years ago

First, rewinding head to replay your work on top of it...
Applying: Added translation using Weblate (Finnish)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging resources/langs/nheko_fi.ts
CONFLICT (add/add): Merge conflict in resources/langs/nheko_fi.ts
error: Failed to merge in the changes.
Patch failed at 0001 Added translation using Weblate (Finnish)
Use 'git am --show-current-patch' to see the failed patch

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".

 (128)

4 years ago

Repository rebased 4 years ago

Changes pushed 4 years ago