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=11
https://weblate.framasoft.org/api/components/framadate/framadate-v11x/changes/?format=api&page=12", "previous": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/changes/?format=api&page=10", "results": [ { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-04T07:24:10.973242Z", "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": 445542, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/445542/?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-03T10:33:48.068447Z", "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": 443954, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/443954/?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-03T09:01:41.332012Z", "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": 443948, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/443948/?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-03T03:03:58.886823Z", "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": 443925, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/443925/?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-02T15:47:28.215963Z", "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": 443825, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/443825/?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-02T07:23:35.450639Z", "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": 443567, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/443567/?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-01T16:18:46.362515Z", "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": 443528, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/443528/?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-01T09:05:49.701609Z", "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": 443505, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/443505/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-31T18:37:06.046199Z", "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": 443481, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/443481/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-31T15:25:19.625054Z", "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": 442912, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/442912/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-31T05:52:12.706083Z", "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": 442176, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/442176/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-31T04:59:39.773959Z", "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": 442172, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/442172/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-31T02:49:22.044602Z", "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": 442160, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/442160/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-31T00:08:49.792308Z", "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": 442136, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/442136/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-30T20:31:57.679220Z", "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": 442083, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/442083/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-30T13:58:18.308213Z", "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": 442063, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/442063/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-30T11:43:18.455295Z", "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": 442050, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/442050/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-30T08:45:53.011554Z", "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": 442026, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/442026/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-30T04:22:17.969093Z", "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": 442012, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/442012/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-29T21:25:01.201806Z", "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": 441995, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/441995/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-29T04:18:23.297937Z", "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": 441839, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/441839/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-29T03:37:15.004408Z", "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": 441810, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/441810/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-29T03:30:18.767490Z", "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": 441807, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/441807/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-28T22:00:32.817369Z", "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": 441723, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/441723/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-28T05:23:51.566020Z", "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": 440657, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/440657/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-26T14:26:55.922693Z", "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": 440411, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/440411/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-26T03:50:00.602781Z", "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": 439601, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/439601/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-24T05:40:56.654034Z", "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": 435927, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/435927/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-23T22:35:26.809401Z", "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": 435918, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/435918/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-22T22:44:00.447187Z", "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": 435819, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/435819/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-22T10:01:01.212518Z", "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": 435786, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/435786/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-22T00:55:48.806276Z", "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": 435774, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/435774/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-21T10:51:26.126143Z", "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": 435727, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/435727/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-20T01:56:26.820381Z", "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": 435637, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/435637/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-19T00:50:02.823911Z", "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": 435577, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/435577/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-19T00:48:52.535685Z", "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": 435574, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/435574/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-17T22:17:07.943079Z", "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": 432849, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/432849/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-16T21:51:10.503359Z", "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": 432607, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/432607/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-16T15:52:24.655038Z", "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": 432596, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/432596/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-14T21:13:52.262505Z", "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": 432256, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/432256/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-14T21:13:50.450434Z", "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": 432253, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/432253/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-14T14:52:01.828141Z", "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": 432212, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/432212/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-13T20:19:40.287867Z", "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": 432156, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/432156/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-13T11:34:59.845272Z", "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": 432008, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/432008/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-13T10:00:58.388280Z", "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": 431985, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/431985/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-13T10:00:48.798033Z", "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": 431982, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/431982/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-13T09:50:48.588635Z", "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": 431954, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/431954/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-13T09:49:26.692842Z", "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": 431946, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/431946/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-13T09:49:17.519200Z", "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": 431935, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/431935/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-10-13T09:49:09.643783Z", "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": 431925, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/431925/?format=api" } ] }{ "count": 7734, "next": "