Move plurals into seperate files, make Condition use plurals

.tx/config

@@ -8,6 +8,12 @@ source_file = play-services-core/src/main/res/values/strings.xml
 source_lang = en
 type = ANDROID
 
+[gmscore.plurals]
+file_filter = play-services-core/src/main/res/values-<lang>/plurals.xml
+source_file = play-services-core/src/main/res/values/plurals.xml
+source_lang = en
+type = ANDROID
+
 [gmscore.permissions]
 file_filter = play-services-core/src/main/res/values-<lang>/permissions.xml
 source_file = play-services-core/src/main/res/values/permissions.xml

extern/UnifiedNlp

@@ -1 +1 @@
-Subproject commit 4dcb5f15dfd8c66019f30fac643fdc717bea6575
+Subproject commit ac0636fa018e40e40cd51023efe5440378d6c643

play-services-core/src/main/java/org/microg/gms/ui/Conditions.java

@@ -64,18 +64,25 @@ public class Conditions {
     private static final String[] REQUIRED_PERMISSIONS = new String[]{ACCESS_COARSE_LOCATION, WRITE_EXTERNAL_STORAGE, GET_ACCOUNTS, READ_PHONE_STATE};
     public static final Condition PERMISSIONS = new Condition.Builder()
             .title(R.string.cond_perm_title)
-            .summary(R.string.cond_perm_summary)
+            .summaryPlurals(R.plurals.cond_perm_summary)
             .evaluation(new Condition.Evaluation() {
+                int count = 0;
                 @Override
                 public boolean isActive(Context context) {
+                    count = 0;
                     for (String permission : REQUIRED_PERMISSIONS) {
                         if (ContextCompat.checkSelfPermission(context, permission) != PERMISSION_GRANTED)
-                            return true;
+                            count++;
                     }
-                    return false;
+                    return count > 0;
+                }
+
+                @Override
+                public int getPluralsCount() {
+                    return count;
                 }
             })
-            .firstAction(R.string.cond_perm_action, new View.OnClickListener() {
+            .firstActionPlurals(R.plurals.cond_perm_action, new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     if (v.getContext() instanceof Activity) {

play-services-core/src/main/res/values-de/plurals.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <plurals name="pref_unifiednlp_summary">
+        <item quantity="one"><xliff:g example="1">%1$d</xliff:g> backend eingestellt</item>
+        <item quantity="other"><xliff:g example="3">%1$d</xliff:g> backends eingestellt</item>
+    </plurals>
+    <plurals name="gcm_registered_apps_counter">
+        <item quantity="one"><xliff:g example="1">%1$d</xliff:g> registrierte App</item>
+        <item quantity="other"><xliff:g example="123">%1$d</xliff:g> registrierte Apps</item>
+    </plurals>
+    <plurals name="cond_perm_summary">
+        <item quantity="one">Eine Berechtigungen, die für die ordnungsgemäße Funktionalität von microG Services Core benötigt werden, ist nicht zugeteilt.</item>
+        <item quantity="other">Mehrere Berechtigungen, die für die ordnungsgemäße Funktionalität von microG Services Core benötigt werden, sind nicht zugeteilt.</item>
+    </plurals>
+    <plurals name="cond_perm_action">
+        <item quantity="one">Fehlende Berechtigung anfragen</item>
+        <item quantity="other">Fehlende Berechtigungen anfragen</item>
+    </plurals>
+</resources>

play-services-core/src/main/res/values-de/strings.xml

@@ -73,8 +73,6 @@ Dies kann einige Minuten dauern."</string>
     <string name="prefcat_test">Test</string>
 
     <string name="cond_perm_title">Berechtigung fehlt</string>
-    <string name="cond_perm_summary">Eine oder mehrere Berechtigungen, die für die ordnungsgemäße Funktionalität von microG Services Core benötigt werden, sind nicht zugeteilt.</string>
-    <string name="cond_perm_action">Fehlende Berechtigungen anfragen</string>
 
     <string name="prefs_account">Kontoeinstellungen</string>
     <string name="prefs_account_privacy">Persönliche Daten &amp; Privatsphäre</string>
@@ -86,10 +84,6 @@ Dies kann einige Minuten dauern."</string>
     <string name="pref_checkin_enable_summary">Registriert den Gerät zur Nutzung von Google-Diensten und erzeugt eine eindeutige Kennung. microG entfernt identifizierende Daten außer dem Namen  des Google-Kontos.</string>
 
     <string name="pref_more_settings">Mehr</string>
-    <plurals name="pref_unifiednlp_summary">
-        <item quantity="one"><xliff:g example="1">%1$d</xliff:g> backend eingestellt</item>
-        <item quantity="other"><xliff:g example="3">%1$d</xliff:g> backends eingestellt</item>
-    </plurals>
 
     <string name="pref_gcm_enable_mcs_summary">Google Cloud Messaging ist ein Push-Nachrichten-Dienst, der von vielen Apps genutzt wird. Zur Benutzung muss Geräte Check-In aktiviert werden.</string>
     <string name="pref_gcm_apps_title">Apps die Cloud Messaging benutzen</string>
@@ -98,10 +92,6 @@ Dies kann einige Minuten dauern."</string>
     <string name="pref_about_title">Über microG Services Core</string>
     <string name="pref_about_summary">Versionsinformation und genutzte Bibliotheken</string>
 
-    <plurals name="gcm_registered_apps_counter">
-        <item quantity="one"><xliff:g example="1">%1$d</xliff:g> registrierte App</item>
-        <item quantity="other"><xliff:g example="123">%1$d</xliff:g> registrierte Apps</item>
-    </plurals>
     <string name="gcm_app_error_unregistering">Fehler bei der Abmeldung</string>
     <string name="gcm_app_not_installed_anymore">Nicht mehr installiert</string>
     <string name="gcm_unregister_app">Abmelden</string>

play-services-core/src/main/res/values-es/plurals.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    </resources>

play-services-core/src/main/res/values-fr/plurals.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <plurals name="pref_unifiednlp_summary">
+        <item quantity="one"><xliff:g example="3">%1$d</xliff:g> fournisseur configuré</item>
+        <item quantity="other"><xliff:g example="3">%1$d</xliff:g> fournisseurs configurés</item>
+    </plurals>
+    <plurals name="gcm_registered_apps_counter">
+        <item quantity="one"><xliff:g example="1">%1$d</xliff:g> application enregistrée</item>
+        <item quantity="other"><xliff:g example="123">%1$d</xliff:g> applications enregistrées</item>
+    </plurals>
+    <plurals name="cond_perm_summary">
+        <item quantity="one">Une autorisation requises pour le fonctionnement correct de microG Service Core est manquante.</item>
+        <item quantity="other">Plusieurs autorisations requises pour le fonctionnement correct de microG Service Core sont manquantes.</item>
+    </plurals>
+    <plurals name="cond_perm_action">
+        <item quantity="one">Demander la autorisation manquante</item>
+        <item quantity="other">Demander les autorisations manquantes</item>
+    </plurals>
+</resources>

play-services-core/src/main/res/values-fr/strings.xml

@@ -21,8 +21,8 @@
     <string name="just_a_sec">Juste une seconde…</string>
     <string name="google_account_label">Google</string>
     <string name="ask_permission_tos">En poursuivant, vous autorisez cette application et Google à utiliser vos informations en accord avec leurs termes de service et politiques de vie privée respectifs.</string>
-    <string name="ask_scope_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> voudrait:</string>
+    <string name="ask_scope_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> voudrait :</string>
-    <string name="ask_service_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> voudrait utiliser:</string>
+    <string name="ask_service_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> voudrait utiliser :</string>
     <string name="account_manager_title">Gestionnaire du compte Google</string>
     <string name="sorry">Désolé…</string>
     <string name="no_network_error_desc">"Vous n’avez pas de connexion réseau.
@@ -113,8 +113,6 @@ Ceci peut prendre plusieurs minutes."</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_action">Désactiver les optimisations de la batterie</string>
     <string name="cond_perm_title">Autorisations manquantes</string>
-    <string name="cond_perm_summary">Une ou plusieurs autorisations requises pour le fonctionnement correct de microG Service Core sont manquantes.</string>
-    <string name="cond_perm_action">Demander les autorisations manquantes</string>
 
     <string name="prefs_account">Préférences du compte</string>
     <string name="prefs_account_privacy">Informations personnelles &amp; vie privée</string>
@@ -126,10 +124,6 @@ Ceci peut prendre plusieurs minutes."</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_more_settings">Plus</string>
-    <plurals name="pref_unifiednlp_summary">
-        <item quantity="one"><xliff:g example="3">%1$d</xliff:g> fournisseur configuré</item>
-        <item quantity="other"><xliff:g example="3">%1$d</xliff:g> fournisseurs configurés</item>
-    </plurals>
 
     <string name="pref_gcm_enable_mcs_summary">Google Cloud Messaging est un fournisseur de notifications push utilisés par beaucoup d’applications tierces. Pour l’utiliser vous devez activez l’enregistrement du terminal.</string>
     <string name="pref_gcm_heartbeat_title">Intervalle des signaux de présence Cloud Messaging</string>
@@ -143,9 +137,6 @@ Ceci peut prendre plusieurs minutes."</string>
     <string name="pref_about_title">À propos de microG Services Core</string>
     <string name="pref_about_summary">Informations de version et librairies utilisées</string>
 
-    <plurals name="gcm_registered_apps_counter">
-        <item quantity="other"><xliff:g example="123">%1$d</xliff:g> applications enregistrées</item>
-    </plurals>
     <string name="gcm_app_error_unregistering">Erreur lors du désenregistrement</string>
     <string name="gcm_app_not_installed_anymore">Cette application n’est plus installée</string>
     <string name="gcm_unregister_app">Désenregistrer</string>

play-services-core/src/main/res/values-pl/permissions.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2013-2015 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <string name="permission_service_all_label">Wszystkie usługi Google</string>
+    <string name="permission_service_all_description">Zezwala aplikacji na dostęp do wszystkich usług Google przez dowolne powiązane konto Google.</string>
+
+    <string name="permission_service_android_label">Usługi Android</string>
+    <string name="permission_service_android_description">Zezwala aplikacji na dostęp do usług Androida przez dowolne powiązane konto Google.</string>
+    <string name="permission_service_adsense_label">AdSense</string>
+    <string name="permission_service_adsense_description">Zezwala aplikacji na dostęp do AdSense przez dowolne powiązane konto Google.</string>
+    <string name="permission_service_adwords_label">AdWords</string>
+    <string name="permission_service_adwords_description">Zezwala aplikacji na dostęp do AdWords przez dowolne powiązane konto Google.</string>
+    <string name="permission_service_ah_label">Google App Engine</string>
+    <string name="permission_service_ah_description">Zezwala aplikacji na dostęp do Google App Engine przez dowolne powiązane konto Google.</string>
+    <string name="permission_service_blogger_label">Blogger</string>
+    <string name="permission_service_blogger_description">Zezwala aplikacji na dostęp do Bloggera przez dowolne powiązane konto Google.</string>
+    <string name="permission_service_cl_label">Kalendarz Google</string>
+    <string name="permission_service_cl_description">Zezwala aplikacji na dostęp do Kalendarza Google przez dowolne powiązane konto Google.</string>
+    <string name="permission_service_cp_label">Kontakty</string>
+    <string name="permission_service_cp_description">Zezwala aplikacji na dostęp do Kontaktów przez dowolne powiązane konto Google.</string>
+    <string name="permission_service_dodgeball_label">Dodgeball</string>
+    <string name="permission_service_dodgeball_description">Zezwala aplikacji na dostęp do Dodgeballa przez dowolne powiązane konto Google.</string>
+    <string name="permission_service_finance_label">Finanse Google</string>
+    <string name="permission_service_finance_description">Zezwala aplikacji na dostęp do Finansów Google przez dowolne powiązane konto Google.</string>
+    <string name="permission_service_gbase_label">Google Base</string>
+    <string name="permission_service_gbase_description">Zezwala aplikacji na dostęp do Google Base przez dowolne powiązane konto Google.</string>
+    <string name="permission_service_grandcentral_label">Google Voice</string>
+    <string name="permission_service_grandcentral_description">Zezwala aplikacji na dostęp do Google Voice przez dowolne powiązane konto Google.</string>
+    <string name="permission_service_groups2_label">Grupy dyskusyjne Google</string>
+    <string name="permission_service_groups2_description">Zezwala aplikacji na dostęp do Grup dyskusyjnych Google przez dowolne powiązane konto Google.</string>
+    </resources>

play-services-core/src/main/res/values-pl/plurals.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <plurals name="pref_unifiednlp_summary">
+        <item quantity="one"><xliff:g example=\"1\">%1$d</xliff:g> usługa skonfigurowana</item>
+        <item quantity="few"><xliff:g example=\"3\">%1$d</xliff:g> usługi skonfigurowane</item>
+        <item quantity="many"><xliff:g example=\"3\">%1$d</xliff:g> usług skonfigurowanych</item>
+        <item quantity="other"><xliff:g example=\"3\">%1$d</xliff:g> usług skonfigurowanych</item>
+    </plurals>
+    <plurals name="gcm_registered_apps_counter">
+        <item quantity="one"><xliff:g example=\"1\">%1$d</xliff:g> zarejestrowana aplikacja</item>
+        <item quantity="few"><xliff:g example=\"123\">%1$d</xliff:g> zarejestrowane aplikacje</item>
+        <item quantity="many"><xliff:g example=\"123\">%1$d</xliff:g> zarejestrowanych aplikacji</item>
+        <item quantity="other"><xliff:g example=\"123\">%1$d</xliff:g> zarejestrowanych aplikacji</item>
+    </plurals>
+    <plurals name="cond_perm_summary">
+        <item quantity="one">Nie udzielono uprawnienia niezbędnego do poprawnego funkcjonowania usługi microG.</item>
+        <item quantity="few">Nie udzielono uprawnień niezbędnych do poprawnego działania usługi microG.</item>
+        <item quantity="many">Nie udzielono uprawnień niezbędnych do poprawnego działania usługi microG.</item>
+        <item quantity="other">Nie udzielono uprawnień niezbędnych do poprawnego działania usługi microG.</item>
+    </plurals>
+    <plurals name="cond_perm_action">
+        <item quantity="one">Brakuje wymaganego uprawnienia</item>
+        <item quantity="few">Brakuje wymaganych uprawnień</item>
+        <item quantity="many">Brakuje wymaganych uprawnień</item>
+        <item quantity="other">Brakuje wymaganych uprawnień</item>
+    </plurals>
+</resources>

play-services-core/src/main/res/values-pl/strings.xml

@@ -113,8 +113,6 @@ To zajmie kilka minut.</string>
     <string name="cond_gcm_bat_summary">Aktywowałeś Google Cloud Messaging ale optymalizacja baterii jest aktywna dla usługi microG. Aby powiadomienia \'push\' działały, powinieneś wyłączyć optymalizację baterii.</string>
     <string name="cond_gcm_bat_action">Ignoruj optymalizacje</string>
     <string name="cond_perm_title">Brakuje uprawnień</string>
-    <string name="cond_perm_summary">Brakuje jednego lub kilku uprawnień niezbędnych do poprawnego działania usługi microG.</string>
-    <string name="cond_perm_action">Poproś o brakujące uprawnienia</string>
 
     <string name="prefs_account">Ustawienia konta</string>
     <string name="prefs_account_privacy">Ustawienia osobiste i prywatność</string>
@@ -126,12 +124,6 @@ To zajmie kilka minut.</string>
     <string name="pref_checkin_enable_summary">Zgłaszanie urządzenia to ukryty proces, służący do wygenerowania unikalnego identyfikatora dla usług Google. Usługi microG usuwają inne dane identyfikacyjne niż nazwa Twojego konta z tego identyfikatora.</string>
 
     <string name="pref_more_settings">Więcej</string>
-    <plurals name="pref_unifiednlp_summary">
-        <item quantity="one"><xliff:g example="1">%1$d</xliff:g> usługa skonfigurowana</item>
-        <item quantity="few"><xliff:g example="3">%1$d</xliff:g> usługi skonfigurowane</item>
-        <item quantity="many"><xliff:g example="3">%1$d</xliff:g> usług skonfigurowanych</item>
-        <item quantity="other"><xliff:g example="3">%1$d</xliff:g> usług skonfigurowanych</item>
-    </plurals>
 
     <string name="pref_gcm_enable_mcs_summary">Google Cloud Messaging jest systemem zapewniającym powiadomienia dla wielu aplikacji. Żeby z niego korzystać, musisz uruchomić zgłaszanie urządzenia.</string>
     <string name="pref_gcm_heartbeat_title">Częstotliwość nasłuchu Cloud Messaging</string>
@@ -145,9 +137,6 @@ To zajmie kilka minut.</string>
     <string name="pref_about_title">O usłudze microG</string>
     <string name="pref_about_summary">Informacje o wersji i użyte biblioteki</string>
 
-    <plurals name="gcm_registered_apps_counter">
-	<item quantity="other"><xliff:g example="123">%1$d</xliff:g> zarejestrowanych aplikacji</item>
-    </plurals>
     <string name="gcm_app_error_unregistering">Błąd wyrejestrowywania</string>
     <string name="gcm_app_not_installed_anymore">Już odinstalowany</string>
     <string name="gcm_unregister_app">Wyrejestruj</string>
@@ -160,4 +149,20 @@ To zajmie kilka minut.</string>
     <string name="gcm_unregister_confirm_message">Niektóre aplikacje automatycznie nie rejestrują się ponownie lub nie posiadają opcji do przeprowadzenia tego ręcznie. Te aplikacje mogą nie działać prawidłowo po wyrejestrowaniu.\nCzy kontynuować?</string>
     <string name="gcm_unregister_after_deny_message">Zabroniłeś już zarejestrowanej aplikacji zarejestrować się do odczytu powiadomień \'push\'.\nCzy chcesz wyrejestrować ją, aby nie otrzymywała powiadomień \'push\' w przyszłości?</string>
     <string name="gcm_messages_counter">Wiadomości: <xliff:g example="123">%1$d</xliff:g> (<xliff:g example="12345">%2$d</xliff:g> bajtów)</string>
+    <string name="gcm_state_disconnected">Obecny stan: rozłączony</string>
+    <string name="gcm_state_connected">Obecny stan: połączony od <xliff:g example=\"2 hours ago\">%1$s</xliff:g></string>
+
+    <string name="snet_intro">Google SafetyNet jest systemem certyfikacji urządzenia, który upewnia się czy urządzenie jest poprawnie zabezpieczone i kompatybilne z Android CTS. Niektóre aplikacje używają SafetyNet ze względów bezpieczeństwa lub jako przeciwśrodek do modyfikacji.\n\nUsługa microG GmsCore zawiera wolną implementację SafetyNet, ale oficjalny serwer wymaga, aby SafetyNet był podpisany przez własnościowy system DroidGuard. Izolowana wersja DroidGuard-a jest dostępna do pobrania jako oddzielna aplikacja \"DroidGuard Helper\".</string>
+
+    <string name="pref_snet_testdrive_title">Wypróbuj poświadczenie SafetyNet</string>
+
+    <string name="pref_snet_status_official_title">Użyj oficjalnego serwera</string>
+    <string name="pref_snet_status_official_summary">Wymaga niezrootowanego systemu i zainstalowanego microG DroidGuard Helper</string>
+    <string name="pref_snet_status_third_party_title">Użyj serwera strony trzeciej</string>
+    <string name="pref_snet_status_third_party_summary">Serwery stron trzecich mogą być w stanie odpowiedzieć na zapytania SafetyNet bez sygnatury DroidGuard</string>
+    <string name="pref_snet_custom_url_title">URL własnego serwera</string>
+    <string name="pref_snet_custom_url_summary">Pełny URL serwera strony trzeciej odpowiadającego na zapytania poświadczeń SafetyNet</string>
+    <string name="pref_snet_self_signed_title">Użyj samo-podpisanego certyfikatu</string>
+    <string name="pref_snet_self_signed_summary">Zamiast odpytywać serwera, podpisuj odpowiedzi SafetyNet lokalnie używając samo-podpisanego certyfikatu. Większość aplikacji odmówi użycia samo-podpisanych odpowiedzi.</string>
+
 </resources>

play-services-core/src/main/res/values-pt-rBR/plurals.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <plurals name="gcm_registered_apps_counter">
+        <item quantity="other"><xliff:g example="123">%1$d</xliff:g> registered Apps</item>
+    </plurals>
+    <plurals name="cond_perm_summary">
+        <item quantity="other">Falta uma ou mais permissões para a funcionalidade adequada do MicroG Service Core.</item>
+    </plurals>
+    <plurals name="cond_perm_action">
+        <item quantity="other">Solicitar permissões em falta</item>
+    </plurals>
+</resources>

play-services-core/src/main/res/values-pt-rBR/strings.xml

@@ -101,8 +101,6 @@ Isso pode demorar alguns minutos."</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_action">Ignorar otimização</string>
     <string name="cond_perm_title">Permissão ausente</string>
-    <string name="cond_perm_summary">Falta uma ou mais permissões para a funcionalidade adequada do MicroG Service Core.</string>
-    <string name="cond_perm_action">Solicitar permissões em falta</string>
 
     <string name="prefs_account">Preferências da conta</string>
     <string name="prefs_account_privacy">Informação pessoal &amp; privacidade</string>
@@ -121,9 +119,6 @@ Isso pode demorar alguns minutos."</string>
     <string name="pref_about_title">Sobre microG Services Core</string>
     <string name="pref_about_summary">Informações de versão e bibliotecas usadas</string>
 
-    <plurals name="gcm_registered_apps_counter">
-        <item quantity="other"><xliff:g example="123">%1$d</xliff:g> registered Apps</item>
-    </plurals>
     <string name="gcm_app_error_unregistering">Erro ao cancelar o registro</string>
     <string name="gcm_app_not_installed_anymore">Não está mais instalado</string>
     <string name="gcm_unregister_app">Cancelar registro</string>

play-services-core/src/main/res/values-ro/plurals.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    </resources>

play-services-core/src/main/res/values-ru/plurals.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <plurals name="gcm_registered_apps_counter">
+        <item quantity="other"><xliff:g example="123">%1$d</xliff:g> привязаных приложений</item>
+    </plurals>
+    <plurals name="cond_perm_summary">
+        <item quantity="other">Отсутствуют один или несколько разрешений, которые требуются для корректной работы microG Service Core.</item>
+    </plurals>
+    <plurals name="cond_perm_action">
+        <item quantity="other">Запросить отсутствующие разрешения</item>
+    </plurals>
+</resources>

play-services-core/src/main/res/values-ru/strings.xml

@@ -109,8 +109,6 @@
     <string name="cond_gcm_bat_summary">Вы включили Google Cloud Messaging, но у вас активна оптимизация энергопотребления для microG Services Core. Чтобы получать push-уведомления вам необходимо разрешить приложению работать в фоновом режиме.</string>
     <string name="cond_gcm_bat_action">Разрешить работу в фоне</string>
     <string name="cond_perm_title">Отсутствуют разрешения</string>
-    <string name="cond_perm_summary">Отсутствуют один или несколько разрешений, которые требуются для корректной работы microG Service Core.</string>
-    <string name="cond_perm_action">Запросить отсутствующие разрешения</string>
 
     <string name="prefs_account">Настройки аккаунта</string>
     <string name="prefs_account_privacy">Персональная информация и приватность</string>
@@ -122,6 +120,7 @@
     <string name="pref_checkin_enable_summary">Регистрирует ваше устройство в сервисах Google и создает уникальный идентификатор. MicroG удаляет все идентифицирующие биты, кроме имени вашего аккаунта Google.</string>
 
     <string name="pref_more_settings">Ещё</string>
+
     <string name="pref_gcm_enable_mcs_summary">Google Cloud Messaging предоставляет push-уведомления, которые используются во многих в сторонних приложениях. Чтобы использовать их, вы должны включить регистрацию устройства.</string>
     <string name="pref_gcm_heartbeat_title">Интервал соединения Cloud Messaging</string>
     <string name="pref_gcm_heartbeat_summary">"Интервал в секундах, для использования серверов Google. Увеличение этого числа сократит потребление батареи, но может привести к задержкам push-сообщений.\nУстарело, будет изменено в следующем релизе."</string>
@@ -130,9 +129,6 @@
     <string name="pref_about_title">О сервисах microG</string>
     <string name="pref_about_summary">Информация о версии и используемые библиотеки</string>
 
-    <plurals name="gcm_registered_apps_counter">
-        <item quantity="other"><xliff:g example="123">%1$d</xliff:g> привязаных приложений</item>
-    </plurals>
     <string name="gcm_app_error_unregistering">Не удалось отвязать</string>
     <string name="gcm_app_not_installed_anymore">Приложение больше не установлено</string>
     <string name="gcm_unregister_app">Отвязать</string>

play-services-core/src/main/res/values-sr/plurals.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <plurals name="gcm_registered_apps_counter">
+        <item quantity="other">%1$d пријављених апликација</item>
+    </plurals>
+    <plurals name="cond_perm_summary">
+        <item quantity="other">Једна или више дозвола потребних за исправно функционисање Језгра микроГ услуга недостају.</item>
+    </plurals>
+    <plurals name="cond_perm_action">
+        <item quantity="other">Захтевај недостајуће дозволе</item>
+    </plurals>
+</resources>

play-services-core/src/main/res/values-sr/strings.xml

@@ -101,8 +101,6 @@
     <string name="cond_gcm_bat_summary">Укључили сте Гуглове облак поруке али имате активну оптимизацију батерије за Језгро микроГ услуга. Да би гурана обавештења стизала морате да игноришете оптимизацију батерије.</string>
     <string name="cond_gcm_bat_action">Игнориши оптимизацију</string>
     <string name="cond_perm_title">Недостају дозволе</string>
-    <string name="cond_perm_summary">Једна или више дозвола потребних за исправно функционисање Језгра микроГ услуга недостају.</string>
-    <string name="cond_perm_action">Захтевај недостајуће дозволе</string>
 
     <string name="prefs_account">Поставке налога</string>
     <string name="prefs_account_privacy">Лични подаци и приватност</string>
@@ -121,9 +119,6 @@
     <string name="pref_about_title">О језгру микроГ услуга</string>
     <string name="pref_about_summary">Подаци о издању и коришћеним библиотекама</string>
 
-    <plurals name="gcm_registered_apps_counter">
-        <item quantity="other">%1$d пријављених апликација</item>
-    </plurals>
     <string name="gcm_app_error_unregistering">Грешка одјављивања</string>
     <string name="gcm_app_not_installed_anymore">Није више инсталирана</string>
     <string name="gcm_unregister_app">Одјави</string>

play-services-core/src/main/res/values-zh-rTW/plurals.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <plurals name="gcm_registered_apps_counter">
+        <item quantity="other"><xliff:g example="123">%1$d</xliff:g> 個已註冊的程式</item>
+    </plurals>
+    <plurals name="cond_perm_summary">
+        <item quantity="other">microG Service Core遺失了一個或多個權限以至於不能正常運作。</item>
+    </plurals>
+    <plurals name="cond_perm_action">
+        <item quantity="other">請求遺失的權限</item>
+    </plurals>
+</resources>

play-services-core/src/main/res/values-zh-rTW/strings.xml

@@ -104,8 +104,6 @@
     <string name="cond_gcm_bat_summary">您已啟用GCM但依舊套用了電池優化在microG Services Core上。 為了能收到推送通知您應該取消電池優化。</string>
     <string name="cond_gcm_bat_action">取消優化</string>
     <string name="cond_perm_title">遺失權限</string>
-    <string name="cond_perm_summary">microG Service Core遺失了一個或多個權限以至於不能正常運作。</string>
-    <string name="cond_perm_action">請求遺失的權限</string>
 
     <string name="prefs_account">帳號設定</string>
     <string name="prefs_account_privacy">個人資訊 &amp; 隱私</string>
@@ -125,9 +123,6 @@
     <string name="pref_about_title">關於microG Services Core</string>
     <string name="pref_about_summary">版本資訊和使用的程式庫</string>
 
-    <plurals name="gcm_registered_apps_counter">
-        <item quantity="other"><xliff:g example="123">%1$d</xliff:g> 個已註冊的程式</item>
-    </plurals>
     <string name="gcm_app_error_unregistering">註冊錯誤</string>
     <string name="gcm_app_not_installed_anymore">已移除</string>
     <string name="gcm_unregister_app">取消註冊</string>

play-services-core/src/main/res/values/plurals.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <plurals name="pref_unifiednlp_summary">
+        <item quantity="one"><xliff:g example="1">%1$d</xliff:g> backend configured</item>
+        <item quantity="other"><xliff:g example="3">%1$d</xliff:g> backends configured</item>
+    </plurals>
+    <plurals name="gcm_registered_apps_counter">
+        <item quantity="one"><xliff:g example="1">%1$d</xliff:g> registered App</item>
+        <item quantity="other"><xliff:g example="123">%1$d</xliff:g> registered Apps</item>
+    </plurals>
+    <plurals name="cond_perm_summary">
+        <item quantity="one">A permission required for proper functionality of microG Service Core is not granted.</item>
+        <item quantity="other">Permissions required for proper functionality of microG Service Core are not granted.</item>
+    </plurals>
+    <plurals name="cond_perm_action">
+        <item quantity="one">Request missing permission</item>
+        <item quantity="other">Request missing permissions</item>
+    </plurals>
+</resources>

play-services-core/src/main/res/values/strings.xml

@@ -113,8 +113,6 @@ This can take a couple of minutes."</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_action">Ignore optimizations</string>
     <string name="cond_perm_title">Permission missing</string>
-    <string name="cond_perm_summary">One or more permissions required for proper functionality of microG Service Core is missing.</string>
-    <string name="cond_perm_action">Request missing permissions</string>
 
     <string name="prefs_account">Account preferences</string>
     <string name="prefs_account_privacy">Personal info &amp; privacy</string>
@@ -126,10 +124,6 @@ This can take a couple of minutes."</string>
     <string name="pref_checkin_enable_summary">Registers your device to Google services and creates a unique device identifier. microG strips identifying bits other than your Google account name from registration data.</string>
 
     <string name="pref_more_settings">More</string>
-    <plurals name="pref_unifiednlp_summary">
-        <item quantity="one"><xliff:g example="1">%1$d</xliff:g> backend configured</item>
-        <item quantity="other"><xliff:g example="3">%1$d</xliff:g> backends configured</item>
-    </plurals>
 
     <string name="pref_gcm_enable_mcs_summary">Google Cloud Messaging is a push notification provider used by many third-party applications. To use it you must enable device registration.</string>
     <string name="pref_gcm_heartbeat_title">Cloud Messaging heartbeat interval</string>
@@ -143,10 +137,6 @@ This can take a couple of minutes."</string>
     <string name="pref_about_title">About microG Services Core</string>
     <string name="pref_about_summary">Version information and used libraries</string>
 
-    <plurals name="gcm_registered_apps_counter">
-        <item quantity="one"><xliff:g example="1">%1$d</xliff:g> registered App</item>
-        <item quantity="other"><xliff:g example="123">%1$d</xliff:g> registered Apps</item>
-    </plurals>
     <string name="gcm_app_error_unregistering">Error unregistering</string>
     <string name="gcm_app_not_installed_anymore">No longer installed</string>
     <string name="gcm_unregister_app">Unregister</string>