Automatic translation import

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

-include frameworks/opt/setupwizard/navigationbar/common.mk
 include frameworks/opt/setupwizard/library/common.mk

 include $(BUILD_PACKAGE)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -66,12 +66,13 @@
                 android:icon="@drawable/icon"
                 android:theme="@style/Theme.Setup"
                 android:uiOptions="none"
+                 android:taskAffinity="com.android.wizard"
                 android:name=".SetupWizardApp">

        <meta-data android:name="com.google.android.gms.version"
                   android:value="@integer/google_play_services_version" />

-       <activity android:name=".ui.SetupWizardActivity"
+        <activity android:name=".ui.SetupWizardActivity"
                  android:label="@string/product_name"
                  android:launchMode="singleInstance"
                  android:excludeFromRecents="true"
@@ -79,36 +80,12 @@
                  android:immersive="true"
                  android:windowSoftInputMode="stateAlwaysHidden">

-        <!--  <intent-filter android:priority="9">
+            <intent-filter android:priority="9">

-             <action android:name="android.intent.action.MAIN" />
-             <action android:name="android.intent.action.DEVICE_INITIALIZATION_WIZARD" />
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.DEVICE_INITIALIZATION_WIZARD" />

-             <category android:name="android.intent.category.HOME" />
-             <category android:name="android.intent.category.DEFAULT" />
-         </intent-filter> -->
-     </activity>
-
-        <activity android:name=".ui.WelcomeActivity"
-                  android:label="@string/product_name"
-                  android:excludeFromRecents="true"
-                  android:configChanges="mcc|mnc|themeChange"
-                  android:immersive="true"
-                  android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.CYANOGEN_WELCOME" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".ui.CyanogenAccountActivity"
-                  android:label="@string/cm_account_name"
-                  android:excludeFromRecents="true"
-                  android:configChanges="mcc|mnc|themeChange"
-                  android:immersive="true"
-                  android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.CYANOGEN_ACCOUNT_SETUP" />
+                <category android:name="android.intent.category.HOME" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>
@@ -119,11 +96,5 @@
                <action android:name="com.cyanogenmod.setupwizard.ACTION_FINISH_SETUPWIZARD" />
            </intent-filter>
        </receiver>
-
-        <receiver android:name=".PartnerReceiver">
-            <intent-filter>
-                <action android:name="com.android.setupwizard.action.PARTNER_CUSTOMIZATION" />
-            </intent-filter>
-        </receiver>
    </application>
 </manifest>
--- a/res/drawable/mod_ready.xml
+++ b/res/drawable/mod_ready.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 The CyanogenMod Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="256dp"
+        android:height="114dp"
+        android:viewportWidth="256"
+        android:viewportHeight="114">
+
+    <path android:fillColor="@color/white"
+          android:pathData="M40,113.7V77.1h14.3c7.5,0,12.3,4,12.3,11.1c0,6.2-3,9.4-8.6,10.6l8,14.9h-5.8l-7.7-14.5h-7.4v14.5H40z
+            M45.2,94.6h8.7 c4.6,0,7.5-1.9,7.5-6.3c0-4.2-2.5-6.4-7.5-6.4h-8.6v12.7H45.2z
+            M78.7,113.7V77.1h22.4V82H84v10.6h15.7v4.7H84V109h17.2v4.8
+            L78.7,113.7L78.7,113.7z
+            M136.5,113.7L134,107h-15.7l-2.4,6.7h-5.4l13.2-36.6h5l13.2,36.6H136.5z
+            M126.1,84.7l-6.2,17.8h12.6 l-6.2-17.8H126.1z
+            M152.7,113.7V77.1h11.7c8.1,0,15.9,5.6,15.9,18.3c0,13.6-7.6,18.4-16.2,18.4L152.7,113.7L152.7,113.7z
+            M158,108.9 h5.9c6.9,0,10.8-3.8,10.8-13.6c0-8.8-4-13.4-10.5-13.4H158V108.9z
+            M198.8,113.7V98.3l-12-21.2h5.7l8.8,16.4h0.1l8.9-16.4h5.7
+            l-12,21.2v15.4C204,113.7,198.8,113.7,198.8,113.7z
+            M73.1,20.8c0-11.3-9.2-20.5-20.6-20.5H0.2v58.1h9.3V9.5H32v48.8h9.3V9.5h11.3
+            c6.2,0,11.3,5.1,11.3,11.3v37.5h9.3L73.1,20.8L73.1,20.8z
+            M164.5,26.6v-3.4v-2.4c0-11.3-9.2-20.5-20.6-20.5h-26.7
+            c-11.3,0-20.5,9.2-20.5,20.5v4.6v1.2V32v1.7v4.2c0,11.3,9.2,20.5,20.5,20.5h26.7c11.3,0,20.6-9.2,20.6-20.5v-2.3V32V26.6z
+            M155.2,37.8c0,6.2-5.1,11.3-11.3,11.3h-26.7c-6.2,0-11.3-5.1-11.3-11.3v-17c0-6.2,5.1-11.3,11.3-11.3h26.7
+            c6.2,0,11.3,5.1,11.3,11.3V37.8z
+            M235.2,0.3H188v58.1h47.2c11.3,0,20.6-9.2,20.6-20.5v-17C255.8,9.5,246.6,0.3,235.2,0.3z
+            M246.5,37.8c0,6.2-5.1,11.3-11.3,11.3h-38V9.5h38c6.2,0,11.3,5.1,11.3,11.3V37.8z" />
+</vector>
--- a/res/layout/location_settings.xml
+++ b/res/layout/location_settings.xml
@@ -45,42 +45,6 @@
                    android:paddingRight="@dimen/content_margin_right"
                    style="@style/PageSummaryText" />

-                <LinearLayout
-                    android:id="@+id/backup"
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="@dimen/location_margin_left"
-                    android:paddingRight="@dimen/content_margin_right"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:clickable="true">
-
-
-                    <CheckBox
-                        android:id="@+id/backup_checkbox"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="top"
-                        android:layout_marginTop="5dp"
-                        android:duplicateParentState="true"
-                        android:clickable="false" />
-
-                    <TextView
-                        android:id="@+id/backup_summary"
-                        android:layout_width="0px"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:textSize="15sp"
-                        android:lineSpacingExtra="@dimen/setup_line_spacing"
-                        android:gravity="top"
-                        android:layout_marginLeft="@dimen/location_text_margin_left"
-                        android:layout_marginRight="@dimen/location_text_margin_right"
-                        android:paddingBottom="@dimen/content_margin_bottom"
-                        android:text="@string/backup_data_summary"
-                        android:maxLines="5" />
-
-                </LinearLayout>
-
                <LinearLayout
                    android:id="@+id/location"
                    android:orientation="horizontal"
--- a/res/layout/logo_welcome.xml
+++ b/res/layout/logo_welcome.xml
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/header"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/primary">
-
-    <ImageView
-        android:id="@+id/brand_logo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/brand"
-        android:paddingLeft="@dimen/header_logo_margin_left"
-        android:paddingBottom="@dimen/header_logo_margin_bottom"
-        android:layout_above="@+id/powered_by_logo"/>
-
-    <ImageView
-        android:id="@+id/powered_by_logo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/powered_by"
-        android:visibility="gone"
-        android:paddingLeft="@dimen/header_logo_margin_left"
-        android:paddingBottom="@dimen/header_logo_margin_bottom"
-        android:layout_above="@android:id/title"/>
-
-
-</RelativeLayout>
--- a/res/layout/setup_finished_page.xml
+++ b/res/layout/setup_finished_page.xml
@@ -20,12 +20,46 @@
              android:layout_height="match_parent"
              android:background="@color/primary">

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

+
+
+    <TextView android:id="@+id/mod_welcome"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:textSize="20sp"
+              android:layout_marginTop="105dp"
+              android:paddingLeft="@dimen/content_margin_left"
+              android:paddingRight="@dimen/content_margin_right"
+              android:text="@string/mod_welcome"
+              android:fontFamily="sans-serif-medium"
+              android:textColor="@color/white"
+              android:visibility="gone"/>
+
+
+    <TextView android:id="@+id/mod_desc"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:textSize="16sp"
+              android:layout_marginTop="16dp"
+              android:paddingLeft="@dimen/content_margin_left"
+              android:paddingRight="@dimen/content_margin_right"
+              android:text="@string/mod_description"
+              android:textColor="@color/white"
+              android:visibility="gone"/>
+
+    <Space android:layout_width="match_parent"
+           android:layout_height="0px"
+           android:layout_weight="1"/>
+
 </LinearLayout>
