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
139 changed files with 1893 additions and 829 deletions
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,10 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
    android-support-v4 \
    android-support-v13 \
    play \
-    libphonenumber
+    libphonenumber \
+    org.cyanogenmod.platform.sdk
+
+LOCAL_JAVA_LIBRARIES := telephony-common

 # Include res dir from chips
 google_play_dir := ../../../external/google/google_play_services/libproject/google-play-services_lib/res
@@ -25,4 +28,6 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 LOCAL_AAPT_FLAGS += --extra-packages com.google.android.gms

+include frameworks/opt/setupwizard/library/common.mk
+
 include $(BUILD_PACKAGE)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
          package="com.cyanogenmod.setupwizard"
-          android:versionCode="3"
+          android:versionCode="4"
          android:sharedUserId="android.uid.system">

    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
@@ -30,24 +30,23 @@
    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS_PRIVILEGED" />
+    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
    <uses-permission android:name="android.permission.MANAGE_USERS" />
    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_THEME_MANAGER"/>
+    <uses-permission android:name="cyanogenmod.permission.ACCESS_THEME_MANAGER"/>
    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
-    <uses-permission android:name="android.permission.HARDWARE_ABSTRACTION_ACCESS" />
+    <uses-permission android:name="cyanogenmod.permission.HARDWARE_ABSTRACTION_ACCESS" />
    <uses-permission android:name="android.permission.BACKUP" />
    <uses-permission android:name="cyanogenmod.permission.FINISH_SETUP" />
    <uses-permission android:name="cyanogenmod.permission.LEGALESE" />
    <uses-permission android:name="com.cyngn.stats.SEND_ANALYTICS" />
    <uses-permission android:name="com.cyanogen.permission.REQUEST_KILL_SWITCH_OP" />
+    <uses-permission android:name="cyanogenmod.permission.WRITE_SETTINGS"/>
+    <uses-permission android:name="cyanogenmod.permission.WRITE_SECURE_SETTINGS"/>

    <permission
        android:name="cyanogenmod.permission.PROTECTED_APP"
@@ -61,12 +60,13 @@
    <protected-broadcast android:name="com.cyanogenmod.setupwizard.SETUP_FINISHED"
                         android:permission="cyanogenmod.permission.FINISH_SETUP"/>

-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23" />

    <application android:label="@string/app_name"
                 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"
@@ -76,7 +76,7 @@
                  android:label="@string/product_name"
                  android:launchMode="singleInstance"
                  android:excludeFromRecents="true"
-                  android:configChanges="themeChange|mcc|mnc"
+                  android:configChanges="mcc|mnc|themeChange"
                  android:immersive="true"
                  android:windowSoftInputMode="stateAlwaysHidden">

--- a/proguard.flags
+++ b/proguard.flags
@@ -1,3 +1,25 @@
 -keep class * extends java.util.ListResourceBundle {
    protected Object[][] getContents();
-}
+}
+
+# Keep SafeParcelable value, needed for reflection. This is required to support backwards
+# compatibility of some classes.
+-keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
+    public static final *** NULL;
+}
+
+# Keep the names of classes/members we need for client functionality.
+-keepnames @com.google.android.gms.common.annotation.KeepName class *
+-keepclassmembernames class * {
+    @com.google.android.gms.common.annotation.KeepName *;
+}
+
+# Needed for Parcelable/SafeParcelable Creators to not get stripped
+-keepnames class * implements android.os.Parcelable {
+    public static final ** CREATOR;
+}
+
+# Needed when building against the Marshmallow SDK
+-dontwarn org.apache.http.**
+-dontwarn android.support.**
+-dontwarn com.google.android.gms.**
--- 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/locale_picker.xml
+++ b/res/layout/locale_picker.xml
@@ -19,24 +19,26 @@

 <merge xmlns:android="http://schemas.android.com/apk/res/android">

-    <ImageButton android:id="@+id/increment"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="22dip"
-        android:paddingBottom="22dip"/>
+    <ImageButton android:id="@+id/lp__increment"
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:paddingTop="22dip"
+                 android:paddingBottom="22dip"/>

-    <EditText
-        android:id="@+id/numberpicker_input"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMediumInverse"
-        android:gravity="center"
-        android:singleLine="true" />
+    <view class="com.cyanogenmod.setupwizard.ui.LocalePicker$CustomEditText"
+          android:textAppearance="?android:attr/textAppearanceMedium"
+          android:textColor="?android:attr/textColorPrimary"
+          android:id="@+id/localepicker_input"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:gravity="center"
+          android:singleLine="true"
+          android:background="@null" />

-    <ImageButton android:id="@+id/decrement"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="22dip"
-        android:paddingBottom="22dip"/>
+    <ImageButton android:id="@+id/lp__decrement"
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:paddingTop="22dip"
+                 android:paddingBottom="22dip"/>

 </merge>
--- 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"
@@ -118,7 +82,7 @@
                </LinearLayout>

                <LinearLayout
-                    android:id="@+id/gps"
+                    android:id="@+id/battery_saving"
                    android:orientation="horizontal"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
@@ -128,7 +92,7 @@
                    android:clickable="true">

                    <CheckBox
-                        android:id="@+id/gps_checkbox"
+                        android:id="@+id/battery_saving_checkbox"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_gravity="top"
@@ -138,7 +102,7 @@


                    <TextView
-                        android:id="@+id/gps_summary"
+                        android:id="@+id/battery_saving_summary"
                        android:layout_width="0px"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
@@ -148,7 +112,7 @@
                        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/location_gps"
+                        android:text="@string/location_battery_saving"
                        android:maxLines="5" />

                </LinearLayout>
--- 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/setup_welcome_page.xml
+++ b/res/layout/setup_welcome_page.xml
@@ -34,7 +34,6 @@
            android:id="@+id/locale_list"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:minHeight="@dimen/min_locale_picker_height"
            android:focusable="true"
            android:focusableInTouchMode="true"
            android:layout_centerInParent="true"/>
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Hierdie dienste word deur Google verskaf en jy kan dit aktiveer of deaktiveer op enige tyd. Data sal in ooreenstemming met Google se <xliff:g id="name" example="Privacy Policy">%s</xliff:g> gebruik word.</string>
  <string name="location_services_summary">Ligging dienste laat stelsel en ander 3rde party programme toe om data te gebruik soos jou benaderde ligging. Bv \'n program kan jou benaderde ligging gebruik om nabygeleë koffiewinkels op te spoor.</string>
  <string name="location_access_summary"><b>Laat programme toe wat jou toestemming gevra het</b> om jou ligging inligting te gebruik. Dit kan jou huidige ligging en plekke asook liggings en plekke uit die verlede insluit.</string>
-  <string name="location_gps" product="tablet"><b>Verbeter ligging akkuraatheid</b> deur programme toe te laat om jou GPS te kan gebruik op jou tablet.</string>
-  <string name="location_gps" product="default"><b>Verbeter ligging akkuraatheid</b> deur programme toe te laat om jou GPS te kan gebruik op jou foon.</string>
+  <string name="location_battery_saving"><b>Verminder battery verbruik</b> deur die beperking van die aantal GPS opdaterings per uur.</string>
  <string name="location_network"><b>Gebruik Wi-Fi</b> om programme te help om jou ligging te bepaal.</string>
  <string name="location_network_telephony"><b>Gebruik Wi-Fi en mobiele netwerke</b> om programme te help om jou ligging te bepaal.</string>
  <string name="location_network_gms"><b>Gebruik Google se ligging diens</b> om programme te help om jou ligging te bepaal. Dit beteken dit stuur anonieme ligging data na Google, selfs wanneer daar geen programme aktief is nie.</string>
  <string name="setup_mobile_data">Skakel mobiele data aan</string>
  <string name="setup_mobile_data_no_service">Geen diens</string>
  <string name="setup_mobile_data_emergency_only">Net Noodoproepe</string>
-  <string name="enable_mobile_data_summary">Wil jy mobiele data gebruik tydens die opstelling? Aan skakeling van mobiele data kan onderworpe aan data koste wees.</string>
+  <string name="enable_mobile_data_summary">Wil jy sellulêre data aanskakel gedurende opstelling? Wanneer aangeskakel kan dit tot data kostes lui.</string>
  <string name="no">Nee</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>
@@ -78,4 +77,13 @@
  <string name="fingerprint_setup_backup_lock_method">Stel \'n tweede ontsluit metode op</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">هذه الخدمات  تجعل جوجل في خدمتك، ويمكنك تشغيلها أو إيقاف تشغيلها في أي وقت. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">تسمح خدمات الموقع لتطبيقات النظام والتطبيقات الخارجية بجمع واستخدام البيانات مثل موقعك التقريبي. على سبيل المثال، قد يستخدم تطبيق ما موقعك التقريبي لتحديد موقع  المقاهي القريبة.</string>
  <string name="location_access_summary"><b>يسمح للتطبيقات التي طلبت إذنك</b> باستخدام معلومات موقعك. وقد يشمل ذلك موقعك الحالي ومواقعك السابقة.</string>
-  <string name="location_gps" product="tablet"><b>تحسين دقة الموقع</b> بالسماح للتطبيقات باستخدام نظام تحديد المواقع على الكمبيوتر اللوحي الخاص بك.</string>
-  <string name="location_gps" product="default"><b>تحسين دقة الموقع</b> بالسماح للتطبيقات باستخدام نظام تحديد المواقع على هاتفك.</string>
+  <string name="location_battery_saving"><b>قم بتقليل استهلاك البطارية</b> من خلال تقييد عدد تحديثات GPS في كل ساعة.</string>
  <string name="location_network"><b>استخدام الواي فاي</b> لمساعدة التطبيقات على تحديد موقعك.</string>
-  <string name="location_network_telephony"><b>استخدام الواي فاي وشبكات الجوال</b> لمساعدة التطبيقات على تحديد موقعك.</string>
+  <string name="location_network_telephony"><b>استخدام Wi-Fi والشبكات الخلوية</b> لمساعدة التطبيقات على تحديد موقعك.</string>
  <string name="location_network_gms"><b>استخدام خدمة الموقع من جوجل</b> لمساعدة التطبيقات على تحديد موقعك. وهذا يعني إرسال بيانات مجهولة عن الموقع إلى جوجل، حتى في حالة عدم تشغيل أي تطبيقات.</string>
-  <string name="setup_mobile_data">تشغيل بيانات الجوال</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="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>
@@ -78,4 +77,11 @@
  <string name="fingerprint_setup_backup_lock_method">إنشاء طريقة احتياطية لإلغاء إقفال الشاشة</string>
  <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
@@ -41,8 +41,7 @@
  <string name="other_services_summary">এই সেৱাবোৰে আপোনাৰ বাবে Google ক কাম কৰায় আৰু আপুনি সেইবোৰ যিকোনো সময়তে অন বা অফ কৰিব পাৰে। ডাটা Google ৰ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> অনুযায়ী ব্যৱহাৰ কৰা হ\'ব।</string>
  <string name="location_services_summary">অৱস্থান সেৱাই ছিষ্টেম আৰু তৃতীয় পক্ষৰ এপ্প্‌বোৰক আপোনাৰ মোটামুটি অৱস্থানৰ দৰে ডাটা সংগ্ৰহ আৰু ব্যৱহাৰ কৰিবলৈ অনুমতি দিয়ে। উদাহৰণ হিচাপে, নিকটতম কফি শ্বপ বিচাৰিবলৈ এটা এপ্পে্‌ আপোনাৰ মোটামুটি অৱস্থান ব্যৱহাৰ কৰিব পাৰে।</string>
  <string name="location_access_summary">আপোনাৰ অৱস্থান তথ্য ব্যৱহাৰ কৰিবলৈ <b>অনুমতি বিচৰা এপ্প্‌বোৰক অনুমতি দিয়ক</b>। ইয়াত আপোনাৰ চলিত আৰু অতীতৰ অৱস্থান অন্তৰ্ভুক্ত থাকিব পাৰে।</string>
-  <string name="location_gps" product="tablet">আপোনাৰ টেবলেট কম্পিউটাৰত এপ্প্‌ক GPS ব্যৱহাৰ কৰিবলৈ দি <b>অৱস্থান নিৰ্ভুলতা উন্নত কৰক</b>।</string>
-  <string name="location_gps" product="default">আপোনাৰ ফোনত এপ্প্‌ক GPS ব্যৱহাৰ কৰিবলৈ দি <b>অৱস্থান নিৰ্ভুলতা উন্নত কৰক</b>।</string>
+  <string name="location_battery_saving">প্ৰতি ঘণ্টাত GPS আপডেট সীমাবদ্ধ কৰি <b>বেটাৰি ব্যয় হ্ৰাস কৰক</b>।</string>
  <string name="location_network">আপোনাৰ অৱস্থান নিৰ্ণয় কৰাত এপ্প্‌ক সহায় কৰিবলৈ <b>Wi-Fi ব্যৱহাৰ কৰক</b>।</string>
  <string name="location_network_telephony">আপোনাৰ অৱস্থান নিৰ্ণয় কৰাত এপ্প্‌ক সহায় কৰিবলৈ <b>Wi-Fi আৰু ম\'বাইল নেটৱৰ্ক ব্যৱহাৰ কৰক</b>।</string>
  <string name="location_network_gms">আপোনাৰ অৱস্থান নিৰ্ণয় কৰাত এপ্প্‌ক সহায় কৰিবলৈ <b>Google সেৱা ব্যৱহাৰ কৰক</b>। ইয়াৰ অৰ্থ হৈছে Google-লৈ অজ্ঞাত অৱস্থান প্ৰেৰণ কৰা, আনকি কোনো এপ্প্‌ চলি নথকাৰ সময়তো।</string>
@@ -78,4 +77,8 @@
  <string name="fingerprint_setup_backup_lock_method">দ্বিতীয় এটা আনলক পদ্ধতি ছেটআপ কৰক</string>
  <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,15 +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_gps" product="tablet"><b>Ameyorar la precisión del allugamientu</b> permitiendo a les aplicaciones usar el GPS na to tableta.</string>
-  <string name="location_gps" product="default"><b>Ameyorar la precisión del allugamientu</b> permitiendo a les aplicaciones usar el GPS nel to móvil.</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">Activar datos móviles</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? Activar los datos móviles podría ser oxetu de cargos de datos.</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>
@@ -78,4 +77,10 @@
  <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
@@ -41,15 +41,10 @@
  <string name="other_services_summary">Bu xidmətlər ilə Google sizin üçün işləməyə başlayar və istədiyiniz vaxt açıb bağlaya bilərsiniz. Verilənlər Google\'un <xliff:g id="name" example="Privacy Policy">%s</xliff:g>\'nə uyğun olaraq istifadə ediləcək.</string>
  <string name="location_services_summary">Yer xidmətləri sistem və üçüncü tərəf tətbiqetmələrə təxmini yeriniz kimi məlumatları götürmək və istifadə etmək icazəsi verər. Məsələn, bir tətbiqetmə yaxınlıqdakı əyləncə mərkəzini tapmaq üçün təxmini yerinizdən istifadə edə bilər.</string>
  <string name="location_access_summary"><b>Yer məlumatlarınızı istəyən tətbiqetmələrə icazə ver.</b> Bu hazırki yerinizi və keçmiş yerlərinizi ehtiva edə bilər.</string>
-  <string name="location_gps" product="tablet"><b>Yer dəqiqliyini təkmilləşdirin</b> tətbiqetmələrə planşetinizdəki GPS\'ni istifadə etmə icazəsi verin.</string>
-  <string name="location_gps" product="default"><b>Yer dəqiqliyini təkmilləşdirin</b> tətbiqetmələrə telefonunuzdakı GPS\'ni istifadə etmə icazəsi verin.</string>
  <string name="location_network"><b>Wi-Fi ilə</b> tətbiqetmələrin yerinizi tapmasına kömək edin.</string>
-  <string name="location_network_telephony"><b>Wi-Fi və mobil şəbəkələr ilə</b> tətbiqetmələrin yerinizi tapmasına kömək edin.</string>
  <string name="location_network_gms"><b>Google\'un yer xidmətləri ilə</b> tətbiqetmələrin yerinizi tapmasına kömək edin. Bu heç bir tətbiqetmə işləməzkən belə, adsız yer verilənlərinin Google\'a göndərilməsi deməkdir.</string>
-  <string name="setup_mobile_data">Mobil verilənləri aç</string>
  <string name="setup_mobile_data_no_service">Xidmət yoxdur</string>
  <string name="setup_mobile_data_emergency_only">Yalnız fövqəladə vəziyyət zəngləri</string>
-  <string name="enable_mobile_data_summary">Quraşdırma vaxtı mobil verilənlərdən istifadə etmək istəyirsiniz? Mobil verilənləri açmaq əlavə ödənişə səbəb ola bilər.</string>
  <string name="no">Xeyr</string>
  <string name="yes">Bəli</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Гэтыя службы дазваляюць Google пашырыць магчымасці прылады. Вы можаце выключыць іх у кожны час. Дадзеныя будуць выкарыстоўвацца ў адпаведнасці з <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Службы месцазнаходжання дазваляюць сістэме і ўсталяваным дадаткам збіраць і скарыстаць такія дадзеныя, як ваша прыблізнае месцазнаходжанне. Прыкладам, дадатак можа шукаць кавярні паблізу, засноўваючыся на дадзеных пра ваша месцазнаходжанне.</string>
  <string name="location_access_summary"><b>Дазволіць дадаткам, якія запыталі ваш дазвол</b> скарыстаць інфармацыю пра ваша месцазнаходжанне. Гэта можа ўлучаць ваша бягучае і мінулыя месцазнаходжанні.</string>
