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

19 files changed, 321 insertions, 70 deletions

diff --git a/assets/contributors.db b/assets/contributors.db
index 5bb5e7999..65ab2f524 100644
--- a/assets/contributors.db
+++ b/assets/contributors.db
diff --git a/res/layout-sw600dp/crypt_keeper_pattern_entry.xml b/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
index 393700870..b83f5e26f 100644
--- a/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
@@ -36,6 +36,17 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/pattern_sizes"
+        android:layout_width="@dimen/crypt_keeper_pattern_size"
+        android:layout_height="@dimen/crypt_keeper_pattern_size"
+        android:orientation="horizontal"
+        android:layout_gravity="center_horizontal">
+
+        <include layout="@layout/crypt_keeper_pattern_sizes" />
+
+    </LinearLayout>
+
     <include layout="@layout/crypt_keeper_emergency_button" />
 
 </LinearLayout>
diff --git a/res/values-ast-rES/arrays.xml b/res/values-ast-rES/arrays.xml
index 4c33b1db9..3c177b38d 100644
--- a/res/values-ast-rES/arrays.xml
+++ b/res/values-ast-rES/arrays.xml
@@ -24,8 +24,27 @@
          strings. -->
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
+  <string-array name="screen_timeout_entries">
+    <item>15 seconds</item>
+    <item>30 seconds</item>
+    <item>1 minutu</item>
+    <item>2 minutos</item>
+    <item>5 minutos</item>
+    <item>10 minutos</item>
+    <item>30 minutos</item>
+  </string-array>
   <!-- Do not translate. -->
   <!-- Display settings.  The delay in inactivity before the dream is shown. These are shown in a list dialog. -->
+  <string-array name="dream_timeout_entries">
+    <item>Never</item>
+    <item>15 seconds</item>
+    <item>30 seconds</item>
+    <item>1 minutu</item>
+    <item>2 minutos</item>
+    <item>5 minutos</item>
+    <item>10 minutos</item>
+    <item>30 minutos</item>
+  </string-array>
   <!-- Do not translate. -->
   <!-- Security settings.  The delay after screen is turned off until device locks.
          These are shown in a list dialog. -->
@@ -81,6 +100,13 @@
     <item>Very high</item>
   </string-array>
   <!-- Do not translate. -->
+  <string-array name="tts_pitch_values">
+    <item>50</item>
+    <item>80</item>
+    <item>100</item>
+    <item>120</item>
+    <item>150</item>
+  </string-array>
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
@@ -89,7 +115,7 @@
     <!-- Status message of Wi-Fi when it is idle. -->
     <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
-    <item>Scanning\u2026</item>
+    <item>Escaniando\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting. -->
     <item>Connecting\u2026</item>
     <!-- Status message of Wi-Fi when it is authenticating. -->
@@ -117,7 +143,7 @@
     <!-- Status message of Wi-Fi when it is idle. -->
     <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
-    <item>Scanning\u2026</item>
+    <item>Escaniando\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting to a network. -->
     <item>Connecting to <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
     <!-- Status message of Wi-Fi when it is authenticating with a network. -->
@@ -211,6 +237,12 @@
   <!-- Wi-Fi p2p settings device status message -->
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item>2 minutos</item>
+    <item>5 minutos</item>
+    <item>1 hour</item>
+    <item>Never time out</item>
+  </string-array>
   <!-- Match this with drawable.wifi_signal. -->
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 496d5d91a..2254e9ec9 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -64,6 +64,7 @@
   <!-- About phone screen, Replicant Api Level -->
   <string name="mod_api_level">Nivel d\'API Replicant</string>
   <!-- About phone screen, build date -->
+  <string name="build_date">Data de compilación</string>
   <!-- CM Updater -->
   <string name="cmupdate_settings_title">Anovamientos Replicant</string>
   <!-- Settings switch for updating Cyanogen recovery -->
@@ -296,6 +297,8 @@
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Evitar esconsueñu accidental</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
+  <string name="wake_when_plugged_or_unplugged_title">Esconsoñar al enchufar</string>
+  <string name="wake_when_plugged_or_unplugged_summary">Prender la pantalla al coneutar o desconeutar el cargador</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
   <string name="font_size_sample">Amuesa</string>
@@ -404,11 +407,14 @@
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Tonu d\'avisu</string>
   <!-- Advanced reboot options -->
+  <string name="advanced_reboot_title">Reaniciu avanzáu</string>
+  <string name="advanced_reboot_summary">Al desbloquiar, inclúi opciones nel menú d\'apagáu pa reaniciar nel recovery, cargador d\'arranque o facer un reaniciu suave</string>
   <!-- Expanded desktop -->
   <!-- Kill app long-press back -->
   <!-- Show/Hide Search Bar -->
   <!-- Voice Wakeup -->
   <!-- Blacklist preferences -->
+  <string name="blacklist_unknown_numbers_title">Númberos desconocíos</string>
   <!-- Blacklist management -->
   <!-- Sms security limit -->
   <!-- Notification spamfilter -->
@@ -425,6 +431,7 @@
   <!-- Contributors cloud activity -->
   <string name="category_sounds">Soníos</string>
   <string name="notification_manager">Avisos</string>
+  <string name="lockscreen_settings">Pantalla de bloquéu</string>
   <string name="category_volume">Volume</string>
   <string name="title_general">Xeneral</string>
   <string name="link_volume_option_title">Enllazar volume del timbre y avisos</string>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index ee09320a8..0af267b90 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -85,6 +85,7 @@
   <!-- Do not translate. label for font size preview.  Does not need to be translated. -->
   <string name="font_size_preview_text">Servez à ce monsieur une bière et des kiwis.</string>
   <!-- Button. Chosen when they want to save the chosen text size. -->
+  <string name="font_size_save">Aceutar</string>
   <!-- Title for a notification shown. [CHAR LIMIT=25] -->
   <!-- Title for a notification shown. -->
   <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -162,6 +163,7 @@
   <!-- The title of the activity to pick a time zone. -->
   <!-- Label of preview text when tweaking font size -->
   <!-- Label for chosen font size -->
+  <string name="display_font_size_label">Tamañu de fonte:</string>
   <!-- Used for diagnostic screens, precise translation is not necessary -->
   <!-- Used for diagnostic screens, precise translation is not necessary -->
   <!-- Used for diagnostic screens, precise translation is not necessary -->
@@ -199,6 +201,7 @@
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <string name="radio_info_imei_label">IMEI:</string>
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -215,6 +218,7 @@
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <string name="radio_info_network_type_label">Triba de rede:</string>
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -246,7 +250,9 @@
   <!-- Error message when the SD card was removed without properly unmounting -->
   <!-- Label for used bytes on the SD card -->
   <!-- Message when it is scanning the SD card for new files [CHAR LIMIT=30]  -->
+  <string name="sdcard_settings_scanning_status" product="nosdcard">Escaniando medios nel almacenamientu USB\u2026</string>
   <!-- Message when it is scanning the SD card for new files -->
+  <string name="sdcard_settings_scanning_status" product="default">Escaniando medios na tarxeta SD\u2026</string>
   <!-- Message when the SD card is mounted as read only [CHAR LIMIT=30] -->
   <!-- Message when the SD card is mounted as read only -->
   <!-- Used in setup wizard Wi-Fi screen.  The button label for going to the next screen without submitting. [CHAR LIMIT=20] -->
@@ -256,6 +262,7 @@
   <string name="language_picker_title">Llingua</string>
   <!-- The title of the dialog to pick an activity.  This is shown when there are multiple activities that can do a particular action.  For example, suppose you click on the "Share" menu item in the Browser.  Since you can share the webpage URL via many communication methods, this dialog would come up with choices like "Email", "IM", etc.  This is a generic message, and the previous example is a single possible scenario (so please don't assume it's for the browser or anything :) ). -->
   <!-- Do not translate. -->
+  <string name="debug_intent_sender_label">Debug intent sender</string>
   <!-- The title of the activity to see random device info. -->
   <!-- The title of the activity to adjust display settings -->
   <!-- The title of the activity to see phone info -->
@@ -289,7 +296,9 @@
   <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
   <string name="wireless_networks_settings_title">Conexones y redes</string>
   <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
+  <string name="radio_controls_summary">Xestiona\'l Wi‑Fi, Bluetooth, mou avión, redes móviles y VPNs</string>
   <!-- check box cellular data title [CHAR LIMIT=30] -->
+  <string name="cellular_data_title">Datos móviles</string>
   <!-- check box Calls title [CHAR LIMIT=30] -->
   <string name="calls_title">Llamaes</string>
   <!-- check box SMS Messges title [CHAR LIMIT=30] -->
@@ -411,6 +420,7 @@
   <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->
   <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
   <!-- Message shown when fingerprint enrollment is completed during setup wizard [CHAR LIMIT=NONE] -->
+  <string name="setup_fingerprint_enroll_finish_message">Namái toca\'l sensor de buelgues pa esconsoñar y desbloquiar el to preséu.</string>
   <!-- Message shown when fingerprint enrollment is completed, telling user about the fingerprint icon that will be shown whenever they can use their fingerprint [CHAR LIMIT=NONE] -->
   <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
   <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
@@ -601,6 +611,11 @@
   <!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The
       place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
       the user to "scanning settings" screen. -->
+  <string name="ble_scan_notify_text">P\'ameyorar la precisión del allugamientu, les aplicaciones
+      del sistema entá puen deteutar preseos Bluetooth. Pues
+      camudar esto nos <xliff:g id="link_begin">LINK_BEGIN
+      </xliff:g>axustes d\'escanéu<xliff:g id="link_end">
+      LINK_END</xliff:g>.</string>
   <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
   <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
   <!-- Bluetooth settings.  Message for disconnecting from the headset profile. [CHAR LIMIT=80] -->
@@ -633,6 +648,7 @@
   <!-- Wifi Display settings. The status summary for connected devices. [CHAR LIMIT=40] -->
   <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->
   <!-- Wifi Display settings. The status summary for devices that's not available. [CHAR LIMIT=40] -->
+  <string name="wifi_display_status_not_available">Non disponible</string>
   <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
   <!-- Wifi Display settings. Options dialog.  The title of the dialog. [CHAR LIMIT=40] -->
   <!-- Wifi Display settings. Options dialog.  The forget button text. [CHAR LIMIT=20] -->
@@ -663,6 +679,7 @@
   <!-- Used to describe the on state of the Android Beam feature [CHAR LIMIT=NONE] -->
   <!-- Used to describe the off state of the Android Beam feature [CHAR LIMIT=NONE] -->
   <!-- Used to describe the enabled state of the Android Beam feature when NFC, which it relies on, is turned off [CHAR LIMIT=NONE] -->
+  <string name="android_beam_disabled_summary">Non disponible porque\'l NFC ta desactivao</string>
   <!-- Used in the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
   <string name="android_beam_label">Android Beam</string>
   <!-- Explanation of the Android Beam feature in the Android Beam settings panel. The use of "beam" here is as a verb and not considered trademarked. [CHAR LIMIT=NONE] -->
@@ -700,6 +717,11 @@
   <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off. The
       place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
       the user to "scanning settings" screen. -->
