2. BlueMind
3. bluemind-addons: signature
4. Changes

Changes pushed 3 years ago

Changes pushed 3 years ago

Changes pushed 3 years ago

Changes pushed 3 years ago

English German 5 characters edited Current translation 3 years ago

English German 5 characters edited Current translation 3 years ago

Component unlocked 3 years ago

Component locked 3 years ago

Repository reset 3 years ago

The “signature/net.bluemind.ui.signature.application/l10n/files/de.json” file was changed. 3 years ago

Fixing an alert automatically unlocked the component. 3 years ago

Repository rebased 3 years ago

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)

3 years ago

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)

3 years ago

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)

3 years ago

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)

3 years ago

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)

3 years ago

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)

3 years ago

The component was automatically locked because of an alert. 3 years ago

Could not merge the repository. 3 years ago