Automatic translation import

Change-Id: If68ff820b3ca26981a3ac28b10fb3211efd585b0 Ticket: RM-231
2016-09-19 19:11:58 -07:00 · 2016-09-18 18:05:15 -07:00 · 2016-09-06 21:26:55 -07:00 · 2016-09-01 18:46:18 -07:00 · 2016-08-31 10:12:43 -07:00 · 2016-08-29 17:40:58 -07:00
122 changed files with 1197 additions and 235 deletions
--- a/Android.mk
+++ b/Android.mk
@@ -28,4 +28,6 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 LOCAL_AAPT_FLAGS += --extra-packages com.google.android.gms

+include frameworks/opt/setupwizard/library/common.mk
+
 include $(BUILD_PACKAGE)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -66,6 +66,7 @@
                 android:icon="@drawable/icon"
                 android:theme="@style/Theme.Setup"
                 android:uiOptions="none"
+                 android:taskAffinity="com.android.wizard"
                 android:name=".SetupWizardApp">

        <meta-data android:name="com.google.android.gms.version"
--- a/res/drawable/mod_ready.xml
+++ b/res/drawable/mod_ready.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="256dp"
+        android:height="114dp"
+        android:viewportWidth="256"
+        android:viewportHeight="114">
+
+    <path android:fillColor="@color/white"
+          android:pathData="M40,113.7V77.1h14.3c7.5,0,12.3,4,12.3,11.1c0,6.2-3,9.4-8.6,10.6l8,14.9h-5.8l-7.7-14.5h-7.4v14.5H40z
+            M45.2,94.6h8.7 c4.6,0,7.5-1.9,7.5-6.3c0-4.2-2.5-6.4-7.5-6.4h-8.6v12.7H45.2z
+            M78.7,113.7V77.1h22.4V82H84v10.6h15.7v4.7H84V109h17.2v4.8
+            L78.7,113.7L78.7,113.7z
+            M136.5,113.7L134,107h-15.7l-2.4,6.7h-5.4l13.2-36.6h5l13.2,36.6H136.5z
+            M126.1,84.7l-6.2,17.8h12.6 l-6.2-17.8H126.1z
+            M152.7,113.7V77.1h11.7c8.1,0,15.9,5.6,15.9,18.3c0,13.6-7.6,18.4-16.2,18.4L152.7,113.7L152.7,113.7z
+            M158,108.9 h5.9c6.9,0,10.8-3.8,10.8-13.6c0-8.8-4-13.4-10.5-13.4H158V108.9z
+            M198.8,113.7V98.3l-12-21.2h5.7l8.8,16.4h0.1l8.9-16.4h5.7
+            l-12,21.2v15.4C204,113.7,198.8,113.7,198.8,113.7z
+            M73.1,20.8c0-11.3-9.2-20.5-20.6-20.5H0.2v58.1h9.3V9.5H32v48.8h9.3V9.5h11.3
+            c6.2,0,11.3,5.1,11.3,11.3v37.5h9.3L73.1,20.8L73.1,20.8z
+            M164.5,26.6v-3.4v-2.4c0-11.3-9.2-20.5-20.6-20.5h-26.7
+            c-11.3,0-20.5,9.2-20.5,20.5v4.6v1.2V32v1.7v4.2c0,11.3,9.2,20.5,20.5,20.5h26.7c11.3,0,20.6-9.2,20.6-20.5v-2.3V32V26.6z
+            M155.2,37.8c0,6.2-5.1,11.3-11.3,11.3h-26.7c-6.2,0-11.3-5.1-11.3-11.3v-17c0-6.2,5.1-11.3,11.3-11.3h26.7
+            c6.2,0,11.3,5.1,11.3,11.3V37.8z
+            M235.2,0.3H188v58.1h47.2c11.3,0,20.6-9.2,20.6-20.5v-17C255.8,9.5,246.6,0.3,235.2,0.3z
+            M246.5,37.8c0,6.2-5.1,11.3-11.3,11.3h-38V9.5h38c6.2,0,11.3,5.1,11.3,11.3V37.8z" />
+</vector>
--- a/res/layout/location_settings.xml
+++ b/res/layout/location_settings.xml
@@ -45,42 +45,6 @@
                    android:paddingRight="@dimen/content_margin_right"
                    style="@style/PageSummaryText" />

-                <LinearLayout
-                    android:id="@+id/backup"
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="@dimen/location_margin_left"
-                    android:paddingRight="@dimen/content_margin_right"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:clickable="true">
-
-
-                    <CheckBox
-                        android:id="@+id/backup_checkbox"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="top"
-                        android:layout_marginTop="5dp"
-                        android:duplicateParentState="true"
-                        android:clickable="false" />
-
-                    <TextView
-                        android:id="@+id/backup_summary"
-                        android:layout_width="0px"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:textSize="15sp"
-                        android:lineSpacingExtra="@dimen/setup_line_spacing"
-                        android:gravity="top"
-                        android:layout_marginLeft="@dimen/location_text_margin_left"
-                        android:layout_marginRight="@dimen/location_text_margin_right"
-                        android:paddingBottom="@dimen/content_margin_bottom"
-                        android:text="@string/backup_data_summary"
-                        android:maxLines="5" />
-
-                </LinearLayout>
-
                <LinearLayout
                    android:id="@+id/location"
                    android:orientation="horizontal"
--- a/res/layout/setup_finished_page.xml
+++ b/res/layout/setup_finished_page.xml
@@ -20,12 +20,46 @@
              android:layout_height="match_parent"
              android:background="@color/primary">

+    <Space android:layout_width="match_parent"
+           android:layout_height="0px"
+           android:layout_weight="1"/>
+
    <ImageView
        android:id="@+id/brand_logo"
        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
        android:src="@drawable/brand_finish"
        android:scaleType="centerInside"
        android:padding="@dimen/content_margin_left"/>

+
+
+    <TextView android:id="@+id/mod_welcome"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:textSize="20sp"
+              android:layout_marginTop="105dp"
+              android:paddingLeft="@dimen/content_margin_left"
+              android:paddingRight="@dimen/content_margin_right"
+              android:text="@string/mod_welcome"
+              android:fontFamily="sans-serif-medium"
+              android:textColor="@color/white"
+              android:visibility="gone"/>
+
+
+    <TextView android:id="@+id/mod_desc"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:textSize="16sp"
+              android:layout_marginTop="16dp"
+              android:paddingLeft="@dimen/content_margin_left"
+              android:paddingRight="@dimen/content_margin_right"
+              android:text="@string/mod_description"
+              android:textColor="@color/white"
+              android:visibility="gone"/>
+
+    <Space android:layout_width="match_parent"
+           android:layout_height="0px"
+           android:layout_weight="1"/>
+
 </LinearLayout>
--- a/res/layout/setup_lockscreen.xml
+++ b/res/layout/setup_lockscreen.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/header" />
+
+    <FrameLayout android:id="@+id/page"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <ScrollView android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/PageContent">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/PageSummaryText"
+                    android:textSize="16sp"
+                    android:paddingLeft="@dimen/content_margin_left"
+                    android:layout_marginBottom="@dimen/summary_margin_bottom"
+                    android:paddingRight="@dimen/location_text_margin_right"
+                    android:text="@string/lockscreen_setup_summary" />
+
+                <TextView
+                    android:id="@+id/setup_lockscreen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/content_margin_left"
+                    android:paddingRight="@dimen/location_text_margin_right"
+                    android:gravity="center_vertical"
+                    android:textSize="16sp"
+                    android:textAllCaps="true"
+                    android:textColor="@color/accent"
+                    android:text="@string/lockscreen_setup_screen_lock_setup"/>
+
+            </LinearLayout>
+        </ScrollView>
+    </FrameLayout>
+</LinearLayout>
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -78,4 +78,12 @@
  <string name="fingerprint_setup_add_fingerprint">Voeg jou vingerafdruk by</string>
  <string name="fingerprint_setup_screen_lock_setup">Stel skerm sluit op</string>
  <string name="sim_locale_changed">%1$s SIM opgespoor</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Hoe wil jy jou skerm sluit?</string>
+  <string name="lockscreen_setup_title">Beskerm jou foon</string>
+  <string name="lockscreen_setup_summary"><b>Beskerm die toestel</b>\" en vereis \'n PIN, patroon of wagwoord om skerm te ontsluit\"</string>
+  <string name="lockscreen_setup_screen_lock_setup">Stel PIN, patroon of wagwoord op</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Welkom by die Post-Toep Era</string>
+  <string name="mod_description">Mods is intelligente ervarings, direk ingebou in die BS. Wanneer die MOD dink dit kan help, sal dit aanbied om die ervaring te aktiveer vir jou.</string>
 </resources>
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -78,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">أضف بصمتك</string>
  <string name="fingerprint_setup_screen_lock_setup">إنشاء إقفال الشاشة</string>
  <string name="sim_locale_changed">تم اكتشاف %1$s SIM</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">كيف تريد إقفال الشاشة؟</string>
+  <string name="lockscreen_setup_summary"><b>حماية هذا الجهاز</b> وطلب رقم تعريف شخصي أو نمط أو كلمة مرور لإلغاء قفل الشاشة.</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">مرحباً بكم في Post-App Era</string>
+  <string name="mod_description">الأوضاع عبارة عن تجارب ذكية، ومدركة وخفيفة الوزن تم بناؤها مباشرة في نظام التشغيل OS. عندما يرى MOD أنه يمكنه المساعدة، سيقوم بتنشيطه لك.</string>
 </resources>
--- a/res/values-as-rIN/strings.xml
+++ b/res/values-as-rIN/strings.xml
@@ -78,4 +78,7 @@
  <string name="fingerprint_setup_add_fingerprint">আপোনাৰ আঙুলিৰছাপ যোগ কৰক</string>
  <string name="fingerprint_setup_screen_lock_setup">স্ক্ৰীণ লক ছেটআপ কৰক</string>
  <string name="sim_locale_changed">%1$s SIM চিনাক্ত কৰা হৈছে</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">আপুনি আপোনাৰ স্ক্ৰীণ লক কেনেকৈ কৰিবলৈ বিচাৰিব?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -41,10 +41,14 @@
  <string name="other_services_summary">Estos servicios ponen a Google a trabayar pot ti, y pues activalos o desactivalos en cualesquier momentu. Los datos usaránse acordies cola <xliff:g id="name" example="Política de privacidá">%s</xliff:g> de Google.</string>
  <string name="location_services_summary">Los servicios de llocalización permiten al sistema y les aplicaciones de terceres partes a recoyer y usar datos como\'l to allugamientu aproximáu. Por exemplu, una aplicación podría usar l\'allugamientu aproximáu p\'asitiate cerca d\'una cafetería.</string>
  <string name="location_access_summary"><b>Permitir a les tos aplicaciones entrugar pol to permisu</b> pa usar la to información d\'allugamientu. Esto podría incluyir los tos allugamientos recientes y pasaos.</string>
+  <string name="location_battery_saving"><b>Amenorgar consumu de batería</b> restrinxendo\'l númberu d\'anovamientos GPS per hora.</string>
  <string name="location_network"><b>Usar Wi-Fi</b> p\'ayudar a les aplicaciones a determinar el to allugamientu.</string>
+  <string name="location_network_telephony"><b>Usar Wi-Fi y redes móviles</b> p\'ayudar a les aplicaciones a determinar el to allugamientu.</string>
  <string name="location_network_gms"><b>Usar el serviciu d\'allugamientu de Google</b> p\'ayudar a les aplicaciones a determinar el to allugamientu. Esto quier dicir que s\'unviarán datos anónimos a Google, incluso cuando nun se tea executándose denguna aplicación.</string>
+  <string name="setup_mobile_data">Prender datos móviles</string>
  <string name="setup_mobile_data_no_service">Ensin serviciu</string>
  <string name="setup_mobile_data_emergency_only">Namái llamaes d\'emerxencia</string>
+  <string name="enable_mobile_data_summary">¿Quies usar los datos móviles na configuración? Activalos quiciabes puean tar suxetos a cargos de datos.</string>
  <string name="no">Non</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>
@@ -54,11 +58,29 @@
  <string name="services_explanation" product="default">Estos servicios furrulen por ti pa estender les capacidaes del móvil. Los datos usaránse acordies cola <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string>
  <string name="services_privacy_policy">Política de privacidá</string>
  <string name="services_help_improve_cm">Ayudar a ameyorar <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> unviando automáticamente diagnósticos y usu de datos a Cyanogen. Esta información nun s\'usa pa indentificate y écha-yos un gabitu a los equipos pa trabayar en coses como\'l consumu de batería, el rindimientu d\'aplicaciones, y les nueves carauterístiques <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> habilitando iconos, fondos de pantalla y fontes únicos.</string>
  <string name="services_os_nav_keys_label"><b>Usar tecles de navegación na pantalla</b> en cuantes de tecles físiques.</string>
  <string name="services_use_secure_sms">Usar SMS seguru</string>
