diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-12-17 14:57:49 +0100 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-12-17 14:57:49 +0100 |
| commit | c5f434719dacffe76a9d2d25498bc8bc0e1860b8 (patch) | |
| tree | 50ac78298ef1ee7453fc2f0435b92194b7b5d2ea /android | |
| parent | 489a788d81e78d123b73f06dbf7ce663f48c1b33 (diff) | |
| parent | 8e9061b034396ed1fef43cf6941668d908abbed0 (diff) | |
| download | mullvadvpn-c5f434719dacffe76a9d2d25498bc8bc0e1860b8.tar.xz mullvadvpn-c5f434719dacffe76a9d2d25498bc8bc0e1860b8.zip | |
Merge branch 'bump-dependencies-3'
Diffstat (limited to 'android')
52 files changed, 307 insertions, 901 deletions
diff --git a/android/config/dependency-check-suppression-agp-fixes.xml b/android/config/dependency-check-suppression-agp-fixes.xml index 6537709f4a..16b4bba810 100644 --- a/android/config/dependency-check-suppression-agp-fixes.xml +++ b/android/config/dependency-check-suppression-agp-fixes.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd"> - <suppress until="2024-12-01Z"> + <suppress until="2025-03-01Z"> <notes><![CDATA[ This and all other supressions in this file are for dependencies only used for tests. These should be excluded by the plugin but this behaviour is broken. @@ -15,7 +15,7 @@ <cve>CVE-2022-41915</cve> <cve>CVE-2024-47535</cve> </suppress> - <suppress until="2024-12-01Z"> + <suppress until="2025-03-01Z"> <notes><![CDATA[ This and all other supressions in this file are for dependencies only used for tests. These should be excluded by the plugin but this behaviour is broken. @@ -27,7 +27,7 @@ <cve>CVE-2022-3510</cve> <cve>CVE-2021-22569</cve> </suppress> - <suppress until="2024-12-01Z"> + <suppress until="2025-03-01Z"> <notes><![CDATA[ This and all other supressions in this file are for dependencies only used for tests. These should be excluded by the plugin but this behaviour is broken. diff --git a/android/config/dependency-check-suppression.xml b/android/config/dependency-check-suppression.xml index a7ef421fd2..7257124ef7 100644 --- a/android/config/dependency-check-suppression.xml +++ b/android/config/dependency-check-suppression.xml @@ -8,7 +8,7 @@ <packageUrl regex="true">^pkg:maven/org\.jetbrains\.kotlin/kotlin\-stdlib.*@.*$</packageUrl> <cve>CVE-2022-24329</cve> </suppress> - <suppress until="2024-12-01Z"> + <suppress until="2025-03-01Z"> <notes><![CDATA[ This CVE only affect programs using loadXML and is derived from using ksp. We do not use the loadXML, ksp is used to generate navigation paths in our code @@ -17,14 +17,14 @@ <packageUrl regex="true">^pkg:maven/com\.google\.devtools\.ksp/symbol\-processing.*@.*$</packageUrl> <cve>CVE-2018-1000840</cve> </suppress> - <suppress until="2024-12-01Z"> + <suppress until="2025-03-01Z"> <notes><![CDATA[ False-positive only affecting javascript gRPC packages. ]]></notes> <packageUrl regex="true">^pkg:maven/io\.grpc/protoc\-gen\-grpc\-kotlin@.*$</packageUrl> <cve>CVE-2020-7768</cve> </suppress> - <suppress until="2024-12-01Z"> + <suppress until="2025-03-01Z"> <notes><![CDATA[ No impact on this app since it uses UDS rather than HTTP2. ]]></notes> @@ -40,7 +40,7 @@ <packageUrl regex="true">^pkg:maven/commons\-validator/commons\-validator@.*$</packageUrl> <cve>CVE-2021-3765</cve> </suppress> - <suppress until="2024-12-01Z"> + <suppress until="2025-03-01Z"> <notes><![CDATA[ Denial of service using protobuf. Should not be applicable since client and server are always in sync and we are only diff --git a/android/config/lint-baseline.xml b/android/config/lint-baseline.xml index 4e21f5e7b9..92267c4124 100644 --- a/android/config/lint-baseline.xml +++ b/android/config/lint-baseline.xml @@ -2,20 +2,6 @@ <issues format="6" by="lint 8.7.3" type="baseline" client="gradle" dependencies="true" name="AGP (8.7.3)" variant="all" version="8.7.3"> <issue - id="InvalidPackage" - message="Invalid package reference in library; not included in Android: `javax.naming.directory`. Referenced from `io.grpc.internal.JndiResourceResolverFactory.JndiRecordFetcher`."> - <location - file="../../../root/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-core/1.68.2/b0fd51a1c029785d1c9ae2cfc80a296b60dfcfdb/grpc-core-1.68.2.jar"/> - </issue> - - <issue - id="InvalidPackage" - message="Invalid package reference in library; not included in Android: `javax.naming`. Referenced from `io.grpc.internal.JndiResourceResolverFactory.JndiRecordFetcher`."> - <location - file="../../../root/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-core/1.68.2/b0fd51a1c029785d1c9ae2cfc80a296b60dfcfdb/grpc-core-1.68.2.jar"/> - </issue> - - <issue id="SimilarGradleDependency" message="There are multiple dependencies com.google.protobuf but with different version" errorLine1="protobuf-core = { id = "com.google.protobuf", version.ref = "protobuf" }" diff --git a/android/config/lint.xml b/android/config/lint.xml index 37ce4b5c82..e1c27a2099 100644 --- a/android/config/lint.xml +++ b/android/config/lint.xml @@ -4,15 +4,18 @@ <issue id="ExtraTranslation" severity="ignore" /> <issue id="MissingTranslation" severity="ignore" /> <issue id="Typos" severity="ignore" /> - <issue id="UnusedResources"> - <ignore path="res/values/strings.xml" /> - </issue> <!-- We are currently not using the ellipsis character --> <issue id="TypographyEllipsis" severity="ignore" /> + <!-- Tracked externally (DROID-245) since the same texts are used across multiple platforms. --> + <issue id="ImpliedQuantity" severity="ignore" /> <!-- Temporarily ignore the below checks while migrating to version catalogs. --> <issue id="GradleDependency" severity="ignore" /> <issue id="AndroidGradlePluginVersion" severity="ignore" /> <!-- Temporarily ignored since a dependency is checked with older version of lint --> <issue id="ObsoleteLintCustomCheck" severity="ignore" /> <issue id="NewerVersionAvailable" severity="ignore" /> + <!-- Ignored, see more: https://github.com/grpc/grpc-java/blob/e8ff6da2cf57a39a62497e9f317e6976b5bfb98c/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java#L199 --> + <issue id="InvalidPackage"> + <ignore path="**/io.grpc/grpc-core/1.69.0/7dad3419dfb91a77788afcdf79e0477172784910/grpc-core-1.69.0.jar" /> + </issue> </lint> diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 21b16c2911..0a4b42d804 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -25,12 +25,12 @@ androidx-uiautomator = "2.4.0-alpha01" arrow = "2.0.0" # Compose -compose = "1.7.5" +compose = "1.7.6" compose-destinations = "2.1.0-beta14" compose-constraintlayout = "1.1.0" compose-material3 = "1.3.1" -grpc = "1.68.2" +grpc = "1.69.0" grpc-kotlin = "1.4.1" grpc-kotlin-jar = "1.4.1:jdk8@jar" grpc-protobuf = "4.29.1" diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml index 0840940d7b..f4f8e29109 100644 --- a/android/gradle/verification-metadata.xml +++ b/android/gradle/verification-metadata.xml @@ -642,11 +642,11 @@ <sha256 value="a2773807796a9ea149e4d567d3e4746bc3b2514147a180b00be2ca307f732c4d" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.animation" name="animation" version="1.7.5"> - <artifact name="animation-1.7.5.module"> - <sha256 value="7c742bb407497fb4c322bd3d4abef83741ea6107a12168f579438303433497ff" origin="Generated by Gradle"/> + <component group="androidx.compose.animation" name="animation" version="1.7.6"> + <artifact name="animation-1.7.6.module"> + <sha256 value="709e8af6b1615d8bb8c28c1cd6d6cd4600009e1004b83566da157a9c8fe4efce" origin="Generated by Gradle"/> </artifact> - <artifact name="animation-metadata-1.7.5.jar"> + <artifact name="animation-metadata-1.7.6.jar"> <sha256 value="a2773807796a9ea149e4d567d3e4746bc3b2514147a180b00be2ca307f732c4d" origin="Generated by Gradle"/> </artifact> </component> @@ -655,12 +655,12 @@ <sha256 value="7f4773c5800c09adb41f37a266effaac1618737eeadae80310a771a37cd8b547" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.animation" name="animation-android" version="1.7.5"> - <artifact name="animation-android-1.7.5.module"> - <sha256 value="76d45383ea3676d929f227fee8184eba173df2a2c101474b34856d33be01a3d5" origin="Generated by Gradle"/> + <component group="androidx.compose.animation" name="animation-android" version="1.7.6"> + <artifact name="animation-android-1.7.6.module"> + <sha256 value="bcf31caf7038d7e31f59069a1297e69363c1be70a34916f35967111f095925c0" origin="Generated by Gradle"/> </artifact> <artifact name="animation-release.aar"> - <sha256 value="80279c212589b5c27a9246c128e386789088a903d1599941e4869a2fa9a42c9e" origin="Generated by Gradle"/> + <sha256 value="01f349d54cf9ec41cd0adf5d8c2a869c2c245b8dbb6be5a57e7ebe3d68d31791" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.animation" name="animation-core" version="1.0.0"> @@ -694,11 +694,11 @@ <sha256 value="b176280266779690730c7e6ebbe054bbc247b22e82fb38d900614f82888ce198" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.animation" name="animation-core" version="1.7.5"> - <artifact name="animation-core-1.7.5.module"> - <sha256 value="46fcd379b8259ae795eb281b6594967768ac2eee570b8376e8f2e4f8635948aa" origin="Generated by Gradle"/> + <component group="androidx.compose.animation" name="animation-core" version="1.7.6"> + <artifact name="animation-core-1.7.6.module"> + <sha256 value="d5b86abb4761641909003b7605364ac32b52b862066cb646db978d4971ac3350" origin="Generated by Gradle"/> </artifact> - <artifact name="animation-core-metadata-1.7.5.jar"> + <artifact name="animation-core-metadata-1.7.6.jar"> <sha256 value="b176280266779690730c7e6ebbe054bbc247b22e82fb38d900614f82888ce198" origin="Generated by Gradle"/> </artifact> </component> @@ -707,12 +707,12 @@ <sha256 value="c571f43b5780fb80f42e85644e0ba5696af088d7228f3251c3e1d64c3bd64376" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.animation" name="animation-core-android" version="1.7.5"> - <artifact name="animation-core-android-1.7.5.module"> - <sha256 value="8e6b2529facfc62905467e527a3c96b77074e59d2470cde5acfbc2e843d9fe5a" origin="Generated by Gradle"/> + <component group="androidx.compose.animation" name="animation-core-android" version="1.7.6"> + <artifact name="animation-core-android-1.7.6.module"> + <sha256 value="8db36b35a40474ba8f41d835019fc4a10953dcc2eb8d25191521239c80020071" origin="Generated by Gradle"/> </artifact> <artifact name="animation-core-release.aar"> - <sha256 value="546958e466fcffac9998aae53b8a54ab4722bcde9a65cbf7c4a168886f9325fb" origin="Generated by Gradle"/> + <sha256 value="9722d4fccd4a9e95910baa16652563ba92a5829f9d6e09194850447e3cd9983a" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.animation" name="animation-core-desktop" version="1.6.0"> @@ -720,20 +720,20 @@ <sha256 value="ff50ff710a7afc7b610672238fc925981d498bb2ee27ca84b9992acb7a113a3f" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.animation" name="animation-core-jvmstubs" version="1.7.5"> - <artifact name="animation-core-jvmstubs-1.7.5.jar"> + <component group="androidx.compose.animation" name="animation-core-jvmstubs" version="1.7.6"> + <artifact name="animation-core-jvmstubs-1.7.6.jar"> <sha256 value="0e0d69da42b6dd0bbaebadb2000c0a320553c8d1c40c480e1188924dd5faec93" origin="Generated by Gradle"/> </artifact> - <artifact name="animation-core-jvmstubs-1.7.5.module"> - <sha256 value="82232a38f7c4e9c435486cb6ea207f3b3904ee32fc5cf99263e20c391dd08317" origin="Generated by Gradle"/> + <artifact name="animation-core-jvmstubs-1.7.6.module"> + <sha256 value="c3da17a880db8632bff3b19a25c72cfa3f0cbdd0a8277754ebfac4994eb91491" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.animation" name="animation-jvmstubs" version="1.7.5"> - <artifact name="animation-jvmstubs-1.7.5.jar"> + <component group="androidx.compose.animation" name="animation-jvmstubs" version="1.7.6"> + <artifact name="animation-jvmstubs-1.7.6.jar"> <sha256 value="085168cfa19c0bf96ce0e1ef5bd2586997555d706ae2572d522aef141cb4d335" origin="Generated by Gradle"/> </artifact> - <artifact name="animation-jvmstubs-1.7.5.module"> - <sha256 value="ff89c0a6f7e743d5540aef915b508d18aa70143a288ccd029ffadf4cb63aac58" origin="Generated by Gradle"/> + <artifact name="animation-jvmstubs-1.7.6.module"> + <sha256 value="0afa37e0a9a9efadabfba8e5ad7659bdae94d19d64ff8d72ca27bdac8ac47c22" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.foundation" name="foundation" version="1.7.0"> @@ -744,28 +744,28 @@ <sha256 value="548f57ae3f6aa9ec87aaac82572f225f99830ec1ece01b622721947c8fb3075d" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.foundation" name="foundation" version="1.7.5"> - <artifact name="foundation-1.7.5.module"> - <sha256 value="4f0180d33f888b2bddf8b0188f0c7252604cd795945e6fc65519d1f3c1ae504c" origin="Generated by Gradle"/> + <component group="androidx.compose.foundation" name="foundation" version="1.7.6"> + <artifact name="foundation-1.7.6.module"> + <sha256 value="df9c2660d9dbae7af1e4271bbf89f364ce2fc8c1f8282ec69595d99d3bf209b5" origin="Generated by Gradle"/> </artifact> - <artifact name="foundation-metadata-1.7.5.jar"> - <sha256 value="5e436d86aa89000bf247ecc588d8b6ac7c6520a23f86667f5624b9c9d6a66e8c" origin="Generated by Gradle"/> + <artifact name="foundation-metadata-1.7.6.jar"> + <sha256 value="7d235687e986dc84dc9cfb5338502669f64a0d4017a15fb4e00cfa7393010869" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.foundation" name="foundation-android" version="1.7.5"> - <artifact name="foundation-android-1.7.5.module"> - <sha256 value="79b2d2618b11ba2e219763553eeb98094fd7fb16a22ac87a749c30b017b5d971" origin="Generated by Gradle"/> + <component group="androidx.compose.foundation" name="foundation-android" version="1.7.6"> + <artifact name="foundation-android-1.7.6.module"> + <sha256 value="118b5cf9f3427135062406dd9d7bca69ef984f06f595e76f94f8362dafa33c3b" origin="Generated by Gradle"/> </artifact> <artifact name="foundation-release.aar"> - <sha256 value="b3543b024b275c46324c4df82c9cb4509bffff4e17df6c41d9ca2805f7a61452" origin="Generated by Gradle"/> + <sha256 value="5ccb96bab040a70f7fdd577faaad75343261c006d42fcc5723a38f50a82f597c" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.foundation" name="foundation-jvmstubs" version="1.7.5"> - <artifact name="foundation-jvmstubs-1.7.5.jar"> - <sha256 value="f5eb40dd17fd53d3c96b16e0b83b0fcd4513a39b3622ae46a29128ccd0a60a77" origin="Generated by Gradle"/> + <component group="androidx.compose.foundation" name="foundation-jvmstubs" version="1.7.6"> + <artifact name="foundation-jvmstubs-1.7.6.jar"> + <sha256 value="f2cc08cb22d4074e4873c52cf1cabd40449c03ec1e54f3a1a8ad47e2bcb256ce" origin="Generated by Gradle"/> </artifact> - <artifact name="foundation-jvmstubs-1.7.5.module"> - <sha256 value="13a97b6db3f19fc02d334513398f3e400cb424f5583bcaec899543e8a4427da1" origin="Generated by Gradle"/> + <artifact name="foundation-jvmstubs-1.7.6.module"> + <sha256 value="8c6d768ceb144ae787f67f4d7c449fc581b33de4ae755647415338b6d741f159" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.foundation" name="foundation-layout" version="1.7.0"> @@ -784,11 +784,11 @@ <sha256 value="4094e5a3626380b22b684086e548be51afe18e7979f46d261d4f1e0b6898fb39" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.foundation" name="foundation-layout" version="1.7.5"> - <artifact name="foundation-layout-1.7.5.module"> - <sha256 value="a64ba1df0cbf4fc67bfd5678ef8b3cbcfb3ab5fe9bd92f4785261fe1f3a8ed3c" origin="Generated by Gradle"/> + <component group="androidx.compose.foundation" name="foundation-layout" version="1.7.6"> + <artifact name="foundation-layout-1.7.6.module"> + <sha256 value="50d016e2647bc77565ba32838bc1ca5826147c1d30c652c325b8168a05b9ee6c" origin="Generated by Gradle"/> </artifact> - <artifact name="foundation-layout-metadata-1.7.5.jar"> + <artifact name="foundation-layout-metadata-1.7.6.jar"> <sha256 value="4094e5a3626380b22b684086e548be51afe18e7979f46d261d4f1e0b6898fb39" origin="Generated by Gradle"/> </artifact> </component> @@ -802,20 +802,20 @@ <sha256 value="34978d5115d736c20a6ae0aa8805a5799c8f4bd902059171a8e644b9484702f5" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.foundation" name="foundation-layout-android" version="1.7.5"> - <artifact name="foundation-layout-android-1.7.5.module"> - <sha256 value="6f7c0cf22fc5f6690df6767fb3058c599b9477f1e4ee4cd0cb5d6f80e4a95610" origin="Generated by Gradle"/> + <component group="androidx.compose.foundation" name="foundation-layout-android" version="1.7.6"> + <artifact name="foundation-layout-android-1.7.6.module"> + <sha256 value="d1e2508ec5ce0901c31e6a69655892991f4ae35a32aa65b3066b216733c9af1f" origin="Generated by Gradle"/> </artifact> <artifact name="foundation-layout-release.aar"> - <sha256 value="e2eee2141a308e93ba7c40dafa8dfdc300b3ce4730d793d59ef619f8fe9550ea" origin="Generated by Gradle"/> + <sha256 value="296e14e2b37f7ba09e4185637f71409199bced21d5a070fe26f6dc6b26d588b6" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.foundation" name="foundation-layout-jvmstubs" version="1.7.5"> - <artifact name="foundation-layout-jvmstubs-1.7.5.jar"> + <component group="androidx.compose.foundation" name="foundation-layout-jvmstubs" version="1.7.6"> + <artifact name="foundation-layout-jvmstubs-1.7.6.jar"> <sha256 value="c03f5dca426beedbdfdf53abcf90ca5445dc6eb354688db763078c47f74bb5e3" origin="Generated by Gradle"/> </artifact> - <artifact name="foundation-layout-jvmstubs-1.7.5.module"> - <sha256 value="bddc6cba6e5df50e1cfc14efc07fde7ad65fad1f981b0eade8ce3a429dc84ab9" origin="Generated by Gradle"/> + <artifact name="foundation-layout-jvmstubs-1.7.6.module"> + <sha256 value="2abe90f0faae7daa0d55b95117fcb28e88b5b10c2f40913a3acfdeb4fe4399d2" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.material" name="material" version="1.0.0"> @@ -855,11 +855,11 @@ <sha256 value="951f2a3a6c0913819dfaae7c69cb8cdf977f7c79bd53fef03e4faf459ee30a0f" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.material" name="material-icons-core" version="1.7.5"> - <artifact name="material-icons-core-1.7.5.module"> - <sha256 value="ca9931e5d8007e9fc591e8f2231bf971cc9626738850d020eee16171e69e5be1" origin="Generated by Gradle"/> + <component group="androidx.compose.material" name="material-icons-core" version="1.7.6"> + <artifact name="material-icons-core-1.7.6.module"> + <sha256 value="b11b831e9bfe2fa64c7928956f9fe8b594f8b8f40b4258b09840062b3f56b2bf" origin="Generated by Gradle"/> </artifact> - <artifact name="material-icons-core-metadata-1.7.5.jar"> + <artifact name="material-icons-core-metadata-1.7.6.jar"> <sha256 value="951f2a3a6c0913819dfaae7c69cb8cdf977f7c79bd53fef03e4faf459ee30a0f" origin="Generated by Gradle"/> </artifact> </component> @@ -871,44 +871,44 @@ <sha256 value="0400755a3aa7270893445a18cd845e35064c9de02c1c41cf2083ad4724bcac6f" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.material" name="material-icons-core-android" version="1.7.5"> - <artifact name="material-icons-core-android-1.7.5.module"> - <sha256 value="bb18d80baf5cb548100c7e0843948d9902a2107b40b8f1f8e03918d083b03057" origin="Generated by Gradle"/> + <component group="androidx.compose.material" name="material-icons-core-android" version="1.7.6"> + <artifact name="material-icons-core-android-1.7.6.module"> + <sha256 value="7a27ad1a88d099212a7e1a268a2b3405778552b02d020be5f06a6b9f6a3ec942" origin="Generated by Gradle"/> </artifact> <artifact name="material-icons-core-release.aar"> - <sha256 value="e82eb70310b13e52beae566de3c1bd6c42e0f6cdf384d8573ea73a5d13f7c643" origin="Generated by Gradle"/> + <sha256 value="48d182051236b1dfec829b33bf4d3fd06d03c2876d532208e3f7490159d65c46" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.material" name="material-icons-core-desktop" version="1.7.5"> - <artifact name="material-icons-core-desktop-1.7.5.jar"> + <component group="androidx.compose.material" name="material-icons-core-desktop" version="1.7.6"> + <artifact name="material-icons-core-desktop-1.7.6.jar"> <sha256 value="b5729220e242132b22b0c0317a304ff167a05cc685c3e9e6483d5dfca3495f56" origin="Generated by Gradle"/> </artifact> - <artifact name="material-icons-core-desktop-1.7.5.module"> - <sha256 value="650fa8af01596f79a96548ba6f5cb579a75921018c8533bb2c52d0b3cdab22e4" origin="Generated by Gradle"/> + <artifact name="material-icons-core-desktop-1.7.6.module"> + <sha256 value="dd5e0391521317935737ae3390d7d9d71e292117c02615ebd3bfa543e1b29ef1" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.material" name="material-icons-extended" version="1.7.5"> - <artifact name="material-icons-extended-1.7.5.module"> - <sha256 value="5e1a6cd97b74d5680776ab0e178d5fd78c4c7846a8b9157a92c5b37926aeec05" origin="Generated by Gradle"/> + <component group="androidx.compose.material" name="material-icons-extended" version="1.7.6"> + <artifact name="material-icons-extended-1.7.6.module"> + <sha256 value="ecd73336e136deb45edbaee0dea10f7a54901e1e7815c4bd1627097979893783" origin="Generated by Gradle"/> </artifact> - <artifact name="material-icons-extended-metadata-1.7.5.jar"> + <artifact name="material-icons-extended-metadata-1.7.6.jar"> <sha256 value="714e2bfc4095b291e0dbcbd7626bc0e420fc2f6a78f2416398596504debd9117" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.material" name="material-icons-extended-android" version="1.7.5"> - <artifact name="material-icons-extended-android-1.7.5.module"> - <sha256 value="c971f0589c98511d9d04c41e0203789be4e8799e123d3605a6613136d26c6e2c" origin="Generated by Gradle"/> + <component group="androidx.compose.material" name="material-icons-extended-android" version="1.7.6"> + <artifact name="material-icons-extended-android-1.7.6.module"> + <sha256 value="60696a7ec18fce82370cc6e216a4f9eb216032d87cab40342e334a74723ebdab" origin="Generated by Gradle"/> </artifact> <artifact name="material-icons-extended-release.aar"> - <sha256 value="e383df20b487ee0daeb876054ca9c8a217fcf3cd247cd776d902eae05ae8667d" origin="Generated by Gradle"/> + <sha256 value="07e97e52f35d789ef475d9c687e5ca46cc54f9a0d4af8e1dca92ac25fb21450c" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.material" name="material-icons-extended-desktop" version="1.7.5"> - <artifact name="material-icons-extended-desktop-1.7.5.jar"> + <component group="androidx.compose.material" name="material-icons-extended-desktop" version="1.7.6"> + <artifact name="material-icons-extended-desktop-1.7.6.jar"> <sha256 value="0ade0b7d55cb008136d7b58b71100ce017dedb84be20af6da2e76b58b090f699" origin="Generated by Gradle"/> </artifact> - <artifact name="material-icons-extended-desktop-1.7.5.module"> - <sha256 value="03112b5c9d03d65e17e2c47a71bc5057088eac79fdf5cf7049a460370a2dc152" origin="Generated by Gradle"/> + <artifact name="material-icons-extended-desktop-1.7.6.module"> + <sha256 value="5d074a930c3675455ba560e4a238000f908552b4c0ab1be0c0f5e709e9337e34" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.material" name="material-ripple" version="1.0.0"> @@ -987,28 +987,28 @@ <sha256 value="be6e4afbc5e3be8f24b5f1d602cbbd3af46de26293d627af56c420fa440dd0a3" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime" version="1.7.5"> - <artifact name="runtime-1.7.5.module"> - <sha256 value="8c8646bbe5b776f2c8d22f21d219ac1d36ed807365881e5c69f4b68ddc5dee64" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime" version="1.7.6"> + <artifact name="runtime-1.7.6.module"> + <sha256 value="f173a46d597d8b60b28f08df9c30613a59475fc55eefabf10148a5c40ae96ccb" origin="Generated by Gradle"/> </artifact> - <artifact name="runtime-metadata-1.7.5.jar"> + <artifact name="runtime-metadata-1.7.6.jar"> <sha256 value="6b5bf70cd2267e64d9b04afa4bddf39d145cfa52cc36e3ee197267752fbfa7d3" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-android" version="1.7.5"> - <artifact name="runtime-android-1.7.5.module"> - <sha256 value="36694aa1d4eed5cec53d28cc0e40659f3b6e326802cfd99a9fe2eb244b1c2f17" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime-android" version="1.7.6"> + <artifact name="runtime-android-1.7.6.module"> + <sha256 value="9f9ade7971d92e6ceffebc4991955517fd48b804cf22c6a8cea99c85700d1d75" origin="Generated by Gradle"/> </artifact> <artifact name="runtime-release.aar"> - <sha256 value="7c7ef7a95f150e1f092f49310961fa164d42e09d857ac1c6c7b43d076f820847" origin="Generated by Gradle"/> + <sha256 value="482942683274e1961727b2a76d68fe4ab4abb8145fd8b3146142144ce0b25311" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-jvmstubs" version="1.7.5"> - <artifact name="runtime-jvmstubs-1.7.5.jar"> + <component group="androidx.compose.runtime" name="runtime-jvmstubs" version="1.7.6"> + <artifact name="runtime-jvmstubs-1.7.6.jar"> <sha256 value="a36ed2abaa9267d2f15d593e798a6bc169c278b46775de5f2857af59323fb1ae" origin="Generated by Gradle"/> </artifact> - <artifact name="runtime-jvmstubs-1.7.5.module"> - <sha256 value="03f7189288bdc0ac8915c5fce5ce4d8ffccd0a2a793c3f58cc540051288bbbd7" origin="Generated by Gradle"/> + <artifact name="runtime-jvmstubs-1.7.6.module"> + <sha256 value="3ea529d981d568675c2c3deb4162d1a7d0af8c2b20f8cb84d82e112c144fc928" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.runtime" name="runtime-saveable" version="1.0.1"> @@ -1021,140 +1021,140 @@ <sha256 value="17154c45c5b08189d3048b855b8a8a87ca16ead3eb49294d3f081be5f53c80d5" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-saveable" version="1.7.5"> - <artifact name="runtime-saveable-1.7.5.module"> - <sha256 value="10f77d19d185e8a2cdd4b0dafb29b2da180ceb51b53eec2cb45bb8d027954a98" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime-saveable" version="1.7.6"> + <artifact name="runtime-saveable-1.7.6.module"> + <sha256 value="cdfcb01209abb337b0440905c079478e9284fae1e514579d0ba11ed86b59b271" origin="Generated by Gradle"/> </artifact> - <artifact name="runtime-saveable-metadata-1.7.5.jar"> + <artifact name="runtime-saveable-metadata-1.7.6.jar"> <sha256 value="8b1c04e6bc7b322a34718ae57f26c842117a93b627f75dcde3d02da8b3f0edc6" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-saveable-android" version="1.7.5"> - <artifact name="runtime-saveable-android-1.7.5.module"> - <sha256 value="da3547b1d356cfa65c627e2205e143a751ea6b9455bdc3563587c06a111c3cee" origin="Generated by Gradle"/> + <component group="androidx.compose.runtime" name="runtime-saveable-android" version="1.7.6"> + <artifact name="runtime-saveable-android-1.7.6.module"> + <sha256 value="2d921a9e05a6933df61197927af90e6e2ac2bc2015687373831a13b0c029dae8" origin="Generated by Gradle"/> </artifact> <artifact name="runtime-saveable-release.aar"> - <sha256 value="cd29949a615fc4c5febe297335984f75d968729968cdd6d68efb7b946001dd63" origin="Generated by Gradle"/> + <sha256 value="802c98303c250a91b89d6b703c3eab73bff6cd220a85fdd10e17ca126f954879" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.runtime" name="runtime-saveable-jvmstubs" version="1.7.5"> - <artifact name="runtime-saveable-jvmstubs-1.7.5.jar"> + <component group="androidx.compose.runtime" name="runtime-saveable-jvmstubs" version="1.7.6"> + <artifact name="runtime-saveable-jvmstubs-1.7.6.jar"> <sha256 value="f6c98b0c719abd8b55499be90830681c915d78c0e6581f7cc37c86fde52cec04" origin="Generated by Gradle"/> </artifact> - <artifact name="runtime-saveable-jvmstubs-1.7.5.module"> - <sha256 value="9448cdc2af7dbc12afec12f7ca5f1ca8f38857ab56d8fc9da0b56338b66c6992" origin="Generated by Gradle"/> + <artifact name="runtime-saveable-jvmstubs-1.7.6.module"> + <sha256 value="af5623d21f30891dcdddbfedcc73280716f2990019fddf75f29c144c95db10d2" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui" version="1.7.5"> - <artifact name="ui-1.7.5.module"> - <sha256 value="86d268b97f70eeeb30ade99987fe6fbf6ca65dbf0b308c93989448533e9dadd1" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui" version="1.7.6"> + <artifact name="ui-1.7.6.module"> + <sha256 value="fcc0e2f3e5efe07bc3aa3b4c094752c1fab0964300629dc8470461fa7fc74c5d" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-metadata-1.7.5.jar"> - <sha256 value="13024b3997eab97818f5d3601bf75fb263e757cac5778440c685873902b7c232" origin="Generated by Gradle"/> + <artifact name="ui-metadata-1.7.6.jar"> + <sha256 value="0db108477257620c685b18e3541ced4c6a0c1172bd6ae6a0836e8ead5c408ad9" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-android" version="1.7.5"> - <artifact name="ui-android-1.7.5.module"> - <sha256 value="aec8a356fc23b07a785d2d89f51bc2a42a253e1b5800aeff10555e296b664fc3" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-android" version="1.7.6"> + <artifact name="ui-android-1.7.6.module"> + <sha256 value="7dd0431c6c958f582cdc0a39d7381d702de52693d86dbf579aadf043e3f3cfaf" origin="Generated by Gradle"/> </artifact> <artifact name="ui-release.aar"> - <sha256 value="e426c90ac12878cce1d1d21591cd07e91c4697955a87cea9d72ba3f13703fd39" origin="Generated by Gradle"/> + <sha256 value="42df06e3390808c85256a7efd74d448da71cbc168b41497a30535045c926f5b0" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-geometry" version="1.7.5"> - <artifact name="ui-geometry-1.7.5.module"> - <sha256 value="3159168a29cd0a9d816c02043c038ee8fc93649078e766db954d2df5c90d7098" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-geometry" version="1.7.6"> + <artifact name="ui-geometry-1.7.6.module"> + <sha256 value="da43ee59f64ee4407378c89e26a6b414ff056dd28ae7e0b72e899282ac5dc7ce" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-geometry-metadata-1.7.5.jar"> + <artifact name="ui-geometry-metadata-1.7.6.jar"> <sha256 value="74d9348a19fe1150c20989bae6783d2f87b51ea3c10268b7b46d3024f22b3d4a" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-geometry-android" version="1.7.5"> - <artifact name="ui-geometry-android-1.7.5.module"> - <sha256 value="42e9bfbfa26d9a4b3eef56a5af2aecfb562023b77b518612b086183321b808de" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-geometry-android" version="1.7.6"> + <artifact name="ui-geometry-android-1.7.6.module"> + <sha256 value="836c4dbddeffac5e0c97b49aa1f464396583242025becd1570f007e1dd2fe950" origin="Generated by Gradle"/> </artifact> <artifact name="ui-geometry-release.aar"> - <sha256 value="0dacb49839f79abea9616a84c612dff74da349ce45cd8f31496d9d04f04d4496" origin="Generated by Gradle"/> + <sha256 value="63eb3d049a8c819e3805d51ce15b9203249ce960ecfd53251126592047bc2ff0" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-geometry-jvmstubs" version="1.7.5"> - <artifact name="ui-geometry-jvmstubs-1.7.5.jar"> + <component group="androidx.compose.ui" name="ui-geometry-jvmstubs" version="1.7.6"> + <artifact name="ui-geometry-jvmstubs-1.7.6.jar"> <sha256 value="6bfff1ca29461a7f0ab0e5204d6c7cbe75b5bb8936add7b8dc055162a68fa1d0" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-geometry-jvmstubs-1.7.5.module"> - <sha256 value="34955e2019e7635a80fd52b88b6575904a6fabeb946ef618d4dde655fab12805" origin="Generated by Gradle"/> + <artifact name="ui-geometry-jvmstubs-1.7.6.module"> + <sha256 value="106cf77d4506340e22c9f937d9e34a3c027ea2172d6b9584ff7db64367339be6" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-graphics" version="1.7.5"> - <artifact name="ui-graphics-1.7.5.module"> - <sha256 value="fa9e46b54725f594efed5a30a669fc40ab5f79c429379fec8f25a4faa64253b9" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-graphics" version="1.7.6"> + <artifact name="ui-graphics-1.7.6.module"> + <sha256 value="1b5818996691991661a3712ffc73ab2fbeabd57b8e7c23d50b5f32d8114a3d6c" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-graphics-metadata-1.7.5.jar"> + <artifact name="ui-graphics-metadata-1.7.6.jar"> <sha256 value="5ba9ece097ba31fea936095e1c34b1f517645a1af55e4a641e707c583e61d94b" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-graphics-android" version="1.7.5"> - <artifact name="ui-graphics-android-1.7.5.module"> - <sha256 value="d134ed8b61818ee96df30f1d4e51202d3d6088c0e98e0299026e9b4b5f8a328f" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-graphics-android" version="1.7.6"> + <artifact name="ui-graphics-android-1.7.6.module"> + <sha256 value="0ea16cdfe6f918da72758eeee93a7379c243f3d0e8e979975ac6aa647a26583f" origin="Generated by Gradle"/> </artifact> <artifact name="ui-graphics-release.aar"> - <sha256 value="ef6fcbaa04740d57f171364bd75d800a9e9bf490ee7a9d0ff9e0a10477c8a831" origin="Generated by Gradle"/> + <sha256 value="00c96a2e54b03bc0b72b8fc4327bd2a75b689c689aa01295d870141eb9ddddd0" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-graphics-jvmstubs" version="1.7.5"> - <artifact name="ui-graphics-jvmstubs-1.7.5.jar"> + <component group="androidx.compose.ui" name="ui-graphics-jvmstubs" version="1.7.6"> + <artifact name="ui-graphics-jvmstubs-1.7.6.jar"> <sha256 value="d9a0b6f15dcde98b125d7d01a2219ea7f8c1d6ea315bdc050a2048dc2492bc18" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-graphics-jvmstubs-1.7.5.module"> - <sha256 value="c86a9d9f7eb25f63bcc9327294e45a987c0b856a1b9244d6ed929f68412ba252" origin="Generated by Gradle"/> + <artifact name="ui-graphics-jvmstubs-1.7.6.module"> + <sha256 value="5a1c5f1cfaa2f4f264779dd4c86caf41c03a73aa42d56fd6dc1b25f1b4e89fe3" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-jvmstubs" version="1.7.5"> - <artifact name="ui-jvmstubs-1.7.5.jar"> - <sha256 value="652148969f7a88c1ac1adf70bc4eeb523a758e35b7da8e841bc9204c704774a9" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-jvmstubs" version="1.7.6"> + <artifact name="ui-jvmstubs-1.7.6.jar"> + <sha256 value="923ae372037105746bc661183a8d08a83ef8cf663bc34bdc9ff8740647a53fa0" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-jvmstubs-1.7.5.module"> - <sha256 value="62857395141970f25f6f2b4278c48c6a10eb2087f142acb961e9df6143b8ba6a" origin="Generated by Gradle"/> + <artifact name="ui-jvmstubs-1.7.6.module"> + <sha256 value="cadb38486663f2dd70f055aaee2f1eb01562e1ff5653e648d8c3681820222447" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-test" version="1.7.5"> - <artifact name="ui-test-1.7.5.module"> - <sha256 value="7d8fae09be20bfe75d6cd7ae114d4d02b26f512b6dbc218fdd290e09bffdcaf2" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-test" version="1.7.6"> + <artifact name="ui-test-1.7.6.module"> + <sha256 value="b868d4e2b895ce946f1829c8ca8336cbf1d477b81593a0b41b8b717d3fcee390" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-test-metadata-1.7.5.jar"> + <artifact name="ui-test-metadata-1.7.6.jar"> <sha256 value="a79ffab96e477d235ff6f30b3b6db8afc7a22134b9e20165696943f09b42f609" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-test-android" version="1.7.5"> - <artifact name="ui-test-android-1.7.5.module"> - <sha256 value="71042ad2254ad48fab9b4e95939639293322f4d09ca2b46b5eaf1a7fbd00e247" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-test-android" version="1.7.6"> + <artifact name="ui-test-android-1.7.6.module"> + <sha256 value="e5263a9ae751afc404a72ba686d0c4cbf469a1b5cd7705641a26ae369f100313" origin="Generated by Gradle"/> </artifact> <artifact name="ui-test-release.aar"> - <sha256 value="32348c04881f740f34d5b75c02172a974e789f0cc4dbe44fc106565f57578a2a" origin="Generated by Gradle"/> + <sha256 value="14aa565f814243c88e2fba3dddeb75f45d558483e49709aae27aa8d41b569bc7" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-test-junit4" version="1.7.5"> - <artifact name="ui-test-junit4-1.7.5.module"> - <sha256 value="7a86f79f0593d7163e5fc5bbdcc71b0bba850635783b3c837dd29905c15e0e8b" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-test-junit4" version="1.7.6"> + <artifact name="ui-test-junit4-1.7.6.module"> + <sha256 value="519ea8e9ed02224d61a7b2423328c529d4243efb14d034803fbdb392ccaa27fd" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-test-junit4-metadata-1.7.5.jar"> + <artifact name="ui-test-junit4-metadata-1.7.6.jar"> <sha256 value="71d3b81d23a8350c7cbb8a6b6773ed3901c849bb2405fa9a7c47fddf35c5336e" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-test-junit4-android" version="1.7.5"> - <artifact name="ui-test-junit4-android-1.7.5.module"> - <sha256 value="150a7fdb454a59c46c5de25cf1b9cdf29828af71f1562572b112d3ee5e9be3be" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-test-junit4-android" version="1.7.6"> + <artifact name="ui-test-junit4-android-1.7.6.module"> + <sha256 value="a734cfdf871053c2fa95e3550c8d212712a430babe09ba7682decd5873e7e72f" origin="Generated by Gradle"/> </artifact> <artifact name="ui-test-junit4-release.aar"> - <sha256 value="26f517119a3c769f847728cc5e77012b12d7fb3e45824b0d72076c1c224c1f0b" origin="Generated by Gradle"/> + <sha256 value="dabad805dc934c57755aab07c659cbeb7af2eb6310b9944381f8e6339a024128" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-test-manifest" version="1.7.5"> - <artifact name="ui-test-manifest-1.7.5.aar"> - <sha256 value="310ff754341086dd19e0e7c16cf7e38625a06e5d3251ace9f0be72cfef920abf" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-test-manifest" version="1.7.6"> + <artifact name="ui-test-manifest-1.7.6.aar"> + <sha256 value="95fcd7bcde2caead4ae9a88faeef2d75c80621f894d8aaa22632ad084ad693a0" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-test-manifest-1.7.5.module"> - <sha256 value="a10ffd17df5fe9a27d331864b6add8fd21dba723fbc625943ec4eddb37e98853" origin="Generated by Gradle"/> + <artifact name="ui-test-manifest-1.7.6.module"> + <sha256 value="6a32e1b750272d7c67f665f871337adaa36956dd0edd802cc4ea1d6c63d433ed" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.ui" name="ui-text" version="1.6.0"> @@ -1162,100 +1162,100 @@ <sha256 value="c830a2fdf5cf174da80bbcaf977b69a4f55dd935dce78bab676e191780aa449a" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-text" version="1.7.5"> - <artifact name="ui-text-1.7.5.module"> - <sha256 value="3e8a7b17f3cbfa84025ae3027c876aca1c9a894c0ee49d20fff999ecf9f54ddf" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-text" version="1.7.6"> + <artifact name="ui-text-1.7.6.module"> + <sha256 value="e6dcae331d62916acf10aaf0fcbf4f70b681a4897630e1698d8d27161cdc5cfb" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-text-metadata-1.7.5.jar"> + <artifact name="ui-text-metadata-1.7.6.jar"> <sha256 value="5bd379bebabeb47ea92b3777bb1ceb31dc93c294b46f264dcf8e4c010f4699fc" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-text-android" version="1.7.5"> - <artifact name="ui-text-android-1.7.5.module"> - <sha256 value="915b65201853a4b5fb63a31a2dbe68daad18a7fbea73c288c9e78a582dee3801" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-text-android" version="1.7.6"> + <artifact name="ui-text-android-1.7.6.module"> + <sha256 value="b256b43d34fb60aadb2e2107d138acc73fd21f205368ad42a7161378f52e2694" origin="Generated by Gradle"/> </artifact> <artifact name="ui-text-release.aar"> - <sha256 value="01c9c5f92d1871d34c06b0d861011f218ecb9a9179f72bdaf9a0ae33700a068f" origin="Generated by Gradle"/> + <sha256 value="d2291842f1c3e8e70c4cb5c962c0754e463e023fef906f3437c209a096c09ec7" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-text-jvmstubs" version="1.7.5"> - <artifact name="ui-text-jvmstubs-1.7.5.jar"> + <component group="androidx.compose.ui" name="ui-text-jvmstubs" version="1.7.6"> + <artifact name="ui-text-jvmstubs-1.7.6.jar"> <sha256 value="4462aaa7f57906f45ab7372cf852780ae9e73e1658afa046625b131419b4e05a" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-text-jvmstubs-1.7.5.module"> - <sha256 value="460e77d8077f556c84e72897b8f05400ced73e460a14b4ed4ad868f5ab1d5970" origin="Generated by Gradle"/> + <artifact name="ui-text-jvmstubs-1.7.6.module"> + <sha256 value="cc789182ea6c50abe6cc76ed6fc9d4c2e12f3acb535fd0348aa07ebf30d65984" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling" version="1.7.5"> - <artifact name="ui-tooling-1.7.5.module"> - <sha256 value="c2fc8703bc0f3aeda01505cb8f4387ee7d158cc79bf4f4de10a342d47b0227cd" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling" version="1.7.6"> + <artifact name="ui-tooling-1.7.6.module"> + <sha256 value="6d3706819473efb8c29566cac05dd080a883396ad4a1f251beed1e7c5b5d1cce" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-tooling-metadata-1.7.5.jar"> + <artifact name="ui-tooling-metadata-1.7.6.jar"> <sha256 value="fbf2eaab5603fc2f9df5325f3324f454afa107956b924e033aa1f4e2e6b4d8d2" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-android" version="1.7.5"> - <artifact name="ui-tooling-android-1.7.5.module"> - <sha256 value="6b69555acc8bd783f9c7df0f97d17ef910cb8d1ff976e580feb4a363ac798c0f" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling-android" version="1.7.6"> + <artifact name="ui-tooling-android-1.7.6.module"> + <sha256 value="d00b918f5a5ca2b5e55255467cca539114eeea14d94f21a4aa842061530dcf18" origin="Generated by Gradle"/> </artifact> <artifact name="ui-tooling-release.aar"> - <sha256 value="3bc474b8437171cfc529f673aa8d3c479360d11e4520e952dd56d5a46faf17cd" origin="Generated by Gradle"/> + <sha256 value="f34446fdb8bf7594c9ecf037d2661db68becef40d7845415448803f1560bdecb" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-data" version="1.7.5"> - <artifact name="ui-tooling-data-1.7.5.module"> - <sha256 value="4d063817071d85ea399813bb5a9e8d81d8b9e16c85b674c0242dc69e95cfbb9e" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling-data" version="1.7.6"> + <artifact name="ui-tooling-data-1.7.6.module"> + <sha256 value="37aeabec955d0b3e9841f2d1195323525d60709c50eacb272ffba7b806c459de" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-tooling-data-metadata-1.7.5.jar"> + <artifact name="ui-tooling-data-metadata-1.7.6.jar"> <sha256 value="6b8231847e4ff969a213a61fc0dcebc0a8250c451ada7ac7a430dd2fc7b3a0cf" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-data-android" version="1.7.5"> - <artifact name="ui-tooling-data-android-1.7.5.module"> - <sha256 value="95e63eb3645506fcea0522da50bc5bb7a54e46c25c6df35edc010cfa98071bcc" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling-data-android" version="1.7.6"> + <artifact name="ui-tooling-data-android-1.7.6.module"> + <sha256 value="75037084b6f4609d042d64e021fb2b1894d559d2c95ad91ffc06ac181115f3f0" origin="Generated by Gradle"/> </artifact> <artifact name="ui-tooling-data-release.aar"> - <sha256 value="c99cd1e6faad38b5dba3c276e5ed8d6ab51744951e4974a78b3c67b5484e1daa" origin="Generated by Gradle"/> + <sha256 value="70816bf7083e076ee824193661052efd97a2776fc721c0f5e6956aecf2a0d34e" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-data-jvmstubs" version="1.7.5"> - <artifact name="ui-tooling-data-jvmstubs-1.7.5.jar"> + <component group="androidx.compose.ui" name="ui-tooling-data-jvmstubs" version="1.7.6"> + <artifact name="ui-tooling-data-jvmstubs-1.7.6.jar"> <sha256 value="e217a177e64d450f68c43964d221afe92bee3b096bb02e9a9644bf23c210aae7" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-tooling-data-jvmstubs-1.7.5.module"> - <sha256 value="70affa683768d20f648a9eb8f9d18acc00666e6cb815229444f7564546f894a6" origin="Generated by Gradle"/> + <artifact name="ui-tooling-data-jvmstubs-1.7.6.module"> + <sha256 value="0b861d387a2be8f766537188da27cae2d0516553d75ec40bdfd557207f64f215" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-jvmstubs" version="1.7.5"> - <artifact name="ui-tooling-jvmstubs-1.7.5.jar"> + <component group="androidx.compose.ui" name="ui-tooling-jvmstubs" version="1.7.6"> + <artifact name="ui-tooling-jvmstubs-1.7.6.jar"> <sha256 value="6fa09b0440174341645c58429d172a02dee9ae89fb123c4d0111cf0700632bed" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-tooling-jvmstubs-1.7.5.module"> - <sha256 value="fbab846c3ec69aa69c8dd346f5d1390736e0df010596a2445d21df0097e7eee9" origin="Generated by Gradle"/> + <artifact name="ui-tooling-jvmstubs-1.7.6.module"> + <sha256 value="7684097640f54e6a518e0434da26647bb559af55315c5b0c41766c5b8082574a" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-preview" version="1.7.5"> - <artifact name="ui-tooling-preview-1.7.5.module"> - <sha256 value="145508a3fbb5684b25dbd9ab12d906d84f2e8d5992d3db17f933706e7f0bb1f1" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling-preview" version="1.7.6"> + <artifact name="ui-tooling-preview-1.7.6.module"> + <sha256 value="ed467d488b1c49497fbe8453e019f4dd2bdbcfea8e27d3017158527e66c3e22b" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-tooling-preview-metadata-1.7.5.jar"> + <artifact name="ui-tooling-preview-metadata-1.7.6.jar"> <sha256 value="c4bfdfd326ccc96073aca33abdbd04ec0c048e7b9458c12767b753aa1e44ffc9" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-preview-android" version="1.7.5"> - <artifact name="ui-tooling-preview-android-1.7.5.module"> - <sha256 value="262c0b6cf9dab8f81956265f92f0b5dca4e49d20d373e5d662b8f174fc1d7601" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-tooling-preview-android" version="1.7.6"> + <artifact name="ui-tooling-preview-android-1.7.6.module"> + <sha256 value="77ee6c00ea9d0f6797178cee56434b81fc181892c578a923e8cb91f1a2dea504" origin="Generated by Gradle"/> </artifact> <artifact name="ui-tooling-preview-release.aar"> - <sha256 value="5d6226931ae38830d3e50d8bd682446f9381ea6721ed081f3e6a1760e4c3e292" origin="Generated by Gradle"/> + <sha256 value="800e929cead9d30f079f378eb51fb52cddea2c3575ee8a5442ec6dc8a4adaca1" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-tooling-preview-jvmstubs" version="1.7.5"> - <artifact name="ui-tooling-preview-jvmstubs-1.7.5.jar"> + <component group="androidx.compose.ui" name="ui-tooling-preview-jvmstubs" version="1.7.6"> + <artifact name="ui-tooling-preview-jvmstubs-1.7.6.jar"> <sha256 value="c6deada2fac53b8ea6523dbda77597b128006674616f140f04df23264c6d1aa3" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-tooling-preview-jvmstubs-1.7.5.module"> - <sha256 value="ee4b89b372b1bca60f6607d7b4213a81052f74532ec6ced981cf26744fa01c6a" origin="Generated by Gradle"/> + <artifact name="ui-tooling-preview-jvmstubs-1.7.6.module"> + <sha256 value="33cc146dab6cc2498427e9630b15b6602359a4bfae4df01353e24eadfff5cf26" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.ui" name="ui-unit" version="1.7.2"> @@ -1263,28 +1263,28 @@ <sha256 value="d67c73d878486c33c5b0b5a60187558687052605223beaef2643b926bdfbdde8" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-unit" version="1.7.5"> - <artifact name="ui-unit-1.7.5.module"> - <sha256 value="fc5e2a610ad18ae86a32f2fa4d83394696f096670f001b776c98df7386fb9a21" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-unit" version="1.7.6"> + <artifact name="ui-unit-1.7.6.module"> + <sha256 value="dbf3459c2f9f11b330f41ae8b22c4089541fc8352b42ae89be1af993a829fa17" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-unit-metadata-1.7.5.jar"> + <artifact name="ui-unit-metadata-1.7.6.jar"> <sha256 value="254bd27dc799c63b1b59614beef214058c7fbf6cf800c70848bc1fac51b06218" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-unit-android" version="1.7.5"> - <artifact name="ui-unit-android-1.7.5.module"> - <sha256 value="c1e1876a7e4ea56872ca7042e2d5467b02d875eb8904cf6a143ee878bf2be821" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-unit-android" version="1.7.6"> + <artifact name="ui-unit-android-1.7.6.module"> + <sha256 value="e5c3f0e8b6ab05b915454cf889d185136448354989ec7bfd8f7db4c02d5c88bc" origin="Generated by Gradle"/> </artifact> <artifact name="ui-unit-release.aar"> - <sha256 value="ef180632c4aadf0c02cb4ba49e83f9667c4b07066e7179c801b6895b0e6c2edc" origin="Generated by Gradle"/> + <sha256 value="9ed6214fdd4da272b0b2582c428f8c3dce5ce6a186c47daaf9fc01aec226a199" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-unit-jvmstubs" version="1.7.5"> - <artifact name="ui-unit-jvmstubs-1.7.5.jar"> + <component group="androidx.compose.ui" name="ui-unit-jvmstubs" version="1.7.6"> + <artifact name="ui-unit-jvmstubs-1.7.6.jar"> <sha256 value="adab6b0837de96bd435937b0202431f1f7071900fc5835a49cf561c85ca30c32" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-unit-jvmstubs-1.7.5.module"> - <sha256 value="80cfb4955d5e61210a98405f41c5d8820f04a43b5532456d4aff896895a43ce4" origin="Generated by Gradle"/> + <artifact name="ui-unit-jvmstubs-1.7.6.module"> + <sha256 value="7bdde8515a98e4763a0ff36c515a45cb97394dc7b4f68266509cccbd93b3914a" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.compose.ui" name="ui-util" version="1.6.0"> @@ -1292,28 +1292,28 @@ <sha256 value="85b335a307cb203c0ee477bfeada5023aadc282bd8ab9d114d69d61937490e17" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-util" version="1.7.5"> - <artifact name="ui-util-1.7.5.module"> - <sha256 value="89237d9b7499ae88af8ee3ff6c459d96844f4ede5c5e8e444f68cc1c727b013a" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-util" version="1.7.6"> + <artifact name="ui-util-1.7.6.module"> + <sha256 value="6384b90108fd404262d72ead1db675fd20c30504f0af766090a2d6ae55399dcc" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-util-metadata-1.7.5.jar"> + <artifact name="ui-util-metadata-1.7.6.jar"> <sha256 value="25afa139ccbda2c33c6d9e7be3579e2ca9295f986e3b4f5b96297d6ce0fba86a" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-util-android" version="1.7.5"> - <artifact name="ui-util-android-1.7.5.module"> - <sha256 value="02f4be06dc201ba5a74d7408525967c31466add66a43b65af1966b93587433df" origin="Generated by Gradle"/> + <component group="androidx.compose.ui" name="ui-util-android" version="1.7.6"> + <artifact name="ui-util-android-1.7.6.module"> + <sha256 value="df2f9e98eaf858507b1799a0fec0ee9be425e28ca7c205a4ed4bbeca6d97ad65" origin="Generated by Gradle"/> </artifact> <artifact name="ui-util-release.aar"> - <sha256 value="52dd259269fbd6791e19e7cbaf2c17cd7ec0ba599f0fd44d39091372f3423561" origin="Generated by Gradle"/> + <sha256 value="f74120949fd8f82fbfbcc3793246108f9554df0f51ecc7fb5d721ac971c4394a" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-util-jvmstubs" version="1.7.5"> - <artifact name="ui-util-jvmstubs-1.7.5.jar"> + <component group="androidx.compose.ui" name="ui-util-jvmstubs" version="1.7.6"> + <artifact name="ui-util-jvmstubs-1.7.6.jar"> <sha256 value="ad9516e0310a7ae89356551413aa5ef8578007a528363f462c6b7b30f3538636" origin="Generated by Gradle"/> </artifact> - <artifact name="ui-util-jvmstubs-1.7.5.module"> - <sha256 value="de57d53fe09293d0b2fdb7651d1054c8690dc4a55ea4c0ff71c749562429bfab" origin="Generated by Gradle"/> + <artifact name="ui-util-jvmstubs-1.7.6.module"> + <sha256 value="5f6442fbca6a0414bb89e74a18981dde8b6e5124d0426dfddb6354c4d0752198" origin="Generated by Gradle"/> </artifact> </component> <component group="androidx.concurrent" name="concurrent-futures" version="1.1.0"> @@ -3250,9 +3250,9 @@ <sha256 value="de25f2d9a2156529bd765f51d8efdfc0dfa7301e04efb9cc75b7f10cf5d0e0fb" origin="Generated by Gradle"/> </artifact> </component> - <component group="com.google.errorprone" name="error_prone_annotations" version="2.28.0"> - <artifact name="error_prone_annotations-2.28.0.jar"> - <sha256 value="f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e" origin="Generated by Gradle"/> + <component group="com.google.errorprone" name="error_prone_annotations" version="2.30.0"> + <artifact name="error_prone_annotations-2.30.0.jar"> + <sha256 value="144f3aefbd6e27daec55d3753b2c6b13c1afdaf0cf04816cdb564588ed92f1bd" origin="Generated by Gradle"/> </artifact> </component> <component group="com.google.firebase" name="firebase-encoders" version="17.0.0"> @@ -3313,17 +3313,6 @@ <sha256 value="f5fff7642c12e7627bc14289fd267e2602c17f9590e23522c3e63107f61c2942" origin="Generated by Gradle"/> </artifact> </component> - <component group="com.google.guava" name="guava" version="33.2.1-android"> - <artifact name="guava-33.2.1-android.jar"> - <sha256 value="6b55fbe6ffee621454c03df7bea720d189789e136391a524e29506ff40654180" origin="Generated by Gradle"/> - </artifact> - <artifact name="guava-33.2.1-android.module"> - <sha256 value="2d6a278db032c3ea603afcf5984568d2b655660c27bced232fa4c2c69ed450bb" origin="Generated by Gradle"/> - </artifact> - <artifact name="guava-33.2.1-jre.jar"> - <sha256 value="452b2d9787b7d366fa8cf5ed9a1c40404542d05effa7a598da03bbbbb76d9f31" origin="Generated by Gradle"/> - </artifact> - </component> <component group="com.google.guava" name="guava" version="33.2.1-jre"> <artifact name="guava-33.2.1-jre.jar"> <sha256 value="452b2d9787b7d366fa8cf5ed9a1c40404542d05effa7a598da03bbbbb76d9f31" origin="Generated by Gradle"/> @@ -3332,6 +3321,17 @@ <sha256 value="d23eda6a1c2c0bd25f8a3346cddeec43b51f75bf819b931eaa98326ea6447422" origin="Generated by Gradle"/> </artifact> </component> + <component group="com.google.guava" name="guava" version="33.3.1-android"> + <artifact name="guava-33.3.1-android.jar"> + <sha256 value="2c3e41d1b380f2044d257947a3aa82dabf3ae4b978622745254aa18b6cf89ab0" origin="Generated by Gradle"/> + </artifact> + <artifact name="guava-33.3.1-android.module"> + <sha256 value="6971614ddeee003e54d2b69c6b0c94ce8a5b5eba980d16455c81df9089a7acb7" origin="Generated by Gradle"/> + </artifact> + <artifact name="guava-33.3.1-jre.jar"> + <sha256 value="4bf0e2c5af8e4525c96e8fde17a4f7307f97f8478f11c4c8e35a0e3298ae4e90" origin="Generated by Gradle"/> + </artifact> + </component> <component group="com.google.guava" name="listenablefuture" version="1.0"> <artifact name="listenablefuture-1.0.jar"> <sha256 value="e4ad7607e5c0477c6f890ef26a49cb8d1bb4dffb650bab4502afee64644e3069" origin="Generated by Gradle"/> @@ -4205,8 +4205,8 @@ <sha256 value="2167c3642cd8f62c02b4b90b7d9b1a7b7acd43b742cf2cf92772e113c6025329" origin="Generated by Gradle"/> </artifact> </component> - <component group="io.grpc" name="grpc-android" version="1.68.2"> - <artifact name="grpc-android-1.68.2.aar"> + <component group="io.grpc" name="grpc-android" version="1.69.0"> + <artifact name="grpc-android-1.69.0.aar"> <sha256 value="788dde58f01a9de18395aaaacf9f97316311a63251bdbb9c2da41221a7058236" origin="Generated by Gradle"/> </artifact> </component> @@ -4215,9 +4215,9 @@ <sha256 value="8d2c384299f84ee8aa7f670f00e7cb26b87e231cf3091474307b32b76910f71c" origin="Generated by Gradle"/> </artifact> </component> - <component group="io.grpc" name="grpc-api" version="1.68.2"> - <artifact name="grpc-api-1.68.2.jar"> - <sha256 value="56b2ff4ec64de0a57ecb3b97fa0e6af5d60d2b5dbd2f97271873a7c54d7b18ff" origin="Generated by Gradle"/> + <component group="io.grpc" name="grpc-api" version="1.69.0"> + <artifact name="grpc-api-1.69.0.jar"> + <sha256 value="ffa9af0f76fb08b4dbcade9dba9805af6b216980cafa0756b4d97b6029077506" origin="Generated by Gradle"/> </artifact> </component> <component group="io.grpc" name="grpc-context" version="1.57.0"> @@ -4225,9 +4225,9 @@ <sha256 value="953fcacd82f531e69b76e3834f5830bad4c22ae84144e058d71dc80a7430275d" origin="Generated by Gradle"/> </artifact> </component> - <component group="io.grpc" name="grpc-context" version="1.68.2"> - <artifact name="grpc-context-1.68.2.jar"> - <sha256 value="99925ffb2964c32ea2b34d88679b0c5afe37bd35df3be38f46f7398ea52d9a31" origin="Generated by Gradle"/> + <component group="io.grpc" name="grpc-context" version="1.69.0"> + <artifact name="grpc-context-1.69.0.jar"> + <sha256 value="e682d036496d4429442955b615b931ee65486bd318d0ab13d9937d11cb36ffd5" origin="Generated by Gradle"/> </artifact> </component> <component group="io.grpc" name="grpc-core" version="1.57.0"> @@ -4235,9 +4235,9 @@ <sha256 value="3bee48c73bc4c5b55bed79be0e484adf26ba56bebbe5798ddbf34714ef1e1cea" origin="Generated by Gradle"/> </artifact> </component> - <component group="io.grpc" name="grpc-core" version="1.68.2"> - <artifact name="grpc-core-1.68.2.jar"> - <sha256 value="7715f557bd0bebc695c8fa639c36c7c3f297a168bbe4bf74f52762d923193a43" origin="Generated by Gradle"/> + <component group="io.grpc" name="grpc-core" version="1.69.0"> + <artifact name="grpc-core-1.69.0.jar"> + <sha256 value="817fbb87f8119c40f2b276f49340effd880e7e574095d3a8fb798a94e3f66652" origin="Generated by Gradle"/> </artifact> </component> <component group="io.grpc" name="grpc-kotlin-stub" version="1.4.1"> @@ -4253,9 +4253,9 @@ <sha256 value="81d43f2d4ed18fa341bd840a3735f1403a70074a046e157e27f679b721b4c9ad" origin="Generated by Gradle"/> </artifact> </component> - <component group="io.grpc" name="grpc-okhttp" version="1.68.2"> - <artifact name="grpc-okhttp-1.68.2.jar"> - <sha256 value="845059e338bc896db0cef30e68107fc1f442f95d7b104cf8edd2708da289f1ae" origin="Generated by Gradle"/> + <component group="io.grpc" name="grpc-okhttp" version="1.69.0"> + <artifact name="grpc-okhttp-1.69.0.jar"> + <sha256 value="4288820852a7de8a343c8d2010f9732ea03ec5fc933289693e3cdf71374112f2" origin="Generated by Gradle"/> </artifact> </component> <component group="io.grpc" name="grpc-protobuf" version="1.57.0"> @@ -4268,9 +4268,9 @@ <sha256 value="2c507c02d981b84a21763d44e09af4f279881dd3e25be3080f6361258607f198" origin="Generated by Gradle"/> </artifact> </component> - <component group="io.grpc" name="grpc-protobuf-lite" version="1.68.2"> - <artifact name="grpc-protobuf-lite-1.68.2.jar"> - <sha256 value="9229e4bf6ea3c9e6d2ccce1203eb006a144771e974d46b08e92887ae38b3c2d8" origin="Generated by Gradle"/> + <component group="io.grpc" name="grpc-protobuf-lite" version="1.69.0"> + <artifact name="grpc-protobuf-lite-1.69.0.jar"> + <sha256 value="5d0ded291edbb4820209a78786b39646c9c6ca3a89f169e92382bbe5d29d43df" origin="Generated by Gradle"/> </artifact> </component> <component group="io.grpc" name="grpc-stub" version="1.57.0"> @@ -4283,38 +4283,38 @@ <sha256 value="84d2af12719168f76375f2afdfd6eb5133a865edba9244d40e6b968e3adde1d3" origin="Generated by Gradle"/> </artifact> </component> - <component group="io.grpc" name="grpc-util" version="1.68.2"> - <artifact name="grpc-util-1.68.2.jar"> - <sha256 value="e4b42d4702cb0eae39130c941f815c3015ac395182135b4cc3c4de98f0652816" origin="Generated by Gradle"/> + <component group="io.grpc" name="grpc-util" version="1.69.0"> + <artifact name="grpc-util-1.69.0.jar"> + <sha256 value="22b47e755dc271c1738327162366599c4faf25ae1d1356455d6191d472841b94" origin="Generated by Gradle"/> </artifact> </component> - <component group="io.grpc" name="protoc-gen-grpc-java" version="1.68.2"> - <artifact name="protoc-gen-grpc-java-1.68.2-linux-aarch_64.exe"> - <sha256 value="c0c172eed59584976321dd0e2f275a7e90d4317d0e3fe48aa4e38a30f9c89c3a" origin="Generated by Gradle"/> + <component group="io.grpc" name="protoc-gen-grpc-java" version="1.69.0"> + <artifact name="protoc-gen-grpc-java-1.69.0-linux-aarch_64.exe"> + <sha256 value="305872abae1f2659399d231336bc29bdad7f5429c153cc4b895173d9df59b0b0" origin="Generated by Gradle"/> </artifact> - <artifact name="protoc-gen-grpc-java-1.68.2-linux-ppcle_64.exe"> - <sha256 value="9fc11feb9e6ad36c7bfc9bcdcc60ee527e34ca1672b662b661573b453d76bb2b" origin="Generated by Gradle"/> + <artifact name="protoc-gen-grpc-java-1.69.0-linux-ppcle_64.exe"> + <sha256 value="1f42cc28399403d8b3e6281897de007f56b2ee1079aaaf1a87e18a9253130fb8" origin="Generated by Gradle"/> </artifact> - <artifact name="protoc-gen-grpc-java-1.68.2-linux-s390_64.exe"> - <sha256 value="8bb255025c451cffe01b7b6e35c70a32bc270d56fe903f3b3d1ca3bef361554c" origin="Generated by Gradle"/> + <artifact name="protoc-gen-grpc-java-1.69.0-linux-s390_64.exe"> + <sha256 value="ebda9c24a3eaf57bb6418648a05f267ffe8258de4608d100882a78065ef9c0cc" origin="Generated by Gradle"/> </artifact> - <artifact name="protoc-gen-grpc-java-1.68.2-linux-x86_32.exe"> - <sha256 value="dafa45af960e5da1cde149a5dda3e99fe91a8dddca274a4fa13754fa72f21efb" origin="Generated by Gradle"/> + <artifact name="protoc-gen-grpc-java-1.69.0-linux-x86_32.exe"> + <sha256 value="60916a77fb8e888e5f1e7a298652298c29cc7d7ca76cc0b0805e56f9197489d2" origin="Generated by Gradle"/> </artifact> - <artifact name="protoc-gen-grpc-java-1.68.2-linux-x86_64.exe"> - <sha256 value="cca81ee0918daf577cb965516861b94abe1a1b152d1b6f7108ede8ec0811f4bf" origin="Generated by Gradle"/> + <artifact name="protoc-gen-grpc-java-1.69.0-linux-x86_64.exe"> + <sha256 value="a8a5c7e7602cbaa2a907c2232f533c1d260fdd87fff2eb5dbd79efbccece60e6" origin="Generated by Gradle"/> </artifact> - <artifact name="protoc-gen-grpc-java-1.68.2-osx-aarch_64.exe"> - <sha256 value="cdb43a824712cad3b9f0f0c0338223f71a0d9c5f0e31a0ded155109c1f4403d5" origin="Generated by Gradle"/> + <artifact name="protoc-gen-grpc-java-1.69.0-osx-aarch_64.exe"> + <sha256 value="5355b16b05831cc35d963c04d39f0ee374a0d8f273495e10ad381f338e7c4b70" origin="Generated by Gradle"/> </artifact> - <artifact name="protoc-gen-grpc-java-1.68.2-osx-x86_64.exe"> - <sha256 value="cdb43a824712cad3b9f0f0c0338223f71a0d9c5f0e31a0ded155109c1f4403d5" origin="Generated by Gradle"/> + <artifact name="protoc-gen-grpc-java-1.69.0-osx-x86_64.exe"> + <sha256 value="5355b16b05831cc35d963c04d39f0ee374a0d8f273495e10ad381f338e7c4b70" origin="Generated by Gradle"/> </artifact> - <artifact name="protoc-gen-grpc-java-1.68.2-windows-x86_32.exe"> - <sha256 value="5be01072b5974cd12f4a3dfe52456eb311d939f1401bc5e8066a0f2d0e9cfbd8" origin="Generated by Gradle"/> + <artifact name="protoc-gen-grpc-java-1.69.0-windows-x86_32.exe"> + <sha256 value="395508bb6f9fad56cdcd8767603248c946c3d5f97e1847f0473ecfbc9be46741" origin="Generated by Gradle"/> </artifact> - <artifact name="protoc-gen-grpc-java-1.68.2-windows-x86_64.exe"> - <sha256 value="844bea505a8eaf899ee317913d4af2dba9a44ce27052ac24daf32573685dc0c7" origin="Generated by Gradle"/> + <artifact name="protoc-gen-grpc-java-1.69.0-windows-x86_64.exe"> + <sha256 value="64f6ccb877bfb1d0aa40574c7a3425ec7a6b7eaeb9af9f5aa5536df87fa0e003" origin="Generated by Gradle"/> </artifact> </component> <component group="io.grpc" name="protoc-gen-grpc-kotlin" version="1.4.1"> @@ -5097,6 +5097,14 @@ <sha256 value="e0fa622b7de63eae11047ef6e91b4c2ad0f1f0e13cb903ff52080a47f57a5746" origin="Generated by Gradle"/> </artifact> </component> + <component group="org.checkerframework" name="checker-qual" version="3.43.0"> + <artifact name="checker-qual-3.43.0.jar"> + <sha256 value="3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6" origin="Generated by Gradle"/> + </artifact> + <artifact name="checker-qual-3.43.0.module"> + <sha256 value="f8163327245ab8625532948c72a930548cd97f34d6c3fe860fa6aec5a34d79b4" origin="Generated by Gradle"/> + </artifact> + </component> <component group="org.codehaus.groovy" name="groovy" version="3.0.21"> <artifact name="groovy-3.0.21.jar"> <sha256 value="5cf3730c0c2c15c293f7750dd7114ed27a671fc940165bbae0378a281f5b2d5e" origin="Generated by Gradle"/> diff --git a/android/lib/resource/build.gradle.kts b/android/lib/resource/build.gradle.kts index fa9cd5d63e..7463441274 100644 --- a/android/lib/resource/build.gradle.kts +++ b/android/lib/resource/build.gradle.kts @@ -22,7 +22,8 @@ android { } lint { - lintConfig = file("lint.xml") + baseline = file("${rootProject.projectDir}/config/lint-baseline.xml") + lintConfig = file("${rootProject.projectDir}/config/lint.xml") abortOnError = true warningsAsErrors = true } diff --git a/android/lib/resource/lint.xml b/android/lib/resource/lint.xml deleted file mode 100644 index 27240ea702..0000000000 --- a/android/lib/resource/lint.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<lint> - <!-- Ignore the following rules as they don't match our localization workflow. --> - <issue id="ExtraTranslation" severity="ignore" /> - <issue id="MissingTranslation" severity="ignore" /> - <issue id="Typos" severity="ignore" /> - <issue id="UnusedResources" severity="ignore" /> - <!-- We are currently not using the ellipsis character. --> - <issue id="TypographyEllipsis" severity="ignore" /> - <!-- Tracked externally (DROID-245) since the same texts are used across multiple platforms. --> - <issue id="ImpliedQuantity" severity="ignore" /> -</lint> diff --git a/android/lib/resource/src/main/res/values-da/plurals.xml b/android/lib/resource/src/main/res/values-da/plurals.xml index 5b3d885c96..8bed6193e4 100644 --- a/android/lib/resource/src/main/res/values-da/plurals.xml +++ b/android/lib/resource/src/main/res/values-da/plurals.xml @@ -4,10 +4,6 @@ <item quantity="one">1 dag tilbage</item> <item quantity="other">%1$d dage tilbage</item> </plurals> - <plurals name="months_left"> - <item quantity="one">1 måned tilbage</item> - <item quantity="other">%1$d måneder tilbage</item> - </plurals> <plurals name="years_left"> <item quantity="one">1 år tilbage</item> <item quantity="other">%1$d år tilbage</item> @@ -32,24 +28,4 @@ <item quantity="one">Kontokredit udløber om en time</item> <item quantity="other">Kontokredit udløber om %1$d timer</item> </plurals> - <plurals name="days_ago"> - <item quantity="one">en dag siden</item> - <item quantity="other">%1$d dage siden</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="one">et minut siden</item> - <item quantity="other">%1$d minutter siden</item> - </plurals> - <plurals name="months_ago"> - <item quantity="one">en måned siden</item> - <item quantity="other">%1$d måneder siden</item> - </plurals> - <plurals name="years_ago"> - <item quantity="one">et år siden</item> - <item quantity="other">%1$d år siden</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="one">en time siden</item> - <item quantity="other">%1$d timer siden</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-da/strings.xml b/android/lib/resource/src/main/res/values-da/strings.xml index ad3fe3eeb2..f24c594abe 100644 --- a/android/lib/resource/src/main/res/values-da/strings.xml +++ b/android/lib/resource/src/main/res/values-da/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">API tilgængelig, tilføjer metode...</string> <string name="api_unreachable">API utilgængelig</string> <string name="api_unreachable_save_anyway">API utilgængelig, gemme metode alligevel?</string> - <string name="app_version">App-version</string> <string name="apply">Anvend</string> <string name="at_least_on_method_needs_to_enabled">Mindst én metode skal aktiveres</string> <string name="auth_failed">Kan ikke godkende konto. Indsend en problemrapport.</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">Indstillingerne for automatisk forbindelse og Lockdown-tilstand kan findes i Android- systemindstillingerne. Følg denne vejledning for at aktivere en eller begge.</string> <string name="auto_connect_carousel_second_slide_top_text">Auto-tilslutning kaldes Altid-til VPN i Android-systemindstillingerne, og det sørger for, at du konstant er forbundet til VPN-tunnelen og automatisk forbinder efter genstart.</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">her</string> - <string name="auto_connect_legacy">Automatisk forbindelse (ældre metode)</string> <string name="automatic">Automatisk</string> <string name="back">Tilbage</string> <string name="block_ads_title">Annoncer</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">Blokerer internettet</string> <string name="blocking_internet_device_offline">Blokering af internet (enhed offline)</string> <string name="buy_credit">Køb kredit</string> - <string name="buy_more_credit">Køb mere kredit</string> <string name="cancel">Annuller</string> <string name="changes_dialog_subtitle">Ændringer i denne version:</string> <string name="cipher">Chiffer</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s gør dette ved omhyggeligt at tilføje netværksstøj og gøre alle netværkspakker lige store.</string> <string name="daita_description_slide_2_second_paragraph">Ikke alle vores servere er %1$s-kompatible. Derfor bruger vi automatisk multihop til at aktivere %2$s med enhver server.</string> <string name="daita_info">Hvis du aktiverer \"%1$s\", skal du manuelt vælge en server, der er %2$s-aktiveret. Det kan medføre, at du ender i en blokeret tilstand, indtil du har valgt en kompatibel server i visningen \"Vælg placering\".</string> - <string name="daita_relay_subset_warning">Denne funktion er ikke tilgængelig på alle servere. Du skal muligvis ændre placering efter aktivering.</string> - <string name="daita_warning">Bemærk: Da dette øger din samlede netværkstrafik, skal du være forsigtig, hvis du har et abonnement med begrænset datamængde. Det kan også påvirke din netværkshastighed og dit batteriforbrug negativt.</string> <string name="delete">Slet</string> <string name="delete_custom_list_confirmation_description">Vil du slette \"%1$s\"?</string> <string name="delete_custom_list_message">\"%1$s\" blev slettet</string> diff --git a/android/lib/resource/src/main/res/values-de/plurals.xml b/android/lib/resource/src/main/res/values-de/plurals.xml index 76d6654e3e..a972d9af72 100644 --- a/android/lib/resource/src/main/res/values-de/plurals.xml +++ b/android/lib/resource/src/main/res/values-de/plurals.xml @@ -4,10 +4,6 @@ <item quantity="one">1 Tag übrig</item> <item quantity="other">%1$d Tage übrig</item> </plurals> - <plurals name="months_left"> - <item quantity="one">1 Monat übrig</item> - <item quantity="other">%1$d Monate übrig</item> - </plurals> <plurals name="years_left"> <item quantity="one">1 Jahr übrig</item> <item quantity="other">%1$d Jahre übrig</item> @@ -32,24 +28,4 @@ <item quantity="one">Kontoguthaben läuft in einer Stunde ab</item> <item quantity="other">Kontoguthaben läuft in %1$d Stunden ab</item> </plurals> - <plurals name="days_ago"> - <item quantity="one">vor einem Tag</item> - <item quantity="other">vor %1$d Tagen</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="one">vor einer Minute</item> - <item quantity="other">vor %1$d Minuten</item> - </plurals> - <plurals name="months_ago"> - <item quantity="one">vor einem Monat</item> - <item quantity="other">vor %1$d Monaten</item> - </plurals> - <plurals name="years_ago"> - <item quantity="one">vor einem Jahr</item> - <item quantity="other">vor %1$d Jahren</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="one">vor einer Stunde</item> - <item quantity="other">vor %1$d Stunden</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-de/strings.xml b/android/lib/resource/src/main/res/values-de/strings.xml index d59e93b6ef..174e807f0e 100644 --- a/android/lib/resource/src/main/res/values-de/strings.xml +++ b/android/lib/resource/src/main/res/values-de/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">API erreichbar, Methode hinzufügen …</string> <string name="api_unreachable">API nicht erreichbar</string> <string name="api_unreachable_save_anyway">API nicht erreichbar, Methode dennoch speichern?</string> - <string name="app_version">App-Version</string> <string name="apply">Anwenden</string> <string name="at_least_on_method_needs_to_enabled">Mindestens eine Methode muss aktiviert sein</string> <string name="auth_failed">Konto konnte nicht authentifiziert werden. Bitte senden Sie einen Problembericht.</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">Die Einstellungen für die automatische Verbindung und den Sperrmodus finden Sie in den Android-Systemeinstellungen. Folgen Sie dieser Anleitung, um eine oder beide Einstellungen zu aktivieren.</string> <string name="auto_connect_carousel_second_slide_top_text">Die automatische Verbindung wird in den Android-Systemeinstellungen als „Always-on VPN“ bezeichnet und sorgt dafür, dass Sie ständig mit dem VPN-Tunnel verbunden sind und sich nach einem Neustart automatisch verbinden.</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">hier</string> - <string name="auto_connect_legacy">Automatische Verbindung (veraltet)</string> <string name="automatic">Automatisch</string> <string name="back">Zurück</string> <string name="block_ads_title">Werbung</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">Internet wird gesperrt</string> <string name="blocking_internet_device_offline">Internet sperren (Gerät offline)</string> <string name="buy_credit">Guthaben erwerben</string> - <string name="buy_more_credit">Mehr Guthaben erwerben</string> <string name="cancel">Abbrechen</string> <string name="changes_dialog_subtitle">Änderungen in dieser Version:</string> <string name="cipher">Chiffre</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s tut dies, indem es Netzwerkrauschen gezielt hinzufügt und alle Netzwerkpakete gleich groß macht.</string> <string name="daita_description_slide_2_second_paragraph">Daher verwenden wir automatisch Multihop, um %1$s mit jedem Server zu aktivieren.</string> <string name="daita_info">Wenn Sie „%1$s“ aktivieren, müssen Sie manuell einen Server auswählen, der %2$s-fähig ist. Dies kann dazu führen, dass Sie in einem blockierten Zustand landen, bis Sie einen kompatiblen Server in der Ansicht „Standort auswählen“ ausgewählt haben.</string> - <string name="daita_relay_subset_warning">Diese Funktion ist nicht auf allen Servern verfügbar. Möglicherweise müssen Sie nach der Aktivierung den Standort wechseln.</string> - <string name="daita_warning">Achtung! Da dies Ihren gesamten Netzwerk-Traffic erhöht, sollten Sie vorsichtig sein, wenn Sie einen begrenzten Datentarif haben. Es kann sich auch negativ auf Ihre Netzwerkgeschwindigkeit und den Akkuverbrauch auswirken.</string> <string name="delete">Löschen</string> <string name="delete_custom_list_confirmation_description">„%1$s“ löschen?</string> <string name="delete_custom_list_message">„%1$s“ wurde gelöscht</string> diff --git a/android/lib/resource/src/main/res/values-es/plurals.xml b/android/lib/resource/src/main/res/values-es/plurals.xml index a683e7c1eb..a94c0ba7e8 100644 --- a/android/lib/resource/src/main/res/values-es/plurals.xml +++ b/android/lib/resource/src/main/res/values-es/plurals.xml @@ -4,10 +4,6 @@ <item quantity="one">Queda 1 día</item> <item quantity="other">Quedan %1$d días</item> </plurals> - <plurals name="months_left"> - <item quantity="one">Queda 1 mes</item> - <item quantity="other">Quedan %1$d meses</item> - </plurals> <plurals name="years_left"> <item quantity="one">Queda 1 año</item> <item quantity="other">Quedan %1$d años</item> @@ -32,24 +28,4 @@ <item quantity="one">El crédito de la cuenta caduca en una hora</item> <item quantity="other">El crédito de la cuenta caduca en %1$d horas</item> </plurals> - <plurals name="days_ago"> - <item quantity="one">hace un día</item> - <item quantity="other">hace %1$d días</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="one">hace un minuto</item> - <item quantity="other">hace %1$d minutos</item> - </plurals> - <plurals name="months_ago"> - <item quantity="one">hace un mes</item> - <item quantity="other">hace %1$d meses</item> - </plurals> - <plurals name="years_ago"> - <item quantity="one">hace un año</item> - <item quantity="other">hace %1$d años</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="one">hace una hora</item> - <item quantity="other">hace %1$d horas</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-es/strings.xml b/android/lib/resource/src/main/res/values-es/strings.xml index b6c3d9ba63..628b23e6ee 100644 --- a/android/lib/resource/src/main/res/values-es/strings.xml +++ b/android/lib/resource/src/main/res/values-es/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">API accesible, añadiendo método...</string> <string name="api_unreachable">API inaccesible</string> <string name="api_unreachable_save_anyway">API inaccesible, ¿guardar el método de todos modos?</string> - <string name="app_version">Versión de la aplicación</string> <string name="apply">Aplicar</string> <string name="at_least_on_method_needs_to_enabled">Se debe habilitar al menos un método</string> <string name="auth_failed">No se puede autenticar la cuenta. Envíe un informe de problemas.</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">La configuración del modo de bloqueo y de la conexión automática puede encontrarse en la configuración del sistema Android, siga esta guía para habilitar uno o ambos.</string> <string name="auto_connect_carousel_second_slide_top_text">La conexión automática se llama VPN siempre activa en la configuración del sistema Android y asegura estar conectado constantemente al túnel de la VPN y conectarse automáticamente después de cada reinicio.</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">aquí</string> - <string name="auto_connect_legacy">Conexión automática (heredada)</string> <string name="automatic">Automático</string> <string name="back">Volver</string> <string name="block_ads_title">Anuncios</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">Internet bloqueado</string> <string name="blocking_internet_device_offline">Bloqueo de Internet (dispositivo sin conexión)</string> <string name="buy_credit">Comprar créditos</string> - <string name="buy_more_credit">Comprar más créditos</string> <string name="cancel">Cancelar</string> <string name="changes_dialog_subtitle">Cambios en esta versión:</string> <string name="cipher">Cifrado</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s lo realiza añadiendo con cuidado ruido de red y haciendo que todos los paquetes de red tengan el mismo tamaño.</string> <string name="daita_description_slide_2_second_paragraph">No todos nuestros servidores están habilitados para %1$s. Por lo tanto, utilizamos el salto múltiple de forma automática para habilitar %2$s con cualquier servidor.</string> <string name="daita_info">Si habilita «%1$s», deberá seleccionar manualmente un servidor que esté habilitado para %2$s. Esto puede provocar que termine bloqueado hasta que seleccione un servidor compatible en la vista «Seleccionar ubicación».</string> - <string name="daita_relay_subset_warning">Esta característica no está disponible en todos los servidores. Podría tener que cambiar de ubicación tras habilitarla.</string> - <string name="daita_warning">Atención: Como esto aumenta el tráfico total de su red, tenga cuidado si tiene un plan de datos limitado. También puede afectar negativamente a la velocidad de su red y al uso de la batería.</string> <string name="delete">Eliminar</string> <string name="delete_custom_list_confirmation_description">¿Eliminar «%1$s»?</string> <string name="delete_custom_list_message">Se ha eliminado «%1$s»</string> diff --git a/android/lib/resource/src/main/res/values-fi/plurals.xml b/android/lib/resource/src/main/res/values-fi/plurals.xml index 7d58779e41..b432b0acb3 100644 --- a/android/lib/resource/src/main/res/values-fi/plurals.xml +++ b/android/lib/resource/src/main/res/values-fi/plurals.xml @@ -4,10 +4,6 @@ <item quantity="one">1 päivä jäljellä</item> <item quantity="other">%1$d päivää jäljellä</item> </plurals> - <plurals name="months_left"> - <item quantity="one">1 kuukausi jäljellä</item> - <item quantity="other">%1$d kuukautta jäljellä</item> - </plurals> <plurals name="years_left"> <item quantity="one">1 vuosi jäljellä</item> <item quantity="other">%1$d vuotta jäljellä</item> @@ -32,24 +28,4 @@ <item quantity="one">Tilin käyttöaika päättyy tunnin kuluttua</item> <item quantity="other">Tilin käyttöaika päättyy %1$d tunnin kuluttua</item> </plurals> - <plurals name="days_ago"> - <item quantity="one">1 päivä sitten</item> - <item quantity="other">%1$d päivää sitten</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="one">minuutti sitten</item> - <item quantity="other">%1$d minuuttia sitten</item> - </plurals> - <plurals name="months_ago"> - <item quantity="one">kuukausi sitten</item> - <item quantity="other">%1$d kuukautta sitten</item> - </plurals> - <plurals name="years_ago"> - <item quantity="one">vuosi sitten</item> - <item quantity="other">%1$d vuotta sitten</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="one">tunti sitten</item> - <item quantity="other">%1$d tuntia sitten</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-fi/strings.xml b/android/lib/resource/src/main/res/values-fi/strings.xml index c1c6e80cf3..a383d09816 100644 --- a/android/lib/resource/src/main/res/values-fi/strings.xml +++ b/android/lib/resource/src/main/res/values-fi/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">API tavoitettavissa, menetelmää lisätään...</string> <string name="api_unreachable">Ohjelmointirajapinta ei ole saavutettavissa</string> <string name="api_unreachable_save_anyway">API ei ole tavoitettavissa. Tallennetaanko menetelmä silti?</string> - <string name="app_version">Sovelluksen versio</string> <string name="apply">Ota käyttöön</string> <string name="at_least_on_method_needs_to_enabled">Vähintään yhden menetelmän on oltava käytössä</string> <string name="auth_failed">Tilin todentaminen ei onnistu. Lähetä ongelmaraportti.</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">Automaattisen yhdistämisen ja lukitustilan asetukset löytyvät Androidin järjestelmäasetuksista. Voit ottaa jommankumman tai molemmat käyttöön tämän oppaan ohjeilla.</string> <string name="auto_connect_carousel_second_slide_top_text">Automaattista yhdistämistä kutsutaan aina päällä olevaksi VPN-yhteydeksi Androidin järjestelmäasetuksissa. Se varmistaa, että olet jatkuvasti yhteydessä VPN-tunneliin, sekä muodostaa yhteyden automaattisesti aina uudelleenkäynnistyksen jälkeen.</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">täältä</string> - <string name="auto_connect_legacy">Autom. yhdistäminen (vanha järjestelmä)</string> <string name="automatic">Automaattinen</string> <string name="back">Takaisin</string> <string name="block_ads_title">Mainokset</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">Verkkoyhteys estetään</string> <string name="blocking_internet_device_offline">Internetyhteys on estetty (laite on offline-tilassa)</string> <string name="buy_credit">Osta käyttöaikaa</string> - <string name="buy_more_credit">Uudista tilaus</string> <string name="cancel">Peruuta</string> <string name="changes_dialog_subtitle">Muutokset tässä versiossa:</string> <string name="cipher">Salaus</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s tekee tämän lisäämällä varovasti verkkokohinaa ja tekemällä kaikista paketeista saman kokoisia.</string> <string name="daita_description_slide_2_second_paragraph">Kaikissa palvelimissamme ei ole %1$s-tukea. Siksi käytämme multihopia automaattisesti mahdollistaaksemme %2$s:n millä tahansa palvelimella.</string> <string name="daita_info">Kun \"%1$s\" otetaan käyttöön, sinun on valittava manuaalisesti palvelin, jossa on %2$s-tuki. Tämä voi aiheuttaa sen, että päädyt estettyyn tilaan, kunnes olet valinnut yhteensopivan palvelimen \"Valitse sijainti\" -näkymästä.</string> - <string name="daita_relay_subset_warning">Ominaisuus ei ole käytettävissä kaikilla palvelimilla, joten saatat joutua vaihtamaan sijaintia otettuasi sen käyttöön.</string> - <string name="daita_warning">Huomioithan, että ominaisuuden käyttöönotto kasvattaa verkkoliikennettäsi kokonaisuudessaan ja voi myös vaikuttaa negatiivisesti verkon nopeuteen ja akun kestoon. Ominaisuuden käyttöönottoa kannattaa harkita tarkkaan, mikäli datapakettisi tiedonsiirtomäärä on rajoitettu.</string> <string name="delete">Poista</string> <string name="delete_custom_list_confirmation_description">Poistetaanko \"%1$s\"?</string> <string name="delete_custom_list_message">\"%1$s\" poistettiin</string> diff --git a/android/lib/resource/src/main/res/values-fr/plurals.xml b/android/lib/resource/src/main/res/values-fr/plurals.xml index d3ab1fc0ab..924c44c61b 100644 --- a/android/lib/resource/src/main/res/values-fr/plurals.xml +++ b/android/lib/resource/src/main/res/values-fr/plurals.xml @@ -4,10 +4,6 @@ <item quantity="one">1 jour restant</item> <item quantity="other">%1$d jours restants</item> </plurals> - <plurals name="months_left"> - <item quantity="one">1 mois restant</item> - <item quantity="other">%1$d mois restants</item> - </plurals> <plurals name="years_left"> <item quantity="one">1 an restant</item> <item quantity="other">%1$d ans restants</item> @@ -32,24 +28,4 @@ <item quantity="one">Les crédits du compte expirent dans une heure</item> <item quantity="other">Les crédits du compte expirent dans %1$d heures</item> </plurals> - <plurals name="days_ago"> - <item quantity="one">il y a un jour</item> - <item quantity="other">il y a %1$d jours</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="one">il y a une minute</item> - <item quantity="other">il y a %1$d minutes</item> - </plurals> - <plurals name="months_ago"> - <item quantity="one">il y a un mois</item> - <item quantity="other">il y a %1$d mois</item> - </plurals> - <plurals name="years_ago"> - <item quantity="one">il y a un an</item> - <item quantity="other">il y a %1$d ans</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="one">il y a une heure</item> - <item quantity="other">Il y a %1$d heures</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-fr/strings.xml b/android/lib/resource/src/main/res/values-fr/strings.xml index d9c230a2eb..a170565dc2 100644 --- a/android/lib/resource/src/main/res/values-fr/strings.xml +++ b/android/lib/resource/src/main/res/values-fr/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">API joignable, ajout de la méthode...</string> <string name="api_unreachable">API injoignable</string> <string name="api_unreachable_save_anyway">API injoignable, enregistrer quand même la méthode ?</string> - <string name="app_version">Version de l\'application</string> <string name="apply">Appliquer</string> <string name="at_least_on_method_needs_to_enabled">Au moins une méthode doit être activée</string> <string name="auth_failed">Impossible d\'authentifier le compte. Veuillez envoyer un rapport de problème.</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">Les paramètres de la connexion automatique et du mode Verrouillage se trouvent dans les paramètres du système Android, suivez ce guide pour activer l\'un, l\'autre ou les deux.</string> <string name="auto_connect_carousel_second_slide_top_text">La connexion automatique est appelée VPN toujours actif dans les paramètres du système Android et elle s\'assure que vous êtes constamment connecté au tunnel VPN et se connecte automatiquement après le redémarrage.</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">ici</string> - <string name="auto_connect_legacy">Connexion automatique (obsolète)</string> <string name="automatic">Automatique</string> <string name="back">Retour</string> <string name="block_ads_title">Publicités</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">Internet bloqué</string> <string name="blocking_internet_device_offline">Internet bloqué (appareil hors ligne)</string> <string name="buy_credit">Acheter des crédits</string> - <string name="buy_more_credit">Acheter plus de crédits</string> <string name="cancel">Annuler</string> <string name="changes_dialog_subtitle">Modifications dans cette version :</string> <string name="cipher">Chiffre</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s y parvient en ajoutant soigneusement du bruit au réseau et en faisant en sorte que tous les paquets du réseau aient la même taille.</string> <string name="daita_description_slide_2_second_paragraph">Tous nos serveurs ne sont pas compatibles %1$s. C\'est pourquoi nous utilisons automatiquement le multihop pour activer %2$s avec n\'importe quel serveur.</string> <string name="daita_info">Si vous activez « %1$s », vous devez sélectionner manuellement un serveur avec %2$s activé. Vous risquez alors de vous retrouver dans une situation de blocage tant que vous n\'avez pas sélectionné un serveur compatible dans la vue « Sélectionner une localisation ».</string> - <string name="daita_relay_subset_warning">Cette fonctionnalité n\'est pas disponible sur tous les serveurs. Vous devrez peut-être changer d\'emplacement après l\'avoir activée.</string> - <string name="daita_warning">Attention : étant donné que cette opération augmente le trafic total de votre réseau, faites attention si vous disposez d\'un forfait à données limitées. Cela peut également avoir un impact négatif sur la vitesse de votre réseau et l\'utilisation de la batterie.</string> <string name="delete">Supprimer</string> <string name="delete_custom_list_confirmation_description">Supprimer « %1$s » ?</string> <string name="delete_custom_list_message">« %1$s » a été supprimé</string> diff --git a/android/lib/resource/src/main/res/values-it/plurals.xml b/android/lib/resource/src/main/res/values-it/plurals.xml index 15f393fe6d..2936d8c4c8 100644 --- a/android/lib/resource/src/main/res/values-it/plurals.xml +++ b/android/lib/resource/src/main/res/values-it/plurals.xml @@ -4,10 +4,6 @@ <item quantity="one">1 giorno rimanente</item> <item quantity="other">%1$d giorni rimanenti</item> </plurals> - <plurals name="months_left"> - <item quantity="one">1 mese rimanente</item> - <item quantity="other">%1$d mesi rimanenti</item> - </plurals> <plurals name="years_left"> <item quantity="one">1 anno rimanente</item> <item quantity="other">%1$d anni rimanenti</item> @@ -32,24 +28,4 @@ <item quantity="one">Il credito dell\'account scade tra un\'ora</item> <item quantity="other">Il credito dell\'account scade tra %1$d ore</item> </plurals> - <plurals name="days_ago"> - <item quantity="one">un giorno fa</item> - <item quantity="other">%1$d giorni fa</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="one">un minuto fa</item> - <item quantity="other">%1$d minuti fa</item> - </plurals> - <plurals name="months_ago"> - <item quantity="one">un mese fa</item> - <item quantity="other">%1$d mesi fa</item> - </plurals> - <plurals name="years_ago"> - <item quantity="one">un anno fa</item> - <item quantity="other">%1$d anni fa</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="one">un\'ora fa</item> - <item quantity="other">%1$d ore fa</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-it/strings.xml b/android/lib/resource/src/main/res/values-it/strings.xml index fbe0126af8..bc0bfebc64 100644 --- a/android/lib/resource/src/main/res/values-it/strings.xml +++ b/android/lib/resource/src/main/res/values-it/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">API raggiungibile, aggiunta del metodo...</string> <string name="api_unreachable">API non raggiungibile</string> <string name="api_unreachable_save_anyway">API non raggiungibile, salvare comunque il metodo?</string> - <string name="app_version">Versione app</string> <string name="apply">Applica</string> <string name="at_least_on_method_needs_to_enabled">È necessario abilitare almeno un metodo</string> <string name="auth_failed">Impossibile autenticare l\'account. Invia una segnalazione del problema.</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">Le impostazioni della modalità di Connessione automatica e di Blocco si trovano nelle impostazioni del sistema Android. Segui questa guida per abilitare una o entrambe.</string> <string name="auto_connect_carousel_second_slide_top_text">La connessione automatica è denominata VPN sempre attiva nelle impostazioni del sistema Android e garantisce di essere costantemente connessi al tunnel VPN e di connettersi automaticamente dopo il riavvio.</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">qui</string> - <string name="auto_connect_legacy">Connessione automatica (precedente)</string> <string name="automatic">Automatico</string> <string name="back">Indietro</string> <string name="block_ads_title">Annunci</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">Blocco di Internet</string> <string name="blocking_internet_device_offline">Blocco di Internet (dispositivo offline)</string> <string name="buy_credit">Acquista credito</string> - <string name="buy_more_credit">Acquista altro credito</string> <string name="cancel">Annulla</string> <string name="changes_dialog_subtitle">Modifiche in questa versione:</string> <string name="cipher">Codice</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s lo fa aggiungendo con attenzione rumore di rete e rendendo tutti i pacchetti di rete della stessa dimensione.</string> <string name="daita_description_slide_2_second_paragraph">Non tutti i nostri server sono abilitati per %1$s. Pertanto, utilizziamo automaticamente il multihop per abilitare %2$s con un server qualsiasi.</string> <string name="daita_info">Abilitando “%1$s” dovrai selezionare manualmente un server abilitato per %2$s. Questo può comportare uno stato di blocco finché non selezioni un server compatibile nella vista “Seleziona posizione”.</string> - <string name="daita_relay_subset_warning">Questa funzionalità non è disponibile su tutti i server. Potrebbe essere necessario modificare la posizione dopo l\'abilitazione.</string> - <string name="daita_warning">Attenzione: poiché questa operazione aumenta il traffico di rete totale, usala con cautela se disponi di un piano dati limitato. Può anche avere un impatto negativo sulla velocità della rete e sul consumo della batteria.</string> <string name="delete">Elimina</string> <string name="delete_custom_list_confirmation_description">Eliminare \"%1$s\"?</string> <string name="delete_custom_list_message">\"%1$s\" eliminato</string> diff --git a/android/lib/resource/src/main/res/values-ja/plurals.xml b/android/lib/resource/src/main/res/values-ja/plurals.xml index 7397e7c25d..b0c70aa7d3 100644 --- a/android/lib/resource/src/main/res/values-ja/plurals.xml +++ b/android/lib/resource/src/main/res/values-ja/plurals.xml @@ -3,9 +3,6 @@ <plurals name="days_left"> <item quantity="other">残り%1$d日</item> </plurals> - <plurals name="months_left"> - <item quantity="other">残り%1$d ヶ月</item> - </plurals> <plurals name="years_left"> <item quantity="other">残り%1$d 年</item> </plurals> @@ -24,19 +21,4 @@ <plurals name="account_credit_expires_in_hours"> <item quantity="other">アカウントのクレジットが%1$d時間後に無効になります</item> </plurals> - <plurals name="days_ago"> - <item quantity="other">%1$d 日前</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="other">%1$d 分前</item> - </plurals> - <plurals name="months_ago"> - <item quantity="other">%1$d ヶ月前</item> - </plurals> - <plurals name="years_ago"> - <item quantity="other">%1$d 年前</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="other">%1$d時間前</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-ja/strings.xml b/android/lib/resource/src/main/res/values-ja/strings.xml index 6f6d9a9542..1799f41d7a 100644 --- a/android/lib/resource/src/main/res/values-ja/strings.xml +++ b/android/lib/resource/src/main/res/values-ja/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">API に到達可能です。方法を追加しています...</string> <string name="api_unreachable">API到達不能</string> <string name="api_unreachable_save_anyway">API に到達できません。方法を保存しますか？</string> - <string name="app_version">アプリのバージョン</string> <string name="apply">適用</string> <string name="at_least_on_method_needs_to_enabled">方法は少なくとも 1 つは有効化する必要があります</string> <string name="auth_failed">アカウントを認証できません。問題の報告を送信してください。</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">自動接続とロックダウンモードの設定はAndroidシステム設定にあります。どちらか、または両方をこのガイドに従って有効にしてください。</string> <string name="auto_connect_carousel_second_slide_top_text">自動接続はAndroidシステム設定で「Always-on VPN」と呼ばれており、確実に一貫してVPNトンネルに接続し、再起動の後に自動接続を行う機能です。</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">こちらをご覧ください。</string> - <string name="auto_connect_legacy">自動接続 (レガシー)</string> <string name="automatic">自動</string> <string name="back">戻る</string> <string name="block_ads_title">広告</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">インターネットをブロック中</string> <string name="blocking_internet_device_offline">インターネットをブロック中 (デバイスがオフライン)</string> <string name="buy_credit">クレジットを購入</string> - <string name="buy_more_credit">追加クレジットを購入</string> <string name="cancel">キャンセル</string> <string name="changes_dialog_subtitle">このバージョンでの変更内容:</string> <string name="cipher">暗号化</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$sはネットワークノイズを入念に追加し、すべてのネットワークパケットを同じサイズにすることによってこれを実現しています。</string> <string name="daita_description_slide_2_second_paragraph">すべてのサーバーが%1$sに対応しているわけではないため、どのサーバーでも%2$sが有効になるようにマルチホップを自動的に使用しています。</string> <string name="daita_info">“%1$s” を有効化した場合、%2$s対応のサーバーを手動で選択する必要があります。これにより、“場所を選択する” で互換性のあるサーバーを選択するまでブロック状態となる可能性があります。</string> - <string name="daita_relay_subset_warning">この機能はすべてのサーバーでご利用いただけるわけではありません。有効にした後に場所の変更が必要となる可能性があります。</string> - <string name="daita_warning">注意: これにより、ネットワークトラフィックの総数が増加します。上限のあるデータプランをご利用の場合にはご注意ください。また、ネットワークの速度とバッテリー使用量にも悪影響を及ぼす可能性があります。</string> <string name="delete">削除</string> <string name="delete_custom_list_confirmation_description">\"%1$s\" を削除しますか？</string> <string name="delete_custom_list_message">\"%1$s\" は削除されました</string> diff --git a/android/lib/resource/src/main/res/values-ko/plurals.xml b/android/lib/resource/src/main/res/values-ko/plurals.xml index 9174284ab5..7ad8f76793 100644 --- a/android/lib/resource/src/main/res/values-ko/plurals.xml +++ b/android/lib/resource/src/main/res/values-ko/plurals.xml @@ -3,9 +3,6 @@ <plurals name="days_left"> <item quantity="other">%1$d일 남음</item> </plurals> - <plurals name="months_left"> - <item quantity="other">%1$d개월 남음</item> - </plurals> <plurals name="years_left"> <item quantity="other">%1$d년 남음</item> </plurals> @@ -24,19 +21,4 @@ <plurals name="account_credit_expires_in_hours"> <item quantity="other">계정 크레딧이 %1$d시간 후에 만료됩니다.</item> </plurals> - <plurals name="days_ago"> - <item quantity="other">%1$d일 전</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="other">%1$d분 전</item> - </plurals> - <plurals name="months_ago"> - <item quantity="other">%1$d개월 전</item> - </plurals> - <plurals name="years_ago"> - <item quantity="other">%1$d년 전</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="other">%1$d시간 전</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-ko/strings.xml b/android/lib/resource/src/main/res/values-ko/strings.xml index 0dd64b7945..d6339cb653 100644 --- a/android/lib/resource/src/main/res/values-ko/strings.xml +++ b/android/lib/resource/src/main/res/values-ko/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">API 연결 가능, 방법 추가 중...</string> <string name="api_unreachable">API 연결 불가</string> <string name="api_unreachable_save_anyway">API 연결 불가, 그래도 이 방법을 저장하시겠습니까?</string> - <string name="app_version">앱 버전</string> <string name="apply">적용</string> <string name="at_least_on_method_needs_to_enabled">1개 이상의 방법이 활성화되어 있어야 합니다</string> <string name="auth_failed">계정을 인증할 수 없습니다. 문제 보고서를 보내주세요.</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">자동 연결 및 잠금 모드 설정은 Android 시스템 설정에서 찾을 수 있습니다. 이 가이드에 따라 하나 또는 둘 다를 활성화하세요.</string> <string name="auto_connect_carousel_second_slide_top_text">자동 연결은 Android 시스템 설정에서 상시 접속 VPN이라고 하며 VPN 터널에 지속적으로 연결되고 다시 시작한 후 자동 연결되게 해줍니다.</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">여기</string> - <string name="auto_connect_legacy">자동 연결(레거시)</string> <string name="automatic">자동</string> <string name="back">뒤로</string> <string name="block_ads_title">광고</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">인터넷 차단</string> <string name="blocking_internet_device_offline">인터넷 차단(장치 오프라인)</string> <string name="buy_credit">크레딧 구매</string> - <string name="buy_more_credit">추가 크레딧 구매</string> <string name="cancel">취소</string> <string name="changes_dialog_subtitle">이 버전의 변경 사항:</string> <string name="cipher">암호</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s는 정교하게 네트워크 노이즈를 추가하고 모든 네트워크 패킷을 동일한 크기로 만들어 이를 달성합니다.</string> <string name="daita_description_slide_2_second_paragraph">일부 서버에는 %1$s가 활성화되어 있지 않습니다. 따라서 당사는 모든 서버에서 %2$s를 활성화하기 위해 자동으로 멀티홉을 사용합니다.</string> <string name="daita_info">“%1$s”을 활성화하면 %2$s가 활성화된 서버를 수동으로 선택해야 합니다. 이로 인해 “위치 선택” 창에서 호환되는 서버를 선택할 때까지 차단된 상태에 빠질 수 있습니다.</string> - <string name="daita_relay_subset_warning">이 기능은 일부 서버에서 이용 가능하지 않습니다. 활성화 후 위치를 변경해야 할 수도 있습니다.</string> - <string name="daita_warning">주의: 이러한 방식은 총 네트워크 트래픽을 증가시키므로, 제한된 데이터 플랜 사용 시에는 유의하시기 바랍니다. 또한 네트워크 속도와 배터리 사용에 부정적인 영향을 미칠 수 있습니다.</string> <string name="delete">삭제</string> <string name="delete_custom_list_confirmation_description">\"%1$s\"을(를) 삭제하시겠습니까?</string> <string name="delete_custom_list_message">\"%1$s\"이(가) 삭제되었습니다</string> diff --git a/android/lib/resource/src/main/res/values-my/plurals.xml b/android/lib/resource/src/main/res/values-my/plurals.xml index 8883c0f9c7..e1484c8422 100644 --- a/android/lib/resource/src/main/res/values-my/plurals.xml +++ b/android/lib/resource/src/main/res/values-my/plurals.xml @@ -3,9 +3,6 @@ <plurals name="days_left"> <item quantity="other">%1$d ရက်သာ ကျန်တော့သည်</item> </plurals> - <plurals name="months_left"> - <item quantity="other">%1$d လသာ ကျန်တော့သည်</item> - </plurals> <plurals name="years_left"> <item quantity="other">%1$d နှစ်သာ ကျန်တော့သည်</item> </plurals> @@ -24,19 +21,4 @@ <plurals name="account_credit_expires_in_hours"> <item quantity="other">%1$d နာရီအကြာတွင် အကောင့်ခရက်ဒစ် သက်တမ်းကုန်ပါတော့မည်</item> </plurals> - <plurals name="days_ago"> - <item quantity="other">လွန်ခဲ့သော %1$d ရက်</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="other">လွန်ခဲ့သော %1$d မိနစ်</item> - </plurals> - <plurals name="months_ago"> - <item quantity="other">လွန်ခဲ့သော %1$d လ</item> - </plurals> - <plurals name="years_ago"> - <item quantity="other">လွန်ခဲ့သော %1$d နှစ်</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="other">လွန်ခဲ့သော %1$d နာရီ</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-my/strings.xml b/android/lib/resource/src/main/res/values-my/strings.xml index 4d572ba641..4686067da4 100644 --- a/android/lib/resource/src/main/res/values-my/strings.xml +++ b/android/lib/resource/src/main/res/values-my/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">API နှင့် ချိတ်၍ရသည်၊ နည်းလမ်း ထည့်နေဆဲ…</string> <string name="api_unreachable">API ဝင်ရောက် သုံးစွဲ၍ မရနိုင်ပါ</string> <string name="api_unreachable_save_anyway">API နှင့် ချိတ်၍မရပါ၊ မည်သို့ပင်ဖြစ်စေ နည်းလမ်းကို သိမ်းမလား။</string> - <string name="app_version">အက်ပ်ဗားရှင်း</string> <string name="apply">သုံးရန်</string> <string name="at_least_on_method_needs_to_enabled">အနည်းဆုံး နည်းလမ်းတစ်ခုကို ဖွင့်ရမည်</string> <string name="auth_failed">အကောင့်ကို စစ်မှန်ကြောင်း အတည်ပြု၍ မရနိုင်ပါ။ ပြဿနာ ရီပို့တ်တစ်ခု ပေးပို့ပေးပါ။</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">အော်တို ချိတ်ဆက်မှုနှင့် လော့ခ်ဒေါင်းစနစ် ဆက်တင်များကို Android စနစ် ဆက်တင်များတွင် ရှာတွေ့နိုင်ပြီး တစ်ခု သို့မဟုတ် နှစ်ခုလုံးကို ဖွင့်ရန် ဤလမ်းညွှန်ချက်ကို လိုက်နာပါ။</string> <string name="auto_connect_carousel_second_slide_top_text">Android စနစ် ဆက်တင်တွင် အော်တိုချိတ်ဆက်မှုကို အမြဲဖွင့် VPN ဟုခေါ်ပြီး VPN Tunnel ကို အမြဲချိတ်ဆက်ထားကြောင်း သေချာစေပြီး အစမှ ပြန်ဖွင့်ပြီးနောက် အော်တို ချိတ်ဆက်ပါသည်။</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">ဤနေရာတွင် ပိုမိုဖတ်ရှုနိုင်ပါသည်</string> - <string name="auto_connect_legacy">အော်တို ချိတ်ဆက်ရန် (ပင်မ)</string> <string name="automatic">အလိုအလျောက်</string> <string name="back">နောက်သို့</string> <string name="block_ads_title">ကြောငြာများ</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">အင်တာနက် ပိတ်ဆို့နေပါသည်</string> <string name="blocking_internet_device_offline">အင်တာနက် ပိတ်ဆို့နေဆဲ (စက် အော့ဖ်လိုင်း)</string> <string name="buy_credit">ခရက်ဒစ် ဝယ်ရန်</string> - <string name="buy_more_credit">ခရက်ဒစ်များ ဝယ်ရန်</string> <string name="cancel">မလုပ်တော့ပါ</string> <string name="changes_dialog_subtitle">ဤဗားရှင်းတွင် ပြောင်းလဲမှုများ-</string> <string name="cipher">ဝှက်စာ</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s သည် ကွန်ရက် အနှောင့်အယှက်လျှပ်လိုင်းကို ဂရုတစိုက် ထည့်ပြီး ကွန်ရက် ပက်ကက်အားလုံးကို အရွယ်အစားတူညီအောင် ပြုလုပ်၍ ထိုသို့လုပ်ဆောင်ခြင်းဖြစ်သည်။</string> <string name="daita_description_slide_2_second_paragraph">ကျွန်ုပ်တို့၏ဆာဗာအားလုံးတွင် %1$s ကိုဖွင့်ထားခြင်းမရှိပါ။ ထို့ကြောင့် ကျွန်ုပ်တို့သည် မည်သည့်ဆာဗာနှင့်မဆို %2$s ကိုဖွင့်ရန် မာလ်တီဟော့ပ်ကို အလိုအလျောက်အသုံးပြုပါသည်။</string> <string name="daita_info">“%1$s” ကို ဖွင့်လိုက်လျှင် သင်သည် %2$s ကိုဖွင့်ထားသည့် ဆာဗာကို ကိုယ်တိုင်ရွေးချယ်ရမည်ဖြစ်သည်။ ၎င်းသည် \"တည်နေရာကိုရွေးချယ်ပါ\" မြင်ကွင်းတွင် တွဲဖက်သုံးနိုင်သောဆာဗာကို မရွေးချယ်ရသေးမချင်း ပိတ်ဆို့ခံထားသောအခြေအနေတွင် အဆုံးသတ်စေနိုင်သည်။</string> - <string name="daita_relay_subset_warning">ဤလုပ်ဆောင်ချက်ကို ဆာဗာအားလုံးတွင် မရရှိနိုင်ပါ။ ဖွင့်ပြီးနောက် တည်နေရာ ပြောင်းလဲရန် လိုအပ်နိုင်သည်။</string> - <string name="daita_warning">သတိပြုရန်- ၎င်းသည် သင်၏ စုစုပေါင်းကွန်ရက်သုံးစွဲမှုကို တိုးစေသောကြောင့် သင့်ဒေတာပလန်မှာ အကန့်အသတ်ဖြင့်သာ ရှိပါက သတိထားပါ။ ၎င်းသည် သင်၏ကွန်ရက်အမြန်နှုန်းနှင့် ဘက်ထရီအသုံးပြုမှုကိုလည်း ထိခိုက်စေနိုင်သည်။</string> <string name="delete">ဖျက်ရန်</string> <string name="delete_custom_list_confirmation_description">\"%1$s\" ကို ဖျက်မည်လား။</string> <string name="delete_custom_list_message">\"%1$s\" ကို ဖျက်ပြီးပါပြီ</string> diff --git a/android/lib/resource/src/main/res/values-nb/plurals.xml b/android/lib/resource/src/main/res/values-nb/plurals.xml index a89cd08f3f..255436fa74 100644 --- a/android/lib/resource/src/main/res/values-nb/plurals.xml +++ b/android/lib/resource/src/main/res/values-nb/plurals.xml @@ -4,10 +4,6 @@ <item quantity="one">1 dag igjen</item> <item quantity="other">%1$d dager igjen</item> </plurals> - <plurals name="months_left"> - <item quantity="one">1 måned igjen</item> - <item quantity="other">%1$d måneder igjen</item> - </plurals> <plurals name="years_left"> <item quantity="one">1 år igjen</item> <item quantity="other">%1$d år igjen</item> @@ -32,24 +28,4 @@ <item quantity="one">Kontokreditt utløper om én time</item> <item quantity="other">Kontokreditt utløper om %1$d timer</item> </plurals> - <plurals name="days_ago"> - <item quantity="one">én dag siden</item> - <item quantity="other">%1$d dager siden</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="one">ett minutt siden</item> - <item quantity="other">%1$d minutter siden</item> - </plurals> - <plurals name="months_ago"> - <item quantity="one">én måned siden</item> - <item quantity="other">%1$d måneder siden</item> - </plurals> - <plurals name="years_ago"> - <item quantity="one">ett år siden</item> - <item quantity="other">%1$d år siden</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="one">én time siden</item> - <item quantity="other">%1$d timer siden</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-nb/strings.xml b/android/lib/resource/src/main/res/values-nb/strings.xml index 0ab2e77341..73a62b5efa 100644 --- a/android/lib/resource/src/main/res/values-nb/strings.xml +++ b/android/lib/resource/src/main/res/values-nb/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">API tilgjengelig, legger til metode …</string> <string name="api_unreachable">API ikke tilgjengelig</string> <string name="api_unreachable_save_anyway">API ikke tilgjengelig, lagre metoden uansett?</string> - <string name="app_version">Appversjon</string> <string name="apply">Angi</string> <string name="at_least_on_method_needs_to_enabled">Minst én metode må være aktivert</string> <string name="auth_failed">Kunne ikke autentisere konto. Send inn en problemrapport.</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">Du finner innstillingene for automatisk tilkobling og låsemodus i Androids systeminnstillinger. Følg denne veiledningen for å aktivere én eller begge.</string> <string name="auto_connect_carousel_second_slide_top_text">Automatisk tilkobling heter «Alltid-på-VPN» i Androids systeminnstillinger og sørger for at du alltid er tilkoblet VPN-tunnelen og automatisk tilkobling etter omstart.</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">her</string> - <string name="auto_connect_legacy">Automatisk tilkobling (eldre)</string> <string name="automatic">Automatisk</string> <string name="back">Tilbake</string> <string name="block_ads_title">Annonser</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">Blokkerer internettet</string> <string name="blocking_internet_device_offline">Blokkerer internett (enhet frakoblet)</string> <string name="buy_credit">Kjøp kreditt</string> - <string name="buy_more_credit">Kjøp mer kreditt</string> <string name="cancel">Avbryt</string> <string name="changes_dialog_subtitle">Endringer i denne versjonen:</string> <string name="cipher">Chiffer</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s gjør det ved å legge til nettverkstøy på en forsiktig måte og sørge for at alle nettverkspakker har den samme størrelsen.</string> <string name="daita_description_slide_2_second_paragraph">Ikke alle serverne våre er %1$s-aktiverte. Derfor bruker vi automatisk multihopp for å aktivere %2$s med alle servere.</string> <string name="daita_info">Hvis du aktiverer «%1$s», må du manuelt velge en server som har aktivert %2$s. Dette kan føre til at du havner i en blokkert tilstand inntil du har valgt en kompatibel server under «Velg plassering».</string> - <string name="daita_relay_subset_warning">Denne funksjonen er ikke tilgjengelig på alle servere. Det kan hende du må endre plassering etter aktivering.</string> - <string name="daita_warning">Merk: Siden dette øker den totale nettverkstrafikken, bør du være forsiktig hvis du har et abonnement med begrenset data. Det kan også negativt påvirke nettverkshastigheten og batteribruken.</string> <string name="delete">Slett</string> <string name="delete_custom_list_confirmation_description">Slette «%1$s»?</string> <string name="delete_custom_list_message">«%1$s» ble slettet</string> diff --git a/android/lib/resource/src/main/res/values-nl/plurals.xml b/android/lib/resource/src/main/res/values-nl/plurals.xml index 14f4057a45..c0703cebaa 100644 --- a/android/lib/resource/src/main/res/values-nl/plurals.xml +++ b/android/lib/resource/src/main/res/values-nl/plurals.xml @@ -4,10 +4,6 @@ <item quantity="one">1 dag resterend</item> <item quantity="other">%1$d dagen resterend</item> </plurals> - <plurals name="months_left"> - <item quantity="one">1 maand resterend</item> - <item quantity="other">%1$d maanden resterend</item> - </plurals> <plurals name="years_left"> <item quantity="one">1 jaar resterend</item> <item quantity="other">%1$d jaar resterend</item> @@ -32,24 +28,4 @@ <item quantity="one">Accountkrediet verloopt over een uur</item> <item quantity="other">Accountkrediet verloopt over %1$d uur</item> </plurals> - <plurals name="days_ago"> - <item quantity="one">een dag geleden</item> - <item quantity="other">%1$d dagen geleden</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="one">een minuut geleden</item> - <item quantity="other">%1$d minuten geleden</item> - </plurals> - <plurals name="months_ago"> - <item quantity="one">een maand geleden</item> - <item quantity="other">%1$d maanden geleden</item> - </plurals> - <plurals name="years_ago"> - <item quantity="one">een jaar geleden</item> - <item quantity="other">%1$d jaar geleden</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="one">een uur geleden</item> - <item quantity="other">%1$d uur geleden</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-nl/strings.xml b/android/lib/resource/src/main/res/values-nl/strings.xml index a2689b1285..5072500bd5 100644 --- a/android/lib/resource/src/main/res/values-nl/strings.xml +++ b/android/lib/resource/src/main/res/values-nl/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">API bereikbaar, methode toevoegen ...</string> <string name="api_unreachable">API onbereikbaar</string> <string name="api_unreachable_save_anyway">API onbereikbaar, methode toch opslaan?</string> - <string name="app_version">Appversie</string> <string name="apply">Toevoegen</string> <string name="at_least_on_method_needs_to_enabled">Er moet minimaal één methode ingeschakeld zijn</string> <string name="auth_failed">Kan account niet verifiëren. Stuur een probleemrapport.</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">De instellingen Automatisch verbinden en Lockdownmodus zijn te vinden in de Android-systeeminstellingen, volg deze gids om een of beide in te schakelen.</string> <string name="auto_connect_carousel_second_slide_top_text">Automatisch verbinden heet Altijd-aan VPN in de Android-systeeminstellingen en zorgt ervoor dat u altijd verbonden bent met de VPN-tunnel en automatisch verbinding maakt na een herstart.</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">hier</string> - <string name="auto_connect_legacy">Automatisch verbinden (verouderd)</string> <string name="automatic">Automatisch</string> <string name="back">Terug</string> <string name="block_ads_title">Advertenties</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">Internet blokkeren</string> <string name="blocking_internet_device_offline">Internet wordt geblokkeerd (apparaat offline)</string> <string name="buy_credit">Krediet kopen</string> - <string name="buy_more_credit">Meer krediet kopen</string> <string name="cancel">Annuleren</string> <string name="changes_dialog_subtitle">Wijzigingen in deze versie:</string> <string name="cipher">Versleuteling</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s doet dit door zorgvuldig netwerkruis toe te voegen en alle netwerkpakketten even groot te maken.</string> <string name="daita_description_slide_2_second_paragraph">Niet al onze servers zijn geschikt voor %1$s. Daarom gebruiken we automatisch multihop om %2$s in te schakelen bij elke server.</string> <string name="daita_info">Als u \"%1$s\" inschakelt, moet u handmatig een server selecteren die %2$s ondersteunt. Hierdoor kunt u in een geblokkeerde toestand terechtkomen totdat u een compatibele server hebt geselecteerd in het dialoogvenster \"Locatie selecteren\".</string> - <string name="daita_relay_subset_warning">Deze functie is niet op alle servers beschikbaar. Mogelijk moet u na het inschakelen van locatie veranderen.</string> - <string name="daita_warning">Let op: omdat dit het totale netwerkverkeer verhoogt, moet u voorzichtig zijn als u een beperkt data-abonnement hebt. Ook kan het uw netwerksnelheid en batterijgebruik beïnvloeden.</string> <string name="delete">Verwijderen</string> <string name="delete_custom_list_confirmation_description">\"%1$s\" verwijderen?</string> <string name="delete_custom_list_message">\"%1$s\" is verwijderd</string> diff --git a/android/lib/resource/src/main/res/values-pl/plurals.xml b/android/lib/resource/src/main/res/values-pl/plurals.xml index 75ffdd9650..baf3dae8e5 100644 --- a/android/lib/resource/src/main/res/values-pl/plurals.xml +++ b/android/lib/resource/src/main/res/values-pl/plurals.xml @@ -6,12 +6,6 @@ <item quantity="many">Pozostało %1$d dni</item> <item quantity="other">Pozostało %1$d dnia</item> </plurals> - <plurals name="months_left"> - <item quantity="one">Pozostał 1 miesiąc</item> - <item quantity="few">Pozostały %1$d miesiące</item> - <item quantity="many">Pozostało %1$d miesięcy</item> - <item quantity="other">Pozostało %1$d miesiąca</item> - </plurals> <plurals name="years_left"> <item quantity="one">Pozostał 1 rok</item> <item quantity="few">Pozostały %1$d lata</item> @@ -48,34 +42,4 @@ <item quantity="many">Doładowanie konta wygasa za %1$d godzin</item> <item quantity="other">Doładowanie konta wygasa za %1$d godziny</item> </plurals> - <plurals name="days_ago"> - <item quantity="one">dzień temu</item> - <item quantity="few">%1$d dni temu</item> - <item quantity="many">%1$d dni temu</item> - <item quantity="other">%1$d dnia temu</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="one">minutę temu</item> - <item quantity="few">%1$d minuty temu</item> - <item quantity="many">%1$d minut temu</item> - <item quantity="other">%1$d minuty temu</item> - </plurals> - <plurals name="months_ago"> - <item quantity="one">miesiąc temu</item> - <item quantity="few">%1$d miesiące temu</item> - <item quantity="many">%1$d miesięcy temu</item> - <item quantity="other">%1$d miesiąca temu</item> - </plurals> - <plurals name="years_ago"> - <item quantity="one">rok temu</item> - <item quantity="few">%1$d lata temu</item> - <item quantity="many">%1$d lat temu</item> - <item quantity="other">%1$d roku temu</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="one">godzinę temu</item> - <item quantity="few">%1$d godziny temu</item> - <item quantity="many">%1$d godzin temu</item> - <item quantity="other">%1$d godzuny temu</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-pl/strings.xml b/android/lib/resource/src/main/res/values-pl/strings.xml index 68d21e88fb..78db009c0c 100644 --- a/android/lib/resource/src/main/res/values-pl/strings.xml +++ b/android/lib/resource/src/main/res/values-pl/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">Interfejs API osiągalny, dodawanie metody...</string> <string name="api_unreachable">API nieosiągalny</string> <string name="api_unreachable_save_anyway">Interfejs API nieosiągalny, zapisać metodę mimo to?</string> - <string name="app_version">Wersja aplikacji</string> <string name="apply">Zastosuj</string> <string name="at_least_on_method_needs_to_enabled">Należy włączyć co najmniej jedną metodę</string> <string name="auth_failed">Nie można uwierzytelnić konta. Wyślij zgłoszenie problemu.</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">Ustawienia trybu automatycznego łączenia i trybu Lockdown można znaleźć w ustawieniach systemu Android. Aby włączyć jeden lub oba tryby, postępuj zgodnie z niniejszym poradnikiem.</string> <string name="auto_connect_carousel_second_slide_top_text">Automatyczne łączenie w ustawieniach systemu Android nazywa się „Zawsze włączony VPN” i zapewnia stałe połączenie z tunelem VPN oraz automatyczne łączenie po ponownym uruchomieniu.</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">tutaj</string> - <string name="auto_connect_legacy">Automatyczne łączenie (starsza wersja)</string> <string name="automatic">Automatycznie</string> <string name="back">Wstecz</string> <string name="block_ads_title">Reklamy</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">Blokowanie Internetu</string> <string name="blocking_internet_device_offline">Blokowanie Internetu (urządzenie rozłączone)</string> <string name="buy_credit">Kup doładowanie</string> - <string name="buy_more_credit">Doładuj konto</string> <string name="cancel">Anuluj</string> <string name="changes_dialog_subtitle">Zmiany w tej wersji:</string> <string name="cipher">Szyfrowanie</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s w tym celu ostrożnie dodaje szum sieciowy i nadaje ten sam rozmiar wszystkim pakietom sieciowym.</string> <string name="daita_description_slide_2_second_paragraph">Nie wszystkie nasze serwery obsługują %1$s. Dlatego automatycznie używamy funkcji wielokrotnego przeskoku, aby umożliwić działanie %2$s z dowolnym serwerem.</string> <string name="daita_info">Po włączeniu opcji „%1$s” trzeba ręcznie wybrać serwer, który obsługuje %2$s. Może to skutkować zablokowaniem, dopóki nie wybierzesz zgodnego serwera w widoku „Wybierz lokalizację”.</string> - <string name="daita_relay_subset_warning">Funkcja niedostępna na wszystkich serwerach. Po włączeniu może być konieczna zmiana lokalizacji.</string> - <string name="daita_warning">Uwaga: ponieważ zwiększa to łączny ruch sieciowy, zachowaj ostrożność, jeśli masz ograniczony pakiet danych. Może to również negatywnie wpłynąć na szybkość sieci i poziom naładowania.</string> <string name="delete">Usuń</string> <string name="delete_custom_list_confirmation_description">Usunąć „%1$s”?</string> <string name="delete_custom_list_message">Usunięto „%1$s”</string> diff --git a/android/lib/resource/src/main/res/values-pt/plurals.xml b/android/lib/resource/src/main/res/values-pt/plurals.xml index f4e20c19f1..410ea1d452 100644 --- a/android/lib/resource/src/main/res/values-pt/plurals.xml +++ b/android/lib/resource/src/main/res/values-pt/plurals.xml @@ -4,10 +4,6 @@ <item quantity="one">1 dia restante</item> <item quantity="other">%1$d dias restantes</item> </plurals> - <plurals name="months_left"> - <item quantity="one">1 mês restante</item> - <item quantity="other">%1$d meses restantes</item> - </plurals> <plurals name="years_left"> <item quantity="one">1 ano restante</item> <item quantity="other">%1$d anos restantes</item> @@ -32,24 +28,4 @@ <item quantity="one">O crédito da conta expira dentro de uma hora</item> <item quantity="other">O crédito da conta expira dentro de %1$d horas</item> </plurals> - <plurals name="days_ago"> - <item quantity="one">há um dia</item> - <item quantity="other">há %1$d dias</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="one">há um minuto</item> - <item quantity="other">há %1$d minutos</item> - </plurals> - <plurals name="months_ago"> - <item quantity="one">há um mês</item> - <item quantity="other">há %1$d meses</item> - </plurals> - <plurals name="years_ago"> - <item quantity="one">há um ano</item> - <item quantity="other">há %1$d anos</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="one">há uma hora</item> - <item quantity="other">há %1$d horas</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-pt/strings.xml b/android/lib/resource/src/main/res/values-pt/strings.xml index a69366aa1e..d4da188cdd 100644 --- a/android/lib/resource/src/main/res/values-pt/strings.xml +++ b/android/lib/resource/src/main/res/values-pt/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">API alcançável, a adicionar método...</string> <string name="api_unreachable">API inalcançável</string> <string name="api_unreachable_save_anyway">API inalcançável, guardar o método mesmo assim?</string> - <string name="app_version">Versão da app</string> <string name="apply">Aplicar</string> <string name="at_least_on_method_needs_to_enabled">É necessário ativar pelo menos um método</string> <string name="auth_failed">Não foi possível autenticar a conta. Envie um relatório do problema.</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">As definições da ligação automática e do modo de bloqueio podem ser encontradas nas definições do sistema Android. Siga este guia para ativar uma ou ambas as funcionalidades.</string> <string name="auto_connect_carousel_second_slide_top_text">A ligação automática é designada por VPN sempre ligada nas definições do sistema Android e assegura que está constantemente ligado ao túnel VPN e ligar-se-á automaticamente após o reinício.</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">aqui</string> - <string name="auto_connect_legacy">Ligação automática (método antigo)</string> <string name="automatic">Automático</string> <string name="back">Retroceder</string> <string name="block_ads_title">Anúncios</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">A bloquear a Internet</string> <string name="blocking_internet_device_offline">Bloqueio de Internet (dispositivo offline)</string> <string name="buy_credit">Comprar crédito</string> - <string name="buy_more_credit">Comprar mais crédito</string> <string name="cancel">Cancelar</string> <string name="changes_dialog_subtitle">Alterações nesta versão:</string> <string name="cipher">Cifra</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s consegue-o ao adicionar cuidadosamente ruído de rede e ao tornar todos os pacotes de rede do mesmo tamanho.</string> <string name="daita_description_slide_2_second_paragraph">Nem todos os servidores suportam %1$s. Por isso, utilizamos multihop automaticamente para ativar %2$s em qualquer servidor.</string> <string name="daita_info">Ao ativar “%1$s”, terá de selecionar manualmente um servidor que tenha %2$s ativada, o que pode fazer com que fique num estado bloqueado até selecionar um servidor compatível na vista \"Selecionar localização\".</string> - <string name="daita_relay_subset_warning">Esta funcionalidade não está disponível em todos os servidores. Poderá ser necessário alterar a localização após a ativação.</string> - <string name="daita_warning">Atenção: visto que isto aumenta o tráfego total da sua rede, tenha cuidado se tiver um plano de dados limitado. Também pode afetar negativamente a velocidade da rede e a utilização da bateria.</string> <string name="delete">Eliminar</string> <string name="delete_custom_list_confirmation_description">Eliminar \"%1$s\"?</string> <string name="delete_custom_list_message">\"%1$s\" foi eliminada</string> diff --git a/android/lib/resource/src/main/res/values-ru/plurals.xml b/android/lib/resource/src/main/res/values-ru/plurals.xml index 1f92a172da..39004debfe 100644 --- a/android/lib/resource/src/main/res/values-ru/plurals.xml +++ b/android/lib/resource/src/main/res/values-ru/plurals.xml @@ -6,12 +6,6 @@ <item quantity="many">Осталось %1$d дней</item> <item quantity="other">Осталось %1$d дня</item> </plurals> - <plurals name="months_left"> - <item quantity="one">Остался %1$d месяц</item> - <item quantity="few">Осталось %1$d месяца</item> - <item quantity="many">Осталось %1$d месяцев</item> - <item quantity="other">Осталось %1$d месяца</item> - </plurals> <plurals name="years_left"> <item quantity="one">Остался %1$d год</item> <item quantity="few">Осталось %1$d года</item> @@ -48,34 +42,4 @@ <item quantity="many">Срок действия баланса учетной записи истекает через %1$d часов</item> <item quantity="other">Срок действия баланса учетной записи истекает через %1$d часа</item> </plurals> - <plurals name="days_ago"> - <item quantity="one">%1$d день назад</item> - <item quantity="few">%1$d дня назад</item> - <item quantity="many">%1$d дней назад</item> - <item quantity="other">%1$d дня назад</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="one">%1$d минуту назад</item> - <item quantity="few">%1$d минуты назад</item> - <item quantity="many">%1$d минут назад</item> - <item quantity="other">%1$d минуты назад</item> - </plurals> - <plurals name="months_ago"> - <item quantity="one">%1$d месяц назад</item> - <item quantity="few">%1$d месяца назад</item> - <item quantity="many">%1$d месяцев назад</item> - <item quantity="other">%1$d месяца назад</item> - </plurals> - <plurals name="years_ago"> - <item quantity="one">%1$d год назад</item> - <item quantity="few">%1$d года назад</item> - <item quantity="many">%1$d лет назад</item> - <item quantity="other">%1$d года назад</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="one">%1$d час назад</item> - <item quantity="few">%1$d часа назад</item> - <item quantity="many">%1$d часов назад</item> - <item quantity="other">%1$d часа назад</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-ru/strings.xml b/android/lib/resource/src/main/res/values-ru/strings.xml index 5523dd13b9..12bb0d4dc5 100644 --- a/android/lib/resource/src/main/res/values-ru/strings.xml +++ b/android/lib/resource/src/main/res/values-ru/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">Есть доступ к API, добавляем метод...</string> <string name="api_unreachable">Нет доступа к API</string> <string name="api_unreachable_save_anyway">Нет доступа к API. Сохранить метод?</string> - <string name="app_version">Версия приложения</string> <string name="apply">Применить</string> <string name="at_least_on_method_needs_to_enabled">Должен быть включен хотя бы один метод</string> <string name="auth_failed">Не удается произвести аутентификацию учетной записи. Отправьте сообщение о проблеме.</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">Настройки автоподключения и режима блокировки можно найти в системных настройках Android. Чтобы включить их, следуйте этой инструкции.</string> <string name="auto_connect_carousel_second_slide_top_text">В системных настройках Android автоподключение называется «Постоянная VPN». Эта опция обеспечивает постоянное подключение к туннелю VPN и автоподключение после перезапуска.</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">здесь</string> - <string name="auto_connect_legacy">Автоподключение (устаревшее)</string> <string name="automatic">Автоматически</string> <string name="back">Назад</string> <string name="block_ads_title">Реклама</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">Блокируется доступ в Интернет</string> <string name="blocking_internet_device_offline">Блокируется доступ в Интернет (устройство офлайн)</string> <string name="buy_credit">Пополнить баланс</string> - <string name="buy_more_credit">Пополнить баланс</string> <string name="cancel">Отмена</string> <string name="changes_dialog_subtitle">Изменения в этой версии:</string> <string name="cipher">Шифр</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">Для этого %1$s добавляет в трафик сетевой шум, а все пакеты приводятся к одному размеру.</string> <string name="daita_description_slide_2_second_paragraph">%1$s поддерживается не на всех серверах. Поэтому, чтобы функция %2$s работала с любым сервером, мы автоматически используем многократный переход.</string> <string name="daita_info">После включения параметра «%1$s» вы должны будете вручную выбрать сервер, который поддерживает %2$s. В результате вы можете оказаться заблокированы, пока не выберете совместимый сервер в окне выбора местоположения.</string> - <string name="daita_relay_subset_warning">Эта функция доступна не на всех серверах. Возможно, после ее включения придется сменить местоположение.</string> - <string name="daita_warning">Внимание! При использовании этой функции общий сетевой трафик увеличивается. Имейте это в виду, если у вас тарифный план с ограничением по трафику. Также может снизиться скорость сети и повыситься расход заряда аккумулятора.</string> <string name="delete">Удалить</string> <string name="delete_custom_list_confirmation_description">Удалить список «%1$s»?</string> <string name="delete_custom_list_message">Список «%1$s» удален</string> diff --git a/android/lib/resource/src/main/res/values-sv/plurals.xml b/android/lib/resource/src/main/res/values-sv/plurals.xml index e556fecabf..5370f01151 100644 --- a/android/lib/resource/src/main/res/values-sv/plurals.xml +++ b/android/lib/resource/src/main/res/values-sv/plurals.xml @@ -4,10 +4,6 @@ <item quantity="one">1 dag kvar</item> <item quantity="other">%1$d dagar kvar</item> </plurals> - <plurals name="months_left"> - <item quantity="one">1 månad kvar</item> - <item quantity="other">%1$d månader kvar</item> - </plurals> <plurals name="years_left"> <item quantity="one">1 år kvar</item> <item quantity="other">%1$d år kvar</item> @@ -32,24 +28,4 @@ <item quantity="one">Kontokrediten slutar gälla om en timme</item> <item quantity="other">Kontokrediten slutar gälla om %1$d timmar</item> </plurals> - <plurals name="days_ago"> - <item quantity="one">en dag sedan</item> - <item quantity="other">%1$d dagar sedan</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="one">en minut sedan</item> - <item quantity="other">%1$d minuter sedan</item> - </plurals> - <plurals name="months_ago"> - <item quantity="one">en månad sedan</item> - <item quantity="other">%1$d månader sedan</item> - </plurals> - <plurals name="years_ago"> - <item quantity="one">ett år sedan</item> - <item quantity="other">%1$d år sedan</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="one">en timme sedan</item> - <item quantity="other">%1$d timmar sedan</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-sv/strings.xml b/android/lib/resource/src/main/res/values-sv/strings.xml index 4a8547b7f3..6660459e45 100644 --- a/android/lib/resource/src/main/res/values-sv/strings.xml +++ b/android/lib/resource/src/main/res/values-sv/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">API kan nås, lägger till metod ...</string> <string name="api_unreachable">API kan inte nås</string> <string name="api_unreachable_save_anyway">API kan inte nås, spara metod ändå?</string> - <string name="app_version">Appversion</string> <string name="apply">Använd</string> <string name="at_least_on_method_needs_to_enabled">Minst en metod måste vara aktiverad</string> <string name="auth_failed">Det går inte att autentisera kontot. Skicka en problemrapport.</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">Inställningar för Anslut automatiskt och Låsningsläge finns i Androids systeminställningar. Följ guiden för att aktivera en av dem eller båda.</string> <string name="auto_connect_carousel_second_slide_top_text">Anslut automatiskt kallas Alltid på-VPN i Androids systeminställningar och ser till att du är ansluten till VPN-tunneln oavbrutet och ansluter automatiskt efter omstart.</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">här</string> - <string name="auto_connect_legacy">Anslut automatiskt (äldre)</string> <string name="automatic">Automatisk</string> <string name="back">Tillbaka</string> <string name="block_ads_title">Annonser</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">Blockerar internet</string> <string name="blocking_internet_device_offline">Blockerar internet (enheten är offline)</string> <string name="buy_credit">Köp kredit</string> - <string name="buy_more_credit">Köp mer kredit</string> <string name="cancel">Avbryt</string> <string name="changes_dialog_subtitle">Ändringar i den här versionen:</string> <string name="cipher">Chiffrering</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s gör det genom att noggrant lägga till nätverksbrus och se till så att alla nätverkspaket har samma storlek.</string> <string name="daita_description_slide_2_second_paragraph">Det är inte alla våra servrar som är %1$s-aktiverade. Därför använder vi multihopp automatiskt för att aktivera %2$s med alla servrar.</string> <string name="daita_info">Om du aktiverar \"%1$s\" måste du manuellt välja en server som är %2$s-aktiverad. Det kan leda till ett blockerat tillstånd tills du väljer en kompatibel server i \"Välj plats\"-vyn.</string> - <string name="daita_relay_subset_warning">Det här funktionen är inte tillgänglig på alla servrar. Du kanske måste ändra plats efter aktivering.</string> - <string name="daita_warning">Obs! Detta ökar nätverkstrafiken så var försiktig om du har ett abonnemang med begränsad mängd data. Det kan även ha en negativ påverkan på din nätverkshastighet och batterianvändning.</string> <string name="delete">Ta bort</string> <string name="delete_custom_list_confirmation_description">Ta bort \"%1$s\"?</string> <string name="delete_custom_list_message">\"%1$s\" har tagits bort</string> diff --git a/android/lib/resource/src/main/res/values-th/plurals.xml b/android/lib/resource/src/main/res/values-th/plurals.xml index 6afb878ef0..f0c9e497ce 100644 --- a/android/lib/resource/src/main/res/values-th/plurals.xml +++ b/android/lib/resource/src/main/res/values-th/plurals.xml @@ -3,9 +3,6 @@ <plurals name="days_left"> <item quantity="other">คงเหลือ %1$d วัน</item> </plurals> - <plurals name="months_left"> - <item quantity="other">คงเหลือ %1$d เดือน</item> - </plurals> <plurals name="years_left"> <item quantity="other">คงเหลือ %1$d ปี</item> </plurals> @@ -24,19 +21,4 @@ <plurals name="account_credit_expires_in_hours"> <item quantity="other">เครดิตของบัญชีจะหมดอายุใน %1$d ชั่วโมง</item> </plurals> - <plurals name="days_ago"> - <item quantity="other">%1$d วันก่อน</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="other">%1$d นาทีก่อน</item> - </plurals> - <plurals name="months_ago"> - <item quantity="other">%1$d เดือนก่อน</item> - </plurals> - <plurals name="years_ago"> - <item quantity="other">%1$d ปีก่อน</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="other">%1$d ชั่วโมงก่อน</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-th/strings.xml b/android/lib/resource/src/main/res/values-th/strings.xml index fdd19e3845..b840b62b9c 100644 --- a/android/lib/resource/src/main/res/values-th/strings.xml +++ b/android/lib/resource/src/main/res/values-th/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">เข้าถึง API ได้ กำลังเพิ่มวิธีการ...</string> <string name="api_unreachable">ไม่สามารถเข้าถึง API ได้</string> <string name="api_unreachable_save_anyway">เข้าถึง API ไม่ได้ บันทึกวิธีการหรือไม่</string> - <string name="app_version">เวอร์ชันแอป</string> <string name="apply">ใช้</string> <string name="at_least_on_method_needs_to_enabled">จำเป็นต้องเปิดใช้อย่างน้อยหนึ่งวิธีการ</string> <string name="auth_failed">ไม่สามารถตรวจสอบความถูกต้องของบัญชีได้ โปรดส่งรายงานปัญหา</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">การตั้งค่าการเชื่อมต่ออัตโนมัติและโหมดล็อกดาวน์ อยู่ในการตั้งค่าระบบ Android โปรดทำตามคำแนะนำนี้ เพื่อเปิดใช้งานโหมดใดโหมดหนึ่ง หรือทั้งสองโหมด</string> <string name="auto_connect_carousel_second_slide_top_text">การเชื่อมต่ออัตโนมัติเรียกว่า Always-on VPN ในการตั้งค่าระบบ Android ซึ่งจะช่วยให้คุณมั่นใจได้ว่า คุณเชื่อมต่อกับช่องทาง VPN อย่างต่อเนื่อง และมีการเชื่อมต่ออัตโนมัติหลังจากรีสตาร์ต</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">ที่นี่</string> - <string name="auto_connect_legacy">เชื่อมต่ออัตโนมัติ (เดิม)</string> <string name="automatic">อัตโนมัติ</string> <string name="back">ย้อนกลับ</string> <string name="block_ads_title">โฆษณา</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">กำลังบล็อกอินเทอร์เน็ต</string> <string name="blocking_internet_device_offline">กำลังบล็อกอินเทอร์เน็ต (อุปกรณ์ออฟไลน์)</string> <string name="buy_credit">ซื้อเครดิต</string> - <string name="buy_more_credit">ซื้อเครดิตเพิ่ม</string> <string name="cancel">ยกเลิก</string> <string name="changes_dialog_subtitle">การเปลี่ยนแปลงในเวอร์ชันนี้:</string> <string name="cipher">เข้ารหัส</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s ได้ดำเนินการนี้ ด้วยการเพิ่มสัญญาณรบกวนเครือข่ายอย่างระมัดระวัง และทำให้แพ็กเก็ตเครือข่ายทั้งหมดมีขนาดเท่ากัน</string> <string name="daita_description_slide_2_second_paragraph">ไม่ใช่ทุกเซิร์ฟเวอร์ของเราที่เปิดใช้งาน %1$s ด้วยเหตุนี้เอง เราจึงใช้การมัลติฮอปอัตโนมัติ เพื่อเปิดใช้งาน %2$s กับทุกเซิร์ฟเวอร์</string> <string name="daita_info">โดยการเปิดใช้งาน “%1$s” คุณจะต้องเลือกเซิร์ฟเวอร์ที่เปิดใช้งาน %2$s ด้วยตนเอง ซึ่งอาจทำให้คุณอยู่ในสถานะถูกบล็อก จนกว่าคุณจะเลือกเซิร์ฟเวอร์ที่เข้ากันได้ในมุมมอง \"เลือกตำแหน่งที่ตั้ง\"</string> - <string name="daita_relay_subset_warning">คุณลักษณะนี้ไม่พร้อมใช้งานบนทุกเซิร์ฟเวอร์ คุณอาจต้องต้องเปลี่ยนตำแหน่งที่ตั้ง หลังจากเปิดใช้งาน</string> - <string name="daita_warning">โปรดทราบ: โปรดใช้ความระมัดระวัง หากคุณมีแผนข้อมูลที่มีปริมาณจำกัด เนื่องจากการดำเนินการนี้ จะเพิ่มการรับส่งข้อมูลโดยรวมของคุณขึ้น การดำเนินการนี้ อาจส่งผลเชิงลบต่อความเร็วเครือข่าย และการใช้งานแบตเตอรี่ของคุณได้</string> <string name="delete">ลบ</string> <string name="delete_custom_list_confirmation_description">ลบ \"%1$s\" หรือไม่</string> <string name="delete_custom_list_message">\"%1$s\" ถูกลบแล้ว</string> diff --git a/android/lib/resource/src/main/res/values-tr/plurals.xml b/android/lib/resource/src/main/res/values-tr/plurals.xml index 84e1e85170..a7350176c3 100644 --- a/android/lib/resource/src/main/res/values-tr/plurals.xml +++ b/android/lib/resource/src/main/res/values-tr/plurals.xml @@ -4,10 +4,6 @@ <item quantity="one">1 gün kaldı</item> <item quantity="other">%1$d gün kaldı</item> </plurals> - <plurals name="months_left"> - <item quantity="one">1 ay kaldı</item> - <item quantity="other">%1$d ay kaldı</item> - </plurals> <plurals name="years_left"> <item quantity="one">1 yıl kaldı</item> <item quantity="other">%1$d yıl kaldı</item> @@ -32,24 +28,4 @@ <item quantity="one">Hesap kredisi bir saat içinde sona eriyor</item> <item quantity="other">Hesap kredisi %1$d saat içinde sona eriyor</item> </plurals> - <plurals name="days_ago"> - <item quantity="one">bir gün önce</item> - <item quantity="other">%1$d gün önce</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="one">bir dakika önce</item> - <item quantity="other">%1$d dakika önce</item> - </plurals> - <plurals name="months_ago"> - <item quantity="one">bir ay önce</item> - <item quantity="other">%1$d ay önce</item> - </plurals> - <plurals name="years_ago"> - <item quantity="one">bir yıl önce</item> - <item quantity="other">%1$d yıl önce</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="one">bir saat önce</item> - <item quantity="other">%1$d saat önce</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-tr/strings.xml b/android/lib/resource/src/main/res/values-tr/strings.xml index 8ec78da21f..b8a135894b 100644 --- a/android/lib/resource/src/main/res/values-tr/strings.xml +++ b/android/lib/resource/src/main/res/values-tr/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">Erişilebilir API, yöntem ekleniyor...</string> <string name="api_unreachable">Erişilemez API</string> <string name="api_unreachable_save_anyway">API\'ye erişilemiyor, yöntem yine de kaydedilsin mi?</string> - <string name="app_version">Uygulama sürümü</string> <string name="apply">Uygula</string> <string name="at_least_on_method_needs_to_enabled">En az bir yöntemin etkinleştirilmesi gerekiyor</string> <string name="auth_failed">Hesap doğrulanamıyor. Lütfen bir hata raporu gönderin.</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">Otomatik Bağlantı ve Kilitleme modu ayarları Android sistem ayarlarında yer alır. Bu ayarlardan birini veya her ikisini de etkinleştirmek için bu kılavuza göz atın.</string> <string name="auto_connect_carousel_second_slide_top_text">Otomatik bağlantı, Android sistem ayarlarında VPN her zaman açık olarak gösterilir ve VPN tüneline sürekli bağlı olmanızı ve yeniden başlatma sonrası otomatik olarak bağlanmanızı sağlar.</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">burada</string> - <string name="auto_connect_legacy">Otomatik bağlan (eski)</string> <string name="automatic">Otomatik</string> <string name="back">Geri</string> <string name="block_ads_title">Reklamlar</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">İnternet bağlantısı engelleniyor</string> <string name="blocking_internet_device_offline">İnternet bağlantısı engelleniyor (cihaz çevrimdışı)</string> <string name="buy_credit">Kredi satın alın</string> - <string name="buy_more_credit">Daha fazla kredi satın alın</string> <string name="cancel">İptal et</string> <string name="changes_dialog_subtitle">Bu sürümdeki değişiklikler:</string> <string name="cipher">Şifre</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s, dikkatli bir şekilde ağ paraziti ekleyerek ve tüm ağ paketlerini aynı boyuta getirerek sizi izlenmekten korur.</string> <string name="daita_description_slide_2_second_paragraph">%1$s, tüm sunucularımızda etkin değildir. Bu nedenle, %2$s özelliğini herhangi bir sunucuda etkinleştirmek için otomatik olarak çoklu geçişi kullanırız.</string> <string name="daita_info">\"%1$s\" seçeneğini etkinleştirdiğinizde %2$s özellikli bir sunucuyu manuel olarak seçmeniz gerekir. Bu, \"Konum seç\" görünümünde uyumlu bir sunucu seçilene kadar engellenmiş durumda kalmanıza neden olabilir.</string> - <string name="daita_relay_subset_warning">Bu özellik tüm sunucularda mevcut değildir. Etkinleştirdikten sonra konumu değiştirmeniz gerekebilir.</string> - <string name="daita_warning">Dikkat: Bu özellik, toplam ağ trafiğinizi artıracağından sınırlı bir veri planınız varsa dikkatli olun. Ağ hızınız ve pil kullanımınız da bu durumdan olumsuz etkilenebilir.</string> <string name="delete">Sil</string> <string name="delete_custom_list_confirmation_description">\"%1$s\" silinsin mi\"?</string> <string name="delete_custom_list_message">\"%1$s\" silindi</string> diff --git a/android/lib/resource/src/main/res/values-zh-rCN/plurals.xml b/android/lib/resource/src/main/res/values-zh-rCN/plurals.xml index 4a044bd508..53005eabf8 100644 --- a/android/lib/resource/src/main/res/values-zh-rCN/plurals.xml +++ b/android/lib/resource/src/main/res/values-zh-rCN/plurals.xml @@ -3,9 +3,6 @@ <plurals name="days_left"> <item quantity="other">剩余 %1$d 天</item> </plurals> - <plurals name="months_left"> - <item quantity="other">剩余 %1$d 个月</item> - </plurals> <plurals name="years_left"> <item quantity="other">剩余 %1$d 年</item> </plurals> @@ -24,19 +21,4 @@ <plurals name="account_credit_expires_in_hours"> <item quantity="other">帐户额度将在 %1$d 小时后到期</item> </plurals> - <plurals name="days_ago"> - <item quantity="other">%1$d 天前</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="other">%1$d 分钟前</item> - </plurals> - <plurals name="months_ago"> - <item quantity="other">%1$d 个月前</item> - </plurals> - <plurals name="years_ago"> - <item quantity="other">%1$d 年前</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="other">%1$d 小时前</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-zh-rCN/strings.xml b/android/lib/resource/src/main/res/values-zh-rCN/strings.xml index 16ce33aea5..5068310751 100644 --- a/android/lib/resource/src/main/res/values-zh-rCN/strings.xml +++ b/android/lib/resource/src/main/res/values-zh-rCN/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">可通过 API 访问，正在添加方法…</string> <string name="api_unreachable">无法通过 API 访问</string> <string name="api_unreachable_save_anyway">无法通过 API 访问，是否仍然保存方法？</string> - <string name="app_version">应用版本</string> <string name="apply">应用</string> <string name="at_least_on_method_needs_to_enabled">至少需要启用一个方法</string> <string name="auth_failed">无法验证帐户。请发送问题报告。</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">自动连接和锁定模式设置可以在 Android 系统设置中找到，请按照本指南启用其中一项或两项。</string> <string name="auto_connect_carousel_second_slide_top_text">自动连接在 Android 系统设置中称为“始终开启 VPN”，此功能可确保您始终连接到 VPN 隧道并在重新启动后自动连接。</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">（点击此处）</string> - <string name="auto_connect_legacy">自动连接（旧）</string> <string name="automatic">自动</string> <string name="back">返回</string> <string name="block_ads_title">广告</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">正在阻止网络</string> <string name="blocking_internet_device_offline">正在阻止网络（设备离线）</string> <string name="buy_credit">购买额度</string> - <string name="buy_more_credit">购买更多额度</string> <string name="cancel">取消</string> <string name="changes_dialog_subtitle">此版本中的变更：</string> <string name="cipher">加密方式</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s 的实现方法是精心添加网络噪声并将所有网络数据包处理为相同的大小。</string> <string name="daita_description_slide_2_second_paragraph">我们的部分服务器未启用 %1$s。因此，我们使用多跳自动为任何服务器启用 %2$s。</string> <string name="daita_info">启用“%1$s”后，您需要手动选择启用了 %2$s 的服务器。这可能导致您在“选择位置”视图中选择兼容服务器之前处于阻止状态。</string> - <string name="daita_relay_subset_warning">此功能并非在所有服务器上都可用。启用后，您可能需要更改位置。</string> - <string name="daita_warning">注意：这样会增加您的网络总流量，因此，如果您的数据套餐流量有限，请谨慎使用。这种方式还会对网速和电池用量产生负面影响。</string> <string name="delete">删除</string> <string name="delete_custom_list_confirmation_description">删除“%1$s”？</string> <string name="delete_custom_list_message">“%1$s”已被删除</string> diff --git a/android/lib/resource/src/main/res/values-zh-rTW/plurals.xml b/android/lib/resource/src/main/res/values-zh-rTW/plurals.xml index 461e6276ae..066bbbe5c8 100644 --- a/android/lib/resource/src/main/res/values-zh-rTW/plurals.xml +++ b/android/lib/resource/src/main/res/values-zh-rTW/plurals.xml @@ -3,9 +3,6 @@ <plurals name="days_left"> <item quantity="other">剩餘 %1$d 天</item> </plurals> - <plurals name="months_left"> - <item quantity="other">剩餘 %1$d 個月</item> - </plurals> <plurals name="years_left"> <item quantity="other">剩餘 %1$d 年</item> </plurals> @@ -24,19 +21,4 @@ <plurals name="account_credit_expires_in_hours"> <item quantity="other">帳戶點數將在 %1$d 小時後到期</item> </plurals> - <plurals name="days_ago"> - <item quantity="other">%1$d 天前</item> - </plurals> - <plurals name="minutes_ago"> - <item quantity="other">%1$d 分鐘前</item> - </plurals> - <plurals name="months_ago"> - <item quantity="other">%1$d 個月前</item> - </plurals> - <plurals name="years_ago"> - <item quantity="other">%1$d 年前</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="other">%1$d 小時前</item> - </plurals> </resources> diff --git a/android/lib/resource/src/main/res/values-zh-rTW/strings.xml b/android/lib/resource/src/main/res/values-zh-rTW/strings.xml index 5c23e90f70..4980679d88 100644 --- a/android/lib/resource/src/main/res/values-zh-rTW/strings.xml +++ b/android/lib/resource/src/main/res/values-zh-rTW/strings.xml @@ -32,7 +32,6 @@ <string name="api_reachable_adding_method">可透過 API 存取，正在新增方式…</string> <string name="api_unreachable">無法透過 API 存取</string> <string name="api_unreachable_save_anyway">無法透過 API 存取，仍要儲存方式嗎？</string> - <string name="app_version">應用程式版本</string> <string name="apply">套用</string> <string name="at_least_on_method_needs_to_enabled">至少需要啟用一種方式</string> <string name="auth_failed">無法驗證帳戶。請傳送問題回報。</string> @@ -42,7 +41,6 @@ <string name="auto_connect_carousel_first_slide_top_text">自動連線和鎖定模式設定皆可在 Android 系統設定中找到，請按照本指南的指示，啟用其中一項或兩項設定。</string> <string name="auto_connect_carousel_second_slide_top_text">自動連線在 Android 系統設定中稱為「始終啟用 VPN」，此功能可確保您始終與 VPN 通道連線，並且會在重新啟動後自動連線。</string> <string name="auto_connect_carousel_third_slide_top_text_website_link">此處</string> - <string name="auto_connect_legacy">自動連線 (舊)</string> <string name="automatic">自動</string> <string name="back">返回</string> <string name="block_ads_title">廣告</string> @@ -55,7 +53,6 @@ <string name="blocking_internet">正在封鎖網路</string> <string name="blocking_internet_device_offline">封鎖網際網路 (裝置離線)</string> <string name="buy_credit">購買點數</string> - <string name="buy_more_credit">購買更多點數</string> <string name="cancel">取消</string> <string name="changes_dialog_subtitle">此版本中的變更：</string> <string name="cipher">加密方式</string> @@ -99,8 +96,6 @@ <string name="daita_description_slide_2_first_paragraph">%1$s 會仔細加入網路噪音，讓所有網路資料封包大小皆相同，以達到此目的。</string> <string name="daita_description_slide_2_second_paragraph">我們有些伺服器並未啟用 %1$s。因此，我們使用多點跳躍自動來為任意伺服器啟用 %2$s 。</string> <string name="daita_info">啟用「%1$s」後，您必須手動選取已啟用 %2$s 的伺服器。這有可能導致您後來處於封鎖狀態，直到您在「選取位置」檢視圖中選到相容的伺服器為止。</string> - <string name="daita_relay_subset_warning">此功能尚未在所有伺服器上開放。啟用後，您可能需要變更位置。</string> - <string name="daita_warning">注意：這會增加您的網路總流量。如果您方案中的流量有限，請謹慎使用。這還會對您的網路速度和電池使用情況產生負面影響。</string> <string name="delete">刪除</string> <string name="delete_custom_list_confirmation_description">要刪除「%1$s」嗎？</string> <string name="delete_custom_list_message">「%1$s」已刪除</string> diff --git a/android/lib/resource/src/main/res/values/colors.xml b/android/lib/resource/src/main/res/values/colors.xml index 7ce616c7c0..d8dc10c43d 100644 --- a/android/lib/resource/src/main/res/values/colors.xml +++ b/android/lib/resource/src/main/res/values/colors.xml @@ -1,6 +1,5 @@ <resources> <color name="colorPrimary">#294D73</color> - <color name="blue">#294D73</color> <color name="darkBlue">#192E45</color> <color name="icon_background">@color/darkBlue</color> </resources> diff --git a/android/lib/resource/src/main/res/values/dimensions.xml b/android/lib/resource/src/main/res/values/dimensions.xml deleted file mode 100644 index ca17e071b7..0000000000 --- a/android/lib/resource/src/main/res/values/dimensions.xml +++ /dev/null @@ -1,4 +0,0 @@ -<resources> - <dimen name="text_medium_plus">18sp</dimen> - <dimen name="zero_size">0px</dimen> -</resources> diff --git a/android/lib/resource/src/main/res/values/integers.xml b/android/lib/resource/src/main/res/values/integers.xml deleted file mode 100644 index 3089382d18..0000000000 --- a/android/lib/resource/src/main/res/values/integers.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <integer name="transition_animation_duration">@android:integer/config_mediumAnimTime</integer> -</resources> diff --git a/android/lib/resource/src/main/res/values/plurals.xml b/android/lib/resource/src/main/res/values/plurals.xml index cd913ffa05..29af5cb16a 100644 --- a/android/lib/resource/src/main/res/values/plurals.xml +++ b/android/lib/resource/src/main/res/values/plurals.xml @@ -3,35 +3,10 @@ <item quantity="one">1 year left</item> <item quantity="other">%d years left</item> </plurals> - <plurals name="months_left"> - <item quantity="one">1 month left</item> - <item quantity="other">%d months left</item> - </plurals> <plurals name="days_left"> <item quantity="one">1 day left</item> <item quantity="other">%d days left</item> </plurals> - <plurals name="minutes_ago"> - <item quantity="zero">less than a minute ago</item> - <item quantity="one">a minute ago</item> - <item quantity="other">%d minutes ago</item> - </plurals> - <plurals name="hours_ago"> - <item quantity="one">an hour ago</item> - <item quantity="other">%d hours ago</item> - </plurals> - <plurals name="days_ago"> - <item quantity="one">a day ago</item> - <item quantity="other">%d days ago</item> - </plurals> - <plurals name="months_ago"> - <item quantity="one">a month ago</item> - <item quantity="other">%d months ago</item> - </plurals> - <plurals name="years_ago"> - <item quantity="one">a year ago</item> - <item quantity="other">%d years ago</item> - </plurals> <plurals name="account_credit_expires_in_days"> <item quantity="one">Account credit expires in a day</item> <item quantity="other">Account credit expires in %d days</item> diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml index 3d3c9a159f..a0098ae847 100644 --- a/android/lib/resource/src/main/res/values/strings.xml +++ b/android/lib/resource/src/main/res/values/strings.xml @@ -26,7 +26,6 @@ <string name="here_is_your_account_number">Here’s your account number. Save it!</string> <string name="pay_to_start_using">To start using the app, you first need to add time to your account.</string> <string name="buy_credit">Buy credit</string> - <string name="buy_more_credit">Buy more credit</string> <string name="redeem_voucher">Redeem voucher</string> <string name="enter_voucher_code">Enter voucher code</string> <string name="redeem">Redeem</string> @@ -43,7 +42,6 @@ <string name="out_of_time">Out of time</string> <string name="add_time_to_account">Either buy credit on our website or redeem a voucher.</string> <string name="settings_vpn">VPN settings</string> - <string name="app_version">App version</string> <string name="report_a_problem">Report a problem</string> <string name="faqs_and_guides">FAQs & Guides</string> <string name="privacy_policy_label">Privacy policy</string> @@ -256,7 +254,6 @@ <string name="loading_connecting">Connecting...</string> <string name="loading_verifying">Verifying purchase...</string> <string name="copied_logs_to_clipboard">Copied logs to clipboard</string> - <string name="auto_connect_legacy">Auto-connect (legacy)</string> <string name="custom_lists">Custom lists</string> <string name="all_locations">All locations</string> <string name="edit_lists">Edit lists</string> @@ -360,10 +357,8 @@ <string name="location_was_removed_from_list">%s was removed from \"%s\"</string> <string name="create_custom_list_message">\"%s\" was created</string> <string name="daita_info">By enabling “%1$s” you will have to manually select a server that is %2$s-enabled. This can cause you to end up in a blocked state until you have selected a compatible server in the “Select location” view.</string> - <string name="daita_warning">Attention: Since this increases your total network traffic, be cautious if you have a limited data plan. It can also negatively impact your network speed and battery usage.</string> <string name="setting_chip">Setting: %s</string> <string name="enable_anyway">Enable anyway</string> - <string name="daita_relay_subset_warning">This feature isn’t available on all servers. You might need to change location after enabling.</string> <string name="upd_over_tcp">UDP-over-TCP</string> <string name="port_x">Port: %s</string> <string name="connect_panel_active_features">Active features</string> @@ -406,7 +401,6 @@ <string name="clear_input">Clear input</string> <string name="x_entry">%s (Entry)</string> <string name="x_exit">%s (Exit)</string> - <string name="search_results">Search results</string> <string name="filters">Filters:</string> <string name="search_query_empty">Type at least 2 characters to start searching.</string> <string name="daita_description_slide_1_first_paragraph">%1$s (%2$s) hides patterns in your encrypted VPN traffic.</string> diff --git a/android/lib/resource/src/main/res/values/strings_non_translatable.xml b/android/lib/resource/src/main/res/values/strings_non_translatable.xml index 0f0a64e796..837740aa47 100644 --- a/android/lib/resource/src/main/res/values/strings_non_translatable.xml +++ b/android/lib/resource/src/main/res/values/strings_non_translatable.xml @@ -1,6 +1,5 @@ <resources> <string name="app_name" translatable="false">Mullvad VPN</string> - <string name="login_hint" translatable="false">0000 0000 0000 0000</string> <string name="voucher_hint" translatable="false">XXXX-XXXX-XXXX-XXXX</string> <string name="account_url" translatable="false">https://mullvad.net/account</string> <string name="download_url" translatable="false">https://mullvad.net/download/vpn/android</string> |