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=3
{ "count": 1135, "next": "https://weblate.foundryvtt-hub.com/api/projects/pf2e-dailies/changes/?format=api&page=4", "previous": "https://weblate.foundryvtt-hub.com/api/projects/pf2e-dailies/changes/?format=api&page=2", "results": [ { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-13T13:22:05.538165Z", "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": 459318, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/459318/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-05T16:40:06.711483Z", "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 9e2fe04\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 '9e2fe04'.\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": 457933, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/457933/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-05T16:40:04.805374Z", "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": 457932, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/457932/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-28T23:18:58.116119Z", "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 54a76b9\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 '54a76b9'.\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": 456690, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/456690/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-28T23:18:55.806422Z", "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": 456689, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/456689/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-26T00:50:50.349766Z", "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 46e69f9\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 '46e69f9'.\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": 456493, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/456493/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-26T00:50:49.215598Z", "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": 456492, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/456492/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-24T20:29:52.302573Z", "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 16be8c7\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 '16be8c7'.\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": 455932, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/455932/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-24T20:29:51.026558Z", "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": 455931, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/455931/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-22T11:53:31.868482Z", "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 5e6d1e1\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 '5e6d1e1'.\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": 455662, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/455662/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-22T11:53:30.873265Z", "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": 455661, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/455661/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-22T11:10:36.396809Z", "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 b9e9f5f\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 'b9e9f5f'.\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": 455660, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/455660/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-22T11:10:35.403625Z", "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": 455659, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/455659/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-21T23:26:53.219880Z", "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 bb8a386\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 'bb8a386'.\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": 455547, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/455547/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-21T23:26:46.304273Z", "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": 455546, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/455546/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-21T23:26:43.498316Z", "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 bb8a386\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 'bb8a386'.\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": 455545, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/455545/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-21T23:26:06.882116Z", "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": 455544, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/455544/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-21T18:01:27.216434Z", "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 c349f4c\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 'c349f4c'.\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": 455531, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/455531/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-21T18:01:24.796989Z", "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": 455530, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/455530/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-21T12:12:11.397260Z", "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 84ea92b\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 '84ea92b'.\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": 455517, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/455517/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-21T12:12:01.686853Z", "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": 455516, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/455516/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-17T11:59:58.827243Z", "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 b5386c8\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 'b5386c8'.\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": 455345, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/455345/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-17T11:59:57.591626Z", "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": 455344, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/455344/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-17T02:10:13.016354Z", "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 7d052a4\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 '7d052a4'.\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": 455343, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/455343/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-17T02:09:31.559447Z", "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": 455342, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/455342/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-16T22:39:48.389033Z", "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 6ebbf85\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 '6ebbf85'.\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": 455341, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/455341/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-16T22:39:43.521814Z", "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": 455340, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/455340/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T12:32:45.590939Z", "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 af9b9a1\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 'af9b9a1'.\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": 454942, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/454942/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T12:32:44.932702Z", "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": 454941, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/454941/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T12:10:08.897138Z", "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 fce44c9\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 'fce44c9'.\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": 454940, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/454940/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T12:10:07.654338Z", "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": 454939, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/454939/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T11:07:58.454696Z", "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 294316d\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 '294316d'.\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": 454938, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/454938/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T11:06:10.687147Z", "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": 454937, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/454937/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T11:02:49.248543Z", "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 e41d208\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 'e41d208'.\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": 454936, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/454936/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T11:02:48.498223Z", "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": 454935, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/454935/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T10:54:55.935359Z", "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 2b4b6ec\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 '2b4b6ec'.\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": 454934, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/454934/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T10:54:55.187896Z", "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": 454933, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/454933/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T10:54:09.323073Z", "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 2a8d6b5\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 '2a8d6b5'.\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": 454932, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/454932/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T10:53:44.965741Z", "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": 454931, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/454931/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-12T22:49:38.332350Z", "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 f96344f\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 'f96344f'.\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": 454916, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/454916/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-12T22:49:37.710927Z", "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": 454915, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/454915/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-12T22:47:58.186275Z", "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 92469ae\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 '92469ae'.\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": 454914, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/454914/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-12T22:47:57.211701Z", "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": 454913, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/454913/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-12T22:46:40.284226Z", "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 07b48c4\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 '07b48c4'.\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": 454912, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/454912/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-12T22:46:39.122867Z", "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": 454911, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/454911/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-12T21:41:49.879506Z", "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 ea7618b\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 'ea7618b'.\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": 454910, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/454910/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-12T21:41:48.795145Z", "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": 454909, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/454909/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-12T19:08:31.892777Z", "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 d4a5448\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 'd4a5448'.\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": 454908, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/454908/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-12T19:08:30.658164Z", "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": 454907, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/454907/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-10T01:16:47.016974Z", "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 6e4ca89\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 '6e4ca89'.\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": 449322, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/449322/?format=api" } ] }