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=8
https://weblate.framasoft.org/api/components/framadate/framadate-v11x/changes/?format=api&page=9", "previous": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/changes/?format=api&page=7", "results": [ { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-25T14:37:30.081547Z", "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": 485144, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/485144/?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-25T12:03:35.091655Z", "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": 485071, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/485071/?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-25T09:43:55.394352Z", "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": 485066, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/485066/?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-25T00:46:58.569389Z", "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": 484920, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/484920/?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-24T16:35:52.661724Z", "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": 484588, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/484588/?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-24T12:22:37.520494Z", "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": 484506, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/484506/?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-24T10:29:39.975400Z", "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": 484472, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/484472/?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-24T06:51:46.710232Z", "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": 484095, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/484095/?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-24T01:09:20.218950Z", "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": 484044, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/484044/?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-23T19:18:07.817676Z", "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": 483939, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/483939/?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-23T09:47:00.736207Z", "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": 482609, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/482609/?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-22T00:41:58.362284Z", "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": 456617, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/456617/?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-21T11:15:20.174595Z", "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": 456368, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/456368/?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-21T10:23:40.690784Z", "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": 456364, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/456364/?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-21T09:49:41.597472Z", "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": 456361, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/456361/?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-21T07:23:22.056495Z", "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": 456337, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/456337/?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-21T03:37:39.786144Z", "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": 456316, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/456316/?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-21T00:15:26.682392Z", "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": 456283, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/456283/?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-21T00:15:04.901406Z", "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": 456280, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/456280/?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-20T23:11:23.694299Z", "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": 456269, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/456269/?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-20T19:24:07.501976Z", "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": 455323, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/455323/?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-20T18:41:29.560272Z", "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": 455301, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/455301/?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-20T18:38:37.414432Z", "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": 455288, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/455288/?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-20T18:04:55.722378Z", "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": 455280, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/455280/?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-20T16:43:30.066598Z", "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": 455249, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/455249/?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-20T00:18:56.021407Z", "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": 454935, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/454935/?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-20T00:06:49.310185Z", "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": 454932, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/454932/?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-19T23:28:37.779336Z", "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": 454928, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/454928/?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-19T21:49:18.537245Z", "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": 454913, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/454913/?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-19T18:56:55.293193Z", "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": 454173, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/454173/?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-19T09:04:24.193862Z", "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": 454075, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/454075/?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-19T08:51:49.913478Z", "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": 454071, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/454071/?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-19T08:16:32.449702Z", "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": 454060, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/454060/?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-19T07:07:59.255347Z", "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": 454047, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/454047/?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-19T06:32:04.178285Z", "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": 454042, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/454042/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:18:58.797754Z", "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": 453870, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453870/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:18:48.105302Z", "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": 453867, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453867/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:18:44.203732Z", "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": 453864, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453864/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:18:41.673360Z", "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": 453861, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453861/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:18:36.960631Z", "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": 453858, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453858/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:18:34.696126Z", "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": 453856, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453856/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:18:31.784225Z", "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": 453852, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453852/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:18:27.366390Z", "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": 453851, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453851/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:18:25.610572Z", "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": 453849, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453849/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:18:21.820224Z", "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": 453844, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453844/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:18:19.467909Z", "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": 453843, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453843/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:17:46.874188Z", "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": 453836, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453836/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:17:39.710012Z", "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": 453834, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453834/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:17:30.736381Z", "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": 453831, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453831/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/framadate/framadate-v11x/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-18T05:17:25.605446Z", "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": 453827, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/453827/?format=api" } ] }{ "count": 7734, "next": "