diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bccc77c..fa49406 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -41,6 +41,7 @@
   <string name="other_services_summary">Diese Dienste werden von Google zur Verfügung gestellt und können jederzeit aktiviert oder deaktiviert werden. Die Daten werden in Übereinstimmung mit Googles <xliff:g id="name" example="Privacy Policy">%s</xliff:g> genutzt.</string>
   <string name="location_services_summary">Standortdienste erlauben es Systemapps oder Apps von Drittanbietern Daten, wie z. B. Ihren ungefähren Standort zu bestimmen und zu verwenden. Zum Beispiel könnte eine App Ihren ungefähren Standort verwenden, um Cafés in der Nähe zu finden.</string>
   <string name="location_access_summary"><b>Erlaubt Apps, die nach Ihrer Berechtigung gefragt haben,</b> Standortinformationen zu verwenden. Diese können Ihren derzeitigen und vergangenen Standort beinhalten.</string>
+  <string name="location_battery_saving"><b>Akkuverbrauch verringern</b>, indem die Aktualisierungsrate ihres Standortes beschränkt wird.</string>
   <string name="location_network"><b>WLAN nutzen</b>, um Apps zu helfen, Ihren Standort zu ermitteln.</string>
   <string name="location_network_telephony"><b>WLAN und mobiles Netzwerk aktivieren</b>, um Apps den Standortabruf zu ermöglichen.</string>
   <string name="location_network_gms"><b>Googles Standortdienst verwenden</b>, um Apps bei der Bestimmung Ihrer Position zu helfen. Das bedeutet, dass anonymisierte Standortdaten an Google gesendet werden, auch wenn keine App aktiv ist.</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0801d0f..317ae20 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -41,6 +41,7 @@
   <string name="other_services_summary">These services put Google to work for you, and you can turn them on or off at any time. Data will be used in accordance with Google\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
   <string name="location_services_summary">Location services allows system and third party apps to gather and use data such as your approximate location. For example, an app may use your approximate location to locate nearby coffee shops.</string>
   <string name="location_access_summary"><b>Allow apps that have asked your permission</b> to use your location information. This may include your current location and past locations.</string>
+  <string name="location_battery_saving"><b>Reduce battery consumption</b> by restricting the number of GPS updates per hour.</string>
   <string name="location_network"><b>Use Wi-Fi</b> to help apps determine your location.</string>
   <string name="location_network_telephony"><b>Use Wi-Fi and mobile networks</b> to help apps determine your location.</string>
   <string name="location_network_gms"><b>Use Google\'s location service</b> to help apps determine your location. This means sending anonymous location data to Google, even when no apps are running.</string>
@@ -57,8 +58,22 @@
   <string name="services_explanation" product="default">These services work for you to extend the capabilities of your phone. Data will be used in accordance with Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
   <string name="services_privacy_policy">Privacy Policy</string>
   <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> by automatically sending diagnostic and usage data to Cyanogen. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> features.</string>
   <string name="services_apply_theme">Apply the <xliff:g id="name" example="Material">%s</xliff:g> theme</string>
   <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> enabling unique icons, wallpapers, and fonts.</string>
   <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
   <string name="services_use_secure_sms">Use secure SMS</string>
+  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> to encrypt SMS conversations with other users using secure SMS on a <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> device.</string>
+  <string name="setup_unlock">Unlock</string>
+  <string name="setup_device_locked">This device has been locked by the user.</string>
+  <string name="setup_require_cyanogen_label"><b>Require your Cyanogen OS account password</b> in order to use your device even after a factory reset.</string>
+  <string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings &gt; Security</i></string>
+  <string name="setup_warning_skip_anyway">Without a Cyanogen OS Account, you won\'t be able to:\n\nCustomize your phone with new icons, wallpapers and more in the Themes app\n\nLocate or remotely erase your phone if it\'s lost</string>
+  <string name="settings_fingerprint_setup_title">Select backup screen lock type</string>
+  <string name="settings_fingerprint_setup_details">How would you like to lock your screen?</string>
+  <string name="fingerprint_setup_title">Fingerprint setup</string>
+  <string name="fingerprint_setup_summary">To use your fingerprint sensor to unlock your screen, you\'ll need to:</string>
+  <string name="fingerprint_setup_backup_lock_method">Setup a secondary unlock method</string>
+  <string name="fingerprint_setup_add_fingerprint">Add your fingerprint</string>
+  <string name="fingerprint_setup_screen_lock_setup">Setup screen lock</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2c01d8b..77c6bd3 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -22,6 +22,7 @@
   <string name="start">Iniciar</string>
   <string name="ok">Aceptar</string>
   <string name="loading">Un segundo\u2026</string>
+  <string name="setup_complete">Configuración completada</string>
   <string name="setup_welcome">¡Bienvenido/a!</string>
   <string name="setup_wifi">Selecciona una red Wi-Fi</string>
   <string name="setup_sim_missing">Falta la tarjeta SIM</string>
@@ -30,6 +31,7 @@
   <string name="setup_other">Otros servicios</string>
   <string name="setup_datetime">Fecha y hora</string>
   <string name="setup_current_date">Fecha actual</string>
+  <string name="setup_current_time">Hora actual</string>
   <string name="sim_missing_summary" product="tablet">No se ha detectado una tarjeta SIM en el tablet. Para insertar una tarjeta SIM, lee las instrucciones que vienen con el tablet.</string>
   <string name="sim_missing_summary" product="default">No se ha detectado una tarjeta SIM en el teléfono. Para insertar una tarjeta SIM, lee las instrucciones que vienen con el teléfono.</string>
   <string name="choose_data_sim_summary" product="tablet">¿Qué tarjeta SIM quieres utilizar para los datos? La tarjeta SIM seleccionada puede incurrir en cargos de red ya que se utilizará para configurar el tablet.</string>
@@ -42,6 +44,7 @@
   <string name="location_battery_saving"><b>Reducir consumo de batería</b> al restringir el número de actualizaciones GPS por hora.</string>
   <string name="location_network"><b>Uso de Wi-Fi</b> para ayudar a que las aplicaciones determinen tu ubicación.</string>
   <string name="location_network_telephony"><b>Utiliza Wi-Fi y redes móviles</b> para ayudar a que las aplicaciones determinen tu ubicación.</string>
+  <string name="location_network_gms"><b>Uso del servicio de localización de Google</b> para ayudar a las aplicaciones a determinar tu ubicación. Esto significa enviar información anónima de la localización a Google, incluso cuando no haya aplicaciones usando este servicio.</string>
   <string name="setup_mobile_data">Activar datos móviles</string>
   <string name="setup_mobile_data_no_service">Sin servicio</string>
   <string name="setup_mobile_data_emergency_only">Solo llamadas de emergencia</string>
@@ -49,19 +52,28 @@
   <string name="no">No</string>
   <string name="yes">Sí</string>
   <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
+  <string name="emergency_call">Llamada de emergencia</string>
   <string name="setup_services">Características de Cyanogen</string>
   <string name="services_explanation" product="tablet">Estos servicios sirven para extender las capacidades del tablet. Se utilizarán datos de acuerdo a la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string>
   <string name="services_explanation" product="default">Estos servicios sirven para extender las capacidades del teléfono. Se utilizarán datos de acuerdo a la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string>
   <string name="services_privacy_policy">Política de Privacidad</string>
