2. Changes

Repository rebased 2 years ago

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

2 years ago

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

2 years ago

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

The "resources/langs/nheko_vi.ts" file was changed. 3 years ago

The "resources/langs/nheko_uk.ts" file was changed. 3 years ago

The "resources/langs/nheko_sv.ts" file was changed. 3 years ago

The "resources/langs/nheko_sr_Latn.ts" file was changed. 3 years ago

The "resources/langs/nheko_si.ts" file was changed. 3 years ago

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

The "resources/langs/nheko_ro.ts" file was changed. 3 years ago

The "resources/langs/nheko_pt_PT.ts" file was changed. 3 years ago

The "resources/langs/nheko_pt_BR.ts" file was changed. 3 years ago

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

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

The "resources/langs/nheko_ml.ts" file was changed. 3 years ago

The "resources/langs/nheko_ja.ts" file was changed. 3 years ago

The "resources/langs/nheko_it.ts" file was changed. 3 years ago

The "resources/langs/nheko_ie.ts" file was changed. 3 years ago

The "resources/langs/nheko_id.ts" file was changed. 3 years ago