summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/preference_permissions.xml (renamed from res/layout/preference.xml)5
-rw-r--r--res/layout/preference_permissions_switch.xml (renamed from res/layout/preference_app.xml)3
-rw-r--r--res/values-ca/strings.xml8
-rw-r--r--res/values-cs/strings.xml2
-rw-r--r--res/values-da/strings.xml2
-rw-r--r--res/values-de/strings.xml2
-rw-r--r--res/values-el/strings.xml2
-rw-r--r--res/values-es/strings.xml4
-rw-r--r--res/values-fa-television/strings.xml2
-rw-r--r--res/values-fa/strings.xml6
-rw-r--r--res/values-fi/strings.xml2
-rw-r--r--res/values-fr/strings.xml2
-rw-r--r--res/values-iw/strings.xml4
-rw-r--r--res/values-ja/strings.xml2
-rw-r--r--res/values-kn-rIN/strings.xml2
-rw-r--r--res/values-lt/strings.xml2
-rw-r--r--res/values-ml-rIN/strings.xml2
-rw-r--r--res/values-nb/strings.xml4
-rw-r--r--res/values-ru/strings.xml2
-rw-r--r--res/values-sk/strings.xml2
-rw-r--r--res/values-sl/strings.xml4
-rw-r--r--res/values-sq-rAL/strings.xml2
-rw-r--r--res/values-te-rIN/strings.xml2
-rw-r--r--res/values-television/themes.xml4
-rw-r--r--res/values-uz-rUZ/strings.xml4
-rw-r--r--res/values-zh-rTW/strings.xml4
-rwxr-xr-xres/values/styles.xml13
-rw-r--r--res/values/themes.xml2
28 files changed, 54 insertions, 41 deletions
diff --git a/res/layout/preference.xml b/res/layout/preference_permissions.xml
index 4f941f79..67b4469c 100644
--- a/res/layout/preference.xml
+++ b/res/layout/preference_permissions.xml
@@ -24,7 +24,8 @@
android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
- android:background="?android:attr/activatedBackgroundIndicator"
+ android:background="?android:attr/selectableItemBackground"
+ android:focusable="true"
android:clipToPadding="false">
<LinearLayout
@@ -33,7 +34,7 @@
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
android:orientation="horizontal"
- android:paddingEnd="32dp"
+ android:paddingEnd="20dp"
android:paddingTop="4dp"
android:paddingBottom="4dp">
<com.android.internal.widget.PreferenceImageView
diff --git a/res/layout/preference_app.xml b/res/layout/preference_permissions_switch.xml
index 8dc8464e..cf444d96 100644
--- a/res/layout/preference_app.xml
+++ b/res/layout/preference_permissions_switch.xml
@@ -24,7 +24,8 @@
android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
- android:background="?android:attr/activatedBackgroundIndicator"
+ android:background="?android:attr/selectableItemBackground"
+ android:focusable="true"
android:clipToPadding="false">
<LinearLayout
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d0e521e3..d86973ab 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -90,7 +90,7 @@
<string name="grant_dialog_button_allow" msgid="4616529495342337095">"Permet"</string>
<string name="grant_dialog_button_deny" msgid="2176510645406614340">"Denega"</string>
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> de <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
- <string name="permission_warning_template" msgid="5209102765005869454">"Vols permetre que <xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
+ <string name="permission_warning_template" msgid="5209102765005869454">"Permetre que <xliff:g id="APP_NAME">%1$s</xliff:g> pugui <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Aplicacions"</string>
<string name="app_permissions" msgid="3146758905824597178">"Permisos de l\'aplicació"</string>
<string name="never_ask_again" msgid="3798895821072102967">"No el tornis a demanar"</string>
@@ -98,10 +98,10 @@
<string name="additional_permissions" msgid="6667573114240111763">"Més permisos"</string>
<string name="additional_permissions_more" msgid="5359708933519276635">"<xliff:g id="COUNT">%1$d</xliff:g> més"</string>
<string name="old_sdk_deny_warning" msgid="3872277112584842615">"Aquesta aplicació es va dissenyar per a una versió anterior d\'Android. És possible que no funcioni com està previst si li denegues el permís."</string>
- <string name="show_legacy_permissions" msgid="8564016242732902337">"Mostra els antics"</string>
- <string name="hide_legacy_permissions" msgid="663430183171847324">"Amaga els antics"</string>
+ <string name="show_legacy_permissions" msgid="8564016242732902337">"Mostra els permisos heretats"</string>
+ <string name="hide_legacy_permissions" msgid="663430183171847324">"Amaga els permisos heretats"</string>
<string name="default_permission_description" msgid="4992892207044156668">"dur a terme una acció desconeguda"</string>
- <string name="app_permissions_group_summary" msgid="4787239772223699263">"Es permeten <xliff:g id="COUNT_0">%d</xliff:g> aplicacions d\'un total de <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+ <string name="app_permissions_group_summary" msgid="4787239772223699263">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicacions permeses"</string>
<string name="menu_show_system" msgid="6773743421743728921">"Mostra el sistema"</string>
<string name="menu_hide_system" msgid="7595471742649432977">"Amaga el sistema"</string>
<string name="permission_title" msgid="6495415273398916381">"Permisos de <xliff:g id="PERMISSION">%1$s</xliff:g>"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 55167acf..a35e4119 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -92,7 +92,7 @@
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> z <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
<string name="permission_warning_template" msgid="5209102765005869454">"Povolit aplikaci <xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Aplikace"</string>
- <string name="app_permissions" msgid="3146758905824597178">"Oprávnění aplikace"</string>
+ <string name="app_permissions" msgid="3146758905824597178">"Oprávnění aplikací"</string>
<string name="never_ask_again" msgid="3798895821072102967">"Již se znovu neptat"</string>
<string name="no_permissions" msgid="3210542466245591574">"Žádná oprávnění"</string>
<string name="additional_permissions" msgid="6667573114240111763">"Další oprávnění"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0b14942c..5c442ba4 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -90,7 +90,7 @@
<string name="grant_dialog_button_allow" msgid="4616529495342337095">"Tillad"</string>
<string name="grant_dialog_button_deny" msgid="2176510645406614340">"Afvis"</string>
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> ud af <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
- <string name="permission_warning_template" msgid="5209102765005869454">"Vil du give <xliff:g id="APP_NAME">%1$s</xliff:g> lov til at <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
+ <string name="permission_warning_template" msgid="5209102765005869454">"Vil du give <xliff:g id="APP_NAME">%1$s</xliff:g> tilladelse til at <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Apps"</string>
<string name="app_permissions" msgid="3146758905824597178">"Apptilladelser"</string>
<string name="never_ask_again" msgid="3798895821072102967">"Spørg ikke igen"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d3e3b45c..14cd88e2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -90,7 +90,7 @@
<string name="grant_dialog_button_allow" msgid="4616529495342337095">"Zulassen"</string>
<string name="grant_dialog_button_deny" msgid="2176510645406614340">"Verweigern"</string>
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> von <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
- <string name="permission_warning_template" msgid="5209102765005869454">"Zulassen, dass <xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
+ <string name="permission_warning_template" msgid="5209102765005869454">"<xliff:g id="APP_NAME">%1$s</xliff:g> ermöglichen, <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Apps"</string>
<string name="app_permissions" msgid="3146758905824597178">"App-Berechtigungen"</string>
<string name="never_ask_again" msgid="3798895821072102967">"Nicht mehr fragen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 09b7867e..ad104731 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -92,7 +92,7 @@
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> από <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
<string name="permission_warning_template" msgid="5209102765005869454">"Να επιτρέπεται στην εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> να <xliff:g id="ACTION">%2$s</xliff:g>;"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Εφαρμογές"</string>
- <string name="app_permissions" msgid="3146758905824597178">"Δικαιώματα εφαρμογών"</string>
+ <string name="app_permissions" msgid="3146758905824597178">"Δικαιώματα εφ/γών"</string>
<string name="never_ask_again" msgid="3798895821072102967">"Να μην γίνει ποτέ ξανά ερώτηση"</string>
<string name="no_permissions" msgid="3210542466245591574">"Χωρίς δικαιώματα"</string>
<string name="additional_permissions" msgid="6667573114240111763">"Πρόσθετα δικαιώματα"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 55aa9f84..4f5befc4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -90,7 +90,7 @@
<string name="grant_dialog_button_allow" msgid="4616529495342337095">"Permitir"</string>
<string name="grant_dialog_button_deny" msgid="2176510645406614340">"Rechazar"</string>
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> de <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
- <string name="permission_warning_template" msgid="5209102765005869454">"¿Permitir que <xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
+ <string name="permission_warning_template" msgid="5209102765005869454">"¿Permitir que <xliff:g id="APP_NAME">%1$s</xliff:g> pueda <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Aplicaciones"</string>
<string name="app_permissions" msgid="3146758905824597178">"Permisos de aplicaciones"</string>
<string name="never_ask_again" msgid="3798895821072102967">"No volver a preguntar"</string>
@@ -101,7 +101,7 @@
<string name="show_legacy_permissions" msgid="8564016242732902337">"Mostrar permisos heredados"</string>
<string name="hide_legacy_permissions" msgid="663430183171847324">"Ocultar permisos heredados"</string>
<string name="default_permission_description" msgid="4992892207044156668">"realizar una acción desconocida"</string>
- <string name="app_permissions_group_summary" msgid="4787239772223699263">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicaciones admitidas"</string>
+ <string name="app_permissions_group_summary" msgid="4787239772223699263">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicaciones permitidas"</string>
<string name="menu_show_system" msgid="6773743421743728921">"Mostrar aplicaciones del sistema"</string>
<string name="menu_hide_system" msgid="7595471742649432977">"Ocultar aplicaciones del sistema"</string>
<string name="permission_title" msgid="6495415273398916381">"Permisos: <xliff:g id="PERMISSION">%1$s</xliff:g>"</string>
diff --git a/res/values-fa-television/strings.xml b/res/values-fa-television/strings.xml
index 13f09259..ef4fb828 100644
--- a/res/values-fa-television/strings.xml
+++ b/res/values-fa-television/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="grant_dialog_button_deny_dont_ask_again" msgid="5694574989758145558">"نادیده گرفته شود و دیگر سؤال نشود"</string>
+ <string name="grant_dialog_button_deny_dont_ask_again" msgid="5694574989758145558">"اجازه ندارد و دیگر سؤال نشود"</string>
<string name="grant_dialog_how_to_change" msgid="615414835189256888">"‏می‌توانید بعداً آن را در تنظیمات &gt; برنامه‌ها تغییر دهید"</string>
<string name="current_permission_template" msgid="4793247012451594523">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c11fad08..dafdccfb 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -20,7 +20,7 @@
<string name="next" msgid="3057143178373252333">"بعدی"</string>
<string name="install" msgid="5896438203900042068">"نصب"</string>
<string name="done" msgid="3889387558374211719">"انجام شد"</string>
- <string name="security_settings_desc" msgid="2706691034244052604">"به این برنامه اجازه داده شود که:"</string>
+ <string name="security_settings_desc" msgid="2706691034244052604">"این برنامه مجاز است که:"</string>
<string name="cancel" msgid="8360346460165114585">"لغو"</string>
<string name="unknown" msgid="4742479012767208045">"ناشناس"</string>
<string name="installing" msgid="8613631001631998372">"در حال نصب…"</string>
@@ -87,8 +87,8 @@
<string name="devicePerms" msgid="6733560207731294504">"دسترسی به دستگاه"</string>
<string name="no_new_perms" msgid="6657813692169565975">"این به‌روزرسانی به مجوز جدیدی نیاز ندارد."</string>
<string name="grant_confirm_question" msgid="4690289297029223742">"آیا می‌خواهید مجوزهای زیر را اعطا کنید؟ این مجوزها دسترسی به این موارد را بوجود می‌آورند:"</string>
- <string name="grant_dialog_button_allow" msgid="4616529495342337095">"مجاز"</string>
- <string name="grant_dialog_button_deny" msgid="2176510645406614340">"رد کردن"</string>
+ <string name="grant_dialog_button_allow" msgid="4616529495342337095">"مجاز است"</string>
+ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"اجازه ندارد"</string>
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> از <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
<string name="permission_warning_template" msgid="5209102765005869454">"به <xliff:g id="APP_NAME">%1$s</xliff:g> برای <xliff:g id="ACTION">%2$s</xliff:g> اجازه می‌دهید؟"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"برنامه‌ها"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index a835ab3b..06a95bc8 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -90,7 +90,7 @@
<string name="grant_dialog_button_allow" msgid="4616529495342337095">"Salli"</string>
<string name="grant_dialog_button_deny" msgid="2176510645406614340">"Estä"</string>
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>/<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
- <string name="permission_warning_template" msgid="5209102765005869454">"Onko sovelluksella <xliff:g id="APP_NAME">%1$s</xliff:g> lupa <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
+ <string name="permission_warning_template" msgid="5209102765005869454">"Saako <xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Sovellukset"</string>
<string name="app_permissions" msgid="3146758905824597178">"Sovelluksen käyttöoikeudet"</string>
<string name="never_ask_again" msgid="3798895821072102967">"Älä kysy enää koskaan"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a6f34dc7..6d554765 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -90,7 +90,7 @@
<string name="grant_dialog_button_allow" msgid="4616529495342337095">"Autoriser"</string>
<string name="grant_dialog_button_deny" msgid="2176510645406614340">"Refuser"</string>
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> sur <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
- <string name="permission_warning_template" msgid="5209102765005869454">"Autoriser <xliff:g id="APP_NAME">%1$s</xliff:g> à effectuer l\'action suivante : <xliff:g id="ACTION">%2$s</xliff:g> ?"</string>
+ <string name="permission_warning_template" msgid="5209102765005869454">"Autoriser <xliff:g id="APP_NAME">%1$s</xliff:g> à <xliff:g id="ACTION">%2$s</xliff:g> ?"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Applications"</string>
<string name="app_permissions" msgid="3146758905824597178">"Autoris. des applis"</string>
<string name="never_ask_again" msgid="3798895821072102967">"Ne plus jamais demander"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index d8a33534..2ad697e2 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -98,8 +98,8 @@
<string name="additional_permissions" msgid="6667573114240111763">"הרשאות נוספות"</string>
<string name="additional_permissions_more" msgid="5359708933519276635">"עוד <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="old_sdk_deny_warning" msgid="3872277112584842615">"‏האפליקציה הזו עוצבה בשביל גרסה ישנה יותר של Android. דחיית ההרשאה עשויה לגרום לה לתפקד בצורה לקויה."</string>
- <string name="show_legacy_permissions" msgid="8564016242732902337">"הצג דור קודם"</string>
- <string name="hide_legacy_permissions" msgid="663430183171847324">"הסתר דור קודם"</string>
+ <string name="show_legacy_permissions" msgid="8564016242732902337">"הצג הרשאות ישנות"</string>
+ <string name="hide_legacy_permissions" msgid="663430183171847324">"הסתר הרשאות ישנות"</string>
<string name="default_permission_description" msgid="4992892207044156668">"ביצוע פעולה לא ידועה"</string>
<string name="app_permissions_group_summary" msgid="4787239772223699263">"<xliff:g id="COUNT_0">%d</xliff:g> מתוך <xliff:g id="COUNT_1">%d</xliff:g> אפליקציות קיבלו הרשאה"</string>
<string name="menu_show_system" msgid="6773743421743728921">"הצג מערכת"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 86fb5b1b..ce16be0e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -90,7 +90,7 @@
<string name="grant_dialog_button_allow" msgid="4616529495342337095">"許可"</string>
<string name="grant_dialog_button_deny" msgid="2176510645406614340">"許可しない"</string>
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>/<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
- <string name="permission_warning_template" msgid="5209102765005869454">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」に「<xliff:g id="ACTION">%2$s</xliff:g>」の許可を付与しますか?"</string>
+ <string name="permission_warning_template" msgid="5209102765005869454">"<xliff:g id="APP_NAME">%1$s</xliff:g>に<xliff:g id="ACTION">%2$s</xliff:g>を許可しますか?"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"アプリ"</string>
<string name="app_permissions" msgid="3146758905824597178">"アプリの権限"</string>
<string name="never_ask_again" msgid="3798895821072102967">"今後は確認しない"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 6a3dddc9..0920cab9 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -90,7 +90,7 @@
<string name="grant_dialog_button_allow" msgid="4616529495342337095">"ಅನುಮತಿಸು"</string>
<string name="grant_dialog_button_deny" msgid="2176510645406614340">"ನಿರಾಕರಿಸು"</string>
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g> ರಲ್ಲಿ <xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>"</string>
- <string name="permission_warning_template" msgid="5209102765005869454">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗೆ <xliff:g id="ACTION">%2$s</xliff:g> ಕ್ರಮ ಅನುಮತಿಸುವುದೇ?"</string>
+ <string name="permission_warning_template" msgid="5209102765005869454">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗೆ <xliff:g id="ACTION">%2$s</xliff:g> ಅನುಮತಿಸುವುದೇ?"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
<string name="app_permissions" msgid="3146758905824597178">"ಅಪ್ಲಿಕೇಶನ್ ಅನುಮತಿಗಳು"</string>
<string name="never_ask_again" msgid="3798895821072102967">"ಎಂದಿಗೂ ಮತ್ತೊಮ್ಮೆ ಕೇಳಬೇಡಿ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 7ad1285c..e92fc0c8 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -90,7 +90,7 @@
<string name="grant_dialog_button_allow" msgid="4616529495342337095">"Leisti"</string>
<string name="grant_dialog_button_deny" msgid="2176510645406614340">"Atmesti"</string>
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> iš <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
- <string name="permission_warning_template" msgid="5209102765005869454">"Leisti „<xliff:g id="APP_NAME">%1$s</xliff:g>“ <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
+ <string name="permission_warning_template" msgid="5209102765005869454">"Leisti <xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Programos"</string>
<string name="app_permissions" msgid="3146758905824597178">"Programos leidimai"</string>
<string name="never_ask_again" msgid="3798895821072102967">"Daugiau niekada neklausti"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 9a5ee064..ebcf9728 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -90,7 +90,7 @@
<string name="grant_dialog_button_allow" msgid="4616529495342337095">"അനുവദിക്കുക"</string>
<string name="grant_dialog_button_deny" msgid="2176510645406614340">"നിരസിക്കുക"</string>
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
- <string name="permission_warning_template" msgid="5209102765005869454">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിനെ <xliff:g id="ACTION">%2$s</xliff:g> ചെയ്യാൻ അനുവദിക്കണോ?"</string>
+ <string name="permission_warning_template" msgid="5209102765005869454">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്നതിനെ <xliff:g id="ACTION">%2$s</xliff:g> എന്നതിന് അനുവദിക്കണോ?"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"ആപ്സ്"</string>
<string name="app_permissions" msgid="3146758905824597178">"ആപ്പ് അനുമതികൾ"</string>
<string name="never_ask_again" msgid="3798895821072102967">"വീണ്ടും ചോദിക്കരുത്"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a06fc6d2..3834ea74 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -98,8 +98,8 @@
<string name="additional_permissions" msgid="6667573114240111763">"Flere tillatelser"</string>
<string name="additional_permissions_more" msgid="5359708933519276635">"<xliff:g id="COUNT">%1$d</xliff:g> til"</string>
<string name="old_sdk_deny_warning" msgid="3872277112584842615">"Denne appen er designet for en eldre versjon av Android. Hvis du nekter å gi tillatelse, kan det føre til at den ikke lenger fungerer etter hensikten."</string>
- <string name="show_legacy_permissions" msgid="8564016242732902337">"Vis den eldre versjonen"</string>
- <string name="hide_legacy_permissions" msgid="663430183171847324">"Skjul den eldre versjonen"</string>
+ <string name="show_legacy_permissions" msgid="8564016242732902337">"Vis eldre tillatelser"</string>
+ <string name="hide_legacy_permissions" msgid="663430183171847324">"Skjul eldre tillatelser"</string>
<string name="default_permission_description" msgid="4992892207044156668">"utfør en ukjent handling"</string>
<string name="app_permissions_group_summary" msgid="4787239772223699263">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> apper er tillatt"</string>
<string name="menu_show_system" msgid="6773743421743728921">"Vis systemet"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 30c48047..02c8a47a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -92,7 +92,7 @@
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> из <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
<string name="permission_warning_template" msgid="5209102765005869454">"Разрешить приложению \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Приложения"</string>
- <string name="app_permissions" msgid="3146758905824597178">"Разрешения для приложений"</string>
+ <string name="app_permissions" msgid="3146758905824597178">"Разрешения приложений"</string>
<string name="never_ask_again" msgid="3798895821072102967">"Больше не запрашивать"</string>
<string name="no_permissions" msgid="3210542466245591574">"Разрешения не требуются"</string>
<string name="additional_permissions" msgid="6667573114240111763">"Ещё разрешения"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index bc60a31a..6d5124be 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -101,7 +101,7 @@
<string name="show_legacy_permissions" msgid="8564016242732902337">"Zobraziť staré povolenia"</string>
<string name="hide_legacy_permissions" msgid="663430183171847324">"Skryť staré povolenia"</string>
<string name="default_permission_description" msgid="4992892207044156668">"umožňuje vykonať neznámu akciu"</string>
- <string name="app_permissions_group_summary" msgid="4787239772223699263">"Povolené aplikácie: <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+ <string name="app_permissions_group_summary" msgid="4787239772223699263">"Povolené: <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikácií"</string>
<string name="menu_show_system" msgid="6773743421743728921">"Zobraziť systémové aplikácie"</string>
<string name="menu_hide_system" msgid="7595471742649432977">"Skryť systémové aplikácie"</string>
<string name="permission_title" msgid="6495415273398916381">"Povolenia <xliff:g id="PERMISSION">%1$s</xliff:g>"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index eefe4e3e..adc572b7 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -90,7 +90,7 @@
<string name="grant_dialog_button_allow" msgid="4616529495342337095">"Dovoli"</string>
<string name="grant_dialog_button_deny" msgid="2176510645406614340">"Zavrni"</string>
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> od <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
- <string name="permission_warning_template" msgid="5209102765005869454">"Dovolite aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> to dejanje: <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
+ <string name="permission_warning_template" msgid="5209102765005869454">"Dovolite aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Aplikacije"</string>
<string name="app_permissions" msgid="3146758905824597178">"Dovoljenja za aplikacije"</string>
<string name="never_ask_again" msgid="3798895821072102967">"Ne vprašaj nikoli več"</string>
@@ -101,7 +101,7 @@
<string name="show_legacy_permissions" msgid="8564016242732902337">"Pokaži starejša"</string>
<string name="hide_legacy_permissions" msgid="663430183171847324">"Skrij starejša"</string>
<string name="default_permission_description" msgid="4992892207044156668">"izvedba neznanega dejanja"</string>
- <string name="app_permissions_group_summary" msgid="4787239772223699263">"Dovoljenih je toliko aplikacij: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+ <string name="app_permissions_group_summary" msgid="4787239772223699263">"Dovoljene aplikacije: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
<string name="menu_show_system" msgid="6773743421743728921">"Prikaz sistemskih aplikacij"</string>
<string name="menu_hide_system" msgid="7595471742649432977">"Skrivanje sistemskih aplikacij"</string>
<string name="permission_title" msgid="6495415273398916381">"Dovoljenja za: <xliff:g id="PERMISSION">%1$s</xliff:g>"</string>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 3b4ba02c..a908fc6d 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -90,7 +90,7 @@
<string name="grant_dialog_button_allow" msgid="4616529495342337095">"Lejo"</string>
<string name="grant_dialog_button_deny" msgid="2176510645406614340">"Refuzo"</string>
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> nga <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
- <string name="permission_warning_template" msgid="5209102765005869454">"Të lejohet <xliff:g id="APP_NAME">%1$s</xliff:g> që <xliff:g id="ACTION">%2$s</xliff:g>?"</string>
+ <string name="permission_warning_template" msgid="5209102765005869454">"Të lejohet apl. \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" të realizojë veprimin \"<xliff:g id="ACTION">%2$s</xliff:g>\"?"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Aplikacionet"</string>
<string name="app_permissions" msgid="3146758905824597178">"Lejet e aplikacionit"</string>
<string name="never_ask_again" msgid="3798895821072102967">"Mos pyet më asnjëherë"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index b67fbf7b..16aaaccf 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -90,7 +90,7 @@
<string name="grant_dialog_button_allow" msgid="4616529495342337095">"అనుమతించు"</string>
<string name="grant_dialog_button_deny" msgid="2176510645406614340">"తిరస్కరించు"</string>
<string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>లో <xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>"</string>
- <string name="permission_warning_template" msgid="5209102765005869454">"<xliff:g id="ACTION">%2$s</xliff:g> కోసం <xliff:g id="APP_NAME">%1$s</xliff:g>ని అనుమతించాలా?"</string>
+ <string name="permission_warning_template" msgid="5209102765005869454">"<xliff:g id="ACTION">%2$s</xliff:g> <xliff:g id="APP_NAME">%1$s</xliff:g>ని అనుమతించాలా?"</string>
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"అనువర్తనాలు"</string>
<string name="app_permissions" msgid="3146758905824597178">"అనువర్తన అనుమతులు"</string>
<string name="never_ask_again" msgid="3798895821072102967">"మళ్లీ ఎప్పుడూ అడగవద్దు"</string>
diff --git a/res/values-television/themes.xml b/res/values-television/themes.xml
index de4ff092..f6946f68 100644
--- a/res/values-television/themes.xml
+++ b/res/values-television/themes.xml
@@ -16,7 +16,9 @@
-->
<resources>
- <style name="Settings" parent="Theme.Leanback" />
+ <style name="Settings" parent="Theme.Leanback">
+ <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Permissions</item>
+ </style>
<style name="GrantPermissions" parent="Theme.Leanback">
<item name="android:windowIsFloating">true</item>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 08410df9..b99fef1c 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -95,10 +95,10 @@
<string name="app_permissions" msgid="3146758905824597178">"Ilovalar uchun ruxsatlar"</string>
<string name="never_ask_again" msgid="3798895821072102967">"Boshqa so‘ralmasin"</string>
<string name="no_permissions" msgid="3210542466245591574">"Hech qanday ruxsat talab qilinmaydi"</string>
- <string name="additional_permissions" msgid="6667573114240111763">"Qo‘shimcha ruxsatnomalar"</string>
+ <string name="additional_permissions" msgid="6667573114240111763">"Qo‘shimcha ruxsatlar"</string>
<string name="additional_permissions_more" msgid="5359708933519276635">"Yana <xliff:g id="COUNT">%1$d</xliff:g> ta"</string>
<string name="old_sdk_deny_warning" msgid="3872277112584842615">"Bu ilova Androidning eskiroq versiyasiga mo‘ljallab ishlab chiqilgan. Agar ruxsat bermasangiz, u kutilganidek ishlamasligi mumkin."</string>
- <string name="show_legacy_permissions" msgid="8564016242732902337">"Eskirlarini ko‘rsatish"</string>
+ <string name="show_legacy_permissions" msgid="8564016242732902337">"Eskilarini ko‘rsatish"</string>
<string name="hide_legacy_permissions" msgid="663430183171847324">"Eskilarini berkitish"</string>
<string name="default_permission_description" msgid="4992892207044156668">"noma’lum amalni bajarish"</string>
<string name="app_permissions_group_summary" msgid="4787239772223699263">"Ruxsat berilgan: <xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7b56e6b9..41b70f35 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -98,8 +98,8 @@
<string name="additional_permissions" msgid="6667573114240111763">"其他權限"</string>
<string name="additional_permissions_more" msgid="5359708933519276635">"還有 <xliff:g id="COUNT">%1$d</xliff:g> 項"</string>
<string name="old_sdk_deny_warning" msgid="3872277112584842615">"這個應用程式是為舊版 Android 所開發。拒絕授予權限可能導致應用程式無法正常運作。"</string>
- <string name="show_legacy_permissions" msgid="8564016242732902337">"顯示舊有權限"</string>
- <string name="hide_legacy_permissions" msgid="663430183171847324">"隱藏舊有權限"</string>
+ <string name="show_legacy_permissions" msgid="8564016242732902337">"顯示舊權限"</string>
+ <string name="hide_legacy_permissions" msgid="663430183171847324">"隱藏舊權限"</string>
<string name="default_permission_description" msgid="4992892207044156668">"執行不明的動作"</string>
<string name="app_permissions_group_summary" msgid="4787239772223699263">"已授權 <xliff:g id="COUNT_0">%d</xliff:g> 個應用程式 (共 <xliff:g id="COUNT_1">%d</xliff:g> 個)"</string>
<string name="menu_show_system" msgid="6773743421743728921">"顯示系統"</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 888f9d02..e800b56f 100755
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -27,8 +27,17 @@
<style name="Theme.Header.Settings" parent="@android:style/Theme.Material.Settings">
</style>
- <style name="Preference">
- <item name="android:layout">@layout/preference</item>
+ <style name="PreferenceThemeOverlay.v14.Permissions">
+ <item name="preferenceStyle">@style/Preference.Permissions</item>
+ <item name="switchPreferenceStyle">@style/Preference.SwitchPreference.Permissions</item>
+ </style>
+
+ <style name="Preference.Permissions">
+ <item name="layout">@layout/preference_permissions</item>
+ </style>
+
+ <style name="Preference.SwitchPreference.Permissions">
+ <item name="layout">@layout/preference_permissions_switch</item>
</style>
<style name="ActionBar" parent="@android:style/Widget.Material.ActionBar.Solid">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 2dbb2818..3f8f59d9 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -18,7 +18,7 @@
<resources>
<style name="Settings" parent="@android:style/Theme.Material.Settings">
<item name="android:actionBarStyle">@style/ActionBar</item>
- <item name="@*android:preferenceStyle">@style/Preference</item>
+ <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Permissions</item>
</style>
<style name="GrantPermissions"