--- a/res/layout/setup_lockscreen.xml
+++ b/res/layout/setup_lockscreen.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/header" />
+
+    <FrameLayout android:id="@+id/page"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <ScrollView android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/PageContent">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/PageSummaryText"
+                    android:textSize="16sp"
+                    android:paddingLeft="@dimen/content_margin_left"
+                    android:layout_marginBottom="@dimen/summary_margin_bottom"
+                    android:paddingRight="@dimen/location_text_margin_right"
+                    android:text="@string/lockscreen_setup_summary" />
+
+                <TextView
+                    android:id="@+id/setup_lockscreen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="@dimen/content_margin_left"
+                    android:paddingRight="@dimen/location_text_margin_right"
+                    android:gravity="center_vertical"
+                    android:textSize="16sp"
+                    android:textAllCaps="true"
+                    android:textColor="@color/accent"
+                    android:text="@string/lockscreen_setup_screen_lock_setup"/>
+
+            </LinearLayout>
+        </ScrollView>
+    </FrameLayout>
+</LinearLayout>
--- a/res/layout/welcome_activity.xml
+++ b/res/layout/welcome_activity.xml
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/primary">
-
-    <View android:layout_width="match_parent"
-          android:layout_height="0px"
-          android:layout_weight="1"/>
-
-    <include layout="@layout/logo_welcome" />
-
-    <View android:layout_width="match_parent"
-          android:layout_height="0px"
-          android:layout_weight="1"/>
-
-
-    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
-        android:id="@+id/navigation_bar"
-        style="@style/setup_wizard_navbar_style" />
-
-</LinearLayout>
--- a/res/raw/wizard_script.xml
+++ b/res/raw/wizard_script.xml
@@ -1,428 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Copyright (c) 2014 Google 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.
-->
-
-<!--
-    The wizard:uris recorded here have the inconvenience of being generated by hand, but they allow
-    for the full spread of launch flags (we need FLAG_ACTIVITY_NEW_TASK [0x10000000]), where the
-    <intent> tag processed by Intent.parseIntent() does not.
-
-    adb shell am to-intent-uri -a com.android.setupwizard.WELCOME -f 0x10000000 \-\-ez firstRun true
-->
-<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
-    wizard:firstAction="oem_pre_setup">
-
-    <!-- Preliminary setup for OEMs -->
-    <WizardAction id="oem_pre_setup"
-        wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.CYANOGEN_WELCOME;end">
-        <result wizard:action="welcome" />
-    </WizardAction>
-
-    <!-- Welcome screen with language selection -->
-    <WizardAction id="welcome"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.WELCOME;end">
-        <result wizard:action="carrier_setup" />
-    </WizardAction>
-
-    <!-- Privileged carrier setup app -->
-    <WizardAction id="carrier_setup"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.CARRIER_SETUP;end">
-        <result wizard:name="ok"
-            wizard:resultCode="-1"
-            wizard:action="wifi_settings" />
-        <result wizard:name="not_ready"
-            wizard:resultCode="1"
-            wizard:action="wifi_settings" />
-        <result wizard:action="activation_check" />
-    </WizardAction>
-
-    <!-- Phone activation and mobile data connectivity -->
-    <WizardAction id="activation_check"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.ACTIVATION_CHECK;end">
-        <result wizard:name="sim_missing"
-            wizard:resultCode="101"
-            wizard:action="sim_missing" />
-        <result wizard:name="activation_needed"
-            wizard:resultCode="102"
-            wizard:action="activate_mobile_data" />
-        <result wizard:action="sim_setup" />
-    </WizardAction>
-    <WizardAction id="sim_missing"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.SIM_MISSING;end">
-        <result wizard:name="retry"
-            wizard:resultCode="2"
-            wizard:action="activation_check" />
-        <result wizard:action="wifi_settings" />
-    </WizardAction>
-    <WizardAction id="activate_mobile_data"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.ACTIVATE_MOBILE_DATA;end">
-        <result wizard:name="sim_missing"
-            wizard:resultCode="101"
-            wizard:action="sim_missing" />
-        <result wizard:action="sim_setup" />
-    </WizardAction>
-    <WizardAction id="sim_setup"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.SIM_SETUP;end">
-        <result wizard:action="wifi_settings" />
-    </WizardAction>
-
-    <!-- Wi-Fi setup -->
-    <WizardAction id="wifi_settings"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.WIFI_SETTINGS;end">
-        <result wizard:action="connection_check" />
-    </WizardAction>
-
-    <!-- Check network connectivity -->
-    <WizardAction id="connection_check"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.CONNECTION_CHECK;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="no_account_date_time_check" />
-        <result wizard:action="walled_garden" />
-    </WizardAction>
-
-    <!-- Resolve captive portal access, check for Gservices -->
-    <WizardAction id="walled_garden"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.WALLED_GARDEN;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="no_account_date_time_check" />
-        <result wizard:action="ota_update" />
-    </WizardAction>
-
-    <!-- Update important packages -->
-    <WizardAction id="ota_update"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.OTA_UPDATE;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="early_update" />
-        <result wizard:action="system_update" />
-    </WizardAction>
-    <WizardAction id="system_update"
-        wizard:uri="intent:#Intent;action=android.settings.SYSTEM_UPDATE_SETTINGS;end">
-        <!-- System update should cause a reboot, but if it returns unexpectedly, continue on to
-            early update -->
-        <result wizard:action="early_update" />
-    </WizardAction>
-    <WizardAction id="early_update"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.update.EarlyUpdateFragment;end">
-        <result wizard:action="load_account_intent" />
-    </WizardAction>
-    <WizardAction id="load_account_intent"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.LoadAddAccountIntentFragment;end">
-        <result wizard:action="device_owner_warning" />
-    </WizardAction>
-
-    <!-- Security warning -->
-    <WizardAction
-        id="device_owner_warning"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.DEVICE_OWNER_WARNING;end">
-        <result wizard:name="skip" wizard:resultCode="1" wizard:action="account_setup" />
-        <result wizard:action="factory_reset" />
-    </WizardAction>
-    <WizardAction
-        id="factory_reset"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.FACTORY_RESET;end">
-        <!-- Factory reset should cause a reboot, but if it returns unexpectedly, continue on to
-             account setup  -->
-        <result wizard:action="account_setup" />
-    </WizardAction>
-
-    <!-- Add an account -->
-    <WizardAction id="account_setup"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.ACCOUNT_SETUP;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="no_account_date_time_check" />
-        <result wizard:name="alt_setup_complete"
-            wizard:resultCode="102"
-            wizard:action="exit" />
-        <result wizard:action="account_checkin" />
-    </WizardAction>
-
-    <!-- Checkin with Gservices using account. If it fails, VPA will not be available. -->
-    <WizardAction id="account_checkin"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.util.WaitForGservicesFragment;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="mfm_check" />
-        <result wizard:action="start_vpa" />
-    </WizardAction>
-    <WizardAction id="start_vpa"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.StartVpaFragment;end">
-        <result wizard:action="mfm_check" />
-    </WizardAction>
-
-    <!-- Fork for MFM (includes skip for no account, although that will have been caught by account_setup) -->
-    <WizardAction id="mfm_check"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.AccountCheckFragment;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="no_account_date_time_check" />
-        <result wizard:name="mfm"
-            wizard:resultCode="4"
-            wizard:action="mfm_date_time_check" />
-        <result wizard:action="date_time_check" />
-    </WizardAction>
-
-    <!-- Set user name, restore account, and other options -->
-    <WizardAction id="date_time_check"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.time.DateTimeCheckFragment;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="user_name_check" />
-        <result wizard:action="date_time" />
-    </WizardAction>
-    <WizardAction id="date_time"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.DATE_TIME;end">
-        <result wizard:action="user_name_check" />
-    </WizardAction>
-    <WizardAction id="user_name_check"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.user.NameCheckFragment;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="gmail" />
-        <result wizard:action="user_name" />
-    </WizardAction>
-    <WizardAction id="user_name"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.USER_NAME;end">
-        <result wizard:action="gmail" />
-    </WizardAction>
-    <WizardAction id="gmail"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GMAIL_SETUP;end">
-        <result wizard:action="restore_check" />
-    </WizardAction>
-    <!-- Check to see if we already know which device is being restored onto this one -->
-    <WizardAction id="restore_check"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.CheckRestoreTokenFragment;end">
-        <result wizard:name="token_not_found"
-            wizard:resultCode="101"
-            wizard:action="restore_get_intent" />
-        <result wizard:action="restore_start" />
-    </WizardAction>
-    <!-- Select a device to serve as the source for restored apps -->
-    <WizardAction id="restore_get_intent"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.GetRestoreIntentFragment;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="restore_start" />
-        <result wizard:action="restore_picker" />
-    </WizardAction>
-    <WizardAction id="restore_picker"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.RESTORE;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="lock_screen_intro" />
-        <result wizard:action="restore_start" />
-    </WizardAction>
-    <WizardAction id="restore_start"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.StartRestoreFragment;end">
-        <result wizard:action="lock_screen_intro" />
-    </WizardAction>
-    <WizardAction id="lock_screen_intro"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.LOCK_SCREEN_INTRO;end">
-        <result wizard:action="google_now" />
-    </WizardAction>
-    <WizardAction id="google_now"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GOOGLE_NOW;end">
-        <result wizard:action="restore_progress" />
-    </WizardAction>
-    <!-- Wait for data restoration to finish -->
-    <WizardAction id="restore_progress"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.RESTORE_PROGRESS;end">
-        <result wizard:name="retry"
-            wizard:resultCode="2"
-            wizard:action="restore_reset" />
-        <result wizard:action="start_downloads" />
-    </WizardAction>
-    <!-- If data restoration failed and user chose to retry, pick a new source device -->
-    <WizardAction id="restore_reset"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.RemoveRestoreTokenFragment;end">
-        <result wizard:action="restore_retry_get_intent" />
-    </WizardAction>
-    <WizardAction id="restore_retry_get_intent"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.GetRestoreIntentFragment;end">
-        <result wizard:action="restore_retry" />
-    </WizardAction>
-    <WizardAction id="restore_retry"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.RESTORE;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="start_downloads" />
-        <result wizard:action="restore_retry_start" />
-    </WizardAction>
-    <WizardAction id="restore_retry_start"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.StartRestoreFragment;end">
-        <result wizard:action="restore_progress" />
-    </WizardAction>
-    <WizardAction id="start_downloads"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.StartDownloadsFragment;end">
-        <result wizard:action="final_hold" />
-    </WizardAction>
-    <WizardAction id="final_hold"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.FINAL_HOLD;end">
-        <result wizard:action="oem_post_setup" />
-    </WizardAction>
-
-    <!-- MFM flow -->
-    <!-- TODO: Merge with non-MFM flow when metrics can distinguish account type using other than the action ID -->
-    <WizardAction id="mfm_date_time_check"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.time.DateTimeCheckFragment;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="mfm_user_name_check" />
-        <result wizard:action="mfm_date_time" />
-    </WizardAction>
-    <WizardAction id="mfm_date_time"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.DATE_TIME;end">
-        <result wizard:action="mfm_user_name_check" />
-    </WizardAction>
-    <WizardAction id="mfm_user_name_check"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.user.NameCheckFragment;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="mfm_gmail" />
-        <result wizard:action="mfm_user_name" />
-    </WizardAction>
-    <WizardAction id="mfm_user_name"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.USER_NAME;end">
-        <result wizard:action="mfm_gmail" />
-    </WizardAction>
-    <WizardAction id="mfm_gmail"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GMAIL_SETUP;end">
-        <result wizard:action="mfm_restore_check" />
-    </WizardAction>
-    <!-- Check to see if we already know which device is being restored onto this one -->
-    <WizardAction id="mfm_restore_check"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.CheckRestoreTokenFragment;end">
-        <result wizard:name="token_not_found"
-            wizard:resultCode="101"
-            wizard:action="mfm_restore_get_intent" />
-        <result wizard:action="mfm_restore_start" />
-    </WizardAction>
-    <!-- Select a device to serve as the source for restored apps -->
-    <WizardAction id="mfm_restore_get_intent"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.GetRestoreIntentFragment;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="mfm_restore_start" />
-        <result wizard:action="mfm_restore_picker" />
-    </WizardAction>
-    <WizardAction id="mfm_restore_picker"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.RESTORE;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="mfm_lock_screen_intro" />
-        <result wizard:action="mfm_restore_start" />
-    </WizardAction>
-    <WizardAction id="mfm_restore_start"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.StartRestoreFragment;end">
-        <result wizard:action="mfm_lock_screen_intro" />
-    </WizardAction>
-    <WizardAction id="mfm_lock_screen_intro"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.LOCK_SCREEN_INTRO;end">
-        <result wizard:action="mfm_google_now" />
-    </WizardAction>
-    <WizardAction id="mfm_google_now"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GOOGLE_NOW;end">
-        <result wizard:action="mfm_restore_progress" />
-    </WizardAction>
-    <!-- Wait for data restoration to finish -->
-    <WizardAction id="mfm_restore_progress"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.RESTORE_PROGRESS;end">
-        <result wizard:name="retry"
-            wizard:resultCode="2"
-            wizard:action="mfm_restore_reset" />
-        <result wizard:action="mfm_start_downloads" />
-    </WizardAction>
-    <!-- If data restoration failed and user chose to retry, pick a new source device -->
-    <WizardAction id="mfm_restore_reset"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.RemoveRestoreTokenFragment;end">
-        <result wizard:action="mfm_restore_retry_get_intent" />
-    </WizardAction>
-    <WizardAction id="mfm_restore_retry_get_intent"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.GetRestoreIntentFragment;end">
-        <result wizard:action="mfm_restore_retry" />
-    </WizardAction>
-    <WizardAction id="mfm_restore_retry"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.RESTORE;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="mfm_start_downloads" />
-        <result wizard:action="mfm_restore_retry_start" />
-    </WizardAction>
-    <WizardAction id="mfm_restore_retry_start"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.StartRestoreFragment;end">
-        <result wizard:action="mfm_restore_progress" />
-    </WizardAction>
-    <WizardAction id="mfm_start_downloads"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.StartDownloadsFragment;end">
-        <result wizard:action="mfm_final_hold" />
-    </WizardAction>
-    <WizardAction id="mfm_final_hold"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.FINAL_HOLD;end">
-        <result wizard:action="oem_post_setup" />
-    </WizardAction>
-
-    <!-- Jump to here if no Google account was added -->
-    <WizardAction id="no_account_date_time_check"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.time.DateTimeCheckFragment;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="no_account_user_name_check" />
-        <result wizard:action="no_account_date_time" />
-    </WizardAction>
-    <WizardAction id="no_account_date_time"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.DATE_TIME;end">
-        <result wizard:action="no_account_user_name_check" />
-    </WizardAction>
-    <WizardAction id="no_account_user_name_check"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.user.NameCheckFragment;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="no_account_gmail" />
-        <result wizard:action="no_account_user_name" />
-    </WizardAction>
-    <WizardAction id="no_account_user_name"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.USER_NAME;end">
-        <result wizard:action="no_account_gmail" />
-    </WizardAction>
-
-    <WizardAction id="no_account_gmail"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GMAIL_SETUP;end">
-        <result wizard:action="no_account_lock_screen_intro" />
-    </WizardAction>
-
-    <WizardAction id="no_account_lock_screen_intro"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.LOCK_SCREEN_INTRO;end">
-        <result wizard:action="no_account_google_services" />
-    </WizardAction>
-    <WizardAction id="no_account_google_services"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GOOGLE_SERVICES;end">
-        <result wizard:action="oem_post_setup" />
-    </WizardAction>
-
-    <!-- OEM completion -->
-    <WizardAction id="oem_post_setup"
-        wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.CYANOGEN_ACCOUNT_SETUP;end">
-        <result wizard:action="exit" />
-    </WizardAction>
-
-    <WizardAction id="exit"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.EXIT;end" />
-
-</WizardScript>
--- a/res/raw/wizard_script_user.xml
+++ b/res/raw/wizard_script_user.xml
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Copyright (c) 2014 Google 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.
-->
-
-<!--
-    The wizard:uris recorded here have the inconvenience of being generated by hand, but they allow
-    for the full spread of launch flags (we need FLAG_ACTIVITY_NEW_TASK [0x10000000]), where the
-    <intent> tag processed by Intent.parseIntent() does not.
-
-    adb shell am to-intent-uri -a com.android.setupwizard.WELCOME -f 0x10000000 \-\-ez firstRun true
-->
-<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
-    wizard:firstAction="oem_pre_setup">
-
-    <!-- Preliminary setup for OEMs -->
-    <WizardAction id="oem_pre_setup"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.OEM_PRE_SETUP;end">
-        <result wizard:action="secondary_user_warning" />
-    </WizardAction>
-
-    <!-- Secondary user warning -->
-    <WizardAction id="secondary_user_warning"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.USER_WARNING;end">
-        <result wizard:action="wifi_settings" />
-    </WizardAction>
-
-    <!-- Wi-Fi setup -->
-    <WizardAction id="wifi_settings"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.WIFI_SETTINGS;end">
-        <result wizard:action="connection_check" />
-    </WizardAction>
-
-    <!-- Check network connectivity -->
-    <WizardAction id="connection_check"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.CONNECTION_CHECK;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="no_account_user_name_check" />
-        <result wizard:action="walled_garden" />
-    </WizardAction>
-
-    <!-- Resolve captive portal access, check for Gservices -->
-    <WizardAction id="walled_garden"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.WALLED_GARDEN;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="no_account_user_name_check" />
-        <result wizard:action="load_account_intent" />
-    </WizardAction>
-    <WizardAction id="load_account_intent"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.LoadAddAccountIntentFragment;end">
-        <result wizard:action="account_setup" />
-    </WizardAction>
-
-    <!-- Add an account -->
-    <WizardAction id="account_setup"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.ACCOUNT_SETUP;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="no_account_user_name_check" />
-        <result wizard:name="alt_setup_complete"
-            wizard:resultCode="102"
-            wizard:action="exit" />
-        <result wizard:action="account_checkin" />
-    </WizardAction>
-
-    <!-- Checkin with Gservices using account. If it fails, VPA will not be available. -->
-    <WizardAction id="account_checkin"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.util.WaitForGservicesFragment;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="mfm_check" />
-        <result wizard:action="start_vpa" />
-    </WizardAction>
-    <WizardAction id="start_vpa"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.StartVpaFragment;end">
-        <result wizard:action="mfm_check" />
-    </WizardAction>
-
-    <!-- Fork for MFM (includes skip for no account, although that will have been caught by account_setup) -->
-    <WizardAction id="mfm_check"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.AccountCheckFragment;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="no_account_user_name_check" />
-        <result wizard:name="mfm"
-            wizard:resultCode="4"
-            wizard:action="mfm_user_name_check" />
-        <result wizard:action="user_name_check" />
-    </WizardAction>
-
-    <!-- Set user name, and other options -->
-    <WizardAction id="user_name_check"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.user.NameCheckFragment;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="gmail" />
-        <result wizard:action="user_name" />
-    </WizardAction>
-    <WizardAction id="user_name"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.USER_NAME;end">
-        <result wizard:action="gmail" />
-    </WizardAction>
-    <WizardAction id="gmail"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GMAIL_SETUP;end">
-        <result wizard:action="google_now" />
-    </WizardAction>
-    <WizardAction id="google_now"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GOOGLE_NOW;end">
-        <result wizard:action="start_downloads" />
-    </WizardAction>
-    <WizardAction id="start_downloads"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.StartDownloadsFragment;end">
-        <result wizard:action="final_hold" />
-    </WizardAction>
-    <WizardAction id="final_hold"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.FINAL_HOLD;end">
-        <result wizard:action="oem_post_setup" />
-    </WizardAction>
-
-    <!-- MFM flow -->
-    <!-- TODO: Merge with non-MFM flow when metrics can distinguish account type using other than the action ID -->
-    <WizardAction id="mfm_user_name_check"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.user.NameCheckFragment;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="mfm_gmail" />
-        <result wizard:action="mfm_user_name" />
-    </WizardAction>
-    <WizardAction id="mfm_user_name"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.USER_NAME;end">
-        <result wizard:action="mfm_gmail" />
-    </WizardAction>
-    <WizardAction id="mfm_gmail"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GMAIL_SETUP;end">
-        <result wizard:action="mfm_google_now" />
-    </WizardAction>
-    <WizardAction id="mfm_start_downloads"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.account.StartDownloadsFragment;end">
-        <result wizard:action="mfm_final_hold" />
-    </WizardAction>
-    <WizardAction id="mfm_final_hold"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.FINAL_HOLD;end">
-        <result wizard:action="oem_post_setup" />
-    </WizardAction>
-
-    <!-- Jump to here if no Google account was added -->
-    <WizardAction id="no_account_user_name_check"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PROGRESS;S.fragment=com.google.android.setupwizard.user.NameCheckFragment;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="no_account_gmail" />
-        <result wizard:action="no_account_user_name" />
-    </WizardAction>
-    <WizardAction id="no_account_user_name"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.USER_NAME;end">
-        <result wizard:action="no_account_gmail" />
-    </WizardAction>
-    <WizardAction id="no_account_gmail"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GMAIL_SETUP;end">
-        <result wizard:action="no_account_google_services" />
-    </WizardAction>
-    <WizardAction id="no_account_google_services"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GOOGLE_SERVICES;end">
-        <result wizard:action="oem_post_setup" />
-    </WizardAction>
-
-    <!-- OEM completion -->
-    <WizardAction id="oem_post_setup"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.OEM_POST_SETUP;end">
-        <result wizard:action="exit" />
-    </WizardAction>
-
-    <WizardAction id="exit"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.EXIT;end" />
-
-</WizardScript>
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -60,6 +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_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>
@@ -77,4 +78,12 @@
  <string name="fingerprint_setup_add_fingerprint">Voeg jou vingerafdruk by</string>
  <string name="fingerprint_setup_screen_lock_setup">Stel skerm sluit op</string>
  <string name="sim_locale_changed">%1$s SIM opgespoor</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Hoe wil jy jou skerm sluit?</string>
