SetupWizard: Don't show wifi setup on wifi-less devices

Altough uncommon, development boards and emulators don't have a wireless
interface. In those cases, don't show the wireless setup page.

Change-Id: I0017b2277defdccf7f0bd61cb9606254509f78cc

Android.mk

@@ -18,6 +18,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     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
 res_dir := $(google_play_dir) res
@@ -26,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)

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,17 +30,14 @@
     <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="cyanogenmod.permission.HARDWARE_ABSTRACTION_ACCESS" />
     <uses-permission android:name="android.permission.BACKUP" />
@@ -50,7 +47,6 @@
     <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"/>
-    <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" />
 
     <permission
         android:name="cyanogenmod.permission.PROTECTED_APP"
@@ -64,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"
@@ -79,7 +76,7 @@
                   android:label="@string/product_name"
                   android:launchMode="singleInstance"
                   android:excludeFromRecents="true"
-                  android:configChanges="themeChange|mcc|mnc"
+                  android:configChanges="mcc|mnc"
                   android:immersive="true"
                   android:windowSoftInputMode="stateAlwaysHidden">
 

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.**

res/drawable/ic_logo_mod_title.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 Cyanogen, Inc.
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="16dp"
+    android:viewportWidth="72"
+    android:viewportHeight="16">
+
+    <path
+        android:name="ic_logo_mod_title"
+        android:fillColor="#000000"
+        android:pathData="M19.9097139,5.66053833 C19.9097139,2.54013671 17.3930434,4.53810596e-05
+14.2986968,4.53810596e-05 L0,4.53810596e-05 L0,15.9999319 L2.53412329,15.9999319
+L2.53412329,2.5567008 L8.68814203,2.5567008 L8.68814203,15.9999319
+L11.221803,15.9999319 L11.221803,2.5567008 L14.2986968,2.5567008
+C15.9954325,2.5567008 17.3755906,3.94933205 17.3755906,5.66053833
+L17.3755906,15.9999319 L19.9097139,15.9999319 L19.9097139,5.66053833 Z
+M44.8456489,7.26108291 L44.8456489,6.32158153 L44.8456489,5.66049295
+C44.8456489,2.54020478 42.3287472,0 39.2346318,0 L31.9464123,0 C28.853106,0
+26.3363199,2.54020478 26.3363199,5.66049295 L26.3363199,6.93388547
+L26.3363199,7.26108291 L26.3363199,8.73891709 L26.3363199,9.19476983
+L26.3363199,10.3393936 C26.3363199,13.4595683 28.853106,16 31.9464123,16
+L39.2346318,16 C42.3287472,16 44.8456489,13.4595683 44.8456489,10.3393936
+L44.8456489,9.71290807 L44.8456489,8.73891709 L44.8456489,7.26108291 Z
+M42.3111788,10.3393936 C42.3111788,12.0508268 40.9310208,13.4432311
+39.2346318,13.4432311 L31.9464123,13.4432311 C30.2502545,13.4432311
+28.8700964,12.0508268 28.8700964,10.3393936 L28.8700964,5.66049295
+C28.8700964,3.94928667 30.2502545,2.55676887 31.9464123,2.55676887
+L39.2346318,2.55676887 C40.9315987,2.55676887 42.3111788,3.94928667
+42.3111788,5.66049295 L42.3111788,10.3393936 Z M64.1708327,0 L51.2719428,0
+L51.2719428,16 L64.1708327,16 C67.2652948,16 69.7817342,13.4595683
+69.7817342,10.3393936 L69.7817342,5.66049295 C69.7817342,2.54020478 67.2652948,0
+64.1708327,0 Z M67.2477265,10.3393936 C67.2477265,12.0508268
+65.8674528,13.4432311 64.1708327,13.4432311 L53.8064129,13.4432311
+L53.8064129,2.55676887 L64.1708327,2.55676887 C65.8674528,2.55676887
+67.2477265,3.94928667 67.2477265,5.66049295 L67.2477265,10.3393936 Z" />
+</vector>

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>

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>

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>

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>

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>

res/layout/setup_modguide_page.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/mod_yellow">
+
+    <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="296dp">
+        <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                android:src="@drawable/img_oobe_hero"
+                tools:ignore="ContentDescription"/>
+        <ImageView
+                android:layout_width="140dp"
+                android:layout_height="32dp"
+                android:src="@drawable/ic_logo_mod_title"
+                android:tint="@color/white"
+                android:layout_marginTop="72dp"
+                android:layout_marginStart="24dp"
+                tools:ignore="ContentDescription"/>
+    </FrameLayout>
+
+    <TextView android:id="@+id/mod_welcome"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:minHeight="20sp"
+              android:textSize="16sp"
+              android:fontFamily="sans-serif"
+              android:layout_marginTop="32dp"
+              android:paddingStart="24dp"
+              android:paddingEnd="24dp"
+              android:text="@string/mod_welcome"
+              android:textColor="@color/mod_title"/>
+
+    <TextView android:id="@+id/mod_desc"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:fontFamily="sans-serif"
+              android:textSize="14sp"
+              android:lineSpacingExtra="6sp"
+              android:layout_marginTop="3dp"
+              android:paddingStart="24dp"
+              android:paddingEnd="24dp"
+              android:text="@string/mod_description"
+              android:textColor="@color/mod_description"/>
+
+    <FrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="72dp"
+            android:minWidth="208dp"
+            android:layout_marginTop="25dp"
+            android:layout_marginStart="24dp"
+            android:background="@drawable/btn_mod_oobe">
+
+        <LinearLayout
+                android:id="@+id/explore_mod_guide"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:minWidth="176dp"
+                android:orientation="horizontal">
+
+            <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:src="@mipmap/ic_modguide"
+                    android:layout_margin="8dp"
+                    tools:ignore="ContentDescription"/>
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:gravity="center_vertical"
+                    android:fontFamily="sans-serif"
+                    android:text="@string/mod_explore"
+                    android:textAllCaps="false"
+                    android:textColor="@color/mod_title"/>
+        </LinearLayout>
+    </FrameLayout>
+</LinearLayout>

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"/>

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>
@@ -61,7 +60,7 @@
   <string name="services_help_improve_cm">Help verbeter <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> deur outomaties diagnostiese en gebruikers data te stuur na Cyanogen. Hierdie inligting kan nie gebruik word om jou te identifiseer nie en help spanne werk op dinge soos battery lewe, program werkverrigting en nuwe <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funksies.</string>
   <string name="services_apply_theme">Pas <xliff:g id="name" example="Material">%s</xliff:g> tema toe</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> aktiveer unieke ikone, agtergronde en lettertipe.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> aktiveer \'n unieke visuele styl vir jou ikone, agtergrond en nog baie meer.</string>
   <string name="services_os_nav_keys_label"><b>Gebruik skerm navigasie sleutels</b> in plaas van hardeware sleutels.</string>
   <string name="services_use_secure_sms">Maak gebruik van veilige SMS</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> om SMS gesprekke met ander gebruikers te enkripteer met behulp van veilige SMS op \'n <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> toestel.</string>
@@ -78,4 +77,11 @@
   <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="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 -->
 </resources>

res/values-am/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,7 @@
   <string name="services_help_improve_cm">ساهم في تحسين <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s </xliff:g> بإرسال بيانات تشخيص المشكلات وبيانات الاستخدام تلقائياً إلى Cyanogen. هذه المعلومات لا يمكن استخدامها للتعرف عليك، لكنها تقدم المساعدة للفرق العاملة على جوانب مثل عمر البطارية وأداء التطبيقات، وميزات  <xliff:g id="name" example="CyanogenMod"> %2$s </xliff:g> الجديدة.</string>
   <string name="services_apply_theme">تطبيق السمة <xliff:g id="name" example="Material">%s </xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s </xliff:g> تمكين الرموز الفريدة والخلفيات والخطوط.</string>
+  <string name="services_apply_theme_label">يعمل <xliff:g id="name" example="Apply the Material theme">%s</xliff:g> على تمكين نمط مرئي فريد للأيقونات الخاصة بك، الخلفية والمزيد.</string>
   <string name="services_os_nav_keys_label"><b>استخدام مفاتيح التنقل على الشاشة</b> بدلاً من مفاتيح الأجهزة.</string>
   <string name="services_use_secure_sms">استخدام شريحة SIM آمنة</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s </xliff:g> لتشفير المحادثات عبر الرسائل القصيرة مع المستخدمين الآخرين باستخدام شريحة SMS آمنة على جهاز <xliff:g id="name" example="CyanogenMod"> %2$s </xliff:g>.</string>