+  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> pa cifrar conversaciones SMS con otros usuarios usando SMS seguru nun preséu <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
+  <string name="setup_unlock">Desbloquiar</string>
  <string name="setup_device_locked">Esti preséu ta bloquiáu pol usuariu.</string>
+  <string name="setup_require_cyanogen_label"><b>Riquir la to contraseña de la cuenta Cyanogen OS</b> pa usar el to preséu incluso dempués de reafitalu.</string>
+  <string name="setup_device_locked_instructions"><i>Pa apagar/prender esta carauterística, por favor vete a Axustes &gt; Seguranza</i></string>
+  <string name="setup_warning_skip_anyway">Ensin una cuenta de Cyanogen OS, nun vas poder: \n\nPersonalizar el to teléfonu con iconos nuevos, fondos de pantalla y muncho más al traviés de l\'aplicación de temes\n\nDesaniciar el teléfonu llocalmente o de manera remota si se perdió</string>
  <!-- Fingerprint setup -->
+  <string name="settings_fingerprint_setup_title">Esbilla\'l tipu de copia de seguranza de pantalla de bloquéu</string>
  <string name="settings_fingerprint_setup_details">¿Cómo te prestaría bloquiar la to pantalla?</string>
+  <string name="fingerprint_setup_title">Configuración del buelga</string>
+  <string name="fingerprint_setup_summary">Pa usar el to sensor de buelgues pa desbloquiar la to pantalla, necesitarás:</string>
+  <string name="fingerprint_setup_backup_lock_method">Configura un métodu secundariu de desbloquéu</string>
+  <string name="fingerprint_setup_add_fingerprint">Amiesta la to buelga</string>
+  <string name="fingerprint_setup_screen_lock_setup">Configuración del bloquéu de pantalla</string>
+  <string name="sim_locale_changed">%1$s SIM deteutada</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">¿Cómo te prestaría bloquiar la to pantalla?</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Bienllegáu a la dómina post-app</string>
+  <string name="mod_description">Los Mods son esperiencies intelixentes, conscientes y llixeres construyíes direutamente dientro del SO. Cuando un MOD camiente que pue ayudate, ufriráse p\'activase.</string>
 </resources>
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -73,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">İkinci kilid açma üsulunu quraşdırın</string>
  <string name="fingerprint_setup_add_fingerprint">Barmaq izinizi əlavə edin</string>
  <string name="fingerprint_setup_screen_lock_setup">Ekran kilidi qurun</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Ekranınızı necə kilidləmək istərdiniz?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -43,9 +43,12 @@
  <string name="location_access_summary"><b>Дазволіць дадаткам, якія запыталі ваш дазвол</b> скарыстаць інфармацыю пра ваша месцазнаходжанне. Гэта можа ўлучаць ваша бягучае і мінулыя месцазнаходжанні.</string>
  <string name="location_battery_saving"><b>Зменшыць энергаспажыванне</b>, абмяжоўваючы колькасць абнаўленняў GPS у гадзіну.</string>
  <string name="location_network"><b>Скарыстаць Wi-F</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">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -75,4 +78,7 @@
  <string name="fingerprint_setup_add_fingerprint">Дадаць адбітак пальца</string>
  <string name="fingerprint_setup_screen_lock_setup">Наладзіць блакаванне экрану</string>
  <string name="sim_locale_changed">%1$s SIM знойдзена</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Абярыце спосаб блакавання экрана.</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -78,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Добавете вашият пръстов отпечатък</string>
  <string name="fingerprint_setup_screen_lock_setup">Настройка на екрана за заключване</string>
  <string name="sim_locale_changed">Намерена %1$s СИМ карта</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Изберете метод на заключване на екрана</string>
+  <string name="settings_lockscreen_setup_details">Как бихте желали да заключите вашият екран?</string>
+  <string name="lockscreen_setup_title">Защитете телефона си</string>
+  <string name="lockscreen_setup_summary"><b>Защитете у-вото</b> и изисквайте ПИН код, фигура или парола за отключване на екрана</string>
+  <string name="lockscreen_setup_screen_lock_setup">Настройване на ПИН код, фигура или парола</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Добре дошли в Post-App Era</string>
+  <string name="mod_description">Модулите са интелигентни, леки и вградени директно в операционната система. Когато модулите смятат, че могат да помогнат те ще Ви предложат да се активират.</string>
 </resources>
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-br-rFR/strings.xml
+++ b/res/values-br-rFR/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml
@@ -0,0 +1,22 @@
+<?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">
+  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
+</resources>
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -66,7 +66,7 @@
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> per xifrar les converses SMS amb altres usuaris mitjançant SMS segurs en un dispositiu <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="setup_unlock">Desbloqueja</string>
  <string name="setup_device_locked">Aquest dispositiu ha estat bloquejat per l\'usuari.</string>
-  <string name="setup_require_cyanogen_label"><b>Demana la contrasenya del teu compte Cyanogen OS</b> per utilitzar el teu dispositiu, fins i tot després de restaurar als ajustaments de fàbrica.</string>
+  <string name="setup_require_cyanogen_label"><b>Demana la contrasenya del teu compte Cyanogen OS</b> per utilitzar el teu dispositiu, fins i tot després de restablir als ajustaments de fàbrica.</string>
  <string name="setup_device_locked_instructions"><i>Per activar/desactivar aquesta característica, si us plau ves a Configuració &gt; Seguretat</i></string>
  <string name="setup_warning_skip_anyway">Sense un compte Cyanogen OS, no podràs:\n\nPersonalitzar el teu telèfon amb noves icones, fons de pantalla i més en l\'aplicació de Temes\n\nLocalitzar o esborrar remotament el teu telèfon si el perds</string>
  <!-- Fingerprint setup -->
@@ -78,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Afegeix la teva empremta digital</string>
  <string name="fingerprint_setup_screen_lock_setup">Configuració del bloqueig de pantalla</string>
  <string name="sim_locale_changed">%1$s SIM detectada</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Selecciona el tipus de bloqueig de pantalla</string>
+  <string name="settings_lockscreen_setup_details">Com t\'agradaria bloquejar la teva pantalla?</string>
+  <string name="lockscreen_setup_title">Protegeix el teu telèfon</string>
+  <string name="lockscreen_setup_summary"><b>Protegeix el dispositiu</b> i estableix un PIN, un patró o una contrasenya per desbloquejar la pantalla</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configura el PIN, el patró o la contrasenya</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Benvinguts a l\'Era Post-Aplicacions</string>
+  <string name="mod_description">Els Mods són intel·ligents, conscients i experiències lleugeres construïts directament dins el SO. Quan un MOD pensi que et pot ajudar, s\'oferirà per activar-se.</string>
 </resources>
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -78,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Přidat otisk prstu</string>
  <string name="fingerprint_setup_screen_lock_setup">Nastavit zámek obrazovky</string>
  <string name="sim_locale_changed">Zjištěna %1$s SIM</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Vyberte typ zámku obrazovky</string>
+  <string name="settings_lockscreen_setup_details">Jak chcete zamykat obrazovku?</string>
+  <string name="lockscreen_setup_title">Chraňte svůj telefon</string>
+  <string name="lockscreen_setup_summary"><b>Chránit toto zařízení</b> a před odemknutím obrazovky požadovat kód PIN, gesto nebo heslo</string>
+  <string name="lockscreen_setup_screen_lock_setup">Nastavit kód PIN, gesto nebo heslo</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Vítejte v éře Post-App</string>
+  <string name="mod_description">Módy jsou inteligentní a nenáročné malé aplikace zabudované přímo do OS. Tyto MODy mohou v určitých situacích nabídnout svoji pomoc.</string>
 </resources>
--- a/res/values-csb-rPL/strings.xml
+++ b/res/values-csb-rPL/strings.xml
@@ -0,0 +1,22 @@
+<?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">
+  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
+</resources>
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -78,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Tilføje dit fingeraftryk</string>
  <string name="fingerprint_setup_screen_lock_setup">Konfigurere skærmlås</string>
  <string name="sim_locale_changed">%1$s SIM-kort fundet</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Vælg skærmlåstype</string>
+  <string name="settings_lockscreen_setup_details">Hvordan vil du gerne låse din skærm?</string>
+  <string name="lockscreen_setup_title">Beskyt din telefon</string>
+  <string name="lockscreen_setup_summary"><b>Beskyt denne enhed</b>, og kræv pinkode, mønster eller adgangskode for at låse skærmen op</string>
+  <string name="lockscreen_setup_screen_lock_setup">Konfigurer pinkode, mønster eller adgangskode</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Velkommen til Post-App æraen</string>
+  <string name="mod_description">Tilpasninger er intelligente, opmærksomme og gode oplevelser indbygget direkte i styresystemet. Når MOD mener den kan hjælpe, vil den tilbyde at aktivere dem for dig.</string>
 </resources>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -41,14 +41,14 @@
  <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 (z. B. zu Ihrem ungefähren Standort) zu sammeln und zu verwenden. Beispielweise 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 um Ihre Erlaubnis gebeten haben, </b>Ihre Standortinformationen zu verwenden. Dies können Informationen zu Ihrem aktuellen Standort und zu vergangenen Standorten sein.</string>
-  <string name="location_battery_saving"><b>Akkuverbrauch verringern</b>, indem die Aktualisierungsrate ihres Standortes beschränkt wird.</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 aktivieren</b>, um Apps den Standortabruf zu ermöglichen.</string>
  <string name="location_network_telephony"><b>WLAN und Mobilfunknetz nutzen</b>, um die Genauigkeit der Standortbestimmung zu erhöhen.</string>
  <string name="location_network_gms"><b>Googles Standortdienst verwenden</b>, um Apps den Standortabruf zu ermöglichen. Das bedeutet, dass anonymisierte Standortdaten an Google gesendet werden, auch wenn keine App aktiv ist.</string>
  <string name="setup_mobile_data">Mobile Datenverbindung aktivieren</string>
  <string name="setup_mobile_data_no_service">Kein Service</string>
  <string name="setup_mobile_data_emergency_only">Nur Notrufe</string>
-  <string name="enable_mobile_data_summary">Möchten Sie für die Ersteinrichtung mobile Daten benutzen? Dies kann eventuell Kosten verursachen.</string>
+  <string name="enable_mobile_data_summary">Möchten Sie Datenverbindungen über das Mobilfunknetz aktivieren? Dies kann eventuell Kosten verursachen.</string>
  <string name="no">Nein</string>
  <string name="yes">Ja</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> – <xliff:g id="name">%s</xliff:g></string>
@@ -57,7 +57,7 @@
  <string name="services_explanation" product="tablet">Diese Dienste werden verwendet, um die Funktionen Ihres Tablets zu erweitern. Die Daten werden in Übereinstimmung mit Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g> verwendet.</string>
  <string name="services_explanation" product="default">Diese Dienste werden verwendet, um die Funktionen Ihres Telefons zu erweitern. Die Daten werden in Übereinstimmung mit Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g> verwendet.</string>
  <string name="services_privacy_policy">Datenschutzerklärung</string>
-  <string name="services_help_improve_cm">Helfen Sie, <xliff:g id="name" example="CyanogenMod">%s</xliff:g> zu verbessern.</string>
+  <string name="services_help_improve_cm">Helfen Sie <xliff:g id="name" example="CyanogenMod">%s</xliff:g> zu verbessern</string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>, indem Sie automatisch Diagnose-und Nutzungsdaten an CyanogenMod senden. Diese Informationen können nicht dazu verwendet werden, Sie zu identifizieren. Vielmehr helfen sie unserem Team bei der Arbeit an Dingen wie der Akkulaufzeit, der App-Leistung und <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-Funktionen.</string>
  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g>-Design anwenden</string>
  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>, um spezifische Symbole, Hintergrundbilder und Schriftarten zu aktivieren.</string>
@@ -78,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Fügen Sie Ihren Fingerabdruck hinzu.</string>
  <string name="fingerprint_setup_screen_lock_setup">Die Bildschirmsperre einrichten</string>
  <string name="sim_locale_changed">%1$s SIM-Karte erkannt</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Wählen Sie einen Sperrbildschirm-Typ</string>
