Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/wild-magic-surge-5e/main/changes/?format=api
{ "count": 1826, "next": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/changes/?format=api&page=2", "previous": null, "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": "2025-01-31T18:36:43.039075Z", "action": 47, "target": "", "old": "", "details": { "alert": "UnusedComponent" }, "id": 493525, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/493525/?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": "2025-01-20T00:40:55.289446Z", "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 78b753c\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 '78b753c'.\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": 492929, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492929/?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": "2025-01-20T00:40:54.878412Z", "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": 492928, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492928/?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": "2025-01-19T08:34:33.872692Z", "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 6b178b0\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 '6b178b0'.\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": 492891, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492891/?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": "2025-01-19T08:34:33.400389Z", "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": 492890, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492890/?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": "2025-01-13T00:50:11.254810Z", "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 ddea532\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 'ddea532'.\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": 492712, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492712/?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": "2025-01-13T00:50:10.837669Z", "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": 492711, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492711/?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": "2025-01-11T21:32:55.262836Z", "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 96aac75\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 '96aac75'.\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": 492654, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492654/?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": "2025-01-11T21:32:54.823733Z", "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": 492653, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492653/?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": "2025-01-11T02:27:30.878829Z", "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 f0b8fc3\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 'f0b8fc3'.\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": 492647, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492647/?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": "2025-01-11T02:27:30.358649Z", "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": 492646, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492646/?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": "2025-01-06T01:40:37.120158Z", "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 b3cfe52\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 'b3cfe52'.\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": 492492, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492492/?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": "2025-01-06T01:40:36.399682Z", "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": 492491, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492491/?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": "2025-01-05T19:41:04.956403Z", "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 30e1e88\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 '30e1e88'.\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": 492433, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492433/?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": "2025-01-05T19:41:04.505256Z", "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": 492432, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492432/?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": "2025-01-04T02:16:47.095886Z", "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 8baa953\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 '8baa953'.\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": 492384, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492384/?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": "2025-01-04T02:16:46.698128Z", "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": 492383, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492383/?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-12-30T02:18:37.921617Z", "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 4786deb\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 '4786deb'.\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": 492360, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492360/?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-12-30T02:18:37.514526Z", "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": 492359, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492359/?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-12-28T00:28:00.987990Z", "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 938032f\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 '938032f'.\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": 492354, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492354/?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-12-28T00:28:00.551405Z", "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": 492353, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492353/?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-12-23T00:14:29.214704Z", "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 a6e9969\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 'a6e9969'.\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": 492236, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492236/?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-12-23T00:14:28.753391Z", "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": 492235, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492235/?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-12-21T00:26:32.319606Z", "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 d5e22fe\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 'd5e22fe'.\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": 492201, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492201/?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-12-21T00:26:31.904728Z", "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": 492200, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492200/?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-12-16T03:09:32.167165Z", "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 0b1b3f9\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 '0b1b3f9'.\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": 491410, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491410/?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-12-16T03:09:31.679226Z", "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": 491409, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491409/?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-12-16T00:15:33.681276Z", "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 702266f\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 '702266f'.\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": 491402, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491402/?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-12-16T00:15:33.265631Z", "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": 491401, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491401/?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-12-14T09:56:34.580087Z", "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 ec41d83\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 'ec41d83'.\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": 491375, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491375/?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-12-14T09:56:34.166847Z", "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": 491374, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491374/?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-12-14T03:23:37.112312Z", "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 65f962f\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 '65f962f'.\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": 491373, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491373/?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-12-14T03:23:36.649617Z", "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": 491372, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491372/?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-12-09T00:09:41.308989Z", "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 ca176a9\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 'ca176a9'.\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": 491358, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491358/?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-12-09T00:09:40.892857Z", "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": 491357, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491357/?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-12-07T07:50:08.386430Z", "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 c8e9f8d\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 'c8e9f8d'.\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": 491348, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491348/?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-12-07T07:50:07.938849Z", "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": 491347, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491347/?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-12-07T00:55:44.306313Z", "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 58e9689\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 '58e9689'.\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": 491346, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491346/?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-12-07T00:55:43.902573Z", "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": 491345, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491345/?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-12-02T01:51:14.320883Z", "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 30f5c01\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 '30f5c01'.\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": 491283, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491283/?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-12-02T01:51:13.882653Z", "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": 491282, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491282/?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-12-01T11:13:18.787254Z", "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 83db290\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 '83db290'.\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": 491281, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491281/?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-12-01T11:13:18.341778Z", "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": 491280, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491280/?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-30T00:26:08.666348Z", "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 4b9323b\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 '4b9323b'.\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": 491254, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491254/?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-30T00:26:08.256125Z", "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": 491253, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491253/?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-25T01:43:31.443022Z", "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 3e5a845\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 '3e5a845'.\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": 491006, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491006/?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-25T01:43:31.037117Z", "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": 491005, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491005/?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-23T01:28:57.635179Z", "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 a67c08c\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 'a67c08c'.\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": 490979, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/490979/?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-23T01:28:57.191993Z", "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": 490978, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/490978/?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-18T02:04:09.473927Z", "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 84e98a1\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 '84e98a1'.\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": 490847, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/490847/?format=api" } ] }