diff --git a/buildSrc/src/main/kotlin/mihon/buildlogic/tasks/LocalesConfigPlugin.kt b/buildSrc/src/main/kotlin/mihon/buildlogic/tasks/LocalesConfigPlugin.kt index 961a3b751..d84d2cb64 100644 --- a/buildSrc/src/main/kotlin/mihon/buildlogic/tasks/LocalesConfigPlugin.kt +++ b/buildSrc/src/main/kotlin/mihon/buildlogic/tasks/LocalesConfigPlugin.kt @@ -8,7 +8,7 @@ private val emptyResourcesElement = "\\s*|".t fun Project.getLocalesConfigTask(): TaskProvider { return tasks.register("generateLocalesConfig") { - val locales = fileTree("$projectDir/src/commonMain/resources/MR/") + val locales = fileTree("$projectDir/src/commonMain/moko-resources/") .matching { include("**/strings.xml") } .filterNot { it.readText().contains(emptyResourcesElement) } .map { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 00c16f93e..0de8db92c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] aboutlib_version = "11.2.1" leakcanary = "2.14" -moko = "0.23.0" +moko = "0.24.1" okhttp_version = "5.0.0-alpha.14" richtext = "0.20.0" shizuku_version = "12.2.0" diff --git a/i18n-sy/build.gradle.kts b/i18n-sy/build.gradle.kts index 2e0110a6c..e77288b5b 100644 --- a/i18n-sy/build.gradle.kts +++ b/i18n-sy/build.gradle.kts @@ -11,14 +11,11 @@ kotlin { applyDefaultHierarchyTemplate() sourceSets { - val commonMain by getting { + commonMain { dependencies { api(libs.moko.core) } } - androidMain { - dependsOn(commonMain) // https://github.com/icerockdev/moko-resources/issues/562 - } } } @@ -37,8 +34,8 @@ android { } multiplatformResources { - multiplatformResourcesClassName = "SYMR" - multiplatformResourcesPackage = "tachiyomi.i18n.sy" + resourcesClassName.set("SYMR") + resourcesPackage.set("tachiyomi.i18n.sy") } tasks.withType { diff --git a/i18n-sy/src/commonMain/resources/MR/base/plurals.xml b/i18n-sy/src/commonMain/moko-resources/base/plurals.xml similarity index 100% rename from i18n-sy/src/commonMain/resources/MR/base/plurals.xml rename to i18n-sy/src/commonMain/moko-resources/base/plurals.xml diff --git a/i18n-sy/src/commonMain/resources/MR/base/strings.xml b/i18n-sy/src/commonMain/moko-resources/base/strings.xml similarity index 100% rename from i18n-sy/src/commonMain/resources/MR/base/strings.xml rename to i18n-sy/src/commonMain/moko-resources/base/strings.xml diff --git a/i18n-sy/src/commonMain/resources/MR/fr/plurals.xml b/i18n-sy/src/commonMain/moko-resources/fr/plurals.xml similarity index 100% rename from i18n-sy/src/commonMain/resources/MR/fr/plurals.xml rename to i18n-sy/src/commonMain/moko-resources/fr/plurals.xml diff --git a/i18n-sy/src/commonMain/resources/MR/fr/strings.xml b/i18n-sy/src/commonMain/moko-resources/fr/strings.xml similarity index 100% rename from i18n-sy/src/commonMain/resources/MR/fr/strings.xml rename to i18n-sy/src/commonMain/moko-resources/fr/strings.xml diff --git a/i18n-sy/src/commonMain/resources/MR/in/plurals.xml b/i18n-sy/src/commonMain/moko-resources/in/plurals.xml similarity index 100% rename from i18n-sy/src/commonMain/resources/MR/in/plurals.xml rename to i18n-sy/src/commonMain/moko-resources/in/plurals.xml diff --git a/i18n-sy/src/commonMain/resources/MR/in/strings.xml b/i18n-sy/src/commonMain/moko-resources/in/strings.xml similarity index 100% rename from i18n-sy/src/commonMain/resources/MR/in/strings.xml rename to i18n-sy/src/commonMain/moko-resources/in/strings.xml diff --git a/i18n-sy/src/commonMain/resources/MR/pt-rBR/plurals.xml b/i18n-sy/src/commonMain/moko-resources/pt-rBR/plurals.xml similarity index 100% rename from i18n-sy/src/commonMain/resources/MR/pt-rBR/plurals.xml rename to i18n-sy/src/commonMain/moko-resources/pt-rBR/plurals.xml diff --git a/i18n-sy/src/commonMain/resources/MR/pt-rBR/strings.xml b/i18n-sy/src/commonMain/moko-resources/pt-rBR/strings.xml similarity index 100% rename from i18n-sy/src/commonMain/resources/MR/pt-rBR/strings.xml rename to i18n-sy/src/commonMain/moko-resources/pt-rBR/strings.xml diff --git a/i18n-sy/src/commonMain/resources/MR/ru/plurals.xml b/i18n-sy/src/commonMain/moko-resources/ru/plurals.xml similarity index 100% rename from i18n-sy/src/commonMain/resources/MR/ru/plurals.xml rename to i18n-sy/src/commonMain/moko-resources/ru/plurals.xml diff --git a/i18n-sy/src/commonMain/resources/MR/ru/strings.xml b/i18n-sy/src/commonMain/moko-resources/ru/strings.xml similarity index 100% rename from i18n-sy/src/commonMain/resources/MR/ru/strings.xml rename to i18n-sy/src/commonMain/moko-resources/ru/strings.xml diff --git a/i18n-sy/src/commonMain/resources/MR/zh-rCN/plurals.xml b/i18n-sy/src/commonMain/moko-resources/zh-rCN/plurals.xml similarity index 100% rename from i18n-sy/src/commonMain/resources/MR/zh-rCN/plurals.xml rename to i18n-sy/src/commonMain/moko-resources/zh-rCN/plurals.xml diff --git a/i18n-sy/src/commonMain/resources/MR/zh-rCN/strings.xml b/i18n-sy/src/commonMain/moko-resources/zh-rCN/strings.xml similarity index 100% rename from i18n-sy/src/commonMain/resources/MR/zh-rCN/strings.xml rename to i18n-sy/src/commonMain/moko-resources/zh-rCN/strings.xml diff --git a/i18n-sy/src/commonMain/resources/MR/zh-rTW/plurals.xml b/i18n-sy/src/commonMain/moko-resources/zh-rTW/plurals.xml similarity index 100% rename from i18n-sy/src/commonMain/resources/MR/zh-rTW/plurals.xml rename to i18n-sy/src/commonMain/moko-resources/zh-rTW/plurals.xml diff --git a/i18n-sy/src/commonMain/resources/MR/zh-rTW/strings.xml b/i18n-sy/src/commonMain/moko-resources/zh-rTW/strings.xml similarity index 100% rename from i18n-sy/src/commonMain/resources/MR/zh-rTW/strings.xml rename to i18n-sy/src/commonMain/moko-resources/zh-rTW/strings.xml diff --git a/i18n/build.gradle.kts b/i18n/build.gradle.kts index 836f98402..60d8bfdcf 100644 --- a/i18n/build.gradle.kts +++ b/i18n/build.gradle.kts @@ -14,15 +14,11 @@ kotlin { applyDefaultHierarchyTemplate() sourceSets { - val commonMain by getting { + commonMain { dependencies { api(libs.moko.core) } } - - androidMain { - dependsOn(commonMain) // https://github.com/icerockdev/moko-resources/issues/562 - } } } @@ -41,7 +37,7 @@ android { } multiplatformResources { - multiplatformResourcesPackage = "tachiyomi.i18n" + resourcesPackage.set("tachiyomi.i18n") } tasks { diff --git a/i18n/src/commonMain/resources/MR/am/plurals.xml b/i18n/src/commonMain/moko-resources/am/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/am/plurals.xml rename to i18n/src/commonMain/moko-resources/am/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/am/strings.xml b/i18n/src/commonMain/moko-resources/am/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/am/strings.xml rename to i18n/src/commonMain/moko-resources/am/strings.xml diff --git a/i18n/src/commonMain/resources/MR/ar/plurals.xml b/i18n/src/commonMain/moko-resources/ar/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ar/plurals.xml rename to i18n/src/commonMain/moko-resources/ar/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/ar/strings.xml b/i18n/src/commonMain/moko-resources/ar/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ar/strings.xml rename to i18n/src/commonMain/moko-resources/ar/strings.xml diff --git a/i18n/src/commonMain/resources/MR/base/plurals.xml b/i18n/src/commonMain/moko-resources/base/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/base/plurals.xml rename to i18n/src/commonMain/moko-resources/base/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/base/strings.xml b/i18n/src/commonMain/moko-resources/base/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/base/strings.xml rename to i18n/src/commonMain/moko-resources/base/strings.xml diff --git a/i18n/src/commonMain/resources/MR/be/plurals.xml b/i18n/src/commonMain/moko-resources/be/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/be/plurals.xml rename to i18n/src/commonMain/moko-resources/be/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/be/strings.xml b/i18n/src/commonMain/moko-resources/be/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/be/strings.xml rename to i18n/src/commonMain/moko-resources/be/strings.xml diff --git a/i18n/src/commonMain/resources/MR/bg/plurals.xml b/i18n/src/commonMain/moko-resources/bg/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/bg/plurals.xml rename to i18n/src/commonMain/moko-resources/bg/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/bg/strings.xml b/i18n/src/commonMain/moko-resources/bg/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/bg/strings.xml rename to i18n/src/commonMain/moko-resources/bg/strings.xml diff --git a/i18n/src/commonMain/resources/MR/bn/plurals.xml b/i18n/src/commonMain/moko-resources/bn/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/bn/plurals.xml rename to i18n/src/commonMain/moko-resources/bn/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/bn/strings.xml b/i18n/src/commonMain/moko-resources/bn/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/bn/strings.xml rename to i18n/src/commonMain/moko-resources/bn/strings.xml diff --git a/i18n/src/commonMain/resources/MR/ca/plurals.xml b/i18n/src/commonMain/moko-resources/ca/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ca/plurals.xml rename to i18n/src/commonMain/moko-resources/ca/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/ca/strings.xml b/i18n/src/commonMain/moko-resources/ca/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ca/strings.xml rename to i18n/src/commonMain/moko-resources/ca/strings.xml diff --git a/i18n/src/commonMain/resources/MR/ceb/plurals.xml b/i18n/src/commonMain/moko-resources/ceb/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ceb/plurals.xml rename to i18n/src/commonMain/moko-resources/ceb/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/ceb/strings.xml b/i18n/src/commonMain/moko-resources/ceb/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ceb/strings.xml rename to i18n/src/commonMain/moko-resources/ceb/strings.xml diff --git a/i18n/src/commonMain/resources/MR/cs/plurals.xml b/i18n/src/commonMain/moko-resources/cs/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/cs/plurals.xml rename to i18n/src/commonMain/moko-resources/cs/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/cs/strings.xml b/i18n/src/commonMain/moko-resources/cs/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/cs/strings.xml rename to i18n/src/commonMain/moko-resources/cs/strings.xml diff --git a/i18n/src/commonMain/resources/MR/cv/plurals.xml b/i18n/src/commonMain/moko-resources/cv/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/cv/plurals.xml rename to i18n/src/commonMain/moko-resources/cv/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/cv/strings.xml b/i18n/src/commonMain/moko-resources/cv/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/cv/strings.xml rename to i18n/src/commonMain/moko-resources/cv/strings.xml diff --git a/i18n/src/commonMain/resources/MR/da/plurals.xml b/i18n/src/commonMain/moko-resources/da/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/da/plurals.xml rename to i18n/src/commonMain/moko-resources/da/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/da/strings.xml b/i18n/src/commonMain/moko-resources/da/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/da/strings.xml rename to i18n/src/commonMain/moko-resources/da/strings.xml diff --git a/i18n/src/commonMain/resources/MR/de/plurals.xml b/i18n/src/commonMain/moko-resources/de/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/de/plurals.xml rename to i18n/src/commonMain/moko-resources/de/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/de/strings.xml b/i18n/src/commonMain/moko-resources/de/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/de/strings.xml rename to i18n/src/commonMain/moko-resources/de/strings.xml diff --git a/i18n/src/commonMain/resources/MR/el/plurals.xml b/i18n/src/commonMain/moko-resources/el/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/el/plurals.xml rename to i18n/src/commonMain/moko-resources/el/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/el/strings.xml b/i18n/src/commonMain/moko-resources/el/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/el/strings.xml rename to i18n/src/commonMain/moko-resources/el/strings.xml diff --git a/i18n/src/commonMain/resources/MR/eo/plurals.xml b/i18n/src/commonMain/moko-resources/eo/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/eo/plurals.xml rename to i18n/src/commonMain/moko-resources/eo/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/eo/strings.xml b/i18n/src/commonMain/moko-resources/eo/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/eo/strings.xml rename to i18n/src/commonMain/moko-resources/eo/strings.xml diff --git a/i18n/src/commonMain/resources/MR/es/plurals.xml b/i18n/src/commonMain/moko-resources/es/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/es/plurals.xml rename to i18n/src/commonMain/moko-resources/es/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/es/strings.xml b/i18n/src/commonMain/moko-resources/es/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/es/strings.xml rename to i18n/src/commonMain/moko-resources/es/strings.xml diff --git a/i18n/src/commonMain/resources/MR/eu/plurals.xml b/i18n/src/commonMain/moko-resources/eu/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/eu/plurals.xml rename to i18n/src/commonMain/moko-resources/eu/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/eu/strings.xml b/i18n/src/commonMain/moko-resources/eu/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/eu/strings.xml rename to i18n/src/commonMain/moko-resources/eu/strings.xml diff --git a/i18n/src/commonMain/resources/MR/fa/plurals.xml b/i18n/src/commonMain/moko-resources/fa/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/fa/plurals.xml rename to i18n/src/commonMain/moko-resources/fa/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/fa/strings.xml b/i18n/src/commonMain/moko-resources/fa/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/fa/strings.xml rename to i18n/src/commonMain/moko-resources/fa/strings.xml diff --git a/i18n/src/commonMain/resources/MR/fi/plurals.xml b/i18n/src/commonMain/moko-resources/fi/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/fi/plurals.xml rename to i18n/src/commonMain/moko-resources/fi/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/fi/strings.xml b/i18n/src/commonMain/moko-resources/fi/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/fi/strings.xml rename to i18n/src/commonMain/moko-resources/fi/strings.xml diff --git a/i18n/src/commonMain/resources/MR/fil/plurals.xml b/i18n/src/commonMain/moko-resources/fil/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/fil/plurals.xml rename to i18n/src/commonMain/moko-resources/fil/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/fil/strings.xml b/i18n/src/commonMain/moko-resources/fil/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/fil/strings.xml rename to i18n/src/commonMain/moko-resources/fil/strings.xml diff --git a/i18n/src/commonMain/resources/MR/fr/plurals.xml b/i18n/src/commonMain/moko-resources/fr/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/fr/plurals.xml rename to i18n/src/commonMain/moko-resources/fr/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/fr/strings.xml b/i18n/src/commonMain/moko-resources/fr/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/fr/strings.xml rename to i18n/src/commonMain/moko-resources/fr/strings.xml diff --git a/i18n/src/commonMain/resources/MR/gl/plurals.xml b/i18n/src/commonMain/moko-resources/gl/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/gl/plurals.xml rename to i18n/src/commonMain/moko-resources/gl/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/gl/strings.xml b/i18n/src/commonMain/moko-resources/gl/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/gl/strings.xml rename to i18n/src/commonMain/moko-resources/gl/strings.xml diff --git a/i18n/src/commonMain/resources/MR/he/plurals.xml b/i18n/src/commonMain/moko-resources/he/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/he/plurals.xml rename to i18n/src/commonMain/moko-resources/he/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/he/strings.xml b/i18n/src/commonMain/moko-resources/he/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/he/strings.xml rename to i18n/src/commonMain/moko-resources/he/strings.xml diff --git a/i18n/src/commonMain/resources/MR/hi/plurals.xml b/i18n/src/commonMain/moko-resources/hi/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/hi/plurals.xml rename to i18n/src/commonMain/moko-resources/hi/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/hi/strings.xml b/i18n/src/commonMain/moko-resources/hi/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/hi/strings.xml rename to i18n/src/commonMain/moko-resources/hi/strings.xml diff --git a/i18n/src/commonMain/resources/MR/hr/plurals.xml b/i18n/src/commonMain/moko-resources/hr/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/hr/plurals.xml rename to i18n/src/commonMain/moko-resources/hr/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/hr/strings.xml b/i18n/src/commonMain/moko-resources/hr/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/hr/strings.xml rename to i18n/src/commonMain/moko-resources/hr/strings.xml diff --git a/i18n/src/commonMain/resources/MR/hu/plurals.xml b/i18n/src/commonMain/moko-resources/hu/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/hu/plurals.xml rename to i18n/src/commonMain/moko-resources/hu/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/hu/strings.xml b/i18n/src/commonMain/moko-resources/hu/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/hu/strings.xml rename to i18n/src/commonMain/moko-resources/hu/strings.xml diff --git a/i18n/src/commonMain/resources/MR/in/plurals.xml b/i18n/src/commonMain/moko-resources/in/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/in/plurals.xml rename to i18n/src/commonMain/moko-resources/in/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/in/strings.xml b/i18n/src/commonMain/moko-resources/in/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/in/strings.xml rename to i18n/src/commonMain/moko-resources/in/strings.xml diff --git a/i18n/src/commonMain/resources/MR/it/plurals.xml b/i18n/src/commonMain/moko-resources/it/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/it/plurals.xml rename to i18n/src/commonMain/moko-resources/it/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/it/strings.xml b/i18n/src/commonMain/moko-resources/it/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/it/strings.xml rename to i18n/src/commonMain/moko-resources/it/strings.xml diff --git a/i18n/src/commonMain/resources/MR/ja/plurals.xml b/i18n/src/commonMain/moko-resources/ja/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ja/plurals.xml rename to i18n/src/commonMain/moko-resources/ja/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/ja/strings.xml b/i18n/src/commonMain/moko-resources/ja/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ja/strings.xml rename to i18n/src/commonMain/moko-resources/ja/strings.xml diff --git a/i18n/src/commonMain/resources/MR/jv/plurals.xml b/i18n/src/commonMain/moko-resources/jv/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/jv/plurals.xml rename to i18n/src/commonMain/moko-resources/jv/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/jv/strings.xml b/i18n/src/commonMain/moko-resources/jv/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/jv/strings.xml rename to i18n/src/commonMain/moko-resources/jv/strings.xml diff --git a/i18n/src/commonMain/resources/MR/ka-rGE/plurals.xml b/i18n/src/commonMain/moko-resources/ka-rGE/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ka-rGE/plurals.xml rename to i18n/src/commonMain/moko-resources/ka-rGE/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/ka-rGE/strings.xml b/i18n/src/commonMain/moko-resources/ka-rGE/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ka-rGE/strings.xml rename to i18n/src/commonMain/moko-resources/ka-rGE/strings.xml diff --git a/i18n/src/commonMain/resources/MR/kk/plurals.xml b/i18n/src/commonMain/moko-resources/kk/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/kk/plurals.xml rename to i18n/src/commonMain/moko-resources/kk/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/kk/strings.xml b/i18n/src/commonMain/moko-resources/kk/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/kk/strings.xml rename to i18n/src/commonMain/moko-resources/kk/strings.xml diff --git a/i18n/src/commonMain/resources/MR/km/plurals.xml b/i18n/src/commonMain/moko-resources/km/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/km/plurals.xml rename to i18n/src/commonMain/moko-resources/km/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/km/strings.xml b/i18n/src/commonMain/moko-resources/km/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/km/strings.xml rename to i18n/src/commonMain/moko-resources/km/strings.xml diff --git a/i18n/src/commonMain/resources/MR/kn/plurals.xml b/i18n/src/commonMain/moko-resources/kn/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/kn/plurals.xml rename to i18n/src/commonMain/moko-resources/kn/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/kn/strings.xml b/i18n/src/commonMain/moko-resources/kn/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/kn/strings.xml rename to i18n/src/commonMain/moko-resources/kn/strings.xml diff --git a/i18n/src/commonMain/resources/MR/ko/plurals.xml b/i18n/src/commonMain/moko-resources/ko/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ko/plurals.xml rename to i18n/src/commonMain/moko-resources/ko/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/ko/strings.xml b/i18n/src/commonMain/moko-resources/ko/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ko/strings.xml rename to i18n/src/commonMain/moko-resources/ko/strings.xml diff --git a/i18n/src/commonMain/resources/MR/lt/plurals.xml b/i18n/src/commonMain/moko-resources/lt/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/lt/plurals.xml rename to i18n/src/commonMain/moko-resources/lt/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/lt/strings.xml b/i18n/src/commonMain/moko-resources/lt/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/lt/strings.xml rename to i18n/src/commonMain/moko-resources/lt/strings.xml diff --git a/i18n/src/commonMain/resources/MR/lv/plurals.xml b/i18n/src/commonMain/moko-resources/lv/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/lv/plurals.xml rename to i18n/src/commonMain/moko-resources/lv/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/lv/strings.xml b/i18n/src/commonMain/moko-resources/lv/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/lv/strings.xml rename to i18n/src/commonMain/moko-resources/lv/strings.xml diff --git a/i18n/src/commonMain/resources/MR/ml/plurals.xml b/i18n/src/commonMain/moko-resources/ml/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ml/plurals.xml rename to i18n/src/commonMain/moko-resources/ml/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/ml/strings.xml b/i18n/src/commonMain/moko-resources/ml/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ml/strings.xml rename to i18n/src/commonMain/moko-resources/ml/strings.xml diff --git a/i18n/src/commonMain/resources/MR/mr/plurals.xml b/i18n/src/commonMain/moko-resources/mr/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/mr/plurals.xml rename to i18n/src/commonMain/moko-resources/mr/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/mr/strings.xml b/i18n/src/commonMain/moko-resources/mr/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/mr/strings.xml rename to i18n/src/commonMain/moko-resources/mr/strings.xml diff --git a/i18n/src/commonMain/resources/MR/ms/plurals.xml b/i18n/src/commonMain/moko-resources/ms/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ms/plurals.xml rename to i18n/src/commonMain/moko-resources/ms/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/ms/strings.xml b/i18n/src/commonMain/moko-resources/ms/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ms/strings.xml rename to i18n/src/commonMain/moko-resources/ms/strings.xml diff --git a/i18n/src/commonMain/resources/MR/nb-rNO/plurals.xml b/i18n/src/commonMain/moko-resources/nb-rNO/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/nb-rNO/plurals.xml rename to i18n/src/commonMain/moko-resources/nb-rNO/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/nb-rNO/strings.xml b/i18n/src/commonMain/moko-resources/nb-rNO/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/nb-rNO/strings.xml rename to i18n/src/commonMain/moko-resources/nb-rNO/strings.xml diff --git a/i18n/src/commonMain/resources/MR/ne/plurals.xml b/i18n/src/commonMain/moko-resources/ne/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ne/plurals.xml rename to i18n/src/commonMain/moko-resources/ne/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/ne/strings.xml b/i18n/src/commonMain/moko-resources/ne/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ne/strings.xml rename to i18n/src/commonMain/moko-resources/ne/strings.xml diff --git a/i18n/src/commonMain/resources/MR/nl/plurals.xml b/i18n/src/commonMain/moko-resources/nl/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/nl/plurals.xml rename to i18n/src/commonMain/moko-resources/nl/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/nl/strings.xml b/i18n/src/commonMain/moko-resources/nl/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/nl/strings.xml rename to i18n/src/commonMain/moko-resources/nl/strings.xml diff --git a/i18n/src/commonMain/resources/MR/nn/plurals.xml b/i18n/src/commonMain/moko-resources/nn/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/nn/plurals.xml rename to i18n/src/commonMain/moko-resources/nn/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/nn/strings.xml b/i18n/src/commonMain/moko-resources/nn/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/nn/strings.xml rename to i18n/src/commonMain/moko-resources/nn/strings.xml diff --git a/i18n/src/commonMain/resources/MR/pl/plurals.xml b/i18n/src/commonMain/moko-resources/pl/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/pl/plurals.xml rename to i18n/src/commonMain/moko-resources/pl/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/pl/strings.xml b/i18n/src/commonMain/moko-resources/pl/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/pl/strings.xml rename to i18n/src/commonMain/moko-resources/pl/strings.xml diff --git a/i18n/src/commonMain/resources/MR/pt-rBR/plurals.xml b/i18n/src/commonMain/moko-resources/pt-rBR/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/pt-rBR/plurals.xml rename to i18n/src/commonMain/moko-resources/pt-rBR/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/pt-rBR/strings.xml b/i18n/src/commonMain/moko-resources/pt-rBR/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/pt-rBR/strings.xml rename to i18n/src/commonMain/moko-resources/pt-rBR/strings.xml diff --git a/i18n/src/commonMain/resources/MR/pt/plurals.xml b/i18n/src/commonMain/moko-resources/pt/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/pt/plurals.xml rename to i18n/src/commonMain/moko-resources/pt/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/pt/strings.xml b/i18n/src/commonMain/moko-resources/pt/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/pt/strings.xml rename to i18n/src/commonMain/moko-resources/pt/strings.xml diff --git a/i18n/src/commonMain/resources/MR/ro/plurals.xml b/i18n/src/commonMain/moko-resources/ro/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ro/plurals.xml rename to i18n/src/commonMain/moko-resources/ro/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/ro/strings.xml b/i18n/src/commonMain/moko-resources/ro/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ro/strings.xml rename to i18n/src/commonMain/moko-resources/ro/strings.xml diff --git a/i18n/src/commonMain/resources/MR/ru/plurals.xml b/i18n/src/commonMain/moko-resources/ru/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ru/plurals.xml rename to i18n/src/commonMain/moko-resources/ru/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/ru/strings.xml b/i18n/src/commonMain/moko-resources/ru/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/ru/strings.xml rename to i18n/src/commonMain/moko-resources/ru/strings.xml diff --git a/i18n/src/commonMain/resources/MR/sa/plurals.xml b/i18n/src/commonMain/moko-resources/sa/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sa/plurals.xml rename to i18n/src/commonMain/moko-resources/sa/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/sa/strings.xml b/i18n/src/commonMain/moko-resources/sa/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sa/strings.xml rename to i18n/src/commonMain/moko-resources/sa/strings.xml diff --git a/i18n/src/commonMain/resources/MR/sah/plurals.xml b/i18n/src/commonMain/moko-resources/sah/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sah/plurals.xml rename to i18n/src/commonMain/moko-resources/sah/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/sah/strings.xml b/i18n/src/commonMain/moko-resources/sah/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sah/strings.xml rename to i18n/src/commonMain/moko-resources/sah/strings.xml diff --git a/i18n/src/commonMain/resources/MR/sc/plurals.xml b/i18n/src/commonMain/moko-resources/sc/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sc/plurals.xml rename to i18n/src/commonMain/moko-resources/sc/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/sc/strings.xml b/i18n/src/commonMain/moko-resources/sc/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sc/strings.xml rename to i18n/src/commonMain/moko-resources/sc/strings.xml diff --git a/i18n/src/commonMain/resources/MR/sdh/plurals.xml b/i18n/src/commonMain/moko-resources/sdh/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sdh/plurals.xml rename to i18n/src/commonMain/moko-resources/sdh/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/sdh/strings.xml b/i18n/src/commonMain/moko-resources/sdh/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sdh/strings.xml rename to i18n/src/commonMain/moko-resources/sdh/strings.xml diff --git a/i18n/src/commonMain/resources/MR/sk/plurals.xml b/i18n/src/commonMain/moko-resources/sk/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sk/plurals.xml rename to i18n/src/commonMain/moko-resources/sk/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/sk/strings.xml b/i18n/src/commonMain/moko-resources/sk/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sk/strings.xml rename to i18n/src/commonMain/moko-resources/sk/strings.xml diff --git a/i18n/src/commonMain/resources/MR/sq/plurals.xml b/i18n/src/commonMain/moko-resources/sq/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sq/plurals.xml rename to i18n/src/commonMain/moko-resources/sq/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/sq/strings.xml b/i18n/src/commonMain/moko-resources/sq/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sq/strings.xml rename to i18n/src/commonMain/moko-resources/sq/strings.xml diff --git a/i18n/src/commonMain/resources/MR/sr/plurals.xml b/i18n/src/commonMain/moko-resources/sr/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sr/plurals.xml rename to i18n/src/commonMain/moko-resources/sr/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/sr/strings.xml b/i18n/src/commonMain/moko-resources/sr/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sr/strings.xml rename to i18n/src/commonMain/moko-resources/sr/strings.xml diff --git a/i18n/src/commonMain/resources/MR/sv/plurals.xml b/i18n/src/commonMain/moko-resources/sv/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sv/plurals.xml rename to i18n/src/commonMain/moko-resources/sv/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/sv/strings.xml b/i18n/src/commonMain/moko-resources/sv/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/sv/strings.xml rename to i18n/src/commonMain/moko-resources/sv/strings.xml diff --git a/i18n/src/commonMain/resources/MR/te/plurals.xml b/i18n/src/commonMain/moko-resources/te/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/te/plurals.xml rename to i18n/src/commonMain/moko-resources/te/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/te/strings.xml b/i18n/src/commonMain/moko-resources/te/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/te/strings.xml rename to i18n/src/commonMain/moko-resources/te/strings.xml diff --git a/i18n/src/commonMain/resources/MR/th/plurals.xml b/i18n/src/commonMain/moko-resources/th/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/th/plurals.xml rename to i18n/src/commonMain/moko-resources/th/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/th/strings.xml b/i18n/src/commonMain/moko-resources/th/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/th/strings.xml rename to i18n/src/commonMain/moko-resources/th/strings.xml diff --git a/i18n/src/commonMain/resources/MR/tr/plurals.xml b/i18n/src/commonMain/moko-resources/tr/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/tr/plurals.xml rename to i18n/src/commonMain/moko-resources/tr/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/tr/strings.xml b/i18n/src/commonMain/moko-resources/tr/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/tr/strings.xml rename to i18n/src/commonMain/moko-resources/tr/strings.xml diff --git a/i18n/src/commonMain/resources/MR/uk/plurals.xml b/i18n/src/commonMain/moko-resources/uk/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/uk/plurals.xml rename to i18n/src/commonMain/moko-resources/uk/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/uk/strings.xml b/i18n/src/commonMain/moko-resources/uk/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/uk/strings.xml rename to i18n/src/commonMain/moko-resources/uk/strings.xml diff --git a/i18n/src/commonMain/resources/MR/uz/plurals.xml b/i18n/src/commonMain/moko-resources/uz/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/uz/plurals.xml rename to i18n/src/commonMain/moko-resources/uz/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/uz/strings.xml b/i18n/src/commonMain/moko-resources/uz/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/uz/strings.xml rename to i18n/src/commonMain/moko-resources/uz/strings.xml diff --git a/i18n/src/commonMain/resources/MR/vi/plurals.xml b/i18n/src/commonMain/moko-resources/vi/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/vi/plurals.xml rename to i18n/src/commonMain/moko-resources/vi/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/vi/strings.xml b/i18n/src/commonMain/moko-resources/vi/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/vi/strings.xml rename to i18n/src/commonMain/moko-resources/vi/strings.xml diff --git a/i18n/src/commonMain/resources/MR/zh-rCN/plurals.xml b/i18n/src/commonMain/moko-resources/zh-rCN/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/zh-rCN/plurals.xml rename to i18n/src/commonMain/moko-resources/zh-rCN/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/zh-rCN/strings.xml b/i18n/src/commonMain/moko-resources/zh-rCN/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/zh-rCN/strings.xml rename to i18n/src/commonMain/moko-resources/zh-rCN/strings.xml diff --git a/i18n/src/commonMain/resources/MR/zh-rTW/plurals.xml b/i18n/src/commonMain/moko-resources/zh-rTW/plurals.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/zh-rTW/plurals.xml rename to i18n/src/commonMain/moko-resources/zh-rTW/plurals.xml diff --git a/i18n/src/commonMain/resources/MR/zh-rTW/strings.xml b/i18n/src/commonMain/moko-resources/zh-rTW/strings.xml similarity index 100% rename from i18n/src/commonMain/resources/MR/zh-rTW/strings.xml rename to i18n/src/commonMain/moko-resources/zh-rTW/strings.xml