+  <string name="lockscreen_setup_title">Beskerm jou foon</string>
+  <string name="lockscreen_setup_summary"><b>Beskerm die toestel</b>\" en vereis \'n PIN, patroon of wagwoord om skerm te ontsluit\"</string>
+  <string name="lockscreen_setup_screen_lock_setup">Stel PIN, patroon of wagwoord op</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Welkom by die Post-Toep Era</string>
+  <string name="mod_description">Mods is intelligente ervarings, direk ingebou in die BS. Wanneer die MOD dink dit kan help, sal dit aanbied om die ervaring te aktiveer vir jou.</string>
 </resources>
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -60,6 +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_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>
@@ -77,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">أضف بصمتك</string>
  <string name="fingerprint_setup_screen_lock_setup">إنشاء إقفال الشاشة</string>
  <string name="sim_locale_changed">تم اكتشاف %1$s SIM</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">كيف تريد إقفال الشاشة؟</string>
+  <string name="lockscreen_setup_summary"><b>حماية هذا الجهاز</b> وطلب رقم تعريف شخصي أو نمط أو كلمة مرور لإلغاء قفل الشاشة.</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">مرحباً بكم في Post-App Era</string>
+  <string name="mod_description">الأوضاع عبارة عن تجارب ذكية، ومدركة وخفيفة الوزن تم بناؤها مباشرة في نظام التشغيل OS. عندما يرى MOD أنه يمكنه المساعدة، سيقوم بتنشيطه لك.</string>
 </resources>
--- a/res/values-as-rIN/strings.xml
+++ b/res/values-as-rIN/strings.xml
@@ -60,6 +60,7 @@
  <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>
@@ -77,4 +78,7 @@
  <string name="fingerprint_setup_add_fingerprint">আপোনাৰ আঙুলিৰছাপ যোগ কৰক</string>
  <string name="fingerprint_setup_screen_lock_setup">স্ক্ৰীণ লক ছেটআপ কৰক</string>
  <string name="sim_locale_changed">%1$s SIM চিনাক্ত কৰা হৈছে</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">আপুনি আপোনাৰ স্ক্ৰীণ লক কেনেকৈ কৰিবলৈ বিচাৰিব?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -41,10 +41,14 @@
  <string name="other_services_summary">Estos servicios ponen a Google a trabayar pot ti, y pues activalos o desactivalos en cualesquier momentu. Los datos usaránse acordies cola <xliff:g id="name" example="Política de privacidá">%s</xliff:g> de Google.</string>
  <string name="location_services_summary">Los servicios de llocalización permiten al sistema y les aplicaciones de terceres partes a recoyer y usar datos como\'l to allugamientu aproximáu. Por exemplu, una aplicación podría usar l\'allugamientu aproximáu p\'asitiate cerca d\'una cafetería.</string>
  <string name="location_access_summary"><b>Permitir a les tos aplicaciones entrugar pol to permisu</b> pa usar la to información d\'allugamientu. Esto podría incluyir los tos allugamientos recientes y pasaos.</string>
+  <string name="location_battery_saving"><b>Amenorgar consumu de batería</b> restrinxendo\'l númberu d\'anovamientos GPS per hora.</string>
  <string name="location_network"><b>Usar Wi-Fi</b> p\'ayudar a les aplicaciones a determinar el to allugamientu.</string>
+  <string name="location_network_telephony"><b>Usar Wi-Fi y redes móviles</b> p\'ayudar a les aplicaciones a determinar el to allugamientu.</string>
  <string name="location_network_gms"><b>Usar el serviciu d\'allugamientu de Google</b> p\'ayudar a les aplicaciones a determinar el to allugamientu. Esto quier dicir que s\'unviarán datos anónimos a Google, incluso cuando nun se tea executándose denguna aplicación.</string>
+  <string name="setup_mobile_data">Prender datos móviles</string>
  <string name="setup_mobile_data_no_service">Ensin serviciu</string>
  <string name="setup_mobile_data_emergency_only">Namái llamaes d\'emerxencia</string>
+  <string name="enable_mobile_data_summary">¿Quies usar los datos móviles na configuración? Activalos quiciabes puean tar suxetos a cargos de datos.</string>
  <string name="no">Non</string>
  <string name="yes">Sí</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -54,10 +58,29 @@
  <string name="services_explanation" product="default">Estos servicios furrulen por ti pa estender les capacidaes del móvil. Los datos usaránse acordies cola <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string>
  <string name="services_privacy_policy">Política de privacidá</string>
  <string name="services_help_improve_cm">Ayudar a ameyorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> unviando automáticamente diagnósticos y usu de datos a Cyanogen. Esta información nun s\'usa pa indentificate y écha-yos un gabitu a los equipos pa trabayar en coses como\'l consumu de batería, el rindimientu d\'aplicaciones, y les nueves carauterístiques <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">Aplicar el tema <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> habilitando iconos, fondos de pantalla y fontes únicos.</string>
  <string name="services_os_nav_keys_label"><b>Usar tecles de navegación na pantalla</b> en cuantes de tecles físiques.</string>
  <string name="services_use_secure_sms">Usar SMS seguru</string>
+  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> pa cifrar conversaciones SMS con otros usuarios usando SMS seguru nun preséu <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
+  <string name="setup_unlock">Desbloquiar</string>
  <string name="setup_device_locked">Esti preséu ta bloquiáu pol usuariu.</string>
+  <string name="setup_require_cyanogen_label"><b>Riquir la to contraseña de la cuenta Cyanogen OS</b> pa usar el to preséu incluso dempués de reafitalu.</string>
+  <string name="setup_device_locked_instructions"><i>Pa apagar/prender esta carauterística, por favor vete a Axustes &gt; Seguranza</i></string>
+  <string name="setup_warning_skip_anyway">Ensin una cuenta de Cyanogen OS, nun vas poder: \n\nPersonalizar el to teléfonu con iconos nuevos, fondos de pantalla y muncho más al traviés de l\'aplicación de temes\n\nDesaniciar el teléfonu llocalmente o de manera remota si se perdió</string>
  <!-- Fingerprint setup -->
+  <string name="settings_fingerprint_setup_title">Esbilla\'l tipu de copia de seguranza de pantalla de bloquéu</string>
  <string name="settings_fingerprint_setup_details">¿Cómo te prestaría bloquiar la to pantalla?</string>
+  <string name="fingerprint_setup_title">Configuración del buelga</string>
+  <string name="fingerprint_setup_summary">Pa usar el to sensor de buelgues pa desbloquiar la to pantalla, necesitarás:</string>
+  <string name="fingerprint_setup_backup_lock_method">Configura un métodu secundariu de desbloquéu</string>
+  <string name="fingerprint_setup_add_fingerprint">Amiesta la to buelga</string>
+  <string name="fingerprint_setup_screen_lock_setup">Configuración del bloquéu de pantalla</string>
+  <string name="sim_locale_changed">%1$s SIM deteutada</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">¿Cómo te prestaría bloquiar la to pantalla?</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Bienllegáu a la dómina post-app</string>
+  <string name="mod_description">Los Mods son esperiencies intelixentes, conscientes y llixeres construyíes direutamente dientro del SO. Cuando un MOD camiente que pue ayudate, ufriráse p\'activase.</string>
 </resources>
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -56,6 +56,7 @@
  <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>
@@ -72,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">İkinci kilid açma üsulunu quraşdırın</string>
  <string name="fingerprint_setup_add_fingerprint">Barmaq izinizi əlavə edin</string>
  <string name="fingerprint_setup_screen_lock_setup">Ekran kilidi qurun</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Ekranınızı necə kilidləmək istərdiniz?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -43,9 +43,12 @@
  <string name="location_access_summary"><b>Дазволіць дадаткам, якія запыталі ваш дазвол</b> скарыстаць інфармацыю пра ваша месцазнаходжанне. Гэта можа ўлучаць ваша бягучае і мінулыя месцазнаходжанні.</string>
  <string name="location_battery_saving"><b>Зменшыць энергаспажыванне</b>, абмяжоўваючы колькасць абнаўленняў GPS у гадзіну.</string>
  <string name="location_network"><b>Скарыстаць Wi-F</b> для вызначэння месцазнаходжання.</string>
+  <string name="location_network_telephony"><b>Выкарыстоўваць Wi-Fi ды сотавую сетку</b> каб дапамагчы дадаткам вызначаць ваша месцазнаходжанне.</string>
  <string name="location_network_gms"><b>Скарыстаць службы месцазнаходжання Google</b>, каб дапамагчы дадаткам вызначаць ваша месцазнаходжанне. Гэта азначае, што яны будуць адпраўляць ананімныя дадзеныя пра месцазнаходжанне ў Google нават тады, калі ніякія дадаткі не запушчаны.</string>
+  <string name="setup_mobile_data">Падлучыць мабільны трафік</string>
  <string name="setup_mobile_data_no_service">Няма сеткі</string>
  <string name="setup_mobile_data_emergency_only">Толькі экстраныя выклікі</string>
+  <string name="enable_mobile_data_summary">Выкарыстоўваць мабільную сувязь падчас налады? Ўключэнне перадачы дадзеных па сотавых сетках можа пацягнуць выдаткі.</string>
  <string name="no">Не</string>
  <string name="yes">Так</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -57,6 +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_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>
@@ -74,4 +78,7 @@
  <string name="fingerprint_setup_add_fingerprint">Дадаць адбітак пальца</string>
  <string name="fingerprint_setup_screen_lock_setup">Наладзіць блакаванне экрану</string>
  <string name="sim_locale_changed">%1$s SIM знойдзена</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Абярыце спосаб блакавання экрана.</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -78,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Добавете вашият пръстов отпечатък</string>
  <string name="fingerprint_setup_screen_lock_setup">Настройка на екрана за заключване</string>
  <string name="sim_locale_changed">Намерена %1$s СИМ карта</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Изберете метод на заключване на екрана</string>
+  <string name="settings_lockscreen_setup_details">Как бихте желали да заключите вашият екран?</string>
+  <string name="lockscreen_setup_title">Защитете телефона си</string>
+  <string name="lockscreen_setup_summary"><b>Защитете у-вото</b> и изисквайте ПИН код, фигура или парола за отключване на екрана</string>
+  <string name="lockscreen_setup_screen_lock_setup">Настройване на ПИН код, фигура или парола</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Добре дошли в Post-App Era</string>
+  <string name="mod_description">Модулите са интелигентни, леки и вградени директно в операционната система. Когато модулите смятат, че могат да помогнат те ще Ви предложат да се активират.</string>
 </resources>
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-br-rFR/strings.xml
+++ b/res/values-br-rFR/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
+</resources>
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -60,13 +60,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 un estil visual únic per a les teves icones, fons de pantalla i més.</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_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,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Afegeix la teva empremta digital</string>
  <string name="fingerprint_setup_screen_lock_setup">Configuració del bloqueig de pantalla</string>
  <string name="sim_locale_changed">%1$s SIM detectada</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Selecciona el tipus de bloqueig de pantalla</string>
+  <string name="settings_lockscreen_setup_details">Com t\'agradaria bloquejar la teva pantalla?</string>
+  <string name="lockscreen_setup_title">Protegeix el teu telèfon</string>
+  <string name="lockscreen_setup_summary"><b>Protegeix el dispositiu</b> i estableix un PIN, un patró o una contrasenya per desbloquejar la pantalla</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configura el PIN, el patró o la contrasenya</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Benvinguts a l\'Era Post-Aplicacions</string>
+  <string name="mod_description">Els Mods són intel·ligents, conscients i experiències lleugeres construïts directament dins el SO. Quan un MOD pensi que et pot ajudar, s\'oferirà per activar-se.</string>
 </resources>
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -60,6 +60,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_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>
@@ -77,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Přidat otisk prstu</string>
  <string name="fingerprint_setup_screen_lock_setup">Nastavit zámek obrazovky</string>
  <string name="sim_locale_changed">Zjištěna %1$s SIM</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Vyberte typ zámku obrazovky</string>
+  <string name="settings_lockscreen_setup_details">Jak chcete zamykat obrazovku?</string>
+  <string name="lockscreen_setup_title">Chraňte svůj telefon</string>
+  <string name="lockscreen_setup_summary"><b>Chránit toto zařízení</b> a před odemknutím obrazovky požadovat kód PIN, gesto nebo heslo</string>
+  <string name="lockscreen_setup_screen_lock_setup">Nastavit kód PIN, gesto nebo heslo</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Vítejte v éře Post-App</string>
+  <string name="mod_description">Módy jsou inteligentní a nenáročné malé aplikace zabudované přímo do OS. Tyto MODy mohou v určitých situacích nabídnout svoji pomoc.</string>
 </resources>
