Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/kernelsu/manager/changes/?format=api&page=3
{ "count": 16025, "next": "https://hosted.weblate.org/api/components/kernelsu/manager/changes/?format=api&page=4", "previous": "https://hosted.weblate.org/api/components/kernelsu/manager/changes/?format=api&page=2", "results": [ { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-28T04:31:02.022517+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93112722, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93112722/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-28T04:30:55.670997+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 11 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: kernel/throne_tracker.c\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: userspace/ksud/src/boot_patch.rs\n\tmodified: website/docs/.vitepress/locales/pt_BR.ts\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/difference-with-magisk.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/docs/zh_CN/guide/module.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93112721, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93112721/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-28T04:30:49.647265+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 11 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: kernel/throne_tracker.c\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: userspace/ksud/src/boot_patch.rs\n\tmodified: website/docs/.vitepress/locales/pt_BR.ts\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/difference-with-magisk.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/docs/zh_CN/guide/module.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93112720, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93112720/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-28T04:30:46.588127+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93112718, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93112718/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-28T04:30:46.579734+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93112717, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93112717/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-27T04:35:53.090639+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 10 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: kernel/throne_tracker.c\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: userspace/ksud/src/boot_patch.rs\n\tmodified: website/docs/.vitepress/locales/pt_BR.ts\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/difference-with-magisk.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/docs/zh_CN/guide/module.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93069788, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93069788/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-27T04:35:46.827473+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 10 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: kernel/throne_tracker.c\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: userspace/ksud/src/boot_patch.rs\n\tmodified: website/docs/.vitepress/locales/pt_BR.ts\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/difference-with-magisk.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/docs/zh_CN/guide/module.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93069787, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93069787/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-27T04:35:43.979870+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93069786, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93069786/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-27T04:35:43.778136+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93069785, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93069785/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-27T04:35:22.446782+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 9 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: kernel/throne_tracker.c\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: userspace/ksud/src/boot_patch.rs\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/docs/zh_CN/guide/module.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93069781, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93069781/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-27T04:35:16.787148+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 9 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: kernel/throne_tracker.c\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: userspace/ksud/src/boot_patch.rs\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/docs/zh_CN/guide/module.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93069780, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93069780/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-27T04:35:10.786930+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93069779, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93069779/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-27T04:35:10.620044+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93069778, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93069778/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-27T04:34:00.798627+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 8 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: kernel/throne_tracker.c\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: userspace/ksud/src/boot_patch.rs\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/docs/zh_CN/guide/module.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93069777, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93069777/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-27T04:33:54.350523+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 8 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: kernel/throne_tracker.c\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: userspace/ksud/src/boot_patch.rs\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/docs/zh_CN/guide/module.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93069776, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93069776/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-27T04:33:47.078275+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93069775, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93069775/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-27T04:33:47.056200+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93069774, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93069774/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-26T11:10:56.009517+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 7 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: kernel/throne_tracker.c\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: userspace/ksud/src/boot_patch.rs\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/docs/zh_CN/guide/module.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93050207, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93050207/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-26T11:10:49.871681+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 7 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: kernel/throne_tracker.c\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: userspace/ksud/src/boot_patch.rs\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/docs/zh_CN/guide/module.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93050206, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93050206/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-26T11:10:47.020622+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93050204, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93050204/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-26T11:10:46.946910+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93050203, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93050203/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-26T11:03:48.249726+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 6 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: kernel/throne_tracker.c\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: userspace/ksud/src/boot_patch.rs\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93050149, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93050149/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-26T11:03:42.818044+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 6 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: kernel/throne_tracker.c\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: userspace/ksud/src/boot_patch.rs\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93050147, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93050147/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-26T11:03:35.947816+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93050146, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93050146/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-26T11:03:35.884587+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93050145, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93050145/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:10:12.776096+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 5 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: userspace/ksud/src/boot_patch.rs\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93019138, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93019138/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:09:14.919818+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 5 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: userspace/ksud/src/boot_patch.rs\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93019130, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93019130/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:09:08.364957+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93019122, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93019122/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:09:08.112327+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93019121, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93019121/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:08:50.079270+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 4 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93019120, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93019120/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:08:44.618688+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 4 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: website/docs/guide/app-profile.md\n\tmodified: website/docs/guide/faq.md\n\tmodified: website/docs/guide/how-to-build.md\n\tmodified: website/docs/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/guide/installation.md\n\tmodified: website/docs/guide/module.md\n\tmodified: website/docs/guide/rescue-from-bootloop.md\n\tmodified: website/docs/guide/what-is-kernelsu.md\n\tmodified: website/docs/pt_BR/guide/faq.md\n\tmodified: website/docs/pt_BR/guide/how-to-build.md\n\tmodified: website/docs/pt_BR/guide/how-to-integrate-for-non-gki.md\n\tmodified: website/docs/pt_BR/guide/installation.md\n\tmodified: website/docs/pt_BR/guide/module.md\n\tmodified: website/docs/pt_BR/guide/rescue-from-bootloop.md\n\tmodified: website/docs/pt_BR/guide/what-is-kernelsu.md\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93019119, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93019119/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:08:37.690183+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93019118, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93019118/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:08:37.669855+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93019117, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93019117/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:08:03.288250+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93019116, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93019116/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:07:58.029406+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: .github/workflows/build-debug-kernel.yml\n\tmodified: .github/workflows/build-kernel-a12.yml\n\tmodified: .github/workflows/build-kernel-a13.yml\n\tmodified: .github/workflows/build-kernel-a14.yml\n\tmodified: .github/workflows/build-lkm.yml\n\tmodified: .github/workflows/build-manager.yml\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93019115, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93019115/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:07:55.065077+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93019114, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93019114/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:07:54.954325+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93019113, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93019113/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:07:44.444203+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93019112, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93019112/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:07:36.670787+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\tmodified: manager/build.gradle.kts\n\tmodified: manager/gradle/libs.versions.toml\n\tmodified: userspace/ksud/Cargo.lock\n\tmodified: userspace/ksud/Cargo.toml\n\tmodified: website/package.json\n\tmodified: website/yarn.lock\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 93019111, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/93019111/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:07:29.711770+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93019109, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93019109/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-25T05:07:29.646917+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 93019108, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/93019108/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-23T04:47:00.024347+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 92932437, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/92932437/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-23T04:46:53.421821+02:00", "action": 14, "target": "", "old": "", "details": { "auto": true }, "id": 92932436, "action_name": "Component locked", "url": "https://hosted.weblate.org/api/changes/92932436/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-23T04:46:53.411544+02:00", "action": 47, "target": "", "old": "", "details": { "alert": "MergeFailure" }, "id": 92932435, "action_name": "Alert triggered", "url": "https://hosted.weblate.org/api/changes/92932435/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-23T04:46:53.381246+02:00", "action": 22, "target": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "old": "", "details": { "error": "Auto-merging manager/app/src/main/res/values-de/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-de/strings.xml\nAuto-merging manager/app/src/main/res/values-fr/strings.xml\nAuto-merging manager/app/src/main/res/values-nl/strings.xml\nCONFLICT (content): Merge conflict in manager/app/src/main/res/values-nl/strings.xml\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)", "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 22 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n (fix conflicts and run \"git commit\")\n (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified: manager/app/build.gradle.kts\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Settings.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt\n\tmodified: manager/app/src/main/java/me/weishu/kernelsu/ui/util/LogEvent.kt\n\tmodified: manager/app/src/main/res/values-ar/strings.xml\n\tmodified: manager/app/src/main/res/values-az/strings.xml\n\tmodified: manager/app/src/main/res/values-bn-rBD/strings.xml\n\tmodified: manager/app/src/main/res/values-bn/strings.xml\n\tmodified: manager/app/src/main/res/values-bs/strings.xml\n\tmodified: manager/app/src/main/res/values-da/strings.xml\n\tmodified: manager/app/src/main/res/values-es/strings.xml\n\tmodified: manager/app/src/main/res/values-et/strings.xml\n\tmodified: manager/app/src/main/res/values-fa/strings.xml\n\tmodified: manager/app/src/main/res/values-fil/strings.xml\n\tmodified: manager/app/src/main/res/values-fr/strings.xml\n\tmodified: manager/app/src/main/res/values-hi/strings.xml\n\tmodified: manager/app/src/main/res/values-hr/strings.xml\n\tmodified: manager/app/src/main/res/values-hu/strings.xml\n\tmodified: manager/app/src/main/res/values-in/strings.xml\n\tmodified: manager/app/src/main/res/values-it/strings.xml\n\tmodified: manager/app/src/main/res/values-iw/strings.xml\n\tmodified: manager/app/src/main/res/values-ja/strings.xml\n\tmodified: manager/app/src/main/res/values-kn/strings.xml\n\tmodified: manager/app/src/main/res/values-ko/strings.xml\n\tmodified: manager/app/src/main/res/values-lt/strings.xml\n\tmodified: manager/app/src/main/res/values-lv/strings.xml\n\tmodified: manager/app/src/main/res/values-mr/strings.xml\n\tmodified: manager/app/src/main/res/values-ms/strings.xml\n\tmodified: manager/app/src/main/res/values-pl/strings.xml\n\tmodified: manager/app/src/main/res/values-pt-rBR/strings.xml\n\tmodified: manager/app/src/main/res/values-pt/strings.xml\n\tmodified: manager/app/src/main/res/values-ro/strings.xml\n\tmodified: manager/app/src/main/res/values-ru/strings.xml\n\tmodified: manager/app/src/main/res/values-sl/strings.xml\n\tmodified: manager/app/src/main/res/values-sr/strings.xml\n\tmodified: manager/app/src/main/res/values-te/strings.xml\n\tmodified: manager/app/src/main/res/values-th/strings.xml\n\tmodified: manager/app/src/main/res/values-tr/strings.xml\n\tmodified: manager/app/src/main/res/values-uk/strings.xml\n\tmodified: manager/app/src/main/res/values-vi/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rCN/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rHK/strings.xml\n\tmodified: manager/app/src/main/res/values-zh-rTW/strings.xml\n\tmodified: manager/app/src/main/res/values/strings.xml\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: manager/app/src/main/res/values-de/strings.xml\n\tboth modified: manager/app/src/main/res/values-nl/strings.xml\n\n" }, "id": 92932434, "action_name": "Repository merge failed", "url": "https://hosted.weblate.org/api/changes/92932434/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-23T04:46:46.933092+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 92932433, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/92932433/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-23T04:46:46.891053+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 92932432, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/92932432/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-21T03:36:45.420892+02:00", "action": 18, "target": "", "old": "", "details": {}, "id": 92771942, "action_name": "Changes pushed", "url": "https://hosted.weblate.org/api/changes/92771942/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-21T03:36:39.840881+02:00", "action": 20, "target": "", "old": "", "details": { "new_head": "56e28127987d4e5a1305beb31a4b7641a53c4085", "previous_head": "fa6da0ce70f0f268115b831fe1d4b75c0095097b" }, "id": 92771941, "action_name": "Repository merged", "url": "https://hosted.weblate.org/api/changes/92771941/?format=api" }, { "unit": null, "component": "https://hosted.weblate.org/api/components/kernelsu/manager/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2024-05-21T03:36:35.332706+02:00", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/tiann/KernelSU", "git://github.com/tiann/KernelSU.git", "git@github.com:tiann/KernelSU", "git@github.com:tiann/KernelSU.git", "https://github.com/tiann/KernelSU", "https://github.com/tiann/KernelSU.git" ], "branch": "main", "repo_url": "https://github.com/tiann/KernelSU", "full_name": "tiann/KernelSU", "service_long_name": "GitHub" }, "id": 92771940, "action_name": "Repository notification received", "url": "https://hosted.weblate.org/api/changes/92771940/?format=api" } ] }