-  <string name="location_gps" product="tablet"><b>Палепшыць дакладнасць месцазнаходжання</b>, дазваляючы дадаткам скарыстаць GPS на вашым планшэце.</string>
-  <string name="location_gps" product="default"><b>Палепшыць дакладнасць месцазнаходжання</b>, дазваляючы дадаткам скарыстаць GPS на вашым тэлефоне.</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_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">Падлучыць мабільны трафік</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="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>
@@ -78,4 +77,8 @@
  <string name="fingerprint_setup_backup_lock_method">Наладзіць дадатковы спосаб разблакоўкі</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Google поставя тези услуги да работят за вас, и можете да ги включвате или изключвате по всяко време. Данните ще бъдат използвани в съгласие с Google <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string>
  <string name="location_services_summary">Услугите за местоположение позволява системата и някой приложения да събират и използват данни като приблизителното ви местоположение. Например едно приложение може да използва приблизителното ви местоположение за да намерите близки кафенета.</string>
  <string name="location_access_summary"><b>Разреши приложения, които са поискали разрешение</b> за да използва информацията за вашето местоположение. Това може да включва текущото местоположение и последните места.</string>
-  <string name="location_gps" product="tablet"><b>Подобряване точноста на засичането</b> като позволите на приложенията да използват GPS-а на таблета.</string>
-  <string name="location_gps" product="default"><b>Подобряване точноста на засичането</b> като позволите на приложенията да използват GPS-а на телефона.</string>
+  <string name="location_battery_saving"><b>Намаляване разхода на батерията</b> чрез ограничаване на броя на GPS актуализации за час.</string>
  <string name="location_network"><b>Използвайте Wi-Fi</b> за да помогнете на приложенията да определят вашето местоположение.</string>
  <string name="location_network_telephony"><b>Използвайте Wi-Fi и мобилен интернет</b> за да помогнете на приложенията да определят вашето местоположение.</string>
  <string name="location_network_gms"><b>Използвайте Google услугите за местоположение</b> за да помогнете на приложенията да определят вашето местоположение. Това означава, че ще изпращате анонимно информация за местоположението си до Google, включително когато няма приложения използващи тази услуга.</string>
-  <string name="setup_mobile_data">Включване на мобилен интернет</string>
+  <string name="setup_mobile_data">Включване на мобилните данни</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="enable_mobile_data_summary">Желаете ли да се използват мобилни данни по време на инсталацията? Активирането на мобилните данни може да доведе до допълнителни такси.</string>
  <string name="no">Не</string>
  <string name="yes">Да</string>
  <string name="data_sim_name">СИМ карта<xliff:g id="sub">%d </xliff:g> - <xliff:g id="name">%s </xliff:g></string>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Настройка на втори метод за отключване</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Aquests serveis posen a Google a treballar per a tu, i pots activar-los o desactivar-los en qualsevol moment. Les dades s\'utilitzaran d\'acord amb la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Google.</string>
  <string name="location_services_summary">Els serveis d\'ubicació permeten al sistema i a aplicacions de tercers recopilar i utilitzar dades com la teva ubicació aproximada. Per exemple, una aplicació pot utilitzar la teva ubicació aproximada per localitzar cafeteries als voltants.</string>
  <string name="location_access_summary"><b>Permet a les aplicacions que han demanat el teu permís</b> utilitzar la teva informació d\'ubicació. Això pot incloure la teva ubicació i ubicacions anteriors.</string>
-  <string name="location_gps" product="tablet"><b>Millora la precisió de la ubicació</b> permetent a les aplicacions utilitzar el GPS de la teva tauleta.</string>
-  <string name="location_gps" product="default"><b>Millora la precisió de la ubicació</b> permetent a les aplicacions utilitzar el GPS del teu telèfon.</string>
+  <string name="location_battery_saving"><b>Redueix el consum de bateria</b> restringint el número d\'actualitzacions GPS per hora.</string>
  <string name="location_network"><b>Utilitza Wi-Fi</b> per ajudar a les aplicacions a determinar la teva ubicació.</string>
-  <string name="location_network_telephony"><b>Utilitza Wi-Fi i les xarxes mòbils</b> per ajudar a les aplicacions a determinar la teva ubicació.</string>
+  <string name="location_network_telephony"><b>Utilitza el Wi-Fi i les xarxes mòbils</b> per ajudar a les aplicacions a determinar la teva ubicació.</string>
  <string name="location_network_gms"><b>Utilitza el servei d\'ubicació de Google</b> per ajudar a les aplicacions a determinar la teva ubicació. Això implica l\'enviament de dades anònimes d\'ubicació a Google, fins i tot quan no hi ha aplicacions en execució.</string>
-  <string name="setup_mobile_data">Activa les dades mòbils</string>
+  <string name="setup_mobile_data">Encén les dades mòbils</string>
  <string name="setup_mobile_data_no_service">Sense servei</string>
  <string name="setup_mobile_data_emergency_only">Només trucades d\'emergència</string>
-  <string name="enable_mobile_data_summary">Vols utilitzar les dades mòbils durant la configuració? Encendre les dades mòbils pot estar subjecte a càrrecs a la tarifa de dades.</string>
+  <string name="enable_mobile_data_summary">Vols utilitzar les dades mòbils durant la instal·lació? Encendre les dades mòbils pot provocar càrrecs de dades.</string>
  <string name="no">No</string>
  <string name="yes">Sí</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -67,7 +66,7 @@
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> per xifrar les converses SMS amb altres usuaris mitjançant SMS segurs en un dispositiu <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
  <string name="setup_unlock">Desbloqueja</string>
  <string name="setup_device_locked">Aquest dispositiu ha estat bloquejat per l\'usuari.</string>
-  <string name="setup_require_cyanogen_label"><b>Demana la contrasenya del teu compte Cyanogen OS</b> per utilitzar el teu dispositiu, fins i tot després de restaurar als ajustaments de fàbrica.</string>
+  <string name="setup_require_cyanogen_label"><b>Demana la contrasenya del teu compte Cyanogen OS</b> per utilitzar el teu dispositiu, fins i tot després de restablir als ajustaments de fàbrica.</string>
  <string name="setup_device_locked_instructions"><i>Per activar/desactivar aquesta característica, si us plau ves a Configuració &gt; Seguretat</i></string>
  <string name="setup_warning_skip_anyway">Sense un compte Cyanogen OS, no podràs:\n\nPersonalitzar el teu telèfon amb noves icones, fons de pantalla i més en l\'aplicació de Temes\n\nLocalitzar o esborrar remotament el teu telèfon si el perds</string>
  <!-- Fingerprint setup -->
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Configura el mètode de desbloqueig alternatiu</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Tyto služby Vám nabízí Google a Vy je můžete kdykoliv povolit či zakázat. Data budou použita v souladu se zásadami ochrany osobních údajů Google - <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Určování polohy umožňuje systému a dalším aplikacím sbírat data a používat je jako vaši přibližnou polohu. Aplikace tak může například vaši přibližnou polohu k nalezení blízkých kaváren.</string>
  <string name="location_access_summary"><b>Povolí aplikacím, které žádaly oprávnění</b> použít vaše informace o poloze. To může zahrnovat vaši aktuální, ale i minulé polohy.</string>
-  <string name="location_gps" product="tablet"><b>Zlepšit přesnost polohy</b> umožněním aplikacím používat GPS ve vašem tabletu.</string>
-  <string name="location_gps" product="default"><b>Zlepšit přesnost polohy</b> umožněním aplikacím používat GPS na vašem telefonu.</string>
+  <string name="location_battery_saving"><b>Snížit spotřebu baterie</b> omezením počtu GPS aktualizací během hodiny.</string>
  <string name="location_network"><b>Použít Wi\u2011Fi</b> pro zlepšení zjištění přibližné polohy.</string>
  <string name="location_network_telephony"><b>Použít Wi\u2011Fi a mobilní sítě</b> pro zlepšení zjištění přibližné polohy.</string>
  <string name="location_network_gms">Pro rychlejší určení vaší polohy <b>použijte lokační službu Google (Location Services)</b>. To znamená anonymní odesílání dat o poloze Googlu, i když žádné aplikace právě neběží.</string>
  <string name="setup_mobile_data">Zapnout mobilní data</string>
  <string name="setup_mobile_data_no_service">Žádná síť</string>
  <string name="setup_mobile_data_emergency_only">Pouze tísňová volání</string>
-  <string name="enable_mobile_data_summary">Chcete používat mobilní data během instalace? Zapnutí mobilních dat vás může něco stát.</string>
+  <string name="enable_mobile_data_summary">Chcete využít mobilní data při prvotní nastavení? Mobilní data mohou být zpoplatněna.</string>
  <string name="no">Ne</string>
  <string name="yes">Ano</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Nastavení alternativní metody odemčení</string>
  <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
@@ -41,8 +41,7 @@
  <string name="other_services_summary">Disse tjenester får Google til at arbejde for dig, og du kan slå dem til og fra på ethvert tidspunkt. Data vil blive anvendt i overensstemmelse med Googles <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Placeringstjenester tillader Maps og andre apps at indsamle og bruge data såsom din omtrentlige placering. Maps kan for eksempel bruge din omtrentlige placering for at finde caféer i nærheden.</string>
  <string name="location_access_summary"><b>Tillad apps, der har bedt om din tilladelse</b> til at bruge dine placeringsoplysninger. Dette kan omfatte din aktuelle placering og tidligere placeringer.</string>
-  <string name="location_gps" product="tablet"><b>Forbedr placeringnøjagtighed</b> ved at tillade apps at bruge GPS på din tablet.</string>
-  <string name="location_gps" product="default"><b>Forbedr placeringnøjagtighed</b> ved at tillade apps at bruge GPS på din telefon.</string>
+  <string name="location_battery_saving"><b>Reducer batteriforbruget</b> ved at begrænse antallet af GPS opdateringer pr. time.</string>
  <string name="location_network"><b>Brug Wi-Fi</b> til at hjælpe apps med at bestemme din placering.</string>
  <string name="location_network_telephony"><b>Brug Wi-Fi og mobile netværk</b> til at hjælpe apps med at bestemme din placering.</string>
  <string name="location_network_gms"><b>Brug Googles placeringtjeneste</b> til at hjælpe apps med at bestemme din placering. Dermed sendes anonyme placeringsdata til Google, selv når ingen apps kører.</string>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Konfigurere en sekundær låsemetode</string>
  <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,15 +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_gps" product="tablet"><b>Standortgenauigkeit erhöhen</b>, indem Apps erlaubt wird, das GPS Ihres Tablets zu verwenden.</string>
-  <string name="location_gps" product="default"><b>Standortgenauigkeit erhöhen</b>, indem Apps erlaubt wird, das GPS Ihres Telefons zu verwenden.</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 mobiles Netzwerk 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 Daten aktivieren</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">Mobile Daten bei der Einrichtung verwenden? Dadurch können für Sie Kosten anfallen.</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>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Einrichtung einer sekundären Methode zum Entsperren</string>
  <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
@@ -41,12 +41,11 @@
  <string name="other_services_summary">Οι υπηρεσίες αυτές βάζουν τη Google να δουλεύει για εσάς, και μπορείτε να τις απενεργοποιήσετε οποιαδήποτε στιγμή. Τα δεδομένα θα χρησιμοποιηθούν σύμφωνα με την <xliff:g id="name" example="Privacy Policy">%s</xliff:g> της Google.</string>
  <string name="location_services_summary">Οι υπηρεσίες τοποθεσίας επιτρέπουν σε εφαρμογές συστήματος και άλλες εφαρμογές να συγκεντρώσουν και να χρησιμοποιήσουν δεδομένα όπως η κατά προσέγγιση τοποθεσία σας. Για παράδειγμα, μια εφαρμογή μπορεί να χρησιμοποιήσει την κατά προσέγγιση τοποθεσία σας για να εντοπίσει κοντινές καφετέριες.</string>
  <string name="location_access_summary"><b>Επιτρέπει σε εφαρμογές που έχουν ζητήσει την άδειά σας</b> να χρησιμοποιήσουν τις πληροφορίες τοποθεσίας σας. Αυτό μπορεί να περιλαμβάνει την τρέχουσα και τις προηγούμενες τοποθεσίες σας.</string>
-  <string name="location_gps" product="tablet"><b>Βελτιώστε την ακρίβεια τοποθεσίας</b> επιτρέποντας σε εφαρμογές να χρησιμοποιούν το GPS του tablet σας.</string>
-  <string name="location_gps" product="default"><b>Βελτιώστε την ακρίβεια τοποθεσίας</b> επιτρέποντας σε εφαρμογές να χρησιμοποιούν το GPS του τηλεφώνου σας.</string>
+  <string name="location_battery_saving"><b>Μείωση κατανάλωσης μπαταρίας</b> περιορίζοντας τον αριθμό των ενημερώσεων GPS ανά ώρα.</string>
  <string name="location_network"><b>Χρήση Wi-Fi</b> για να βοηθήσετε τις εφαρμογές να προσδιορίζουν την τοποθεσία σας.</string>
  <string name="location_network_telephony"><b>Χρήση Wi-Fi και δικτύων τηλεφωνίας</b> για να βοηθήσετε τις εφαρμογές να προσδιορίζουν την τοποθεσία σας.</string>
  <string name="location_network_gms"><b>Χρήση των υπηρεσιών τοποθεσίας της Google</b> για να βοηθήσετε τις εφαρμογές να προσδιορίζουν την τοποθεσία σας. Αυτό σημαίνει ότι θα αποστέλλονται ανώνυμα δεδομένα τοποθεσίας στη Google, ακόμα και όταν δεν εκτελείται καμία εφαρμογή.</string>
-  <string name="setup_mobile_data">Ενεργοποίηση δεδομένων</string>
+  <string name="setup_mobile_data">Ενεργοποίηση δεδομένων κινητής τηλεφωνίας</string>
  <string name="setup_mobile_data_no_service">Καμία υπηρεσία</string>
  <string name="setup_mobile_data_emergency_only">Μόνο κλήσεις έκτακτης ανάγκης</string>
  <string name="enable_mobile_data_summary">Θέλετε να χρησιμοποιήσετε τα δεδομένα κινητής τηλεφωνίας κατά την διάρκεια της εγκατάστασης;. Η ενεργοποίηση των δεδομένων κινητής τηλεφωνίας μπορεί να υπόκειται σε χρεώσεις από το πάροχο σας.</string>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Ρυθμίστε ένα δευτερεύον κλείδωμα οθόνης</string>
  <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
@@ -41,15 +41,10 @@
  <string name="other_services_summary">These services put Google to work for you, and you can turn them on or off at any time. Data will be used in accordance with Google\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Location services allows system and third party apps to gather and use data such as your approximate location. For example, an app may use your approximate location to locate nearby coffee shops.</string>
  <string name="location_access_summary"><b>Allow apps that have asked your permission</b> to use your location information. This may include your current location and past locations.</string>
-  <string name="location_gps" product="tablet"><b>Improve location accuracy</b> by allowing apps to use the GPS on your tablet.</string>
-  <string name="location_gps" product="default"><b>Improve location accuracy</b> by allowing apps to use the GPS on your phone.</string>
  <string name="location_network"><b>Use Wi-Fi</b> to help apps determine your location.</string>
-  <string name="location_network_telephony"><b>Use Wi-Fi and mobile networks</b> to help apps determine your location.</string>
  <string name="location_network_gms"><b>Use Google\'s location service</b> to help apps determine your location. This means sending anonymous location data to Google, even when no apps are running.</string>
-  <string name="setup_mobile_data">Turn on mobile data</string>
  <string name="setup_mobile_data_no_service">No service</string>
  <string name="setup_mobile_data_emergency_only">Emergency calls only</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>
  <string name="no">No</string>
  <string name="yes">Yes</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -64,4 +59,6 @@
  <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
  <string name="services_use_secure_sms">Use secure SMS</string>
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -16,5 +16,10 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="location_network_telephony"><b>Use Wi-Fi and mobile networks</b> to help apps determine your location.</string>
+  <string name="setup_mobile_data">Turn on mobile data</string>
+  <string name="enable_mobile_data_summary">Do you want to use mobile data during setup? Turning on mobile data may be subject to data charges.</string>
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -41,15 +41,11 @@
  <string name="other_services_summary">These services put Google to work for you, and you can turn them on or off at any time. Data will be used in accordance with Google\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Location services allows system and third party apps to gather and use data such as your approximate location. For example, an app may use your approximate location to locate nearby coffee shops.</string>
  <string name="location_access_summary"><b>Allow apps that have asked your permission</b> to use your location information. This may include your current location and past locations.</string>
-  <string name="location_gps" product="tablet"><b>Improve location accuracy</b> by allowing apps to use the GPS on your tablet.</string>
-  <string name="location_gps" product="default"><b>Improve location accuracy</b> by allowing apps to use the GPS on your phone.</string>
+  <string name="location_battery_saving"><b>Reduce battery consumption</b> by restricting the number of GPS updates per hour.</string>
  <string name="location_network"><b>Use Wi-Fi</b> to help apps determine your location.</string>
-  <string name="location_network_telephony"><b>Use Wi-Fi and mobile networks</b> to help apps determine your location.</string>
  <string name="location_network_gms"><b>Use Google\'s location service</b> to help apps determine your location. This means sending anonymous location data to Google, even when no apps are running.</string>
-  <string name="setup_mobile_data">Turn on mobile data</string>
  <string name="setup_mobile_data_no_service">No service</string>
  <string name="setup_mobile_data_emergency_only">Emergency calls only</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>
  <string name="no">No</string>
  <string name="yes">Yes</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,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>
@@ -41,15 +40,10 @@
  <string name="other_services_summary">Tiujn servoj disponigas Google al vi, kaj vi povas ŝalti aŭ malŝalti ilin iam ajn. Datumoj estos uzataj laŭ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Google.</string>
  <string name="location_services_summary">Lokiga servo permesas al sistemaj aplikaĵoj  kaj aliaj aplikaĵoj koni vian aproksiman lokigon. Ekzemple, aplikaĵo povas uzi vian aproksiman lokigon por trovi kafejojn en la ĉirkaŭaĵo.</string>
  <string name="location_access_summary"><b>Permesi al aplikaĵoj kiujn vi aprobis</b> koni vian lokigon. Tiu inkluzivas aktualan lokigon kaj pasintajn.</string>
