User avatar None

Repository rebase failed

  1. BlueMind
  2. bluemind/tbird
 
First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (French)
Applying: Translated using Weblate (French)
Using index info to reconstruct a base tree...
M	open/ui/vue-apps/commons/net.bluemind.l10n.js/l10n/fr.json
Falling back to patching base and 3-way merge...
Auto-merging open/ui/vue-apps/commons/net.bluemind.l10n.js/l10n/fr.json
CONFLICT (content): Merge conflict in open/ui/vue-apps/commons/net.bluemind.l10n.js/l10n/fr.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 Translated using Weblate (French)

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)
5 years ago
User avatar admin

Translation changed

  1. BlueMind
  2. open/ui/closures/net.bluemind.calendar.application.closure/src/main/lang/lang
  3. French
You have unsaved modifications, changes you made will be lost. Do you really want to leave?
Vous avez des modifications non sauvegardéées, ces changements seront perdues. Voulez-vous vraiment quitter le formulaire ?
5 years ago
User avatar admin

Contributor joined

  1. BlueMind
  2. open/ui/closures/net.bluemind.calendar.application.closure/src/main/lang/lang
  3. French
Contributor joined 5 years ago
User avatar None

Suggestion added

  1. BlueMind
  2. open/ui/closures/net.bluemind.calendar.application.closure/src/main/lang/lang
  3. French
You have unsaved modifications, changes you made will be lost. Do you really want to leave?
Vous avez des modifications non sauvegardées, ces changements seront perdus. Voulez-vous vraiment quitter le formulaire ?
5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/plugins/net.bluemind.core.handler.print/lang/translation
Repository outdated. 5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/ui/settings-webapp/net.bluemind.ui.settings.downloads/lang/settings-downloads
Repository outdated. 5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/ui/settings-webapp/net.bluemind.ui.settings.cti/src/bluemind/lang
Repository outdated. 5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/ui/closures/net.bluemind.commons.ui.closure/src/main/lang/lang
Repository outdated. 5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/ui/closures/net.bluemind.todolist.closure/src/main/lang/lang
Repository outdated. 5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/ui/closures/net.bluemind.todolist.ui.closure/src/main/lang/todolistui
Repository outdated. 5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/ui/closures/net.bluemind.addressbook.api.closure/src/main/lang/lang
Repository outdated. 5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/ui/closures/net.bluemind.contact.application.closure/src/main/lang/lang
Repository outdated. 5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/ui/closures/net.bluemind.history.ui.closure/src/main/lang/lang
Repository outdated. 5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/ui/closures/net.bluemind.chooser.application.closure/src/main/lang/lang
Repository outdated. 5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/ui/closures/net.bluemind.chooser.application.closure/src/main/lang/generic
Repository outdated. 5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/ui/closures/net.bluemind.mvp.closure/src/main/lang/lang
Repository outdated. 5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/ui/closures/net.bluemind.ui.banner.cti/src/main/lang/lang
Repository outdated. 5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/ui/closures/net.bluemind.task.application.closure/src/main/lang/lang
Repository outdated. 5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/ui/closures/net.bluemind.filehosting.ui.closure/src/main/lang/filehosting
Repository outdated. 5 years ago
User avatar None

Alert triggered

  1. BlueMind
  2. open/ui/closures/net.bluemind.calendar.application.closure/src/main/lang/lang
Repository outdated. 5 years ago

Search