Automatic translation import

Change-Id: Ic6ea5026d11093b716305389e3c58a7c0d2fa252
2015-08-24 05:35:41 +03:00 · 2015-08-20 14:58:34 -07:00 · 2015-06-22 21:12:36 +03:00 · 2015-06-01 22:00:32 +03:00 · 2015-05-22 16:59:25 -07:00 · 2015-05-19 14:44:55 -07:00
72 changed files with 1895 additions and 460 deletions
--- a/Android.mk
+++ b/Android.mk
@@ -17,8 +17,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
    play \
    libphonenumber

-LOCAL_JAVA_LIBRARIES += org.cyanogenmod.hardware
-
 # 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
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -66,10 +66,9 @@
    <application android:label="@string/app_name"
                 android:icon="@drawable/icon"
                 android:theme="@style/Theme.Setup"
+                 android:uiOptions="none"
                 android:name=".SetupWizardApp">

-        <uses-library android:name="org.cyanogenmod.hardware" android:required="false" />
-
        <meta-data android:name="com.google.android.gms.version"
                   android:value="@integer/google_play_services_version" />

@@ -77,9 +76,9 @@
                  android:label="@string/product_name"
                  android:launchMode="singleInstance"
                  android:excludeFromRecents="true"
-                  android:uiOptions="none"
                  android:configChanges="themeChange|mcc|mnc"
-                  android:immersive="true">
+                  android:immersive="true"
+                  android:windowSoftInputMode="stateAlwaysHidden">

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

--- a/res/anim/translucent_enter.xml
+++ b/res/anim/translucent_enter.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source 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.
+*/
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+     android:interpolator="@android:interpolator/decelerate_quad">
+   <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+           android:duration="@android:integer/config_shortAnimTime"/>
+</set>
--- a/res/anim/translucent_exit.xml
+++ b/res/anim/translucent_exit.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source 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.
+*/
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+     android:interpolator="@android:interpolator/accelerate_quad">
+    <alpha android:fromAlpha="1.0" android:toAlpha="0"
+           android:duration="@android:integer/config_shortAnimTime"/>
+</set>
--- a/res/layout/choose_data_sim_page.xml
+++ b/res/layout/choose_data_sim_page.xml
@@ -21,6 +21,13 @@

    <include layout="@layout/header" />

+    <ProgressBar
+        android:id="@+id/progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:indeterminateOnly="true"
+        android:layout_width="match_parent"
+        android:layout_height="8dp" />
+
    <FrameLayout android:id="@+id/page"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
@@ -35,7 +42,8 @@
                android:orientation="vertical"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                style="@style/PageContent">
+                style="@style/PageContent"
+                android:visibility="gone">

                <TextView
                    android:layout_width="match_parent"
--- a/res/layout/mobile_data_settings.xml
+++ b/res/layout/mobile_data_settings.xml
@@ -21,6 +21,13 @@

    <include layout="@layout/header" />

+    <ProgressBar
+        android:id="@+id/progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:indeterminateOnly="true"
+        android:layout_width="match_parent"
+        android:layout_height="8dp" />
+
    <FrameLayout android:id="@+id/page"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
@@ -31,10 +38,12 @@
                    android:fillViewport="true">

            <LinearLayout
+                android:id="@+id/page_view"
                android:orientation="vertical"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                style="@style/PageContent">
+                style="@style/PageContent"
+                android:visibility="gone">

                <TextView
                    android:id="@+id/mobile_data_summary"
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -38,6 +38,7 @@
  <string name="choose_data_sim_summary" product="default">Watter SIM wil jy gebruik vir data? Die gekose SIM kan netwerk koste aangaan, dit sal gebruik word met die opstel van jou foon.</string>
  <string name="date_time_summary">Stel jou tydsone en pas huidige datum en tyd toe, indien nodig</string>
  <string name="backup_data_summary"><b>Rugsteun</b> program data, Wi-Fi wagwoorde en ander instellings na Google-bedieners</string>
+  <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>
@@ -53,9 +54,14 @@
  <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>
  <string name="emergency_call">Noodoproep</string>
+  <string name="setup_services">Cyanogen funksies</string>
+  <string name="services_explanation" product="tablet">Hierdie dienste werk vir jou om die vermoëns van jou tablet uit te brei. Data sal in ooreenkomstig gebruik word met Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="services_explanation" product="default">Hierdie dienste werk vir jou om die vermoëns van jou foon uit te brei. Data sal in ooreenkomstig gebruik word met Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="services_privacy_policy">Privaatheid beleid</string>
  <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">%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">%s</xliff:g> funksies.</string>
+  <string name="services_apply_theme">Pas <xliff:g id="name" example="Material">%s</xliff:g> tema toe</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> aktiveer unieke ikone, agtergronde en lettertipe.</string>
  <string name="services_os_nav_keys_label"><b>Gebruik skerm navigasie sleutels</b> in plaas van hardeware sleutels.</string>
  <string name="services_use_secure_sms">Maak gebruik van veilige SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> om SMS gesprekke met ander gebruikers te enkripteer met behulp van veilige SMS op \'n  <xliff:g id="name" example="CyanogenMod">%s</xliff:g> toestel.</string>
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -0,0 +1,68 @@
+<?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">
+  <string name="app_name">معالج التثبيت</string>
+  <string name="next">القادم</string>
+  <string name="skip">تخطي</string>
+  <string name="start">البداية</string>
+  <string name="ok">موافق</string>
+  <string name="loading">ثانية واحدة</string>
+  <string name="setup_complete">اكتمل الإعداد</string>
+  <string name="setup_welcome">مرحباً</string>
+  <string name="setup_wifi">تحديد الواي فاي</string>
+  <string name="setup_sim_missing">شريحة SIM مفقودة</string>
+  <string name="setup_choose_data_sim">اختر شريحة SIM للبيانات</string>
+  <string name="setup_location">خدمات الموقع</string>
+  <string name="setup_other">خدمات أخرى</string>
+  <string name="setup_datetime">التاريخ والوقت</string>
+  <string name="setup_current_date">التاريخ الحالي</string>
+  <string name="setup_current_time">الوقت الحالي</string>
+  <string name="sim_missing_summary" product="tablet">لم يتم العثور على شريحة SIM في الكمبيوتر اللوحي الخاص بك. لإدخال شريحة SIM، عليك قراءة الإرشادات المرفقة بجهازك.</string>
+  <string name="sim_missing_summary" product="default">لم يتم العثور على شريحة SIM في هاتفك. لإدخال شريحة SIM، عليك قراءة الإرشادات المرفقة بجهازك.</string>
+  <string name="choose_data_sim_summary" product="tablet">أي شريحة SIM تريد استخدامها للبيانات؟ شريحة SIM المحددة قد يترتب عليها رسوماً للشبكة لأنها ستُستخدم لإعداد الكمبيوتر اللوحي الخاص بك.</string>
+  <string name="choose_data_sim_summary" product="default">أي شريحة SIM تريد استخدامها للبيانات؟ شريحة SIM المحددة قد يترتب عليها رسوماً للشبكة لأنها ستُستخدم لإعداد هاتفك.</string>
+  <string name="date_time_summary">تعيين المنطقة الزمنية الخاصة بك وضبط الوقت والتاريخ الحالي إذا لزم الأمر</string>
+  <string name="backup_data_summary"><b>إجراء نسخ احتياطي</b> لبيانات التطبيقات وكلمات مرور شبكات الواي فاي والإعدادات الأخرى على خوادم جوجل</string>
+  <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">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g> شريحة</string>
+  <string name="emergency_call">مكالمة طوارئ</string>
+  <string name="setup_services">ميزات Cyanogen</string>
+  <string name="services_explanation" product="tablet">تعمل هذه الخدمات  على توسيع نطاق إمكانيات الكمبيوتر اللوحي الخاص بك. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="services_explanation" product="default">تعمل هذه الخدمات  على توسيع نطاق إمكانيات هاتفك. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="services_privacy_policy">سياسة الخصوصية</string>
+  <string name="services_help_improve_cm">ساهم في تحسين <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s </xliff:g> بإرسال بيانات تشخيص المشكلات وبيانات الاستخدام تلقائياً إلى Cyanogen. هذه المعلومات لا يمكن استخدامها للتعرف عليك، لكنها تقدم المساعدة للفرق العاملة على جوانب مثل عمر البطارية وأداء التطبيقات، وميزات  <xliff:g id="name" example="CyanogenMod"> %s </xliff:g> الجديدة.</string>
+  <string name="services_apply_theme">تطبيق السمة <xliff:g id="name" example="Material">%s </xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s </xliff:g> تمكين الرموز الفريدة والخلفيات والخطوط.</string>
+  <string name="services_os_nav_keys_label"><b>استخدام مفاتيح التنقل على الشاشة</b> بدلاً من مفاتيح الأجهزة.</string>
+  <string name="services_use_secure_sms">استخدام شريحة SIM آمنة</string>
+  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s </xliff:g> لتشفير المحادثات عبر الرسائل القصيرة مع المستخدمين الآخرين باستخدام شريحة SMS آمنة على جهاز <xliff:g id="name" example="CyanogenMod"> %s </xliff:g>.</string>
+</resources>
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Llamada d\'emerxencia</string>
+  <string name="setup_services">Carauterístiques de Cyanogen</string>
+  <string name="services_explanation" product="tablet">Estos servicios furrulen por ti pa estender les capacidaes de la tableta. Los datos usaránse acordies cola <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string>
+  <string name="services_explanation" product="default">Estos servicios furrulen por ti pa estender les capacidaes del móvil. Los datos usaránse acordies cola <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string>
  <string name="services_privacy_policy">Política de privacidá</string>
  <string name="services_help_improve_cm">Ayudar a ameyorar <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%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">%s</xliff:g>.</string>
+  <string name="services_apply_theme">Aplicar el tema <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> habilitando iconos, fondos de pantalla y fontes únicos.</string>
  <string name="services_os_nav_keys_label"><b>Usar tecles de navegación na pantalla</b> en cuantes de tecles físiques.</string>
  <string name="services_use_secure_sms">Usar SMS seguru</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> pa cifrar conversaciones SMS con otros usuarios usando SMS seguru nun preséu <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -16,9 +16,16 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="app_name">Quraşdırma Sehrbazı</string>
+  <string name="next">Sonrakı</string>
+  <string name="skip">Ötür</string>
  <string name="setup_choose_data_sim">Verilənlər üçün bir SIM seçin</string>
  <string name="choose_data_sim_summary" product="tablet">Hansı SIM\'dən verilənlər üçün istifadə etmək istəyirsiz? Şəbəkə planşetinizin quraşdırılması üçün seçilən SIM\'ə görə ödəniş tətbiq edə bilər.</string>
  <string name="choose_data_sim_summary" product="default">Hansı SIM\'dən verilənlər üçün istifadə etmək istəyirsiz? Şəbəkə telefonunuzun quraşdırılması üçün seçilən SIM\'ə görə ödəniş tətbiq edə bilər.</string>
  <string name="backup_data_summary">Tətbiqetmə verilənlərini, Wi-Fi şifrələri və digər tənzimləmələri Google serverlərinə <b>nüsxələ</b></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="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="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></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>
 </resources>
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -39,13 +39,13 @@
  <string name="date_time_summary">Estableix el teu fus horari i ajusta la data i hora actual si és necessari</string>
  <string name="backup_data_summary"><b>Fes una còpia de seguretat</b> de les dades de les app, contrasenyes Wi-Fi, i altres ajustaments als servidors de Google</string>
  <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 apps de tercers recopilar i utilitzar dades com la teva ubicació aproximada. Per exemple, una app pot utilitzar la teva ubicació aproximada per localitzar cafeteries als voltants.</string>
-  <string name="location_access_summary"><b>Permet a les apps 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 apps 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 apps utilitzar el GPS del teu telèfon.</string>
-  <string name="location_network"><b>Utilitza Wi-Fi</b> per ajudar a les apps 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 apps a determinar la teva ubicació.</string>
-  <string name="location_network_gms"><b>Utilitza el servei d\'ubicació de Google</b> per ajudar a les apps a determinar la teva ubicació. Això implica l\'enviament de dades anònimes d\'ubicació a Google, fins i tot quan no hi ha apps en execució.</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_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_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_no_service">Sense servei</string>
  <string name="setup_mobile_data_emergency_only">Només trucades d\'emergència</string>
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Trucada d\'emergència</string>
+  <string name="setup_services">Característiques Cyanogen</string>
+  <string name="services_explanation" product="tablet">Aquests serveis serveixen per ampliar les capacitats de la teva tauleta. Les dades s\'utilitzaran d\'acord amb la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string>
+  <string name="services_explanation" product="default">Aquests serveis serveixen per ampliar les capacitats del teu telèfon. Les dades s\'utilitzaran d\'acord amb la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string>
  <string name="services_privacy_policy">Política de privacitat</string>
  <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">%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 app i noves característiques de <xliff:g id="name" example="CyanogenMod"> %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_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">%s</xliff:g> per xifrarr les converses SMS amb altres usuaris mitjançant SMS segurs en un dispositiu <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Tísňové volání</string>
+  <string name="setup_services">Cyanogen funkce</string>
+  <string name="services_explanation" product="tablet">Tyto služby rozšířují funkce vašeho tabletu. Data budou použita v souladu se zásadami ochrany osobních údajů Cyanogen <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string>
+  <string name="services_explanation" product="default">Tyto služby rozšiřují funkce vašeho telefonu. Data budou použita v souladu se zásadami ochrany osobních údajů Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="services_privacy_policy">Zásady ochrany osobních údajů</string>
  <string name="services_help_improve_cm">Pomozte zlepšovat <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
-  <string name="services_metrics_label">&lt;b&gt;Pomozte zlepšovat <xliff:g id="name" example="CyanogenMod">%s</xliff:g>&lt;/b&gt; automatickým odesíláním dat o používání do Cyanogenu. Tyto informace nebudou použity k vaší identifikaci, ale pomohou vývojářům v práci na věcech jako výdrž baterie, rychlost aplikací nebo vývoj nových <xliff:g id="name" example="CyanogenMod">%s</xliff:g> funkcí.</string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> automatickým odesíláním dat o používání. 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í <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="services_apply_theme">Použít motiv <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> povolí unikátní ikony, tapety a písma.</string>
  <string name="services_os_nav_keys_label"><b>Použít navigační klávesy na obrazovce</b> namísto hw kláves.</string>
  <string name="services_use_secure_sms">Použít zabezpečené SMS</string>
  <string name="services_secure_sms_label">Použijte aplikaci <xliff:g id="name" example="Use secure SMS">%s</xliff:g> pro šifrované SMS a zabezpečenou komunikaci na zařízení <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Nødopkald</string>
+  <string name="setup_services">Cyanogen-funktioner</string>
+  <string name="services_explanation" product="tablet">Disse tjenester giver dig flere muligheder med din tablet. Data bliver anvendt i overensstemmelse med Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="services_explanation" product="default">Disse tjenester giver dig flere muligheder med din telefon. Data bliver anvendt i overensstemmelse med Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="services_privacy_policy">Privatlivspolitik</string>
  <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">%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">%s</xliff:g> funktioner.</string>
+  <string name="services_apply_theme">Anvend temaet <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> giver unikke ikoner, baggrunde og skrifttyper.</string>
  <string name="services_os_nav_keys_label"><b>Brug navigationstaster på skærmen</b> i stedet for fysiske knapper.</string>
  <string name="services_use_secure_sms">Brug sikker SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%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">%s</xliff:g> enhed.</string>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -40,9 +40,12 @@
  <string name="backup_data_summary"><b>Sichert</b> App-Daten, WLAN-Passwörter und andere Einstellungen auf Google-Servern</string>
  <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, wie z. B. Ihren ungefähren Standort zu bestimmen und zu verwenden. Zum Beispiel 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 nach Ihrer Berechtigung gefragt haben,</b> Standortinformationen zu verwenden. Diese können Ihren derzeitigen und vergangenen Standort beinhalten.</string>
  <string name="location_gps" product="tablet"><b>Standortgenauigkeit erhöhen</b>, indem Apps erlaubt wird, GPS an Ihrem Tablet zu verwenden.</string>
  <string name="location_gps" product="default"><b>Standortgenauigkeit erhöhen</b>, indem Apps erlaubt wird, GPS an Ihrem Telefon zu verwenden.</string>
+  <string name="location_network"><b>WLAN nutzen</b>, um Apps zu helfen, Ihren Standort zu ermitteln.</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_gms"><b>Googles Standortdienst verwenden</b>, um Apps bei der Bestimmung Ihrer Position zu helfen. 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_no_service">Kein Netz</string>
  <string name="setup_mobile_data_emergency_only">Nur Notrufe</string>
@@ -51,9 +54,14 @@
  <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>
  <string name="emergency_call">Notruf</string>
+  <string name="setup_services">Cyanogen-Funktionen</string>
+  <string name="services_explanation" product="tablet">Diese Dienste werden verwendet, um die Funktionen Ihres Tablets zu erweitern. Die Daten werden in Übereinstimmung mit Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g> verwendet.</string>
+  <string name="services_explanation" product="default">Diese Dienste werden verwendet, um die Funktionen Ihres Telefons zu erweitern. Die Daten werden in Übereinstimmung mit Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g> verwendet.</string>
  <string name="services_privacy_policy">Datenschutzbestimmungen</string>
  <string name="services_help_improve_cm">Helfen Sie <xliff:g id="name" example="CyanogenMod">%s</xliff:g> zu verbessern</string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> indem Sie automatisch Diagnose- und Nutzungsdaten an CyanogenMod senden. Diese Information können nicht verwendet werden, um Sie zu identifizieren. Es hilft unseren Teams, die an Dingen wie Akkulaufzeit, App-Leistung oder an neuen <xliff:g id="name" example="CyanogenMod">%s</xliff:g>-Funktionen arbeiten.</string>
+  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g>-Design anwenden</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>, um spezifische Symbole, Hintergrundbilder und Schriftarten zu aktivieren.</string>
  <string name="services_os_nav_keys_label"><b>Bildschirm-Navigationstasten</b> statt Hardwaretasten verwenden.</string>
  <string name="services_use_secure_sms">Sichere SMS verwenden</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g>, um SMS-Konversationen mit anderen Nutzern auf einem <xliff:g id="name" example="CyanogenMod">%s</xliff:g>-Gerät zu verschlüsseln.</string>
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Κλήση έκτακτης ανάγκης</string>
+  <string name="setup_services">Χαρακτηριστικά Cyanogen</string>
+  <string name="services_explanation" product="tablet">Οι υπηρεσίες αυτές έχουν σκοπό να επεκτείνουν τις δυνατότητες του tablet σας. Τα δεδομένα θα χρησιμοποιηθούν σύμφωνα με την <xliff:g id="name" example="Privacy Policy">%s</xliff:g> της Cyanogen.</string>
+  <string name="services_explanation" product="default">Οι υπηρεσίες αυτές έχουν σκοπό να επεκτείνουν τις δυνατότητες του τηλεφώνου σας. Τα δεδομένα θα χρησιμοποιηθούν σύμφωνα με την <xliff:g id="name" example="Privacy Policy">%s</xliff:g> της Cyanogen.</string>
  <string name="services_privacy_policy">Πολιτική απορρήτου</string>
  <string name="services_help_improve_cm">Βοηθήστε στη βελτίωση του <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> στέλνοντας αυτόματα διαγνωστικά δεδομένα και στατιστικά χρήσης στη Cyanogen. Αυτές οι πληροφορίες δε μπορούν να χρησιμοποιηθούν για να σας αναγνωρίσουν και δίνουν ένα χέρι βοηθείας στις ομάδες που εργάζονται σε θέματα όπως η διάρκεια ζωής μπαταρίας, επιδόσεις εφαρμογών και νέα χαρακτηριστικά του <xliff:g id="name" example="CyanogenMod">%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">%s</xliff:g> για να κρυπτογραφήσετε τις συνομιλίες SMS με άλλους χρήστες που χρησιμοποιούν ασφαλή SMS σε συσκευές <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -0,0 +1,68 @@
+<?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">
+  <string name="app_name">Setup Wizard</string>
+  <string name="next">Next</string>
+  <string name="skip">Skip</string>
+  <string name="start">Start</string>
+  <string name="ok">OK</string>
+  <string name="loading">Just a sec\u2026</string>
+  <string name="setup_complete">Setup is complete</string>
+  <string name="setup_welcome">Welcome</string>
+  <string name="setup_wifi">Select Wi-Fi</string>
+  <string name="setup_sim_missing">SIM card missing</string>
+  <string name="setup_choose_data_sim">Choose a SIM for data</string>
+  <string name="setup_location">Location services</string>
+  <string name="setup_other">Other services</string>
+  <string name="setup_datetime">Date &amp; time</string>
+  <string name="setup_current_date">Current date</string>
+  <string name="setup_current_time">Current time</string>
+  <string name="sim_missing_summary" product="tablet">A SIM card has not been detected in your tablet. To insert a SIM card, read the instructions that came with your device.</string>
+  <string name="sim_missing_summary" product="default">A SIM card has not been detected in your phone. To insert a SIM card, read the instructions that came with your device.</string>
+  <string name="choose_data_sim_summary" product="tablet">Which SIM do you want to use for data? The selected SIM may incur network charges as it will be used to set up your tablet.</string>
+  <string name="choose_data_sim_summary" product="default">Which SIM do you want to use for data? The selected SIM may incur network charges as it will be used to set up your phone.</string>
+  <string name="date_time_summary">Set your time zone and adjust current date and time if needed</string>
+  <string name="backup_data_summary"><b>Back up</b> app data, Wi-Fi passwords, and other settings to Google servers</string>
+  <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>
+  <string name="emergency_call">Emergency call</string>
+  <string name="setup_services">Cyanogen features</string>
+  <string name="services_explanation" product="tablet">These services work for you to extend the capabilities of your tablet. Data will be used in accordance with Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="services_explanation" product="default">These services work for you to extend the capabilities of your phone. Data will be used in accordance with Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <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_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%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">%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">%s</xliff:g> to encrypt SMS conversations with other users using secure SMS on a <xliff:g id="name" example="CyanogenMod">%s</xliff:g> device.</string>
+</resources>
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -0,0 +1,68 @@
+<?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">
+  <string name="app_name">Setup Wizard</string>
+  <string name="next">Next</string>
+  <string name="skip">Skip</string>
+  <string name="start">Start</string>
+  <string name="ok">OK</string>
+  <string name="loading">Just a sec\u2026</string>
+  <string name="setup_complete">Setup is complete</string>
+  <string name="setup_welcome">Welcome</string>
+  <string name="setup_wifi">Select Wi-Fi</string>
+  <string name="setup_sim_missing">SIM card missing</string>
+  <string name="setup_choose_data_sim">Choose a SIM for data</string>
+  <string name="setup_location">Location services</string>
+  <string name="setup_other">Other services</string>
+  <string name="setup_datetime">Date &amp; time</string>
+  <string name="setup_current_date">Current date</string>
+  <string name="setup_current_time">Current time</string>
+  <string name="sim_missing_summary" product="tablet">A SIM card has not been detected in your tablet. To insert a SIM card, read the instructions that came with your device.</string>
+  <string name="sim_missing_summary" product="default">A SIM card has not been detected in your phone. To insert a SIM card, read the instructions that came with your device.</string>
+  <string name="choose_data_sim_summary" product="tablet">Which SIM do you want to use for data? The selected SIM may incur network charges as it will be used to set up your tablet.</string>
+  <string name="choose_data_sim_summary" product="default">Which SIM do you want to use for data? The selected SIM may incur network charges as it will be used to set up your phone.</string>
+  <string name="date_time_summary">Set your time zone and adjust current date and time if needed</string>
+  <string name="backup_data_summary"><b>Back up</b> app data, Wi-Fi passwords, and other settings to Google servers</string>
+  <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>
+  <string name="emergency_call">Emergency call</string>
+  <string name="setup_services">Cyanogen features</string>
+  <string name="services_explanation" product="tablet">These services work for you to extend the capabilities of your tablet. Data will be used in accordance with Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="services_explanation" product="default">These services work for you to extend the capabilities of your phone. Data will be used in accordance with Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <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_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%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">%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">%s</xliff:g> to encrypt SMS conversations with other users using secure SMS on a <xliff:g id="name" example="CyanogenMod">%s</xliff:g> device.</string>
+</resources>
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -0,0 +1,68 @@
+<?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">
+  <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_gps" product="tablet"><b>Plibonigi vian lokigon</b> permesante aplikaĵojn uzi la GPS de via tabuleto.</string>
+  <string name="location_gps" product="default"><b>Plibonigi vian lokigon</b> permesante aplikaĵojn uzi la GPS de via telefono.</string>
+  <string name="location_network"><b>Uzi Vifion</b> por helpi aplikaĵojn koni vian lokigon.</string>
+  <string name="location_network_telephony"><b>Uzi Vifion kaj porteblajn retojn</b> por helpi aplikaĵojn koni vian lokigon.</string>
+  <string name="location_network_gms"><b>Uzi lokigan servon de Google</b> por helpi aplikaĵojn koni vian lokigon. Tio signifas sendi anonimajn lokigajn datumojn al Google, eĉ kiam neniu aplikaĵo funkcias.</string>
+  <string name="setup_mobile_data">Ŝalti poŝkomputilan reton</string>
+  <string name="setup_mobile_data_no_service">Neniu servo</string>
+  <string name="setup_mobile_data_emergency_only">Nur urĝaj alvokoj</string>
+  <string name="enable_mobile_data_summary">Ĉu vi deziras uzi retajn datumojn dum agordo ?  Ŝalti retan aliron povas okazi pliajn kostojn.</string>
+  <string name="no">Ne</string>
+  <string name="yes">Jes</string>
+  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
+  <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_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> per aŭtomata sendado de diagnozaj kaj uzaj datumoj al Cyanogen. Tiuj informoj ne kapablos identigi vin kaj helpos programistojn kiuj laboras pri bateria vivdaŭro, aplikaĵa rendimento kaj novaj <xliff:g id="name" example="CyanogenMod">%s</xliff:g> funkcioj.</string>
+  <string name="services_apply_theme">Apliki la etoson <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ŝaltas unikajn piktogramojn, ekranfonojn kaj fontojn.</string>
+  <string name="services_os_nav_keys_label"><b>Uzi ekran-klavojn </b> anstataŭ tiujn de la aparato.</string>
+  <string name="services_use_secure_sms">Uzi sekurajn SMS</string>
+  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> por ĉifri SMS dialogojn kun aliaj uzantoj per sekuraj SMS sur <xliff:g id="name" example="CyanogenMod">%s</xliff:g> aparatoj.</string>
+</resources>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -27,7 +27,7 @@
  <string name="setup_wifi">Selecciona una red Wi-Fi</string>
  <string name="setup_sim_missing">Falta la tarjeta SIM</string>
  <string name="setup_choose_data_sim">Elige una SIM para datos</string>