-  <string name="location_gps" product="tablet"><b>Plibonigi vian lokigon</b> permesante aplikaĵojn uzi la GPS de via tabuleto.</string>
-  <string name="location_gps" product="default"><b>Plibonigi vian lokigon</b> permesante aplikaĵojn uzi la GPS de via telefono.</string>
  <string name="location_network"><b>Uzi Vifion</b> por helpi aplikaĵojn koni vian lokigon.</string>
-  <string name="location_network_telephony"><b>Uzi Vifion kaj porteblajn retojn</b> por helpi aplikaĵojn koni vian lokigon.</string>
  <string name="location_network_gms"><b>Uzi lokigan servon de Google</b> por helpi aplikaĵojn koni vian lokigon. Tio signifas sendi anonimajn lokigajn datumojn al Google, eĉ kiam neniu aplikaĵo funkcias.</string>
-  <string name="setup_mobile_data">Ŝalti poŝkomputilan reton</string>
  <string name="setup_mobile_data_no_service">Neniu servo</string>
  <string name="setup_mobile_data_emergency_only">Nur urĝaj alvokoj</string>
-  <string name="enable_mobile_data_summary">Ĉu vi deziras uzi retajn datumojn dum agordo ?  Ŝalti retan aliron povas okazi pliajn kostojn.</string>
  <string name="no">Ne</string>
  <string name="yes">Jes</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -69,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
@@ -16,5 +16,12 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="location_battery_saving"><b>Reduce el consumo de batería</b> restringiendo el número de actualizaciones del GPS por hora.</string>
+  <string name="location_network_telephony"><b>Utiliza el Wi-Fi y las redes móviles</b> para ayudar a las aplicaciones a determinar tu ubicación.</string>
+  <string name="setup_mobile_data">Activar datos móviles</string>
+  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Estos servicios hacen que Google trabaje 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 otras ubicaciones recientes.</string>
-  <string name="location_gps" product="tablet"><b>Mejorar la precisión de localización</b> al permitir que las aplicaciones usen el GPS de la tableta.</string>
-  <string name="location_gps" product="default"><b>Mejora la precisión de localización</b> al permitir que las aplicaciones usen el GPS del teléfono.</string>
+  <string name="location_battery_saving"><b>Reducir el consumo de batería</b> restringiendo el número de actualizaciones del GPS por hora.</string>
  <string name="location_network"><b>Uso de Wi-Fi</b> para permitir que las aplicaciones determinen tu ubicación.</string>
-  <string name="location_network_telephony"><b>Utiliza Wi-Fi y redes móviles</b> para permitir que las aplicaciones determinen tu ubicación.</string>
+  <string name="location_network_telephony"><b>Utilizar Wi-Fi y las redes móviles</b> para que las aplicaciones puedan determinar tu ubicación.</string>
  <string name="location_network_gms"><b>Uso del servicio de localización de Google</b> para permitir que las aplicaciones determinen tu ubicación. Esto significa enviar información anónima de la localización a Google, incluso cuando no haya aplicaciones usando este servicio.</string>
  <string name="setup_mobile_data">Activar datos móviles</string>
  <string name="setup_mobile_data_no_service">Sin servicio</string>
  <string name="setup_mobile_data_emergency_only">Solo llamadas de emergencia</string>
-  <string name="enable_mobile_data_summary">¿Quieres usar los datos móviles durante la instalación? Activar los datos móviles puede incurrir en cargos de red.</string>
+  <string name="enable_mobile_data_summary">¿Quieres usar los datos móviles durante la instalación? Activar los datos móviles puede provocar cargos de datos.</string>
  <string name="no">No</string>
  <string name="yes">Sí</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,4 +77,13 @@
  <string name="fingerprint_setup_backup_lock_method">Establecer un método secundario de desbloqueo</string>
  <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,15 +41,14 @@
  <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_gps" product="tablet"><b>Mejorar la precisión de localización</b> al permitir que las aplicaciones usen el GPS del tablet.</string>
-  <string name="location_gps" product="default"><b>La precisión de localización es mejorada</b> al permitir que las aplicaciones usen el GPS del teléfono.</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>Utiliza Wi-Fi y redes móviles</b> para ayudar a que las aplicaciones determinen tu ubicación.</string>
  <string name="location_network_gms"><b>Uso del servicio de localización de Google</b> para ayudar a las aplicaciones a determinar tu ubicación. Esto significa enviar información anónima de la localización a Google, incluso cuando no haya aplicaciones usando este servicio.</string>
  <string name="setup_mobile_data">Activar datos móviles</string>
  <string name="setup_mobile_data_no_service">Sin servicio</string>
  <string name="setup_mobile_data_emergency_only">Solo llamadas de emergencia</string>
-  <string name="enable_mobile_data_summary">¿Quieres usar los datos móviles durante la instalación? Encender los datos móviles puede incurrir en cargos de red.</string>
+  <string name="enable_mobile_data_summary">¿Deseas utilizar los datos móviles durante la instalación? Activar los datos móviles puede provocar cargos de datos.</string>
  <string name="no">No</string>
  <string name="yes">Sí</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,4 +77,11 @@
  <string name="fingerprint_setup_backup_lock_method">Establecer un método secundario de desbloqueo</string>
  <string name="fingerprint_setup_add_fingerprint">Añade tu huella digital</string>
  <string name="fingerprint_setup_screen_lock_setup">Ajustes de pantalla de bloqueo</string>
+  <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
@@ -41,15 +41,10 @@
  <string name="other_services_summary">Need teenused panevad Google sinu heaks tööle ning sul on võimalus neid sätteid igal ajal sisse või välja lülitada. Andmeid kasutatakse vastavalt Google <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Asukohateenused võimaldavad süsteemil ja kolmandate osapoolte rakendustel koguda ja kasutada informatsiooni sinu umbkaudse asukoha kohta. Näiteks võib rakendus kasutada sinu umbkautset asukohta, et leida lähedal asuvaid kohvikuid.</string>
  <string name="location_access_summary"><b>Luba rakendustel, mis on küsinud Teie nõusolekut</b> kasutada Teie asukoha informatsiooni. See võib tähendada nii Teie praegust kui ka eelnevaid asukohti.</string>
-  <string name="location_gps" product="tablet"><b>Parandada asukoha täpsust</b> lubades rakendustel kasutada GPS-i Teie tahvelarvutis.</string>
-  <string name="location_gps" product="default"><b>Parandada asukoha täpsust</b> lubades rakendustel kasutada GPS-i Teie nutitelefonis.</string>
  <string name="location_network"><b>Kasuta Wi-Fi-t</b> aitamaks rakendustel asukohta kindlaks määrata .</string>
-  <string name="location_network_telephony"><b>Kasuta Wi-Fi-t ja mobiilsidevõrke</b> aitamaks rakendustel asukohta kindlaks määrata.</string>
  <string name="location_network_gms"><b>Kasuta Google asukohateenuseid</b>, mis aitab rakendustel Teie asukohta kindlaks määrata. See tähendab anonüümsete asukoha andmete saatmist Google-sse, isegi kui ükski rakendus ei tööta.</string>
-  <string name="setup_mobile_data">Lülita mobiilne andmeside sisse</string>
  <string name="setup_mobile_data_no_service">Teenus puudub</string>
  <string name="setup_mobile_data_emergency_only">Üksnes hädaabikõned</string>
-  <string name="enable_mobile_data_summary">Kas soovite kasutada mobiilandmesidet installeerimise ajal? Sisselülitatud mobiilandmesidega võivad kaasneda andmeside võrgutasud.</string>
  <string name="no">Ei</string>
  <string name="yes">Jah</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d </xliff:g> - <xliff:g id="name">%s </xliff:g></string>
@@ -78,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
@@ -41,10 +41,9 @@
  <string name="other_services_summary">Zerbitzu hauek Google zure mesedetan lanean jartzen dute, edozein unetan piztu edo itzali ditzakezu. Datuak Google <xliff:g id="name" example="Privacy Policy">%s</xliff:g> arabera erabiliko dira.</string>
  <string name="location_services_summary">Kokaleku zerbitzuek zure kokalekua bezalako datuak eskuratzea ahalbidetzen diete sistemako eta instalatutako aplikazioei. Adibidez, aplikazio batek zure kokalekua erabili lezake inguruko kafetegiak aurkitzeko.</string>
  <string name="location_access_summary"><b>Baimena eskatu dizuten aplikazioei</b> zure kokaleku informazioa erabiltzea ahalbidetu. Uneko zein iraganeko kokalekuak barne.</string>
-  <string name="location_gps" product="tablet"><b>Hobetu kokalekuaren zehaztasuna</b> aplikazioei tabletaren GPSa erabiltzea baimenduz.</string>
-  <string name="location_gps" product="default"><b>Hobetu kokalekuaren zehaztasuna</b> aplikazioei telefonoaren GPSa erabiltzea baimenduz.</string>
+  <string name="location_battery_saving"><b>Gutxiagotu bateria kontsumoa</b> orduko GPS eguneraketak mugatuz.</string>
  <string name="location_network"><b>Erabili Wi-Fia</b> aplikazioei zure kokalekua zehazten laguntzeko.</string>
-  <string name="location_network_telephony"><b>Erabili Wi-Fi eta sare mugikorrak</b> aplikazioei zure kokalekua zehazten laguntzeko.</string>
+  <string name="location_network_telephony"><b>Erabili Wi-Fi eta sare mugikorrak</b> aplikazioei zure kokapena zehazten laguntzeko.</string>
  <string name="location_network_gms"><b>Erabili Google kokaleku zerbitzua</b> aplikazioei zure kokalekua zehazten laguntzeko. Honek Googlei kokaleku informazio anonimoa bidaltzea dakar, aplikaziorik erabiltzen ez duzunean ere.</string>
  <string name="setup_mobile_data">Piztu datu mugikorrak</string>
  <string name="setup_mobile_data_no_service">Zerbitzurik ez</string>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Ezarri ordezko desblokeo metodo bat</string>
  <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
@@ -41,15 +41,10 @@
  <string name="other_services_summary">سرویس‌های پیش‌رو خدمات گوگل را به شما ارائه می‌کنند که هر زمان می‌توانید آن‌ها را روشن یا خاموش کنید. از داده‌ها مطابق با <xliff:g id="name" example="Privacy Policy">%s</xliff:g> گوگل استفاده خواهد شد.</string>
  <string name="location_services_summary">با استفاده از سرویس مکان، نقشه‌ها و برنامه‌های دیگر می‌توانند از داده‌هایی مثل مکان تقریبی شما استفاده کنند. به‌عنوان مثال، یک برنامه می‌تواند کافی‌شاپ‌های نزدیکتان را با استفاده از این داده‌ها مشخص کند.</string>
  <string name="location_access_summary"><b>به برنامه‌هایی که درخواست مکان می‌کنند اجازه دهید</b> از اطلاعات مکان شما استفاده کنند. ممکن است این استفاده شامل مکان فعلی و قبلی شما باشد.</string>
-  <string name="location_gps" product="tablet">به برنامه‌ها اجازه دهید از جی‌پی‌اس تبلت برای <b>افزایش دقت مکان</b> استفاده کنند.</string>
-  <string name="location_gps" product="default">به برنامه‌ها اجازه دهید از جی‌پی‌اس گوشی برای <b>افزایش دقت مکان</b> استفاده کنند.</string>
  <string name="location_network">از <b>وای‌فای</b> برای بهبود مکان‌یابی در برنامه‌ها استفاده کنید.</string>
-  <string name="location_network_telephony">از <b>وای‌فای و شبکه‌های همراه</b> برای بهبود مکان‌یابی در برنامه‌ها استفاده کنید.</string>
  <string name="location_network_gms">از <b>سرویس مکان گوگل</b> برای بهبود مکان‌یابی در برنامه‌ها استفاده کنید. این استفاده به معنای ارسال داده‌های ناشناس مکانی به گوگل است، حتی هنگامی که برنامه‌ای در حال اجرا نیست.</string>
-  <string name="setup_mobile_data">روشن کردن داده همراه</string>
  <string name="setup_mobile_data_no_service">بدون سرویس</string>
  <string name="setup_mobile_data_emergency_only">فقط تماس اضطراری</string>
-  <string name="enable_mobile_data_summary">آیا می‌خواهید در طول راه‌اندازی از داده همراه استفاده کنید؟ ممکن است روشن کردن داده همراه باعث هزینه‌های اضافی شود.</string>
  <string name="no">خیر</string>
  <string name="yes">بله</string>
  <string name="data_sim_name">سیم کارت <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Tämä ottaa Googlen palvelut käyttöön, ja voit ottaa ne käyttöön tai poistaa käytöstä milloin tahansa. Tietoja käytetään Googlen <xliff:g id="name" example="Privacy Policy">%s</xliff:g> mukaisesti.</string>
  <string name="location_services_summary">Sijaintipalvelut sallii järjestelmän ja muiden sovellusten kerätä ja käyttää tietoja kuten likimääräinen sijaintisi. Esimerkiksi sovellus voi paikantaa sinut ja etsiä lähistöllä olevia kahviloita.</string>
  <string name="location_access_summary"><b>Salli sovellusten, jotka ovat kysyneet sinulta lupaa</b> käyttää sijaintitietojasi. Tämä saattaa sisältää nykyisen sijaintisi ja aiemmat sijaintisi.</string>
-  <string name="location_gps" product="tablet"><b>Paranna paikannuksen tarkkuutta</b> sallimalla sovellusten käyttää GPS:ää tabletissasi.</string>
-  <string name="location_gps" product="default"><b>Paranna paikannuksen tarkkuutta</b> sallimalla sovellusten käyttää GPS:ää puhelimessasi.</string>
+  <string name="location_battery_saving"><b>Vähennä akun kulutusta</b> rajoittamalla GPS-paikannusten määrää per tunti.</string>
  <string name="location_network"><b>Käytä Wi-Fiä</b> auttaaksesi sovelluksia paikantamaan sijaintisi.</string>
  <string name="location_network_telephony"><b>Käytä Wi-Fi- ja mobiiliverkkoja</b> auttaaksesi sovelluksia määrittämään sijaintisi.</string>
  <string name="location_network_gms"><b>Käytä Googlen paikannusta</b> auttaaksesi sovellusten sijaintisi paikannusta. Tämä tarkoittaa nimettömien paikannustietojen lähettämistä Googlelle, jopa ilman sovellusten käynnissäolemista.</string>
  <string name="setup_mobile_data">Ota mobiilidata käyttöön</string>
  <string name="setup_mobile_data_no_service">Ei palvelua</string>
  <string name="setup_mobile_data_emergency_only">Vain hätäpuhelut</string>
-  <string name="enable_mobile_data_summary">Haluatko käyttää mobiilidataa asennuksen aikana? Mobiilidatan kytkeminen päälle saattaa aiheuttaa tiedonsiirtokuluja.</string>
+  <string name="enable_mobile_data_summary">Haluatko käyttää mobiilidataa asennuksen aikana? Mobiilidatan käyttöönottaminen voi aiheuttaa tiedonsiirtokuluja.</string>
  <string name="no">Ei</string>
  <string name="yes">Kyllä</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Asentaa toissijainen näytön avaustapa</string>
  <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
@@ -41,8 +41,7 @@
  <string name="other_services_summary">Ces services sont mis à disposition par Google, et vous pouvez les activer ou les désactiver à tout moment. Les données seront utilisées conformément à la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Google.</string>
  <string name="location_services_summary">Le service de localisation permet aux applications systèmes et de tiers de recueillir et d\'utiliser des données comme votre position approximative. Par exemple, une application peut utiliser votre position approximative pour localiser des cafés-restaurants à proximité.</string>
  <string name="location_access_summary"><b>Permettre aux applications ayant obtenu votre autorisation</b> d\'utiliser vos informations de localisation. Cela peut inclure votre position actuelle et les dernières positions.</string>
-  <string name="location_gps" product="tablet"><b>Améliorer la précision de la localisation</b> en permettant aux applications d\'utiliser le GPS sur votre tablette.</string>
-  <string name="location_gps" product="default"><b>Améliorer la précision de la localisation</b> en permettant aux applications d\'utiliser le GPS sur votre téléphone.</string>
+  <string name="location_battery_saving"><b>Réduire la consommation de la batterie</b> en limitant le nombre de mise à jour GPS par heure.</string>
  <string name="location_network"><b>Utiliser le Wi-Fi</b> pour aider les applications à déterminer votre position.</string>
  <string name="location_network_telephony"><b>Utiliser le Wi-Fi et les réseaux mobiles</b> pour aider les applications à déterminer votre position.</string>
  <string name="location_network_gms"><b>Utiliser le service de localisation de Google</b> pour aider les applications à déterminer votre position. Cela signifie envoyer anonymement des données de localisation à Google, même lorsque qu\'aucune application n\'est en cours d\'exécution.</string>
@@ -78,4 +77,13 @@
  <string name="fingerprint_setup_backup_lock_method">Configurer une méthode de déblocage secondaire</string>
  <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,15 +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_gps" product="tablet"><b>Mellora a precisión da localización</b> permitindo que a aplicación utilice o GPS da túa tableta.</string>
-  <string name="location_gps" product="default"><b>Mellora a precisión da localización</b> permitindo que a aplicación utilice o GPS do seu teléfono.</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 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óbiles</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">Quere empregar os datos móbiles durante a instalación? Activalos pode estar suxeito a cargos na tarifa de datos.</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>
@@ -78,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
@@ -41,8 +41,7 @@
  <string name="other_services_summary">આ સેવાઓ Google પાસે તમારું કાર્ય કરાવે છે, અને તમે તે કોઇ પણ સમયે તેને ચાલુ અથવા બંધ કરી શકો છો. ડેટાનો ઉપયોગ Googleના <xliff:g id="name" example="Privacy Policy">%s</xliff:g> અનુસાર થશે.</string>
  <string name="location_services_summary">લોકેશન સેવાઓ સિસ્ટમને અને ત્રાહિત પક્ષ ઍપને તમારો ડેટા એકઠો કરી વાપરવાની છૂટ આપે છે જેમકે આશરે તમારું લોકેશન. દાખલા તરીકે, એપ્લિકેશન નજીક હોય તેવી કૉફીશૉપ શોધવા માટે તમારા આશરેના લોકેશનનો ઉપયોગ કરી શકે.</string>
  <string name="location_access_summary">તમારી લોકેશન માહિતી વાપરવાની <b>પરવાનગી માંગી હોય એવા ઍપ્સને છૂટ આપો</b>. આમાં તમારા હાલના લોકેશન અને ભૂતકાલીન લોકેશનોનો સમાવેશ થઈ શકે.</string>