+  <string name="services_help_improve_cm">Ayuda a mejorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> enviando automáticamente diagnósticos de depuración y uso de datos a Cyanogen. Esta información no puede ser utilizada para identificarte, y sirve para ayudar a mejorar la vida de la batería, el rendimiento de la aplicación y el desarrollo de nuevas características desarrolladas por <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">Aplicar el tema <xliff:g id="name" example="Material">%s</xliff:g></string>
   <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> activando iconos especiales, fondos de pantalla y tipos de letra.</string>
   <string name="services_os_nav_keys_label"><b>Usar las teclas de navegación en pantalla</b> en vez de las teclas físicas.</string>
+  <string name="services_use_secure_sms">Usar SMS seguros</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> para encriptar conversaciones SMS con otros usuarios utilizando SMS seguros en un dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="setup_unlock">Desbloquear</string>
   <string name="setup_device_locked">Este dispositivo ha sido bloqueado por el usuario.</string>
+  <string name="setup_require_cyanogen_label"><b>Se requiere la contraseña de tu cuenta Cyanogen OS</b> para poder utilizar el dispositivo incluso después de un restablecimiento de fábrica.</string>
+  <string name="setup_device_locked_instructions"><i>Para activar o desactivar esta función, ve a Ajustes &gt; Seguridad</i></string>
   <string name="setup_warning_skip_anyway">Sin una cuenta de Cyanogen OS no podrás:\n\nPersonalizar tu teléfono con nuevos iconos, fondos de pantalla y mucho más a través de la aplicación de temas\n\nBorrar tu teléfono localmente o de manera remota si se ha perdido</string>
   <string name="settings_fingerprint_setup_title">Selecciona el tipo de copia de seguridad de pantalla de bloqueo</string>
+  <string name="settings_fingerprint_setup_details">¿Cómo quieres bloquear tu pantalla?</string>
+  <string name="fingerprint_setup_title">Ajustes de huella digital</string>
   <string name="fingerprint_setup_summary">Para utilizar el sensor de huella digital para desbloquear la pantalla, necesitarás:</string>
-  <string name="fingerprint_setup_backup_lock_method">Configurar un método secundario de desbloqueo</string>
+  <string name="fingerprint_setup_backup_lock_method">Establecer un método secundario de desbloqueo</string>
+  <string name="fingerprint_setup_add_fingerprint">Añade tu huella digital</string>
+  <string name="fingerprint_setup_screen_lock_setup">Ajustes de pantalla de bloqueo</string>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 709f127..5f0629e 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -18,4 +18,52 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="app_name">Asistente de configuración</string>
   <string name="next">Seguinte</string>
+  <string name="skip">Omitir</string>
+  <string name="start">Comezar</string>
+  <string name="ok">Aceptar</string>
+  <string name="loading">Só un seg.\u2026</string>
+  <string name="setup_complete">A configuración está completa</string>
+  <string name="setup_welcome">Dámoslle a benvida</string>
+  <string name="setup_wifi">Escolle rede Wi-Fi</string>
+  <string name="setup_sim_missing">Falta a tarxeta SIM</string>
+  <string name="setup_choose_data_sim">Escolle unha SIM para datos</string>
+  <string name="setup_location">Servizos de localización</string>
+  <string name="setup_other">Outros servizos</string>
+  <string name="setup_datetime">Data e hora</string>
+  <string name="setup_current_date">Data actual</string>
+  <string name="setup_current_time">Hora actual</string>
+  <string name="sim_missing_summary" product="tablet">Non se detectou a tarxeta SIM na túa tableta. Para inserila, le as instrucións que veñen co dispositivo.</string>
+  <string name="sim_missing_summary" product="default">Non se detectou a tarxeta SIM no teu teléfono. Para inserila, le as instrucións que veñen co dispositivo.</string>
+  <string name="choose_data_sim_summary" product="tablet">Que SIM quere utilizar para datos? A tarxeta SIM elixida podería incorrer en cargos adicionais e utilizarase para configurar a súa tableta.</string>
+  <string name="choose_data_sim_summary" product="default">Que SIM quere utilizar para datos? A tarxeta SIM elixida podería incorrer en cargos adicionais e utilizarase para configurar o seu teléfono.</string>
+  <string name="date_time_summary">Configure a súa zona horaria e axuste a hora e data se é preciso</string>
+  <string name="backup_data_summary"><b>Garda copia</b> dos datos de aplicacións, contrasinais Wi-Fi e outras configuracións nos servidores de Google</string>
+  <string name="other_services_summary">Estes servizos fan que Google traballe para vostede e pode desactivalos ou activalos cando queira. Os datos utilizaranse de acordo coa<xliff:g id="name" example="Política de privacidade">%s</xliff:g> de Google.</string>
+  <string name="location_services_summary">Os servizos de localización permítenlle ao sistema e a aplicacións de terceiros reunir e utilizar datos como a súa localización aproximada. Por exemplo, unha aplicación pode utilizar a localización aproximada para determinar as cafetarías próximas.</string>
+  <string name="location_access_summary"><b>Permite que as aplicacións se teñen o teu permiso</b> utilicen a información sobre a túa localización, o que pode incluír á presente e ás pasadas.</string>
+  <string name="location_network"><b>Utiliza a Wi-Fi</b> para axudar as aplicacións a determinar a súa localización.</string>
+  <string name="location_network_telephony"><b>Utiliza a Wi-Fi e redes móbiles</b> para axudar as aplicacións a determinar a súa localización.</string>
+  <string name="location_network_gms"><b>Utiliza o servizo de localización de Google</b> para axudar a determinar a súa localización.</string>
+  <string name="setup_mobile_data">Activar os datos móbiles</string>
+  <string name="setup_mobile_data_no_service">Sen servizo</string>
+  <string name="setup_mobile_data_emergency_only">Só chamadas de urxencia</string>
+  <string name="enable_mobile_data_summary">Quere empregar os datos móbiles durante a instalación? Activalos pode estar suxeito a cargos na tarifa de datos.</string>
+  <string name="no">Non</string>
+  <string name="yes">Si</string>
+  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
+  <string name="emergency_call">Chamada de emerxencia</string>
+  <string name="setup_services">Características do Cyanogen</string>
+  <string name="services_explanation" product="tablet">Estes servizos serven para mellorar as capacidades da súa tableta. Os datos utilizaranse de acordo coa <xliff:g id="name" example="Política de privacidade">%s</xliff:g> de Cyanogen.</string>
+  <string name="services_explanation" product="default">Estes servizos serven para mellorar as capacidades do seu teléfono. Os datos utilizaranse de acordo coa <xliff:g id="name" example="Política de privacidade">%s</xliff:g> de Cyanogen.</string>
+  <string name="services_privacy_policy">Política de privacidade</string>
+  <string name="services_help_improve_cm">Axuda a mellorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Axuda a mellorar CyanogenMod">%1$s</xliff:g> enviando automaticamente diagnóstico e uso de datos a Cyanogen. Esta información non se pode utilizar para identificalo a vostede e acaba nas mans dos equipos que traballan en cousas como a duración da batería, rendemento das aplicacións e novas características de <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
+  <string name="services_apply_theme">Aplicar o tema <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Aplicar o tema Material">%s</xliff:g> activando as iconas, fondos de pantalla e tipos de letra.</string>
+  <string name="services_os_nav_keys_label"><b>Usar as teclas de navegación</b> en vez das do hardware.</string>
+  <string name="services_use_secure_sms">Empregar SMS seguras</string>
+  <string name="services_secure_sms_label"><xliff:g id="name" example="Utilizar SMS seguras">%1$s</xliff:g> para cifrar conversas por SMS con outros usuarios utilizando SMS seguras nun dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
+  <string name="setup_unlock">Desbloquear</string>
+  <string name="setup_device_locked">Este dispositivo foi bloqueado polo usuario.</string>
+  <string name="setup_require_cyanogen_label"><b>Precísase o seu contrasinal do SO Cyanogen</b> para poder utilizar o seu dispositivo mesmo tras unha restauración de fábrica.</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
new file mode 100644
index 0000000..c35cf43
--- /dev/null
+++ b/res/values-hr/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="app_name">Čarobnjak za postavljanje</string>
+  <string name="next">Sljedeći</string>
+  <string name="skip">Preskoči</string>
+  <string name="start">Početak</string>
+  <string name="ok">U redu</string>
+  <string name="loading">Samo sec\u2026</string>
+  <string name="setup_complete">Postavljanje je završeno</string>
+  <string name="setup_welcome">Dobrodošli</string>
+  <string name="setup_wifi">Odaberite Wi-Fi</string>
+  <string name="setup_sim_missing">Nedostaje SIM kartica</string>
+  <string name="setup_choose_data_sim">Odaberite SIM za podatke</string>
+  <string name="setup_location">Lokacijske usluge</string>
+  <string name="setup_other">Ostale usluge</string>
+  <string name="setup_datetime">Datum i vrijeme</string>
+  <string name="setup_current_date">Današnji datum</string>
+  <string name="setup_current_time">Trenutno vrijeme</string>
+  <string name="date_time_summary">Postavite vremensku zonu i ako je potrebno prilagoditi trenutni datum i vrijeme</string>
+  <string name="location_battery_saving"><b>Smanji potrošnju baterije</b> ograničavanjem GPS ažuriranja po satu.</string>
+  <string name="setup_mobile_data">Uključite mobilne podatke</string>
+  <string name="setup_mobile_data_no_service">Nema usluge</string>
+  <string name="setup_mobile_data_emergency_only">Samo hitni pozivi</string>
+  <string name="enable_mobile_data_summary">Želite li koristiti mobilne podatke tijekom postavljanja? Uključieni mobilni podaci mogu napraviti troškove.</string>
+  <string name="no">Ne</string>
+  <string name="yes">Da</string>
+  <string name="data_sim_name">SIM <xliff:g id="sub">%d </xliff:g> - <xliff:g id="name">%s </xliff:g></string>
+  <string name="emergency_call">Hitan poziv</string>
+  <string name="setup_services">Cijanogen značajke</string>
+  <string name="services_help_improve_cm">Pomozite poboljšati <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
+  <string name="setup_unlock">Otključaj</string>
+</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5e08f2a..c0defb1 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -41,6 +41,7 @@
   <string name="other_services_summary">Ezek a szolgáltatások az Ön szolgálatába állítják a Google-t, amit bármikor ki- vagy bekapcsolhat. Az adatok felhasználása a Google <xliff:g id="name" example="Privacy Policy">%s</xliff:g> alapján történik.</string>
   <string name="location_services_summary">A helymeghatározási szolgáltatások engedélyezni fogják a rendszer és más harmadik féltől származó alkalmazások számára az adatok összegyűjtését és használatát a pozíciója pontosításához. Például egy alkalmazás a becsült helyzetét fogja használni a közeli kávézók meghatározásához.</string>
   <string name="location_access_summary"><b>Lehetővé teszi az alkalmazás számára, amely korábban engedélyt kért,</b> a helymeghatározási információ használatára. Beleértve a jelenlegi és a korábbi helyeket.</string>
