Merge remote-tracking branch 'origin/master'

# Conflicts:
#	play-services-core/src/main/res/values-de/strings.xml
This commit is contained in:
X1nto 2020-07-18 23:18:04 +04:00
commit 072f2a9c23
2 changed files with 2 additions and 2 deletions

View File

@ -16,7 +16,7 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="gms_settings_name">Vanced microG Einstellungen</string>
<string name="gms_settings_summary">Vanced microG einrichten.</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>

View File

@ -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>