-  <string name="setup_location">Servicios de localizacion</string>
+  <string name="setup_location">Servicios de ubicación</string>
  <string name="setup_other">Otros servicios</string>
  <string name="setup_datetime">Fecha y hora</string>
  <string name="setup_current_date">Fecha actual</string>
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Llamada de emergencia</string>
+  <string name="setup_services">Características de Cyanogen</string>
+  <string name="services_explanation" product="tablet">Estos servicios sirven para extender las capacidades del tablet. Se utilizarán datos de acuerdo a la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string>
+  <string name="services_explanation" product="default">Estos servicios sirven para extender las capacidades del teléfono. Se utilizarán datos de acuerdo a la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Cyanogen.</string>
  <string name="services_privacy_policy">Política de Privacidad</string>
  <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="Ayuda a mejorar CyanogenMod">%s</xliff:g> enviando automáticamente datos de diagnóstico y uso a Cyanogen. Esta información no puede utilizarse para identificarte y sirve de ayuda a los equipos que trabajan en aspectos como la duración de la batería, rendimiento de las aplicaciones y nuevas características de <xliff:g id="name" example="CyanogenMod">%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 especiales, fondo de pantalla y fuentes.</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="Usar SMS seguro">%s</xliff:g> para cifrar conversaciones SMS con otros usuarios usando SMS seguros en tu dispositivo <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -0,0 +1,68 @@
+<?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">
+  <string name="app_name">Ezarpen laguntzailea</string>
+  <string name="next">Hurrengoa</string>
+  <string name="skip">Saltatu</string>
+  <string name="start">Hasi</string>
+  <string name="ok">Ados</string>
+  <string name="loading">Une bat\u2026</string>
+  <string name="setup_complete">Ezarpena burutu da</string>
+  <string name="setup_welcome">Ongi etorri</string>
+  <string name="setup_wifi">Hautatu Wi-Fia</string>
+  <string name="setup_sim_missing">SIM txartela falta da</string>
+  <string name="setup_choose_data_sim">Hautatu datuetarako SIM txartela</string>
+  <string name="setup_location">Kokaleku zerbitzuak</string>
+  <string name="setup_other">Bestelako zerbitzuak</string>
+  <string name="setup_datetime">Data eta ordua</string>
+  <string name="setup_current_date">Uneko data</string>
+  <string name="setup_current_time">Uneko ordua</string>
+  <string name="sim_missing_summary" product="tablet">Ez da SIM txartelik antzeman zure tabletan. SIM txartel bat sartzeko jarraitu zure gailuarekin zetozen argibideak.</string>
+  <string name="sim_missing_summary" product="default">Ez da SIM txartelik antzeman zure telefonoan. SIM txartel bat sartzeko jarraitu zure gailuarekin zetozen argibideak.</string>
+  <string name="choose_data_sim_summary" product="tablet">Zein SIM erabili nahi duzu datu mugikorretarako? Hautatutako SIM txartelean gastuak sor litzake zure tableta ezartzeko erabiliko baita.</string>
+  <string name="choose_data_sim_summary" product="default">Zein SIM erabili nahi duzu datu mugikorretarako? Hautatutako SIM txartelean gastuak sor litzake zure telefonoa ezartzeko erabiliko baita.</string>
+  <string name="date_time_summary">Ezarri zure ordu-zona eta doitu oraingo data beharrezkoa bada</string>
+  <string name="backup_data_summary">Aplikazio datuen, Wi-Fi pasahitzen, eta bestelako ezarpenen <b>babeskopia</b> egin Google zerbitzarietan</string>
+  <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_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_gms"><b>Erabili Google kokaleku zerbitzua</b> aplikazioei zure kokalekua zehazten laguntzeko. Honek Google-i 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>
+  <string name="setup_mobile_data_emergency_only">Larrialdi deiak besterik ez</string>
+  <string name="enable_mobile_data_summary">Datu mugikorrak erabili nahi dituzu ezarpenean? Datu mugikorrak pizteak gastuak ekar ditzake.</string>
+  <string name="no">Ez</string>
+  <string name="yes">Bai</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">Larrialdi deia</string>
+  <string name="setup_services">Cyanogen ezaugarriak</string>
+  <string name="services_explanation" product="tablet">Zerbitzu hauek tabletaren gaitasunak hobetzeko zure mesedetan egiten dute lan. Datuak Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g> arabera erabiliko dira.</string>
+  <string name="services_explanation" product="default">Zerbitzu hauek telefonoaren gaitasunak hobetzeko zure mesedetan egiten dute lan. Datuak Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g> arabera erabiliko dira.</string>
+  <string name="services_privacy_policy">Pribatutasun politika</string>
+  <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">%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">%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_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">%s</xliff:g> <xliff:g id="name" example="CyanogenMod">%s</xliff:g> gailu batean SMS segurua erabiltzen duten beste erabiltzaileekin dituzun SMS elkarrizketak zifratzeko.</string>
+</resources>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -0,0 +1,68 @@
+<?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">
+  <string name="app_name">آموزش راه‌اندازی</string>
+  <string name="next">بعدی</string>
+  <string name="skip">رد شدن</string>
+  <string name="start">شروع</string>
+  <string name="ok">بسیارخب</string>
+  <string name="loading">یک لحظه لطفا\u2026</string>
+  <string name="setup_complete">راه‌اندازی کامل شد</string>
+  <string name="setup_welcome">خوش آمدید</string>
+  <string name="setup_wifi">انتخاب وای‌فای</string>
+  <string name="setup_sim_missing">سیم کارت موجود نیست</string>
+  <string name="setup_choose_data_sim">انتخاب سیم کارت برای داده همراه</string>
+  <string name="setup_location">خدمات مکان</string>
+  <string name="setup_other">سایر خدمات</string>
+  <string name="setup_datetime">تاریخ &amp; زمان</string>
+  <string name="setup_current_date">تاریخ کنونی</string>
+  <string name="setup_current_time">زمان کنونی</string>
+  <string name="sim_missing_summary" product="tablet">سیم کارتی در تبلت شما یافت نشد. برای قرار دادن یک سیم کارت، دستورالعمل همراه دستگاه خود را بخوانید.</string>
+  <string name="sim_missing_summary" product="default">سیم کارتی در گوشی شما یافت نشد. برای قرار دادن یک سیم کارت، دستورالعمل همراه دستگاه خود را بخوانید.</string>
+  <string name="choose_data_sim_summary" product="tablet">از کدام سیم کارت برای داده همراه می خواهید استفاده کنید؟ انتخاب سیم کارت ممکن است هزینه های شبکه ایجاد کند چرا که برای راه‌اندازی تبلت شما استفاده می شود.</string>
+  <string name="choose_data_sim_summary" product="default">از کدام سیم کارت برای داده همراه می خواهید استفاده کنید؟ انتخاب سیم کارت ممکن است هزینه های شبکه ایجاد کند چرا که برای راه‌اندازی گوشی شما استفاده می شود.</string>
+  <string name="date_time_summary">در صورت نیاز منطقه‌ی زمانی خود و تاریخ و زمان فعلی را تنظیم کنید</string>
+  <string name="backup_data_summary">از داده‌های برنامه‌ها، گذرواژه وای‌فای و دیگر تنظیمات در سرورهای گوگل پشتیبان بگیر</string>
+  <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">با اجازه دادن به برنامه‌ها برای استفاده از GPS تبلت، <b>دقت موقعیت خود را بهبود بخشید</b>.</string>
+  <string name="location_gps" product="default">با اجازه دادن به برنامه‌ها برای استفاده از جی‌پی‌اس گوشی، <b>دقت موقعیت خود را بهبود بخشید</b>.</string>
+  <string name="location_network">برای کمک به برنامه‌ها در تعیین مکانتان از وای‌فای استفاده کنید.</string>
+  <string name="location_network_telephony">برای کمک به برنامه‌ها در تعیین مکانتان از وای‌فای وشبکه‌های همراه استفاده کنید.</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>
+  <string name="emergency_call">تماس اضطراری</string>
+  <string name="setup_services">ویژگی‌های سایانوژن</string>
+  <string name="services_explanation" product="tablet">این خدمات برای افزایش قابلیت‌های تبلت شما هستند. داده‌ها مطابق با <xliff:g id="name" example="Privacy Policy">%s</xliff:g> سایانوژن استفاده خواهند شد.</string>
+  <string name="services_explanation" product="default">این خدمات برای افزایش قابلیت‌های گوشی شما هستند. داده‌ها مطابق با <xliff:g id="name" example="Privacy Policy">%s</xliff:g> سایانوژن استفاده خواهند شد.</string>
+  <string name="services_privacy_policy">سیاست حفظ حریم خصوصی</string>
+  <string name="services_help_improve_cm">به بهبود <xliff:g id="name" example="CyanogenMod">%s</xliff:g> کمک کنید</string>
+  <string name="services_metrics_label">به وسیله ارسال خودکار داده‌های تشخیصی و استفاده به سایانوژن، <xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g>. از این داده‌ها برای شناسایی شما استفاده نمی‌شود و تنها برای کمک به گروه‌هایی که روی مواردی مانند عمر باتری، عملکرد برنامه و قابلیت‌های جدید <xliff:g id="name" example="CyanogenMod">%s</xliff:g> features کار می‌کنند استفاده می‌شود.</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">%s</xliff:g> برای رمزگذاری گفتگوهای پیامکی با کاربران دیگر با استفاده ازپیامک امن در یک دستگاه <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+</resources>
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -38,7 +38,7 @@
  <string name="choose_data_sim_summary" product="default">Mitä SIM-korttia haluat käyttää mobiilitiedonsiirtoon? Mobiilidatan käyttö voi aiheuttaa tiedonsiirtokuluja.</string>
  <string name="date_time_summary">Valitse aikavyöhyke ja määritä aika ja päivämäärä tarvittaessa</string>
  <string name="backup_data_summary"><b>Varmuuskopioi</b> sovellusten tiedot, Wi-FI-salasanat ja muut asetukset Googlen palvelimille</string>
-  <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>n mukaisesti.</string>
+  <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>
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Hätäpuhelu</string>
+  <string name="setup_services">Cyanogen-ominaisuudet</string>
+  <string name="services_explanation" product="tablet">Nämä palvelut toimivat tablettisi ominaisuuksien parantamiseksi. Tietoja käytetään Cyanogenin <xliff:g id="name" example="Privacy Policy">%s</xliff:g> mukaisesti.</string>
+  <string name="services_explanation" product="default">Nämä palvelut toimivat puhelimesi ominaisuuksien parantamiseksi. Tietoja käytetään Cyanogenin <xliff:g id="name" example="Privacy Policy">%s</xliff:g> mukaisesti.</string>
  <string name="services_privacy_policy">Tietosuojakäytännön</string>
  <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">%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">%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_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">%s</xliff:g> salataksesi tekstiviestikeskustelut muiden turvallisia tekstiviestejä ja <xliff:g id="name" example="CyanogenMod">%s</xliff:g>ia käyttävien henkilöiden kanssa.</string>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -54,9 +54,14 @@
  <string name="yes">Oui</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">Appel d\'urgence</string>
+  <string name="setup_services">Fonctionnalités Cyanogen</string>
+  <string name="services_explanation" product="tablet">Ces services fonctionnent pour étendre les fonctionnalités de votre tablette. Les données seront utilisées conformément à la <xliff:g id="name" example="Politique de confidentialité">%s</xliff:g> de Cyanogen.</string>
+  <string name="services_explanation" product="default">Ces services fonctionnent pour étendre les fonctionnalités de votre téléphone. Les données seront utilisées conformément à la <xliff:g id="name" example="Politique de confidentialité">%s</xliff:g> de Cyanogen.</string>
  <string name="services_privacy_policy">Politique de confidentialité</string>
  <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="Help improve CyanogenMod">%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 <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="services_apply_theme">Appliquer le thème <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Appliquer le thème Material">%s</xliff:g> active les icônes uniques, fonds d\'écran, et polices.</string>
  <string name="services_os_nav_keys_label"><b>Utilisation des touches de navigation de l\'écran</b> au lieu des touches physiques.</string>
  <string name="services_use_secure_sms">Utiliser les SMS sécurisés</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%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">%s</xliff:g>.</string>
--- a/res/values-fy-rNL/strings.xml
+++ b/res/values-fy-rNL/strings.xml
@@ -0,0 +1,20 @@
+<?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">
+  <string name="ok">OK</string>
+</resources>
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -0,0 +1,68 @@
+<?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">
+  <string name="app_name">सेटअप विज़ार्ड</string>
+  <string name="next">अगला</string>
+  <string name="skip">छोड़ें</string>
+  <string name="start">शुरू करें</string>
+  <string name="ok">ठीक है</string>
+  <string name="loading">एक सेकंड\u2026</string>
+  <string name="setup_complete">सेटअप पूरा हो गया</string>
+  <string name="setup_welcome">स्वागत</string>
+  <string name="setup_wifi">वाई-फाई चुनें</string>
+  <string name="setup_sim_missing">सिम कार्ड नहीं है</string>
+  <string name="setup_choose_data_sim">डेटा के लिए सिम कार्ड चुनें</string>
+  <string name="setup_location">स्थान सेवाएँ</string>
+  <string name="setup_other">अन्य सेवाएँ</string>
+  <string name="setup_datetime">तिथि और समय</string>
+  <string name="setup_current_date">वर्तमान तिथि</string>
+  <string name="setup_current_time">वर्तमान समय</string>
+  <string name="sim_missing_summary" product="tablet">आपके टैब्लेट के लिए सिम कार्ड पहचाना नहीं जा सका है। सिम कार्ड डालने के लिए अपने उपकरण के साथ आए निर्देशों को देखें।</string>
+  <string name="sim_missing_summary" product="default">आपके फ़ोन के लिए सिम कार्ड पहचाना नहीं जा सका है। सिम कार्ड डालने के लिए अपने उपकरण के साथ आए निर्देशों को देखें।</string>
+  <string name="choose_data_sim_summary" product="tablet">डेटा के लिए आप किस सिम का उपयोग करना चाहते हैं? चयनित सिम कार्ड के लिए नेटवर्क शुल्क लग सकते हैं क्योंकि उसका उपयोग आपके टैब्लेट को सेटअप करने के लिए किया जाएगा।</string>
+  <string name="choose_data_sim_summary" product="default">डेटा के लिए आप किस सिम का उपयोग करना चाहते हैं? चयनित सिम कार्ड के लिए नेटवर्क शुल्क लग सकते हैं क्योंकि उसका उपयोग आपके फ़ोन को सेटअप करने के लिए किया जाएगा।</string>
+  <string name="date_time_summary">अपना समय क्षेत्र सेटअप करें और यदि आवश्यक हो तो वर्तमान तिथि और समय को समायोजित करें</string>
+  <string name="backup_data_summary">ऐप डेटा, वाई-फ़ाई पासवर्ड, और अन्य सेटिंगि का गूगल सर्वरों में <b>बैकअप लें</b></string>
+  <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>
+  <string name="emergency_call">आपातकालीन कॉल</string>
+  <string name="setup_services">सियानोजेन सुविधाएँ</string>
+  <string name="services_explanation" product="tablet">ये सेवाएँ आपके टैब्लेट की क्षमताओं को बढ़ाती हैं। डेटा का उपयोग सियानोजेन की <xliff:g id="name" example="Privacy Policy">%s</xliff:g> के अनुसार किया जाएगा।</string>
+  <string name="services_explanation" product="default">ये सेवाएँ आपके फ़ोन की क्षमताओं को बढ़ाती हैं। डेटा का उपयोग सियानोजेन की <xliff:g id="name" example="Privacy Policy">%s</xliff:g> के अनुसार किया जाएगा।</string>
+  <string name="services_privacy_policy">गोपनीयता नीति</string>
+  <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> को सुधारने में मदद करें</string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> - सियानोजेन को अपने आप ही निदानात्मक और उपयोग से संबंधित डेटा भेजें। इस जानकारी का उपयोग आपको पहचानने के लिए नहीं हो सकता है। वह केवल बैटरी की आयु, ऐप के निष्पादन और नए <xliff:g id="name" example="CyanogenMod">%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">%s</xliff:g> का उपयोग करके सुरक्षित एसएमएस का उपयोग करने वाले अन्य उपयोगकर्ताओं के साथ के एसएमएस वार्तालापों को <xliff:g id="name" example="CyanogenMod">%s</xliff:g> उपकरण में कूटलेखित करें।</string>
+</resources>
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Segélyhívás</string>
+  <string name="setup_services">Cyanogen funkciók</string>
+  <string name="services_explanation" product="tablet">Ezek a szolgáltatások azon dolgoznak, hogy kibővítsék az Ön táblagépe képességeit. Az adatok felhasználása a Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g> alapján történik.</string>
+  <string name="services_explanation" product="default">Ezek a szolgáltatások azon dolgoznak, hogy kibővítsék az Ön telefonja képességeit. Az adatok felhasználása a Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g> alapján történik.</string>
  <string name="services_privacy_policy">Adatvédelmi nyilatkozat</string>
  <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">%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">%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">%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">%s</xliff:g> eszközön.</string>
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -21,18 +21,48 @@
  <string name="skip">Lewati</string>
  <string name="start">Mulai</string>
  <string name="ok">OKE</string>
+  <string name="loading">Hanya sec\u2026</string>
  <string name="setup_complete">Setup selesai</string>
  <string name="setup_welcome">Selamat datang</string>
  <string name="setup_wifi">Pilih Wi-Fi</string>
+  <string name="setup_sim_missing">SIM kartu hilang</string>
+  <string name="setup_choose_data_sim">Pilih SIM untuk Data</string>
+  <string name="setup_location">Layanan lokasi</string>
+  <string name="setup_other">Layanan lainnya</string>
  <string name="setup_datetime">Tanggal &amp; waktu</string>
  <string name="setup_current_date">Tanggal sekarang</string>
  <string name="setup_current_time">Waktu saat ini</string>
+  <string name="sim_missing_summary" product="tablet">Kartu SIM tidak terdeteksi pada perangkat anda.  Untuk menyisipkan kartu SIM, baca petunjuk yang datang dengan perangkat Anda.</string>
+  <string name="sim_missing_summary" product="default">Kartu SIM tidak terdeteksi pada perangkat anda.  Untuk menyisipkan kartu SIM, baca petunjuk yang datang dengan perangkat Anda.</string>
+  <string name="choose_data_sim_summary" product="tablet">Manakah SIM yang ingin Anda gunakan untuk data? SIM yang dipilih dapat dikenakan biaya jaringan karena akan digunakan untuk menyiapkan perangkat Anda.</string>
+  <string name="choose_data_sim_summary" product="default">Manakah SIM yang ingin Anda gunakan untuk data? SIM yang dipilih dapat dikenakan biaya jaringan karena akan digunakan untuk menyiapkan perangkat Anda.</string>
  <string name="date_time_summary">Atur zona waktu dan sesuaikan tanggal dan waktu jika diperlukan</string>
+  <string name="backup_data_summary"><b>Membuat cadangan</b> data aplikasi, password Wi-Fi, dan setelan lainnya ke server Google</string>
+  <string name="other_services_summary">Layanan ini menempatkan Google bekerja untuk Anda, dan Anda dapat mengubah mereka atau menonaktifkan setiap saat. Data akan digunakan sesuai dengan Google <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string>
+  <string name="location_services_summary">Layanan lokasi mengizinkan Maps dan aplikasi lain untuk mengumpulkan dan menggunakan data seperti perkiraan lokasi Anda. Misalnya, Maps dapat menggunakan perkiraan lokasi Anda untuk menemukan toko-toko 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_network"><b>Penggunaan Wi-Fi</b> untuk membantu aplikasi menentukan lokasi Anda.</string>
+  <string name="location_network_telephony"><b>Penggunaan Wi-Fi dan jaringan selular</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_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 mobile data selama setup? Menyalakan mobile data mungkin akan dikenakan biaya data.</string>
+  <string name="no">Tidak</string>
+  <string name="yes">Ya</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
+  <string name="emergency_call">Panggilan darurat</string>
+  <string name="setup_services">Fitur sianogen</string>
+  <string name="services_explanation" product="tablet">Layanan ini bekerja untuk Anda untuk memperluas kemampuan perangkat tablet Anda. Data akan digunakan sesuai dengan sianogen di <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string>
+  <string name="services_explanation" product="default">Layanan ini bekerja untuk Anda untuk memperluas kemampuan perangkat tablet Anda. Data akan digunakan sesuai dengan sianogen di <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string>
  <string name="services_privacy_policy">Kebijakan privasi</string>
+  <string name="services_help_improve_cm">Membantu meningkatkan <xliff:g id="name" example="CyanogenMod">%s </xliff:g></string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s </xliff:g> dengan secara otomatis mengirim data diagnostik dan penggunaan ke Cyanogen. Informasi ini tidak dapat digunakan untuk mengidentifikasi Anda dan meminjamkan tangan untuk tim bekerja pada hal-hal seperti baterai, app kinerja dan fitur <xliff:g id="name" example="CyanogenMod"> %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 unik, Wallpaper dan font.</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">%s </xliff:g> untuk mengenkripsi percakapan SMS dengan pengguna lain menggunakan SMS aman pada perangkat <xliff:g id="name" example="CyanogenMod"> %s </xliff:g>.</string>
 </resources>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -17,30 +17,30 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="app_name">Installazione guidata</string>
