Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/mcc/main/changes/?format=api&page=5
{ "count": 1020, "next": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/changes/?format=api&page=6", "previous": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/changes/?format=api&page=4", "results": [ { "unit": "https://weblate.foundryvtt-hub.com/api/units/212001/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318790Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Percentage ready", "old_state": -1 }, "id": 315957, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315957/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/212000/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318758Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Packages visible", "old_state": -1 }, "id": 315956, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315956/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211999/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318724Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Unknown Author", "old_state": -1 }, "id": 315955, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315955/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211998/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318691Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Untitled", "old_state": -1 }, "id": 315954, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315954/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211997/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318664Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Notes", "old_state": -1 }, "id": 315953, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315953/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211996/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318640Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Status", "old_state": -1 }, "id": 315952, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315952/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211995/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318615Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Compatible Version", "old_state": -1 }, "id": 315951, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315951/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211994/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318591Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "ID", "old_state": -1 }, "id": 315950, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315950/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211993/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318566Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Type", "old_state": -1 }, "id": 315949, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315949/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211992/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318541Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Title", "old_state": -1 }, "id": 315948, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315948/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211991/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318515Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Check compatibility for:", "old_state": -1 }, "id": 315947, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315947/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211990/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318478Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Loading…", "old_state": -1 }, "id": 315946, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315946/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211989/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318452Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Marked as compatible by developer in manifest", "old_state": -1 }, "id": 315945, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315945/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211988/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318418Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Unknown status - Package may not be in the official listing", "old_state": -1 }, "id": 315944, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315944/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211987/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318391Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Archived - Package may still function but is not actively maintained", "old_state": -1 }, "id": 315943, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315943/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211986/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318366Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "No testing necessary", "old_state": -1 }, "id": 315942, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315942/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211985/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318336Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Package works without issue or an updated version is available", "old_state": -1 }, "id": 315941, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315941/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211984/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318303Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Blocked from being tested", "old_state": -1 }, "id": 315940, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315940/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211983/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318267Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Package functions with some errors", "old_state": -1 }, "id": 315939, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315939/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211982/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318233Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Package does not function at all or prevents the world loading", "old_state": -1 }, "id": 315938, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315938/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/211981/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": null, "author": null, "timestamp": "2023-05-05T19:31:27.318151Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Module Compatibility Checker", "old_state": -1 }, "id": 315937, "action_name": "String updated in the repository", "url": "https://weblate.foundryvtt-hub.com/api/changes/315937/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pl/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/Lioheart/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/Lioheart/?format=api", "timestamp": "2023-05-05T19:31:27.124829Z", "action": 48, "target": "", "old": "", "details": { "language": "pl" }, "id": 315936, "action_name": "Language added", "url": "https://weblate.foundryvtt-hub.com/api/changes/315936/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-03-26T03:42:49.382488Z", "action": 18, "target": "", "old": "", "details": {}, "id": 285154, "action_name": "Changes pushed", "url": "https://weblate.foundryvtt-hub.com/api/changes/285154/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/24892/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pt-BR/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "timestamp": "2023-03-26T03:36:46.830315Z", "action": 5, "target": "Lembre-se de que os desenvolvedores de módulos e sistemas são voluntários, eles têm suas próprias vidas e horários e só porque ainda não atualizaram não significa que nunca o farão. Paciência é importante! Os desenvolvedores também são humanos.", "old": "", "details": { "state": 20, "source": "Please remember that module and system developers are volunteers, they have their own lives and schedules and just because they have not yet updated doesn't mean they never will. Patience is important! Devs are human too.", "old_state": 0 }, "id": 285146, "action_name": "Translation added", "url": "https://weblate.foundryvtt-hub.com/api/changes/285146/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/24891/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pt-BR/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "timestamp": "2023-03-26T03:36:27.405595Z", "action": 5, "target": "Mostrar pacotes compatíveis", "old": "", "details": { "state": 20, "source": "Show compatible packages", "old_state": 0 }, "id": 285145, "action_name": "Translation added", "url": "https://weblate.foundryvtt-hub.com/api/changes/285145/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/79463/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pt-BR/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "timestamp": "2023-03-26T03:36:17.585373Z", "action": 5, "target": "A porcentagem de pacotes visíveis que estão prontos para serem usados na versão Foundry VTT selecionada.", "old": "", "details": { "state": 20, "source": "The percentage of visible packages that are ready to be used on the selected Foundry VTT version.", "old_state": 0 }, "id": 285144, "action_name": "Translation added", "url": "https://weblate.foundryvtt-hub.com/api/changes/285144/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/12049/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pt-BR/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "timestamp": "2023-03-26T03:36:02.974118Z", "action": 2, "target": "As cores de fundo abaixo são usadas para indicar o status do módulo na última versão do Foundry VTT. Abra o Verificador de Compatibilidade do Módulo com o botão abaixo para mais informações.", "old": "As cores de fundo abaixo são usadas para indicar o status do módulo na última versão do núcleo. Abra o Verificador de Compatibilidade do Módulo com o botão abaixo para mais informações.", "details": { "state": 20, "source": "The background colors below are used to indicate the status of the module in the latest Foundry VTT version. Open the Module Compatibility Checker with the button below for more info.", "old_state": 10 }, "id": 285143, "action_name": "Translation changed", "url": "https://weblate.foundryvtt-hub.com/api/changes/285143/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/79457/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pt-BR/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "timestamp": "2023-03-26T03:35:34.530207Z", "action": 5, "target": "Autor desconhecido", "old": "", "details": { "state": 20, "source": "Unknown Author", "old_state": 0 }, "id": 285142, "action_name": "Translation added", "url": "https://weblate.foundryvtt-hub.com/api/changes/285142/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/24890/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pt-BR/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "timestamp": "2023-03-26T03:35:25.483169Z", "action": 5, "target": "Marcado como compatível pelo desenvolvedor no manifesto", "old": "", "details": { "state": 20, "source": "Marked as compatible by developer in manifest", "old_state": 0 }, "id": 285141, "action_name": "Translation added", "url": "https://weblate.foundryvtt-hub.com/api/changes/285141/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/12032/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pt-BR/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "timestamp": "2023-03-26T03:35:11.235666Z", "action": 2, "target": "Arquivado - O pacote ainda pode funcionar, mas não é mantido ativamente", "old": "Arquivado - A ser arquivado ou não mais disponível", "details": { "state": 20, "source": "Archived - Package may still function but is not actively maintained", "old_state": 10 }, "id": 285140, "action_name": "Translation changed", "url": "https://weblate.foundryvtt-hub.com/api/changes/285140/?format=api" }, { "unit": "https://weblate.foundryvtt-hub.com/api/units/12032/?format=api", "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": "https://weblate.foundryvtt-hub.com/api/translations/mcc/main/pt-BR/?format=api", "user": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "author": "https://weblate.foundryvtt-hub.com/api/users/eunaumtenhoid/?format=api", "timestamp": "2023-03-26T03:35:11.232478Z", "action": 45, "target": "", "old": "", "details": {}, "id": 285139, "action_name": "Contributor joined", "url": "https://weblate.foundryvtt-hub.com/api/changes/285139/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/JDW/?format=api", "author": null, "timestamp": "2023-02-14T22:28:08.137995Z", "action": 18, "target": "", "old": "", "details": {}, "id": 236134, "action_name": "Changes pushed", "url": "https://weblate.foundryvtt-hub.com/api/changes/236134/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-02-14T22:27:57.885381Z", "action": 18, "target": "", "old": "", "details": {}, "id": 236133, "action_name": "Changes pushed", "url": "https://weblate.foundryvtt-hub.com/api/changes/236133/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-02-14T22:27:55.884777Z", "action": 15, "target": "", "old": "", "details": { "auto": true }, "id": 236132, "action_name": "Component unlocked", "url": "https://weblate.foundryvtt-hub.com/api/changes/236132/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/JDW/?format=api", "author": null, "timestamp": "2023-02-14T22:27:55.854595Z", "action": 20, "target": "", "old": "", "details": {}, "id": 236131, "action_name": "Repository merged", "url": "https://weblate.foundryvtt-hub.com/api/changes/236131/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-02-09T02:43:56.035611Z", "action": 23, "target": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "old": "", "details": { "error": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "status": "interactive rebase in progress; onto 81305d8\nLast command done (1 command done):\n pick 300e492 feat: updated (Spanish) translations using Weblate\nNext commands to do (3 remaining commands):\n pick d8353a6 feat: updated (Spanish) translations using Weblate\n pick 5d6cd4e feat: updated (English) translations using Weblate\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '81305d8'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: languages/es.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 216483, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/216483/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-02-09T02:43:55.332697Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/arcanistzed/mcc", "git://github.com/arcanistzed/mcc.git", "[email protected]:arcanistzed/mcc", "[email protected]:arcanistzed/mcc.git", "https://github.com/arcanistzed/mcc", "https://github.com/arcanistzed/mcc.git" ], "branch": "main", "repo_url": "https://github.com/arcanistzed/mcc", "full_name": "arcanistzed/mcc.git", "service_long_name": "GitHub" }, "id": 216482, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/216482/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-02-09T02:42:15.033964Z", "action": 23, "target": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "old": "", "details": { "error": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "status": "interactive rebase in progress; onto 43bc210\nLast command done (1 command done):\n pick 300e492 feat: updated (Spanish) translations using Weblate\nNext commands to do (3 remaining commands):\n pick d8353a6 feat: updated (Spanish) translations using Weblate\n pick 5d6cd4e feat: updated (English) translations using Weblate\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '43bc210'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: languages/es.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 216481, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/216481/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-02-09T02:42:14.398503Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/arcanistzed/mcc", "git://github.com/arcanistzed/mcc.git", "[email protected]:arcanistzed/mcc", "[email protected]:arcanistzed/mcc.git", "https://github.com/arcanistzed/mcc", "https://github.com/arcanistzed/mcc.git" ], "branch": "main", "repo_url": "https://github.com/arcanistzed/mcc", "full_name": "arcanistzed/mcc.git", "service_long_name": "GitHub" }, "id": 216480, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/216480/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-02-09T02:41:43.798778Z", "action": 23, "target": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "old": "", "details": { "error": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "status": "interactive rebase in progress; onto bf57255\nLast command done (1 command done):\n pick 300e492 feat: updated (Spanish) translations using Weblate\nNext commands to do (3 remaining commands):\n pick d8353a6 feat: updated (Spanish) translations using Weblate\n pick 5d6cd4e feat: updated (English) translations using Weblate\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'bf57255'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: languages/es.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 216479, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/216479/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-02-09T02:41:43.125614Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/arcanistzed/mcc", "git://github.com/arcanistzed/mcc.git", "[email protected]:arcanistzed/mcc", "[email protected]:arcanistzed/mcc.git", "https://github.com/arcanistzed/mcc", "https://github.com/arcanistzed/mcc.git" ], "branch": "main", "repo_url": "https://github.com/arcanistzed/mcc", "full_name": "arcanistzed/mcc.git", "service_long_name": "GitHub" }, "id": 216478, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/216478/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-06T20:35:53.171071Z", "action": 23, "target": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "old": "", "details": { "error": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "status": "interactive rebase in progress; onto 18e2347\nLast command done (1 command done):\n pick 300e492 feat: updated (Spanish) translations using Weblate\nNext commands to do (3 remaining commands):\n pick d8353a6 feat: updated (Spanish) translations using Weblate\n pick 5d6cd4e feat: updated (English) translations using Weblate\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '18e2347'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: languages/es.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 160052, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/160052/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-06T20:35:52.016390Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/arcanistzed/mcc", "git://github.com/arcanistzed/mcc.git", "[email protected]:arcanistzed/mcc", "[email protected]:arcanistzed/mcc.git", "https://github.com/arcanistzed/mcc", "https://github.com/arcanistzed/mcc.git" ], "branch": "main", "repo_url": "https://github.com/arcanistzed/mcc", "full_name": "arcanistzed/mcc.git", "service_long_name": "GitHub" }, "id": 160051, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/160051/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-06T06:12:36.111791Z", "action": 23, "target": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "old": "", "details": { "error": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "status": "interactive rebase in progress; onto 831e9ad\nLast command done (1 command done):\n pick 300e492 feat: updated (Spanish) translations using Weblate\nNext commands to do (3 remaining commands):\n pick d8353a6 feat: updated (Spanish) translations using Weblate\n pick 5d6cd4e feat: updated (English) translations using Weblate\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '831e9ad'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: languages/es.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 149758, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/149758/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-06T06:07:52.308622Z", "action": 23, "target": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "old": "", "details": { "error": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "status": "interactive rebase in progress; onto 831e9ad\nLast command done (1 command done):\n pick 300e492 feat: updated (Spanish) translations using Weblate\nNext commands to do (3 remaining commands):\n pick d8353a6 feat: updated (Spanish) translations using Weblate\n pick 5d6cd4e feat: updated (English) translations using Weblate\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '831e9ad'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: languages/es.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 149757, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/149757/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-06T06:03:03.439028Z", "action": 23, "target": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "old": "", "details": { "error": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "status": "interactive rebase in progress; onto 831e9ad\nLast command done (1 command done):\n pick 300e492 feat: updated (Spanish) translations using Weblate\nNext commands to do (3 remaining commands):\n pick d8353a6 feat: updated (Spanish) translations using Weblate\n pick 5d6cd4e feat: updated (English) translations using Weblate\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '831e9ad'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: languages/es.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 149756, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/149756/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-06T05:57:36.432426Z", "action": 23, "target": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "old": "", "details": { "error": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "status": "interactive rebase in progress; onto 831e9ad\nLast command done (1 command done):\n pick 300e492 feat: updated (Spanish) translations using Weblate\nNext commands to do (3 remaining commands):\n pick d8353a6 feat: updated (Spanish) translations using Weblate\n pick 5d6cd4e feat: updated (English) translations using Weblate\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '831e9ad'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: languages/es.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 149755, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/149755/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-06T05:52:46.250910Z", "action": 23, "target": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "old": "", "details": { "error": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "status": "interactive rebase in progress; onto 831e9ad\nLast command done (1 command done):\n pick 300e492 feat: updated (Spanish) translations using Weblate\nNext commands to do (3 remaining commands):\n pick d8353a6 feat: updated (Spanish) translations using Weblate\n pick 5d6cd4e feat: updated (English) translations using Weblate\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '831e9ad'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: languages/es.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 149754, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/149754/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-06T05:48:12.453988Z", "action": 23, "target": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "old": "", "details": { "error": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "status": "interactive rebase in progress; onto 831e9ad\nLast command done (1 command done):\n pick 300e492 feat: updated (Spanish) translations using Weblate\nNext commands to do (3 remaining commands):\n pick d8353a6 feat: updated (Spanish) translations using Weblate\n pick 5d6cd4e feat: updated (English) translations using Weblate\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '831e9ad'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: languages/es.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 149753, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/149753/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/mcc/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-06T05:40:25.067771Z", "action": 23, "target": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "old": "", "details": { "error": "Rebasing (1/4)\nerror: could not apply 300e492... feat: updated (Spanish) translations using Weblate\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 300e492... feat: updated (Spanish) translations using Weblate\nAuto-merging languages/es.json\nCONFLICT (content): Merge conflict in languages/es.json\n (1)", "status": "interactive rebase in progress; onto 831e9ad\nLast command done (1 command done):\n pick 300e492 feat: updated (Spanish) translations using Weblate\nNext commands to do (3 remaining commands):\n pick d8353a6 feat: updated (Spanish) translations using Weblate\n pick 5d6cd4e feat: updated (English) translations using Weblate\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '831e9ad'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: languages/es.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 149752, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/149752/?format=api" } ] }