Changes
Translation projects API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/projects/pf2e-dailies/changes/?format=api&page=5
{ "count": 1135, "next": "https://weblate.foundryvtt-hub.com/api/projects/pf2e-dailies/changes/?format=api&page=6", "previous": "https://weblate.foundryvtt-hub.com/api/projects/pf2e-dailies/changes/?format=api&page=4", "results": [ { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-12-11T16:13:21.134607Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 409570, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/409570/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-27T14:20:07.328780Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 35f71d8\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '35f71d8'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 404355, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/404355/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-27T14:16:24.033625Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 404354, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/404354/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-03T23:14:34.937711Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 8dcb3f3\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '8dcb3f3'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 397216, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/397216/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-03T23:14:32.372444Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 8dcb3f3\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '8dcb3f3'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 397215, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/397215/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-03T23:13:29.170070Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 397214, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/397214/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-11-03T23:12:32.461266Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 397213, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/397213/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-27T23:18:54.122502Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 230a76d\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '230a76d'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 383038, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/383038/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-27T23:18:52.899951Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 383037, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/383037/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-27T13:30:16.975192Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 75fd355\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '75fd355'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 382523, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/382523/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-27T13:30:15.659118Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 382522, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/382522/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-24T22:18:07.860245Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 46b0737\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '46b0737'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 382364, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/382364/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-24T22:18:06.625194Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 382363, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/382363/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-24T18:31:49.122275Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 75a29c4\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '75a29c4'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 382345, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/382345/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-24T18:31:48.479257Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 382344, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/382344/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-24T18:30:56.941812Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto e2fb282\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on 'e2fb282'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 382343, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/382343/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-24T18:30:56.033826Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 382342, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/382342/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-24T14:14:50.331868Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto cf3e0fe\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on 'cf3e0fe'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 382319, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/382319/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-24T14:14:49.411796Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 382318, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/382318/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-22T17:18:53.717706Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto bf538ac\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on 'bf538ac'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 380354, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/380354/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-22T17:18:52.651751Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 380353, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/380353/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-03T12:40:49.920009Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 3eaead4\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3eaead4'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 365742, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/365742/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-03T12:40:48.811982Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 365741, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/365741/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-29T18:58:51.260896Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto f650e70\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on 'f650e70'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 364527, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/364527/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-29T18:58:50.529425Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 364526, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/364526/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-29T18:51:48.245946Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto f7adad4\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on 'f7adad4'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 364525, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/364525/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-29T18:51:47.310036Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 364524, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/364524/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-03T09:38:58.508372Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 4fa4514\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '4fa4514'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 356685, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/356685/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-03T09:38:57.735903Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 356684, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/356684/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-13T22:42:49.851428Z", "action": 47, "target": "", "old": "", "details": { "alert": "RepositoryOutdated" }, "id": 340510, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/340510/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-13T18:28:35.919569Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto b52f2b8\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on 'b52f2b8'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 340486, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/340486/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-13T18:28:35.153008Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 340485, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/340485/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-10T14:39:45.048225Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 292f8a5\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '292f8a5'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 338339, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/338339/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-10T14:39:44.384483Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 338338, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/338338/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-10T14:36:44.143787Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto a09203b\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on 'a09203b'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 338337, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/338337/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-10T14:36:43.487649Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 338336, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/338336/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-09T00:55:44.810569Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 39a02f7\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '39a02f7'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 338191, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/338191/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-09T00:55:44.146818Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 338190, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/338190/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-06T15:55:50.562900Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto dc73f7c\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on 'dc73f7c'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 337818, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/337818/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-06T15:55:49.833864Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 337817, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/337817/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-03T10:04:39.324988Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 93c4c24\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '93c4c24'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 337063, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/337063/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-03T10:04:38.639175Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 337062, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/337062/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-27T19:54:19.393176Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto a89303c\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on 'a89303c'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 335324, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/335324/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-27T19:54:18.801424Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 335323, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/335323/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-27T19:52:43.492632Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 8f2c439\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '8f2c439'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 335322, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/335322/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-27T19:52:42.534172Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 335321, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/335321/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-27T19:29:06.209668Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 776e31c\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '776e31c'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 335316, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/335316/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-27T19:29:05.544002Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 335315, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/335315/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-04-18T18:55:26.290212Z", "action": 23, "target": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\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 b94d317... Added translation using Weblate (Chinese (Simplified))\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 8fda5ae\nLast command done (1 command done):\n pick b94d317 Added translation using Weblate (Chinese (Simplified))\nNext commands to do (16 remaining commands):\n pick 1240071 Added translation using Weblate (French)\n pick 30d0aca Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '8fda5ae'.\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\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/zh_Hans.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 305441, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/305441/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-04-18T18:55:25.501531Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/reonZ/pf2e-dailies", "git://github.com/reonZ/pf2e-dailies.git", "[email protected]:reonZ/pf2e-dailies", "[email protected]:reonZ/pf2e-dailies.git", "https://github.com/reonZ/pf2e-dailies", "https://github.com/reonZ/pf2e-dailies.git" ], "branch": "master", "repo_url": "https://github.com/reonZ/pf2e-dailies", "full_name": "reonZ/pf2e-dailies", "service_long_name": "GitHub" }, "id": 305440, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/305440/?format=api" } ] }