-  <string name="next">Avanti</string>
+  <string name="next">Prossimo</string>
  <string name="skip">Salta</string>
-  <string name="start">Cominciamo</string>
-  <string name="ok">OK</string>
+  <string name="start">Inizio</string>
+  <string name="ok">Ok</string>
  <string name="loading">Solo un secondo\u2026</string>
-  <string name="setup_complete">Il setup è completo</string>
+  <string name="setup_complete">Installazione completata</string>
  <string name="setup_welcome">Benvenuto</string>
  <string name="setup_wifi">Seleziona Wi-Fi</string>
  <string name="setup_sim_missing">Scheda SIM non inserita</string>
  <string name="setup_choose_data_sim">Scegli una SIM per la connessione dati</string>
  <string name="setup_location">Servizi di localizzazione</string>
  <string name="setup_other">Altri servizi</string>
-  <string name="setup_datetime">Data &amp; Ora</string>
+  <string name="setup_datetime">Data &amp; ora</string>
  <string name="setup_current_date">Data corrente</string>
  <string name="setup_current_time">Ora corrente</string>
  <string name="sim_missing_summary" product="tablet">Non è stata riconosciuta alcuna scheda SIM nel tuo tablet. Per inserire una scheda SIM, leggi le istruzioni comprese col tuo dispositivo.</string>
  <string name="sim_missing_summary" product="default">Non è stata rilevata alcuna scheda SIM nel tuo cellulare. Per inserire una scheda SIM, leggi le istruzioni comprese col tuo dispositivo.</string>
  <string name="choose_data_sim_summary" product="tablet">Quale SIM vuoi utilizzare per la connessione dati? La SIM selezionata può incorrere in costi di rete durante la configurazione del dispositivo.</string>
  <string name="choose_data_sim_summary" product="default">Quale SIM vuoi utilizzare per la connessione dati? La SIM selezionata può incorrere in costi di rete durante la configurazione del dispositivo.</string>
-  <string name="date_time_summary">Imposta il fuso orario e se necessario regola ora e data corrente</string>
+  <string name="date_time_summary">Imposta il fuso orario e se necessario regola data e ora corrente</string>
  <string name="backup_data_summary"><b>Esegui il Back-up</b> dei dati delle app, password Wi-Fi e altre impostazioni sui server di Google</string>
  <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> ad utilizzare informazioni sulla tua posizione. Ciò può includere la tua posizione attuale e quelle precedenti.</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_network"><b>Usa il Wi-Fi</b> per aiutare le app a determinare la tua posizione.</string>
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Chiamata di emergenza</string>
-  <string name="services_privacy_policy">Condizioni sulla Privacy</string>
+  <string name="setup_services">Funzioni di Cyanogenmod</string>
+  <string name="services_explanation" product="tablet">Questi servizi funzionano per estendere le funzioni del tablet. I dati saranno utilizzati in accordo con <xliff:g id="name" example="Privacy Policy">%s</xliff:g>di Cyanogen.</string>
+  <string name="services_explanation" product="default">Questi servizi funzionano per estendere le funzioni del telefono. I dati saranno utilizzati in accordo con <xliff:g id="name" example="Privacy Policy">%s</xliff:g>di Cyanogen.</string>
+  <string name="services_privacy_policy">Informativa sulla privacy</string>
  <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">%s</xliff:g> inviando automaticamente dati di diagnostica e sull\'utilizzo a Cyanogen. Queste informazioni non possono essere utilizzate per identificarti e servono ad aiutare i team che lavorano sulla durata della batteria, sulle prestazioni delle app, e su nuove funzionalità <xliff:g id="name" example="CyanogenMod">%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_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">%s</xliff:g> per criptare le conversazioni SMS con altri utenti che utilizzano gli SMS sicuri su un dispositivo <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -25,7 +25,7 @@
  <string name="setup_complete">ההגדרה הושלמה</string>
  <string name="setup_welcome">ברוך הבא</string>
  <string name="setup_wifi">בחר רשת Wi-Fi</string>
-  <string name="setup_sim_missing">חסר כרטיס SIM</string>
+  <string name="setup_sim_missing">כרטיס SIM חסר</string>
  <string name="setup_choose_data_sim">בחר כרטיס SIM עבור נתונים</string>
  <string name="setup_location">שירותי מיקום</string>
  <string name="setup_other">שירותים אחרים</string>
@@ -35,17 +35,17 @@
  <string name="sim_missing_summary" product="tablet">לא זוהה כרטיס SIM בטאבלט שלך. כדי להכניס כרטיס SIM, קרא את הוראות ההפעלה שהגיעו יחד עם מכשירך.</string>
  <string name="sim_missing_summary" product="default">לא זוהה כרטיס SIM במכשיר. כדי להכניס כרטיס SIM, קרא את הוראות ההפעלה שהגיעו יחד עם מכשירך.</string>
  <string name="choose_data_sim_summary" product="tablet">באיזה כרטיס SIM הנך מעוניין להשתמש עבור אינטרנט סלולרי? יתכן ויחולו חיובי רשת ב-SIM הנבחר בעקבות שימוש באינטרנט במהלך הגדרת הטאבלט שלך.</string>
-  <string name="choose_data_sim_summary" product="default">באיזה כרטיס SIM הנך מעוניין להשתמש עבור אינטרנט סלולרי? יתכן ויחולו חיובי רשת ב-SIM הנבחר בעקבות שימוש באינטרנט במהלך הגדרת המכשיר.</string>
+  <string name="choose_data_sim_summary" product="default">באיזה כרטיס SIM הנך מעוניין להשתמש עבור אינטרנט סלולרי? יתכן ויחולו חיובי רשת ב-SIM הנבחר בעקבות שימוש באינטרנט במהלך הגדרת מכשירך.</string>
  <string name="date_time_summary">הגדר את אזור הזמן שלך והתאם את התאריך ואת השעה הנוכחיים במידת הצורך</string>
  <string name="backup_data_summary"><b>גבה</b> נתוני יישומים, סיסמאות Wi-Fi והגדרות אחרות לשרתי Google</string>
  <string name="other_services_summary">שירותים אלו נותנים ל-Google לעבוד בשבילך, ואתה יכול לכבות/להדליק אותם בכל זמן. מידע ישומש בכפוף ל<xliff:g id="name" example="Privacy Policy">%s</xliff:g> של Google.</string>
  <string name="location_services_summary">שירותי מיקום מאפשרים ליישום המפות וליישומים אחרים להשתמש במיקומך. לדוגמא, יישום המפות עשוי להשתמש במידע זה על מנת להציג לך בתי קפה הנמצאים בקרבתך.</string>
-  <string name="location_access_summary"><b>אפשר ליישומים שביקשו את אישורך</b> להשתמש במידע על מיקומך.</string>
-  <string name="location_gps" product="tablet"><b>שפר דיוק מיקום</b> ע\"י נתינת הרשאה ליישומים להשתמש ב-GPS בטאבלט.</string>
-  <string name="location_gps" product="default"><b>שפר דיוק מיקום</b> ע\"י נתינת הרשאה ליישומים להשתמש ב-GPS בטלפון.</string>
-  <string name="location_network"><b>השתמש ב-Wi-Fi</b> כדי לסייע לאפליקציות לקבוע את מיקומך.</string>
-  <string name="location_network_telephony"><b>השתמש ב-Wi-Fi וברשתות סלולריות</b> כדי לסייע לאפליקציות לקבוע את מיקומך.</string>
-  <string name="location_network_gms"><b>השתמש בשירותי המיקום של Google</b> כדי לשלוח נתוני מיקום אנונימיים ל-Google, גם כשיישומים לא פועלים.</string>
+  <string name="location_access_summary"><b>אפשר ליישומים שביקשו את רשותך</b> להשתמש במידע על מיקומך. הדבר עלול לכלול את מיקומך הנוכחי ומיקומים קודמים.</string>
+  <string name="location_gps" product="tablet"><b>שפר דיוק מיקום</b> על-ידי נתינת הרשאה ליישומים להשתמש ב-GPS בטאבלט.</string>
+  <string name="location_gps" product="default"><b>שפר דיוק מיקום</b> על-ידי נתינת הרשאה ליישומים להשתמש ב-GPS במכשירך.</string>
+  <string name="location_network"><b>השתמש ב-Wi-Fi</b> כדי לסייע ליישומים לקבוע את מיקומך.</string>
+  <string name="location_network_telephony"><b>השתמש ב-Wi-Fi וברשתות סלולריות</b> כדי לסייע ליישומים לקבוע את מיקומך.</string>
+  <string name="location_network_gms"><b>השתמש בשירותי המיקום של Google</b> כדי לשלוח נתוני מיקום אנונימיים ל-Google, גם כאשר אין יישומים פועלים.</string>
  <string name="setup_mobile_data">הפעל נתונים ניידים</string>
  <string name="setup_mobile_data_no_service">אין שירות</string>
  <string name="setup_mobile_data_emergency_only">שיחות חירום בלבד</string>
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">שיחת חירום</string>
+  <string name="setup_services">תכונות Cyanogen</string>
+  <string name="services_explanation" product="tablet">שירותים אלה עובדים בשבילך כדי להרחיב את יכולותיו של הטאבלט שלך. מידע ישומש בכפוף ל<xliff:g id="name" example="Privacy Policy">%s</xliff:g> של Cyanogen.</string>
+  <string name="services_explanation" product="default">שירותים אלה עובדים בשבילך כדי להרחיב את יכולותיו של מכשירך. מידע ישומש בכפוף ל<xliff:g id="name" example="Privacy Policy">%s</xliff:g> של Cyanogen.</string>
  <string name="services_privacy_policy">מדיניות הפרטיות</string>
  <string name="services_help_improve_cm">עזור לשפר את <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
-  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> על ידי שליחת נתוני אבחון ושימוש למפתחים. מידע זה לא יוכל לשמש כדי לזהות אותך והוא תורם לצוותים העובדים על דברים כמו חיי סוללה, ביצועים ותכונות חדשות ל-<xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> על-ידי שליחת נתוני אבחון ושימוש למפתחים. מידע זה לא יוכל לשמש כדי לזהות אותך והוא תורם לצוותים העובדים על דברים כמו חיי סוללה, ביצועים ותכונות חדשות ל-<xliff:g id="name" example="CyanogenMod">%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">%s</xliff:g> להצפנת שיחות SMS עם משתמשים אחרים באמצעות SMS מאובטח במכשיר <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">緊急通報</string>
+  <string name="setup_services">Cyanogenの機能</string>
+  <string name="services_explanation" product="tablet">これらのサービスはタブレットの機能を拡張するために動作します。データはCyanogenの<xliff:g id="name" example="Privacy Policy">%s</xliff:g>にしたがって使用されます。</string>
+  <string name="services_explanation" product="default">これらのサービスは携帯電話の機能を拡張するために動作します。データはCyanogenの<xliff:g id="name" example="Privacy Policy">%s</xliff:g>にしたがって使用されます。</string>
  <string name="services_privacy_policy">プライバシーポリシー</string>
  <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>の改善を支援します</string>
  <string name="services_metrics_label">診断と使用状況データを自動的にCyanogenに送信して<xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g>。この情報は個人を特定するために使用されることはなく、電池持ち、アプリのパフォーマンス、<xliff:g id="name" example="CyanogenMod">%s</xliff:g>の新機能などへの取り組みで活用されます。</string>
+  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g>テーマを適用</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>すると、テーマ固有のアイコン、壁紙、フォントが有効になります。</string>
  <string name="services_os_nav_keys_label">ハードウェアキーのかわりに<b>スクリーンナビゲーションキーを使用します</b>。</string>
  <string name="services_use_secure_sms">セキュアSMSを使用します</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>端末でセキュアSMSを使用している他のユーザーとのSMSの会話を自動的に暗号化するために<xliff:g id="name" example="Use secure SMS">%s</xliff:g>。</string>
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -0,0 +1,68 @@
+<?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">
+  <string name="app_name">ಸೆಟಪ್ ವಿಝಾರ್ಡ್</string>
+  <string name="next">ಮುಂದೆ</string>
+  <string name="skip">ಸ್ಕಿಪ್</string>
+  <string name="start">ಪ್ರಾರಂಭಿಸಿ</string>
+  <string name="ok">ಆಯ್ತು</string>
+  <string name="loading">ಒಂದೇ ಒಂದು ಕ್ಷಣ\u2026</string>
+  <string name="setup_complete">ಸೆಟಪ್ ಪೂರ್ಣಗೊಂಡಿದೆ</string>
+  <string name="setup_welcome">ಸುಸ್ವಾಗತ</string>
+  <string name="setup_wifi">ವೈ-ಫೈ ಆಯ್ಕೆಮಾಡಿ</string>
+  <string name="setup_sim_missing">ಸಿಮ್ ಕಾರ್ಡ್ ಇಲ್ಲ</string>
+  <string name="setup_choose_data_sim">ಡೇಟಾಗಾಗಿ ಒಂದು ಸಿಮ್ ಆರಿಸಿ</string>
+  <string name="setup_location">ಸ್ಥಳ ಸೇವೆಗಳು</string>
+  <string name="setup_other">ಇತರೆ ಸೇವೆಗಳು</string>
+  <string name="setup_datetime">ದಿನಾಂಕ &amp; ಸಮಯ</string>
+  <string name="setup_current_date">ಪ್ರಸ್ತುತ ದಿನಾಂಕ</string>
+  <string name="setup_current_time">ಪ್ರಸ್ತುತ ಸಮಯ</string>
+  <string name="sim_missing_summary" product="tablet">ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‍ನಲ್ಲಿ ಸಿಮ್ ಕಾರ್ಡ್ ಪತ್ತೆಯಾಗಿಲ್ಲ. ಸಿಮ್‍ ಕಾರ್ಡ್ ಅಳವಡಿಸಲು, ನಿಮ್ಮ ಸಾಧನದೊಂದಿಗೆ ಬಂದಿರುವ ಸೂಚನೆಗಳನ್ನು ಓದಿ.</string>
+  <string name="sim_missing_summary" product="default">ನಿಮ್ಮ ಫೋನ್‍ನಲ್ಲಿ ಸಿಮ್ ಕಾರ್ಡ್ ಪತ್ತೆಯಾಗಿಲ್ಲ. ಸಿಮ್‍ ಕಾರ್ಡ್ ಅಳವಡಿಸಲು, ನಿಮ್ಮ ಸಾಧನದೊಂದಿಗೆ ಬಂದಿರುವ ಸೂಚನೆಗಳನ್ನು ಓದಿ.</string>
+  <string name="choose_data_sim_summary" product="tablet">ನೀವು ಡೇಟಾಗಾಗಿ ಯಾವ ಸಿಮ್ ಉಪಯೋಗಿಸಲು ಬಯಸುವಿರಿ? ಆಯ್ಕೆಮಾಡಿರುವ ಸಿಮ್ ನೆಟ್‍ವರ್ಕ್ ಶುಲ್ಕಗಳಿಗೆ ಗುರಿಯಾಗಬಹುದು ಏಕೆಂದರೆ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಇದನ್ನು ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string>
+  <string name="choose_data_sim_summary" product="default">ನೀವು ಡೇಟಾಗಾಗಿ ಯಾವ ಸಿಮ್ ಉಪಯೋಗಿಸಲು ಬಯಸುವಿರಿ? ಆಯ್ಕೆಮಾಡಿರುವ ಸಿಮ್ ನೆಟ್‍ವರ್ಕ್ ಶುಲ್ಕಗಳಿಗೆ ಗುರಿಯಾಗಬಹುದು ಏಕೆಂದರೆ ನಿಮ್ಮ ಫೋನನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಇದನ್ನು ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string>
+  <string name="date_time_summary">ಅಗತ್ಯವಿದ್ದಲ್ಲಿ ನಿಮ್ಮ ಸಮಯ ವಲಯವನ್ನು ಹಾಗು ಪ್ರಸ್ತುತ ದಿನಾಂಕ ಮತ್ತು ಸಮಯವನ್ನು ಹೊಂದಿಸಿ</string>
+  <string name="backup_data_summary">ಆಪ್ ಡೇಟಾ, ವೈ-ಫೈ ಪ್ರವೇಶಪದಗಳು, ಮತ್ತು ಇತರೆ ಸೆಟ್ಟಿಂಗ್‍ಗಳನ್ನು ಗೂಗಲ್ ಸರ್ವರ್‍ಗಳಿಗೆ <b>ಬ್ಯಾಕ್ಅಪ್</b> ಮಾಡು</string>
+  <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>
+  <string name="emergency_call">ತುರುಪರೀಸ್ಥಿತಿ ಕರೆ</string>
+  <string name="setup_services">Cyanogen ವೈಶಿಷ್ಟ್ಯಗಳು</string>
+  <string name="services_explanation" product="tablet">ಈ ಸೇವೆಗಳು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‍ನ ಸಾಮಾರ್ಥ್ಯಗಳನ್ನು ವಿಸ್ತರಿಸಲು ನಿಮಗಾಗಿ ಕೆಲಸ ಮಾಡುತ್ತದೆ. ಡೇಟಾವನ್ನು Cyanogenನ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ಅನುಸಾರವಾಗಿ ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string>
+  <string name="services_explanation" product="default">ಈ ಸೇವೆಗಳು ನಿಮ್ಮ ಫೋನ್‍ನ ಸಾಮಾರ್ಥ್ಯಗಳನ್ನು ವಿಸ್ತರಿಸಲು ನಿಮಗಾಗಿ ಕೆಲಸ ಮಾಡುತ್ತದೆ. ಡೇಟಾವನ್ನು Cyanogenನ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ಅನುಸಾರವಾಗಿ ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string>
+  <string name="services_privacy_policy">ಗೌಪ್ಯತಾ ನೀತಿ</string>
+  <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> ಸುಧಾರಿಸಲು ಸಹಕರಿಸಿ</string>
+  <string name="services_metrics_label">Cyanogenಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ವಿಶ್ಲೇಷಣಾತ್ಮಕ ಮತ್ತು ಬಳಕೆಯ ಡೇಟಾವನ್ನು ಕಳುಹಿಸುವುದರಿಂದ <xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g>. ಈ ಮಾಹಿತಿಯನ್ನು ನಿಮ್ಮನ್ನು ಗುರುತಿಸುವುದಕ್ಕಾಗಿ ಉಪಯೋಗಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ ಮತ್ತು ಇದನ್ನು ಬ್ಯಾಟರಿ ಲೈಫ್, ಆಪ್ ಕಾರ್ಯಕ್ಷಮತೆ, ಮತ್ತು ಹೊಸ <xliff:g id="name" example="CyanogenMod">%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">%s</xliff:g> ಸಾಧನದಲ್ಲಿ ಇತರೆ ಬಳಕೆದಾರರ ಜೊತೆಗಿನ ಎಸ್ಎಂಎಸ್ ಸಂಭಾಷಣೆಗಳನ್ನು ಸುರಕ್ಷಿತ ಎಸ್ಎಂಎಸ್ ಉಪಯೋಗಿಸಿ ಎನ್ಕ್ರಿಪ್ಟ್ ಮಾಡಲು <xliff:g id="name" example="Use secure SMS">%s</xliff:g>.</string>
+</resources>
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -26,7 +26,7 @@
  <string name="setup_welcome">환영합니다</string>
  <string name="setup_wifi">Wi-Fi 연결</string>
  <string name="setup_sim_missing">SIM 카드 없음</string>
-  <string name="setup_choose_data_sim">데이터 통신용 SIM 카드 선택</string>
+  <string name="setup_choose_data_sim">모바일 데이터용 SIM 카드 선택</string>
  <string name="setup_location">위치 서비스</string>
  <string name="setup_other">기타 서비스</string>
  <string name="setup_datetime">날짜 및 시간</string>
@@ -34,8 +34,8 @@
  <string name="setup_current_time">현재 시간</string>
  <string name="sim_missing_summary" product="tablet">태블릿에서 SIM 카드가 감지되지 않았습니다. SIM 카드를 삽입하려면 기기와 함께 제공된 설명을 읽어보십시오.</string>
  <string name="sim_missing_summary" product="default">휴대전화에서 SIM 카드가 감지되지 않았습니다. SIM 카드를 삽입하려면 기기와 함께 제공된 설명을 읽어보십시오.</string>
-  <string name="choose_data_sim_summary" product="tablet">데이터 통신을 위해 어느 카드를 사용하시겠습니까? 태블릿을 설정하는 동안 선택한 SIM 카드에서 통신 요금이 발생할 수 있습니다.</string>
-  <string name="choose_data_sim_summary" product="default">데이터 통신을 위해 어느 카드를 사용하시겠습니까? 휴대전화를 설정하는 동안 선택한 SIM 카드에서 통신 요금이 발생할 수 있습니다.</string>
+  <string name="choose_data_sim_summary" product="tablet">모바일 데이터를 위해 어느 카드를 사용하시겠습니까? 태블릿을 설정하는 동안 선택한 SIM 카드에서 통신 요금이 발생할 수 있습니다.</string>
+  <string name="choose_data_sim_summary" product="default">모바일 데이터를 위해 어느 카드를 사용하시겠습니까? 휴대전화를 설정하는 동안 선택한 SIM 카드에서 통신 요금이 발생할 수 있습니다.</string>
  <string name="date_time_summary">시간대를 설정하고 필요한 경우 현재 날짜 및 시간을 조정</string>
  <string name="backup_data_summary">앱 데이터, Wi-Fi 비밀번호 그리고 기타 설정을 Google 서버에 <b>백업합니다</b></string>
  <string name="other_services_summary">이 Google 서비스는 사용자가 실행하며, 언제든지 켜고 끌 수 있습니다. 데이터는 Google의 <xliff:g id="name" example="Privacy Policy">%s</xliff:g>에 따라 사용됩니다.</string>
@@ -46,17 +46,22 @@
  <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>
  <string name="emergency_call">긴급 통화</string>
+  <string name="setup_services">Cyanogen 기능</string>
+  <string name="services_explanation" product="tablet">이 기능은 태블릿의 성능 향상을 위해 작동합니다. 수집된 데이터는 Cyanogen의 <xliff:g id="name" example="Privacy Policy">%s</xliff:g>에 따라 사용됩니다.</string>
+  <string name="services_explanation" product="default">이 기능은 휴대전화의 성능 향상을 위해 작동합니다. 수집된 데이터는 Cyanogen의 <xliff:g id="name" example="Privacy Policy">%s</xliff:g>에 따라 사용됩니다.</string>
  <string name="services_privacy_policy">개인 정보 보호 정책</string>
  <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g>의 개발 지원</string>
  <string name="services_metrics_label">진단 및 사용 정보를 Cyanogen에 보내 <xliff:g id="name" example="CyanogenMod 개선을 도와주십시오">%s</xliff:g>. 이 정보는 배터리 수명, 앱 성능과 새 <xliff:g id="name" example="CyanogenMod">%s</xliff:g> 기능과 같이 사용자를 식별할 수 없는 정보입니다.</string>