@@ -78,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="lockscreen_setup_title">حماية هاتفك</string>
+  <string name="lockscreen_setup_summary"><b>حماية هذا الجهاز</b> وطلب رقم تعريف شخصي أو نمط أو كلمة مرور لإلغاء قفل الشاشة.</string>
+  <string name="lockscreen_setup_screen_lock_setup">إعداد رقم تعريف شخصي أو نمط أو كلمة مرور</string>
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,6 @@
   <string name="services_help_improve_cm">স্বয়ংক্ৰিয়ভাবে ডায়গনষ্টিক আৰু ব্যৱহাৰ ডাটা Cyanogen লৈ প্ৰেৰণ কৰি <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> উন্নত কৰাত সহায় কৰক এই তথ্য আপোনাক চিনাক্ত কৰিবলৈ ব্যৱহাৰ কৰিব পৰা নাযায় আৰু বেটাৰীৰ আয়ুস, এপ্প্‌ৰ কাৰ্যকাৰীতা আৰু নতুন <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> বৈশিষ্ট্যবোৰৰ ওপৰত কাম কৰি থকা দলবোৰক সহায় কৰে।</string>
   <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> বিষয়বস্তুটো প্ৰয়োগ কৰক</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> এ অনন্য আইকন, ৱালপেপাৰ আৰু ফণ্ট সক্ষম কৰি আছে।</string>
   <string name="services_os_nav_keys_label">হাৰ্ডৱেৰ কীবোৰৰ পৰিৱৰ্তে স্ক্ৰীণ <b>নেভিগেচন কীবোৰ ব্যৱহাৰ কৰক</b>।</string>
   <string name="services_use_secure_sms">এটা</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ডিভাইচত সুৰক্ষিত SMS ব্যৱহাৰ কৰি থকা আন ব্যৱহাৰকৰ্তাৰ সৈতে SMS কথোপকথন এনক্ৰিপ্ট কৰিবলৈ সুৰক্ষিত SMS <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> ব্যৱহাৰ কৰক।</string>
@@ -78,4 +76,6 @@
   <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>
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,7 @@
   <string name="services_help_improve_cm">Ayudar a ameyorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> unviando automáticamente diagnósticos y usu de datos a Cyanogen. Esta información nun s\'usa pa indentificate y écha-yos un gabitu a los equipos pa trabayar en coses como\'l consumu de batería, el rindimientu d\'aplicaciones, y les nueves carauterístiques <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">Aplicar el tema <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> habilitando iconos, fondos de pantalla y fontes únicos.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> habilitando iconos, fondos de pantalla, fontes únicos y más.</string>
   <string name="services_os_nav_keys_label"><b>Usar tecles de navegación na pantalla</b> en cuantes de tecles físiques.</string>
   <string name="services_use_secure_sms">Usar SMS seguru</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> pa cifrar conversaciones SMS con otros usuarios usando SMS seguru nun preséu <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,4 +77,6 @@
   <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>
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +56,6 @@
   <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> təkmilləşməsinə kömək edin</string>
   <string name="services_metrics_label">Diaqnostika və istifadə verilənlərini Cyanogen\'ə göndərərək <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>. Bu məlumatlar kimliyinizdən istifadə məqsədilə götürülmür, ancaq batareya ömrü, tətbiq performansı və yeni <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> özəllikləri kimi mövzularda komandamızın işlərində istifadə olunur.</string>
   <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> temasını tətbiq et</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> fəal olduğu zaman təkrar olunmaz nişanlar, divar kağızları və yazı tipləri fəallaşdıralacaq.</string>
   <string name="services_os_nav_keys_label"><b>Avadanlıq düymələri əvəzinə ekran üstü hərəkət düymələrindən istifadə edin.</b></string>
   <string name="services_use_secure_sms">Şifrəli SMS istifadə edin</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%1$s</xliff:g> cihazında digər istifadəçilərlə edilən söhbətlərinizi şifrələmək üçün <xliff:g id="name" example="Use secure SMS">%2$s</xliff:g>.</string>
@@ -78,4 +72,5 @@
   <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>
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,6 @@
   <string name="services_help_improve_cm">Дапамагчы палепшыць <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>, аўтаматычна адпраўляючы дадзеныя дыягностыкі і выкарыстанні ў Cyanogen. Дадзеная інфармацыя не можа быць скарыстана для ідэнтыфікацыі вашай асобы, але можа дапамагчы ў працы над аптымізацыяй выдатку батарэі, паляпшэннем прадукцыйнасці дадаткаў, а таксама распрацоўцы новых функцый <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">Ужыць тэму <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> і скарыстаць яе значкі, шпалеры і шрыфты.</string>
   <string name="services_os_nav_keys_label"><b>Скарыстаць на экранные навігацыйныя кнопкі</b> заміж апаратных.</string>
   <string name="services_use_secure_sms">Выкарыстоўваць бяспечныя SMS</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> для шыфравання паведамленняў, што перадаюцца іншым карыстачам прылад з<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,4 +76,6 @@
   <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>
+  <!-- MOD stuff -->
 </resources>

res/values-bg/strings.xml

@@ -20,6 +20,7 @@
   <string name="next">Следваща</string>
   <string name="skip">Пропусни</string>
   <string name="start">Старт</string>
+  <string name="done">Готово</string>
   <string name="ok">Добре</string>
   <string name="loading">Само секунда\u2026</string>
   <string name="setup_complete">Настройването е завършено</string>
@@ -41,15 +42,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 +78,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="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">Вашето устройство е готово за модификация</string>
+  <string name="mod_description">Модулите ще направят в телефона по-бърз, по-умен и лесен за употреба. В това ръководство можете да откриете нови модове, да научите какво те правят и как да ги активирате и деактивирате.</string>
+  <string name="mod_explore">Запознай се с \"Модулите\"</string>
 </resources>

res/values-bn-rBD/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-br-rFR/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-bs-rBA/strings.xml

@@ -1,20 +0,0 @@
-<?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 -->
-</resources>

res/values-ca/strings.xml

@@ -20,6 +20,7 @@
   <string name="next">Següent</string>
   <string name="skip">Omet</string>
   <string name="start">Inicia</string>
+  <string name="done">Fet</string>
   <string name="ok">Accepta</string>
   <string name="loading">Només un seg\u2026</string>
   <string name="setup_complete">Configuració completa</string>
@@ -41,15 +42,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>
@@ -61,13 +61,13 @@
   <string name="services_help_improve_cm">Ajuda a millorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> enviant automàticament les dades de diagnòstic i d\'ús a Cyanogen. Aquesta informació no es pot utilitzar per identificar-te i dóna un cop de mà als equips que treballen en coses com la duració de les bateries, el rendiment de les aplicacions i noves característiques de <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">Aplica el tema <xliff:g id="name" example="Material">%s </xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s </xliff:g> habilitant icones úniques, fons de pantalla i tipus de lletra.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> habilitant un estil visual únic per a les teves icones, fons de pantalla i més.</string>
   <string name="services_os_nav_keys_label"><b>Utilitza les tecles de navegació en pantalla</b> enlloc de les tecles físiques.</string>
   <string name="services_use_secure_sms">Utilitza SMS segurs</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> per xifrar les converses SMS amb altres usuaris mitjançant SMS segurs en un dispositiu <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="setup_unlock">Desbloqueja</string>
   <string name="setup_device_locked">Aquest dispositiu ha estat bloquejat per l\'usuari.</string>
-  <string name="setup_require_cyanogen_label"><b>Demana la contrasenya del teu compte Cyanogen OS</b> per utilitzar el teu dispositiu, fins i tot després de restablir 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 restaurar als ajustaments de fàbrica.</string>
   <string name="setup_device_locked_instructions"><i>Per activar/desactivar aquesta característica, si us plau ves a Configuració &gt; Seguretat</i></string>
   <string name="setup_warning_skip_anyway">Sense un compte Cyanogen OS, no podràs:\n\nPersonalitzar el teu telèfon amb noves icones, fons de pantalla i més en l\'aplicació de Temes\n\nLocalitzar o esborrar remotament el teu telèfon si el perds</string>
   <!-- Fingerprint setup -->
@@ -78,4 +78,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="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">El teu dispositiu està llest pel MOD</string>
+  <string name="mod_description">Els Mods fan el teu telèfon més ràpid, i més fàcil d\'utilitzar. En aquesta guia, pots descobrir nous mods, aprendre què fan, i habilitar-los o deshabilitar-los.</string>
+  <string name="mod_explore">Explora la Guia de MODs</string>
 </resources>

res/values-cs/strings.xml

@@ -20,6 +20,7 @@
   <string name="next">Další</string>
   <string name="skip">Přeskočit</string>
   <string name="start">Spustit</string>
+  <string name="done">Hotovo</string>
   <string name="ok">OK</string>
   <string name="loading">Jen chvilku\u2026</string>
   <string name="setup_complete">Instalace je dokončena</string>
@@ -41,15 +42,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>
@@ -61,7 +61,7 @@
   <string name="services_help_improve_cm">Pomozte zlepšovat <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> automatickým odesíláním diagnostických dat a dat o používání do Cyanogen. Tato data nelze použít pro Vaší identifikaci, ale pomohou vývojářskému týmu s informacemi o výdrži baterie, výkonu aplikací a vývoji nových vlastností pro <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">Použít motiv <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> povolí unikátní ikony, tapety a písma.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> povolí unikátní vizuální styl pro ikony, tapety, písma a další.</string>
   <string name="services_os_nav_keys_label"><b>Použít navigační klávesy na obrazovce</b> namísto hw kláves.</string>
   <string name="services_use_secure_sms">Použít zabezpečené SMS</string>
   <string name="services_secure_sms_label">Použijte aplikaci <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> pro šifrované SMS a zabezpečenou komunikaci na zařízení <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,4 +78,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="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">Zařízení je připraveno k použití modů</string>
+  <string name="mod_description">Mody zrychlují, zefektivňují a usnadňují používání telefonu. V této příručce můžete objevit nové mody, naučit se co dělají, povolit je nebo zakázat.</string>
+  <string name="mod_explore">Prozkoumat průvodce modů</string>
 </resources>

