GmsAccount: If there's no network and FRP isn't enforcing, skip GMS

The current version of GMS's SuW has the main activity return as CANCELED when no network is available. This is the same result as an actual cancellation (by pressing "Back"), and there's no extra data to distinguish the two, so the user gets stuck in a loop between the "no network" page and the one preceding it, unless connectivity is somehow established. Making connectivity mandatory for OOBE isn't acceptable, so skip GMS entirely if network is absent (and FRP isn't enforcing). The only thing it was presenting was a "you have no network" dialog anyway. RM-290 Change-Id: I2abadc79a0823e94da7d3a875ce6db8eae8f143b
Automatic translation import
2016-12-03 22:12:52 +01:00 · 2016-09-06 23:02:44 -07:00 · 2016-09-01 20:11:43 -07:00 · 2016-08-29 19:19:38 -07:00 · 2016-08-24 18:52:40 -07:00 · 2016-08-22 13:49:14 -07:00
126 changed files with 981 additions and 176 deletions
--- a/res/drawable-hdpi/btn_mod_oobe.9.png
+++ b/res/drawable-hdpi/btn_mod_oobe.9.png
--- a/res/drawable-mdpi/btn_mod_oobe.9.png
+++ b/res/drawable-mdpi/btn_mod_oobe.9.png
--- a/res/drawable-xhdpi/btn_mod_oobe.9.png
+++ b/res/drawable-xhdpi/btn_mod_oobe.9.png
--- a/res/drawable-xxhdpi/btn_mod_oobe.9.png
+++ b/res/drawable-xxhdpi/btn_mod_oobe.9.png
--- a/res/drawable-xxxhdpi/btn_mod_oobe.9.png
+++ b/res/drawable-xxxhdpi/btn_mod_oobe.9.png
--- a/res/drawable/ic_logo_mod_title.xml
+++ b/res/drawable/ic_logo_mod_title.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 Cyanogen, Inc.
+    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="72dp"
+    android:height="16dp"
+    android:viewportWidth="72"
+    android:viewportHeight="16">
+
+    <path
+        android:name="ic_logo_mod_title"
+        android:fillColor="#000000"
+        android:pathData="M19.9097139,5.66053833 C19.9097139,2.54013671 17.3930434,4.53810596e-05
+14.2986968,4.53810596e-05 L0,4.53810596e-05 L0,15.9999319 L2.53412329,15.9999319
+L2.53412329,2.5567008 L8.68814203,2.5567008 L8.68814203,15.9999319
+L11.221803,15.9999319 L11.221803,2.5567008 L14.2986968,2.5567008
+C15.9954325,2.5567008 17.3755906,3.94933205 17.3755906,5.66053833
+L17.3755906,15.9999319 L19.9097139,15.9999319 L19.9097139,5.66053833 Z
+M44.8456489,7.26108291 L44.8456489,6.32158153 L44.8456489,5.66049295
+C44.8456489,2.54020478 42.3287472,0 39.2346318,0 L31.9464123,0 C28.853106,0
+26.3363199,2.54020478 26.3363199,5.66049295 L26.3363199,6.93388547
+L26.3363199,7.26108291 L26.3363199,8.73891709 L26.3363199,9.19476983
+L26.3363199,10.3393936 C26.3363199,13.4595683 28.853106,16 31.9464123,16
+L39.2346318,16 C42.3287472,16 44.8456489,13.4595683 44.8456489,10.3393936
+L44.8456489,9.71290807 L44.8456489,8.73891709 L44.8456489,7.26108291 Z
+M42.3111788,10.3393936 C42.3111788,12.0508268 40.9310208,13.4432311
+39.2346318,13.4432311 L31.9464123,13.4432311 C30.2502545,13.4432311
+28.8700964,12.0508268 28.8700964,10.3393936 L28.8700964,5.66049295
+C28.8700964,3.94928667 30.2502545,2.55676887 31.9464123,2.55676887
+L39.2346318,2.55676887 C40.9315987,2.55676887 42.3111788,3.94928667
+42.3111788,5.66049295 L42.3111788,10.3393936 Z M64.1708327,0 L51.2719428,0
+L51.2719428,16 L64.1708327,16 C67.2652948,16 69.7817342,13.4595683
+69.7817342,10.3393936 L69.7817342,5.66049295 C69.7817342,2.54020478 67.2652948,0
+64.1708327,0 Z M67.2477265,10.3393936 C67.2477265,12.0508268
+65.8674528,13.4432311 64.1708327,13.4432311 L53.8064129,13.4432311
+L53.8064129,2.55676887 L64.1708327,2.55676887 C65.8674528,2.55676887
+67.2477265,3.94928667 67.2477265,5.66049295 L67.2477265,10.3393936 Z" />
+</vector>
--- a/res/drawable/img_oobe_hero.jpg
+++ b/res/drawable/img_oobe_hero.jpg
--- 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/layout/setup_modguide_page.xml
+++ b/res/layout/setup_modguide_page.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 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"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/mod_yellow">
+
+    <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="296dp">
+        <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                android:src="@drawable/img_oobe_hero"
+                tools:ignore="ContentDescription"/>
+        <ImageView
+                android:layout_width="140dp"
+                android:layout_height="32dp"
+                android:src="@drawable/ic_logo_mod_title"
+                android:tint="@color/white"
+                android:layout_marginTop="72dp"
+                android:layout_marginStart="24dp"
+                tools:ignore="ContentDescription"/>
+    </FrameLayout>
+
+    <TextView android:id="@+id/mod_welcome"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:minHeight="20sp"
+              android:textSize="16sp"
+              android:fontFamily="sans-serif"
+              android:layout_marginTop="32dp"
+              android:paddingStart="24dp"
+              android:paddingEnd="24dp"
+              android:text="@string/mod_welcome"
+              android:textColor="@color/mod_title"/>
+
+    <TextView android:id="@+id/mod_desc"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:fontFamily="sans-serif"
+              android:textSize="14sp"
+              android:lineSpacingExtra="6sp"
+              android:layout_marginTop="3dp"
+              android:paddingStart="24dp"
+              android:paddingEnd="24dp"
+              android:text="@string/mod_description"
+              android:textColor="@color/mod_description"/>
+
+    <FrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="72dp"
+            android:minWidth="208dp"
+            android:layout_marginTop="25dp"
+            android:layout_marginStart="24dp"
+            android:background="@drawable/btn_mod_oobe">
+
+        <LinearLayout
+                android:id="@+id/explore_mod_guide"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:minWidth="176dp"
+                android:orientation="horizontal">
+
+            <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:src="@mipmap/ic_modguide"
+                    android:layout_margin="8dp"
+                    tools:ignore="ContentDescription"/>
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:gravity="center_vertical"
+                    android:fontFamily="sans-serif"
+                    android:text="@string/mod_explore"
+                    android:textAllCaps="false"
+                    android:textColor="@color/mod_title"/>
+        </LinearLayout>
+    </FrameLayout>
+</LinearLayout>
--- a/res/mipmap-hdpi/ic_modguide.png
+++ b/res/mipmap-hdpi/ic_modguide.png
--- a/res/mipmap-mdpi/ic_modguide.png
+++ b/res/mipmap-mdpi/ic_modguide.png
--- a/res/mipmap-xhdpi/ic_modguide.png
+++ b/res/mipmap-xhdpi/ic_modguide.png
--- a/res/mipmap-xxhdpi/ic_modguide.png
+++ b/res/mipmap-xxhdpi/ic_modguide.png
--- a/res/mipmap-xxxhdpi/ic_modguide.png
+++ b/res/mipmap-xxxhdpi/ic_modguide.png
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -60,7 +60,7 @@
  <string name="services_help_improve_cm">Help verbeter <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> deur outomaties diagnostiese en gebruikers data te stuur na Cyanogen. Hierdie inligting kan nie gebruik word om jou te identifiseer nie en help spanne werk op dinge soos battery lewe, program werkverrigting en nuwe <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funksies.</string>
  <string name="services_apply_theme">Pas <xliff:g id="name" example="Material">%s</xliff:g> tema toe</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> aktiveer unieke ikone, agtergronde en lettertipe.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> aktiveer \'n unieke visuele styl vir jou ikone, agtergrond en nog baie meer.</string>
  <string name="services_os_nav_keys_label"><b>Gebruik skerm navigasie sleutels</b> in plaas van hardeware sleutels.</string>
  <string name="services_use_secure_sms">Maak gebruik van veilige SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> om SMS gesprekke met ander gebruikers te enkripteer met behulp van veilige SMS op \'n <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> toestel.</string>
@@ -78,7 +78,10 @@
  <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,5 +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
@@ -60,7 +60,7 @@
  <string name="services_help_improve_cm">ساهم في تحسين <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s </xliff:g> بإرسال بيانات تشخيص المشكلات وبيانات الاستخدام تلقائياً إلى Cyanogen. هذه المعلومات لا يمكن استخدامها للتعرف عليك، لكنها تقدم المساعدة للفرق العاملة على جوانب مثل عمر البطارية وأداء التطبيقات، وميزات  <xliff:g id="name" example="CyanogenMod"> %2$s </xliff:g> الجديدة.</string>
  <string name="services_apply_theme">تطبيق السمة <xliff:g id="name" example="Material">%s </xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s </xliff:g> تمكين الرموز الفريدة والخلفيات والخطوط.</string>
+  <string name="services_apply_theme_label">يعمل <xliff:g id="name" example="Apply the Material theme">%s</xliff:g> على تمكين نمط مرئي فريد للأيقونات الخاصة بك، الخلفية والمزيد.</string>
  <string name="services_os_nav_keys_label"><b>استخدام مفاتيح التنقل على الشاشة</b> بدلاً من مفاتيح الأجهزة.</string>
  <string name="services_use_secure_sms">استخدام شريحة SIM آمنة</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s </xliff:g> لتشفير المحادثات عبر الرسائل القصيرة مع المستخدمين الآخرين باستخدام شريحة SMS آمنة على جهاز <xliff:g id="name" example="CyanogenMod"> %2$s </xliff:g>.</string>
