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=9
https://weblate.framasoft.org/api/components/framadate/framadate-v11x/changes/?format=api&page=10", "previous": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/changes/?format=api&page=8", "results": [ { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:17:13.853185Z", "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": 453823, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453823/?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-18T05:17:08.244472Z", "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": 453821, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453821/?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-18T05:17:05.771392Z", "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": 453817, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453817/?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-18T05:17:01.039469Z", "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": 453815, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453815/?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-18T05:16:55.857252Z", "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": 453813, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453813/?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-18T05:16:54.112301Z", "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": 453812, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453812/?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-18T05:16:48.793088Z", "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": 453805, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453805/?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-18T05:16:32.456137Z", "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": 453802, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453802/?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-18T05:16:30.641289Z", "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": 453799, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453799/?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-18T05:16:12.603580Z", "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": 453798, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453798/?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-18T04:10:26.599235Z", "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": 453594, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453594/?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-18T00:31:57.965576Z", "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": 453556, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453556/?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-18T00:31:49.715024Z", "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": 453553, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453553/?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-18T00:31:40.198611Z", "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": 453548, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453548/?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-18T00:31:38.089488Z", "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": 453545, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453545/?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-18T00:31:36.380385Z", "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": 453542, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453542/?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-18T00:31:21.709762Z", "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": 453541, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453541/?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-18T00:31:15.573923Z", "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": 453538, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453538/?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-18T00:30:59.484994Z", "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": 453533, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453533/?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-18T00:30:56.905399Z", "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": 453532, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453532/?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-18T00:30:54.346805Z", "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": 453529, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453529/?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-18T00:30:36.958945Z", "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": 453526, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453526/?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-18T00:30:27.033172Z", "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": 453523, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453523/?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-18T00:30:25.163885Z", "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": 453520, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453520/?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-18T00:29:43.676653Z", "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": 453516, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453516/?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-18T00:29:39.890728Z", "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": 453513, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453513/?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-18T00:29:31.681939Z", "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": 453510, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453510/?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-18T00:29:29.177161Z", "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": 453507, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453507/?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-18T00:29:22.650760Z", "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": 453505, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453505/?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-18T00:29:15.441863Z", "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": 453501, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453501/?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-18T00:29:10.934888Z", "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": 453498, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453498/?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-18T00:29:08.453544Z", "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": 453497, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453497/?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-17T23:29:14.860452Z", "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": 453357, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453357/?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-17T19:47:08.220861Z", "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": 453311, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453311/?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-17T16:20:59.428026Z", "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": 453285, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453285/?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-17T12:17:12.668987Z", "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": 453253, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453253/?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-17T11:10:17.871916Z", "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": 453208, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453208/?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-16T12:06:11.835888Z", "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": 453069, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453069/?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-15T15:05:23.879719Z", "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": 452891, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/452891/?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-15T07:11:07.401297Z", "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": 452393, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/452393/?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-13T21:26:33.407132Z", "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": 451645, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/451645/?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-13T04:50:16.378240Z", "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": 451172, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/451172/?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-12T18:04:59.613902Z", "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": 451102, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/451102/?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-11T15:31:44.065516Z", "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": 450765, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450765/?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-11T03:44:18.728310Z", "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": 450727, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450727/?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-10T22:05:45.815293Z", "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": 450723, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450723/?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-10T16:36:34.626571Z", "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": 450627, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450627/?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-10T16:34:31.380605Z", "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": 450625, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450625/?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-10T16:12:51.879693Z", "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": 450620, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450620/?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-10T08:17:36.714802Z", "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": 450595, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/450595/?format=api" } ] }{ "count": 7734, "next": "