+  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> 테마 적용</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>은 독특한 아이콘, 배경화면과 폰트를 활성화합니다.</string>
  <string name="services_os_nav_keys_label">하드웨어 키 대신 <b>화면 상의 내비게이션 키</b>를 사용합니다.</string>
  <string name="services_use_secure_sms">보안 SMS 사용</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="보안 SMS를 사용">%s</xliff:g>하여 <xliff:g id="name" example="CyanogenMod">%s</xliff:g>기기에서 보안 SMS를 사용하는 다른 사용자와의 SMS 대화를 암호화함.</string>
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -0,0 +1,51 @@
+<?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">
+  <string name="app_name">دامەزراندنی گەزەک</string>
+  <string name="next">دواتر</string>
+  <string name="skip">تێپەڕاندن</string>
+  <string name="start">دەستپێکردن</string>
+  <string name="ok">باشه‌</string>
+  <string name="loading">تەنها چرکەیەک\u2026</string>
+  <string name="setup_complete">دامه‌زراندن ته‌واوبوو</string>
+  <string name="setup_welcome">بە خێربێيت</string>
+  <string name="setup_wifi">هەڵبژاردنی Wi-Fi</string>
+  <string name="setup_sim_missing">سیمکارتی تیا نیە</string>
+  <string name="setup_choose_data_sim">سیمکارتێک هەڵبژێرە بۆ داتا</string>
+  <string name="setup_location">خزمەتگوزاری ناوچەی</string>
+  <string name="setup_other">خزمەتگوزاری تر</string>
+  <string name="setup_datetime">کات وamp; ڕۆژ</string>
+  <string name="setup_current_date">ڕۆژی هه‌نووکه‌</string>
+  <string name="setup_current_time">کاتی هه‌نووکه‌</string>
+  <string name="sim_missing_summary" product="tablet">سیمکارت لە ناو تاتەبژمێر نیە. بۆ تێکردنی سیمکارت ، تێبینیەکان بخوێنەرەوە کە لەگەڵ ئامێرەکەت هاتوە.</string>
+  <string name="sim_missing_summary" product="default">سیمکارت لە ناو تەلەفۆنەکەت نیە. بۆ تێکردنی سیمکارت ، تێبینیەکان بخوێنەرەوە کە لەگەڵ ئامێرەکەت هاتوە.</string>
+  <string name="choose_data_sim_summary" product="tablet">کام سیمکارتت ئەوێ کار بکات لەسەر داتا? سیمکارتی دیاریکراو لەوانەیە پارەکەت ببات بە هەمان شێوەش لەسەر تاتەژمێرەکەت دادەمەزرێت.</string>
+  <string name="choose_data_sim_summary" product="default">کام سیمکارتت ئەوێ کار بکات لەسەر داتا? سیمکارتی دیاریکراو لەوانەیە پارەکەت ببات بە هەمان شێوەش لەسەر تەلەفۆنەکەت دادەمەزرێت.</string>
+  <string name="date_time_summary">کاتی ناوچەی دامەزرێنە و داتای ئێستا لە کاتی خۆی دیاری بکە ئەگەر پێویستی کرد</string>
+  <string name="backup_data_summary"><b>پاڵپشتی</b> داتای بەرنامە, Wi-Fi تێپەڕەوشە, و ڕێکخستنی تری خزمەتگووزاری گووگڵ</string>
+  <string name="other_services_summary">ئەم خزمەتگوزاریە گووگڵ دەخاتە یارمەتی تۆوە، و ئەتوانی بیانکەیتەوە یان بیانکوژێنیتەوە لە هەرکاتێکدا.
+داتاکە لەگەڵ گووگڵ بەکارئەهێنرێت <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</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="no">نەخێر</string>
+  <string name="yes">بەڵێ</string>
+  <string name="emergency_call">تەلەفۆنی فریاگوزاری</string>
+  <string name="setup_services">شێوازی ساینەجن</string>
+  <string name="services_privacy_policy">یاسای تایبەتی</string>
+</resources>
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -48,12 +48,14 @@
  <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 mobilen Date kënnen Zousazkäschten entstoen.</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>
  <string name="emergency_call">Noutruff</string>
+  <string name="setup_services">Cyanogen-Funktiounen</string>
  <string name="services_privacy_policy">Dateschutzerklärung</string>
  <string name="services_help_improve_cm">Hëllef <xliff:g id="name" example="CyanogenMod">%s</xliff:g> ze verbesseren</string>
+  <string name="services_apply_theme">Den Design <xliff:g id="name" example="Material">%s</xliff:g> applizéieren</string>
  <string name="services_use_secure_sms">Sécher SMSe benotzen</string>
 </resources>
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Sąrankos vedlys</string>
+  <string name="app_name">Sąrankos vediklis</string>
  <string name="next">Kitas</string>
  <string name="skip">Praleisti</string>
  <string name="start">Pradėti</string>
@@ -45,7 +45,7 @@
  <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ėtumėte programoms nustatyti jūsų buvimo vietą. Tai reiškia, anoniminių vietos duomenų siuntimą į „Google“, net tada, kai neveikia jokios programos.</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>
@@ -54,10 +54,15 @@
  <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>
  <string name="emergency_call">Pagalbos skambutis</string>
+  <string name="setup_services">„Cyanogen“ funkcijos</string>
+  <string name="services_explanation" product="tablet">Šios paslaugos dirba už jus, kad išplėstu jūsų planšetinio kompiuterio galimybes. Duomenys bus naudojami pagal „Cyanogen\'s“ <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="services_explanation" product="default">Šios paslaugos dirba už jus, kad išplėstu jūsų telefono galimybes. Duomenys bus naudojami pagal „Cyanogen\'s“ <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="services_privacy_policy">Privatumo politika</string>
-  <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="Padėti tobulinti „CyanogenMod“">%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 ilgaamžiškumo, programų našumo ir naujų <xliff:g id="name" example="„CyanogenMod“">%s</xliff:g> funkcijų.</string>
+  <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">%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">%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="Naudoti saugius SMS">%s</xliff:g>, kad užšifruoti SMS pokalbius su kitais vartotojais, naudojančiais saugius SMS <xliff:g id="name" example="„CyanogenMod“">%s</xliff:g> įrenginyje.</string>
+  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g>, kad užšifruoti SMS pokalbius su kitais vartotojais, naudojančiais saugius SMS <xliff:g id="name" example="CyanogenMod">%s</xliff:g> įrenginyje.</string>
 </resources>
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Nødsamtale</string>
+  <string name="setup_services">Cyanogen funksjoner</string>
+  <string name="services_explanation" product="tablet">Disse tjenestene fungerer for deg ved å utvide funksjonaliteten til tableten. Dataene vil bli brukt i samsvar med Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="services_explanation" product="default">Disse tjenestene fungere for deg ved å utvide funksjonene i telefonen. Dataene vil bli brukt i samsvar med Cyanogen\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="services_privacy_policy">Personvern</string>
  <string name="services_help_improve_cm">Hjelp til med å forbedre <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> ved å automatisk sende diagnose og bruksdata til Cyanogen. Denne informasjonen kan ikke bli brukt til å identifisere deg og du hjelper de som jobber med ting som batteritid, appytelse og nye <xliff:g id="name" example="CyanogenMod">%s</xliff:g> funksjoner.</string>
+  <string name="services_apply_theme">Bruke <xliff:g id="name" example="Material">%s</xliff:g> temaet</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> aktiverer unike ikoner, bakgrunner og skrifttyper.</string>
  <string name="services_os_nav_keys_label"><b>Bruk navigasjonstaster på skjermen </b> istedenfor hardware knapper.</string>
  <string name="services_use_secure_sms">Bruk sikker SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> for å kryptere SMS samtaler med andre som også bruker sikker SMS på en <xliff:g id="name" example="CyanogenMod">%s</xliff:g> enhet.</string>
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -24,7 +24,7 @@
  <string name="loading">Even geduld\u2026</string>
  <string name="setup_complete">Instellen voltooid</string>
  <string name="setup_welcome">Welkom</string>
-  <string name="setup_wifi">Selecteer Wi-Fi</string>
+  <string name="setup_wifi">Wifi selecteren</string>
  <string name="setup_sim_missing">Simkaart ontbreekt</string>
  <string name="setup_choose_data_sim">Kies een simkaart voor gegevensverbinding</string>
  <string name="setup_location">Locatieservices</string>
@@ -32,11 +32,11 @@
  <string name="setup_datetime">Datum &amp; tijd</string>
  <string name="setup_current_date">Huidige datum</string>
  <string name="setup_current_time">Huidige tijd</string>
-  <string name="sim_missing_summary" product="tablet">Geen simkaart gedetecteerd in uw tablet. Om een simkaart te plaatsen, lees de instructies die bij uw tablet is geleverd.</string>
-  <string name="sim_missing_summary" product="default">Geen simkaart gedetecteerd in uw telefoon. Om een simkaart te plaatsen, lees de instructies die bij uw telefoon is geleverd.</string>
+  <string name="sim_missing_summary" product="tablet">Geen simkaart gedetecteerd in uw tablet. Om een simkaart te plaatsen, lees de instructie die bij uw tablet is geleverd.</string>
+  <string name="sim_missing_summary" product="default">Geen simkaart gedetecteerd in uw telefoon. Om een simkaart te plaatsen, lees de instructie die bij uw telefoon is geleverd.</string>
  <string name="choose_data_sim_summary" product="tablet">Welke simkaart wilt u gebruiken voor mobiel internet? Voor deze simkaart kunnen extra kosten in rekening gebracht worden, omdat deze gebruikt wordt om uw tablet in te stellen.</string>
  <string name="choose_data_sim_summary" product="default">Welke simkaart wilt u gebruiken voor mobiel internet? Voor deze simkaart kunnen extra kosten in rekening gebracht worden, omdat deze gebruikt wordt om uw telefoon in te stellen.</string>
-  <string name="date_time_summary">Selecteer uw tijdzone en pas de huidige datum en tijd aan indien nodig.</string>
+  <string name="date_time_summary">Selecteer uw tijdzone en pas indien nodig de huidige datum en tijd aan.</string>
  <string name="backup_data_summary"><b>Back-up maken</b> van app-gegevens, wifi-wachtwoorden en andere instellingen naar de servers van Google</string>
  <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>
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Noodoproep</string>
+  <string name="setup_services">Cyanogen-functies</string>
+  <string name="services_explanation" product="tablet">Deze diensten worden gebruikt om de mogelijkheden van uw tablet uit te breiden. Gegevens worden gebruikt conform de \'<xliff:g id="name" example="Privacy Policy">%s</xliff:g>\' van Cyanogen.</string>
+  <string name="services_explanation" product="default">Deze diensten worden gebruikt om de mogelijkheden van uw telefoon uit te breiden. Gegevens worden gebruikt conform de \'<xliff:g id="name" example="Privacy Policy">%s</xliff:g>\' van Cyanogen.</string>
  <string name="services_privacy_policy">Privacybeleid</string>
  <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">%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">%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">%s</xliff:g> om sms-gesprekken te versleutelen met anderen die ook beveiligde sms-berichten gebruiken op een <xliff:g id="name" example="CyanogenMod">%s</xliff:g>-apparaat.</string>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Połączenie alarmowe</string>
+  <string name="setup_services">Funkcje Cyanogen</string>
+  <string name="services_explanation" product="tablet">Te usługi są uruchomione w celu rozszerzenia możliwości twojego tabletu. Dane będą używane zgodnie z Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="services_explanation" product="default">Te usługi są uruchomione w celu rozszerzenia możliwości twojego telefonu. Dane będą używane zgodnie z Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="services_privacy_policy">Polityka Prywatności</string>
  <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="Help improve CyanogenMod">%s</xliff:g> automatycznie wysyłając dane diagnostyczne do Cyanogen. Te informacje nie będą mogły zostać użyte do identyfikacji i stanowią pomoc dla zespołów pracujących nad, między innymi, czasem pracy na baterii, wydajnością aplikacji oraz nowymi funkcjami <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="services_apply_theme">Zastosuj motyw <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> zawiera unikalne ikony, tapety oraz czcionki.</string>
  <string name="services_os_nav_keys_label"><b>Użyj ekranowych przycisków nawigacyjnych</b> zamiast klawiszy sprzętowych.</string>
  <string name="services_use_secure_sms">Używaj bezpiecznych wiadomości SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g>, aby prowadzić szyfrowane konwersacje z innymi użytkownikami używając bezpiecznych SMS na urządzeniach z <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Chamada de emergência</string>
+  <string name="setup_services">Recursos do Cyanogen</string>
+  <string name="services_explanation" product="tablet">Estes serviços trabalham para estender os recursos do seu tablet. Dados serão utilizados em conformidade com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> do Cyanogen.</string>
+  <string name="services_explanation" product="default">Estes serviços trabalham para estender os recursos do seu telefone. Dados serão utilizados em conformidade com o <xliff:g id="name" example="Privacy Policy">%s</xliff:g> do Cyanogen.</string>
  <string name="services_privacy_policy">Política de Privacidade</string>
  <string name="services_help_improve_cm">Ajudar a melhorar a <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> enviando automaticamente relatórios de uso de dados e diagnósticos para a Cyanogen. Esta informação não será usada para lhe identificar, e ajudam as equipes responsáveis pela duração de bateria, desempenho dos aplicativos, e novas funcionalidades do <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="services_apply_theme">Aplicar o tema <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ativando fontes, papéis de parede e ícones exclusivos.</string>
  <string name="services_os_nav_keys_label"><b>Use as teclas de navegação na tela</b> em vez de botões físicos.</string>
  <string name="services_use_secure_sms">Usar SMS seguro</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%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">%s</xliff:g>.</string>
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -37,7 +37,7 @@
  <string name="choose_data_sim_summary" product="tablet">Qual o cartão SIM que quer usar para os dados? O SIM selecionado pode incorrer em custos de rede adicionais, pois será usado para configurar o seu tablet.</string>
  <string name="choose_data_sim_summary" product="default">Qual o cartão SIM que quer usar para os dados? O SIM selecionado pode incorrer em custos de rede adicionais, pois será usado para configurar o seu telefone.</string>
  <string name="date_time_summary">Defina o fuso horário e ajuste a hora e a data atual, se necessário</string>
-  <string name="backup_data_summary">Efetuar uma <b>cópia de segurança</b> dos dados das aplicações, senhas de acesso de redes sem fios e outras definições para os servidores da Google</string>
+  <string name="backup_data_summary">Efetuar uma <b>cópia de segurança</b> dos dados das aplicações, palavras-passe de acesso de redes sem fios e outras definições para os servidores da Google</string>
  <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 às aplicações que pediram a sua permissão</b> para usar as suas informações de localização. Isso pode incluir a sua localização atual bem como localizações anteriores.</string>
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Chamadas de emergência</string>
+  <string name="setup_services">Recursos Cyanogen</string>
+  <string name="services_explanation" product="tablet">Estes serviços servem para ampliar os recursos do seu tablet. Os dados serão utilizados em conformidade com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> da Cyanogen.</string>
+  <string name="services_explanation" product="default">Estes serviços servem para ampliar os recursos do seu telefone. Os dados serão utilizados em conformidade com a <xliff:g id="name" example="Privacy Policy">%s</xliff:g> da Cyanogen.</string>
  <string name="services_privacy_policy">Política de privacidade</string>
  <string name="services_help_improve_cm">Ajude a melhorar a <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g>  enviando automaticamente dados de diagnóstico e utilização para a Cyanogen. Esta informação não pode ser usada para o identificar mas ajudam as equipas de desenvolvimento a melhorar a duração da bateria, desempenho das aplicações e desenvolver novos recursos da  <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
+  <string name="services_apply_theme">Aplicar o tema <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> ativando ícones , imagens de fundo e tipos de letra únicos.</string>
  <string name="services_os_nav_keys_label"><b>Usar os botões de navegação no ecrã</b>, em vez dos botões do dispositivo.</string>
  <string name="services_use_secure_sms">Usar SMS seguras</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> para encriptar conversações SMS com outros utilizadores que também utilizem este serviço num dispositivo com a <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -17,17 +17,48 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="app_name">Expert de instalare</string>
+  <string name="next">Următoarea</string>
+  <string name="skip">Omite</string>
  <string name="start">Pornire</string>
  <string name="ok">OK</string>
+  <string name="loading">Doar o secundă\u2026</string>
  <string name="setup_complete">Configurarea este completă</string>
-  <string name="setup_wifi">Selectaţi Wi-Fi</string>
+  <string name="setup_welcome">Bine ați venit</string>
+  <string name="setup_wifi">Selectați Wi-Fi</string>
+  <string name="setup_sim_missing">Lipsă card SIM</string>
+  <string name="setup_choose_data_sim">Alege un SIM pentru date</string>
+  <string name="setup_location">Servicii de localizare</string>
+  <string name="setup_other">Alte servicii</string>
  <string name="setup_datetime">Dată &amp; oră</string>
  <string name="setup_current_date">Data curentă</string>
  <string name="setup_current_time">Ora curentă</string>
+  <string name="sim_missing_summary" product="tablet">O cartelă SIM nu a fost detectată în tableta dvs. Pentru a insera o cartelă SIM, citiți instrucțiunile care au venit cu aparatul dvs.</string>
+  <string name="sim_missing_summary" product="default">O cartelă SIM nu a fost detectată în telefonul dvs. Pentru a insera o cartelă SIM, citiți instrucțiunile care au venit cu aparatul dvs.</string>
+  <string name="choose_data_sim_summary" product="tablet">Ce cartelă SIM vreți să utilizați pentru date? Cartela SIM selectată v-ar putea costa adițional în timp ce e folosită pentru a configura tableta dvs.</string>
+  <string name="choose_data_sim_summary" product="default">Ce cartelă SIM vreți să utilizați pentru date? Cartela SIM selectată v-ar putea costa adițional în timp ce e folosită pentru a configura telefonul dvs.</string>
+  <string name="date_time_summary">Setați fusul orar și reglați data și ora curentă, dacă este necesar</string>
+  <string name="backup_data_summary"><b>Back up</b> datele aplicațiilor, parolele Wi-Fi și alte setări pe serverele Google</string>
+  <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_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_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>
  <string name="no">Nu</string>
  <string name="yes">Da</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
  <string name="emergency_call">Apel de urgenţă</string>
+  <string name="setup_services">Facilități Cyanogen</string>
+  <string name="services_explanation" product="tablet">Aceste servicii extind capacitățile tabletei dumneavoastră. Datele vor fi folosite în conformitate cu Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="services_explanation" product="default">Aceste servicii extind capacitățile telefonului dumneavoastră. Datele vor fi folosite în conformitate cu Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="services_privacy_policy">Politica de confidențialitate</string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> prin trimiterea automată de date de diagnostic și de utilizare către Cyanogen. Aceste informații nu pot fi folosite pentru a vă identifica și ajută echipele ce lucrează la lucruri precum viața bateriei, performanța aplicațiilor și caracteristici noi <xliff:g id="name" example="CyanogenMod">%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_use_secure_sms">Utilizează SMS securizat</string>
 </resources>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Экстренный вызов</string>
+  <string name="setup_services">Службы Cyanogen</string>
+  <string name="services_explanation" product="tablet">Эти службы расширяют возможности вашего планшета. Данные будут использоваться в соответствии с <xliff:g id="name" example="Privacy Policy">%s</xliff:g> Cyanogen.</string>
+  <string name="services_explanation" product="default">Эти службы расширяют возможности вашего телефона. Данные будут использоваться в соответствии с <xliff:g id="name" example="Privacy Policy">%s</xliff:g> Cyanogen.</string>
  <string name="services_privacy_policy">политикой конфиденциальности</string>
  <string name="services_help_improve_cm">Помочь улучшить <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> автоматической отправкой диагностических и данных об использовании в Cyanogen. Эта информация не может быть использована для идентификации вашей личности и и поможет командам, работающим над оптимизацией расхода батареи, улучшением производительности и новыми функциями в <xliff:g id="name" example="CyanogenMod">%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">%s</xliff:g> для шифрования SMS с другими пользователями, использующими безопасные SMS на устройстве <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -54,9 +54,14 @@
  <string name="yes">Áno</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
  <string name="emergency_call">Tiesňový hovor</string>
+  <string name="setup_services">Funkcie Cyanogen</string>
+  <string name="services_explanation" product="tablet">Tieto služby sú určené pre vás a rozširujú možnosti vášho tabletu. Údaje sa použijú v súlade s Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="services_explanation" product="default">Tieto služby sú určené pre vás a rozširujú možnosti vášho telefónu. Údaje sa použijú v súlade s Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="services_privacy_policy">Ochrana osobných údajov</string>
  <string name="services_help_improve_cm">Pomôcť vylepšovať <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> automatickým zasielaním diagnostických údajov a údajov o používaní do Cyanogenu. Tieto informácie sa nepoužijú na vašu identifikáciu, ale pomôžu tímom pracujúcim na výdrži, výkone aplikácií a nových funkciách <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="services_apply_theme">Použiť tému <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> umožňuje používanie unikátnych ikon, tapiet a písiem.</string>
  <string name="services_os_nav_keys_label"><b>Používajte navigačné tlačidlá na obrazovke</b> namiesto hardvérových tlačidiel.</string>
  <string name="services_use_secure_sms">Používajte zabezpečené SMS</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> pre šifrovanie SMS konverzácií s ostatnými používateľmi prostredníctvom zabezpečených SMS na zariadení s <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -0,0 +1,68 @@
+<?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">
+  <string name="app_name">Čarovnik za namestitev</string>
+  <string name="next">Naprej</string>
+  <string name="skip">Preskoči</string>
+  <string name="start">Začni</string>
+  <string name="ok">V redu</string>
+  <string name="loading">Samo trenutek \u2026</string>
+  <string name="setup_complete">Namestitev je končana</string>
+  <string name="setup_welcome">Dobrodošli</string>
+  <string name="setup_wifi">Izberite Wi-Fi</string>
+  <string name="setup_sim_missing">Kartica SIM ni prisotna</string>
+  <string name="setup_choose_data_sim">Izberite kartico SIM za podatke</string>
+  <string name="setup_location">Lokacijske storitve</string>
+  <string name="setup_other">Druge storitve</string>
+  <string name="setup_datetime">Datum in čas</string>
+  <string name="setup_current_date">Trenutni datum</string>
+  <string name="setup_current_time">Trenutni čas</string>
+  <string name="sim_missing_summary" product="tablet">V vaši tablici ni bila zaznana kartica SIM. Za vstavitev kartice SIM preberite navodila priložena k napravi.</string>
+  <string name="sim_missing_summary" product="default">V vašem telefonu ni bila zaznana kartica SIM. Za vstavitev kartice SIM preberite navodila priložena k napravi.</string>
+  <string name="choose_data_sim_summary" product="tablet">Katero kartico SIM želite uporabiti za podatke? Izbrana kartica SIM lahko povzroči omrežne stroške, ker bo uporabljena za namestitev vaše tablice.</string>
+  <string name="choose_data_sim_summary" product="default">Katero kartico SIM želite uporabiti za podatke? Izbrana kartica SIM lahko povzroči omrežne stroške, ker bo uporabljena za namestitev vašega telefona.</string>
+  <string name="date_time_summary">Nastavite časovni pas in prilagodite trenutni datum in čas, če je potrebno</string>
+  <string name="backup_data_summary"><b>Varnostno kopirajte</b> podatke programov, gesla Wi-Fi in druge nastavitve na strežnike Google</string>
+  <string name="other_services_summary">Te storitve obremenijo Google in lahko jih vklopite ali izklopite kadarkoli. Podatki se bodo uporabljali v skladu s Googlovo<xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="location_services_summary">Lokacijske storitve omogočajo sistemu in programom tretjih oseb, da zbirajo in uporabijo podatke, kot je vaša približna lokacija. Program lahko na primer uporabi približno lokacijo za iskanje bližnjih kavarn.</string>
+  <string name="location_access_summary"><b>Dovolite programom, ki so zahtevale vaše dovoljenje</b>, da uporabijo podatke o vaši lokaciji. To lahko vključuje vašo trenutno lokacijo in prejšnje.</string>
+  <string name="location_gps" product="tablet"><b>Izboljšajte natančnost lokacije</b>, da omogočite programom uporabo GPS-a na vaši tablici.</string>
+  <string name="location_gps" product="default"><b>Izboljšajte natančnost lokacije</b>, da omogočite programom uporabo GPS-a v vašem telefonu.</string>
+  <string name="location_network"><b>Uporabite Wi-Fi</b>, da pomagate programom določiti vašo lokacijo.</string>
+  <string name="location_network_telephony"><b>Uporabite Wi-Fi in mobilna omrežja</b>, da pomagate programom določiti vašo lokacijo.</string>
+  <string name="location_network_gms"><b>Uporabite Googlove lokacijske storitve</b>, da pomagate programom določiti vašo lokacijo. To pomeni pošiljanje anonimnih podatkov o lokaciji Googlu tudi, ko se ne izvaja noben program.</string>
+  <string name="setup_mobile_data">Vključi mobilne podatke</string>
+  <string name="setup_mobile_data_no_service">Ni storitve</string>
+  <string name="setup_mobile_data_emergency_only">Samo klici v sili</string>
+  <string name="enable_mobile_data_summary">Ali želite med namestitvijo uporabiti mobilne podatke? Vklop mobilnih podatkov lahko povzroči dodatne stroške.</string>
+  <string name="no">Ne</string>
+  <string name="yes">Da</string>
+  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
+  <string name="emergency_call">Klic v sili</string>
+  <string name="setup_services">Funkcije Cyanogen</string>
+  <string name="services_explanation" product="tablet">Te storitve delajo za vas, da  razširijo zmogljivost vaše tablice. Podatki se uporabijo v skladu s <xliff:g id="name" example="Privacy Policy">%s </xliff:g> Cyanogen.</string>
+  <string name="services_explanation" product="default">Te storitve delajo za vas, da  razširijo zmogljivost vašega telefona. Podatki se uporabijo v skladu s <xliff:g id="name" example="Privacy Policy">%s </xliff:g> Cyanogen.</string>
+  <string name="services_privacy_policy">Politiko zasebnosti</string>
+  <string name="services_help_improve_cm">Pomagajte izboljšati <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> s samodejnim pošiljanjem diagnostičnih podatkov in podatkov uporabe Cyanogenu. Ti podatki se ne smejo uporabljati za vaše prepoznavanje in ekipi pomagajo pri izboljšanju npr. življenjske dobe baterije, zmogljivosti programov in novih funkcij <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+  <string name="services_apply_theme">Uveljavi temo <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>, ki omogoča edinstvene ikone, slike ozadja in pisave.</string>
+  <string name="services_os_nav_keys_label"><b>Uporabite zaslonske tipke za krmarjenje</b> namesto fizičnih tipk.</string>
+  <string name="services_use_secure_sms">Uporabite varne SMS-e</string>
+  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g>, da šifrirate pogovore SMS z drugimi uporabniki z uporabo varnih SMS-ov na napravi <xliff:g id="name" example="CyanogenMod">%s</xliff:g>.</string>
+</resources>
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Хитан позив</string>
+  <string name="setup_services">Cyanogen карактеристике</string>
+  <string name="services_explanation" product="tablet">Ови сервиси раде за тебе да повећају могућности твог таблета. Подаци ће бити коришћени у сагласности са Cyanogen-овим <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="services_explanation" product="default">Ови сервиси раде за тебе да повећају могућности твог телефона. Подаци ће бити коришћени у сагласности са Cyanogen-овим <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
  <string name="services_privacy_policy">Политика приватности</string>
  <string name="services_help_improve_cm">Помозите да побољшамо <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> аутоматским слањем дијагностике и коришћењу података у Cyanogen. Ове информације се неће користити за вашу идентификацију и далазе у руку да тимова који раде на стварима као што су трајање батерије, перформансе апликација, и новим <xliff:g id="name" example="CyanogenMod">%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">%s</xliff:g> да заштитиш SMS преписку са другим корисницима користећи безбедан SMS на <xliff:g id="name" example="CyanogenMod">%s</xliff:g> уређају.</string>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -16,12 +16,53 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="app_name">Installationsguide</string>
  <string name="next">Nästa</string>