--- a/res/values-csb-rPL/strings.xml
+++ b/res/values-csb-rPL/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -60,6 +60,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_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>
@@ -77,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Tilføje dit fingeraftryk</string>
  <string name="fingerprint_setup_screen_lock_setup">Konfigurere skærmlås</string>
  <string name="sim_locale_changed">%1$s SIM-kort fundet</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Vælg skærmlåstype</string>
+  <string name="settings_lockscreen_setup_details">Hvordan vil du gerne låse din skærm?</string>
+  <string name="lockscreen_setup_title">Beskyt din telefon</string>
+  <string name="lockscreen_setup_summary"><b>Beskyt denne enhed</b>, og kræv pinkode, mønster eller adgangskode for at låse skærmen op</string>
+  <string name="lockscreen_setup_screen_lock_setup">Konfigurer pinkode, mønster eller adgangskode</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Velkommen til Post-App æraen</string>
+  <string name="mod_description">Tilpasninger er intelligente, opmærksomme og gode oplevelser indbygget direkte i styresystemet. Når MOD mener den kan hjælpe, vil den tilbyde at aktivere dem for dig.</string>
 </resources>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -41,14 +41,14 @@
  <string name="other_services_summary">Diese Dienste werden von Google zur Verfügung gestellt und können jederzeit aktiviert oder deaktiviert werden. Die Daten werden in Übereinstimmung mit Googles <xliff:g id="name" example="Privacy Policy">%s</xliff:g> genutzt.</string>
  <string name="location_services_summary">Standortdienste erlauben es Systemapps oder Apps von Drittanbietern, Daten (z. B. zu Ihrem ungefähren Standort) zu sammeln und zu verwenden. Beispielweise könnte eine App Ihren ungefähren Standort verwenden, um Cafés in der Nähe zu finden.</string>
  <string name="location_access_summary"><b>Erlaubt Apps, die um Ihre Erlaubnis gebeten haben, </b>Ihre Standortinformationen zu verwenden. Dies können Informationen zu Ihrem aktuellen Standort und zu vergangenen Standorten sein.</string>
-  <string name="location_battery_saving"><b>Akkuverbrauch verringern</b>, indem die Aktualisierungsrate ihres Standortes beschränkt wird.</string>
+  <string name="location_battery_saving"><b>Akkuverbrauch verringern</b>, indem die Aktualisierungsrate Ihres Standortes beschränkt wird.</string>
  <string name="location_network"><b>WLAN aktivieren</b>, um Apps den Standortabruf zu ermöglichen.</string>
  <string name="location_network_telephony"><b>WLAN und Mobilfunknetz nutzen</b>, um die Genauigkeit der Standortbestimmung zu erhöhen.</string>
  <string name="location_network_gms"><b>Googles Standortdienst verwenden</b>, um Apps den Standortabruf zu ermöglichen. Das bedeutet, dass anonymisierte Standortdaten an Google gesendet werden, auch wenn keine App aktiv ist.</string>
  <string name="setup_mobile_data">Mobile Datenverbindung aktivieren</string>
  <string name="setup_mobile_data_no_service">Kein Service</string>
  <string name="setup_mobile_data_emergency_only">Nur Notrufe</string>
-  <string name="enable_mobile_data_summary">Möchten Sie für die Ersteinrichtung mobile Daten benutzen? Dies kann eventuell Kosten verursachen.</string>
+  <string name="enable_mobile_data_summary">Möchten Sie Datenverbindungen über das Mobilfunknetz aktivieren? Dies kann eventuell Kosten verursachen.</string>
  <string name="no">Nein</string>
  <string name="yes">Ja</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> – <xliff:g id="name">%s</xliff:g></string>
@@ -57,9 +57,10 @@
  <string name="services_explanation" product="tablet">Diese Dienste werden verwendet, um die Funktionen Ihres Tablets zu erweitern. Die Daten werden in Übereinstimmung mit Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g> verwendet.</string>
  <string name="services_explanation" product="default">Diese Dienste werden verwendet, um die Funktionen Ihres Telefons zu erweitern. Die Daten werden in Übereinstimmung mit Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g> verwendet.</string>
  <string name="services_privacy_policy">Datenschutzerklärung</string>
-  <string name="services_help_improve_cm">Helfen Sie, <xliff:g id="name" example="CyanogenMod">%s</xliff:g> zu verbessern.</string>
+  <string name="services_help_improve_cm">Helfen Sie <xliff:g id="name" example="CyanogenMod">%s</xliff:g> zu verbessern</string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>, indem Sie automatisch Diagnose-und Nutzungsdaten an CyanogenMod senden. Diese Informationen können nicht dazu verwendet werden, Sie zu identifizieren. Vielmehr helfen sie unserem Team bei der Arbeit an Dingen wie der Akkulaufzeit, der App-Leistung und <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-Funktionen.</string>
  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g>-Design anwenden</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>, um spezifische Symbole, Hintergrundbilder und Schriftarten zu aktivieren.</string>
  <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>
@@ -77,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Fügen Sie Ihren Fingerabdruck hinzu.</string>
  <string name="fingerprint_setup_screen_lock_setup">Die Bildschirmsperre einrichten</string>
  <string name="sim_locale_changed">%1$s SIM-Karte erkannt</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Wählen Sie einen Sperrbildschirm-Typ</string>
+  <string name="settings_lockscreen_setup_details">Wie möchten Sie Ihren Bildschirm sperren?</string>
+  <string name="lockscreen_setup_title">Schützen Sie Ihr Telefon</string>
+  <string name="lockscreen_setup_summary"><b>Gerät schützen</b> und PIN, Muster oder Passwort zur Display-Entsperrung verwenden</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN, Muster oder Passwort einrichten</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Willkommen in der Post-App-Ära</string>
+  <string name="mod_description">Mods sind intelligente, kontextsensitive und leichtgewichtige Anwendungen, die direkt in das Betriebssystem integriert sind. Wenn MOD der Meinung ist, dass es von Nutzen wäre, bietet es Ihnen an, die Mods für Sie zu aktivieren.</string>
 </resources>
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -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">Κάντε χρήση των ασφαλών 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,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Προσθέστε το δακτυλικό σας αποτύπωμα</string>
  <string name="fingerprint_setup_screen_lock_setup">Ρύθμιση κλειδώματος οθόνης</string>
  <string name="sim_locale_changed">Ανιχνεύθηκε %1$s SIM</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Επιλέξτε κλείδωμα οθόνης</string>
+  <string name="settings_lockscreen_setup_details">Πώς θα θέλατε να κλειδώνετε την οθόνη σας;</string>
+  <string name="lockscreen_setup_title">Προστατέψτε το τηλέφωνό σας</string>
+  <string name="lockscreen_setup_summary"><b>Προστατέψτε αυτήν τη συσκευή</b> και ζητήστε ένα PIN, ένα μοτίβο ή έναν κωδικό πρόσβασης για να ξεκλειδώσετε την οθόνη</string>
+  <string name="lockscreen_setup_screen_lock_setup">Ρύθμιση PIN, μοτίβου ή κωδικού πρόσβασης</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Καλώς ήρθατε στην εποχή μετά τις εφαρμογές</string>
+  <string name="mod_description">Τα Mod είναι ευφυείς, ενήμερες και ελαφριές βελτιώσεις ενσωματωμένες κατευθείαν στο σύστημα. Όταν το MOD νομίζει ότι μπορεί να βοηθήσει, θα προσφερθεί να τα ενεργοποιήσει για εσάς.</string>
 </resources>
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -55,7 +55,10 @@
  <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
@@ -16,5 +16,10 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="location_network_telephony"><b>Use Wi-Fi and mobile networks</b> to help apps determine your location.</string>
+  <string name="setup_mobile_data">Turn on mobile data</string>
+  <string name="enable_mobile_data_summary">Do you want to use mobile data during setup? Turning on mobile data may be subject to data charges.</string>
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -57,6 +57,7 @@
  <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>
@@ -73,4 +74,7 @@
  <string name="fingerprint_setup_backup_lock_method">Setup a secondary unlock method</string>
  <string name="fingerprint_setup_add_fingerprint">Add your fingerprint</string>
  <string name="fingerprint_setup_screen_lock_setup">Setup screen lock</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">How would you like to lock your screen?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-en-rPT/strings.xml
+++ b/res/values-en-rPT/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -16,7 +16,6 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Asistanto pri agordoj</string>
  <string name="next">Sekvonta</string>
  <string name="skip">Preterpasi</string>
  <string name="start">Lanĉi</string>
@@ -55,6 +54,7 @@
  <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>
@@ -63,4 +63,6 @@
  <string name="setup_device_locked_instructions"><i>Por mal-/ŝalti tiun funkcion, bonvolu iri en Agordoj &gt; Sekureco</i></string>
  <string name="setup_warning_skip_anyway">Sen Cyanogen konto, vi ne kapablos :\n\nAgordi vian telefonon per novaj piktogramoj, ekranfono kaj pli en la etosa aplikaĵo\n\nLokigi aŭ fore forviŝi vian telefonilon se vi perdas ĝin</string>
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-es-rCO/strings.xml
+++ b/res/values-es-rCO/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
+</resources>
--- a/res/values-es-rMX/strings.xml
+++ b/res/values-es-rMX/strings.xml
@@ -22,4 +22,6 @@
  <string name="enable_mobile_data_summary">¿Deseas utilizar datos móviles durante la instalación? Activar los datos móviles puede provocar cargos de datos.</string>
  <!-- Fingerprint setup -->
  <string name="sim_locale_changed">%1$s SIM detectada</string>
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -17,7 +17,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="app_name">Asistente de configuración</string>
-  <string name="next">Sig</string>
+  <string name="next">Siguiente</string>
  <string name="skip">Omitir</string>
  <string name="start">Inicio</string>
  <string name="ok">Aceptar</string>
@@ -60,6 +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_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>
@@ -77,4 +78,12 @@
  <string name="fingerprint_setup_add_fingerprint">Añadir tu huella digital</string>
  <string name="fingerprint_setup_screen_lock_setup">Configurar la pantalla bloqueada</string>
  <string name="sim_locale_changed">%1$s SIM detectada</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">¿Cómo quieres bloquear tu pantalla?</string>
+  <string name="lockscreen_setup_title">Protege el teléfono</string>
+  <string name="lockscreen_setup_summary"><b>Proteger dispositivo</b> y solicitar PIN/patrón/contraseña para desbloquear pantalla</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurar PIN, patrón o contraseña</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Bienvenido a la era posaplicaciones</string>
+  <string name="mod_description">Las Mods son experiencias inteligentes, conscientes y ligeras construidas directamente dentro del SO. Cuando una MOD cree que te puede ayudar, se ofrecerá para activarse.</string>
 </resources>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -41,9 +41,9 @@
  <string name="other_services_summary">Estos servicios hacen que Google trabajar para ti, y puedes activarlos o desactivarlos en cualquier momento. Los datos se utilizarán según la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Google.</string>
  <string name="location_services_summary">Los servicios de localización permiten al sistema y a otras aplicaciones recopilar y utilizar datos tales como tu ubicación aproximada. Por ejemplo, una aplicación puede utilizar tu ubicación aproximada para localizar cafeterías cercanas.</string>
  <string name="location_access_summary"><b>Permitir aplicaciones que han solicitado tu permiso</b> para usar tu información de ubicación. Esto puede incluir tu localización actual y ubicaciones recientes.</string>
-  <string name="location_battery_saving"><b>Reducir consumo de batería</b> al restringir el número de actualizaciones GPS por hora.</string>
+  <string name="location_battery_saving"><b>Reduce el consumo de batería</b> al restringir el número de actualizaciones GPS por hora.</string>
  <string name="location_network"><b>Uso de Wi-Fi</b> para ayudar a que las aplicaciones determinen tu ubicación.</string>
-  <string name="location_network_telephony"><b>Utilizar Wi-Fi y redes móviles</b> para ayudar a que las aplicaciones determinen tu ubicación.</string>
+  <string name="location_network_telephony"><b>Utiliza Wi-Fi y redes móviles</b> para ayudar a que las aplicaciones determinen tu ubicación.</string>
  <string name="location_network_gms"><b>Uso del servicio de localización de Google</b> para ayudar a las aplicaciones a determinar tu ubicación. Esto significa enviar información anónima de la localización a Google, incluso cuando no haya aplicaciones usando este servicio.</string>
  <string name="setup_mobile_data">Activar datos móviles</string>
  <string name="setup_mobile_data_no_service">Sin servicio</string>
@@ -60,6 +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_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>
@@ -77,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">Añade tu huella digital</string>
  <string name="fingerprint_setup_screen_lock_setup">Ajustes de pantalla de bloqueo</string>
  <string name="sim_locale_changed">%1$s SIM detectada</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">¿Cómo quieres bloquear tu pantalla?</string>
+  <string name="lockscreen_setup_summary"><b>Proteger este dispositivo</b> y establecer un PIN, un patrón o una contraseña para desbloquear la pantalla</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Bienvenido a la era Post-Aplicaciones</string>
+  <string name="mod_description">Los Mods son experiencias inteligentes, conscientes y ligeras construidas directamente dentro del SO. Cuando un MOD piensa que te puede ayudar, se ofrecerá para activarse.</string>
 </resources>
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -56,6 +56,7 @@
  <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>
@@ -72,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">Häälesta teisejärguline avamise meetod</string>
  <string name="fingerprint_setup_add_fingerprint">Lisa oma sõrmejälg</string>
  <string name="fingerprint_setup_screen_lock_setup">Ekraaniluku seadistamine</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Kuidas soovite ekraani lukustada?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -60,7 +60,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> zure ikono, horma-irudi eta bestelakoentzat estilo bisual paregabe bat gaituz.</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_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,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Gehitu zure hatz-marka</string>
  <string name="fingerprint_setup_screen_lock_setup">Ezarri pantaila blokeoa</string>
  <string name="sim_locale_changed">%1$s SIM antzeman da</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Hautatu pantaila-blokeo mota</string>
+  <string name="settings_lockscreen_setup_details">Nola blokeatu nahi duzu pantaila?</string>
+  <string name="lockscreen_setup_title">Babestu telefonoa</string>
+  <string name="lockscreen_setup_summary"><b>Babestu gailua</b> eta eskatu PIN kode, eredu edo pasahitz bat pantaila desblokeatzeko</string>
+  <string name="lockscreen_setup_screen_lock_setup">Konfiguratu PIN kodea, eredua edo pasahitza</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Ongi etorri aplikazioen osteko garaira</string>
+  <string name="mod_description">Mod-ak zuzenean sistema eragilean eraikitako esperienzia adimentsu, jakitun eta arinak dira. Mod batek lagundu dezakeela uste duenean aktibatzea eskainiko dizu.</string>
 </resources>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -56,6 +56,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>. از این داده‌ها برای تعیین هویت شما استفاده نمی‌شود و صرفاً کمکی است به تیم‌هایی که بر روی قابلیت‌هایی نظیر عمر باتری، عملکرد برنامه‌ها و ویژگی‌های جدید <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>