+  <string name="settings_lockscreen_setup_details">Wie möchten Sie Ihren Bildschirm sperren?</string>
+  <string name="lockscreen_setup_title">Schützen Sie Ihr Telefon</string>
+  <string name="lockscreen_setup_summary"><b>Gerät schützen</b> und PIN, Muster oder Passwort zur Display-Entsperrung verwenden</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN, Muster oder Passwort einrichten</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Willkommen in der Post-App-Ära</string>
+  <string name="mod_description">Mods sind intelligente, kontextsensitive und leichtgewichtige Anwendungen, die direkt in das Betriebssystem integriert sind. Wenn MOD der Meinung ist, dass es von Nutzen wäre, bietet es Ihnen an, die Mods für Sie zu aktivieren.</string>
 </resources>
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -78,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Προσθέστε το δακτυλικό σας αποτύπωμα</string>
  <string name="fingerprint_setup_screen_lock_setup">Ρύθμιση κλειδώματος οθόνης</string>
  <string name="sim_locale_changed">Ανιχνεύθηκε %1$s SIM</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Επιλέξτε κλείδωμα οθόνης</string>
+  <string name="settings_lockscreen_setup_details">Πώς θα θέλατε να κλειδώνετε την οθόνη σας;</string>
+  <string name="lockscreen_setup_title">Προστατέψτε το τηλέφωνό σας</string>
+  <string name="lockscreen_setup_summary"><b>Προστατέψτε αυτήν τη συσκευή</b> και ζητήστε ένα PIN, ένα μοτίβο ή έναν κωδικό πρόσβασης για να ξεκλειδώσετε την οθόνη</string>
+  <string name="lockscreen_setup_screen_lock_setup">Ρύθμιση PIN, μοτίβου ή κωδικού πρόσβασης</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Καλώς ήρθατε στην εποχή μετά τις εφαρμογές</string>
+  <string name="mod_description">Τα Mod είναι ευφυείς, ενήμερες και ελαφριές βελτιώσεις ενσωματωμένες κατευθείαν στο σύστημα. Όταν το MOD νομίζει ότι μπορεί να βοηθήσει, θα προσφερθεί να τα ενεργοποιήσει για εσάς.</string>
 </resources>
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -59,4 +59,6 @@
  <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>
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -16,5 +16,10 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="location_network_telephony"><b>Use Wi-Fi and mobile networks</b> to help apps determine your location.</string>
+  <string name="setup_mobile_data">Turn on mobile data</string>
+  <string name="enable_mobile_data_summary">Do you want to use mobile data during setup? Turning on mobile data may be subject to data charges.</string>
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -74,4 +74,7 @@
  <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>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">How would you like to lock your screen?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-en-rPT/strings.xml
+++ b/res/values-en-rPT/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -16,7 +16,6 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Asistanto pri agordoj</string>
  <string name="next">Sekvonta</string>
  <string name="skip">Preterpasi</string>
  <string name="start">Lanĉi</string>
@@ -64,4 +63,6 @@
  <string name="setup_device_locked_instructions"><i>Por mal-/ŝalti tiun funkcion, bonvolu iri en Agordoj &gt; Sekureco</i></string>
  <string name="setup_warning_skip_anyway">Sen Cyanogen konto, vi ne kapablos :\n\nAgordi vian telefonon per novaj piktogramoj, ekranfono kaj pli en la etosa aplikaĵo\n\nLokigi aŭ fore forviŝi vian telefonilon se vi perdas ĝin</string>
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-es-rCO/strings.xml
+++ b/res/values-es-rCO/strings.xml
@@ -0,0 +1,22 @@
+<?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">
+  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
+</resources>
--- a/res/values-es-rMX/strings.xml
+++ b/res/values-es-rMX/strings.xml
@@ -22,4 +22,6 @@
  <string name="enable_mobile_data_summary">¿Deseas utilizar datos móviles durante la instalación? Activar los datos móviles puede provocar cargos de datos.</string>
  <!-- Fingerprint setup -->
  <string name="sim_locale_changed">%1$s SIM detectada</string>
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -17,7 +17,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="app_name">Asistente de configuración</string>
-  <string name="next">Sig</string>
+  <string name="next">Siguiente</string>
  <string name="skip">Omitir</string>
  <string name="start">Inicio</string>
  <string name="ok">Aceptar</string>
@@ -78,4 +78,12 @@
  <string name="fingerprint_setup_add_fingerprint">Añadir tu huella digital</string>
  <string name="fingerprint_setup_screen_lock_setup">Configurar la pantalla bloqueada</string>
  <string name="sim_locale_changed">%1$s SIM detectada</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">¿Cómo quieres bloquear tu pantalla?</string>
+  <string name="lockscreen_setup_title">Protege el teléfono</string>
+  <string name="lockscreen_setup_summary"><b>Proteger dispositivo</b> y solicitar PIN/patrón/contraseña para desbloquear pantalla</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurar PIN, patrón o contraseña</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Bienvenido a la era posaplicaciones</string>
+  <string name="mod_description">Las Mods son experiencias inteligentes, conscientes y ligeras construidas directamente dentro del SO. Cuando una MOD cree que te puede ayudar, se ofrecerá para activarse.</string>
 </resources>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -41,9 +41,9 @@
  <string name="other_services_summary">Estos servicios hacen que Google trabajar para ti, y puedes activarlos o desactivarlos en cualquier momento. Los datos se utilizarán según la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Google.</string>
  <string name="location_services_summary">Los servicios de localización permiten al sistema y a otras aplicaciones recopilar y utilizar datos tales como tu ubicación aproximada. Por ejemplo, una aplicación puede utilizar tu ubicación aproximada para localizar cafeterías cercanas.</string>
  <string name="location_access_summary"><b>Permitir aplicaciones que han solicitado tu permiso</b> para usar tu información de ubicación. Esto puede incluir tu localización actual y ubicaciones recientes.</string>
-  <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_battery_saving"><b>Reduce el 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>Utilizar Wi-Fi y redes móviles</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>
@@ -78,4 +78,10 @@
  <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>
  <string name="sim_locale_changed">%1$s SIM detectada</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">¿Cómo quieres bloquear tu pantalla?</string>
+  <string name="lockscreen_setup_summary"><b>Proteger este dispositivo</b> y establecer un PIN, un patrón o una contraseña para desbloquear la pantalla</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Bienvenido a la era Post-Aplicaciones</string>
+  <string name="mod_description">Los Mods son experiencias inteligentes, conscientes y ligeras construidas directamente dentro del SO. Cuando un MOD piensa que te puede ayudar, se ofrecerá para activarse.</string>
 </resources>
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -73,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">Häälesta teisejärguline avamise meetod</string>
  <string name="fingerprint_setup_add_fingerprint">Lisa oma sõrmejälg</string>
  <string name="fingerprint_setup_screen_lock_setup">Ekraaniluku seadistamine</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Kuidas soovite ekraani lukustada?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -78,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Gehitu zure hatz-marka</string>
  <string name="fingerprint_setup_screen_lock_setup">Ezarri pantaila blokeoa</string>
  <string name="sim_locale_changed">%1$s SIM antzeman da</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Hautatu pantaila-blokeo mota</string>
+  <string name="settings_lockscreen_setup_details">Nola blokeatu nahi duzu pantaila?</string>
+  <string name="lockscreen_setup_title">Babestu telefonoa</string>
+  <string name="lockscreen_setup_summary"><b>Babestu gailua</b> eta eskatu PIN kode, eredu edo pasahitz bat pantaila desblokeatzeko</string>
+  <string name="lockscreen_setup_screen_lock_setup">Konfiguratu PIN kodea, eredua edo pasahitza</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Ongi etorri aplikazioen osteko garaira</string>
+  <string name="mod_description">Mod-ak zuzenean sistema eragilean eraikitako esperienzia adimentsu, jakitun eta arinak dira. Mod batek lagundu dezakeela uste duenean aktibatzea eskainiko dizu.</string>
 </resources>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -73,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">تنظیم روش دوم باز کردن قفل</string>
  <string name="fingerprint_setup_add_fingerprint">افزودن اثر انگشت خود</string>
  <string name="fingerprint_setup_screen_lock_setup">تنظیمات قفل صفحه</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">چگونه می‌خواهید صفحه خود را قفل کنید؟</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -78,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Lisää sormenjälkesi</string>
  <string name="fingerprint_setup_screen_lock_setup">Aseta näytön lukitus</string>
  <string name="sim_locale_changed">%1$s SIM tunnistettu</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Valitse näytön lukitustapa</string>
+  <string name="settings_lockscreen_setup_details">Miten haluat lukita näyttösi?</string>
+  <string name="lockscreen_setup_title">Suojaa puhelintasi</string>
+  <string name="lockscreen_setup_summary"><b>Suojaa laitetta</b> avaamalla näytön lukitus PIN-koodin, kuvion tai salasanan avulla</string>
+  <string name="lockscreen_setup_screen_lock_setup">Aseta PIN-koodi, kuvio tai salasana</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Tervetuloa Post-App-aikakaudelle</string>
+  <string name="mod_description">Modit ovat älykkäitä, tietoisia ja kevyitä kokemuksia jotka on sisäänrakennettuna käyttöjärjestelmään. Kun MOD ajattelee voivansa auttaa, se ehdottaa voivansa aktivoida ne puolestasi.</string>
 </resources>
--- a/res/values-fil-rPH/strings.xml
+++ b/res/values-fil-rPH/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -78,4 +78,12 @@
  <string name="fingerprint_setup_add_fingerprint">Ajouter votre empreinte digitale</string>
  <string name="fingerprint_setup_screen_lock_setup">Configurer le verrouillage de l\'écran</string>
  <string name="sim_locale_changed">%1$s carte SIM détectée</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Comment voulez-vous verrouiller votre écran ?</string>
+  <string name="lockscreen_setup_title">Protéger votre téléphone</string>
+  <string name="lockscreen_setup_summary"><b>"Protéger l\'appareil"</b>\" et exiger code, schéma ou mot de passe pour déverrouiller l\'écran\"</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurer un code, un schéma ou un mot de passe</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Bienvenue dans l\'ère post-applications</string>
+  <string name="mod_description">Les Mods sont des fonctionnalités intelligentes, conscientes et légères construites directement dans le système d\'exploitation. Lorsque le MOD pense pouvoir vous aider, il vous proposera de les activer à votre place.</string>
 </resources>
--- a/res/values-frp-rIT/strings.xml
+++ b/res/values-frp-rIT/strings.xml
@@ -0,0 +1,22 @@
+<?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">
+  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
+</resources>
--- a/res/values-fy-rNL/strings.xml
+++ b/res/values-fy-rNL/strings.xml
@@ -18,4 +18,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="ok">OK</string>
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ga-rIE/strings.xml
+++ b/res/values-ga-rIE/strings.xml
@@ -0,0 +1,22 @@
+<?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">
+  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
+</resources>
--- a/res/values-gd-rGB/strings.xml
+++ b/res/values-gd-rGB/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -41,10 +41,14 @@
  <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_battery_saving"><b>Reducir o consumo da batería</b> reducindo as actualizacións do GPS por hora.</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 ás aplicacións a determinar a tú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óbeis</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">Queres utilizar os datos móbeis durante a configuración? Ao facelo pódense producir gastos adicionais no plan de datos contratado.</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>
@@ -73,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Configurar un método secundario de desbloqueo</string>
  <string name="fingerprint_setup_add_fingerprint">Engadir a súa pegada dactilar</string>
  <string name="fingerprint_setup_screen_lock_setup">Configurar o bloqueo da pantalla</string>
+  <string name="sim_locale_changed">%1$s SIM detectado</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Seleccionar o tipo de bloqueo da pantalla</string>
+  <string name="settings_lockscreen_setup_details">Como quere bloquear a súa pantalla?</string>
+  <string name="lockscreen_setup_title">Protexe o teu móbil</string>
+  <string name="lockscreen_setup_summary"><b>Protexe o dispositivo</b> e solicitar un PIN, patrón ou contrasinal para desbloquear a pantalla</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurar un PIN, patrón ou contrasinal</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Benvido á era post-aplicacións</string>
+  <string name="mod_description">Os Mos son experiencias intelixentes, conscientes e lixeiras construídas directamente no SO. Cando un MOD pensa que pode axudar, ofreceralle activarse.</string>
 </resources>
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -78,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">તમારી ફિંગરપ્રિન્ટ ઉમેરો</string>
  <string name="fingerprint_setup_screen_lock_setup">સ્ક્રીન લૉક સેટઅપ કરો</string>
  <string name="sim_locale_changed">%1$s SIM સૂચિત</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">તમે કેવી રીતે તમારું સ્ક્રીન લૉક કરવા માંગો છો?</string>