+  <string name="skip">Hoppa över</string>
  <string name="start">Start</string>
  <string name="ok">OK</string>
+  <string name="loading">Vänta en liten stund\u2026</string>
+  <string name="setup_complete">Konfigurationen är klar</string>
  <string name="setup_welcome">Välkommen</string>
+  <string name="setup_wifi">Välj Wi-Fi</string>
+  <string name="setup_sim_missing">SIM-kort saknas</string>
+  <string name="setup_choose_data_sim">Välj ett SIM-kort för data</string>
+  <string name="setup_location">Platstjänster</string>
+  <string name="setup_other">Andra tjänster</string>
+  <string name="setup_datetime">Datum &amp; tid</string>
+  <string name="setup_current_date">Aktuellt datum</string>
  <string name="setup_current_time">Aktuell tid</string>
+  <string name="sim_missing_summary" product="tablet">Ett SIM-kort kunde inte hittas på din surfplatta. För att sätta in ett SIM-kort, läs instruktionerna som kom med din enhet.</string>
+  <string name="sim_missing_summary" product="default">Ett SIM-kort kunde inte hittas på din telefon. För att sätta in ett SIM-kort, läs instruktionerna som kom med din enhet.</string>
+  <string name="choose_data_sim_summary" product="tablet">Vilket SIM-kort vill du använda för data? Det valda SIM-kortet kan medföra nätverkskostnader eftersom det används för att konfigurera din enhet.</string>
+  <string name="choose_data_sim_summary" product="default">Vilket SIM-kort vill du använda för data? Det valda SIM-kortet kan medföra nätverkskostnader eftersom det används för att konfigurera din telefon.</string>
+  <string name="date_time_summary">Ställ in din tidszon och justera datum och tid om det behövs</string>
+  <string name="backup_data_summary"><b>Backa upp</b> appdata, Wi-Fi-lösenord, och andra inställningar på Google-servrar</string>
+  <string name="other_services_summary">Dessa tjänster låter Google arbeta för dig, och du kan sätta på eller stänga av tjänsterna när som helst. Data kommer användas i överensstämmelse med Googles <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="location_services_summary">Platstjänster låter systemet och tredjepartsappar samla in och använda data såsom din ungefärliga plats. Till exempel så kan en app använda din ungefärliga plats för att hitta närbelägna kaféer.</string>
+  <string name="location_access_summary"><b>Tillåt appar som du gett tillåtelse</b> att använda din platsinformation. Detta inkluderar din nuvarande plats och tidigare platser.</string>
+  <string name="location_gps" product="tablet"><b>Förbättra platsnogrannhet</b> genom att tillåta appar att använda GPS:en på din surfplatta.</string>
+  <string name="location_gps" product="default"><b>Förbättra platsnogrannhet</b> genom att tillåta appar att använda GPS:en på din telefon.</string>
+  <string name="location_network"><b>Använd Wi-Fi</b> för att hjälpa appar fastställa din position.</string>
+  <string name="location_network_telephony"><b>Använd Wi-Fi och mobila nät</b> för att hjälpa appar fastställa din position.</string>
+  <string name="location_network_gms"><b>Använd Googles platstjänster</b> för att hjälpa appar fastställa din position. Detta innebär att skicka anonyma platsdata till Google, även om inga appar körs.</string>
+  <string name="setup_mobile_data">Aktivera mobildata</string>
  <string name="setup_mobile_data_no_service">Ingen service</string>
+  <string name="setup_mobile_data_emergency_only">Endast nödsamtal</string>
+  <string name="enable_mobile_data_summary">Vill du använda mobildata under installationen? Aktivering av mobildata kan medföra datakostnader.</string>
  <string name="no">Nej</string>
  <string name="yes">Ja</string>
+  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
+  <string name="emergency_call">Nödsamtal</string>
+  <string name="setup_services">Cyanogen-funktioner</string>
+  <string name="services_explanation" product="tablet">Dessa tjänster ger dig fler användningsområden för din surfplatta. Datat kommer användas i överensstämmelse med Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="services_explanation" product="default">Dessa tjänster ger dig fler användningsområden för din telefon. Datat kommer användas i överensstämmelse med Cyanogens <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+  <string name="services_privacy_policy">Sekretesspolicy</string>
+  <string name="services_help_improve_cm">Hjälp till att förbättra <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> genom att automatiskt skicka diagnostisk och användningsdata till Cyanogen. Denna information kan inte användas för att identifiera dig och kan hjälpa team att arbeta på saker så som batteritid, app-prestanda, och nya<xliff:g id="name" example="CyanogenMod">%s</xliff:g> funktioner.</string>
+  <string name="services_apply_theme">Tillämpa temat <xliff:g id="name" example="Material">%s</xliff:g></string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g> aktiverar unika ikoner, bakgrunder, och typsnitt.</string>
+  <string name="services_os_nav_keys_label"><b>Använder styrtangenter på skärmen</b> i stället för fysiska knappar.</string>
+  <string name="services_use_secure_sms">Använd säker SMS</string>
+  <string name="services_secure_sms_label"><xliff:g id="name" example="Use secure SMS">%s</xliff:g> för att kryptera SMS-konversationer med andra användare med hjälp av säkra SMS på en<xliff:g id="name" example="CyanogenMod">%s</xliff:g> enhet.</string>
 </resources>
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -0,0 +1,68 @@
+<?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">
+  <string name="app_name">เปิดใช้ครั้งแรก</string>
+  <string name="next">ถัดไป</string>
+  <string name="skip">ข้าม</string>
+  <string name="start">เริ่มต้น</string>
+  <string name="ok">ตกลง</string>
+  <string name="loading">รอสักครู่\u2026</string>
+  <string name="setup_complete">การตั้งค่าเรียบร้อย</string>
+  <string name="setup_welcome">ยินดีต้อนรับ</string>
+  <string name="setup_wifi">เลือก Wi-Fi</string>
+  <string name="setup_sim_missing">ไม่พบซิมการ์ด</string>
+  <string name="setup_choose_data_sim">เลือกซิมการ์ดสำหรับข้อมูล</string>
+  <string name="setup_location">บริการตำแหน่ง</string>
+  <string name="setup_other">บริการอื่นๆ</string>
+  <string name="setup_datetime">วัน &amp; เวลา</string>
+  <string name="setup_current_date">วันที่ปัจจุบัน</string>
+  <string name="setup_current_time">เวลาปัจจุบัน</string>
+  <string name="sim_missing_summary" product="tablet">ไม่ได้พบกับซิมการ์ดในแท็บเล็ตของคุณ กรุณาใส่ซิมการ์ดโดยอ่านคำแนะนำที่มาพร้อมกับอุปกรณ์ของคุณ</string>
+  <string name="sim_missing_summary" product="default">ไม่ได้พบกับซิมการ์ดในโทรศัพท์ของคุณ กรุณาใส่ซิมการ์ดโดยอ่านคำแนะนำที่มาพร้อมกับอุปกรณ์ของคุณ</string>
+  <string name="choose_data_sim_summary" product="tablet">กรุณาเลือกซิมการ์ดที่คุณต้องการใช้ข้อมูล การกระทำนี้อาจมีค่าบริการ เพื่อใช้เครือข่ายค่าในการตั้งค่าแท็บเล็ตของคุณ</string>
+  <string name="choose_data_sim_summary" product="default">กรุณาเลือกซิมการ์ดที่คุณต้องการใช้ข้อมูล การกระทำนี้อาจมีค่าบริการ เพื่อใช้เครือข่ายค่าในการตั้งค่าโทรศัพท์ของคุณ</string>
+  <string name="date_time_summary">ตั้งค่าเขตเวลาและวันที่ของคุณหากคุณต้องการ</string>
+  <string name="backup_data_summary"><b>สำรอง</b>ข้อมูลแอป,รหัสผ่าน Wi-Fi และการตั้งค่าอื่นๆไปยังเซิฟเวอร์ของ Google</string>
+  <string name="other_services_summary">บริการเหล่านี้ Google จะเป็นผู้ให้บริการของคุณ คุณสามารถเปิดหรือปิดมันได้เสมอเมื่อคุณต้องการ โดยข้อมูลจะถูกใช้ตาม <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ของ Google</string>
+  <string name="location_services_summary">บริการตำแหน่งจะอนุญาตให้ระบบและแอปอื่นๆสามารถเก็บข้อมูลที่อยู่ของคุณได้ เช่นแอปอาจจะใช้ข้อมูลที่อยู่ของคุณเพื่อหาร้านกาแฟที่อยู่ใกล้คุณมากที่สุด</string>
+  <string name="location_access_summary"><b>อนุญาตให้แอปขอสิทธิ์</b> การใช้ข้อมูลตำแหน่งของคุณ ซึ่งอาจรวมถึงสถานปัจจุบันและสถานที่ผ่านมา</string>
+  <string name="location_gps" product="tablet"><b>เพิ่มความแม่นยำ</b> ของที่ตั้งโดยการอนุญาตให้แอปใช้ GPS บนแท็บเล็ตของคุณ</string>
+  <string name="location_gps" product="default"><b>เพิ่มความแม่นยำ</b> ของที่ตั้งโดยการอนุญาตให้แอปใช้ GPS บนโทรศัพท์ของคุณ</string>
+  <string name="location_network"><b>ใช้ Wi-Fi</b> เพื่อช่วยแอปหาตำแหน่งของคุณได้ง่ายขึ้น</string>
+  <string name="location_network_telephony"><b>ใช้ Wi-Fi และเครือข่ายมือถือ</b> เพื่อช่วยให้แอปหาตำแหน่งของคุณได้ง่ายขึ้น</string>
+  <string name="location_network_gms"><b>ใช้บริการตำแหน่งของ Google</b> เพื่อช่วยให้แอปของคุณหาตำแหน่งได้ดีขึ้น นี่หมายรวมถึงการส่งข้อมูลที่อยู่แบบไม่ระบุตัวตนให้ Google แม้ไม่มีแอปใดๆทำงานอยู่เลย</string>
+  <string name="setup_mobile_data">เปิดใช้งานข้อมูลมือถือ</string>
+  <string name="setup_mobile_data_no_service">ไม่มีบริการ</string>
+  <string name="setup_mobile_data_emergency_only">โทรฉุกเฉินเท่านั้น</string>
+  <string name="enable_mobile_data_summary">คุณต้องการใช้ข้อมูลมือถือขณะทำการตั้งค่าไหม? การกระทำนี้อาจมีค่าใช้จ่ายจากผู้ให้บริการ</string>
+  <string name="no">ไม่</string>
+  <string name="yes">ใช่</string>
+  <string name="data_sim_name">ซิม <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
+  <string name="emergency_call">โทรฉุกเฉิน</string>
+  <string name="setup_services">ความสามารถของ Cyanogen</string>
+  <string name="services_explanation" product="tablet">บริการเหล่านี้คุณสามารถเพิ่มความสามารถของแท็บเล็ตของคุณได้ ข้อมูลจะถูกใช้ตาม Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g></string>
+  <string name="services_explanation" product="default">บริการเหล่านี้คุณสามารถเพิ่มความสามารถของโทรศัพท์ของคุณได้ ข้อมูลจะถูกใช้ตาม Cyanogen <xliff:g id="name" example="Privacy Policy">%s</xliff:g></string>
+  <string name="services_privacy_policy">นโยบายความเป็นส่วนตัว</string>
+  <string name="services_help_improve_cm">ช่วยปรับปรุง <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> โดยการส่งปัญหาและข้อมูลการใช้งานไปยัง Cyanogen อัตโนมัติ โดยการกระทำนี้ จะไม่มีข้อมูลที่สามารถระบุตัวตนคุณได้ส่งไปด้วย โดยการกระทำนี้จะช่วยให้ทีมงานของพวกเราสามารถพัฒนาประสิทธิภาพ,ยืดอายุการใช้งาน รวมถึงสร้างความสามารถใหม่ของ  <xliff:g id="name" example="CyanogenMod">%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">%s</xliff:g> จะเข้ารหัสข้อความเมื่อส่งข้อความไปหาผู้ที่ใช้อุปกรณ์ที่ติดตั้ง <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
+</resources>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -54,9 +54,14 @@
  <string name="yes">Evet</string>
  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
  <string name="emergency_call">Acil durum çağrısı</string>
+  <string name="setup_services">Cyanogen özellikleri</string>
+  <string name="services_explanation" product="tablet">Bu hizmetler tabletinizin yeteneklerini arttırır. Veriler Cyanogen\'in <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ilkelerine uygun olarak kullanılacaktır.</string>
+  <string name="services_explanation" product="default">Bu hizmetler telefonunuzun yeteneklerini arttırır. Veriler Cyanogen\'in <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ilkelerine uygun olarak kullanılacaktır.</string>
  <string name="services_privacy_policy">Gizlilik Politikası</string>
  <string name="services_help_improve_cm"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> gelişimine yardım edin</string>
  <string name="services_metrics_label">Tanılama ve kullanım verilerini Cyanogen\'e göndererek <xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g>. Bu bilgiler kimliğinizi ifşah edecek şekilde kullanılmaz ancak pil ömrü, uyg. performansı, ve yeni <xliff:g id="name" example="CyanogenMod">%s</xliff:g> özellikleri gibi konularda takımımızın çalışmalarında kullanılır.</string>
+  <string name="services_apply_theme"><xliff:g id="name" example="Material">%s</xliff:g> temasını uygula</string>
+  <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>nırken eşsiz simgeler, duvar kağıtları ve yazı tipleri etkinleştiriliyor.</string>
  <string name="services_os_nav_keys_label"><b>Donanımsal tuşlar yerine ekran üstü dolaşım tuşlarını kullanın.</b></string>
  <string name="services_use_secure_sms">Şifreli SMS kullanın</string>
  <string name="services_secure_sms_label"><xliff:g id="name" example="CyanogenMod">%s</xliff:g> cihazında diğer kullanıcılarla olan sohbetlerinizi şifrelemek için <xliff:g id="name" example="Use secure SMS">%s</xliff:g>.</string>
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">Екстрений виклик</string>
+  <string name="setup_services">Особливості Cyanogen</string>
+  <string name="services_explanation" product="tablet">Ці послуги створено, щоб розширити можливості Вашого пристрою. Особисті дані буде використано у відповідності до <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string>
+  <string name="services_explanation" product="default">Ці послуги створено, щоб розширити можливості Вашого пристрою. Особисті дані буде використано у відповідності до <xliff:g id="name" example="Privacy Policy">%s </xliff:g>.</string>
  <string name="services_privacy_policy">Політика Конфіденційності</string>
  <string name="services_help_improve_cm">Допомогти поліпшити <xliff:g id="name" example="CyanogenMod">%s </xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> автоматично надсилаючи дані, щодо  використання та диагностики у Cyanogen. Ця інформація не може бути використована для ідентифікації користувача, але дуже допоможе розробникам, що працюють над такими речами, як: час праці батареї, продуктивність додатків і нові функції <xliff:g id="name" example="CyanogenMod"> %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>
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -54,9 +54,14 @@
  <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>
  <string name="emergency_call">紧急电话</string>
+  <string name="setup_services">Cyanogen 功能</string>
+  <string name="services_explanation" product="tablet">这些服务用于扩展您的平板电脑的功能。数据将根据 Cyanogen 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 使用。</string>
+  <string name="services_explanation" product="default">这些服务用于扩展您的手机的功能。数据将根据 Cyanogen 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 使用。</string>
  <string name="services_privacy_policy">隐私政策</string>
  <string name="services_help_improve_cm">帮助完善 <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> 通过自动发送诊断和使用数据给 Cyanogen。这些信息不会被用于识别您的身份，而是用于帮助团队致力于诸如电池寿命、应用性能和新 <xliff:g id="name" example="CyanogenMod">%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">%s</xliff:g> 设备上<xliff:g id="name" example="Use secure SMS">%s</xliff:g>来加密您与其他用户的短信会话。</string>
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -0,0 +1,68 @@
+<?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">
+  <string name="app_name">設定精靈</string>
+  <string name="next">下一步</string>
+  <string name="skip">略過</string>
+  <string name="start">開始</string>
+  <string name="ok">確定</string>
+  <string name="loading">請稍候\u2026</string>
+  <string name="setup_complete">設定已完成</string>
+  <string name="setup_welcome">歡迎</string>
+  <string name="setup_wifi">選取 Wi-Fi</string>
+  <string name="setup_sim_missing">沒有 SIM 卡</string>
+  <string name="setup_choose_data_sim">選取使用行動數據的 SIM 卡</string>
+  <string name="setup_location">定位服務</string>
+  <string name="setup_other">其他服務</string>
+  <string name="setup_datetime">日期與時間</string>
+  <string name="setup_current_date">目前日期</string>
+  <string name="setup_current_time">目前時間</string>
+  <string name="sim_missing_summary" product="tablet">您的平板電腦中未發現 SIM 卡。若要插入一張 SIM 卡，請查閱您的裝置附贈的說明。</string>
+  <string name="sim_missing_summary" product="default">您的手機中未發現 SIM 卡。若要插入一張 SIM 卡，請查閱您的裝置附贈的說明。</string>
+  <string name="choose_data_sim_summary" product="tablet">您想要使用哪一張 SIM 卡作為行動數據? 所選擇的 SIM 卡可能產生費用，因為它將用於設定您的平板電腦。</string>
+  <string name="choose_data_sim_summary" product="default">您想要使用哪一張 SIM 卡作為行動數據? 所選擇的 SIM 卡可能產生費用，因為它將用於設定您的手機。</string>
+  <string name="date_time_summary">如果需要的話，請調整您的時區及日期與時間</string>
+  <string name="backup_data_summary"><b>備份</b>應用程式資料、Wi-Fi 密碼及其他設定到 Google 伺服器</string>
+  <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_network"><b>使用 Wi-Fi</b> 來幫助應用程式確定您所在的位置。</string>
+  <string name="location_network_telephony"><b>使用 Wi-Fi 和行動網路</b>來幫助應用程式確定您所在的位置。</string>
+  <string name="location_network_gms"><b>使用 Google 的定位服務</b>來幫助應用程式確定您所在的位置。這表示即使應用程式沒有運作，也會發送匿名的位置資料給 Google。</string>
+  <string name="setup_mobile_data">開啟行動數據</string>
+  <string name="setup_mobile_data_no_service">沒有服務</string>
+  <string name="setup_mobile_data_emergency_only">僅可撥打緊急電話</string>
+  <string name="enable_mobile_data_summary">您想在設定過程中使用行動網路嗎？使用行動網路可能會產生傳輸費用。</string>
+  <string name="no">否</string>
+  <string name="yes">是</string>
+  <string name="data_sim_name">SIM <xliff:g id="sub">%d</xliff:g> - <xliff:g id="name">%s</xliff:g></string>
+  <string name="emergency_call">緊急電話</string>
+  <string name="setup_services">Cyanogen 功能</string>
+  <string name="services_explanation" product="tablet">這些服務用來增強您的平板電腦的功能。資料將根據 Cyanogen 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 來使用。</string>
+  <string name="services_explanation" product="default">這些服務用來增強您的手機的功能。資料將根據 Cyanogen 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 來使用。</string>
+  <string name="services_privacy_policy">隱私權政策</string>
+  <string name="services_help_improve_cm">協助改善 <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%s</xliff:g> 通過自動發送診斷及使用資料給 Cyanogen。這些資料不會被用於識別您的身份，而是用於幫助團隊致力於諸如電池壽命、應用程式性能和增加 <xliff:g id="name" example="CyanogenMod">%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">%s</xliff:g> 裝置上 <xliff:g id="name" example="Use secure SMS">%s</xliff:g> 來加密您與其他人的簡訊。</string>
+</resources>
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -20,4 +20,5 @@
    <!-- The type of sim image to display.
         0=default sim image, 1=sim on side, 2=sim on back-->
    <integer name="sim_image_type">0</integer>
+    <bool name="check_custom_theme_by_default">true</bool>
 </resources>
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,12 +18,25 @@
    <style name="Theme.Setup" parent="@android:style/Theme.Material.Light">
        <item name="android:windowActionBar">false</item>
        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowBackground">@color/page_background</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
        <item name="android:colorPrimary">@color/primary</item>
        <item name="android:colorPrimaryDark">@color/primary</item>
        <item name="android:colorAccent">@color/accent</item>
        <item name="android:textColorLink">@color/accent</item>
        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowAnimationStyle">@style/ActivityAnimations</item>
+    </style>
+
+    <style name="ActivityAnimations" parent="@android:style/Animation.Activity">
+        <item name="android:activityOpenEnterAnimation">@anim/translucent_enter</item>
+        <item name="android:activityOpenExitAnimation">@anim/translucent_exit</item>
+        <item name="android:activityCloseEnterAnimation">@anim/translucent_enter</item>
+        <item name="android:activityCloseExitAnimation">@anim/translucent_exit</item>
+        <item name="android:taskToFrontEnterAnimation">@anim/translucent_enter</item>
+        <item name="android:taskToFrontExitAnimation">@anim/translucent_exit</item>
+        <item name="android:taskToBackEnterAnimation">@anim/translucent_enter</item>
+        <item name="android:taskToBackExitAnimation">@anim/translucent_exit</item>
    </style>

    <style name="Header">
@@ -32,6 +45,7 @@

    <style name="PageContainer">
        <item name="android:textColor">@color/primary_text</item>