+  <string name="location_battery_saving"><b>Akkumulátor fogyasztás csökkentése</b> a GPS óránkénti frissítés számának korlátozásával.</string>
   <string name="location_network"><b>Wi-Fi használata</b> segítse az alkalmazásokat a helymeghatározásával.</string>
   <string name="location_network_telephony"><b>Wi-Fi és mobil hálózatok használata</b> segítse az alkalmazásokat a helymeghatározásával.</string>
   <string name="location_network_gms"><b>A Google helymeghatározó szolgáltatás használata</b> az alkalmazások helymeghatározásának segítésére. Ez névtelen helyadatok Google felé történő küldését jelenti, még akkor is, ha nincs futó alkalmazás.</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 776c920..9af85ee 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -41,6 +41,7 @@
   <string name="other_services_summary">Disse tjenestene lar Google jobbe for deg, og du kan slå dem på eller av når som helst. Data brukes i henhold til Googles <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
   <string name="location_services_summary">Lokasjonstjenester lar system og 3.parts apper å samle inn og bruke data som din omtrentlige posisjon. For eksempel, en app kan bruke din omtrentlige posisjon til å finne nærliggende kafeer.</string>
   <string name="location_access_summary"><b>Tillat programmer som har bedt om din tillatelse</b> å bruke stedsinformasjonen. Dette kan være din nåværende posisjon og siste steder.</string>
+  <string name="location_battery_saving"><b>Redusere batteriforbruket</b> ved å begrense antall GPS oppdateringer per time.</string>
   <string name="location_network"><b>Bruk Wi-Fi</b> for å hjelpe apper å finne din posisjon.</string>
   <string name="location_network_telephony"><b>Bruk Wi-Fi og mobile nettverk</b> for å hjelpe apper å finne din posisjon.</string>
   <string name="location_network_gms"><b>Bruk Googles lokasjonstjeneste</b> for å hjelpe apps finne din posisjon. Dette betyr å sende anonym stedsinformasjon til Google, selv når ingen programmer kjører.</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 13f9197..9a43768 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -41,6 +41,7 @@
   <string name="other_services_summary">Deze diensten laten Google het werk doen en kunnen op elk moment in- of uitgeschakeld worden. De gegevens worden gebruikt conform de <xliff:g id="name" example="Privacy Policy">%s</xliff:g> van Google.</string>
   <string name="location_services_summary">Locatieservices stellen systeemapps en apps van derde partijen in staat gegevens zoals uw geschatte locatie te verzamelen en te gebruiken. Zo kan een app uw locatie gebruiken om winkels in de buurt te vinden.</string>
   <string name="location_access_summary"><b>Apps toestaan die uw toestemming hebben gevraagd</b> om informatie over uw locatie te gebruiken. Dit kan uw huidige locatie en voorgaande locaties omvatten.</string>
+  <string name="location_battery_saving"><b>Verlaag het accugebruik</b> door het aantal GPS-updates per uur te beperken.</string>
   <string name="location_network"><b>Wifi gebruiken</b> om apps te helpen uw locatie te bepalen.</string>
   <string name="location_network_telephony"><b>Wifi en mobiele netwerken gebruiken</b> om apps te helpen uw locatie te bepalen.</string>
   <string name="location_network_gms"><b>Locatieservices van Google gebruiken</b> om apps te helpen uw locatie te bepalen. Dit betekent anonieme locatiegegevens verzenden naar Google, zelfs wanneer er geen apps worden uitgevoerd.</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index ab16f75..cf58cd6 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -41,6 +41,7 @@
   <string name="other_services_summary">Esses serviços colocam o Google para trabalhar para você, e você pode desligá-los a qualquer momento. Os dados serão usados de acordo com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> do Google.</string>
   <string name="location_services_summary">Serviços de localização permitem ao sistema e aplicativos de terceiros a obter e usar dados como a sua localização aproximada. Por exemplo, um aplicativo pode usar sua localização aproximada para localizar cafeterias perto de você.</string>
   <string name="location_access_summary"><b>Permitir aplicativos que pediram a sua permissão</b> para usar as suas informações de localização. Isso pode incluir a sua localização atual bem como localizações anteriores.</string>
