Changes
Translation projects API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/projects/readrops/changes/?format=api&page=3
https://hosted.weblate.org/api/projects/readrops/changes/?format=api&page=4", "previous": "https://hosted.weblate.org/api/projects/readrops/changes/?format=api&page=2", "results": [ { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-31T19:48:45.231002+02: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 e0874f22\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 'e0874f22'.\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": 86413883, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/86413883/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-31T19:48:34.093327+02: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": 86413882, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/86413882/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-30T19:35:56.950802+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 1a92684c\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 '1a92684c'.\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": 86385430, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/86385430/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-30T19:35:52.706041+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": 86385428, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/86385428/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-28T11:54:37.142667+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 b9438221\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 'b9438221'.\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": 86103593, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/86103593/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-28T11:54:28.291589+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": 86103591, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/86103591/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-28T11:23:05.012747+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 51b7ba73\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 '51b7ba73'.\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": 86102462, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/86102462/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-28T11:23:02.401757+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": 86102461, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/86102461/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-26T19:41:42.307906+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 8b108645\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 '8b108645'.\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": 85753084, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/85753084/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-26T19:41:40.986426+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": 85753083, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/85753083/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-26T14:30:37.752480+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 da78d1b8\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 'da78d1b8'.\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": 85735830, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/85735830/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-26T14:30:34.921947+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": 85735829, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/85735829/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-25T22:58:25.282013+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 b4ac0211\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 'b4ac0211'.\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": 85708221, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/85708221/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-25T22:58:22.546664+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": 85708220, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/85708220/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-21T12:20:23.994890+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 c3026f0f\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 'c3026f0f'.\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": 85461058, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/85461058/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-21T12:20:12.959897+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": 85461055, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/85461055/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-20T16:44:51.821942+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 32e0c17e\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 '32e0c17e'.\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": 85376546, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/85376546/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-20T16:44:49.358209+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": 85376545, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/85376545/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-19T21:55:48.678548+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 1038fb68\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 '1038fb68'.\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": 85349076, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/85349076/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-19T21:55:46.043008+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": 85349074, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/85349074/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-04T23:10:26.224691+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 c52f324a\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 'c52f324a'.\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": 82871616, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/82871616/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-04T23:10:24.528209+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": 82871615, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/82871615/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-04T22:43:00.679659+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 5c16ea09\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 '5c16ea09'.\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": 82871381, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/82871381/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-04T22:42:59.455322+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": 82871380, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/82871380/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-04T22:16:53.443494+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 66649035\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 '66649035'.\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": 82870803, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/82870803/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-04T22:16:51.012207+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": 82870802, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/82870802/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-03T23:44:48.804647+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 e31ebe48\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 'e31ebe48'.\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": 82791052, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/82791052/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-03T23:44:41.173997+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": 82791049, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/82791049/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-03T22:18:20.889371+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 3e522538\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 '3e522538'.\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": 82787598, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/82787598/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-03T22:18:18.621859+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": 82787597, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/82787597/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-02T14:56:53.558942+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 59d22fd3\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 '59d22fd3'.\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": 82722420, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/82722420/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-02T14:56:52.174175+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": 82722419, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/82722419/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-01T22:16:06.493368+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 291c75a6\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 '291c75a6'.\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": 82688022, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/82688022/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-01T22:16:05.287241+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": 82688021, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/82688021/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-01T19:41:05.991860+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 97dc2446\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 '97dc2446'.\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": 82683069, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/82683069/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-03-01T19:40:56.427534+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": 82683068, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/82683068/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-29T10:48:54.667185+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 2ee2144f\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 '2ee2144f'.\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": 82569488, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/82569488/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-29T10:48:52.761606+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": 82569484, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/82569484/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-28T23:07:52.448087+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 6bf7cb00\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 '6bf7cb00'.\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": 82550900, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/82550900/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-28T23:07:44.549800+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": 82550899, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/82550899/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-28T22:38:32.202326+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 56b2943f\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 '56b2943f'.\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": 82550600, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/82550600/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-02-28T22:38:29.980981+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": 82550599, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/82550599/?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: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" } ] }{ "count": 1037, "next": "