Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/pf2e-dailies/main/changes/?format=api
https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/changes/?format=api&page=2", "previous": null, "results": [ { "unit": "https://weblate.foundryvtt-hub.com/api/units/176458/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/pf2e-dailies/main/fr/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/rectulo/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/rectulo/?format=api", "timestamp": "2025-05-03T10:12:47.562564Z", "action": 4, "target": "Préparatifs quotidiens personnalisés", "old": "Préparatifs quotidiens", "details": { "state": 20, "source": "Custom Dailies", "old_state": 20 }, "id": 502935, "action_name": "Suggestion added", "url": "https://weblate.foundryvtt-hub.com/api/changes/502935/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/176418/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/pf2e-dailies/main/fr/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/rectulo/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/rectulo/?format=api", "timestamp": "2025-05-03T10:12:07.857627Z", "action": 4, "target": "Connaissance qualifiée", "old": "Compétence qualifiée", "details": { "state": 20, "source": "Trained Lore", "old_state": 20 }, "id": 502934, "action_name": "Suggestion added", "url": "https://weblate.foundryvtt-hub.com/api/changes/502934/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2025-01-19T17:47:00.609014Z", "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 ce808c4\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 'ce808c4'.\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": 492921, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492921/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2025-01-19T17:47:00.180514Z", "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": 492920, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492920/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2025-01-19T12:20:05.661363Z", "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 1780fa9\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 '1780fa9'.\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": 492893, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492893/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2025-01-19T12:20:05.245084Z", "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": 492892, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492892/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2025-01-17T13:26:11.672776Z", "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 45c718f\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 '45c718f'.\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": 492785, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492785/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-dailies/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2025-01-17T13:26:11.124730Z", "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": 492784, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492784/?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-12-20T19:06:26.261071Z", "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 c218ef8\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 'c218ef8'.\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": 492137, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492137/?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-12-20T19:06:25.859151Z", "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": 492136, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492136/?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-12-20T13:51:18.441230Z", "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 a7ce8e5\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 'a7ce8e5'.\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": 492121, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/492121/?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-12-20T13:51:17.915260Z", "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": 492120, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/492120/?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-12-12T19:29:03.874985Z", "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 7a1dc4f\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 '7a1dc4f'.\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": 491371, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491371/?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-12-12T19:29:03.446522Z", "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": 491370, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491370/?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-12-12T19:13:50.942358Z", "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 c8b4dfa\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 'c8b4dfa'.\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": 491369, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491369/?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-12-12T19:13:50.499955Z", "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": 491368, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491368/?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-12-10T22:58:15.094591Z", "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 4bfe422\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 '4bfe422'.\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": 491367, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491367/?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-12-10T22:58:14.679369Z", "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": 491366, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491366/?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-12-10T16:42:21.368201Z", "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 f2e8868\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 'f2e8868'.\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": 491365, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491365/?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-12-10T16:42:20.953057Z", "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": 491364, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491364/?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-12-08T11:32:04.235484Z", "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 a28bef0\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 'a28bef0'.\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": 491354, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491354/?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-12-08T11:32:03.772665Z", "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": 491353, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491353/?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-11-26T15:49:06.742369Z", "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 cac26ef\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 'cac26ef'.\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": 491020, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491020/?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-11-26T15:49:06.296272Z", "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": 491019, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491019/?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-11-26T15:05:28.928997Z", "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 3a077fd\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 '3a077fd'.\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": 491018, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491018/?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-11-26T15:05:28.493141Z", "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": 491017, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491017/?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-11-25T13:49:51.853013Z", "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 8d4ba8b\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 '8d4ba8b'.\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": 491008, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/491008/?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-11-25T13:49:51.463450Z", "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": 491007, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/491007/?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-11-23T13:14:22.216413Z", "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 a6eeb9f\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 'a6eeb9f'.\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": 490995, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/490995/?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-11-23T13:14:21.781242Z", "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": 490994, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/490994/?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-11-22T22:27:04.321534Z", "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 66c765e\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 '66c765e'.\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": 490977, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/490977/?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-11-22T22:27:03.911737Z", "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": 490976, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/490976/?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-11-21T13:56:25.780275Z", "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 9410e6c\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 '9410e6c'.\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": 490957, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/490957/?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-11-21T13:56:25.334172Z", "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": 490956, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/490956/?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-11-16T15:06:38.724699Z", "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 bda053e\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 'bda053e'.\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": 490841, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/490841/?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-11-16T15:06:38.336378Z", "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": 490840, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/490840/?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-11-13T23:03:13.184389Z", "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 23eafe7\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 '23eafe7'.\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": 490812, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/490812/?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-11-13T23:03:12.752787Z", "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": 490811, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/490811/?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-11-06T11:46:31.161805Z", "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 a8ab1e0\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 'a8ab1e0'.\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": 490482, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/490482/?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-11-06T11:46:30.739383Z", "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": 490481, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/490481/?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-11-06T11:45:26.965080Z", "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 825606a\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 '825606a'.\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": 490476, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/490476/?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-11-06T11:45:26.546816Z", "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": 490475, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/490475/?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-11-05T12:23:32.705365Z", "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 311909a\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 '311909a'.\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": 490046, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/490046/?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-11-05T12:23:32.293628Z", "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": 490045, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/490045/?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-11-04T22:52:02.287148Z", "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 9291d36\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 '9291d36'.\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": 490044, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/490044/?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-11-04T22:52:01.854677Z", "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": 490043, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/490043/?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-11-02T12:04:36.668887Z", "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 c074e2e\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 'c074e2e'.\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": 489820, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/489820/?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-11-02T12:04:36.259585Z", "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": 489819, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/489819/?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:37:05.708970Z", "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 51d465b\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 '51d465b'.\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": 489812, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/489812/?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:37:05.303486Z", "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": 489811, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/489811/?format=api" } ] }{ "count": 1129, "next": "