@@ -78,7 +78,8 @@
  <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
@@ -60,7 +60,6 @@
  <string name="services_help_improve_cm">স্বয়ংক্ৰিয়ভাবে ডায়গনষ্টিক আৰু ব্যৱহাৰ ডাটা Cyanogen লৈ প্ৰেৰণ কৰি <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> উন্নত কৰাত সহায় কৰক এই তথ্য আপোনাক চিনাক্ত কৰিবলৈ ব্যৱহাৰ কৰিব পৰা নাযায় আৰু বেটাৰীৰ আয়ুস, এপ্প্‌ৰ কাৰ্যকাৰীতা আৰু নতুন <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> বৈশিষ্ট্যবোৰৰ ওপৰত কাম কৰি থকা দলবোৰক সহায় কৰে।</string>
  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> বিষয়বস্তুটো প্ৰয়োগ কৰক</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> এ অনন্য আইকন, ৱালপেপাৰ আৰু ফণ্ট সক্ষম কৰি আছে।</string>
  <string name="services_os_nav_keys_label">হাৰ্ডৱেৰ কীবোৰৰ পৰিৱৰ্তে স্ক্ৰীণ <b>নেভিগেচন কীবোৰ ব্যৱহাৰ কৰক</b>।</string>
  <string name="services_use_secure_sms">এটা</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ডিভাইচত সুৰক্ষিত SMS ব্যৱহাৰ কৰি থকা আন ব্যৱহাৰকৰ্তাৰ সৈতে SMS কথোপকথন এনক্ৰিপ্ট কৰিবলৈ সুৰক্ষিত SMS <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> ব্যৱহাৰ কৰক।</string>
@@ -78,5 +77,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
@@ -60,7 +60,7 @@
  <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_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> habilitando iconos, fondos de pantalla, fontes únicos y más.</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>
@@ -78,7 +78,7 @@
  <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
@@ -56,7 +56,6 @@
  <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> təkmilləşməsinə kömək edin</string>
  <string name="services_metrics_label">Diaqnostika və istifadə verilənlərini Cyanogen\'ə göndərərək <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>. Bu məlumatlar kimliyinizdən istifadə məqsədilə götürülmür, ancaq batareya ömrü, tətbiq performansı və yeni <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> özəllikləri kimi mövzularda komandamızın işlərində istifadə olunur.</string>
  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> temasını tətbiq et</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> fəal olduğu zaman təkrar olunmaz nişanlar, divar kağızları və yazı tipləri fəallaşdıralacaq.</string>
  <string name="services_os_nav_keys_label"><b>Avadanlıq düymələri əvəzinə ekran üstü hərəkət düymələrindən istifadə edin.</b></string>
  <string name="services_use_secure_sms">Şifrəli SMS istifadə edin</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%1$s</xliff:g> cihazında digər istifadəçilərlə edilən söhbətlərinizi şifrələmək üçün <xliff:g id="name" example="Use secure SMS">%2$s</xliff:g>.</string>
@@ -73,5 +72,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
@@ -60,7 +60,6 @@
  <string name="services_help_improve_cm">Дапамагчы палепшыць <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>, аўтаматычна адпраўляючы дадзеныя дыягностыкі і выкарыстанні ў Cyanogen. Дадзеная інфармацыя не можа быць скарыстана для ідэнтыфікацыі вашай асобы, але можа дапамагчы ў працы над аптымізацыяй выдатку батарэі, паляпшэннем прадукцыйнасці дадаткаў, а таксама распрацоўцы новых функцый <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">Ужыць тэму <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> і скарыстаць яе значкі, шпалеры і шрыфты.</string>
  <string name="services_os_nav_keys_label"><b>Скарыстаць на экранные навігацыйныя кнопкі</b> заміж апаратных.</string>
  <string name="services_use_secure_sms">Выкарыстоўваць бяспечныя SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> для шыфравання паведамленняў, што перадаюцца іншым карыстачам прылад з<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,5 +77,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
@@ -20,6 +20,7 @@
  <string name="next">Следваща</string>
  <string name="skip">Пропусни</string>
  <string name="start">Старт</string>
+  <string name="done">Готово</string>
  <string name="ok">Добре</string>
  <string name="loading">Само секунда\u2026</string>
  <string name="setup_complete">Настройването е завършено</string>
@@ -78,7 +79,14 @@
  <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>
+  <string name="mod_welcome">Вашето устройство е готово за модификация</string>
+  <string name="mod_description">Модулите ще направят в телефона по-бърз, по-умен и лесен за употреба. В това ръководство можете да откриете нови модове, да научите какво те правят и как да ги активирате и деактивирате.</string>
+  <string name="mod_explore">Запознай се с \"Модулите\"</string>
 </resources>
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -17,5 +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,5 +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
@@ -20,6 +20,7 @@
  <string name="next">Següent</string>
  <string name="skip">Omet</string>
  <string name="start">Inicia</string>
+  <string name="done">Fet</string>
  <string name="ok">Accepta</string>
  <string name="loading">Només un seg\u2026</string>
  <string name="setup_complete">Configuració completa</string>
@@ -60,13 +61,13 @@
  <string name="services_help_improve_cm">Ajuda a millorar <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> enviant automàticament les dades de diagnòstic i d\'ús a Cyanogen. Aquesta informació no es pot utilitzar per identificar-te i dóna un cop de mà als equips que treballen en coses com la duració de les bateries, el rendiment de les aplicacions i noves característiques de <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">Aplica 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> habilitant icones úniques, fons de pantalla i tipus de lletra.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> habilitant un estil visual únic per a les teves icones, fons de pantalla i més.</string>
  <string name="services_os_nav_keys_label"><b>Utilitza les tecles de navegació en pantalla</b> enlloc de les tecles físiques.</string>
  <string name="services_use_secure_sms">Utilitza SMS segurs</string>
  <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,7 +79,14 @@
  <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>
+  <string name="mod_welcome">El teu dispositiu està llest pel MOD</string>
+  <string name="mod_description">Els Mods fan el teu telèfon més ràpid, i més fàcil d\'utilitzar. En aquesta guia, pots descobrir nous mods, aprendre què fan, i habilitar-los o deshabilitar-los.</string>
+  <string name="mod_explore">Explora la Guia de MODs</string>
 </resources>
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -20,6 +20,7 @@
  <string name="next">Další</string>
  <string name="skip">Přeskočit</string>
  <string name="start">Spustit</string>
+  <string name="done">Hotovo</string>
  <string name="ok">OK</string>
  <string name="loading">Jen chvilku\u2026</string>
  <string name="setup_complete">Instalace je dokončena</string>
@@ -60,7 +61,7 @@
  <string name="services_help_improve_cm">Pomozte zlepšovat <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> automatickým odesíláním diagnostických dat a dat o používání do Cyanogen. Tato data nelze použít pro Vaší identifikaci, ale pomohou vývojářskému týmu s informacemi o výdrži baterie, výkonu aplikací a vývoji nových vlastností pro <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">Použít motiv <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> povolí unikátní ikony, tapety a písma.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> povolí unikátní vizuální styl pro ikony, tapety, písma a další.</string>
  <string name="services_os_nav_keys_label"><b>Použít navigační klávesy na obrazovce</b> namísto hw kláves.</string>
  <string name="services_use_secure_sms">Použít zabezpečené SMS</string>
  <string name="services_secure_sms_label">Použijte aplikaci <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> pro šifrované SMS a zabezpečenou komunikaci na zařízení <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,7 +79,14 @@
  <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>
+  <string name="mod_welcome">Zařízení je připraveno k použití modů</string>
+  <string name="mod_description">Mody zrychlují, zefektivňují a usnadňují používání telefonu. V této příručce můžete objevit nové mody, naučit se co dělají, povolit je nebo zakázat.</string>
+  <string name="mod_explore">Prozkoumat průvodce modů</string>
 </resources>
--- a/res/values-csb-rPL/strings.xml
+++ b/res/values-csb-rPL/strings.xml
@@ -17,5 +17,6 @@
 -->
 <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,5 +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
@@ -20,6 +20,7 @@
  <string name="next">Næste</string>
  <string name="skip">Spring over</string>
  <string name="start">Start</string>
+  <string name="done">Gem</string>
  <string name="ok">OK</string>
  <string name="loading">Lige et øjeblik\u2026</string>
  <string name="setup_complete">Installationen er fuldført</string>
@@ -60,7 +61,7 @@
  <string name="services_help_improve_cm">Hjælpe med at forbedre <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> ved automatisk at sende diagnosticerings- og brugsoplysninger til Cyanogen. Denne information kan ikke bruges til at identificere dig, men hjælper udviklerne i arbejdet med eksempelvis batterilevetid, ydeevne og nye <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funktioner.</string>
  <string name="services_apply_theme">Anvend temaet <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> giver unikke ikoner, baggrunde og skrifttyper.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> muliggør et unikt udseende til dine ikoner, baggrunde og meget mere.</string>
  <string name="services_os_nav_keys_label"><b>Brug navigationstaster på skærmen</b> i stedet for fysiske knapper.</string>
  <string name="services_use_secure_sms">Brug sikker SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> til at kryptere SMS-samtaler med andre brugere ved hjælp af sikker SMS på en <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> enhed.</string>
@@ -78,7 +79,14 @@
  <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>
+  <string name="mod_welcome">Din enhed er MOD Klar</string>
+  <string name="mod_description">Mods gør din telefon hurtigere, smartere og nemmere at bruge. I denne guide kan du udforske nye mods, lære hvad de gør, og aktivere eller deaktivere dem.</string>
+  <string name="mod_explore">Udforsk MOD Guide</string>
 </resources>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -20,6 +20,7 @@
  <string name="next">Weiter</string>
  <string name="skip">Überspringen</string>
  <string name="start">Start</string>
+  <string name="done">Fertig</string>
  <string name="ok">OK</string>
  <string name="loading">Einen Moment\u2026</string>
  <string name="setup_complete">Einrichtung abgeschlossen</string>