+        <item name="android:background">@color/page_background</item>
    </style>

    <style name="PageContent">
--- a/src/com/cyanogenmod/setupwizard/SetupWizardApp.java
+++ b/src/com/cyanogenmod/setupwizard/SetupWizardApp.java
@@ -20,8 +20,12 @@ package com.cyanogenmod.setupwizard;
 import android.app.Application;
 import android.app.StatusBarManager;
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Handler;
 import android.provider.Settings;

+import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
+
 public class SetupWizardApp extends Application {

    public static final String TAG = SetupWizardApp.class.getSimpleName();
@@ -44,19 +48,68 @@ public class SetupWizardApp extends Application {

    private static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled";

+    private static final String[] THEME_PACKAGES = {
+            "org.cyanogenmod.theme.chooser",
+            "com.cyngn.theme.chooser",
+            "com.cyngn.themestore"
+    };
+
    public static final int REQUEST_CODE_SETUP_WIFI = 0;
    public static final int REQUEST_CODE_SETUP_GMS= 1;
    public static final int REQUEST_CODE_RESTORE_GMS= 2;
    public static final int REQUEST_CODE_SETUP_CYANOGEN= 3;
    public static final int REQUEST_CODE_SETUP_CAPTIVE_PORTAL= 4;

+    public static final int RADIO_READY_TIMEOUT = 10 * 1000;
+
+    private boolean mIsRadioReady = false;
+
    private StatusBarManager mStatusBarManager;

+    private final Handler mHandler = new Handler();
+
+    private final Runnable mRadioTimeoutRunnable = new Runnable() {
+        @Override
+        public void run() {
+            mIsRadioReady = true;
+        }
+    };
+
    @Override
    public void onCreate() {
        super.onCreate();
-        disableCaptivePortalDetection();
        mStatusBarManager = (StatusBarManager)getSystemService(Context.STATUS_BAR_SERVICE);
+        try {
+            // Since this is a new component, we need to disable here if the user
+            // has already been through setup on a previous version.
+            final boolean isOwner = SetupWizardUtils.isOwner();
+            if (!isOwner
+                    || Settings.Secure.getInt(getContentResolver(),
+                    Settings.Secure.USER_SETUP_COMPLETE) == 1) {
+                SetupWizardUtils.disableGMSSetupWizard(this);
+                SetupWizardUtils.disableSetupWizard(this);
+                if (!isOwner) {
+                    disableThemeComponentsForSecondaryUser();
+                }
+            }  else {
+                disableCaptivePortalDetection();
+            }
+        } catch (Settings.SettingNotFoundException e) {
+            // Continue with setup
+            disableCaptivePortalDetection();
+        }
+        mHandler.postDelayed(mRadioTimeoutRunnable, SetupWizardApp.RADIO_READY_TIMEOUT);
+    }
+
+    public boolean isRadioReady() {
+        return mIsRadioReady;
+    }
+
+    public void setRadioReady(boolean radioReady) {
+        if (!mIsRadioReady && radioReady) {
+            mHandler.removeCallbacks(mRadioTimeoutRunnable);
+        }
+        mIsRadioReady = radioReady;
    }

    public void disableStatusBar() {
@@ -76,4 +129,17 @@ public class SetupWizardApp extends Application {
    public void enableCaptivePortalDetection() {
        Settings.Global.putInt(getContentResolver(), KEY_DETECT_CAPTIVE_PORTAL, 1);
    }
+
+    private void disableThemeComponentsForSecondaryUser() {
+        PackageManager pm = getPackageManager();
+        for(String pkgName : THEME_PACKAGES) {
+            try {
+                pm.getApplicationInfo(pkgName, 0);
+                pm.setApplicationEnabledSetting(pkgName,
+                        PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER, 0);
+            } catch (PackageManager.NameNotFoundException e) {
+                // don't care
+            }
+        }
+    }
 }
--- a/src/com/cyanogenmod/setupwizard/setup/AbstractSetupData.java
+++ b/src/com/cyanogenmod/setupwizard/setup/AbstractSetupData.java
@@ -34,6 +34,8 @@ public abstract class AbstractSetupData extends BroadcastReceiver implements Set

    private boolean mIsResumed = false;

+    private boolean mIsFinished = false;
+
    private OnResumeRunnable mOnResumeRunnable;

    public AbstractSetupData(Context context) {
@@ -186,6 +188,7 @@ public abstract class AbstractSetupData extends BroadcastReceiver implements Set
    }

    public void finishPages() {
+        mIsFinished = true;
        for (Page page : mPageList.values()) {
            page.onFinishSetup();
        }
@@ -198,6 +201,10 @@ public abstract class AbstractSetupData extends BroadcastReceiver implements Set
        }
    }

+    public boolean isFinished() {
+        return mIsFinished;
+    }
+
    public Bundle save() {
        Bundle bundle = new Bundle();
        for (Page page : mPageList.values()) {
--- a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java
@@ -20,13 +20,15 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
+import android.telephony.SubInfoRecord;
+import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;

 import com.android.internal.telephony.TelephonyIntents;
-import com.cyanogenmod.setupwizard.ui.SetupWizardActivity;
 import com.cyanogenmod.setupwizard.util.SetupWizardUtils;

 import java.util.ArrayList;
+import java.util.List;

 public class CMSetupWizardData extends AbstractSetupData {

@@ -45,10 +47,12 @@ public class CMSetupWizardData extends AbstractSetupData {
        pages.add(new WelcomePage(mContext, this));
        pages.add(new WifiSetupPage(mContext, this));
        if (SetupWizardUtils.hasTelephony(mContext)) {
-            pages.add(new SimCardMissingPage(mContext, this).setHidden(isSimInserted()));
+            pages.add(new SimCardMissingPage(mContext, this)
+                    .setHidden(isSimInserted()));
        }
-        if (SetupWizardUtils.isMultiSimDevice(mContext) && SetupWizardUtils.isOwner()) {
-            pages.add(new ChooseDataSimPage(mContext, this).setHidden(!allSimsInserted()));
+        if (SetupWizardUtils.isMultiSimDevice(mContext)) {
+            pages.add(new ChooseDataSimPage(mContext, this)
+                    .setHidden(!allSimsInserted()));
        }
        if (SetupWizardUtils.hasTelephony(mContext)) {
            pages.add(new MobileDataPage(mContext, this)
@@ -57,12 +61,10 @@ public class CMSetupWizardData extends AbstractSetupData {
        if (SetupWizardUtils.hasGMS(mContext)) {
            pages.add(new GmsAccountPage(mContext, this).setHidden(true));
        }
-        if (SetupWizardUtils.isOwner()) {
        pages.add(new CyanogenServicesPage(mContext, this).setHidden(true));
        pages.add(new CyanogenSettingsPage(mContext, this));
        pages.add(new OtherSettingsPage(mContext, this));
        pages.add(new DateTimePage(mContext, this));
-        }
        pages.add(new FinishPage(mContext, this));
        return new PageList(pages.toArray(new SetupPage[pages.size()]));
    }
@@ -71,22 +73,13 @@ public class CMSetupWizardData extends AbstractSetupData {
    @Override
    public void onReceive(Context context, Intent intent) {
        if (intent.getAction().equals(TelephonyIntents.ACTION_SIM_STATE_CHANGED)) {
-            ChooseDataSimPage chooseDataSimPage =
-                    (ChooseDataSimPage) getPage(ChooseDataSimPage.TAG);
-            if (chooseDataSimPage != null) {
-                chooseDataSimPage.setHidden(!allSimsInserted());
-            }
-            SimCardMissingPage simCardMissingPage =
-                    (SimCardMissingPage) getPage(SimCardMissingPage.TAG);
-            if (simCardMissingPage != null) {
-                simCardMissingPage.setHidden(isSimInserted());
-                if (isCurrentPage(simCardMissingPage)) {
-                    onNextPage();
-                }
-            }
+            showHideDataSimPage();
+            showHideSimMissingPage();
            showHideMobileDataPage();
        } else if (intent.getAction()
-                .equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
+                .equals(ConnectivityManager.CONNECTIVITY_ACTION) ||
+                intent.getAction()
+                        .equals(ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE)) {
            showHideAccountPages();
        } else  if (intent.getAction()
                .equals(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED)) {
@@ -117,12 +110,30 @@ public class CMSetupWizardData extends AbstractSetupData {
        }
    }

+    private void showHideSimMissingPage() {
+        SimCardMissingPage simCardMissingPage =
+                (SimCardMissingPage) getPage(SimCardMissingPage.TAG);
+        if (simCardMissingPage != null && isSimInserted()) {
+            simCardMissingPage.setHidden(true);
+            if (isCurrentPage(simCardMissingPage)) {
+                onNextPage();
+            }
+        }
+    }
+
+    private void showHideDataSimPage() {
+        ChooseDataSimPage chooseDataSimPage =
+                (ChooseDataSimPage) getPage(ChooseDataSimPage.TAG);
+        if (chooseDataSimPage != null) {
+            chooseDataSimPage.setHidden(!allSimsInserted());
+        }
+    }
+
    private void showHideMobileDataPage() {
        MobileDataPage mobileDataPage =
                (MobileDataPage) getPage(MobileDataPage.TAG);
        if (mobileDataPage != null) {
-            mobileDataPage.setHidden(!isSimInserted() ||
-                    SetupWizardUtils.isMobileDataEnabled(mContext));
+            mobileDataPage.setHidden(!isSimInserted());
        }
    }

@@ -139,6 +150,7 @@ public class CMSetupWizardData extends AbstractSetupData {
            filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
            filter.addAction(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);
        }
+        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE);
        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
        filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
        filter.addAction(Intent.ACTION_TIME_CHANGED);
@@ -165,13 +177,14 @@ public class CMSetupWizardData extends AbstractSetupData {
    private boolean allSimsInserted() {
        TelephonyManager tm = TelephonyManager.from(mContext);
        int simSlotCount = tm.getSimCount();
+        List<SubInfoRecord> subInfoRecords =  SubscriptionManager.getActiveSubInfoList();
        for (int i = 0; i < simSlotCount; i++) {
            int state = tm.getSimState(i);
            if (state == TelephonyManager.SIM_STATE_ABSENT) {
                return false;
            }
        }
-        return true;
+        return simSlotCount == subInfoRecords.size();
    }

 }
--- a/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java
@@ -20,6 +20,7 @@ import android.app.Fragment;
 import android.app.FragmentManager;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Handler;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
 import android.telephony.SignalStrength;
@@ -31,13 +32,17 @@ import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.AnimationUtils;
 import android.widget.CheckBox;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;

 import com.cyanogenmod.setupwizard.R;
+import com.cyanogenmod.setupwizard.SetupWizardApp;
 import com.cyanogenmod.setupwizard.cmstats.SetupStats;
 import com.cyanogenmod.setupwizard.ui.SetupPageFragment;
+import com.cyanogenmod.setupwizard.util.SetupWizardUtils;

 import java.util.List;

@@ -76,16 +81,30 @@ public class ChooseDataSimPage extends SetupPage {
    public static class ChooseDataSimFragment extends SetupPageFragment {

        private ViewGroup mPageView;
+        private ProgressBar mProgressBar;
        private SparseArray<TextView> mNameViews;
        private SparseArray<ImageView> mSignalViews;
        private SparseArray<CheckBox> mCheckBoxes;

        private TelephonyManager mPhone;
-        private List<SubInfoRecord> mSubInfoRecords;
+        private SparseArray<SubInfoRecord> mSubInfoRecords;
        private SparseArray<SignalStrength> mSignalStrengths;
        private SparseArray<ServiceState> mServiceStates;
        private SparseArray<PhoneStateListener> mPhoneStateListeners;

+        private boolean mIsAttached = false;
+
+        private Context mContext;
+
+        private final Handler mHandler = new Handler();
+
+        private final Runnable mRadioReadyRunnable = new Runnable() {
+            @Override
+            public void run() {
+                hideWaitForRadio();
+            }
+        };
+
        private View.OnClickListener mSetDataSimClickListener = new View.OnClickListener() {
            @Override
            public void onClick(View view) {
@@ -100,8 +119,13 @@ public class ChooseDataSimPage extends SetupPage {
        @Override
        protected void initializePage() {
            mPageView = (ViewGroup)mRootView.findViewById(R.id.page_view);
-            mSubInfoRecords =  SubscriptionManager.getActiveSubInfoList();
-            int simCount = mSubInfoRecords.size();
+            mProgressBar = (ProgressBar) mRootView.findViewById(R.id.progress);
+            List<SubInfoRecord> subInfoRecords =  SubscriptionManager.getActiveSubInfoList();
+            int simCount = subInfoRecords.size();
+            mSubInfoRecords = new SparseArray<SubInfoRecord>(simCount);
+            for (SubInfoRecord subInfoRecord : subInfoRecords) {
+                mSubInfoRecords.put(subInfoRecord.slotId, subInfoRecord);
+            }
            mNameViews = new SparseArray<TextView>(simCount);
            mSignalViews = new SparseArray<ImageView>(simCount);
            mCheckBoxes = new SparseArray<CheckBox>(simCount);
@@ -112,21 +136,19 @@ public class ChooseDataSimPage extends SetupPage {
            for (int i = 0; i < simCount; i++) {
                View simRow = inflater.inflate(R.layout.data_sim_row, null);
                mPageView.addView(simRow);
-                SubInfoRecord subInfoRecord = mSubInfoRecords.get(i);
+                SubInfoRecord subInfoRecord = mSubInfoRecords.valueAt(i);
                simRow.setTag(subInfoRecord);
                simRow.setOnClickListener(mSetDataSimClickListener);
-                mNameViews.put(i, (TextView) simRow.findViewById(R.id.sim_title));
-                mSignalViews.put(i, (ImageView) simRow.findViewById(R.id.signal));
-                mCheckBoxes.put(i, (CheckBox) simRow.findViewById(R.id.enable_check));
-                mPhoneStateListeners.put(i, createPhoneStateListener(subInfoRecord));
+                mNameViews.put(subInfoRecord.slotId,
+                        (TextView) simRow.findViewById(R.id.sim_title));
+                mSignalViews.put(subInfoRecord.slotId,
+                        (ImageView) simRow.findViewById(R.id.signal));
+                mCheckBoxes.put(subInfoRecord.slotId,
+                        (CheckBox) simRow.findViewById(R.id.enable_check));
+                mPhoneStateListeners.put(subInfoRecord.slotId,
+                        createPhoneStateListener(subInfoRecord));
                mPageView.addView(inflater.inflate(R.layout.divider, null));
            }
-            mPhone = (TelephonyManager)getActivity().getSystemService(Context.TELEPHONY_SERVICE);
-            for (int i = 0; i < mPhoneStateListeners.size(); i++) {
-                mPhone.listen(mPhoneStateListeners.get(i),
-                        PhoneStateListener.LISTEN_SERVICE_STATE
-                                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
-            }
            updateSignalStrengths();
            updateCurrentDataSub();
        }
@@ -139,16 +161,31 @@ public class ChooseDataSimPage extends SetupPage {
        @Override
        public void onResume() {
            super.onResume();
+            mIsAttached = true;
+            mContext = getActivity().getApplicationContext();
+            mPhone = (TelephonyManager)getActivity().getSystemService(Context.TELEPHONY_SERVICE);
+            for (int i = 0; i < mPhoneStateListeners.size(); i++) {
+                mPhone.listen(mPhoneStateListeners.valueAt(i),
+                        PhoneStateListener.LISTEN_SERVICE_STATE
+                                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
+            }
            updateSignalStrengths();
            updateCurrentDataSub();
+            if (SetupWizardUtils.isRadioReady(mContext, null)) {
+                hideWaitForRadio();
+            } else if (mTitleView != null) {
+                mTitleView.setText(R.string.loading);
+                mHandler.postDelayed(mRadioReadyRunnable, SetupWizardApp.RADIO_READY_TIMEOUT);
+            }
        }

        @Override
-        public void onDetach() {
+        public void onPause() {
+            super.onPause();
+            mIsAttached = false;
            for (int i = 0; i < mPhoneStateListeners.size(); i++) {
-                mPhone.listen(mPhoneStateListeners.get(i), PhoneStateListener.LISTEN_NONE);
+                mPhone.listen(mPhoneStateListeners.valueAt(i), PhoneStateListener.LISTEN_NONE);
            }
-            super.onDetach();
        }

        private PhoneStateListener createPhoneStateListener(final SubInfoRecord subInfoRecord) {
@@ -156,54 +193,73 @@ public class ChooseDataSimPage extends SetupPage {

                @Override
                public void onSignalStrengthsChanged(SignalStrength signalStrength) {
-                    if (isDetached()) return;
                        mSignalStrengths.put(subInfoRecord.slotId, signalStrength);
                        updateSignalStrength(subInfoRecord);
+
                }

                @Override
                public void onServiceStateChanged(ServiceState state) {
-                    if (isDetached()) return;
+                    if (SetupWizardUtils.isRadioReady(mContext, state)) {
+                        hideWaitForRadio();
+                    }
                    mServiceStates.put(subInfoRecord.slotId, state);
                    updateSignalStrength(subInfoRecord);
                }
            };
        }

+        private void hideWaitForRadio() {
+            if (getUserVisibleHint() && mProgressBar.isShown()) {
+                mHandler.removeCallbacks(mRadioReadyRunnable);
+                if (mTitleView != null) {
+                    mTitleView.setText(mPage.getTitleResId());
+                }
+                mProgressBar.setVisibility(View.GONE);
+                mPageView.setVisibility(View.VISIBLE);
+                mPageView.startAnimation(
+                        AnimationUtils.loadAnimation(getActivity(), R.anim.translucent_enter));
+            }
+        }
+
        private void updateSignalStrengths() {
-            if (isDetached()) return;
+            if (mIsAttached) {
                for (int i = 0; i < mSubInfoRecords.size(); i++) {
-                updateSignalStrength(mSubInfoRecords.get(i));
+                    updateSignalStrength(mSubInfoRecords.valueAt(i));
+                }
            }
        }

        private void setDataSubChecked(SubInfoRecord subInfoRecord) {
-            if (isDetached()) return;
+            if (mIsAttached) {
                for (int i = 0; i < mCheckBoxes.size(); i++) {
                    if (subInfoRecord.slotId == i) {
-                    mCheckBoxes.get(i).setChecked(true);
+                        mCheckBoxes.get(subInfoRecord.slotId).setChecked(true);
                        SetupStats.addEvent(SetupStats.Categories.SETTING_CHANGED,
                                SetupStats.Action.PREFERRED_DATA_SIM,
-                            SetupStats.Label.SLOT, String.valueOf(i + 1));
+                                SetupStats.Label.SLOT, String.valueOf(subInfoRecord.slotId + 1));
                    } else {
                        mCheckBoxes.get(i).setChecked(false);
                    }

                }
            }
+        }

        private void updateCurrentDataSub() {
-            if (isDetached()) return;
+            if (mIsAttached) {
                for (int i = 0; i < mSubInfoRecords.size(); i++) {
-                SubInfoRecord subInfoRecord = mSubInfoRecords.get(i);
-                mCheckBoxes.get(i).setChecked(SubscriptionManager.getDefaultDataSubId()
-                        == subInfoRecord.subId);
+                    SubInfoRecord subInfoRecord = mSubInfoRecords.valueAt(i);
+                    final long defaultDataSubId =  SubscriptionManager.getDefaultDataSubId();
+                    mCheckBoxes.get(subInfoRecord.slotId)
+                            .setChecked(defaultDataSubId == subInfoRecord.subId);

                }
            }
+        }

        private void updateCarrierText(SubInfoRecord subInfoRecord) {
-            if (isDetached()) return;
+            if (mIsAttached) {
                String name = mPhone.getNetworkOperatorName(subInfoRecord.subId);
                ServiceState serviceState = mServiceStates.get(subInfoRecord.slotId);
                if (TextUtils.isEmpty(name)) {
@@ -217,9 +273,10 @@ public class ChooseDataSimPage extends SetupPage {
                        getString(R.string.data_sim_name, subInfoRecord.slotId + 1, name);
                mNameViews.get(subInfoRecord.slotId).setText(formattedName);
            }
+        }

        private void updateSignalStrength(SubInfoRecord subInfoRecord) {
-            if (isDetached()) return;
+            if (mIsAttached) {
                ImageView signalView = mSignalViews.get(subInfoRecord.slotId);
                SignalStrength signalStrength = mSignalStrengths.get(subInfoRecord.slotId);
                if (!hasService(subInfoRecord)) {
@@ -249,6 +306,7 @@ public class ChooseDataSimPage extends SetupPage {
                }
                updateCarrierText(subInfoRecord);
            }
+        }

        private boolean hasService(SubInfoRecord subInfoRecord) {
            boolean retVal;
--- a/src/com/cyanogenmod/setupwizard/setup/CyanogenServicesPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CyanogenServicesPage.java
@@ -28,6 +28,7 @@ import android.app.FragmentManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;

 import com.cyanogenmod.setupwizard.R;
 import com.cyanogenmod.setupwizard.SetupWizardApp;
@@ -83,17 +84,13 @@ public class CyanogenServicesPage extends SetupPage {
            if (!SetupWizardUtils.accountExists(mContext,
                    mContext.getString(R.string.cm_account_type))) {
                super.doLoadAction(fragmentManager, action);
+                launchCyanogenAccountSetup();
            } else {
                getCallbacks().onNextPage();
            }
        }
    }

-    @Override
-    public void onFragmentReady() {
-        launchCyanogenAccountSetup();
-    }
-
    @Override
    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
        if (requestCode == SetupWizardApp.REQUEST_CODE_SETUP_CYANOGEN) {
@@ -127,6 +124,7 @@ public class CyanogenServicesPage extends SetupPage {
                        null, new AccountManagerCallback<Bundle>() {
                            @Override
                            public void run(AccountManagerFuture<Bundle> future) {
+                                boolean error = false;
                                try {
                                    Bundle result = future.getResult();
                                    Intent intent = result
@@ -135,7 +133,6 @@ public class CyanogenServicesPage extends SetupPage {
                                            ActivityOptions.makeCustomAnimation(mContext,
                                                    android.R.anim.fade_in,
                                                    android.R.anim.fade_out);
-                                    if (!mFragment.isDetached()) {
                                    SetupStats
                                            .addEvent(SetupStats.Categories.EXTERNAL_PAGE_LOAD,
                                                    SetupStats.Action.EXTERNAL_PAGE_LAUNCH,
@@ -144,16 +141,19 @@ public class CyanogenServicesPage extends SetupPage {
                                    mFragment.startActivityForResult(intent,
                                            SetupWizardApp.REQUEST_CODE_SETUP_CYANOGEN,
                                            options.toBundle());
-                                    } else {
-                                        if (getCallbacks().
+                                } catch (OperationCanceledException e) {
+                                    error = true;
+                                } catch (IOException e) {
+                                    error = true;
+                                } catch (AuthenticatorException e) {
+                                    Log.e(TAG, "Error launching cm account", e);
+                                    error = true;
+                                } finally {
+                                    if (error && getCallbacks().
                                            isCurrentPage(CyanogenServicesPage.this)) {
                                        getCallbacks().onNextPage();
                                    }
                                }
-                                } catch (OperationCanceledException e) {
-                                } catch (IOException e) {
-                                } catch (AuthenticatorException e) {
-                                }
                            }
                        }, null);
    }
--- a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
@@ -23,6 +23,7 @@ import android.content.SharedPreferences;
 import android.content.pm.ThemeUtils;
 import android.content.res.ThemeConfig;
 import android.content.res.ThemeManager;
+import android.hardware.CmHardwareManager;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.preference.PreferenceManager;
@@ -50,8 +51,6 @@ import com.cyanogenmod.setupwizard.util.WhisperPushUtils;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GooglePlayServicesUtil;

-import org.cyanogenmod.hardware.KeyDisabler;
-
 public class CyanogenSettingsPage extends SetupPage {

    public static final String TAG = "CyanogenSettingsPage";
@@ -62,7 +61,7 @@ public class CyanogenSettingsPage extends SetupPage {
    public static final String KEY_APPLY_DEFAULT_THEME = "apply_default_theme";

    public static final String SETTING_METRICS = "settings.cyanogen.allow_metrics";
-    public static final String PRIVACY_POLICY_URI = "https://cyngn.com/legal";
+    public static final String PRIVACY_POLICY_URI = "https://cyngn.com/oobe-legal?hideHeader=1";

    public CyanogenSettingsPage(Context context, SetupDataCallbacks callbacks) {
        super(context, callbacks);
@@ -98,7 +97,9 @@ public class CyanogenSettingsPage extends SetupPage {

        Settings.Secure.putInt(context.getContentResolver(),
                Settings.Secure.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0);
-        KeyDisabler.setActive(enabled);
+        final CmHardwareManager cmHardwareManager =
+                (CmHardwareManager) context.getSystemService(Context.CMHW_SERVICE);
+        cmHardwareManager.set(CmHardwareManager.FEATURE_KEY_DISABLE, enabled);

        /* Save/restore button timeouts to disable them in softkey mode */
        SharedPreferences.Editor editor = prefs.edit();
@@ -181,21 +182,16 @@ public class CyanogenSettingsPage extends SetupPage {
        }
    }

-    private static boolean hideKeyDisabler() {
-        try {
-            return !KeyDisabler.isSupported();
-        } catch (NoClassDefFoundError e) {
-            // Hardware abstraction framework not installed
-            return true;
-        }
+    private static boolean hideKeyDisabler(Context ctx) {
+        final CmHardwareManager cmHardwareManager =
+                (CmHardwareManager) ctx.getSystemService(Context.CMHW_SERVICE);
+        return !cmHardwareManager.isSupported(CmHardwareManager.FEATURE_KEY_DISABLE);
    }

-    private static boolean isKeyDisablerActive() {
-        try {
-            return KeyDisabler.isActive();
-        } catch (Exception e) {
-            return false;
-        }
+    private static boolean isKeyDisablerActive(Context ctx) {
+        final CmHardwareManager cmHardwareManager =
+                (CmHardwareManager) ctx.getSystemService(Context.CMHW_SERVICE);
+        return cmHardwareManager.get(CmHardwareManager.FEATURE_KEY_DISABLE);
    }

    private static boolean hideWhisperPush(Context context) {
@@ -207,7 +203,7 @@ public class CyanogenSettingsPage extends SetupPage {
                SetupWizardUtils.isSimMissing(context));
    }

-    protected static boolean hideThemeSwitch(Context context) {
+    private static boolean hideThemeSwitch(Context context) {
        return ThemeUtils.getDefaultThemePackageName(context).equals(ThemeConfig.SYSTEM_DEFAULT);
    }

@@ -222,6 +218,10 @@ public class CyanogenSettingsPage extends SetupPage {
        private CheckBox mNavKeys;
        private CheckBox mSecureSms;

+        private boolean mHideNavKeysRow = false;
+        private boolean mHideThemeRow = false;
+        private boolean mHideSmsRow = false;
+

        private View.OnClickListener mMetricsClickListener = new View.OnClickListener() {
            @Override
@@ -261,7 +261,6 @@ public class CyanogenSettingsPage extends SetupPage {

        @Override
        protected void initializePage() {
-            final Bundle myPageBundle = mPage.getData();
            String privacy_policy = getString(R.string.services_privacy_policy);
            String policySummary = getString(R.string.services_explanation, privacy_policy);
            SpannableString ss = new SpannableString(policySummary);
@@ -292,14 +291,10 @@ public class CyanogenSettingsPage extends SetupPage {
            TextView metrics = (TextView) mRootView.findViewById(R.id.enable_metrics_summary);
            metrics.setText(metricsSpan);
            mMetrics = (CheckBox) mRootView.findViewById(R.id.enable_metrics_checkbox);
-            boolean metricsChecked =
-                    !myPageBundle.containsKey(KEY_SEND_METRICS) || myPageBundle
-                            .getBoolean(KEY_SEND_METRICS);
-            mMetrics.setChecked(metricsChecked);
-            myPageBundle.putBoolean(KEY_SEND_METRICS, metricsChecked);

            mDefaultThemeRow = mRootView.findViewById(R.id.theme);
-            if (hideThemeSwitch(getActivity())) {
+            mHideThemeRow = hideThemeSwitch(getActivity());
+            if (mHideThemeRow) {
                mDefaultThemeRow.setVisibility(View.GONE);
            } else {
                mDefaultThemeRow.setOnClickListener(mDefaultThemeClickListener);
@@ -315,11 +310,6 @@ public class CyanogenSettingsPage extends SetupPage {
                TextView theme = (TextView) mRootView.findViewById(R.id.enable_theme_summary);
                theme.setText(themeSpan);
                mDefaultTheme = (CheckBox) mRootView.findViewById(R.id.enable_theme_checkbox);
-                boolean themesChecked =
-                        !myPageBundle.containsKey(KEY_APPLY_DEFAULT_THEME) || myPageBundle
-                                .getBoolean(KEY_APPLY_DEFAULT_THEME);
-                mDefaultTheme.setChecked(themesChecked);
-                myPageBundle.putBoolean(KEY_APPLY_DEFAULT_THEME, themesChecked);
            }

            mNavKeysRow = mRootView.findViewById(R.id.nav_keys);
@@ -331,11 +321,12 @@ public class CyanogenSettingsPage extends SetupPage {
                needsNavBar = windowManager.needsNavigationBar();
            } catch (RemoteException e) {
            }
-            if (hideKeyDisabler() || needsNavBar) {
+            mHideNavKeysRow = hideKeyDisabler(getActivity());
+            if (mHideNavKeysRow || needsNavBar) {
                mNavKeysRow.setVisibility(View.GONE);
            } else {
                boolean navKeysDisabled =
-                        isKeyDisablerActive();
+                        isKeyDisablerActive(getActivity());
                mNavKeys.setChecked(navKeysDisabled);
            }

@@ -350,15 +341,11 @@ public class CyanogenSettingsPage extends SetupPage {
                    0, useSecureSms.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
            TextView secureSms = (TextView) mRootView.findViewById(R.id.secure_sms_summary);
            secureSms.setText(secureSmsSpan);
-            if (hideWhisperPush(getActivity())) {
+            mHideSmsRow = hideWhisperPush(getActivity());
+            if (mHideSmsRow) {
                mSecureSmsRow.setVisibility(View.GONE);
            }
            mSecureSms = (CheckBox) mRootView.findViewById(R.id.secure_sms_checkbox);
-            boolean smsChecked = myPageBundle.containsKey(KEY_REGISTER_WHISPERPUSH) ?
-                    myPageBundle.getBoolean(KEY_REGISTER_WHISPERPUSH) :
-                    false;
-            mSecureSms.setChecked(smsChecked);
-            myPageBundle.putBoolean(KEY_REGISTER_WHISPERPUSH, smsChecked);
        }

        @Override
@@ -370,15 +357,57 @@ public class CyanogenSettingsPage extends SetupPage {
        public void onResume() {
            super.onResume();
            updateDisableNavkeysOption();
+            updateMetricsOption();
+            updateThemeOption();
+            updateSmsOption();
+        }
+
+        private void updateMetricsOption() {
+            final Bundle myPageBundle = mPage.getData();
+            boolean metricsChecked =
+                    !myPageBundle.containsKey(KEY_SEND_METRICS) || myPageBundle
+                            .getBoolean(KEY_SEND_METRICS);
+            mMetrics.setChecked(metricsChecked);
+            myPageBundle.putBoolean(KEY_SEND_METRICS, metricsChecked);
+        }
+
+        private void updateThemeOption() {
+            if (!mHideThemeRow) {
+                final Bundle myPageBundle = mPage.getData();
+                boolean themesChecked;
+                if (myPageBundle.containsKey(KEY_APPLY_DEFAULT_THEME)) {
+                    themesChecked = myPageBundle.getBoolean(KEY_APPLY_DEFAULT_THEME);
+                } else {
+                    themesChecked = getActivity().getResources().getBoolean(
+                            R.bool.check_custom_theme_by_default);
+                }
+                mDefaultTheme.setChecked(themesChecked);
+                myPageBundle.putBoolean(KEY_APPLY_DEFAULT_THEME, themesChecked);
+            }
+        }
+
+        private void updateSmsOption() {
+            if (!mHideSmsRow) {
+                final Bundle myPageBundle = mPage.getData();
+                boolean smsChecked = myPageBundle.containsKey(KEY_REGISTER_WHISPERPUSH) ?
+                        myPageBundle.getBoolean(KEY_REGISTER_WHISPERPUSH) :
+                        false;
+                mSecureSms.setChecked(smsChecked);
+                myPageBundle.putBoolean(KEY_REGISTER_WHISPERPUSH, smsChecked);
+            }
        }

        private void updateDisableNavkeysOption() {
+            if (!mHideNavKeysRow) {
+                final Bundle myPageBundle = mPage.getData();
                boolean enabled = Settings.Secure.getInt(getActivity().getContentResolver(),
                        Settings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) != 0;
-            boolean checked = mPage.getData().containsKey(KEY_ENABLE_NAV_KEYS) ?
-                    mPage.getData().getBoolean(KEY_ENABLE_NAV_KEYS) :
+                boolean checked = myPageBundle.containsKey(KEY_ENABLE_NAV_KEYS) ?
+                        myPageBundle.getBoolean(KEY_ENABLE_NAV_KEYS) :
                        enabled;
                mNavKeys.setChecked(checked);
+                myPageBundle.putBoolean(KEY_ENABLE_NAV_KEYS, checked);
+            }
        }

    }
--- a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
@@ -114,13 +114,9 @@ public class GmsAccountPage extends SetupPage {
            getCallbacks().onPreviousPage();
        } else {
            super.doLoadAction(fragmentManager, action);
-        }
-    }
-
-    @Override
-    public void onFragmentReady() {
            launchGmsAccountSetup();
        }
+    }

    @Override
    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -180,7 +176,7 @@ public class GmsAccountPage extends SetupPage {
    private void launchGmsRestorePage() {
        try {
            // GMS can disable this after logging in sometimes
-            SetupWizardUtils.enableGMSSetupWizard(mContext);
+            if (SetupWizardUtils.enableGMSSetupWizard(mContext)) {
                Intent intent = new Intent(ACTION_RESTORE);
                intent.putExtra(SetupWizardApp.EXTRA_ALLOW_SKIP, true);
                intent.putExtra(SetupWizardApp.EXTRA_USE_IMMERSIVE, true);
@@ -199,12 +195,14 @@ public class GmsAccountPage extends SetupPage {
                mFragment.startActivityForResult(
                        intent,
                        SetupWizardApp.REQUEST_CODE_RESTORE_GMS, options.toBundle());
+                return;
+            }
        } catch (Exception e) {
            e.printStackTrace();
            // XXX: In open source, we don't know what gms version a user has.
            // Bail if the restore activity is not found.
-            getCallbacks().onNextPage();
        }
+        getCallbacks().onNextPage();
    }

    private void launchGmsAccountSetup() {
@@ -217,6 +215,7 @@ public class GmsAccountPage extends SetupPage {
                bundle, null, new AccountManagerCallback<Bundle>() {
                    @Override
                    public void run(AccountManagerFuture<Bundle> future) {
+                        boolean error = false;
                        try {
                            Bundle result = future.getResult();
                            Intent intent = result
@@ -225,21 +224,24 @@ public class GmsAccountPage extends SetupPage {
                                    ActivityOptions.makeCustomAnimation(mContext,
                                            android.R.anim.fade_in,
                                            android.R.anim.fade_out);
-                            if (!mFragment.isDetached()) {
                            SetupStats.addEvent(SetupStats.Categories.EXTERNAL_PAGE_LOAD,
                                    SetupStats.Action.EXTERNAL_PAGE_LAUNCH,
                                    SetupStats.Label.PAGE, SetupStats.Label.GMS_ACCOUNT);
                            mFragment.startActivityForResult(intent,
                                    SetupWizardApp.REQUEST_CODE_SETUP_GMS, options.toBundle());
-                            } else {
-                                if (getCallbacks().isCurrentPage(GmsAccountPage.this)) {
+                        } catch (OperationCanceledException e) {
+                            error = true;
+                        } catch (IOException e) {
+                            error = true;
+                        } catch (AuthenticatorException e) {
+                            Log.e(TAG, "Error launching gms account", e);
+                            error = true;
+                        } finally {
+                            if (error && getCallbacks().
+                                    isCurrentPage(GmsAccountPage.this)) {
                                getCallbacks().onNextPage();
                            }
                        }
-                        } catch (OperationCanceledException e) {
-                        } catch (IOException e) {
-                        } catch (AuthenticatorException e) {
-                        }
                    }
                }, null);
    }
--- a/src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java
@@ -16,11 +16,11 @@

 package com.cyanogenmod.setupwizard.setup;

-import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Handler;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
 import android.telephony.SignalStrength;
@@ -28,11 +28,15 @@ import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.Switch;
 import android.widget.TextView;

 import com.cyanogenmod.setupwizard.R;
+import com.cyanogenmod.setupwizard.SetupWizardApp;
 import com.cyanogenmod.setupwizard.cmstats.SetupStats;
 import com.cyanogenmod.setupwizard.ui.SetupPageFragment;
 import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
@@ -70,6 +74,8 @@ public class MobileDataPage extends SetupPage {

    public static class MobileDataFragment extends SetupPageFragment {

+        private ViewGroup mPageView;
+        private ProgressBar mProgressBar;
        private View mEnableDataRow;
        private Switch mEnableMobileData;
        private ImageView mSignalView;
@@ -79,19 +85,33 @@ public class MobileDataPage extends SetupPage {
        private SignalStrength mSignalStrength;
        private ServiceState mServiceState;

+        private boolean mIsAttached = false;
+
+        private Context mContext;
+
+        private final Handler mHandler = new Handler();
+
+        private final Runnable mRadioReadyRunnable = new Runnable() {
+            @Override
+            public void run() {
+                hideWaitForRadio();
+            }
+        };
+
        private PhoneStateListener mPhoneStateListener =
                new PhoneStateListener(SubscriptionManager.getDefaultDataSubId()) {

                    @Override
                    public void onSignalStrengthsChanged(SignalStrength signalStrength) {
-                if (isDetached()) return;
                        mSignalStrength = signalStrength;
                        updateSignalStrength();
                    }

                    @Override
                    public void onServiceStateChanged(ServiceState state) {
-                if (isDetached()) return;
+                        if (SetupWizardUtils.isRadioReady(mContext, state)) {
+                            hideWaitForRadio();
+                        }
                        mServiceState = state;
                        updateSignalStrength();
                    }
@@ -112,6 +132,8 @@ public class MobileDataPage extends SetupPage {

        @Override
        protected void initializePage() {
+            mPageView = (ViewGroup)mRootView.findViewById(R.id.page_view);
+            mProgressBar = (ProgressBar) mRootView.findViewById(R.id.progress);
            mEnableDataRow = mRootView.findViewById(R.id.data);
            mEnableDataRow.setOnClickListener(mEnableDataClickListener);
            mEnableMobileData = (Switch) mRootView.findViewById(R.id.data_switch);
@@ -129,28 +151,46 @@ public class MobileDataPage extends SetupPage {
        @Override
        public void onResume() {
            super.onResume();
-            updateDataConnectionStatus();
-            updateSignalStrength();
-        }
-
-        @Override
-        public void onAttach(Activity activity) {
-            super.onAttach(activity);
+            mIsAttached = true;
+            mContext = getActivity().getApplicationContext();
            mPhone = (TelephonyManager)getActivity().getSystemService(Context.TELEPHONY_SERVICE);
            mPhone.listen(mPhoneStateListener,
                    PhoneStateListener.LISTEN_SERVICE_STATE
                            | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
+            updateDataConnectionStatus();
+            updateSignalStrength();
+            if (SetupWizardUtils.isRadioReady(mContext, null)) {
+                hideWaitForRadio();
+            } else if (mTitleView != null) {
+                mTitleView.setText(R.string.loading);
+                mHandler.postDelayed(mRadioReadyRunnable, SetupWizardApp.RADIO_READY_TIMEOUT);
+            }
        }

        @Override
-        public void onDetach() {
+        public void onPause() {
+            super.onPause();
+            mIsAttached = false;
            mPhone.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
-            super.onDetach();
+        }
+
+        private void hideWaitForRadio() {
+            if (getUserVisibleHint() && mProgressBar.isShown()) {
+                mHandler.removeCallbacks(mRadioReadyRunnable);
+                if (mTitleView != null) {
+                    mTitleView.setText(mPage.getTitleResId());
+                }
+                mProgressBar.setVisibility(View.GONE);
+                mPageView.setVisibility(View.VISIBLE);
+                mPageView.startAnimation(
+                        AnimationUtils.loadAnimation(getActivity(), R.anim.translucent_enter));
+            }
        }

        private void updateCarrierText() {
-            if (isDetached()) return;
-            String name = mPhone.getNetworkOperatorName(SubscriptionManager.getDefaultDataSubId());
+            if (mIsAttached) {
+                String name =
+                        mPhone.getNetworkOperatorName(SubscriptionManager.getDefaultDataSubId());
                if (TextUtils.isEmpty(name)) {
                    if (mServiceState != null && mServiceState.isEmergencyOnly()) {
                        name = getString(R.string.setup_mobile_data_emergency_only);
@@ -160,9 +200,10 @@ public class MobileDataPage extends SetupPage {
                }
                mNameView.setText(name);
            }
+        }

        private void updateSignalStrength() {
-            if (isDetached()) return;
+            if (mIsAttached) {
                if (!hasService()) {
                    mSignalView.setImageResource(R.drawable.ic_signal_no_signal);
                } else {
@@ -190,6 +231,7 @@ public class MobileDataPage extends SetupPage {
                }
                updateCarrierText();
            }
+        }

        private void updateDataConnectionStatus() {
            mEnableMobileData.setChecked(SetupWizardUtils.isMobileDataEnabled(getActivity()));
--- a/src/com/cyanogenmod/setupwizard/setup/OtherSettingsPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/OtherSettingsPage.java
@@ -136,18 +136,13 @@ public class OtherSettingsPage extends SetupPage {
            }
        };

-        @Override
-        public void onActivityCreated(Bundle savedInstanceState) {
-            super.onActivityCreated(savedInstanceState);
-            mContentResolver = getActivity().getContentResolver();
-            mBackupManager = IBackupManager.Stub.asInterface(
-                    ServiceManager.getService(Context.BACKUP_SERVICE));
-        }
-
        @Override
        protected void initializePage() {
            final boolean hasGms = SetupWizardUtils.hasGMS(getActivity());
            final boolean hasTelephony = SetupWizardUtils.hasTelephony(getActivity());
+            mContentResolver = getActivity().getContentResolver();
+            mBackupManager = IBackupManager.Stub.asInterface(
+                    ServiceManager.getService(Context.BACKUP_SERVICE));
            TextView summaryView = (TextView) mRootView.findViewById(android.R.id.summary);
            if (hasGms) {
                String privacy_policy = getString(R.string.services_privacy_policy);
@@ -275,6 +270,10 @@ public class OtherSettingsPage extends SetupPage {
                    SetupStats.Action.ENABLE_NETWORK_LOCATION,
                    SetupStats.Label.CHECKED, String.valueOf(networkEnabled));
            mLocationAccess.setChecked(gpsEnabled || networkEnabled);
+            mGps.setEnabled(gpsEnabled || networkEnabled);
+            mGpsRow.setEnabled(gpsEnabled || networkEnabled);
+            mNetwork.setEnabled(gpsEnabled || networkEnabled);
+            mNetworkRow.setEnabled(gpsEnabled || networkEnabled);
        }

        private void onToggleLocationAccess(boolean checked) {
--- a/src/com/cyanogenmod/setupwizard/setup/Page.java
+++ b/src/com/cyanogenmod/setupwizard/setup/Page.java
@@ -43,7 +43,6 @@ public interface Page {
    public boolean doPreviousAction();
    public boolean doNextAction();
    public void doLoadAction(FragmentManager fragmentManager, int action);
-    public void onFragmentReady();
    public void onFinishSetup();
    public boolean onActivityResult(int requestCode, int resultCode, Intent data);
    public SetupDataCallbacks getCallbacks();
--- a/src/com/cyanogenmod/setupwizard/setup/SetupPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/SetupPage.java
@@ -96,9 +96,6 @@ public abstract class SetupPage implements Page {
        }
    }

-    @Override
-    public void onFragmentReady(){}
-
    @Override
    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
        return false;
--- a/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java
@@ -136,8 +136,10 @@ public class WifiSetupPage extends SetupPage {
        return R.string.loading;
    }

+
    @Override
-    public void onFragmentReady() {
+    public void doLoadAction(FragmentManager fragmentManager, int action) {
+        super.doLoadAction(fragmentManager, action);
        launchWifiSetup();
    }

--- a/src/com/cyanogenmod/setupwizard/ui/LoadingFragment.java
+++ b/src/com/cyanogenmod/setupwizard/ui/LoadingFragment.java
@@ -16,9 +16,39 @@

 package com.cyanogenmod.setupwizard.ui;

+import android.content.Intent;
+import android.os.Bundle;
+
 import com.cyanogenmod.setupwizard.R;

 public class LoadingFragment extends SetupPageFragment {
+
+    private StartActivityForResultRunnable mStartActivityForResultRunnable;
+
+    @Override
+    public void startActivityForResult(Intent intent, int requestCode, Bundle options) {
+        if (isResumed()) {
+            super.startActivityForResult(intent, requestCode, options);
+        } else {
+            mStartActivityForResultRunnable =
+                    new StartActivityForResultRunnable(this, intent, requestCode, options);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mStartActivityForResultRunnable != null) {
+            mStartActivityForResultRunnable.run();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mStartActivityForResultRunnable = null;
+    }
+
    @Override
    protected void initializePage() {}

@@ -26,4 +56,26 @@ public class LoadingFragment extends SetupPageFragment {
    protected int getLayoutResource() {
        return R.layout.setup_loading_page;
    }
+
+    private static class StartActivityForResultRunnable implements Runnable {
+
+        private final LoadingFragment mLoadingFragment;
+        private final Intent mIntent;
+        private final int mRequestCode;
+        private final Bundle mOptions;
+
+        private StartActivityForResultRunnable(LoadingFragment loadingFragment,
+                Intent intent, int requestCode, Bundle options) {
+            mLoadingFragment = loadingFragment;
+            mIntent = intent;
+            mRequestCode = requestCode;
+            mOptions = options;
+        }
+
+        @Override
+        public void run() {
+            mLoadingFragment.startActivityForResult(mIntent, mRequestCode, mOptions);
+            mLoadingFragment.mStartActivityForResultRunnable = null;
+        }
+    }
 }
--- a/src/com/cyanogenmod/setupwizard/ui/SetupPageFragment.java
+++ b/src/com/cyanogenmod/setupwizard/ui/SetupPageFragment.java
@@ -43,11 +43,6 @@ public abstract class SetupPageFragment extends Fragment {
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setRetainInstance(true);
-        Bundle args = getArguments();
-        mKey = args.getString(Page.KEY_PAGE_ARGUMENT);
-        if (mKey == null) {
-            throw new IllegalArgumentException("No KEY_PAGE_ARGUMENT given");
-        }
        SetupStats.addEvent(SetupStats.Categories.PAGE_LOAD, SetupStats.Action.PAGE_LOADED,
                mKey, String.valueOf(System.currentTimeMillis()));
    }
@@ -58,25 +53,18 @@ public abstract class SetupPageFragment extends Fragment {
        mRootView = inflater.inflate(getLayoutResource(), container, false);
        mTitleView = (TextView) mRootView.findViewById(android.R.id.title);
        mHeaderView = (ViewGroup )  mRootView.findViewById(R.id.header);
-        getActivity().startPostponedEnterTransition();
-        return mRootView;
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        mPage = mCallbacks.getPage(mKey);
-        if (mTitleView != null) {
-            mTitleView.setText(mPage.getTitleResId());
-        }
        initializePage();
-        mPage.onFragmentReady();
-        mCallbacks.onPageLoaded(mPage);
+        return mRootView;
    }

    @Override
    public void onAttach(Activity activity) {
        super.onAttach(activity);
+        Bundle args = getArguments();
+        mKey = args.getString(Page.KEY_PAGE_ARGUMENT);
+        if (mKey == null) {
+            throw new IllegalArgumentException("No KEY_PAGE_ARGUMENT given");
+        }
        if (!(activity instanceof SetupDataCallbacks)) {
            throw new ClassCastException("Activity implement SetupDataCallbacks");
        }
@@ -89,8 +77,24 @@ public abstract class SetupPageFragment extends Fragment {
        mCallbacks = null;
    }

+    @Override
+    public void onResume() {
+        super.onResume();
+        mPage = mCallbacks.getPage(mKey);
+        if (mTitleView != null) {
+            mTitleView.setText(mPage.getTitleResId());
+        }
+        mCallbacks.onPageLoaded(mPage);
+        getActivity().startPostponedEnterTransition();
+    }
+
    @Override
    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        // On low mem devices, this fragment might get destroyed by
+        // fragment manager while we are in another activity.
+        if (mPage == null) {
+            mPage = mCallbacks.getPage(mKey);
+        }
        mPage.onActivityResult(requestCode, resultCode, data);
    }

--- a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
+++ b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
@@ -51,10 +51,17 @@ import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
 import java.util.ArrayList;


-public class SetupWizardActivity extends Activity implements SetupDataCallbacks {
+public class SetupWizardActivity extends Activity implements SetupDataCallbacks,
+        ThemeManager.ThemeChangeListener {

    private static final String TAG = SetupWizardActivity.class.getSimpleName();

+    private static final int UI_FLAGS = View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+            | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+            | View.SYSTEM_UI_FLAG_IMMERSIVE
+            | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+            | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+
    private View mRootView;
    private View mButtonBar;
    private Button mNextButton;
@@ -68,25 +75,33 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks

    private final Handler mHandler = new Handler();

-    private boolean mIsGuestUser = false;
-
    private volatile boolean mIsFinishing = false;

    private static long sLaunchTime = 0;

    private final ArrayList<Runnable> mFinishRunnables = new ArrayList<Runnable>();

-    private ThemeManager.ThemeChangeListener mThemeChangeListener;
-
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        final View decorView = getWindow().getDecorView();
+        decorView.setSystemUiVisibility(UI_FLAGS);
+        decorView.setOnSystemUiVisibilityChangeListener(
+                new View.OnSystemUiVisibilityChangeListener() {
+
+                    @Override
+                    public void onSystemUiVisibilityChange(int visibility) {
+                        if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) {
+                            decorView.setSystemUiVisibility(UI_FLAGS);
+                        }
+                    }
+                });
        if (sLaunchTime == 0) {
            SetupStats.addEvent(SetupStats.Categories.APP_LAUNCH, TAG);
            sLaunchTime = System.nanoTime();
        }
-        getWindow().setWindowAnimations(android.R.anim.fade_in);
        setContentView(R.layout.setup_main);
        mRootView = findViewById(R.id.root);
+        mRootView.setSystemUiVisibility(UI_FLAGS);
        mReveal = (ImageView)mRootView.findViewById(R.id.reveal);
        mButtonBar = findViewById(R.id.button_bar);
        mFinishingProgressBar = (ProgressBar)findViewById(R.id.finishing_bar);
@@ -97,6 +112,10 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
        }
        mNextButton = (Button) findViewById(R.id.next_button);
        mPrevButton = (Button) findViewById(R.id.prev_button);
+        if (mSetupData.isFinished()) {
+            mNextButton.setVisibility(View.INVISIBLE);
+            mPrevButton.setVisibility(View.INVISIBLE);
+        }
        mSetupData.registerListener(this);
        mNextButton.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -124,37 +143,32 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
        mRootView.setOnTouchListener(new View.OnTouchListener() {
            @Override
            public boolean onTouch(View v, MotionEvent event) {
-                return mEnableAccessibilityController.onInterceptTouchEvent(event);
+                return
+                    mEnableAccessibilityController.onInterceptTouchEvent(event) &
+                    mEnableAccessibilityController.onTouchEvent(event);
            }
        });
-        // Since this is a new component, we need to disable here if the user
-        // has already been through setup on a previous version.
-        try {
-            if (Settings.Secure.getInt(getContentResolver(),
-                    Settings.Secure.USER_SETUP_COMPLETE) == 1) {
-                finalizeSetup();
-            }
-        } catch (Settings.SettingNotFoundException e) {
-            // Continue with setup
-        }
-        mIsGuestUser =  SetupWizardUtils.isGuestUser(this);
-        if (mIsGuestUser) {
-            finalizeSetup();
-        }
        registerReceiver(mSetupData, mSetupData.getIntentFilter());
    }

    @Override
    protected void onResume() {
-        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                | View.SYSTEM_UI_FLAG_IMMERSIVE
-                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
+        final View decorView = getWindow().getDecorView();
+        decorView.setSystemUiVisibility(UI_FLAGS);
        super.onResume();
+        if (mSetupData.isFinished()) {
+            mHandler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    finishSetup();
+                }
+            }, 500);
+        }  else {
            mSetupData.onResume();
            onPageTreeChanged();
            enableButtonBar(true);
        }
+    }

    @Override
    protected void onPause() {
@@ -278,7 +292,7 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks

    @Override
    public void onFinish() {
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
        Animation fadeOut = AnimationUtils.loadAnimation(this, android.R.anim.fade_out);
        mNextButton.startAnimation(fadeOut);
        mNextButton.setVisibility(View.INVISIBLE);
@@ -292,7 +306,22 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
        mFinishingProgressBar.setIndeterminate(true);
        mFinishingProgressBar.startAnimation(fadeIn);
        final ThemeManager tm = (ThemeManager) getSystemService(Context.THEME_SERVICE);
-        mThemeChangeListener = new ThemeManager.ThemeChangeListener() {
+        tm.addClient(this);
+        mSetupData.finishPages();
+    }
+
+    @Override
+    public void onFinish(boolean isSuccess) {
+        if (isResumed()) {
+            mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    finishSetup();
+                }
+            });
+        }
+    }
+
    @Override
    public void onProgress(int progress) {
        if (progress > 0) {
@@ -302,38 +331,24 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
    }

    @Override
-            public void onFinish(boolean isSuccess) {
-                finishSetup();
-            }
-        };
-        tm.addClient(mThemeChangeListener);
-        mSetupData.finishPages();
+    public void finishSetup() {
+        if (!mIsFinishing) {
            SetupStats.addEvent(SetupStats.Categories.APP_FINISHED, TAG,
                    SetupStats.Label.TOTAL_TIME, String.valueOf(
                            System.nanoTime() - sLaunchTime));
-    }
-
-    @Override
-    public void finishSetup() {
-        if (!mIsFinishing) {
-            mIsFinishing = true;
-            mHandler.post(new Runnable() {
-                @Override
-                public void run() {
            final SetupWizardApp setupWizardApp = (SetupWizardApp)getApplication();
            setupWizardApp.sendStickyBroadcastAsUser(
                    new Intent(SetupWizardApp.ACTION_FINISHED),
                    UserHandle.getCallingUserHandle());
+            mIsFinishing = true;
            setupRevealImage();
        }
-            });
-        }
    }

    @Override
    public void finish() {
        super.finish();
-        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+        overridePendingTransition(R.anim.translucent_enter, R.anim.translucent_exit);
    }

    private void setupRevealImage() {
@@ -342,9 +357,6 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
        mFinishingProgressBar.startAnimation(fadeOut);
        mFinishingProgressBar.setVisibility(View.INVISIBLE);

-        final Thread t = new Thread() {
-            @Override
-            public void run() {
        final Point p = new Point();
        getWindowManager().getDefaultDisplay().getRealSize(p);
        final WallpaperManager wallpaperManager =
@@ -357,25 +369,15 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
                    0, Math.min(p.x, wallpaper.getWidth()),
                    Math.min(p.y, wallpaper.getHeight()));
        }
-                final Bitmap croppedWallpaper = cropped;
-                mHandler.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (croppedWallpaper != null) {
+        if (cropped != null) {
            mReveal.setScaleType(ImageView.ScaleType.CENTER_CROP);
-                            mReveal.setImageBitmap(croppedWallpaper);
+            mReveal.setImageBitmap(cropped);
        } else {
            mReveal.setBackground(wallpaperManager
                    .getBuiltInDrawable(p.x, p.y, false, 0, 0));
        }
        animateOut();
    }
-                });
-
-            }
-        };
-        t.start();
-    }

    private void animateOut() {
        int cx = (mReveal.getLeft() + mReveal.getRight()) / 2;
@@ -421,7 +423,7 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
                }
                final ThemeManager tm =
                        (ThemeManager) SetupWizardActivity.this.getSystemService(THEME_SERVICE);
-                tm.removeClient(mThemeChangeListener);
+                tm.removeClient(SetupWizardActivity.this);
                SetupStats.sendEvents(SetupWizardActivity.this);
                SetupWizardUtils.disableGMSSetupWizard(SetupWizardActivity.this);
                Intent intent = new Intent(Intent.ACTION_MAIN);
@@ -432,10 +434,10 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks
                wallpaperManager.forgetLoadedWallpaper();
            }
        });
-        finish();
        for (Runnable runnable : mFinishRunnables) {
            runnable.run();
        }
+        finish();
        SetupWizardUtils.disableSetupWizard(SetupWizardActivity.this);
    }
 }
--- a/src/com/cyanogenmod/setupwizard/util/EnableAccessibilityController.java
+++ b/src/com/cyanogenmod/setupwizard/util/EnableAccessibilityController.java
@@ -47,8 +47,8 @@ import java.util.List;

 public class EnableAccessibilityController {

-    private static final int SPEAK_WARNING_DELAY_MILLIS = 2000;
-    private static final int ENABLE_ACCESSIBILITY_DELAY_MILLIS = 6000;
+    private static final int SPEAK_WARNING_DELAY_MILLIS = 5000;
+    private static final int ENABLE_ACCESSIBILITY_DELAY_MILLIS = 12000;

    public static final int MESSAGE_SPEAK_WARNING = 1;
    public static final int MESSAGE_SPEAK_ENABLE_CANCELED = 2;
@@ -91,7 +91,6 @@ public class EnableAccessibilityController {
    private final float mTouchSlop;

    private boolean mDestroyed;
-    private boolean mCanceled;

    private float mFirstPointerDownX;
    private float mFirstPointerDownY;
@@ -177,19 +176,19 @@ public class EnableAccessibilityController {
    public boolean onTouchEvent(MotionEvent event) {
        final int pointerCount = event.getPointerCount();
        final int action = event.getActionMasked();
-        if (mCanceled) {
-            if (action == MotionEvent.ACTION_UP) {
-                mCanceled = false;
-            }
-            return true;
-        }
        switch (action) {
            case MotionEvent.ACTION_POINTER_DOWN: {
                if (pointerCount > 2) {
                    cancel();
                }
-            } break;
+            }
+            break;
            case MotionEvent.ACTION_MOVE: {
+                //We only care about a 2 fingered move
+                if (pointerCount < 2) {
+                    cancel();
+                    return false;
+                }
                final float firstPointerMove = MathUtils.dist(event.getX(0),
                        event.getY(0), mFirstPointerDownX, mFirstPointerDownY);
                if (Math.abs(firstPointerMove) > mTouchSlop) {
@@ -200,17 +199,18 @@ public class EnableAccessibilityController {
                if (Math.abs(secondPointerMove) > mTouchSlop) {
                    cancel();
                }
-            } break;
+            }
+            break;
            case MotionEvent.ACTION_POINTER_UP:
            case MotionEvent.ACTION_CANCEL: {
                cancel();
-            } break;
+            }
+            break;
        }
        return true;
    }

    private void cancel() {
-        mCanceled = true;
        if (mHandler.hasMessages(MESSAGE_SPEAK_WARNING)) {
            mHandler.removeMessages(MESSAGE_SPEAK_WARNING);
        } else if (mHandler.hasMessages(MESSAGE_ENABLE_ACCESSIBILITY)) {
--- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
+++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
@@ -27,11 +27,13 @@ import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.provider.Settings;
+import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;

+import com.cyanogenmod.setupwizard.SetupWizardApp;
+
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GooglePlayServicesUtil;

@@ -43,11 +45,6 @@ public class SetupWizardUtils {

    private SetupWizardUtils(){}

-    public static boolean isStatsCollectionEnabled(Context context) {
-        return Settings.Secure.getInt(context.getContentResolver(),
-                Settings.Secure.STATS_COLLECTION, 1) != 0;
-    }
-
    public static void tryEnablingWifi(Context context) {
        WifiManager wifiManager = (WifiManager)context.getSystemService(Context.WIFI_SERVICE);
        if (!wifiManager.isWifiEnabled()) {
@@ -127,6 +124,19 @@ public class SetupWizardUtils {
        return true;
    }

+    public static boolean isRadioReady(Context context, ServiceState state) {
+        final SetupWizardApp setupWizardApp = (SetupWizardApp)context.getApplicationContext();
+        if (setupWizardApp.isRadioReady()) {
+            return true;
+        } else {
+            final boolean ready = state != null
+                    && state.getState() != ServiceState.STATE_POWER_OFF;
+            setupWizardApp.setRadioReady(ready);
+            return ready;
+        }
+
+    }
+
    public static boolean isGuestUser(Context context) {
        UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
        return userManager.isGuestUser();
@@ -160,11 +170,11 @@ public class SetupWizardUtils {
            disableComponentArray(context, packageInfo.services);
            disableComponentArray(context, packageInfo.receivers);
        } catch (PackageManager.NameNotFoundException e) {
-            Log.e(TAG, "Enable to disable GMS");
+            Log.e(TAG, "Unable to disable GMS");
        }
    }

-    public static void enableGMSSetupWizard(Context context) {
+    public static boolean enableGMSSetupWizard(Context context) {
        try {
            PackageInfo packageInfo = context.getPackageManager()
                    .getPackageInfo(GOOGLE_SETUPWIZARD_PACKAGE,
@@ -173,8 +183,10 @@ public class SetupWizardUtils {
            enableComponentArray(context, packageInfo.activities);
            enableComponentArray(context, packageInfo.services);
            enableComponentArray(context, packageInfo.receivers);
+            return true;
        } catch (PackageManager.NameNotFoundException e) {
-            Log.e(TAG, "Unable to disable GMS");
+            Log.e(TAG, "Unable to enable GMS");
+            return false;
        }
    }

--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -30,6 +30,7 @@
    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
    <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />

    <application android:icon="@drawable/icon">
        <uses-library android:name="android.test.runner" />
--- a/tests/src/com/cyanogenmod/account/tests/ManualTestActivity.java
+++ b/tests/src/com/cyanogenmod/account/tests/ManualTestActivity.java
@@ -18,6 +18,7 @@ package com.cyanogenmod.setupwizard.tests;


 import android.app.Activity;
+import android.app.ActivityManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -66,6 +67,8 @@ public class ManualTestActivity extends Activity {
        pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
                PackageManager.DONT_KILL_APP);
        pm.clearApplicationUserData("com.cyanogenmod.setupwizard", null);
+        ActivityManager am = (ActivityManager) getSystemService(Activity.ACTIVITY_SERVICE);
+        am.killBackgroundProcesses("com.cyanogenmod.setupwizard");
        try {
            PackageInfo packageInfo = getPackageManager()
                    .getPackageInfo("com.google.android.setupwizard",
@@ -110,7 +113,6 @@ public class ManualTestActivity extends Activity {

    private void setSetupComplete() {
        Settings.Secure.putInt(getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, 1);
-        Settings.Global.putInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0);
        Intent intent = new Intent("android.intent.action.MAIN");
        intent.addCategory("android.intent.category.HOME");
        final PackageManager pm = getPackageManager();
@@ -118,6 +120,8 @@ public class ManualTestActivity extends Activity {
                "com.cyanogenmod.setupwizard.ui.SetupWizardActivity");
        pm.setComponentEnabledSetting(componentName,
                PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
+        ActivityManager am = (ActivityManager) getSystemService(Activity.ACTIVITY_SERVICE);
+        am.killBackgroundProcesses("com.cyanogenmod.setupwizard");
        try {
            PackageInfo packageInfo = this.getPackageManager()
                    .getPackageInfo("com.google.android.setupwizard",
Author	SHA1	Message	Date
Michael Bestas	8ab69bbd87	Automatic translation import Change-Id: Ic6ea5026d11093b716305389e3c58a7c0d2fa252	2015-08-24 05:35:41 +03:00
Tom Powell	cf113aa4e8	Automatic translation import Change-Id: Icf38ad917a0bd578b8e4dd944a03b716855daab3	2015-08-20 14:58:34 -07:00
Michael Bestas	c0886d8053	Automatic translation import Change-Id: I29ba4c0839692d3d2feb36e67abba54c98e6a4aa	2015-06-22 21:12:36 +03:00
Michael Bestas	c5db58d5ca	Automatic translation import Change-Id: I1f5a00cdb88fe750860893f7fc36528373321cdd	2015-06-01 22:00:32 +03:00
emancebo	7a255f6e5c	SetupWizard: add overlay to uncheck cyanogen theme option by default Change-Id: I278dcb3b2d8099b71a66d90250c40836dd8ec7fc	2015-05-22 16:59:25 -07:00
d34d	a726a3d990	Remove use of mCanceled It is possible for mCanceled to be set to true even though it was canceled without ever playing back the cancelation message. This can end up putting us in an incorrect state where the user must release both fingers so ACTION_UP finally sets mCanceled to false. The cancel() method was still being called and since it does the proper checks for removing/sending messages, the use of mCanceled is unneccessary. Change-Id: I38679d3bf65157a9ba5ca3d898c5c8d55e5df9f5 REF: LETTUCE-293	2015-05-19 14:44:55 -07:00
cretin45	838a8e11b2	SetupWizard: Increase delay for accessibility Change-Id: Ifff7161f95e91ec7763f388206cd1d30804ad600 (cherry picked from commit `9dd952e3f6`)	2015-05-16 18:22:47 +00:00
Michael Bestas	0f80350f39	Automatic translation import Change-Id: I2f1d52ef251daa67b8b91a4041380a9b347c7ac3	2015-05-11 23:19:13 +03:00
Michael Bestas	d5a226372a	Automatic translation import Change-Id: I6b8d3fb084df5abb3449b842ce02d1d6aaf2170a	2015-05-02 02:53:08 +03:00
cretin45	a0eb5bb442	Setupwizard: Fix msim NPE where sim only in slot 2 Change-Id: I919129185cb49c51f9f02d9718e116e7d02b0d2c	2015-04-27 13:20:13 -07:00
Michael Bestas	9a610892c4	Automatic translation import Change-Id: Ifc62c159189df11f3443defc57069ab5b78b644f	2015-04-25 01:15:00 +03:00
Michael Bestas	c4df39fe5c	Automatic translation import Change-Id: I1649ba39d39b73ce351909a310041d6f6b0a99b7	2015-04-17 22:20:07 +03:00
cretin45	70c7b24ab5	SetupWizard: Give radio a 10 second chance to come up Change-Id: Iadd817b200106783dd67edbc5ad03928ce2baa6b	2015-04-14 17:28:37 -07:00
cretin45	cb09e29e29	Setupwizard: Make sure to advance if GMS is absent Change-Id: Ia0c4d83c9a9f7c581208d753024f55f48326afc7	2015-04-09 12:09:24 -07:00
cretin45	1d7988a4c7	SetupWizard: Aggressively hide nav bar on soft key devices Change-Id: Ic23fd7e605a323411fe2f581235ff3ed45bfcaed	2015-04-09 10:44:41 -07:00
cretin45	62b79e3880	SetupWizard: Ensure page object isn't null if FM destroyed Change-Id: Ia794e7656587ca803d02418d3d84d4df5027cd00	2015-04-09 10:43:41 -07:00
cretin45	0fde3a04cc	SetupWizard: Handle all touch events in EnableAccessibilityController Change-Id: Icf15be21c90d32305a9c1f8b9835eb473acf1f33	2015-04-08 12:09:55 -07:00
Michael Bestas	cc9467cfbd	Automatic translation import Change-Id: Ifa97d2292f1ab37a21a8695a53e673f406df706b	2015-04-07 00:51:01 +03:00
cretin45	4c2ce25f1c	SetupWizard: Don't assume order of SubInfoRecords Change-Id: I3b4132afccc96a5d08986a3cb902bd384931f21f	2015-04-03 16:07:47 -07:00
Aaahh	9192fc6903	SetupWizard: Disable Checkbox on Resume Change-Id: Ica6f3043b9b0d3703b6ce6f47a43b5201deb05b7	2015-04-03 18:23:30 -04:00
Michael Bestas	6fb3d23f09	Automatic translation import Change-Id: Icd2308a33556872fa1564058b8250c60dc1b8372	2015-03-31 01:51:32 +03:00
cretin45	c8e4c29020	SetupWizard: Lock orientation prior to finish animation Change-Id: I43a69937e2deb5f55585522fe5d00c51ffdae569	2015-03-23 15:08:09 -07:00
Michael Bestas	afcf65d6c0	Automatic translation import Change-Id: I9aa0c0cf342d79ffcdb42e8c87284ad354fc9563	2015-03-22 20:01:36 +02:00
cretin45	33683fc2ce	SetupWizard: Initialize the nav keys bundle boolean Change-Id: I50f2ef0fb7226c8b58437b669ca71df436d68ee8	2015-03-20 15:00:21 -07:00
cretin45	838248ab86	SetupWizard: Fix regression for devices without custom default theme Change-Id: Ia223c1b118dbb68e596ff01cf944bc870a321752	2015-03-19 15:05:23 -07:00
cretin45	83be05d6ec	SetupWizard: Fix regression, only init pages once Change-Id: I1207cb3975daa752a66eb8e9e40635f9a8009509	2015-03-19 09:46:17 -07:00
cretin45	ed5d46703e	SetupWizard: Better handling of launching into other activities Change-Id: I4d8dc4a1b25e45c6ff35042239a0adf4c16458f1	2015-03-17 15:18:16 -07:00
d34d	836f867086	Disable theme components for secondary users This patch is to mitigate theming problems with multiple users. Once themes properly support multiple users we can revert this. Change-Id: Idc89a273bc1563fc668ca2a5a591cf133e8d5406	2015-03-17 15:41:08 +00:00
Michael Bestas	c7b84c2793	Automatic translation import Change-Id: If0a158896a3ec49fb0b32c48c6f426dea4d9b653	2015-03-15 01:48:39 +02:00
cretin45	bfde63c27c	SetupWizard: #blamethemes Themes keep breaking the handle themeConfig flag. This provides a workaround for cases the activity gets torn down during the finish process. Change-Id: I6664ded3dfff5b69c1217f89f25106953cb5f92a	2015-03-13 16:18:24 -07:00
cretin45	0ed67f547c	SetupWizard: Only go through OOBE if owner Change-Id: I3886119d0d6fd69f18ea23d4b6435da75280dbf8	2015-03-12 13:50:19 -07:00
cretin45	f66c56b62f	SetupWizard: Only update network state when resumed Change-Id: Id018bf0ed4d9c54a1d6d57d53749c265b1d0e269	2015-03-11 17:14:22 -07:00
cretin45	77fce341b1	SetupWizard: Update legal link Change-Id: I1389dbb3e7e0ba3b7db992fdef02f4c8fdc1692d	2015-03-11 09:59:24 -07:00
cretin45	0d31b31aac	SetupWizard: Refactor for better transitions out of OOBE Change-Id: If91da3f44dbc5383236b54da529953d48a475250	2015-03-09 14:49:31 -07:00
Scott Mertz	7732b7485d	SetupWizard: move to CmHardwareService Change-Id: I9413151fe307d23196ea5736dc8c50966a43a7cc	2015-03-07 00:56:09 +00:00
Michael Bestas	7faec91e22	Automatic translation import Change-Id: Ie14f953a377b6d9410c6b5b386334e153abd4964	2015-03-06 22:14:59 +00:00
cretin45	7c8e091320	SetupWizard: Fix race condition on finish Change-Id: Ie4a5893c49db7ce9622091e05776cb5523ed5c45	2015-03-06 14:01:53 -08:00