-  <string name="location_gps" product="tablet">તમારા ટૅબ્લેટ પર રહેલ GPSનો ઉપયોગ કરવા ઍપ્સને છૂટ આપી તમારા <b>લોકેશનની સચોટતા સુધારો</b>.</string>
-  <string name="location_gps" product="default">તમારા ફોન પર રહેલ GPSનો ઉપયોગ કરવા ઍપ્સને છૂટ આપી તમારા <b>લોકેશનની સચોટતા સુધારો</b>.</string>
+  <string name="location_battery_saving">કલાક દીઠ GPS અપડેટોની સંખ્યા મર્યાદિત કરીને <b>બેટરીનો વપરાશ ઘટાડો</b>.</string>
  <string name="location_network">તમારું લોકેશન નિર્ધારિત કરવામાં ઍપ્સને મદદ કરવા <b>Wi-Fi વાપરો</b>.</string>
  <string name="location_network_telephony">તમારું લોકેશન નિર્ધારિત કરવામાં ઍપ્સને મદદ કરવા <b>Wi-Fi અને મોબાઇલ નેટવર્ક્સ વાપરો</b>.</string>
  <string name="location_network_gms">તમારું લોકેશન નિર્ધારિત કરવામાં ઍપ્સને મદદ કરવા <b>Googleની લોકેશન સેવા વાપરો</b>. આનો અર્થ થાય છે Google ને અનામી લોકેશન ડેટા મોકલવો, જ્યારે કોઈ એપ્સ ચાલી રહી ન હોય ત્યારે પણ.</string>
@@ -78,4 +77,11 @@
  <string name="fingerprint_setup_backup_lock_method">સેકન્ડરિ અનલૉક પદ્ધતિ સેટઅપ કરો</string>
  <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
@@ -41,15 +41,10 @@
  <string name="other_services_summary">इन सेवाओं के लिए गूगल से लाभ लिया जाता है, और आप उन्हें किसी भी समय बंद या चालू कर सकते हैं। डेटा का उपयोग गूगल की <xliff:g id="name" example="गोपनीयता नीति">%s</xliff:g> के अनुसार किया जाएगा।</string>
  <string name="location_services_summary">स्थान सेवाएँ आपके सिस्टम को तृतीय पक्षीय ऐपों का उपयोग करके डेटा संग्रहण करने और डेटा उपयोग करने देती हैं ताकि आपके स्थान का अंदाज़ा लगाया जा सके। उदाहरण के लिए, कोई ऐप आपके स्थान के अनुमान का उपयोग निकट के कॉफ़ी शॉपों का पता करने के लिए कर सकता है।</string>
  <string name="location_access_summary"><b>जिन ऐपों ने आपसे अनुमति ले ली है</b> उन्हें आपके स्थान संबंधी जानकारी का उपयोग करने दें। इस जानकारी में आपका वर्तमान स्थान और पहले के स्थान शामिल हो सकते हैं।</string>
-  <string name="location_gps" product="tablet">अपने टैब्लेट में ऐपों को जीपीएस का उपयोग करने देकर <b>स्थान सटीकता बढ़ाएँ</b>।</string>
-  <string name="location_gps" product="default">अपने फ़ोन में ऐपों को जीपीएस का उपयोग करने देकर <b>स्थान सटीकता बढ़ाएँ</b>।</string>
  <string name="location_network">अपने स्थान को निर्धारित करने में ऐपों की मदद करने के लिए <b>वाई-फ़ाई</b> का उपयोग करें।</string>
-  <string name="location_network_telephony">ऐपों को आपके स्थान का निर्धारण करने में मदद करने के लिए <b>वाई-फ़ाई और मोबाइल नेटवर्कों का उपयोग करें।</b></string>
  <string name="location_network_gms">ऐपों को अपने स्थान का निर्धारण करने में मदद करने के लिए <b>गूगल की स्थान सेवा का उपयोग करें।</b> इसका मतलब है कि गूगल को गुमनाम स्थान डेटा तब भी भेजा जाएगा जब कोई भी ऐप नहीं चल रहा हो।</string>
-  <string name="setup_mobile_data">मोबाइल डेटा को चालू करें</string>
  <string name="setup_mobile_data_no_service">कोई सेवा नहीं है</string>
  <string name="setup_mobile_data_emergency_only">केवल आपातकालीन कॉल</string>
-  <string name="enable_mobile_data_summary">क्या आप सेटअप के दौरान मोबाइल डेटा का उपयोग करना चाहते हैं? मोबाइल डेटा को चालू करने पर डेटा शुल्क लग सकते हैं।</string>
  <string name="no">नहीं</string>
  <string name="yes">हाँ</string>
  <string name="data_sim_name">सिम <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,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>
@@ -41,12 +41,11 @@
  <string name="other_services_summary">Ove usluge daju Googleu da radi za vas, a možete ih uključiti ili isključiti u bilo kojem trenutku. Podaci će se koristiti u skladu sa Google-ovim <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Servis lokacije dozvoljava sustavnim i drugim aplikacijama da sakupljaju i koriste podatke kao što je približna lokacija. Npr. aplikacije mogu koristiti vašu približnu lokaciju za lociranje kafića u blizini.</string>
  <string name="location_access_summary"><b>Dopusti aplikacijama koje traže tvoju dozvolu</b> da koriste informacije o tvojoj lokaciji. Ovo može uključiti tvoju sadašnju i prošle lokacije.</string>
-  <string name="location_gps" product="tablet"><b>Poboljšaj točnost lokacije</b>dozvolivši aplikacijama da koriste GPS na tvom tabletu.</string>
-  <string name="location_gps" product="default"><b>Poboljšaj točnost lokacije</b>dozvolivši aplikacijama da koriste GPS na tvom telefonu.</string>
+  <string name="location_battery_saving"><b>Smanji potrošnju baterije</b> ograničavanjem GPS ažuriranja po satu.</string>
  <string name="location_network"><b>Koristi Wi-Fi</b> da pomogneš aplikacijama da odrede tvoju lokaciju.</string>
  <string name="location_network_telephony"><b>Koristi Wi-Fi i mobilne mreže</b> da pomogneš aplikacijama da odrede tvoju lokaciju.</string>
  <string name="location_network_gms"><b>Koristi Google servis lokacije</b>da pomogneš aplikacijama da odrede tvoju lokaciju. To znači slanje anonimnih podaka u Google, čak i kad nema pokrenutih aplikacija.</string>
-  <string name="setup_mobile_data">Uključite mobilne podatke</string>
+  <string name="setup_mobile_data">Uključi mobilne podatke</string>
  <string name="setup_mobile_data_no_service">Nema usluge</string>
  <string name="setup_mobile_data_emergency_only">Samo hitni pozivi</string>
  <string name="enable_mobile_data_summary">Želite li koristiti mobilne podatke tijekom postavljanja? Uključeni mobilni podaci mogu napraviti troškove.</string>
@@ -54,7 +53,7 @@
  <string name="yes">Da</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d </xliff:g> - <xliff:g id="name">%s </xliff:g></string>
  <string name="emergency_call">Hitan poziv</string>
-  <string name="setup_services">Cijanogen značajke</string>
+  <string name="setup_services">Cyanogenove značajke</string>
  <string name="services_explanation" product="tablet">Ovi servisi rade za tebe da povećaju mogućnosti tvog tableta. Podaci će biti korišteni u suglasnosti sa Cyanogenovim <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="services_explanation" product="default">Ovi servisi rade za tebe da povećaju mogućnosti tvog telefona. Podaci će biti korišteni u suglasnosti sa Cyanogenovim <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="services_privacy_policy">Pravila privatnosti</string>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Postavljanje rezervne metode otključavanja</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Ezek a szolgáltatások az Ön szolgálatába állítják a Google-t, amit bármikor ki- vagy bekapcsolhat. Az adatok felhasználása a Google <xliff:g id="name" example="Privacy Policy">%s</xliff:g> alapján történik.</string>
  <string name="location_services_summary">A helymeghatározási szolgáltatások engedélyezni fogják a rendszer és más harmadik féltől származó alkalmazások számára az adatok összegyűjtését és használatát a pozíciója pontosításához. Például egy alkalmazás a becsült helyzetét fogja használni a közeli kávézók meghatározásához.</string>
  <string name="location_access_summary"><b>Lehetővé teszi az alkalmazás számára, amely korábban engedélyt kért,</b> a helymeghatározási információ használatára. Beleértve a jelenlegi és a korábbi helyeket.</string>
-  <string name="location_gps" product="tablet"><b>Javítson helyzete pontosságán</b> azzal, hogy engedélyezi az alkalmazásoknak a GPS használatát az eszközén.</string>
-  <string name="location_gps" product="default"><b>Javítson helyzete pontosságán</b> azzal, hogy engedélyezi az alkalmazásoknak a GPS használatát az eszközén.</string>
+  <string name="location_battery_saving"><b>Akkumulátor fogyasztás csökkentése</b> a GPS óránkénti frissítés számának korlátozásával.</string>
  <string name="location_network"><b>Wi-Fi használata</b> segítse az alkalmazásokat a helymeghatározásával.</string>
  <string name="location_network_telephony"><b>Wi-Fi és mobil hálózatok használata</b> segítse az alkalmazásokat a helymeghatározásával.</string>
  <string name="location_network_gms"><b>A Google helymeghatározó szolgáltatás használata</b> az alkalmazások helymeghatározásának segítésére. Ez névtelen helyadatok Google felé történő küldését jelenti, még akkor is, ha nincs futó alkalmazás.</string>
-  <string name="setup_mobile_data">Mobilinternet bekapcsolása</string>
+  <string name="setup_mobile_data">Mobilnet bekapcsolása</string>
  <string name="setup_mobile_data_no_service">Nincs szolgáltatás</string>
  <string name="setup_mobile_data_emergency_only">Csak segélyhívások</string>
-  <string name="enable_mobile_data_summary">Kívánja használni a mobilinternetet a telepítés során? A mobilinternet használata költségekkel járhat.</string>
+  <string name="enable_mobile_data_summary">Szeretné használni a mobilnetet a beállítás során? Bekapcsolás esetén díjat számíthatnak fel érte.</string>
  <string name="no">Nem</string>
  <string name="yes">Igen</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Másodlagos feloldási mód beállításai</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Layanan ini menggunakan Google, dan Anda dapat mengubahnya atau menonaktifkannya setiap saat. Data akan digunakan sesuai dengan <xliff:g id="name" example="Privacy Policy">%s</xliff:g> Google.</string>
  <string name="location_services_summary">Layanan lokasi mengizinkan sistem dan aplikasi pihak ketiga untuk mengumpulkan dan menggunakan data seperti perkiraan lokasi Anda. Misalnya, sebuah aplikasi dapat menggunakan perkiraan lokasi Anda untuk menemukan kedai kopi terdekat.</string>
  <string name="location_access_summary"><b>Izinkan aplikasi yang telah meminta izin Anda</b> menggunakan informasi lokasi Anda. Ini mungkin termasuk lokasi Anda saat ini dan lokasi terakhir.</string>
-  <string name="location_gps" product="tablet"><b>Meningkatkan akurasi lokasi</b> dengan mengizinkan aplikasi untuk menggunakan GPS pada ponsel Anda.</string>
-  <string name="location_gps" product="default"><b>Meningkatkan akurasi lokasi</b> dengan mengizinkan aplikasi untuk menggunakan GPS pada ponsel Anda.</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>Penggunaan Wi-Fi dan jaringan seluler</b> untuk membantu aplikasi menentukan lokasi Anda.</string>
+  <string name="location_network_telephony"><b>Gunakan Wi-Fi dan jaringan seluler</b> untuk membantu aplikasi menentukan lokasi Anda.</string>
  <string name="location_network_gms"><b>Gunakan layanan lokasi Google</b> untuk membantu aplikasi menentukan lokasi Anda. Ini berarti mengirimkan data lokasi anonim ke Google, bahkan ketika tidak ada aplikasi yang berjalan.</string>
-  <string name="setup_mobile_data">Aktifkan 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>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Siapkan metode buka kunci kedua</string>
  <string name="fingerprint_setup_add_fingerprint">Tambahkan sidik jari Anda</string>
  <string name="fingerprint_setup_screen_lock_setup">Siapkan kunci layar</string>
+  <string name="sim_locale_changed">%1$s SIM terdeteksi</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Pilih tipe kunci layar</string>
+  <string name="settings_lockscreen_setup_details">Bagaimana cara kunci layar yang Anda suka?</string>
+  <string name="lockscreen_setup_title">Lindungi telepon anda</string>
+  <string name="lockscreen_setup_summary"><b>Lindungi perangkat ini</b> dan minta PIN, pola, atau sandi untuk membuka kunci layar</string>
+  <string name="lockscreen_setup_screen_lock_setup">Siapkan PIN, pola, atau sandi</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Selamat datang di Era Pasca-Aplikasi</string>
+  <string name="mod_description">Mod itu cerdas, sadar, dan merupakan pengalaman ringan yang terintegrasi dengan sistem operasi. Jika MOD berpikir bahwa ia dapat membantu, ia dapat menawarkan pengaktifan fitur bagi Anda.</string>
 </resources>
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -17,4 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Questi servizi consentono a Google di lavorare per te, ed è possibile attivarli o disattivarli in qualsiasi momento. I dati saranno utilizzati in conformità con la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> di Google.</string>
  <string name="location_services_summary">I servizi di localizzazione permettono a Maps e ad altre applicazioni di raccogliere ed utilizzare dati come la tua posizione. Ad esempio, Maps potrebbe utilizzare la tua posizione per individuare negozi di caffè nelle tue vicinanze.</string>
  <string name="location_access_summary"><b>Consenti alle applicazioni che hanno chiesto la tua autorizzazione</b> di utilizzare informazioni sulla tua posizione. Ciò può includere la tua posizione attuale e quelle precedenti.</string>
-  <string name="location_gps" product="tablet"><b>Migliora l\'accuratezza della localizzazione</b> consentendo alle app di usare il GPS sul tuo tablet.</string>
-  <string name="location_gps" product="default"><b>Migliora l\'accuratezza della localizzazione</b> permettendo alle applicazioni di utilizzare il GPS sul tuo telefono.</string>
+  <string name="location_battery_saving"><b>Riduci il consumo della batteria</b> limitando il numero di aggiornamenti del GPS ogni ora.</string>
  <string name="location_network"><b>Usa il Wi-Fi</b> per aiutare le app a determinare la tua posizione.</string>
  <string name="location_network_telephony"><b>Usa il Wi-Fi e le reti mobili</b> per aiutare le app a determinare la tua posizione.</string>
  <string name="location_network_gms"><b>Usa il servizio di localizzazione di Google</b> per aiutare le app a determinare la tua posizione. Questo significa spedire dati anonimi sulla tua posizione a Google, anche quando nessuna app è in esecuzione.</string>
-  <string name="setup_mobile_data">Attiva i dati mobili</string>
+  <string name="setup_mobile_data">Attiva la rete mobile</string>
  <string name="setup_mobile_data_no_service">Nessun servizio</string>
  <string name="setup_mobile_data_emergency_only">Solo chiamate di emergenza</string>
-  <string name="enable_mobile_data_summary">Vuoi utilizzare la connessione dati durante la configurazione? Attivando la connessione dati potrebbero essere applicate tariffe dati.</string>
+  <string name="enable_mobile_data_summary">Vuoi utilizzare la rete mobile durante il setup? L\'attivazione della rete mobile potrebbe comportare costi aggiuntivi.</string>
  <string name="no">No</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>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Impostare un metodo di sblocco secondario</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">שירותים אלו מאפשרים ל-Google לעבוד עבורך, ובאפשרותך לכבות או להדליק אותם בכל עת. מידע ישמש בכפוף ל<xliff:g id="name" example="Privacy Policy">%s</xliff:g> של Google.</string>
  <string name="location_services_summary">שירותי מיקום מאפשרים ליישום המפות וליישומים אחרים להשתמש במיקומך. לדוגמא, יישום המפות עשוי להשתמש במידע זה על מנת להציג לך בתי קפה הנמצאים בקרבתך.</string>
  <string name="location_access_summary"><b>אפשר ליישומים שביקשו את רשותך</b> להשתמש במידע על מיקומך. הפעולה עשויה לכלול את מיקומך הנוכחי ומיקומים קודמים.</string>
-  <string name="location_gps" product="tablet"><b>שפר דיוק מיקום</b> על-ידי נתינת הרשאה ליישומים להשתמש ב-GPS בטאבלט.</string>
-  <string name="location_gps" product="default"><b>שפר דיוק מיקום</b> על-ידי נתינת הרשאה ליישומים להשתמש ב-GPS בטלפון שלך.</string>
+  <string name="location_battery_saving"><b>הפחת צריכת הסוללה</b> על ידי הגבלת מספר עדכוני GPS בשעה.</string>
  <string name="location_network"><b>השתמש ב-Wi-Fi</b> כדי לסייע ליישומים לקבוע את מיקומך.</string>
  <string name="location_network_telephony"><b>השתמש ב-Wi-Fi וברשתות סלולריות</b> כדי לסייע ליישומים לקבוע את מיקומך.</string>
  <string name="location_network_gms"><b>השתמש בשירותי המיקום של Google</b> כדי לשלוח נתוני מיקום אנונימיים ל-Google, גם כאשר אין יישומים פועלים.</string>
-  <string name="setup_mobile_data">הפעל נתונים ניידים</string>
+  <string name="setup_mobile_data">הפעל נתונים סלולריים</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="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>
@@ -78,4 +77,13 @@
  <string name="fingerprint_setup_backup_lock_method">הגדר שיטת פתיחה משנית</string>
  <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