@@ -60,7 +61,7 @@
  <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>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>, um einen besonderen visuellen Stil für Ihre Symbole, Ihren Hintergrund und mehr zu aktivieren.</string>
  <string name="services_os_nav_keys_label"><b>Bildschirm-Navigationstasten</b> statt Hardwaretasten verwenden.</string>
  <string name="services_use_secure_sms">Sichere SMS verwenden</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>, um SMS-Konversationen mit anderen Benutzern auf einem <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-Gerät zu verschlüsseln.</string>
@@ -78,7 +79,14 @@
  <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>
+  <string name="mod_welcome">Ihr Gerät ist MOD bereit</string>
+  <string name="mod_description">Mods machen Ihr Mobiltelefon schneller, smarter und einfacher zu bedienen. In diesem Handbuch können Sie neue Mods entdecken, erfahren was sie tun und diese aktivieren oder deaktivieren.</string>
+  <string name="mod_explore">MOD-Handbuch erkunden</string>
 </resources>
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -20,6 +20,7 @@
  <string name="next">Επόμενο</string>
  <string name="skip">Παράλειψη</string>
  <string name="start">Έναρξη</string>
+  <string name="done">Ολοκληρώθηκε</string>
  <string name="ok">ΟΚ</string>
  <string name="loading">Μισό λεπτό\u2026</string>
  <string name="setup_complete">Η εγκατάσταση ολοκληρώθηκε</string>
@@ -60,7 +61,7 @@
  <string name="services_help_improve_cm">Βοηθήστε στη βελτίωση του <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> στέλνοντας αυτόματα διαγνωστικά δεδομένα και στατιστικά χρήσης στη Cyanogen. Αυτές οι πληροφορίες δε μπορούν να χρησιμοποιηθούν για να σας αναγνωρίσουν και δίνουν ένα χέρι βοηθείας στις ομάδες που εργάζονται σε θέματα όπως η διάρκεια ζωής μπαταρίας, επιδόσεις εφαρμογών και νέα χαρακτηριστικά του <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">Εφαρμογή του θέματος <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ενεργοποιώντας μοναδικά εικονίδια, ταπετσαρίες και γραμματοσειρές.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ενεργοποιώντας ένα μοναδικό στυλ εικονιδίων, ταπετσαριών και ακόμα περισσότερα.</string>
  <string name="services_os_nav_keys_label"><b>Κάντε χρήση των πλήκτρων πλοήγησης της οθόνης</b> αντί των φυσικών πλήκτρων.</string>
  <string name="services_use_secure_sms">Κάντε χρήση των ασφαλών SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> για να κρυπτογραφήσετε τις συνομιλίες SMS με άλλους χρήστες που χρησιμοποιούν ασφαλή SMS σε συσκευές <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,7 +79,14 @@
  <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>
+  <string name="mod_welcome">Η συσκευή σας είναι έτοιμη για MOD</string>
+  <string name="mod_description">Τα mod κάνουν το τηλέφωνό σας πιο γρήγορο, πιο έξυπνο και πιο εύκολο στη χρήση. Σε αυτόν τον οδηγό, μπορείτε να ανακαλύψετε νέα mod, να μάθετε τι κάνουν, και να τα ενεργοποιήσετε ή να τα απενεργοποιήσετε.</string>
+  <string name="mod_explore">Εξερευνήστε τον οδηγό MOD</string>
 </resources>
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -55,9 +55,9 @@
  <string name="services_privacy_policy">Privacy Policy</string>
  <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_apply_theme">Apply the <xliff:g id="name" example="Material">%s</xliff:g> theme</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> enabling unique icons, wallpapers, and fonts.</string>
  <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
  <string name="services_use_secure_sms">Use secure SMS</string>
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
  <!-- MOD stuff -->
 </resources>
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -20,5 +20,6 @@
  <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
@@ -57,7 +57,6 @@
  <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> by automatically sending diagnostic and usage data to Cyanogen. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> features.</string>
  <string name="services_apply_theme">Apply the <xliff:g id="name" example="Material">%s</xliff:g> theme</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> enabling unique icons, wallpapers, and fonts.</string>
  <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
  <string name="services_use_secure_sms">Use secure SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> to encrypt SMS conversations with other users using secure SMS on a <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> device.</string>
@@ -74,5 +73,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,5 +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
@@ -55,7 +55,6 @@
  <string name="services_privacy_policy">Privateca politiko</string>
  <string name="services_help_improve_cm">Helpu por plibonigi <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_apply_theme">Apliki la etoson <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> ŝaltas unikajn piktogramojn, ekranfonojn kaj fontojn.</string>
  <string name="services_os_nav_keys_label"><b>Uzi ekran-klavojn </b> anstataŭ tiujn de la aparato.</string>
  <string name="services_use_secure_sms">Uzi sekurajn SMS</string>
  <string name="setup_unlock">Malŝlosi</string>
@@ -64,5 +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,5 +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
@@ -60,7 +60,7 @@
  <string name="services_help_improve_cm">Ayuda a mejorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> enviando automáticamente diagnósticos de depuración y uso de datos a Cyanogen. Esta información no puede ser utilizada para identificarte y sirve para mejorar la vida útil de la batería, el rendimiento de la aplicación y el desarrollo de nuevas características desarrolladas por <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">Aplicar el tema <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> activando iconos especiales, fondos de pantalla y tipos de fuente.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> permite un estilo visual único para sus iconos, fondo de pantalla y más.</string>
  <string name="services_os_nav_keys_label"><b>Usar las teclas de navegación en pantalla</b> en vez de las teclas físicas.</string>
  <string name="services_use_secure_sms">Usar SMS seguros</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> para encriptar conversaciones SMS con otros usuarios utilizando SMS seguros en un dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,7 +78,10 @@
  <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
@@ -60,7 +60,7 @@
  <string name="services_help_improve_cm">Ayuda a mejorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> enviando automáticamente diagnósticos de depuración y uso de datos a Cyanogen. Esta información no puede ser utilizada para identificarte, y sirve para ayudar a mejorar la vida de la batería, el rendimiento de la aplicación y el desarrollo de nuevas características desarrolladas por <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">Aplicar el tema <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> activando iconos especiales, fondos de pantalla y tipos de letra.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> permite un estilo visual único para sus iconos, fondo de pantalla y más.</string>
  <string name="services_os_nav_keys_label"><b>Usar las teclas de navegación en pantalla</b> en vez de las teclas físicas.</string>
  <string name="services_use_secure_sms">Usar SMS seguros</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> para encriptar conversaciones SMS con otros usuarios utilizando SMS seguros en un dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,7 +78,8 @@
  <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
@@ -56,7 +56,6 @@
  <string name="services_help_improve_cm">Aita parendada <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> saates automatselt diagnostika ja kasutamise infot Cyanogenile. Andmeid ei ole võimalik kasutada isiku tuvastamiseks. Teave aitab arendajatel muu hulgas parandada aku eluiga, rakenduste jõudlust ning arendada uusi <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> võimalusi.</string>
  <string name="services_apply_theme">Rakenda <xliff:g id="name" example="Material">%s</xliff:g> teema</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> võimaldades unikaalseid ikoone , taustapilte ja fonte.</string>
  <string name="services_os_nav_keys_label"><b>Kasuta ekraanil olevaid navigeerimisklahve</b> riistvaraliste nuppude asemel.</string>
  <string name="services_use_secure_sms">Kasuta turvalist SMS-i</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> et krüpteerida SMS vestluseid teiste turvalise SMSi kasutajetga <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> seadmel.</string>
@@ -73,5 +72,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
@@ -20,6 +20,7 @@
  <string name="next">Hurrengoa</string>
  <string name="skip">Saltatu</string>
  <string name="start">Hasi</string>
+  <string name="done">Eginda</string>
  <string name="ok">Ados</string>
  <string name="loading">Une bat\u2026</string>
  <string name="setup_complete">Ezarpena burutu da</string>
@@ -60,7 +61,7 @@
  <string name="services_help_improve_cm">Lagundu <xliff:g id="name" example="CyanogenMod">%s</xliff:g> hobetzen</string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> automatikoki diagnostiko eta erabilera datuak bidaliz Cyanogeni. Informazio hau ezin da erabili zu identifikatzeko eta bateriaren iraupena, aplikazioen errendimendua, eta <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ezaugarri berrietan lanean dabilen taldearentzat lagungarria da.</string>
  <string name="services_apply_theme">Aplikatu <xliff:g id="name" example="Material">%s</xliff:g> gaia</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> aparteko ikono, horma-paper eta letra-tipoak gaitzen.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> zure ikono, horma-irudi eta bestelakoentzat estilo bisual paregabe bat gaituz.</string>
  <string name="services_os_nav_keys_label"><b>Erabili pantailako nabigazio teklak</b> hardware teklen ordez.</string>
  <string name="services_use_secure_sms">Erabili SMS segurua</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> gailu batean SMS segurua erabiltzen duten beste erabiltzaileekin dituzun SMS elkarrizketak zifratzeko.</string>
@@ -78,7 +79,14 @@
  <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>
+  <string name="mod_welcome">Zure gailuak MODak onartzen ditu</string>
+  <string name="mod_description">Modak zure telefona azkarragoa, adimentsuagoa eta erabilerrazagoa egiten dute. Gida honetan, mod berriak ezagutuko dituzu, zer egiten duten ulertu, eta nola gaitu eta desgaitu ikasiko duzu.</string>
+  <string name="mod_explore">Aztertu MOD gida</string>
 </resources>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -56,7 +56,6 @@
  <string name="services_help_improve_cm">به بهبود <xliff:g id="name" example="CyanogenMod">%s</xliff:g> کمک کنید</string>
  <string name="services_metrics_label">با ارسال خودکار داده‌های تشخیصی ومیزان استفاده به سایانوژن <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>. از این داده‌ها برای تعیین هویت شما استفاده نمی‌شود و صرفاً کمکی است به تیم‌هایی که بر روی قابلیت‌هایی نظیر عمر باتری، عملکرد برنامه‌ها و ویژگی‌های جدید <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> کار می‌کنند.</string>
  <string name="services_apply_theme">اعمال تم <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> که آیکون‌ها، کاغذدیواری‌ها و فونت‌هایی بی‌نظیر را فعال می‌کند.</string>
  <string name="services_os_nav_keys_label"><b>استفاده از کلیدهای پیمایش صفحه نمایش</b> به جای کلیدهای سخت‌افزاری.</string>
  <string name="services_use_secure_sms">استفاده از پیامک امن</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> تا مکالمات پیامکی با کاربران دیگری که از پیامک امن در دستگاه مبتنی بر <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> استفاده می‌کنند، رمزنگاری شود.</string>
