2. Changes

Component locked a year ago

Changes pushed a year ago

Changes pushed a year ago

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (French)
Using index info to reconstruct a base tree...
M	closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties
Falling back to patching base and 3-way merge...
Auto-merging closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties
CONFLICT (content): Merge conflict in closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties
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 (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)

a year ago

To ssh://stash.blue-mind.loc:7999/bm/bluemind-addons.git
 ! [rejected]        master -> weblate-merge (non-fast-forward)
error: failed to push some refs to 'ssh://stash.blue-mind.loc:7999/bm/bluemind-addons.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
 (1)

a year ago

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (French)
Using index info to reconstruct a base tree...
M	closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties
Falling back to patching base and 3-way merge...
Auto-merging closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties
CONFLICT (content): Merge conflict in closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties
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 (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)

a year ago

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (French)
Using index info to reconstruct a base tree...
M	closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties
Falling back to patching base and 3-way merge...
Auto-merging closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties
CONFLICT (content): Merge conflict in closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties
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 (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)

a year ago

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (French)
Using index info to reconstruct a base tree...
M	closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties
Falling back to patching base and 3-way merge...
Auto-merging closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties
CONFLICT (content): Merge conflict in closed/mapi/net.bluemind.exchange.ese/lang/folder_fr.properties
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 (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)

a year ago

Changes pushed 3 years ago

English French 1 character edited Current translation 3 years ago

Changes pushed 3 years ago

To ssh://stash.blue-mind.loc:7999/bm/bluemind-all.git
 ! [rejected]              master -> weblate-merge (non-fast-forward)
error: failed to push some refs to 'ssh://stash.blue-mind.loc:7999/bm/bluemind-all.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
 (1)

3 years ago

The “open/parent/calendar/net.bluemind.calendar.helper/lang/eventDelete_fr.properties” file was changed. 3 years ago

Repository rebased 3 years ago

The “open/parent/system/net.bluemind.system.service/OSGI-INF/l10n/bundle_fr.properties” file was changed. 3 years ago

The “closed/plugins/net.bluemind.core.bo.report/lang/announcement_fr.properties” file was changed. 3 years ago

The “open/parent/resource/net.bluemind.resource.service/lang/reservation_de.properties” file was changed. 3 years ago

The “open/parent/ldap/net.bluemind.system.ldap.importation/OSGI-INF/l10n/messages_fr.properties” file was changed. 3 years ago

The “open/parent/custom/net.bluemind.custom.password.sizestrength/lang/SizeStrengthPolicy_fr.properties” file was changed. 3 years ago

The “open/parent/calendar/net.bluemind.calendar.helper/lang/eventCreate_fr.properties” file was changed. 3 years ago