Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/framadate/framadate-v11x/changes/?format=api&page=5
https://weblate.framasoft.org/api/components/framadate/framadate-v11x/changes/?format=api&page=6", "previous": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/changes/?format=api&page=4", "results": [ { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-17T10:54:13.553011Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495719, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495719/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-16T22:43:09.539860Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495570, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495570/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-16T20:35:58.589979Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495545, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495545/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-16T20:34:44.786331Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495541, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495541/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-16T12:36:30.587218Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495483, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495483/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-16T05:20:01.964675Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495429, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495429/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-15T13:12:11.466228Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495343, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495343/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-15T10:09:03.829808Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495206, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495206/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-15T05:48:25.511273Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495040, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495040/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-15T05:32:52.797645Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495037, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495037/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-15T04:31:34.929376Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495033, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495033/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-14T20:41:58.056791Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 494672, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/494672/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-14T17:20:51.727344Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 494439, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/494439/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-14T08:00:03.600493Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 494039, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/494039/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-14T06:27:25.224830Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 494032, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/494032/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-14T06:02:42.061699Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 494028, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/494028/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-14T05:53:33.317190Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 494026, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/494026/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-14T04:50:12.965607Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 494017, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/494017/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-14T04:29:18.227068Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 494013, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/494013/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-13T07:15:27.960104Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493734, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493734/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-13T05:31:25.966133Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493729, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493729/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-13T05:28:32.881389Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493728, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493728/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-13T04:32:24.236212Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493721, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493721/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-13T02:23:02.988019Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493711, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493711/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-13T02:16:12.707761Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493707, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493707/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-12T23:50:04.516569Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493695, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493695/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-12T17:15:43.181382Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493674, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493674/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-12T16:50:42.745032Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493650, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493650/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T22:40:27.866368Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493239, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493239/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T17:56:59.228830Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493219, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493219/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T11:12:43.410690Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493193, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493193/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T09:58:43.364481Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493189, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493189/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T04:01:28.690969Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493146, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493146/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T02:58:54.309849Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493141, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493141/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T00:03:21.978208Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493137, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493137/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T23:50:22.975949Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493134, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493134/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T22:13:29.256430Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493130, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493130/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T20:00:17.583701Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493127, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493127/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T18:16:06.942003Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493115, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493115/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T17:51:00.068815Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493108, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493108/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T08:05:39.896995Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493067, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493067/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T07:17:21.560228Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493064, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493064/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-09T15:53:06.386475Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493028, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493028/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-09T07:17:03.797051Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 492935, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/492935/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-09T05:15:27.964038Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 492927, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/492927/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-09T05:12:55.962200Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 492924, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/492924/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-09T05:07:37.540916Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 492923, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/492923/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-09T04:59:07.541341Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 492920, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/492920/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-09T04:47:46.626080Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 492918, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/492918/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-09T04:45:15.892853Z", "action": 23, "target": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "old": "", "details": { "error": "Rebasing (1/32)\nRebasing (2/32)\nRebasing (3/32)\nRebasing (4/32)\nRebasing (5/32)\nRebasing (6/32)\nRebasing (7/32)\nRebasing (8/32)\nRebasing (9/32)\nRebasing (10/32)\nRebasing (11/32)\nRebasing (12/32)\nRebasing (13/32)\nRebasing (14/32)\nRebasing (15/32)\nRebasing (16/32)\nRebasing (17/32)\nRebasing (18/32)\nRebasing (19/32)\nRebasing (20/32)\nRebasing (21/32)\nRebasing (22/32)\nRebasing (23/32)\nRebasing (24/32)\nRebasing (25/32)\nRebasing (26/32)\nRebasing (27/32)\nRebasing (28/32)\nRebasing (29/32)\nRebasing (30/32)\nRebasing (31/32)\nRebasing (32/32)\nerror: could not apply e4a6082a... Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply e4a6082a... Translated using Weblate (German)\nAuto-merging locale/de.json\nCONFLICT (content): Merge conflict in locale/de.json\n (1)", "status": "interactive rebase in progress; onto ffdfdb98\nLast commands done (32 commands done):\n pick bb3ad765 Translated using Weblate (Czech)\n pick e4a6082a Translated using Weblate (German)\n (see more in file .git/rebase-merge/done)\nNo commands remaining.\nYou are currently rebasing branch 'v1.1.x' on 'ffdfdb98'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: locale/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 492914, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/492914/?format=api" } ] }{ "count": 7734, "next": "