+  <string name="location_battery_saving"><b>Reduzir o consumo da bateria</b>, restringindo o número de atualizações GPS por hora.</string>
   <string name="location_network"><b>Usar Wi-Fi</b> para ajudar aplicativos a determinarem a sua localização.</string>
   <string name="location_network_telephony"><b>Usar Wi-Fi e redes móveis</b> para ajudar aplicativos a determinarem a sua localização.</string>
   <string name="location_network_gms"><b>Usar o serviço de localização do Google</b> para ajudar os aplicativos a determinarem a sua localização. Isto significa o envio de dados de localização anônimos para o Google, mesmo quando nenhum aplicativo estiver aberto.</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0e8ff28..a6b23fd 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -18,8 +18,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="app_name">Assistente de configuração</string>
   <string name="next">Próximo</string>
-  <string name="skip">Pular</string>
-  <string name="start">Inicio</string>
+  <string name="skip">Saltar</string>
+  <string name="start">Início</string>
   <string name="ok">OK</string>
   <string name="loading">Um momento\u2026</string>
   <string name="setup_complete">A configuração está completa</string>
@@ -29,22 +29,22 @@
   <string name="setup_choose_data_sim">Escolha um SIM para os dados</string>
   <string name="setup_location">Serviços de localização</string>
   <string name="setup_other">Outros serviços</string>
-  <string name="setup_datetime">Data &amp; hora</string>
+  <string name="setup_datetime">Data e hora</string>
   <string name="setup_current_date">Data atual</string>
   <string name="setup_current_time">Hora atual</string>
   <string name="sim_missing_summary" product="tablet">Não foi detetado nenhum cartão SIM no seu tablet. Para inserir um cartão SIM, leia o manual de instruções que veio com o seu dispositivo.</string>
   <string name="sim_missing_summary" product="default">Não foi detetado nenhum cartão SIM no seu telefone. Para inserir um cartão SIM, leia o manual de instruções que veio com o seu dispositivo.</string>
   <string name="choose_data_sim_summary" product="tablet">Qual o cartão SIM que quer usar para os dados? O SIM selecionado pode incorrer em custos de rede adicionais, pois será usado para configurar o seu tablet.</string>
   <string name="choose_data_sim_summary" product="default">Qual o cartão SIM que quer usar para os dados? O SIM selecionado pode incorrer em custos de rede adicionais, pois será usado para configurar o seu telefone.</string>
-  <string name="date_time_summary">Defina o fuso horário e ajuste a hora e a data atual, se necessário</string>
+  <string name="date_time_summary">Defina o fuso horário e ajuste a hora e a data atuais, se necessário</string>
   <string name="backup_data_summary">Efetuar uma <b>cópia de segurança</b> dos dados das aplicações, palavras-passe de acesso de redes sem fios e outras definições para os servidores da Google</string>
   <string name="other_services_summary">Estes serviços colocam o Google a trabalhar para si, e pode ligá-los ou desligá-los a qualquer momento. Os dados serão utilizados em conformidade com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> do Google.</string>
   <string name="location_services_summary">Os serviços de localização permitem às aplicações de sistema e de terceiros reunir e utilizar dados tais como a sua localização aproximada. Por exemplo, uma aplicação pode usar a sua localização aproximada para localizar cafés ou bares nas proximidades.</string>
-  <string name="location_access_summary"><b>Permitir às aplicações que pediram a sua permissão</b> para usar as suas informações de localização. Isso pode incluir a sua localização atual bem como localizações anteriores.</string>
+  <string name="location_access_summary"><b>Permitir que as aplicações que pediram a sua permissão</b> usem as suas informações de localização. Isso pode incluir a sua localização atual bem como localizações anteriores.</string>
   <string name="location_battery_saving"><b>Reduzir o consumo da bateria</b>, restringindo o número de atualizações GPS por hora.</string>
-  <string name="location_network"><b>Usar Wi-Fi</b> para ajudar as aplicações a determinar a sua localização.</string>
-  <string name="location_network_telephony"><b>Usar Wi-Fi e redes móveis</b> para ajudar as aplicações a determinar a sua localização.</string>
-  <string name="location_network_gms"><b>Usar o serviço de localização do Google</b> para ajudar as aplicações a determinar a sua localização. Isto significa o envio de dados de localização anónimos para o Google, mesmo quando nenhuma aplicação estiver a funcionar.</string>
+  <string name="location_network"><b>Usar o Wi-Fi</b> para ajudar as aplicações a determinar a sua localização.</string>
+  <string name="location_network_telephony"><b>Usar o Wi-Fi e redes móveis</b> para ajudar as aplicações a determinar a sua localização.</string>
+  <string name="location_network_gms"><b>Usar o serviço de localização do Google</b> para ajudar as aplicações a determinar a sua localização. Isto implica o envio de dados anónimos de localização para o Google, mesmo quando nenhuma aplicação estiver a funcionar.</string>
   <string name="setup_mobile_data">Ligar os dados móveis</string>
   <string name="setup_mobile_data_no_service">Sem serviço</string>
   <string name="setup_mobile_data_emergency_only">Apenas chamadas de emergência</string>
@@ -52,28 +52,28 @@
   <string name="no">Não</string>
   <string name="yes">Sim</string>
   <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
-  <string name="emergency_call">Chamadas de emergência</string>
-  <string name="setup_services">Recursos Cyanogen</string>
+  <string name="emergency_call">Chamada de emergência</string>
+  <string name="setup_services">Funcionalidades Cyanogen</string>
   <string name="services_explanation" product="tablet">Estes serviços servem para ampliar os recursos do seu tablet. Os dados serão utilizados em conformidade com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> da Cyanogen.</string>
   <string name="services_explanation" product="default">Estes serviços servem para ampliar os recursos do seu telefone. Os dados serão utilizados em conformidade com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> da Cyanogen.</string>
-  <string name="services_privacy_policy">Política de privacidade</string>
+  <string name="services_privacy_policy">Política de Privacidade</string>
   <string name="services_help_improve_cm">Ajude a melhorar a <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
-  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>  enviando automaticamente dados de diagnóstico e utilização para a Cyanogen. Esta informação não pode ser usada para o identificar mas ajudam as equipas de desenvolvimento a melhorar a duração da bateria, desempenho das aplicações e desenvolver novos recursos da  <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> enviando automaticamente dados de diagnóstico e utilização para a Cyanogen. Esta informação não pode ser usada para identificá-lo e ajuda as equipas de desenvolvimento a melhorarem coisas como a duração da bateria, o desempenho das aplicações e no desenvolvimento novos recursos para a <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">Aplicar o tema <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ativando ícones , imagens de fundo e tipos de letra únicos.</string>
-  <string name="services_os_nav_keys_label"><b>Usar os botões de navegação no ecrã</b>, em vez dos botões do dispositivo.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ativando ícones, imagens de fundo e tipos de letra únicos.</string>
+  <string name="services_os_nav_keys_label"><b>Usar os botões de navegação no ecrã</b> em vez dos botões do dispositivo.</string>
   <string name="services_use_secure_sms">Usar SMS seguras</string>