+  <string name="wifi_scan_notify_text">P\'ameyorar la precisión del allugamientu, les aplicaciones
+        del sistema entá puen escaniar redes Wi\u2011Fi. Pues
+        camudar esto nos <xliff:g
+        id="link_begin">LINK_BEGIN</xliff:g>axustes d\'escanéu<xliff:g
+        id="link_end">LINK_END</xliff:g>.</string>
   <!-- Wifi scan always mode checkbox text -->
   <string name="wifi_scan_notify_remember_choice">Nun amosar de nueves</string>
   <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? -->
@@ -749,6 +771,7 @@
   <!-- Text displayed when WPS fails due to authentication issues [CHAR LIMIT=150] -->
   <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
   <!-- Label for the SSID of the network -->
+  <string name="wifi_ssid">Nome de rede</string>
   <!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] -->
   <string name="wifi_ssid_hint">Introduz el SSID</string>
   <!-- Label for the security of the connection -->
@@ -788,6 +811,7 @@
          string is listed after a wifi_secured_* string-->
   <string name="wifi_wps_available_second_item">\u0020(WPS disponible)</string>
   <!-- Message in WriteWifiConfigToNfcDialog when prompted to enter network password [CHAR_LIMIT=40] -->
+  <string name="wifi_scan_always_turnon_message">P\'ameyorar la precisión del allugamientu y otros fines, <xliff:g id="app_name">%1$s</xliff:g> quier activar l\'escanéu de redes, magar que\'l Wi-Fi tea apagáu.\n\n¿Permitilo pa toles aplicaciones que quieran escaniar?</string>
   <!-- Message informing the user how to turn off  [CHAR LIMIT=200] -->
   <!-- Dialog label to sign in to a Hotspot. [CHAR LIMIT=50]-->
   <!-- Dialog message to sign in to a Hotspot. [CHAR LIMIT=50]-->
@@ -1021,6 +1045,7 @@
   <!-- Sound & display settings screen, setting option name to enable adaptive brightness [CHAR LIMIT=30] -->
   <string name="auto_brightness_title">Brilléu adautativo</string>
   <!-- Sound & display settings screen, setting option summary to enable adaptive brightness [CHAR LIMIT=100] -->
+  <string name="auto_brightness_summary">Optimiza\'l nivel de brilléu pa la lluz disponible</string>
   <!-- Sound & display settings screen, setting option name to change the user interface theme [CHAR LIMIT=30] -->
   <!-- Sound & display settings screen, setting option summary to change the user interface theme [CHAR LIMIT=100] -->
   <!-- Sound & display settings screen, theme setting value to prefer a light-colored user interface [CHAR LIMIT=30] -->
@@ -1048,8 +1073,10 @@
   <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
   <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
   <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
+  <string name="title_font_size">Tamañu de fonte</string>
   <!-- Sound & display settings screen, setting option summary displaying the currently selected font size -->
   <!-- [CHAR LIMIT=40] Sound & display settings screen, title of dialog for picking font size -->
+  <string name="dialog_title_font_size">Tamañu de fonte</string>
   <!-- SIM lock settings title  [CHAR LIMIT=40] -->
   <!-- Security & location settings screen, setting option name  [CHAR LIMIT=40] -->
   <!-- Security & location settings screen, section heading for settings related to sim card locking  [CHAR LIMIT=40] -->
@@ -1092,11 +1119,16 @@
   <!-- About phone screen, list item title.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
   <!-- About phone screen, list item summary.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
   <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <string name="firmware_version">Versión d\'Android</string>
   <!-- About phone screen, status item label  [CHAR LIMIT=60] -->
+  <string name="security_patch">Nivel de parche de seguranza d\'Android</string>
   <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <string name="model_number">Númberu de modelu</string>
   <!-- About phone screen, fcc equipment id label  [CHAR LIMIT=40] -->
   <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <string name="baseband_version">Versión de banda base</string>
   <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <string name="kernel_version">Versión del kernel</string>
   <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
   <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
   <string name="selinux_status">Estáu de SELinux</string>
@@ -1134,11 +1166,13 @@
   <!-- About phone, status item title. The  current cell tower signal strength -->
   <!-- About phone, status item title, The status for roaming.  For example, the value might be "Not roaming" -->
   <!-- About phone, status item title. The cell carrier that the user is connected to.  -->
+  <string name="status_operator">Rede</string>
   <!-- About phone, status item title.  The MAC address of the Wi-Fi network adapter. -->
   <string name="status_wifi_mac_address">Direición MAC de Wi‑Fi</string>
   <!-- About phone, status item title.  The bluetooth adapter's hardware address-->
   <!-- About phone, status item title.  The hardware serial number. [CHAR LIMIT=30]-->
   <!-- About phone, status item value if the actual value is not available. -->
+  <string name="status_unavailable">Non disponible</string>
   <!-- About phone, status item title.  How long the device has been running since its last reboot. -->
   <!-- About phone, status item title.  How much time the device has had its main CPU awake. -->
   <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the phone's internal storage  -->
@@ -1267,6 +1301,11 @@
   <!-- Title of wizard button prompting user to start data migration [CHAR LIMIT=32] -->
   <!-- Title of wizard step showing migration progress [CHAR LIMIT=32] -->
   <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+  <string name="storage_wizard_migrate_details">Na movición:
+\n\u2022 Nun estrayas la <xliff:g id="name" example="SD card">^1</xliff:g>.
+\n\u2022 Delles aplicaciones nun funcionarán bien.
+\n\u2022 Ten el preséu cargáu.
+    </string>
   <!-- Title of wizard step indicating that storage is ready [CHAR LIMIT=32] -->
   <!-- Body of wizard step indicating that external storage is ready [CHAR LIMIT=NONE] -->
   <!-- Body of wizard step indicating that internal storage is ready [CHAR LIMIT=NONE] -->
@@ -1399,33 +1438,49 @@
   <!-- Ask user to insert a SIM card [CHAR_ LIMIT=50]-->
   <!-- Ask user to connect to the internet [CHAR_ LIMIT=50]-->
   <!-- Security & location settings screen, section header for settings relating to location -->
+  <string name="location_title">El mio allugamientu</string>
   <!-- Title for managed profile preference category [CHAR_LIMIT=25] -->
   <!-- [CHAR LIMIT=30] Title for managed profile location switch  -->
   <!-- [CHAR LIMIT=30] Text to show on managed profile location switch if MDM has locked down location access for managed profile-->
   <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
+  <string name="location_mode_title">Mou</string>
   <!-- [CHAR LIMIT=30] Location settings screen, high accuracy location mode -->
   <!-- [CHAR LIMIT=30] Location settings screen, battery saving location mode -->
   <!-- [CHAR LIMIT=30] Location settings screen, device only location mode -->
   <string name="location_mode_sensors_only_title">Namái nel preséu</string>
   <!-- [CHAR LIMIT=30] Location settings screen, location off mode -->
+  <string name="location_mode_location_off_title">Allugamientu desactiváu</string>
   <!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests -->
+  <string name="location_category_recent_location_requests">Solicitúes recientes d\'allugamientu</string>
   <!-- Location settings screen, displayed when there's no recent app accessing location -->
+  <string name="location_no_recent_apps">Apocayá denguna aplicación solicitó l\'allugamientu</string>
   <!-- [CHAR LIMIT=30] Location settings screen, sub category for location services -->
+  <string name="location_category_location_services">Servicios d\'allugamientu</string>
   <!-- [CHAR LIMIT=30] Location settings screen, recent location requests high battery use-->
   <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->
   <!-- [CHAR LIMIT=30] Location mode screen, screen title -->
+  <string name="location_mode_screen_title">Mou de llocalización</string>
   <!-- [CHAR LIMIT=130] Location mode screen, description for high accuracy mode -->
+  <string name="location_mode_high_accuracy_description">Usa\'l GPS, Wi\u2011Fi, Bluetooth o redes móviles pa determinar l\'allugamientu </string>
   <!-- [CHAR LIMIT=130] Location mode screen, description for battery saving mode -->
+  <string name="location_mode_battery_saving_description">Usa\'l Wi\u2011Fi, Bluetooth o redes móviles pa determinar l\'allugamientu</string>
   <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
+  <string name="location_mode_sensors_only_description">Usa\'l GPS pa determinar l\'allugamientu</string>
   <!-- Help menu label [CHAR LIMIT=20] Location settings screen, overflow menu that takes the user
       to scanning settings activity -->
+  <string name="location_menu_scanning">Escanéu</string>
   <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
+  <string name="location_scanning_screen_title">Escanéu</string>
   <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
+  <string name="location_scanning_wifi_always_scanning_title">Escanéu Wi‑Fi</string>
   <!-- Preference description text for Wi-Fi always scanning -->
   <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning -->
+  <string name="location_scanning_bluetooth_always_scanning_title">Escanéu Bluetooth</string>
   <!-- Description text for Bluetooth always scanning -->
   <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
+  <string name="location_network_based">Allugamientu de Wi\u2011Fi y rede móvil</string>
   <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary for Google location service check box-->
+  <string name="location_neighborhood_level">Dexa que\u2019l serviciu d\u2019allugamientu de Google calcule aína\u2019l to allugamientu. Recoyeránse y unviaránse datos anónimos a Google.</string>
   <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary when Use wireless networks check box is selected, for wifi-only devices -->
   <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for GPS satellites -->
   <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a tablet -->
@@ -1436,9 +1491,13 @@
   <!-- [CHAR_LIMIT=30] Security & location settings screen, setting check box label for Google search -->
   <string name="use_location_title">Allugamientu y gueta de Google</string>
   <!-- [CHAR_LIMIT=100] Security & location settings screen, setting check box summary for Google search -->
+  <string name="use_location_summary">Dexa que Google use\'l to allugamientu p\'ameyorar los resultaos de gueta y otros servicios</string>
   <!-- [CHAR LIMIT=45] Label for turning on/off location access completely. -->
+  <string name="location_access_title">Acceder al mio allugmientu</string>
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
+  <string name="location_access_summary">Dexa que les aplicaciones que pidieren el permisu usen la to información d\'allugamientu</string>
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
+  <string name="location_sources_heading">Fontes d\'allugamientu</string>
   <!-- About -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <string name="about_settings" product="tablet">Tocante a la tableta</string>
@@ -1446,6 +1505,7 @@
   <string name="about_settings" product="default">Tocante al teléfonu</string>
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
   <!-- About phone settings screen, setting option name to go to dialog that shows legal info -->
+  <string name="legal_information">Información llegal</string>
   <!-- About phone settings screen, setting option name to see a list of contributors -->
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
@@ -1532,9 +1592,11 @@
   <!-- Applications settings summary, on main settings screen. The summary for the "Applications" item on the main settings screen. Describes what settings are accessible from the "Applications" screen. -->
   <!-- Applications settings screen heading. The header for the Application settings screen. -->
   <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  -->
+  <string name="install_applications">Fontes desconocíes</string>
   <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  [CHAR LIMIT=30] -->
   <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  [CHAR LIMIT=65] -->
   <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  -->
+  <string name="install_unknown_applications">Permitir la instalación d\'aplicaciones d\'orixe desconocíu</string>
   <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
   <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
   <!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
@@ -1582,6 +1644,7 @@
   <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
   <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <string name="unknown">Desconozse</string>
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
   <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show running services. -->