res/values-csb-rPL/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-cy/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,7 @@
   <string name="services_help_improve_cm">Hjælpe med at forbedre <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> ved automatisk at sende diagnosticerings- og brugsoplysninger til Cyanogen. Denne information kan ikke bruges til at identificere dig, men hjælper udviklerne i arbejdet med eksempelvis batterilevetid, ydeevne og nye <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funktioner.</string>
   <string name="services_apply_theme">Anvend temaet <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> giver unikke ikoner, baggrunde og skrifttyper.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> muliggør et unikt udseende til dine ikoner, baggrunde og meget mere.</string>
   <string name="services_os_nav_keys_label"><b>Brug navigationstaster på skærmen</b> i stedet for fysiske knapper.</string>
   <string name="services_use_secure_sms">Brug sikker SMS</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> til at kryptere SMS-samtaler med andre brugere ved hjælp af sikker SMS på en <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> enhed.</string>
@@ -78,4 +77,11 @@
   <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="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 -->
 </resources>

res/values-de/strings.xml

@@ -20,6 +20,7 @@
   <string name="next">Weiter</string>
   <string name="skip">Überspringen</string>
   <string name="start">Start</string>
+  <string name="done">Fertig</string>
   <string name="ok">OK</string>
   <string name="loading">Einen Moment\u2026</string>
   <string name="setup_complete">Einrichtung abgeschlossen</string>
@@ -41,15 +42,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>
@@ -61,7 +61,7 @@
   <string name="services_help_improve_cm">Helfen Sie <xliff:g id="name" example="CyanogenMod">%s</xliff:g> zu verbessern</string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>, indem Sie automatisch Diagnose-und Nutzungsdaten an CyanogenMod senden. Diese Informationen können nicht dazu verwendet werden, Sie zu identifizieren. Vielmehr helfen sie unserem Team bei der Arbeit an Dingen wie der Akkulaufzeit, der App-Leistung und <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-Funktionen.</string>
   <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g>-Design anwenden</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>, um spezifische Symbole, Hintergrundbilder und Schriftarten zu aktivieren.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>, um einen besonderen visuellen Stil für Ihre Symbole, Ihren Hintergrund und mehr zu aktivieren.</string>
   <string name="services_os_nav_keys_label"><b>Bildschirm-Navigationstasten</b> statt Hardwaretasten verwenden.</string>
   <string name="services_use_secure_sms">Sichere SMS verwenden</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>, um SMS-Konversationen mit anderen Benutzern auf einem <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-Gerät zu verschlüsseln.</string>
@@ -78,4 +78,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="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">Ihr Gerät ist MOD bereit</string>
+  <string name="mod_description">Mods machen Ihr Mobiltelefon schneller, smarter und einfacher zu bedienen. In diesem Handbuch können Sie neue Mods entdecken, erfahren was sie tun und diese aktivieren oder deaktivieren.</string>
+  <string name="mod_explore">MOD-Handbuch erkunden</string>
 </resources>

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>
@@ -61,7 +60,7 @@
   <string name="services_help_improve_cm">Βοηθήστε στη βελτίωση του <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> στέλνοντας αυτόματα διαγνωστικά δεδομένα και στατιστικά χρήσης στη Cyanogen. Αυτές οι πληροφορίες δε μπορούν να χρησιμοποιηθούν για να σας αναγνωρίσουν και δίνουν ένα χέρι βοηθείας στις ομάδες που εργάζονται σε θέματα όπως η διάρκεια ζωής μπαταρίας, επιδόσεις εφαρμογών και νέα χαρακτηριστικά του <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">Εφαρμογή του θέματος <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ενεργοποιώντας μοναδικά εικονίδια, ταπετσαρίες και γραμματοσειρές.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ενεργοποιώντας ένα μοναδικό στυλ εικονιδίων, ταπετσαριών και ακόμα περισσότερα.</string>
   <string name="services_os_nav_keys_label"><b>Κάντε χρήση των πλήκτρων πλοήγησης της οθόνης</b> αντί των φυσικών πλήκτρων.</string>
   <string name="services_use_secure_sms">Κάντε χρήση των ασφαλών SMS</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> για να κρυπτογραφήσετε τις συνομιλίες SMS με άλλους χρήστες που χρησιμοποιούν ασφαλή SMS σε συσκευές <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,4 +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="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>

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>
@@ -60,8 +55,8 @@
   <string name="services_privacy_policy">Privacy Policy</string>
   <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_apply_theme">Apply the <xliff:g id="name" example="Material">%s</xliff:g> theme</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> enabling unique icons, wallpapers, and fonts.</string>
   <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
   <string name="services_use_secure_sms">Use secure SMS</string>
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-en-rGB/strings.xml

@@ -16,5 +16,9 @@
      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 -->
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +57,6 @@
   <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> by automatically sending diagnostic and usage data to Cyanogen. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> features.</string>
   <string name="services_apply_theme">Apply the <xliff:g id="name" example="Material">%s</xliff:g> theme</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> enabling unique icons, wallpapers, and fonts.</string>
   <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
   <string name="services_use_secure_sms">Use secure SMS</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> to encrypt SMS conversations with other users using secure SMS on a <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> device.</string>
@@ -78,4 +73,5 @@
   <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>
+  <!-- MOD stuff -->
 </resources>

res/values-en-rPT/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-eo/strings.xml

@@ -16,6 +16,52 @@
      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>
+  <string name="ok">Konfirmi</string>
+  <string name="loading">Nur unu sek.\u2026</string>
+  <string name="setup_complete">Agordo finiĝis</string>
+  <string name="setup_welcome">Bonvenon</string>
+  <string name="setup_wifi">Elektu vifion</string>
+  <string name="setup_sim_missing">SIM-karto mankas</string>
+  <string name="setup_choose_data_sim">Elektu SIM-karto por datumoj</string>
+  <string name="setup_location">Servo de lokigo</string>
+  <string name="setup_other">Aliaj servoj</string>
+  <string name="setup_datetime">Dato &amp; tempo</string>
+  <string name="setup_current_date">Aktuala dato</string>
+  <string name="setup_current_time">Aktuala tempo</string>
+  <string name="sim_missing_summary" product="tablet">SIM-karto ne troveblas en via tabulo. Por enmeti SIM karton, legu la informojn de via aparato.</string>
+  <string name="sim_missing_summary" product="default">SIM-karto ne troveblas en via telefono. Por enmeti SIM-karton, legu la informojn de via aparato.</string>
+  <string name="choose_data_sim_summary" product="tablet">Kiun SIM-karton vi deziras uzi por datumoj ? La elektita SIM-karto eble postulos kostojn ĉar agordoj uzos ĝin.</string>
+  <string name="choose_data_sim_summary" product="default">Kiun SIM-karton vi deziras uzi por datumoj ? La elektita SIM-karto eble postulos kostojn ĉar agordoj uzos ĝin.</string>
+  <string name="date_time_summary">Agordu vian horzonon kaj ĝustigu la aktualan daton kaj tempon laŭbezone</string>
+  <string name="backup_data_summary"><b>Savkopio</b> de aplikaĵaj datumoj, vifiaj pasvortoj kaj aliaj agordoj ĉe Google serviloj</string>
+  <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_network"><b>Uzi Vifion</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_no_service">Neniu servo</string>
+  <string name="setup_mobile_data_emergency_only">Nur urĝaj alvokoj</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>
+  <string name="emergency_call">Urĝa alvoko</string>
+  <string name="setup_services">Cyanogen funkcioj</string>
+  <string name="services_explanation" product="tablet">Tiuj servoj funkcias por etendi kapablojn de via tabulo. Datumoj estos uzataj laŭ la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string>
+  <string name="services_explanation" product="default">Tiuj servoj funkcias por etendi kapablojn de via telefono. Datumoj estos uzataj laŭ la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string>
+  <string name="services_privacy_policy">Privateca politiko</string>
+  <string name="services_help_improve_cm">Helpu por plibonigi <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
+  <string name="services_apply_theme">Apliki la etoson <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_os_nav_keys_label"><b>Uzi ekran-klavojn </b> anstataŭ tiujn de la aparato.</string>
+  <string name="services_use_secure_sms">Uzi sekurajn SMS</string>
+  <string name="setup_unlock">Malŝlosi</string>
+  <string name="setup_device_locked">La aparato estas ŝlosita de la uzanto.</string>
+  <string name="setup_require_cyanogen_label"><b>Postulas vian Cyanogen OS pasvorton</b> por uzi vian aparaton eĉ post rekomencigo al fabrika stato.</string>
+  <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 -->
+  <!-- MOD stuff -->
 </resources>

res/values-es-rCO/strings.xml

@@ -1,20 +0,0 @@
-<?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 -->
-</resources>

res/values-es-rMX/strings.xml

@@ -16,5 +16,11 @@
      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>
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,7 @@
   <string name="services_help_improve_cm">Ayuda a mejorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> enviando automáticamente diagnósticos de depuración y uso de datos a Cyanogen. Esta información no puede ser utilizada para identificarte y sirve para mejorar la vida útil de la batería, el rendimiento de la aplicación y el desarrollo de nuevas características desarrolladas por <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">Aplicar el tema <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> activando iconos especiales, fondos de pantalla y tipos de fuente.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> permite un estilo visual único para sus iconos, fondo de pantalla y más.</string>
   <string name="services_os_nav_keys_label"><b>Usar las teclas de navegación en pantalla</b> en vez de las teclas físicas.</string>
   <string name="services_use_secure_sms">Usar SMS seguros</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> para encriptar conversaciones SMS con otros usuarios utilizando SMS seguros en un dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,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ñ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="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 -->
 </resources>

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>
@@ -61,7 +60,7 @@
   <string name="services_help_improve_cm">Ayuda a mejorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> enviando automáticamente diagnósticos de depuración y uso de datos a Cyanogen. Esta información no puede ser utilizada para identificarte, y sirve para ayudar a mejorar la vida de la batería, el rendimiento de la aplicación y el desarrollo de nuevas características desarrolladas por <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">Aplicar el tema <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> activando iconos especiales, fondos de pantalla y tipos de letra.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> permite un estilo visual único para sus iconos, fondo de pantalla y más.</string>
   <string name="services_os_nav_keys_label"><b>Usar las teclas de navegación en pantalla</b> en vez de las teclas físicas.</string>
   <string name="services_use_secure_sms">Usar SMS seguros</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> para encriptar conversaciones SMS con otros usuarios utilizando SMS seguros en un dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,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="lockscreen_setup_title">Protege tu teléfono</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>
