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=2
{ "count": 1135, "next": "https://weblate.foundryvtt-hub.com/api/projects/pf2e-dailies/changes/?format=api&page=3", "previous": "https://weblate.foundryvtt-hub.com/api/projects/pf2e-dailies/changes/?format=api", "results": [ { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-31T23:25:08.097556Z", "action": 23, "target": "Rebasing (1/17)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b94d317... Added translation using Weblate (Chinese (Simplified))\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b94d317... Added translation using Weblate (Chinese (Simplified))\n (1)", "status": "interactive rebase in progress; onto b687011\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 'b687011'.\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": 489810, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/489810/?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-10-31T23:25:07.719618Z", "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": 489809, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/489809/?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-10-31T21:36:11.211511Z", "action": 23, "target": "Rebasing (1/17)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b94d317... Added translation using Weblate (Chinese (Simplified))\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b94d317... Added translation using Weblate (Chinese (Simplified))\n (1)", "status": "interactive rebase in progress; onto d3226f5\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 'd3226f5'.\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": 489808, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/489808/?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-10-31T21:36:10.787349Z", "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": 489807, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/489807/?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-10-24T18:54:06.731727Z", "action": 23, "target": "Rebasing (1/17)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b94d317... Added translation using Weblate (Chinese (Simplified))\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b94d317... Added translation using Weblate (Chinese (Simplified))\n (1)", "status": "interactive rebase in progress; onto 2182bcf\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 '2182bcf'.\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": 489269, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/489269/?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-10-24T18:54:06.288847Z", "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": 489268, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/489268/?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-10-23T22:51:03.468921Z", "action": 23, "target": "Rebasing (1/17)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b94d317... Added translation using Weblate (Chinese (Simplified))\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b94d317... Added translation using Weblate (Chinese (Simplified))\n (1)", "status": "interactive rebase in progress; onto 0b240aa\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 '0b240aa'.\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": 489265, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/489265/?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-10-23T22:51:03.085501Z", "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": 489264, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/489264/?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-10-21T12:16:43.489108Z", "action": 23, "target": "Rebasing (1/17)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b94d317... Added translation using Weblate (Chinese (Simplified))\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b94d317... Added translation using Weblate (Chinese (Simplified))\n (1)", "status": "interactive rebase in progress; onto 47ebb5e\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 '47ebb5e'.\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": 489000, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/489000/?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-10-21T12:16:43.116357Z", "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": 488999, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/488999/?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-10-20T22:29:14.308320Z", "action": 23, "target": "Rebasing (1/17)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b94d317... Added translation using Weblate (Chinese (Simplified))\n (1)", "old": "", "details": { "error": "Rebasing (1/17)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nerror: could not apply b94d317... Added translation using Weblate (Chinese (Simplified))\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply b94d317... Added translation using Weblate (Chinese (Simplified))\n (1)", "status": "interactive rebase in progress; onto c6c39d2\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 'c6c39d2'.\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": 488996, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/488996/?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-10-20T22:29:13.823758Z", "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": 488995, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/488995/?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-09-17T23:21:59.229362Z", "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 299f225\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 '299f225'.\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": 484697, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/484697/?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-09-17T23:21:57.835512Z", "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": 484696, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/484696/?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-08-12T09:43:28.397304Z", "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 7fc910d\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 '7fc910d'.\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": 472534, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/472534/?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-08-12T09:43:27.525117Z", "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": 472533, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/472533/?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-08-02T03:16:21.585915Z", "action": 47, "target": "", "old": "", "details": { "alert": "UpdateFailure" }, "id": 471969, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/471969/?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-07-26T03:14:44.438512Z", "action": 47, "target": "", "old": "", "details": { "alert": "UpdateFailure" }, "id": 470755, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/470755/?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-07-20T22:23:36.493781Z", "action": 47, "target": "", "old": "", "details": { "alert": "UpdateFailure" }, "id": 469693, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/469693/?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-07-20T22:23:12.648355Z", "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": 469692, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/469692/?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-07-03T19:27:33.795907Z", "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 0dd134e\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 '0dd134e'.\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": 467159, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/467159/?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-07-03T19:27:24.626196Z", "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": 467158, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/467158/?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-07-03T19:27:21.947791Z", "action": 47, "target": "", "old": "", "details": { "alert": "UpdateFailure" }, "id": 467157, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/467157/?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-07-03T19:26:10.215824Z", "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": 467156, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/467156/?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-07-01T22:29:27.987810Z", "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 7482552\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 '7482552'.\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": 466889, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/466889/?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-07-01T22:29:25.346657Z", "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": 466888, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/466888/?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-06-26T13:36:04.342905Z", "action": 47, "target": "", "old": "", "details": { "alert": "UpdateFailure" }, "id": 465386, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/465386/?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-06-26T13:35:04.179610Z", "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": 465384, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/465384/?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-06-23T16:54:24.469649Z", "action": 23, "target": "Rebasing (1/17)\nPerforming inexact rename detection: 7% (172/2193)\nPerforming inexact rename detection: 9% (215/2193)\nPerforming inexact rename detection: 11% (258/2193)\nPerforming inexact rename detection: 13% (301/2193)\nPerforming inexact rename detection: 15% (344/2193)\nPerforming inexact rename detection: 17% (387/2193)\nPerforming inexact rename detection: 19% (430/2193)\nPerforming inexact rename detection: 21% (473/2193)\nPerforming inexact rename detection: 23% (516/2193)\nPerforming inexact rename detection: 25% (559/2193)\nPerforming inexact rename detection: 27% (602/2193)\nPerforming inexact rename detection: 29% (645/2193)\nPerforming inexact rename detection: 31% (688/2193)\nPerforming inexact rename detection: 33% (731/2193)\nPerforming inexact rename detection: 35% (774/2193)\nPerforming inexact rename detection: 37% (817/2193)\nPerforming inexact rename detection: 39% (860/2193)\nPerforming inexact rename detection: 41% (903/2193)\nPerforming inexact rename detection: 43% (946/2193)\nPerforming inexact rename detection: 45% (989/2193)\nPerforming inexact rename detection: 47% (1032/2193)\nPerforming inexact rename detection: 49% (1075/2193)\nPerforming inexact rename detection: 50% (1118/2193)\nPerforming inexact rename detection: 52% (1161/2193)\nPerforming inexact rename detection: 54% (1204/2193)\nPerforming inexact rename detection: 56% (1247/2193)\nPerforming inexact rename detection: 58% (1290/2193)\nPerforming inexact rename detection: 60% (1333/2193)\nPerforming inexact rename detection: 62% (1376/2193)\nPerforming inexact rename detection: 64% (1419/2193)\nPerforming inexact rename detection: 66% (1462/2193)\nPerforming inexact rename detection: 68% (1505/2193)\nPerforming inexact rename detection: 70% (1548/2193)\nPerforming inexact rename detection: 72% (1591/2193)\nPerforming inexact rename detection: 74% (1634/2193)\nPerforming inexact rename detection: 76% (1677/2193)\nPerforming inexact rename detection: 78% (1720/2193)\nPerforming inexact rename detection: 80% (1763/2193)\nPerforming inexact rename detection: 82% (1806/2193)\nPerforming inexact rename detection: 84% (1849/2193)\nPerforming inexact rename detection: 86% (1892/2193)\nPerforming inexact rename detection: 88% (1935/2193)\nPerforming inexact rename detection: 90% (1978/2193)\nPerforming inexact rename detection: 92% (2021/2193)\nPerforming inexact rename detection: 94% (2064/2193)\nPerforming inexact rename detection: 96% (2107/2193)\nPerforming inexact rename detection: 98% (2150/2193)\nPerforming inexact rename detection: 100% (2193/2193)\nPerforming inexact rename detection: 100% (2193/2193), done.\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)\nPerforming inexact rename detection: 7% (172/2193)\nPerforming inexact rename detection: 9% (215/2193)\nPerforming inexact rename detection: 11% (258/2193)\nPerforming inexact rename detection: 13% (301/2193)\nPerforming inexact rename detection: 15% (344/2193)\nPerforming inexact rename detection: 17% (387/2193)\nPerforming inexact rename detection: 19% (430/2193)\nPerforming inexact rename detection: 21% (473/2193)\nPerforming inexact rename detection: 23% (516/2193)\nPerforming inexact rename detection: 25% (559/2193)\nPerforming inexact rename detection: 27% (602/2193)\nPerforming inexact rename detection: 29% (645/2193)\nPerforming inexact rename detection: 31% (688/2193)\nPerforming inexact rename detection: 33% (731/2193)\nPerforming inexact rename detection: 35% (774/2193)\nPerforming inexact rename detection: 37% (817/2193)\nPerforming inexact rename detection: 39% (860/2193)\nPerforming inexact rename detection: 41% (903/2193)\nPerforming inexact rename detection: 43% (946/2193)\nPerforming inexact rename detection: 45% (989/2193)\nPerforming inexact rename detection: 47% (1032/2193)\nPerforming inexact rename detection: 49% (1075/2193)\nPerforming inexact rename detection: 50% (1118/2193)\nPerforming inexact rename detection: 52% (1161/2193)\nPerforming inexact rename detection: 54% (1204/2193)\nPerforming inexact rename detection: 56% (1247/2193)\nPerforming inexact rename detection: 58% (1290/2193)\nPerforming inexact rename detection: 60% (1333/2193)\nPerforming inexact rename detection: 62% (1376/2193)\nPerforming inexact rename detection: 64% (1419/2193)\nPerforming inexact rename detection: 66% (1462/2193)\nPerforming inexact rename detection: 68% (1505/2193)\nPerforming inexact rename detection: 70% (1548/2193)\nPerforming inexact rename detection: 72% (1591/2193)\nPerforming inexact rename detection: 74% (1634/2193)\nPerforming inexact rename detection: 76% (1677/2193)\nPerforming inexact rename detection: 78% (1720/2193)\nPerforming inexact rename detection: 80% (1763/2193)\nPerforming inexact rename detection: 82% (1806/2193)\nPerforming inexact rename detection: 84% (1849/2193)\nPerforming inexact rename detection: 86% (1892/2193)\nPerforming inexact rename detection: 88% (1935/2193)\nPerforming inexact rename detection: 90% (1978/2193)\nPerforming inexact rename detection: 92% (2021/2193)\nPerforming inexact rename detection: 94% (2064/2193)\nPerforming inexact rename detection: 96% (2107/2193)\nPerforming inexact rename detection: 98% (2150/2193)\nPerforming inexact rename detection: 100% (2193/2193)\nPerforming inexact rename detection: 100% (2193/2193), done.\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 83c205f\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 '83c205f'.\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": 464490, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/464490/?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-06-23T16:53:24.333074Z", "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": 464489, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/464489/?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-06-16T20:49:14.051280Z", "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 8276a49\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 '8276a49'.\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": 463990, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/463990/?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-06-16T20:49:10.694771Z", "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": 463989, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/463989/?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-06-10T17:49:01.075930Z", "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 cd07211\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 'cd07211'.\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": 463472, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/463472/?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-06-10T17:48:59.655489Z", "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": 463471, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/463471/?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-06-10T15:50:10.478227Z", "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 c0ebf0b\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 'c0ebf0b'.\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": 463455, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/463455/?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-06-10T15:50:08.136297Z", "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": 463454, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/463454/?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-28T18:28:44.952309Z", "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 37c3f0e\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 '37c3f0e'.\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": 462074, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/462074/?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-28T18:28:43.802054Z", "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": 462073, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/462073/?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-28T18:27:52.382694Z", "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 17d4a45\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 '17d4a45'.\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": 462072, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/462072/?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-28T18:27:51.113272Z", "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": 462071, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/462071/?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-28T10:41:43.486473Z", "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 193f339\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 '193f339'.\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": 462069, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/462069/?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-28T10:41:41.584062Z", "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": 462068, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/462068/?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-16T03:17:09.944176Z", "action": 47, "target": "", "old": "", "details": { "alert": "UpdateFailure" }, "id": 459536, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/459536/?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-13T22:08:56.741058Z", "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 8d1aae7\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 '8d1aae7'.\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": 459383, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/459383/?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-13T22:08:55.088106Z", "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": 459382, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/459382/?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-13T22:03:49.392148Z", "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 020dbec\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 '020dbec'.\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": 459381, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/459381/?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-13T22:03:47.638052Z", "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": 459380, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/459380/?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-13T13:22:57.229906Z", "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 b94bb74\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 'b94bb74'.\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": 459321, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/459321/?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-13T13:22:52.280773Z", "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": 459320, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/459320/?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-13T13:22:08.091575Z", "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 41030ec\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 '41030ec'.\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": 459319, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/459319/?format=api" } ] }