@@ -1684,6 +1747,7 @@
   <!-- Text to label a process entry with the process name. -->
   <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+  <string name="running_process_item_user_label">Usuariu: <xliff:g id="USER_NAME">%1$s</xliff:g></string>
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
   <!-- Descriptive text of a running process: singular process, singular service. -->
   <!-- Descriptive text of a running process: singular process, plural service. -->
@@ -1741,6 +1805,7 @@
   <!-- On Text & language settings screen, category for physical keyboard text entry options. -->
   <!-- On Text & language settings screen, setting summary for the Auto-punctuate setting. -->
   <!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away.  By hide, I mean mask it out. -->
+  <string name="show_password">Visibilizar contraseñes</string>
   <!-- Warning message about security implications of enabling an input method, displayed as a dialog
          message when the user selects to enable an IME. -->
   <!-- Warning message about security implications of enabling a spell checker, displayed as a dialog
@@ -1823,6 +1888,7 @@
   <string name="vpn_settings_not_available">Los axustes de VPN nun tán disponibles pa esti usuariu</string>
   <!-- Error message for users that aren't allowed to modify Tethering settings [CHAR LIMIT=none] -->
   <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
+  <string name="enable_adb">Depuración USB</string>
   <!-- Setting checkbox summary for Whether to enable USB debugging support on the phone -->
   <!-- Setting title to revoke secure USB debugging authorizations -->
   <!-- [CHAR LIMIT=NONE] Setting checkbox title for Whether to include bug report item in power menu. -->
@@ -1832,9 +1898,11 @@
   <!-- Setting Checkbox title whether to enable bluetooth HCI snoop log -->
   <!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
   <!-- setting Checkbox title whether to enable OEM unlock [CHAR_LIMIT=35] -->
+  <string name="oem_unlock_enable">Desbloquéu d\'OEM</string>
   <!-- setting Checkbox summary whether to enable OEM unlock [CHAR_LIMIT=50] -->
   <string name="oem_unlock_enable_summary">Permite desbloquiar el cargador d\'arranque</string>
   <!-- Confirmation dialog title to ensure user wishes to enable OEM unlock and disable theft protection features -->
+  <string name="confirm_enable_oem_unlock_title">¿Permitir desbloquéu d\'OEM?</string>
   <!-- Warning dialog message to confirm user wishes to enable OEM unlock and disable theft protection features -->
   <!-- UI debug setting: limit size of Android logger buffers -->
   <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
@@ -1863,6 +1931,7 @@
   <!-- Setting Checkbox title whether to enable view attribute inspection -->
   <!-- Title of warning dialog about the implications of enabling USB debugging -->
   <!-- Setting Checkbox summary whether to use DHCP client from Lollipop (Android 5.0) [CHAR LIMIT=130] -->
+  <string name="adb_warning_title">¿Permitir depuración USB?</string>
   <!-- Warning text to user about the implications of enabling USB debugging -->
   <!-- Message of dialog confirming that user wants to revoke access to adb from all computers they have authorized -->
   <!-- Title of warning dialog about the implications of enabling developer settings -->
@@ -1967,6 +2036,7 @@
   <!-- Sample characters for previewing video caption preferences. [CHAR LIMIT=2] -->
   <!-- Label for the default device locale. [CHAR LIMIT=35] -->
   <!-- Label for color selection title in sim settings [CHAR LIMIT=35] -->
+  <string name="color_title">Color</string>
   <!-- Label for default color. This lets the app pick the color. [CHAR LIMIT=35] -->
   <!-- Label for no color (transparent). [CHAR LIMIT=35] -->
   <!-- Label for the color white. [CHAR LIMIT=35] -->
@@ -2171,6 +2241,7 @@
   <!-- [CHAR LIMIT=NONE] Label OS "process" app -->
   <!-- [CHAR LIMIT=NONE] Name of OS "process" for all native processes -->
   <!-- [CHAR LIMIT=NONE] Name of OS "process" for all kernel memory -->
+  <string name="process_stats_os_kernel">Kernel</string>
   <!-- [CHAR LIMIT=NONE] Name of OS "process" for all zram memory -->
   <!-- [CHAR LIMIT=NONE] Name of OS "process" for base memory needed for caches -->
   <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
@@ -2186,8 +2257,10 @@
   <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory use -->
   <string name="mem_use_subtitle">Usu de memoria</string>
   <!-- [CHAR LIMIT=NONE] Type of memory use associated with the kernel -->
+  <string name="mem_use_kernel_type">Kernel</string>
   <!-- [CHAR LIMIT=NONE] Type of memory use associated with native processes -->
   <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel caches -->
+  <string name="mem_use_kernel_cache_type">Cachés del kernel</string>
   <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel zram swap -->
   <!-- [CHAR LIMIT=NONE] Type of memory use that is available/free -->
   <!-- [CHAR LIMIT=NONE] Total of all memory use -->
@@ -2367,6 +2440,7 @@
   <!-- Summary text of the "local backup password" setting when the user has already supplied a password -->
   <!-- Toast message shown when the user successfully sets a new local backup password [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
+  <string name="local_backup_password_toast_confirmation_mismatch">La contraseña nueva y la de confirmación nun concasen</string>
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase backup data from server -->
@@ -2441,6 +2515,7 @@
   <string name="wifi_setup_cancel">Encaboxar</string>
   <!-- The message shown above available networks when the device is scanning
          available networks [CHAR LIMIT=35] -->
+  <string name="wifi_setup_status_scanning">Escaniando redes\u2026</string>
   <!-- Message shown above available network when there's no connected network.
          Used in Wifi Setup For Setup Wizard with XL screen. -->
   <!-- Message shown above available networks when a user clicked one of available
@@ -2526,10 +2601,15 @@
   <!-- Informational text on the pin entry screen prompting the user for their pin -->
   <!-- Informational text on the pattern entry screen prompting the user for their pattern -->
   <!-- Message shown when user enters wrong pattern -->
+  <string name="cryptkeeper_wrong_pattern">Patrón incorreutu</string>
   <!-- Message shown when user enters wrong password -->
+  <string name="cryptkeeper_wrong_password">Contraseña incorreuta</string>
   <!-- Message shown when user enters wrong PIN -->
+  <string name="cryptkeeper_wrong_pin">PIN incorreutu</string>
   <!-- Shown when a password has been entered, and we're checking it -->
+  <string name="checking_decryption">Comprobando\u2026</string>
   <!-- Shown when password is correct, and we're starting Android -->
+  <string name="starting_android">Aniciando Android</string>
   <!-- the following are for Settings Storage screen -->
   <!-- Menu item/button 'delete' -->
   <!-- Misc files [CHAR LIMIT=25] -->
@@ -2539,6 +2619,7 @@
   <!-- HDCP checking title, used for debug purposes only. [CHAR LIMIT=25] -->
   <!-- HDCP checking dialog title, used for debug purposes only. [CHAR LIMIT=25] -->
   <!-- Preference category for app debugging development settings. [CHAR LIMIT=50] -->
+  <string name="debug_debugging_category">Depuración</string>
   <!-- UI debug setting: select current app to debug [CHAR LIMIT=50] -->
   <!-- UI debug setting: no debug app has been set [CHAR LIMIT=50] -->
   <!-- UI debug setting: debug app has been set [CHAR LIMIT=50] -->
@@ -2620,6 +2701,7 @@
   <!-- Title for menu option to enable global auto-sync of account data -->
   <!-- Title for menu option to show details for all SIM cards. [CHAR LIMIT=26] -->
   <!-- Title for menu option to show details for all cellular networks. [CHAR LIMIT=26] -->
+  <string name="data_usage_menu_cellular_networks">Redes móviles</string>
   <!-- Summary String for Cellular data enable toggle. [CHAR LIMIT=33] -->
   <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
   <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
@@ -2687,6 +2769,7 @@
   <!-- Dialog title for selecting metered networks. [CHAR LIMIT=25] -->
   <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
   <!-- Header for list of mobile networks. [CHAR LIMIT=32] -->
+  <string name="data_usage_metered_mobile">Redes móviles</string>
   <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
   <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
   <!-- Disclaimer string for data usage measured by device. [CHAR LIMIT=80] -->
@@ -2759,6 +2842,8 @@
     "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
+  <string name="selinux_status_permissive">Permisivu</string>
+  <string name="selinux_status_enforcing">Obligatoriu</string>
   <!-- Notification of installed CA Certs -->
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
@@ -2846,7 +2931,9 @@
   <!-- NFC payment settings -->
   <string name="nfc_payment_settings_title">Tocar y pagar</string>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
+  <string name="nfc_payment_how_it_works">Cómo funciona</string>
   <!-- String shown when there are no NFC payment applications installed -->
+  <string name="nfc_payment_no_apps">Paga nes tiendes col to teléfonu</string>
   <!-- Header text that can be clicked on to change the default payment app -->
   <!-- Summary text that is shown when no default app is set -->
   <!-- String indicating the label of the default payment app and a description of its state; eg Google Wallet - MasterCard 1234 -->
@@ -2900,21 +2987,26 @@
   <!-- Help URL, Remote display [DO NOT TRANSLATE] -->
   <!-- Help URL, Fingerprint [DO NOT TRANSLATE] -->
   <!-- User account title [CHAR LIMIT=30] -->
+  <string name="user_account_title">Cuenta pal conteníu</string>
   <!-- User picture title [CHAR LIMIT=30] -->
   <!-- Extreme threats title.  [CHAR LIMIT=30] -->
   <!-- Extreme threats summary.  [CHAR LIMIT=62] -->
+  <string name="extreme_threats_summary">Recibe alertes d\'amenaces estremes pa la vida y propiedá</string>
   <!-- Severe threats title.  [CHAR LIMIT=30] -->
   <!-- Extreme threats summary.  [CHAR LIMIT=60] -->
+  <string name="severe_threats_summary">Recibe alertes d\'amenaces graves pa la vida y propiedá</string>
   <!-- Amber alerts title.  [CHAR LIMIT=30] -->
   <!-- Amber alerts summary.  [CHAR LIMIT=60] -->
   <!-- repeat title.  Allows the user to set how oftem to repeat alert reminders.
          For example, they may have alerts just once or every 2 or 15 minutes.  [CHAR LIMIT=30] -->
+  <string name="repeat_title">Repitir</string>
   <!-- Call Manager enable settings title.  [CHAR LIMIT=50] -->
   <!-- Call Manager enable settings summary.  [CHAR LIMIT=80] -->
   <!-- Call Manager settings title.  [CHAR LIMIT=50] -->
   <!-- Call Manager settings summary.  [CHAR LIMIT=50] -->
   <!-- Cell Broadcast settings title.  [CHAR LIMIT=50] -->
   <!-- Network operators settings title.  [CHAR LIMIT=50] -->
+  <string name="network_operators_settings">Operadores de rede</string>
   <!-- Access point names title.  [CHAR LIMIT=50] -->
   <!-- Enhaced 4G LTE Mode title.  [CHAR LIMIT=50] -->
   <!-- Enhaced 4G LTE Mode summary.  [CHAR LIMIT=100] -->
@@ -2942,6 +3034,7 @@
   <!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
   <string name="restriction_location_enable_title">Allugamientu</string>
   <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
+  <string name="restriction_location_enable_summary">Dexa que les aplicaciones usen la to información d\'allugamientu</string>
   <!-- Wizard back button label [CHAR LIMIT=25] -->
   <!-- Wizard next button label [CHAR LIMIT=25] -->
   <!-- Wizard next button label [CHAR LIMIT=25] -->
@@ -3000,8 +3093,17 @@
   <!-- Text used to identify the search query suggestions / recent searches -->
   <!-- Text used to identify the search results -->
   <!--Search Keywords [CHAR LIMIT=NONE]-->
+  <string name="keywords_wifi">wifi wi-fi rede conexón</string>
+  <string name="keywords_home">llanzador</string>
+  <string name="keywords_display">pantalla táutil</string>
   <!-- Search keywords for display light/dark theme: dark theme, night mode, dim screen, invert brightness [CHAR LIMIT=NONE] -->
   <string name="keywords_display_night_mode">tema escuru mou nocherniegu amatagar pantalla invertir brilléu</string>
+  <string name="keywords_display_font_size">tamañu de testu</string>
+  <string name="keywords_printing">imprentadora</string>
+  <string name="keywords_sounds_and_notifications">bip d\'altavoz</string>
+  <string name="keywords_app">RAM</string>
+  <string name="keywords_location_mode">precisión</string>
+  <string name="keywords_accounts">cuenta</string>
   <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
   <!-- NFC Wi-Fi pairing/setup strings-->
   <!-- Write NFC tag for Wi-Fi pairing/setup title [CHAR_LIMIT=30]-->
@@ -3155,6 +3257,7 @@
   <!-- [CHAR LIMIT=35] Feedback on the device -->
   <!-- Full package name of OEM preferred device feedback reporter [DO NOT TRANSLATE] -->
   <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <string name="restr_pin_enter_admin_pin">Introduz el PIN del alministrador</string>
   <!-- Switch On/Off  -->
   <!-- [CHAR LIMIT=28] Screen pinning title -->
   <!-- [CHAR LIMIT=300] Screen pinning description -->
@@ -3174,6 +3277,7 @@
   <!-- [CHAR LIMIT=70] Don't rotate when screen is turned option -->
   <!-- Title and summary for SIM Status -->
   <!-- Title for IMEI preference [CHAR LIMIT=30] -->
+  <string name="imei_information_title">Información d\'IMEI</string>
   <!-- Encryption interstitial title. This screen asks the user whether the device will ask for a PIN / pattern / password before the device starts up. [CHAR LIMIT=30] -->
   <!-- Encryption interstitial button to continue with the shown setting.  Appears on screen that asks the user to opt in/out of encrypting device with a pin/pattern/password. [CHAR LIMIT=NONE] -->
   <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] -->
