Merge remote-tracking branch 'lineageos/cm-13.0' into replicant-6.0replicant-6.0-0003

4 files changed, 14 insertions, 10 deletions

diff --git a/cm/res/res/values-ast-rES/strings.xml b/cm/res/res/values-ast-rES/strings.xml
index 4dfebce..eb3fb98 100644
--- a/cm/res/res/values-ast-rES/strings.xml
+++ b/cm/res/res/values-ast-rES/strings.xml
@@ -83,6 +83,7 @@
   <string name="perf_profile_perf">Rindimientu</string>
   <string name="perf_profile_bias_power">Eficiencia</string>
   <!-- LiveDisplay strings -->
+  <string name="live_display_auto_summary">Axusta automáticamente la temperatura de color de la pantalla dempués del tapecer y l\'aséu</string>
   <string name="live_display_off">Non</string>
   <string name="live_display_off_summary">Deshabilita tolos axustes</string>
   <string name="live_display_day">Día</string>
diff --git a/cm/res/res/values-es-rUS/strings.xml b/cm/res/res/values-es-rUS/strings.xml
index f25feb9..bc304f3 100644
--- a/cm/res/res/values-es-rUS/strings.xml
+++ b/cm/res/res/values-es-rUS/strings.xml
@@ -93,22 +93,22 @@
   <string name="live_display_off">Desactivado</string>
   <string name="live_display_off_summary">Desactivar todos los ajustes</string>
   <string name="live_display_day">Día</string>
-  <string name="live_display_day_summary">Sólo utilizar los ajustes de día</string>
+  <string name="live_display_day_summary">Utilizar sólo los ajustes de «Día»</string>
   <string name="live_display_night">Noche</string>
-  <string name="live_display_night_summary">Sólo utilizar los ajustes de noche</string>
-  <string name="live_display_outdoor">Al aire libre (luz del sol)</string>
-  <string name="live_display_outdoor_summary">Sólo utilizar los ajustes de aire libre</string>
+  <string name="live_display_night_summary">Utilizar sólo los ajustes de «Noche»</string>
+  <string name="live_display_outdoor">Exterior (luz del sol)</string>
+  <string name="live_display_outdoor_summary">Utilizar sólo los ajustes de «Exterior»</string>
   <string name="live_display_hint">LiveDisplay puede ayudar a reducir la fatiga visual y a dormir por la noche. ¡Pulsa aquí para probarlo!</string>
   <string name="accessibility_quick_settings_live_display_off">LiveDisplay desactivado.</string>
   <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: modo automático.</string>
   <string name="accessibility_quick_settings_live_display_day">LiveDisplay: modo diurno.</string>
   <string name="accessibility_quick_settings_live_display_night">LiveDisplay: modo nocturno.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: modo aire libre.</string>
+  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: modo exterior.</string>
   <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay desactivado.</string>
   <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay cambió a modo automático.</string>
   <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay cambió a modo diurno.</string>
   <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay cambió a modo nocturno.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay cambió a modo aire libre.</string>
+  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay cambió a modo exterior.</string>
   <!-- Third party keyguard permission label -->
   <string name="permlab_thirdPartyKeyguard">pantalla bloqueada con aplicación de terceros</string>
   <!-- Third party keyguard permission description -->
@@ -176,8 +176,8 @@
   <string name="permlab_manageLiveDisplay">gestionar los ajustes de LiveDisplay</string>
   <string name="permdesc_manageLiveDisplay">Permite que una aplicación modifique los ajustes avanzados de la pantalla.</string>
   <!-- CMAudioService - observe session changes permission -->
-  <string name="permlab_observe_audio_sessions">observa los cambios en la sesión de sonido</string>
-  <string name="permdesc_observe_audio_sessions">Permite que una aplicación observe los flujos de sonido que se crean y destruyen.</string>
+  <string name="permlab_observe_audio_sessions">observa los cambios de sesión del audio</string>
+  <string name="permdesc_observe_audio_sessions">Permite que una aplicación observe los flujos de audio que se crean y destruyen.</string>
   <!-- CMAudioService - observe session changes permission -->
   <string name="permlab_manage_audio_sessions">gestionar los cambios de sesión del audio</string>
   <string name="permdesc_manage_audio_sessions">Permitir a una aplicación enviar actualizaciones de la transmisión del audio.</string>
diff --git a/cm/res/res/values-pt-rPT/strings.xml b/cm/res/res/values-pt-rPT/strings.xml
index 370529c..47f4bbd 100644
--- a/cm/res/res/values-pt-rPT/strings.xml
+++ b/cm/res/res/values-pt-rPT/strings.xml
@@ -22,7 +22,7 @@
   <string name="permlab_publishCustomTile">criar um mosaico personalizado no painel de definições rápidas</string>
   <string name="permdesc_publishCustomTile">Permite que uma aplicação publique um mosaico de definições rápidas.</string>
   <string name="permlab_modifyNetworkSettings">alterar as definições de rede do sistema</string>
-  <string name="permdesc_modifyNetworkSettings">Permite que uma aplicação altere o estado do modo de voo e as definições dos dados móveis.</string>
+  <string name="permdesc_modifyNetworkSettings">Permite que uma aplicação altere o estado do modo de avião e as definições dos dados móveis.</string>
   <string name="permlab_modifySoundSettings">alterar as definições de som do sistema</string>
   <string name="permdesc_modifySoundSettings">Permite que uma aplicação faça alterações às definições do modo de interrupção do som.</string>
   <string name="permlab_bindCustomTileListenerService">vincular a um serviço de escuta de mosaicos personalizados</string>
@@ -125,7 +125,7 @@
   <string name="theme_install_error_title">Falha ao instalar o tema</string>
   <string name="theme_install_error_message">Falha ao instalar <xliff:g id="theme">%1$s</xliff:g></string>
   <!-- Theme reset notification -->
-  <string name="theme_reset_notification_title">Restaurar tema</string>
+  <string name="theme_reset_notification_title">Repor tema</string>
   <string name="theme_reset_notification_message">O tema do sistema foi restaurado devido a vários erros nas aplicações.</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessThemeService">aceder ao serviço de temas</string>
diff --git a/cm/res/res/values-sv/strings.xml b/cm/res/res/values-sv/strings.xml
index d25cca5..7567ca6 100644
--- a/cm/res/res/values-sv/strings.xml
+++ b/cm/res/res/values-sv/strings.xml
@@ -156,6 +156,9 @@
   <string name="qs_themes_label">Teman</string>
   <!-- Custom booot dexopt -->
   <string name="android_upgrading_starting_apps">Startar appar\u2026</string>
+  <string name="android_upgrading_complete">Förbereder för uppstart\u2026</string>
+  <string name="android_upgrading_complete_details">Optimering slutförd.</string>
+  <string name="android_preparing_apk">Förbereder %1$s\u2026</string>
   <string name="android_preparing_apk_obscured">Förbereder appar\u2026</string>
   <string name="android_upgrading_apk">%1$d av %2$d appar</string>
 </resources>