+  <string name="lockscreen_setup_screen_lock_setup">Configurar PIN, patrón o contraseña</string>
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +56,6 @@
   <string name="services_help_improve_cm">Aita parendada <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> saates automatselt diagnostika ja kasutamise infot Cyanogenile. Andmeid ei ole võimalik kasutada isiku tuvastamiseks. Teave aitab arendajatel muu hulgas parandada aku eluiga, rakenduste jõudlust ning arendada uusi <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> võimalusi.</string>
   <string name="services_apply_theme">Rakenda <xliff:g id="name" example="Material">%s</xliff:g> teema</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> võimaldades unikaalseid ikoone , taustapilte ja fonte.</string>
   <string name="services_os_nav_keys_label"><b>Kasuta ekraanil olevaid navigeerimisklahve</b> riistvaraliste nuppude asemel.</string>
   <string name="services_use_secure_sms">Kasuta turvalist SMS-i</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> et krüpteerida SMS vestluseid teiste turvalise SMSi kasutajetga <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> seadmel.</string>
@@ -78,4 +72,5 @@
   <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>
+  <!-- MOD stuff -->
 </resources>

res/values-eu-rES/strings.xml

@@ -20,6 +20,7 @@
   <string name="next">Hurrengoa</string>
   <string name="skip">Saltatu</string>
   <string name="start">Hasi</string>
+  <string name="done">Eginda</string>
   <string name="ok">Ados</string>
   <string name="loading">Une bat\u2026</string>
   <string name="setup_complete">Ezarpena burutu da</string>
@@ -41,10 +42,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>
@@ -61,7 +61,7 @@
   <string name="services_help_improve_cm">Lagundu <xliff:g id="name" example="CyanogenMod">%s</xliff:g> hobetzen</string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> automatikoki diagnostiko eta erabilera datuak bidaliz Cyanogeni. Informazio hau ezin da erabili zu identifikatzeko eta bateriaren iraupena, aplikazioen errendimendua, eta <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ezaugarri berrietan lanean dabilen taldearentzat lagungarria da.</string>
   <string name="services_apply_theme">Aplikatu <xliff:g id="name" example="Material">%s</xliff:g> gaia</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> aparteko ikono, horma-paper eta letra-tipoak gaitzen.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> zure ikono, horma-irudi eta bestelakoentzat estilo bisual paregabe bat gaituz.</string>
   <string name="services_os_nav_keys_label"><b>Erabili pantailako nabigazio teklak</b> hardware teklen ordez.</string>
   <string name="services_use_secure_sms">Erabili SMS segurua</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> gailu batean SMS segurua erabiltzen duten beste erabiltzaileekin dituzun SMS elkarrizketak zifratzeko.</string>
@@ -78,4 +78,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="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">Zure gailuak MODak onartzen ditu</string>
+  <string name="mod_description">Modak zure telefona azkarragoa, adimentsuagoa eta erabilerrazagoa egiten dute. Gida honetan, mod berriak ezagutuko dituzu, zer egiten duten ulertu, eta nola gaitu eta desgaitu ikasiko duzu.</string>
+  <string name="mod_explore">Aztertu MOD gida</string>
 </resources>

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>
@@ -61,7 +56,6 @@
   <string name="services_help_improve_cm">به بهبود <xliff:g id="name" example="CyanogenMod">%s</xliff:g> کمک کنید</string>
   <string name="services_metrics_label">با ارسال خودکار داده‌های تشخیصی ومیزان استفاده به سایانوژن <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>. از این داده‌ها برای تعیین هویت شما استفاده نمی‌شود و صرفاً کمکی است به تیم‌هایی که بر روی قابلیت‌هایی نظیر عمر باتری، عملکرد برنامه‌ها و ویژگی‌های جدید <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> کار می‌کنند.</string>
   <string name="services_apply_theme">اعمال تم <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> که آیکون‌ها، کاغذدیواری‌ها و فونت‌هایی بی‌نظیر را فعال می‌کند.</string>
   <string name="services_os_nav_keys_label"><b>استفاده از کلیدهای پیمایش صفحه نمایش</b> به جای کلیدهای سخت‌افزاری.</string>
   <string name="services_use_secure_sms">استفاده از پیامک امن</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> تا مکالمات پیامکی با کاربران دیگری که از پیامک امن در دستگاه مبتنی بر <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> استفاده می‌کنند، رمزنگاری شود.</string>
@@ -78,4 +72,5 @@
   <string name="fingerprint_setup_backup_lock_method">تنظیم روش دوم باز کردن قفل</string>
   <string name="fingerprint_setup_add_fingerprint">افزودن اثر انگشت خود</string>
   <string name="fingerprint_setup_screen_lock_setup">تنظیمات قفل صفحه</string>
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,7 @@
   <string name="services_help_improve_cm">Auta parantamaan <xliff:g id="name" example="CyanogenMod">%s</xliff:g>ia</string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> lähettämällä vianmääritys- ja käyttötietoja Cyanogenille. Tietoja ei voi käyttää tunnistamiseen. Tiedot auttavat kehittäjiä muun muassa parantamaan akun kestoa, sovellusten suorituskykyä ja kehittämään <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>iin uusia ominaisuuksia.</string>
   <string name="services_apply_theme">Ota <xliff:g id="name" example="Material">%s</xliff:g>-teema käyttöön</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> käyttääksesi ainutlaatuisia kuvakkeita, taustakuvia ja fontteja.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> käyttääksesi ainutlaatuista ulkoasua kuvakkeissa, taustakuvissa ja fonteissa.</string>
   <string name="services_os_nav_keys_label"><b>Käytä näytön navigointipalkkia</b> fyysisten näppäinten sijaan.</string>
   <string name="services_use_secure_sms">Käytä turvallisia tekstiviestejä</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> salataksesi tekstiviestikeskustelut muiden turvallisia tekstiviestejä ja <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>ia käyttävien henkilöiden kanssa.</string>
@@ -78,4 +77,11 @@
   <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="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 -->
 </resources>

res/values-fil-rPH/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-fr-rCA/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,7 @@
   <string name="services_help_improve_cm">Aider à améliorer <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Aider à l\'amélioration de CyanogenMod">%1$s</xliff:g> en envoyant automatiquement des données de diagnostics et d\'utilisation à Cyanogen. Ces informations ne peuvent pas être utilisées pour vous identifier et elles pourront aider les équipes qui travaillent sur des choses telles que la durée de vie de la batterie, les performances des applications et les nouvelles fonctionnalités de <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">Appliquer le thème <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Appliquer le thème Material">%s</xliff:g> active les icônes uniques, fonds d\'écran, et polices.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> permettant l\'utilisation d\'un style visuel unique pour vos icônes, fond d\'écran et plus.</string>
   <string name="services_os_nav_keys_label"><b>Utilisation des touches de navigation de l\'écran</b> au lieu des touches physiques.</string>
   <string name="services_use_secure_sms">Utiliser les SMS sécurisés</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> pour crypter les conversations SMS avec les autres utilisateurs utilisant les SMS sécurisés sur leurs appareils <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,4 +77,11 @@
   <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="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 -->
 </resources>

res/values-frp-rIT/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-fy-rNL/strings.xml

@@ -18,4 +18,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="ok">OK</string>
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-ga-rIE/strings.xml

@@ -1,20 +0,0 @@
-<?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 -->
-</resources>

res/values-gd-rGB/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-gl-rES/strings.xml

@@ -41,15 +41,10 @@
   <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_network"><b>Utiliza a Wi-Fi</b> para axudar as aplicacións a determinar a súa localización.</string>
-  <string name="location_network_telephony"><b>Utiliza a Wi-Fi e redes móbiles</b> para axudar as aplicacións a determinar a súa localización.</string>
   <string name="location_network_gms"><b>Utiliza o servizo de localización de Google</b> para axudar a determinar a súa localización.</string>
-  <string name="setup_mobile_data">Activar os datos móbiles</string>
   <string name="setup_mobile_data_no_service">Sen servizo</string>
   <string name="setup_mobile_data_emergency_only">Só chamadas de urxencia</string>
-  <string name="enable_mobile_data_summary">Quere empregar os datos móbiles durante a instalación? Activalos pode estar suxeito a cargos na tarifa de datos.</string>
   <string name="no">Non</string>
   <string name="yes">Si</string>
   <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
