From 4b3ef83e0d664ee1d144f050098943f34528baa4 Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Sat, 18 Jul 2020 16:41:40 +0400
Subject: [PATCH 1/6] Vanced-ified microG

---
 .../src/main/java/org/microg/gms/gcm/McsService.java      | 2 +-
 .../src/main/java/org/microg/gms/ui/AboutFragment.java    | 8 +-------
 play-services-core/src/main/res/values-de/strings.xml     | 6 +++---
 play-services-core/src/main/res/values-es/strings.xml     | 2 +-
 play-services-core/src/main/res/values-fr/strings.xml     | 4 ++--
 play-services-core/src/main/res/values-pl/strings.xml     | 4 ++--
 play-services-core/src/main/res/values-pt-rBR/strings.xml | 4 ++--
 play-services-core/src/main/res/values-ro/strings.xml     | 2 +-
 play-services-core/src/main/res/values-ru/strings.xml     | 8 ++++----
 play-services-core/src/main/res/values-sr/strings.xml     | 4 ++--
 play-services-core/src/main/res/values-uk/strings.xml     | 8 ++++----
 play-services-core/src/main/res/values-zh-rTW/strings.xml | 8 ++++----
 play-services-core/src/main/res/values/strings.xml        | 6 +++---
 play-services-core/src/main/res/xml/authenticator.xml     | 2 +-
 14 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java b/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java