-  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> para encriptar conversações SMS com outros utilizadores que também utilizem este serviço num dispositivo com a <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
+  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> para encriptar conversações SMS com outros utilizadores que também utilizem este serviço num dispositivo com <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="setup_unlock">Desbloquear</string>
   <string name="setup_device_locked">Este dispositivo foi bloqueado pelo utilizador.</string>
   <string name="setup_require_cyanogen_label"><b>Exigir a palavra-passe da conta Cyanogen OS</b> para usar o dispositivo mesmo depois da reposição dos dados de fábrica.</string>
   <string name="setup_device_locked_instructions"><i>Para ativar ou desativar este recurso, por favor vá a Definições &gt; Segurança</i></string>
-  <string name="setup_warning_skip_anyway">\"Sem uma conta Cyanogen OS, não será capaz de: \n\nPersonalizar o telefone com novos ícones, imagens de fundo e muito mais na aplicação de Temas\n\n Localizar ou apagar remotamente o seu telefone se estiver perdido</string>
+  <string name="setup_warning_skip_anyway">Sem uma conta Cyanogen OS, não será capaz de: \n\nPersonalizar o telefone com novos ícones, imagens de fundo e muito mais na aplicação de Temas\n\nLocalizar ou apagar remotamente o seu telefone se estiver perdido</string>
   <string name="settings_fingerprint_setup_title">Selecione o tipo de bloqueio do ecrã da cópia de segurança</string>
   <string name="settings_fingerprint_setup_details">Como gostaria de bloquear o seu ecrã?</string>
   <string name="fingerprint_setup_title">Configuração de impressão digital</string>
   <string name="fingerprint_setup_summary">Para usar o seu sensor de impressão digital para desbloquear o ecrã, precisará de:</string>
-  <string name="fingerprint_setup_backup_lock_method">Defina um método de desbloqueio secundário</string>
-  <string name="fingerprint_setup_add_fingerprint">Adicione a sua impressão digital</string>
+  <string name="fingerprint_setup_backup_lock_method">Definir um método de desbloqueio secundário</string>
+  <string name="fingerprint_setup_add_fingerprint">Adicionar a sua impressão digital</string>
   <string name="fingerprint_setup_screen_lock_setup">Configuração do ecrã de bloqueio</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index bcc3b60..116110a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -41,6 +41,7 @@
   <string name="other_services_summary">Te storitve obremenijo Google in lahko jih vklopite ali izklopite kadarkoli. Podatki se bodo uporabljali v skladu s Googlovo <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
   <string name="location_services_summary">Lokacijske storitve omogočajo sistemu in programom tretjih oseb, da zbirajo in uporabijo podatke, kot je vaša približna lokacija. Program lahko na primer uporabi približno lokacijo za iskanje bližnjih kavarn.</string>
   <string name="location_access_summary"><b>Dovolite programom, ki so zahtevali vaše dovoljenje</b>, da uporabijo podatke o vaši lokaciji. To lahko vključuje vašo trenutno lokacijo in prejšnje.</string>
+  <string name="location_battery_saving"><b>Zmanjšajte porabo energije</b> z omejevanjem števila posodobitev GPS-a na uro.</string>
   <string name="location_network"><b>Uporabite Wi-Fi</b>, da pomagate programom določiti vašo lokacijo.</string>
   <string name="location_network_telephony"><b>Uporabite Wi-Fi in mobilna omrežja</b>, da pomagate programom določiti vašo lokacijo.</string>
   <string name="location_network_gms"><b>Uporabite Googlove lokacijske storitve</b>, da pomagate programom določiti vašo lokacijo. To pomeni pošiljanje anonimnih podatkov o lokaciji Googlu tudi, ko se ne izvaja noben program.</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index cf712ee..9911a77 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -16,9 +16,59 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">ชุดเครื่องมือการเปิดใช้งาน</string>
