| Project website | www.teckids.org |
|---|---|
| Translation process |
|
| Source code repository |
git@edugit.org:Teckids/teckids.edugit.io
|
| Repository branch | master |
| Last remote commit |
Update submodule
bb55aa9
 debdolph authored 3 months ago |
| Weblate repository |
https://translate.edugit.org/git/teckids/teckids-edugit-io/
|
| Filemask | po/*.po |
| Languages | 2 |
| Source strings | 29 |
| Source words | 326 |
| Source characters | 2,887 |
| Hosted strings | 58 |
| Hosted words | 652 |
| Hosted characters | 5,774 |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M po/en.po Falling back to patching base and 3-way merge... Auto-merging po/en.po CONFLICT (content): Merge conflict in po/en.po 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 (English) 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)a month ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M po/en.po Falling back to patching base and 3-way merge... Auto-merging po/en.po CONFLICT (content): Merge conflict in po/en.po 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 (English) 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)a month ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M po/en.po Falling back to patching base and 3-way merge... Auto-merging po/en.po CONFLICT (content): Merge conflict in po/en.po 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 (English) 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)a month ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M po/en.po Falling back to patching base and 3-way merge... Auto-merging po/en.po CONFLICT (content): Merge conflict in po/en.po 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 (English) 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)a month ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M po/en.po Falling back to patching base and 3-way merge... Auto-merging po/en.po CONFLICT (content): Merge conflict in po/en.po 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 (English) 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 months ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M po/en.po Falling back to patching base and 3-way merge... Auto-merging po/en.po CONFLICT (content): Merge conflict in po/en.po 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 (English) 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 months ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M po/en.po Falling back to patching base and 3-way merge... Auto-merging po/en.po CONFLICT (content): Merge conflict in po/en.po 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 (English) 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 months ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M po/en.po Falling back to patching base and 3-way merge... Auto-merging po/en.po CONFLICT (content): Merge conflict in po/en.po 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 (English) 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 months ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M po/en.po Falling back to patching base and 3-way merge... Auto-merging po/en.po CONFLICT (content): Merge conflict in po/en.po 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 (English) 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 months ago
None