Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/swade-immersive-macros/main/changes/?format=api&page=27
{ "count": 4133, "next": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/changes/?format=api&page=28", "previous": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/changes/?format=api&page=26", "results": [ { "unit": "https://weblate.foundryvtt-hub.com/api/units/199704/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/swade-immersive-macros/main/pt_BR/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/mclemente/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/mclemente/?format=api", "timestamp": "2023-07-03T00:30:09.314239Z", "action": 5, "target": "Nomes de poções de cura:", "old": "", "details": { "state": 20, "source": "Health Potion Names:", "old_state": 0 }, "id": 356411, "action_name": "Translation added", "url": "https://weblate.foundryvtt-hub.com/api/changes/356411/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/199703/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/swade-immersive-macros/main/pt_BR/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/mclemente/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/mclemente/?format=api", "timestamp": "2023-07-03T00:29:20.905533Z", "action": 5, "target": "A tabela de medo usada para a macro da Tabela de Medo. Certifique-se de inserir o nome EXATO de sua tabela de medo aqui.", "old": "", "details": { "state": 20, "source": "Fear table used for the Fear table macro. Please make sure to enter the EXACT name of your Fear table in here.", "old_state": 0 }, "id": 356410, "action_name": "Translation added", "url": "https://weblate.foundryvtt-hub.com/api/changes/356410/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/199702/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/swade-immersive-macros/main/pt_BR/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/mclemente/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/mclemente/?format=api", "timestamp": "2023-07-03T00:28:43.305013Z", "action": 5, "target": "Tabela de Medo:", "old": "", "details": { "state": 20, "source": "Fear Table:", "old_state": 0 }, "id": 356409, "action_name": "Translation added", "url": "https://weblate.foundryvtt-hub.com/api/changes/356409/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/199701/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/swade-immersive-macros/main/pt_BR/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/mclemente/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/mclemente/?format=api", "timestamp": "2023-07-03T00:28:36.427775Z", "action": 5, "target": "Ativar esta opção também ativará o Dano Severo para os NPCs.", "old": "", "details": { "state": 20, "source": "Activating this option will enable Gritty Damage for NPCs as well.", "old_state": 0 }, "id": 356408, "action_name": "Translation added", "url": "https://weblate.foundryvtt-hub.com/api/changes/356408/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/199700/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/swade-immersive-macros/main/pt_BR/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/mclemente/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/mclemente/?format=api", "timestamp": "2023-07-03T00:28:10.483362Z", "action": 5, "target": "Usar Dano Severo em NPCs?", "old": "", "details": { "state": 20, "source": "Use Gritty Damage on NPCs?", "old_state": 0 }, "id": 356407, "action_name": "Translation added", "url": "https://weblate.foundryvtt-hub.com/api/changes/356407/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/199699/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/swade-immersive-macros/main/pt_BR/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/mclemente/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/mclemente/?format=api", "timestamp": "2023-07-03T00:27:58.923627Z", "action": 5, "target": "Ative essa opção se quiser usar Dano Severo. Por padrão, ele afeta apenas os PJs.", "old": "", "details": { "state": 20, "source": "Activate this if you want to use Gritty Damage. By default it only affects PCs.", "old_state": 0 }, "id": 356406, "action_name": "Translation added", "url": "https://weblate.foundryvtt-hub.com/api/changes/356406/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-02T21:44:07.566129Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto 4c874e3\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '4c874e3'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 356403, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/356403/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-02T21:44:06.384176Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 356402, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/356402/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-02T16:31:03.636274Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto e781d0a\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'e781d0a'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 356391, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/356391/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-02T16:31:02.806476Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 356390, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/356390/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-02T16:26:57.848002Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto 88edd2a\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '88edd2a'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 356387, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/356387/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-02T16:26:55.978196Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 356386, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/356386/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-02T06:57:02.740461Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto 254737c\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '254737c'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355994, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355994/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-02T06:57:01.590617Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 355993, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355993/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-01T22:14:23.567575Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto 446c1c3\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '446c1c3'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355962, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355962/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-01T22:14:22.414396Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 355961, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355961/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-01T22:06:48.035517Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto 89b0556\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '89b0556'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355960, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355960/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-01T22:06:47.124141Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 355959, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355959/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-01T08:18:31.835791Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto cce8a34\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'cce8a34'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355699, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355699/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-01T08:18:31.065416Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 355698, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355698/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-01T08:13:17.207223Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto 9d30033\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '9d30033'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355697, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355697/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-01T08:13:16.415025Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 355696, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355696/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-01T08:12:50.997057Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto d2d8f44\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'd2d8f44'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355695, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355695/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-01T08:12:50.233276Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 355694, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355694/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-01T07:22:02.484884Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto 1fb1150\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '1fb1150'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355693, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355693/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-01T07:22:01.465426Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 355692, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355692/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-30T21:02:29.924124Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto df62cf5\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'df62cf5'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355649, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355649/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-30T21:02:28.943470Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 355648, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355648/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-30T15:15:42.538886Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto cbd92cb\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'cbd92cb'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355430, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355430/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-30T15:15:41.615871Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 355429, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355429/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-30T14:13:54.800725Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto fba0e45\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'fba0e45'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355428, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355428/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-30T14:13:53.994787Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 355427, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355427/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-30T09:27:29.920777Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto 747a01b\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '747a01b'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355415, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355415/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-30T09:27:29.098324Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 355414, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355414/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-30T08:32:47.332938Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto 189f611\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '189f611'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355413, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355413/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-30T08:32:46.125840Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 355412, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355412/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-30T06:45:13.082313Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto 4a261db\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '4a261db'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355404, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355404/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-30T06:45:12.030832Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 355403, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355403/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-29T11:07:05.904774Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto 4ff8028\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '4ff8028'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355059, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355059/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-29T11:07:04.778029Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 355058, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355058/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-28T06:47:31.680505Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto 2b93957\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '2b93957'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 354904, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/354904/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-28T06:47:30.706020Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 354903, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/354903/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-27T13:03:44.024023Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto e97811a\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'e97811a'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 354671, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/354671/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-27T13:03:43.217979Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 354670, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/354670/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-27T13:02:23.245691Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto 219bcb6\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '219bcb6'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 354669, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/354669/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-27T13:02:22.193431Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 354668, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/354668/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-26T21:49:21.819675Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto 99d4e1c\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '99d4e1c'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 354243, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/354243/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-26T21:49:20.831884Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 354242, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/354242/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-26T08:36:20.329330Z", "action": 23, "target": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "old": "", "details": { "error": "Rebasing (1/8)\nerror: could not apply 0000906... Added translation using Weblate (Portuguese (Brazil))\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 0000906... Added translation using Weblate (Portuguese (Brazil))\nAuto-merging swim/module.json\nCONFLICT (add/add): Merge conflict in swim/lang/pt_BR.json\nAuto-merging swim/lang/pt_BR.json\n (1)", "status": "interactive rebase in progress; onto 254aca4\nLast command done (1 command done):\n pick 0000906 Added translation using Weblate (Portuguese (Brazil))\nNext commands to do (7 remaining commands):\n pick 3367b94 Translated using Weblate (English)\n pick 5fb077d Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '254aca4'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth added: swim/lang/pt_BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 352790, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/352790/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/swade-immersive-macros/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-26T08:36:19.400013Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/SalieriC/SWADE-Immersive-Macros", "git://github.com/SalieriC/SWADE-Immersive-Macros.git", "[email protected]:SalieriC/SWADE-Immersive-Macros", "[email protected]:SalieriC/SWADE-Immersive-Macros.git", "https://github.com/SalieriC/SWADE-Immersive-Macros", "https://github.com/SalieriC/SWADE-Immersive-Macros.git" ], "branch": "main", "repo_url": "https://github.com/SalieriC/SWADE-Immersive-Macros", "full_name": "SalieriC/SWADE-Immersive-Macros", "service_long_name": "GitHub" }, "id": 352789, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/352789/?format=api" } ] }