Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/mobilizon/android-app/changes/?format=api&page=6
{ "count": 4334, "next": "https://weblate.framasoft.org/api/components/mobilizon/android-app/changes/?format=api&page=7", "previous": "https://weblate.framasoft.org/api/components/mobilizon/android-app/changes/?format=api&page=5", "results": [ { "unit": "https://weblate.framasoft.org/api/units/781825/?format=api", "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": "https://weblate.framasoft.org/api/translations/mobilizon/android-app/zh_Hant/?format=api", "user": null, "author": null, "timestamp": "2022-12-18T05:05:26.818703Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Pick an instance", "old_state": -1 }, "id": 496027, "action_name": "Chaîne mise à jour dans le dépôt", "url": "https://weblate.framasoft.org/api/changes/496027/?format=api" }, { "unit": "https://weblate.framasoft.org/api/units/781824/?format=api", "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": "https://weblate.framasoft.org/api/translations/mobilizon/android-app/zh_Hant/?format=api", "user": null, "author": null, "timestamp": "2022-12-18T05:05:26.818674Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Change instance", "old_state": -1 }, "id": 496026, "action_name": "Chaîne mise à jour dans le dépôt", "url": "https://weblate.framasoft.org/api/changes/496026/?format=api" }, { "unit": "https://weblate.framasoft.org/api/units/781823/?format=api", "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": "https://weblate.framasoft.org/api/translations/mobilizon/android-app/zh_Hant/?format=api", "user": null, "author": null, "timestamp": "2022-12-18T05:05:26.818642Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Enable Data", "old_state": -1 }, "id": 496025, "action_name": "Chaîne mise à jour dans le dépôt", "url": "https://weblate.framasoft.org/api/changes/496025/?format=api" }, { "unit": "https://weblate.framasoft.org/api/units/781822/?format=api", "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": "https://weblate.framasoft.org/api/translations/mobilizon/android-app/zh_Hant/?format=api", "user": null, "author": null, "timestamp": "2022-12-18T05:05:26.818610Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "No Internet Connection", "old_state": -1 }, "id": 496024, "action_name": "Chaîne mise à jour dans le dépôt", "url": "https://weblate.framasoft.org/api/changes/496024/?format=api" }, { "unit": "https://weblate.framasoft.org/api/units/781821/?format=api", "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": "https://weblate.framasoft.org/api/translations/mobilizon/android-app/zh_Hant/?format=api", "user": null, "author": null, "timestamp": "2022-12-18T05:05:26.818581Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Error: %1$s", "old_state": -1 }, "id": 496023, "action_name": "Chaîne mise à jour dans le dépôt", "url": "https://weblate.framasoft.org/api/changes/496023/?format=api" }, { "unit": "https://weblate.framasoft.org/api/units/781820/?format=api", "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": "https://weblate.framasoft.org/api/translations/mobilizon/android-app/zh_Hant/?format=api", "user": null, "author": null, "timestamp": "2022-12-18T05:05:26.818552Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Help", "old_state": -1 }, "id": 496022, "action_name": "Chaîne mise à jour dans le dépôt", "url": "https://weblate.framasoft.org/api/changes/496022/?format=api" }, { "unit": "https://weblate.framasoft.org/api/units/781819/?format=api", "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": "https://weblate.framasoft.org/api/translations/mobilizon/android-app/zh_Hant/?format=api", "user": null, "author": null, "timestamp": "2022-12-18T05:05:26.818523Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Cancel", "old_state": -1 }, "id": 496021, "action_name": "Chaîne mise à jour dans le dépôt", "url": "https://weblate.framasoft.org/api/changes/496021/?format=api" }, { "unit": "https://weblate.framasoft.org/api/units/781818/?format=api", "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": "https://weblate.framasoft.org/api/translations/mobilizon/android-app/zh_Hant/?format=api", "user": null, "author": null, "timestamp": "2022-12-18T05:05:26.818494Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "No", "old_state": -1 }, "id": 496020, "action_name": "Chaîne mise à jour dans le dépôt", "url": "https://weblate.framasoft.org/api/changes/496020/?format=api" }, { "unit": "https://weblate.framasoft.org/api/units/781817/?format=api", "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": "https://weblate.framasoft.org/api/translations/mobilizon/android-app/zh_Hant/?format=api", "user": null, "author": null, "timestamp": "2022-12-18T05:05:26.818461Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Yes", "old_state": -1 }, "id": 496019, "action_name": "Chaîne mise à jour dans le dépôt", "url": "https://weblate.framasoft.org/api/changes/496019/?format=api" }, { "unit": "https://weblate.framasoft.org/api/units/781816/?format=api", "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": "https://weblate.framasoft.org/api/translations/mobilizon/android-app/zh_Hant/?format=api", "user": null, "author": null, "timestamp": "2022-12-18T05:05:26.818413Z", "action": 59, "target": "", "old": "", "details": { "state": 0, "source": "Mobilizon", "old_state": -1 }, "id": 496018, "action_name": "Chaîne mise à jour dans le dépôt", "url": "https://weblate.framasoft.org/api/changes/496018/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": "https://weblate.framasoft.org/api/translations/mobilizon/android-app/zh_Hant/?format=api", "user": "https://weblate.framasoft.org/api/users/Eeeee/?format=api", "author": "https://weblate.framasoft.org/api/users/Eeeee/?format=api", "timestamp": "2022-12-18T05:05:26.608487Z", "action": 48, "target": "", "old": "", "details": { "language": "zh_Hant" }, "id": 496017, "action_name": "Langage ajouté", "url": "https://weblate.framasoft.org/api/changes/496017/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-16T19:45:50.623235Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495510, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495510/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-16T19:45:49.499081Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495509, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495509/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-16T11:53:16.100446Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495478, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495478/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-16T05:32:32.709166Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495448, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495448/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-16T05:12:52.215887Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495422, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495422/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-16T03:53:53.407399Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495399, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495399/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-15T12:06:28.468465Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495319, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495319/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-15T07:53:27.287938Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495086, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495086/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-15T07:33:39.836740Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495078, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495078/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-15T04:14:42.610939Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 495030, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/495030/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-15T01:40:56.444366Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 494950, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/494950/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-14T17:06:30.637342Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 494425, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/494425/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-13T21:44:24.872628Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493909, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493909/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-13T12:48:44.610479Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493826, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493826/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-13T01:02:49.639546Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493701, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493701/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-12T16:16:25.598721Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493644, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493644/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-12T13:22:54.743083Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493350, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493350/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-12T09:22:40.142189Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493312, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493312/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-12T08:55:34.127031Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493308, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493308/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T22:45:50.080649Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493245, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493245/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T20:15:13.661629Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493232, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493232/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T20:03:27.539788Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493229, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493229/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T15:23:25.331510Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493215, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493215/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T13:41:24.290195Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493208, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493208/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T13:40:53.089642Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493205, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493205/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T13:40:37.737100Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493202, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493202/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T06:03:23.174383Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493178, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493178/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-11T05:58:51.552137Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493177, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493177/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T22:17:06.191685Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493131, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493131/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T20:00:09.831842Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493123, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493123/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T19:53:13.607995Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493119, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493119/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T17:25:12.815750Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493105, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493105/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T17:24:56.550583Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493104, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493104/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T15:01:03.049764Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493094, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493094/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T00:56:50.914838Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493043, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493043/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-10T00:14:31.468574Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493040, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493040/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-09T14:54:23.261122Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493024, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493024/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-09T13:23:53.007317Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 493020, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/493020/?format=api" }, { "unit": null, "component": "https://weblate.framasoft.org/api/components/mobilizon/android-app/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-12-09T04:09:44.968215Z", "action": 23, "target": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "old": "", "details": { "error": "Rebasing (1/61)\nerror: could not apply 2b662da... Added translation using Weblate (Bengali)\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 2b662da... Added translation using Weblate (Bengali)\nCONFLICT (add/add): Merge conflict in app/src/main/res/values-bn/strings.xml\nAuto-merging app/src/main/res/values-bn/strings.xml\n (1)", "status": "interactive rebase in progress; onto 3725790\nLast command done (1 command done):\n pick 2b662da Added translation using Weblate (Bengali)\nNext commands to do (60 remaining commands):\n pick 294cb35 Translated using Weblate (French)\n pick 1f42c4f Translated using Weblate (Finnish)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3725790'.\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: app/src/main/res/values-bn/strings.xml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 492896, "action_name": "Échec du rebasement du dépôt", "url": "https://weblate.framasoft.org/api/changes/492896/?format=api" } ] }