@@ -61,7 +56,6 @@
   <string name="services_help_improve_cm">Axuda a mellorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Axuda a mellorar CyanogenMod">%1$s</xliff:g> enviando automaticamente diagnóstico e uso de datos a Cyanogen. Esta información non se pode utilizar para identificalo a vostede e acaba nas mans dos equipos que traballan en cousas como a duración da batería, rendemento das aplicacións e novas características de <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">Aplicar o tema <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Aplicar o tema Material">%s</xliff:g> activando as iconas, fondos de pantalla e tipos de letra.</string>
   <string name="services_os_nav_keys_label"><b>Usar as teclas de navegación</b> en vez das do hardware.</string>
   <string name="services_use_secure_sms">Empregar SMS seguras</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Utilizar SMS seguras">%1$s</xliff:g> para cifrar conversas por SMS con outros usuarios utilizando SMS seguras nun dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,4 +72,5 @@
   <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>
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,6 @@
   <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>ના સુધારામાં મદદ કરો</string>
   <string name="services_metrics_label">સ્વયંચાલિત રીતે ડાયગ્નોસ્ટિક અને વપરાશ ડેટા Cyanogen ને મોકલીને<xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> . આ માહિતીનો ઉપયોગ તમને ઓળખવા માટે થઈ શકે નહીં અને એવી ટીમોને મદદરૂપ થશે જેઓ બૅટરી આવરદા, એપ્લિકેશન કામગીરી અને <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ફીચરો પર કાર્ય કરતી હોય.</string>
   <string name="services_apply_theme">થીમ <xliff:g id="name" example="Material">%s</xliff:g> લાગુ કરો</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> અનન્ય આઇકૉન્સ, વૉલપેપર્સ, અને ફોન્ટ સક્ષમ કરી રહ્યા છે.</string>
   <string name="services_os_nav_keys_label">હાર્ડવેર કીને બદલે <b>સ્ક્રીન નૅવિગેશન કીનો ઉપયોગ કરો</b>.</string>
   <string name="services_use_secure_sms">સુરક્ષિત SMS નો ઉપયોગ કરો</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> અન્ય ઉપયોગકર્તાઓ સાથેના SMS વાર્તાલાપો <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ડિવાઇસ પર એન્ક્રિપ્ટ કરશે જે સુ‌રક્ષિત SMSનો ઉપયોગ કરીને કરશે.</string>
@@ -78,4 +76,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="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>

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>
@@ -61,7 +56,6 @@
   <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> को सुधारने में मदद करें</string>
   <string name="services_metrics_label">सियानोजेन को अपने आप ही निदानात्मक और उपयोग से संबंधित डेटा भेजकर <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>। इस जानकारी का उपयोग आपको पहचानने के लिए नहीं हो सकता है। वह केवल बैटरी की आयु, ऐप के निष्पादन और नए <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> प्रकार्यों पर काम करने वाली टीमों की मदद के लिए है।</string>
   <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> थीम को लागू करें</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> जो अद्वितीय आइकन, वॉलपेपर, और फ़ॉन्टों को सक्षम करता है।</string>
   <string name="services_os_nav_keys_label">हार्डवेयर कुंजियों की जगह <b>स्क्रीन पर मौजूद नेविगेशन कुंजियों का उपयोग करें।</b></string>
   <string name="services_use_secure_sms">सुरक्षित एसएमएस का उपयोग करें</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> से सुरक्षित एसएमएस का उपयोग करने वाले अन्य उपयोगकर्ताओं के साथ के एसएमएस वार्तालापों को <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> उपकरण में कूटलेखित करें।</string>
@@ -78,4 +72,5 @@
   <string name="fingerprint_setup_backup_lock_method">अनलॉक करने की कोई दूसरी विधि भी सेट अप करें</string>
   <string name="fingerprint_setup_add_fingerprint">अपनी अँगुली छाप जोड़ें</string>
   <string name="fingerprint_setup_screen_lock_setup">स्क्रीन लॉक सेटअप करें</string>
+  <!-- MOD stuff -->
 </resources>

res/values-hr/strings.xml

@@ -20,6 +20,7 @@
   <string name="next">Dalje</string>
   <string name="skip">Preskoči</string>
   <string name="start">Započni</string>
+  <string name="done">Gotovo</string>
   <string name="ok">U redu</string>
   <string name="loading">Samo trenutak\u2026</string>
   <string name="setup_complete">Postavljanje je završeno.</string>
@@ -41,12 +42,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>
@@ -61,7 +61,7 @@
   <string name="services_help_improve_cm">Pomozite poboljšati <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Pomozite poboljšati CyanogenMod">%1$s</xliff:g> automatskim slanjem dijagnostike i korištenja podataka u Cyanogen. Ove informacije se neće koristiti za vašu identifikaciju i pomaže timovima koji rade na stvarima kao što su trajanje baterije, performanse aplikacija, i novim <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> karakteristikama.</string>
   <string name="services_apply_theme">Primijeni <xliff:g id="name" example="Material">%s</xliff:g> temu</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> omogućuje jedinstvene ikone, pozadine i fontove.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> omogućuje jedinstven vizualni stil za vaše ikone, pozadine i više.</string>
   <string name="services_os_nav_keys_label"><b>Koristite navigacijske tipke na zaslonu</b>umjesto hardverskih tipki.</string>
   <string name="services_use_secure_sms">Koristi siguran SMS</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> za zaštitu SMS razgovora s drugim korisnicima koristeći siguran SMS na<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> uređaju.</string>
@@ -78,4 +78,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="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">Vaš uređaj je MOD Spreman</string>
+  <string name="mod_description">Modovi čine telefon bržim, pametnijim i lakšim za korištenje. U ovom vodiču, možete otkriti nove modove, saznati što oni sve mogu, te ih omogućiti ili onemogućiti.</string>
+  <string name="mod_explore">Istražite MOD Vodič</string>
 </resources>

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>
@@ -61,7 +60,6 @@
   <string name="services_help_improve_cm">Segítsen javítani <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> a Cyanogen részére történő automatikus diagnosztikai és használati adatok küldésével. Ez az információ nem használható az Ön beazonosítására, csupán segítséget nyújt a csapat számára például az akkumulátor használat, alkalmazás teljesítmény, és más új <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funkciók fejlesztésében.</string>
   <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> téma alkalmazása</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> lehetővé teszi az egyéni ikonok, háttérképek és betűtípusok használatát.</string>
   <string name="services_os_nav_keys_label"><b>A képernyő navigációs gombjainak használata</b> a hardveres gombok helyett.</string>
   <string name="services_use_secure_sms">Biztonságos SMS használata</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> az SMS beszélgetések titkosításához más olyan felhasználókkal, akik szintén biztonságos SMS-t használnak <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> eszközön.</string>
@@ -78,4 +76,11 @@
   <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="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 -->
 </resources>

res/values-hy-rAM/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-in/strings.xml

@@ -41,12 +41,11 @@
   <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">Nyalakan data seluler</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>
@@ -61,7 +60,7 @@
   <string name="services_help_improve_cm">Membantu meningkatkan <xliff:g id="name" example="CyanogenMod">%s </xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> dengan mengirim data diagnostik dan penggunaan ke Cyanogen secara otomatis. Informasi ini tidak dapat mengidentifikasi Anda, dan hanya berfungsi untuk membantu tim bekerja dengan hal-hal seperti masa pakai baterai, kinerja aplikasi, dan fitur <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> baru.</string>
   <string name="services_apply_theme">Terapkan tema <xliff:g id="name" example="Material">%s </xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> memungkinkan ikon, gambar latar, dan font unik.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> mengaktifkan gaya visual unik untuk ikon, gambar latar dan lainnya.</string>
   <string name="services_os_nav_keys_label"><b>Digunakan pada tombol navigasi layar</b> bukan tombol perangkat keras.</string>
   <string name="services_use_secure_sms">Menggunakan SMS aman</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> untuk mengenkripsi percakapan SMS dengan pengguna lain menggunakan SMS aman pada perangkat <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,4 +77,11 @@
   <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="lockscreen_setup_title">Lindungi ponsel</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 -->
 </resources>

res/values-is-rIS/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-it/strings.xml

@@ -20,6 +20,7 @@
   <string name="next">Prossimo</string>
   <string name="skip">Salta</string>
   <string name="start">Inizio</string>
+  <string name="done">Fatto</string>
   <string name="ok">Ok</string>
   <string name="loading">Solo un secondo\u2026</string>
   <string name="setup_complete">Installazione completata</string>
@@ -41,15 +42,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>
@@ -61,7 +61,7 @@
   <string name="services_help_improve_cm">Aiuta a migliorare <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> inviando automaticamente dati diagnostici e di consumo agli svilupatori. Queste informazioni non possono essere utilizzate per identificare te e danno una mano ai team che lavorano su cose come la durata della batteria, performance delle app e nuove funzioni di <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">Applica il tema<xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> attiva icone, sfondi e caratteri unici.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> attiverà uno stile unico per le tue icone, sfondi e altro.</string>
   <string name="services_os_nav_keys_label"><b>Usa i pulsanti virtuali a schermo</b> invece di quelli fisici.</string>
   <string name="services_use_secure_sms">Utilizza SMS sicuri</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> per criptare le conversazioni con gli altri utenti via SMS su un dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -77,5 +77,15 @@
   <string name="fingerprint_setup_summary">Per usare le impronte digitali per sbloccare lo schermo, avrai bisogno di:</string>
   <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 un blocco schermo</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="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">Il tuo dispositivo è Mod Ready</string>
+  <string name="mod_description">Le Mod rendono il dispositivo più veloce, intelligente e facile da usare. In questa guida puoi esplorare nuove Mod, conoscerne il funzionamento, attivarle o disattivarle.</string>
+  <string name="mod_explore">Esplora la guida delle Mod</string>
 </resources>

