User avatar None

Repository rebase failed

  1. BlueMind
  2. bluemind-addons: signature
 
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
User avatar tfricker

Translation changed

  1. BlueMind
  2. bluemind-addons: signature
  3. German
All
Alle
3 years ago
User avatar tfricker

Contributor joined

  1. BlueMind
  2. bluemind-addons: signature
  3. German
Contributor joined 3 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. bluemind-addons: signature
License info missing. 3 years ago
User avatar None

Resource updated

  1. BlueMind
  2. bluemind-addons: signature
  3. Chinese (Simplified)
The “signature/net.bluemind.ui.signature.application/l10n/files/zh_Hans.json” file was changed. 3 years ago
User avatar None

Resource updated

  1. BlueMind
  2. bluemind-addons: signature
  3. Ukrainian
The “signature/net.bluemind.ui.signature.application/l10n/files/uk.json” file was changed. 3 years ago
User avatar None

Resource updated

  1. BlueMind
  2. bluemind-addons: signature
  3. Slovak
The “signature/net.bluemind.ui.signature.application/l10n/files/sk.json” file was changed. 3 years ago
User avatar None

Resource updated

  1. BlueMind
  2. bluemind-addons: signature
  3. Russian
The “signature/net.bluemind.ui.signature.application/l10n/files/ru.json” file was changed. 3 years ago
User avatar None

Resource updated

  1. BlueMind
  2. bluemind-addons: signature
  3. Portuguese
The “signature/net.bluemind.ui.signature.application/l10n/files/pt.json” file was changed. 3 years ago
User avatar None

Resource updated

  1. BlueMind
  2. bluemind-addons: signature
  3. Polish
The “signature/net.bluemind.ui.signature.application/l10n/files/pl.json” file was changed. 3 years ago
User avatar None

Resource updated

  1. BlueMind
  2. bluemind-addons: signature
  3. Dutch
The “signature/net.bluemind.ui.signature.application/l10n/files/nl.json” file was changed. 3 years ago
User avatar None

Resource updated

  1. BlueMind
  2. bluemind-addons: signature
  3. Italian
The “signature/net.bluemind.ui.signature.application/l10n/files/it.json” file was changed. 3 years ago
User avatar None

Resource updated

  1. BlueMind
  2. bluemind-addons: signature
  3. Hungarian
The “signature/net.bluemind.ui.signature.application/l10n/files/hu.json” file was changed. 3 years ago
User avatar None

Resource updated

  1. BlueMind
  2. bluemind-addons: signature
  3. French
The “signature/net.bluemind.ui.signature.application/l10n/files/fr.json” file was changed. 3 years ago
User avatar None

Resource updated

  1. BlueMind
  2. bluemind-addons: signature
  3. Spanish
The “signature/net.bluemind.ui.signature.application/l10n/files/es.json” file was changed. 3 years ago
User avatar None

Resource updated

  1. BlueMind
  2. bluemind-addons: signature
  3. German
The “signature/net.bluemind.ui.signature.application/l10n/files/de.json” file was changed. 3 years ago
User avatar None

Resource updated

  1. BlueMind
  2. bluemind-addons: signature
  3. English
The “signature/net.bluemind.ui.signature.application/l10n/files/en.json” file was changed. 3 years ago
User avatar None

Repository rebased

  1. BlueMind
  2. bluemind-addons: signature
Repository rebased 3 years ago
User avatar admin

Component created

  1. BlueMind
  2. bluemind-addons: signature
Component created 3 years ago

Search