 None
Changes pushed |
Changes pushed
4 years ago
|
|
None
Changes pushed |
Changes pushed
4 years ago
|
|
None
Changes pushed |
Changes pushed
4 years ago
|
|
None
Changes pushed |
Changes pushed
4 years ago
|
|
None
Changes pushed |
Changes pushed
4 years ago
|
|
None
Changes pushed |
Changes pushed
4 years ago
|
 tfricker
Translation added |
|
|
tfricker
Translation added |
|
 admin
Component unlocked |
Component unlocked
4 years ago
|
|
admin
Component locked |
Component locked
4 years ago
|
|
admin
Repository reset |
Repository reset
4 years ago
|
|
admin
Resource updated |
The “
signature/net.bluemind.ui.signature.application/l10n/files/de.json” file was changed.
4 years ago
|
|
None
Component unlocked |
Fixing an alert automatically unlocked the component.
4 years ago
|
|
admin
Repository rebased |
Repository rebased
4 years ago
|
|
None
Repository rebase failed |
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 signature/net.bluemind.ui.signature.application/l10n/files/de.json Falling back to patching base and 3-way merge... Auto-merging signature/net.bluemind.ui.signature.application/l10n/files/de.json CONFLICT (content): Merge conflict in signature/net.bluemind.ui.signature.application/l10n/files/de.json 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 (German) 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)4 years ago |
|
None
Repository rebase failed |
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 signature/net.bluemind.ui.signature.application/l10n/files/de.json Falling back to patching base and 3-way merge... Auto-merging signature/net.bluemind.ui.signature.application/l10n/files/de.json CONFLICT (content): Merge conflict in signature/net.bluemind.ui.signature.application/l10n/files/de.json 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 (German) 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)4 years ago |
|
admin
Repository rebase failed |
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 signature/net.bluemind.ui.signature.application/l10n/files/de.json Falling back to patching base and 3-way merge... Auto-merging signature/net.bluemind.ui.signature.application/l10n/files/de.json CONFLICT (content): Merge conflict in signature/net.bluemind.ui.signature.application/l10n/files/de.json 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 (German) 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)4 years ago |
|
admin
Repository rebase failed |
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 signature/net.bluemind.ui.signature.application/l10n/files/de.json Falling back to patching base and 3-way merge... Auto-merging signature/net.bluemind.ui.signature.application/l10n/files/de.json CONFLICT (content): Merge conflict in signature/net.bluemind.ui.signature.application/l10n/files/de.json 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 (German) 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)4 years ago |
|
None
Repository rebase failed |
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 signature/net.bluemind.ui.signature.application/l10n/files/de.json Falling back to patching base and 3-way merge... Auto-merging signature/net.bluemind.ui.signature.application/l10n/files/de.json CONFLICT (content): Merge conflict in signature/net.bluemind.ui.signature.application/l10n/files/de.json 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 (German) 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)4 years ago |
|
admin
Repository rebase failed |
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 signature/net.bluemind.ui.signature.application/l10n/files/de.json Falling back to patching base and 3-way merge... Auto-merging signature/net.bluemind.ui.signature.application/l10n/files/de.json CONFLICT (content): Merge conflict in signature/net.bluemind.ui.signature.application/l10n/files/de.json 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 (German) 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)4 years ago |