+  <string name="lockscreen_setup_title">તમારા ફોનને સુરક્ષિત કરો</string>
+  <string name="lockscreen_setup_summary"><b>આ ઉપકરણને સુરક્ષિત કરો</b> અને સ્ક્રીનને અનલૉક કરવા માટે PIN, પેટર્ન અથવા પાસવર્ડ જરૂરી</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN, પેટર્ન અથવા પાસવર્ડ સેટ કરો</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -73,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">अनलॉक करने की कोई दूसरी विधि भी सेट अप करें</string>
  <string name="fingerprint_setup_add_fingerprint">अपनी अँगुली छाप जोड़ें</string>
  <string name="fingerprint_setup_screen_lock_setup">स्क्रीन लॉक सेटअप करें</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">आप अपने स्क्रीन को किस तरह से लॉक करना चाहेंगे?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -19,15 +19,15 @@
  <string name="app_name">Čarobnjak za postavljanje</string>
  <string name="next">Dalje</string>
  <string name="skip">Preskoči</string>
-  <string name="start">Start</string>
+  <string name="start">Započni</string>
  <string name="ok">U redu</string>
-  <string name="loading">Samo sek\u2026</string>
-  <string name="setup_complete">Postavljanje je završeno</string>
-  <string name="setup_welcome">Dobrodošli</string>
+  <string name="loading">Samo trenutak\u2026</string>
+  <string name="setup_complete">Postavljanje je završeno.</string>
+  <string name="setup_welcome">Dobro doš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_sim_missing">Nema SIM kartice</string>
+  <string name="setup_choose_data_sim">Odaberite SIM karticu za podatke</string>
+  <string name="setup_location">Usluge lokacije</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>
@@ -53,7 +53,7 @@
  <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="setup_services">Cyanogenove značajke</string>
  <string name="services_explanation" product="tablet">Ovi servisi rade za tebe da povećaju mogućnosti tvog tableta. Podaci će biti korišteni u suglasnosti sa Cyanogenovim <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="services_explanation" product="default">Ovi servisi rade za tebe da povećaju mogućnosti tvog telefona. Podaci će biti korišteni u suglasnosti sa Cyanogenovim <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="services_privacy_policy">Pravila privatnosti</string>
@@ -78,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Dodajte svoj otisak</string>
  <string name="fingerprint_setup_screen_lock_setup">Postavljanje zaključavanja zaslona</string>
  <string name="sim_locale_changed">%1$s SIM otkriven</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Odaberite vrstu zaključavanja zaslona</string>
+  <string name="settings_lockscreen_setup_details">Kako želite zaključati vaš zaslon?</string>
+  <string name="lockscreen_setup_title">Zaštitite svoj telefon</string>
+  <string name="lockscreen_setup_summary"><b>Zaštiti uređaj</b> i zahtijevaj PIN, uzorak ili zaporku za otključavanje zaslona</string>
+  <string name="lockscreen_setup_screen_lock_setup">Postavi PIN, uzorak ili zaporku</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Dobro došli u Post-App eru</string>
+  <string name="mod_description">Modovi su inteligentni, svjesni, laganim iskustvom ugrađeni izravno u OS. Kada MOD misli da može pomoći, ponudit će da vam ih aktivira.</string>
 </resources>
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -78,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Adja hozzá ujjlenyomatát</string>
  <string name="fingerprint_setup_screen_lock_setup">Képernyőzár beállítása</string>
  <string name="sim_locale_changed">%1$s SIM észlelve</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Válasszon képernyő zárolási típust</string>
+  <string name="settings_lockscreen_setup_details">Hogyan szeretné zárolni a képernyőt?</string>
+  <string name="lockscreen_setup_title">Óvja meg telefonját</string>
+  <string name="lockscreen_setup_summary"><b>Óvja meg eszközét</b>, és a képernyőzár feloldásához állítson be PIN kódot, mintát vagy jelszót.</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN kód, minta vagy jelszó beállítása</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Üdvözöljük a Post-App korszakban</string>
+  <string name="mod_description">Módosítások közvetlenül a rendszerbe épített intelligens, tájékozott és könnyű tapasztalatok. Ha a MOD úgy gondolja, hogy hasznos lehet az Ön számára, fel fogja ajánlani, hogy aktiválja őket.</string>
 </resources>
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -16,5 +16,75 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="app_name">Panduan Penyiapan</string>
+  <string name="next">Berikutnya</string>
+  <string name="skip">Lewati</string>
+  <string name="start">Mulai</string>
+  <string name="ok">OKE</string>
+  <string name="loading">Hanya sec\u2026</string>
+  <string name="setup_complete">Penyiapan selesai</string>
+  <string name="setup_welcome">Selamat datang</string>
+  <string name="setup_wifi">Pilih Wi-Fi</string>
+  <string name="setup_sim_missing">SIM kartu hilang</string>
+  <string name="setup_choose_data_sim">Pilih SIM untuk Data</string>
+  <string name="setup_location">Layanan lokasi</string>
+  <string name="setup_other">Layanan lainnya</string>
+  <string name="setup_datetime">Tanggal &amp; waktu</string>
+  <string name="setup_current_date">Tanggal sekarang</string>
+  <string name="setup_current_time">Waktu saat ini</string>
+  <string name="sim_missing_summary" product="tablet">Kartu SIM tidak terdeteksi pada perangkat Anda.  Untuk menyisipkan kartu SIM, baca petunjuk yang datang dengan perangkat Anda.</string>
+  <string name="sim_missing_summary" product="default">Kartu SIM tidak terdeteksi pada perangkat Anda. Untuk menyisipkan kartu SIM, baca petunjuk yang disediakan dengan perangkat Anda.</string>
+  <string name="choose_data_sim_summary" product="tablet">Manakah SIM yang ingin Anda gunakan untuk data? SIM yang dipilih dapat dikenakan biaya jaringan karena akan digunakan untuk menyiapkan perangkat Anda.</string>
+  <string name="choose_data_sim_summary" product="default">Manakah SIM yang ingin Anda gunakan untuk data? SIM yang dipilih dapat dikenakan biaya jaringan karena akan digunakan untuk menyiapkan perangkat Anda.</string>
+  <string name="date_time_summary">Atur zona waktu dan sesuaikan tanggal dan waktu jika diperlukan</string>
+  <string name="backup_data_summary"><b>Membuat cadangan</b> data aplikasi, password Wi-Fi, dan pengaturan lainnya ke server Google</string>
+  <string name="other_services_summary">Layanan ini menggunakan Google, dan Anda dapat mengubahnya atau menonaktifkannya setiap saat. Data akan digunakan sesuai dengan <xliff:g id="name" example="Privacy Policy">%s</xliff:g> Google.</string>
+  <string name="location_services_summary">Layanan lokasi mengizinkan sistem dan aplikasi pihak ketiga untuk mengumpulkan dan menggunakan data seperti perkiraan lokasi Anda. Misalnya, sebuah aplikasi dapat menggunakan perkiraan lokasi Anda untuk menemukan kedai kopi terdekat.</string>
+  <string name="location_access_summary"><b>Izinkan aplikasi yang telah meminta izin Anda</b> menggunakan informasi lokasi Anda. Ini mungkin termasuk lokasi Anda saat ini dan lokasi terakhir.</string>
+  <string name="location_battery_saving"><b>Mengurangi pemakaian baterai</b> dengan membatasi jumlah pembaruan GPS tiap jam.</string>
+  <string name="location_network"><b>Penggunaan Wi-Fi</b> untuk membantu aplikasi menentukan lokasi Anda.</string>
+  <string name="location_network_telephony"><b>Gunakan Wi-Fi dan jaringan seluler</b> untuk membantu aplikasi menentukan lokasi Anda.</string>
+  <string name="location_network_gms"><b>Gunakan layanan lokasi Google</b> untuk membantu aplikasi menentukan lokasi Anda. Ini berarti mengirimkan data lokasi anonim ke Google, bahkan ketika tidak ada aplikasi yang berjalan.</string>
+  <string name="setup_mobile_data">Hidupkan data selular</string>
+  <string name="setup_mobile_data_no_service">Tidak ada layanan</string>
+  <string name="setup_mobile_data_emergency_only">Panggilan darurat saja</string>
+  <string name="enable_mobile_data_summary">Apakah anda ingin menggunakan data seluler selama penyiapan? Menghidupkan data seluler dapat dikenakan biaya data.</string>
+  <string name="no">Tidak</string>
+  <string name="yes">Ya</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">Panggilan darurat</string>
+  <string name="setup_services">Fitur Cyanogen</string>
+  <string name="services_explanation" product="tablet">Layanan ini bekerja untuk Anda untuk memperluas kemampuan perangkat tablet Anda. Data akan digunakan sesuai dengan sianogen di <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string>
+  <string name="services_explanation" product="default">Layanan ini bekerja untuk Anda untuk memperluas kemampuan perangkat tablet Anda. Data akan digunakan sesuai dengan sianogen di <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string>
+  <string name="services_privacy_policy">Kebijakan privasi</string>
+  <string name="services_help_improve_cm">Membantu meningkatkan <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> dengan mengirim data diagnostik dan penggunaan ke Cyanogen secara otomatis. Informasi ini tidak dapat mengidentifikasi Anda, dan hanya berfungsi untuk membantu tim bekerja dengan hal-hal seperti masa pakai baterai, kinerja aplikasi, dan fitur <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> baru.</string>
+  <string name="services_apply_theme">Terapkan 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> memungkinkan ikon, gambar latar, dan fon unik.</string>
+  <string name="services_os_nav_keys_label"><b>Digunakan pada tombol navigasi layar</b> bukan tombol perangkat keras.</string>
+  <string name="services_use_secure_sms">Menggunakan SMS aman</string>
+  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> untuk mengenkripsi percakapan SMS dengan pengguna lain menggunakan SMS aman pada perangkat <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
+  <string name="setup_unlock">Buka kunci</string>
+  <string name="setup_device_locked">Perangkat ini telah dikunci oleh pengguna.</string>
+  <string name="setup_require_cyanogen_label"><b>Memerlukan sandi akun Cyanogen OS</b> untuk dapat menggunakan perangkat meskipun setelah pengaturan ulang ke pabrik.</string>
+  <string name="setup_device_locked_instructions"><i>Untuk mengaktifkan/menonaktifkan fitur ini, silakan masuk ke Pengaturan &gt; Keamanan</i></string>
+  <string name="setup_warning_skip_anyway">Tanpa Akun Cyanogen OS, Anda tidak bisa:\n\nMenyesuaikan ponsel Anda dengan ikon, gambar latar baru dan masih banyak lagi di aplikasi Tema\n\nMencari atau menghapus data secara jarak jauh jika ponsel Anda hilang</string>
  <!-- Fingerprint setup -->
+  <string name="settings_fingerprint_setup_title">Pilih tipe kunci layar cadangan</string>
+  <string name="settings_fingerprint_setup_details">Bagaimana cara kunci layar yang Anda suka?</string>
+  <string name="fingerprint_setup_title">Penyiapan sidik jari</string>
+  <string name="fingerprint_setup_summary">Untuk menggunakan sensor sidik jari untuk membuka layar, Anda perlu:</string>
+  <string name="fingerprint_setup_backup_lock_method">Siapkan metode buka kunci kedua</string>
+  <string name="fingerprint_setup_add_fingerprint">Tambahkan sidik jari Anda</string>
+  <string name="fingerprint_setup_screen_lock_setup">Siapkan kunci layar</string>
+  <string name="sim_locale_changed">%1$s SIM terdeteksi</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Pilih tipe kunci layar</string>
+  <string name="settings_lockscreen_setup_details">Bagaimana cara kunci layar yang Anda suka?</string>
+  <string name="lockscreen_setup_title">Lindungi telepon anda</string>
+  <string name="lockscreen_setup_summary"><b>Lindungi perangkat ini</b> dan minta PIN, pola, atau sandi untuk membuka kunci layar</string>
+  <string name="lockscreen_setup_screen_lock_setup">Siapkan PIN, pola, atau sandi</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Selamat datang di Era Pasca-Aplikasi</string>
+  <string name="mod_description">Mod itu cerdas, sadar, dan merupakan pengalaman ringan yang terintegrasi dengan sistem operasi. Jika MOD berpikir bahwa ia dapat membantu, ia dapat menawarkan pengaktifan fitur bagi Anda.</string>
 </resources>
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -78,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Aggiungere un\'impronta</string>
  <string name="fingerprint_setup_screen_lock_setup">Imposta una schermata di blocco</string>
  <string name="sim_locale_changed">%1$s SIM rilevata</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Seleziona il tipo di schermata di blocco</string>
