summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-08-08 18:45:17 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-08-08 18:45:17 +0000
commit773bffe3a5acd9f4cfcb0bd7d504329e9df6ac66 (patch)
treefd741b98bcfe7391e3347571836c9d727b672c7b
parente77fba0a273fe3b9551c9aa8beb77651a8d136d2 (diff)
parent710c8be50d59c521778240ec7d583353a0d1b849 (diff)
downloadandroid_packages_apps_PackageInstaller-773bffe3a5acd9f4cfcb0bd7d504329e9df6ac66.tar.gz
android_packages_apps_PackageInstaller-773bffe3a5acd9f4cfcb0bd7d504329e9df6ac66.tar.bz2
android_packages_apps_PackageInstaller-773bffe3a5acd9f4cfcb0bd7d504329e9df6ac66.zip
Merge cherrypicks of [2686743, 2686091, 2686092, 2686125, 2686126, 2686127, 2686744, 2686745, 2686543, 2686746, 2686747, 2686748, 2686749, 2686750, 2686751, 2686544, 2686545, 2686546, 2686547, 2686548, 2686549, 2686550, 2686821, 2686242, 2686243, 2686128, 2686754, 2686755, 2686551, 2686244, 2686552, 2686756, 2686265, 2686245, 2686246, 2686266, 2686096, 2686757, 2686758, 2686759, 2686900, 2686901, 2686902, 2686903, 2686904] into oc-r3-release
Change-Id: I0ecd23e0f05adfa93826cfa685af6217b8867bfe
-rw-r--r--res/values-pt-rBR/strings.xml2
-rw-r--r--res/values-pt-rPT-television/strings.xml2
-rw-r--r--res/values-pt-rPT/strings.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 28e64546..efb732a9 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -103,7 +103,7 @@
<string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Apps"</string>
<string name="app_permissions" msgid="3146758905824597178">"Permissões do app"</string>
<string name="never_ask_again" msgid="1089938738199748687">"Não perguntar novamente"</string>
- <string name="no_permissions" msgid="3210542466245591574">"Sem permissão"</string>
+ <string name="no_permissions" msgid="3210542466245591574">"Sem permissões"</string>
<string name="additional_permissions" msgid="6667573114240111763">"Permissões adicionais"</string>
<plurals name="additional_permissions_more" formatted="false" msgid="945127158155064388">
<item quantity="one">Mais <xliff:g id="COUNT_1">%1$d</xliff:g></item>
diff --git a/res/values-pt-rPT-television/strings.xml b/res/values-pt-rPT-television/strings.xml
index 6e14d369..206676b6 100644
--- a/res/values-pt-rPT-television/strings.xml
+++ b/res/values-pt-rPT-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="5694574989758145558">"Recusar e não perguntar novamente"</string>
- <string name="grant_dialog_how_to_change" msgid="615414835189256888">"Pode depois alterar esta definição mais tarde em Definições &gt; Aplicações"</string>
+ <string name="grant_dialog_how_to_change" msgid="615414835189256888">"Pode alterar esta definição mais tarde em Definições &gt; Aplicações"</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>
<string name="preference_show_system_apps" msgid="7330308025768596149">"Mostrar aplicações do sistema"</string>
<string name="app_permissions_decor_title" msgid="1461057434211920209">"Autorizações da aplicação"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5f81e353..84174e85 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -106,7 +106,7 @@
<string name="no_permissions" msgid="3210542466245591574">"Sem autorizações"</string>
<string name="additional_permissions" msgid="6667573114240111763">"Autorizações adicionais"</string>
<plurals name="additional_permissions_more" formatted="false" msgid="945127158155064388">
- <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> more</item>
+ <item quantity="one">Mais <xliff:g id="COUNT_0">%1$d</xliff:g></item>
<item quantity="other">Mais <xliff:g id="COUNT_1">%1$d</xliff:g></item>
</plurals>
<string name="old_sdk_deny_warning" msgid="3872277112584842615">"Esta aplicação foi concebida para uma versão mais antiga do Android. Negar autorização pode fazer com que deixe de funcionar como pretendido."</string>