res/values-iw/strings.xml

@@ -20,6 +20,7 @@
   <string name="next">הבא</string>
   <string name="skip">דלג</string>
   <string name="start">התחל</string>
+  <string name="done">בוצע</string>
   <string name="ok">אישור</string>
   <string name="loading">רק רגע\u2026</string>
   <string name="setup_complete">ההגדרה הושלמה</string>
@@ -41,15 +42,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>
@@ -61,7 +61,7 @@
   <string name="services_help_improve_cm">עזור בשיפור <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> על-ידי שליחת נתוני אבחון ושימוש אל Cyanogen. מידע זה לא יוכל לשמש כדי לזהותך, והוא תורם לצוותים העובדים על תחומים כמו חיי סוללה, ביצועים ותכונות חדשות ל-<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">החל את ערכת העיצוב <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> מאפשר סמלים ייחודיים, טפטים וגופנים.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> מאפשר סגנון גרפי ייחודי לסמלים, טפטים ועוד.</string>
   <string name="services_os_nav_keys_label"><b>השתמש במקשי הניווט במסך</b> במקום במקשים הפיזיים.</string>
   <string name="services_use_secure_sms">השתמש ב-SMS מאובטח</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> להצפנת שיחות SMS עם משתמשים אחרים באמצעות SMS מאובטח במכשיר <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,4 +78,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="lockscreen_setup_title">הגן על הטלפון שלך</string>
+  <string name="lockscreen_setup_summary"><b>הגן על מכשיר זה</b> ודרוש קוד אימות, קו או סיסמה לביטול נעילת המסך.</string>
+  <string name="lockscreen_setup_screen_lock_setup">‏הגדר PIN, קו ביטול נעילה או סיסמה</string>
+  <!-- MOD stuff -->
 </resources>

res/values-ja/strings.xml

@@ -20,6 +20,7 @@
   <string name="next">次へ</string>
   <string name="skip">スキップ</string>
   <string name="start">開始</string>
+  <string name="done">完了</string>
   <string name="ok">OK</string>
   <string name="loading">しばらくお待ちください\u2026</string>
   <string name="setup_complete">セットアップが完了しました</string>
@@ -41,8 +42,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>
@@ -61,10 +61,10 @@
   <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>の改善に協力します</string>
   <string name="services_metrics_label">診断と使用状況データを自動的にCyanogenに送信して、<xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>。この情報は個人を特定するために使用されることはなく、電池持ち、アプリのパフォーマンス、<xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>の新機能などへの取り組みに活用されます。</string>
   <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g>テーマを適用</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>すると、テーマ固有のアイコン、壁紙、フォントが有効になります。</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>すると、アイコンや壁紙などに対してテーマ固有の外観スタイルが有効になります。</string>
   <string name="services_os_nav_keys_label">ハードウェアキーのかわりに<b>スクリーンナビゲーションキーを使用します</b>。</string>
   <string name="services_use_secure_sms">セキュアSMSを使用します</string>
-  <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>端末でセキュアSMSを使用している他のユーザーとのSMSのスレッドを自動的に暗号化するために<xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>。</string>
+  <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>端末でセキュアSMSを使用している他のユーザーとのSMSの会話を自動的に暗号化するために<xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>。</string>
   <string name="setup_unlock">ロック解除</string>
   <string name="setup_device_locked">この端末はユーザーによってロックされています。</string>
   <string name="setup_require_cyanogen_label">工場出荷時の状態にリセットした後でも、この端末を使用するには<b>Cyanogen OSアカウントのパスワードの入力が必要です</b>。</string>
@@ -78,4 +78,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="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>

res/values-ka-rGE/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-kk-rKZ/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-km-rKH/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,6 @@
   <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> ಸುಧಾರಿಸಲು ಸಹಕರಿಸಿ</string>
   <string name="services_metrics_label">Cyanogenಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ವಿಶ್ಲೇಷಣಾತ್ಮಕ ಮತ್ತು ಬಳಕೆಯ ಡೇಟಾವನ್ನು ಕಳುಹಿಸುವುದರಿಂದ <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>. ಈ ಮಾಹಿತಿಯನ್ನು ನಿಮ್ಮನ್ನು ಗುರುತಿಸುವುದಕ್ಕಾಗಿ ಉಪಯೋಗಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ ಮತ್ತು ಇದನ್ನು ಬ್ಯಾಟರಿ ಲೈಫ್, ಆಪ್ ಕಾರ್ಯಕ್ಷಮತೆ, ಮತ್ತು ಹೊಸ <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ವೈಶಿಷ್ಟ್ಯಗಳಲ್ಲಿ ಕೆಲಸಮಾಡುವ ತಂಡಗಳಿಗೆ ನೀಡಲಾಗುವುದು.</string>
   <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> ಥೀಮ್ ಅನ್ವಯಿಸಿ</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ವಿಶಿಷ್ಟ್ಯವಾದ ಐಕಾನ್ಸ್, ವಾಲ್‍ಪೇಪರ್‍ಗಳು, ಮತ್ತು ಫಾಂಟ್ಸನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತಿದೆ.</string>
   <string name="services_os_nav_keys_label">ಹಾರ್ಡ್‍ವೇರ್ ಕೀಗಳ ಬದಲಾಗಿ <b>ಪರದೆಯ ಮೇಲಿನ ನಾವಿಗೇಶನ್ ಕೀಗಳನ್ನು ಉಪಯೋಗಿಸಿ</b>.</string>
   <string name="services_use_secure_sms">ಸುರಕ್ಷಿತ ಎಸ್ಎಂಎಸ್ ಉಪಯೋಗಿಸಿ</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ಸಾಧನದಲ್ಲಿ ಇತರೆ ಬಳಕೆದಾರರ ಜೊತೆಗಿನ ಎಸ್ಎಂಎಸ್ ಸಂಭಾಷಣೆಗಳನ್ನು ಸುರಕ್ಷಿತ ಎಸ್ಎಂಎಸ್ ಉಪಯೋಗಿಸಿ ಎನ್ಕ್ರಿಪ್ಟ್ ಮಾಡಲು <xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>.</string>
@@ -78,4 +76,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="lockscreen_setup_title">ನಿಮ್ಮ ಫೋನನ್ನು ರಕ್ಷಿಸಿ</string>
+  <string name="lockscreen_setup_summary"><b>ಸಾಧನ ರಕ್ಷಿಸಿ</b>. ಸ್ಕ್ರೀನ್‌ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಪಿನ್, ಪ್ಯಾಟರ್ನ್, ಪಾಸ್‌ವರ್ಡ್ ಬೇಕಾಗುತ್ತದೆ</string>
+  <string name="lockscreen_setup_screen_lock_setup">ಪಿನ್, ನಮೂನೆ ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ</string>
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,7 @@
   <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>의 개발 지원</string>
   <string name="services_metrics_label">진단 및 사용 정보를 Cyanogen에 보내 <xliff:g id="name" example="CyanogenMod 개선을 도와주십시오">%1$s</xliff:g>. 이 정보는 배터리 수명, 앱 성능과 새 <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> 기능과 같이 사용자를 식별할 수 없는 정보입니다.</string>
   <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> 테마 적용</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>은 독특한 아이콘, 배경화면과 폰트를 활성화합니다.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>은 독특한 아이콘, 배경화면 등을 제공합니다.</string>
   <string name="services_os_nav_keys_label">하드웨어 키 대신 <b>화면 상의 내비게이션 키</b>를 사용합니다.</string>
   <string name="services_use_secure_sms">보안 SMS 사용</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="보안 SMS를 사용">%1$s</xliff:g>하여 <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>기기에서 보안 SMS를 사용하는 다른 사용자와의 SMS 대화를 암호화함.</string>
@@ -79,4 +78,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="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>

res/values-ku/strings.xml

@@ -49,4 +49,5 @@
   <string name="services_privacy_policy">یاسای تایبەتی</string>
   <string name="setup_unlock">کردنەوە</string>
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-ky-rKG/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +56,6 @@
   <string name="services_help_improve_cm">Hëllef <xliff:g id="name" example="CyanogenMod">%s</xliff:g> ze verbesseren</string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> andeem s du automatesch Diagnos- a Benotzungsdaten u CyanogenMod schécks. Dës Informatioune kënnen net benotzt ginn, fir dech z\'identifiéieren. Et hëlleft eisen Equippen, déi u Saache wéi Akkulafzäit, App-Leeschtung oder un neie <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-Funktioune schaffen.</string>
   <string name="services_apply_theme">Den Design <xliff:g id="name" example="Material">%s</xliff:g> applizéieren</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>, fir spezifesch Symboler, Hannergrondbiller a Schrëften z\'aktivéieren.</string>
   <string name="services_os_nav_keys_label"><b>Schierm-Navigatiounstasten</b> amplaz Hardwaretaste benotzen.</string>
   <string name="services_use_secure_sms">Sécher SMSe benotzen</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>, fir SMS-Konversatioune mat anere Benotzer op engem <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-Apparat ze verschlësselen.</string>
@@ -78,4 +72,5 @@
   <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>
+  <!-- MOD stuff -->
 </resources>