@@ -72,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">تنظیم روش دوم باز کردن قفل</string>
  <string name="fingerprint_setup_add_fingerprint">افزودن اثر انگشت خود</string>
  <string name="fingerprint_setup_screen_lock_setup">تنظیمات قفل صفحه</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">چگونه می‌خواهید صفحه خود را قفل کنید؟</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -60,7 +60,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 ainutlaatuista ulkoasua kuvakkeissa, taustakuvissa ja fonteissa.</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_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,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Lisää sormenjälkesi</string>
  <string name="fingerprint_setup_screen_lock_setup">Aseta näytön lukitus</string>
  <string name="sim_locale_changed">%1$s SIM tunnistettu</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Valitse näytön lukitustapa</string>
+  <string name="settings_lockscreen_setup_details">Miten haluat lukita näyttösi?</string>
+  <string name="lockscreen_setup_title">Suojaa puhelintasi</string>
+  <string name="lockscreen_setup_summary"><b>Suojaa laitetta</b> avaamalla näytön lukitus PIN-koodin, kuvion tai salasanan avulla</string>
+  <string name="lockscreen_setup_screen_lock_setup">Aseta PIN-koodi, kuvio tai salasana</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Tervetuloa Post-App-aikakaudelle</string>
+  <string name="mod_description">Modit ovat älykkäitä, tietoisia ja kevyitä kokemuksia jotka on sisäänrakennettuna käyttöjärjestelmään. Kun MOD ajattelee voivansa auttaa, se ehdottaa voivansa aktivoida ne puolestasi.</string>
 </resources>
--- a/res/values-fil-rPH/strings.xml
+++ b/res/values-fil-rPH/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -60,6 +60,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_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>
@@ -77,4 +78,12 @@
  <string name="fingerprint_setup_add_fingerprint">Ajouter votre empreinte digitale</string>
  <string name="fingerprint_setup_screen_lock_setup">Configurer le verrouillage de l\'écran</string>
  <string name="sim_locale_changed">%1$s carte SIM détectée</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Comment voulez-vous verrouiller votre écran ?</string>
+  <string name="lockscreen_setup_title">Protéger votre téléphone</string>
+  <string name="lockscreen_setup_summary"><b>"Protéger l\'appareil"</b>\" et exiger code, schéma ou mot de passe pour déverrouiller l\'écran\"</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurer un code, un schéma ou un mot de passe</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Bienvenue dans l\'ère post-applications</string>
+  <string name="mod_description">Les Mods sont des fonctionnalités intelligentes, conscientes et légères construites directement dans le système d\'exploitation. Lorsque le MOD pense pouvoir vous aider, il vous proposera de les activer à votre place.</string>
 </resources>
--- a/res/values-frp-rIT/strings.xml
+++ b/res/values-frp-rIT/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-fy-rNL/strings.xml
+++ b/res/values-fy-rNL/strings.xml
@@ -18,4 +18,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="ok">OK</string>
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ga-rIE/strings.xml
+++ b/res/values-ga-rIE/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
+</resources>
--- a/res/values-gd-rGB/strings.xml
+++ b/res/values-gd-rGB/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -41,10 +41,14 @@
  <string name="other_services_summary">Estes servizos fan que Google traballe para vostede e pode desactivalos ou activalos cando queira. Os datos utilizaranse de acordo coa<xliff:g id="name" example="Política de privacidade">%s</xliff:g> de Google.</string>
  <string name="location_services_summary">Os servizos de localización permítenlle ao sistema e a aplicacións de terceiros reunir e utilizar datos como a súa localización aproximada. Por exemplo, unha aplicación pode utilizar a localización aproximada para determinar as cafetarías próximas.</string>
  <string name="location_access_summary"><b>Permite que as aplicacións se teñen o teu permiso</b> utilicen a información sobre a túa localización, o que pode incluír á presente e ás pasadas.</string>
+  <string name="location_battery_saving"><b>Reducir o consumo da batería</b> reducindo as actualizacións do GPS por hora.</string>
  <string name="location_network"><b>Utiliza a Wi-Fi</b> para axudar as aplicacións a determinar a súa localización.</string>
+  <string name="location_network_telephony"><b>Utiliza a Wi-Fi e redes móbiles</b> para axudar ás aplicacións a determinar a túa localización.</string>
  <string name="location_network_gms"><b>Utiliza o servizo de localización de Google</b> para axudar a determinar a súa localización.</string>
+  <string name="setup_mobile_data">Activar os datos móbeis</string>
  <string name="setup_mobile_data_no_service">Sen servizo</string>
  <string name="setup_mobile_data_emergency_only">Só chamadas de urxencia</string>
+  <string name="enable_mobile_data_summary">Queres utilizar os datos móbeis durante a configuración? Ao facelo pódense producir gastos adicionais no plan de datos contratado.</string>
  <string name="no">Non</string>
  <string name="yes">Si</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -56,6 +60,7 @@
  <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>
@@ -72,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Configurar un método secundario de desbloqueo</string>
  <string name="fingerprint_setup_add_fingerprint">Engadir a súa pegada dactilar</string>
  <string name="fingerprint_setup_screen_lock_setup">Configurar o bloqueo da pantalla</string>
+  <string name="sim_locale_changed">%1$s SIM detectado</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Seleccionar o tipo de bloqueo da pantalla</string>
+  <string name="settings_lockscreen_setup_details">Como quere bloquear a súa pantalla?</string>
+  <string name="lockscreen_setup_title">Protexe o teu móbil</string>
+  <string name="lockscreen_setup_summary"><b>Protexe o dispositivo</b> e solicitar un PIN, patrón ou contrasinal para desbloquear a pantalla</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurar un PIN, patrón ou contrasinal</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Benvido á era post-aplicacións</string>
+  <string name="mod_description">Os Mos son experiencias intelixentes, conscientes e lixeiras construídas directamente no SO. Cando un MOD pensa que pode axudar, ofreceralle activarse.</string>
 </resources>
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -60,6 +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="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>
@@ -77,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">તમારી ફિંગરપ્રિન્ટ ઉમેરો</string>
  <string name="fingerprint_setup_screen_lock_setup">સ્ક્રીન લૉક સેટઅપ કરો</string>
  <string name="sim_locale_changed">%1$s SIM સૂચિત</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">તમે કેવી રીતે તમારું સ્ક્રીન લૉક કરવા માંગો છો?</string>
+  <string name="lockscreen_setup_title">તમારા ફોનને સુરક્ષિત કરો</string>
+  <string name="lockscreen_setup_summary"><b>આ ઉપકરણને સુરક્ષિત કરો</b> અને સ્ક્રીનને અનલૉક કરવા માટે PIN, પેટર્ન અથવા પાસવર્ડ જરૂરી</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN, પેટર્ન અથવા પાસવર્ડ સેટ કરો</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -56,6 +56,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>। इस जानकारी का उपयोग आपको पहचानने के लिए नहीं हो सकता है। वह केवल बैटरी की आयु, ऐप के निष्पादन और नए <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>
@@ -72,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">अनलॉक करने की कोई दूसरी विधि भी सेट अप करें</string>
  <string name="fingerprint_setup_add_fingerprint">अपनी अँगुली छाप जोड़ें</string>
  <string name="fingerprint_setup_screen_lock_setup">स्क्रीन लॉक सेटअप करें</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">आप अपने स्क्रीन को किस तरह से लॉक करना चाहेंगे?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -19,15 +19,15 @@
  <string name="app_name">Čarobnjak za postavljanje</string>
  <string name="next">Dalje</string>
  <string name="skip">Preskoči</string>
-  <string name="start">Start</string>
+  <string name="start">Započni</string>
  <string name="ok">U redu</string>
-  <string name="loading">Samo sek\u2026</string>
-  <string name="setup_complete">Postavljanje je završeno</string>
-  <string name="setup_welcome">Dobrodošli</string>
+  <string name="loading">Samo trenutak\u2026</string>
+  <string name="setup_complete">Postavljanje je završeno.</string>
+  <string name="setup_welcome">Dobro došli!</string>
  <string name="setup_wifi">Odaberite Wi-Fi</string>
-  <string name="setup_sim_missing">Nedostaje SIM kartica</string>
-  <string name="setup_choose_data_sim">Odaberite SIM za podatke</string>
-  <string name="setup_location">Lokacijske usluge</string>
+  <string name="setup_sim_missing">Nema SIM kartice</string>
+  <string name="setup_choose_data_sim">Odaberite SIM karticu za podatke</string>
+  <string name="setup_location">Usluge lokacije</string>
  <string name="setup_other">Ostale usluge</string>
  <string name="setup_datetime">Datum i vrijeme</string>
  <string name="setup_current_date">Današnji datum</string>
@@ -53,13 +53,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_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>
@@ -77,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Dodajte svoj otisak</string>
  <string name="fingerprint_setup_screen_lock_setup">Postavljanje zaključavanja zaslona</string>
  <string name="sim_locale_changed">%1$s SIM otkriven</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Odaberite vrstu zaključavanja zaslona</string>
+  <string name="settings_lockscreen_setup_details">Kako želite zaključati vaš zaslon?</string>
+  <string name="lockscreen_setup_title">Zaštitite svoj telefon</string>
+  <string name="lockscreen_setup_summary"><b>Zaštiti uređaj</b> i zahtijevaj PIN, uzorak ili zaporku za otključavanje zaslona</string>
+  <string name="lockscreen_setup_screen_lock_setup">Postavi PIN, uzorak ili zaporku</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Dobro došli u Post-App eru</string>
+  <string name="mod_description">Modovi su inteligentni, svjesni, laganim iskustvom ugrađeni izravno u OS. Kada MOD misli da može pomoći, ponudit će da vam ih aktivira.</string>
 </resources>
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -60,6 +60,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_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>
@@ -77,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Adja hozzá ujjlenyomatát</string>
  <string name="fingerprint_setup_screen_lock_setup">Képernyőzár beállítása</string>
  <string name="sim_locale_changed">%1$s SIM észlelve</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Válasszon képernyő zárolási típust</string>
+  <string name="settings_lockscreen_setup_details">Hogyan szeretné zárolni a képernyőt?</string>
+  <string name="lockscreen_setup_title">Óvja meg telefonját</string>
+  <string name="lockscreen_setup_summary"><b>Óvja meg eszközét</b>, és a képernyőzár feloldásához állítson be PIN kódot, mintát vagy jelszót.</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN kód, minta vagy jelszó beállítása</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Üdvözöljük a Post-App korszakban</string>
+  <string name="mod_description">Módosítások közvetlenül a rendszerbe épített intelligens, tájékozott és könnyű tapasztalatok. Ha a MOD úgy gondolja, hogy hasznos lehet az Ön számára, fel fogja ajánlani, hogy aktiválja őket.</string>
 </resources>
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -43,12 +43,12 @@
  <string name="location_access_summary"><b>Izinkan aplikasi yang telah meminta izin Anda</b> menggunakan informasi lokasi Anda. Ini mungkin termasuk lokasi Anda saat ini dan lokasi terakhir.</string>
  <string name="location_battery_saving"><b>Mengurangi pemakaian baterai</b> dengan membatasi jumlah pembaruan GPS tiap jam.</string>
  <string name="location_network"><b>Penggunaan Wi-Fi</b> untuk membantu aplikasi menentukan lokasi Anda.</string>
-  <string name="location_network_telephony"><b>Gunakan Wi-Fi dan jaringan seluler</b> untuk membantu aplikasi menetukan 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,6 +60,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_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>
@@ -77,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Tambahkan sidik jari Anda</string>
  <string name="fingerprint_setup_screen_lock_setup">Siapkan kunci layar</string>
  <string name="sim_locale_changed">%1$s SIM terdeteksi</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Pilih tipe kunci layar</string>
+  <string name="settings_lockscreen_setup_details">Bagaimana cara kunci layar yang Anda suka?</string>
+  <string name="lockscreen_setup_title">Lindungi telepon anda</string>
+  <string name="lockscreen_setup_summary"><b>Lindungi perangkat ini</b> dan minta PIN, pola, atau sandi untuk membuka kunci layar</string>
+  <string name="lockscreen_setup_screen_lock_setup">Siapkan PIN, pola, atau sandi</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Selamat datang di Era Pasca-Aplikasi</string>
+  <string name="mod_description">Mod itu cerdas, sadar, dan merupakan pengalaman ringan yang terintegrasi dengan sistem operasi. Jika MOD berpikir bahwa ia dapat membantu, ia dapat menawarkan pengaktifan fitur bagi Anda.</string>
 </resources>
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -60,7 +60,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> attiverà uno stile unico per le tue icone, sfondi e altro.</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_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,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Aggiungere un\'impronta</string>
  <string name="fingerprint_setup_screen_lock_setup">Imposta una schermata di blocco</string>
  <string name="sim_locale_changed">%1$s SIM rilevata</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Seleziona il tipo di schermata di blocco</string>
+  <string name="settings_lockscreen_setup_details">Come vuoi bloccare lo schermo?</string>
+  <string name="lockscreen_setup_title">Proteggi il tuo telefono</string>
+  <string name="lockscreen_setup_summary"><b>Proteggi il dispositivo</b> e richiedi PIN, sequenza o password per sbloccare schermo</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configura PIN, sequenza o password</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Benvenuti nell\'Era Post-App</string>
+  <string name="mod_description">Le MOD sono funzioni intelligenti, consapevoli e leggere costruite direttamente nel sistema. Quando una MOD pensa di essere d\'aiuto, si offrirà di attivare delle funzioni per te.</string>
 </resources>
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -60,6 +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_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>
@@ -77,4 +78,12 @@
  <string name="fingerprint_setup_add_fingerprint">הוסף את טביעת האצבע שלך</string>
  <string name="fingerprint_setup_screen_lock_setup">הגדרת מסך נעילה</string>
  <string name="sim_locale_changed">זוהו %1$s כרטיסי SIM</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">כיצד הנך מעוניין לנעול את המסך שלך?</string>
