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=10
https://weblate.framasoft.org/api/components/framadate/framadate-v11x/changes/?format=api&page=11", "previous": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/changes/?format=api&page=9", "results": [ { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T20:54:49.313107Z", "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": 450576, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450576/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T12:32:00.183497Z", "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": 450496, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450496/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T12:30:44.898727Z", "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": 450488, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450488/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T12:30:25.643412Z", "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": 450485, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450485/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T12:29:49.570810Z", "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": 450482, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450482/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T12:28:29.649218Z", "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": 450472, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450472/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T12:26:20.857379Z", "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": 450458, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450458/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T12:24:20.358987Z", "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": 450449, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450449/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T12:21:59.918219Z", "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": 450440, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450440/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T12:18:45.796624Z", "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": 450429, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450429/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T12:16:57.442515Z", "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": 450414, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450414/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T12:16:24.403112Z", "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": 450412, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450412/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T12:12:12.540437Z", "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": 450396, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450396/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T12:10:39.807078Z", "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": 450387, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450387/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T10:38:35.874918Z", "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": 450256, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450256/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-09T10:14:28.976262Z", "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": 450252, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450252/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-08T01:56:44.933437Z", "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": 448717, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448717/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T20:52:38.661379Z", "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": 448573, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448573/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T20:51:43.720795Z", "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": 448569, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448569/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T20:41:49.319043Z", "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": 448567, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448567/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T20:40:55.786527Z", "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": 448563, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448563/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T20:40:38.056325Z", "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": 448561, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448561/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T20:39:59.459886Z", "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": 448558, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448558/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T20:29:55.803809Z", "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": 448554, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448554/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T20:28:53.061061Z", "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": 448551, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448551/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T20:18:30.051682Z", "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": 448548, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448548/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T20:17:32.855941Z", "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": 448544, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448544/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T20:16:35.491305Z", "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": 448541, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448541/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T20:05:38.682873Z", "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": 448539, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448539/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T20:04:43.658201Z", "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": 448536, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448536/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T20:03:46.477058Z", "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": 448533, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448533/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T19:52:37.085335Z", "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": 448528, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448528/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T19:51:39.483089Z", "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": 448523, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448523/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T19:50:37.271407Z", "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": 448520, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448520/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T19:39:18.234711Z", "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": 448512, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448512/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T19:38:25.330502Z", "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": 448508, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448508/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T19:26:55.077668Z", "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": 448503, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448503/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T19:25:58.422858Z", "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": 448500, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448500/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T19:25:03.322672Z", "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": 448498, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448498/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T19:13:17.943543Z", "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": 448495, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448495/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T19:12:25.683233Z", "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": 448492, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448492/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T19:11:26.584204Z", "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": 448487, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448487/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T18:59:38.921462Z", "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": 448482, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448482/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T18:17:59.494283Z", "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": 448479, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448479/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T18:07:40.694715Z", "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": 448468, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/448468/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-07T03:07:40.930456Z", "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": 447697, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/447697/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-06T21:53:05.568721Z", "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": 447692, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/447692/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-06T21:15:09.881894Z", "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": 447672, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/447672/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-05T16:22:20.485839Z", "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": 447543, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/447543/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-05T03:16:35.474335Z", "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": 447435, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/447435/?format=api" } ] }{ "count": 7734, "next": "