index b7fa28dd..77973ba5 100644
--- a/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java
+++ b/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java
@@ -321,7 +321,7 @@ public class McsService extends Service implements Handler.Callback {
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     private Notification buildForegroundNotification() {
-        NotificationChannel channel = new NotificationChannel("foreground-service", "Foreground Service", NotificationManager.IMPORTANCE_LOW);
+        NotificationChannel channel = new NotificationChannel("foreground-service", "Foreground Service", NotificationManager.IMPORTANCE_MIN);
         channel.setLockscreenVisibility(Notification.VISIBILITY_SECRET);
         channel.setShowBadge(false);
         getSystemService(NotificationManager.class).createNotificationChannel(channel);
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java
index 176ed386..6f24a2c4 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java
@@ -29,18 +29,12 @@ public class AboutFragment extends AbstractAboutFragment {
 
     @Override
     protected void collectLibraries(List<AbstractAboutFragment.Library> libraries) {
-        if (BuildConfig.FLAVOR.contains("mapbox")) {
-            libraries.add(new AbstractAboutFragment.Library("com.mapbox.mapboxsdk", "Mapbox Maps SDK for Android", "Three-Clause BSD, Mapbox"));
-        } else {
-            libraries.add(new AbstractAboutFragment.Library("org.oscim.android", "V™", "GNU LGPLv3, Hannes Janetzek and devemux86"));
-        }
+
         libraries.add(new AbstractAboutFragment.Library("de.hdodenhof.circleimageview", "CircleImageView", "Apache License 2.0, Henning Dodenhof"));
         libraries.add(new AbstractAboutFragment.Library("su.litvak.chromecast.api.v2", "ChromeCast Java API v2", "Apache License 2.0, Vitaly Litvak"));
         libraries.add(new AbstractAboutFragment.Library("org.conscrypt", "Conscrypt", "Apache License 2.0, The Android Open Source Project"));
         libraries.add(new AbstractAboutFragment.Library("org.microg.safeparcel", "SafeParcel", "Apache License 2.0, microG Team"));
         libraries.add(new AbstractAboutFragment.Library("org.slf4j", "SLF4J", "MIT License, QOS.ch"));
-        libraries.add(new AbstractAboutFragment.Library("org.microg.nlp.service", "UnifiedNlp", "Apache License 2.0, microG Team"));
-        libraries.add(new AbstractAboutFragment.Library("org.microg.wearable", "Wearable", "Apache License 2.0, microG Team"));
         libraries.add(new AbstractAboutFragment.Library("com.squareup.wire", "Wire Protocol Buffers", "Apache License 2.0, Square Inc."));
     }
 
diff --git a/play-services-core/src/main/res/values-de/strings.xml b/play-services-core/src/main/res/values-de/strings.xml
index 2bd8f13b..03c61367 100644
--- a/play-services-core/src/main/res/values-de/strings.xml
+++ b/play-services-core/src/main/res/values-de/strings.xml
@@ -15,8 +15,8 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="gms_settings_name">microG Einstellungen</string>
-    <string name="gms_settings_summary">microG services Core einrichten.</string>
+    <string name="gms_settings_name">Vacned microG Einstellungen</string>
+    <string name="gms_settings_summary">Vanced microG services einrichten.</string>
 
     <string name="just_a_sec">Einen kurzen Moment…</string>
     <string name="google_account_label">Google</string>
@@ -65,7 +65,7 @@ Dies kann einige Minuten dauern."</string>
     <string name="self_check_cat_system">System</string>
 
     <string name="self_check_name_battery_optimizations">Batterieoptimierung deaktiviert:</string>
-    <string name="self_check_resolution_battery_optimizations">Hier drücken um Batterieoptimierungen für microG zu deaktivieren. Wenn das nicht geschieht funktionieren einige Apps nicht ordnungsgemäß.</string>
+    <string name="self_check_resolution_battery_optimizations">Hier drücken um Batterieoptimierungen für Vanced microG zu deaktivieren. Wenn das nicht geschieht funktionieren einige Apps nicht ordnungsgemäß.</string>
 
     <!-- Settings strings -->
 
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 124446cb..16a3653a 100644
--- a/play-services-core/src/main/res/values-es/strings.xml
+++ b/play-services-core/src/main/res/values-es/strings.xml
@@ -15,7 +15,7 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="gms_settings_name">Ajustes de microG</string>
+    <string name="gms_settings_name">Ajustes de Vanced microG</string>
 
     <string name="just_a_sec">Un momento…</string>
     <string name="google_account_label">Google</string>
diff --git a/play-services-core/src/main/res/values-fr/strings.xml b/play-services-core/src/main/res/values-fr/strings.xml
index 9dbdabad..565739ad 100644
--- a/play-services-core/src/main/res/values-fr/strings.xml
+++ b/play-services-core/src/main/res/values-fr/strings.xml
@@ -15,7 +15,7 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="gms_settings_name">Paramètres de microG</string>
+    <string name="gms_settings_name">Paramètres de Vanced microG</string>
 
     <string name="just_a_sec">Juste une seconde…</string>
     <string name="google_account_label">Google</string>
@@ -72,7 +72,7 @@ Ceci peut prendre plusieurs minutes."</string>
     <string name="prefcat_google_services">Services Google</string>
 
     <string name="cond_gcm_bat_title">Optimisations de la batterie activées</string>
-    <string name="cond_gcm_bat_summary">Vous avez activé Google Cloud Messaging mais l’optimisation de la batterie est activée pour microG Services Core. Afin de recevoir les notifications push vous devriez désactiver les optimisations de la batterie.</string>
+    <string name="cond_gcm_bat_summary">Vous avez activé Google Cloud Messaging mais l’optimisation de la batterie est activée pour Vanced microG Services. Afin de recevoir les notifications push vous devriez désactiver les optimisations de la batterie.</string>
     <string name="cond_gcm_bat_action">Désactiver les optimisations de la batterie</string>
 
     <string name="prefs_account">Préférences du compte</string>
diff --git a/play-services-core/src/main/res/values-pl/strings.xml b/play-services-core/src/main/res/values-pl/strings.xml
index 962edde9..ecb5d318 100644
--- a/play-services-core/src/main/res/values-pl/strings.xml
+++ b/play-services-core/src/main/res/values-pl/strings.xml
@@ -15,7 +15,7 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="gms_settings_name">Ustawienia microG</string>
+    <string name="gms_settings_name">Ustawienia Vanced microG</string>
 
     <string name="just_a_sec">Chwileczkę…</string>
     <string name="google_account_label">Google</string>
@@ -72,7 +72,7 @@ To zajmie kilka minut.</string>
     <string name="prefcat_google_services">Usługi Google</string>
 
     <string name="cond_gcm_bat_title">Optymalizacja baterii włączona</string>
-    <string name="cond_gcm_bat_summary">Aktywowałeś usługę Google Cloud Messaging, ale optymalizacja baterii dla usługi microG jest włączona. Aby powiadomienia ‘push’ działały, powinieneś wyłączyć optymalizację baterii dla microG.</string>
+    <string name="cond_gcm_bat_summary">Aktywowałeś usługę Google Cloud Messaging, ale optymalizacja baterii dla usługi Vanced microG jest włączona. Aby powiadomienia ‘push’ działały, powinieneś wyłączyć optymalizację baterii dla microG.</string>
     <string name="cond_gcm_bat_action">Ignoruj optymalizacje</string>
 
     <string name="prefs_account">Ustawienia konta</string>
diff --git a/play-services-core/src/main/res/values-pt-rBR/strings.xml b/play-services-core/src/main/res/values-pt-rBR/strings.xml
index b5696185..7e8cf1cf 100644
--- a/play-services-core/src/main/res/values-pt-rBR/strings.xml
+++ b/play-services-core/src/main/res/values-pt-rBR/strings.xml
@@ -15,7 +15,7 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="gms_settings_name">Configurações microG</string>
+    <string name="gms_settings_name">Configurações Vanced microG</string>
 
     <string name="just_a_sec">Aguarde um momento…</string>
     <string name="google_account_label">Google</string>
@@ -65,7 +65,7 @@ Isso pode demorar alguns minutos."</string>
 
     <string name="prefcat_about">Sobre</string>
     <string name="cond_gcm_bat_title">Otimização de bateria ativada</string>
-    <string name="cond_gcm_bat_summary">Você ativou o Google Cloud Messaging, mas possui otimizações de bateria ativas para o MicroG Services Core. Para que as notificações push cheguem, você deve ignorar as otimizações da bateria.</string>
+    <string name="cond_gcm_bat_summary">Você ativou o Google Cloud Messaging, mas possui otimizações de bateria ativas para o Vanced microG Services. Para que as notificações push cheguem, você deve ignorar as otimizações da bateria.</string>
     <string name="cond_gcm_bat_action">Ignorar otimização</string>
 
     <string name="prefs_account">Preferências da conta</string>
diff --git a/play-services-core/src/main/res/values-ro/strings.xml b/play-services-core/src/main/res/values-ro/strings.xml
index de38c8a7..5628f3b3 100644
--- a/play-services-core/src/main/res/values-ro/strings.xml
+++ b/play-services-core/src/main/res/values-ro/strings.xml
@@ -15,7 +15,7 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="gms_settings_name">Setări microG</string>
+    <string name="gms_settings_name">Setări Vanced microG</string>
 
     <string name="just_a_sec">Doar o secundă…</string>
     <string name="google_account_label">Google</string>
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 1ab49a69..de552bb0 100644
--- a/play-services-core/src/main/res/values-ru/strings.xml
+++ b/play-services-core/src/main/res/values-ru/strings.xml
@@ -15,10 +15,10 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="gms_settings_name">Настройки MicroG</string>
-    <string name="gms_settings_summary">Конфигурирование сервисов microG.</string>
+    <string name="gms_settings_name">Настройки Vanced MicroG</string>
+    <string name="gms_settings_summary">Конфигурирование Vanced microG.</string>
 
-    <string name="just_a_sec">Пожалуйста, подождите...</string>
+    <string name="just_a_sec">Пожалуйста, подождите…</string>
     <string name="google_account_label">Google</string>
     <string name="ask_permission_tos">Продолжая, вы позволяете этому приложению и Google использовать свою информацию в соответствии с их соответствующими условиями предоставления услуг и политиками конфиденциальности.</string>
     <string name="ask_scope_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> хотел бы:</string>
@@ -80,7 +80,7 @@
     <string name="prefcat_google_services">Google сервисы</string>
 
     <string name="cond_gcm_bat_title">Активна оптимизация энергопотребления</string>
-    <string name="cond_gcm_bat_summary">Вы включили Google Cloud Messaging, но у вас активна оптимизация энергопотребления для microG Services Core. Чтобы получать push-уведомления вам необходимо разрешить приложению работать в фоновом режиме.</string>
+    <string name="cond_gcm_bat_summary">Вы включили Google Cloud Messaging, но у вас активна оптимизация энергопотребления для Vanced microG Services. Чтобы получать push-уведомления вам необходимо разрешить приложению работать в фоновом режиме.</string>
     <string name="cond_gcm_bat_action">Разрешить работу в фоне</string>
 
     <string name="prefs_account">Настройки аккаунта</string>
diff --git a/play-services-core/src/main/res/values-sr/strings.xml b/play-services-core/src/main/res/values-sr/strings.xml
index a9bab989..6f017891 100644
--- a/play-services-core/src/main/res/values-sr/strings.xml
+++ b/play-services-core/src/main/res/values-sr/strings.xml
@@ -15,7 +15,7 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="gms_settings_name">Поставке микроГ</string>
+    <string name="gms_settings_name">Поставке Vanced микроГ</string>
 
     <string name="just_a_sec">Само тренутак…</string>
     <string name="google_account_label">Гугл</string>
@@ -65,7 +65,7 @@
 
     <string name="prefcat_about">О програму</string>
     <string name="cond_gcm_bat_title">Оптимизација батерије укључена</string>
-    <string name="cond_gcm_bat_summary">Укључили сте Гуглове облак поруке али имате активну оптимизацију батерије за Језгро микроГ услуга. Да би гурана обавештења стизала морате да игноришете оптимизацију батерије.</string>
+    <string name="cond_gcm_bat_summary">Укључили сте Гуглове облак поруке али имате активну оптимизацију батерије за Језгро Vanced микроГ услуга. Да би гурана обавештења стизала морате да игноришете оптимизацију батерије.</string>
     <string name="cond_gcm_bat_action">Игнориши оптимизацију</string>
 
     <string name="prefs_account">Поставке налога</string>
diff --git a/play-services-core/src/main/res/values-uk/strings.xml b/play-services-core/src/main/res/values-uk/strings.xml
index d7b6105c..755b287c 100644
--- a/play-services-core/src/main/res/values-uk/strings.xml
+++ b/play-services-core/src/main/res/values-uk/strings.xml
@@ -15,15 +15,15 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="gms_settings_name">Налаштування microG</string>
+    <string name="gms_settings_name">Налаштування VAnced microG</string>
 
-    <string name="just_a_sec">Зачекайте трохи...</string>
+    <string name="just_a_sec">Зачекайте трохи…</string>
     <string name="google_account_label">Google</string>
     <string name="ask_permission_tos">Продовжуючи, ви дозволяєте даному додатку та Google використовувати ваші дані згідно з їх відповідними умовами надання послуг та політикою конфіденційності.</string>
     <string name="ask_scope_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> бажав би:</string>
     <string name="ask_service_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> бажав би використовувати:</string>
     <string name="account_manager_title">Google Account Manager</string>
-    <string name="sorry">Вибачте...</string>
+    <string name="sorry">Вибачте…</string>
     <string name="auth_before_connect">Додаток на Вашому пристрої намагається увійти до облікового запису Google.
 
 Якщо Ви очікували цю дію, натисніть кнопку <b>Увійти</b> для підключення до сторінки авторизації Google, інакше натисніть  <b>Скасувати</b>, аби перейти назад до додатку, що викликало це вікно.</string>
@@ -79,7 +79,7 @@
     <string name="prefcat_google_services">Сервіси Google</string>
 
     <string name="cond_gcm_bat_title">Увімкнута оптимізація енергоспоживання</string>
-    <string name="cond_gcm_bat_summary">Ви увімкнули Google Cloud Messaging але лиши оптимізацію енергоспоживання активним для microG Services Core. Аби отримувати push-сповіщення необхідно вимкнути оптимізацію енергоспоживання.</string>
+    <string name="cond_gcm_bat_summary">Ви увімкнули Google Cloud Messaging але лиши оптимізацію енергоспоживання активним для Vanced microG Services. Аби отримувати push-сповіщення необхідно вимкнути оптимізацію енергоспоживання.</string>
     <string name="cond_gcm_bat_action">Ігнорувати оптимізацію</string>
 
     <string name="prefs_account">Налаштування облікового запису</string>
diff --git a/play-services-core/src/main/res/values-zh-rTW/strings.xml b/play-services-core/src/main/res/values-zh-rTW/strings.xml
index dd870b75..5a093908 100644
--- a/play-services-core/src/main/res/values-zh-rTW/strings.xml
+++ b/play-services-core/src/main/res/values-zh-rTW/strings.xml
@@ -15,15 +15,15 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="gms_settings_name">microG設定</string>
+    <string name="gms_settings_name">Vanced microG設定</string>
 
-    <string name="just_a_sec">請稍等...</string>
+    <string name="just_a_sec">請稍等…</string>
     <string name="google_account_label">Google</string>
     <string name="ask_permission_tos">當您繼續下一步時，代表您同意Google和本程式在遵守服務條款和隱私權政策下使用您的個人資訊。</string>
     <string name="ask_scope_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g>將會：</string>
     <string name="ask_service_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g>將會使用：</string>
     <string name="account_manager_title">Google帳號管理員</string>
-    <string name="sorry">抱歉...</string>
+    <string name="sorry">抱歉…</string>
     <string name="no_network_error_desc">"沒有網路連線。
 
 這可能是暫時的問題，或是您的手機沒有連線能力。 請在連接到行動數據或是Wi-Fi網路後重試。"</string>
@@ -80,7 +80,7 @@
 
     <string name="pref_gcm_enable_mcs_summary">GCM是一個廣為第三方應用程式所採用的推播訊息供應者。 必須先註冊為Google設備才能使用。</string>
     <string name="pref_gcm_apps_title">使用GCM的程式</string>
-    <string name="pref_about_title">關於microG Services Core</string>
+    <string name="pref_about_title">關於VAnced microG Services</string>
 
     <string name="gcm_unregister_app">取消註冊</string>
     <string name="gcm_not_registered">未註冊</string>
diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
index 5e51628f..a5128249 100644
--- a/play-services-core/src/main/res/values/strings.xml
+++ b/play-services-core/src/main/res/values/strings.xml
@@ -15,8 +15,8 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="gms_settings_name">microG Settings</string>
-    <string name="gms_settings_summary">Setup microG services Core.</string>
+    <string name="gms_settings_name">Vanced microG Settings</string>
+    <string name="gms_settings_summary">Setup Vanced microG services.</string>
 
     <string name="just_a_sec">Just a sec…</string>
     <string name="google_account_label">Google</string>
@@ -80,7 +80,7 @@ This can take a couple of minutes."</string>
     <string name="prefcat_google_services">Google Services</string>
 
     <string name="cond_gcm_bat_title">Battery optimizations enabled</string>
-    <string name="cond_gcm_bat_summary">You enabled Google Cloud Messaging but have battery optimizations active for microG Services Core. For push notifications to arrive you should ignore battery optimizations.</string>
+    <string name="cond_gcm_bat_summary">You enabled Google Cloud Messaging but have battery optimizations active for Vanced microG Services. For push notifications to arrive you should ignore battery optimizations.</string>
     <string name="cond_gcm_bat_action">Ignore optimizations</string>
 
     <string name="prefs_account">Account preferences</string>
diff --git a/play-services-core/src/main/res/xml/authenticator.xml b/play-services-core/src/main/res/xml/authenticator.xml
index 11939c19..d08a5360 100644
--- a/play-services-core/src/main/res/xml/authenticator.xml
+++ b/play-services-core/src/main/res/xml/authenticator.xml
@@ -20,4 +20,4 @@
     android:customTokens="true"
     android:icon="@drawable/ic_microg"
     android:smallIcon="@drawable/ic_microg"
-    android:label="@string/google_account_label" />
+    android:label="Vanced microG" />

From 1dabc95475633cb434d2004b7a0147b6b5993eb6 Mon Sep 17 00:00:00 2001
From: VenNeptury <sgtmattis@gmail.com>
Date: Sat, 18 Jul 2020 21:14:16 +0200
Subject: [PATCH 2/6] Update strings.xml

---
 play-services-core/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/play-services-core/src/main/res/values-de/strings.xml b/play-services-core/src/main/res/values-de/strings.xml
index 03c61367..771c9967 100644
--- a/play-services-core/src/main/res/values-de/strings.xml
+++ b/play-services-core/src/main/res/values-de/strings.xml
@@ -15,7 +15,7 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="gms_settings_name">Vacned microG Einstellungen</string>
+    <string name="gms_settings_name">Vanced microG Einstellungen</string>
     <string name="gms_settings_summary">Vanced microG services einrichten.</string>
 
     <string name="just_a_sec">Einen kurzen Moment…</string>

From 5e379ac398da0ca0e91410ee6cac619f3bf980ce Mon Sep 17 00:00:00 2001
From: VenNeptury <sgtmattis@gmail.com>
Date: Sat, 18 Jul 2020 21:15:31 +0200
Subject: [PATCH 3/6] Update strings.xml

---
 play-services-core/src/main/res/values-pt-rBR/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/play-services-core/src/main/res/values-pt-rBR/strings.xml b/play-services-core/src/main/res/values-pt-rBR/strings.xml
index 7e8cf1cf..0342e390 100644
--- a/play-services-core/src/main/res/values-pt-rBR/strings.xml
+++ b/play-services-core/src/main/res/values-pt-rBR/strings.xml
@@ -65,7 +65,7 @@ Isso pode demorar alguns minutos."</string>
 
     <string name="prefcat_about">Sobre</string>
     <string name="cond_gcm_bat_title">Otimização de bateria ativada</string>
-    <string name="cond_gcm_bat_summary">Você ativou o Google Cloud Messaging, mas possui otimizações de bateria ativas para o Vanced microG Services. Para que as notificações push cheguem, você deve ignorar as otimizações da bateria.</string>
+    <string name="cond_gcm_bat_summary">Você ativou o Google Cloud Messaging, mas possui otimizações de bateria ativas para o Vanced microG. Para que as notificações push cheguem, você deve ignorar as otimizações da bateria.</string>
     <string name="cond_gcm_bat_action">Ignorar otimização</string>
 
     <string name="prefs_account">Preferências da conta</string>
@@ -79,7 +79,7 @@ Isso pode demorar alguns minutos."</string>
 
     <string name="pref_gcm_enable_mcs_summary">O Google Cloud Messaging é um provedor de notificação push usado por muitos aplicativos de terceiros. Para usá-lo, você deve ativar o registro do dispositivo.</string>
     <string name="pref_gcm_apps_title">Aplicativos que usam o Google Cloud Messaging</string>
-    <string name="pref_about_title">Sobre microG Services Core</string>
+    <string name="pref_about_title">Sobre Vanced microG</string>
 
     <string name="gcm_unregister_app">Cancelar registro</string>
     <string name="gcm_not_registered">Não registrado</string>

From 8c672d6ad0f9bd7f92aa0f978a0ad402eb2687d5 Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Sat, 18 Jul 2020 23:16:00 +0400
Subject: [PATCH 4/6] fixed typos

---
 play-services-core/src/main/res/values-de/strings.xml     | 4 ++--
 play-services-core/src/main/res/values-es/strings.xml     | 2 +-
 play-services-core/src/main/res/values-fr/strings.xml     | 2 +-
 play-services-core/src/main/res/values-pt-rBR/strings.xml | 2 +-
 play-services-core/src/main/res/values-ro/strings.xml     | 2 +-
 play-services-core/src/main/res/values-ru/strings.xml     | 2 +-
 play-services-core/src/main/res/values-uk/strings.xml     | 4 ++--
 play-services-core/src/main/res/values-zh-rTW/strings.xml | 4 ++--
 play-services-core/src/main/res/values/strings.xml        | 4 ++--
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/play-services-core/src/main/res/values-de/strings.xml b/play-services-core/src/main/res/values-de/strings.xml
index 03c61367..41691d30 100644
--- a/play-services-core/src/main/res/values-de/strings.xml
+++ b/play-services-core/src/main/res/values-de/strings.xml
@@ -15,8 +15,8 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="gms_settings_name">Vacned microG Einstellungen</string>
-    <string name="gms_settings_summary">Vanced microG services einrichten.</string>
+    <string name="gms_settings_name">Vanced microG Einstellungen</string>
+    <string name="gms_settings_summary">Vanced microG einrichten.</string>
 
     <string name="just_a_sec">Einen kurzen Moment…</string>
     <string name="google_account_label">Google</string>
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 16a3653a..2b6982c1 100644
--- a/play-services-core/src/main/res/values-es/strings.xml
+++ b/play-services-core/src/main/res/values-es/strings.xml
@@ -51,7 +51,7 @@ Esto podría tardar algunos minutos."</string>
     <string name="pref_auth_trust_google_title">Confiar en Google para los permisos de las aplicaciones</string>
     <string name="pref_auth_trust_google_summary">Cuando este desactivado, se preguntara al usuario antes de que una aplicación envíe una solicitud de autorización a Google. Algunas aplicaciones fallaran al usar la cuenta de Google si esta desactivado.</string>
 
-    <string name="pref_checkin_enable_summary">El registro del dispositivo es un proceso oculto que se usa para crear un identificador único para los servicios de Google. microG quita información identificativa aparte del nombre en tu cuenta de Google de estos datos.</string>
+    <string name="pref_checkin_enable_summary">El registro del dispositivo es un proceso oculto que se usa para crear un identificador único para los servicios de Google. Vanced microG quita información identificativa aparte del nombre en tu cuenta de Google de estos datos.</string>
 
     <string name="pref_gcm_enable_mcs_summary">Google Cloud Messaging es un proveedor de notificaciones push usado por muchas aplicaciones. Para usarlo debes habilitar el registro del dispositivo.</string>
     <string name="pref_about_title">Acerca de los Servicios de microG Core</string>
diff --git a/play-services-core/src/main/res/values-fr/strings.xml b/play-services-core/src/main/res/values-fr/strings.xml
index 565739ad..36686c51 100644
--- a/play-services-core/src/main/res/values-fr/strings.xml
+++ b/play-services-core/src/main/res/values-fr/strings.xml
@@ -72,7 +72,7 @@ Ceci peut prendre plusieurs minutes."</string>
     <string name="prefcat_google_services">Services Google</string>
 
     <string name="cond_gcm_bat_title">Optimisations de la batterie activées</string>
-    <string name="cond_gcm_bat_summary">Vous avez activé Google Cloud Messaging mais l’optimisation de la batterie est activée pour Vanced microG Services. Afin de recevoir les notifications push vous devriez désactiver les optimisations de la batterie.</string>
+    <string name="cond_gcm_bat_summary">Vous avez activé Google Cloud Messaging mais l’optimisation de la batterie est activée pour Vanced microG. Afin de recevoir les notifications push vous devriez désactiver les optimisations de la batterie.</string>
     <string name="cond_gcm_bat_action">Désactiver les optimisations de la batterie</string>
 
     <string name="prefs_account">Préférences du compte</string>
diff --git a/play-services-core/src/main/res/values-pt-rBR/strings.xml b/play-services-core/src/main/res/values-pt-rBR/strings.xml
index 7e8cf1cf..9a1711cf 100644
--- a/play-services-core/src/main/res/values-pt-rBR/strings.xml
+++ b/play-services-core/src/main/res/values-pt-rBR/strings.xml
@@ -65,7 +65,7 @@ Isso pode demorar alguns minutos."</string>
 
     <string name="prefcat_about">Sobre</string>
     <string name="cond_gcm_bat_title">Otimização de bateria ativada</string>
-    <string name="cond_gcm_bat_summary">Você ativou o Google Cloud Messaging, mas possui otimizações de bateria ativas para o Vanced microG Services. Para que as notificações push cheguem, você deve ignorar as otimizações da bateria.</string>
+    <string name="cond_gcm_bat_summary">Você ativou o Google Cloud Messaging, mas possui otimizações de bateria ativas para o Vanced microG. Para que as notificações push cheguem, você deve ignorar as otimizações da bateria.</string>
     <string name="cond_gcm_bat_action">Ignorar otimização</string>
 
     <string name="prefs_account">Preferências da conta</string>
diff --git a/play-services-core/src/main/res/values-ro/strings.xml b/play-services-core/src/main/res/values-ro/strings.xml
index 5628f3b3..b8b420ac 100644
--- a/play-services-core/src/main/res/values-ro/strings.xml
+++ b/play-services-core/src/main/res/values-ro/strings.xml
@@ -44,7 +44,7 @@ Acest lucru poate dura câteva minute."</string>
     <string name="pref_auth_trust_google_title">Credeţi Google pentru permisiunile aplicaţiei</string>
     <string name="pref_auth_trust_google_summary">Dacă este dezactivat, utilizatorul este întrebat înainte de trimiterea către Google a unei solicitări de autorizare a aplicaţiei. Unele aplicații nu vor reuși să utilizeze contul Google, dacă această opţiune este dezactivată.</string>
 
-    <string name="pref_checkin_enable_summary">\"Înregistrarea dispozitivului\" este un proces ascuns care este utilizat pentru a crea un identificator unic pentru serviciile Google. Serviciile microG înlătură alte date de identificare cu excepţia numelui contului dvs. Google.</string>
+    <string name="pref_checkin_enable_summary">\"Înregistrarea dispozitivului\" este un proces ascuns care este utilizat pentru a crea un identificator unic pentru serviciile Google. Serviciile Vanced microG înlătură alte date de identificare cu excepţia numelui contului dvs. Google.</string>
 
     <string name="pref_gcm_enable_mcs_summary">Mesageria Google Cloud este un furnizor de notificări de ti push utilizat de multe aplicații. Pentru a utiliza trebuie să activați \"Înregistrarea dispozitivului\".</string>
     </resources>
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 de552bb0..40041348 100644
--- a/play-services-core/src/main/res/values-ru/strings.xml
+++ b/play-services-core/src/main/res/values-ru/strings.xml
@@ -80,7 +80,7 @@
     <string name="prefcat_google_services">Google сервисы</string>
 
     <string name="cond_gcm_bat_title">Активна оптимизация энергопотребления</string>
-    <string name="cond_gcm_bat_summary">Вы включили Google Cloud Messaging, но у вас активна оптимизация энергопотребления для Vanced microG Services. Чтобы получать push-уведомления вам необходимо разрешить приложению работать в фоновом режиме.</string>
+    <string name="cond_gcm_bat_summary">Вы включили Google Cloud Messaging, но у вас активна оптимизация энергопотребления для Vanced microG. Чтобы получать push-уведомления вам необходимо разрешить приложению работать в фоновом режиме.</string>
     <string name="cond_gcm_bat_action">Разрешить работу в фоне</string>
 
     <string name="prefs_account">Настройки аккаунта</string>
diff --git a/play-services-core/src/main/res/values-uk/strings.xml b/play-services-core/src/main/res/values-uk/strings.xml
index 755b287c..0453b6ca 100644
--- a/play-services-core/src/main/res/values-uk/strings.xml
+++ b/play-services-core/src/main/res/values-uk/strings.xml
@@ -15,7 +15,7 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="gms_settings_name">Налаштування VAnced microG</string>
+    <string name="gms_settings_name">Налаштування Vanced microG</string>
 
     <string name="just_a_sec">Зачекайте трохи…</string>
     <string name="google_account_label">Google</string>
@@ -79,7 +79,7 @@
     <string name="prefcat_google_services">Сервіси Google</string>
 
     <string name="cond_gcm_bat_title">Увімкнута оптимізація енергоспоживання</string>
-    <string name="cond_gcm_bat_summary">Ви увімкнули Google Cloud Messaging але лиши оптимізацію енергоспоживання активним для Vanced microG Services. Аби отримувати push-сповіщення необхідно вимкнути оптимізацію енергоспоживання.</string>
+    <string name="cond_gcm_bat_summary">Ви увімкнули Google Cloud Messaging але лиши оптимізацію енергоспоживання активним для Vanced microG. Аби отримувати push-сповіщення необхідно вимкнути оптимізацію енергоспоживання.</string>
     <string name="cond_gcm_bat_action">Ігнорувати оптимізацію</string>
 
     <string name="prefs_account">Налаштування облікового запису</string>
diff --git a/play-services-core/src/main/res/values-zh-rTW/strings.xml b/play-services-core/src/main/res/values-zh-rTW/strings.xml
index 5a093908..9d080e9c 100644
--- a/play-services-core/src/main/res/values-zh-rTW/strings.xml
+++ b/play-services-core/src/main/res/values-zh-rTW/strings.xml
@@ -66,7 +66,7 @@
     <string name="prefcat_about">關於</string>
 
     <string name="cond_gcm_bat_title">已開啟電池優化</string>
-    <string name="cond_gcm_bat_summary">您已啟用GCM但依舊套用了電池優化在microG Services Core上。 為了能收到推送通知您應該取消電池優化。</string>
+    <string name="cond_gcm_bat_summary">您已啟用GCM但依舊套用了電池優化在Vanced microG上。 為了能收到推送通知您應該取消電池優化。</string>
     <string name="cond_gcm_bat_action">取消優化</string>
 
     <string name="prefs_account">帳號設定</string>
@@ -80,7 +80,7 @@
 
     <string name="pref_gcm_enable_mcs_summary">GCM是一個廣為第三方應用程式所採用的推播訊息供應者。 必須先註冊為Google設備才能使用。</string>
     <string name="pref_gcm_apps_title">使用GCM的程式</string>
-    <string name="pref_about_title">關於VAnced microG Services</string>
+    <string name="pref_about_title">關於Vanced microG Services</string>
 
     <string name="gcm_unregister_app">取消註冊</string>
     <string name="gcm_not_registered">未註冊</string>
diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
index a5128249..29e97ad0 100644
--- a/play-services-core/src/main/res/values/strings.xml
+++ b/play-services-core/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="gms_settings_name">Vanced microG Settings</string>
-    <string name="gms_settings_summary">Setup Vanced microG services.</string>
+    <string name="gms_settings_summary">Setup Vanced microG.</string>
 
     <string name="just_a_sec">Just a sec…</string>
     <string name="google_account_label">Google</string>
@@ -80,7 +80,7 @@ This can take a couple of minutes."</string>
     <string name="prefcat_google_services">Google Services</string>
 
     <string name="cond_gcm_bat_title">Battery optimizations enabled</string>
-    <string name="cond_gcm_bat_summary">You enabled Google Cloud Messaging but have battery optimizations active for Vanced microG Services. For push notifications to arrive you should ignore battery optimizations.</string>
+    <string name="cond_gcm_bat_summary">You enabled Google Cloud Messaging but have battery optimizations active for Vanced microG. For push notifications to arrive you should ignore battery optimizations.</string>
     <string name="cond_gcm_bat_action">Ignore optimizations</string>
 
     <string name="prefs_account">Account preferences</string>

From 3818bb00751529649db73584a9247c83fe0683fe Mon Sep 17 00:00:00 2001
From: VenNeptury <sgtmattis@gmail.com>
Date: Sat, 18 Jul 2020 21:16:41 +0200
Subject: [PATCH 5/6] Update strings.xml

---
 play-services-core/src/main/res/values-fr/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/play-services-core/src/main/res/values-fr/strings.xml b/play-services-core/src/main/res/values-fr/strings.xml
index 565739ad..36fbf743 100644
--- a/play-services-core/src/main/res/values-fr/strings.xml
+++ b/play-services-core/src/main/res/values-fr/strings.xml
@@ -72,7 +72,7 @@ Ceci peut prendre plusieurs minutes."</string>
     <string name="prefcat_google_services">Services Google</string>
 
     <string name="cond_gcm_bat_title">Optimisations de la batterie activées</string>
-    <string name="cond_gcm_bat_summary">Vous avez activé Google Cloud Messaging mais l’optimisation de la batterie est activée pour Vanced microG Services. Afin de recevoir les notifications push vous devriez désactiver les optimisations de la batterie.</string>
+    <string name="cond_gcm_bat_summary">Vous avez activé Google Cloud Messaging mais l’optimisation de la batterie est activée pour Vanced microG. Afin de recevoir les notifications push vous devriez désactiver les optimisations de la batterie.</string>
     <string name="cond_gcm_bat_action">Désactiver les optimisations de la batterie</string>
 
     <string name="prefs_account">Préférences du compte</string>
@@ -82,14 +82,14 @@ Ceci peut prendre plusieurs minutes."</string>
     <string name="pref_auth_trust_google_title">Faire confiance à Google pour les autorisations des applications</string>
     <string name="pref_auth_trust_google_summary">Si désactivé, l’utilisateur est interrogé avant que la demande d’autorisation d’une application soit envoyée à Google. Certaines applications échoueront à utiliser le compte Google si ceci est désactivé.</string>
 
-    <string name="pref_checkin_enable_summary">Enregistre votre terminal auprès des services Google et crée un identifiant unique. microG retire les identifiants autres que le nom de votre compte Google des informations d’enregistrement.</string>
+    <string name="pref_checkin_enable_summary">Enregistre votre terminal auprès des services Google et crée un identifiant unique. Vanced microG retire les identifiants autres que le nom de votre compte Google des informations d’enregistrement.</string>
 
     <string name="pref_gcm_enable_mcs_summary">Google Cloud Messaging est un fournisseur de notifications push utilisé par beaucoup d’applications tierces. Pour l’utiliser vous devez activer l’enregistrement du terminal.</string>
     <string name="pref_gcm_apps_title">Applications utilisant Google Cloud Messaging</string>
     <string name="pref_gcm_confirm_new_apps_title">Confirmation pour les nouvelles applications</string>
     <string name="pref_gcm_confirm_new_apps_summary">Demander avant d’enregistrer une nouvelle application auprès de Google Cloud Messaging</string>
 
-    <string name="pref_about_title">À propos de microG Services Core</string>
+    <string name="pref_about_title">À propos de Vanced microG</string>
 
     <string name="gcm_unregister_app">Désenregistrer</string>
     <string name="gcm_not_registered">Non enregistrée</string>

From 2b8c14965361a3c6fe3a97405fdff3fcd4d2b6af Mon Sep 17 00:00:00 2001
From: VenNeptury <sgtmattis@gmail.com>
Date: Sat, 18 Jul 2020 21:17:29 +0200
Subject: [PATCH 6/6] Update strings.xml

---
 play-services-core/src/main/res/values-ru/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 de552bb0..5e127ccf 100644
--- a/play-services-core/src/main/res/values-ru/strings.xml
+++ b/play-services-core/src/main/res/values-ru/strings.xml
@@ -80,7 +80,7 @@
     <string name="prefcat_google_services">Google сервисы</string>
 
     <string name="cond_gcm_bat_title">Активна оптимизация энергопотребления</string>
-    <string name="cond_gcm_bat_summary">Вы включили Google Cloud Messaging, но у вас активна оптимизация энергопотребления для Vanced microG Services. Чтобы получать push-уведомления вам необходимо разрешить приложению работать в фоновом режиме.</string>
+    <string name="cond_gcm_bat_summary">Вы включили Google Cloud Messaging, но у вас активна оптимизация энергопотребления для Vanced microG. Чтобы получать push-уведомления вам необходимо разрешить приложению работать в фоновом режиме.</string>
     <string name="cond_gcm_bat_action">Разрешить работу в фоне</string>
 
     <string name="prefs_account">Настройки аккаунта</string>
@@ -90,7 +90,7 @@
     <string name="pref_auth_trust_google_title">Доверять разрешениям Google в приложениях</string>
     <string name="pref_auth_trust_google_summary">Если параметр отключен, то у пользователя запрашивается разрешение для авторизации Google. Некоторые приложения не смогут использовать аккаунт Google, если эта возможность отключена.</string>
 
-    <string name="pref_checkin_enable_summary">Регистрирует ваше устройство в сервисах Google и создает уникальный идентификатор. MicroG удаляет все идентифицирующие биты, кроме имени вашего аккаунта Google.</string>
+    <string name="pref_checkin_enable_summary">Регистрирует ваше устройство в сервисах Google и создает уникальный идентификатор. Vanced MicroG удаляет все идентифицирующие биты, кроме имени вашего аккаунта Google.</string>
 
     <string name="pref_add_account_title">Аккаунт</string>
     <string name="pref_add_account_summary">Добавить аккаунт Google</string>
@@ -99,7 +99,7 @@
     <string name="pref_gcm_confirm_new_apps_title">Подтверждать новые приложения</string>
     <string name="pref_gcm_confirm_new_apps_summary">Спрашивать разрешение перед привязкой новых приложений для получения push-уведомлений</string>
 
-    <string name="pref_about_title">О сервисах microG</string>
+    <string name="pref_about_title">О сервисах Vanced microG</string>
 
     <string name="gcm_unregister_app">Отвязать</string>
     <string name="gcm_not_registered">Не привязано</string>