@@ -41,8 +41,7 @@
  <string name="other_services_summary">これらのサービスはGoogleアプリを動作させるもので、いつでもONまたはOFFにすることができます。データはGoogleの<xliff:g id="name" example="Privacy Policy">%s</xliff:g>に従って使用されます。</string>
  <string name="location_services_summary">位置情報サービスは、おおよその位置情報などのデータの収集や使用をマップやサードパーティのアプリに許可します。例えば、アプリが最寄りの喫茶店を探すために、おおよその位置情報を使用するかもしれません。</string>
  <string name="location_access_summary">位置情報を使用する<b>権限を求めてきたアプリを許可します</b>。現在の位置情報と過去の位置情報を含む可能性があります。</string>
-  <string name="location_gps" product="tablet">タブレットのGPSの使用をアプリに許可して<b>位置情報の精度を向上させます</b>。</string>
-  <string name="location_gps" product="default">携帯電話のGPSの使用をアプリに許可して<b>位置情報の精度を向上させます</b>。</string>
+  <string name="location_battery_saving">一時間あたりのGPSの更新回数を制限して<b>電池消費を抑えます</b>。</string>
  <string name="location_network">アプリが位置情報を特定しやすくするために<b>Wi-Fiを使用します</b>。</string>
  <string name="location_network_telephony">アプリが位置情報を特定しやすくするために<b>Wi-Fiとモバイルネットワークを使用します</b>。</string>
  <string name="location_network_gms">アプリが位置情報を特定しやすくするために<b>Googleの位置情報サービスを使用します</b>。アプリが実行されていなくても、匿名の位置情報データをGoogleに送信することになります。</string>
@@ -58,7 +57,7 @@
  <string name="services_explanation" product="tablet">これらのサービスはタブレットの機能を拡張するために動作します。データはCyanogenの<xliff:g id="name" example="Privacy Policy">%s</xliff:g>に従って使用されます。</string>
  <string name="services_explanation" product="default">これらのサービスは携帯電話の機能を拡張するために動作します。データはCyanogenの<xliff:g id="name" example="Privacy Policy">%s</xliff:g>に従って使用されます。</string>
  <string name="services_privacy_policy">プライバシーポリシー</string>
-  <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>の改善を支援します</string>
+  <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>の改善に協力します</string>
  <string name="services_metrics_label">診断と使用状況データを自動的にCyanogenに送信して、<xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>。この情報は個人を特定するために使用されることはなく、電池持ち、アプリのパフォーマンス、<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>の新機能などへの取り組みに活用されます。</string>
  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g>テーマを適用</string>
  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>すると、テーマ固有のアイコン、壁紙、フォントが有効になります。</string>
@@ -78,4 +77,13 @@
  <string name="fingerprint_setup_backup_lock_method">予備のロック解除方法をセットアップ</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">ಈ ಸೇವೆಗಳು ಗೂಗಲನ್ನು ನಿಮ್ಮ ಸೇವೆಗೆ ನಿಯೋಜಿಸುತ್ತದೆ, ಹಾಗು ನೀವು ಅವುಗಳ್ಳನ್ನು ಯಾವ ಸಮಯದಲ್ಲಾದರೂ ಆನ್ ಅಥವ ಆಫ್ ಮಾಡಬಹುದು. ಡೇಟಾವನ್ನು ಗೂಗಲ್‍ನ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ಅನುಸಾರವಾಗಿ ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string>
  <string name="location_services_summary">ಸ್ಥಳ ಸೇವೆಗಳು ಸಿಸ್ಟಂ ಹಾಗು ತೃತೀಯ ಪಕ್ಷೀಯ ಆಪ್‍ಗಳಿಗೆ ನಿಮ್ಮ ಅಂದಾಜು ಸ್ಥಳದಂತಹ ಡೇಟಾವನ್ನು ಸಂಗ್ರಹಿಸಲು ಮತ್ತು ಉಪಯೋಗಿಸಲು ಅನುಮತಿಸುತ್ತದೆ. ಉದಾಹರಣೆಗೆ, ಒಂದು ಆಪ್ ನಿಮ್ಮ ಅಂದಾಜು ಸ್ಥಳವನ್ನು ಹತ್ತಿರದ ಕಾಫಿ ಶಾಪ್‍ಗಳನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಉಪಯೋಗಿಸಬಹುದು.</string>
  <string name="location_access_summary"><b>ನಿಮ್ಮ ಅನುಮತಿಗಳನ್ನು ಕೇಳಿರುವ ಆಪ್‍ಗಳಿಗೆ</b> ನಿಮ್ಮ ಸ್ಥಳದ ಮಾಹಿತಿಯನ್ನು ಉಪಯೋಗಿಸಲು ಅನುಮತಿಸುತ್ತದೆ. ಇದು ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಸ್ಥಳ ಮತ್ತು ಹಿಂದಿನ ಸ್ಥಳಗಳನ್ನೂ ಒಳಗೊಂಡಿರಬಹುದು.</string>
-  <string name="location_gps" product="tablet">ಆಪ್‍ಗಳಿಗೆ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‍ನಲ್ಲಿ ಜಿಪಿಎಸ್ ಉಪಯೋಗಿಸಲು ಅನುಮತಿಸುವ ಮೂಲಕ <b>ಸ್ಥಳ ನಿಖರತೆಯನ್ನು ಉತ್ತಮಗೊಳಿಸಿ</b>.</string>
-  <string name="location_gps" product="default">ಆಪ್‍ಗಳಿಗೆ ನಿಮ್ಮ ಫೋನ್‍ನಲ್ಲಿ ಜಿಪಿಎಸ್ ಉಪಯೋಗಿಸಲು ಅನುಮತಿಸುವ ಮೂಲಕ <b>ಸ್ಥಳ ನಿಖರತೆಯನ್ನು ಉತ್ತಮಗೊಳಿಸಿ</b>.</string>
+  <string name="location_battery_saving"><b>ಪ್ರತಿ ಗಂಟೆಗೆ GPS ಅಪ್‌ಡೇಟ್‌ಗಳ ಸಂಖ್ಯೆಯನ್ನು</b> ಸೀಮಿತಗೊಳಿಸುವ ಮೂಲಕ ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಕಡಿಮೆ ಮಾಡಿ.</string>
  <string name="location_network">ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು ಆಪ್‍ಗಳಿಗೆ ಸಹಕರಿಸಲು <b>ವೈಫೈ ಉಪಯೋಗಿಸಿ</b>.</string>
-  <string name="location_network_telephony">ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು ಆಪ್‍ಗಳಿಗೆ ಸಹಕರಿಸಲು <b>ವೈಫೈ ಹಾಗು ಮೊಬೈಲ್ ನೆಟ್‍ವರ್ಕ್ ಉಪಯೋಗಿಸಿ</b>.</string>
+  <string name="location_network_telephony"><b>ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಆಪ್‌ಗಳು ನಿರ್ಧರಿಸಲು ನೆರವಾಗಲು Wi-Fi </b> ಮತ್ತು ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಉಪಯೋಗಿಸಿ.</string>
  <string name="location_network_gms">ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು ಆಪ್‍ಗಳಿಗೆ ಸಹಕರಿಸಲು <b>ಗೂಗಲ್‍ನ ಸ್ಥಳ ಸೇವೆಯನ್ನು ಉಪಯೋಗಿಸಿ</b>. ಇದರ ಅರ್ಥ ಅಜ್ಞಾತ ಸ್ಥಳ ಡೇಟಾವನ್ನು ಗೂಗಲ್‍ಗೆ ಕಳುಹಿಸುವುದು. ಯಾವುದೇ ಆಪ್‍ಗಳು ಚಾಲನೆಯಲ್ಲಿರದಿರುವಾಗಲೂ ಸಹ.</string>
-  <string name="setup_mobile_data">ಮೊಬೈಲ್ ಡೇಟಾ ಆನ್ ಮಾಡಿ</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="enable_mobile_data_summary">ಸೆಟಪ್ ವೇಳೆ ಮೊಬೈಲ್ ಡೇಟಾ ಉಪಯೋಗಿಸಲು ನೀವು ಬಯಸುತ್ತೀರಾ? ಮೊಬೈಲ್ ಡೇಟಾ ಆನ್ ಮಾಡುವುದು ಡೇಟಾ ಶುಲ್ಕಗಳಿಗೆ ಒಳಪಟ್ಟಿರುತ್ತದೆ.</string>
  <string name="no">ಬೇಡ</string>
  <string name="yes">ಹೌದು</string>
  <string name="data_sim_name">ಸಿಮ್ <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,4 +77,11 @@
  <string name="fingerprint_setup_backup_lock_method">ಒಂದು ದ್ವಿತೀಯಕ ಅನ್‍ಲಾಕ್ ಪ್ರಕಾರವನ್ನು ಸೆಟಪ್ ಮಾಡಿ</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">이 Google 서비스는 사용자가 실행하며, 언제든지 켜고 끌 수 있습니다. 데이터는 Google의 <xliff:g id="name" example="Privacy Policy">%s</xliff:g>에 따라 사용됩니다.</string>
  <string name="location_services_summary">위치 서비스는 시스템과 사용자 앱이 사용자의 대략적인 위치 정보와 같은 데이터를 수집하고 사용할 수 있게 해줍니다. 예를 들어, 어떤 앱은 사용자의 대략적인 위치 정보를 사용하여 근처에 있는 카페를 표시합니다.</string>
  <string name="location_access_summary"><b>사용자에게 권한을 요청한 앱</b>이 위치 정보를 사용할 수 있도록 합니다. 현재 위치 정보와 예전 위치 정보가 포함됩니다.</string>
-  <string name="location_gps" product="tablet"><b>앱이 태블릿의 GPS를 이용하도록 하여</b> 위치 정보의 정확성을 향상시킵니다.</string>
-  <string name="location_gps" product="default"><b>앱이 휴대전화의 GPS를 이용하도록 하여</b> 위치 정보의 정확성을 향상시킵니다.</string>
+  <string name="location_battery_saving">한 시간에 한 번으로 GPS 업데이트를 제한하여 <b>배터리 소모를 줄입니다</b>.</string>
  <string name="location_network">앱이 사용자의 위치를 확인할 수 있도록 <b>Wi-Fi를 사용합니다</b>.</string>
  <string name="location_network_telephony">앱이 사용자의 위치를 확인할 수 있도록 <b>Wi-Fi와 모바일 네트워크를 사용합니다</b>.</string>
  <string name="location_network_gms">앱이 사용자의 위치를 정확하게 확인할 수 있도록 <b>Google 위치 서비스를 사용합니다</b>. 앱을 사용하지 않을때도 익명 위치 정보가 Google에 전송됩니다.</string>
-  <string name="setup_mobile_data">모바일 데이터 켜기</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="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>
@@ -79,4 +78,13 @@
  <string name="fingerprint_setup_backup_lock_method">보조 잠금 해제 방법을 설정해야 합니다</string>
  <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
@@ -41,15 +41,10 @@
  <string name="other_services_summary">Dës Servicer gi vu Google zur Verfügung gestallt a kënnen all Moment aktivéiert oder desaktivéiert ginn. D\'Daten ginn an Iwwerastëmmung mat <xliff:g id="name" example="Privacy Policy">%s</xliff:g> vu Google benotzt.</string>
  <string name="location_services_summary">Standuertservicer erlabe System-Appen an aneren Appen, Informatiounen zum Standuert ze sammelen an ze benotzen. Eng App ka beispillsweis däin ongeféiere Standuert benotzen, fir Caféen an der Géigend ze lokaliséieren.</string>
  <string name="location_access_summary"><b>Appen déi deng Berechtegung gefrot hunn</b> den Zougrëff op d\'Standuertinformatiounen erlaben. Dat ka fir den aktuelle Standuert an och fir fréier Standuerter gëllen.</string>
-  <string name="location_gps" product="tablet"><b>Standuertgenauegkeet verbesseren</b> andeem Appen op de GPS vum Tablet däerfen zougräifen.</string>
-  <string name="location_gps" product="default"><b>Standuertgenauegkeet verbesseren</b> andeem Appen op de GPS vum Telefon däerfen zougräifen.</string>
  <string name="location_network"><b>WLAN benotzen</b>, fir Appen ze hëllefen, de Standuert erauszefannen.</string>
-  <string name="location_network_telephony"><b>WLAN an Datennetzwierker benotzen</b>, fir Appen ze hëllefen, de Standuert erauszefannen.</string>
  <string name="location_network_gms"><b>De Standuertservice vu Google benotzen</b> fir Appen ze hëllefen de Standuert ze bestëmmen. Dat bedeit datt anonym Standuertdaten u Google geschéckt ginn, och wa keng Appe lafen.</string>
-  <string name="setup_mobile_data">Mobil Daten uschalten</string>
  <string name="setup_mobile_data_no_service">Kee Service</string>
  <string name="setup_mobile_data_emergency_only">Just Noutriff</string>
-  <string name="enable_mobile_data_summary">Wëlls du mobil Date während der Installatioun benotzen? Duerch d\'Uschalte vu mobillen Date kënnen Zousazkäschten entstoen.</string>
  <string name="no">Nee</string>
  <string name="yes">Jo</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,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
@@ -41,15 +41,10 @@
  <string name="other_services_summary">Šios paslaugos leidžia „Google“ atlikti darbą už jus, jūs galite jas įjungti arba išjungti bet kuriuo metu. Duomenys bus naudojami pagal „Google“ <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Vietos paslaugos leidžia žemėlapiams ir kitoms programoms rinkti ir naudoti duomenis, tokius kaip apytikslę jūsų buvimo vietą. Pavyzdžiui, žemėlapiai gali naudoti apytikslę jūsų buvimo vietą surandant netoliese esančias kavines.</string>
  <string name="location_access_summary"><b>Leisti programoms, kurios paprašė jūsų leidimo</b> naudoti jūsų vietos informaciją. Tai gali būti jūsų dabartinė buvimo vieta ir ankstesnės vietos.</string>
-  <string name="location_gps" product="tablet"><b>Pagerinti vietos tikslumą</b> leidžiant programoms naudotis GPS jūsų planšetiniame kompiuteryje.</string>
-  <string name="location_gps" product="default"><b>Pagerinti vietos tikslumą</b> leidžiant programoms naudotis GPS jūsų telefone.</string>
  <string name="location_network"><b>Naudoti „Wi-Fi“</b> , kad padėti programoms nustatyti jūsų buvimo vietą.</string>
-  <string name="location_network_telephony"><b>Naudoti „Wi-Fi“ ir mobiliuosius duomenis</b> , kad padėti programoms nustatyti jūsų buvimo vietą.</string>
  <string name="location_network_gms"><b>Naudoti „Google“ vietos paslaugą</b>, kad padėti programoms nustatyti jūsų buvimo vietą. Tai reiškia, anoniminių vietos duomenų siuntimą į „Google“, net tada, kai neveikia jokios programos.</string>
-  <string name="setup_mobile_data">Įjungti mobiliuosius duomenis</string>
  <string name="setup_mobile_data_no_service">Nėra paslaugos</string>
  <string name="setup_mobile_data_emergency_only">Tik pagalbos skambučiai</string>
-  <string name="enable_mobile_data_summary">Ar norite naudoti mobiliuosius duomenis nustatymo metu? įjungiant mobiliuosius duomenis gali būti taikomi duomenų mokesčiai.</string>
  <string name="no">Ne</string>
  <string name="yes">Taip</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,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
@@ -41,15 +41,10 @@
  <string name="other_services_summary">Šie pakalpojumi liek Google darboties Jūsu labā, un Jūs varat tos aktivizēt vai deaktivizēt jebkura laikā. Dati tiks lietoti saskaņā ar Google <xliff:g id="name" example="Privātuma Politiku">%s</xliff:g>.</string>
  <string name="location_services_summary">Atrašanās vietas pakalpojumi atļauj sistēmai un trešo pušu lietotnēm ievākt un izmantot ievākto informāciju, kā, piemēram, Jūsu aptuveno atrašanās vietu, lai atrastu tuvumā esošo kafejnīcu.</string>
  <string name="location_access_summary"><b>Atļaut lietotnēm kas ir lūgušas atļauju</b> izmantot Jūsu atrašanās vietu. Tas var ietvert Jūsu pašreizējo atrašanās vietu vai kādu no iepriekšējām.</string>
-  <string name="location_gps" product="tablet"><b>Uzlabojiet atrašanās vietas noteikšanas precizitāti</b>, ļaujot programmām izmantot GPS Jūsu planšetdatorā.</string>
-  <string name="location_gps" product="default"><b>Uzlabojiet atrašanās vietas noteikšanas precizitāti</b>, ļaujot programmām izmantot GPS Jūsu telefonā.</string>
  <string name="location_network"><b>Izmantot Wi-Fi</b>, lai palīdzētu lietotnēm noteikt Jūsu atrašanās vietu.</string>
-  <string name="location_network_telephony"><b>Izmantot Wi-Fi un pakešdatus</b>, lai palīdzētu lietotnēm noteikt Jūsu atrašanās vietu.</string>
  <string name="location_network_gms"><b>Izmantot Google atrašanās vietas pakalpojumus</b>, lai palīdzētu lietotnēm noteikt Jūsu atrašanās vietu. Tas iekļauj anonīmu datu sūtīšanu uz Google serveriem, pat ja lietotnes nedarbojas.</string>
-  <string name="setup_mobile_data">Ieslēgt pakešdatus</string>
  <string name="setup_mobile_data_no_service">Nav signāla</string>
  <string name="setup_mobile_data_emergency_only">Tikai ārkārtas zvani</string>
