Merge tag 'android-6.0.0_r26' into cm-13.0

Android 6.0.0 release 26

4 files changed, 33 insertions, 5 deletions

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index b29a137..7d28eff 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -20,7 +20,7 @@
     <string name="title_no_certs" msgid="8350009443064722873">"هیچ گواهی‌ای یافت نشد"</string>
     <string name="title_select_cert" msgid="3588447616418041699">"انتخاب گواهی"</string>
     <string name="requesting_application" msgid="1589142627467598421">"‏برنامه %s درخواست یک گواهی کرده است. انتخاب یک گواهی به برنامه امکان می‌دهد از این هویت با سرورها درحال حاضر و در آینده استفاده کند."</string>
-    <string name="requesting_server" msgid="5832565605998634370">"‏برنامه سرور درخواست‌کننده را به‌عنوان %s تشخیص داده است اما فقط در صورتی که به برنامه اطمینان دارید باید به آن اجازه دسترسی به گواهی را بدهید."</string>
+    <string name="requesting_server" msgid="5832565605998634370">"‏برنامه سرور درخواست‌کننده را به‌عنوان %s تشخیص داده است اما فقط درصورتی‌که به برنامه اطمینان دارید باید به آن اجازه دسترسی به گواهی را بدهید."</string>
     <string name="install_new_cert_message" msgid="4451971501142085495">"‏با یک افرونه %2$s یا %1$s واقع در حافظه خارجی می‌توانید مجوزهارا از یک فایل PKCS#12 نصب کنید."</string>
     <string name="install_new_cert_button_label" msgid="510732745267546907">"نصب"</string>
     <string name="allow_button" msgid="5340501035618157678">"مجاز است"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 128b052..036a53c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -20,8 +20,8 @@
     <string name="title_no_certs" msgid="8350009443064722873">"Geen certificaten gevonden"</string>
     <string name="title_select_cert" msgid="3588447616418041699">"Certificaat kiezen"</string>
     <string name="requesting_application" msgid="1589142627467598421">"De app %s heeft een certificaat aangevraagd. Door een certificaat te kiezen, kan de app deze identiteit nu en in de toekomst gebruiken voor servers."</string>
-    <string name="requesting_server" msgid="5832565605998634370">"De app heeft de aanvragende server geïdentificeerd als %s, maar u moet de app alleen toegang tot het certificaat geven als u de app vertrouwt."</string>
-    <string name="install_new_cert_message" msgid="4451971501142085495">"U kunt certificaten installeren uit een PKCS#12-bestand met de extensie %1$s of %2$s dat zich bevindt in de externe opslag."</string>
+    <string name="requesting_server" msgid="5832565605998634370">"De app heeft de aanvragende server geïdentificeerd als %s, maar je moet de app alleen toegang tot het certificaat geven als je de app vertrouwt."</string>
+    <string name="install_new_cert_message" msgid="4451971501142085495">"Je kunt certificaten installeren uit een PKCS#12-bestand met de extensie %1$s of %2$s dat zich bevindt in de externe opslag."</string>
     <string name="install_new_cert_button_label" msgid="510732745267546907">"Installeren"</string>
     <string name="allow_button" msgid="5340501035618157678">"Toestaan"</string>
     <string name="deny_button" msgid="3766539809121892584">"Weigeren"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..4db4d20
--- /dev/null
+++ b/res/values-pt-rBR/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="170210454004696382">"Chaveiro"</string>
+    <string name="title_no_certs" msgid="8350009443064722873">"Nenhum certificado encontrado"</string>
+    <string name="title_select_cert" msgid="3588447616418041699">"Escolher certificado"</string>
+    <string name="requesting_application" msgid="1589142627467598421">"O app %s solicitou um certificado. A escolha de um certificado permitirá que o app use esta identidade com os servidores de agora em diante."</string>
+    <string name="requesting_server" msgid="5832565605998634370">"O app identificou o servidor da solicitação como %s, mas você só deve permitir o acesso ao certificado caso confie no app."</string>
+    <string name="install_new_cert_message" msgid="4451971501142085495">"Você pode instalar certificados a partir de um arquivo PKCS#12 com a extensão %1$s ou %2$s armazenado externamente."</string>
+    <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalar"</string>
+    <string name="allow_button" msgid="5340501035618157678">"Permitir"</string>
+    <string name="deny_button" msgid="3766539809121892584">"Negar"</string>
+</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 636d1f7..1cf30cb 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -19,8 +19,8 @@
     <string name="app_name" msgid="170210454004696382">"Key Chain"</string>
     <string name="title_no_certs" msgid="8350009443064722873">"Nu au fost găsite certificate"</string>
     <string name="title_select_cert" msgid="3588447616418041699">"Alegeţi un certificat"</string>
-    <string name="requesting_application" msgid="1589142627467598421">"Aplicaţia %s a solicitat un certificat. Alegerea unui certificat va permite aplicației să utilizeze această identitate în relaţia sa cu serverele, acum și în viitor."</string>
-    <string name="requesting_server" msgid="5832565605998634370">"Aplicaţia a identificat serverul solicitant drept %s, dar ar trebui să acordaţi aplicației acces la certificat numai dacă aveţi încredere în aceasta."</string>
+    <string name="requesting_application" msgid="1589142627467598421">"Aplicaţia %s a solicitat un certificat. Alegerea unui certificat va permite aplicației să utilizeze această identitate în relația sa cu serverele, acum și în viitor."</string>
+    <string name="requesting_server" msgid="5832565605998634370">"Aplicaţia a identificat serverul solicitant drept %s, dar ar trebui să acordați aplicației acces la certificat numai dacă aveţi încredere în aceasta."</string>
     <string name="install_new_cert_message" msgid="4451971501142085495">"Puteţi instala certificate dintr-un fişier PKCS#12 cu o extensie %1$s sau %2$s care se află pe stocarea externă."</string>
     <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalaţi"</string>
     <string name="allow_button" msgid="5340501035618157678">"Permiteţi"</string>