@@ -73,5 +72,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
@@ -20,6 +20,7 @@
  <string name="next">Seuraava</string>
  <string name="skip">Ohita</string>
  <string name="start">Aloita</string>
+  <string name="done">Valmis</string>
  <string name="ok">OK</string>
  <string name="loading">Odota hetki\u2026</string>
  <string name="setup_complete">Asennus on valmis</string>
@@ -60,7 +61,7 @@
  <string name="services_help_improve_cm">Auta parantamaan <xliff:g id="name" example="CyanogenMod">%s</xliff:g>ia</string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> lähettämällä vianmääritys- ja käyttötietoja Cyanogenille. Tietoja ei voi käyttää tunnistamiseen. Tiedot auttavat kehittäjiä muun muassa parantamaan akun kestoa, sovellusten suorituskykyä ja kehittämään <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>iin uusia ominaisuuksia.</string>
  <string name="services_apply_theme">Ota <xliff:g id="name" example="Material">%s</xliff:g>-teema käyttöön</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> käyttääksesi ainutlaatuisia kuvakkeita, taustakuvia ja fontteja.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> käyttääksesi ainutlaatuista ulkoasua kuvakkeissa, taustakuvissa ja fonteissa.</string>
  <string name="services_os_nav_keys_label"><b>Käytä näytön navigointipalkkia</b> fyysisten näppäinten sijaan.</string>
  <string name="services_use_secure_sms">Käytä turvallisia tekstiviestejä</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> salataksesi tekstiviestikeskustelut muiden turvallisia tekstiviestejä ja <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>ia käyttävien henkilöiden kanssa.</string>
@@ -78,7 +79,14 @@
  <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>
+  <string name="mod_welcome">Laitteesi on MOD-valmis</string>
+  <string name="mod_description">Modit tekevät puhelimestasi nopeamman, älykkäämmän ja helpomman käyttää. Tässä oppaassa voit tutustua uusiin modeihin, oppia mitä ne tekevät, ja ottaa käyttöön tai poistaa ne käytöstä.</string>
+  <string name="mod_explore">Tutustu MOD-oppaaseen</string>
 </resources>
--- a/res/values-fil-rPH/strings.xml
+++ b/res/values-fil-rPH/strings.xml
@@ -17,5 +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,5 +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
@@ -20,6 +20,7 @@
  <string name="next">Suivant</string>
  <string name="skip">Ignorer</string>
  <string name="start">Commencer</string>
+  <string name="done">Effectué</string>
  <string name="ok">OK</string>
  <string name="loading">Juste une seconde\u2026</string>
  <string name="setup_complete">Configuration terminée</string>
@@ -60,7 +61,7 @@
  <string name="services_help_improve_cm">Aider à améliorer <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Aider à l\'amélioration de CyanogenMod">%1$s</xliff:g> en envoyant automatiquement des données de diagnostics et d\'utilisation à Cyanogen. Ces informations ne peuvent pas être utilisées pour vous identifier et elles pourront aider les équipes qui travaillent sur des choses telles que la durée de vie de la batterie, les performances des applications et les nouvelles fonctionnalités de <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">Appliquer le thème <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Appliquer le thème Material">%s</xliff:g> active les icônes uniques, fonds d\'écran, et polices.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> permettant l\'utilisation d\'un style visuel unique pour vos icônes, fond d\'écran et plus.</string>
  <string name="services_os_nav_keys_label"><b>Utilisation des touches de navigation de l\'écran</b> au lieu des touches physiques.</string>
  <string name="services_use_secure_sms">Utiliser les SMS sécurisés</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> pour crypter les conversations SMS avec les autres utilisateurs utilisant les SMS sécurisés sur leurs appareils <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,7 +79,10 @@
  <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
@@ -17,5 +17,6 @@
 -->
 <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,5 +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,5 +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
@@ -56,7 +56,6 @@
  <string name="services_help_improve_cm">Axuda a mellorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Axuda a mellorar CyanogenMod">%1$s</xliff:g> enviando automaticamente diagnóstico e uso de datos a Cyanogen. Esta información non se pode utilizar para identificalo a vostede e acaba nas mans dos equipos que traballan en cousas como a duración da batería, rendemento das aplicacións e novas características de <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">Aplicar o tema <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Aplicar o tema Material">%s</xliff:g> activando as iconas, fondos de pantalla e tipos de letra.</string>
  <string name="services_os_nav_keys_label"><b>Usar as teclas de navegación</b> en vez das do hardware.</string>
  <string name="services_use_secure_sms">Empregar SMS seguras</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Utilizar SMS seguras">%1$s</xliff:g> para cifrar conversas por SMS con outros usuarios utilizando SMS seguras nun dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -73,5 +72,7 @@
  <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>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Como quere bloquear a súa pantalla?</string>
  <!-- MOD stuff -->
 </resources>
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -60,7 +60,6 @@
  <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>
  <string name="services_os_nav_keys_label">હાર્ડવેર કીને બદલે <b>સ્ક્રીન નૅવિગેશન કીનો ઉપયોગ કરો</b>.</string>
  <string name="services_use_secure_sms">સુરક્ષિત SMS નો ઉપયોગ કરો</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> અન્ય ઉપયોગકર્તાઓ સાથેના SMS વાર્તાલાપો <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ડિવાઇસ પર એન્ક્રિપ્ટ કરશે જે સુ‌રક્ષિત SMSનો ઉપયોગ કરીને કરશે.</string>
@@ -78,5 +77,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
@@ -56,7 +56,6 @@
  <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> को सुधारने में मदद करें</string>
  <string name="services_metrics_label">सियानोजेन को अपने आप ही निदानात्मक और उपयोग से संबंधित डेटा भेजकर <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>। इस जानकारी का उपयोग आपको पहचानने के लिए नहीं हो सकता है। वह केवल बैटरी की आयु, ऐप के निष्पादन और नए <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> प्रकार्यों पर काम करने वाली टीमों की मदद के लिए है।</string>
  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> थीम को लागू करें</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> जो अद्वितीय आइकन, वॉलपेपर, और फ़ॉन्टों को सक्षम करता है।</string>
  <string name="services_os_nav_keys_label">हार्डवेयर कुंजियों की जगह <b>स्क्रीन पर मौजूद नेविगेशन कुंजियों का उपयोग करें।</b></string>
  <string name="services_use_secure_sms">सुरक्षित एसएमएस का उपयोग करें</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> से सुरक्षित एसएमएस का उपयोग करने वाले अन्य उपयोगकर्ताओं के साथ के एसएमएस वार्तालापों को <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> उपकरण में कूटलेखित करें।</string>
@@ -73,5 +72,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,16 @@
  <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="done">Gotovo</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,14 +54,14 @@
  <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>
  <string name="services_help_improve_cm">Pomozite poboljšati <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Pomozite poboljšati CyanogenMod">%1$s</xliff:g> automatskim slanjem dijagnostike i korištenja podataka u Cyanogen. Ove informacije se neće koristiti za vašu identifikaciju i pomaže timovima koji rade na stvarima kao što su trajanje baterije, performanse aplikacija, i novim <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> karakteristikama.</string>
  <string name="services_apply_theme">Primijeni <xliff:g id="name" example="Material">%s</xliff:g> temu</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> omogućuje jedinstvene ikone, pozadine i fontove.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> omogućuje jedinstven vizualni stil za vaše ikone, pozadine i više.</string>
  <string name="services_os_nav_keys_label"><b>Koristite navigacijske tipke na zaslonu</b>umjesto hardverskih tipki.</string>
  <string name="services_use_secure_sms">Koristi siguran SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> za zaštitu SMS razgovora s drugim korisnicima koristeći siguran SMS na<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> uređaju.</string>
@@ -78,7 +79,14 @@
  <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>
+  <string name="mod_welcome">Vaš uređaj je MOD Spreman</string>
+  <string name="mod_description">Modovi čine telefon bržim, pametnijim i lakšim za korištenje. U ovom vodiču, možete otkriti nove modove, saznati što oni sve mogu, te ih omogućiti ili onemogućiti.</string>
+  <string name="mod_explore">Istražite MOD Vodič</string>
 </resources>
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -20,6 +20,7 @@
  <string name="next">Következő</string>
  <string name="skip">Kihagyás</string>
  <string name="start">Indít</string>
+  <string name="done">Kész</string>
  <string name="ok">OK</string>
  <string name="loading">Csak egy pillanat\u2026</string>
  <string name="setup_complete">Beállítás kész</string>
@@ -60,7 +61,7 @@
  <string name="services_help_improve_cm">Segítsen javítani <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> a Cyanogen részére történő automatikus diagnosztikai és használati adatok küldésével. Ez az információ nem használható az Ön beazonosítására, csupán segítséget nyújt a csapat számára például az akkumulátor használat, alkalmazás teljesítmény, és más új <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funkciók fejlesztésében.</string>
  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> téma alkalmazása</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> lehetővé teszi az egyéni ikonok, háttérképek és betűtípusok használatát.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> engedélyezésével egyedi stílust alkalmaz az ikonokhoz, háttérképhez, stb.</string>
  <string name="services_os_nav_keys_label"><b>A képernyő navigációs gombjainak használata</b> a hardveres gombok helyett.</string>
  <string name="services_use_secure_sms">Biztonságos SMS használata</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> az SMS beszélgetések titkosításához más olyan felhasználókkal, akik szintén biztonságos SMS-t használnak <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> eszközön.</string>
