From 47b0f67f5b56ab68ebbdbd4e3edec862525c7c6b Mon Sep 17 00:00:00 2001 From: Oizaro Date: Sat, 28 Nov 2020 18:43:41 +0100 Subject: [PATCH 1/3] Update string values --- .../src/main/res/values-es/arrays.xml | 16 ----------- .../src/main/res/values-es/plurals.xml | 18 ++---------- .../src/main/res/values-es/strings.xml | 2 +- .../src/main/res/values-it/strings.xml | 2 +- .../src/main/res/values-ru/arrays.xml | 28 +------------------ .../src/main/res/values-ru/bools.xml | 18 ------------ .../src/main/res/values-ru/plurals.xml | 18 ++---------- .../src/main/res/values-ru/strings.xml | 2 +- .../src/main/res/values/strings.xml | 2 +- 9 files changed, 9 insertions(+), 97 deletions(-) delete mode 100644 play-services-core/src/main/res/values-ru/bools.xml diff --git a/play-services-core/src/main/res/values-es/arrays.xml b/play-services-core/src/main/res/values-es/arrays.xml index bb888fef..b472d256 100644 --- a/play-services-core/src/main/res/values-es/arrays.xml +++ b/play-services-core/src/main/res/values-es/arrays.xml @@ -1,20 +1,4 @@ - - diff --git a/play-services-core/src/main/res/values-es/plurals.xml b/play-services-core/src/main/res/values-es/plurals.xml index b1e21da0..464623a3 100644 --- a/play-services-core/src/main/res/values-es/plurals.xml +++ b/play-services-core/src/main/res/values-es/plurals.xml @@ -1,23 +1,9 @@ - - + %1$d App registrada %1$d Apps registradas + \ No newline at end of file diff --git a/play-services-core/src/main/res/values-es/strings.xml b/play-services-core/src/main/res/values-es/strings.xml index 9e8779db..edcb2438 100644 --- a/play-services-core/src/main/res/values-es/strings.xml +++ b/play-services-core/src/main/res/values-es/strings.xml @@ -7,7 +7,7 @@ Exclusion de Ahorro de Bateria Expandir notificación Mantener microG en segundo plano - Toque aqui y deshabilita la optimización de batería para vanced microG, después fuerze el cierre de microG para cerrar esta notificación + Toque aqui y deshabilita la optimización de batería para vanced microG, luego reinicie el dispositivo para cerrar esta notificación Solo un momento… Al continuar, permites que esta app y Google usen tu información de acuerdo con sus respectivos términos de servicio y políticas de privacidad. diff --git a/play-services-core/src/main/res/values-it/strings.xml b/play-services-core/src/main/res/values-it/strings.xml index 32ff1757..f2ab271e 100755 --- a/play-services-core/src/main/res/values-it/strings.xml +++ b/play-services-core/src/main/res/values-it/strings.xml @@ -7,7 +7,7 @@ Avviso Risparmio Energetico Espandi la notifica Mantieni i microG in secondo piano - Tocca qui per disattivare l\'ottimizzazione della batteria per microG, quindi effettua una chiusura forzata dalle info dell\'app. + Tocca qui per disattivare l\'ottimizzazione della batteria per microG, poi riavvia il dispositivo per rimuovere questa notifica. Solo un secondo… Continuando, consentirai a quest\'app e a Google di utilizzare le tue informazioni in conformità con i rispettivi termini di servizio e politiche sulla riservatezza. diff --git a/play-services-core/src/main/res/values-ru/arrays.xml b/play-services-core/src/main/res/values-ru/arrays.xml index f1e0c736..b7dd8ecc 100644 --- a/play-services-core/src/main/res/values-ru/arrays.xml +++ b/play-services-core/src/main/res/values-ru/arrays.xml @@ -1,33 +1,6 @@ - - - - -1 - 0 - 2 - 5 - 10 - 15 - 20 - 30 - - @string/service_status_disabled @string/service_status_default @@ -38,4 +11,5 @@ Интервал пинга: 20 минут Интервал пинга: 30 минут + diff --git a/play-services-core/src/main/res/values-ru/bools.xml b/play-services-core/src/main/res/values-ru/bools.xml deleted file mode 100644 index 5a5242ed..00000000 --- a/play-services-core/src/main/res/values-ru/bools.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - diff --git a/play-services-core/src/main/res/values-ru/plurals.xml b/play-services-core/src/main/res/values-ru/plurals.xml index e76ae472..566ad44f 100644 --- a/play-services-core/src/main/res/values-ru/plurals.xml +++ b/play-services-core/src/main/res/values-ru/plurals.xml @@ -1,23 +1,9 @@ - - + %1$d зарегистрированное приложение %1$d зарегистрированное приложения + diff --git a/play-services-core/src/main/res/values-ru/strings.xml b/play-services-core/src/main/res/values-ru/strings.xml index 2b16aeb4..203d6f03 100644 --- a/play-services-core/src/main/res/values-ru/strings.xml +++ b/play-services-core/src/main/res/values-ru/strings.xml @@ -7,7 +7,7 @@ Уведомление о службе батареи Разверните уведомление Удерживать microG в фоне - Нажмите сюда и отключите экономию заряда батареи для microG. После этого закройте приложение или отключите уведомление. + Щелкните здесь, чтобы отключить режим энергосбережения для microG. Затем перезагрузите устройство, чтобы отключить уведомление. Секундочку… Продолжая, вы разрешаете этому приложению и Google использовать вашу информацию в соответствии с их соответствующими условиями использования и политикой конфиденциальности. diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml index ee10ee31..567b0137 100755 --- a/play-services-core/src/main/res/values/strings.xml +++ b/play-services-core/src/main/res/values/strings.xml @@ -7,7 +7,7 @@ Battery Saving Warning Expand notification Keep microG in background - Tap here and disable battery optimization for microG, then force close it from app info to remove this notification. + Ketuk di sini dan nonaktifkan pengoptimalan baterai untuk microG, lalu reboot perangkat untuk menghapus notifikasi ini. Just a sec… By continuing, you allow this app and Google to use your information in accordance with their respective terms of service and privacy policies. From d4c0f6bc8ec692751c85135ecd2ca4c8771b7a14 Mon Sep 17 00:00:00 2001 From: Oizaro Date: Sat, 28 Nov 2020 22:25:45 +0100 Subject: [PATCH 2/3] MicroG 0.2.14.204216 --- build.gradle | 4 ++-- play-services-core/build.gradle | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 8cb66517..3ebc12b7 100644 --- a/build.gradle +++ b/build.gradle @@ -46,8 +46,8 @@ allprojects { apply plugin: 'idea' group = 'org.microg.gms' - version = "0.2.14.204215" - ext.appVersionCode = 204215001 + version = "0.2.14.204216" + ext.appVersionCode = 204215002 ext.isReleaseVersion = false } diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index f44313d8..ca523053 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -48,11 +48,6 @@ dependencies { implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10' implementation project(path: ':play-services-basement') - // nlp - implementation "org.microg.nlp:geocode-v1:$nlpVersion" - implementation "org.microg.nlp:location-v2:$nlpVersion" - implementation "org.microg.nlp:location-v3:$nlpVersion" - implementation "org.microg.nlp:service:$nlpVersion" api project(':play-services-location-api') } From e1f25c07c7d4af3ce8b7256469c6a2c7f9836e14 Mon Sep 17 00:00:00 2001 From: Oizaro Date: Sat, 28 Nov 2020 22:46:34 +0100 Subject: [PATCH 3/3] Fix copyrights --- .../src/main/res/values-es/arrays.xml | 16 +++++++++++++++ .../src/main/res/values-es/plurals.xml | 16 +++++++++++++++ .../src/main/res/values-es/strings.xml | 16 +++++++++++++++ .../src/main/res/values-in/arrays.xml | 16 +++++++++++++++ .../src/main/res/values-in/plurals.xml | 16 +++++++++++++++ .../src/main/res/values-in/strings.xml | 16 +++++++++++++++ .../src/main/res/values-it/arrays.xml | 16 +++++++++++++++ .../src/main/res/values-it/permissions.xml | 20 ------------------- .../src/main/res/values-it/plurals.xml | 16 +++++++++++++++ .../src/main/res/values-it/strings.xml | 16 +++++++++++++++ .../src/main/res/values-ru/arrays.xml | 16 +++++++++++++++ .../src/main/res/values-ru/plurals.xml | 16 +++++++++++++++ .../src/main/res/values-ru/strings.xml | 16 +++++++++++++++ .../src/main/res/values/strings.xml | 16 +++++++++++++++ 14 files changed, 208 insertions(+), 20 deletions(-) delete mode 100755 play-services-core/src/main/res/values-it/permissions.xml diff --git a/play-services-core/src/main/res/values-es/arrays.xml b/play-services-core/src/main/res/values-es/arrays.xml index b472d256..bb888fef 100644 --- a/play-services-core/src/main/res/values-es/arrays.xml +++ b/play-services-core/src/main/res/values-es/arrays.xml @@ -1,4 +1,20 @@ + + diff --git a/play-services-core/src/main/res/values-es/plurals.xml b/play-services-core/src/main/res/values-es/plurals.xml index 464623a3..2f3794d9 100644 --- a/play-services-core/src/main/res/values-es/plurals.xml +++ b/play-services-core/src/main/res/values-es/plurals.xml @@ -1,4 +1,20 @@ + + diff --git a/play-services-core/src/main/res/values-es/strings.xml b/play-services-core/src/main/res/values-es/strings.xml index edcb2438..21e6614f 100644 --- a/play-services-core/src/main/res/values-es/strings.xml +++ b/play-services-core/src/main/res/values-es/strings.xml @@ -1,4 +1,20 @@ + + Ajustes Vanced microG diff --git a/play-services-core/src/main/res/values-in/arrays.xml b/play-services-core/src/main/res/values-in/arrays.xml index 829bb2d9..c4cfa81e 100644 --- a/play-services-core/src/main/res/values-in/arrays.xml +++ b/play-services-core/src/main/res/values-in/arrays.xml @@ -1,4 +1,20 @@ + + diff --git a/play-services-core/src/main/res/values-in/plurals.xml b/play-services-core/src/main/res/values-in/plurals.xml index 596cecb1..927abf12 100644 --- a/play-services-core/src/main/res/values-in/plurals.xml +++ b/play-services-core/src/main/res/values-in/plurals.xml @@ -1,4 +1,20 @@ + + diff --git a/play-services-core/src/main/res/values-in/strings.xml b/play-services-core/src/main/res/values-in/strings.xml index d3751eb0..86e302b0 100644 --- a/play-services-core/src/main/res/values-in/strings.xml +++ b/play-services-core/src/main/res/values-in/strings.xml @@ -1,4 +1,20 @@ + + Pengaturan Vanced microG diff --git a/play-services-core/src/main/res/values-it/arrays.xml b/play-services-core/src/main/res/values-it/arrays.xml index 45c8c5b0..6326659b 100644 --- a/play-services-core/src/main/res/values-it/arrays.xml +++ b/play-services-core/src/main/res/values-it/arrays.xml @@ -1,4 +1,20 @@ + + diff --git a/play-services-core/src/main/res/values-it/permissions.xml b/play-services-core/src/main/res/values-it/permissions.xml deleted file mode 100755 index 908d14e3..00000000 --- a/play-services-core/src/main/res/values-it/permissions.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/play-services-core/src/main/res/values-it/plurals.xml b/play-services-core/src/main/res/values-it/plurals.xml index 2792b53f..15d75348 100755 --- a/play-services-core/src/main/res/values-it/plurals.xml +++ b/play-services-core/src/main/res/values-it/plurals.xml @@ -1,4 +1,20 @@ + + diff --git a/play-services-core/src/main/res/values-it/strings.xml b/play-services-core/src/main/res/values-it/strings.xml index f2ab271e..26b045f0 100755 --- a/play-services-core/src/main/res/values-it/strings.xml +++ b/play-services-core/src/main/res/values-it/strings.xml @@ -1,4 +1,20 @@ + + Impostazioni di Vanced microG diff --git a/play-services-core/src/main/res/values-ru/arrays.xml b/play-services-core/src/main/res/values-ru/arrays.xml index b7dd8ecc..393425e0 100644 --- a/play-services-core/src/main/res/values-ru/arrays.xml +++ b/play-services-core/src/main/res/values-ru/arrays.xml @@ -1,4 +1,20 @@ + + diff --git a/play-services-core/src/main/res/values-ru/plurals.xml b/play-services-core/src/main/res/values-ru/plurals.xml index 566ad44f..205f2782 100644 --- a/play-services-core/src/main/res/values-ru/plurals.xml +++ b/play-services-core/src/main/res/values-ru/plurals.xml @@ -1,4 +1,20 @@ + + diff --git a/play-services-core/src/main/res/values-ru/strings.xml b/play-services-core/src/main/res/values-ru/strings.xml index 203d6f03..0f57997c 100644 --- a/play-services-core/src/main/res/values-ru/strings.xml +++ b/play-services-core/src/main/res/values-ru/strings.xml @@ -1,4 +1,20 @@ + + Настройки Vanced microG diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml index 567b0137..247ab8de 100755 --- a/play-services-core/src/main/res/values/strings.xml +++ b/play-services-core/src/main/res/values/strings.xml @@ -1,4 +1,20 @@ + + Vanced microG Settings