2. Framadate
3. Framadate v1.1.x
4. Changes

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago

Rebasing (1/28)
error: could not apply 0016ad3... 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".
Could not apply 0016ad3... Translated using Weblate (French)
Auto-merging locale/fr.json
CONFLICT (content): Merge conflict in locale/fr.json
 (1)

a year ago