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&page=7
{ "count": 1826, "next": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/changes/?format=api&page=8", "previous": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/changes/?format=api&page=6", "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-02-18T19:18:05.721906Z", "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": 442031, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/442031/?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-02-18T10:36:03.346664Z", "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 5d23a28\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 '5d23a28'.\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": 442013, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/442013/?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-02-18T10:35:54.703612Z", "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": 442012, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/442012/?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-02-17T00:30:35.749945Z", "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 1ed5cfc\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 '1ed5cfc'.\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": 441740, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/441740/?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-02-17T00:30:34.479587Z", "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": 441739, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/441739/?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-02-14T08:24:17.516572Z", "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 e3ee4ef\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 'e3ee4ef'.\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": 441547, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/441547/?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-02-14T08:22:52.079259Z", "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": 441546, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/441546/?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-02-14T08:21:20.359767Z", "action": 47, "target": "", "old": "", "details": { "alert": "UpdateFailure" }, "id": 441545, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/441545/?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-02-14T08:18:36.878933Z", "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": 441544, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/441544/?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-02-12T01:38:17.362810Z", "action": 47, "target": "", "old": "", "details": { "alert": "UpdateFailure" }, "id": 441295, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/441295/?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-02-12T01:36:51.564080Z", "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": 441294, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/441294/?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-02-11T21:27:44.987340Z", "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": 441289, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/441289/?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-02-10T00:38:51.481464Z", "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 baf9e32\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 'baf9e32'.\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": 440888, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/440888/?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-02-10T00:38:48.222234Z", "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": 440887, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/440887/?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-02-05T00:13:44.357610Z", "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": 439942, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/439942/?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-02-04T19:26:30.794255Z", "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": 439927, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/439927/?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-02-04T09:21:45.847899Z", "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 df1510c\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 'df1510c'.\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": 439907, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/439907/?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-02-04T09:21:44.112004Z", "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": 439906, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/439906/?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-02-03T20:18:48.350932Z", "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 a988339\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 'a988339'.\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": 439876, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/439876/?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-02-03T20:18:46.737845Z", "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": 439875, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/439875/?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-02-03T13:46:10.795601Z", "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 f092b35\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 'f092b35'.\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": 439861, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/439861/?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-02-03T13:46:06.379598Z", "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": 439860, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/439860/?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-02-03T04:28:19.405808Z", "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 07a7a3c\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 '07a7a3c'.\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": 439841, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/439841/?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-02-03T04:28:17.470716Z", "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": 439840, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/439840/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/22496/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/wild-magic-surge-5e/main/de/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/anonymous/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/anonymous/?format=api", "timestamp": "2024-02-01T09:54:19.928147Z", "action": 4, "target": "In den Chat senden", "old": "Zum Chatten senden", "details": { "state": 20, "source": "Send to chat", "old_state": 20 }, "id": 439097, "action_name": "Suggestion added", "url": "https://weblate.foundryvtt-hub.com/api/changes/439097/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/22500/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/wild-magic-surge-5e/main/de/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/anonymous/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/anonymous/?format=api", "timestamp": "2024-02-01T09:53:21.080285Z", "action": 4, "target": "Der Wurf auf \"Wilde Magie\" wird nur an den GM statt an alle Spieler gesendet.", "old": "", "details": { "state": 0, "source": "The surge check roll message is only sent to the GM instead of all players.", "old_state": 0 }, "id": 439096, "action_name": "Suggestion added", "url": "https://weblate.foundryvtt-hub.com/api/changes/439096/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/22499/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/wild-magic-surge-5e/main/de/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/anonymous/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/anonymous/?format=api", "timestamp": "2024-02-01T09:52:46.175376Z", "action": 4, "target": "Sende deinen \"Wilde Magie\" Wurf an den GM", "old": "", "details": { "state": 0, "source": "Whisper Wild Magic Surge Roll Check to GM", "old_state": 0 }, "id": 439095, "action_name": "Suggestion added", "url": "https://weblate.foundryvtt-hub.com/api/changes/439095/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/22492/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/wild-magic-surge-5e/main/de/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/anonymous/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/anonymous/?format=api", "timestamp": "2024-02-01T09:52:00.095980Z", "action": 4, "target": "Name der Fähigkeit \"Gezeiten des Chaos\"", "old": "", "details": { "state": 0, "source": "Name of the Tides of Chaos feat", "old_state": 0 }, "id": 439094, "action_name": "Suggestion added", "url": "https://weblate.foundryvtt-hub.com/api/changes/439094/?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-01-29T02:50:47.155789Z", "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 2a6f779\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 '2a6f779'.\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": 438783, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/438783/?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-01-29T02:50:44.547423Z", "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": 438782, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/438782/?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-01-28T21:20:51.496977Z", "action": 47, "target": "", "old": "", "details": { "alert": "UpdateFailure" }, "id": 438775, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/438775/?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-01-28T21:19:16.864008Z", "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": 438774, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/438774/?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-01-27T08:28:06.023990Z", "action": 47, "target": "", "old": "", "details": { "alert": "UpdateFailure" }, "id": 437213, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/437213/?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-01-27T08:27:38.958874Z", "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": 437212, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/437212/?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-01-27T01:05:04.374133Z", "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 ec1689e\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 'ec1689e'.\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": 437190, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/437190/?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-01-27T01:05:02.974908Z", "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": 437189, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/437189/?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-01-22T01:12:56.754039Z", "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 7cde296\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 '7cde296'.\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": 435388, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/435388/?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-01-22T01:12:55.760283Z", "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": 435387, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/435387/?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-01-20T10:57:50.015546Z", "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 54090b8\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 '54090b8'.\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": 434932, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/434932/?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-01-20T10:57:48.689173Z", "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": 434931, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/434931/?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-01-20T05:15:30.771890Z", "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 2c55184\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 '2c55184'.\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": 434890, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/434890/?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-01-20T05:15:29.470078Z", "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": 434889, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/434889/?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-01-20T02:00:14.275000Z", "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 f18c53d\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 'f18c53d'.\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": 434788, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/434788/?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-01-20T02:00:13.338234Z", "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": 434787, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/434787/?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-01-15T02:17:52.174891Z", "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 0c94344\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 '0c94344'.\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": 434135, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/434135/?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-01-15T02:17:51.220463Z", "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": 434134, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/434134/?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-01-14T06:01:53.270418Z", "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 bbcd6d2\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 'bbcd6d2'.\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": 434110, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/434110/?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-01-14T06:01:51.995310Z", "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": 434109, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/434109/?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-01-13T05:09:39.686301Z", "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 c205b6b\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 'c205b6b'.\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": 434006, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/434006/?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-01-13T05:09:36.095516Z", "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": 434005, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/434005/?format=api" } ] }