+  <string name="settings_lockscreen_setup_details">Come vuoi bloccare lo schermo?</string>
+  <string name="lockscreen_setup_title">Proteggi il tuo telefono</string>
+  <string name="lockscreen_setup_summary"><b>Proteggi il dispositivo</b> e richiedi PIN, sequenza o password per sbloccare schermo</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configura PIN, sequenza o password</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Benvenuti nell\'Era Post-App</string>
+  <string name="mod_description">Le MOD sono funzioni intelligenti, consapevoli e leggere costruite direttamente nel sistema. Quando una MOD pensa di essere d\'aiuto, si offrirà di attivare delle funzioni per te.</string>
 </resources>
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -67,8 +67,8 @@
  <string name="setup_unlock">פתיחה</string>
  <string name="setup_device_locked">מכשיר זה ננעל על-ידי המשתמש.</string>
  <string name="setup_require_cyanogen_label"><b>נדרשת סיסמת חשבון מערכת Cyanogen</b> על מנת להשתמש במכשירך, אפילו לאחר איפוס המכשיר להגדרות היצרן.</string>
-  <string name="setup_device_locked_instructions"><i>כדי להפעיל/לכבות אפשרות זו, אנא גש להגדרות &gt; אבטחה</i></string>
-  <string name="setup_warning_skip_anyway">בלי חשבון מערכת Cyanogen, לא ניתן יהיה:\n\nלהתאים את מכשירך אישית עם סמלים, רקעים ועוד ביישום ערכות העיצוב\n\nלאתר או למחוק מרחוק את מכשירך במקרה של אובדן</string>
+  <string name="setup_device_locked_instructions"><i>כדי להפעיל/לכבות אפשרות זו, גש להגדרות &gt; אבטחה</i></string>
+  <string name="setup_warning_skip_anyway">בלי חשבון מערכת Cyanogen, לא ניתן יהיה:\n\nלהתאים את מכשירך אישית עם סמלים, טפטים ועוד ביישום ערכות העיצוב\n\nלאתר או למחוק מרחוק את מכשירך במקרה של אובדן</string>
  <!-- Fingerprint setup -->
  <string name="settings_fingerprint_setup_title">בחר סוג שיטת נעילת מסך לגיבוי</string>
  <string name="settings_fingerprint_setup_details">כיצד הנך מעוניין לנעול את המסך שלך?</string>
@@ -78,4 +78,12 @@
  <string name="fingerprint_setup_add_fingerprint">הוסף את טביעת האצבע שלך</string>
  <string name="fingerprint_setup_screen_lock_setup">הגדרת מסך נעילה</string>
  <string name="sim_locale_changed">זוהו %1$s כרטיסי SIM</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">כיצד הנך מעוניין לנעול את המסך שלך?</string>
+  <string name="lockscreen_setup_title">הגן על הטלפון שלך</string>
+  <string name="lockscreen_setup_summary"><b>הגן על מכשיר זה</b> ודרוש קוד אימות, קו או סיסמה לביטול נעילת המסך.</string>
+  <string name="lockscreen_setup_screen_lock_setup">‏הגדר PIN, קו ביטול נעילה או סיסמה</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">ברוכים הבאים לעידן הפוסט-יישום</string>
+  <string name="mod_description">תוספים הם חוויות אינטליגנטיות, מודעות וקלות, שנבנו לתוך מערכת ההפעלה. כאשר תוסף חושב שביכולתו לסייע למשתמש/ת, הוא יציע לך להפעיל את עצמו למענך.</string>
 </resources>
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -34,8 +34,8 @@
  <string name="setup_current_time">現在の時刻</string>
  <string name="sim_missing_summary" product="tablet">お使いのタブレットでSIMカードが検出されませんでした。SIMカードの挿入方法については、タブレットに付属している説明書をご覧ください。</string>
  <string name="sim_missing_summary" product="default">お使いの携帯電話でSIMカードが検出されませんでした。SIMカードの挿入方法については、携帯電話に付属している説明書をご覧ください。</string>
-  <string name="choose_data_sim_summary" product="tablet">どちらのSIMをデータ通信に使用しますか？選択したSIMをタブレットのセットアップに使用しますので、パケット通信料を請求される可能性があります。</string>
-  <string name="choose_data_sim_summary" product="default">どちらのSIMをデータ通信に使用しますか？選択したSIMを携帯電話のセットアップに使用しますので、パケット通信料を請求される可能性があります。</string>
+  <string name="choose_data_sim_summary" product="tablet">どちらのSIMをデータ通信に使用しますか？選択したSIMをタブレットのセットアップに使用するため、パケット通信料を請求される可能性があります。</string>
+  <string name="choose_data_sim_summary" product="default">どちらのSIMをデータ通信に使用しますか？選択したSIMを携帯電話のセットアップに使用するため、パケット通信料を請求される可能性があります。</string>
  <string name="date_time_summary">タイムゾーンを設定して、必要であれば現在の日付と時刻を調整してください</string>
  <string name="backup_data_summary">アプリのデータ、Wi-Fiパスワード、その他の設定をGoogleのサーバーに<b>バックアップする</b></string>
  <string name="other_services_summary">これらのサービスはGoogleアプリを動作させるもので、いつでもONまたはOFFにすることができます。データはGoogleの<xliff:g id="name" example="Privacy Policy">%s</xliff:g>に従って使用されます。</string>
@@ -45,10 +45,10 @@
  <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">データ通信をON</string>
+  <string name="setup_mobile_data">モバイルデータをON</string>
  <string name="setup_mobile_data_no_service">サービスがありません</string>
  <string name="setup_mobile_data_emergency_only">緊急通報のみ</string>
-  <string name="enable_mobile_data_summary">セットアップでデータ通信を有効にしますか？データ通信をONにするとデータ通信料を請求される可能性があります。</string>
+  <string name="enable_mobile_data_summary">セットアップ中にモバイルデータを使用しますか？モバイルデータをONにすると、パケット通信料を請求される可能性があります。</string>
  <string name="no">いいえ</string>
  <string name="yes">はい</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -57,7 +57,7 @@
  <string name="services_explanation" product="tablet">これらのサービスはタブレットの機能を拡張するために動作します。データはCyanogenの<xliff:g id="name" example="Privacy Policy">%s</xliff:g>に従って使用されます。</string>
  <string name="services_explanation" product="default">これらのサービスは携帯電話の機能を拡張するために動作します。データはCyanogenの<xliff:g id="name" example="Privacy Policy">%s</xliff:g>に従って使用されます。</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_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>の改善に協力します</string>
  <string name="services_metrics_label">診断と使用状況データを自動的にCyanogenに送信して、<xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>。この情報は個人を特定するために使用されることはなく、電池持ち、アプリのパフォーマンス、<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>
@@ -78,4 +78,12 @@
  <string name="fingerprint_setup_add_fingerprint">指紋を追加</string>
  <string name="fingerprint_setup_screen_lock_setup">画面のロックをセットアップ</string>
  <string name="sim_locale_changed">%1$sのSIMを検出しました</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">どのように画面をロックしますか？</string>
+  <string name="lockscreen_setup_title">スマートフォンの保護</string>
+  <string name="lockscreen_setup_summary"><b>この端末を保護</b>し、画面のロック解除にPIN、パターン、またはパスワードを必要とする</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN、パターン、またはパスワードの設定</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Post-App Eraへようこそ</string>
+  <string name="mod_description">MODはOSに直接組み込まれたスマートで、物分りが良く、軽量なエクスペリアンスです。MODが役に立つと考えたときは、MODを有効にすることを提案します。</string>
 </resources>
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -78,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">ನಿಮ್ಮ ಫಿಂಗರ್‍ಪ್ರಿಂಟನ್ನು ಸೇರಿಸಿ</string>
  <string name="fingerprint_setup_screen_lock_setup">ಪರದೆ ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಿ</string>
  <string name="sim_locale_changed">%1$s SIM ಗುರುತಿಸಲ್ಪಟ್ಟಿದೆ</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">ನಿಮ್ಮ ಪರದೆಯನ್ನು ನೀವು ಹೇಗೆ ಲಾಕ್ ಮಾಡಲು ಬಯಸುವಿರಿ?</string>
+  <string name="lockscreen_setup_title">ನಿಮ್ಮ ಫೋನನ್ನು ರಕ್ಷಿಸಿ</string>
+  <string name="lockscreen_setup_summary"><b>ಸಾಧನ ರಕ್ಷಿಸಿ</b>. ಸ್ಕ್ರೀನ್‌ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಪಿನ್, ಪ್ಯಾಟರ್ನ್, ಪಾಸ್‌ವರ್ಡ್ ಬೇಕಾಗುತ್ತದೆ</string>
+  <string name="lockscreen_setup_screen_lock_setup">ಪಿನ್, ನಮೂನೆ ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -79,4 +79,12 @@
  <string name="fingerprint_setup_add_fingerprint">지문 추가</string>
  <string name="fingerprint_setup_screen_lock_setup">화면 잠금 설정</string>
  <string name="sim_locale_changed">%1$s SIM 인식됨</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">화면을 어떻게 잠그시겠습니까?</string>
+  <string name="lockscreen_setup_title">휴대전화 보호</string>
+  <string name="lockscreen_setup_summary"><b>이 기기를 보호</b>하고 화면 잠금 해제용 PIN, 패턴 또는 비밀번호 요청</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN, 패턴 또는 비밀번호 설정하기</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">앱 이전 시대에 오신 것을 환영합니다</string>
+  <string name="mod_description">Mod는 운영 체제에 내장된 지능형이고, 인식할 수 있으며 가벼운 경험입니다. Mod가 도울 수 있다고 생각하면, 당신이 활성화할 수 있도록 제공할 것입니다.</string>
 </resources>
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -49,4 +49,6 @@
  <string name="services_privacy_policy">یاسای تایبەتی</string>
  <string name="setup_unlock">کردنەوە</string>
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -73,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">Eng zweet Entspärmethod ariichten</string>
  <string name="fingerprint_setup_add_fingerprint">Däi Fangerofdrock dobäisetzen</string>
  <string name="fingerprint_setup_screen_lock_setup">D\'Schiermspär ariichten</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Wéi wëlls du däi Schierm spären?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -73,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">Nustatyti antrinį atrakinimo metodą</string>
  <string name="fingerprint_setup_add_fingerprint">Pridėti savo pirštų atspaudą</string>
  <string name="fingerprint_setup_screen_lock_setup">Nustatyti ekrano užraktą</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Kaip norėtumėte užrakinti ekraną?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -73,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">Iestatīt sekundāro atbloķēšanas metodi</string>
  <string name="fingerprint_setup_add_fingerprint">Pievienot pirkstu nospiedumu</string>
  <string name="fingerprint_setup_screen_lock_setup">Iestatīt ekrānslēgu</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Kādu Jūs vēlētos ekrānslēgu?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -78,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">നിങ്ങളുടെ വിരലടയാളം ചേർക്കുക</string>
  <string name="fingerprint_setup_screen_lock_setup">സ്ക്രീൻ ലോക്ക് സജ്ജമാക്കുക</string>
  <string name="sim_locale_changed">%1$s SIM കണ്ടെത്തി</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">നിങ്ങളുടെ സ്ക്രീന്‍ എങ്ങനെ ലോക്ക് ചെയ്യാനാണ് നിങ്ങള്‍ ആഗ്രഹിക്കുന്നത്?</string>
+  <string name="lockscreen_setup_title">നിങ്ങളുടെ ഫോൺ പരിരക്ഷിക്കുക</string>
+  <string name="lockscreen_setup_summary"><b>ഈ ഉപകരണം പരിരക്ഷിക്കുക</b>, സ്‌ക്രീൻ അൺലോക്കുചെയ്യാൻ പിൻ,പാറ്റേൺ അല്ലെങ്കിൽ പാസ്‌വേഡ് ആവശ്യമാണ്</string>
+  <string name="lockscreen_setup_screen_lock_setup">പിൻ, പാറ്റേൺ അല്ലെങ്കിൽ പാസ്‌വേഡ് സജ്ജമാക്കുക</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -78,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">तुमचा बोटाचा ठसा जोडा</string>
  <string name="fingerprint_setup_screen_lock_setup">स्क्रीन लॉक सेटअप करा</string>
  <string name="sim_locale_changed">%1$s सिम आढळले</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">तुम्हाला तुमचा स्क्रीन कसा लॉक करायला आवडेल?</string>