@@ -3195,6 +3299,7 @@
   <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
   <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
   <!-- Title and summary for SIM Status -->
+  <string name="imei_information_title">Información d\'IMEI</string>
   <!-- New strings needed for App Info 2 -->
   <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->
   <!-- Summary for app storage preference [CHAR LIMIT=15] -->
@@ -3386,7 +3491,9 @@
   <!-- Zen mode access settings - title for warning dialog when enabling access [CHAR LIMIT=NONE] -->
   <!-- Zen mode access settings - summary for warning dialog when enabling access [CHAR LIMIT=NONE] -->
   <!-- Ignore battery optimizations on label [CHAR LIMIT=30] -->
+  <string name="ignore_optimizations_on">Nun optimizar</string>
   <!-- Ignore battery optimizations off label [CHAR LIMIT=30] -->
+  <string name="ignore_optimizations_off">Optimizar</string>
   <!-- Ignore battery optimizations on description [CHAR LIMIT=NONE] -->
   <!-- Ignore battery optimizations off description [CHAR LIMIT=NONE] -->
   <!-- Ignore battery optimizations dialog title [CHAR LIMIT=NONE] -->
@@ -3433,6 +3540,11 @@
   <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
   <!-- Name of each color mode for the display. [CHAR LIMIT=40] -->
   <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
+  <string-array name="color_mode_descriptions">
+    <item>Enhanced colors</item>
+    <item>Natural colors as seen by the eye</item>
+    <item>Colores optimizaes pal conteníu dixital</item>
+  </string-array>
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
   <!-- Name of the setting to change the display's color temperature -->
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 372082d75..64a84be56 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -18,8 +18,14 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Du er nu <xliff:g id="step_count">%1$d</xliff:g> skridt fra at anmode om enheds-ID\'et.</item>
+    <item quantity="other">Du er nu <xliff:g id="step_count">%1$d</xliff:g> skridt fra at anmode om enheds-ID\'et.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">Enheds-ID:[<xliff:g id="device_id">%1$s</xliff:g>] kopieret til udklipsholder</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Enheds-ID er ikke tilgængeligt i dette build</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <string name="show_device_id_clipboard_label">Enheds-ID</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -46,6 +52,7 @@
   <string name="root_access_all">Apps og ADB</string>
   <!-- Preference link for root appops -->
   <string name="root_appops_title">Administrer root adgang</string>
+  <string name="root_appops_summary">Vis og kontrollér rootreglerne</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, Replicant version -->
@@ -365,6 +372,7 @@
   <string name="app_ops_summaries_read_external_storage">læs eksternt lager</string>
   <string name="app_ops_summaries_write_external_storage">skriv til eksternt lager</string>
   <string name="app_ops_summaries_turn_screen_on">tænd skærmen</string>
+  <string name="app_ops_summaries_get_accounts">hent konti</string>
   <string name="app_ops_summaries_toggle_wifi">Wi-Fi til/fra</string>
   <string name="app_ops_summaries_toggle_bluetooth">bluetooth til/fra</string>
   <string name="app_ops_summaries_start_at_boot">start ved opstart</string>
@@ -384,6 +392,7 @@
   <string name="app_ops_labels_modify_calendar">Ændre kalender</string>
   <string name="app_ops_labels_wifi_scan">Wi-Fi skanning</string>
   <string name="app_ops_labels_notification">Skriv notifikation</string>
+  <string name="app_ops_labels_cell_scan">Mobilnetværksskanning</string>
   <string name="app_ops_labels_call_phone">Opkald til telefon</string>
   <string name="app_ops_labels_read_sms">Læs SMS</string>
   <string name="app_ops_labels_write_sms">Skriv SMS</string>
@@ -413,6 +422,7 @@
   <string name="app_ops_labels_bluetooth_volume">Lydstyrke for Bluetooth</string>
   <string name="app_ops_labels_keep_awake">Hold vågen</string>
   <string name="app_ops_labels_monitor_location">Overvåg placering</string>
+  <string name="app_ops_labels_monitor_high_power_location">Overvåg placering ved højt strømforbrug</string>
   <string name="app_ops_labels_get_usage_stats">Få brugsstatistik</string>
   <string name="app_ops_labels_mute_unmute_microphone">Mikrofon til/fra</string>
   <string name="app_ops_labels_toast_window">Vis toastbeskeder</string>
@@ -432,6 +442,7 @@
   <string name="app_ops_labels_read_external_storage">Læs eksternt lager</string>
   <string name="app_ops_labels_write_external_storage">Skriv til eksternt lager</string>
   <string name="app_ops_labels_turn_screen_on">Tænd skærmen</string>
+  <string name="app_ops_labels_get_accounts">Hent konti</string>
   <string name="app_ops_labels_toggle_wifi">Wi-Fi til/fra</string>
   <string name="app_ops_labels_toggle_bluetooth">Bluetooth til/fra</string>
   <string name="app_ops_labels_start_at_boot">Start ved opstart</string>
@@ -553,6 +564,7 @@
   <string name="volume_adjust_sounds_title">Lyd for lydstyrkejustering</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Vibrator-intensitet</string>
+  <string name="vibrator_warning">Værdier højere end %1$d%% anbefales ikke</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Farvekalibrering</string>
   <string name="color_calibration_summary">Kalibrér skærmfarver</string>
@@ -604,6 +616,8 @@
   <string name="live_display_color_profile_photography_summary">Perfekt farvegengivelse for fotos</string>
   <string name="live_display_color_profile_basic_title">Grundlæggende</string>
   <string name="live_display_color_profile_basic_summary">Brug skærmen ukalibreret</string>
+  <string name="live_display_color_profile_adaptive_title">Selvjusterende</string>
+  <string name="live_display_color_profile_adaptive_summary">Farver tilpasses omgivelser</string>
   <!-- LiveDisplay : Picture Adjustment -->
   <string name="picture_adjustment_title">Billedjustering</string>
   <string name="picture_adjustment_summary">Justerer farvetone, mætning, lysstyrke og kontrast</string>
@@ -798,6 +812,7 @@
   <string name="voice_wakeup_retrain_title">Træn din stemme igen</string>
   <string name="voice_wakeup_activity_title">Aktivitet, som skal startes</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">Stemmevækning er nødt til at have tilladelser til opkald for at vælge en Direct Dial-kontakt.</string>
   <string name="picker_activities">Aktiviteter</string>
   <string name="select_custom_app_title">Vælg brugerdefineret app</string>
   <string name="select_custom_activity_title">Vælg brugerdefineret aktivitet</string>
@@ -843,7 +858,10 @@
   <string name="no_filters_title">Der er ingen filtre</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">LineageOS-statistikker</string>
+  <string name="anonymous_statistics_summary">Hjælp med at gøre LineageOS bedre ved at deltage i rapportering af anonyme statistikker</string>
   <string name="anonymous_statistics_warning_title">Om</string>
+  <string name="anonymous_statistics_warning">Deltagelse af LineageOS-statistikker vil tillade ikke-personlige data, der skal forelægges for udviklerne af LineageOS, at spore unikke installationer på tværs af enheder. De indsendte oplysninger omfatter en entydig indikator, som ikke kompromitterer dit privatliv eller personlige data. Dataene indsendes under hver opstart.\n\nFor et eksempel på de data, der er indsendt, skal du trykke på Få vist data.</string>
   <string name="enable_reporting_title">Aktivér rapportering</string>
   <string name="preview_data_title">Få vist data</string>
   <string name="view_stats_title">Vis statistikker</string>
@@ -863,17 +881,23 @@
   <string name="menu_hidden_apps_delete">Nulstil</string>
   <string name="menu_hidden_apps_reset_lock">Nulstil mønster lås</string>
   <string name="protected_apps">Beskyttede apps</string>
+  <string name="protected_apps_summary">Administrer, hvilke apps, der er skjult bag en sikker lås</string>
   <string name="saving_protected_components">Gemmer komponenttilstand\u2026</string>
   <string name="pa_login_username_hint">Brugernavn (e-mail)</string>
   <string name="pa_login_password_hint">Adgangskode</string>
   <string name="pa_login_submit_button">Log ind</string>
   <string name="pa_login_checking_password">Kontrollerer konto\u2026</string>
   <string name="pa_login_incorrect_login">Login var forkert</string>
+  <string name="pa_pattern_or_fingerprint_header">Skal tegne mønster eller bruge fingeraftryk til at låse op</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">Bidragydere</string>
   <string name="contributors_cloud_loading_message">Indlæser bidragyderdata\u2026</string>
   <string name="contributors_cloud_failed_message">Kan ikke indlæse bidragyderdata</string>
   <string name="contributor_info_menu">Bidragyder info</string>