@@ -78,5 +79,14 @@
  <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">Készüléke MOD képes</string>
+  <string name="mod_description">A Mod-ok gyorsabbá, okosabbá és könnyen kezelhetőbbé teszik a készülékét. Ebben az útmutatóban új Mod-okat fedezhet fel, megtudhatja hogyan működnek, engedélyezheti vagy kikapcsolhatja őket.</string>
+  <string name="mod_explore">Mod útmutató</string>
 </resources>
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -17,5 +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
@@ -20,6 +20,7 @@
  <string name="next">Berikutnya</string>
  <string name="skip">Lewati</string>
  <string name="start">Mulai</string>
+  <string name="done">Selesai</string>
  <string name="ok">OKE</string>
  <string name="loading">Hanya sec\u2026</string>
  <string name="setup_complete">Penyiapan selesai</string>
@@ -45,10 +46,10 @@
  <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">Nyalakan data seluler</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? Menyalakan data seluler dapat dikenakan biaya data.</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>
@@ -60,7 +61,7 @@
  <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_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> mengaktifkan gaya visual unik untuk ikon, gambar latar dan lainnya.</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>
@@ -78,7 +79,14 @@
  <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>
+  <string name="mod_welcome">Perangkat anda sudah siap MOD</string>
+  <string name="mod_description">Modifikasi membuat telepon anda lebih cepat, lebih cerdas, dan mudah digunakan. Dalam panduan ini, anda dapat menemukan modifikasi baru, belajar apa yang mereka lakukan, dan mengaktifkan atau menonaktifkan mereka.</string>
+  <string name="mod_explore">Jelajahi panduan MOD</string>
 </resources>
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -17,5 +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
@@ -20,6 +20,7 @@
  <string name="next">Prossimo</string>
  <string name="skip">Salta</string>
  <string name="start">Inizio</string>
+  <string name="done">Fatto</string>
  <string name="ok">Ok</string>
  <string name="loading">Solo un secondo\u2026</string>
  <string name="setup_complete">Installazione completata</string>
@@ -60,7 +61,7 @@
  <string name="services_help_improve_cm">Aiuta a migliorare <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> inviando automaticamente dati diagnostici e di consumo agli svilupatori. Queste informazioni non possono essere utilizzate per identificare te e danno una mano ai team che lavorano su cose come la durata della batteria, performance delle app e nuove funzioni di <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">Applica il 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> attiva icone, sfondi e caratteri unici.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> attiverà uno stile unico per le tue icone, sfondi e altro.</string>
  <string name="services_os_nav_keys_label"><b>Usa i pulsanti virtuali a schermo</b> invece di quelli fisici.</string>
  <string name="services_use_secure_sms">Utilizza SMS sicuri</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> per criptare le conversazioni con gli altri utenti via SMS su un dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,7 +79,14 @@
  <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>
+  <string name="mod_welcome">Il tuo dispositivo è Mod Ready</string>
+  <string name="mod_description">Le Mod rendono il dispositivo più veloce, intelligente e facile da usare. In questa guida puoi esplorare nuove Mod, conoscerne il funzionamento, attivarle o disattivarle.</string>
+  <string name="mod_explore">Esplora la guida delle Mod</string>
 </resources>
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -20,6 +20,7 @@
  <string name="next">הבא</string>
  <string name="skip">דלג</string>
  <string name="start">התחל</string>
+  <string name="done">בוצע</string>
  <string name="ok">אישור</string>
  <string name="loading">רק רגע\u2026</string>
  <string name="setup_complete">ההגדרה הושלמה</string>
@@ -60,7 +61,7 @@
  <string name="services_help_improve_cm">עזור בשיפור <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> על-ידי שליחת נתוני אבחון ושימוש אל Cyanogen. מידע זה לא יוכל לשמש כדי לזהותך, והוא תורם לצוותים העובדים על תחומים כמו חיי סוללה, ביצועים ותכונות חדשות ל-<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">החל את ערכת העיצוב <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> מאפשר סמלים ייחודיים, טפטים וגופנים.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> מאפשר סגנון גרפי ייחודי לסמלים, טפטים ועוד.</string>
  <string name="services_os_nav_keys_label"><b>השתמש במקשי הניווט במסך</b> במקום במקשים הפיזיים.</string>
  <string name="services_use_secure_sms">השתמש ב-SMS מאובטח</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> להצפנת שיחות SMS עם משתמשים אחרים באמצעות SMS מאובטח במכשיר <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,7 +79,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">‏הגדר 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
@@ -20,6 +20,7 @@
  <string name="next">次へ</string>
  <string name="skip">スキップ</string>
  <string name="start">開始</string>
+  <string name="done">完了</string>
  <string name="ok">OK</string>
  <string name="loading">しばらくお待ちください\u2026</string>
  <string name="setup_complete">セットアップが完了しました</string>
@@ -57,10 +58,10 @@
  <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>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>すると、アイコンや壁紙などに対してテーマ固有の外観スタイルが有効になります。</string>
  <string name="services_os_nav_keys_label">ハードウェアキーのかわりに<b>スクリーンナビゲーションキーを使用します</b>。</string>
  <string name="services_use_secure_sms">セキュアSMSを使用します</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>端末でセキュアSMSを使用している他のユーザーとのSMSの会話を自動的に暗号化するために<xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>。</string>
@@ -78,7 +79,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 -->
-  <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,5 +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,5 +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,5 +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
@@ -60,7 +60,6 @@
  <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>
  <string name="services_os_nav_keys_label">ಹಾರ್ಡ್‍ವೇರ್ ಕೀಗಳ ಬದಲಾಗಿ <b>ಪರದೆಯ ಮೇಲಿನ ನಾವಿಗೇಶನ್ ಕೀಗಳನ್ನು ಉಪಯೋಗಿಸಿ</b>.</string>
  <string name="services_use_secure_sms">ಸುರಕ್ಷಿತ ಎಸ್ಎಂಎಸ್ ಉಪಯೋಗಿಸಿ</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ಸಾಧನದಲ್ಲಿ ಇತರೆ ಬಳಕೆದಾರರ ಜೊತೆಗಿನ ಎಸ್ಎಂಎಸ್ ಸಂಭಾಷಣೆಗಳನ್ನು ಸುರಕ್ಷಿತ ಎಸ್ಎಂಎಸ್ ಉಪಯೋಗಿಸಿ ಎನ್ಕ್ರಿಪ್ಟ್ ಮಾಡಲು <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>.</string>
@@ -78,5 +77,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
@@ -60,7 +60,7 @@
  <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="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>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>은 독특한 아이콘, 배경화면 등을 제공합니다.</string>
  <string name="services_os_nav_keys_label">하드웨어 키 대신 <b>화면 상의 내비게이션 키</b>를 사용합니다.</string>
  <string name="services_use_secure_sms">보안 SMS 사용</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="보안 SMS를 사용">%1$s</xliff:g>하여 <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>기기에서 보안 SMS를 사용하는 다른 사용자와의 SMS 대화를 암호화함.</string>
@@ -79,7 +79,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 -->
-  <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,5 +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,5 +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
@@ -56,7 +56,6 @@
  <string name="services_help_improve_cm">Hëllef <xliff:g id="name" example="CyanogenMod">%s</xliff:g> ze verbesseren</string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> andeem s du automatesch Diagnos- a Benotzungsdaten u CyanogenMod schécks. Dës Informatioune kënnen net benotzt ginn, fir dech z\'identifiéieren. Et hëlleft eisen Equippen, déi u Saache wéi Akkulafzäit, App-Leeschtung oder un neie <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-Funktioune schaffen.</string>
  <string name="services_apply_theme">Den Design <xliff:g id="name" example="Material">%s</xliff:g> applizéieren</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>, fir spezifesch Symboler, Hannergrondbiller a Schrëften z\'aktivéieren.</string>
  <string name="services_os_nav_keys_label"><b>Schierm-Navigatiounstasten</b> amplaz Hardwaretaste benotzen.</string>
  <string name="services_use_secure_sms">Sécher SMSe benotzen</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>, fir SMS-Konversatioune mat anere Benotzer op engem <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-Apparat ze verschlësselen.</string>
@@ -73,5 +72,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,5 +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
@@ -56,7 +56,6 @@
  <string name="services_help_improve_cm">Padėti tobulinti <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> automatiškai siunčiant diagnostikos ir naudojimo duomenis „Cyanogen“. Ši informacija negali būti naudojama jūsų identifikavimui, pateikti duomenys padės komandoms dirbančioms prie akumuliatoriaus veikimo laiko, programų našumo ir naujų <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funkcijų.</string>
  <string name="services_apply_theme">Taikyti <xliff:g id="name" example="Material">%s</xliff:g> temą</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> įgalina unikalias piktogramas, ekrano fonus ir šriftus.</string>
  <string name="services_os_nav_keys_label"><b>Naudokite ekrane rodomus naršymo klavišus</b> vietoj aparatūrinių klavišų.</string>
  <string name="services_use_secure_sms">Naudoti saugius SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>, kad užšifruoti SMS pokalbius su kitais vartotojais, naudojančiais saugius SMS <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> įrenginyje.</string>