+  <string name="lockscreen_setup_title">आपला फोन संरक्षित करा</string>
+  <string name="lockscreen_setup_summary"><b>हे डिव्हाइस संरक्षित करा</b> आणि स्क्रीन अनलॉक करण्यासाठी पिन, नमुना किंवा संकेतशब्द आवश्यक आहे</string>
+  <string name="lockscreen_setup_screen_lock_setup">पिन, नमुना किंवा संकेतशब्द सेट करा</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -43,10 +43,12 @@
  <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 mobilnettverk</b> for å forbedre posisjonen din.</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>
  <string name="setup_mobile_data">Slå på mobildata</string>
  <string name="setup_mobile_data_no_service">Ingen tjeneste</string>
  <string name="setup_mobile_data_emergency_only">Kun nødanrop</string>
+  <string name="enable_mobile_data_summary">Vil du bruke mobildata under installasjonen? Slå på mobildata kan tilføye ekstra kostnader.</string>
  <string name="no">Nei</string>
  <string name="yes">Ja</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d </xliff:g> - <xliff:g id="name">%s </xliff:g></string>
@@ -76,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Legge til fingeravtrykket ditt</string>
  <string name="fingerprint_setup_screen_lock_setup">Konfigurere skjermlås</string>
  <string name="sim_locale_changed">%1$s SIM oppdaget</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Velg skjermlåstype</string>
+  <string name="settings_lockscreen_setup_details">Hvordan vil du låse skjermen din?</string>
+  <string name="lockscreen_setup_title">Beskytt telefonen</string>
+  <string name="lockscreen_setup_summary"><b>Beskytt denne enheten</b> og krev PIN-kode, mønster eller passord for å låse opp skjermen</string>
+  <string name="lockscreen_setup_screen_lock_setup">Konfigurer PIN-kode, mønster eller passord</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Velkommen til Post-App Era</string>
+  <string name="mod_description">Mods er intelligente, godtvitende og små erfaringer bygget direkte inn i OSet. Når MOD tenker at den kan hjelpe, vil den anbefale deg å slå den på.</string>
 </resources>
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -78,4 +78,11 @@
  <string name="fingerprint_setup_add_fingerprint">Uw vingerafdruk toe te voegen</string>
  <string name="fingerprint_setup_screen_lock_setup">Schermvergrendeling in te stellen</string>
  <string name="sim_locale_changed">%1$s simkaart gedetecteerd</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Schermvergrendelingstype selecteren</string>
+  <string name="settings_lockscreen_setup_details">Hoe wilt u uw scherm vergrendelen?</string>
+  <string name="lockscreen_setup_title">Bescherm uw telefoon</string>
+  <string name="lockscreen_setup_summary"><b>Bescherm dit apparaat</b> en vraag om een pincode, patroon of wachtwoord om het scherm te ontgrendelen</string>
+  <string name="lockscreen_setup_screen_lock_setup">Pincode, patroon of wachtwoord instellen</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-oc-rFR/strings.xml
+++ b/res/values-oc-rFR/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-or-rIN/strings.xml
+++ b/res/values-or-rIN/strings.xml
@@ -78,4 +78,7 @@
  <string name="fingerprint_setup_add_fingerprint">ଆପଣଙ୍କ ଫିଙ୍ଗର୍‍ପ୍ରିଣ୍ଟ ଯୋଗ କରନ୍ତୁ</string>
  <string name="fingerprint_setup_screen_lock_setup">ସ୍କ୍ରିନ୍‍ ଲକ୍‍ ସେଟ୍‍ଅପ୍‍ କରନ୍ତୁ</string>
  <string name="sim_locale_changed">%1$s SIM ସନ୍ଧାନ କରାଯାଇଛି</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">ଆପଣ କିପରି ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‍ ଲକ୍‍ କରିବାକୁ ଚାହିଁବେ?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -78,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Dodać swój odcisk palca</string>
  <string name="fingerprint_setup_screen_lock_setup">Skonfigurować blokadę ekranu</string>
  <string name="sim_locale_changed">Wykryto %1$s SIM</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Wybierz typ blokady ekranu</string>
+  <string name="settings_lockscreen_setup_details">Jak chcesz blokować swój ekran?</string>
+  <string name="lockscreen_setup_title">Zabezpiecz telefon</string>
+  <string name="lockscreen_setup_summary"><b>Zabezpiecz to urządzenie</b>, wymagając kodu PIN, wzoru lub hasła do odblokowania ekranu</string>
+  <string name="lockscreen_setup_screen_lock_setup">Ustaw PIN, wzorzec lub hasło</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Witamy w erze Post-App</string>
+  <string name="mod_description">Modyfikacje są inteligentne, świadome i przyjemne a przy tym wbudowane bezpośrednio w system. Kiedy MOD pomyśli, że mogą być pożyteczne dla Ciebie, zaproponuje Ci ich aktywację.</string>
 </resources>
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -23,7 +23,7 @@
  <string name="ok">Ok</string>
  <string name="loading">Aguarde um segundo\u2026</string>
  <string name="setup_complete">Configuração concluída</string>
-  <string name="setup_welcome">Bem vindo</string>
+  <string name="setup_welcome">Bem-vindo</string>
  <string name="setup_wifi">Selecionar rede Wi-Fi</string>
  <string name="setup_sim_missing">Não há cartão SIM</string>
  <string name="setup_choose_data_sim">Escolha um cartão SIM para dados</string>
@@ -34,21 +34,21 @@
  <string name="setup_current_time">Hora atual</string>
  <string name="sim_missing_summary" product="tablet">Não foi encontrado um cartão SIM no seu tablet. Para colocar um cartão SIM, leia as instruções que vieram com seu dispositivo.</string>
  <string name="sim_missing_summary" product="default">Não foi encontrado um cartão SIM no seu celular. Para colocar um cartão SIM, leia as instruções que vieram com seu dispositivo.</string>
-  <string name="choose_data_sim_summary" product="tablet">Qual SIM você gostaria usar para dados? Poderão haver cobranças no SIM escolhido, pois ele será usado para configurar o seu tablet.</string>
-  <string name="choose_data_sim_summary" product="default">Qual SIM você gostaria usar para dados? Poderão haver cobranças no SIM escolhido, pois ele será usado para configurar o seu celular.</string>
+  <string name="choose_data_sim_summary" product="tablet">Qual SIM você gostaria usar para dados? Pode haver cobranças no SIM escolhido, pois ele será usado para configurar o seu tablet.</string>
+  <string name="choose_data_sim_summary" product="default">Qual SIM você gostaria usar para dados? Pode haver cobranças no SIM escolhido, pois ele será usado para configurar o seu celular.</string>
  <string name="date_time_summary">Defina o fuso horário e ajuste a data e a hora atual, se necessário</string>
-  <string name="backup_data_summary">Efetuar uma <b>cópia de segurança</b> dos dados das aplicações, senhas de acesso de redes sem fios e outras configuraçõess para os servidores do Google</string>
-  <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="backup_data_summary">Faça uma <b>cópia de segurança</b> dos dados de aplicativos, senhas de Wi-Fi e outras configuraçõess nos servidores do Google</string>
+  <string name="other_services_summary">Esses serviços colocam o Google para trabalhar para você e podem ser desligados 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 a aplicativos de terceiros obter e usar dados como a sua localização aproximada. Por exemplo, um aplicativo pode usar sua localização aproximada para encontrar cafés perto de você.</string>
+  <string name="location_access_summary"><b>Permitir que aplicativos que pediram a sua permissão</b> usem 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 apps 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>
+  <string name="location_network"><b>Use Wi-Fi</b> para ajudar aplicativos a determinar a sua localização.</string>
+  <string name="location_network_telephony"><b>Use Wi-Fi e redes móveis</b> para ajudar aplicativos a determinar sua localização.</string>
+  <string name="location_network_gms"><b>Use o serviço de localização do Google</b> para ajudar os aplicativos a determinar sua localização. Isto significa enviar dados de localização anônimos para o Google, mesmo quando nenhum aplicativo estiver aberto.</string>
  <string name="setup_mobile_data">Ativar dados celular</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>
-  <string name="enable_mobile_data_summary">Você quer usar dados moveis durante a instalação? Ao ligar os dados móveis, você estará sujeito a gastos de seu plano de dados contratado.</string>
+  <string name="enable_mobile_data_summary">Você quer usar dados móveis durante a instalação? Ao ligar os dados móveis, você estará sujeito a gastos de seu plano de dados contratado.</string>
  <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>
@@ -57,8 +57,8 @@
  <string name="services_explanation" product="tablet">Estes serviços trabalham para estender os recursos do seu tablet. Dados serão utilizados em conformidade com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> do Cyanogen.</string>
  <string name="services_explanation" product="default">Estes serviços trabalham para estender os recursos do seu telefone. Dados serão utilizados em conformidade com o <xliff:g id="name" example="Privacy Policy">%s</xliff:g> do Cyanogen.</string>
  <string name="services_privacy_policy">Política de Privacidade</string>
-  <string name="services_help_improve_cm">Ajudar 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 relatórios de uso de dados e diagnósticos para a Cyanogen. Esta informação não será usada para lhe identificar, e ajudam as equipes responsáveis pela duração de bateria, desempenho dos aplicativos, e novas funcionalidades do <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</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 relatórios de uso de dados e diagnósticos para a Cyanogen. Esta informação não será usada para lhe identificar e ajuda as equipes responsáveis pela duração de bateria, desempenho dos aplicativos e novos recursos do <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 fontes, papéis de parede e ícones exclusivos.</string>
  <string name="services_os_nav_keys_label"><b>Use as teclas de navegação na tela</b> em vez de botões físicos.</string>
@@ -68,14 +68,23 @@
  <string name="setup_device_locked">Este dispositivo foi bloqueado pelo usuário.</string>
  <string name="setup_require_cyanogen_label"><b>Exigir a senha da conta Cyanogen</b> para usar o dispositivo mesmo depois da restauração de fábrica.</string>
  <string name="setup_device_locked_instructions"><i>Para ativar ou desativar este recurso, por favor vá para Configurações e Segurança</i></string>
-  <string name="setup_warning_skip_anyway">Sem uma conta Cyanogen, você não será capaz de:\n\nPersonalizar seu celular com novos ícones, papéis de parede e muito mais no app Temas\n\nLocalizar ou apagar remotamente o seu telefone se for perdido</string>
+  <string name="setup_warning_skip_anyway">Sem uma conta Cyanogen, você não poderá:\n\nPersonalizar seu celular com novos ícones, papéis de parede e muito mais no aplicativo Temas\n\nLocalizar ou apagar remotamente o seu telefone caso o perca</string>
  <!-- Fingerprint setup -->
  <string name="settings_fingerprint_setup_title">Selecione o tipo de bloqueio de tela do backup</string>
  <string name="settings_fingerprint_setup_details">Como você gostaria de bloquear a tela?</string>
  <string name="fingerprint_setup_title">Configuração de impressão digital</string>
  <string name="fingerprint_setup_summary">Para usar o sensor de impressão digital para desbloquear a tela, você vai precisar de:</string>
  <string name="fingerprint_setup_backup_lock_method">Configurar 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_add_fingerprint">Adicionar sua impressão digital</string>
  <string name="fingerprint_setup_screen_lock_setup">Configuração de bloqueio de tela</string>
  <string name="sim_locale_changed">Cartão SIM %1$s detectado</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Selecione o tipo de bloqueio de tela</string>
+  <string name="settings_lockscreen_setup_details">Como você gostaria de bloquear a tela?</string>
+  <string name="lockscreen_setup_title">Proteger seu smartphone</string>
+  <string name="lockscreen_setup_summary"><b>Proteger este dispositivo</b> e pedir PIN, padrão ou senha para desbloquear a tela</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurar PIN, padrão ou senha</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Bem-vindo à Era Pós-Aplicativos</string>
+  <string name="mod_description">Mods são experiências inteligentes, conscientes e leves incluídas diretamente no sistema operacional. Quando uma MOD acha que pode ajudar, ela se oferece para ativar para você.</string>
 </resources>
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -78,4 +78,13 @@
  <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>
  <string name="sim_locale_changed">Cartão SIM %1$s detetado</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Selecionar o tipo de bloqueio do ecrã</string>
