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

Android 6.0.0 release 26

6 files changed, 6 insertions, 6 deletions

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 323f26f..c96f842 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -57,7 +57,7 @@
     <string name="wifi_detail_title" msgid="3627332137252994395">"Detalls de: %s"</string>
     <string name="wifi_detail_label" msgid="3032151019356747583">"Detalls"</string>
     <string name="wifi_install_label" msgid="1449629407724323233">"Instal·la"</string>
-    <string name="wifi_installing_label" msgid="8387393993627129025">"Instal·lant"</string>
+    <string name="wifi_installing_label" msgid="8387393993627129025">"S\'està instal·lant"</string>
     <string name="wifi_cancel_label" msgid="1328748037608392134">"Cancel·la"</string>
     <string name="wifi_dismiss_label" msgid="1916684434873972698">"Ignora"</string>
     <string name="wifi_no_config" msgid="1835743123288916755">"Cap"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 2468028..371b824 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -68,7 +68,7 @@
     <string name="wifi_trust_config_text" msgid="5916047381475747783">"‏گواهی قابل اعتماد:\n%s\n"</string>
     <string name="install_done_title" msgid="4822989918460334497">"اعتبارنامه‌ها نصب شد"</string>
     <string name="install_done" msgid="1522718684172097080">"‏اعتبارنامه‌های <xliff:g id="NAME">%1$s</xliff:g> به شبکه‌های ذخیره شده Wi-Fi اضافه شد."</string>
-    <string name="done_label" msgid="5597425930652904250">"انجام شد"</string>
+    <string name="done_label" msgid="5597425930652904250">"تمام"</string>
     <string name="wifi_installer_detail" msgid="63879632832701669">"‏اعتبارنامه‌های Wi-Fi را نصب کنید تا به شبکه‌هایی که از طریق <xliff:g id="NAME">%1$s</xliff:g> در دسترسند متصل شوید."</string>
     <string name="wifi_installer_download_error" msgid="5429453090956277692">"فایل دانلود شده مشکل دارد و نمی‌تواند نصب شود. مطمئن شوید که فایل را از منبع درستی دانلود کرده‌اید."</string>
     <string name="wifi_installer_fail" msgid="894483173306576331">"‏نصب اعتبارنامه‌های Wi-Fi انجام نشد. دوباره فایل را دانلود کنید."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 04bd414..a8d1950 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -57,7 +57,7 @@
     <string name="wifi_detail_title" msgid="3627332137252994395">"%s részletei"</string>
     <string name="wifi_detail_label" msgid="3032151019356747583">"Részletek"</string>
     <string name="wifi_install_label" msgid="1449629407724323233">"Telepítés"</string>
-    <string name="wifi_installing_label" msgid="8387393993627129025">"Települ"</string>
+    <string name="wifi_installing_label" msgid="8387393993627129025">"Telepítés folyamatban"</string>
     <string name="wifi_cancel_label" msgid="1328748037608392134">"Mégse"</string>
     <string name="wifi_dismiss_label" msgid="1916684434873972698">"Elvetés"</string>
     <string name="wifi_no_config" msgid="1835743123288916755">"Nincs"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 90d6395..a032d10 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -53,7 +53,7 @@
     <item msgid="375085478373011304">"VPNとアプリ"</item>
     <item msgid="692322974985472861">"Wi-Fi"</item>
   </string-array>
-    <string name="wifi_title" msgid="8475811746333426489">"Wi-Fiプロフィール"</string>
+    <string name="wifi_title" msgid="8475811746333426489">"Wi-Fiプロファイル"</string>
     <string name="wifi_detail_title" msgid="3627332137252994395">"%sの詳細"</string>
     <string name="wifi_detail_label" msgid="3032151019356747583">"詳細"</string>
     <string name="wifi_install_label" msgid="1449629407724323233">"インストール"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index f855260..39057ed 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -57,7 +57,7 @@
     <string name="wifi_detail_title" msgid="3627332137252994395">"%s-ის დეტალები"</string>
     <string name="wifi_detail_label" msgid="3032151019356747583">"დეტალები"</string>
     <string name="wifi_install_label" msgid="1449629407724323233">"ინსტალაცია"</string>
-    <string name="wifi_installing_label" msgid="8387393993627129025">"ინსტალაცია..."</string>
+    <string name="wifi_installing_label" msgid="8387393993627129025">"მიმდინარეობს ინსტალაცია"</string>
     <string name="wifi_cancel_label" msgid="1328748037608392134">"გაუქმება"</string>
     <string name="wifi_dismiss_label" msgid="1916684434873972698">"დახურვა"</string>
     <string name="wifi_no_config" msgid="1835743123288916755">"არცერთი"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index d2c24f4..3d566bc 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -34,7 +34,7 @@
     <string name="password_empty_error" msgid="591713406761723025">"Introduceţi parola."</string>
     <string name="name_empty_error" msgid="3808800768660110354">"Introduceţi un nume."</string>
     <string name="name_char_error" msgid="3176618568784938968">"Introduceţi un nume care conţine doar litere și numere."</string>
-    <string name="storage_error" msgid="8306802455802770779">"Nu se poate salva certificatul. Atingeţi OK pentru a încerca din nou."</string>
+    <string name="storage_error" msgid="8306802455802770779">"Nu se poate salva certificatul. Atingeți OK pentru a încerca din nou."</string>
     <string name="unable_to_save_cert" msgid="9178604087335389686">"Nu se poate salva certificatul. Spaţiul de stocare a certificatelor nu este activat sau nu este corect iniţializat."</string>
     <string name="cert_not_saved" msgid="4037698479662830270">"Certificatul nu este instalat."</string>
     <string name="no_cert_to_saved" msgid="5708884372817309068">"Niciun certificat de instalat."</string>