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=2
{ "count": 1029, "next": "https://hosted.weblate.org/api/components/readrops/strings/changes/?format=api&page=3", "previous": "https://hosted.weblate.org/api/components/readrops/strings/changes/?format=api", "results": [ { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-30T22:40:59.440342+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 f14ed7f3\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 'f14ed7f3'.\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": 88532622, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/88532622/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-30T22:40:45.975906+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": 88532621, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/88532621/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-29T13:08:33.239470+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 a7c07496\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 'a7c07496'.\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": 88445984, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/88445984/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-29T13:08:20.240568+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": 88445982, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/88445982/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-29T00:03:49.414404+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 cc7b874e\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 'cc7b874e'.\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": 88424374, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/88424374/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-29T00:03:34.125167+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": 88424372, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/88424372/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-27T21:20:56.707552+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 2c105f59\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 '2c105f59'.\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": 88385109, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/88385109/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-27T21:20:42.559196+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": 88385108, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/88385108/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-26T18:25:42.972144+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 9f870779\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 '9f870779'.\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": 88340169, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/88340169/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-26T18:25:33.929122+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": 88340164, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/88340164/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-26T18:02:42.738035+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 a3ffde0d\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 'a3ffde0d'.\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": 88339993, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/88339993/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-26T18:02:41.501321+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": 88339992, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/88339992/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-26T17:09:05.757947+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 6893e9a1\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 '6893e9a1'.\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": 88337774, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/88337774/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-26T17:09:02.914819+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": 88337773, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/88337773/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-26T15:55:27.407939+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 c55a9dc5\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 'c55a9dc5'.\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": 88334412, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/88334412/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-26T15:55:14.548071+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": 88334406, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/88334406/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-17T15:10:19.344359+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 8566b55e\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 '8566b55e'.\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": 87626590, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/87626590/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-17T15:10:16.152580+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": 87626589, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/87626589/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-15T16:34:49.024762+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 ea51df49\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 'ea51df49'.\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": 87538896, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/87538896/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-15T16:34:45.365890+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": 87538894, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/87538894/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-15T14:21:46.801401+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 99ff1594\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 '99ff1594'.\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": 87532691, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/87532691/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-15T14:21:34.225646+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": 87532616, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/87532616/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-15T12:28:44.899837+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 c115a1ed\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 'c115a1ed'.\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": 87528190, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/87528190/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-15T12:28:41.697039+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": 87528189, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/87528189/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-14T14:40:39.039558+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 afbf8129\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 'afbf8129'.\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": 87492666, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/87492666/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-14T14:40:35.798044+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": 87492665, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/87492665/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T16:34:38.967787+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 eeb054f0\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 'eeb054f0'.\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": 87462923, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/87462923/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T16:34:37.588082+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": 87462922, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/87462922/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T15:58:28.879569+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 d486bd92\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 'd486bd92'.\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": 87462253, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/87462253/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T15:58:20.445647+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": 87462251, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/87462251/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T14:24:19.954339+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 7b644cbc\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 '7b644cbc'.\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": 87461348, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/87461348/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T14:24:11.227837+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": 87461345, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/87461345/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T14:13:00.348093+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 02a3f82b\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 '02a3f82b'.\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": 87461242, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/87461242/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T14:12:59.044978+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": 87461241, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/87461241/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T13:03:53.594250+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 91378f0a\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 '91378f0a'.\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": 87459217, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/87459217/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-13T13:03:42.414401+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": 87459216, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/87459216/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-10T17:14:29.244430+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 bf7ac41d\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 'bf7ac41d'.\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": 87274354, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/87274354/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-10T17:14:20.878788+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": 87274352, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/87274352/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-10T16:56:45.896594+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 c071426b\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 'c071426b'.\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": 87273641, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/87273641/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-10T16:56:33.537462+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": 87273637, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/87273637/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-08T21:22:08.650615+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 da51f504\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 'da51f504'.\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": 87022013, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/87022013/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-08T21:22:05.529688+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": 87022012, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/87022012/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-06T22:52:05.648655+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 0ccb4aa9\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 '0ccb4aa9'.\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": 86872417, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/86872417/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-06T22:52:02.428709+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": 86872416, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/86872416/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-05T22:41:34.724601+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 8a5c22d1\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 '8a5c22d1'.\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": 86830195, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/86830195/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-05T22:41:31.292075+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": 86830194, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/86830194/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-01T19:41:39.246333+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 cbeea6ca\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 'cbeea6ca'.\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": 86497995, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/86497995/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-01T19:41:30.899897+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": 86497994, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/86497994/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-01T13:03:07.111156+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 0a1574df\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 '0a1574df'.\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": 86484686, "action_name": "Repository rebase failed", "url": "https://hosted.weblate.org/api/changes/86484686/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/readrops/strings/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-04-01T13:03:04.465063+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": 86484685, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/86484685/?format=api" } ] }