Changes in Framadate/Framadate v1.1.x @ Framasoft Weblate

None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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
None Repository rebase failed Framadate Framadate v1.1.x	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 locale/fr.json Falling back to patching base and 3-way merge... Auto-merging locale/fr.json CONFLICT (content): Merge conflict in locale/fr.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 (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

1 / 5

/ 5

Search

Action

Author username

Starting date

Ending date