res/values-lo-rLA/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +56,6 @@
   <string name="services_help_improve_cm">Padėti tobulinti <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> automatiškai siunčiant diagnostikos ir naudojimo duomenis „Cyanogen“. Ši informacija negali būti naudojama jūsų identifikavimui, pateikti duomenys padės komandoms dirbančioms prie akumuliatoriaus veikimo laiko, programų našumo ir naujų <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> funkcijų.</string>
   <string name="services_apply_theme">Taikyti <xliff:g id="name" example="Material">%s</xliff:g> temą</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> įgalina unikalias piktogramas, ekrano fonus ir šriftus.</string>
   <string name="services_os_nav_keys_label"><b>Naudokite ekrane rodomus naršymo klavišus</b> vietoj aparatūrinių klavišų.</string>
   <string name="services_use_secure_sms">Naudoti saugius SMS</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g>, kad užšifruoti SMS pokalbius su kitais vartotojais, naudojančiais saugius SMS <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> įrenginyje.</string>
@@ -78,4 +72,5 @@
   <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>
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +56,6 @@
   <string name="services_help_improve_cm">Palīdziet uzlabot <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Palīdziet uzlabot CyanogenMod">%1$s</xliff:g> automātiski sūtot diagnostikas informāciju un ierīces lietojumu uz Cyanogen serveriem. Šī informācija nevar tikt izmantota lai Jūs identificētu, bet gan palīdzēs komandām kas strādā pie baterijas taupīšana, lietotņu veiktspēja, jaunām <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> iespējām un citiem uzlabojumiem.</string>
   <string name="services_apply_theme">Lietot <xliff:g id="name" example="Material">%s</xliff:g> tēmu</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Lietot Materiālo tēmu">%s</xliff:g> ļaujot lietot unikālas ikonas, ekrāntapetes un fontus.</string>
   <string name="services_os_nav_keys_label"><b>Izmantot ekrānā redzamos navigācijas taustiņus</b> fizisko taustiņu vietā.</string>
   <string name="services_use_secure_sms">Izmantot drošu SIM</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Izmantot drošu SIM">%1$s</xliff:g> lai šifrētu SMS sarunas ar citiem lietotājiem, kas arī izmanto šifrētas SMS <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ierīcē.</string>
@@ -78,4 +72,5 @@
   <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>
+  <!-- MOD stuff -->
 </resources>

res/values-mk-rMK/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,6 @@
   <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> മെച്ചപ്പെടുത്താൻ സഹായിക്കുക</string>
   <string name="services_metrics_label">ഡയഗ്നോസ്റ്റിക്സ്, ഉപയോഗ ഡാറ്റ Cyanogen ലേക്ക് സ്വപ്രേരിതമായി അയക്കുന്നതിലൂടെ <xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>. ഈ വിവരങ്ങൾ നിങ്ങളെ തിരിച്ചറിയുന്നതിനായി ഉപയോഗിക്കാൻ കഴിയില്ല, ബാറ്ററിയുടെ ആയുസ്സ്, ആപ്ലിക്കേഷൻ പ്രകടനം, പുതിയ <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> സവിശേഷതകൾ തുടങ്ങിയ കാര്യങ്ങളിൽ പ്രവർത്തിക്കുന്ന ടീമുകളെ ഇത് സഹായിക്കുന്നു</string>
   <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> തീം പ്രയോഗിക്കുക</string>
-  <string name="services_apply_theme_label">വിശിഷ്ട ഐക്കണുകൾ, വാൾപേപ്പറുകൾ, ഫോണ്ടുകള്‍ എന്നിവയെ <xliff:g id="name" example="Apply the Material theme">%s</xliff:g> പ്രാപ്തമാക്കുന്നു.</string>
   <string name="services_os_nav_keys_label">ഹാര്‍ഡ്‌വെയര്‍ കീകൾക്ക് പകരം സ്ക്രീൻ <b>നാവിഗേഷൻ കീകൾ ഉപയോഗിക്കുക.</b></string>
   <string name="services_use_secure_sms">സുരക്ഷിത SMS ഉപയോഗിക്കുക</string>
   <string name="services_secure_sms_label">ഒരു <xliff:g id="name" example="Use secure SMS">%2$s</xliff:g> ഉപകരണത്തില്‍ സുരക്ഷിത SMS ഉപയോഗിച്ച് മറ്റ് ഉപയോക്താക്കളുമായി SMS സംഭാഷണങ്ങൾ എൻക്രിപ്റ്റ് ചെയ്യുന്നതിന് <xliff:g id="name" example="CyanogenMod">%1$s</xliff:g>.</string>
@@ -78,4 +76,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="lockscreen_setup_title">നിങ്ങളുടെ ഫോൺ പരിരക്ഷിക്കുക</string>
+  <string name="lockscreen_setup_summary"><b>ഈ ഉപകരണം പരിരക്ഷിക്കുക</b>, സ്‌ക്രീൻ അൺലോക്കുചെയ്യാൻ പിൻ,പാറ്റേൺ അല്ലെങ്കിൽ പാസ്‌വേഡ് ആവശ്യമാണ്</string>
+  <string name="lockscreen_setup_screen_lock_setup">പിൻ, പാറ്റേൺ അല്ലെങ്കിൽ പാസ്‌വേഡ് സജ്ജമാക്കുക</string>
+  <!-- MOD stuff -->
 </resources>

res/values-mn-rMN/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,6 @@
   <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>सुधारण्यासाठी मदत करा</string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> Cyanogen कडे निदानात्मक आणि वापर डेटा स्वयंचलितपणे पाठवून. तुम्हाला ओळखण्यासाठी ही माहिती वापरता येत नाही आणि बॅटरी आयु, अनुप्रयोगची कामगिरी आणि नवीन <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> वैशिष्ट्ये यांसारख्या गोष्टींवर काम करण्यासाठी संघांना हात देते.</string>
   <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> थीम लागू करा</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> वैशिष्ट्यपूर्ण प्रतीके, वॉलपेपर्स आणि फाँट्स सक्षम करणे.</string>
   <string name="services_os_nav_keys_label">हार्डवेअर कींच्या ऐवजी <b>स्क्रीन नॅविगेशन कींवर वापरा</b>.</string>
   <string name="services_use_secure_sms">सुरक्षित SMS वापरा</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> SMS संभाषणे <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> डिव्हाइसवर सुरक्षित SMS वापरणाऱ्या इतर वापरकर्त्यांसह एनक्रिप्ट करण्यासाठी.</string>
@@ -78,4 +76,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="lockscreen_setup_title">आपला फोन संरक्षित करा</string>
+  <string name="lockscreen_setup_summary"><b>हे डिव्हाइस संरक्षित करा</b> आणि स्क्रीन अनलॉक करण्यासाठी पिन, नमुना किंवा संकेतशब्द आवश्यक आहे</string>
+  <string name="lockscreen_setup_screen_lock_setup">पिन, नमुना किंवा संकेतशब्द सेट करा</string>
+  <!-- MOD stuff -->
 </resources>

res/values-ms-rMY/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-my-rMM/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

res/values-nb/strings.xml

@@ -20,6 +20,7 @@
   <string name="next">Neste</string>
   <string name="skip">Hopp over</string>
   <string name="start">Start</string>
+  <string name="done">OK</string>
   <string name="ok">Ok</string>
   <string name="loading">vent noen sekunder\u2026</string>
   <string name="setup_complete">Konfigureringen er ferdig</string>
@@ -41,11 +42,10 @@
   <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_gms"><b>Bruk Googles lokasjonstjeneste</b> for å hjelpe apper finne din posisjon. Dette betyr å sende anonym stedsinformasjon til Google, selv når ingen programmer kjører.</string>
+  <string name="location_network_telephony"><b>Bruk Wi-Fi og mobilnettverk</b> for å forbedre posisjonen din.</string>
+  <string name="location_network_gms"><b>Bruk Googles lokasjonstjeneste</b> for å hjelpe apps finne din posisjon. Dette betyr å sende anonym stedsinformasjon til Google, selv når ingen programmer kjører.</string>
   <string name="setup_mobile_data">Slå på mobildata</string>
   <string name="setup_mobile_data_no_service">Ingen tjeneste</string>
   <string name="setup_mobile_data_emergency_only">Kun nødanrop</string>
@@ -78,4 +78,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="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">Enheten din er MOD Klargjort</string>
+  <string name="mod_description">Mods gjør telefonen din raskere, smartere og enklere å bruke. I denne veiledningen, kan du oppdage nye mods, lære om hva de gjør, og aktivere eller deaktivere dem.</string>
+  <string name="mod_explore">Utforsk MOD Veiledning</string>
 </resources>

res/values-ne-rNP/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,6 @@
   <string name="services_help_improve_cm">Help mee met het verbeteren van <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> door automatisch diagnose- en verbruiksgegevens te verzenden naar Cyanogen. Deze informatie kan niet gebruikt worden om u te identificeren en helpt de teams om te werken aan zaken zoals levensduur van de accu, app-prestaties en nieuwe <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-functies.</string>
   <string name="services_apply_theme">Thema <xliff:g id="name" example="Material">%s</xliff:g> toepassen</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> voor unieke pictogrammen, achtergronden en lettertypen.</string>
   <string name="services_os_nav_keys_label"><b>On-screen navigatieknoppen</b> gebruiken in plaats van de hardwareknoppen.</string>
   <string name="services_use_secure_sms">Beveiligde sms-berichten gebruiken</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> om sms-gesprekken te versleutelen met anderen die ook beveiligde sms-berichten gebruiken op een <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>-apparaat.</string>
@@ -78,4 +76,11 @@
   <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="lockscreen_setup_title">Bescherm je 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>

