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=32
{ "count": 1603, "next": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/changes/?format=api&page=33", "previous": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/changes/?format=api&page=31", "results": [ { "unit": "https://weblate.foundryvtt-hub.com/api/units/119002/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/babonus/main/en/?format=api", "user": null, "author": null, "timestamp": "2023-01-10T20:23:29.700380Z", "action": 59, "target": "Consume:", "old": "", "details": { "state": 20, "source": "Consume:", "old_state": -1 }, "id": 185735, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/185735/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/119001/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/babonus/main/en/?format=api", "user": null, "author": null, "timestamp": "2023-01-10T20:23:29.700321Z", "action": 59, "target": "Which targets should benefit from the aura, and whether the aura should affect its owner as well. Allies are defined as tokens that have the same disposition as the owner; enemies are those with a Hostile disposition (if you are Friendly) or Friendly disposition (if you are Hostile).", "old": "", "details": { "state": 20, "source": "Which targets should benefit from the aura, and whether the aura should affect its owner as well. Allies are defined as tokens that have the same disposition as the owner; enemies are those with a Hostile disposition (if you are Friendly) or Friendly disposition (if you are Hostile).", "old_state": -1 }, "id": 185734, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/185734/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/119000/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/babonus/main/en/?format=api", "user": null, "author": null, "timestamp": "2023-01-10T20:23:29.700266Z", "action": 59, "target": "Valid Targets", "old": "", "details": { "state": 20, "source": "Valid Targets", "old_state": -1 }, "id": 185733, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/185733/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/118999/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/babonus/main/en/?format=api", "user": null, "author": null, "timestamp": "2023-01-10T20:23:29.700206Z", "action": 59, "target": "A set of configurations to make the bonus an aura, instead of only applying to the actor who owns it.", "old": "", "details": { "state": 20, "source": "A set of configurations to make the bonus an aura, instead of only applying to the actor who owns it.", "old_state": -1 }, "id": 185732, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/185732/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/118997/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/babonus/main/en/?format=api", "user": null, "author": null, "timestamp": "2023-01-10T20:23:29.700085Z", "action": 59, "target": "Applies to Template", "old": "", "details": { "state": 20, "source": "Applies to Template", "old_state": -1 }, "id": 185730, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/185730/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/118996/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/babonus/main/en/?format=api", "user": null, "author": null, "timestamp": "2023-01-10T20:23:29.700026Z", "action": 59, "target": "Affects Self", "old": "", "details": { "state": 20, "source": "Affects Self", "old_state": -1 }, "id": 185729, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/185729/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/118995/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/babonus/main/en/?format=api", "user": null, "author": null, "timestamp": "2023-01-10T20:23:29.699964Z", "action": 59, "target": "The range of the aura, measured in feet (put in <span style='font-family: monospace;'>-1</span> for an unlimited range), and if the aura affects the area within a Measured Template instead (for items that are able to place a template).", "old": "", "details": { "state": 20, "source": "The range of the aura, measured in feet (put in <span style='font-family: monospace;'>-1</span> for an unlimited range), and if the aura affects the area within a Measured Template instead (for items that are able to place a template).", "old_state": -1 }, "id": 185728, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/185728/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/118994/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/babonus/main/en/?format=api", "user": null, "author": null, "timestamp": "2023-01-10T20:23:29.699919Z", "action": 59, "target": "Range…", "old": "", "details": { "state": 20, "source": "Range…", "old_state": -1 }, "id": 185727, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/185727/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/118993/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/babonus/main/en/?format=api", "user": null, "author": null, "timestamp": "2023-01-10T20:23:29.699881Z", "action": 59, "target": "Range (ft)", "old": "", "details": { "state": 20, "source": "Range (ft)", "old_state": -1 }, "id": 185726, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/185726/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/118986/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/babonus/main/en/?format=api", "user": null, "author": null, "timestamp": "2023-01-10T20:23:29.699527Z", "action": 59, "target": "Bonuses", "old": "", "details": { "state": 20, "source": "Bonuses", "old_state": -1 }, "id": 185719, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/185719/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/118985/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/babonus/main/en/?format=api", "user": null, "author": null, "timestamp": "2023-01-10T20:23:29.699461Z", "action": 59, "target": "The list of filters you can apply to this bonus, further narrowing down which rolls it should apply to. Each filter must be true for the bonus to apply.", "old": "", "details": { "state": 20, "source": "The list of filters you can apply to this bonus, further narrowing down which rolls it should apply to. Each filter must be true for the bonus to apply.", "old_state": -1 }, "id": 185718, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/185718/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-01-10T20:23:20.796218Z", "action": 21, "target": "", "old": "", "details": {}, "id": 185715, "action_name": "Repository rebased", "url": "https://weblate.foundryvtt-hub.com/api/changes/185715/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-01-10T20:23:19.976654Z", "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.git", "service_long_name": "GitHub" }, "id": 185714, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/185714/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": null, "timestamp": "2023-01-04T04:45:12.923980Z", "action": 18, "target": "", "old": "", "details": {}, "id": 184374, "action_name": "Changes pushed", "url": "https://weblate.foundryvtt-hub.com/api/changes/184374/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-01-04T04:43:25.589897Z", "action": 18, "target": "", "old": "", "details": {}, "id": 184373, "action_name": "Changes pushed", "url": "https://weblate.foundryvtt-hub.com/api/changes/184373/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/babonus/main/fr/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "timestamp": "2023-01-04T04:43:23.772749Z", "action": 54, "target": "", "old": "", "details": { "reason": "content changed", "filename": "lang/fr.json" }, "id": 184372, "action_name": "Translation replaced file by upload", "url": "https://weblate.foundryvtt-hub.com/api/changes/184372/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-01-04T04:42:19.608286Z", "action": 18, "target": "", "old": "", "details": {}, "id": 184198, "action_name": "Changes pushed", "url": "https://weblate.foundryvtt-hub.com/api/changes/184198/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/babonus/main/fr/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "timestamp": "2023-01-04T04:42:17.772482Z", "action": 0, "target": "", "old": "", "details": { "reason": "new file", "filename": "lang/fr.json" }, "id": 184196, "action_name": "Resource updated", "url": "https://weblate.foundryvtt-hub.com/api/changes/184196/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/babonus/main/fr/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "timestamp": "2023-01-04T04:42:17.149077Z", "action": 48, "target": "", "old": "", "details": { "language": "fr" }, "id": 184022, "action_name": "Language added", "url": "https://weblate.foundryvtt-hub.com/api/changes/184022/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/babonus/main/en/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "timestamp": "2023-01-04T04:25:06.967045Z", "action": 0, "target": "", "old": "", "details": { "reason": "content changed", "filename": "lang/en.json" }, "id": 184020, "action_name": "Resource updated", "url": "https://weblate.foundryvtt-hub.com/api/changes/184020/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": null, "timestamp": "2023-01-04T04:25:06.686378Z", "action": 19, "target": "", "old": "", "details": {}, "id": 184011, "action_name": "Repository reset", "url": "https://weblate.foundryvtt-hub.com/api/changes/184011/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": null, "timestamp": "2023-01-04T04:17:17.012824Z", "action": 22, "target": "Auto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 11 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: scripts/helpers/helpers.mjs\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 184007, "action_name": "Repository merge failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/184007/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": null, "timestamp": "2023-01-04T04:17:08.767632Z", "action": 22, "target": "Auto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 11 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: scripts/helpers/helpers.mjs\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 184006, "action_name": "Repository merge failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/184006/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": null, "timestamp": "2023-01-04T04:14:05.279717Z", "action": 22, "target": "Auto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 11 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: scripts/helpers/helpers.mjs\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 184005, "action_name": "Repository merge failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/184005/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": null, "timestamp": "2023-01-04T04:13:25.003247Z", "action": 23, "target": "Rebasing (1/11)\nRebasing (2/11)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/11)\nRebasing (2/11)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 7fd34a4\nLast commands done (2 commands done):\n pick 3228e56 Translated using Weblate (English)\n pick 02488c1 Added translation using Weblate (French)\nNext commands to do (9 remaining commands):\n pick f173e47 Translated using Weblate (French)\n pick d1923f4 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '7fd34a4'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/fr.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 184004, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/184004/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": null, "timestamp": "2023-01-04T03:58:34.469368Z", "action": 22, "target": "Auto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 11 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: scripts/helpers/helpers.mjs\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 184003, "action_name": "Repository merge failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/184003/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": null, "timestamp": "2023-01-04T03:58:17.322124Z", "action": 23, "target": "Rebasing (1/11)\nRebasing (2/11)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/11)\nRebasing (2/11)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 7fd34a4\nLast commands done (2 commands done):\n pick 3228e56 Translated using Weblate (English)\n pick 02488c1 Added translation using Weblate (French)\nNext commands to do (9 remaining commands):\n pick f173e47 Translated using Weblate (French)\n pick d1923f4 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '7fd34a4'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/fr.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 184002, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/184002/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": null, "timestamp": "2023-01-04T03:57:49.620041Z", "action": 23, "target": "Rebasing (1/11)\nRebasing (2/11)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/11)\nRebasing (2/11)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 7fd34a4\nLast commands done (2 commands done):\n pick 3228e56 Translated using Weblate (English)\n pick 02488c1 Added translation using Weblate (French)\nNext commands to do (9 remaining commands):\n pick f173e47 Translated using Weblate (French)\n pick d1923f4 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '7fd34a4'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/fr.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 184001, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/184001/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": null, "timestamp": "2022-12-29T16:11:09.405789Z", "action": 23, "target": "Rebasing (1/11)\nRebasing (2/11)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/11)\nRebasing (2/11)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 7fd34a4\nLast commands done (2 commands done):\n pick 3228e56 Translated using Weblate (English)\n pick 02488c1 Added translation using Weblate (French)\nNext commands to do (9 remaining commands):\n pick f173e47 Translated using Weblate (French)\n pick d1923f4 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '7fd34a4'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/fr.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 182788, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/182788/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": null, "timestamp": "2022-12-29T16:09:57.911122Z", "action": 22, "target": "Auto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 11 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: scripts/helpers/helpers.mjs\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 182787, "action_name": "Repository merge failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/182787/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": null, "timestamp": "2022-12-29T16:08:37.552621Z", "action": 23, "target": "Rebasing (1/11)\nRebasing (2/11)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/11)\nRebasing (2/11)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 7fd34a4\nLast commands done (2 commands done):\n pick 3228e56 Translated using Weblate (English)\n pick 02488c1 Added translation using Weblate (French)\nNext commands to do (9 remaining commands):\n pick f173e47 Translated using Weblate (French)\n pick d1923f4 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '7fd34a4'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/fr.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 182786, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/182786/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": null, "timestamp": "2022-12-29T16:07:06.848341Z", "action": 23, "target": "Rebasing (1/11)\nRebasing (2/11)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/11)\nRebasing (2/11)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 7fd34a4\nLast commands done (2 commands done):\n pick 3228e56 Translated using Weblate (English)\n pick 02488c1 Added translation using Weblate (French)\nNext commands to do (9 remaining commands):\n pick f173e47 Translated using Weblate (French)\n pick d1923f4 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '7fd34a4'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/fr.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 182785, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/182785/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-28T13:35:47.846894Z", "action": 23, "target": "Rebasing (1/11)\nRebasing (2/11)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/11)\nRebasing (2/11)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 7fd34a4\nLast commands done (2 commands done):\n pick 3228e56 Translated using Weblate (English)\n pick 02488c1 Added translation using Weblate (French)\nNext commands to do (9 remaining commands):\n pick f173e47 Translated using Weblate (French)\n pick d1923f4 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '7fd34a4'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/fr.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 182684, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/182684/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-28T13:20:36.766328Z", "action": 23, "target": "Rebasing (1/10)\nRebasing (2/10)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/10)\nRebasing (2/10)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 7fd34a4\nLast commands done (2 commands done):\n pick 3228e56 Translated using Weblate (English)\n pick 02488c1 Added translation using Weblate (French)\nNext commands to do (8 remaining commands):\n pick f173e47 Translated using Weblate (French)\n pick d1923f4 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '7fd34a4'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/fr.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 182680, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/182680/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-28T13:00:54.784498Z", "action": 23, "target": "Rebasing (1/9)\nRebasing (2/9)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/9)\nRebasing (2/9)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 7fd34a4\nLast commands done (2 commands done):\n pick 3228e56 Translated using Weblate (English)\n pick 02488c1 Added translation using Weblate (French)\nNext commands to do (7 remaining commands):\n pick f173e47 Translated using Weblate (French)\n pick d1923f4 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '7fd34a4'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/fr.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 182668, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/182668/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-28T12:46:07.520697Z", "action": 23, "target": "Rebasing (1/8)\nRebasing (2/8)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nRebasing (2/8)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 7fd34a4\nLast commands done (2 commands done):\n pick 3228e56 Translated using Weblate (English)\n pick 02488c1 Added translation using Weblate (French)\nNext commands to do (6 remaining commands):\n pick f173e47 Translated using Weblate (French)\n pick d1923f4 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '7fd34a4'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/fr.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 182659, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/182659/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-24T10:18:00.463729Z", "action": 23, "target": "Rebasing (1/7)\nRebasing (2/7)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/7)\nRebasing (2/7)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 7fd34a4\nLast commands done (2 commands done):\n pick 3228e56 Translated using Weblate (English)\n pick 02488c1 Added translation using Weblate (French)\nNext commands to do (5 remaining commands):\n pick f173e47 Translated using Weblate (French)\n pick d1923f4 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '7fd34a4'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/fr.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 182494, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/182494/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api", "author": null, "timestamp": "2022-12-21T18:21:00.873552Z", "action": 15, "target": "", "old": "", "details": { "auto": false }, "id": 182036, "action_name": "Component unlocked", "url": "https://weblate.foundryvtt-hub.com/api/changes/182036/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-21T17:30:34.604619Z", "action": 14, "target": "", "old": "", "details": { "auto": true }, "id": 182015, "action_name": "Component locked", "url": "https://weblate.foundryvtt-hub.com/api/changes/182015/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-21T17:30:34.580731Z", "action": 47, "target": "", "old": "", "details": { "alert": "MergeFailure" }, "id": 182014, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/182014/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-21T17:30:34.534224Z", "action": 23, "target": "Rebasing (1/6)\nRebasing (2/6)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nRebasing (2/6)\nerror: could not apply 02488c1... Added translation 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 02488c1... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 7fd34a4\nLast commands done (2 commands done):\n pick 3228e56 Translated using Weblate (English)\n pick 02488c1 Added translation using Weblate (French)\nNext commands to do (4 remaining commands):\n pick f173e47 Translated using Weblate (French)\n pick d1923f4 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '7fd34a4'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/fr.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 182013, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/182013/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-21T17:30:33.058092Z", "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.git", "service_long_name": "GitHub" }, "id": 182012, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/182012/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-20T07:18:00.647756Z", "action": 18, "target": "", "old": "", "details": {}, "id": 181858, "action_name": "Changes pushed", "url": "https://weblate.foundryvtt-hub.com/api/changes/181858/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-17T16:18:00.093763Z", "action": 18, "target": "", "old": "", "details": {}, "id": 181109, "action_name": "Changes pushed", "url": "https://weblate.foundryvtt-hub.com/api/changes/181109/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-16T11:17:58.961692Z", "action": 18, "target": "", "old": "", "details": {}, "id": 180461, "action_name": "Changes pushed", "url": "https://weblate.foundryvtt-hub.com/api/changes/180461/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-15T07:35:37.443215Z", "action": 18, "target": "", "old": "", "details": {}, "id": 174332, "action_name": "Changes pushed", "url": "https://weblate.foundryvtt-hub.com/api/changes/174332/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T20:17:57.933433Z", "action": 18, "target": "", "old": "", "details": {}, "id": 172507, "action_name": "Changes pushed", "url": "https://weblate.foundryvtt-hub.com/api/changes/172507/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/JDW/?format=api", "author": null, "timestamp": "2022-12-09T18:58:50.128705Z", "action": 61, "target": "weblate.json.customize", "old": "", "details": { "style": "spaces", "indent": 2, "sort_keys": false }, "id": 166962, "action_name": "Add-on configuration changed", "url": "https://weblate.foundryvtt-hub.com/api/changes/166962/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/JDW/?format=api", "author": null, "timestamp": "2022-12-09T18:58:37.250123Z", "action": 61, "target": "weblate.foundryhub.foundryhub", "old": "", "details": { "manifest": "module.json" }, "id": 166961, "action_name": "Add-on configuration changed", "url": "https://weblate.foundryvtt-hub.com/api/changes/166961/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-09T18:58:12.696787Z", "action": 47, "target": "", "old": "", "details": { "alert": "NoMaskMatches" }, "id": 166955, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/166955/?format=api" } ] }