-  <string name="enable_mobile_data_summary">Vai vēlaties ieslēgt pakešdatus uzstādīšanas laikā? Ieslēdzot pakešdatus var tik piemērota maksa.</string>
  <string name="no">Nē</string>
  <string name="yes">Jā</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">ഈ സേവനങ്ങൾ നിങ്ങൾക്ക് വേണ്ടി പ്രവർത്തിക്കാന്‍ Google നെ ചുമതലപ്പെടുത്തുന്നു, നിങ്ങൾക്കിത് എപ്പോൾ വേണമെങ്കിലും ഓണ്‍ അല്ലെങ്കില്‍ ഓഫ് ചെയ്യാന്‍ കഴിയുന്നതാണ്. Google ന്റെ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> പ്രകാരം ഡാറ്റ ഉപയോഗിക്കുന്നതാണ്.</string>
  <string name="location_services_summary">നിങ്ങളുടെ ഏകദേശ സ്ഥാനം പോലുള്ള ഡാറ്റ ശേഖരിക്കുന്നതിനും ഉപയോഗിക്കുന്നതിനും സിസ്റ്റം, മൂന്നാം കക്ഷി ആപ്ലിക്കേഷനുകളെ സ്ഥാനം സേവനങ്ങൾ അനുവദിക്കുന്നു. ഉദാഹരണത്തിന്, സമീപത്തുള്ള കോഫി ഷോപ്പുകൾ കണ്ടെത്താൻ നിങ്ങളുടെ ഏകദേശ സ്ഥാനം ഒരു ആപ്ലിക്കേഷൻ ഉപയോഗിച്ചേക്കാം.</string>
  <string name="location_access_summary"><b>നിങ്ങളുടെ സ്ഥാനം വിവരങ്ങൾ ഉപയോഗിക്കാൻ നിങ്ങളുടെ അനുമതി ആവശ്യപ്പെടുന്ന</b> ആപ്ലിക്കേഷനുകളെ അനുവദിക്കുക. ഇതില്‍ നിങ്ങളുടെ നിലവിലെ സ്ഥാനവും മുമ്പത്തെ ലൊക്കേഷനുകളും ഉൾപ്പെട്ടേക്കാം.</string>
-  <string name="location_gps" product="tablet">നിങ്ങളുടെ ടാബ്ലെറ്റില്‍ GPS ഉപയോഗിക്കാൻ ആപ്ലിക്കേഷനുകളെ അനുവദിക്കുന്നതിലൂടെ <b>സ്ഥാനത്തിന്റെ കൃത്യത മെച്ചപ്പെടുത്തുക.</b></string>
-  <string name="location_gps" product="default">നിങ്ങളുടെ ഫോണില്‍ GPS ഉപയോഗിക്കാൻ ആപ്ലിക്കേഷനുകളെ അനുവദിക്കുന്നതിലൂടെ <b>സ്ഥാനത്തിന്റെ കൃത്യത മെച്ചപ്പെടുത്തുക.</b></string>
+  <string name="location_battery_saving"><b>മണിക്കൂറിന് ജി. പി. എസ് അപ്ഡേറ്റുകൾ എണ്ണം കുറയ്ക്കുക</b> ബാറ്ററി ഉപഭോഗം നിയന്ത്രിയ്ക്കുന്നു.</string>
  <string name="location_network">നിങ്ങളുടെ സ്ഥാനം നിർണ്ണയിക്കാൻ ആപ്ലിക്കേഷനുകളെ സഹായിക്കുന്നതിന് <b>Wi-Fi ഉപയോഗിക്കുക</b>.</string>
-  <string name="location_network_telephony">നിങ്ങളുടെ സ്ഥാനം നിർണ്ണയിക്കാൻ ആപ്ലിക്കേഷനുകളെ സഹായിക്കുന്നതിന് <b>Wi-Fi യും മൊബൈൽ നെറ്റ്‌വർക്കുകളും</b> ഉപയോഗിക്കുക.</string>
+  <string name="location_network_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">സെല്ലുലാർ ഡാറ്റ ഓണാക്കുക</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="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>
@@ -78,4 +77,11 @@
  <string name="fingerprint_setup_backup_lock_method">ഒരു ദ്വിതീയ അൺലോക്ക് മാര്‍ഗ്ഗം സജ്ജമാക്കുക</string>
  <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
@@ -41,8 +41,7 @@
  <string name="other_services_summary">ह्या सेवा तुमच्यासाठी Google ला कामाला लावतात आणि तुम्ही त्यांना कधीही चालू किंवा बंद करू शकता. डेटा Googleच्या <xliff:g id="name" example="Privacy Policy">%s</xliff:g> अनुसार वापरला जाईल.</string>
  <string name="location_services_summary">स्थान सेवा सिस्टिम आणि त्रयस्थ पक्षाच्या अनुप्रयोगांना अंदाजे स्थानासारखा डेटा गोळा करण्यास आणि वापरण्यास परवानगी देतात. उदाहरणार्थ, एखादा अनुप्रयोग आसपासची कॉफीची दुकाने शोधण्यासाठी तुमचे अंदाजे स्थान वापरू शकते.</string>
  <string name="location_access_summary"><b>तुमची परवानगी विचारलेल्या अनुप्रयोगांना</b> तुमची स्थान माहिती वापरण्यास परवानगी द्या. यामध्ये तुमचे चालू स्थान आणि मागील स्थानांचा समावेश होऊ शकतो.</string>
-  <string name="location_gps" product="tablet">तुमच्या टॅब्लेटवरील GPS वापरण्यास अनुप्रयोगाला परवानगी देऊन <b>स्थान अचूकता सुधारित करा</b>.</string>
-  <string name="location_gps" product="default">तुमच्या फोनवरील GPS वापरण्यास अनुप्रयोगाला परवानगी देऊन <b>स्थान अचूकता सुधारित करा</b>.</string>
+  <string name="location_battery_saving">दर तासाला होणाऱ्या GPS अद्यतनांची संख्या निर्बंधित करून <b>बॅटरी वापर कमी करा</b>.</string>
  <string name="location_network">तुमचे स्थान ठरवण्यासाठी अनुप्रयोगांना मदत करण्यासाठी <b>Wi-Fi वापरा</b>.</string>
  <string name="location_network_telephony">तुमचे स्थान ठरवण्यासाठी अनुप्रयोगांना मदत करण्यासाठी <b>Wi-Fi आणि मोबाईल नेटवर्क्स वापरा</b>.</string>
  <string name="location_network_gms">तुमचे स्थान ठरवण्यासाठी अनुप्रयोगांना मदत करण्यासाठी <b>Googleची स्थान सेवा वापरा</b>. याचा अर्थ Googleला अनामिक डेटा पाठवणे, अनुप्रयोग चालू नसताना सुध्दा.</string>
@@ -78,4 +77,11 @@
  <string name="fingerprint_setup_backup_lock_method">दुय्यम अनलॉक पध्दत सेटअप करा</string>
  <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
@@ -41,10 +41,9 @@
  <string name="other_services_summary">Disse tjenestene lar Google jobbe for deg, og du kan slå dem på eller av når som helst. Data brukes i henhold til Googles <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Lokasjonstjenester lar system og 3.parts apper å samle inn og bruke data som din omtrentlige posisjon. For eksempel, en app kan bruke din omtrentlige posisjon til å finne nærliggende kafeer.</string>
  <string name="location_access_summary"><b>Tillat programmer som har bedt om din tillatelse</b> å bruke stedsinformasjonen. Dette kan være din nåværende posisjon og siste steder.</string>
-  <string name="location_gps" product="tablet"><b>Forbedre plasseringsnøyaktighet</b> ved å tillate programmer å bruke GPS på enheten.</string>
-  <string name="location_gps" product="default"><b>Forbedre plasseringsnøyaktighet</b> ved å tillate programmer å bruke GPS på telefonen.</string>
+  <string name="location_battery_saving"><b>Redusere batteriforbruket</b> ved å begrense antall GPS oppdateringer per time.</string>
  <string name="location_network"><b>Bruk Wi-Fi</b> for å hjelpe apper å finne din posisjon.</string>
-  <string name="location_network_telephony"><b>Bruk Wi-Fi og mobile nettverk</b> for å hjelpe apper å finne din posisjon.</string>
+  <string name="location_network_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>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Konfigurere en sekundær opplåsingsmetode</string>
  <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
@@ -41,10 +41,9 @@
  <string name="other_services_summary">Deze diensten laten Google het werk doen en kunnen op elk moment in- of uitgeschakeld worden. De gegevens worden gebruikt conform de <xliff:g id="name" example="Privacy Policy">%s</xliff:g> van Google.</string>
  <string name="location_services_summary">Locatieservices stellen systeemapps en apps van derde partijen in staat gegevens zoals uw geschatte locatie te verzamelen en te gebruiken. Zo kan een app uw locatie gebruiken om winkels in de buurt te vinden.</string>
  <string name="location_access_summary"><b>Apps toestaan die uw toestemming hebben gevraagd</b> om informatie over uw locatie te gebruiken. Dit kan uw huidige locatie en voorgaande locaties omvatten.</string>
-  <string name="location_gps" product="tablet"><b>Verbeter de nauwkeurigheid van uw locatie</b> door apps toe te staan GPS op uw tablet te gebruiken.</string>
-  <string name="location_gps" product="default"><b>Verbeter de nauwkeurigheid van uw locatie</b> door apps toe te staan GPS op uw telefoon te gebruiken.</string>
+  <string name="location_battery_saving"><b>Verlaag het accugebruik</b> door het aantal GPS-updates per uur te beperken.</string>
  <string name="location_network"><b>Wifi gebruiken</b> om apps te helpen uw locatie te bepalen.</string>
-  <string name="location_network_telephony"><b>Wifi en mobiele netwerken gebruiken</b> om apps te helpen uw locatie te bepalen.</string>
+  <string name="location_network_telephony"><b>Wifi- en mobiele netwerken gebruiken</b> om apps te helpen uw locatie te bepalen.</string>
  <string name="location_network_gms"><b>Locatieservices van Google gebruiken</b> om apps te helpen uw locatie te bepalen. Dit betekent anonieme locatiegegevens verzenden naar Google, zelfs wanneer er geen apps worden uitgevoerd.</string>
  <string name="setup_mobile_data">Mobiele gegevens inschakelen</string>
  <string name="setup_mobile_data_no_service">Geen verbinding</string>
@@ -78,4 +77,12 @@
  <string name="fingerprint_setup_backup_lock_method">Een tweede ontgrendelmethode in te stellen</string>
  <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
@@ -41,8 +41,7 @@
  <string name="other_services_summary">ଏହି ସେବାଗୁଡିକ Googleକୁ ଆପଣଙ୍କ ପାଇଁ ସଂଚାଳନ କ୍ରାଇବ, ଓ ଆପଣ ଯେ କୌଣସି ସମୟରେ ସେଗୁଡିକୁ ଅନ୍‍ ବା ଅଫ୍‍ କରିପାରିବେ। Google\ର <xliff:g id="name" example="Privacy Policy">%s</xliff:g>ସହିତ ସମାନ ଭାବେ ଡାଟା ବ୍ୟବହୃତ ହେବ।</string>
  <string name="location_services_summary">ଅବ‍ସ୍ଥାନ ସେବା ସିଷ୍ଟମ୍‍କୁ ଓ ତୃତୀୟ ପ‍କ୍ଷ ଆପ୍ଲିକେସନ୍‍କୁ ଡାଟା ସଂଗ୍ରହ ଓ ବ୍ୟବହାର କରିବା ପାଇଁ ଅନୁମତି ଦେବ ଯଥା ଆପଣଙ୍କ ଆନୁମାନିକ ଅବ‍ସ୍ଥାନ। ଉଦାହରଣ ସ୍ୱରୂପ, ଆପ୍ଲିକେସନ୍‍ ଆପଣଙ୍କ ଆନୁମାନିକ ଅବ‍ସ୍ଥାନ ପାଖାପାଖି ଥିବା କଫି ସପ୍‍ ବିଷୟରେ ଜାଣିବା ପାଇଁ ବ୍ୟବହାର କରିପାରେ।</string>
  <string name="location_access_summary">ଆପଣଙ୍କ ଅବ‍ସ୍ଥାନ ସୂଚନା ବ୍ୟବହାର କରିବା ପାଇଁ<b>ଯେଉଁ ଆପ୍ଲିକେସନ୍‍ ଆପଣଙ୍କ ଠାରୁ ଅନୁମତି ମା୍ଗିଛନ୍ତି। ତାଙ୍କୁ ଅନୁମତି ଦିଅନ୍ତୁ।</b> ଏହା ଆପଣଙ୍କ ସମ୍ପ୍ରତୋ ଅବ‍ସ୍ଥାନ ଓ ପୂର୍ବ ଅବ‍ସ୍ଥାନ ଅନ୍ତଭୁକ୍ତ କ୍ରିପାରେ।</string>
-  <string name="location_gps" product="tablet">ଆପଣଙ୍କ ଟା୍ବ୍‍ଲେଟ୍‍ରେ GPS ବ୍ୟବହାରକୁ ଅନୁମତି ଦେଇ<b>ଅବ‍ସ୍ଥାନ ସଠିକତା ଉନ୍ନତ କରନ୍ତୁ</b> ।</string>
-  <string name="location_gps" product="default">ଆପଣଙ୍କ ଫୋ‍ନ୍ରେ GPS ବ୍ୟବହାରକୁ ଅନୁମତି ଦେଇ <b>ଅବ‍ସ୍ଥାନ ସଠିକତା ଉନ୍ନତ କରନ୍ତୁ</b> ।</string>
+  <string name="location_battery_saving">ପ୍ରତି ଘଣ୍ଟାରେ ହେଉଥିବା GPS ଅଦ୍ୟତନ ସଂଖ୍ୟା ଉପରେ କଟକଣା କରି<b>ବ୍ୟାଟେରୀ ବ୍ୟବହାର ହ୍ରାସ କରନ୍ତୁ</b> ।</string>
  <string name="location_network">ଆପଣଙ୍କ ଅବ‍ସ୍ଥାନ ନି‍ର୍ଧାରଣରେ ସାହାଯ୍ୟ କରିବା ପାଇଁ<b>Wi-Fi ବ୍ୟବହାର କରନ୍ତୁ</b> ।</string>
  <string name="location_network_telephony">ଆପଣଙ୍କ ଅବ‍ସ୍ଥାନ ନି‍ର୍ଧାରଣରେ ସାହାଯ୍ୟ କରିବା ପାଇଁ<b>Wi-Fi ଓ ମୋବାଇଲ୍‍ ନେଟ୍‍ୱାର୍କ୍‍ ବ୍ୟବହାର କରନ୍ତୁ </b> ।</string>
  <string name="location_network_gms">ଆପଣଙ୍କ ଅବ‍ସ୍ଥାନ ନି‍ର୍ଧାରଣରେ ସାହାଯ୍ୟ କରିବା ପାଇଁ<b>Google\ର ଅବ‍ସ୍ଥାନ ସେବା ବ୍ୟବହାର କରନ୍ତୁ</b> । ଏହା ଅର୍ଥ Googleକୁ ବେନାମୀ ଅବସ୍ଥାନ ଡାଟା ପଠାଉଛି, ଏପରିକି ଯେବେ କୌଣସି ଆପ୍ଲିକେସନଗୁଡିକ ଦୌଡୁ ନାହାନ୍ତି।</string>
@@ -78,4 +77,8 @@
  <string name="fingerprint_setup_backup_lock_method">ଏକ ସେକେଣ୍ଡାରି ଅନ୍‍ଲକ୍‍ ପଧତି ସେଟ୍‍ଅପ୍‍ କରନ୍ତୁ</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Usługi te umożliwiają działanie aplikacjom Google, możesz jest włączyć lub wyłączyć kiedy chcesz. Dane będą wykorzystywane zgodnie z Google <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Usługi lokalizacji umożliwiają systemowi i innym aplikacjom na zbieranie danych o użytkowniku w celu szybszego ustalenia przybliżonej lokalizacji. Np. jakaś aplikacja może użyć twojej przybliżonej lokalizacji w celu zlokalizowania kawiarni, które znajdują się w pobliżu.</string>
  <string name="location_access_summary"><b>Zezwalaj aplikacjom, które zapytały cię o zezwolenie</b> do używania informacji o twojej lokalizacji. Może to obejmować twoje poprzednie, ale i bieżącą lokalizację.</string>
-  <string name="location_gps" product="tablet"><b>Usprawnij dokładność lokalizacji</b> poprzez zezwolenie aplikacjom na używanie GPS tabletu.</string>
-  <string name="location_gps" product="default"><b>Usprawnij dokładność lokalizacji</b> poprzez zezwolenie aplikacjom na używanie GPS twojego telefonu.</string>
+  <string name="location_battery_saving"><b>Zmniejsz zużycie baterii</b> poprzez ograniczenie liczby aktualizacji GPS na godzinę.</string>
  <string name="location_network"><b>Użyj WiFi</b>, aby pomóc aplikacjom w określeniu twojej lokalizacji.</string>
  <string name="location_network_telephony"><b>Użyj WiFi i sieci komórkowych</b>, aby pomóc aplikacjom w określeniu twojej lokalizacji.</string>
  <string name="location_network_gms"><b>Użyj usług lokalizacji Google</b>, aby pomóc aplikacjom w określeniu twojej lokalizacji. Oznacza to wysyłanie anonimowych danych o twojej lokalizacji do Google, nawet jeśli żadna aplikacja nie jest uruchomiona.</string>
-  <string name="setup_mobile_data">Włącz dane mobilne</string>
+  <string name="setup_mobile_data">Włącz transmisję danych</string>
  <string name="setup_mobile_data_no_service">Brak usługi</string>
  <string name="setup_mobile_data_emergency_only">Tylko połączenia alarmowe</string>
-  <string name="enable_mobile_data_summary">Czy chcesz użyć mobilnej transmisji danych podczas instalacji? Włącznie transmisji danych może wiązać się z dodatkowymi opłatami.</string>
+  <string name="enable_mobile_data_summary">Czy chcesz użyć mobilnej transmisji danych podczas instalacji? Włączenie transmisji danych może wiązać się z dodatkowymi opłatami.</string>
  <string name="no">Nie</string>
  <string name="yes">Tak</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Skonfigurować drugą metodę odblokowania</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Esses serviços colocam o Google para trabalhar para você e podem ser desligados a qualquer momento. Os dados serão usados de acordo com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> do Google.</string>
  <string name="location_services_summary">Serviços de localização permitem ao sistema e a aplicativos de terceiros obter e usar dados como a sua localização aproximada. Por exemplo, um aplicativo pode usar sua localização aproximada para encontrar cafés perto de você.</string>
  <string name="location_access_summary"><b>Permitir que aplicativos que pediram a sua permissão</b> usem suas informações de localização. Isso pode incluir a sua localização atual bem como localizações anteriores.</string>
