chore: Merge branch dev to main

build.gradle

@@ -83,8 +83,8 @@ allprojects {
     apply plugin: 'idea'
 
     group = 'org.microg.gms'
-    ext.appVersionName = '6.1.3'
-    ext.appVersionCode = 255034003
+    ext.appVersionName = '6.1.4'
+    ext.appVersionCode = 255034004
     ext.baseVersion = ext.appVersionCode.toString()[0..1] + '.' + ext.appVersionCode.toString()[2..3] + '.' + ext.appVersionCode.toString()[4..5]
     version = ext.appVersionName
     ext.isReleaseVersion = false

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

@@ -5,11 +5,25 @@
   -->
 <resources>
     <!--Foreground service notification-->
+    <string name="foreground_service_notification_title">Aktivno v ozadju</string>
     <!-- %1$s is a notification text such as "Exposure Notification" -->
+    <string name="foreground_service_notification_text" formatted="true">%1$s deluje v ozadju</string>
     <!-- %1$s is a notification text such as "mnicroG Services" -->
+    <string name="foreground_service_notification_big_text">Izključite %1$s iz optimizacij baterije ali spremenite nastavitve obvestil za skritje tega obvestila</string>
     <!--foreground service: notification actions-->
+    <string name="foreground_action_battery_optimization">Optimizacija baterije</string>
+    <string name="foreground_action_notification_settings">Nastavitve</string>
     <!--Actionbar menu-->
+    <string name="menu_settings">Nastavitve</string>
     <!--Google Cloud Messaging-->
+    <string name="list_no_item_none">Nič</string>
+    <string name="list_item_see_all">Prikaži vse</string>
     <!--gcm: network status-->
+    <string name="service_status_disabled">Onemogleno</string>
+    <string name="service_status_enabled">Omogočeno</string>
+    <string name="service_status_automatic">Samodejno</string>
+    <string name="service_status_manual">Ročno</string>
+    <string name="service_status_enabled_short">Vklopljeno</string>
+    <string name="service_status_disabled_short">Izklopljeno</string>
     <!--Patchers names-->
 </resources>

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

@@ -17,7 +17,7 @@
     <string name="menu_settings">Налаштування</string>
     <!--Google Cloud Messaging-->
     <string name="list_no_item_none">Немає</string>
-    <string name="list_item_see_all">Дивитися все</string>
+    <string name="list_item_see_all">Показати всі</string>
     <!--gcm: network status-->
     <string name="service_status_disabled">Вимкнено</string>
     <string name="service_status_enabled">Увімкнено</string>

play-services-core/microg-ui-tools/src/main/res/values-sl-rSI/strings.xml

@@ -16,11 +16,28 @@
   -->
 <resources>
     <!--Updater-->
+    <string name="update_checker_button">Preveri posodobitve</string>
+    <string name="update_checker_download_button">Prenesi</string>
     <!--updater: messages-->
+    <string name="update_checker_no_update">Nobenih posodobitev ni na voljo</string>
+    <string name="update_checker_update_available">Na voljo je nova posodobitev: %s</string>
+    <string name="update_checker_no_internet">Ni internetne povezave</string>
+    <string name="update_checker_generic_error">Prišlo je do napake... Prosimo, poskusite pozneje</string>
     <!--Settings About-->
+    <string name="about_morphe_description">Morphe je projekt z odprtim kodom, zasnovan za spreminjanje Android aplikacij prek popravkov</string>
+    <string name="about_version_str">Različica %1$s</string>
+    <string name="about_default_license">Vse pravice pridržane</string>
     <!--Self Check-->
     <!--self-check: permission-->
+    <string name="self_check_cat_permissions">Dovoljenja</string>
+    <string name="self_check_name_permission">Dovoljenje za %1$s:</string>
+    <string name="self_check_resolution_permission">Tapnite tukaj, da podate dovoljenje. Nepodajanje dovoljenja lahko povzroči nepravilno delovanje aplikacij</string>
     <!--Settings Preferences-->
     <!--preferences: self-check-->
+    <string name="self_check_title">Samopreverjanje</string>
+    <string name="self_check_desc">Preverite, ali je naprava pravilno konfigurirana za uporabo microG</string>
     <!--UI preview-->
+    <string name="about_root_title">microG UI demo</string>
+    <string name="about_root_version">Različica v0.1.0</string>
+    <string name="about_root_libraries">Vključene knjižnice</string>
 </resources>

play-services-core/microg-ui-tools/src/main/res/values-sv-rSE/strings.xml

@@ -24,7 +24,7 @@
     <string name="update_checker_no_internet">Ingen internetanslutning</string>
     <string name="update_checker_generic_error">Något gick fel … Försök igen senare</string>
     <!--Settings About-->
-    <string name="about_morphe_description">Morphe är ett projekt med öppen källkod för att modifiera Android-appar med korrigeringar</string>
+    <string name="about_morphe_description">Morphe är ett projekt med öppen källkod för att modifiera Android-appar med tillägg</string>
     <string name="about_version_str">Version %1$s</string>
     <string name="about_default_license">Alla rättigheter förbehållna</string>
     <!--Self Check-->

play-services-core/src/main/kotlin/org/microg/gms/auth/signin/AuthSignInActivity.kt

@@ -105,10 +105,11 @@ class AuthSignInActivity : AppCompatActivity() {
             val photo = PeopleManager.getOwnerAvatarBitmap(this@AuthSignInActivity, account.name, false)
             if (photo == null) {
                 lifecycleScope.launchWhenStarted {
-                    val bitmap = withContext(Dispatchers.IO) {
+                    withContext(Dispatchers.IO) {
                         PeopleManager.getOwnerAvatarBitmap(this@AuthSignInActivity, account.name, true)
+                    }?.let {
+                        updateAction(photoView, it)
                     }
-                    updateAction(photoView, bitmap)
                 }
             }
             val displayName = getDisplayName(account)

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

@@ -21,7 +21,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">السماح لك بتسجيل الدخول إلى %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">للمتابعة، سيشارك MicroG اسمك وعنوان بريدك الإلكتروني وصورة ملفك الشخصي لحساب Google مع %1$s</string>
+    <string name="signin_subtext_sharing">للمتابعة، سيشارك microG اسمك وعنوان بريدك الإلكتروني وصورة ملفك الشخصي لحساب Google مع %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"ربط حساب Google بـ MicroG.

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

@@ -21,7 +21,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">Да се разреши достъп до %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">За да продължите, microG ще споделя името, електронната поща и снимката на профила от вашия Google акаунт с %1$s</string>
+    <string name="signin_subtext_sharing">За да продължите, microG ще сподели името, имейл адреса и снимката на профила на вашия Google акаунт с %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"Връзка с Google акаунт към microG.

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

@@ -21,7 +21,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">%1$S-এ আপনাকে সাইন ইন করতে দিন</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">চালিয়ে যেতে, মাইক্রোজি আপনার গুগল অ্যাকাউন্টের নাম, ইমেল ঠিকানা এবং প্রোফাইল ছবি %1$S সাথে শেয়ার করবে</string>
+    <string name="signin_subtext_sharing">চালানো অব্যাহত রাখতে, microG আপনার গুগল অ্যাকাউন্টের নাম, ইমেল ঠিকানা এবং প্রোফাইল ছবি %1$s-এর সাথে শেয়ার করবে</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"গুগল অ্যাকাউন্ট মাইক্রোজি সাথে সংযুক্ত করুন।

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

@@ -21,7 +21,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">Tillad at logge dig ind på %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">For at fortsætte, vil microG dele din Google-konto-navn, e-mail-adresse og profilbillede med %1$s</string>
+    <string name="signin_subtext_sharing">For at fortsætte, vil microG dele navnet, e-mailadressen og profilbilledet fra din Google-konto med %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"Tilknyt Google-konto til microG.

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

@@ -21,7 +21,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">Επιτρέψτε τη σύνδεση σε %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">Για να συνεχίσετε, το microG θα μοιραστεί το όνομα, τη διεύθυνση email και την εικόνα προφίλ του λογαριασμού Google σας με %1$s</string>
+    <string name="signin_subtext_sharing">Για να συνεχίσετε, το microG θα μοιραστεί το όνομα, τη διεύθυνση email και την εικόνα προφίλ του λογαριασμού σας Google με το %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"Συνδέστε τον λογαριασμό Google με microG.

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

@@ -21,7 +21,6 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">اجازه دهید برای ورود به %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">برای ادامه، microG نام، نشانی ایمیل و تصویر پروفایل حساب Google شما را با %1$s به اشتراک می‌گذارد</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"اتصال حساب Google به microG

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

@@ -21,7 +21,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">Autoriser la connexion à %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">Pour continuer, microG partagera votre nom, votre adresse e-mail et votre photo de profil de votre compte Google avec %1$s</string>
+    <string name="signin_subtext_sharing">Pour continuer, microG partagera le nom, l’adresse e-mail et la photo de profil de votre compte Google avec %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"Connecter un compte Google avec microG.

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

@@ -21,7 +21,6 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">Permitir que conectes a %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">Para continuar, microG compartirá nome, enderezo de correo electrónico e foto de perfil da súa conta Google con %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"Conecta a conta Google con microG.

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

@@ -21,7 +21,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">%1$s को साइन इन करने की अनुमति दें</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">जारी रखने के लिए, माइक्रोजी अपने गूगल अकाउंट के नाम, ईमेल पता और प्रोफाइल चित्र को %1$s के साथ शेयर करेगा</string>
+    <string name="signin_subtext_sharing">जारी रखने के लिए, microG आपके Google खाते का नाम, ईमेल पता और प्रोफाइल चित्र %1$s के साथ साझा करेगा</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"गूगल अकाउंट को माइक्रोजी के साथ कनेक्ट करें

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

@@ -21,7 +21,6 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">Dopustite prijavu u %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">Za nastavak, microG će podijeliti ime, adresu e-pošte i profilnu sliku vašeg Google računa s %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"Povežite Google račun s microG.

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

@@ -21,7 +21,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">Izinkan untuk masuk ke %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">Untuk melanjutkan, microG akan membagikan nama, alamat email, dan foto profil akun Google Anda dengan %1$s</string>
+    <string name="signin_subtext_sharing">Untuk melanjutkan, microG akan membagikan nama, alamat email dan foto profil akun Google Anda dengan %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"Sambungkan akun Google dengan microG.

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

@@ -21,7 +21,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">Consenti l\'accesso a %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">Per continuare, microG condividerà nome, indirizzo email e immagine del profilo del tuo account Google con %1$s</string>
+    <string name="signin_subtext_sharing">Per continuare, microG condividerà il nome, l\'indirizzo email e la foto del profilo del tuo Account Google con %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"Connetti l'account Google a microG.

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

@@ -21,7 +21,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">%1$s へのログインを許可</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">続行すると、microG は Google アカウントの名前、メールアドレス、プロフィール画像を %1$s と共有します</string>
+    <string name="signin_subtext_sharing">続行すると、microG はあなたの Google アカウントのアカウント名、メールアドレス、およびプロフィール写真を %1$s と共有します。</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"Google アカウントと microG を接続します。

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

@@ -21,7 +21,6 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">អនុញ្ញាតឱ្យបញ្ជាប់គណនីរបស់អ្នកទៅក្នុង %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">ដើម្បីបន្ត microG នឹងចែករំលែកឈ្មោះ អាសយដ្ឋានអ៊ីមែល និងរូបប្រូហ្វាលនៃគណនី Google របស់អ្នកជាមួយ %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <!--auth: notifications-->

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

@@ -11,6 +11,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <!-- %1$s is an app name, such as "YouTube" -->
     <!-- %1$s is an app name, such as "YouTube" -->
+    <string name="signin_subtext_sharing">Bo berdewam, microG nav, adres posta elektronîkî û wênegê profîla hesabê xwe yê Googleê bi %1$s parêdixe</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <!--auth: notifications-->

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

@@ -11,6 +11,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <!-- %1$s is an app name, such as "YouTube" -->
     <!-- %1$s is an app name, such as "YouTube" -->
+    <string name="signin_subtext_sharing">To continue, microG will share the name, email address and profile picture of your Google Account with %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <!--auth: notifications-->

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

@@ -21,7 +21,6 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">Benarkan anda log masuk ke %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">Untuk teruskan, microG akan kongsikan nama, alamat emel dan gambar profil akaun Google anda dengan %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <!--auth: notifications-->

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

@@ -21,7 +21,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">Toestemming geven voor in te loggen op %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">Om door te gaan, zal microG de naam, e-mailadres en profielbeeld van je Google-account delen met %1$s</string>
+    <string name="signin_subtext_sharing">Om verder te gaan, deelt microG de naam, het e-mailadres en de profielfoto van uw Google-account met %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"Verbind Google-account met microG.

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

@@ -21,7 +21,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">Permitir entrada com %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">Para continuar, o microG vai compartilhar o nome, endereço de e-mail e foto de perfil da sua conta Google com %1$s</string>
+    <string name="signin_subtext_sharing">Para continuar, o microG irá compartilhar o nome, endereço de e-mail e foto de perfil da sua Conta Google com %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"Conectar conta Google com microG.

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

@@ -21,7 +21,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">Permiteți să vă conectați la %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">Pentru a continua, microG va împărtăși numele, adresa de e-mail și imaginea de profil a contului Google cu %1$s</string>
+    <string name="signin_subtext_sharing">Pentru a continua, microG va distribui numele, adresa de e-mail și poza de profil a contului tău Google cu %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"Conectează contul Google cu microG.

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

@@ -21,7 +21,7 @@
     <!-- %1$s is an app name, such as "YouTube" -->
     <string name="signin_confirm_title">Разрешить вход в %1$s</string>
     <!-- %1$s is an app name, such as "YouTube" -->
-    <string name="signin_subtext_sharing">Чтобы продолжить, microG поделится именем, адресом электронной почты и фотографией профиля вашей учетной записи Google с %1$s</string>
+    <string name="signin_subtext_sharing">Для продолжения, microG будет передавать имя, адрес электронной почты и фотографию профиля вашей учетной записи Google приложению %1$s</string>
     <!--auth: buttons-->
     <!--auth: messages-->
     <string name="auth_before_connect">"Подключить учетную запись Google к microG.