+  <string name="lockscreen_setup_title">הגן על הטלפון שלך</string>
+  <string name="lockscreen_setup_summary"><b>הגן על מכשיר זה</b> ודרוש קוד אימות, קו או סיסמה לביטול נעילת המסך.</string>
+  <string name="lockscreen_setup_screen_lock_setup">‏הגדר PIN, קו ביטול נעילה או סיסמה</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">ברוכים הבאים לעידן הפוסט-יישום</string>
+  <string name="mod_description">תוספים הם חוויות אינטליגנטיות, מודעות וקלות, שנבנו לתוך מערכת ההפעלה. כאשר תוסף חושב שביכולתו לסייע למשתמש/ת, הוא יציע לך להפעיל את עצמו למענך.</string>
 </resources>
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -34,8 +34,8 @@
  <string name="setup_current_time">現在の時刻</string>
  <string name="sim_missing_summary" product="tablet">お使いのタブレットでSIMカードが検出されませんでした。SIMカードの挿入方法については、タブレットに付属している説明書をご覧ください。</string>
  <string name="sim_missing_summary" product="default">お使いの携帯電話でSIMカードが検出されませんでした。SIMカードの挿入方法については、携帯電話に付属している説明書をご覧ください。</string>
-  <string name="choose_data_sim_summary" product="tablet">どちらのSIMをデータ通信に使用しますか？選択したSIMをタブレットのセットアップに使用しますので、パケット通信料を請求される可能性があります。</string>
-  <string name="choose_data_sim_summary" product="default">どちらのSIMをデータ通信に使用しますか？選択したSIMを携帯電話のセットアップに使用しますので、パケット通信料を請求される可能性があります。</string>
+  <string name="choose_data_sim_summary" product="tablet">どちらのSIMをデータ通信に使用しますか？選択したSIMをタブレットのセットアップに使用するため、パケット通信料を請求される可能性があります。</string>
+  <string name="choose_data_sim_summary" product="default">どちらのSIMをデータ通信に使用しますか？選択したSIMを携帯電話のセットアップに使用するため、パケット通信料を請求される可能性があります。</string>
  <string name="date_time_summary">タイムゾーンを設定して、必要であれば現在の日付と時刻を調整してください</string>
  <string name="backup_data_summary">アプリのデータ、Wi-Fiパスワード、その他の設定をGoogleのサーバーに<b>バックアップする</b></string>
  <string name="other_services_summary">これらのサービスはGoogleアプリを動作させるもので、いつでもONまたはOFFにすることができます。データはGoogleの<xliff:g id="name" example="Privacy Policy">%s</xliff:g>に従って使用されます。</string>
@@ -45,10 +45,10 @@
  <string name="location_network">アプリが位置情報を特定しやすくするために<b>Wi-Fiを使用します</b>。</string>
  <string name="location_network_telephony">アプリが位置情報を特定しやすくするために<b>Wi-Fiとモバイルネットワークを使用します</b>。</string>
  <string name="location_network_gms">アプリが位置情報を特定しやすくするために<b>Googleの位置情報サービスを使用します</b>。アプリが実行されていなくても、匿名の位置情報データをGoogleに送信することになります。</string>
-  <string name="setup_mobile_data">データ通信をON</string>
+  <string name="setup_mobile_data">モバイルデータをON</string>
  <string name="setup_mobile_data_no_service">サービスがありません</string>
  <string name="setup_mobile_data_emergency_only">緊急通報のみ</string>
-  <string name="enable_mobile_data_summary">セットアップでデータ通信を有効にしますか？データ通信をONにするとデータ通信料を請求される可能性があります。</string>
+  <string name="enable_mobile_data_summary">セットアップ中にモバイルデータを使用しますか？モバイルデータをONにすると、パケット通信料を請求される可能性があります。</string>
  <string name="no">いいえ</string>
  <string name="yes">はい</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -57,9 +57,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_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>
@@ -77,4 +78,12 @@
  <string name="fingerprint_setup_add_fingerprint">指紋を追加</string>
  <string name="fingerprint_setup_screen_lock_setup">画面のロックをセットアップ</string>
  <string name="sim_locale_changed">%1$sのSIMを検出しました</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">どのように画面をロックしますか？</string>
+  <string name="lockscreen_setup_title">スマートフォンの保護</string>
+  <string name="lockscreen_setup_summary"><b>この端末を保護</b>し、画面のロック解除にPIN、パターン、またはパスワードを必要とする</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN、パターン、またはパスワードの設定</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Post-App Eraへようこそ</string>
+  <string name="mod_description">MODはOSに直接組み込まれたスマートで、物分りが良く、軽量なエクスペリアンスです。MODが役に立つと考えたときは、MODを有効にすることを提案します。</string>
 </resources>
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -60,6 +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="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>
@@ -77,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">ನಿಮ್ಮ ಫಿಂಗರ್‍ಪ್ರಿಂಟನ್ನು ಸೇರಿಸಿ</string>
  <string name="fingerprint_setup_screen_lock_setup">ಪರದೆ ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಿ</string>
  <string name="sim_locale_changed">%1$s SIM ಗುರುತಿಸಲ್ಪಟ್ಟಿದೆ</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">ನಿಮ್ಮ ಪರದೆಯನ್ನು ನೀವು ಹೇಗೆ ಲಾಕ್ ಮಾಡಲು ಬಯಸುವಿರಿ?</string>
+  <string name="lockscreen_setup_title">ನಿಮ್ಮ ಫೋನನ್ನು ರಕ್ಷಿಸಿ</string>
+  <string name="lockscreen_setup_summary"><b>ಸಾಧನ ರಕ್ಷಿಸಿ</b>. ಸ್ಕ್ರೀನ್‌ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಪಿನ್, ಪ್ಯಾಟರ್ನ್, ಪಾಸ್‌ವರ್ಡ್ ಬೇಕಾಗುತ್ತದೆ</string>
+  <string name="lockscreen_setup_screen_lock_setup">ಪಿನ್, ನಮೂನೆ ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -60,6 +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_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>
@@ -78,4 +79,12 @@
  <string name="fingerprint_setup_add_fingerprint">지문 추가</string>
  <string name="fingerprint_setup_screen_lock_setup">화면 잠금 설정</string>
  <string name="sim_locale_changed">%1$s SIM 인식됨</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">화면을 어떻게 잠그시겠습니까?</string>
+  <string name="lockscreen_setup_title">휴대전화 보호</string>
+  <string name="lockscreen_setup_summary"><b>이 기기를 보호</b>하고 화면 잠금 해제용 PIN, 패턴 또는 비밀번호 요청</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN, 패턴 또는 비밀번호 설정하기</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">앱 이전 시대에 오신 것을 환영합니다</string>
+  <string name="mod_description">Mod는 운영 체제에 내장된 지능형이고, 인식할 수 있으며 가벼운 경험입니다. Mod가 도울 수 있다고 생각하면, 당신이 활성화할 수 있도록 제공할 것입니다.</string>
 </resources>
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -49,4 +49,6 @@
  <string name="services_privacy_policy">یاسای تایبەتی</string>
  <string name="setup_unlock">کردنەوە</string>
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -56,6 +56,7 @@
  <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>
@@ -72,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">Eng zweet Entspärmethod ariichten</string>
  <string name="fingerprint_setup_add_fingerprint">Däi Fangerofdrock dobäisetzen</string>
  <string name="fingerprint_setup_screen_lock_setup">D\'Schiermspär ariichten</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Wéi wëlls du däi Schierm spären?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -56,6 +56,7 @@
  <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>
@@ -72,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">Nustatyti antrinį atrakinimo metodą</string>
  <string name="fingerprint_setup_add_fingerprint">Pridėti savo pirštų atspaudą</string>
  <string name="fingerprint_setup_screen_lock_setup">Nustatyti ekrano užraktą</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Kaip norėtumėte užrakinti ekraną?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -56,6 +56,7 @@
  <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>
@@ -72,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">Iestatīt sekundāro atbloķēšanas metodi</string>
  <string name="fingerprint_setup_add_fingerprint">Pievienot pirkstu nospiedumu</string>
  <string name="fingerprint_setup_screen_lock_setup">Iestatīt ekrānslēgu</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Kādu Jūs vēlētos ekrānslēgu?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -60,6 +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="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>
@@ -77,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">നിങ്ങളുടെ വിരലടയാളം ചേർക്കുക</string>
  <string name="fingerprint_setup_screen_lock_setup">സ്ക്രീൻ ലോക്ക് സജ്ജമാക്കുക</string>
  <string name="sim_locale_changed">%1$s SIM കണ്ടെത്തി</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">നിങ്ങളുടെ സ്ക്രീന്‍ എങ്ങനെ ലോക്ക് ചെയ്യാനാണ് നിങ്ങള്‍ ആഗ്രഹിക്കുന്നത്?</string>
+  <string name="lockscreen_setup_title">നിങ്ങളുടെ ഫോൺ പരിരക്ഷിക്കുക</string>
+  <string name="lockscreen_setup_summary"><b>ഈ ഉപകരണം പരിരക്ഷിക്കുക</b>, സ്‌ക്രീൻ അൺലോക്കുചെയ്യാൻ പിൻ,പാറ്റേൺ അല്ലെങ്കിൽ പാസ്‌വേഡ് ആവശ്യമാണ്</string>
+  <string name="lockscreen_setup_screen_lock_setup">പിൻ, പാറ്റേൺ അല്ലെങ്കിൽ പാസ്‌വേഡ് സജ്ജമാക്കുക</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -60,6 +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_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>
@@ -77,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">तुमचा बोटाचा ठसा जोडा</string>
  <string name="fingerprint_setup_screen_lock_setup">स्क्रीन लॉक सेटअप करा</string>
  <string name="sim_locale_changed">%1$s सिम आढळले</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">तुम्हाला तुमचा स्क्रीन कसा लॉक करायला आवडेल?</string>
+  <string name="lockscreen_setup_title">आपला फोन संरक्षित करा</string>
+  <string name="lockscreen_setup_summary"><b>हे डिव्हाइस संरक्षित करा</b> आणि स्क्रीन अनलॉक करण्यासाठी पिन, नमुना किंवा संकेतशब्द आवश्यक आहे</string>
+  <string name="lockscreen_setup_screen_lock_setup">पिन, नमुना किंवा संकेतशब्द सेट करा</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -43,10 +43,12 @@
  <string name="location_access_summary"><b>Tillat programmer som har bedt om din tillatelse</b> å bruke stedsinformasjonen. Dette kan være din nåværende posisjon og siste steder.</string>
  <string name="location_battery_saving"><b>Redusere batteriforbruket</b> ved å begrense antall GPS oppdateringer per time.</string>
  <string name="location_network"><b>Bruk Wi-Fi</b> for å hjelpe apper å finne din posisjon.</string>
+  <string name="location_network_telephony"><b>Bruk Wi-Fi og mobilnettverk</b> for å forbedre posisjonen din.</string>
  <string name="location_network_gms"><b>Bruk Googles lokasjonstjeneste</b> for å hjelpe apps finne din posisjon. Dette betyr å sende anonym stedsinformasjon til Google, selv når ingen programmer kjører.</string>
  <string name="setup_mobile_data">Slå på mobildata</string>
  <string name="setup_mobile_data_no_service">Ingen tjeneste</string>
  <string name="setup_mobile_data_emergency_only">Kun nødanrop</string>
+  <string name="enable_mobile_data_summary">Vil du bruke mobildata under installasjonen? Slå på mobildata kan tilføye ekstra kostnader.</string>
  <string name="no">Nei</string>
  <string name="yes">Ja</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d </xliff:g> - <xliff:g id="name">%s </xliff:g></string>
@@ -58,6 +60,7 @@
  <string name="services_help_improve_cm">Hjelp til med å 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 å sende diagnostikk- og bruksdata automatisk til Cyanogen. Denne informasjonen kan ikke brukes til å identifisere deg, men hjelper de som jobber med ting som batteritid, appytelse og nye <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-funksjoner.</string>
  <string name="services_apply_theme">Bruke <xliff:g id="name" example="Material">%s</xliff:g> temaet</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> aktiverer unike ikoner, bakgrunner og skrifttyper.</string>
  <string name="services_os_nav_keys_label"><b>Bruk navigasjonstaster på skjermen </b> istedenfor hardware knapper.</string>
  <string name="services_use_secure_sms">Bruk sikker SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> for å kryptere SMS-samtaler med andre brukere ved hjelp av sikker SMS på en <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-enhet.</string>
@@ -75,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Legge til fingeravtrykket ditt</string>
  <string name="fingerprint_setup_screen_lock_setup">Konfigurere skjermlås</string>
  <string name="sim_locale_changed">%1$s SIM oppdaget</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Velg skjermlåstype</string>
+  <string name="settings_lockscreen_setup_details">Hvordan vil du låse skjermen din?</string>
+  <string name="lockscreen_setup_title">Beskytt telefonen</string>
+  <string name="lockscreen_setup_summary"><b>Beskytt denne enheten</b> og krev PIN-kode, mønster eller passord for å låse opp skjermen</string>
+  <string name="lockscreen_setup_screen_lock_setup">Konfigurer PIN-kode, mønster eller passord</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Velkommen til Post-App Era</string>
+  <string name="mod_description">Mods er intelligente, godtvitende og små erfaringer bygget direkte inn i OSet. Når MOD tenker at den kan hjelpe, vil den anbefale deg å slå den på.</string>
 </resources>
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -60,6 +60,7 @@
  <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>
@@ -77,4 +78,11 @@
  <string name="fingerprint_setup_add_fingerprint">Uw vingerafdruk toe te voegen</string>
  <string name="fingerprint_setup_screen_lock_setup">Schermvergrendeling in te stellen</string>
  <string name="sim_locale_changed">%1$s simkaart gedetecteerd</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Schermvergrendelingstype selecteren</string>