@@ -73,5 +72,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
@@ -56,7 +56,6 @@
  <string name="services_help_improve_cm">Palīdziet uzlabot <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Palīdziet uzlabot CyanogenMod">%1$s</xliff:g> automātiski sūtot diagnostikas informāciju un ierīces lietojumu uz Cyanogen serveriem. Šī informācija nevar tikt izmantota lai Jūs identificētu, bet gan palīdzēs komandām kas strādā pie baterijas taupīšana, lietotņu veiktspēja, jaunām <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> iespējām un citiem uzlabojumiem.</string>
  <string name="services_apply_theme">Lietot <xliff:g id="name" example="Material">%s</xliff:g> tēmu</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Lietot Materiālo tēmu">%s</xliff:g> ļaujot lietot unikālas ikonas, ekrāntapetes un fontus.</string>
  <string name="services_os_nav_keys_label"><b>Izmantot ekrānā redzamos navigācijas taustiņus</b> fizisko taustiņu vietā.</string>
  <string name="services_use_secure_sms">Izmantot drošu SIM</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Izmantot drošu SIM">%1$s</xliff:g> lai šifrētu SMS sarunas ar citiem lietotājiem, kas arī izmanto šifrētas SMS <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ierīcē.</string>
@@ -73,5 +72,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,5 +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
@@ -60,7 +60,6 @@
  <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>
  <string name="services_os_nav_keys_label">ഹാര്‍ഡ്‌വെയര്‍ കീകൾക്ക് പകരം സ്ക്രീൻ <b>നാവിഗേഷൻ കീകൾ ഉപയോഗിക്കുക.</b></string>
  <string name="services_use_secure_sms">സുരക്ഷിത SMS ഉപയോഗിക്കുക</string>
  <string name="services_secure_sms_label">ഒരു <xliff:g id="name" example="Use secure SMS">%2$s</xliff:g> ഉപകരണത്തില്‍ സുരക്ഷിത SMS ഉപയോഗിച്ച് മറ്റ് ഉപയോക്താക്കളുമായി SMS സംഭാഷണങ്ങൾ എൻക്രിപ്റ്റ് ചെയ്യുന്നതിന് <xliff:g id="name" example="CyanogenMod">%1$s</xliff:g>.</string>
@@ -78,5 +77,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,5 +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
@@ -60,7 +60,6 @@
  <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>सुधारण्यासाठी मदत करा</string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> Cyanogen कडे निदानात्मक आणि वापर डेटा स्वयंचलितपणे पाठवून. तुम्हाला ओळखण्यासाठी ही माहिती वापरता येत नाही आणि बॅटरी आयु, अनुप्रयोगची कामगिरी आणि नवीन <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> वैशिष्ट्ये यांसारख्या गोष्टींवर काम करण्यासाठी संघांना हात देते.</string>
  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> थीम लागू करा</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> वैशिष्ट्यपूर्ण प्रतीके, वॉलपेपर्स आणि फाँट्स सक्षम करणे.</string>
  <string name="services_os_nav_keys_label">हार्डवेअर कींच्या ऐवजी <b>स्क्रीन नॅविगेशन कींवर वापरा</b>.</string>
  <string name="services_use_secure_sms">सुरक्षित SMS वापरा</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> SMS संभाषणे <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> डिव्हाइसवर सुरक्षित SMS वापरणाऱ्या इतर वापरकर्त्यांसह एनक्रिप्ट करण्यासाठी.</string>
@@ -78,5 +77,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,5 +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,5 +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
@@ -20,6 +20,7 @@
  <string name="next">Neste</string>
  <string name="skip">Hopp over</string>
  <string name="start">Start</string>
+  <string name="done">OK</string>
  <string name="ok">Ok</string>
  <string name="loading">vent noen sekunder\u2026</string>
  <string name="setup_complete">Konfigureringen er ferdig</string>
@@ -78,7 +79,14 @@
  <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>
+  <string name="mod_welcome">Enheten din er MOD Klargjort</string>
+  <string name="mod_description">Mods gjør telefonen din raskere, smartere og enklere å bruke. I denne veiledningen, kan du oppdage nye mods, lære om hva de gjør, og aktivere eller deaktivere dem.</string>
+  <string name="mod_explore">Utforsk MOD Veiledning</string>
 </resources>
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -17,5 +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
@@ -20,6 +20,7 @@
  <string name="next">Volgende</string>
  <string name="skip">Overslaan</string>
  <string name="start">Beginnen</string>
+  <string name="done">Gereed</string>
  <string name="ok">OK</string>
  <string name="loading">Even geduld\u2026</string>
  <string name="setup_complete">Instellen voltooid</string>
@@ -60,7 +61,6 @@
  <string name="services_help_improve_cm">Help mee met het verbeteren van <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> door automatisch diagnose- en verbruiksgegevens te verzenden naar Cyanogen. Deze informatie kan niet gebruikt worden om u te identificeren en helpt de teams om te werken aan zaken zoals levensduur van de accu, app-prestaties en nieuwe <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-functies.</string>
  <string name="services_apply_theme">Thema <xliff:g id="name" example="Material">%s</xliff:g> toepassen</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> voor unieke pictogrammen, achtergronden en lettertypen.</string>
  <string name="services_os_nav_keys_label"><b>On-screen navigatieknoppen</b> gebruiken in plaats van de hardwareknoppen.</string>
  <string name="services_use_secure_sms">Beveiligde sms-berichten gebruiken</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> om sms-gesprekken te versleutelen met anderen die ook beveiligde sms-berichten gebruiken op een <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-apparaat.</string>
@@ -78,5 +78,10 @@
  <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_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,5 +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
@@ -60,7 +60,6 @@
  <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>ଉନ୍ନତି କରିବାରେ ସାହାଯ୍ୟ କରନ୍ତୁ</string>
  <string name="services_metrics_label">ଡାଇଗ୍ନୋଷ୍ଟିକ‍ ସ୍ୱତଃ ଭାବେ ପଠାଇ ଓ ସିଆନୋଜେନ୍‍କୁ ବ୍ୟବହୃତ ଡାଟା ପଠାଇ<xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> । ଏହି ସୂଚନା ଆପଣଙ୍କୁ ଚିହ୍ନଟ କରିବା ପାଇଁ ବ୍ୟବହୃତ କରିହେବ ନା୍ହିଁ ଓ ବ୍ୟାଟେରୀ ବ୍ୟବହାର ଅବଧି, ଆପ୍ଲିକେସନ୍‍ କାର୍ଯ୍ୟକାରିତା, ଓ ନୂଆ  <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ବୈଶିଷ୍ଟ୍ୟ ଉପରେ କାର୍ଯ୍ୟ କରିବାରେ ସାହାଯ୍ୟ କରିବ।</string>
  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> ଥିମ୍‍ ଜାରି କରନ୍ତୁ</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ନିର୍ଦ୍ଦିଷ୍ଟ ଆଇକନ୍‍, ୱାଲ୍‍ପେପର୍‍, ଓ ଫଣ୍ଟ ସ‍କ୍ଷମ କରୁଛି।</string>
  <string name="services_os_nav_keys_label">ହା୍ର୍ଡ୍‍ଓୟାର୍‍ କୀ ବଦଳରେ<b>ଅନ୍‍ସ୍କ୍ରିନ୍‍ ନେଭିଗେସନ୍‍ କୀ ବ୍ୟବହାର କରନ୍ତୁ</b> ।</string>
  <string name="services_use_secure_sms">ସୁର‍କ୍ଷିତ SMS ବ୍ୟବହାର କରନ୍ତୁ</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$S</xliff:g> SMS କଥା୍ବାର୍ତ୍ତା ଅନ୍ୟ ଉପଭୋକ୍ତାଙ୍କ ସହିତ ସୁରଷିତ SMS  <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ଡିଭାଇସ୍‍ରେ ବ୍ୟବହାର କରିବା ପାଇଁ।</string>
@@ -78,5 +77,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,5 +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
@@ -20,6 +20,7 @@
  <string name="next">Dalej</string>
  <string name="skip">Pomiń</string>
  <string name="start">Rozpocznij</string>
+  <string name="done">Gotowe</string>
  <string name="ok">OK</string>
  <string name="loading">Chwileczkę\u2026</string>
  <string name="setup_complete">Konfiguracja zakończona</string>
@@ -60,7 +61,7 @@
  <string name="services_help_improve_cm">Pomóż ulepszać <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Pomóż nam w ulepszaniu CyanogenMod">%1$s</xliff:g> zezwalając na automatyczne przesyłanie danych diagnostycznych oraz użytkowania do Cyanogen. Te informacje nie będą mogły zostać użyte do identyfikacji i stanowią pomoc dla zespołów pracujących nad czasem pracy baterii, wydajnością aplikacji oraz nowymi funkcjami <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">Zastosuj motyw <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> zawiera unikalne ikony, tapety oraz czcionki.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> zastosuje unikalny styl dla Twoich ikon, tapety i wiele więcej.</string>
  <string name="services_os_nav_keys_label"><b>Użyj ekranowych przycisków nawigacyjnych</b> zamiast klawiszy sprzętowych.</string>
  <string name="services_use_secure_sms">Używaj bezpiecznych wiadomości SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Użyj bezpiecznych SMS">%1$s</xliff:g>, aby prowadzić szyfrowane konwersacje z innymi użytkownikami korzystającymi z bezpiecznych SMS na urządzeniach z <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,5 +79,14 @@
  <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">Urządzenie jest gotowe na MODy</string>
+  <string name="mod_description">MODy robią Twój telefon szybszym, inteligentniejszym i łatwiejszym w obsłudze. W tym przewodniku możesz odkryć nowe MODy, dowiedzieć się co one robią, włączać i wyłączać je.</string>
+  <string name="mod_explore">Poznaj przewodnik po MODach</string>
 </resources>
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -20,6 +20,7 @@
  <string name="next">Próximo</string>
  <string name="skip">Pular</string>
  <string name="start">Início</string>
+  <string name="done">Concluído</string>
  <string name="ok">Ok</string>
  <string name="loading">Aguarde um segundo\u2026</string>
  <string name="setup_complete">Configuração concluída</string>
@@ -60,7 +61,7 @@
  <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_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ativando um estilo visual exclusivo para os seus ícones, papéis de parede, etc.</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>
  <string name="services_use_secure_sms">Usar SMS seguro</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> para criptografar conversas SMS com outros usuários que usam o SMS seguro em um dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,7 +79,14 @@
  <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>
