Changes
Translation projects API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/projects/encounter-stats/changes/?format=api
https://weblate.foundryvtt-hub.com/api/projects/encounter-stats/changes/?format=api&page=2", "previous": null, "results": [ { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-07T01:07:20.656451Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto bd748b0\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'bd748b0'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 486634, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/486634/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-07T01:07:19.461987Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 486633, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/486633/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-05T15:41:51.231062Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto c33d8be\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'c33d8be'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 486428, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/486428/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-05T15:41:49.882634Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 486427, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/486427/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-05T02:05:12.658934Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 9f3d048\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '9f3d048'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 486424, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/486424/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-10-05T02:05:11.194922Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 486423, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/486423/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-30T00:12:19.384406Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto c877045\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'c877045'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 486349, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/486349/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-30T00:12:17.600405Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 486348, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/486348/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-29T01:44:22.071745Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 51f6a70\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '51f6a70'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 485964, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/485964/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-29T01:44:20.954716Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 485963, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/485963/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-28T18:11:12.973680Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 09fac3f\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '09fac3f'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 485910, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/485910/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-28T18:11:11.831729Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 485909, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/485909/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-28T03:38:11.412225Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto d3c58e0\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'd3c58e0'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 485800, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/485800/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-28T03:38:10.304256Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 485799, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/485799/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-28T00:25:28.381683Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto d7c3917\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'd7c3917'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 485796, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/485796/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-28T00:25:27.372078Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 485795, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/485795/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-23T01:49:26.802388Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto f01ea21\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'f01ea21'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 484903, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/484903/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-23T01:49:25.486957Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 484902, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/484902/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-22T05:12:50.701336Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 1a2ed39\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '1a2ed39'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 484884, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/484884/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-22T05:12:49.468745Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 484883, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/484883/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-21T00:47:09.890501Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto ec3ecf1\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'ec3ecf1'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 484862, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/484862/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-21T00:47:08.919796Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 484861, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/484861/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-16T01:49:19.925624Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 47a8aa5\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '47a8aa5'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 484503, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/484503/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-16T01:49:18.539701Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 484502, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/484502/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-15T19:31:38.273738Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto e4accf6\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'e4accf6'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 484499, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/484499/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-15T19:31:37.227942Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 484498, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/484498/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-14T00:23:02.783445Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto a76ef93\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'a76ef93'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 484364, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/484364/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-14T00:23:01.446525Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 484363, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/484363/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-09T00:34:14.983876Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto b786542\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'b786542'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 482744, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/482744/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-09T00:34:13.616156Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 482743, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/482743/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-07T22:36:44.803376Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 2ed1e2d\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '2ed1e2d'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 482512, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/482512/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-07T22:36:43.859358Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 482511, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/482511/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-07T04:19:53.824950Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 475768b\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '475768b'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 482485, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/482485/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-07T04:19:52.851262Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 482484, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/482484/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-07T00:12:38.511281Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 3cfb944\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '3cfb944'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 482481, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/482481/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-07T00:12:37.084501Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 482480, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/482480/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-02T01:05:29.768775Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto e990f0d\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'e990f0d'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 482215, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/482215/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-02T01:05:29.109424Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 482214, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/482214/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-31T01:45:36.519022Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 28ea942\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '28ea942'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 481742, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/481742/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-31T01:45:35.719201Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 481741, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/481741/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-26T00:41:37.693162Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 8f07e5f\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '8f07e5f'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 481602, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/481602/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-26T00:41:36.635072Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 481601, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/481601/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-25T09:57:02.662420Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 2c90675\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '2c90675'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 481526, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/481526/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-25T09:57:01.041948Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 481525, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/481525/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-24T00:52:16.585227Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto b819efa\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'b819efa'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 481505, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/481505/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-24T00:52:15.088672Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 481504, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/481504/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-19T01:25:02.415835Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 446136f\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '446136f'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 479059, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/479059/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-19T01:25:01.062851Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 479058, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/479058/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-17T01:29:45.758059Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply b85ae2b... Added translation using Weblate (Polish)\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 b85ae2b... Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in languages/pl.json\nAuto-merging languages/pl.json\n (1)", "status": "interactive rebase in progress; onto 67aa963\nLast command done (1 command done):\n pick b85ae2b Added translation using Weblate (Polish)\nNext command to do (1 remaining command):\n pick f4364a0 Translated using Weblate (Polish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '67aa963'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: languages/pl.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 478627, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/478627/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-17T01:29:44.611898Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/encounter-stats", "git://github.com/johnnolan/encounter-stats.git", "[email protected]:johnnolan/encounter-stats", "[email protected]:johnnolan/encounter-stats.git", "https://github.com/johnnolan/encounter-stats", "https://github.com/johnnolan/encounter-stats.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/encounter-stats", "full_name": "johnnolan/encounter-stats", "service_long_name": "GitHub" }, "id": 478626, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/478626/?format=api" } ] }{ "count": 1988, "next": "