Merge "Fix wifi compareTo" into jb-mr1-dev
diff --git a/res/drawable-hdpi/appwidget_item_bg_normal.9.png b/res/drawable-hdpi/appwidget_item_bg_normal.9.png
index baff858..36552d4 100644
--- a/res/drawable-hdpi/appwidget_item_bg_normal.9.png
+++ b/res/drawable-hdpi/appwidget_item_bg_normal.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_item_bg_pressed.9.png b/res/drawable-hdpi/appwidget_item_bg_pressed.9.png
index 7ec33dd..0da4a1d 100644
--- a/res/drawable-hdpi/appwidget_item_bg_pressed.9.png
+++ b/res/drawable-hdpi/appwidget_item_bg_pressed.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_item_bg_normal.9.png b/res/drawable-mdpi/appwidget_item_bg_normal.9.png
index 976083f..08a94f5 100644
--- a/res/drawable-mdpi/appwidget_item_bg_normal.9.png
+++ b/res/drawable-mdpi/appwidget_item_bg_normal.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_item_bg_pressed.9.png b/res/drawable-mdpi/appwidget_item_bg_pressed.9.png
index 8f340d3..9a5001b 100644
--- a/res/drawable-mdpi/appwidget_item_bg_pressed.9.png
+++ b/res/drawable-mdpi/appwidget_item_bg_pressed.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_item_bg_normal.9.png b/res/drawable-xhdpi/appwidget_item_bg_normal.9.png
index b26f1d2..cbbd8f6 100644
--- a/res/drawable-xhdpi/appwidget_item_bg_normal.9.png
+++ b/res/drawable-xhdpi/appwidget_item_bg_normal.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_item_bg_pressed.9.png b/res/drawable-xhdpi/appwidget_item_bg_pressed.9.png
index 3871689..3160e85 100644
--- a/res/drawable-xhdpi/appwidget_item_bg_pressed.9.png
+++ b/res/drawable-xhdpi/appwidget_item_bg_pressed.9.png
Binary files differ
diff --git a/res/layout/keyguard_appwidget_item.xml b/res/layout/keyguard_appwidget_item.xml
index 7280098..de0c855 100755
--- a/res/layout/keyguard_appwidget_item.xml
+++ b/res/layout/keyguard_appwidget_item.xml
@@ -15,21 +15,33 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content" >
- <TextView
- android:id="@+id/icon_and_label"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="8dip"
- android:layout_marginRight="8dip"
- android:layout_marginTop="4dip"
- android:layout_marginBottom="4dip"
- android:background="@drawable/appwidget_item_bg"
- android:minHeight="?android:attr/listPreferredItemHeightSmall"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:gravity="center_vertical"
- android:drawablePadding="8dip"
- android:paddingStart="11dip"
- android:paddingEnd="11dip" />
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:background="@drawable/appwidget_item_bg"
+ android:layout_marginTop="2dip"
+ android:layout_marginBottom="2dip"
+ android:layout_marginLeft="2dip"
+ android:layout_marginRight="2dip"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip"
+ android:paddingTop="16dip"
+ android:paddingBottom="16dip" >
+ <ImageView
+ android:id="@+id/icon"
+ android:layout_width="@dimen/appwidget_preview_width"
+ android:layout_height="@dimen/appwidget_preview_height"
+ android:scaleType="center" />
+ <TextView
+ android:id="@+id/label"
+ style="@style/KeyguardAppWidgetItem"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingLeft="24dip"
+ android:paddingBottom="8dip"
+ android:gravity="left|bottom" />
+ </LinearLayout>
</FrameLayout>
diff --git a/res/layout/keyguard_appwidget_pick_layout.xml b/res/layout/keyguard_appwidget_picker_layout.xml
similarity index 76%
rename from res/layout/keyguard_appwidget_pick_layout.xml
rename to res/layout/keyguard_appwidget_picker_layout.xml
index feb85a5..e533672 100644
--- a/res/layout/keyguard_appwidget_pick_layout.xml
+++ b/res/layout/keyguard_appwidget_picker_layout.xml
@@ -18,10 +18,16 @@
android:id="@+id/layout_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:paddingLeft="@dimen/keyguard_appwidget_picker_margin_left"
+ android:paddingRight="@dimen/keyguard_appwidget_picker_margin_right"
+ android:paddingTop="2dip"
+ android:paddingBottom="2dip"
android:orientation="vertical" >
<GridView android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
+ android:numColumns="@integer/keyguard_appwidget_picker_cols"
+ android:layout_gravity="center_horizontal"
android:listSelector="@android:color/transparent"
android:id="@+id/widget_list" />
</LinearLayout>
diff --git a/res/layout/manage_applications_content.xml b/res/layout/manage_applications_content.xml
index 32d6378..9e415a9 100644
--- a/res/layout/manage_applications_content.xml
+++ b/res/layout/manage_applications_content.xml
@@ -18,7 +18,6 @@
*/
-->
-
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 85b46de..290de20 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Kies skermslot"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Kies rugsteunslot"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skermslot"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Voeg legstuk by"</string>
- <string name="widget_none" msgid="2708702293215501854">"Geen"</string>
- <string name="widget_default" msgid="8269383575996003796">"Horlosie"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Verander slotskerm"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Verander of deaktiveer patroon-, PIN- of wagwoordsekuriteit"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Kies \'n metode om die skerm te sluit"</string>
@@ -721,14 +718,14 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Muurpapier"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Kies muurpapier uit"</string>
- <string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdroom"</string>
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Sluimer"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Wanneer dit gedok is of slaap en laai"</string>
<string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Enige een"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Terwyl laai"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Terwyl dit gedok is"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Af"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Om te beheer wat gebeur wanneer die foon gedok is en/of slaap, skakel slaapmodus aan."</string>
- <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Wanneer om Dagdroom te gebruik"</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Om te beheer wat gebeur wanneer die foon gedok is en/of slaap, skakel Sluimer aan."</string>
+ <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Wanneer om Sluimer te gebruik"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Begin nou"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Instellings"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Outomatiese helderheid"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 3cc596f..fa36419 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"ማሳያ ቆልፍ ምረጥ"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"ምትኬ ቆላፊ ምረጥ"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ማሳያ ተቆልፏል"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"ንዑስ ፕሮግራም አክል"</string>
- <string name="widget_none" msgid="2708702293215501854">"ምንም የለም"</string>
- <string name="widget_default" msgid="8269383575996003796">"ሰዓት"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ማሳያ ቆልፍን ለውጥ"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"ስርዓተ ጥለት፣ PIN፣ ወይም የይለፍ ቃል ለውጥ ወይም አቦዝን"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"ማያውን ለመቆለፍ ሜተድ ምረጥ"</string>
@@ -721,14 +718,13 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"ከ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> የእንቅስቃሴ አለመኖር በኋላ"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"ልጣፍ"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"ልጣፍ ምረጥ ከ"</string>
- <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
- <skip />
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"የቀን ህልም"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"ሲተከል ወይም ሲተኛ እና ባትሪ እየሞላ ሳለ"</string>
<string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"ማናቸውም"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"ባትሪ በመሙላት ላይ ሳለ"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"ተተክሎ ሳለ"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ጠፍቷል"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"ስልኩ ሲተከል እና/ወይም ሲተኛ ምን እንደሚከሰት ለመቆጣጠር የእንቅልፍ ሁነታን ያብሩ።"</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"ስልኩ ሲተከል እና/ወይም ሲተኛ ምን እንደሚከሰት ለመቆጣጠር የቀን ህልምን ይክፈቱ።"</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"መቼ በቀን ማለም እንዳለበት"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"አሁን ጀምር"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"ቅንብሮች"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 303039f..e2aa268 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"اختيار قفل الشاشة"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"اختر قفلاً للنسخ الاحتياطي"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"تأمين الشاشة"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"إضافة أداة"</string>
- <string name="widget_none" msgid="2708702293215501854">"لا شيء"</string>
- <string name="widget_default" msgid="8269383575996003796">"الساعة"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"تغيير تأمين الشاشة"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"تغيير أو تعطيل النقش أو رقم التعريف الشخصي أو أمان كلمة المرور"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"اختيار طريقة لتأمين الشاشة"</string>
@@ -723,12 +720,12 @@
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"اختيار خلفية من"</string>
<string name="screensaver_settings_title" msgid="3349790120327233241">"حلم اليقظة"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"عند الإرسال أو السكون والشحن"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"أي الخيارين"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"أيهما"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"أثناء الشحن"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"أثناء الإرساء"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"إيقاف"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"للتحكم في ما يحدث عندما يتم إرساء الهاتف و/أو عند السكون، شغل وضع السكون."</string>
- <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"وقت تشغيل خلفيات أحلام اليقظة التفاعلية"</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"للتحكم في ما يحدث عندما يتم إرساء الهاتف و/أو عند السكون، شغّل \"حلم اليقظة\"."</string>
+ <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"وقت تشغيل خلفيات أحلام اليقظة"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"البدء الآن"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"إعدادات"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"سطوع تلقائي"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index b61c22d..1a3bcd7 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Выберыце спосаб блак. экрана"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Блакав. рэз. капіяв."</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блакоўка экрана"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Дадаць віджэт"</string>
- <string name="widget_none" msgid="2708702293215501854">"Няма"</string>
- <string name="widget_default" msgid="8269383575996003796">"Гадзіннік"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Змена блакавання экрана"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Змяніць або адключыць шаблон, PIN-код або пароль бяспекі"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Выберыце метад блакавання экрана"</string>
@@ -727,7 +724,7 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Падчас зарадкі"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Пакуль падключаны"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Адключана"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Каб кантраляваць тое, што адбываецца, калі тэлефон падкючаны або ў стане сну, уключыце \"Мары\"."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Каб кантраляваць тое, што адбываецца, калі тэлефон падкючаны або ў стане сну, уключыце \"Мроi\"."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Калі трэба марыць"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Пачаць"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Налады"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 7169ed2..27e1921 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Закл. на екрана: Избор"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Резервно заключване"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Заключване на екрана"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"+ приспособление"</string>
- <string name="widget_none" msgid="2708702293215501854">"Няма"</string>
- <string name="widget_default" msgid="8269383575996003796">"Часовник"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Промяна на заключването"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Промяна или деактивиране на защита с фигура, PIN или парола"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Изберете начин за заключване на екрана"</string>
@@ -721,14 +718,13 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"След <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Тапет"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Избор на тапет от"</string>
- <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
- <skip />
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Мечта"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"При свързване с докинг станция или при спящ режим и зареждане"</string>
<string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"И в двата случая"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"При зареждане"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"При свързване с докинг станция"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Изкл."</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"За да контролирате какво се случва, когато телефонът е свързан с докинг станция и/или е в спящ режим, включете спящия режим."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"За да контролирате какво се случва, когато телефонът е свързан с докинг станция и/или е в спящ режим, включете „Мечта“."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Време за мечти"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Стартиране сега"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Настройки"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 8aaa34c..04e5d81 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Tria bloq. de pantalla"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Tria bloq. còpia seg."</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueig de pantalla"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Addició d\'un widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"Cap"</string>
- <string name="widget_default" msgid="8269383575996003796">"Rellotge"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Canvi pantalla bloq."</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Canvia o desactiva la seguretat de contrasenyes, PIN o patrons"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Trieu un mètode per bloquejar la pantalla"</string>
@@ -721,14 +718,14 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Fons de pantalla"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecciona fons de pantalla de"</string>
- <string name="screensaver_settings_title" msgid="3349790120327233241">"Fantasia"</string>
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Estalvi de pantalla"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quan el dispositiu estigui en un connector o inactiu i carregant-se"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Una de les dues"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Els dos casos"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Mentre es carrega"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quan el dispositiu estigui en un connector"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivat"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Per controlar què passa quan el telèfon està connectat o en repòs, activa el mode de repòs."</string>
- <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quan s\'ha d\'activar l\'estalvi de pantalla"</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Per comprovar què passa quan el telèfon està connectat o en mode de suspensió, activa l\'estalvi de pantalla."</string>
+ <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quan s\'ha d\'activar"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Comença ara mateix"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Configuració"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
@@ -1313,7 +1310,7 @@
<string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Drecera d\'accessibilitat"</string>
<string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Activada"</string>
<string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desactiva"</string>
- <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quan aquesta funció està activada, pots activar ràpidament les funcions d\'accessibilitat en dos passos."\n\n"Pas 1: mantén premut el botó d\'encesa fins que sentis un so o notis una vibració."\n\n"Pas 2: mantén premut amb dos dits fins que sentis una confirmació d\'àudio."\n\n"Si el dispositiu té diversos usuaris, fer servir aquesta drecera a la pantalla de bloqueig activa temporalment l\'accessibilitat fins que es desbloqueja el dispositiu."</string>
+ <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quan aquesta funció està activada, pots activar ràpidament les funcions d\'accessibilitat en dos passos."\n\n"Pas 1: mantén premut el botó d\'engegada fins que sentis un so o notis una vibració."\n\n"Pas 2: mantén premut amb dos dits fins que sentis una confirmació d\'àudio."\n\n"Si el dispositiu té diversos usuaris, fer servir aquesta drecera a la pantalla de bloqueig activa temporalment l\'accessibilitat fins que es desbloqueja el dispositiu."</string>
<string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Text gran"</string>
<string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliació de pantalla"</string>
<string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualitza ampliació automàticament"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 17f528e..28353d7 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Vybrat zámek obrazovky"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Výběr záložního zámku"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zámek obrazovky"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Přidat widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"Žádné"</string>
- <string name="widget_default" msgid="8269383575996003796">"Hodiny"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Změna zámku obrazovky"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Změnit nebo deaktivovat bezpečnostní gesto, kód PIN nebo heslo"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Vyberte způsob uzamknutí obrazovky"</string>
@@ -727,7 +724,7 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Při nabíjení"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Při vložení do doku"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Vyp."</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Chcete-li nastavit, co se stane, když je telefon vložen do doku nebo je v režimu spánku, zapněte režim spánku."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Chcete-li nastavit, co se stane, když je telefon v doku nebo v režimu spánku, zapněte funkci Spořič obrazovky."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kdy spustit spořič obrazovky"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Začít"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavení"</string>
@@ -1066,7 +1063,7 @@
<string name="install_text" msgid="884360662922471113">"Instalovat"</string>
<string name="disable_text" msgid="6544054052049395202">"Vypnout"</string>
<string name="enable_text" msgid="9217362512327828987">"Povolit"</string>
- <string name="clear_user_data_text" msgid="5597622864770098388">"Mazání dat"</string>
+ <string name="clear_user_data_text" msgid="5597622864770098388">"Vymazat data"</string>
<string name="app_factory_reset" msgid="6635744722502563022">"Odinstalovat aktualizace"</string>
<string name="auto_launch_enable_text" msgid="2652825923953591251">"Aplikace byla nastavena, aby se pro některé akce spouštěla jako výchozí."</string>
<string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Této aplikaci jste povolili vytváření widgetů a přístup k jejich datům."</string>
@@ -1099,17 +1096,17 @@
<string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Úložiště USB"</string>
<string name="sd_card_storage" product="default" msgid="7623513618171928235">"Karta SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Přepočítávání velikosti..."</string>
- <string name="clear_data_dlg_title" msgid="5605258400134511197">"Smazat data aplikace?"</string>
+ <string name="clear_data_dlg_title" msgid="5605258400134511197">"Vymazat data aplikace?"</string>
<string name="clear_data_dlg_text" msgid="8847257251846779938">"Veškerá data (všechny soubory, nastavení, účty, databáze apod.) této aplikace budou trvale vymazána."</string>
<string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
<string name="dlg_cancel" msgid="1674753358972975911">"Zrušit"</string>
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="8333723538280257243">"Aplikaci se nepodařilo najít na seznamu nainstalovaných aplikací."</string>
- <string name="clear_data_failed" msgid="1907582169616856698">"Nelze smazat data aplikace."</string>
+ <string name="clear_data_failed" msgid="1907582169616856698">"Nelze vymazat data aplikace."</string>
<string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Odinstalovat aktualizace?"</string>
<string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Všechny aktualizace této aplikace systému Android budou odinstalovány."</string>
- <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Mazání dat"</string>
- <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Nepodařilo se smazat data aplikace."</string>
+ <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Vymazat data"</string>
+ <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Nepodařilo se vymazat data aplikace."</string>
<string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Tato aplikace má přístup k následujícím funkcím tabletu:"</string>
<string name="security_settings_desc" product="default" msgid="61749028818785244">"Tato aplikace má přístup k následujícím funkcím telefonu:"</string>
<string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Tato aplikace může ve vašem tabletu používat následující oprávnění. Chcete-li zvýšit výkon a snížit využití paměti, některá tato oprávnění jsou dostupná v aplikaci <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, která se spouští v rámci stejného procesu jako aplikace <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
@@ -1143,7 +1140,7 @@
<string name="app_install_location_summary" msgid="5155453752692959098">"Změna preferovaného umístění pro instalaci nových aplikací"</string>
<string name="app_disable_dlg_title" msgid="3916469657537695436">"Zakázat integrovanou aplikaci"</string>
<string name="app_disable_dlg_text" msgid="3562567756362627323">"Pokud zakážete integrovanou aplikaci, může se stát, že ostatní aplikace přestanou fungovat správně."</string>
- <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Smazat data a deaktivovat aplikaci?"</string>
+ <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vymazat data a deaktivovat aplikaci?"</string>
<string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Pokud deaktivujete integrovanou aplikaci, mohou se ostatní aplikace chovat nestandardně. Budou také smazána vaše data."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vypnout oznámení?"</string>
<string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Pokud v této aplikaci vypnete oznámení, můžete přijít o důležitá upozornění a aktuality."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5eebb1d..0f93604 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Vælg skærmlås"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Vælg backuplås"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skærmlås"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Tilføj widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"Ingen"</string>
- <string name="widget_default" msgid="8269383575996003796">"Ur"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Skift skærmlås"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Skift eller deaktiver mønster, PIN-kode eller adgangskode."</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Vælg en metode til låsning af skærmen"</string>
@@ -721,14 +718,13 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Baggrund"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vælg baggrund fra"</string>
- <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
- <skip />
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdrøm"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Når enheden er tilsluttet en dockingstation eller i dvale og i færd med at oplade"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Begge dele"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Enten eller"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Under opladning"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Når enheden er tilsluttet en dockingstation"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Fra"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Hvis du vil kontrollere, hvad der sker, når telefonen tilsluttes en dockingstation og/eller går i dvale, skal du slå Dvaletilstand til."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Hvis du vil kontrollere, hvad der sker, når telefonen tilsluttes en dockingstation og/eller går i dvale, skal du slå Dagdrøm til."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Hvornår der skal dagdrømmes"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start nu"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Indstillinger"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e6d230c..b8ab38c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -270,7 +270,7 @@
<string name="roaming" msgid="3596055926335478572">"Daten-Roaming"</string>
<string name="roaming_enable" msgid="3737380951525303961">"Bei Roaming mit Datendienst verbinden"</string>
<string name="roaming_disable" msgid="1295279574370898378">"Bei Roaming mit Datendienst verbinden"</string>
- <string name="roaming_reenable_message" msgid="9141007271031717369">"Die Datenkonnektivität wurde unterbrochen, da Sie Ihr Heimnetzwerk verlassen haben und Daten-Roaming nicht aktiviert ist."</string>
+ <string name="roaming_reenable_message" msgid="9141007271031717369">"Die Datenkonnektivität wurde unterbrochen, weil Sie Ihr Heimnetzwerk verlassen haben und Daten-Roaming nicht aktiviert ist."</string>
<string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Aktivieren"</string>
<string name="roaming_warning" msgid="7625933694709170887">"Wenn Sie das Roaming zulassen, können hohe Roaming-Gebühren anfallen!"</string>
<string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Wenn Sie Roaming zulassen, können erhebliche Roaming-Gebühren entstehen."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Tablet."</string>
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Display-Sperre wählen"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Ersatzsperre wählen"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Display-Sperre"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Widget hinzufügen"</string>
- <string name="widget_none" msgid="2708702293215501854">"Keine"</string>
- <string name="widget_default" msgid="8269383575996003796">"Uhr"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Display-Sperre ändern"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Sperre (Muster, PIN, Passwort) ändern oder deaktivieren"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Methode zum Sperren des Bildschirms wählen"</string>
@@ -439,7 +436,7 @@
<string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Abbrechen"</string>
<string name="bluetooth_error_title" msgid="6850384073923533096"></string>
<string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> war nicht möglich."</string>
- <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> war nicht möglich, da die eingegebene PIN oder der Schlüssel falsch ist."</string>
+ <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> war nicht möglich, weil die eingegebene PIN oder der Schlüssel falsch ist."</string>
<string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Kommunikation mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist nicht möglich."</string>
<string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Verbindung wurde von <xliff:g id="DEVICE_NAME">%1$s</xliff:g> abgelehnt."</string>
<string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Keine Verbindung zu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> möglich"</string>
@@ -521,7 +518,7 @@
<string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
<string name="android_beam_on_summary" msgid="3618057099355636830">"Bereit zur Übertragung von App-Inhalten über NFC"</string>
<string name="android_beam_off_summary" msgid="4663095428454779138">"Aus"</string>
- <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nicht verfügbar, da NFC deaktiviert ist"</string>
+ <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nicht verfügbar, weil NFC deaktiviert ist"</string>
<string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
<string name="android_beam_explained" msgid="6981652347448777459">"Wenn diese Funktion aktiviert ist, können Sie App-Inhalte auf ein anderes NFC-fähiges Gerät beamen, indem Sie die Geräte dicht nebeneinander halten. Sie können beispielsweise Browserseiten, YouTube-Videos und Kontakte beamen."\n\n"Halten Sie die Geräte einfach dicht nebeneinander, am besten Rückseite an Rückseite, und berühren Sie den Bildschirm. Die App bestimmt, was übertragen wird."</string>
<string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Diensterkennung"</string>
@@ -724,12 +721,12 @@
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Hintergrund auswählen"</string>
<string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Bei angedocktem Gerät oder im Ruhezustand beim Aufladen"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Beides"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Immer"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Während des Ladevorgangs"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Bei angedocktem Gerät"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Aus"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Um festzulegen, was geschieht, wenn das Telefon angedockt und/oder im Ruhezustand ist, aktivieren Sie den Ruhemodus."</string>
- <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Daydreams starten"</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Um festzulegen, was geschieht, wenn das Telefon angedockt oder im Ruhezustand ist, aktivieren Sie \"Daydream\"."</string>
+ <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Daydream starten"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Jetzt starten"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Einstellungen"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
@@ -811,7 +808,7 @@
<string name="memory_music_usage" msgid="1363785144783011606">"Audio (Musik, Töne, usw.)"</string>
<string name="memory_media_misc_usage" msgid="235452944021647124">"Sonstiges"</string>
<string name="memory_media_cache_usage" msgid="6704293333141177910">"Daten im Cache"</string>
- <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gem. Speicher trennen"</string>
+ <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gemeinsamen Speicher trennen"</string>
<string name="sd_eject" product="default" msgid="6915293408836853020">"SD-Karte entnehmen"</string>
<string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Internen USB-Speicher trennen"</string>
<string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD-Karte trennen, damit Sie sie sicher entfernen können"</string>
@@ -911,7 +908,7 @@
<string name="master_clear_final_button_text" msgid="5390908019019242910">"Alles löschen"</string>
<string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
<string name="master_clear_gesture_explanation" msgid="826193821455182780">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Zurücksetzen auf die Werkseinstellungen zu bestätigen."</string>
- <string name="master_clear_failed" msgid="7959646179737950703">"Die Zurücksetzung konnte nicht durchgeführt werden, da der Dienst zur Systembereinigung nicht verfügbar ist."</string>
+ <string name="master_clear_failed" msgid="7959646179737950703">"Die Zurücksetzung konnte nicht durchgeführt werden, weil der Dienst zur Systembereinigung nicht verfügbar ist."</string>
<string name="master_clear_confirm_title" msgid="7572642091599403668">"Zurücksetzen?"</string>
<string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB-Speicher löschen"</string>
<string name="media_format_title" product="default" msgid="4427528440306787972">"SD-Karte löschen"</string>
@@ -1055,7 +1052,7 @@
<string name="clear_cache_btn_text" msgid="5756314834291116325">"Cache leeren"</string>
<string name="cache_size_label" msgid="7505481393108282913">"Cache"</string>
<string name="controls_label" msgid="7611113077086853799">"Steuerung"</string>
- <string name="force_stop" msgid="7435006169872876756">"Stoppen erzwingen"</string>
+ <string name="force_stop" msgid="7435006169872876756">"Beenden erzwingen"</string>
<string name="total_size_label" msgid="1048676419552557254">"Insgesamt"</string>
<string name="application_size_label" msgid="8494609207373874267">"App"</string>
<string name="external_code_size_label" msgid="3459343140355961335">"USB-Speicher-App"</string>
@@ -1136,7 +1133,7 @@
<string name="app_forward_locked" msgid="6331564656683790866">"Die App ist kopiergeschützt."</string>
<string name="invalid_location" msgid="2786030127356312746">"Installationspfad ist nicht gültig."</string>
<string name="system_package" msgid="6222593098063037137">"Systemupdates können nicht auf externen Datenträgern installiert werden."</string>
- <string name="force_stop_dlg_title" msgid="977530651470711366">"Stoppen erzwingen?"</string>
+ <string name="force_stop_dlg_title" msgid="977530651470711366">"Beenden erzwingen?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Das Beenden der App zu erzwingen kann zu unerwünschtem Verhalten führen."</string>
<string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
<string name="move_app_failed_dlg_text" msgid="3465267182923054022">"App kann nicht verschoben werden. <xliff:g id="REASON">%1$s</xliff:g>"</string>
@@ -1349,7 +1346,7 @@
<string name="battery_since_reset" msgid="7464546661121187045">"Akkuverbrauch seit dem Zurücksetzen"</string>
<string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> mit Akku"</string>
<string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> seit dem Ausstecken"</string>
- <string name="battery_stats_charging_label" msgid="4223311142875178785">"Wird geladen"</string>
+ <string name="battery_stats_charging_label" msgid="4223311142875178785">"Wird geladen..."</string>
<string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Bildschirm an"</string>
<string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS aktiv"</string>
<string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"WLAN"</string>
@@ -1386,7 +1383,7 @@
<string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
<string name="usage_type_on_time" msgid="3351200096173733159">"Laufzeit"</string>
<string name="usage_type_no_coverage" msgid="3797004252954385053">"Zeit ohne Signal"</string>
- <string name="battery_action_stop" msgid="649958863744041872">"Stoppen erzwingen"</string>
+ <string name="battery_action_stop" msgid="649958863744041872">"Beenden erzwingen"</string>
<string name="battery_action_app_details" msgid="7861051816778419018">"App-Info"</string>
<string name="battery_action_app_settings" msgid="4570481408106287454">"App-Einstellungen"</string>
<string name="battery_action_display" msgid="7338551244519110831">"Bildschirmeinstellungen"</string>
@@ -1581,7 +1578,7 @@
<string name="sync_automatically" msgid="1682730255435062059">"App-Daten autom. synchronisieren"</string>
<string name="sync_enabled" msgid="4551148952179416813">"Synchronisierung AN"</string>
<string name="sync_disabled" msgid="8511659877596511991">"Synchronisierung AUS"</string>
- <string name="sync_error" msgid="5060969083117872149">"Synchron.fehler"</string>
+ <string name="sync_error" msgid="5060969083117872149">"Synchronisierungsfehler"</string>
<string name="last_synced" msgid="4242919465367022234">"Zuletzt synchronisiert am <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
<string name="sync_in_progress" msgid="5151314196536070569">"Synchronisieren…"</string>
<string name="settings_backup" msgid="2274732978260797031">"Einstellungen sichern"</string>
@@ -1691,7 +1688,7 @@
<string name="data_usage_label_foreground" msgid="4938034231928628164">"Vordergrund"</string>
<string name="data_usage_label_background" msgid="3225844085975764519">"Hintergrund"</string>
<string name="data_usage_app_restricted" msgid="3568465218866589705">"eingeschränkt"</string>
- <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Mobile Daten deaktivieren?"</string>
+ <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Mobilfunk deaktivieren?"</string>
<string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Limit festlegen"</string>
<string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G-Datenlimit festlegen"</string>
<string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-/3G-Datenlimit festlegen"</string>
@@ -1703,7 +1700,7 @@
<string name="data_usage_tab_3g" msgid="6092169523081538718">"2G/3G"</string>
<string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobil"</string>
<string name="data_usage_list_none" msgid="3933892774251050735">"Keine"</string>
- <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobile Daten"</string>
+ <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobilfunk"</string>
<string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-/3G-Daten"</string>
<string name="data_usage_enable_4g" msgid="3635854097335036738">"4G-Daten"</string>
<string name="data_usage_app_settings" msgid="8430240158135453271">"App-Einstellungen anzeigen"</string>
@@ -1712,7 +1709,7 @@
<string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Legen Sie zur Beschränkung der App-Hintergrunddaten zuerst ein Mobildatenlimit fest."</string>
<string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Hintergrunddaten beschränken?"</string>
<string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Diese Funktion kann dazu führen, dass eine auf Hintergrunddaten basierende App nicht mehr funktioniert, wenn nur Mobilfunknetze verfügbar sind."\n\n"Geeignetere Kontrollmechanismen für den Datenverbrauch finden Sie in den Einstellungen der App."</string>
- <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Hintergrunddaten können nur beschränkt werden, wenn Sie ein Limit für mobile Daten festgelegt haben."</string>
+ <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Hintergrunddaten können nur beschränkt werden, wenn Sie ein Mobilfunklimit festgelegt haben."</string>
<string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Autom. Synchronisierung aktivieren?"</string>
<string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Änderungen, die Sie im Web an Ihren Konten vornehmen, werden automatisch auf Ihrem Tablet übernommen."\n\n"Für einige Konten werden möglicherweise auch Änderungen, die Sie auf Ihrem Tablet vornehmen, im Web übernommen. Dies ist die Funktionsweise von Google Konten."\n\n"Unter \"Einstellungen > Konten\" können Sie auswählen, welche Informationen in den einzelnen Konten synchronisiert werden sollen."</string>
<string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Änderungen, die Sie im Web an Ihren Konten vornehmen, werden automatisch auf Ihrem Telefon übernommen."\n\n"Für einige Konten werden eventuell auch Änderungen, die Sie auf Ihrem Telefon vornehmen, im Web übernommen. Dies ist die Funktionsweise von Google Konten."\n\n"Unter \"Einstellungen > Konten\" können Sie auswählen, welche Informationen in den einzelnen Konten synchronisiert werden sollen."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8bc92b6..18b1697 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Επιλογή κλειδ. οθόνης"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Επιλ. εφεδρ. κλειδώμ."</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Κλείδωμα οθόνης"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Προσθήκη γραφ. στοιχ."</string>
- <string name="widget_none" msgid="2708702293215501854">"Κανένας"</string>
- <string name="widget_default" msgid="8269383575996003796">"Ρολόι"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Αλλαγή κλειδώματος οθ."</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Αλλαγή ή απενεργοποίηση ασφάλειας μοτίβου, PIN ή κωδικού πρόσβασης"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Επιλέξτε μια μέθοδο για κλείδωμα της οθόνης"</string>
@@ -727,7 +724,7 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Κατά τη φόρτιση"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Κατά τη σύνδεση"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Απενεργοποίηση"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Για να ελέγξετε τι συμβαίνει όταν το τηλέφωνο είναι συνδεδεμένο και/ή σε κατάσταση αδράνειας, ενεργοποιήστε την κατάσταση αναστολής λειτουργίας."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Για να ελέγξετε τι συμβαίνει όταν το τηλέφωνο είναι συνδεδεμένο ή/και σε κατάσταση αδράνειας, ενεργοποιήστε τη λειτουργία Daydream."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Πότε να χρησιμοποιείται η εφαρμογή Daydream"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Έναρξη τώρα"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Ρυθμίσεις"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b0a533f..faacd7c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Choose backup lock"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Screen lock"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Add widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"None"</string>
- <string name="widget_default" msgid="8269383575996003796">"Clock"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Change lock screen"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Change or disable pattern, PIN or password security"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Choose a method to lock the screen"</string>
@@ -727,7 +724,7 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"While charging"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"While docked"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Off"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"To control what happens when the phone is docked and/or sleeping, turn Sleep Mode on."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"To control what happens when the phone is docked and/or sleeping, turn Dreams on."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"When to daydream"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start now"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Settings"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 318ac81..402a8a8 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Elegir bloqueo pant."</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Bloqueo alternativo"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Agregar widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"Ninguno"</string>
- <string name="widget_default" msgid="8269383575996003796">"Reloj"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambiar pant. bloqueada"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Cambiar/inhab. patrón/PIN/contraseña"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Elige un método para bloquear la pantalla."</string>
@@ -721,14 +718,13 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Elegir fondo de pantalla de"</string>
- <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
- <skip />
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Activar protector de pantalla"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Cuando esté conectado o cuando se encuentre inactivo y cargándose"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Cualquiera de las dos opciones"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"En ambos casos"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la carga"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Cuando esté conectado"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Apagado"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Para controlar qué sucede cuando el dispositivo está conectado o inactivo, activa el modo de suspensión."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Para controlar qué sucede cuando el dispositivo está conectado o inactivo, activa el protector de pantalla."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Cuándo activar el protector de pantalla"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Comenzar ahora"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Configuración"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f8bff5e..d349944 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Elegir bloqueo de pantalla"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Bloqueo alternativo"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Añadir widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"Ninguno"</string>
- <string name="widget_default" msgid="8269383575996003796">"Reloj"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambiar pantalla de bloqueo"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Cambia o inhabilit seguridad contraseña, PIN o patrón"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Elige un método para bloquear la pantalla."</string>
@@ -727,8 +724,8 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la carga"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Cuando el dispositivo esté en un conector"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivado"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Para controlar lo que ocurre cuando el teléfono está conectado o inactivo, debes activar el modo de suspensión."</string>
- <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Cuándo activar el salvapantallas"</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Para controlar lo que ocurre cuando el teléfono está conectado o inactivo, debes activar el salvapantallas."</string>
+ <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Cuándo activarlo"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Iniciar ahora"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Ajustes"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index c34656c..fb63cfa 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekraaniluku valimine"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Valige varukoopia lukk"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekraanilukk"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Vidina lisamine"</string>
- <string name="widget_none" msgid="2708702293215501854">"Puudub"</string>
- <string name="widget_default" msgid="8269383575996003796">"Kell"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ekraaniluku muutmine"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Muuda või keela mustri, PIN-koodi või parooli turve"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Valige ekraani lukustamise meetod"</string>
@@ -723,11 +720,11 @@
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Taustapildi valimine:"</string>
<string name="screensaver_settings_title" msgid="3349790120327233241">"Unerežiim"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kui on dokitud või puhkerežiimis ja laeb"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Kui on dokitud või puhkerežiimis"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Kui on dokitud või laeb"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Laadimise ajal"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kui on dokitud"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Välja"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Kui soovite juhtida, mis juhtub telefoni dokkimisel ja/või puhkerežiimi lülitamisel, siis lülitage sisse unerežiim."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Kui soovite juhtida, mis juhtub telefoni dokkimisel ja/või puhkerežiimi lülitamisel, siis lülitage sisse unerežiim."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Millal lülitada sisse unerežiim?"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Alusta kohe"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Seaded"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 50b2d1d..fd5e936 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -291,7 +291,7 @@
<string name="date_time_set_time" msgid="5716856602742530696">"تنظیم ساعت"</string>
<string name="date_time_set_timezone" msgid="5045627174274377814">"انتخاب منطقهٔ زمانی"</string>
<string name="date_time_set_date" msgid="7021491668550232105">"تنظیم تاریخ"</string>
- <string name="date_time_date_format" msgid="6951498879879281102">"فرمت تاریخ را انتخاب کنید"</string>
+ <string name="date_time_date_format" msgid="6951498879879281102">"انتخاب قالب تاریخ"</string>
<string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ترتیب الفبایی"</string>
<string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"بر اساس منطقهٔ زمانی مرتب شود"</string>
<string name="date_picker_title" msgid="1338210036394128512">"تاریخ"</string>
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"قفل صفحهٔ نمایش را انتخاب کنید"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"قفل پشتیبان را انتخاب کنید"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"قفل صفحه"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"افزودن ابزارک"</string>
- <string name="widget_none" msgid="2708702293215501854">"هیچکدام"</string>
- <string name="widget_default" msgid="8269383575996003796">"ساعت"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"تغییر قفل صفحه"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"تغییر یا غیرفعال کردن الگو، PIN یا ایمنی رمز ورود"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"روشی برای قفل کردن صفحهٔ نمایش انتخاب کنید"</string>
@@ -721,14 +718,13 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"پس از گذشت <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> از غیر فعال بودن"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"تصویر زمینه"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"انتخاب تصویر زمینه از"</string>
- <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
- <skip />
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"رویاپردازی"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"هنگام قرار گرفتن در جایگاه یا خواب و شارژ شدن"</string>
<string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"هرکدام از این موارد"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"هنگام شارژ"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"هنگامی که در جایگاه قرار میگیرد"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"خاموش"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"برای کنترل آنچه که وقتی تلفن را در جایگاه خود متصل میٔکنید روی میدهد و/یا خواب، حالت خواب را روشن کنید."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"برای کنترل آنچه که پس از قرار دادن تلفن در جایگاه و/یا به خواب رفتن آن روی میدهد، رویاپردازی را فعال کنید."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"زمان رویاپردازی"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"اکنون شروع شود"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"تنظیمات"</string>
@@ -762,8 +758,8 @@
<string name="device_info_settings" product="default" msgid="475872867864762157">"وضعیت تلفن"</string>
<string name="system_update_settings_list_item_title" msgid="3342887311059985961">"بهروزرسانیهای سیستم"</string>
<string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
- <string name="firmware_version" msgid="4801135784886859972">"نسخه Android"</string>
- <string name="model_number" msgid="3765737700545384794">"شماره مدل"</string>
+ <string name="firmware_version" msgid="4801135784886859972">"نسخهٔ Android"</string>
+ <string name="model_number" msgid="3765737700545384794">"شمارهٔ مدل"</string>
<string name="fcc_equipment_id" msgid="149114368246356737">"شناسه دستگاه"</string>
<string name="baseband_version" msgid="1848990160763524801">"نسخهٔ باند پایه"</string>
<string name="kernel_version" msgid="9192574954196167602">"نسخهٔ اصلی"</string>
@@ -785,8 +781,8 @@
<string name="status_prl_version" msgid="1007470446618081441">"نسخه PRL"</string>
<string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
<string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
- <string name="status_network_type" msgid="3279383550222116235">"نوع شبکه تلفن همراه"</string>
- <string name="status_data_state" msgid="5503181397066522950">"وضعیت شبکه تلفن همراه"</string>
+ <string name="status_network_type" msgid="3279383550222116235">"نوع شبکهٔ تلفن همراه"</string>
+ <string name="status_data_state" msgid="5503181397066522950">"وضعیت شبکهٔ تلفن همراه"</string>
<string name="status_service_state" msgid="2323931627519429503">"وضعیت سرویس"</string>
<string name="status_signal_strength" msgid="3732655254188304547">"قدرت سیگنال"</string>
<string name="status_roaming" msgid="2638800467430913403">"رومینگ"</string>
@@ -955,9 +951,9 @@
<string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> از اتصال اینترنتی با تلفن همراه قطع میشود."</string>
<string name="tethering_help_button_text" msgid="656117495547173630">"راهنمایی"</string>
<string name="network_settings_title" msgid="7967552516440151852">"شبکههای تلفن همراه"</string>
- <string name="location_title" msgid="1029961368397484576">"موقعیت مکانی من"</string>
- <string name="location_network_based" msgid="7472814266821714527">"مکان شبکه تلفن همراه و Wi-Fi"</string>
- <string name="location_neighborhood_level" msgid="5626515380188353712">"بگذارید برنامهها از سرویس مکانی Google بسرعت مکان شما را تخمین بزنند. دادههای ناشناس مکان، جمعآوری و به Google ارسال میشوند."</string>
+ <string name="location_title" msgid="1029961368397484576">"موقعیت مکانی شما"</string>
+ <string name="location_network_based" msgid="7472814266821714527">"مکان شبکهٔ تلفن همراه و Wi-Fi"</string>
+ <string name="location_neighborhood_level" msgid="5626515380188353712">"به برنامهها اجازه داده شود با استفاده از خدمات مکانی Google مکان شما را سریعتر تخمین بزنند. دادههای مکان بهطور ناشناس جمعآوری شده و به Google ارسال خواهد شد."</string>
<string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"موقعیت مکانی تعیین شده توسط Wi-Fi"</string>
<string name="location_gps" msgid="8392461023569708478">"ماهوارههای GPS"</string>
<string name="location_street_level" product="tablet" msgid="1669562198260860802">"به برنامههای کاربردی اجازه داده شود برای مشخص کردن دقیق مکان شما از GPS رایانه لوحیتان استفاده کنند"</string>
@@ -967,8 +963,8 @@
<string name="assisted_gps_disabled" msgid="6982698333968010748">"استفاده از سرور برای کمک به GPS (برای ارتقای عملکرد GPS، علامت آن را حذف کنید)"</string>
<string name="use_location_title" msgid="5206937465504979977">"مکان و جستجوی Google"</string>
<string name="use_location_summary" msgid="3978805802386162520">"به Google اجازه داده شود از مکان شما برای بهبود نتایج جستجو و سایر سرویسها استفاده کند"</string>
- <string name="location_access_title" msgid="7064108942964081243">"دسترسی به موقعیت مکانی من"</string>
- <string name="location_access_summary" msgid="69031404093194341">"بگذارید برنامههای کاربردی که اجازه شما را درخواست کردهاند از اطلاعات موقعیت مکانی شما استفاده کنند."</string>
+ <string name="location_access_title" msgid="7064108942964081243">"دسترسی به موقعیت مکانی شما"</string>
+ <string name="location_access_summary" msgid="69031404093194341">"به برنامههایی که از شما اجازه گرفتهاند اجازه داده شود از اطلاعات مکانی شما استفاده کنند"</string>
<string name="location_sources_heading" msgid="1278732419851088319">"منابع موقعیت مکانی"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"دربارهٔ رایانهٔ لوحی"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"دربارهٔ گوشی"</string>
@@ -1354,7 +1350,7 @@
<string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS در"</string>
<string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
<string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"بیدار"</string>
- <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"سیگنال شبکه تلفن همراه"</string>
+ <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"سیگنال شبکهٔ تلفن همراه"</string>
<!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
<skip />
<string name="awake" msgid="387122265874485088">"زمان بیداری دستگاه"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 5729a3e..b00eb7b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Valitse ruudunlukitus"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Valitse varalukko"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ruudun lukitus"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Lisää widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"Ei mitään"</string>
- <string name="widget_default" msgid="8269383575996003796">"Kello"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Vaihda ruudunlukitusta"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Vaihda tai poista käytöstä kuvio-, PIN-koodi- tai salasanasuojaus"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Valitse ruudunlukitustapa"</string>
@@ -721,14 +718,13 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Kun laite on ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustakuva"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Valitse taustakuva"</string>
- <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
- <skip />
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Unelmat"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Telakoituna tai virransäästötilassa ja ladattaessa"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Joko"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Kumpi vain"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Latauksen aikana"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Telakoituna"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Pois käytöstä"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Jos haluat hallita puhelimen toimintaa telakoituna ja/tai lepotilassa, ota virransäästötila käyttöön."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Jos haluat hallita puhelimen toimintaa telakoituna ja/tai lepotilassa, ota Unelmat käyttöön."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Milloin unelmoidaan"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Aloita nyt"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Asetukset"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index cd116f3..81496c3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Sélect. verr. écran"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Verrouillage secondaire"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Verrouillage de l\'écran"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Ajouter un widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"Aucun"</string>
- <string name="widget_default" msgid="8269383575996003796">"Horloge"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Modifier écran verr."</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Modifier ou désactiver la sécurité : schéma, code PIN ou mot de passe"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Choisir une méthode pour verrouiller l\'écran"</string>
@@ -721,14 +718,14 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Fond d\'écran"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Sélectionner fond d\'écran dans"</string>
- <string name="screensaver_settings_title" msgid="3349790120327233241">"Écran de veille"</string>
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Écran de veille interactif"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Lorsque l\'appareil est installé sur la station d\'accueil ou lorsqu\'il est en veille et en charge"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Les deux"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Dans les deux cas"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Pendant la charge"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Sur la station d\'accueil"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Désactivé"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Pour contrôler le comportement du téléphone lorsqu\'il se trouve sur une station d\'accueil et/ou lorsqu\'il est en veille, activez l\'écran de veille interactif."</string>
- <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Activer l\'écran de veille interactif"</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Pour contrôler le comportement du téléphone lorsqu\'il se trouve sur une station d\'accueil et/ou lorsqu\'il est en veille, activez l\'écran de veille interactif."</string>
+ <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quand activer"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Commencer"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Paramètres"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ba66849..2edb73c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"स्क्रीन लॉक चुनें"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"बैकअप लॉक चुनें"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"स्क्रीन लॉक"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"विजेट जोड़ें"</string>
- <string name="widget_none" msgid="2708702293215501854">"कुछ नहीं"</string>
- <string name="widget_default" msgid="8269383575996003796">"घड़ी"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"लॉक स्क्रीन बदलें"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"प्रतिमान, पिन या पासवर्ड सुरक्षा बदलें या अक्षम करें"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"स्क्रीन को लॉक करने की विधि चुनें"</string>
@@ -727,7 +724,7 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"चार्ज करते समय"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"जब डॉक किया हुआ हो"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"बंद"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"फ़ोन के डॉक किए होने पर और/या निष्क्रिय होने पर होने वाली कार्यवाही नियंत्रित करने के लिए निष्क्रिय मोड को चालू करें."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"फ़ोन के डॉक रहते समय और/या निष्क्रिय रहते समय जो भी होता है, उसे नियंत्रित करने के लिए Daydream को चालू करें."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"daydream कब करें"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"अब प्रारंभ करें"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"सेटिंग"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 6d518e7..01d4a01 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Odaberite zaključavanje zaslona"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Odabir sig. zaključ."</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaključavanje zaslona"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Dodavanje widgeta"</string>
- <string name="widget_none" msgid="2708702293215501854">"Ništa"</string>
- <string name="widget_default" msgid="8269383575996003796">"Sat"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Promjena zaklj. zasl."</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Promijenite ili onemogućite sigurnosni uzorak, PIN ili zaporku"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Odaberite metodu za zaključavanje zaslona"</string>
@@ -723,11 +720,11 @@
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Odabir pozadinske slike iz"</string>
<string name="screensaver_settings_title" msgid="3349790120327233241">"Sanjarenje"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kada je uređaj na priključnoj stanici ili kada miruje i puni se"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ili"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bilo koje"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Tijekom punjenja"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kada je na priključnoj stanici"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Isključeno"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Da biste kontrolirali događaje dok je telefon na priključnoj stanici i/ili dok miruje, uključite značajku Mirovanja."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Da biste kontrolirali događaje dok je telefon na priključnoj stanici i/ili dok miruje, uključite značajku Sanjarenje."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kada sanjariti"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Započni sad"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Postavke"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 8a44f7c..39a5af8 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Képernyőzár választása"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Biztonsági zárolás"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Képernyő zárolása"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Modul felvétele"</string>
- <string name="widget_none" msgid="2708702293215501854">"Nincs"</string>
- <string name="widget_default" msgid="8269383575996003796">"Óra"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Képernyőzár mód."</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Minta, PIN-kód és jelszavas védelem módosítása és kikapcsolása"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Válasszon módszert a képernyő lezárásához"</string>
@@ -723,11 +720,11 @@
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Válasszon tapétát innen:"</string>
<string name="screensaver_settings_title" msgid="3349790120327233241">"Álmodozás"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Dokkolt vagy alvó állapotban, töltés közben"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Mindegy"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bármelyik"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Töltés közben"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Dokkolt állapotban"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Ki"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Ha szeretné beállítani, hogy mi történjen a telefon dokkolt és/vagy alvó állapotában, kapcsolja be az Alvó üzemmódot."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Az Álmodozás bekapcsolásával beállíthatja, hogy mit csináljon a telefon dokkolt vagy alvó állapotban."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Álmodozás ideje"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Indítás most"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Beállítások"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 6bbdd50..3bc7b70 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci layar"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pilih gembok cadangan"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Gembok layar"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Tambahkan widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"Tidak ada"</string>
- <string name="widget_default" msgid="8269383575996003796">"Jam"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ubah layar gembok"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Ubah atau nonaktifkan pola, PIN, atau sandi keamanan"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Pilih metode untuk mengunci layar"</string>
@@ -727,7 +724,7 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Saat mengisi daya"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Selagi di dok"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Mati"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Untuk mengontrol apa yang terjadi saat ponsel dipasang ke dok dan/atau sedang tidur, nyalakan Mode Mimpi."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Untuk mengontrol apa yang terjadi saat ponsel di dok dan/atau sedang tidur, nyalakan Lamunan."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Waktu melamun"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Mulai sekarang"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Setelan"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a95b96a..e1bedba 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Scegli blocco schermo"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Scegli blocco di backup"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocco schermo"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Aggiungi widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"Nessuno"</string>
- <string name="widget_default" msgid="8269383575996003796">"Orologio"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambia blocco schermo"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Cambia o disattiva protez. tramite sequenza, PIN o password"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Scegli un metodo per bloccare lo schermo"</string>
@@ -727,8 +724,8 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la ricarica"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quando inserito nel dock"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Disattivato"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Per stabilire che cosa accade quando il telefono è inserito nel dock e/o in stand-by, attiva la Modalità di sospensione."</string>
- <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quando sognare a occhi aperti"</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Per stabilire che cosa accade quando il telefono è inserito nel dock e/o in stand-by, attiva Daydream."</string>
+ <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quando attivare Daydream"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Inizia subito"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Impostazioni"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b323d32..04c8649 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"בחירת נעילת מסך"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"בחר נעילת גיבוי"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"נעילת מסך"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"הוסף Widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"ללא"</string>
- <string name="widget_default" msgid="8269383575996003796">"שעון"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"שינוי נעילת מסך"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"שנה או השבת אבטחת קו, PIN או סיסמה"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"בחר שיטה לנעילת המסך"</string>
@@ -727,7 +724,7 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"במהלך טעינה"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"בזמן עגינה"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"כבוי"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"כדי לשלוט במה שקורה כאשר הטלפון בעגינה ו/או במצב שינה, הפעל את מצב השינה."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"כדי לשלוט במה שקורה כאשר הטלפון בעגינה ו/או במצב שינה, הפעל את Daydream."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"מתי יש לעבור למצב Daydream"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"התחל כעת"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"הגדרות"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index de5cddd..e9b1ce8 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -343,9 +343,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"画面ロックを選択"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"バックアップのロックの選択"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"画面のロック"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"ウィジェットを追加"</string>
- <string name="widget_none" msgid="2708702293215501854">"なし"</string>
- <string name="widget_default" msgid="8269383575996003796">"時計"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ロック解除方法を変更する"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"パターン、PIN、パスワードセキュリティを変更または無効にする"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"画面をロックする方法を選択する"</string>
@@ -729,9 +726,9 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"充電時"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"ホルダー装着時"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"OFF"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"携帯端末のホルダー装着時やスリープ時の動作を管理するにはスリープモードをONにします。"</string>
- <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"スクリーンセーバー開始のタイミング"</string>
- <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"今すぐ開始"</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"携帯端末のホルダー装着時やスリープ時の動作を管理するにはスクリーンセーバーをONにします。"</string>
+ <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"起動のタイミング"</string>
+ <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"今すぐ起動"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"設定"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
<string name="title_font_size" msgid="4405544325522105222">"フォントサイズ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ac86266..b69dbc6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"화면 잠금 선택"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"백업 잠금 선택"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"화면 잠금"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"위젯 추가"</string>
- <string name="widget_none" msgid="2708702293215501854">"없음"</string>
- <string name="widget_default" msgid="8269383575996003796">"시계"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"화면 잠금 변경"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"패턴, PIN 또는 비밀번호 보안을 변경하거나 사용 중지"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"화면을 잠그는 방법을 선택합니다."</string>
@@ -721,14 +718,13 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 이상 동작이 없을 때"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"배경화면"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"배경화면 선택"</string>
- <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
- <skip />
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"화면 보호기"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"도킹할 때 또는 대기상태이거나 충전할 때"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"도킹이나 대기상태일 때"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"도킹이나 충전 중일 때"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"충전하는 동안"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"도킹할 때"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"사용 안함"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"휴대전화가 도킹 또는 절전 모드일 때 작동 방식을 조정하려면 절전 모드를 사용하도록 설정하세요."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"휴대전화가 도킹 또는 절전 모드일 때 작동 방식을 조정하려면 화면 보호기를 사용하도록 설정합니다."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"화면 보호기 전환 시점"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"시작하기"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"설정"</string>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 2ced533..498aa4d 100755
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -17,4 +17,9 @@
<resources>
<dimen name="appwidget_width">421dip</dimen>
<dimen name="appwidget_height">68dip</dimen>
+ <dimen name="appwidget_preview_width">120dip</dimen>
+ <dimen name="appwidget_preview_height">70dip</dimen>
+ <dimen name="keyguard_appwidget_picker_margin_left">2dip</dimen>
+ <dimen name="keyguard_appwidget_picker_margin_right">2dip</dimen>
+ <integer name="keyguard_appwidget_picker_cols">2</integer>
</resources>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
new file mode 100644
index 0000000..0903167
--- /dev/null
+++ b/res/values-land/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<resources>
+ <style name="KeyguardAppWidgetItem">
+ <item name="android:textSize">16sp</item>
+ </style>
+</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f78b219..76424ea 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Pasir. ekrano užrak."</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pasirinkti atsarginį užrakinimą"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekrano užraktas"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Pridėti valdiklį"</string>
- <string name="widget_none" msgid="2708702293215501854">"Nėra"</string>
- <string name="widget_default" msgid="8269383575996003796">"Laikrodis"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Pakeisti užrak. ekraną"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Keisti ar išjungti modelio, PIN kodo ar slaptažodžio saugą"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Pasirinkite ekrano užrakinimo metodą"</string>
@@ -723,11 +720,11 @@
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pasirinkti darbalaukio foną iš"</string>
<string name="screensaver_settings_title" msgid="3349790120327233241">"Svajonė"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kai yra doke arba kai veikia miego režimas ir kraunamas akumuliatorius"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bet kuris variantas"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Abiem atvejais"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Įkraunant"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kai yra doke"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Išjungta"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Jei norite valdyti, kas vyksta, kai telefonas yra prijungtas prie doko ir (arba) veikia miego režimu, įjunkite miego režimą."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Jei norite valdyti, kas vyksta, kai telefonas yra doke ir (arba) veikia miego režimu, įjunkite funkciją „Svajonės“."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kada svajoti"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Pradėti dabar"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Nustatymai"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 90618c8..cc15ce6 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekrāna bloķēš. izvēle"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Rezerves bloķ. izvēle"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekrāna bloķēšana"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Logrīka pievienošana"</string>
- <string name="widget_none" msgid="2708702293215501854">"Neviens"</string>
- <string name="widget_default" msgid="8269383575996003796">"Pulkstenis"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Bloķ. ekr. izmaiņas"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Kombinācijas, PIN koda vai paroles drošības maiņa vai atspējošana"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Izvēlieties ekrāna bloķēšanas veidu"</string>
@@ -727,7 +724,7 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Uzlādes laikā"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kamēr tiek dokots"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Izslēgts"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Lai kontrolētu, kas notiek ar tālruni, kad tas tiek dokots un/vai atrodas miega režīmā, ieslēdziet miega režīmu."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Lai kontrolētu, kas notiek laikā, kad tālrunis ir pievienots dokstacijai un/vai atrodas miega režīmā, ieslēdziet ekrānsaudzētāju."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Ekrānsaudzētāja režīmā"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Sākt tūlīt"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Iestatījumi"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index e8c3945..4fa6275 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci skrin"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pilih kunci sandaran"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kunci skrin"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Tambah widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"Tiada"</string>
- <string name="widget_default" msgid="8269383575996003796">"Jam"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Tukar kunci skrin"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Tukar atau lumpuhkan corak, PIN atau keselamatan kata laluan"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Pilih kaedah untuk mengunci skrin"</string>
@@ -721,13 +718,13 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Kertas dinding"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih kertas dinding dari"</string>
- <string name="screensaver_settings_title" msgid="3349790120327233241">"Lamun"</string>
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Lamunan"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Apabila didok atau tidur dan dicas"</string>
<string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Salah satu"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Semasa mengecas"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Semasa didok"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Dimatikan"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Untuk mengawal apa yang berlaku semasa telefon didok dan/atau tidur, hidupkan Mod Tidur."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Untuk mengawal apa yang berlaku semasa telefon didok dan/atau tidur, hidupkan Daydream."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Bila untuk melamun"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Mulakan sekarang"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Tetapan"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 005d741..fac7f41 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Velg skjermlås"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Velg reservelås"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skjermlås"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Legg til modul"</string>
- <string name="widget_none" msgid="2708702293215501854">"Ingen"</string>
- <string name="widget_default" msgid="8269383575996003796">"Klokke"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Endre skjermlås"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Endre eller deaktiver mønster, personlig kode eller passordsikkerhet"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Velg en metode for å låse skjermen"</string>
@@ -721,14 +718,13 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivivitet"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrunnsbilde"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Velg bakgrunnsbilde fra"</string>
- <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
- <skip />
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdrøm"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Når enheten er plassert i dokken eller under lading i hvilemodus"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Enten eller"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Begge"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Under lading"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Når enheten er plassert i dokken"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Av"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Hvis du vil kontrollere hva som skjer når telefonen er plassert i dokken og/eller hviler, slår du på hvilemodus."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Hvis du vil kontrollere hva som skjer når telefonen er plassert i dokken og/eller i hvilemodus, slår du på Dagdrømmer."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Når dagdrøm-modusen skal brukes"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start nå"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Innstillinger"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2f50bcc..3bfe192 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Schermvergr. kiezen"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Back-upvergr. kiezen"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Schermvergrendeling"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Widget toevoegen"</string>
- <string name="widget_none" msgid="2708702293215501854">"Geen"</string>
- <string name="widget_default" msgid="8269383575996003796">"Klok"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Schermvergr. wijzigen"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Beveiliging via patroon, PIN of wachtwoord wijzigen of uitschakelen"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Kies een methode voor schermvergrendeling"</string>
@@ -723,11 +720,11 @@
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Achtergrond kiezen van"</string>
<string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdromen"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Wanneer gedockt, in slaapstand of tijdens het opladen"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Een van beide"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Maakt niet uit"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Tijdens het opladen"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Wanneer gedockt"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Uit"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Schakel Slaapmodus in om te bepalen wat er gebeurt wanneer de telefoon is gedockt en/of de slaapmodus actief is."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Schakel Dagdromen in om te bepalen wat er gebeurt als de telefoon is gedockt en/of de slaapstand actief is."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Wanneer dagdromen"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Nu beginnen"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Instellingen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3b21049..3d1ceb1 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Wybierz blokadę ekranu"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Wybierz blokadę zapasową"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blokada ekranu"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Dodaj widżet"</string>
- <string name="widget_none" msgid="2708702293215501854">"Brak"</string>
- <string name="widget_default" msgid="8269383575996003796">"Zegar"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Zmień blokadę ekranu"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Zmień lub wyłącz zabezpieczenie ekranu (wzór, PIN lub hasło)"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Wybierz sposób blokowania ekranu"</string>
@@ -721,14 +718,13 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Wybierz tapetę z..."</string>
- <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
- <skip />
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Wygaszacz ekranu"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Podczas zadokowania lub uśpienia i ładowania"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Albo"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Zadokowany lub ładowany"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Podczas ładowania"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Podczas zadokowania"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Wył."</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Aby określić działanie po zadokowaniu i/lub uśpieniu telefonu, włącz tryb uśpienia."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Aby kontrolować to, co dzieje się, gdy telefon jest zadokowany i/lub w trybie uśpienia, włącz Wygaszacz ekranu."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Ustawienia wygaszacza"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Zacznij teraz"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Ustawienia"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 475a56d..480df40 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Selec. bloq. do ecrã"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Escolher bloq. cópia seg."</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de ecrã"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Adicionar widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"Nenhum"</string>
- <string name="widget_default" msgid="8269383575996003796">"Relógio"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Alterar ecrã de bloq."</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Alterar ou desactivar segurança de padrão, PIN ou palavra-passe"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Escolha um método para bloquear o ecrã"</string>
@@ -721,14 +718,14 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagem de fundo"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Escolher imagem de fundo de"</string>
- <string name="screensaver_settings_title" msgid="3349790120327233241">"Sonho"</string>
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quando ancorado ou em suspensão e a carregar"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Qualquer dos modos"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ou"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Enquanto está a carregar"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Enquanto ancorado"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desligado"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Para controlar o que acontece quando o telemóvel está ancorado e/ou em suspensão, ative o Modo de Suspensão."</string>
- <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quando sonhar acordado"</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Para controlar o que acontece quando o telemóvel está ancorado e/ou em suspensão, ative o modo Daydream."</string>
+ <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quando iniciar o Daydream"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Iniciar agora"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Definições"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0371759..fc42ee9 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloq. de tela"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Selec. o bloq. de backup"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueio de tela"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Adicionar widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"Nenhum"</string>
- <string name="widget_default" msgid="8269383575996003796">"Relógio"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Alterar tela bloqueio"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Alterar ou desativar o padrão, o PIN ou a segurança da senha"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Escolha um método para bloquear a tela"</string>
@@ -727,7 +724,7 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Ao carregar"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quando encaixado"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desativado"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Para controlar o que acontece quando o telefone está encaixado e/ou suspenso, ative o modo de suspensão."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Para controlar o que acontece quando o telefone está encaixado e/ou suspenso, ative o Daydream."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quando iniciar Daydreams"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Começar agora"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Configurações"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 08c88d7..d1ffffc 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -497,12 +497,6 @@
<skip />
<!-- no translation found for unlock_set_unlock_launch_picker_title (2084576942666016993) -->
<skip />
- <!-- no translation found for choose_user_selected_lockscreen_widget_picker_title (2016562665711402130) -->
- <skip />
- <!-- no translation found for widget_none (2708702293215501854) -->
- <skip />
- <!-- no translation found for widget_default (8269383575996003796) -->
- <skip />
<!-- no translation found for unlock_set_unlock_launch_picker_change_title (5045866882028324941) -->
<skip />
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Modifitgar u deactivar las bloccaziuns (code PIN, schema e pled-clav)."</string>
@@ -1115,7 +1109,7 @@
<skip />
<!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
<skip />
- <!-- no translation found for screensaver_settings_disabled_prompt (8842133053691392237) -->
+ <!-- no translation found for screensaver_settings_disabled_prompt (3857507943322777651) -->
<skip />
<!-- no translation found for screensaver_settings_when_to_dream (8352267826043957746) -->
<skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index e8f5ea7..3b501f4 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Alegeţi blocare ecran"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Aleg. blocare rezervă"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocarea ecranului"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Adăugaţi un widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"Niciunul"</string>
- <string name="widget_default" msgid="8269383575996003796">"Ceas"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Schimbaţi bloc.ecran."</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Modificaţi sau dezactivaţi modelul, codul PIN sau siguranţa prin parolă"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Alegeţi o metodă pentru a bloca ecranul"</string>
@@ -721,14 +718,13 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagine de fundal"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Aleg. o imag. de fundal de la"</string>
- <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
- <skip />
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Când dispozitivul este andocat sau în modul inactiv şi se realizează încărcarea"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Oricare"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"În ambele situații"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"În timpul încărcării"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Când dispozitivul este andocat"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Dezactivat"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Pentru a controla ceea ce se întâmplă când telefonul este andocat şi/sau în modul inactiv, activaţi modul inactiv."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Pentru a controla ceea ce se întâmplă când telefonul este andocat şi/sau în modul inactiv, activaţi Daydream."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Când porneşte Daydreams"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Începeţi acum"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Setări"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1d1543f..7aa507e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -109,7 +109,7 @@
<string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Время видимости для устройств Bluetooth: <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>"</string>
<string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Отображать для ближайших устройств Bluetooth"</string>
<string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Не отображать для других Bluetooth-устройств"</string>
- <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Отображать только для подключенных устройств"</string>
+ <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Доступно только для подключенных устройств"</string>
<string name="bluetooth_not_discoverable" msgid="128269993123955177">"Сделать устройство видимым"</string>
<string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Тайм-аут видимости"</string>
<string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Укажите, в течение какого времени устройство будет видимым"</string>
@@ -341,28 +341,25 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Блокировка экрана"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Доп. способ блокировки"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блокировка экрана"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Выберите виджет"</string>
- <string name="widget_none" msgid="2708702293215501854">"Нет"</string>
- <string name="widget_default" msgid="8269383575996003796">"Часы"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Изменение блок. экрана"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Смена или отключение графического ключа, PIN-кода и пароля"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Выбрать метод блокировки экрана"</string>
<string name="unlock_backup_info_summary" msgid="108524727803788172">"Выберите альтернативный способ разблокировки экрана."</string>
<string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Нет"</string>
<string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
- <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Прокрутка"</string>
+ <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Слайдер"</string>
<string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Защита отключена"</string>
<string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Фейсконтроль"</string>
<string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Низкий уровень защиты (экспериментальная функция)"</string>
<string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Графический ключ"</string>
<string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Средний уровень защиты"</string>
- <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+ <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN-код"</string>
<string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Уровень безопасности от среднего до высокого"</string>
<string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Пароль"</string>
<string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Высокий уровень защиты"</string>
<string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Запрещено администратором, политикой шифрования или хранилищем учетных данных"</string>
<string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Нет"</string>
- <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Перетащить значок блокировки"</string>
+ <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Для разблокировки экрана сдвиньте слайдер"</string>
<string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Фейсконтроль"</string>
<string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Графический ключ"</string>
<string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-код"</string>
@@ -522,7 +519,7 @@
<string name="android_beam_off_summary" msgid="4663095428454779138">"Выключено"</string>
<string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недоступно, так как отключена связь малого радиуса действия"</string>
<string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
- <string name="android_beam_explained" msgid="6981652347448777459">"Когда включена эта функция, данные приложений можно передавать на другие устройства с поддержкой связи малого радиуса действия. Например, отправлять страницы браузера, видео YouTube, контакты и другие сведения."\n\n"Просто разместите устройства поблизости (например, совместите их задние панели) и коснитесь экрана. Передаваемые данные зависят от приложения."</string>
+ <string name="android_beam_explained" msgid="6981652347448777459">"Когда включена эта функция, вы можете обмениваться данными между устройствами, просто приложив их друг к другу."\n\n"Передавать можно практически любые данные, включая контакты, ссылки, веб-страницы, фотографии и видео."</string>
<string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Обнаружение сетевых служб"</string>
<string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Разрешить приложениям на других устройствах обнаруживать приложения на этом устройстве"</string>
<string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
@@ -576,7 +573,7 @@
<string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Ошибка аутентификации. Повторите попытку."</string>
<string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Обнаружен другой сеанс WPS. Повторите попытку через несколько минут."</string>
<string name="wifi_ssid" msgid="641393708309146745">"Имя сети (SSID)"</string>
- <string name="wifi_security" msgid="6603611185592956936">"Безопасность"</string>
+ <string name="wifi_security" msgid="6603611185592956936">"Защита"</string>
<string name="wifi_signal" msgid="5514120261628065287">"Уровень сигнала"</string>
<string name="wifi_status" msgid="4824568012414605414">"Статус"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Скорость связи"</string>
@@ -721,14 +718,13 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездействия"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Обои"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Установка обоев"</string>
- <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
- <skip />
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Заставка"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"При подключении к док-станции, при переходе в спящий режим и во время зарядки"</string>
<string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Всегда"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Во время зарядки"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"В док-станции"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ВЫКЛ"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Чтобы знать, что происходит с телефоном, когда он подключен к док-станции или находится в спящем режиме, включите заставку."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Чтобы знать, что происходит с телефоном, когда он подключен к док-станции или находится в спящем режиме, включите заставку."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Когда включать"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Включить"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Настройки"</string>
@@ -989,7 +985,7 @@
<string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Выберите пароль"</string>
<string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Создайте графический ключ"</string>
<string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Выберите ПИН-код"</string>
- <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Подтвердите пароль"</string>
+ <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Введите новый пароль"</string>
<string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Подтвердите графический ключ"</string>
<string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Подтвердите ПИН-код"</string>
<string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Пароли не совпадают"</string>
@@ -1000,16 +996,16 @@
<string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Ключ был установлен"</string>
<string name="lock_settings_title" msgid="335025124489630932">"Блокировка экрана"</string>
<string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Изменить ключ"</string>
- <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Изменить ПИН-код разблокировки"</string>
+ <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Изменить PIN-код"</string>
<string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Начертите существующий ключ"</string>
<string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Повторите попытку"</string>
- <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Начертите графический ключ разблокировки"</string>
+ <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Начертите ключ разблокировки"</string>
<string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Для справки нажмите \"Меню\"."</string>
- <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"По завершении отпустите палец."</string>
- <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Соедините точки (как минимум <xliff:g id="NUMBER">%d</xliff:g>). Повторите попытку:"</string>
- <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Графический ключ сохранен."</string>
- <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Для подтверждения начертите графический ключ повторно:"</string>
- <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Новый графический ключ разблокировки:"</string>
+ <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"По завершении отпустите палец"</string>
+ <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Соедините не менее <xliff:g id="NUMBER">%d</xliff:g> точек"</string>
+ <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Графический ключ сохранен"</string>
+ <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Начертите ключ еще раз"</string>
+ <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Новый ключ разблокировки"</string>
<string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Подтвердить"</string>
<string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Воспроизвести повторно"</string>
<string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Повтор"</string>
@@ -1198,7 +1194,7 @@
<string name="auto_punctuate" msgid="4595367243950425833">"Автопунктуация"</string>
<string name="hardkeyboard_category" msgid="5957168411305769899">"Настройки внешней клавиатуры"</string>
<string name="auto_punctuate_summary" msgid="4372126865670574837">"Нажмите дважды клавишу \"Пробел\" для ввода точки"</string>
- <string name="show_password" msgid="3001113966880559611">"Показывать пароль"</string>
+ <string name="show_password" msgid="3001113966880559611">"Показывать пароль при вводе"</string>
<string name="show_password_summary" msgid="7345931695292850058"></string>
<string name="ime_security_warning" msgid="4135828934735934248">"При использовании этого способа могут собираться все вводимые данные, в том числе пароли и номера кредитных карт. Способ ввода запрашиваетя приложением \"<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>\". Использовать этот способ ввода?"</string>
<string name="spellchecker_security_warning" msgid="9060897418527708922">"Для проверки орфографии будет использоваться приложение <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>, которое может собирать все вводимые данные, в том числе пароли и номера кредитных карт. Продолжить?"</string>
@@ -1487,7 +1483,7 @@
<string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Установить сертификаты с SD-карты"</string>
<string name="credentials_reset" msgid="3239382277144980418">"Очистить учетные данные"</string>
<string name="credentials_reset_summary" msgid="3369361230171260282">"Удалить все сертификаты"</string>
- <string name="trusted_credentials" msgid="4266945289534242402">"Надежные учетные данные"</string>
+ <string name="trusted_credentials" msgid="4266945289534242402">"Надежные сертификаты"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Показывать надежные сертификаты ЦС"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Начертите графический ключ"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Чтобы подтвердить установку учетных данных, начертите графический ключ."</string>
@@ -1509,9 +1505,9 @@
<string name="privacy_settings_title" msgid="4856282165773594890">"Восстановление и сброс"</string>
<string name="backup_section_title" msgid="7952232291452882740">"Резервное копирование и восстановление"</string>
<string name="personal_data_section_title" msgid="7815209034443782061">"Возврат к заводским настройкам"</string>
- <string name="backup_data_title" msgid="1239105919852668016">"Копирование данных"</string>
+ <string name="backup_data_title" msgid="1239105919852668016">"Резервирование данных"</string>
<string name="backup_data_summary" msgid="9157861529438245957">"Сохранять резервные копии данных приложений, паролей точек доступа Wi-Fi и настроек на серверах Google"</string>
- <string name="backup_configure_account_title" msgid="3790872965773196615">"Резервный аккаунт"</string>
+ <string name="backup_configure_account_title" msgid="3790872965773196615">"Аккаунт для резервирования"</string>
<string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Не найдены аккаунты с резервными копиями данных"</string>
<string name="auto_restore_title" msgid="5397528966329126506">"Автовосстановление"</string>
<string name="auto_restore_summary" msgid="4235615056371993807">"При переустановке приложения восстановить резервную копию настроек и данных"</string>
@@ -1655,12 +1651,12 @@
<string name="enable_traces_summary_none" msgid="1867562808503494163">"Все трассировки отключены"</string>
<string name="enable_traces_summary_num" msgid="8978230237777454269">"Включено трассировок: <xliff:g id="NUM">%1$d</xliff:g>"</string>
<string name="enable_traces_summary_all" msgid="3950139649125158247">"Все трассировки включены"</string>
- <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Разрешить трассировку OpenGL"</string>
- <string name="debug_layout" msgid="5981361776594526155">"Показывать границы макета"</string>
+ <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Вкл. трассировку OpenGL"</string>
+ <string name="debug_layout" msgid="5981361776594526155">"Показывать границы элементов"</string>
<string name="debug_layout_summary" msgid="2001775315258637682">"Показывать границы клипа, поля и т. д."</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Показывать загрузку ЦП"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Экран, показывающий текущую загрузку ЦП"</string>
- <string name="force_hw_ui" msgid="6426383462520888732">"Ускорить работу GPU"</string>
+ <string name="force_hw_ui" msgid="6426383462520888732">"GPU-ускорение"</string>
<string name="force_hw_ui_summary" msgid="5535991166074861515">"Всегда использовать GPU для двухмерного рисования"</string>
<string name="force_msaa" msgid="7920323238677284387">"Включить 4x MSAA"</string>
<string name="force_msaa_summary" msgid="9123553203895817537">"Включить 4x MSAA в приложениях OpenGL ES 2.0"</string>
@@ -1811,7 +1807,7 @@
<string name="user_owner" msgid="3879126011135546571">"Владелец"</string>
<string name="user_nickname" msgid="5148818000228994488">"Псевдоним"</string>
<string name="user_add_user_title" msgid="3961861593718285403">"Добавить пользователя"</string>
- <string name="user_add_user_message_long" msgid="2278524063301283723">"Если вашим устройством пользуется кто-то ещё, создайте отдельных пользователей. У каждого из них будет свое пространство, где можно, например, установить приложения или выбрать обои. Некоторые параметры, например настройки сети Wi-Fi, будут общими для всех."\n\n"Каждый новый пользователь должен выполнить настройку."\n\n"Пользователи могут разрешать обновления для любых аккаунтов на устройстве."</string>
+ <string name="user_add_user_message_long" msgid="2278524063301283723">"Если устройством пользуется несколько человек, заведите для них отдельные учетные записи. В результате у каждого пользователя появится свое пространство, где можно будет установить собственные приложения или обои. При этом некоторые параметры, например настройки Wi-Fi, останутся общими для всех."\n\n"Обновление приложений будет происходить для всех учетных записей одновременно. Установить обновление сможет любой пользователь."\n\n</string>
<string name="user_add_user_message_short" msgid="3310933423737035428">"Каждый новый пользователь должен выполнить настройку."\n\n"Пользователи могут разрешать обновления для любых аккаунтов на устройстве."</string>
<string name="user_setup_dialog_title" msgid="1765794166801864563">"Настроить аккаунт?"</string>
<string name="user_setup_dialog_message" msgid="614037943337008555">"Если у пользователя нет возможности настроить аккаунт прямо сейчас, он сможет сделать это позже."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 0e24a0c..a2d4e76 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Zvoľte uzamk. obrazov."</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Vybrať zámku zálohy"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Uzamknutie obrazovky"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Pridať miniaplikáciu"</string>
- <string name="widget_none" msgid="2708702293215501854">"Žiadne"</string>
- <string name="widget_default" msgid="8269383575996003796">"Hodiny"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Zmeniť uzamknutie obrazovky"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Zmeniť alebo zakázať bezpečnostný vzor, kód PIN alebo heslo"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Vyberte spôsob uzamknutia obrazovky"</string>
@@ -721,14 +718,13 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrať tapetu z"</string>
- <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
- <skip />
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Šetrič obrazovky"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Pri vložení do doku alebo pri nabíjaní v režime spánku"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Oboje"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"V oboch prípadoch"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Pri nabíjaní"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Počas prítomnosti zariadenia v doku"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Vypnuté"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Ak chcete nastaviť, čo sa stane, keď sa telefón vloží do doku alebo je v režime spánku, zapnite Režim spánku."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Ak chcete nastaviť, čo sa stane, keď je telefón v doku alebo v režime spánku, zapnite funkciu Šetrič obrazovky."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kedy spustiť šetrič obrazovky"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Spustiť"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavenia"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index bfd8530..899c482 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Izberite zakl. zaslona"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Izberite varnostno zaklepanje"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Zaklepanje zaslona"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Dodajanje pripomočka"</string>
- <string name="widget_none" msgid="2708702293215501854">"Brez"</string>
- <string name="widget_default" msgid="8269383575996003796">"Ura"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Sprememba zakl. zasl."</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Spremeni ali onemogoči vzorec, kodo PIN ali varnost gesla"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Izberite način zaklepanja zaslona"</string>
@@ -727,7 +724,7 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Med napajanjem"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"V stojalu"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Izklopljeno"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Če želite nadzorovati, kaj se dogaja, ko je telefon v stojalu in/ali v stanju pripravljenosti, vklopite »Stanje pripravljenosti«."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Če želite nadzorovati, kaj se dogaja, ko je telefon v stojalu in/ali v stanju pripravljenosti, vklopite »Sanjarjenje«."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kdaj sanjariti"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Začnite zdaj"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavitve"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4fbaaa6..e272c8f 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Избор закључав. екрана"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Закључавање рез. коп."</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Закључавање екрана"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Додај виџет"</string>
- <string name="widget_none" msgid="2708702293215501854">"Ниједан"</string>
- <string name="widget_default" msgid="8269383575996003796">"Сат"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Промена закључ. екрана"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Мењање или онемогућавање шаблона, PIN кода или безбедности лозинке"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Изаберите метод закључавања екрана"</string>
@@ -723,11 +720,11 @@
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Избор позадине из"</string>
<string name="screensaver_settings_title" msgid="3349790120327233241">"Сањарење"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Када је на базној станици или у стању спавања и пуни се"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Било које"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Било које од ова два"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Током пуњења"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Док је на базној станици"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Искључено"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Да бисте контролисали шта се дешава када је телефон на базној станици и/или у стању спавања, укључите Режим спавања."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Да бисте контролисали шта се дешава када је телефон на базној станици и/или у стању спавања, укључите Сањарење."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Када да укључите сањарење"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Започни одмах"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Подешавања"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 153d834..0ad015d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -147,13 +147,13 @@
<string name="device_picker" msgid="8398232791303186677">"Bluetooth-enhetsväljare"</string>
<string name="bluetooth_permission_request" msgid="1523129741266262748">"Begäran om Bluetooth-behörighet"</string>
<string name="bluetooth_ask_enablement" msgid="5279027758886569301">"En app vill aktivera Bluetooth. Vill du tillåta detta?"</string>
- <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"En app på pekdatorn vill göra pekdatorn synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta detta?"</string>
+ <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"En app på surfplattan vill göra den synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta detta?"</string>
<string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"En app på mobilen vill göra mobilen synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta detta?"</string>
- <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"En app på pekdatorn vill att pekdatorn alltid ska vara synlig för andra Bluetooth-enheter. Vill du tillåta detta?"</string>
+ <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"En app på surfplattan vill att surfplattan alltid ska vara synlig för andra Bluetooth-enheter. Vill du tillåta detta?"</string>
<string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"En app på mobilen vill att mobilen alltid ska vara synlig för andra Bluetooth-enheter. Vill du tillåta detta?"</string>
- <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"En app på pekdatorn vill aktivera Bluetooth och göra pekdatorn synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta detta?"</string>
+ <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"En app på surfplattan vill aktivera Bluetooth och göra surfplattan synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta detta?"</string>
<string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"En app på mobilen vill aktivera Bluetooth så att mobilen blir synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta detta?"</string>
- <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"En app på pekdatorn vill aktivera Bluetooth och göra pekdatorn synlig för andra enheter. Vill du tillåta detta?"</string>
+ <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"En app på surfplattan vill aktivera Bluetooth och göra surfplattan synlig för andra enheter. Vill du tillåta detta?"</string>
<string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"En app på mobilen vill aktivera Bluetooth så att mobilen blir synlig för andra enheter. Vill du tillåta detta?"</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth aktiveras"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Vill du stänga av Bluetooth…"</string>
@@ -254,7 +254,7 @@
<string name="device_info_label" msgid="6551553813651711205">"Enhetsinfo"</string>
<string name="battery_info_label" msgid="4132685016148679403">"Batteriinformation"</string>
<string name="display_label" msgid="8074070940506840792">"Skärm"</string>
- <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Information om pekdatorn"</string>
+ <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Information om surfplattan"</string>
<string name="phone_info_label" product="default" msgid="2127552523124277664">"Telefoninformation"</string>
<string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-lagring"</string>
<string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kort"</string>
@@ -313,37 +313,34 @@
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ställ in Min plats, skärmupplåsning, lås för uppgiftslagring"</string>
<string name="security_passwords_title" msgid="2930627259125138363">"Lösenord"</string>
<string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
- <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptera pekdatorn"</string>
+ <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptera surfplattan"</string>
<string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kryptera telefonen"</string>
- <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Ange PIN-kod eller lösenord för att dekryptera pekdatorn varje gång du slår på den"</string>
+ <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Ange PIN-kod eller lösenord för att dekryptera surfplattan varje gång du slår på den"</string>
<string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Ange PIN-kod eller lösenord för att dekryptera telefonen varje gång du slår på den"</string>
<string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypterad"</string>
- <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du krypterar pekdatorn måste du ange en numerisk PIN-kod eller ett lösenord och dekryptera enheten varje gång du startar den. Det går endast att ta bort krypteringen genom att återställa standardinställningarna, vilket raderar alla dina data."\n\n"Krypteringen tar en timme eller mer. Ladda batteriet helt innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter den pågående krypteringen kommer du att förlora delar av eller alla dina data."</string>
+ <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du krypterar surfplattan måste du ange en numerisk PIN-kod eller ett lösenord och dekryptera enheten varje gång du startar den. Det går endast att ta bort krypteringen genom att återställa standardinställningarna, vilket raderar alla dina data."\n\n"Krypteringen tar en timme eller mer. Ladda batteriet helt innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter den pågående krypteringen kommer du att förlora delar av eller alla dina data."</string>
<string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du krypterar mobilen måste du ange en numerisk PIN-kod eller ett lösenord och dekryptera enheten varje gång du startar den. Det går endast att ta bort krypteringen genom att återställa standardinställningarna, vilket raderar alla dina data."\n\n"Krypteringen tar en timme eller mer. Ladda batteriet helt innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter den pågående krypteringen kommer du att förlora delar av eller alla dina data."</string>
- <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kryptera pekdatorn"</string>
+ <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kryptera surfplattan"</string>
<string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Kryptera telefonen"</string>
<string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Ladda batteriet och försök igen."</string>
<string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Anslut laddaren och försök igen."</string>
<string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"PIN-kod eller lösenord saknas för skärmlåset"</string>
<string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Du måste ange en PIN-kod eller ett lösenord för skärmlåset innan du påbörjar krypteringen."</string>
<string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Vill du kryptera?"</string>
- <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Krypteringen kan inte ångras och om du avbryter den kan data försvinna. Det kan ta en timme eller mer och under tiden startas pekdatorn om flera gånger."</string>
+ <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Krypteringen kan inte ångras och om du avbryter den kan data försvinna. Det kan ta en timme eller mer och under tiden startas surfplattan om flera gånger."</string>
<string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Krypteringen kan inte ångras och om du avbryter den kan data försvinna. Det kan ta en timme eller mer och under tiden startas mobilen om flera gånger."</string>
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Krypterar"</string>
- <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Vänta medan pekdatorn krypteras. <xliff:g id="PERCENT">^1</xliff:g> % klart."</string>
+ <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Vänta medan surfplattan krypteras. <xliff:g id="PERCENT">^1</xliff:g> % klart."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Vänta medan mobilen krypteras. <xliff:g id="PERCENT">^1</xliff:g> % klart."</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Försök igen om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ange ditt lösenord"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Krypteringen misslyckades"</string>
- <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen avbröts och kan inte slutföras. Data på pekdatorn är därför inte tillgängliga längre."\n\n" Om du vill fortsätta använda pekdatorn måste du återställa standardinställningarna. När du konfigurerar pekdatorn efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
+ <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen avbröts och kan inte slutföras. Data på surfplattan är därför inte tillgängliga längre."\n\n" Om du vill fortsätta använda surfplattan måste du återställa standardinställningarna. När du konfigurerar surfplattan efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
<string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen avbröts och kan inte slutföras. Data på mobilen är därför inte tillgängliga längre."\n\n"Om du vill fortsätta använda mobilen måste du återställa standardinställningarna. När du konfigurerar enheten efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Växla inmatningsmetod"</string>
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Välj skärmlås"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Välj lås för säkerhetskopiering"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Skärmlås"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Lägg till widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"Inga"</string>
- <string name="widget_default" msgid="8269383575996003796">"Klocka"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Byt skärmlås"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Ändra eller inaktivera grafiskt lösenord, PIN eller lösenord"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Välj en metod för att låsa skärmen"</string>
@@ -515,7 +512,7 @@
<string name="wifi_display_summary_off" msgid="2445210133184740611">"Av"</string>
<string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Inaktiverat"</string>
<string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
- <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillåt datautbyte när pekdatorn vidrör en annan enhet"</string>
+ <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillåt datautbyte när surfplattan vidrör en annan enhet"</string>
<string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillåt datautbyte när mobilen vidrör en annan enhet"</string>
<string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
<string name="android_beam_on_summary" msgid="3618057099355636830">"Redo att överföra appinnehåll via NFC"</string>
@@ -611,8 +608,8 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Avbryt"</string>
<string name="wifi_skip_anyway" msgid="6965361454438011190">"Hoppa över ändå"</string>
<string name="wifi_dont_skip" msgid="7350341524881124808">"Hoppa inte över"</string>
- <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"VARNING! Eventuella operatörsavgifter för datatrafik kan tillkomma."\n\n"Konfigurationen av iPhone kan kräva betydande nätverksaktivitet."</string>
- <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"VARNING! Eventuella operatörsavgifter för datatrafik kan tillkomma."\n\n"Konfigurationen av iPhone kan kräva betydande nätverksaktivitet."</string>
+ <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"VARNING! Eventuella operatörsavgifter för datatrafik kan tillkomma."\n\n"Konfigurationen kan kräva betydande nätverksaktivitet."</string>
+ <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"VARNING! Eventuella operatörsavgifter för datatrafik kan tillkomma."\n\n"Konfigurationen kan kräva betydande nätverksaktivitet."</string>
<string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"VARNING! Surfplattan kommer inte att kunna kontrollera om programvaran är uppdaterad."</string>
<string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"VARNING! Mobilen kommer inte att kunna kontrollera om programvaran är uppdaterad."</string>
<string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Surfplattan kunde inte anslutas till Wi-Fi-nätverket."</string>
@@ -695,25 +692,25 @@
<string name="dock_audio_settings_title" msgid="3324750259959570305">"Ljud"</string>
<string name="dock_audio_summary_desk" msgid="6487784412371139335">"Inställningar för ansluten skrivbordsdocka"</string>
<string name="dock_audio_summary_car" msgid="6740897586006248450">"Inställningar för dockningsstation för bil"</string>
- <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Pekdatorn är inte dockad"</string>
+ <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Surfplattan är inte dockad"</string>
<string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefonen är inte dockad"</string>
<string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Inställningar för ansluten dockningsenhet"</string>
<string name="dock_not_found_title" msgid="3290961741828952424">"Ingen dockningsenhet hittades"</string>
- <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Du måste docka pekdatorn innan du konfigurerar ljudet för dockning."</string>
+ <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Du måste docka surfplattan innan du konfigurerar ljudet för dockning."</string>
<string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Du måste docka mobilen innan du konfigurerar ljudet för dockning."</string>
<string name="dock_sounds_enable_title" msgid="885839627097024110">"Ljud för placering i docka"</string>
- <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Spela upp ljud när pekdatorn placeras i eller tas bort från dockningsstation"</string>
+ <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Spela upp ljud när surfplattan placeras i eller tas bort från dockningsstation"</string>
<string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Spela upp ljud när telefonen placeras i eller tas bort från dockningsstation"</string>
- <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Spela inte upp ljud när pekdatorn placeras i eller tas bort från dockningsstation"</string>
+ <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Spela inte upp ljud när surfplattan placeras i eller tas bort från dockningsstation"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Spela inte upp ljud när telefonen placeras i eller tas bort från dockningsstation"</string>
<string name="account_settings" msgid="6403589284618783461">"Konton"</string>
<string name="search_settings" msgid="1910951467596035063">"Sök"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Hantera sökinställningar och historik"</string>
<string name="display_settings" msgid="7965901687241669598">"Visning"</string>
<string name="accelerometer_title" msgid="7854608399547349157">"Rotera skärmen automatiskt"</string>
- <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Växla riktning automatiskt när du roterar pekdatorn"</string>
+ <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Växla riktning automatiskt när du roterar surfplattan"</string>
<string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Växla riktning automatiskt när du roterar telefonen"</string>
- <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Växla riktning automatiskt när du roterar pekdatorn"</string>
+ <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Växla riktning automatiskt när du roterar surfplattan"</string>
<string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Byt riktning automatiskt när du roterar telefonen"</string>
<string name="brightness" msgid="2354961343555249270">"Ljusstyrka"</string>
<string name="brightness_summary" msgid="838917350127550703">"Ändra skärmens ljusstyrka"</string>
@@ -723,11 +720,11 @@
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Välj bakgrund från"</string>
<string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdrömmar"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"När enheten dockas eller laddas i viloläge"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Antingen"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Båda"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Under laddning"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Medan enheten dockas"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Av"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Om du vill styra vad som händer när mobilen är dockad och/eller i viloläge aktiverar du Viloläge."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Om du vill styra vad som händer när mobilen är dockad eller i viloläge aktiverar du dagdrömsläget."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Då ska dagdrömmar aktiveras"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Starta nu"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Inställningar"</string>
@@ -738,9 +735,9 @@
<string name="sim_lock_settings_category" msgid="5136244267576697004">"Ställ in lås för SIM-kort"</string>
<string name="sim_lock_settings_title" msgid="9018585580955414596">"Lås för SIM-kort"</string>
<string name="sim_pin_toggle" msgid="1742123478029451888">"Lås SIM-kort"</string>
- <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"PIN-kod krävs för att använda pekdatorn"</string>
+ <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"PIN-kod krävs för att använda surfplattan"</string>
<string name="sim_lock_on" product="default" msgid="2503536505568814324">"PIN-kod krävs för att använda telefonen"</string>
- <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"PIN-kod krävs för att använda pekdatorn"</string>
+ <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"PIN-kod krävs för att använda surfplattan"</string>
<string name="sim_lock_off" product="default" msgid="258981978215428916">"PIN-kod krävs för att använda telefonen"</string>
<string name="sim_pin_change" msgid="6311414184279932368">"Byt PIN-kod"</string>
<string name="sim_enter_pin" msgid="6608715137008508432">"PIN-kod för SIM-kort"</string>
@@ -892,7 +889,7 @@
<string name="menu_restore" msgid="8260067415075573273">"Återställ standardinst."</string>
<string name="restore_default_apn_completed" msgid="2824775307377604897">"Återställning av standardinställningar för APN har slutförts."</string>
<string name="master_clear_title" msgid="5907939616087039756">"Återställ standardinst."</string>
- <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Raderar alla data på pekdatorn"</string>
+ <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Raderar alla data på surfplattan"</string>
<string name="master_clear_summary" product="default" msgid="4986154238001088492">"Raderar alla data på telefonen"</string>
<string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Detta raderar alla data från pekdatorns "<b>"interna lagringsutrymme"</b>", bland annat:"\n\n<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
<string name="master_clear_desc" product="default" msgid="9165016501623540228">"Detta raderar alla data från pekdatorns "<b>"interna lagringsutrymme"</b>", bland annat:"\n\n<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
@@ -904,7 +901,7 @@
<string name="erase_external_storage" product="default" msgid="1397239046334307625">"Radera SD-kort"</string>
<string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Radera alla data på den interna USB-lagringsenheten, som musik och foton."</string>
<string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Radera alla data på SD-kortet, som musik och foton."</string>
- <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Återställ pekdatorn"</string>
+ <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Återställ surfplattan"</string>
<string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Återställ telefonen"</string>
<string name="master_clear_final_desc" msgid="7209547812233487345">"Vill du radera all personlig information och alla hämtade appar? Åtgärden kan inte ångras."</string>
<string name="master_clear_final_button_text" msgid="5390908019019242910">"Radera allt"</string>
@@ -969,7 +966,7 @@
<string name="location_access_title" msgid="7064108942964081243">"Åtkomst till min plats"</string>
<string name="location_access_summary" msgid="69031404093194341">"Ge appar som har bett om tillstånd möjlighet att använda din platsinformation"</string>
<string name="location_sources_heading" msgid="1278732419851088319">"Platskällor"</string>
- <string name="about_settings" product="tablet" msgid="593457295516533765">"Om pekdatorn"</string>
+ <string name="about_settings" product="tablet" msgid="593457295516533765">"Om surfplattan"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Om telefonen"</string>
<string name="about_settings_summary" msgid="3371517697156165959">"Visa juridisk information, status, programversion"</string>
<string name="legal_information" msgid="5769301644270604095">"Juridisk information"</string>
@@ -1029,7 +1026,7 @@
<string name="next_button_label" msgid="8890792540116568321">"Nästa"</string>
<string name="lock_title" product="tablet" msgid="2909697418179419990">"Skydda din surfplatta"</string>
<string name="lock_title" product="default" msgid="4059246467204273930">"Skydda din telefon"</string>
- <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Skydda pekdatorn från obehörig användning genom att skapa ett personligt grafiskt lösenord. Anslut punkterna med fingret i valfri ordning på nästa sida. Du måste ansluta minst fyra punkter."\n\n"Tryck på Nästa när du är redo att sätta igång."</string>
+ <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Skydda surfplattan från obehörig användning genom att skapa ett personligt grafiskt lösenord. Anslut punkterna med fingret i valfri ordning på nästa sida. Du måste ansluta minst fyra punkter."\n\n"Tryck på Nästa när du är redo att sätta igång."</string>
<string name="lock_intro_message" product="default" msgid="8393155371327584659">"Skydda mobilen från obehörig användning genom att skapa ett personligt grafiskt lösenord på skärmen. Anslut minst fyra punkter i valfri ordning med fingret på nästa skärm."\n\n"Tryck på Nästa när du är redo att sätta igång."</string>
<string name="manageapplications_settings_title" msgid="7041951105633616745">"Hantera appar"</string>
<string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hantera och ta bort installerade appar"</string>
@@ -1038,7 +1035,7 @@
<string name="applications_settings_header" msgid="1014813055054356646">"Appinställningar"</string>
<string name="install_applications" msgid="4872012136210802181">"Okända källor"</string>
<string name="install_unknown_applications" msgid="176855644862942064">"Tillåt installation av appar från okända källor"</string>
- <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Pekdatorn och dina personliga data är mer sårbara för angrepp av appar från okända källor. Du godkänner att du ensam är ansvarig för eventuella skador på pekdatorn eller förlust av data som kan uppstå när du använder dessa appar."</string>
+ <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Surfplattan och dina personliga data är mer sårbara för angrepp av appar från okända källor. Du godkänner att du ensam är ansvarig för eventuella skador på surfplattan eller förlust av data som kan uppstå när du använder dessa appar."</string>
<string name="install_all_warning" product="default" msgid="8113734576826384682">"Mobilen och dina personuppgifter är sårbara för angrepp av appar från okända källor. Du godkänner att du ensam är ansvarig för eventuella skador på mobilen eller förlust av data som orsakats av att du använt dessa appar."</string>
<string name="verify_applications" msgid="2959359554974828518">"Verifiera appar"</string>
<string name="verify_applications_summary" msgid="6737505521913263792">"Tillåt inte installation av appar som kan orsaka skada eller varna innan"</string>
@@ -1110,7 +1107,7 @@
<string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Alla uppdateringar för Android-systemappen kommer att avinstalleras."</string>
<string name="clear_failed_dlg_title" msgid="2387060805294783175">"Ta bort data"</string>
<string name="clear_failed_dlg_text" msgid="1092177570631523106">"Det gick inte att ta bort data för appen."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Appen har åtkomst till följande på pekdatorn:"</string>
+ <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Appen har åtkomst till följande på surfplattan:"</string>
<string name="security_settings_desc" product="default" msgid="61749028818785244">"Appen har åtkomst till följande på mobilen:"</string>
<string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Den här appen har åtkomst till följande på din surfplatta. I syfte att förbättra prestandan och minska minnesanvändningen är några av dessa behörigheter tillgängliga för <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, eftersom den körs i samma process som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> :"</string>
<string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Den här appen har åtkomst till följande på din mobil. I syfte att förbättra prestandan och minska minnesanvändningen är några av dessa behörigheter tillgängliga för <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, eftersom den körs i samma process som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
@@ -1182,7 +1179,7 @@
<string name="process_service_in_use_description" msgid="8993335064403217080">"Tjänsten <xliff:g id="COMP_NAME">%1$s</xliff:g> används."</string>
<string name="process_provider_in_use_description" msgid="5586603325677678940">"Leverantören <xliff:g id="COMP_NAME">%1$s</xliff:g> används."</string>
<string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Avsluta systemtjänst?"</string>
- <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Om du avslutar tjänsten kanske vissa funktioner i pekdatorn inte fungerar korrekt förrän du stänger av och slår på den igen."</string>
+ <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Om du avslutar tjänsten kanske vissa funktioner i surfplattan inte fungerar korrekt förrän du stänger av och slår på den igen."</string>
<string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Om du avslutar tjänsten kanske vissa funktioner i mobilen inte fungerar korrekt förrän du stänger av och slår på den igen."</string>
<string name="language_settings" msgid="5292716747264442359">"Språk och inmatning"</string>
<string name="language_keyboard_settings_title" msgid="243220021717425813">"Språk och inmatning"</string>
@@ -1234,7 +1231,7 @@
<string name="user_dict_settings_all_languages" msgid="6742000040975959247">"För alla språk"</string>
<string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Fler språk ..."</string>
<string name="testing" msgid="6584352735303604146">"Testa"</string>
- <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Information om pekdatorn"</string>
+ <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Information om surfplattan"</string>
<string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefoninformation"</string>
<string name="testing_battery_info" msgid="3497865525976497848">"Batteriinformation"</string>
<string name="quick_launch_title" msgid="7904609846945905306">"Snabbstart"</string>
@@ -1370,7 +1367,7 @@
<string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
<string name="power_cell" msgid="6596471490976003056">"Mobilens viloläge"</string>
<string name="power_phone" msgid="5392641106474567277">"Röstsamtal"</string>
- <string name="power_idle" product="tablet" msgid="4612478572401640759">"Pekdatorn är inaktiv"</string>
+ <string name="power_idle" product="tablet" msgid="4612478572401640759">"Surfplattan är inaktiv"</string>
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen är inaktiv"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU totalt"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU i förgrunden"</string>
@@ -1392,7 +1389,7 @@
<string name="battery_action_wifi" msgid="2272741639606146903">"WiFi-inställningar"</string>
<string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-inställningar"</string>
<string name="battery_desc_voice" msgid="8980322055722959211">"Batteri som förbrukats av röstsamtal"</string>
- <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Batteri som förbrukas när pekdatorn är inaktiv"</string>
+ <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Batteri som förbrukas när surfplattan är inaktiv"</string>
<string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Batteri som förbrukas när telefonen är inaktiv"</string>
<string name="battery_desc_radio" msgid="5479196477223185367">"Batteri som förbrukats av radion"</string>
<string name="battery_sugg_radio" msgid="8211336978326295047">"Växla till flygplansläge om du vill spara batteri när du är i ett område utan täckning"</string>
@@ -1601,10 +1598,10 @@
<string name="header_add_an_account" msgid="756108499532023798">"Lägg till ett konto"</string>
<string name="finish_button_label" msgid="481587707657751116">"Avsluta"</string>
<string name="really_remove_account_title" msgid="8800653398717172460">"Vill du ta bort kontot?"</string>
- <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Om du tar bort kontot tar du också bort alla meddelanden, kontakter och andra data från pekdatorn!"</string>
+ <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Om du tar bort kontot tar du också bort alla meddelanden, kontakter och andra data från surfplattan!"</string>
<string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Om du tar bort kontot tar du också bort alla meddelanden, kontakter och andra data från mobilen!"</string>
- <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Det här kontot krävs för vissa appar. Du kan bara ta bort det genom att återställa pekdatorn till fabriksinställningarna (alla dina personliga data tas bort) i Inställningar > Säkerhetskopiera och återställ."</string>
- <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Det här kontot krävs för vissa appar. Du kan bara ta bort det genom att återställa pekdatorn till fabriksinställningarna (alla dina personliga data tas bort) i Inställningar > Säkerhetskopiera och återställ."</string>
+ <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Det här kontot krävs för vissa appar. Du kan bara ta bort det genom att återställa surfplattan till fabriksinställningarna (alla dina personliga data tas bort) i Inställningar > Säkerhetskopiera och återställ."</string>
+ <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Det här kontot krävs för vissa appar. Du kan bara ta bort det genom att återställa surfplattan till fabriksinställningarna (alla dina personliga data tas bort) i Inställningar > Säkerhetskopiera och återställ."</string>
<string name="provider_label" msgid="7724593781904508866">"Push-prenumerationer"</string>
<!-- no translation found for sync_item_title (4782834606909853006) -->
<skip />
@@ -1713,7 +1710,7 @@
<string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Den här funktionen kan medföra att en app som använder bakgrundsdata slutar fungera när endast mobila nätverk är tillgängliga."\n\n"Du kan hitta fler alternativ för dataanvändning i inställningarna i appen."</string>
<string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Det går bara att begränsa bakgrundsdata när du har angett en gräns för mobildata."</string>
<string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Aktivera automatisk datasynk.?"</string>
- <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Alla kontoändringar som görs på webben kopieras automatiskt till pekdatorn."\n\n"För vissa konton kopieras även alla ändringar som görs på pekdatorn automatiskt till webben. Google-konton fungerar på det sättet."\n\n"Du kan ange vilken typ av information som ska synkroniseras för varje konto under Inställningar > Konton."</string>
+ <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Alla kontoändringar som görs på webben kopieras automatiskt till surfplattan."\n\n"För vissa konton kopieras även alla ändringar som görs på surfplattan automatiskt till webben. Google-konton fungerar på det sättet."\n\n"Du kan ange vilken typ av information som ska synkroniseras för varje konto under Inställningar > Konton."</string>
<string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Alla kontoändringar som görs på webben kopieras automatiskt till mobilen."\n\n"För vissa konton kopieras även alla ändringar som görs på mobilen automatiskt till webben. Google-konton fungerar på det sättet."\n\n"Du kan ställa in vilken typ av information som ska synkroniseras för varje konto under Inställningar > Konton."</string>
<string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Inaktivera automatisk datasynk.?"</string>
<string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Detta minskar dataanvändningen och sparar batteri, men varje konto måste synkroniseras manuellt varje gång du vill samla in aktuell information. Du får inte heller några meddelanden om uppdateringar."</string>
@@ -1723,7 +1720,7 @@
<string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Ange varning för dataanvändning"</string>
<string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ange gräns för dataanvändning"</string>
<string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Begränsa dataanvändningen"</string>
- <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobildataanslutningen inaktiveras när den angivna gränsen är nådd."\n\n" Eftersom dataanvändningen mäts med hjälp av pekdatorn, och det kan hända att din operatör beräknar användningen annorlunda, kan det vara bra att använda en lågt beräknad gräns."</string>
+ <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobildataanslutningen inaktiveras när den angivna gränsen är nådd."\n\n" Eftersom dataanvändningen mäts med hjälp av surfplattan, och det kan hända att din operatör beräknar användningen annorlunda, kan det vara bra att använda en lågt beräknad gräns."</string>
<string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobildataanslutningen inaktiveras när den angivna gränsen är nådd."\n\n" Eftersom dataanvändningen mäts med hjälp av mobilen, och det kan hända att din operatör beräknar användningen annorlunda, kan det vara bra att använda en lågt beräknad gräns."</string>
<string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vill du begränsa bakgrundsdata?"</string>
<string name="data_usage_restrict_background" msgid="6387252645350792955">"Om du begränsar mobildata i bakgrunden kanske vissa appar och tjänster inte fungerar såvida du inte är ansluten till ett Wi-Fi-nätverk."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index c532649..b3f8d0a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -343,9 +343,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Chagua kifungio cha skrini"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Chagua kifungio cha hifadhi"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kufunga skrini"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Ongeza Wijeti"</string>
- <string name="widget_none" msgid="2708702293215501854">"Hamna"</string>
- <string name="widget_default" msgid="8269383575996003796">"Saa"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"badilisha kufunga kwa skrini"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Badilisha au zima umbo, PIn, au usalama wa neniosiri"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Chagua mbinu ili kufunga skrini"</string>
@@ -715,12 +712,12 @@
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Chagua mandhari kutoka"</string>
<string name="screensaver_settings_title" msgid="3349790120327233241">"Ndoto ya mchana"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Wakati inapogatiwa au kulala na inachaji"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"au"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Yoyote kati ya hizi mbili"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Inapochaji"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Inapogatiwa"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Imezimwa"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Ili kudhibiti kinachotendeka simu inapogatiwa na/au inapolala, washa Modi ya Kulala."</string>
- <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Wakati wa ndoto za mchana"</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Ili kudhibiti kinachotendeka simu inapogatiwa na/au inapolala, washa Kuota Mchana."</string>
+ <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Wakati wa kuingia katika hali tulivu"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Anza sasa"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Mipangilio"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Mwangaza wa kiotomatiki"</string>
@@ -751,7 +748,7 @@
<string name="sim_enter_cancel" msgid="6240422158517208036">"Ghairi"</string>
<string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Hadhi ya kompyuta ndogo"</string>
<string name="device_info_settings" product="default" msgid="475872867864762157">"Hali ya simu"</string>
- <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Visasisho vya mfumo"</string>
+ <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Masasisho ya mfumo"</string>
<string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
<string name="firmware_version" msgid="4801135784886859972">"Toleo la Android"</string>
<string name="model_number" msgid="3765737700545384794">"Nambari ya mtindo"</string>
@@ -1502,7 +1499,7 @@
<string name="personal_data_section_title" msgid="7815209034443782061">"Data za kibinafsi"</string>
<string name="backup_data_title" msgid="1239105919852668016">"Cheleza data yangu"</string>
<string name="backup_data_summary" msgid="9157861529438245957">"Cheleza data ya programu, manenosiri ya Wi-Fi, na mipangilio mingine kwa seva za Google"</string>
- <string name="backup_configure_account_title" msgid="3790872965773196615">"Akaunti ya chelezo"</string>
+ <string name="backup_configure_account_title" msgid="3790872965773196615">"Akaunti mbadala"</string>
<string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Hakuna akaunti inayohifadhi kwa sasa data iliyochelezwa"</string>
<string name="auto_restore_title" msgid="5397528966329126506">"Onyesha upya otomatiki"</string>
<string name="auto_restore_summary" msgid="4235615056371993807">"Wakati kusanidi upya programu, rejeza mipangilio iliyohifadhiwa na data"</string>
@@ -1575,7 +1572,7 @@
<string name="sync_error" msgid="5060969083117872149">"Hitilafu ya usawazishaji"</string>
<string name="last_synced" msgid="4242919465367022234">"Ilisawazishwa mwisho <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
<string name="sync_in_progress" msgid="5151314196536070569">"Inasawazisha sasa..."</string>
- <string name="settings_backup" msgid="2274732978260797031">"Mipangilio ya chelezo"</string>
+ <string name="settings_backup" msgid="2274732978260797031">"Mipangilio ya kuhifadhi nakala rudufu"</string>
<string name="settings_backup_summary" msgid="7916877705938054035">"Cheleza mipangilio yangu"</string>
<string name="sync_menu_sync_now" msgid="6154608350395805683">"Sawazisha sasa"</string>
<string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Ghairi usawazishaji"</string>
@@ -1798,7 +1795,7 @@
<string name="user_summary_inactive" msgid="3758296246095054572">"Sio amilifu"</string>
<string name="user_summary_not_set_up" msgid="8778205026866794909">"Haijasanidiwa"</string>
<string name="user_owner" msgid="3879126011135546571">"Mmiliki"</string>
- <string name="user_nickname" msgid="5148818000228994488">"Lakabu"</string>
+ <string name="user_nickname" msgid="5148818000228994488">"Jina la utani"</string>
<string name="user_add_user_title" msgid="3961861593718285403">"Ongeza mtumiaji mpya"</string>
<string name="user_add_user_message_long" msgid="2278524063301283723">"Unaweza kushiriki kifaa hiki na watu wengine kwa kuweka watumiaji wa ziada. Kila mtumiaji ana nafasi yake binafsi, ambazo wanaweza kugeuza kukufaa kwa programu zao binafsi, pazia, na kadhalika. watumia pia wanaweza kurekebisha mipangilio ya kompyuta ndogo kama Wi-Fi ambayo inaathiri kila mtu."\n\n"Baada ya kuweka mtumiaji mpya, mtu huyo anahitaji kupitia mchakato wa usanidi."\n\n"Mtumiaji yeyote anaweza kukubali ruhusa zilizosasishwa za programu kwa niaba ya watumiaji wengine wote."</string>
<string name="user_add_user_message_short" msgid="3310933423737035428">"Baada ya kuweka mtumiaji mpya, mtu huyo anahitaji kupitia mchakato wa usanidi."\n\n"Mtumiaji yeyote anaweza kukubali ruhusa zilizosasishwa za programu kwa niaba ya watumiaji wengine wote."</string>
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index 994d4bb..c0a79ad 100755
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -18,4 +18,6 @@
<dimen name="screen_margin_sides">128dip</dimen>
<dimen name="screen_margin_top">72dip</dimen>
<dimen name="screen_margin_bottom">48dip</dimen>
+ <dimen name="appwidget_preview_height">80dip</dimen>
+ <dimen name="keyguard_appwidget_picker_width">720dip</dimen>
</resources>
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
new file mode 100644
index 0000000..645d1fe
--- /dev/null
+++ b/res/values-sw600dp-land/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<resources>
+ <style name="KeyguardAppWidgetItem">
+ <item name="android:textSize">18sp</item>
+ </style>
+</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index cf7ac6b..1374efd 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -32,4 +32,10 @@
<dimen name="setup_item_margin">32dip</dimen>
<dimen name="appwidget_min_width">325dip</dimen>
<dimen name="appwidget_min_height">50dip</dimen>
+
+ <dimen name="appwidget_preview_width">120dip</dimen>
+ <dimen name="appwidget_preview_height">70dip</dimen>
+ <dimen name="keyguard_appwidget_picker_margin_left">2dip</dimen>
+ <dimen name="keyguard_appwidget_picker_margin_right">2dip</dimen>
+ <integer name="keyguard_appwidget_picker_cols">2</integer>
</resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index f780f53..9f02164 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -57,4 +57,8 @@
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
<item name="android:textSize">20sp</item>
</style>
+
+ <style name="KeyguardAppWidgetItem">
+ <item name="android:textSize">16sp</item>
+ </style>
</resources>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 5a58609..d6d9184 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -16,4 +16,7 @@
<resources>
<dimen name="pager_tabs_padding">@*android:dimen/preference_fragment_padding_side</dimen>
+ <dimen name="appwidget_preview_height">80dip</dimen>
+ <integer name="keyguard_appwidget_picker_cols">2</integer>
+ <dimen name="keyguard_appwidget_picker_width">720dip</dimen>
</resources>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
new file mode 100644
index 0000000..645d1fe
--- /dev/null
+++ b/res/values-sw720dp/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<resources>
+ <style name="KeyguardAppWidgetItem">
+ <item name="android:textSize">18sp</item>
+ </style>
+</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 46b20e9..aac326c 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"เลือกการล็อกหน้าจอ"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"เลือกการล็อกข้อมูลสำรอง"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ล็อกหน้าจอ"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"เพิ่มวิดเจ็ต"</string>
- <string name="widget_none" msgid="2708702293215501854">"ไม่มี"</string>
- <string name="widget_default" msgid="8269383575996003796">"นาฬิกา"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"เปลี่ยนหน้าจอล็อก"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"เปลี่ยนหรือปิดการใช้งานรูปแบบ, PIN หรือความปลอดภัยของรหัสผ่าน"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"เลือกวิธีที่จะล็อกหน้าจอ"</string>
@@ -727,7 +724,7 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"ขณะที่ชาร์จ"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"ในขณะวางอยู่บนแท่นชาร์จ"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ปิด"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"หากต้องการควบคุมสิ่งที่จะเกิดขึ้นเมื่อโทรศัพท์วางอยู่บนแท่นชาร์จและ/หรืออยู่ในโหมดสลีป ให้เปิดโหมดสลีปไว้"</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"หากต้องการควบคุมสิ่งที่จะเกิดขึ้นเมื่อโทรศัพท์วางอยู่บนแท่นชาร์จและ/หรืออยู่ในโหมดสลีป ให้เปิด Daydream เอาไว้"</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"เมื่อใดจึงจะ Daydream"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"เริ่มเลย"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"การตั้งค่า"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index ff858d8..3c3b4df 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Pumili ng screen lock"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pumili ng backup na lock"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"I-screen lock"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Magdagdag ng Widget"</string>
- <string name="widget_none" msgid="2708702293215501854">"Wala"</string>
- <string name="widget_default" msgid="8269383575996003796">"Orasan"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Baguhin ang lock ng screen"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Baguhin o huwag paganahin ang pattern, PIN, o seguridad ng password"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Pumili ng paraan ng pag-lock ng screen"</string>
@@ -727,7 +724,7 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Habang nagcha-charge"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Habang naka-dock"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Naka-off"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Upang kontrolin kung ano ang nangyayari kapag naka-dock at/o naka-sleep ang telepono, i-on ang Sleep Mode."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Upang kontrolin kung ano ang nangyayari kapag naka-dock at/o naka-sleep ang telepono, i-on ang Daydream."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kailan magde-daydream"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Magsimula ngayon"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Mga Setting"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 67a2b46..752361a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekran kilidini seçin"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Yedek kilidi seçin"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Ekran kilidi"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Widget ekle"</string>
- <string name="widget_none" msgid="2708702293215501854">"Hiçbiri"</string>
- <string name="widget_default" msgid="8269383575996003796">"Saat"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ekrn kilidini değştr"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Şekil, PIN veya şifre güvenliğini değiştir veya devre dışı bırak"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Ekranı kilitlemek için bir yöntem seçin"</string>
@@ -561,7 +558,7 @@
<string name="wifi_other_network" msgid="1048006316504242214">"Diğer ağ…"</string>
<string name="wifi_more" msgid="3195296805089107950">"Diğer"</string>
<string name="wifi_setup_wps" msgid="8128702488486283957">"Otomatik kurulum (WPS)"</string>
- <string name="wifi_required_info_text" msgid="9014073093293520112">"Kurulumu tamamladıktan sonra tabletinizin Kablosuz bağlantıya erişmesi gerekecektir. Kurulumdan sonra, mobil veri ile Kablosuz arasında geçiş yapabilirsiniz."</string>
+ <string name="wifi_required_info_text" msgid="9014073093293520112">"Kurulumun tamamlanabilmesi için tabletinizin Kablosuz bağlantıya erişmesi gerekecektir. Kurulumdan sonra, mobil veri ile Kablosuz arasında geçiş yapabilirsiniz."</string>
<string name="wifi_show_advanced" msgid="1793703023711426246">"Gelişmiş seçenekleri göster"</string>
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Kablosuz Korumalı Kurulum"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS başlatılıyor…"</string>
@@ -721,14 +718,13 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmadığında"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Duvar Kağıdı"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Şuradan duvar kağıdı seçin:"</string>
- <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
- <skip />
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Hafif uyku"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Yuvadayken veya uyku modunda ve şarj edilirken"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"İkisinden biri"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Her ikisi"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Şarj olurken"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Yuvadayken"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Kapalı"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Telefon yuvaya yerleştirildiğinde ve/veya uyku durumunda iken ne olacağını kontrol etmek için Uyku Modunu etkinleştirin."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Telefon yuvaya yerleştirildiğinde ve/veya uyku durumunda iken ne olacağını kontrol etmek için Hafif Uyku\'yu etkinleştirin."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Hafif uykuya geçilecek zaman"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Şimdi başla"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Ayarlar"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fbcce7c..fff12a8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -111,7 +111,7 @@
<string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Невидимий для інших пристроїв Bluetooth"</string>
<string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Видимий лише для спарених пристроїв"</string>
<string name="bluetooth_not_discoverable" msgid="128269993123955177">"Зробити пристрій видимим"</string>
- <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Час очікування видимості"</string>
+ <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Час видимості"</string>
<string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Налаштуйте час видимості пристрою"</string>
<string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заблок. голос. набір"</string>
<string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Запобігає використанню набору bluetooth, коли екран заблоковано"</string>
@@ -260,7 +260,7 @@
<string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Карта SD"</string>
<string name="proxy_settings_label" msgid="3271174136184391743">"Налашт-ня проксі"</string>
<string name="cancel" msgid="6859253417269739139">"Скасувати"</string>
- <string name="settings_label" msgid="1626402585530130914">"Налаштув-ня"</string>
+ <string name="settings_label" msgid="1626402585530130914">"Налаштування"</string>
<string name="settings_label_launcher" msgid="8344735489639482340">"Налаштування"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Ярлик налаштувань"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Режим польоту"</string>
@@ -281,7 +281,7 @@
<string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата та час"</string>
<string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Установити дату та час"</string>
<string name="date_and_time_settings_summary" msgid="7095318986757583584">"Установити дату, час, часовий пояс і формати"</string>
- <string name="date_time_auto" msgid="7076906458515908345">"Автомат. дата & час"</string>
+ <string name="date_time_auto" msgid="7076906458515908345">"Автоматичні дата й час"</string>
<string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Використовувати час, наданий мережею"</string>
<string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Використовувати час, наданий мережею"</string>
<string name="zone_auto" msgid="334783869352026648">"Автоматичний часовий пояс"</string>
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Тип блокув. екрана"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Вибер. резерв. блокув."</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Блокування екрана"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Додати віджет"</string>
- <string name="widget_none" msgid="2708702293215501854">"Немає"</string>
- <string name="widget_default" msgid="8269383575996003796">"Годинник"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Змінити блокув. екрана"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Змінити чи вимкнути ключ, PIN або захист паролем"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Вибрати спосіб блокування екрана"</string>
@@ -418,7 +415,7 @@
<string name="lock_setup" msgid="3355847066343753943">"Налаштування завершено."</string>
<string name="device_admin_title" msgid="3562216873644263804">"Адміністрація пристрою"</string>
<string name="manage_device_admin" msgid="5059296715271077278">"Адміністратори пристрою"</string>
- <string name="manage_device_admin_summary" msgid="7672709110988761075">"Переглянути чи дезактив. адмін-ів пристрою"</string>
+ <string name="manage_device_admin_summary" msgid="7672709110988761075">"Переглянути чи відключити адміністраторів пристрою"</string>
<string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
<string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Увімк. Bluetooth"</string>
<string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -723,11 +720,11 @@
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Вибрати фоновий малюнок з"</string>
<string name="screensaver_settings_title" msgid="3349790120327233241">"Заставка"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Коли в док-станції або в режимі сну й заряджання"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Будь-який"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Завжди"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Під час заряджання"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Коли в док-станції"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Вимк."</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Щоб знати, що відбувається з телефоном, коли він у док-станції та/або в режимі сну, увімкніть режим сну."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Щоб знати, що відбувається з телефоном, коли він у док-станції та/або в режимі сну, увімкніть режим заставки."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Коли вмикати заставку"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Почати зараз"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Налаштування"</string>
@@ -774,7 +771,7 @@
<string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Стан батареї, мережі та інша інформація"</string>
<string name="device_status_summary" product="default" msgid="2599162787451519618">"Номер телефону, сигнал тощо"</string>
<string name="storage_settings" msgid="4211799979832404953">"Пам\'ять"</string>
- <string name="storage_settings_title" msgid="8746016738388094064">"Налаштув-ня пам\'яті"</string>
+ <string name="storage_settings_title" msgid="8746016738388094064">"Налаштування пам’яті"</string>
<string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Відключити носій USB, перегл. доступні носії"</string>
<string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Відключ. карту SD, перегл. доступ. сховище"</string>
<string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
@@ -926,13 +923,13 @@
<string name="media_format_gesture_prompt" msgid="3109349468816856670">"Намалюйте ключ розблок-ня"</string>
<string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Щоб підтвердити очищення носія USB, треба намалювати ключ розблокування."</string>
<string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Щоб підтвердити очищення карти SD, треба намалювати ключ розблокування."</string>
- <string name="call_settings_title" msgid="5188713413939232801">"Налашт. виклику"</string>
+ <string name="call_settings_title" msgid="5188713413939232801">"Виклики"</string>
<string name="call_settings_summary" msgid="7291195704801002886">"Налашт. гол.пошту, переадр.викл., парал.викл., ідент.абонента"</string>
<string name="tether_settings_title_usb" msgid="6688416425801386511">"Прив\'язка USB"</string>
<string name="tether_settings_title_wifi" msgid="3277144155960302049">"Порт. точка дост."</string>
<string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Прив\'язка Bluetooth"</string>
<string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Прив\'язка"</string>
- <string name="tether_settings_title_all" msgid="8356136101061143841">"Прив\'яз. & порт. точка дост."</string>
+ <string name="tether_settings_title_all" msgid="8356136101061143841">"Режим модема"</string>
<string name="usb_title" msgid="7483344855356312510">"USB"</string>
<string name="usb_tethering_button_text" msgid="585829947108007917">"Прив\'язка USB"</string>
<string name="usb_tethering_available_subtext" msgid="156779271296152605">"Підкл. ч-з USB, перев.для прив\'яз."</string>
@@ -1018,7 +1015,7 @@
<string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Треба намал. ключ, щоб розблок. екран"</string>
<string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Зробити ключ видимим"</string>
<string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Вібрація під час дотику"</string>
- <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Кнопка живл-ня зразу блок-ся"</string>
+ <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Блокування кнопкою живлення"</string>
<string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Налашт. ключ розблок."</string>
<string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Змінити ключ розблокув."</string>
<string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Як намалювати ключ розблокування"</string>
@@ -1173,7 +1170,7 @@
<string name="runningservicedetails_services_title" msgid="391168243725357375">"Служби"</string>
<string name="runningservicedetails_processes_title" msgid="928115582044655268">"Процеси"</string>
<string name="service_stop" msgid="6369807553277527248">"Зупин."</string>
- <string name="service_manage" msgid="1876642087421959194">"Налаштув-ня"</string>
+ <string name="service_manage" msgid="1876642087421959194">"Налаштування"</string>
<string name="service_stop_description" msgid="9146619928198961643">"Цю службу запущено її програмою. Зупинення служби може спричинити помилку програми."</string>
<string name="heavy_weight_stop_description" msgid="2979218727598321095">"Цю програму неможливо безпечно зупинити – це може призвести до втрати частини вашої поточної роботи."</string>
<string name="background_process_stop_description" msgid="5034773197139654588">"Це процес попередньої програми, який досі запущено для використання в разі потреби. Зазвичай його не потрібно зупиняти."</string>
@@ -1572,7 +1569,7 @@
<string name="sync_active" msgid="8476943765960863040">"Синхронізація активна"</string>
<string name="account_sync_settings_title" msgid="5131314922423053588">"Синхронізація"</string>
<string name="sync_is_failing" msgid="1591561768344128377">"Наразі виникли проблеми із синхронізацією. Незабаром вона відновиться."</string>
- <string name="add_account_label" msgid="7811707265834013767">"Додати облік. запис"</string>
+ <string name="add_account_label" msgid="7811707265834013767">"Додати обліковий запис"</string>
<string name="background_data" msgid="5779592891375473817">"Фонові дані"</string>
<string name="background_data_summary" msgid="8328521479872763452">"Програми можуть будь-коли синхроніз., надсил. й отрим. дані"</string>
<string name="background_data_dialog_title" msgid="6059217698124786537">"Вимкн. фонові дані?"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index dff97ca..572ebd3 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Chọn khóa màn hình"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Chọn khóa dự phòng"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Khóa màn hình"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Thêm tiện ích con"</string>
- <string name="widget_none" msgid="2708702293215501854">"Không có"</string>
- <string name="widget_default" msgid="8269383575996003796">"Đồng hồ"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Thay đổi màn hình khóa"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Thay đổi hoặc vô hiệu hóa hình, mã PIN hoặc bảo mật mật khẩu"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Chọn phương thức khóa màn hình"</string>
@@ -721,14 +718,14 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Sau khi không hoạt động <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Hình nền"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Chọn hình nền từ"</string>
- <string name="screensaver_settings_title" msgid="3349790120327233241">"Mơ màng"</string>
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"Chế độ ngủ"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Khi được gắn đế hoặc ở chế độ ngủ và sạc pin"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Hoặc"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Khi gắn đế và sạc"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Trong khi sạc"</string>
- <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Khi được gắn đế"</string>
+ <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Khi gắn đế"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Tắt"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Để kiểm soát những gì diễn ra khi điện thoại được gắn đế và/hoặc ở chế độ ngủ, hãy bật Chế độ ngủ."</string>
- <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Khi mơ màng"</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Để kiểm soát những gì diễn ra khi điện thoại được gắn đế và/hoặc ở chế độ ngủ, hãy bật Chế độ ngủ."</string>
+ <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Khi vào chế độ ngủ"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Bắt đầu ngay"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Cài đặt"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 43896dc5a..beb1373 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"选择屏幕锁定方式"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"选择备份锁"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"屏幕锁定"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"添加小部件"</string>
- <string name="widget_none" msgid="2708702293215501854">"无"</string>
- <string name="widget_default" msgid="8269383575996003796">"时钟"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"更改锁定屏幕"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"更改或停用图案、PIN 或密码保护"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"选择锁定屏幕的方法"</string>
@@ -721,14 +718,13 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"无操作 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"壁纸"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"选择壁纸来源"</string>
- <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
- <skip />
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"互动屏保"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"插入基座或休眠且正在充电时"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"任意一种情况"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"以上任一情况"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"充电时"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"插入基座时"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"已关闭"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"要控制手机在插入基座时和/或休眠状态下的行为，请启用“休眠模式”。"</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"要控制手机在插入基座时和/或休眠状态下的行为，请启用“互动屏保”。"</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"何时启动"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"立即启动"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"设置"</string>
@@ -1070,7 +1066,7 @@
<string name="clear_user_data_text" msgid="5597622864770098388">"清除数据"</string>
<string name="app_factory_reset" msgid="6635744722502563022">"卸载更新"</string>
<string name="auto_launch_enable_text" msgid="2652825923953591251">"您已选择在默认情况下对某些操作启动此应用。"</string>
- <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"您已选择允许该应用创建窗口小部件并访问其数据。"</string>
+ <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"您已选择允许该应用创建小部件并访问其数据。"</string>
<string name="auto_launch_disable_text" msgid="7800385822185540166">"无默认设置。"</string>
<string name="clear_activities" msgid="7408923511535174430">"清除默认设置"</string>
<string name="screen_compatibility_text" msgid="1616155457673106022">"此应用可能不是针对您的屏幕设计的。您可以在此处调整其显示尺寸/比例，让它适合您的屏幕。"</string>
@@ -1291,10 +1287,10 @@
<string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"要对 SD 卡进行读写保护吗？"</string>
<string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"如果 SD 卡受到读写保护，则应用必须请求相关权限才能读取外部存储设备中的数据。"\n\n"某些应用需要其开发者更新之后才能正常使用。"</string>
<string name="gadget_picker_title" msgid="98374951396755811">"选择小工具"</string>
- <string name="widget_picker_title" msgid="9130684134213467557">"选择窗口小部件"</string>
- <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"是否允许该应用创建并访问窗口小部件？"</string>
- <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"当您创建窗口小部件后，<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>能够访问其显示的所有数据。"</string>
- <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"始终允许<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>创建窗口小部件并访问其数据"</string>
+ <string name="widget_picker_title" msgid="9130684134213467557">"选择小部件"</string>
+ <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"是否允许该应用创建并访问小部件？"</string>
+ <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"当您创建小部件后，<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>能够访问其显示的所有数据。"</string>
+ <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"始终允许<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>创建小部件并访问其数据"</string>
<string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> 天 <xliff:g id="HOURS">%2$d</xliff:g> 小时 <xliff:g id="MINUTES">%3$d</xliff:g> 分 <xliff:g id="SECONDS">%4$d</xliff:g> 秒"</string>
<string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> 小时 <xliff:g id="MINUTES">%2$d</xliff:g> 分 <xliff:g id="SECONDS">%3$d</xliff:g> 秒"</string>
<string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> 分 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string>
@@ -1774,10 +1770,10 @@
<string name="vpn_create" msgid="5628219087569761496">"添加 VPN 配置文件"</string>
<string name="vpn_menu_edit" msgid="408275284159243490">"修改配置文件"</string>
<string name="vpn_menu_delete" msgid="8098021690546891414">"删除配置文件"</string>
- <string name="vpn_menu_lockdown" msgid="7863024538064268139">"始终处于打开状态的 VPN"</string>
+ <string name="vpn_menu_lockdown" msgid="7863024538064268139">"始终开启的 VPN"</string>
<string name="vpn_lockdown_summary" msgid="2200032066376720339">"选择要始终保持连接的 VPN 配置文件。只有在连接到此 VPN 之后才可以使用网络。"</string>
<string name="vpn_lockdown_none" msgid="9214462857336483711">"无"</string>
- <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"始终处于打开状态的 VPN 需要服务器和 DNS 的 IP 地址。"</string>
+ <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"始终开启的 VPN 需要服务器和 DNS 的 IP 地址。"</string>
<string name="vpn_no_network" msgid="3050233675132726155">"目前没有网络连接。请稍后重试。"</string>
<string name="vpn_missing_cert" msgid="7972907102570411501">"证书缺失。请修改配置文件。"</string>
<string name="trusted_credentials_system_tab" msgid="3984284264816924534">"系统"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3cf7785..7d36cb2 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"選擇螢幕鎖定方式"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"選擇備用解鎖方式"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"螢幕鎖定"</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"新增小工具"</string>
- <string name="widget_none" msgid="2708702293215501854">"無"</string>
- <string name="widget_default" msgid="8269383575996003796">"時鐘"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"變更鎖定畫面"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"變更或停用圖案、PIN 或密碼安全性"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"選擇您要鎖定螢幕的方式"</string>
@@ -506,7 +503,7 @@
<string name="wifi_display_status_available" msgid="1924167525172207067">"可以使用"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"顯示裝置設定"</string>
<string name="wifi_display_disconnect_title" msgid="1543715924639003599">"中斷連線？"</string>
- <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"這個東座會結束您與下列裝置的連線：<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
+ <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"這個動作會結束您與下列裝置的連線：<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b>"</string>
<string name="wifi_display_options_title" msgid="5740656401635054838">"無線螢幕分享選項"</string>
<string name="wifi_display_options_forget" msgid="9119048225398894580">"刪除"</string>
<string name="wifi_display_options_done" msgid="5703116500357822557">"完成"</string>
@@ -721,14 +718,14 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"桌布"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"選擇桌布來源"</string>
- <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
+ <string name="screensaver_settings_title" msgid="3349790120327233241">"休眠模式"</string>
<string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"安置於座架上或休眠及充電時"</string>
- <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"皆可"</string>
+ <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"以上任一情況"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"充電時"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"安置於座架上時"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"關閉"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"如要控制手機安置於座架上和/或休眠時的設定，請開啟休眠模式。"</string>
- <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Daydream 開啟時間"</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"如要控制手機安置於座架上和/或休眠時的設定，請開啟休眠模式。"</string>
+ <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"休眠模式開啟時間"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"立即開啟"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"設定"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
@@ -1671,7 +1668,7 @@
<string name="track_frame_time_summary" msgid="447577515813970287">"測量「adb shell dumpsys gfxinfo」指令中的轉譯時間"</string>
<string name="window_animation_scale_title" msgid="6162587588166114700">"視窗動畫比例"</string>
<string name="transition_animation_scale_title" msgid="387527540523595875">"轉場動畫比例"</string>
- <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator 影片長度比例"</string>
+ <string name="animator_duration_scale_title" msgid="3406722410819934083">"動畫影片長度比例"</string>
<string name="overlay_display_devices_title" msgid="5364176287998398539">"模擬次要顯示器"</string>
<string name="debug_applications_category" msgid="4206913653849771549">"應用程式"</string>
<string name="immediately_destroy_activities" msgid="8366775083630234121">"不要保留活動"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 25284d6..590c6af 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -341,9 +341,6 @@
<string name="lock_settings_picker_title" msgid="1095755849152582712">"Khetha isivali sesikrini"</string>
<string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Khetha ukukhiywa kokulondoloza"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Isikrini sivaliwe."</string>
- <string name="choose_user_selected_lockscreen_widget_picker_title" msgid="2016562665711402130">"Faka iwijethi"</string>
- <string name="widget_none" msgid="2708702293215501854">"Akunalutho"</string>
- <string name="widget_default" msgid="8269383575996003796">"Iwashi"</string>
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Shintsha ukuvala isikrini"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Shintsha noma vimbela iphathini, i-PIN, noma ukuphepha kwephasiwedi"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Khetha indlela yokuvula isikrini"</string>
@@ -727,7 +724,7 @@
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Ngenkathi ishaja"</string>
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Ngenkathi idokhiwe"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Valiwe"</string>
- <string name="screensaver_settings_disabled_prompt" msgid="8842133053691392237">"Ukuze ulawule ukuthi kwenzakale ini uma ifoni idokhiwe kanye/noma ilele, khanyisa imodi yokulala."</string>
+ <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Ukuze ulawule ukuthi kwenzakale ini uma ifoni idokhiwe kanye/noma ilele, vula i-Daydream."</string>
<string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Uma kuphupha emini"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Qala manje"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Izilungiselelo"</string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 34b2d86..91f293c 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -54,4 +54,11 @@
<dimen name="pager_tabs_padding">0dp</dimen>
+ <!-- Size of AppWidget previews in KeyguardAppWidgetPickActivity -->
+ <dimen name="appwidget_preview_width">140dip</dimen>
+ <dimen name="appwidget_preview_height">80dip</dimen>
+ <dimen name="keyguard_appwidget_picker_max_width">800dip</dimen>
+ <dimen name="keyguard_appwidget_picker_margin_left">6dip</dimen>
+ <dimen name="keyguard_appwidget_picker_margin_right">6dip</dimen>
+ <integer name="keyguard_appwidget_picker_cols">1</integer>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9b9cb83..dda22d9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -191,4 +191,8 @@
<item name="android:textAllCaps">true</item>
<item name="android:textStyle">bold</item>
</style>
+
+ <style name="KeyguardAppWidgetItem">
+ <item name="android:textSize">18sp</item>
+ </style>
</resources>
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index a899549..6854305 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -21,7 +21,9 @@
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.UserInfo;
import android.os.Bundle;
+import android.os.UserManager;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
@@ -33,6 +35,8 @@
import com.android.internal.widget.LockPatternUtils;
+import java.util.List;
+
import libcore.util.MutableBoolean;
public class ChooseLockGeneric extends PreferenceActivity {
@@ -270,6 +274,12 @@
.getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
final boolean weakBiometricAvailable =
mChooseLockSettingsHelper.utils().isBiometricWeakInstalled();
+
+ // if there are multiple users, disable "None" setting
+ UserManager mUm = (UserManager) getSystemService(Context.USER_SERVICE);
+ List<UserInfo> users = mUm.getUsers(true);
+ final boolean singleUser = users.size() == 1;
+
for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) {
Preference pref = entries.getPreference(i);
if (pref instanceof PreferenceScreen) {
@@ -278,6 +288,7 @@
boolean visible = true;
if (KEY_UNLOCK_SET_OFF.equals(key)) {
enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
+ visible = singleUser; // don't show when there's more than 1 user
} else if (KEY_UNLOCK_SET_NONE.equals(key)) {
enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
} else if (KEY_UNLOCK_SET_BIOMETRIC_WEAK.equals(key)) {
diff --git a/src/com/android/settings/KeyguardAppWidgetPickActivity.java b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
index 0afc5b2..80dbc0c 100644
--- a/src/com/android/settings/KeyguardAppWidgetPickActivity.java
+++ b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
@@ -17,26 +17,24 @@
package com.android.settings;
import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.LauncherActivity.IconResizer;
import android.appwidget.AppWidgetHost;
import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetProviderInfo;
import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
import android.graphics.Canvas;
-import android.graphics.ColorFilter;
import android.graphics.Paint;
-import android.graphics.PaintFlagsDrawFilter;
-import android.graphics.PixelFormat;
import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
-import android.graphics.drawable.PaintDrawable;
+import android.os.AsyncTask;
import android.os.Bundle;
import android.os.IBinder;
import android.os.RemoteException;
@@ -50,11 +48,13 @@
import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.GridView;
+import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import com.android.internal.widget.LockPatternUtils;
+import java.lang.ref.WeakReference;
import java.util.List;
/**
@@ -77,17 +77,18 @@
private AppWidgetLoader<Item> mAppWidgetLoader;
private List<Item> mItems;
private GridView mGridView;
+ private AppWidgetAdapter mAppWidgetAdapter;
private AppWidgetManager mAppWidgetManager;
private int mAppWidgetId;
// Might make it possible to make this be false in future
private boolean mAddingToKeyguard = true;
private Intent mResultData;
private LockPatternUtils mLockPatternUtils;
- private boolean mSuccess;
+ private Bundle mExtraConfigureOptions;
@Override
protected void onCreate(Bundle savedInstanceState) {
- setContentView(R.layout.keyguard_appwidget_pick_layout);
+ setContentView(R.layout.keyguard_appwidget_picker_layout);
super.onCreate(savedInstanceState);
// Set default return data
@@ -101,13 +102,22 @@
} else {
finish();
}
+ mExtraConfigureOptions = intent.getBundleExtra(AppWidgetManager.EXTRA_APPWIDGET_OPTIONS);
mGridView = (GridView) findViewById(R.id.widget_list);
+ DisplayMetrics dm = new DisplayMetrics();
+ getWindowManager().getDefaultDisplay().getMetrics(dm);
+ int maxGridWidth = getResources().getDimensionPixelSize(
+ R.dimen.keyguard_appwidget_picker_max_width);
+
+ if (maxGridWidth < dm.widthPixels) {
+ mGridView.getLayoutParams().width = maxGridWidth;
+ }
mAppWidgetManager = AppWidgetManager.getInstance(this);
mAppWidgetLoader = new AppWidgetLoader<Item>(this, mAppWidgetManager, this);
mItems = mAppWidgetLoader.getItems(getIntent());
- AppWidgetAdapter adapter = new AppWidgetAdapter(this, mItems);
- mGridView.setAdapter(adapter);
+ mAppWidgetAdapter = new AppWidgetAdapter(this, mItems);
+ mGridView.setAdapter(mAppWidgetAdapter);
mGridView.setOnItemClickListener(this);
mLockPatternUtils = new LockPatternUtils(this); // TEMP-- we want to delete this
@@ -125,207 +135,40 @@
setResult(code, result);
}
- private static class EmptyDrawable extends Drawable {
- private final int mWidth;
- private final int mHeight;
-
- EmptyDrawable(int width, int height) {
- mWidth = width;
- mHeight = height;
- }
-
- @Override
- public int getIntrinsicWidth() {
- return mWidth;
- }
-
- @Override
- public int getIntrinsicHeight() {
- return mHeight;
- }
-
- @Override
- public int getMinimumWidth() {
- return mWidth;
- }
-
- @Override
- public int getMinimumHeight() {
- return mHeight;
- }
-
- @Override
- public void draw(Canvas canvas) {
- }
-
- @Override
- public void setAlpha(int alpha) {
- }
-
- @Override
- public void setColorFilter(ColorFilter cf) {
- }
-
- @Override
- public int getOpacity() {
- return PixelFormat.TRANSLUCENT;
- }
- }
-
- /**
- * Utility class to resize icons to match default icon size. Code is mostly
- * borrowed from Launcher.
- */
- private static class IconResizer {
- private final int mIconWidth;
- private final int mIconHeight;
-
- private final DisplayMetrics mMetrics;
- private final Rect mOldBounds = new Rect();
- private final Canvas mCanvas = new Canvas();
-
- public IconResizer(int width, int height, DisplayMetrics metrics) {
- mCanvas.setDrawFilter(new PaintFlagsDrawFilter(Paint.DITHER_FLAG,
- Paint.FILTER_BITMAP_FLAG));
-
- mMetrics = metrics;
- mIconWidth = width;
- mIconHeight = height;
- }
-
- /**
- * Returns a Drawable representing the thumbnail of the specified Drawable.
- * The size of the thumbnail is defined by the dimension
- * android.R.dimen.launcher_application_icon_size.
- *
- * This method is not thread-safe and should be invoked on the UI thread only.
- *
- * @param icon The icon to get a thumbnail of.
- *
- * @return A thumbnail for the specified icon or the icon itself if the
- * thumbnail could not be created.
- */
- public Drawable createIconThumbnail(Drawable icon) {
- int width = mIconWidth;
- int height = mIconHeight;
-
- if (icon == null) {
- return new EmptyDrawable(width, height);
- }
-
- try {
- if (icon instanceof PaintDrawable) {
- PaintDrawable painter = (PaintDrawable) icon;
- painter.setIntrinsicWidth(width);
- painter.setIntrinsicHeight(height);
- } else if (icon instanceof BitmapDrawable) {
- // Ensure the bitmap has a density.
- BitmapDrawable bitmapDrawable = (BitmapDrawable) icon;
- Bitmap bitmap = bitmapDrawable.getBitmap();
- if (bitmap.getDensity() == Bitmap.DENSITY_NONE) {
- bitmapDrawable.setTargetDensity(mMetrics);
- }
- }
- int iconWidth = icon.getIntrinsicWidth();
- int iconHeight = icon.getIntrinsicHeight();
-
- if (iconWidth > 0 && iconHeight > 0) {
- if (width < iconWidth || height < iconHeight) {
- final float ratio = (float) iconWidth / iconHeight;
-
- if (iconWidth > iconHeight) {
- height = (int) (width / ratio);
- } else if (iconHeight > iconWidth) {
- width = (int) (height * ratio);
- }
-
- final Bitmap.Config c = icon.getOpacity() != PixelFormat.OPAQUE ?
- Bitmap.Config.ARGB_8888 : Bitmap.Config.RGB_565;
- final Bitmap thumb = Bitmap.createBitmap(mIconWidth, mIconHeight, c);
- final Canvas canvas = mCanvas;
- canvas.setBitmap(thumb);
- // Copy the old bounds to restore them later
- // If we were to do oldBounds = icon.getBounds(),
- // the call to setBounds() that follows would
- // change the same instance and we would lose the
- // old bounds
- mOldBounds.set(icon.getBounds());
- final int x = (mIconWidth - width) / 2;
- final int y = (mIconHeight - height) / 2;
- icon.setBounds(x, y, x + width, y + height);
- icon.draw(canvas);
- icon.setBounds(mOldBounds);
- //noinspection deprecation
- icon = new BitmapDrawable(thumb);
- ((BitmapDrawable) icon).setTargetDensity(mMetrics);
- canvas.setBitmap(null);
- } else if (iconWidth < width && iconHeight < height) {
- final Bitmap.Config c = Bitmap.Config.ARGB_8888;
- final Bitmap thumb = Bitmap.createBitmap(mIconWidth, mIconHeight, c);
- final Canvas canvas = mCanvas;
- canvas.setBitmap(thumb);
- mOldBounds.set(icon.getBounds());
- final int x = (width - iconWidth) / 2;
- final int y = (height - iconHeight) / 2;
- icon.setBounds(x, y, x + iconWidth, y + iconHeight);
- icon.draw(canvas);
- icon.setBounds(mOldBounds);
- //noinspection deprecation
- icon = new BitmapDrawable(thumb);
- ((BitmapDrawable) icon).setTargetDensity(mMetrics);
- canvas.setBitmap(null);
- }
- }
-
- } catch (Throwable t) {
- icon = new EmptyDrawable(width, height);
- }
-
- return icon;
- }
- }
-
/**
* Item that appears in the AppWidget picker grid.
*/
public static class Item implements AppWidgetLoader.LabelledItem {
protected static IconResizer sResizer;
- protected IconResizer getResizer(Context context) {
- if (sResizer == null) {
- final Resources resources = context.getResources();
- int size = (int) resources.getDimension(android.R.dimen.app_icon_size);
- sResizer = new IconResizer(size, size, resources.getDisplayMetrics());
- }
- return sResizer;
- }
+
CharSequence label;
- Drawable icon;
+ int appWidgetPreviewId;
+ int iconId;
String packageName;
String className;
Bundle extras;
+ private WidgetPreviewLoader mWidgetPreviewLoader;
+ private Context mContext;
/**
* Create a list item from given label and icon.
*/
- Item(Context context, CharSequence label, Drawable icon) {
+ Item(Context context, CharSequence label) {
this.label = label;
- this.icon = getResizer(context).createIconThumbnail(icon);
+ mContext = context;
}
- /**
- * Create a list item and fill it with details from the given
- * {@link ResolveInfo} object.
- */
- Item(Context context, PackageManager pm, ResolveInfo resolveInfo) {
- label = resolveInfo.loadLabel(pm);
- if (label == null && resolveInfo.activityInfo != null) {
- label = resolveInfo.activityInfo.name;
- }
+ void loadWidgetPreview(ImageView v) {
+ mWidgetPreviewLoader = new WidgetPreviewLoader(mContext, v);
+ mWidgetPreviewLoader.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, (Void[]) null);
+ }
- icon = getResizer(context).createIconThumbnail(resolveInfo.loadIcon(pm));
- packageName = resolveInfo.activityInfo.applicationInfo.packageName;
- className = resolveInfo.activityInfo.name;
+ void cancelLoadingWidgetPreview() {
+ if (mWidgetPreviewLoader != null) {
+ mWidgetPreviewLoader.cancel(false);
+ mWidgetPreviewLoader = null;
+ }
}
/**
@@ -352,48 +195,244 @@
public CharSequence getLabel() {
return label;
}
+
+ class WidgetPreviewLoader extends AsyncTask<Void, Bitmap, Void> {
+ private Resources mResources;
+ private PackageManager mPackageManager;
+ private int mIconDpi;
+ private ImageView mView;
+ public WidgetPreviewLoader(Context context, ImageView v) {
+ super();
+ mResources = context.getResources();
+ mPackageManager = context.getPackageManager();
+ ActivityManager activityManager =
+ (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+ mIconDpi = activityManager.getLauncherLargeIconDensity();
+ mView = v;
+ }
+ public Void doInBackground(Void... params) {
+ if (!isCancelled()) {
+ int appWidgetPreviewWidth =
+ mResources.getDimensionPixelSize(R.dimen.appwidget_preview_width);
+ int appWidgetPreviewHeight =
+ mResources.getDimensionPixelSize(R.dimen.appwidget_preview_height);
+ Bitmap b = getWidgetPreview(new ComponentName(packageName, className),
+ appWidgetPreviewId, iconId,
+ appWidgetPreviewWidth, appWidgetPreviewHeight);
+ publishProgress(b);
+ }
+ return null;
+ }
+ public void onProgressUpdate(Bitmap... values) {
+ if (!isCancelled()) {
+ Bitmap b = values[0];
+ mView.setImageBitmap(b);
+ }
+ }
+ abstract class WeakReferenceThreadLocal<T> {
+ private ThreadLocal<WeakReference<T>> mThreadLocal;
+ public WeakReferenceThreadLocal() {
+ mThreadLocal = new ThreadLocal<WeakReference<T>>();
+ }
+
+ abstract T initialValue();
+
+ public void set(T t) {
+ mThreadLocal.set(new WeakReference<T>(t));
+ }
+
+ public T get() {
+ WeakReference<T> reference = mThreadLocal.get();
+ T obj;
+ if (reference == null) {
+ obj = initialValue();
+ mThreadLocal.set(new WeakReference<T>(obj));
+ return obj;
+ } else {
+ obj = reference.get();
+ if (obj == null) {
+ obj = initialValue();
+ mThreadLocal.set(new WeakReference<T>(obj));
+ }
+ return obj;
+ }
+ }
+ }
+
+ class CanvasCache extends WeakReferenceThreadLocal<Canvas> {
+ @Override
+ protected Canvas initialValue() {
+ return new Canvas();
+ }
+ }
+
+ class PaintCache extends WeakReferenceThreadLocal<Paint> {
+ @Override
+ protected Paint initialValue() {
+ return null;
+ }
+ }
+
+ class BitmapCache extends WeakReferenceThreadLocal<Bitmap> {
+ @Override
+ protected Bitmap initialValue() {
+ return null;
+ }
+ }
+
+ class RectCache extends WeakReferenceThreadLocal<Rect> {
+ @Override
+ protected Rect initialValue() {
+ return new Rect();
+ }
+ }
+
+ // Used for drawing widget previews
+ CanvasCache sCachedAppWidgetPreviewCanvas = new CanvasCache();
+ RectCache sCachedAppWidgetPreviewSrcRect = new RectCache();
+ RectCache sCachedAppWidgetPreviewDestRect = new RectCache();
+ PaintCache sCachedAppWidgetPreviewPaint = new PaintCache();
+
+ private Bitmap getWidgetPreview(ComponentName provider, int previewImage,
+ int iconId, int maxWidth, int maxHeight) {
+ // Load the preview image if possible
+ String packageName = provider.getPackageName();
+ if (maxWidth < 0) maxWidth = Integer.MAX_VALUE;
+ if (maxHeight < 0) maxHeight = Integer.MAX_VALUE;
+
+
+ int appIconSize = mResources.getDimensionPixelSize(R.dimen.app_icon_size);
+
+ Drawable drawable = null;
+ if (previewImage != 0) {
+ drawable = mPackageManager.getDrawable(packageName, previewImage, null);
+ if (drawable == null) {
+ Log.w(TAG, "Can't load widget preview drawable 0x" +
+ Integer.toHexString(previewImage) + " for provider: " + provider);
+ }
+ }
+
+ int bitmapWidth;
+ int bitmapHeight;
+ Bitmap defaultPreview = null;
+ boolean widgetPreviewExists = (drawable != null);
+ if (widgetPreviewExists) {
+ bitmapWidth = drawable.getIntrinsicWidth();
+ bitmapHeight = drawable.getIntrinsicHeight();
+ } else {
+ // Generate a preview image if we couldn't load one
+ bitmapWidth = appIconSize;
+ bitmapHeight = appIconSize;
+ defaultPreview = Bitmap.createBitmap(bitmapWidth, bitmapHeight,
+ Config.ARGB_8888);
+
+ try {
+ Drawable icon = null;
+ if (iconId > 0)
+ icon = getFullResIcon(packageName, iconId);
+ if (icon != null) {
+ renderDrawableToBitmap(icon, defaultPreview, 0,
+ 0, appIconSize, appIconSize);
+ }
+ } catch (Resources.NotFoundException e) {
+ }
+ }
+
+ // Scale to fit width only - let the widget preview be clipped in the
+ // vertical dimension
+ float scale = 1f;
+ if (bitmapWidth > maxWidth) {
+ scale = maxWidth / (float) bitmapWidth;
+ }
+ int finalPreviewWidth = (int) (scale * bitmapWidth);
+ int finalPreviewHeight = (int) (scale * bitmapHeight);
+
+ bitmapWidth = finalPreviewWidth;
+ bitmapHeight = Math.min(finalPreviewHeight, maxHeight);
+
+ Bitmap preview = Bitmap.createBitmap(bitmapWidth, bitmapHeight,
+ Config.ARGB_8888);
+
+ // Draw the scaled preview into the final bitmap
+ if (widgetPreviewExists) {
+ renderDrawableToBitmap(drawable, preview, 0, 0, finalPreviewWidth,
+ finalPreviewHeight);
+ } else {
+ final Canvas c = sCachedAppWidgetPreviewCanvas.get();
+ final Rect src = sCachedAppWidgetPreviewSrcRect.get();
+ final Rect dest = sCachedAppWidgetPreviewDestRect.get();
+ c.setBitmap(preview);
+ src.set(0, 0, defaultPreview.getWidth(), defaultPreview.getHeight());
+ dest.set(0, 0, finalPreviewWidth, finalPreviewHeight);
+
+ Paint p = sCachedAppWidgetPreviewPaint.get();
+ if (p == null) {
+ p = new Paint();
+ p.setFilterBitmap(true);
+ sCachedAppWidgetPreviewPaint.set(p);
+ }
+ c.drawBitmap(defaultPreview, src, dest, p);
+ c.setBitmap(null);
+ }
+ return preview;
+ }
+ public Drawable getFullResDefaultActivityIcon() {
+ return getFullResIcon(Resources.getSystem(),
+ android.R.mipmap.sym_def_app_icon);
+ }
+
+ public Drawable getFullResIcon(Resources resources, int iconId) {
+ Drawable d;
+ try {
+ d = resources.getDrawableForDensity(iconId, mIconDpi);
+ } catch (Resources.NotFoundException e) {
+ d = null;
+ }
+
+ return (d != null) ? d : getFullResDefaultActivityIcon();
+ }
+
+ public Drawable getFullResIcon(String packageName, int iconId) {
+ Resources resources;
+ try {
+ resources = mPackageManager.getResourcesForApplication(packageName);
+ } catch (PackageManager.NameNotFoundException e) {
+ resources = null;
+ }
+ if (resources != null) {
+ if (iconId != 0) {
+ return getFullResIcon(resources, iconId);
+ }
+ }
+ return getFullResDefaultActivityIcon();
+ }
+
+ private void renderDrawableToBitmap(Drawable d, Bitmap bitmap, int x, int y, int w, int h) {
+ renderDrawableToBitmap(d, bitmap, x, y, w, h, 1f);
+ }
+
+ private void renderDrawableToBitmap(Drawable d, Bitmap bitmap, int x, int y, int w, int h,
+ float scale) {
+ if (bitmap != null) {
+ Canvas c = new Canvas(bitmap);
+ c.scale(scale, scale);
+ Rect oldBounds = d.copyBounds();
+ d.setBounds(x, y, x + w, y + h);
+ d.draw(c);
+ d.setBounds(oldBounds); // Restore the bounds
+ c.setBitmap(null);
+ }
+ }
+ }
}
@Override
public Item createItem(Context context, AppWidgetProviderInfo info, Bundle extras) {
CharSequence label = info.label;
- Drawable icon = null;
- if (info.icon != 0) {
- try {
- final Resources res = context.getResources();
- final int density = res.getDisplayMetrics().densityDpi;
- int iconDensity;
- switch (density) {
- case DisplayMetrics.DENSITY_MEDIUM:
- iconDensity = DisplayMetrics.DENSITY_LOW;
- case DisplayMetrics.DENSITY_TV:
- iconDensity = DisplayMetrics.DENSITY_MEDIUM;
- case DisplayMetrics.DENSITY_HIGH:
- iconDensity = DisplayMetrics.DENSITY_MEDIUM;
- case DisplayMetrics.DENSITY_XHIGH:
- iconDensity = DisplayMetrics.DENSITY_HIGH;
- case DisplayMetrics.DENSITY_XXHIGH:
- iconDensity = DisplayMetrics.DENSITY_XHIGH;
- default:
- // The density is some abnormal value. Return some other
- // abnormal value that is a reasonable scaling of it.
- iconDensity = (int)((density*0.75f)+.5f);
- }
- Resources packageResources = getPackageManager().
- getResourcesForApplication(info.provider.getPackageName());
- icon = packageResources.getDrawableForDensity(info.icon, iconDensity);
- } catch (NameNotFoundException e) {
- Log.w(TAG, "Can't load icon drawable 0x" + Integer.toHexString(info.icon)
- + " for provider: " + info.provider);
- }
- if (icon == null) {
- Log.w(TAG, "Can't load icon drawable 0x" + Integer.toHexString(info.icon)
- + " for provider: " + info.provider);
- }
- }
-
- Item item = new Item(context, label, icon);
+ Item item = new Item(context, label);
+ item.appWidgetPreviewId = info.previewImage;
+ item.iconId = info.icon;
item.packageName = info.provider.getPackageName();
item.className = info.provider.getClassName();
item.extras = extras;
@@ -442,12 +481,19 @@
}
Item item = (Item) getItem(position);
- TextView textView = (TextView) convertView.findViewById(R.id.icon_and_label);
+ TextView textView = (TextView) convertView.findViewById(R.id.label);
textView.setText(item.label);
- textView.setCompoundDrawablesWithIntrinsicBounds(item.icon, null, null, null);
-
+ ImageView iconView = (ImageView) convertView.findViewById(R.id.icon);
+ iconView.setImageDrawable(null);
+ item.loadWidgetPreview(iconView);
return convertView;
}
+
+ public void cancelAllWidgetPreviewLoaders() {
+ for (int i = 0; i < mItems.size(); i++) {
+ mItems.get(i).cancelLoadingWidgetPreview();
+ }
+ }
}
/**
@@ -466,12 +512,13 @@
setResultData(result, intent);
} else {
try {
- Bundle options = null;
- if (intent.getExtras() != null) {
- options = intent.getExtras().getBundle(
- AppWidgetManager.EXTRA_APPWIDGET_OPTIONS);
+ if (mAddingToKeyguard && mAppWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
+ // Found in KeyguardHostView.java
+ final int KEYGUARD_HOST_ID = 0x4B455947;
+ mAppWidgetId = AppWidgetHost.allocateAppWidgetIdForSystem(KEYGUARD_HOST_ID);
}
- mAppWidgetManager.bindAppWidgetId(mAppWidgetId, intent.getComponent(), options);
+ mAppWidgetManager.bindAppWidgetId(
+ mAppWidgetId, intent.getComponent(), mExtraConfigureOptions);
result = RESULT_OK;
} catch (IllegalArgumentException e) {
// This is thrown if they're already bound, or otherwise somehow
@@ -491,9 +538,8 @@
}
protected void onDestroy() {
- if (!mSuccess && mAddingToKeyguard &&
- mAppWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID) {
- AppWidgetHost.deleteAppWidgetIdForSystem(mAppWidgetId);
+ if (mAppWidgetAdapter != null) {
+ mAppWidgetAdapter.cancelAllWidgetPreviewLoaders();
}
super.onDestroy();
}
@@ -502,20 +548,20 @@
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == REQUEST_PICK_APPWIDGET || requestCode == REQUEST_CREATE_APPWIDGET) {
- int appWidgetId = (data == null) ? -1 : data.getIntExtra(
- AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
- if ((requestCode == REQUEST_PICK_APPWIDGET) &&
- resultCode == Activity.RESULT_OK) {
+ int appWidgetId;
+ if (data == null) {
+ appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID ;
+ } else {
+ appWidgetId = data.getIntExtra(
+ AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
+ }
+ if (requestCode == REQUEST_PICK_APPWIDGET && resultCode == Activity.RESULT_OK) {
AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(this);
- boolean defaultWidget =
- data.getBooleanExtra(LockPatternUtils.EXTRA_DEFAULT_WIDGET, false);
AppWidgetProviderInfo appWidget = null;
- if (!defaultWidget) {
- appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId);
- }
+ appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId);
- if (!defaultWidget && appWidget.configure != null) {
+ if (appWidget.configure != null) {
// Launch over to configure widget, if needed
Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_CONFIGURE);
intent.setComponent(appWidget.configure);
@@ -525,29 +571,31 @@
startActivityForResultSafely(intent, REQUEST_CREATE_APPWIDGET);
} else {
// Otherwise just add it
- if (defaultWidget) {
- // If we selected "none", delete the allocated id
- AppWidgetHost.deleteAppWidgetIdForSystem(appWidgetId);
- data.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
- LockPatternUtils.ID_DEFAULT_STATUS_WIDGET);
- }
onActivityResult(REQUEST_CREATE_APPWIDGET, Activity.RESULT_OK, data);
}
} else if (requestCode == REQUEST_CREATE_APPWIDGET && resultCode == Activity.RESULT_OK) {
- mSuccess = true;
mLockPatternUtils.addAppWidget(appWidgetId, 0);
- finishDelayedAndShowLockScreen();
+ finishDelayedAndShowLockScreen(appWidgetId);
} else {
- finishDelayedAndShowLockScreen();
+ if (mAddingToKeyguard &&
+ mAppWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID) {
+ AppWidgetHost.deleteAppWidgetIdForSystem(mAppWidgetId);
+ }
+ finishDelayedAndShowLockScreen(AppWidgetManager.INVALID_APPWIDGET_ID);
}
}
}
- private void finishDelayedAndShowLockScreen() {
+ private void finishDelayedAndShowLockScreen(int appWidgetId) {
IBinder b = ServiceManager.getService(Context.WINDOW_SERVICE);
IWindowManager iWm = IWindowManager.Stub.asInterface(b);
+ Bundle opts = null;
+ if (appWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID) {
+ opts = new Bundle();
+ opts.putInt(LockPatternUtils.KEYGUARD_SHOW_APPWIDGET, appWidgetId);
+ }
try {
- iWm.lockNow(null);
+ iWm.lockNow(opts);
} catch (RemoteException e) {
}
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 22812b2..59cd110 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -27,8 +27,10 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
import android.os.Bundle;
import android.os.UserHandle;
+import android.os.UserManager;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
@@ -120,7 +122,12 @@
// Add options for lock/unlock screen
int resid = 0;
if (!mLockPatternUtils.isSecure()) {
- if (mLockPatternUtils.isLockScreenDisabled()) {
+ // if there are multiple users, disable "None" setting
+ UserManager mUm = (UserManager) getSystemService(Context.USER_SERVICE);
+ List<UserInfo> users = mUm.getUsers(true);
+ final boolean singleUser = users.size() == 1;
+
+ if (singleUser && mLockPatternUtils.isLockScreenDisabled()) {
resid = R.xml.security_settings_lockscreen;
} else {
resid = R.xml.security_settings_chooser;
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index acb669e..7241fdc 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -358,7 +358,10 @@
if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
enabled = handleDisableable(mUninstallButton);
} else if ((mPackageInfo.applicationInfo.flags
- & ApplicationInfo.FLAG_INSTALLED) == 0) {
+ & ApplicationInfo.FLAG_INSTALLED) == 0
+ && mUserManager.getUsers().size() >= 2) {
+ // When we have multiple users, there is a separate menu
+ // to uninstall for all users.
mUninstallButton.setText(R.string.uninstall_text);
enabled = false;
} else {
@@ -811,14 +814,19 @@
// First time init: are we displaying an uninstalled app?
mInitialized = true;
mShowUninstalled = (mAppEntry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0;
- } else if (!mShowUninstalled) {
- // All other times: if we did not start out with the app uninstalled,
- // then if it becomes uninstalled we want to go away.
+ } else {
+ // All other times: if the app no longer exists then we want
+ // to go away.
try {
ApplicationInfo ainfo = getActivity().getPackageManager().getApplicationInfo(
mAppEntry.info.packageName, PackageManager.GET_UNINSTALLED_PACKAGES
| PackageManager.GET_DISABLED_COMPONENTS);
- return (ainfo.flags&ApplicationInfo.FLAG_INSTALLED) != 0;
+ if (!mShowUninstalled) {
+ // If we did not start out with the app uninstalled, then
+ // it transitioning to the uninstalled state for the current
+ // user means we should go away as well.
+ return (ainfo.flags&ApplicationInfo.FLAG_INSTALLED) != 0;
+ }
} catch (NameNotFoundException e) {
return false;
}
@@ -1286,11 +1294,7 @@
.execute((Object)null);
}
} else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
- try {
- mPm.installExistingPackage(packageName);
- refreshUi();
- } catch (NameNotFoundException e) {
- }
+ uninstallPkg(packageName, true, false);
} else {
uninstallPkg(packageName, false, false);
}
