Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
diff --git a/PermissionController/res/values-as-television/strings.xml b/PermissionController/res/values-as-television/strings.xml
index 3a8197d..2c92996 100644
--- a/PermissionController/res/values-as-television/strings.xml
+++ b/PermissionController/res/values-as-television/strings.xml
@@ -17,7 +17,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="747769682501286250">"অস্বীকাৰ কৰক আৰু পুনৰাই নুসুধিব"</string>
- <string name="grant_dialog_how_to_change" msgid="997462845048160559">"আপুনি ইয়াক পিছত ছেটিং > এপসমূহলৈ গৈ সলনি কৰিব পাৰিব"</string>
+ <string name="grant_dialog_how_to_change" msgid="997462845048160559">"আপুনি ইয়াক পাছত ছেটিং > এপসমূহলৈ গৈ সলনি কৰিব পাৰিব"</string>
<string name="current_permission_template" msgid="6240787325714651204">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
<string name="preference_show_system_apps" msgid="4262140518693221093">"ছিষ্টেম এপসমূহ দেখুৱাওক"</string>
<string name="app_permissions_decor_title" msgid="7438716722786036814">"এপৰ অনুমতি"</string>
diff --git a/PermissionController/res/values-en-rCA-television/strings.xml b/PermissionController/res/values-en-rCA-television/strings.xml
index 923ce15..aed6c88 100644
--- a/PermissionController/res/values-en-rCA-television/strings.xml
+++ b/PermissionController/res/values-en-rCA-television/strings.xml
@@ -18,7 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="grant_dialog_button_deny_dont_ask_again" msgid="747769682501286250">"Deny and don\'t ask again"</string>
<string name="grant_dialog_how_to_change" msgid="997462845048160559">"You can change this later in Settings > Apps"</string>
- <string name="current_permission_template" msgid="6240787325714651204">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>/<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
+ <string name="current_permission_template" msgid="6240787325714651204">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
<string name="preference_show_system_apps" msgid="4262140518693221093">"Show system apps"</string>
<string name="app_permissions_decor_title" msgid="7438716722786036814">"App permissions"</string>
<string name="manage_permissions_decor_title" msgid="4138423885439613577">"App permissions"</string>
diff --git a/PermissionController/res/values-fa-television/strings.xml b/PermissionController/res/values-fa-television/strings.xml
index fad023a..2bc89e1 100644
--- a/PermissionController/res/values-fa-television/strings.xml
+++ b/PermissionController/res/values-fa-television/strings.xml
@@ -16,13 +16,13 @@
<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="747769682501286250">"مجاز نیست و دیگر سؤال نشود"</string>
+ <string name="grant_dialog_button_deny_dont_ask_again" msgid="747769682501286250">"اجازه نیست و دیگر پرسیده نشود"</string>
<string name="grant_dialog_how_to_change" msgid="997462845048160559">"میتوانید بعداً آن را در تنظیمات > برنامهها تغییر دهید"</string>
<string name="current_permission_template" msgid="6240787325714651204">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
<string name="preference_show_system_apps" msgid="4262140518693221093">"نمایش برنامههای سیستم"</string>
<string name="app_permissions_decor_title" msgid="7438716722786036814">"اجازههای برنامه"</string>
<string name="manage_permissions_decor_title" msgid="4138423885439613577">"اجازههای برنامه"</string>
<string name="permission_apps_decor_title" msgid="2811550489429789828">"مجوزهای <xliff:g id="PERMISSION">%1$s</xliff:g>"</string>
- <string name="additional_permissions_decor_title" msgid="5113847982502484225">"اجازههای تکمیلی"</string>
+ <string name="additional_permissions_decor_title" msgid="5113847982502484225">"اجازههای جانبی"</string>
<string name="system_apps_decor_title" msgid="4402004958937474803">"مجوزهای <xliff:g id="PERMISSION">%1$s</xliff:g>"</string>
</resources>
diff --git a/PermissionController/res/values-gu-television/strings.xml b/PermissionController/res/values-gu-television/strings.xml
index a382722..5fde391 100644
--- a/PermissionController/res/values-gu-television/strings.xml
+++ b/PermissionController/res/values-gu-television/strings.xml
@@ -20,8 +20,8 @@
<string name="grant_dialog_how_to_change" msgid="997462845048160559">"તમે થોડા સમય પછી આને સેટિંગ > ઍપમાં બદલી શકો છો"</string>
<string name="current_permission_template" msgid="6240787325714651204">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
<string name="preference_show_system_apps" msgid="4262140518693221093">"સિસ્ટમ ઍપ બતાવો"</string>
- <string name="app_permissions_decor_title" msgid="7438716722786036814">"ઍપ પરવાનગીઓ"</string>
- <string name="manage_permissions_decor_title" msgid="4138423885439613577">"ઍપ પરવાનગીઓ"</string>
+ <string name="app_permissions_decor_title" msgid="7438716722786036814">"ઍપની પરવાનગીઓ"</string>
+ <string name="manage_permissions_decor_title" msgid="4138423885439613577">"ઍપની પરવાનગીઓ"</string>
<string name="permission_apps_decor_title" msgid="2811550489429789828">"<xliff:g id="PERMISSION">%1$s</xliff:g> પરવાનગીઓ"</string>
<string name="additional_permissions_decor_title" msgid="5113847982502484225">"વધારાની પરવાનગીઓ"</string>
<string name="system_apps_decor_title" msgid="4402004958937474803">"<xliff:g id="PERMISSION">%1$s</xliff:g> પરવાનગીઓ"</string>
diff --git a/PermissionController/res/values-or-television/strings.xml b/PermissionController/res/values-or-television/strings.xml
index 7bd4780..2859cc5 100644
--- a/PermissionController/res/values-or-television/strings.xml
+++ b/PermissionController/res/values-or-television/strings.xml
@@ -20,8 +20,8 @@
<string name="grant_dialog_how_to_change" msgid="997462845048160559">"ଏହାକୁ ଆପଣ ପରେ ଆପ୍ସ ସେଟିଂସ୍ରେ> ବଦଳାଇପାରିବେ"</string>
<string name="current_permission_template" msgid="6240787325714651204">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
<string name="preference_show_system_apps" msgid="4262140518693221093">"ସିଷ୍ଟମ୍ ଆପ୍ସ ଦେଖାନ୍ତୁ"</string>
- <string name="app_permissions_decor_title" msgid="7438716722786036814">"ଆପ୍ ଅନୁମତିଗୁଡ଼ିକ"</string>
- <string name="manage_permissions_decor_title" msgid="4138423885439613577">"ଆପ୍ ଅନୁମତିଗୁଡ଼ିକ"</string>
+ <string name="app_permissions_decor_title" msgid="7438716722786036814">"ଆପ ଅନୁମତିଗୁଡ଼ିକ"</string>
+ <string name="manage_permissions_decor_title" msgid="4138423885439613577">"ଆପ ଅନୁମତିଗୁଡ଼ିକ"</string>
<string name="permission_apps_decor_title" msgid="2811550489429789828">"<xliff:g id="PERMISSION">%1$s</xliff:g> ଅନୁମତିଗୁଡ଼ିକ"</string>
<string name="additional_permissions_decor_title" msgid="5113847982502484225">"ଅତିରିକ୍ତ ଅନୁମତି"</string>
<string name="system_apps_decor_title" msgid="4402004958937474803">"<xliff:g id="PERMISSION">%1$s</xliff:g> ଅନୁମତିଗୁଡ଼ିକ"</string>
diff --git a/PermissionController/res/values-ro-television/strings.xml b/PermissionController/res/values-ro-television/strings.xml
index 347b535..7a8802f 100644
--- a/PermissionController/res/values-ro-television/strings.xml
+++ b/PermissionController/res/values-ro-television/strings.xml
@@ -16,10 +16,10 @@
<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="747769682501286250">"Respingeți și nu mai întrebați"</string>
- <string name="grant_dialog_how_to_change" msgid="997462845048160559">"Puteți modifica permisiunile ulterior din Setări > Aplicații"</string>
+ <string name="grant_dialog_button_deny_dont_ask_again" msgid="747769682501286250">"Refuz, nu mai întreba"</string>
+ <string name="grant_dialog_how_to_change" msgid="997462845048160559">"Poți modifica permisiunile ulterior din Setări > Aplicații"</string>
<string name="current_permission_template" msgid="6240787325714651204">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>/<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
- <string name="preference_show_system_apps" msgid="4262140518693221093">"Afișați aplicațiile de sistem"</string>
+ <string name="preference_show_system_apps" msgid="4262140518693221093">"Afișează aplicațiile de sistem"</string>
<string name="app_permissions_decor_title" msgid="7438716722786036814">"Permisiuni pentru aplicații"</string>
<string name="manage_permissions_decor_title" msgid="4138423885439613577">"Permisiuni pentru aplicații"</string>
<string name="permission_apps_decor_title" msgid="2811550489429789828">"Permisiuni pentru <xliff:g id="PERMISSION">%1$s</xliff:g>"</string>