-  <string name="location_gps" product="tablet"><b>Melhore a precisão de localização</b> permitindo que os aplicativos usem o GPS do seu tablet.</string>
-  <string name="location_gps" product="default"><b>Melhore a precisão de localização</b> permitindo que os aplicativos usem o GPS do seu telefone.</string>
+  <string name="location_battery_saving"><b>Reduzir o consumo da bateria</b>, restringindo o número de atualizações GPS por hora.</string>
  <string name="location_network"><b>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">Ligar dados móveis</string>
+  <string name="setup_mobile_data">Ativar dados celular</string>
  <string name="setup_mobile_data_no_service">Sem serviço</string>
  <string name="setup_mobile_data_emergency_only">Apenas chamadas de emergência</string>
-  <string name="enable_mobile_data_summary">Quer usar os dados móveis durante a configuração? Ativar os dados móveis pode gerar cobranças de dados.</string>
+  <string name="enable_mobile_data_summary">Você quer usar dados móveis durante a instalação? Ao ligar os dados móveis, você estará sujeito a gastos de seu plano de dados contratado.</string>
  <string name="no">Não</string>
  <string name="yes">Sim</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Configurar um método de desbloqueio secundário</string>
  <string name="fingerprint_setup_add_fingerprint">Adicionar sua impressão digital</string>
  <string name="fingerprint_setup_screen_lock_setup">Configuração de bloqueio de tela</string>
+  <string name="sim_locale_changed">Cartão SIM %1$s detectado</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_title">Selecione o tipo de bloqueio de tela</string>
+  <string name="settings_lockscreen_setup_details">Como você gostaria de bloquear a tela?</string>
+  <string name="lockscreen_setup_title">Proteger seu smartphone</string>
+  <string name="lockscreen_setup_summary"><b>Proteger este dispositivo</b> e pedir PIN, padrão ou senha para desbloquear a tela</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurar PIN, padrão ou senha</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">Bem-vindo à Era Pós-Aplicativos</string>
+  <string name="mod_description">Mods são experiências inteligentes, conscientes e leves incluídas diretamente no sistema operacional. Quando uma MOD acha que pode ajudar, ela se oferece para ativar para você.</string>
 </resources>
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Estes serviços colocam o Google a trabalhar para si, e pode ligá-los ou desligá-los a qualquer momento. Os dados serão utilizados em conformidade com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> do Google.</string>
  <string name="location_services_summary">Os serviços de localização permitem às aplicações de sistema e de terceiros reunir e utilizar dados tais como a sua localização aproximada. Por exemplo, uma aplicação pode usar a sua localização aproximada para localizar cafés ou bares nas proximidades.</string>
  <string name="location_access_summary"><b>Permitir que as aplicações que pediram a sua permissão</b> usem as suas informações de localização. Isso pode incluir a sua localização atual bem como localizações anteriores.</string>
-  <string name="location_gps" product="tablet"><b>Melhorar a precisão da localização</b>, permitindo que as aplicações usem o GPS do seu tablet.</string>
-  <string name="location_gps" product="default"><b>Melhorar a precisão de localização</b>, permitindo que as aplicações usem o GPS do seu telefone.</string>
+  <string name="location_battery_saving"><b>Reduzir o consumo da bateria</b>, restringindo o número de atualizações GPS por hora.</string>
  <string name="location_network"><b>Usar o Wi-Fi</b> para ajudar as aplicações a determinar a sua localização.</string>
  <string name="location_network_telephony"><b>Usar o Wi-Fi e redes móveis</b> para ajudar as aplicações a determinar a sua localização.</string>
  <string name="location_network_gms"><b>Usar o serviço de localização do Google</b> para ajudar as aplicações a determinar a sua localização. Isto implica o envio de dados anónimos de localização para o Google, mesmo quando nenhuma aplicação estiver a funcionar.</string>
  <string name="setup_mobile_data">Ligar os dados móveis</string>
  <string name="setup_mobile_data_no_service">Sem serviço</string>
  <string name="setup_mobile_data_emergency_only">Apenas chamadas de emergência</string>
-  <string name="enable_mobile_data_summary">Quer usar os dados móveis durante a instalação? Ligar os dados móveis pode estar sujeito a gastos adicionais.</string>
+  <string name="enable_mobile_data_summary">Pretende usar os dados móveis durante a configuração? Usar os dados móveis pode estar sujeito a taxas de dados.</string>
  <string name="no">Não</string>
  <string name="yes">Sim</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Definir um método de desbloqueio secundário</string>
  <string name="fingerprint_setup_add_fingerprint">Adicionar a sua impressão digital</string>
  <string name="fingerprint_setup_screen_lock_setup">Configuração do ecrã de bloqueio</string>
+  <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
@@ -41,12 +41,11 @@
  <string name="other_services_summary">Aceste servicii pun Google să lucreze pentru tine, și puteți să le activați sau dezactivați în orice moment. Datele vor fi folosite în conformitate cu Google <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Serviciul de localizare permite Hărți și altor aplicații să adune și să folosească date precum locația aproximativă. De exemplu, Hărți poate utiliza locația aproximativă pentru a localiza cafenele în vecinătate.</string>
  <string name="location_access_summary"><b>Permite aplicațiilor care au cerut permisiunea</b> să utilizeze informațiile despre locația dvs. Aceasta poate include locația curentă și locațiile precedente.</string>
-  <string name="location_gps" product="tablet"><b>Îmbunătățeste precizia locației</b> permițând aplicațiilor să folosească GPS-ul pe tabletă.</string>
-  <string name="location_gps" product="default"><b>Îmbunătățeste precizia locației</b> permițând aplicațiilor să folosească GPS-ul pe telefon.</string>
+  <string name="location_battery_saving"><b>Reduce consumul bateriei</b> prin limitarea numărului de actualizări ale GPS-ului pe oră.</string>
  <string name="location_network"><b>Folosește Wi-Fi</b> pentru a ajuta aplicațiile să vă determine locația.</string>
  <string name="location_network_telephony"><b>Utilizează Wi-Fi și rețelele de telefonie mobilă</b> pentru a ajuta aplicațiile să vă determine locația.</string>
  <string name="location_network_gms"><b>Folosește serviciile de locație Google</b> pentru a ajuta aplicațiile să vă determine locația. Acest lucru înseamnă trimiterea datelor anonime de localizare la Google, chiar și atunci când nu executați aplicații.</string>
-  <string name="setup_mobile_data">Porniți datele mobile</string>
+  <string name="setup_mobile_data">Activare date mobile</string>
  <string name="setup_mobile_data_no_service">Lipsă semnal</string>
  <string name="setup_mobile_data_emergency_only">Numai apeluri de urgenţă</string>
  <string name="enable_mobile_data_summary">Doriți să utilizați datele mobile în timpul instalării? Activarea datelor mobile poate fi supusă tarifelor de date.</string>
@@ -73,4 +72,11 @@
  <string name="fingerprint_setup_title">Configurare amprentă</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Эти службы позволяют Google расширить возможности устройства. Вы можете выключить их в любое время. Данные будут использоваться в соответствии с правилами Google: <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Службы местоположения позволяют системе и установленным приложениям собирать и использовать такие данные, как ваше приблизительное местоположение. На основе этих данных приложение может искать, например, ближайшие к вам кофейни.</string>
  <string name="location_access_summary"><b>Позволить приложениям, запросившим ваше разрешение</b>, использовать информацию о вашем местоположении. Это может включать ваше текущее и прошлые местоположения.</string>
-  <string name="location_gps" product="tablet"><b>Улучшить точность местоположения</b>, позволяя приложениям использовать GPS на вашем планшете.</string>
-  <string name="location_gps" product="default"><b>Улучшить точность местоположения</b>, позволяя приложениям использовать GPS на вашем телефоне.</string>
+  <string name="location_battery_saving"><b>Снизить энергопотребление</b>, ограничивая количество обновлений GPS в час.</string>
  <string name="location_network"><b>Использовать Wi-Fi</b> для определения местоположения.</string>
  <string name="location_network_telephony"><b>Использовать Wi-Fi и мобильные сети</b> для определения местоположения.</string>
  <string name="location_network_gms"><b>Использовать службы местоположения Google</b>, чтобы помочь приложениям определять ваше местоположение. Это означает, что они будут отправлять анонимные данные о местоположении в Google даже тогда, когда никакие приложения не запущены.</string>
-  <string name="setup_mobile_data">Включить моб. данные</string>
+  <string name="setup_mobile_data">Включить передачу данных</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="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>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Настроить дополнительный способ разблокировки</string>
  <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
@@ -41,15 +41,10 @@
  <string name="other_services_summary">Tieto služby vám ponúka Google a môžete ich kedykoľvek zapnúť alebo vypnúť. Údaje sa použijú v súlade s Google <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Služby polohy umožňujú systému a ďalším aplikáciám tretích strán zhromažďovanie a používanie údajov súvisiacich s vašou približnou polohou. Napríklad aplikácia Mapy môže použiť vašu približnú polohu na nájdene kaviarní vo vašej blízkosti.</string>
  <string name="location_access_summary"><b>Povoliť aplikáciám, ktoré požiadali o vaše povolenie</b>, používať informácie o vašej polohe. To môže zahŕňať vašu aktuálnu polohu a minulé polohy.</string>
-  <string name="location_gps" product="tablet"><b>Zlepšiť presnosť polohy</b> povolením aplikáciám používať GPS v tablete.</string>
-  <string name="location_gps" product="default"><b>Zlepšite presnosť polohy</b> povolením aplikáciám používať GPS v zariadení.</string>
  <string name="location_network"><b>Použitie Wi-Fi</b> pomôže aplikáciám určiť vašu polohu.</string>
-  <string name="location_network_telephony"><b>Použite Wi-Fi a mobilné siete</b> pomôže aplikáciám určiť vašu polohu.</string>
  <string name="location_network_gms"><b>Používanie služieb polohy od spoločnosti Google</b> pomôže aplikáciám určiť vašu polohu. To znamená anonymné zasielanie údajov o polohe do spoločnosti Google, aj keď nie sú spustené žiadne aplikácie.</string>
-  <string name="setup_mobile_data">Povoliť mobilné dáta</string>
  <string name="setup_mobile_data_no_service">Žiadna sieť</string>
  <string name="setup_mobile_data_emergency_only">Len tiesňové hovory</string>
-  <string name="enable_mobile_data_summary">Zapnutie mobilných dát počas procesu inštalácie môže byť príčinou poplatkov za dátové prenosy.</string>
  <string name="no">Nie</string>
  <string name="yes">Áno</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,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
@@ -41,12 +41,11 @@
  <string name="other_services_summary">Te storitve obremenijo Google in lahko jih vklopite ali izklopite kadarkoli. Podatki se bodo uporabljali v skladu s Googlovim <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Lokacijske storitve omogočajo sistemu in aplikacijam tretjih oseb, da zbirajo in uporabijo podatke, kot je vaša približna lokacija. Aplikacija lahko na primer uporabi približno lokacijo za iskanje bližnjih kavarn.</string>
  <string name="location_access_summary"><b>Dovolite aplikacijam, ki so zahtevale vaše dovoljenje</b>, da uporabijo podatke o vaši lokaciji. To lahko vključuje vašo trenutno lokacijo in prejšnje.</string>
-  <string name="location_gps" product="tablet"><b>Izboljšajte natančnost lokacije</b> z omogočanjem GPS-a na svoji tablici.</string>
-  <string name="location_gps" product="default"><b>Izboljšajte natančnost lokacije</b> z omogočanjem GPS-a na svojem telefonu.</string>
+  <string name="location_battery_saving"><b>Zmanjšajte porabo energije</b> z omejevanjem števila posodobitev GPS-a na uro.</string>
  <string name="location_network"><b>Uporabite Wi-Fi</b>, da pomagate aplikacijam določiti vašo lokacijo.</string>
  <string name="location_network_telephony"><b>Uporabite Wi-Fi in mobilna omrežja</b>, da pomagate aplikacijam določiti vašo lokacijo.</string>
  <string name="location_network_gms"><b>Uporabite Googlove lokacijske storitve</b>, da pomagate aplikacijam določiti vašo lokacijo. To pomeni pošiljanje anonimnih podatkov o lokaciji Googlu tudi, ko se ne izvaja nobena aplikacija.</string>
-  <string name="setup_mobile_data">Vključite mobilne podatke</string>
+  <string name="setup_mobile_data">Vklop mobilnih podatkov</string>
  <string name="setup_mobile_data_no_service">Ni storitve</string>
  <string name="setup_mobile_data_emergency_only">Samo klici v sili</string>
  <string name="enable_mobile_data_summary">Ali želite med namestitvijo uporabiti mobilne podatke? Vklop mobilnih podatkov lahko povzroči dodatne stroške.</string>
@@ -78,4 +77,14 @@
  <string name="fingerprint_setup_backup_lock_method">Nastaviti dodatno metodo odklepanja</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Ове услуге дају Google-у да ради за вас, а можете их укључити или искључити у било ком тренутку. Подаци ће се користити у складу са Google-овим <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Сервис локације дозвољава системским и другим апликацијама да сакупљају и користе податке као што је приближна локација. Нпр. апликације могу користити приближну локацију да лоцирају кафиће у близини.</string>
  <string name="location_access_summary"><b>Дозволи апликацијама које траже твоју дозволу</b>да користе информације о твојој локацији. Ово може укључити твоју садашњу и прошле локације.</string>
-  <string name="location_gps" product="tablet"><b>Побољшај тачност локације</b> дозволивши апликацијама да користе GPS на твом таблету.</string>
-  <string name="location_gps" product="default"><b>Побољшај тачност локације</b> дозволивши апликацијама да користе GPS на твојем уређају.</string>
+  <string name="location_battery_saving"><b>Смањивање потрошње батерије</b> ограничењем броја ажурирања GPS-а по сату.</string>
  <string name="location_network"><b>Користи Wi-Fi</b> да помогнеш апликацијама да одреде твоју локацију.</string>
  <string name="location_network_telephony"><b>Користи Wi-Fi и мобилне мреже</b>да помогнеш апликацијама да одреде твоју локацију.</string>
  <string name="location_network_gms"><b>Користи Google сервис локације</b> да помогнеш апликацијама да одреде твоју локацију. Ово значи слање анонимних подака у Google, чак и кад нема покренутих апликација.</string>
-  <string name="setup_mobile_data">Укључи пренос података</string>
+  <string name="setup_mobile_data">Укључи мобилне податке</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="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>
@@ -78,4 +77,13 @@
  <string name="fingerprint_setup_backup_lock_method">Подешавање резервног метода откључавања</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Dessa tjänster låter Google arbeta för dig, och du kan sätta på eller stänga av tjänsterna när som helst. Data kommer användas i överensstämmelse med Googles <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="location_services_summary">Platstjänster låter systemet och tredjepartsappar samla in och använda data såsom din ungefärliga plats. Till exempel så kan en app använda din ungefärliga plats för att hitta närbelägna kaféer.</string>
  <string name="location_access_summary"><b>Tillåt appar som du gett tillåtelse</b> att använda din platsinformation. Detta inkluderar din nuvarande plats och tidigare platser.</string>
-  <string name="location_gps" product="tablet"><b>Förbättra platsnogrannhet</b> genom att tillåta appar att använda GPS:en på din surfplatta.</string>
-  <string name="location_gps" product="default"><b>Förbättra platsnogrannhet</b> genom att tillåta appar att använda GPS:en på din telefon.</string>
+  <string name="location_battery_saving"><b>Minska batteriförbrukningen</b> genom att begränsa antalet GPS-uppdateringar per timme.</string>
  <string name="location_network"><b>Använd Wi\u2011Fi</b> för att hjälpa appar fastställa din position.</string>
  <string name="location_network_telephony"><b>Använd Wi\u2011Fi och mobila nät</b> för att hjälpa appar fastställa din position.</string>
  <string name="location_network_gms"><b>Använd Googles platstjänster</b> för att hjälpa appar fastställa din position. Detta innebär att skicka anonyma platsdata till Google, även om inga appar körs.</string>
-  <string name="setup_mobile_data">Aktivera mobildata</string>
+  <string name="setup_mobile_data">Slå på mobildata</string>
  <string name="setup_mobile_data_no_service">Ingen service</string>
  <string name="setup_mobile_data_emergency_only">Endast nödsamtal</string>
-  <string name="enable_mobile_data_summary">Vill du använda mobildata under installationen? Aktivering av mobildata kan medföra datakostnader.</string>
+  <string name="enable_mobile_data_summary">Vill du använda mobildata under installationen? Användning av mobildata kan ge upphov till dataavgifter.</string>
  <string name="no">Nej</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>
@@ -78,4 +77,11 @@
  <string name="fingerprint_setup_backup_lock_method">Konfigurera en sekundär upplåsningsmetod</string>
  <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
@@ -41,8 +41,7 @@
  <string name="other_services_summary">இந்த சேவைகள் Googleஐ உங்களுக்காக வேலை செய்ய வைக்கும், மற்றும் அவற்றை எந்நேரத்திலும் நீங்கள் ஆன் அல்லது ஆஃப் செய்யலாம். தரவுகள் Googleஇன் <xliff:g id="name" example="Privacy Policy">%s</xliff:g>க்கு இணங்கி பயன்படுத்தப்படும்,</string>
  <string name="location_services_summary">இருப்பிட சேவைகள் கணினி மற்றும் மூன்றாம் தரப்பு பயன்பாடுகள் உங்கள் சராசரி இருப்பிடம் போன்ற தரவுகளை சேகரிக்கவும் பயன்படுத்தவும் அனுமதிக்கும். உதாரணமாக, ஒரு பயன்ப்பாடானது உங்கள் சராசரி இருப்பிடத்தை பயன்படுத்தி அருகிலுள்ள காபி கடைகளைக் கண்டுபிடிக்கலாம்.</string>
  <string name="location_access_summary">உங்கள் இருப்பிட தகவல்களை பயன்படுத்துவதற்கு <b>உங்களிடம் அனுமதி கேட்ட பயன்பாடுகளை அனுமதிக்கவும்.</b> இது உங்களது நடப்பு இருப்பிடம் மற்றும் முந்தைய இருப்பிடத்தை உள்ள்டக்கலாம்.</string>
