Changes
Translation projects API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/projects/wild-magic-surge-5e/changes/?format=api&page=2
{ "count": 1835, "next": "https://weblate.foundryvtt-hub.com/api/projects/wild-magic-surge-5e/changes/?format=api&page=3", "previous": "https://weblate.foundryvtt-hub.com/api/projects/wild-magic-surge-5e/changes/?format=api", "results": [ { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-11-18T02:04:09.060533Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 490846, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/490846/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-11-16T01:47:12.399452Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto 9533d74\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '9533d74'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 490839, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/490839/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-11-16T01:47:11.994711Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 490838, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/490838/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-11-11T01:57:28.171046Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto 0fcc2d3\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '0fcc2d3'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 490764, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/490764/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-11-11T01:57:27.692572Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 490763, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/490763/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-11-09T00:46:03.059661Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto 3eefb20\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '3eefb20'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 490698, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/490698/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-11-09T00:46:02.643167Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 490697, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/490697/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-11-04T02:17:14.232531Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto 086ef26\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '086ef26'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 489854, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/489854/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-11-04T02:17:13.838452Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 489853, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/489853/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-11-03T19:40:50.590820Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto d135e0c\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'd135e0c'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 489849, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/489849/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-11-03T19:40:50.202200Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 489848, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/489848/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-11-03T07:31:34.847918Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto 949861e\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '949861e'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 489843, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/489843/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-11-03T07:31:34.447246Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 489842, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/489842/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-11-02T00:18:27.445456Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto 0578a0e\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '0578a0e'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 489814, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/489814/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-11-02T00:18:26.983735Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 489813, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/489813/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-28T01:06:16.398202Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto d360ec0\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'd360ec0'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 489572, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/489572/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-28T01:06:15.977129Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 489571, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/489571/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-26T15:58:15.182202Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto 05f03e5\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '05f03e5'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 489423, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/489423/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-26T15:58:14.797914Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 489422, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/489422/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-26T04:23:46.839372Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto acaaabe\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'acaaabe'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 489280, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/489280/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-26T04:23:46.438774Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 489279, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/489279/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-26T01:18:36.030142Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto b9a9a69\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'b9a9a69'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 489278, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/489278/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-26T01:18:35.599207Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 489277, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/489277/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-21T01:12:16.424272Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto d6c063b\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'd6c063b'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 488998, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/488998/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-21T01:12:16.034731Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 488997, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/488997/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-20T18:24:58.078056Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto 5cf3faa\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '5cf3faa'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 488980, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/488980/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-20T18:24:57.600917Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 488979, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/488979/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-20T00:04:56.442053Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto f604742\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'f604742'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 488974, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/488974/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-20T00:04:55.994383Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 488973, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/488973/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-19T00:58:21.147640Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto 52fc4d5\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '52fc4d5'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 488953, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/488953/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-19T00:58:20.701043Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 488952, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/488952/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-14T01:42:06.589025Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto 16610a3\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '16610a3'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 488510, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/488510/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-14T01:42:06.184763Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 488509, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/488509/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-13T15:05:09.855650Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto 720149f\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '720149f'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 488228, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/488228/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-13T15:05:09.417450Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 488227, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/488227/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-12T00:23:38.212015Z", "action": 23, "target": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\nerror: could not apply 4f40537... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\n (1)", "status": "interactive rebase in progress; onto d047bf3\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'd047bf3'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 487729, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/487729/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-12T00:23:37.704157Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 487728, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/487728/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-07T00:03:28.376828Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 84a233b\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '84a233b'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 486632, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/486632/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-07T00:03:26.645475Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 486631, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/486631/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-05T16:19:04.374851Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto fa0d16b\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'fa0d16b'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 486432, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/486432/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-05T16:19:03.136494Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 486431, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/486431/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-05T00:19:17.098143Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 1c55cc8\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '1c55cc8'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 486422, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/486422/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-05T00:19:15.466224Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 486421, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/486421/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-29T00:12:29.893392Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 666f920\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '666f920'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 485962, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/485962/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-29T00:12:28.402293Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 485961, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/485961/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-28T18:47:38.822778Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto b098432\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'b098432'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 485912, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/485912/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-28T18:47:37.799705Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 485911, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/485911/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-28T04:16:53.531056Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto b0c79fb\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'b0c79fb'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 485802, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/485802/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-28T04:16:52.554991Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 485801, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/485801/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-28T00:18:20.743984Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 3e90750\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '3e90750'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 485794, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/485794/?format=api" } ] }