Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/readrops/strings/changes/?format=api&page=4
https://hosted.weblate.org/api/components/readrops/strings/changes/?format=api&page=5", "previous": "https://hosted.weblate.org/api/components/readrops/strings/changes/?format=api&page=3", "results": [ { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-27T22:46:02.533650+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 3a5db093\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '3a5db093'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 82455320, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/82455320/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-27T22:46:00.587349+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 82455319, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/82455319/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-27T19:48:04.408521+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto ec0cf16b\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on 'ec0cf16b'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 82396765, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/82396765/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-27T19:13:11.006496+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 82395940, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/82395940/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-25T22:41:50.475473+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto c4339acf\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on 'c4339acf'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 82277417, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/82277417/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-25T22:41:41.244815+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 82277415, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/82277415/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-22T21:44:10.208354+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 1cdb98ee\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '1cdb98ee'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 81752680, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/81752680/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-22T21:44:08.129244+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 81752679, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/81752679/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-21T23:59:10.812296+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto adb56cda\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on 'adb56cda'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 81687478, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/81687478/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-21T23:59:09.751375+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 81687476, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/81687476/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-21T21:53:22.393168+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 09bcba7c\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '09bcba7c'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 81685154, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/81685154/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-21T21:53:17.711275+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 81685153, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/81685153/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-19T23:16:12.721578+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto edc2094a\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on 'edc2094a'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 81510124, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/81510124/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-19T23:16:11.659086+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 81510122, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/81510122/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-19T22:43:59.111081+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 5a0affdf\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '5a0affdf'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 81509447, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/81509447/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-19T22:43:57.902116+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 81509446, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/81509446/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-19T13:27:49.650897+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 13557c00\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '13557c00'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 81426786, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/81426786/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-19T13:27:48.004964+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 81426785, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/81426785/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-18T23:38:53.282322+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 5b744803\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '5b744803'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 81399273, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/81399273/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-18T23:38:52.281496+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 81399272, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/81399272/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-18T22:50:13.536866+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 939af36b\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '939af36b'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 81395021, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/81395021/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-18T22:50:05.770087+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 81395019, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/81395019/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-18T19:04:17.504185+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto ad13ba99\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on 'ad13ba99'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 81240971, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/81240971/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-18T19:04:15.964988+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 81240970, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/81240970/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-15T21:42:00.435069+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 425d2074\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '425d2074'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 81103874, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/81103874/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-15T21:41:49.297499+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 81103859, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/81103859/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-15T12:16:09.992003+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 6c875d9d\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '6c875d9d'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 81060731, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/81060731/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-15T12:16:08.982189+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 81060730, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/81060730/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-15T12:08:10.557496+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 90b8c54e\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '90b8c54e'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 81060689, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/81060689/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-15T12:08:09.035168+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 81060688, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/81060688/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-14T23:49:52.051419+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 9aa20046\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '9aa20046'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 81048137, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/81048137/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-14T23:49:50.326089+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 81048134, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/81048134/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-13T23:06:31.867833+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 5036e021\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '5036e021'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 80973066, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/80973066/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-13T23:06:28.303098+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 80973065, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/80973065/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-11T22:18:40.427439+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto a3c9e0a8\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on 'a3c9e0a8'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 80819270, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/80819270/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-11T22:18:39.215223+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 80819269, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/80819269/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-11T17:52:07.020349+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 6f013330\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '6f013330'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 80815987, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/80815987/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-11T17:52:05.531473+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 80815985, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/80815985/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-01-18T18:45:40.810897+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto caf55451\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on 'caf55451'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 78614806, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/78614806/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-01-18T18:45:39.176563+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 78614804, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/78614804/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-01-18T06:00:24.885894+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto a6d753ef\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on 'a6d753ef'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 78319729, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/78319729/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-01-17T16:42:08.199781+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 78311358, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/78311358/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-01-14T00:57:28.830092+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 672de764\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '672de764'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 77190552, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/77190552/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-01-14T00:57:27.344888+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 77190551, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/77190551/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-01-12T19:49:41.309069+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 7d177407\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '7d177407'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 77131867, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/77131867/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-01-12T19:49:40.169203+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 77131866, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/77131866/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-01-12T19:28:30.213929+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 5cd7ead7\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '5cd7ead7'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 77131588, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/77131588/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-01-12T19:28:28.814602+01:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/readrops/Readrops", "git://github.com/readrops/Readrops.git", "git@github.com:readrops/Readrops", "git@github.com:readrops/Readrops.git", "https://github.com/readrops/Readrops", "https://github.com/readrops/Readrops.git" ], "branch": "develop", "repo_url": "https://github.com/readrops/Readrops", "full_name": "readrops/Readrops", "service_long_name": "GitHub" }, "id": 77131587, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/77131587/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-01-12T03:46:21.049129+01:00", "action": 47, "target": "", "old": "", "details": { "alert": "RepositoryOutdated" }, "id": 77110150, "action_name": "Alert triggered", "url": "https://hosted.weblate.org/api/changes/77110150/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-01-11T23:37:54.139330+01:00", "action": 23, "target": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "old": "", "details": { "error": "Rebasing (1/6)\nAuto-merging app/src/main/res/values-fr/strings.xml\nCONFLICT (content): Merge conflict in app/src/main/res/values-fr/strings.xml\nerror: could not apply 45be8862... Update translation files\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 45be8862... Update translation files\n (1)", "status": "interactive rebase in progress; onto 6b50d408\nLast command done (1 command done):\n pick 45be8862 Update translation files\nNext commands to do (5 remaining commands):\n pick 35401a84 Added translation using Weblate (Portuguese (Brazil))\n pick 33eb256f Translated using Weblate (Portuguese (Brazil))\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '6b50d408'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: app/src/main/res/values-de/strings.xml\n\tmodified: app/src/main/res/values-it/strings.xml\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: app/src/main/res/values-fr/strings.xml\n\n" }, "id": 77107176, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/77107176/?format=api" } ] }{ "count": 1037, "next": "