+  <string name="mod_welcome">Seu dispositivo esta pronto para MOD</string>
+  <string name="mod_description">Mods deixa o seu telefone mais rápido, mais inteligente e mais fácil de usar. Neste guia, você pode descobrir novos mods, aprende o que eles fazem e os ativa ou desativa.</string>
+  <string name="mod_explore">Guia de exploração de MODs</string>
 </resources>
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -20,6 +20,7 @@
  <string name="next">Próximo</string>
  <string name="skip">Saltar</string>
  <string name="start">Início</string>
+  <string name="done">Concluído</string>
  <string name="ok">OK</string>
  <string name="loading">Um momento\u2026</string>
  <string name="setup_complete">A configuração está completa</string>
@@ -78,7 +79,14 @@
  <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>
+  <string name="mod_welcome">O seu dispositivo está pronto para os MODS</string>
+  <string name="mod_description">Os Mods tornam o seu telefone mais rápido, mais inteligente e mais fácil de usar. Neste guia pode descobrir novos mods, aprender o que eles fazem e ativá-los ou desativá-los.</string>
+  <string name="mod_explore">Explorar o Guia MOD</string>
 </resources>
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -17,5 +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
@@ -59,7 +59,6 @@
  <string name="services_privacy_policy">Politica de confidențialitate</string>
  <string name="services_help_improve_cm">Ajută la îmbunătățirea <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_apply_theme">Aplică 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> activând pictograme, imagini de fundal, și fonturi unice.</string>
  <string name="services_os_nav_keys_label"><b>Utilizează tastele de navigare de pe ecran</b> în locul tastelor fizice.</string>
  <string name="services_use_secure_sms">Utilizează SMS securizat</string>
  <string name="setup_unlock">Deblocare</string>
@@ -73,5 +72,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
@@ -20,6 +20,7 @@
  <string name="next">Далее</string>
  <string name="skip">Пропустить</string>
  <string name="start">Начать</string>
+  <string name="done">Готово</string>
  <string name="ok">ОК</string>
  <string name="loading">Секунду\u2026</string>
  <string name="setup_complete">Настройка завершена</string>
@@ -60,7 +61,7 @@
  <string name="services_help_improve_cm">Помочь улучшить <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>, разрешив отправление данных диагностики в Cyanogen. Эта информация полностью анонимна и не может быть использована для вашей идентификации. Использование этих данных поможет в работе над энергосбережением, производительностью и многими деталями <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">Применить тему «<xliff:g id="name" example="Material">%s</xliff:g>»</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> и использовать её значки, обои и шрифты.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> предоставляет уникальный визуальный стиль для ваших значков, обоев и многого другого.</string>
  <string name="services_os_nav_keys_label"><b>Использовать экранные навигационные кнопки</b> вместо аппаратных.</string>
  <string name="services_use_secure_sms">Использовать безопасные SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> для шифрования сообщений, передаваемых другим пользователям устройств с <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,7 +79,14 @@
  <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>
+  <string name="mod_welcome">Ваше устройство поддерживает моды</string>
+  <string name="mod_description">Моды делают ваш телефон быстрее, умнее и проще в использовании. В этом руководстве вы можете открыть для себя новые моды, узнать, что они делают, и включить или отключить их.</string>
+  <string name="mod_explore">Изучите руководство по модам</string>
 </resources>
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -17,5 +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
@@ -56,7 +56,6 @@
  <string name="services_help_improve_cm">Pomôcť vylepšovať <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> automatickým zasielaním diagnostických údajov a údajov o používaní do Cyanogenu. Tieto informácie sa nepoužijú na vašu identifikáciu, ale pomôžu tímom pracujúcim na výdrži, výkone aplikácií a nových funkciách <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">Použiť tému <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> umožňuje používanie unikátnych ikon, tapiet a písiem.</string>
  <string name="services_os_nav_keys_label"><b>Používajte navigačné tlačidlá na obrazovke</b> namiesto hardvérových tlačidiel.</string>
  <string name="services_use_secure_sms">Používajte zabezpečené SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> pre šifrovanie SMS konverzácií s ostatnými používateľmi prostredníctvom zabezpečených SMS na zariadení s <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -73,5 +72,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
@@ -20,6 +20,7 @@
  <string name="next">Naprej</string>
  <string name="skip">Preskoči</string>
  <string name="start">Začni</string>
+  <string name="done">Končano</string>
  <string name="ok">V redu</string>
  <string name="loading">Samo trenutek \u2026</string>
  <string name="setup_complete">Namestitev je končana</string>
@@ -60,7 +61,7 @@
  <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>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>, ki omogoča edinstvene ikone, slike ozadja in pisave.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>, ki omogoča edinstven vidni slog za vaše ikone, sliko ozadja in še več.</string>
  <string name="services_os_nav_keys_label"><b>Uporabite zaslonske tipke za krmarjenje</b> namesto fizičnih tipk.</string>
  <string name="services_use_secure_sms">Uporabite varne SMS-e</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>, da šifrirate pogovore SMS z drugimi uporabniki z uporabo varnih SMS-ov na napravi <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,7 +79,14 @@
  <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>
+  <string name="mod_welcome">Vaša naprava je pripravljena za modifikacije</string>
+  <string name="mod_description">Modifikacije naredijo vaš telefon hitrejši, pametnejši in enostavnejši za uporabo. V tem vodniku lahko odkrijete nove modifikacije, se naučite, kaj naredijo, in jih omogočite ali onemogočite.</string>
+  <string name="mod_explore">Razišči vodnik za modifikacije</string>
 </resources>
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -17,5 +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
@@ -20,6 +20,7 @@
  <string name="next">Следеће</string>
  <string name="skip">Прескочи</string>
  <string name="start">Почетак</string>
+  <string name="done">Завршено</string>
  <string name="ok">OK</string>
  <string name="loading">Само секунд\u2026</string>
  <string name="setup_complete">Подешавање је завршено</string>
@@ -60,7 +61,7 @@
  <string name="services_help_improve_cm">Помозите да побољшамо <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> аутоматским слањем дијагностике и коришћења података у Cyanogen. Ове информације се неће користити за вашу идентификацију и далазе у руку да тимова који раде на стварима као што су трајање батерије, перформансе апликација, и новим <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> карактеристикама.</string>
  <string name="services_apply_theme">Примени <xliff:g id="name" example="Material">%s</xliff:g> тему</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> омогућава јединствене иконе, тапете и фонтове.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> омогућава јединствени визуелни стил за иконе, тапете и остало.</string>
  <string name="services_os_nav_keys_label"><b>Користите навигационе тастере на екрану</b> уместо хардверских тастера.</string>
  <string name="services_use_secure_sms">Користи безбедан SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> да заштитиш SMS преписку са другим корисницима користећи безбедан SMS на <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> уређају.</string>
@@ -78,7 +79,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 -->
-  <string name="mod_welcome">Добродошли у доба после апликација</string>
-  <string name="mod_description">Режими су интелигентна, свесна и лагана искуства уграђена директно у ОС. Када режим мисли да може помоћи, он ће понудити да активира то за вас.</string>
 </resources>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -60,7 +60,6 @@
  <string name="services_help_improve_cm">Hjälp till att förbättra <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> genom att automatiskt skicka diagnostisk och användningsdata till Cyanogen. Denna information kan inte användas för att identifiera dig och kan hjälpa team att arbeta på saker så som batteritid, app-prestanda, och nya<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funktioner.</string>
  <string name="services_apply_theme">Tillämpa temat <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> aktiverar unika ikoner, bakgrunder, och typsnitt.</string>
  <string name="services_os_nav_keys_label"><b>Använder styrtangenter på skärmen</b> i stället för fysiska knappar.</string>
  <string name="services_use_secure_sms">Använd säker SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> för att kryptera SMS-konversationer med andra användare med hjälp av säkra SMS på en<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> enhet.</string>
@@ -78,5 +77,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,5 +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
@@ -60,7 +60,6 @@
  <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>
  <string name="services_os_nav_keys_label"><b>வன்பொருள் விசைகளுக்கு பதிலாக திரையிலுள்ள</b> வழிச்செல்லுதல் விசைகளை பயன்படுத்தவும்</string>
  <string name="services_use_secure_sms">பாதுகாப்பான SMSஐ பயன்படுத்தவும்</string>
  <string name="services_secure_sms_label">பாதுகாப்பான SMSஐ <xliff:g id="name" example="Use secure SMS">%2$s</xliff:g> சாதனத்தில் பிற பயனர்களோடு SMS உரையாடல்களை <xliff:g id="name" example="CyanogenMod">%1$s</xliff:g> குறியாக்கவுள்ளது.</string>