+  <string name="app_name">เปิดใช้ครั้งแรก</string>
+  <string name="next">ถัดไป</string>
+  <string name="skip">ข้าม</string>
+  <string name="start">เริ่มต้น</string>
+  <string name="ok">ตกลง</string>
+  <string name="loading">รอสักครู่\u2026</string>
+  <string name="setup_complete">การตั้งค่าเสร็จสมบูรณ์</string>
+  <string name="setup_welcome">ยินดีต้อนรับ</string>
+  <string name="setup_wifi">เลือก Wi-Fi</string>
+  <string name="setup_sim_missing">ไม่พบซิมการ์ด</string>
+  <string name="setup_choose_data_sim">เลือกซิมการ์ดสำหรับข้อมูล</string>
+  <string name="setup_location">บริการตำแหน่งที่ตั้ง</string>
+  <string name="setup_other">บริการอื่น ๆ</string>
+  <string name="setup_datetime">วัน &amp; เวลา</string>
+  <string name="setup_current_date">วันที่ปัจจุบัน</string>
+  <string name="setup_current_time">เวลาปัจจุบัน</string>
+  <string name="sim_missing_summary" product="tablet">ไม่พบซิมการ์ดในแท็บเล็ตของคุณ ในการใส่ซิมการ์ด ให้อ่านคำแนะนำที่มาพร้อมกับอุปกรณ์ของคุณ</string>
+  <string name="sim_missing_summary" product="default">ไม่พบซิมการ์ดในโทรศัพท์ของคุณ การใส่ซิมการ์ดให้อ่านคำแนะนำที่มาพร้อมกับอุปกรณ์</string>
+  <string name="choose_data_sim_summary" product="tablet">กรุณาเลือกซิมการ์ดที่ต้องการใช้ข้อมูล ซิมที่เลือกอาจมีค่าบริการเครือข่ายเนื่องจากซิมดังกล่าวจะใช้ในการตั้งค่าแท็บเล็ตของคุณ</string>
+  <string name="choose_data_sim_summary" product="default">กรุณาเลือกซิมการ์ดที่ต้องการใช้ข้อมูล ซิมที่เลือกอาจมีค่าบริการเครือข่าย เนื่องจากซิมดังกล่าวจะใช้ในการตั้งค่าโทรศัพท์ของคุณ</string>
+  <string name="date_time_summary">ตั้งค่าเขตเวลาและวันที่ของคุณหากคุณต้องการ</string>
+  <string name="backup_data_summary"><b>สำรอง</b>ข้อมูลแอป รหัสผ่าน Wi-Fi และการตั้งค่าอื่น ๆ ไปยังเซิร์ฟเวอร์ของ Google</string>
+  <string name="other_services_summary">บริการเหล่านี้ทำให้ Google ทำงานเพื่อคุณ คุณสามารถเปิดหรือปิดบริการเหล่านั้นได้เสมอ โดยจะใช้ข้อมูลตาม <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ของ Google</string>
+  <string name="location_services_summary">บริการตำแหน่งที่ตั้งอนุญาตให้ระบบและแอปบุคคลที่สามเก็บและใช้ข้อมูล เช่น ตำแหน่งที่ตั้งของคุณได้ เช่น แอปสามารถใช้ตำแหน่งที่ตั้งของคุณเพื่อหาร้านกาแฟใกล้เคียง</string>
+  <string name="location_access_summary"><b>อนุญาตให้แอปที่ขออนุญาต</b> ใช้ข้อมูลตำแหน่งที่ตั้งของคุณ ซึ่งอาจรวมถึงตำแหน่งที่ตั้งปัจจุบันและที่ผ่านมา</string>
+  <string name="location_battery_saving"><b>ลดปริมาณการใช้แบตเตอรี่</b> โดยการจำกัดจำนวนครั้งการใช้จีพีเอส</string>
+  <string name="location_network"><b>ใช้ Wi-Fi</b> เพื่อช่วยให้แอปหาตำแหน่งได้ง่ายขึ้น</string>
+  <string name="location_network_telephony"><b>ใช้ Wi-Fi และเครือข่ายมือถือ</b> เพื่อช่วยให้แอปหาตำแหน่งของคุณ</string>
+  <string name="location_network_gms"><b>ใช้บริการตำแหน่งที่ตั้งของ Google</b> เพื่อช่วยแอปหาตำแหน่งที่ตั้ง ซึ่งหมายรวมถึงการส่งข้อมูลตำแหน่งที่ตั้งแบบไม่ระบุตัวตนให้ Google แม้ในกรณีที่ไม่มีแอปใดทำงานอยู่ก็ตาม</string>
+  <string name="setup_mobile_data">เปิดใช้งานข้อมูลมือถือ</string>
+  <string name="setup_mobile_data_no_service">ไม่มีบริการ</string>
+  <string name="setup_mobile_data_emergency_only">โทรฉุกเฉินเท่านั้น</string>
+  <string name="enable_mobile_data_summary">ต้องการใช้เครือข่ายมือถือขณะตั้งค่าหรือไม่ การเปิดใช้ข้อมูลมือถืออาจมีค่าใช้จ่ายข้อมูลจากผู้ให้บริการ</string>
+  <string name="no">ไม่</string>
+  <string name="yes">ใช่</string>
+  <string name="data_sim_name">ซิม <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
+  <string name="emergency_call">โทรฉุกเฉิน</string>
+  <string name="setup_services">คุณสมบัติของ Cyanogen</string>
+  <string name="services_explanation" product="tablet">บริการเหล่านี้ทำงานเพื่อเพิ่มความสามารถให้แท็บเล็ตของคุณได้ ข้อมูลจะถูกใช้ตาม <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ของ Cyanogen</string>
+  <string name="services_explanation" product="default">บริการเหล่านี้ทำงานเพื่อขยายความสามารถของโทรศัพท์ของคุณได้ ข้อมูลจะถูกใช้ตาม <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ของ Cyanogen</string>
+  <string name="services_privacy_policy">นโยบายความเป็นส่วนตัว</string>
+  <string name="services_help_improve_cm">ช่วยปรับปรุง <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> ด้วยการส่งข้อมูลการวินิจฉัยและข้อมูลการใช้ให้กับ Cyanogen โดยอัตโนมัติ ข้อมูลนี้จะไม่สามารถนำไปใช้เพื่อระบุตัวตนของคุณและให้การช่วยเหลือทีมที่กำลังทำงานเกี่ยวกับช่วงอายุของแบตเตอร์รี่ ประสิทธิภาพการทำงานของแอพ และคุณสมบัติ <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ใหม่</string>
+  <string name="services_apply_theme">ใช้งานรูปแบบธีม <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> กำลังเปิดใช้งาน ไอคอน ภาพพื้นหลัง และแบบอักษรพิเศษ</string>
+  <string name="services_os_nav_keys_label"><b>ใช้แถบนำทาง</b> แทนการใช้ปุ่มบนอุปกรณ์</string>
+  <string name="services_use_secure_sms">ใช้ SMS แบบเข้ารหัส</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> เพื่อเข้ารหัสการสนทนาผ่าน SMS กับผู้ใช้คนอื่น ๆ โดยใช้ SMS แบบที่มีการเข้ารหัสบนอุปกรณ์ที่มี <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ติดตั้ง</string>
+  <string name="setup_unlock">ปลดล็อค</string>
+  <string name="setup_device_locked">อุปกรณ์นี้ถูกล็อคโดยผู้ใช้</string>
+  <string name="setup_require_cyanogen_label"><b>กรุณาใส่รหัสผ่านบัญชี Cyanogen OS</b> เพื่อใช่อุปกรณ์แม้ในกรณีหลังการคืนค่าโรงงานแล้วก็ตาม</string>
+  <string name="setup_device_locked_instructions"><i>เพื่อปิด/เปิดคุณสมบัตินี้ กรุณาไปที่ การตั้งค่า &gt; ความปลอดภัย</i></string>
+  <string name="setup_warning_skip_anyway">หากไม่มีบัญชี Cyanogen OS คุณจะไม่สามารถ:\n\nปรับแต่งโทรศัพท์โดยใช้ไอคอน ภาพหน้าจอใหม่ ๆ และคุณสมบัติอื่น ๆ เพิ่มเติมในแอปรูปแบบธีม\n\nค้นหาหรือลบข้อมูลระยะไกลหากอุปกรณ์สูญหาย</string>
   <string name="settings_fingerprint_setup_title">เลือกประเภทการล็อคหน้าจอสำรอง</string>
   <string name="settings_fingerprint_setup_details">คุณต้องการล็อคหน้าจอด้วยวิธีใด</string>
   <string name="fingerprint_setup_title">การตั้งค่าลายนิ้วมือ</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index bb569c6..027483f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -34,16 +34,17 @@
   <string name="setup_current_time">Şimdiki saat</string>
   <string name="sim_missing_summary" product="tablet">Tabletinizde bir SIM kart bulunamadı. SIM kart takmak için, cihazınız ile gelen talimatları okuyun.</string>
   <string name="sim_missing_summary" product="default">Telefonunuzda bir SIM kart bulunamadı. SIM kart takmak için, cihazınız ile gelen talimatları okuyun.</string>
-  <string name="choose_data_sim_summary" product="tablet">Hangi SIM\'i veri için kullanmak istiyorsunuz? Tabletinizin kurulumu için kullanılacağı için seçili SIM şebeke ücretlerine tabi olabilir.</string>
+  <string name="choose_data_sim_summary" product="tablet">Hangi SIM\'i veri için kullanmak istiyorsunuz? Seçili SIM, tabletinizin kurulumunda kullanılacağı için şebeke ücretlerine tabi olabilir.</string>
   <string name="choose_data_sim_summary" product="default">Hangi SIM\'i veri için kullanmak istiyorsunuz? Telefonunuzun kurulumu için kullanılacağı için seçili SIM şebeke ücretlerine tabi olabilir.</string>
   <string name="date_time_summary">Zaman diliminizi seçin ve gerekirse geçerli tarih ve saati ayarlayın</string>
-  <string name="backup_data_summary"><b>Uyg. verilerini, Wi-Fi şifrelerini ve diğer ayarları Google sunucularına yedekle</b></string>
+  <string name="backup_data_summary">Uygulama verilerini, Wi-Fi şifrelerini ve diğer ayarları Google sunucularına <b>yedekle</b></string>
   <string name="other_services_summary">Bu hizmetler ile Google sizin için çalışmaya başlar ve istediğiniz zaman açıp kapatabilirsiniz. Veriler Google\'ın <xliff:g id="name" example="Privacy Policy">%s</xliff:g>\'na uygun olarak kullanılacaktır.</string>
   <string name="location_services_summary">Konum servisleri sistem ve üçüncü taraf uygulamalara yaklaşık konumunuz gibi bilgileri toplama ve kullanma izni verir. Örneğin, bir uygulama yakındaki eğlence merkezlerini belirlemek için yaklaşık konumunuzu kullanabilir.</string>
   <string name="location_access_summary"><b>Konum bilginizi isteyen uygulamalara izin ver.</b> Bu geçerli konumunuzu ve geçmiş konumlarınızı içerebilir.</string>