+  <string name="settings_lockscreen_setup_details">Hoe wilt u uw scherm vergrendelen?</string>
+  <string name="lockscreen_setup_title">Bescherm uw telefoon</string>
+  <string name="lockscreen_setup_summary"><b>Bescherm dit apparaat</b> en vraag om een pincode, patroon of wachtwoord om het scherm te ontgrendelen</string>
+  <string name="lockscreen_setup_screen_lock_setup">Pincode, patroon of wachtwoord instellen</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-oc-rFR/strings.xml
+++ b/res/values-oc-rFR/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-or-rIN/strings.xml
+++ b/res/values-or-rIN/strings.xml
@@ -60,6 +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> । ଏହି ସୂଚନା ଆପଣଙ୍କୁ ଚିହ୍ନଟ କରିବା ପାଇଁ ବ୍ୟବହୃତ କରିହେବ ନା୍ହିଁ ଓ ବ୍ୟାଟେରୀ ବ୍ୟବହାର ଅବଧି, ଆପ୍ଲିକେସନ୍‍ କାର୍ଯ୍ୟକାରିତା, ଓ ନୂଆ  <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>
@@ -77,4 +78,7 @@
  <string name="fingerprint_setup_add_fingerprint">ଆପଣଙ୍କ ଫିଙ୍ଗର୍‍ପ୍ରିଣ୍ଟ ଯୋଗ କରନ୍ତୁ</string>
  <string name="fingerprint_setup_screen_lock_setup">ସ୍କ୍ରିନ୍‍ ଲକ୍‍ ସେଟ୍‍ଅପ୍‍ କରନ୍ତୁ</string>
  <string name="sim_locale_changed">%1$s SIM ସନ୍ଧାନ କରାଯାଇଛି</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">ଆପଣ କିପରି ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‍ ଲକ୍‍ କରିବାକୁ ଚାହିଁବେ?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -60,6 +60,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_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>
@@ -77,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Dodać swój odcisk palca</string>
  <string name="fingerprint_setup_screen_lock_setup">Skonfigurować blokadę ekranu</string>
  <string name="sim_locale_changed">Wykryto %1$s SIM</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Wybierz typ blokady ekranu</string>
+  <string name="settings_lockscreen_setup_details">Jak chcesz blokować swój ekran?</string>
+  <string name="lockscreen_setup_title">Zabezpiecz telefon</string>
+  <string name="lockscreen_setup_summary"><b>Zabezpiecz to urządzenie</b>, wymagając kodu PIN, wzoru lub hasła do odblokowania ekranu</string>
+  <string name="lockscreen_setup_screen_lock_setup">Ustaw PIN, wzorzec lub hasło</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Witamy w erze Post-App</string>
+  <string name="mod_description">Modyfikacje są inteligentne, świadome i przyjemne a przy tym wbudowane bezpośrednio w system. Kiedy MOD pomyśli, że mogą być pożyteczne dla Ciebie, zaproponuje Ci ich aktywację.</string>
 </resources>
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -44,6 +44,7 @@
  <string name="location_battery_saving"><b>Reduzir o consumo da bateria</b>, restringindo o número de atualizações GPS por hora.</string>
  <string name="location_network"><b>Use Wi-Fi</b> para ajudar aplicativos a determinar a sua localização.</string>
  <string name="location_network_telephony"><b>Use Wi-Fi e redes móveis</b> para ajudar aplicativos a determinar sua localização.</string>
+  <string name="location_network_gms"><b>Use o serviço de localização do Google</b> para ajudar os aplicativos a determinar sua localização. Isto significa enviar dados de localização anônimos para o Google, mesmo quando nenhum aplicativo estiver aberto.</string>
  <string name="setup_mobile_data">Ativar dados celular</string>
  <string name="setup_mobile_data_no_service">Sem serviço</string>
  <string name="setup_mobile_data_emergency_only">Apenas chamadas de emergência</string>
@@ -59,7 +60,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 um estilo visual exclusivo para os seus ícones, papéis de parede, etc.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ativando fontes, papéis de parede e ícones exclusivos.</string>
  <string name="services_os_nav_keys_label"><b>Use as teclas de navegação na tela</b> em vez de botões físicos.</string>
  <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>
@@ -77,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Adicionar sua impressão digital</string>
  <string name="fingerprint_setup_screen_lock_setup">Configuração de bloqueio de tela</string>
  <string name="sim_locale_changed">Cartão SIM %1$s detectado</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Selecione o tipo de bloqueio de tela</string>
+  <string name="settings_lockscreen_setup_details">Como você gostaria de bloquear a tela?</string>
+  <string name="lockscreen_setup_title">Proteger seu smartphone</string>
+  <string name="lockscreen_setup_summary"><b>Proteger este dispositivo</b> e pedir PIN, padrão ou senha para desbloquear a tela</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurar PIN, padrão ou senha</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Bem-vindo à Era Pós-Aplicativos</string>
+  <string name="mod_description">Mods são experiências inteligentes, conscientes e leves incluídas diretamente no sistema operacional. Quando uma MOD acha que pode ajudar, ela se oferece para ativar para você.</string>
 </resources>
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -60,6 +60,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 dados de diagnóstico e utilização para a Cyanogen. Esta informação não pode ser usada para identificá-lo e ajuda as equipas de desenvolvimento a melhorarem coisas como a duração da bateria, o desempenho das aplicações e no desenvolvimento novos recursos para a <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="services_apply_theme">Aplicar o tema <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ativando ícones, imagens de fundo e tipos de letra únicos.</string>
  <string name="services_os_nav_keys_label"><b>Usar os botões de navegação no ecrã</b> em vez dos botões do dispositivo.</string>
  <string name="services_use_secure_sms">Usar SMS seguras</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> para encriptar conversas SMS com outros utilizadores que também utilizem este serviço num dispositivo com <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -77,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Adicionar a sua impressão digital</string>
  <string name="fingerprint_setup_screen_lock_setup">Configuração do ecrã de bloqueio</string>
  <string name="sim_locale_changed">Cartão SIM %1$s detetado</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Selecionar o tipo de bloqueio do ecrã</string>
+  <string name="settings_lockscreen_setup_details">Como gostaria de bloquear o seu ecrã?</string>
+  <string name="lockscreen_setup_title">Proteja o seu telefone</string>
+  <string name="lockscreen_setup_summary"><b>Protejer este dispositivo</b> ao exigir um código PIN, padrão ou palavra-passe para desbloqueio do ecrã</string>
+  <string name="lockscreen_setup_screen_lock_setup">Definir um código PIN, padrão ou palavra-passe</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Bem-vindo à Era Pós-Aplicação</string>
+  <string name="mod_description">Os Mods são experiências inteligentes, conscientes e leves inseridas diretamente no SO. Quando um MOD achar que poderá ajudá-lo, irá oferecer-se para ativá-los para si.</string>
 </resources>
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -59,6 +59,7 @@
  <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>
@@ -72,4 +73,10 @@
  <string name="fingerprint_setup_add_fingerprint">Adăugați-vă amprenta</string>
  <string name="fingerprint_setup_screen_lock_setup">Setați blocarea de ecran</string>
  <string name="sim_locale_changed">SIM %1$s detectat</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Cum doriți să vă blocați ecranul?</string>
+  <string name="lockscreen_setup_title">Protejați telefonul</string>
+  <string name="lockscreen_setup_summary"><b>Protejați dispozitivul</b> cu PIN, model sau parolă necesară pt. a debloca ecranul</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurați codul PIN, modelul sau parola</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -60,6 +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_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>
@@ -77,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Добавить ваши отпечатки</string>
  <string name="fingerprint_setup_screen_lock_setup">Настроить экран блокировки</string>
  <string name="sim_locale_changed">Обнаружена %1$s SIM-карта</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Выбрать способ блокировки экрана</string>
+  <string name="settings_lockscreen_setup_details">Как вы хотите заблокировать ваш экран?</string>
+  <string name="lockscreen_setup_title">Защитите телефон</string>
+  <string name="lockscreen_setup_summary"><b>Защитить устройство</b> и запрашивать PIN-код, графический ключ или пароль</string>
+  <string name="lockscreen_setup_screen_lock_setup">Добавить PIN-код, графический ключ или пароль</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Добро пожаловать в эпоху встроенных приложений</string>
+  <string name="mod_description">Моды — это интеллектуальные, контекстно-зависимые и легкие приложения, интегрированные непосредственно в операционную систему. Если MOD полагает, что вам нужна помощь, вам будет предложено активировать мод.</string>
 </resources>
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -56,6 +56,7 @@
  <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>
@@ -72,4 +73,7 @@
  <string name="fingerprint_setup_backup_lock_method">Nastaviť alternatívny spôsob odomknutia</string>
  <string name="fingerprint_setup_add_fingerprint">Pridať váš odtlačok prsta</string>
  <string name="fingerprint_setup_screen_lock_setup">Nastaviť zamknutie obrazovky</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Ako chcete zamknúť obrazovku?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -60,7 +60,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 edinstven vidni slog za vaše ikone, sliko ozadja in še več.</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_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,4 +78,13 @@
  <string name="fingerprint_setup_add_fingerprint">Dodati svoj prstni odtis</string>
  <string name="fingerprint_setup_screen_lock_setup">Nastaviti zaklepanje zaslona</string>
  <string name="sim_locale_changed">%1$s kartica SIM zaznana</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Izberite vrsto zaklepanja zaslona</string>
+  <string name="settings_lockscreen_setup_details">Kako bi radi zaklenili svoj zaslon?</string>
+  <string name="lockscreen_setup_title">Zaščitite telefon</string>
+  <string name="lockscreen_setup_summary"><b>Zaščiti napravo</b> in za odklenitev zaslona zahtevaj kodo PIN, vzorec ali geslo</string>
+  <string name="lockscreen_setup_screen_lock_setup">Nastavi kodo PIN, vzorec ali geslo</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Dobrodošli v dobo vgrajenih aplikacij</string>
+  <string name="mod_description">Modifikacije so inteligentne, dovzetne in lahke izkušnje, ki so vgrajene neposredno v OS. Ko MOD misli, da lahko pomaga, vam bo ponudil, da jih omogočite.</string>
 </resources>
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -60,6 +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_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>
@@ -77,4 +78,12 @@
  <string name="fingerprint_setup_add_fingerprint">Додај свој отисак</string>
  <string name="fingerprint_setup_screen_lock_setup">Подешавање закључавања екрана</string>
  <string name="sim_locale_changed">Откривен %1$s SIM</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Како желиш закључати свој екран?</string>
+  <string name="lockscreen_setup_title">Заштитите телефон</string>
+  <string name="lockscreen_setup_summary"><b>Заштитите уређај</b> и поставите PIN, шаблон или лозинку за откључавање екрана</string>
+  <string name="lockscreen_setup_screen_lock_setup">Подеси PIN, шаблон или лозинку</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Добродошли у доба после апликација</string>
+  <string name="mod_description">Режими су интелигентна, свесна и лагана искуства уграђена директно у ОС. Када режим мисли да може помоћи, он ће понудити да активира то за вас.</string>
 </resources>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -60,6 +60,7 @@
  <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>
@@ -77,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">Lägga till ditt fingeravtryck</string>
  <string name="fingerprint_setup_screen_lock_setup">Konfigurera skärmlås</string>
  <string name="sim_locale_changed">%1$s SIM upptäckt</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Hur vill du låsa din skärm?</string>
+  <string name="lockscreen_setup_title">Skydda mobilen</string>
+  <string name="lockscreen_setup_summary"><b>Skydda den här enheten</b> och kräv pinkod, mönster eller lösenord för att låsa upp skärmen</string>
+  <string name="lockscreen_setup_screen_lock_setup">Konfigurera pinkod, mönster eller lösenord</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -60,6 +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="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>
@@ -77,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">கைரேகையைச் சேர்க்கவும்</string>
  <string name="fingerprint_setup_screen_lock_setup">திரைப் பூட்டை அமை</string>
  <string name="sim_locale_changed">%1$s SIM கண்டறியப்பட்டது.</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">உங்கள் திரையை நீங்கள் எவ்வாறு பூட்ட விரும்புகிறீர்கள்?</string>
+  <string name="lockscreen_setup_title">மொபைலைப் பாதுகாக்கவும்</string>
+  <string name="lockscreen_setup_summary">திரையை திறக்க பின், வடிவம் அல்லது கடவுச்சொல் கேட்கும்படி அமைத்து, <b>சாதனத்தைப் பாதுகாக்கலாம்</b></string>
+  <string name="lockscreen_setup_screen_lock_setup">பின், வடிவம் அல்லது கடவுச்சொல்லை அமை</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -60,6 +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> స్వయంచాలకంగా సయనోజెనుకు సమస్యా విశ్లేషణ మరియు వినియోగ డేటాను పంపడం ద్వారా. మిమ్మల్ని గుర్తించేందుకు ఈ సమాచారాన్ని ఉపయోగించుకోవడం కుదరదు మరియు బ్యాటరీ లైఫ్, అనువర్తనం పనితీరు, మరియు క్రొత్త <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>
@@ -77,4 +78,10 @@
  <string name="fingerprint_setup_add_fingerprint">మీ వేలిముద్రను జోడించండి</string>
  <string name="fingerprint_setup_screen_lock_setup">సెటప్ స్క్రీన్ లాక్</string>
  <string name="sim_locale_changed">%1$s SIM కనుగొనబడింది</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">మీరు మీ స్క్రీనును ఏ విధంగా లాక్ చేయాలని అనుకుంటున్నారు?</string>
+  <string name="lockscreen_setup_title">మీ ఫోన్‌ను రక్షించుకోండి</string>
+  <string name="lockscreen_setup_summary"><b>ఈ పరికరాన్ని రక్షించండి</b> మరియు స్క్రీన్‌ను అన్‌లాక్ చేయడానికి PIN, నమూనా లేదా పాస్‌వర్డ్ అవసరమయ్యేలా ఏర్పాటు చేయండి</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN, నమూనా లేదా పాస్‌వర్డ్‌ను సెటప్ చేయి</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -60,6 +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_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>
@@ -77,4 +78,12 @@
  <string name="fingerprint_setup_add_fingerprint">เพิ่มลายนิ้วมือของคุณ</string>
  <string name="fingerprint_setup_screen_lock_setup">ตั้งค่าการล็อคหน้าจอ</string>
  <string name="sim_locale_changed">ตรวจพบซิม %1$s</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">คุณต้องการล็อคหน้าจอด้วยวิธีใด</string>