+  <string name="settings_lockscreen_setup_details">Como gostaria de bloquear o seu ecrã?</string>
+  <string name="lockscreen_setup_title">Proteja o seu telefone</string>
+  <string name="lockscreen_setup_summary"><b>Protejer este dispositivo</b> ao exigir um código PIN, padrão ou palavra-passe para desbloqueio do ecrã</string>
+  <string name="lockscreen_setup_screen_lock_setup">Definir um código PIN, padrão ou palavra-passe</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Bem-vindo à Era Pós-Aplicação</string>
+  <string name="mod_description">Os Mods são experiências inteligentes, conscientes e leves inseridas diretamente no SO. Quando um MOD achar que poderá ajudá-lo, irá oferecer-se para ativá-los para si.</string>
 </resources>
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -73,4 +73,10 @@
  <string name="fingerprint_setup_add_fingerprint">Adăugați-vă amprenta</string>
  <string name="fingerprint_setup_screen_lock_setup">Setați blocarea de ecran</string>
  <string name="sim_locale_changed">SIM %1$s detectat</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Cum doriți să vă blocați ecranul?</string>
+  <string name="lockscreen_setup_title">Protejați telefonul</string>
+  <string name="lockscreen_setup_summary"><b>Protejați dispozitivul</b> cu PIN, model sau parolă necesară pt. a debloca ecranul</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurați codul PIN, modelul sau parola</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -78,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Добавить ваши отпечатки</string>
  <string name="fingerprint_setup_screen_lock_setup">Настроить экран блокировки</string>
  <string name="sim_locale_changed">Обнаружена %1$s SIM-карта</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Выбрать способ блокировки экрана</string>
+  <string name="settings_lockscreen_setup_details">Как вы хотите заблокировать ваш экран?</string>
+  <string name="lockscreen_setup_title">Защитите телефон</string>
+  <string name="lockscreen_setup_summary"><b>Защитить устройство</b> и запрашивать PIN-код, графический ключ или пароль</string>
+  <string name="lockscreen_setup_screen_lock_setup">Добавить PIN-код, графический ключ или пароль</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Добро пожаловать в эпоху встроенных приложений</string>
+  <string name="mod_description">Моды — это интеллектуальные, контекстно-зависимые и легкие приложения, интегрированные непосредственно в операционную систему. Если MOD полагает, что вам нужна помощь, вам будет предложено активировать мод.</string>
 </resources>
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -73,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">Nastaviť alternatívny spôsob odomknutia</string>
  <string name="fingerprint_setup_add_fingerprint">Pridať váš odtlačok prsta</string>
  <string name="fingerprint_setup_screen_lock_setup">Nastaviť zamknutie obrazovky</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Ako chcete zamknúť obrazovku?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -38,7 +38,7 @@
  <string name="choose_data_sim_summary" product="default">Katero kartico SIM želite uporabiti za podatke? Izbrana kartica SIM lahko povzroči omrežne stroške, ker bo uporabljena za namestitev vašega telefona.</string>
  <string name="date_time_summary">Nastavite časovni pas in prilagodite trenutni datum in čas, če je potrebno</string>
  <string name="backup_data_summary"><b>Varnostno kopirajte</b> podatke aplikacij, gesla Wi-Fi in druge nastavitve na strežnike Google</string>
-  <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="other_services_summary">Te storitve obremenijo Google in lahko jih vklopite ali izklopite kadarkoli. Podatki se bodo uporabljali v skladu s Googlovim <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Lokacijske storitve omogočajo sistemu in aplikacijam tretjih oseb, da zbirajo in uporabijo podatke, kot je vaša približna lokacija. Aplikacija lahko na primer uporabi približno lokacijo za iskanje bližnjih kavarn.</string>
  <string name="location_access_summary"><b>Dovolite aplikacijam, ki so zahtevale 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>
@@ -56,7 +56,7 @@
  <string name="setup_services">Značilnosti Cyanogen</string>
  <string name="services_explanation" product="tablet">Te storitve vam omogočajo, da razširite zmogljivosti svoje tablice. Podatki se uporabijo v skladu s <xliff:g id="name" example="Privacy Policy">%s </xliff:g> Cyanogen.</string>
  <string name="services_explanation" product="default">Te storitve vam omogočajo, da razširite zmogljivosti svojega telefona. Podatki se uporabijo v skladu s <xliff:g id="name" example="Privacy Policy">%s </xliff:g> Cyanogen.</string>
-  <string name="services_privacy_policy">Politiko zasebnosti</string>
+  <string name="services_privacy_policy">Pravilnikom o zasebnosti</string>
  <string name="services_help_improve_cm">Pomagajte izboljšati <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> s samodejnim pošiljanjem diagnostičnih podatkov in podatkov uporabe Cyanogenu. Ti podatki se ne uporabljajo za vaše prepoznavanje in ekipi pomagajo pri izboljšanju npr. življenjske dobe baterije, zmogljivosti aplikacij in novih značilnosti <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">Uveljavite temo <xliff:g id="name" example="Material">%s</xliff:g></string>
@@ -78,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Dodati svoj prstni odtis</string>
  <string name="fingerprint_setup_screen_lock_setup">Nastaviti zaklepanje zaslona</string>
  <string name="sim_locale_changed">%1$s kartica SIM zaznana</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Izberite vrsto zaklepanja zaslona</string>
+  <string name="settings_lockscreen_setup_details">Kako bi radi zaklenili svoj zaslon?</string>
+  <string name="lockscreen_setup_title">Zaščitite telefon</string>
+  <string name="lockscreen_setup_summary"><b>Zaščiti napravo</b> in za odklenitev zaslona zahtevaj kodo PIN, vzorec ali geslo</string>
+  <string name="lockscreen_setup_screen_lock_setup">Nastavi kodo PIN, vzorec ali geslo</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Dobrodošli v dobo vgrajenih aplikacij</string>
+  <string name="mod_description">Modifikacije so inteligentne, dovzetne in lahke izkušnje, ki so vgrajene neposredno v OS. Ko MOD misli, da lahko pomaga, vam bo ponudil, da jih omogočite.</string>
 </resources>
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -78,4 +78,12 @@
  <string name="fingerprint_setup_add_fingerprint">Додај свој отисак</string>
  <string name="fingerprint_setup_screen_lock_setup">Подешавање закључавања екрана</string>
  <string name="sim_locale_changed">Откривен %1$s SIM</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Како желиш закључати свој екран?</string>
+  <string name="lockscreen_setup_title">Заштитите телефон</string>
+  <string name="lockscreen_setup_summary"><b>Заштитите уређај</b> и поставите PIN, шаблон или лозинку за откључавање екрана</string>
+  <string name="lockscreen_setup_screen_lock_setup">Подеси PIN, шаблон или лозинку</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Добродошли у доба после апликација</string>
+  <string name="mod_description">Режими су интелигентна, свесна и лагана искуства уграђена директно у ОС. Када режим мисли да може помоћи, он ће понудити да активира то за вас.</string>
 </resources>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -78,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">Lägga till ditt fingeravtryck</string>
  <string name="fingerprint_setup_screen_lock_setup">Konfigurera skärmlås</string>
  <string name="sim_locale_changed">%1$s SIM upptäckt</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Hur vill du låsa din skärm?</string>
+  <string name="lockscreen_setup_title">Skydda mobilen</string>
+  <string name="lockscreen_setup_summary"><b>Skydda den här enheten</b> och kräv pinkod, mönster eller lösenord för att låsa upp skärmen</string>
+  <string name="lockscreen_setup_screen_lock_setup">Konfigurera pinkod, mönster eller lösenord</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -78,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">கைரேகையைச் சேர்க்கவும்</string>
  <string name="fingerprint_setup_screen_lock_setup">திரைப் பூட்டை அமை</string>
  <string name="sim_locale_changed">%1$s SIM கண்டறியப்பட்டது.</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">உங்கள் திரையை நீங்கள் எவ்வாறு பூட்ட விரும்புகிறீர்கள்?</string>
+  <string name="lockscreen_setup_title">மொபைலைப் பாதுகாக்கவும்</string>
+  <string name="lockscreen_setup_summary">திரையை திறக்க பின், வடிவம் அல்லது கடவுச்சொல் கேட்கும்படி அமைத்து, <b>சாதனத்தைப் பாதுகாக்கலாம்</b></string>
+  <string name="lockscreen_setup_screen_lock_setup">பின், வடிவம் அல்லது கடவுச்சொல்லை அமை</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -78,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">మీ వేలిముద్రను జోడించండి</string>
  <string name="fingerprint_setup_screen_lock_setup">సెటప్ స్క్రీన్ లాక్</string>
  <string name="sim_locale_changed">%1$s SIM కనుగొనబడింది</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">మీరు మీ స్క్రీనును ఏ విధంగా లాక్ చేయాలని అనుకుంటున్నారు?</string>
+  <string name="lockscreen_setup_title">మీ ఫోన్‌ను రక్షించుకోండి</string>
+  <string name="lockscreen_setup_summary"><b>ఈ పరికరాన్ని రక్షించండి</b> మరియు స్క్రీన్‌ను అన్‌లాక్ చేయడానికి PIN, నమూనా లేదా పాస్‌వర్డ్ అవసరమయ్యేలా ఏర్పాటు చేయండి</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN, నమూనా లేదా పాస్‌వర్డ్‌ను సెటప్ చేయి</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -78,4 +78,12 @@
  <string name="fingerprint_setup_add_fingerprint">เพิ่มลายนิ้วมือของคุณ</string>
  <string name="fingerprint_setup_screen_lock_setup">ตั้งค่าการล็อคหน้าจอ</string>
  <string name="sim_locale_changed">ตรวจพบซิม %1$s</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">คุณต้องการล็อคหน้าจอด้วยวิธีใด</string>
+  <string name="lockscreen_setup_title">ปกป้องโทรศัพท์ของคุณ</string>
+  <string name="lockscreen_setup_summary"><b>ปกป้องอุปกรณ์นี้</b>และกำหนดให้มีการใช้ PIN, รูปแบบ หรือรหัสผ่านเพื่อปลดล็อกหน้าจอ</string>
+  <string name="lockscreen_setup_screen_lock_setup">ตั้งค่า PIN, รูปแบบ หรือรหัสผ่าน</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">ขอต้อนรับสู่ Post-App Era</string>
+  <string name="mod_description">Mods คือประสบการณ์อันชาญฉลาด รอบรู้ และมีน้ำหนักเบา ซึ่งถูกสร้างขึ้นโดยตรงในระบบปฏิบัติการ เมื่อ MOD คิดว่าสามารถช่วยได้ โปรแกรมจะเปิดใช้งานความช่วยดังกล่าวให้คุณ</string>
 </resources>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -78,4 +78,11 @@
  <string name="fingerprint_setup_add_fingerprint">Parmak izinizi ekleyin</string>
  <string name="fingerprint_setup_screen_lock_setup">Ekran kilidini kurun</string>
  <string name="sim_locale_changed">%1$s SIM tespit edildi</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Ekranınızı nasıl kilitlemek istersiniz?</string>
+  <string name="lockscreen_setup_summary"><b>Bu cihazı koruyun</b> ve ekran kilidini açmak için bir PIN, desen ya da şifreyi gerekli kılın.</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN, desen veya şifre ayarla</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Uygulama Sonrası Dönem\'e Hoş Geldiniz</string>
+  <string name="mod_description">Modlar akıllı ve farkındadır ve hafif deneyimler doğrudan OS\'a kurulur. MOD yardım edebileceğini düşündüğünde, size bunları etkinleştirmeyi teklif eder.</string>
 </resources>
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -78,4 +78,7 @@
  <string name="fingerprint_setup_add_fingerprint">بارماق ئىزى قوشۇڭ</string>
  <string name="fingerprint_setup_screen_lock_setup">ئېكران قۇلۇپ تەڭشىكى</string>
  <string name="sim_locale_changed">ھازىر %1$s دانە SIM كارتا بايقىدى</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">ئېكراننى قانداق قۇلۇپلايسىز؟</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -74,4 +74,7 @@
  <string name="fingerprint_setup_backup_lock_method">Установка резервного методу розблокування</string>
  <string name="fingerprint_setup_add_fingerprint">Додати ваш відбиток пальця</string>
  <string name="fingerprint_setup_screen_lock_setup">Налаштування блокування екрану</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Як би ви хотіли блокувати екран?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -78,4 +78,11 @@
  <string name="fingerprint_setup_add_fingerprint">Thêm vân tay của bạn</string>
  <string name="fingerprint_setup_screen_lock_setup">Thiết lập khóa màn hình</string>
  <string name="sim_locale_changed">Đã phát hiện %1$s SIM</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Bạn muốn khóa màn hình của bạn như thế nào?</string>