-  <string name="location_network"><b>Wi-Fi\'yi kullanarak uygulamaların konumunuzu bulmanıza yardımcı olun.</b></string>
-  <string name="location_network_telephony"><b>Wi-Fi\'yi ve mobil şebekeleri kullanarak uygulamaların konumunuzu bulmanıza yardımcı olun.</b></string>
-  <string name="location_network_gms"><b>Konumunuzu belirlemek için Google konum servislerini kullanın.</b> Bu hiç uygulama çalışmıyorken bile isimsiz konum verilerinin Google\'a gönderilmesi demektir.</string>
+  <string name="location_battery_saving">Saatte yapılan GPS güncelleme sayısını kısıtlayarak <b>pil tüketimini azaltın</b>.</string>
+  <string name="location_network">Uygulamaların konumunuzu bulmanısına yardımcı olmak için <b>Wi-Fi\'yi kullanın</b>.</string>
+  <string name="location_network_telephony">Uygulamaların konumunuzu bulmasına yardımcı olmak için <b>Wi-Fi\'yi ve mobil şebekeleri kullanın</b>.</string>
+  <string name="location_network_gms">Konumunuzu belirlemek için <b>Google konum servislerini kullanın</b>. Bu, hiç uygulama çalışmıyorken bile isimsiz konum verilerinin Google\'a gönderilmesi demektir.</string>
   <string name="setup_mobile_data">Mobil veriyi aç</string>
   <string name="setup_mobile_data_no_service">Servis yok</string>
   <string name="setup_mobile_data_emergency_only">Sadece acil durum çağrıları</string>
@@ -54,20 +55,20 @@
   <string name="emergency_call">Acil durum çağrısı</string>
   <string name="setup_services">Cyanogen özellikleri</string>
   <string name="services_explanation" product="tablet">Bu hizmetler tabletinizin yeteneklerini arttırır. Veriler Cyanogen\'in <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ilkelerine uygun olarak kullanılacaktır.</string>
-  <string name="services_explanation" product="default">Bu hizmetler telefonunuzun yeteneklerini arttırır. Veriler Cyanogen\'in <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ilkelerine uygun olarak kullanılacaktır.</string>
+  <string name="services_explanation" product="default">Bu hizmetler telefonunuzun yeteneklerini arttırır. Veriler, Cyanogen\'in <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ilkelerine uygun olarak kullanılacaktır.</string>
   <string name="services_privacy_policy">Gizlilik Politikası</string>
   <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> gelişimine yardım edin</string>
-  <string name="services_metrics_label">Tanılama ve kullanım verilerini Cyanogen\'e göndererek <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>. Bu bilgiler kimliğinizi ifşah edecek şekilde kullanılmaz ancak pil ömrü, uyg. performansı, ve yeni <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> özellikleri gibi konularda takımımızın çalışmalarında kullanılır.</string>
+  <string name="services_metrics_label">Tanılama ve kullanım verilerini Cyanogen\'e göndererek <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>. Bu bilgiler kimliğinizi ortaya çıkaracak şekilde kullanılmaz ancak pil ömrü, uygulama performansı ve yeni <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> özellikleri gibi konulardaki ekip çalışmalarında kullanılır.</string>
   <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> temasını uygula</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>nırken eşsiz simgeler, duvar kağıtları ve yazı tipleri etkinleştiriliyor.</string>
-  <string name="services_os_nav_keys_label"><b>Donanımsal tuşlar yerine ekran üstü dolaşım tuşlarını kullanın.</b></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> eşsiz simgeler, duvar kağıtları ve yazı tiplerini etkinleştiriyor.</string>
+  <string name="services_os_nav_keys_label">Donanımsal tuşlar yerine <b>ekran üstü dolaşım tuşlarını kullanın</b>.</string>
   <string name="services_use_secure_sms">Şifreli SMS kullanın</string>
-  <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%1$s</xliff:g> cihazında diğer kullanıcılarla olan sohbetlerinizi şifrelemek için <xliff:g id="name" example="Use secure SMS">%2$s</xliff:g>.</string>
+  <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> cihazında güvenli SMS kullanan diğer kullanıcılarla olan SMS sohbetlerinizi şifrelemek için <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>.</string>
   <string name="setup_unlock">Kilidi kaldır</string>
   <string name="setup_device_locked">Bu cihaz kullanıcı tarafından kilitlenmiş.</string>
-  <string name="setup_require_cyanogen_label"><b>Cyanogen İS hesap şifresi gerekir</b> ki cihazınızı fabrika ayarlarına sıfırladıktan sonra kullanabilin.</string>
-  <string name="setup_device_locked_instructions"><i>Bu özelliği açıp kapatmak için, lütfen Ayarlar &gt; Güvenlik bölümüne gidin</i></string>
-  <string name="setup_warning_skip_anyway">Cyanogen İS Hesabı olmadan, aşağıdakiler mümkün olmayacaktır:\n\nTelefonunuzu yeni simgeler, duvar kağıtları ve Temalar uygulamasındaki daha fazla ögeyle özelleştirmek\n\nTelefonunuzu kaybedince uzaktan konumunu bulmak veya içeriğini silmek</string>
+  <string name="setup_require_cyanogen_label">Cihazınızı fabrika ayarlarına sıfırlandıktan sonra kullanabilmeniz için <b>Cyanogen OS hesap şifresi gerekir</b>.</string>
+  <string name="setup_device_locked_instructions"><i>Bu özelliği açıp kapatmak için lütfen Ayarlar &gt; Güvenlik bölümüne gidin</i></string>
+  <string name="setup_warning_skip_anyway">Cyanogen OS Hesabı olmadan, aşağıdakiler mümkün olmayacaktır:\n\nTelefonunuzu yeni simgeler, duvar kağıtları ve Temalar uygulamasındaki daha fazla ögeyle özelleştirmek\n\nTelefonunuzu kaybedince uzaktan konumunu bulmak veya içeriğini silmek</string>
   <string name="settings_fingerprint_setup_title">Yedek ekran kilidi türü seçin</string>
   <string name="settings_fingerprint_setup_details">Ekranınızı nasıl kilitlemek istersiniz?</string>
   <string name="fingerprint_setup_title">Parmak izi kurulumu</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ae3f4ac..63b6f98 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -16,8 +16,58 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="app_name">Trình hướng dẫn thiết lập</string>