@@ -78,5 +77,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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ricardo Cerqueira	d7027be15d	GmsAccount: If there's no network and FRP isn't enforcing, skip GMS The current version of GMS's SuW has the main activity return as CANCELED when no network is available. This is the same result as an actual cancellation (by pressing "Back"), and there's no extra data to distinguish the two, so the user gets stuck in a loop between the "no network" page and the one preceding it, unless connectivity is somehow established. Making connectivity mandatory for OOBE isn't acceptable, so skip GMS entirely if network is absent (and FRP isn't enforcing). The only thing it was presenting was a "you have no network" dialog anyway. RM-290 Change-Id: I2abadc79a0823e94da7d3a875ce6db8eae8f143b	2016-12-03 22:12:52 +01:00
pinky@build01	fb137c6ace	Automatic translation import Change-Id: I37838866c41753fef5a612542e28e12481c7955e Ticket: RM-290	2016-09-06 23:02:44 -07:00
blinky@build01	14ca336e37	Automatic translation import Change-Id: I9edce90deebd3cbbb2b207b9e9586fb7f95e0507 Ticket: RM-290	2016-09-01 20:11:43 -07:00
pinky@build01	08a9289733	Automatic translation import Change-Id: I7c4719ecf6dc3f390271405feab911cd65971e47 Ticket: RM-290	2016-08-29 19:19:38 -07:00
clyde@build01	1e01859117	Automatic translation import Change-Id: Ie998f4f7d426bdbcd383f691c560894fdc5c2199 Ticket: RM-290	2016-08-24 18:52:40 -07:00
pinky@build01	8707d2001d	Automatic translation import Change-Id: Ide41ea3d6c75d2ef87a11f469d26fe658ebc9b05 Ticket: RM-290	2016-08-22 13:49:14 -07:00
inky@build01	f3e26e718c	Automatic translation import Change-Id: I4c9ba27c669633694afd23ef5ca296a97fcd706a Ticket: RM-290	2016-08-22 11:40:23 -07:00
pinky@build01	bf6a21834a	Automatic translation import Change-Id: I7ba0e0f0fc8a885121fab276b33ccbb796c0ba5d Ticket: RM-290	2016-08-21 05:34:59 -07:00
pinky@build01	2b4193dac2	Automatic translation import Change-Id: Ib16eab0eb226116f9134bad6b8ed40bb7471b3f4 Ticket: RM-290	2016-08-19 14:01:18 -07:00
pinky@build01	12d594a24c	Automatic translation import Change-Id: I13c47617c6369baf2d75996bc7120feee8024aa6 Ticket: RM-290	2016-08-19 10:06:50 -07:00
pinky@build01	0958b02832	Automatic translation import Change-Id: I7678d87cf5c5765f3f5d6ab9a74dbcca30571bbc Ticket: RM-290	2016-08-17 15:06:06 -07:00
clyde@build01	22e22891cf	Automatic translation import Change-Id: I68f1f030f2157768a0f92103263b99837ba3c5a9 Ticket: RM-290	2016-08-16 15:34:35 -07:00
clyde@build01	ecf6f58ece	Automatic translation import Change-Id: I3a9ef1317065107588c71175378d4694cb0cffce Ticket: RM-290	2016-08-15 10:09:32 -07:00
Ricardo Cerqueira	adeea456a5	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. RM-290 Change-Id: Ia807142ab08f388d533b5ee45d1fcbe81071f6d1 (cherry picked from commit `8331602e94`)	2016-08-14 14:48:47 -07:00
blinky@build01	7c4b937205	Automatic translation import Change-Id: I8da50104c7822094a7514fe89e24913230a6abd0 Ticket: RM-290	2016-08-13 18:23:03 -07:00
clyde@build01	a3ba41faeb	Automatic translation import Change-Id: I5fd2dd76a06ce196b531a255115aa5b745b69237 Ticket: RM-290	2016-08-09 17:42:23 -07:00
clyde@build01	45e3c47f02	Automatic translation import Change-Id: I068d0429b8ec264a9bc0208a8a91fa2f44d00e48 Ticket: RM-290	2016-08-08 13:44:05 -07:00
inky@build01	979f2bdffd	Automatic translation import Change-Id: I398ee5eea1ea4c60cb43343d3e5f816129f50e3c Ticket: RM-290	2016-08-08 13:43:37 -07:00
inky@build01	3f5eba07af	Automatic translation import Change-Id: If25952a386a646db313271a75f79ac2612194608 Ticket: RM-290	2016-08-07 18:51:16 -07:00
clyde@build01	aafff03d75	Automatic translation import Change-Id: I3fbd2b131cc763624162f20ac2722542e2f4d935 Ticket: -	2016-07-27 12:19:20 -07:00
blinky@build01	739026aa87	Automatic translation import Change-Id: Ic6c6b5ac1bdeeda63bad13571f84706702344324 Ticket: -	2016-07-25 11:49:03 -07:00
blinky@build01	af36bfb798	Automatic translation import Change-Id: I40dfc1caf710a2e105f46778efeb8975a2859b69 Ticket: -	2016-07-24 13:43:47 -07:00
inky@build01	ad287f7167	Automatic translation import Change-Id: I55bcdf977f6befa05abe3c7aa44a53f5d7270162 Ticket: -	2016-07-22 12:04:59 -07:00
pinky@build01	653d79c7d4	Automatic translation import Change-Id: I06a77daadebf1f6d98f5c917400815d1b29ad6da Ticket: -	2016-07-21 11:19:22 -07:00
clyde@build01	7158d4de8b	Automatic translation import Change-Id: Ic1eb28693004337c124b443e0f9b4d2a9a462152	2016-07-19 13:47:19 -07:00
pinky@build01	8bc74d5aeb	Automatic translation import Change-Id: Ib097aa26cb3321afd1bb431dc00320065ff69066 Ticket: -	2016-07-16 09:43:01 -07:00
Luis Mejia	b31e14b835	Replaced last panel with ModGuide panel. - Created and added ModGuide panel. - Added the ability to chnage navigation color. - Added the ability to start an app after wizard completion. Issue-Id: MSC-14 Change-Id: I8e17735d1a9edbd529339982981f8270cde83d96	2016-07-14 19:27:13 -07:00
Ricardo Cerqueira	7c1cf5a232	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	2016-07-14 04:04:00 -07:00
Ricardo Cerqueira	3ebea2fb6d	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	2016-07-14 04:03:45 -07:00
clyde@build01	07c44c4467	Automatic translation import Change-Id: I11ce4a23dd7fdddb4987ff91ccde38c41ae0ac86 Ticket: -	2016-07-11 17:09:44 -07:00
Bharadwaj Narasimha	10a58d25fd	SetupWizard: Handle ActivityNotFoundException in LoadingFragment Handle the possibly thrown ActivityNotFoundException.Changed the generic catch block into a specific catch block to handle ActivityNotFoundException. Change-Id: Ica1106bab3e569aaa7883898ce6adb3a1a2dd99f	2016-07-08 11:03:14 -07:00
inky@build01	20037b7ae9	Automatic translation import Change-Id: I1687e147e7b2c14a8cf5ccd49572f4baea5e66ae	2016-06-29 10:50:31 -07:00
inky@build01	b62056b354	Automatic translation import Change-Id: I77c27bad469445b9ece67c02317fdc073aa1a7aa	2016-06-17 14:02:02 -07:00
inky@build01	73d56b4d76	Automatic translation import Change-Id: I7e13ca1c1f966375c419fc463d30ee3c8fda5cf9	2016-06-01 12:02:42 -07:00
Jessica Wagantall	6476f1bc9d	Automatic translation import Change-Id: I6aadeadde4f69553311dc712fd11f27e886b899a Ticket: RM-214	2016-05-26 18:57:53 -07:00
cretin45	4981bc9888	SetupWizard: Ensure language picker is enabled onResume Issue-id: FEIJ-559 Change-Id: Iafe0467fc4130074ce86fe5f28b215d4774dc50e	2016-05-23 14:18:12 -07:00
cretin45	334c00f437	SetupWizard: Use proper CMSetting for soft keys option Issue-id: CYNGNOS-2842 Change-Id: I5ab75d9d90d79b66fa9b10f011272fc0090a78dd	2016-05-15 10:54:37 -07:00
Abhisek Devkota	df3662581a	Automatic translation import Change-Id: Icc4bf7d7a12df03e99a9774e6fbd0c54bf678f6c	2016-05-14 11:18:02 +02:00
cretin45	36f15ef169	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	2016-05-13 15:40:51 -07:00
Michael Bestas	44026d9007	Automatic translation import Change-Id: I4969f65738f203c9b383f743b05731870eea6b01	2016-05-10 18:38:36 +03:00
cretin45	d35618baef	SetupWizard: Run as com.android.wizard task affinity Issue-id: FEIJ-254 Change-Id: Ib841e7dd82d900150229e99ca01f97dfed6bcde9	2016-05-02 12:24:46 -07:00
Michael Bestas	f06305a9eb	Automatic translation import Change-Id: I351b91a5c30fc8963f622f1b18051c048114fd38	2016-04-29 01:27:58 +03:00
cretin45	635504813a	SetupWizard: Add Mod disovery language for mod ready devices Issue-id: CYNGNOS-2566 Change-Id: If88d2d62b5d2175ffe857d45dd9f6ce132129f2a	2016-04-27 12:39:52 -07:00
cretin45	8109277755	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	2016-04-27 10:35:48 -07:00
cretin45	941aa1e1e2	SetupWizard: Handle register theme change listener crash Issue-id: FEIJ-84 Change-Id: I8ffca77418702f04328ae7d0581ab8cc316a04e8	2016-04-26 11:15:48 -07:00
cretin45	2e75c4ee04	SetupWizard: Fix test app building Ticket: CYNGNOS-2431 Change-Id: I75249f0bbb6e59f47e4a30608bb63b42c93c6e37	2016-04-26 10:52:45 -07:00
Roman Birg	af828584ae	SetupWizard: GMS page controls the next step Ticket: CYNGNOS-2533 Change-Id: Icf7dc1de653d18ac60ddfa52dddbe9412dbc8eda Signed-off-by: Roman Birg <roman@cyngn.com>	2016-04-25 09:00:59 -07:00
Roman Birg	fccccda787	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>	2016-04-22 08:29:40 -07:00
Ricardo Cerqueira	e5c2b92590	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:55:06 +01:00
Michael Bestas	4082d3a7ab	Automatic translation import Change-Id: I5b54fcd2848c07798c9a4a18a9c4d050dfbf782b	2016-04-16 21:00:27 +03:00
Adnan Begovic	fe7ac15220	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	2016-04-14 12:59:25 -07:00
Dave Kover	c8c765c2b5	Update the theme apply label string More expressive and specifically calls out two components most likely to be included. Change-Id: Ied32d53f308b3fa9fea65a77524c7e3729c52f06 Ticket: CYNGNOS-2085	2016-04-13 11:45:46 -07:00
cretin45	763af1265c	SetupWizard: Wait for data connection Issue-id: CRACKLING-786 Change-Id: I54ef75ffa8da87d829ce7ce45a7f42ca1ce54732	2016-04-08 11:40:20 -07:00
Michael Bestas	ac93a6765d	Automatic translation import Change-Id: I4541f0e56eb0b84ae47a1b2da57ade2e1903dc0b	2016-04-06 01:18:54 +03:00