-  <string name="location_gps" product="tablet"><b>பயன்பாடுகள் உங்கள் டேப்ளட்டில் உள்ள</b> GPSஐ பயன்படுத்த அனுமதிப்பதன் மூலம் இருப்பிட துல்லியத்தை மேம்படுத்தவும்.</string>
-  <string name="location_gps" product="default"><b>பயன்பாடுகள் உங்கள் தொலைப்பேசியில்</b> உள்ள GPSஐ பயன்படுத்த அனுமதிப்பதன் மூலம் இருப்பிட துல்லியத்தை மேம்படுத்தவும்.</string>
+  <string name="location_battery_saving"><b>ஒரு மணி நேரத்திற்கான GPS</b> புதுப்பித்தல்களின் எண்ணிக்கையை கட்டுப்படுத்துவதன் மூலம் மின்கல நுகர்வை குறைக்கவும்.</string>
  <string name="location_network">பயன்பாடுகள் உங்கள் இருப்பிடத்தை கண்டறிய உதவ <b>Wi-Fi பயன்படுத்துங்கள்</b>.</string>
  <string name="location_network_telephony">பயன்பாடுகள் உங்கள் இருப்பிடத்தை கண்டறிய உதவ <b>Wi-Fi மற்றும் மொபைல் பிணையங்களைப்</b> பயன்படுத்துங்கள்</string>
  <string name="location_network_gms">பயன்பாடுகள் உங்கள் இருப்பிடத்தை கண்டறிய உதவ <b>Googleஇன் இருப்பிட சேவையைப் பயன்படுத்துங்கள்</b> பயன்பாடுகள் எதுவும் தொடராதபோதும், Googleக்கு அறியப்படாத இருப்பிட தகவல்களை அனுப்புவதே இதன் அர்த்தம்.</string>
@@ -78,4 +77,11 @@
  <string name="fingerprint_setup_backup_lock_method">ஒரு இரண்டாம்நிலை பூட்டுநீக்க முறையை அமை</string>
  <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
@@ -41,8 +41,7 @@
  <string name="other_services_summary">ఈ సేవలు గూగులును మీ కొరకు పనిచేయడానికి నియమిస్తాయి, మరియు మీరు వాటిని ఏ సమయంలోనైనా ఆన్ మరియు ఆఫ్ చేయవచ్చు. గూగుల్ యొక్క <xliff:g id="name" example="Privacy Policy">%s</xliff:g> కు అనుకూలంగా డేటా వినియోగించబడుతుంది.</string>
  <string name="location_services_summary">మీ యొక్క సమీప స్థానం వంటి డేటాను సేకరించేందుకు సిస్టమ్ మరియు మూడవ పార్టీ అనువర్తనాలకు స్థాన సేవలు అనుమతినిస్తాయి. ఉదాహరణకు, దగ్గరిలోని కాఫీ షాపులను గుర్తించేందుకు ఒక అనువర్తనం మీ యొక్క సమీప స్థానాన్ని ఉపయోగించవచ్చు.</string>
  <string name="location_access_summary"><b>మీ యొక్క స్థాన సమాచారాన్ని ఉపయోగించుకునేందుకు</b> మీ అనుమతి కోసం అడిగిన అనువర్తనాలను అనుమతించుము. ఇది మీ యొక్క ప్రస్తుత స్థానం మరియు గత స్థానాలను కూడా కలిగి ఉండవచ్చు.</string>
-  <string name="location_gps" product="tablet"><b>మీ టాబ్లెట్టులో ఉన్న</b> GPSను ఉపయోగించుకునేందుకు అనువర్తనాలకు అనుమతినిస్తూ స్థాన నిర్థిష్టతను మెరుగుపరుచుము.</string>
-  <string name="location_gps" product="default"><b>మీ ఫోనులోఉన్న</b> GPSను ఉపయోగించుకునేందుకు అనువర్తనాలకు అనుమతినిస్తూ స్థాన నిర్థిష్టతను మెరుగుపరుచుము.</string>
+  <string name="location_battery_saving">గంటకు GPPS నవీకరణల సంఖ్యను నియంత్రించుట ద్వారా <b>బ్యాటరీ వినియోగాన్ని తగ్గించండి.</b></string>
  <string name="location_network">అనువర్తనాలు మీ యొక్క స్థానాన్ని నిర్ధారించేందుకు సహాయపడటానికి <b>Wi-Fiను ఉపయోగించుము.</b></string>
  <string name="location_network_telephony">అనువర్తనాలు మీ యొక్క స్థానాన్ని నిర్ధారించేందుకు <b>సహాయపడటానికి Wi-Fi మరియు మొబైల్ నెట్వర్కులను</b> ఉపయోగించుము.</string>
  <string name="location_network_gms"><b>అనువర్తనాలు మీ యొక్క స్థానాన్ని నిర్ధారించేందుకు</b> సహాయపడటానికి గూగుల్ యొక్క స్థాన సర్వీసును ఉపయోగించుము. దీని అర్థం ఎటువంటి అనువర్తనాలు నడుస్తూ లేనప్పుడు కూడా గూగులుకు అజ్ఞాత స్థాన డేటాను పంపడం.</string>
@@ -78,4 +77,11 @@
  <string name="fingerprint_setup_backup_lock_method">ద్వితీయ అన్లాకింగ్ ప్రక్రియను అమర్చుము</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">บริการเหล่านี้ทำให้ Google ทำงานเพื่อคุณ คุณสามารถเปิดหรือปิดบริการเหล่านั้นได้เสมอ โดยจะใช้ข้อมูลตาม <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ของ Google</string>
  <string name="location_services_summary">บริการตำแหน่งที่ตั้งอนุญาตให้ระบบและแอปบุคคลที่สามเก็บและใช้ข้อมูล เช่น ตำแหน่งที่ตั้งของคุณได้ เช่น แอปสามารถใช้ตำแหน่งที่ตั้งของคุณเพื่อหาร้านกาแฟใกล้เคียง</string>
  <string name="location_access_summary"><b>อนุญาตให้แอปที่ขออนุญาต</b> ใช้ข้อมูลตำแหน่งที่ตั้งของคุณ ซึ่งอาจรวมถึงตำแหน่งที่ตั้งปัจจุบันและที่ผ่านมา</string>
-  <string name="location_gps" product="tablet"><b>เพิ่มความแม่นยำของสถานที่ตั้ง</b> โดยอนุญาตให้แอปใช้ GPS บนแท็บเล็ตของคุณ</string>
-  <string name="location_gps" product="default"><b>เพิ่มความแม่นยำตำแหน่งที่ตั้ง</b>โดยอนุญาตให้แอปใช้ GPS บนโทรศัพท์ของคุณ</string>
+  <string name="location_battery_saving"><b>ลดปริมาณการใช้แบตเตอรี่</b> โดยการจำกัดจำนวนครั้งการใช้จีพีเอส</string>
  <string name="location_network"><b>ใช้ Wi-Fi</b> เพื่อช่วยให้แอปหาตำแหน่งได้ง่ายขึ้น</string>
  <string name="location_network_telephony"><b>ใช้ Wi-Fi และเครือข่ายมือถือ</b> เพื่อช่วยให้แอปหาตำแหน่งของคุณ</string>
  <string name="location_network_gms"><b>ใช้บริการตำแหน่งที่ตั้งของ Google</b> เพื่อช่วยแอปหาตำแหน่งที่ตั้ง ซึ่งหมายรวมถึงการส่งข้อมูลตำแหน่งที่ตั้งแบบไม่ระบุตัวตนให้ Google แม้ในกรณีที่ไม่มีแอปใดทำงานอยู่ก็ตาม</string>
-  <string name="setup_mobile_data">เปิดใช้งานข้อมูลมือถือ</string>
+  <string name="setup_mobile_data">เปิดข้อมูลโทรศัพท์มือถือ</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="enable_mobile_data_summary">คุณต้องการใช้ข้อมูลเครือข่ายมือถือระหว่างการติดตั้งหรือไม่ การเปิดข้อมูลโทรศัพท์มือถืออาจมีค่าบริการข้อมูล</string>
  <string name="no">ไม่</string>
  <string name="yes">ใช่</string>
  <string name="data_sim_name">ซิม <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,4 +77,13 @@
  <string name="fingerprint_setup_backup_lock_method">กำหนดวิธีปลดล็อคสำรอง</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">Bu hizmetler ile Google sizin için çalışmaya başlar ve istediğiniz zaman açıp kapatabilirsiniz. Veriler Google\'ın <xliff:g id="name" example="Privacy Policy">%s</xliff:g>\'na uygun olarak kullanılacaktır.</string>
  <string name="location_services_summary">Konum servisleri sistem ve üçüncü taraf uygulamalara yaklaşık konumunuz gibi bilgileri toplama ve kullanma izni verir. Örneğin, bir uygulama yakındaki eğlence merkezlerini belirlemek için yaklaşık konumunuzu kullanabilir.</string>
  <string name="location_access_summary"><b>Konum bilginizi isteyen uygulamalara izin ver.</b> Bu geçerli konumunuzu ve geçmiş konumlarınızı içerebilir.</string>
-  <string name="location_gps" product="tablet">Uygulamaların tabletinizdeki GPS\'i kullanmasına izni vererek <b>konum doğruluğunu geliştirin</b>.</string>
-  <string name="location_gps" product="default">Uygulamalara telefonunuzdaki GPS\'i kullanma izni vererek <b>konum doğruluğunu geliştirin</b>.</string>
+  <string name="location_battery_saving">Saatte yapılan GPS güncelleme sayısını kısıtlayarak <b>pil tüketimini azaltın</b>.</string>
  <string name="location_network">Uygulamaların konumunuzu bulmanısına yardımcı olmak için <b>Wi-Fi\'yi kullanın</b>.</string>
  <string name="location_network_telephony">Uygulamaların konumunuzu bulmasına yardımcı olmak için <b>Wi-Fi\'yi ve mobil şebekeleri kullanın</b>.</string>
  <string name="location_network_gms">Konumunuzu belirlemek için <b>Google konum servislerini kullanın</b>. Bu, hiç uygulama çalışmıyorken bile isimsiz konum verilerinin Google\'a gönderilmesi demektir.</string>
-  <string name="setup_mobile_data">Mobil veriyi aç</string>
+  <string name="setup_mobile_data">Hücresel veriyi etkinleştir</string>
  <string name="setup_mobile_data_no_service">Servis yok</string>
  <string name="setup_mobile_data_emergency_only">Sadece acil durum çağrıları</string>
-  <string name="enable_mobile_data_summary">Kurulum sırasında mobil veriyi kullanmak istiyor musunuz? Mobil veriyi açarak veri ücretlerine tabi olabilirsiniz.</string>
+  <string name="enable_mobile_data_summary">Kurulum sırasında hücresel veri kullanmak istiyor musunuz? Hücresel veriyi kullanmak ücrete tabi olabilir.</string>
  <string name="no">Hayır</string>
  <string name="yes">Evet</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -78,4 +77,12 @@
  <string name="fingerprint_setup_backup_lock_method">İkinci kilit açma yönteminizi ayarlayın</string>
  <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
@@ -41,15 +41,14 @@
  <string name="other_services_summary">بۇ مۇلازىمەتلەرنى Google سىزگە تەمىنلەيدۇ، سىز ئۇلارنى خالىغان چاغدا تاقاپ ئاچسىڭىز بۇلىدۇ. ئېقىم Google نىڭ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> بۇيىچە ئىشلىتىلدۇ.</string>
  <string name="location_services_summary">ئورۇن مۇلازىمىتى سىستېما ۋە ئۈچىنچى تەرەپ ئەپنىڭ سانلىق مەلۇماتنى يىغىشىغا ۋە ئىشلىتىشىگە رۇخسەت قىلىدۇ. مەسىلەن، مەلۇم بىر ئەپ سىزنىڭ تەخمىنىي ئورنىڭىزغا ئاساسەن يېقىن ئەتراپتىن قەھۋەخانا ئىزدەيدۇ.</string>
  <string name="location_access_summary"><b>سىز ھوقۇق بەرگەن ئەپنىڭ</b> سىزنىڭ ئورۇن ئۇچۇرىڭىزنى ئىشلىتىشكە يول قويۇش، بۇ بەلكىم سىزنىڭ ھازىرقى ۋە ئۆتمۈشتىكى ئۇچۇرىڭىزنى ئۆز ئىچىگە ئېلىشى مۇمكىن.</string>
-  <string name="location_gps" product="tablet">ئەپنىڭ تاختا كومپىيوتېرىڭىزدا GPS نى ئىشلىتىشىگە يول قويۇپ، <b>ئورنىڭىزنىڭ توغرىلىقىنى يوقىرى كۆتۈرۈڭ</b>.</string>
-  <string name="location_gps" product="default">ئەپنىڭ تېلېفونىڭىزدا GPS نى ئىشلىتىشىگە يول قويۇپ، <b>ئورنىڭىزنىڭ توغرىلىقىنى يوقىرى كۆتۈرۈڭ</b>.</string>
+  <string name="location_battery_saving">GPS نىڭ سائەتتە بىر يېڭىلىنىش چاستوتىسىنى چەكلەش ئارقىلىق <b>باتارىيە توك سەرپىياتىنى تۆۋەنلىتىش</b>.</string>
  <string name="location_network"><b>سىمسىز تورنى ئىشلىتىپ</b> ئەپنىڭ ئورنىڭىزنى بېكىشىگە ياردەم قىلىڭ.</string>
  <string name="location_network_telephony"><b>يۆتىلىشچان تور ۋە Wi-Fi نى ئىشلىتىپ</b> ئەپنىڭ ئورنىڭىزنى بېكىشىگە ياردەم قىلىڭ.</string>
  <string name="location_network_gms"><b>گوگېل ئورۇن مۇلازىمىتىنى ئىشلىتىپ</b> ئەپنىڭ ئورنىڭىزنى بېكىشىگە ياردەم قىلىڭ. بۇ ئەپ قوزغالمىسىمۇ، گوگېلغا ئىسىمسىز ئورۇن ئۇچۇرى ئەۋەتىدىغانلىقىدىن دىرەك بېرىدۇ.</string>
-  <string name="setup_mobile_data">كۆچمە سانلىق مەلۇماتنى ئېچىش</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="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>
@@ -78,4 +77,8 @@
  <string name="fingerprint_setup_backup_lock_method">زاپاس قۇلۇپ يىيىش ئۇسۇلىنى بېكىتىڭ</string>
  <string name="fingerprint_setup_add_fingerprint">بارماق ئىزى قوشۇڭ</string>
  <string name="fingerprint_setup_screen_lock_setup">ئېكران قۇلۇپ تەڭشىكى</string>
+  <string name="sim_locale_changed">ھازىر %1$s دانە SIM كارتا بايقىدى</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">ئېكراننى قانداق قۇلۇپلايسىز؟</string>
+  <!-- MOD stuff -->
 </resources>
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -41,15 +41,10 @@
  <string name="other_services_summary">Ці служби дозволяють Google розширити можливості пристрою. Вы маєте можливість вимкнути їх у будь-який час. Дані будуть використані відповідно до <xliff:g id="name" example="Privacy Policy">%s</xliff:g> Google.</string>
  <string name="location_services_summary">Служби місцезнаходження дозволяють системі і додаткам збирати та використовувати дані, щодо вашого приблизиного розташування. Наприклад, додаток зможе шукати кав`ярні чи зупинки, що розташовані поруч, грунтуючись на отриманих даних.</string>
  <string name="location_access_summary"><b>Дозволити програмам, котрі запитали вашого дозволу</b> використовувати інформацію, щодо вашого місцезнаходження. Це може бути як ваше поточне, так і минулі розташування.</string>
-  <string name="location_gps" product="tablet"><b>Покращити точність визначення місцезнаходження</b>, дозволяючи програмам використовувати GPS в планшеті.</string>
-  <string name="location_gps" product="default"><b>Покращити точність визначення місцезнаходження</b>, дозволяючи програмам використовувати GPS в телефоні.</string>
  <string name="location_network"><b>Використовувати Wi-Fi</b> для визначення вашого місцезнаходження.</string>
-  <string name="location_network_telephony"><b>Використовувати Wi-Fi та мобільні мережі</b> для визначення вашого місцезнаходження.</string>
  <string name="location_network_gms"><b>Використовувати служби місцезнаходження Google</b>, щоб допомогти додаткам визначити ваше розташування. Мається на увазі, що вони будуть відсилати анонімні дані, щодо вашого розташування, до Google навіть тоді, коли ніякі додатки не виконуються.</string>
-  <string name="setup_mobile_data">Увімкніть моб. дані</string>
  <string name="setup_mobile_data_no_service">Немає мережі</string>
  <string name="setup_mobile_data_emergency_only">Тільки екстрені виклики</string>
-  <string name="enable_mobile_data_summary">Бажаєте використовувати мобільні дані під час налаштування? Увімкнення мобільних даних може коштувати вам грошенят.</string>
  <string name="no">Ні</string>
  <string name="yes">Так</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -79,4 +74,7 @@
  <string name="fingerprint_setup_backup_lock_method">Установка резервного методу розблокування</string>
  <string name="fingerprint_setup_add_fingerprint">Додати ваш відбиток пальця</string>
  <string name="fingerprint_setup_screen_lock_setup">Налаштування блокування екрану</string>
+  <!-- secure lock screen -->
+  <string name="settings_lockscreen_setup_details">Як би ви хотіли блокувати екран?</string>
+  <!-- MOD stuff -->
 </resources>
--- a/Show More
+++ b/Show More