Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/babonus/main/changes/?format=api&page=2
{ "count": 1603, "next": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/changes/?format=api&page=3", "previous": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/changes/?format=api", "results": [ { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-25T21:15:55.653046Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 485396, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/485396/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-24T22:34:43.061825Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto 9a61891\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on '9a61891'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 485376, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/485376/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-24T22:34:42.407364Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 485375, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/485375/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-24T18:17:13.166559Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto ae4ea1b\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on 'ae4ea1b'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 485374, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/485374/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-24T18:17:11.726141Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 485373, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/485373/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-21T22:48:05.120241Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto b90072a\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on 'b90072a'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 484878, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/484878/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-21T22:48:04.193991Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 484877, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/484877/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-21T17:59:08.887284Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto 573775d\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on '573775d'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 484870, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/484870/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-21T17:59:07.792206Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 484869, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/484869/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-21T14:27:09.999960Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto 5c9806a\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on '5c9806a'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 484868, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/484868/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-21T14:27:08.752539Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 484867, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/484867/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-13T20:35:17.546113Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto c382e8b\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on 'c382e8b'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 484362, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/484362/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-09-13T20:35:16.255987Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 484361, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/484361/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-26T18:17:25.278343Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto 57d71fd\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on '57d71fd'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 481637, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/481637/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-26T18:17:24.219699Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 481636, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/481636/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-12T19:10:50.507588Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto 99ffc85\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on '99ffc85'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 472596, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/472596/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-08-12T19:10:49.203954Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 472595, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/472595/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-07-19T22:02:34.386694Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto a01d6a3\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on 'a01d6a3'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 469525, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/469525/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-07-19T22:02:31.898944Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 469524, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/469524/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-07-18T23:16:43.139152Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto 72e3578\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on '72e3578'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 469463, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/469463/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-07-18T23:14:46.902286Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 469462, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/469462/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-07-17T12:43:29.514424Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto 88acef8\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on '88acef8'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 469266, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/469266/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-07-17T12:43:15.552581Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 469265, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/469265/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-07-17T12:37:18.963497Z", "action": 23, "target": "Rebasing (1/1)\nPerforming inexact rename detection: 4% (76/1824)\nPerforming inexact rename detection: 6% (114/1824)\nPerforming inexact rename detection: 8% (152/1824)\nPerforming inexact rename detection: 10% (190/1824)\nPerforming inexact rename detection: 12% (228/1824)\nPerforming inexact rename detection: 14% (266/1824)\nPerforming inexact rename detection: 16% (304/1824)\nPerforming inexact rename detection: 18% (342/1824)\nPerforming inexact rename detection: 20% (380/1824)\nPerforming inexact rename detection: 22% (418/1824)\nPerforming inexact rename detection: 25% (456/1824)\nPerforming inexact rename detection: 27% (494/1824)\nPerforming inexact rename detection: 29% (532/1824)\nPerforming inexact rename detection: 31% (570/1824)\nPerforming inexact rename detection: 33% (608/1824)\nPerforming inexact rename detection: 35% (646/1824)\nPerforming inexact rename detection: 37% (684/1824)\nPerforming inexact rename detection: 39% (722/1824)\nPerforming inexact rename detection: 41% (760/1824)\nPerforming inexact rename detection: 43% (798/1824)\nPerforming inexact rename detection: 45% (836/1824)\nPerforming inexact rename detection: 47% (874/1824)\nPerforming inexact rename detection: 50% (912/1824)\nPerforming inexact rename detection: 52% (950/1824)\nPerforming inexact rename detection: 54% (988/1824)\nPerforming inexact rename detection: 56% (1026/1824)\nPerforming inexact rename detection: 58% (1064/1824)\nPerforming inexact rename detection: 60% (1102/1824)\nPerforming inexact rename detection: 62% (1140/1824)\nPerforming inexact rename detection: 64% (1178/1824)\nPerforming inexact rename detection: 66% (1216/1824)\nPerforming inexact rename detection: 68% (1254/1824)\nPerforming inexact rename detection: 70% (1292/1824)\nPerforming inexact rename detection: 72% (1330/1824)\nPerforming inexact rename detection: 75% (1368/1824)\nPerforming inexact rename detection: 77% (1406/1824)\nPerforming inexact rename detection: 79% (1444/1824)\nPerforming inexact rename detection: 81% (1482/1824)\nPerforming inexact rename detection: 83% (1520/1824)\nPerforming inexact rename detection: 85% (1558/1824)\nPerforming inexact rename detection: 87% (1596/1824)\nPerforming inexact rename detection: 89% (1634/1824)\nPerforming inexact rename detection: 91% (1672/1824)\nPerforming inexact rename detection: 95% (1748/1824)\nPerforming inexact rename detection: 97% (1786/1824)\nPerforming inexact rename detection: 100% (1824/1824)\nPerforming inexact rename detection: 100% (1824/1824), done.\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nPerforming inexact rename detection: 4% (76/1824)\nPerforming inexact rename detection: 6% (114/1824)\nPerforming inexact rename detection: 8% (152/1824)\nPerforming inexact rename detection: 10% (190/1824)\nPerforming inexact rename detection: 12% (228/1824)\nPerforming inexact rename detection: 14% (266/1824)\nPerforming inexact rename detection: 16% (304/1824)\nPerforming inexact rename detection: 18% (342/1824)\nPerforming inexact rename detection: 20% (380/1824)\nPerforming inexact rename detection: 22% (418/1824)\nPerforming inexact rename detection: 25% (456/1824)\nPerforming inexact rename detection: 27% (494/1824)\nPerforming inexact rename detection: 29% (532/1824)\nPerforming inexact rename detection: 31% (570/1824)\nPerforming inexact rename detection: 33% (608/1824)\nPerforming inexact rename detection: 35% (646/1824)\nPerforming inexact rename detection: 37% (684/1824)\nPerforming inexact rename detection: 39% (722/1824)\nPerforming inexact rename detection: 41% (760/1824)\nPerforming inexact rename detection: 43% (798/1824)\nPerforming inexact rename detection: 45% (836/1824)\nPerforming inexact rename detection: 47% (874/1824)\nPerforming inexact rename detection: 50% (912/1824)\nPerforming inexact rename detection: 52% (950/1824)\nPerforming inexact rename detection: 54% (988/1824)\nPerforming inexact rename detection: 56% (1026/1824)\nPerforming inexact rename detection: 58% (1064/1824)\nPerforming inexact rename detection: 60% (1102/1824)\nPerforming inexact rename detection: 62% (1140/1824)\nPerforming inexact rename detection: 64% (1178/1824)\nPerforming inexact rename detection: 66% (1216/1824)\nPerforming inexact rename detection: 68% (1254/1824)\nPerforming inexact rename detection: 70% (1292/1824)\nPerforming inexact rename detection: 72% (1330/1824)\nPerforming inexact rename detection: 75% (1368/1824)\nPerforming inexact rename detection: 77% (1406/1824)\nPerforming inexact rename detection: 79% (1444/1824)\nPerforming inexact rename detection: 81% (1482/1824)\nPerforming inexact rename detection: 83% (1520/1824)\nPerforming inexact rename detection: 85% (1558/1824)\nPerforming inexact rename detection: 87% (1596/1824)\nPerforming inexact rename detection: 89% (1634/1824)\nPerforming inexact rename detection: 91% (1672/1824)\nPerforming inexact rename detection: 95% (1748/1824)\nPerforming inexact rename detection: 97% (1786/1824)\nPerforming inexact rename detection: 100% (1824/1824)\nPerforming inexact rename detection: 100% (1824/1824), done.\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto f8e0b79\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on 'f8e0b79'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 469264, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/469264/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-07-17T12:34:58.209576Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 469263, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/469263/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-07-17T12:31:50.384579Z", "action": 47, "target": "", "old": "", "details": { "alert": "UpdateFailure" }, "id": 469262, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/469262/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-07-17T12:30:23.579311Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 469261, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/469261/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-07-02T21:54:21.296203Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto 8e5d9a6\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on '8e5d9a6'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 466953, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/466953/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-07-02T21:54:19.914247Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 466952, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/466952/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-28T12:33:25.907306Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto 3b76c2b\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on '3b76c2b'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 465940, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/465940/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-28T12:33:22.420650Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 465939, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/465939/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-28T12:18:42.641407Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto a32c4ed\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on 'a32c4ed'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 465935, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/465935/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-28T12:18:39.219233Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 465934, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/465934/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-27T23:50:31.557995Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto e6abb26\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on 'e6abb26'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 465925, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/465925/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-27T23:50:29.819474Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 465924, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/465924/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-27T20:32:25.520639Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto 4c07dc8\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on '4c07dc8'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 465853, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/465853/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-27T20:32:23.701120Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 465852, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/465852/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-27T19:37:22.786097Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto a2aac91\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on 'a2aac91'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 465846, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/465846/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-27T19:37:21.354354Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 465845, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/465845/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-23T21:53:45.432485Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto 0d2c252\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on '0d2c252'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 464548, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/464548/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-23T21:53:37.724343Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 464547, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/464547/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-12T16:22:54.800112Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto bc7934f\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on 'bc7934f'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 463576, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/463576/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-12T16:22:53.567780Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 463575, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/463575/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-11T17:06:30.984191Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto 9f87506\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on '9f87506'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 463508, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/463508/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-11T17:06:28.181232Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 463507, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/463507/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-10T17:48:30.034970Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto 32d3765\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on '32d3765'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 463470, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/463470/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-10T17:48:28.852193Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 463469, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/463469/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-08T15:47:46.078130Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto 7cdc5ee\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on '7cdc5ee'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 462996, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/462996/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-08T15:47:44.481731Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/krbz999/babonus", "git://github.com/krbz999/babonus.git", "[email protected]:krbz999/babonus", "[email protected]:krbz999/babonus.git", "https://github.com/krbz999/babonus", "https://github.com/krbz999/babonus.git" ], "branch": "main", "repo_url": "https://github.com/krbz999/babonus", "full_name": "krbz999/babonus", "service_long_name": "GitHub" }, "id": 462995, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/462995/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-06-08T15:31:48.025158Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply 99a2569... Translated using Weblate (French)\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 99a2569... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)", "status": "interactive rebase in progress; onto e5611e2\nLast command done (1 command done):\n pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on 'e5611e2'.\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 modified: lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 462994, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/462994/?format=api" } ] }