+  <string name="lockscreen_setup_summary"><b>Bảo vệ thiết bị này</b> và yêu cầu mã PIN, hình hoặc mật khẩu để mở khóa màn hình</string>
+  <string name="lockscreen_setup_screen_lock_setup">Thiết lập mã PIN, hình hoặc mật khẩu</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Chào mừng đến với Post-App Era</string>
+  <string name="mod_description">Mod là trải nghiệm thông minh, có nhận thức và trọng lượng nhẹ được tích hợp trực tiếp vào hệ điều hành. Khi MOD cho rằng nó có thể hỗ trợ, nó sẽ cung cấp để kích hoạt chúng cho bạn.</string>
 </resources>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
blinky@build01	b8f7b317c2	Automatic translation import Change-Id: If68ff820b3ca26981a3ac28b10fb3211efd585b0 Ticket: RM-231	2016-09-19 19:11:58 -07:00
blinky@build01	a3cfd0d806	Automatic translation import Change-Id: Idf10191cf178882ebc54694930c4c87b67c3e822 Ticket: RM-231	2016-09-18 18:05:15 -07:00
blinky@build01	30f3035c7b	Automatic translation import Change-Id: I43d7421e4565c4c68a0bd47b887de1d657dca54d Ticket: RM-231	2016-09-06 21:26:55 -07:00
blinky@build01	bed791f6e5	Automatic translation import Change-Id: Ic8ad353432a0fbe17e92792c2c172d239582ec43 Ticket: RM-231	2016-09-01 18:46:18 -07:00
pinky@build01	24fd0339af	Automatic translation import Change-Id: I6eaa18ba7c83ca35237d1a134f9fc87b36ca1798 Ticket: RM-231	2016-08-31 10:12:43 -07:00
inky@build01	6c6a4320c3	Automatic translation import Change-Id: I3ca885de4cacb83cd3f6f885bb8aa176f74b8ee5 Ticket: RM-231	2016-08-29 17:40:58 -07:00
pinky@build01	c8c7eaf728	Automatic translation import Change-Id: Ic3df69e85363bd49844ee26ea5c0964c03a77ac1 Ticket: RM-231	2016-08-25 11:11:06 -07:00
pinky@build01	5313487d06	Automatic translation import Change-Id: Icdb89836a1904d05a553b150c0213d347c91dfb4 Ticket: RM-231	2016-08-24 23:56:10 -07:00
pinky@build01	e363e358a6	Automatic translation import Change-Id: I95dd65eb2615c6dce7fb7a362c13c7b653d67594 Ticket: RM-231	2016-08-23 11:13:19 -07:00
clyde@build01	7e39abb8d9	Automatic translation import Change-Id: I67b05722465094e92feec4b5fd00ca115ee7fe89 Ticket: RM-231	2016-08-23 03:14:25 -07:00
blinky@build01	65798d5e8d	Automatic translation import Change-Id: I76d647d5162cce1ac3e2bfc863a33275d4f23308 Ticket: RM-231	2016-08-22 11:40:29 -07:00
pinky@build01	2a42afa1c2	Automatic translation import Change-Id: Iaf0bdce897bfa49f1294f94f2267484aa7071493 Ticket: RM-231	2016-08-21 03:59:10 -07:00
clyde@build01	f05f9b22f6	Automatic translation import Change-Id: I11c254e4a0bdbf6e4086f4f81ebd4a7b85cbc068 Ticket: RM-231	2016-08-18 11:00:48 -07:00
inky@build01	68961c25f5	Automatic translation import Change-Id: I49797c99cc89d0d9cb0825bf2cc017a1286dcde2 Ticket: RM-231	2016-08-15 08:28:13 -07:00
pinky@build01	eb4c63c84f	Automatic translation import Change-Id: I51d650a5643f363f9944cc3115ffa5333302edf8 Ticket: RM-231	2016-08-13 16:48:08 -07:00
pinky@build01	e2c402efa1	Automatic translation import Change-Id: I6cb3117fd81a32d3f6aa448b6a90d28dd93787f4 Ticket: RM-231	2016-08-12 15:28:00 -07:00
Ricardo Cerqueira	74682334b4	If the device has FRP, prompt the user to set up a lockscreen FRP is kind of pointless if the device is freely accessible. Suggest setting up a secure lockscreen during setup. Ref CYNGNOS-3252 Change-Id: Ia807142ab08f388d533b5ee45d1fcbe81071f6d1	2016-08-11 14:57:13 +01:00
clyde@build01	014a7cc540	Automatic translation import Change-Id: Iead1d77ce87b47d78eace15f6b44495e146bbf0c Ticket: RM-231	2016-07-27 14:33:18 -07:00
pinky@build01	ca5ed31b1f	Automatic translation import Change-Id: I9b0adaec50724991e1e92597855e70f411914f77 Ticket: RM-231	2016-07-14 11:45:44 -07:00
pinky@build01	554f11a79d	Automatic translation import Change-Id: Iff4fab6580c2482b89cb49b3f89acc354998de45 Ticket: RM-231	2016-07-14 11:45:14 -07:00
pinky@build01	51a02f49db	Automatic translation import Change-Id: Ibc56bca29029b013e668e9b60c57a9e9097b6dc9 Ticket: RM-231	2016-07-14 11:44:37 -07:00
Ricardo Cerqueira	3d0a22db75	MobileData: Don't let wait-for-radio trample wait-for-data Both waiting for radio and waiting for data used "is the progress bar visible" as the "allow to continue" clause. If radio service state changes arrived while the wait-for-data was ongoing, this'd terminate the progress bar and make it wait forever. Additionally, if wifi is connected, don't wait for data at all Ref CYNGNOS-3126 Change-Id: I81792ac8be00c6a6746af88a62220c727cddc6d8 (cherry picked from commit `7c1cf5a232`)	2016-07-14 04:04:32 -07:00
Ricardo Cerqueira	713b22f0db	ChooseDataSim: Use the extra data from the intent to validate the sub Instead of waiting for the telephony stack to catch up to the default, take advantage of the fact that the intent already carries the ID as an extra. Also, we were using slotId and phoneId interchangeably, and they're not the same thing. While it's likely they'll match on a freshly reset phone, don't assume that. Index everything to subId for consistency. Ref CYNGNOS-3126 Change-Id: Ibcd767d0124b05d669886190f5d9a98f1a6e5bd7 (cherry picked from commit `3ebea2fb6d`)	2016-07-14 04:04:12 -07:00
Abhisek Devkota	66b7fef2fa	Automatic translation import Change-Id: I82cddd217a4ec3f1be6057bd338b0b8e757c4924 Ticket: RM-231	2016-06-28 00:32:19 +02:00
inky@build01	16086158ca	Automatic translation import Change-Id: Ib83040c26886d53e0a854c42eab28feca6265143 Ticket: RM-231	2016-06-17 12:07:25 -07:00
blinky@build01	a471f36eed	Automatic translation import Change-Id: Id309ee38910c69f54607cb909a17ffa3a7d21dc6 Ticket: RM-214	2016-06-01 16:21:01 -07:00
cretin45	c797d1f5ef	SetupWizard: Alway show google pages if gms present Helps with an issue where qsb widget doesn't work when running through oobe without network. Also set the cm setup finished setting for test receiver. CYNGNOS-2833 Change-Id: I83666deea5a27d74669691c4ab991b1b618edb0a (cherry picked from commit `36f15ef169`)	2016-05-31 15:17:38 -07:00
Jessica Wagantall	48edca790e	Automatic translation import Change-Id: Ib02e84ef73d9a910b273b07cd338c05191c717fe Ticket: RM-214	2016-05-26 18:21:39 -07:00
cretin45	143552b394	SetupWizard: Ensure language picker is enabled onResume Issue-id: FEIJ-559 Change-Id: Iafe0467fc4130074ce86fe5f28b215d4774dc50e (cherry picked from commit `4981bc9888`)	2016-05-23 15:19:47 -07:00
cretin45	556528b548	SetupWizard: Use proper CMSetting for soft keys option Issue-id: CYNGNOS-2842 Change-Id: I5ab75d9d90d79b66fa9b10f011272fc0090a78dd (cherry picked from commit `334c00f437`)	2016-05-15 11:17:07 -07:00
Abhisek Devkota	e638da1cb2	Automatic translation import Change-Id: I5dd902a079c44e0a0baf79f6b179bde4a455849f Ticket: RM-231	2016-05-14 09:45:21 +02:00
cretin45	e79c4ea91e	SetupWizard: Run as com.android.wizard task affinity Issue-id: FEIJ-254 Change-Id: Ib841e7dd82d900150229e99ca01f97dfed6bcde9 (cherry picked from commit `d35618baef`)	2016-05-02 12:27:15 -07:00
cretin45	c919eb07c2	SetupWizard: Add Mod disovery language for mod ready devices Issue-id: CYNGNOS-2566 Change-Id: If88d2d62b5d2175ffe857d45dd9f6ce132129f2a (cherry picked from commit `635504813a`)	2016-04-27 12:51:22 -07:00
cretin45	94db7bffcb	SetupWizard: Ensure compliance with GMS TOS * Launches GMS TOS per documentation * Filters out redundant location page if GMS present * Uses setupwizardlib for some helper functions * Hide notification icons Issue-id: CYNGNOS-2599 Change-Id: I4b59592f0b84d0eb0eafe365eab3bad77c1f76ff (cherry picked from commit `8109277755`)	2016-04-27 12:50:49 -07:00
Roman Birg	ee41edd74b	SetupWizard: add a CM-specific setup-complete settings key Android uses Settings.Global.DEVICE_PROVISIONED and Settings.Secure.USER_SETUP_COMPLETE and the system responds to those database entries, such as allowing the keyguard to be visible, or maybe pulling the statusbar down. Since we still depend on some of Google's setup wizard, it also keys off the same table rows and it may decide that the device is now provisioned when we still haven't finished our own setup wizard, so let's add another key that we have control over to show the real state of OUR setup wizard. Ticket: CYNGNOS-2431 Change-Id: Ic21689625f6d80e209161762ace741918b972aba Signed-off-by: Roman Birg <roman@cyngn.com> (cherry picked from commit `fccccda787`)	2016-04-26 19:14:26 -07:00
cretin45	081fc3d4ae	SetupWizard: Handle register theme change listener crash Issue-id: FEIJ-84 Change-Id: I8ffca77418702f04328ae7d0581ab8cc316a04e8 (cherry picked from commit `941aa1e1e2`)	2016-04-26 12:28:27 -07:00
cretin45	4c7f320b6f	SetupWizard: Fix test app building Ticket: CYNGNOS-2431 Change-Id: I75249f0bbb6e59f47e4a30608bb63b42c93c6e37 (cherry picked from commit `2e75c4ee04`)	2016-04-26 11:00:48 -07:00
Roman Birg	53363b82a8	SetupWizard: GMS page controls the next step Ticket: CYNGNOS-2533 Change-Id: Icf7dc1de653d18ac60ddfa52dddbe9412dbc8eda Signed-off-by: Roman Birg <roman@cyngn.com> (cherry picked from commit `af828584ae`)	2016-04-25 09:01:44 -07:00
Ricardo Cerqueira	fa10678a8c	Prefer SIM carrier name over network carrier People generally identify their SIMs by the emitting carrier, not the network they attach to. In roaming or MVNO scenarios, these are likely not to be the same, leading to confusion in SIM selection. Ref CYNGNOS-2496 Change-Id: I0ecd8e7511fd4229d6ce7629b1f97aa83a1a6254	2016-04-18 17:56:24 +01:00
Adnan Begovic	63a54165ba	SetupWizard: Don't reprompt setup if account already exists. If a user goes through the gms flow, logging in, disabling backup, getting kicked over to restore, and deciding to set the device up as new, the existing logic would reprompt since the flow causes the load action to happen again. Now check for account existance, and skip the setup if true. Change-Id: I3502294d54fcb4e202dca37ff7c6165da4401808 TICKET: CYNGNOS-2459 (cherry picked from commit `fe7ac15220`)	2016-04-14 13:23:00 -07:00
cretin45	4ef9008666	SetupWizard: Wait for data connection Issue-id: CRACKLING-786 Change-Id: I54ef75ffa8da87d829ce7ce45a7f42ca1ce54732 (cherry picked from commit `763af1265c`)	2016-04-08 11:55:29 -07:00
Michael Bestas	bbf7f83834	Automatic translation import RM-231 Change-Id: I4541f0e56eb0b84ae47a1b2da57ade2e1903dc0b (cherry picked from commit `ac93a6765d`)	2016-04-06 08:58:28 -07:00