+  <string name="contributor_info_msg">
+        <![CDATA[<b>Navn:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+                 <b>Kaldenavn:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>Bidrag:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
   <string name="contributions_info_menu">Bidrag-info</string>
   <string name="contributions_info_msg">
         <![CDATA[<b>Bidragsydere i alt:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
@@ -889,6 +913,7 @@
   <string name="title_general">Generelt</string>
   <string name="advanced">Avanceret</string>
   <string name="link_volume_option_title">Forbind ringe- og meddelelseslydstyrke</string>
+  <string name="lcd_density_prompt_message">Nogle apps fungerer muligvis ikke på en ikke-standard DPI.\n\nDette vil genstarte din enhed.</string>
   <!-- Edit access point labels: PPP number -->
   <string name="apn_ppp_number">APN PPP telefonnummer</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
@@ -923,9 +948,14 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_events">begivenheder</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">udvalgte opkaldere</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">valgte beskeder</string>
   <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Vibration</string>
+  <string name="zen_mode_vibration_never">Vibrér ikke</string>
+  <string name="zen_mode_vibration_calls_only">Vibrér kun ved opkald</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Vibrér ved opkald og notifikationer</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Hoved: %1$s W/kg</string>
@@ -995,7 +1025,9 @@
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_title">Vejr</string>
+  <string name="weather_settings_no_services_prompt">Ingen vejrtjenester er installeret</string>
   <string name="weather_settings_button">Udbyderindstillinger</string>
+  <string name="weather_settings_activity_not_found">Kunne ikke åbne indstillingsmenuen for denne udbyder</string>
   <string name="weather_settings_add_weather_provider">Tilføj vejrudbyder</string>
   <string name="weather_settings_general_settings_title">Generelt</string>
   <string name="weather_settings_providers_title">Udbydere</string>
@@ -1003,16 +1035,21 @@
   <string name="weather_settings_temp_celsius">Celsius</string>
   <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
   <string name="weather_settings_keyword">vejr</string>
+  <string name="background_data_access">Baggrundsdataadgang</string>
+  <string name="allow_background_both">Over mobildata &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Kun via Wi\u2011Fi</string>
   <string name="allow_background_none">Ingen adgang</string>
   <string name="mobile_data_alert">Mobildata alarm</string>
+  <string name="mobile_data_alert_summary">Giv besked, når appen bruger en betydelig mængde data</string>
   <string name="data_usage_menu_enable_data_alerts">Aktiver advarsler for dataforbrug</string>
   <string name="data_usage_menu_disable_data_alerts">Desktiver advarsler for dataforbrug</string>
   <string name="data_usage_menu_reset_stats">Nulstil datastatistik</string>
+  <string name="reset_data_stats_msg">Dette vil rydde al tidligere og nuværende datasporingsinformation</string>
   <string name="reset_stats_confirm">Bekræft</string>
   <string name="restrict_cellular_access_title">Begræns adgang for mobildata</string>
   <string name="restrict_cellular_access_summary">Deaktiver adgang til data på mobilnetværk</string>
   <string name="restrict_cellular_access_dialog_title">Begræns adgang for mobildata?</string>
+  <string name="restrict_cellular_access_dialog_summary">Denne funktion kan medføre, at en app, som er afhængig af netværksadgang, ikke længere virker, hvis der kun er mobilnetværk tilgængeligt.\n\nDu kan finde flere relevante kontrolelementer til databrug i de tilgængelige indstillinger i appen.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Netværksoperatører</string>
   <!-- title for lock screen blur preference -->
@@ -1025,6 +1062,8 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Deaktivere vedvarende meddelelser på låseskærmen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Vis aldrig vedvarende meddelelser fra denne app på låseskærmen</string>
   <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Minimumstid mellem notifikationslyde</string>
+  <string name="app_notification_sound_timeout_summary_template">Tillad ikke lyde eller vibration mere en en gang hvert <xliff:g id="duration">%1$s</xliff:g></string>
   <string name="app_notification_sound_timeout_value_none">Ingen begrænsning</string>
   <string name="app_notification_sound_timeout_value_10_seconds">10 sekunder</string>
   <string name="app_notification_sound_timeout_value_30_seconds">30 sekunder</string>
@@ -1051,6 +1090,7 @@
   <string name="lockscreen_wallpaper_title">Baggrund</string>
   <string name="not_available_with_app">Ikke tilgængelig med %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Find fingerprint sensoren på <xliff:g id="sensor_location">%1$s</xliff:g> af din telefon.</string>
   <!-- Fingerprint sensor locations -->
   <string name="security_settings_fingerprint_sensor_location_back">tilbage</string>
   <string name="security_settings_fingerprint_sensor_location_front">front</string>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index 6d2c21783..c43b8cbe7 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -83,6 +83,7 @@
   <!-- choice for the font size spinner -->
   <!-- choice for the font size spinner -->
   <!-- Do not translate. label for font size preview.  Does not need to be translated. -->
+  <string name="font_size_preview_text">Servez à ce monsieur une bière et des kiwis.</string>
   <!-- Button. Chosen when they want to save the chosen text size. -->
   <!-- Title for a notification shown. [CHAR LIMIT=25] -->
   <!-- Title for a notification shown. -->
@@ -1028,7 +1029,9 @@
   <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
   <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
   <!-- Do not translate. About phone, status item title -->
+  <string name="status_imei">IMEI</string>
   <!-- Do not translate. About phone, status item title -->
+  <string name="status_imei_sv">IMEI SV</string>
   <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=30] -->
   <!-- About phone, status item title.  The phone number of the current device [CHAR LIMIT=30] -->
   <string name="status_number" product="default">Mia telefonnumero</string>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index c51a23ed7..bc43e2dbb 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -55,20 +55,20 @@
   <string name="root_appops_summary">Ver y controlar las reglas administrativas</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, Replicant version -->
+  <!-- About phone screen, LineageOS version -->
   <string name="mod_version">Versión de Replicant</string>
   <string name="mod_version_default">Desconocido</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Modelo de dispositivo</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Nombre del dispositivo</string>
-  <!-- About phone screen, Replicant Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level">Nivel de API de Replicant</string>
   <string name="mod_api_level_default">Desconocido</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Fecha de compilación</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Actualizaciones de Replicant</string>
+  <string name="cmupdate_settings_title">Actualizaciones de LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Actualizar recovery de CyanogenMod</string>
   <string name="update_recovery_summary">Actualizar recovery con las actualizaciones del sistema</string>
@@ -858,10 +858,10 @@
   <string name="no_filters_title">No hay filtros establecidos</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Estadísticas de Replicant</string>
-  <string name="anonymous_statistics_summary">Ayude a mejorar Replicant mediante el envío anónimo de estadísticas</string>
+  <string name="anonymous_statistics_title">Estadísticas de LineageOS</string>
+  <string name="anonymous_statistics_summary">Ayude a mejorar LineageOS mediante el envío anónimo de estadísticas</string>
   <string name="anonymous_statistics_warning_title">Acerca de</string>
-  <string name="anonymous_statistics_warning">Al permitir la recopilación y el envío de estadísticas de Replicant, autorizas el envío de información de carácter no personal a los desarrolladores de Replicant para hacer un seguimiento de las instalaciones que realices en los dispositivos. La información enviada incluye un identificador único que no compromete tu privacidad ni tu información personal. Esta información es enviada durante el arranque.\n\nPara ver un ejemplo de la información enviada, pulsa en \u00ABPrevisualizar datos\u00BB.</string>
+  <string name="anonymous_statistics_warning">Al permitir la recopilación y el envío de estadísticas de Replicant, autorizas el envío de información de carácter no personal a los desarrolladores de Replicant para hacer un seguimiento de las instalaciones que realices en los dispositivos. La información enviada incluye un identificador único que no compromete tu privacidad ni tu información personal. Esta información es enviada durante el arranque.\n\nPara ver un ejemplo de la información enviada, pulsa en «Previsualizar datos».</string>
   <string name="enable_reporting_title">Activar envío de estadísticas</string>
   <string name="preview_data_title">Previsualizar datos</string>
   <string name="view_stats_title">Ver estadísticas</string>
@@ -1007,7 +1007,7 @@
   <string name="interruptions_ignore_while_media_title">Prevenir reducción de audio</string>
   <string name="interruptions_ignore_while_media_summary">No reducir el volumen de reproducción cuando llegue una notificación</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Licencia de Replicant</string>
+  <string name="cmlicense_title">Licencia de LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Restablecer estadísticas</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 0e7cfceba..ed0026917 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -497,7 +497,7 @@
   <string name="camera_launch_summary">Una pressione prolungata e un rilascio attiveranno la fotocamera</string>
   <string name="volbtn_music_controls_title">Cambia traccia</string>
   <string name="volbtn_music_controls_summary">Quando lo schermo è spento la pressione prolungata dei tasti volume cambia traccia</string>
-  <string name="volbtn_cursor_control_title">Controllo cursore con tasti</string>
+  <string name="volbtn_cursor_control_title">Controllo cursore input</string>
   <string name="volbtn_cursor_control_off">Disattivato</string>
   <string name="volbtn_cursor_control_on">Volume su/giù muove il cursore a sinistra/destra</string>
   <string name="volbtn_cursor_control_on_reverse">Volume su/giù muove il cursore a destra/sinistra</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index be056063f..3ad9c5c90 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -55,20 +55,20 @@
   <string name="root_appops_summary">Se over og endre root reglene</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, Replicant version -->
-  <string name="mod_version">Replicant versjon</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS versjon</string>
   <string name="mod_version_default">Ukjent</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Enhetsmodell</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Enhetsnavn</string>
-  <!-- About phone screen, Replicant Api Level -->
-  <string name="mod_api_level">Replicant API nivå</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API nivå</string>
   <string name="mod_api_level_default">Ukjent</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Build-dato</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Replicant oppdateringer</string>
+  <string name="cmupdate_settings_title">LineageOS oppdateringer</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Oppdater Cyanogen recovery</string>
   <string name="update_recovery_summary">Oppdater recovery med systemoppdateringer</string>
@@ -858,7 +858,7 @@
   <string name="no_filters_title">Ingen filtre valgt</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Replicant statistikk</string>
+  <string name="anonymous_statistics_title">Replicant-statistikk</string>
   <string name="anonymous_statistics_summary">Hjelp oss med å gjøre Replicant bedre ved å velge å sende inn anonym statistikkrapportering</string>
   <string name="anonymous_statistics_warning_title">Om</string>
   <string name="anonymous_statistics_warning">Ved å bli med i innsamlingen av Replicant statistikk vil ikke-personlige data bli sendt til utviklerne av Replicant for å spore antall unike installasjoner spredt over typer enheter. Informasjonen som sendes inkluderer en unik identitetskode, som ikke kompromitterer ditt personvern eller dine personlige data. Data blir sendt ved hver oppstart.\n\nFor ett eksempel over data som blir sendt, trykk på Forhåndsvis data.</string>
@@ -1007,7 +1007,7 @@
   <string name="interruptions_ignore_while_media_title">Hindre lyd ducking</string>
   <string name="interruptions_ignore_while_media_summary">Ikke Reduser media avspillingsvolumet når en melding ankommer</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Replicant juridisk</string>
+  <string name="cmlicense_title">LineageOS juridisk</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Tilbakestill statistikk</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 776502843..9d3e79d97 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -290,6 +290,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Ustawienia LED</string>
   <string name="led_notification_text">Diody LED włączone przez ustawienia</string>
+  <string name="notification_light_no_apps_summary">Aby dodać kontrolę dla indywidualnych aplikacji, aktywuj \'%1$s\' i naciśnij \'\u002b\' na pasku menu</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Debugowanie</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -554,6 +555,7 @@
   <string name="double_tap_to_sleep_summary">Dotknij dwukrotnie pasek stanu, aby zablokować ekran</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Zapobiega przypadkowemu wybudzeniu</string>
+  <string name="proximity_wake_summary">Sprawdź czujnik zbliżeniowy przed wybudzeniem wywołanym przez gesty</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Wybudź przy podłączaniu</string>
   <string name="wake_when_plugged_or_unplugged_summary">Włącz ekran podczas podłączania i odłączania od źródła zasilania</string>
@@ -564,6 +566,7 @@
   <string name="volume_adjust_sounds_title">Dźwięk regulacji głośności</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Siła wibracji</string>
+  <string name="vibrator_warning">Wartości wyższe niż %1$d%% nie są zalecane</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Kalibracja kolorów</string>
   <string name="color_calibration_summary">Kalibruje wyświetlane kolory</string>
@@ -618,8 +621,11 @@
   <string name="live_display_color_profile_adaptive_title">Adaptacyjny</string>
   <string name="live_display_color_profile_adaptive_summary">Dostosowanie kolorów do warunków otoczenia</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Dostosowanie obrazu</string>
   <string name="picture_adjustment_summary">Dostosuj odcień, nasycenie, intensywność i kontrast</string>
+  <string name="adj_hue_title">Odcień</string>
   <string name="adj_saturation_title">Nasycenie</string>
+  <string name="adj_intensity_title">Intensywność</string>
   <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikona selektora</string>
@@ -855,7 +861,11 @@
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
   <string name="anonymous_statistics_title">Statystyki LineageOS</string>
+  <string name="anonymous_statistics_summary">Pomóż ulepszyć LineageOS, pozwalając na wysyłanie anonimowych statystyk</string>
   <string name="anonymous_statistics_warning_title">O...</string>
+  <string name="anonymous_statistics_warning">Wyrażenie zgody na udział w Statystykach LineageOS zezwoli na przesył anonimowych danych do
+        developerów LineageOS, aby śledzić ilość unikalnych instalacji na urządzeniach . Informacje zawierają unikalny identyfikator,
+       który nie narusza twojej prywatności lub prywatnych danych. Dane są wysyłane przy każdym uruchomieniu.\n\nAby zobaczyć przykład przesyłanych danych naciśnij Podgląd Danych.</string>
   <string name="enable_reporting_title">Włącz raportowanie</string>
   <string name="preview_data_title">Podgląd danych</string>
   <string name="view_stats_title">Zobacz statystyki</string>
@@ -946,6 +956,10 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">wybrane wiadomości</string>
   <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Wibracje</string>
+  <string name="zen_mode_vibration_never">Nie wibruj</string>
+  <string name="zen_mode_vibration_calls_only">Wibruj tylko przy połączeniach</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Wibruj dla połączeń i powiadomień</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Głowa: %1$s W/kg</string>
@@ -1052,6 +1066,9 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Wyłącz trwałe powiadomienia na ekranie blokady</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nigdy nie pokazuj trwałych powiadomień z tej aplikacji na ekranie blokady</string>
   <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Minimalny czas między dźwiękami powiadomień</string>
+  <string name="app_notification_sound_timeout_summary_template">Zezwól na dźwięki i wibracje, nie więcej niż jeden raz co każde <xliff:g id="duration">%1$s </xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Brak ograniczeń</string>
   <string name="app_notification_sound_timeout_value_10_seconds">10 sekund</string>
   <string name="app_notification_sound_timeout_value_30_seconds">30 sekund</string>
   <string name="app_notification_sound_timeout_value_1_minute">1 min</string>
@@ -1084,4 +1101,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">lewa strona</string>
   <string name="security_settings_fingerprint_sensor_location_right">prawa strona</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Połączenie: <xliff:g id="voice_status">%1$s</xliff:g> / Dane: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 9787a04b0..af332eefd 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -549,7 +549,7 @@
   <string name="double_tap_to_wake_title">Toque duplo para acordar</string>
   <string name="double_tap_to_wake_summary">Dê um duplo toque na tela para ligá-la</string>
   <!-- tap-to-sleep -->
-  <string name="double_tap_to_sleep_title">Toque duplo para dormir</string>
+  <string name="double_tap_to_sleep_title">Toque duplo para suspender</string>
   <string name="double_tap_to_sleep_summary">Toque duas vezes na barra de status para desligar a tela</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Evitar despertar acidental</string>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 6b54b4655..49ff90baa 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -789,7 +789,7 @@
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Звук уведомления</string>
   <!-- Advanced reboot options -->
-  <string name="advanced_reboot_title">Варианты перезагрузки</string>
+  <string name="advanced_reboot_title">Варианты перезапуска</string>
   <string name="advanced_reboot_summary">Показывать дополнительные параметры перезагрузки устройства (в загрузчик, режим восстановления или перезапуска интерфейса) в меню кнопки питания</string>
   <string name="category_interface">Интерфейс</string>
   <!-- Expanded desktop -->
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index 12a507103..81f05b97b 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -271,7 +271,7 @@
   <string name="notification_light_missed_call_title">Thirrje e humbur</string>
   <string name="notification_light_voicemail_title">Mesazh zanor</string>
   <string name="notification_light_screen_on">Dritat me ekranin e ndezur</string>
-  <string name="notification_light_zen_mode">Dritat në modalitetin \"Mos më shqetëso\"</string>
+  <string name="notification_light_zen_mode">Dritat në profilin \"Mos më shqetëso\"</string>
   <string name="notification_light_use_multiple_leds">LED të shumëfishta</string>
   <string name="keywords_lights_brightness_level">zbut ndriçimin e dritave LED</string>
   <string name="notification_light_automagic">Zgjidhi ngjyrat automatikisht</string>
@@ -291,6 +291,7 @@
   <string name="adb_notify">Njoftim i debugimit</string>
   <string name="adb_notify_summary">Shfaq një njoftim kur debugimi i USB-së apo rrjetit është i aktivizuar</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <string name="app_ops_categories_location">Vendndodhja</string>
   <string name="app_ops_categories_messaging">Mesazhet</string>
   <string name="app_ops_categories_media">Media</string>
   <string name="app_ops_categories_device">Pajisja</string>
@@ -388,6 +389,7 @@
   <string name="app_ops_labels_read_external_storage">Lexo memorien e jashtme</string>
   <string name="app_ops_labels_write_external_storage">Shkruaj në memorien e jashtme</string>
   <string name="app_ops_labels_turn_screen_on">Ndiz ekranin</string>
+  <string name="app_ops_labels_toggle_wifi">Aktivizo/çaktivizo Wi-Fi</string>
   <string name="app_ops_labels_toggle_bluetooth">Ndiz/fik bluetoothin</string>
   <string name="app_ops_labels_toggle_nfc">Ndiz/fik NFC</string>
   <string name="app_ops_labels_toggle_mobile_data">Aktivizo/çaktivizo internetin e celularit</string>
@@ -583,6 +585,9 @@
   <string name="stylus_app_not_installed">%s nuk është instaluar</string>
   <!-- Touchscreen hovering -->
   <!-- Increasing ring tone volume -->
+  <string name="increasing_ring_volume_option_title">Volum me rritje graduale</string>
+  <string name="increasing_ring_min_volume_title">Volumi fillestar</string>
+  <string name="increasing_ring_ramp_up_time_title">Kohëzgjatja e rritjes</string>
   <!-- LTO download data over wi-fi only -->
   <string name="lto_download_data_wifi_only_on">Me çdo rrjet</string>
   <string name="lto_download_data_wifi_only_off">Vetëm me rrjetet Wi\u2011Fi</string>
@@ -600,7 +605,7 @@
   <!-- Sound settings, Charging sounds ringtone selection, preference label -->
   <string name="power_notifications_ringtone_title">Zilja e njoftimeve</string>
   <!-- Sound settings, charging sounds label for ringtone == none -->
-  <string name="power_notifications_ringtone_silent">Pa zhurmë</string>
+  <string name="power_notifications_ringtone_silent">Pa zë</string>
   <!-- Status bar -->
   <string name="status_bar_title">Shiriti i statusit</string>
   <string name="status_bar_toggle_brightness">Kontrolli i ndriçimit</string>
@@ -717,6 +722,7 @@
   <string name="remove_blacklist_number_title">Hiq numrin</string>
   <string name="select_contact">Zgjidh kontaktin</string>
   <!-- Sms security limit -->
+  <string name="sms_security_check_limit_title">Kufiri i mesazheve SMS</string>
   <string name="sms_security_check_limit_none">Asnjë</string>
   <!-- Notification spamfilter -->
   <!-- Anonymous Statistics #CM -->
@@ -763,6 +769,7 @@
   <string name="category_misc">Të ndryshme</string>
   <string name="title_general">Të përgjithshme</string>
   <string name="advanced">Të përparuara</string>
+  <string name="link_volume_option_title">Lidh volumin e ziles me atë të njoftimeve</string>
   <!-- Edit access point labels: PPP number -->
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
   <string name="sim_disabled">e çaktivizuar</string>
@@ -837,11 +844,12 @@
   <string name="privacy_guard_internet_category">Interneti</string>
   <!-- Weather -->
   <string name="weather_settings_title">Moti</string>
-  <string name="weather_settings_no_services_prompt">Nuk është instaluar asnjë furnizues i shërbimit meteorologjik</string>
-  <string name="weather_settings_button">Parametrat e furnizuesit</string>
-  <string name="weather_settings_activity_not_found">Menuja e parametrave të këtij furnizuesi nuk mund të hapet</string>
-  <string name="weather_settings_add_weather_provider">Shto një furnizues moti</string>
+  <string name="weather_settings_no_services_prompt">Nuk është instaluar asnjë ofrues i shërbimit meteorologjik</string>
+  <string name="weather_settings_button">Parametrat e ofruesit</string>
+  <string name="weather_settings_activity_not_found">Menuja e parametrave të këtij ofruesi nuk mund të hapet</string>
+  <string name="weather_settings_add_weather_provider">Shto një ofrues moti</string>
   <string name="weather_settings_general_settings_title">Të përgjithshme</string>
+  <string name="weather_settings_providers_title">Ofruesit</string>
   <string name="weather_settings_temp_units_title">Njësia e temperaturës</string>
   <string name="weather_settings_temp_celsius">Celsius</string>
   <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
@@ -882,6 +890,7 @@
   <string name="cm_radio_info_wfc_avail_ovr_off_label">Aktivizo debugimin e WFC</string>
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Sfondi</string>
+  <string name="not_available_with_app">E padisponueshme me %1$s</string>
   <!-- Format string for fingerprint location message -->
   <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Lokalizo sensorin e shenjave të gishtave në <xliff:g id="sensor_location">%1$s</xliff:g> të telefonit tuaj.</string>
   <!-- Fingerprint sensor locations -->
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 2f8b818a0..a9a16cebe 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -860,10 +860,10 @@
   <string name="no_filters_title">Нема постављених филтера</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Replicant статистика</string>
-  <string name="anonymous_statistics_summary">Помозите да побољшамо Replicant слањем анонимних извештаја статистике</string>
+  <string name="anonymous_statistics_title">LineageOS статистика</string>
+  <string name="anonymous_statistics_summary">Помозите да побољшамо LineageOS слањем анонимних извештаја статистике</string>
   <string name="anonymous_statistics_warning_title">О</string>
-  <string name="anonymous_statistics_warning">Омогућавањем слања Replicant статистикe дозволиће се да се нелични подаци доставе развојном тиму Replicant-а како би се пратио број појединачних инсталација на различите уређаје. Информације које се шаљу садрже јединствену идентификацију која не компромитује приватност или личне податке. Подаци се шаљу при сваком покретању уређаја.\n\nЗа пример података који се шаљу, додирните преглед података.</string>
+  <string name="anonymous_statistics_warning">Омогућавањем слања LineageOS статистикe дозволиће се да се нелични подаци доставе развојном тиму LineageOS-а како би се пратио број појединачних инсталација на различите уређаје. Информације које се шаљу садрже јединствену идентификацију која не компромитује приватност или личне податке. Подаци се шаљу при сваком покретању уређаја.\n\nЗа пример података који се шаљу, додирните преглед података.</string>
   <string name="enable_reporting_title">Омогући извештавање</string>
   <string name="preview_data_title">Преглед података</string>
   <string name="view_stats_title">Погледај статистике</string>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 833a98eb8..812c8d044 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -1024,6 +1024,12 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Inaktivera beständiga aviseringar på låsskärmen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Visa aldrig beständiga aviseringar från denna app på låsskärmen</string>
   <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_value_10_seconds">10 sekunder</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 sekunder</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 minut</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 minuter</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 minuter</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 minuter</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <string name="cm_radio_info_wfc_avail_ovr_on_label">Stäng av WFC debug</string>
@@ -1031,8 +1037,11 @@
   <string name="cm_radio_info_adb_log_on_label">Stäng av ADB radio log</string>
   <string name="cm_radio_info_adb_log_off_label">Slå på ADB radio log</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Bakgrundsbild</string>
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">bakre</string>
+  <string name="security_settings_fingerprint_sensor_location_front">främre</string>
   <string name="security_settings_fingerprint_sensor_location_left">vänster sida</string>
   <string name="security_settings_fingerprint_sensor_location_right">höger sida</string>
   <!-- SIM status format string -->
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 44e7f1f20..2bf1a95e8 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -43,16 +43,16 @@
   <string name="development_shortcut_title">Geliştirme kısayolu</string>
   <string name="development_shortcut_summary">Son uygulamalar listesinde uygulama yönetimi kısayollarını etkinleştir</string>
   <!-- Setting checkbox title for root access -->
-  <string name="root_access">Root erişimi</string>
-  <string name="root_access_warning_title">Root erişimine izin ver?</string>
-  <string name="root_access_warning_message">Root erişimine izin vermek çok tehlikelidir ve sisteminizin güvenliğini tehlikeye atabilir!</string>
+  <string name="root_access">Kök erişimi</string>
+  <string name="root_access_warning_title">Kök erişimine izin ver?</string>
+  <string name="root_access_warning_message">Kök erişimine izin vermek çok tehlikelidir ve sisteminizin güvenliğini tehlikeye atabilir!</string>
   <string name="root_access_none">Devre dışı</string>
   <string name="root_access_apps">Sadece uygulamalar</string>
   <string name="root_access_adb">Sadece ADB</string>
   <string name="root_access_all">Uygulamalar ve ADB</string>
   <!-- Preference link for root appops -->
-  <string name="root_appops_title">Root erişimini yönet</string>
-  <string name="root_appops_summary">Root kurallarını görüntüle ve kontrol et</string>
+  <string name="root_appops_title">Kök erişimini yönet</string>
+  <string name="root_appops_summary">Kök erişimi kurallarını görüntüle ve kontrol et</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, Replicant version -->
@@ -61,7 +61,7 @@
   <!-- About phone screen, Device model -->
   <string name="device_model">Cihaz modeli</string>
   <!-- About phone screen, Device name -->
-  <string name="device_name">Cihaz ismi</string>
+  <string name="device_name">Cihaz adı</string>
   <!-- About phone screen, Replicant Api Level -->
   <string name="mod_api_level">Replicant API düzeyi</string>
   <string name="mod_api_level_default">Bilinmeyen</string>
@@ -226,7 +226,7 @@
   <string name="profile_appgroup_name_title">İsim</string>
   <string name="duplicate_appgroup_name">Tekrarlayan uygulama grup ismi!</string>
   <string name="profile_app_delete_confirm">Uygulama silinsin mi?</string>
-  <string name="no_bluetooth_triggers">Eşleştirilmiş bluetooth aygıtı yok.\nTetikleyicileri yapılandırmadan önce Bluetooth cihazı ile eşleştirmek için dokunun.</string>
+  <string name="no_bluetooth_triggers">Eşleştirilmiş bluetooth cihazı yok.\nTetikleyicileri yapılandırmadan önce Bluetooth cihazı ile eşleştirmek için dokunun.</string>
   <string name="no_wifi_triggers">Hiç  Wi\u2011Fi erişim noktası yapılandırılmadı.\nTetikleyicileri yapılandırmadan önce  Wi\u2011Fi ağına bağlanmak için dokunun.</string>
   <string name="no_triggers_configured">Hiç tetikleyici ayarlanmadı. Eklemek için dokunun.</string>
   <string name="no_triggers_configured_nfc">Yeni bir NFC tetikleyicisi kurmak için dokunun.</string>
@@ -243,7 +243,7 @@
   <string name="navigation_save_button_text">Kaydet</string>
   <string name="navigation_bar_reset_message">Geçerli ayarlar silinip varsayılan düzene dönülsün mü?</string>
   <string name="navigation_bar_arrow_keys_title">Yazı yazarken yön tuşlarını göster</string>
-  <string name="navigation_bar_arrow_keys_summary">Yazı yazarken sağ ve sol imleç tuşlarını göster. IME değiştiriciyi gösterme.</string>
+  <string name="navigation_bar_arrow_keys_summary">Yazı yazarken sağ ve sol imleç tuşlarını göster. Klavye değiştiriciyi gösterme.</string>
   <string name="navigation_bar_recents_title">Son uygulamalar düğmesi uzun basma eylemi</string>
   <!-- Notification light dialogs -->
   <string name="edit_light_settings">Işık ayarlarını düzenle</string>
@@ -265,7 +265,7 @@
   <string name="pulse_speed_slow">Yavaş</string>
   <string name="pulse_speed_very_slow">Çok yavaş</string>
   <!-- Battery light settings -->
-  <string name="battery_light_title">Pil Işığı</string>
+  <string name="battery_light_title">Pil ışığı</string>
   <string name="battery_low_pulse_title">Pil zayıfsa yanıp sön</string>
   <string name="battery_light_list_title">Renkler</string>
   <string name="battery_light_low_color_title">Pil zayıf</string>
@@ -308,7 +308,7 @@
   <string name="app_ops_categories_media">Ortam</string>
   <string name="app_ops_categories_device">Cihaz</string>
   <string name="app_ops_categories_bootup">Açılış</string>
-  <string name="app_ops_categories_su">Root erişimi</string>
+  <string name="app_ops_categories_su">Kök erişimi</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_summaries_coarse_location">kaba konum</string>
   <string name="app_ops_summaries_fine_location">kesin konum</string>
@@ -378,7 +378,7 @@
   <string name="app_ops_summaries_start_at_boot">açılışta başlat</string>
   <string name="app_ops_summaries_toggle_nfc">NFC\'yi aç/kapa</string>
   <string name="app_ops_summaries_toggle_mobile_data">hücresel veriye geçiş</string>
-  <string name="app_ops_summaries_superuser">root erişimi</string>
+  <string name="app_ops_summaries_superuser">kök erişimi</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_labels_coarse_location">Yaklaşık konum</string>
   <string name="app_ops_labels_fine_location">Kesin konum</string>
@@ -448,7 +448,7 @@
   <string name="app_ops_labels_start_at_boot">Açılışta başlat</string>
   <string name="app_ops_labels_toggle_nfc">NFC\'yi aç/kapa</string>
   <string name="app_ops_labels_toggle_mobile_data">Hücresel veriye geçiş</string>
-  <string name="app_ops_labels_superuser">Root erişimi</string>
+  <string name="app_ops_labels_superuser">Kök erişimi</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">İzin verildi</string>
   <string name="app_ops_permissions_ignored">Görmezden gelindi</string>
@@ -501,13 +501,13 @@
   <string name="volbtn_cursor_control_off">Devre dışı</string>
   <string name="volbtn_cursor_control_on">Ses yukarı/aşağı imleci sola/sağa kaydırır</string>
   <string name="volbtn_cursor_control_on_reverse">Ses yukarı/aşağı imleci sağ/sola kaydırır</string>
-  <string name="power_end_call_title">Çağrıyı sonlandır</string>
-  <string name="power_end_call_summary">Güç tuşuna basmak mevcut çağrıyı sonlandıracak</string>
+  <string name="power_end_call_title">Aramayı sonlandır</string>
+  <string name="power_end_call_summary">Güç tuşuna basmak mevcut aramayı sonlandıracak</string>
   <string name="swap_volume_buttons_title">Yeniden ata</string>
   <string name="swap_volume_buttons_summary">Ekran döndürüldüğünde ses tuşlarını yer değiştir</string>
   <string name="button_wake_title">Cihazı uyandır</string>
-  <string name="home_answer_call_title">Çağrıya cevap ver</string>
-  <string name="home_answer_call_summary">Ana ekran tuşuna basılması mevcut gelen çağrıyı cevaplandırır</string>
+  <string name="home_answer_call_title">Aramaya cevap ver</string>
+  <string name="home_answer_call_summary">Ana ekran tuşuna basmak mevcut gelen aramayı cevaplayacak</string>
   <!-- Backlight brightness settings screen -->
   <string name="adaptive_backlight_title">Uyum sağlayan arka ışık</string>
   <string name="adaptive_backlight_summary">Kullanılabilirliği koruyarak pil ömrünü en üst düzeye çıkarmak için ekranın arka ışık parlaklığını dinamik olarak ayarla</string>
@@ -543,8 +543,8 @@
   <string name="power_menu_sound_title">Ses paneli</string>
   <string name="power_menu_bug_report_disabled">Hata raporlama geliştirici ayarlarında devre dışı bırakıldı</string>
   <!-- Buttons - Enable navbar -->
-  <string name="disable_navkeys_title">Ekrandaki dolaşım çubuğunu etkinleştir</string>
-  <string name="disable_navkeys_summary">Ekran üstü dolaşım çubuğunu etkinleştir ve donanımsal butonları devre dışı bırak</string>
+  <string name="disable_navkeys_title">Gezinme çubuğunu etkinleştir</string>
+  <string name="disable_navkeys_summary">Ekranda gezinme çubuğunu etkinleştirin ve donanım düğmelerini devre dışı bırakın</string>
   <!-- tap-to-wake -->
   <string name="double_tap_to_wake_title">Uyanmak için çift dokun</string>
   <string name="double_tap_to_wake_summary">Ekranı açmak için ekrana iki defa dokunun</string>
@@ -588,7 +588,7 @@
   <string name="display_rotation_180_title">180 derece</string>
   <string name="display_rotation_270_title">270 derece</string>
   <!-- LiveDisplay -->
-  <string name="live_display_summary">Okunabilirliği artırmak ve göz yorgunluğu azaltmak için gün ve ortam koşulları zamanına bağlı olarak ekranı iyileştirir</string>
+  <string name="live_display_summary">Ekranınızı, okunabilirliği artırmak ve göz yorgunluğunu azaltmak için günün saatine ve ortam koşullarına göre optimize edin</string>
   <string name="live_display_mode">Görüntü modu</string>
   <string name="live_display_color_temperature_title">Renk sıcaklığı</string>
   <string name="live_display_color_temperature_summary">Gündüz: <xliff:g id="day_temperature">%1$d</xliff:g>K Gece: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
@@ -629,7 +629,7 @@
   <string name="ime_switcher_notify">Seçici simgesi</string>
   <string name="ime_switcher_notify_summary">Giriş yöntemi seçici simgesini görüntüle</string>
   <!-- Heads up -->
-  <string name="heads_up_notifications">Bildirim Pencereleri</string>
+  <string name="heads_up_notifications">Bildirim pencereleri</string>
   <string name="summary_heads_up_enabled">Açılır bildirimler etkinleştirildi</string>
   <string name="summary_heads_up_disabled">Açılır bildirimler devre dışı bırakıldı</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
@@ -788,7 +788,7 @@
   <string name="notification_ringtone_title_cm">Bildirim sesi</string>
   <!-- Advanced reboot options -->
   <string name="advanced_reboot_title">Gelişmiş yeniden başlatma</string>
-  <string name="advanced_reboot_summary">Kilitli değilken; kapatma menüsüne, kurtarma kipi, ön yükleyici ve yazılımsal yeniden başlatma seçeneklerini dahil et</string>
+  <string name="advanced_reboot_summary">Kilitli değilken; kapatma menüsüne, kurtarma modu, ön yükleyici ve yazılımsal yeniden başlatma seçeneklerini dahil et</string>
   <string name="category_interface">Arayüz</string>
   <!-- Expanded desktop -->
   <string name="power_menu_expanded_desktop">Genişletilmiş Masaüstü</string>
@@ -824,20 +824,20 @@
   <string name="blacklist_empty_text">Hiç engellenmiş numara yok. Ekle (+) tuşuna dokunarak yeni bir numara ekleyin.</string>
   <string name="blacklist_disabled_empty_text">Telefon numaralarının sizi aramasını ya da size mesaj atmasını engellemek için, engelli arayan listesini etkinleştirin.</string>
   <string name="blacklist_summary_disabled">Devre dışı</string>
-  <string name="blacklist_summary">Engelli arayan listesindeki numaralardan gelen çağrıları ya da mesajları almayacaksınız</string>
+  <string name="blacklist_summary">Engelli arayan listesindeki numaralardan gelen aramaları ya da mesajları almayacaksınız</string>
   <string name="blacklist_notify">Bildirim göster</string>
   <string name="blacklist_private_numbers_title">Özel numaralar</string>
-  <string name="blacklist_private_numbers_summary_disabled">Özel numaralardan gelen çağrıları engelleme</string>
+  <string name="blacklist_private_numbers_summary_disabled">Özel numaralardan gelen aramaları engelleme</string>
   <string name="blacklist_private_numbers_summary">Özel numaralardan gelen <xliff:g id="type">%s</xliff:g> engelle</string>
   <string name="blacklist_unknown_numbers_title">Bilinmeyen numaralar</string>
-  <string name="blacklist_unknown_numbers_summary_disabled">Kişi listesinde olmayan numaralardan gelen çağrıları engelleme</string>
+  <string name="blacklist_unknown_numbers_summary_disabled">Kişi listesinde olmayan numaralardan gelen aramaları engelleme</string>
   <string name="blacklist_unknown_numbers_summary">Kişi listesinde olmayan numalardan gelen <xliff:g id="type">%s</xliff:g> engelle</string>
-  <string name="blacklist_summary_type_calls_only">çağrılar</string>
+  <string name="blacklist_summary_type_calls_only">aramalar</string>
   <string name="blacklist_summary_type_messages_only">mesajlar</string>
-  <string name="blacklist_summary_type_calls_and_messages">çağrı ve mesajlar</string>
+  <string name="blacklist_summary_type_calls_and_messages">arama ve mesajlar</string>
   <string name="blacklist_regex_title">Joker karakter kullan</string>
   <string name="blacklist_regex_summary">Herhangi bir karakter için . ve tekrarlama için * kullanın. Örneğin 123.* 123 ile başlayan tüm numaraları engellerken .*123.* 123 içeren tüm numaraları engeller.</string>
-  <string name="blacklist_policy_block_calls">Gelen çağrıları engelle</string>
+  <string name="blacklist_policy_block_calls">Gelen aramaları engelle</string>
   <string name="blacklist_policy_block_messages">Gelen mesajları engelle</string>
   <string name="blacklist_bad_number_add">Geçersiz telefon numaraları engellenen arayan listesine eklenemez</string>
   <!-- Blacklist management -->
@@ -912,7 +912,7 @@
   <string name="category_misc">Çeşitli</string>
   <string name="title_general">Genel</string>
   <string name="advanced">Gelişmiş</string>
-  <string name="link_volume_option_title">Zil sesi ile bildirim sesi düzeyini bağla</string>
+  <string name="link_volume_option_title">Zil ve bildirim sesi düzeyini bağla</string>
   <string name="lcd_density_prompt_message">Bazı uygulamalar standart dışı DPI\'lerde çalışmayabilir.\n\nBu telefonunuzu yeniden başlatacaktır.</string>
   <!-- Edit access point labels: PPP number -->
   <string name="apn_ppp_number">APN PPP telefon numarası</string>
@@ -954,7 +954,7 @@
   <!-- Allow vibration in zen mode -->
   <string name="zen_mode_vibration">Titreşim</string>
   <string name="zen_mode_vibration_never">Titreşim yok</string>
-  <string name="zen_mode_vibration_calls_only">Sadece çağrılarda titret</string>
+  <string name="zen_mode_vibration_calls_only">Sadece aramalarda titret</string>
   <string name="zen_mode_vibration_calls_and_notifications">Arama ve bildirimlerde titret</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index d2dd2390d..fdf1948d2 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -489,7 +489,7 @@
   <string name="hardware_keys_action_launch_camera">啟動相機</string>
   <string name="hardware_keys_action_sleep">關閉螢幕</string>
   <string name="hardware_keys_action_last_app">最後一個應用程式</string>
-  <string name="camera_sleep_on_release_title">窺視螢幕</string>
+  <string name="camera_sleep_on_release_title">預覽螢幕</string>
   <string name="camera_sleep_on_release_summary">僅有當按住按鍵時，半按鍵即可保持螢幕開啟。</string>
   <string name="camera_launch_title">開啟相機</string>
   <string name="camera_launch_summary">按住並放開將會啟動相機</string>
@@ -551,7 +551,7 @@
   <string name="double_tap_to_sleep_summary">輕觸兩次狀態列來關閉螢幕</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">防止意外喚醒</string>
-  <string name="proximity_wake_summary">手勢觸發喚醒前檢查接近感應器</string>
+  <string name="proximity_wake_summary">手勢觸發喚醒前檢查距離感應器</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">接上或移除電源時喚醒</string>
   <string name="wake_when_plugged_or_unplugged_summary">接上或拔除電源時開啟螢幕</string>
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index bbb8c149c..59fcbed2f 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -36,6 +36,7 @@ import android.os.Bundle;
 import android.os.UserHandle;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -83,7 +84,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase
 
     // If an account type is set, then show only accounts of that type
     private String mAccountType;
-    // Temporary hack, to deal with backward compatibility 
+    // Temporary hack, to deal with backward compatibility
     // mFirstAccount is used for the injected preferences
     private Account mFirstAccount;
 
@@ -438,15 +439,18 @@ public class ManageAccountsSettings extends AccountPreferenceBase
     }
 
     /**
-     * Filters through the preference list provided by GoogleLoginService.
+     * Recursively filters through the preference list provided by GoogleLoginService.
      *
      * This method removes all the invalid intent from the list, adds account name as extra into the
      * intent, and hack the location settings to start it as a fragment.
      */
-    private void updatePreferenceIntents(PreferenceScreen prefs) {
+    private void updatePreferenceIntents(PreferenceGroup prefs) {
         final PackageManager pm = getActivity().getPackageManager();
         for (int i = 0; i < prefs.getPreferenceCount();) {
             Preference pref = prefs.getPreference(i);
+            if (pref instanceof PreferenceGroup) {
+                updatePreferenceIntents((PreferenceGroup) pref);
+            }
             Intent intent = pref.getIntent();
             if (intent != null) {
                 // Hack. Launch "Location" as fragment instead of as activity.
@@ -495,8 +499,8 @@ public class ManageAccountsSettings extends AccountPreferenceBase
                                 } else {
                                     Log.e(TAG,
                                             "Refusing to launch authenticator intent because"
-                                            + "it exploits Settings permissions: "
-                                            + prefIntent);
+                                            	    + "it exploits Settings permissions: "
+                                            	    + prefIntent);
                                 }
                                 return true;
                             }
@@ -516,20 +520,26 @@ public class ManageAccountsSettings extends AccountPreferenceBase
     private boolean isSafeIntent(PackageManager pm, Intent intent) {
         AuthenticatorDescription authDesc =
                 mAuthenticatorHelper.getAccountTypeDescription(mAccountType);
-        ResolveInfo resolveInfo = pm.resolveActivity(intent, 0);
+        ResolveInfo resolveInfo =
+            pm.resolveActivityAsUser(intent, 0, mUserHandle.getIdentifier());
         if (resolveInfo == null) {
             return false;
         }
         ActivityInfo resolvedActivityInfo = resolveInfo.activityInfo;
         ApplicationInfo resolvedAppInfo = resolvedActivityInfo.applicationInfo;
         try {
+            if (resolvedActivityInfo.exported) {
+                if (resolvedActivityInfo.permission == null) {
+                    return true; // exported activity without permission.
+                } else if (pm.checkPermission(resolvedActivityInfo.permission,
+                        authDesc.packageName) == PackageManager.PERMISSION_GRANTED) {
+                    return true;
+                }
+            }
             ApplicationInfo authenticatorAppInf = pm.getApplicationInfo(authDesc.packageName, 0);
-            return resolvedActivityInfo.exported
-                    || resolvedAppInfo.uid == authenticatorAppInf.uid;
+            return  resolvedAppInfo.uid == authenticatorAppInf.uid;
         } catch (NameNotFoundException e) {
-            Log.e(TAG,
-                    "Intent considered unsafe due to exception.",
-                    e);
+            Log.e(TAG, "Intent considered unsafe due to exception.", e);            
             return false;
         }
     }