+  <string name="lockscreen_setup_title">ปกป้องโทรศัพท์ของคุณ</string>
+  <string name="lockscreen_setup_summary"><b>ปกป้องอุปกรณ์นี้</b>และกำหนดให้มีการใช้ PIN, รูปแบบ หรือรหัสผ่านเพื่อปลดล็อกหน้าจอ</string>
+  <string name="lockscreen_setup_screen_lock_setup">ตั้งค่า PIN, รูปแบบ หรือรหัสผ่าน</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">ขอต้อนรับสู่ Post-App Era</string>
+  <string name="mod_description">Mods คือประสบการณ์อันชาญฉลาด รอบรู้ และมีน้ำหนักเบา ซึ่งถูกสร้างขึ้นโดยตรงในระบบปฏิบัติการ เมื่อ MOD คิดว่าสามารถช่วยได้ โปรแกรมจะเปิดใช้งานความช่วยดังกล่าวให้คุณ</string>
 </resources>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -60,6 +60,7 @@
  <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> gelişimine yardım edin</string>
  <string name="services_metrics_label">Tanılama ve kullanım verilerini Cyanogen\'e göndererek <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>. Bu bilgiler kimliğinizi ortaya çıkaracak şekilde kullanılmaz ancak pil ömrü, uygulama performansı ve yeni <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> özellikleri gibi konulardaki ekip çalışmalarında kullanılır.</string>
  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> temasını uygula</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> eşsiz simgeler, duvar kağıtları ve yazı tiplerini etkinleştiriyor.</string>
  <string name="services_os_nav_keys_label">Donanımsal tuşlar yerine <b>ekran üstü dolaşım tuşlarını kullanın</b>.</string>
  <string name="services_use_secure_sms">Şifreli SMS kullanın</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> cihazında güvenli SMS kullanan diğer kullanıcılarla olan SMS sohbetlerinizi şifrelemek için <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>.</string>
@@ -77,4 +78,11 @@
  <string name="fingerprint_setup_add_fingerprint">Parmak izinizi ekleyin</string>
  <string name="fingerprint_setup_screen_lock_setup">Ekran kilidini kurun</string>
  <string name="sim_locale_changed">%1$s SIM tespit edildi</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Ekranınızı nasıl kilitlemek istersiniz?</string>
+  <string name="lockscreen_setup_summary"><b>Bu cihazı koruyun</b> ve ekran kilidini açmak için bir PIN, desen ya da şifreyi gerekli kılın.</string>
+  <string name="lockscreen_setup_screen_lock_setup">PIN, desen veya şifre ayarla</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Uygulama Sonrası Dönem\'e Hoş Geldiniz</string>
+  <string name="mod_description">Modlar akıllı ve farkındadır ve hafif deneyimler doğrudan OS\'a kurulur. MOD yardım edebileceğini düşündüğünde, size bunları etkinleştirmeyi teklif eder.</string>
 </resources>
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -60,6 +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_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>
@@ -77,4 +78,7 @@
  <string name="fingerprint_setup_add_fingerprint">بارماق ئىزى قوشۇڭ</string>
  <string name="fingerprint_setup_screen_lock_setup">ئېكران قۇلۇپ تەڭشىكى</string>
  <string name="sim_locale_changed">ھازىر %1$s دانە SIM كارتا بايقىدى</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">ئېكراننى قانداق قۇلۇپلايسىز؟</string>
+  <!-- MOD stuff -->
 </resources>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
blinky@build01	b8f7b317c2	Automatic translation import Change-Id: If68ff820b3ca26981a3ac28b10fb3211efd585b0 Ticket: RM-231	2016-09-19 19:11:58 -07:00
blinky@build01	a3cfd0d806	Automatic translation import Change-Id: Idf10191cf178882ebc54694930c4c87b67c3e822 Ticket: RM-231	2016-09-18 18:05:15 -07:00
blinky@build01	30f3035c7b	Automatic translation import Change-Id: I43d7421e4565c4c68a0bd47b887de1d657dca54d Ticket: RM-231	2016-09-06 21:26:55 -07:00
blinky@build01	bed791f6e5	Automatic translation import Change-Id: Ic8ad353432a0fbe17e92792c2c172d239582ec43 Ticket: RM-231	2016-09-01 18:46:18 -07:00
pinky@build01	24fd0339af	Automatic translation import Change-Id: I6eaa18ba7c83ca35237d1a134f9fc87b36ca1798 Ticket: RM-231	2016-08-31 10:12:43 -07:00
inky@build01	6c6a4320c3	Automatic translation import Change-Id: I3ca885de4cacb83cd3f6f885bb8aa176f74b8ee5 Ticket: RM-231	2016-08-29 17:40:58 -07:00
pinky@build01	c8c7eaf728	Automatic translation import Change-Id: Ic3df69e85363bd49844ee26ea5c0964c03a77ac1 Ticket: RM-231	2016-08-25 11:11:06 -07:00
pinky@build01	5313487d06	Automatic translation import Change-Id: Icdb89836a1904d05a553b150c0213d347c91dfb4 Ticket: RM-231	2016-08-24 23:56:10 -07:00
pinky@build01	e363e358a6	Automatic translation import Change-Id: I95dd65eb2615c6dce7fb7a362c13c7b653d67594 Ticket: RM-231	2016-08-23 11:13:19 -07:00
clyde@build01	7e39abb8d9	Automatic translation import Change-Id: I67b05722465094e92feec4b5fd00ca115ee7fe89 Ticket: RM-231	2016-08-23 03:14:25 -07:00
blinky@build01	65798d5e8d	Automatic translation import Change-Id: I76d647d5162cce1ac3e2bfc863a33275d4f23308 Ticket: RM-231	2016-08-22 11:40:29 -07:00
pinky@build01	2a42afa1c2	Automatic translation import Change-Id: Iaf0bdce897bfa49f1294f94f2267484aa7071493 Ticket: RM-231	2016-08-21 03:59:10 -07:00
clyde@build01	f05f9b22f6	Automatic translation import Change-Id: I11c254e4a0bdbf6e4086f4f81ebd4a7b85cbc068 Ticket: RM-231	2016-08-18 11:00:48 -07:00
inky@build01	68961c25f5	Automatic translation import Change-Id: I49797c99cc89d0d9cb0825bf2cc017a1286dcde2 Ticket: RM-231	2016-08-15 08:28:13 -07:00
pinky@build01	eb4c63c84f	Automatic translation import Change-Id: I51d650a5643f363f9944cc3115ffa5333302edf8 Ticket: RM-231	2016-08-13 16:48:08 -07:00
pinky@build01	e2c402efa1	Automatic translation import Change-Id: I6cb3117fd81a32d3f6aa448b6a90d28dd93787f4 Ticket: RM-231	2016-08-12 15:28:00 -07:00
Ricardo Cerqueira	74682334b4	If the device has FRP, prompt the user to set up a lockscreen FRP is kind of pointless if the device is freely accessible. Suggest setting up a secure lockscreen during setup. Ref CYNGNOS-3252 Change-Id: Ia807142ab08f388d533b5ee45d1fcbe81071f6d1	2016-08-11 14:57:13 +01:00
clyde@build01	014a7cc540	Automatic translation import Change-Id: Iead1d77ce87b47d78eace15f6b44495e146bbf0c Ticket: RM-231	2016-07-27 14:33:18 -07:00
pinky@build01	ca5ed31b1f	Automatic translation import Change-Id: I9b0adaec50724991e1e92597855e70f411914f77 Ticket: RM-231	2016-07-14 11:45:44 -07:00
pinky@build01	554f11a79d	Automatic translation import Change-Id: Iff4fab6580c2482b89cb49b3f89acc354998de45 Ticket: RM-231	2016-07-14 11:45:14 -07:00
pinky@build01	51a02f49db	Automatic translation import Change-Id: Ibc56bca29029b013e668e9b60c57a9e9097b6dc9 Ticket: RM-231	2016-07-14 11:44:37 -07:00
Ricardo Cerqueira	3d0a22db75	MobileData: Don't let wait-for-radio trample wait-for-data Both waiting for radio and waiting for data used "is the progress bar visible" as the "allow to continue" clause. If radio service state changes arrived while the wait-for-data was ongoing, this'd terminate the progress bar and make it wait forever. Additionally, if wifi is connected, don't wait for data at all Ref CYNGNOS-3126 Change-Id: I81792ac8be00c6a6746af88a62220c727cddc6d8 (cherry picked from commit `7c1cf5a232`)	2016-07-14 04:04:32 -07:00
Ricardo Cerqueira	713b22f0db	ChooseDataSim: Use the extra data from the intent to validate the sub Instead of waiting for the telephony stack to catch up to the default, take advantage of the fact that the intent already carries the ID as an extra. Also, we were using slotId and phoneId interchangeably, and they're not the same thing. While it's likely they'll match on a freshly reset phone, don't assume that. Index everything to subId for consistency. Ref CYNGNOS-3126 Change-Id: Ibcd767d0124b05d669886190f5d9a98f1a6e5bd7 (cherry picked from commit `3ebea2fb6d`)	2016-07-14 04:04:12 -07:00
Abhisek Devkota	66b7fef2fa	Automatic translation import Change-Id: I82cddd217a4ec3f1be6057bd338b0b8e757c4924 Ticket: RM-231	2016-06-28 00:32:19 +02:00
inky@build01	16086158ca	Automatic translation import Change-Id: Ib83040c26886d53e0a854c42eab28feca6265143 Ticket: RM-231	2016-06-17 12:07:25 -07:00
blinky@build01	a471f36eed	Automatic translation import Change-Id: Id309ee38910c69f54607cb909a17ffa3a7d21dc6 Ticket: RM-214	2016-06-01 16:21:01 -07:00
cretin45	c797d1f5ef	SetupWizard: Alway show google pages if gms present Helps with an issue where qsb widget doesn't work when running through oobe without network. Also set the cm setup finished setting for test receiver. CYNGNOS-2833 Change-Id: I83666deea5a27d74669691c4ab991b1b618edb0a (cherry picked from commit `36f15ef169`)	2016-05-31 15:17:38 -07:00
Jessica Wagantall	48edca790e	Automatic translation import Change-Id: Ib02e84ef73d9a910b273b07cd338c05191c717fe Ticket: RM-214	2016-05-26 18:21:39 -07:00
cretin45	143552b394	SetupWizard: Ensure language picker is enabled onResume Issue-id: FEIJ-559 Change-Id: Iafe0467fc4130074ce86fe5f28b215d4774dc50e (cherry picked from commit `4981bc9888`)	2016-05-23 15:19:47 -07:00
cretin45	556528b548	SetupWizard: Use proper CMSetting for soft keys option Issue-id: CYNGNOS-2842 Change-Id: I5ab75d9d90d79b66fa9b10f011272fc0090a78dd (cherry picked from commit `334c00f437`)	2016-05-15 11:17:07 -07:00
Abhisek Devkota	e638da1cb2	Automatic translation import Change-Id: I5dd902a079c44e0a0baf79f6b179bde4a455849f Ticket: RM-231	2016-05-14 09:45:21 +02:00
cretin45	e79c4ea91e	SetupWizard: Run as com.android.wizard task affinity Issue-id: FEIJ-254 Change-Id: Ib841e7dd82d900150229e99ca01f97dfed6bcde9 (cherry picked from commit `d35618baef`)	2016-05-02 12:27:15 -07:00
cretin45	c919eb07c2	SetupWizard: Add Mod disovery language for mod ready devices Issue-id: CYNGNOS-2566 Change-Id: If88d2d62b5d2175ffe857d45dd9f6ce132129f2a (cherry picked from commit `635504813a`)	2016-04-27 12:51:22 -07:00
cretin45	94db7bffcb	SetupWizard: Ensure compliance with GMS TOS * Launches GMS TOS per documentation * Filters out redundant location page if GMS present * Uses setupwizardlib for some helper functions * Hide notification icons Issue-id: CYNGNOS-2599 Change-Id: I4b59592f0b84d0eb0eafe365eab3bad77c1f76ff (cherry picked from commit `8109277755`)	2016-04-27 12:50:49 -07:00
Roman Birg	ee41edd74b	SetupWizard: add a CM-specific setup-complete settings key Android uses Settings.Global.DEVICE_PROVISIONED and Settings.Secure.USER_SETUP_COMPLETE and the system responds to those database entries, such as allowing the keyguard to be visible, or maybe pulling the statusbar down. Since we still depend on some of Google's setup wizard, it also keys off the same table rows and it may decide that the device is now provisioned when we still haven't finished our own setup wizard, so let's add another key that we have control over to show the real state of OUR setup wizard. Ticket: CYNGNOS-2431 Change-Id: Ic21689625f6d80e209161762ace741918b972aba Signed-off-by: Roman Birg <roman@cyngn.com> (cherry picked from commit `fccccda787`)	2016-04-26 19:14:26 -07:00
cretin45	081fc3d4ae	SetupWizard: Handle register theme change listener crash Issue-id: FEIJ-84 Change-Id: I8ffca77418702f04328ae7d0581ab8cc316a04e8 (cherry picked from commit `941aa1e1e2`)	2016-04-26 12:28:27 -07:00
cretin45	4c7f320b6f	SetupWizard: Fix test app building Ticket: CYNGNOS-2431 Change-Id: I75249f0bbb6e59f47e4a30608bb63b42c93c6e37 (cherry picked from commit `2e75c4ee04`)	2016-04-26 11:00:48 -07:00
Roman Birg	53363b82a8	SetupWizard: GMS page controls the next step Ticket: CYNGNOS-2533 Change-Id: Icf7dc1de653d18ac60ddfa52dddbe9412dbc8eda Signed-off-by: Roman Birg <roman@cyngn.com> (cherry picked from commit `af828584ae`)	2016-04-25 09:01:44 -07:00
Ricardo Cerqueira	fa10678a8c	Prefer SIM carrier name over network carrier People generally identify their SIMs by the emitting carrier, not the network they attach to. In roaming or MVNO scenarios, these are likely not to be the same, leading to confusion in SIM selection. Ref CYNGNOS-2496 Change-Id: I0ecd8e7511fd4229d6ce7629b1f97aa83a1a6254	2016-04-18 17:56:24 +01:00
Adnan Begovic	63a54165ba	SetupWizard: Don't reprompt setup if account already exists. If a user goes through the gms flow, logging in, disabling backup, getting kicked over to restore, and deciding to set the device up as new, the existing logic would reprompt since the flow causes the load action to happen again. Now check for account existance, and skip the setup if true. Change-Id: I3502294d54fcb4e202dca37ff7c6165da4401808 TICKET: CYNGNOS-2459 (cherry picked from commit `fe7ac15220`)	2016-04-14 13:23:00 -07:00
cretin45	4ef9008666	SetupWizard: Wait for data connection Issue-id: CRACKLING-786 Change-Id: I54ef75ffa8da87d829ce7ce45a7f42ca1ce54732 (cherry picked from commit `763af1265c`)	2016-04-08 11:55:29 -07:00
Michael Bestas	bbf7f83834	Automatic translation import RM-231 Change-Id: I4541f0e56eb0b84ae47a1b2da57ade2e1903dc0b (cherry picked from commit `ac93a6765d`)	2016-04-06 08:58:28 -07:00