Changes in Nheko/nheko @ Weblate

None Repository rebase failed Nheko nheko	First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) 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
None Repository rebase failed Nheko nheko	First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) 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
None Repository rebase failed Nheko nheko	First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) 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
None Repository rebase failed Nheko nheko	First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) 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
None Repository rebase failed Nheko nheko	First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) 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
None Repository rebase failed Nheko nheko	First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) 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
None Repository rebase failed Nheko nheko	First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) 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
None Repository rebase failed Nheko nheko	First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) 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
None Repository rebase failed Nheko nheko	First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) 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
None Repository rebase failed Nheko nheko	First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) 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
None Alert triggered Nheko nheko	Repository outdated. 4 years ago
None Repository rebase failed Nheko nheko	First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) 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
None Changes committed Nheko nheko Polish	Changes committed 4 years ago
None Changes committed Nheko nheko Polish	Changes committed 4 years ago
None Repository rebase failed Nheko nheko	First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) 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
None Repository rebase failed Nheko nheko	First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) 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
None Resource updated Nheko nheko Chinese (Simplified)	The "`resources/langs/nheko_zh_CN.ts`" file was changed. 4 years ago
None Resource updated Nheko nheko Russian	The "`resources/langs/nheko_ru.ts`" file was changed. 4 years ago
None Resource updated Nheko nheko Polish	The "`resources/langs/nheko_pl.ts`" file was changed. 4 years ago
None Resource updated Nheko nheko Dutch	The "`resources/langs/nheko_nl.ts`" file was changed. 4 years ago

2595 / 2608

/ 2608

Search

Action

Author username

Starting date

Ending date