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&page=5
https://weblate.foundryvtt-hub.com/api/projects/encounter-stats/changes/?format=api&page=6", "previous": "https://weblate.foundryvtt-hub.com/api/projects/encounter-stats/changes/?format=api&page=4", "results": [ { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-24T04:39:28.834293Z", "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 2d4aedc\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 '2d4aedc'.\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": 382235, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/382235/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-24T04:39:27.511461Z", "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": 382234, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/382234/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-23T03:29:41.440278Z", "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 2765065\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 '2765065'.\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": 381832, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/381832/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-23T03:29:40.604350Z", "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": 381831, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/381831/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-23T02:12:42.554934Z", "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 52f8329\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 '52f8329'.\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": 381788, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/381788/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-23T02:12:41.671326Z", "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": 381787, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/381787/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-18T03:24:11.266221Z", "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 ab5102f\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 'ab5102f'.\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": 378298, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/378298/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-18T03:24:10.268650Z", "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": 378297, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/378297/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-18T02:21:18.245185Z", "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 6a29e8b\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 '6a29e8b'.\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": 378294, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/378294/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-18T02:21:17.469452Z", "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": 378293, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/378293/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-17T02:14:01.041132Z", "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 328e661\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 '328e661'.\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": 378085, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/378085/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-17T02:13:59.679738Z", "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": 378084, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/378084/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-16T05:03:42.070936Z", "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 0d48737\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 '0d48737'.\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": 377358, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/377358/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-16T05:03:41.268878Z", "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": 377357, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/377357/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-16T00:25:26.406534Z", "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 11ca81f\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 '11ca81f'.\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": 377352, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/377352/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-16T00:25:25.199717Z", "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": 377351, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/377351/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-11T00:53:40.999558Z", "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 3fe43a5\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 '3fe43a5'.\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": 376953, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/376953/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-11T00:53:39.372658Z", "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": 376952, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/376952/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-09T23:25:58.149699Z", "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 a25f32c\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 'a25f32c'.\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": 376861, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/376861/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-09T23:25:56.908802Z", "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": 376860, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/376860/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-09T01:46:08.092095Z", "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 0fe83b4\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 '0fe83b4'.\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": 376757, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/376757/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-09T01:46:06.781785Z", "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": 376756, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/376756/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-04T00:38:15.164618Z", "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 a682bad\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 'a682bad'.\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": 374456, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/374456/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-04T00:38:14.082048Z", "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": 374455, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/374455/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-02T17:19:43.102548Z", "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 01b269a\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 '01b269a'.\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": 374021, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/374021/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-02T17:19:40.902363Z", "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": 374020, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/374020/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-02T02:29:46.024946Z", "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 ae92692\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 'ae92692'.\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": 373936, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/373936/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-02T02:29:45.208668Z", "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": 373935, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/373935/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-28T00:36:30.893180Z", "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 098f391\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 '098f391'.\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": 372458, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/372458/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-28T00:36:29.888317Z", "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": 372457, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/372457/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-27T23:15:46.096934Z", "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 14be3ae\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 '14be3ae'.\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": 372452, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/372452/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-27T23:15:45.229881Z", "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": 372451, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/372451/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-27T19:03:57.724555Z", "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 7000914\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 '7000914'.\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": 372420, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/372420/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-27T19:03:56.919688Z", "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": 372419, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/372419/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-27T16:41:20.247814Z", "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 0a7dd53\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 '0a7dd53'.\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": 372406, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/372406/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-27T16:41:19.416198Z", "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": 372405, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/372405/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-27T14:33:09.973934Z", "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 95c11c4\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 '95c11c4'.\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": 372396, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/372396/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-27T14:33:09.157504Z", "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": 372395, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/372395/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-26T21:47:21.747012Z", "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 ef00134\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 'ef00134'.\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": 372241, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/372241/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-26T21:47:20.892547Z", "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": 372240, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/372240/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-26T00:13:26.447139Z", "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 474b7e9\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 '474b7e9'.\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": 372142, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/372142/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-26T00:13:25.210528Z", "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": 372141, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/372141/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-21T01:25:00.510681Z", "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 257350b\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 '257350b'.\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": 371481, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/371481/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-21T01:24:59.508394Z", "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": 371480, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/371480/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-20T22:51:37.849441Z", "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 10326cf\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 '10326cf'.\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": 371475, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/371475/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-20T22:51:36.589260Z", "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": 371474, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/371474/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-19T01:44:04.758404Z", "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 2c41d91\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 '2c41d91'.\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": 371070, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/371070/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-19T01:44:03.400277Z", "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": 371069, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/371069/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-14T00:11:25.174839Z", "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 fba8343\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 'fba8343'.\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": 369338, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/369338/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/encounter-stats/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-08-14T00:11:23.928258Z", "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": 369337, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/369337/?format=api" } ] }{ "count": 1988, "next": "