+  <string name="next">Tiếp theo</string>
+  <string name="skip">Bỏ qua</string>
+  <string name="start">Bắt đầu</string>
+  <string name="ok">OK</string>
+  <string name="loading">Vui lòng đợi một giây\u2026</string>
+  <string name="setup_complete">Đã thiết lập xong</string>
+  <string name="setup_welcome">Chào mừng</string>
+  <string name="setup_wifi">Chọn Wi-Fi</string>
+  <string name="setup_sim_missing">Không có thẻ SIM</string>
+  <string name="setup_choose_data_sim">Chọn một thẻ SIM sử dụng dữ liệu</string>
+  <string name="setup_location">Dịch vụ vị trí</string>
+  <string name="setup_other">Các dịch vụ khác</string>
+  <string name="setup_datetime">Ngày &amp; giờ</string>
+  <string name="setup_current_date">Ngày hiện tại</string>
+  <string name="setup_current_time">Thời gian hiện tại</string>
+  <string name="sim_missing_summary" product="tablet">Không tìm thấy thẻ SIM trong máy tính bảng của bạn. Để chèn thẻ SIM, đọc hướng dẫn đi kèm với thiết bị của bạn.</string>
+  <string name="sim_missing_summary" product="default">Không tìm thấy thẻ SIM trong điện thoại của bạn. Để chèn thẻ SIM, đọc hướng dẫn đi kèm với thiết bị của bạn.</string>
+  <string name="choose_data_sim_summary" product="tablet">Bạn muốn sử dụng dữ liệu bằng SIM nào? SIM đã chọn có thể phát sinh chi phí mạng trong quá trình thiết lập máy tính bảng của bạn.</string>
+  <string name="choose_data_sim_summary" product="default">Bạn muốn sử dụng dữ liệu bằng SIM nào? SIM đã chọn có thể phát sinh chi phí mạng trong quá trình thiết lập điện thoại của bạn.</string>
+  <string name="date_time_summary">Đặt múi giờ của bạn và điều chỉnh ngày và thời gian hiện tại nếu cần thiết</string>
+  <string name="backup_data_summary"><b>Sao lưu</b> dữ liệu ứng dụng, mật khẩu Wi-Fi và các cài đặt khác vào máy chủ Google</string>
+  <string name="other_services_summary">Các dịch vụ này giúp Google làm việc cho bạn, và bạn có thể bật hoặc tắt chúng bất kì lúc nào. Dữ liệu sẽ được sử dụng theo <xliff:g id="name" example="Privacy Policy">%s</xliff:g> của Google.</string>
+  <string name="location_services_summary">Dịch vụ vị trí cho phép hệ thống và ứng dụng bên thứ ba thu thập và sử dụng dữ liệu chẳng hạn như vị trí gần đúng của bạn. Ví dụ, một ứng dụng có thể sử dụng vị trí gần đúng của bạn để xác định vị trí tiệm cà phê gần đó.</string>
+  <string name="location_access_summary"><b>Cho phép những ứng dụng đã hỏi quyền</b> sử dụng thông tin vị trí của bạn. Những thông tin này có thể bao gồm vị trí hiện tại và trước đó của bạn.</string>
+  <string name="location_network"><b>Sử dụng Wi-Fi</b> để giúp ứng dụng xác định vị trí của bạn.</string>
+  <string name="location_network_telephony"><b>Sử dụng Wi-Fi và mạng di động</b> để giúp ứng dụng xác định vị trí của bạn.</string>
+  <string name="location_network_gms"><b>Sử dụng dịch vụ vị trí của Google</b> giúp ứng dụng xác định vị trí của bạn. Điều này có nghĩa là gửi dữ liệu vị trí ẩn danh tới Google, kể cả khi không có ứng dụng nào đang chạy.</string>
+  <string name="setup_mobile_data">Bật dữ liệu di động</string>
+  <string name="setup_mobile_data_no_service">Không có dịch vụ</string>
+  <string name="setup_mobile_data_emergency_only">Chỉ gọi khẩn cấp</string>
+  <string name="enable_mobile_data_summary">Bạn có muốn sử dụng dữ liệu di động trong lúc thiết lập? Bật dữ liệu di động có thể phải chịu phí dữ liệu.</string>
+  <string name="no">Không</string>
+  <string name="yes">Có</string>
+  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
+  <string name="emergency_call">Cuộc gọi khẩn cấp</string>
+  <string name="setup_services">Tính năng Cyanogen</string>
+  <string name="services_explanation" product="tablet">Những dịch vụ này giúp mở rộng khả năng của máy tính bảng của bạn. Dữ liệu sẽ được sử dụng theo <xliff:g id="name" example="Privacy Policy">%s</xliff:g> của Cyanogen.</string>
+  <string name="services_explanation" product="default">Những dịch vụ này giúp mở rộng khả năng của điện thoại của bạn. Dữ liệu sẽ được sử dụng theo <xliff:g id="name" example="Privacy Policy">%s</xliff:g> của Cyanogen.</string>
+  <string name="services_privacy_policy">Chính sách về quyền riêng tư</string>
+  <string name="services_help_improve_cm">Giúp cải thiện <xliff:g id="name" example="CyanogenMod">%s </xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> bằng cách tự động gửi dữ liệu chẩn đoán và sử dụng đến Cyanogen. Thông tin này không được sử dụng để nhận dạng bạn và giúp nhóm thực hiện những thứ như tuổi thọ pin, hiệu suất ứng dụng và các tính năng <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> mới.</string>
+  <string name="services_apply_theme">Áp dụng chủ đề <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> kích hoạt các biểu tượng, hình nền và phông chữ duy nhất.</string>
+  <string name="services_os_nav_keys_label"><b>Sử dụng các phím điều hướng trên màn hình</b> thay cho các phím cứng.</string>
+  <string name="services_use_secure_sms">Sử dụng SMS an toàn</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> để mã hóa các cuộc trò chuyện qua tin nhắn SMS với những người dùng khác bằng cách sử dụng tin nhắn SMS an toàn trên thiết bị <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
+  <string name="setup_unlock">Mở khóa</string>
+  <string name="setup_device_locked">Thiết bị này đã bị khoá bởi người dùng.</string>
+  <string name="setup_require_cyanogen_label"><b>Yêu cầu mật khẩu tài khoản hệ điều hành Cyanogen</b> để sử dụng thiết bị của bạn ngay cả sau khi thiết lập lại cài đặt của nhà sản xuất.</string>
+  <string name="setup_device_locked_instructions"><i>Để bật/tắt tính năng này, hãy truy cập Cài đặt &gt; bảo mật</i></string>
+  <string name="setup_warning_skip_anyway">Không có tài khoản Cyanogen OS, bạn sẽ không thể:\n\nTùy chỉnh điện thoại với những biểu tượng, hình nền và nhiều thứ khác trong ứng dụng Chủ đề\n\nĐịnh vị hoặc xoá điện thoại của bạn từ xa nếu bị mất</string>
   <string name="settings_fingerprint_setup_title">Chọn kiểu khóa màn hình dự phòng</string>
   <string name="settings_fingerprint_setup_details">Bạn muốn khóa màn hình của bạn như thế nào?</string>
   <string name="fingerprint_setup_title">Thiết lập vân tay</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 87bc368..494d1d2 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -41,7 +41,7 @@
   <string name="other_services_summary">这些服务让 Google 为你工作，您可以在任何时候打开或关闭它们。数据将会按照 Google 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 来被使用。</string>
   <string name="location_services_summary">位置服务允许系统和第三方应用收集和使用数据（比如您的大致位置）。例如，某个应用可能会使用您的大致位置来查找附近的咖啡馆。</string>
   <string name="location_access_summary"><b>允许得到您授权的应用</b>使用您的位置信息，可能包括您当前的位置和过去的位置。</string>
-  <string name="location_battery_saving">通过限制 GPS 每小时的更新次数来<b>节约电池消耗</b>。</string>
+  <string name="location_battery_saving">通过限制 GPS 每小时的更新频率来<b>降低电池消耗</b>。</string>
   <string name="location_network"><b>使用 Wi-Fi</b> 来帮助应用确定您的位置。</string>
   <string name="location_network_telephony"><b>使用 Wi-Fi 和移动网络</b>来帮助应用确定您的位置。</string>
   <string name="location_network_gms"><b>使用 Google 的位置服务</b>帮助应用确定您所在的位置。这意味着即使没有应用运行，也会发送匿名的位置数据给 Google。</string>