res/values-oc-rFR/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,6 @@
   <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>ଉନ୍ନତି କରିବାରେ ସାହାଯ୍ୟ କରନ୍ତୁ</string>
   <string name="services_metrics_label">ଡାଇଗ୍ନୋଷ୍ଟିକ‍ ସ୍ୱତଃ ଭାବେ ପଠାଇ ଓ ସିଆନୋଜେନ୍‍କୁ ବ୍ୟବହୃତ ଡାଟା ପଠାଇ<xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> । ଏହି ସୂଚନା ଆପଣଙ୍କୁ ଚିହ୍ନଟ କରିବା ପାଇଁ ବ୍ୟବହୃତ କରିହେବ ନା୍ହିଁ ଓ ବ୍ୟାଟେରୀ ବ୍ୟବହାର ଅବଧି, ଆପ୍ଲିକେସନ୍‍ କାର୍ଯ୍ୟକାରିତା, ଓ ନୂଆ  <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ବୈଶିଷ୍ଟ୍ୟ ଉପରେ କାର୍ଯ୍ୟ କରିବାରେ ସାହାଯ୍ୟ କରିବ।</string>
   <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> ଥିମ୍‍ ଜାରି କରନ୍ତୁ</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ନିର୍ଦ୍ଦିଷ୍ଟ ଆଇକନ୍‍, ୱାଲ୍‍ପେପର୍‍, ଓ ଫଣ୍ଟ ସ‍କ୍ଷମ କରୁଛି।</string>
   <string name="services_os_nav_keys_label">ହା୍ର୍ଡ୍‍ଓୟାର୍‍ କୀ ବଦଳରେ<b>ଅନ୍‍ସ୍କ୍ରିନ୍‍ ନେଭିଗେସନ୍‍ କୀ ବ୍ୟବହାର କରନ୍ତୁ</b> ।</string>
   <string name="services_use_secure_sms">ସୁର‍କ୍ଷିତ SMS ବ୍ୟବହାର କରନ୍ତୁ</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$S</xliff:g> SMS କଥା୍ବାର୍ତ୍ତା ଅନ୍ୟ ଉପଭୋକ୍ତାଙ୍କ ସହିତ ସୁରଷିତ SMS  <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> ଡିଭାଇସ୍‍ରେ ବ୍ୟବହାର କରିବା ପାଇଁ।</string>
@@ -78,4 +76,6 @@
   <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>
+  <!-- MOD stuff -->
 </resources>

res/values-pa-rIN/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

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>
@@ -61,7 +60,7 @@
   <string name="services_help_improve_cm">Pomóż ulepszać <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Pomóż nam w ulepszaniu CyanogenMod">%1$s</xliff:g> zezwalając na automatyczne przesyłanie danych diagnostycznych oraz użytkowania do Cyanogen. Te informacje nie będą mogły zostać użyte do identyfikacji i stanowią pomoc dla zespołów pracujących nad czasem pracy baterii, wydajnością aplikacji oraz nowymi funkcjami <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">Zastosuj motyw <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> zawiera unikalne ikony, tapety oraz czcionki.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> zastosuje unikalny styl dla Twoich ikon, tapety i wiele więcej.</string>
   <string name="services_os_nav_keys_label"><b>Użyj ekranowych przycisków nawigacyjnych</b> zamiast klawiszy sprzętowych.</string>
   <string name="services_use_secure_sms">Używaj bezpiecznych wiadomości SMS</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Użyj bezpiecznych SMS">%1$s</xliff:g>, aby prowadzić szyfrowane konwersacje z innymi użytkownikami korzystającymi z bezpiecznych SMS na urządzeniach z <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,4 +77,11 @@
   <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="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 -->
 </resources>

res/values-pt-rBR/strings.xml

@@ -20,6 +20,7 @@
   <string name="next">Próximo</string>
   <string name="skip">Pular</string>
   <string name="start">Início</string>
+  <string name="done">Concluído</string>
   <string name="ok">Ok</string>
   <string name="loading">Aguarde um segundo\u2026</string>
   <string name="setup_complete">Configuração concluída</string>
@@ -41,15 +42,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="location_network_gms"><b>Use o serviço de localização do Google</b> para ajudar os aplicativos a determinarem sua localização. Isto significa enviar dados de localização anônimos para o Google, mesmo quando nenhum aplicativo estiver em execução.</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>
@@ -61,7 +61,7 @@
   <string name="services_help_improve_cm">Ajude a melhorar a <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> enviando automaticamente relatórios de uso de dados e diagnósticos para a Cyanogen. Esta informação não será usada para lhe identificar e ajuda as equipes responsáveis pela duração de bateria, desempenho dos aplicativos e novos recursos do <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">Aplicar o tema <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ativando fontes, papéis de parede e ícones exclusivos.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ativando um estilo visual exclusivo para os seus ícones, papéis de parede, etc.</string>
   <string name="services_os_nav_keys_label"><b>Use as teclas de navegação na tela</b> em vez de botões físicos.</string>
   <string name="services_use_secure_sms">Usar SMS seguro</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> para criptografar conversas SMS com outros usuários que usam o SMS seguro em um dispositivo <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
@@ -78,4 +78,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="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">Seu dispositivo esta pronto para MOD</string>
+  <string name="mod_description">Mods deixa o seu telefone mais rápido, mais inteligente e mais fácil de usar. Neste guia, você pode descobrir novos mods, aprende o que eles fazem e os ativa ou desativa.</string>
+  <string name="mod_explore">Guia de exploração de MODs</string>
 </resources>

res/values-pt-rPT/strings.xml

@@ -20,6 +20,7 @@
   <string name="next">Próximo</string>
   <string name="skip">Saltar</string>
   <string name="start">Início</string>
+  <string name="done">Concluído</string>
   <string name="ok">OK</string>
   <string name="loading">Um momento\u2026</string>
   <string name="setup_complete">A configuração está completa</string>
@@ -41,15 +42,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>
@@ -68,7 +68,7 @@
   <string name="setup_unlock">Desbloquear</string>
   <string name="setup_device_locked">Este dispositivo foi bloqueado pelo utilizador.</string>
   <string name="setup_require_cyanogen_label"><b>Exigir a palavra-passe da conta Cyanogen OS</b> para usar o dispositivo mesmo depois da reposição dos dados de fábrica.</string>
-  <string name="setup_device_locked_instructions"><i>Para ativar ou desativar este recurso, por favor vá a Definições de Segurança</i></string>
+  <string name="setup_device_locked_instructions"><i>Para ativar ou desativar este recurso, por favor vá a Definições &gt; Segurança</i></string>
   <string name="setup_warning_skip_anyway">Sem uma conta Cyanogen OS, não será capaz de: \n\nPersonalizar o telefone com novos ícones, imagens de fundo e muito mais na aplicação de Temas\n\nLocalizar ou apagar remotamente o seu telefone se estiver perdido</string>
   <!-- Fingerprint setup -->
   <string name="settings_fingerprint_setup_title">Selecione o tipo de bloqueio do ecrã da cópia de segurança</string>
@@ -78,4 +78,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="lockscreen_setup_title">Proteger o seu telemóvel</string>
+  <string name="lockscreen_setup_summary"><b>Proteja este disp.</b> e exija um PIN, seq. ou palavra-passe para desbloq. o ecrã</string>
+  <string name="lockscreen_setup_screen_lock_setup">Configurar PIN, sequência ou palavra-passe</string>
+  <!-- MOD stuff -->
+  <string name="mod_welcome">O seu dispositivo está pronto para os MODS</string>
+  <string name="mod_description">Os Mods tornam o seu telefone mais rápido, mais inteligente e mais fácil de usar. Neste guia pode descobrir novos mods, aprender o que eles fazem e ativá-los ou desativá-los.</string>
+  <string name="mod_explore">Explorar o Guia MOD</string>
 </resources>

res/values-rm/strings.xml

@@ -17,4 +17,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fingerprint setup -->
+  <!-- MOD stuff -->
 </resources>

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>
@@ -60,7 +59,6 @@
   <string name="services_privacy_policy">Politica de confidențialitate</string>
   <string name="services_help_improve_cm">Ajută la îmbunătățirea <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_apply_theme">Aplică tema <xliff:g id="name" example="Material">%s</xliff:g></string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> activând pictograme, imagini de fundal, și fonturi unice.</string>
   <string name="services_os_nav_keys_label"><b>Utilizează tastele de navigare de pe ecran</b> în locul tastelor fizice.</string>
   <string name="services_use_secure_sms">Utilizează SMS securizat</string>
   <string name="setup_unlock">Deblocare</string>
@@ -73,4 +71,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="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>

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>
@@ -61,7 +60,7 @@
   <string name="services_help_improve_cm">Помочь улучшить <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
   <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g>, разрешив отправление данных диагностики в Cyanogen. Эта информация полностью анонимна и не может быть использована для вашей идентификации. Использование этих данных поможет в работе над энергосбережением, производительностью и многими деталями <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
   <string name="services_apply_theme">Применить тему «<xliff:g id="name" example="Material">%s</xliff:g>»</string>
-  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> и использовать её значки, обои и шрифты.</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> предоставляет уникальный визуальный стиль для ваших значков, обоев и многого другого.</string>
   <string name="services_os_nav_keys_label"><b>Использовать экранные навигационные кнопки</b> вместо аппаратных.</string>
   <string name="services_use_secure_sms">Использовать безопасные SMS</string>
   <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%1$s</xliff:g> для шифрования сообщений, передаваемых другим пользователям устройств с <xliff:g id="name" example="CyanogenMod">%2$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="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>