Merge "Prevent guest user from installing credentials" into rvc-dev am: 4e6075b943

Change-Id: I23bf2ae8bf56226e6e2d4fc4b299f06a970e2d7a
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index a49df86..291ce9d 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -73,7 +73,7 @@
     <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>
+    <string name="wifi_no_config" msgid="1835743123288916755">"କିଛିନୁହେଁ"</string>
     <string name="wifi_config_text" msgid="8259587306773310314">"ନାମ: %1$s\nFQDN: %2$s\nରୋମିଙ୍ଗ କନ୍ସୋଟିୟମ୍ସ: %3$s\nରେଲାମ୍‍: %4$s\nସ୍ୱୀକୃତି ପଦ୍ଧତି: EAP-%5$s\n"</string>
     <string name="wifi_ttls_config_text" msgid="2002413183253872168">"ୟୁଜର୍‍ଙ୍କ ନାମ: %s\n"</string>
     <string name="wifi_tls_config_text" msgid="9062328536640168510">"କ୍ଲାଏଣ୍ଟ ସର୍ଟିଫିକେଟ୍‍:\n%1$s\nକୀ’: %2$s\n"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5641b30..6694267 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -50,7 +50,7 @@
     <string name="invalid_certificate_message" msgid="3508065546083182733">"Não é possível utilizar este ficheiro como um <xliff:g id="CERTIFICATE_USAGE">%1$s</xliff:g>"</string>
     <string name="certificate" msgid="8790577925509962529">"certificado"</string>
     <string name="ca_certificate" msgid="7397198551290322945">"certificado da AC (Autoridade de certificação)"</string>
-    <string name="user_certificate" msgid="514888069820553128">"certificado VPN e de utilizador da app"</string>
+    <string name="user_certificate" msgid="514888069820553128">"certificado VPN e de utilizador da aplicação"</string>
     <string name="wifi_certificate" msgid="5356595832360140989">"certificado de Wi‑Fi"</string>
     <string name="ca_cert_is_added" msgid="2847081843756291802">"Certificado da AC (Autoridade de certificação) instalado."</string>
     <string name="user_cert_is_added" msgid="3088794616560630823">"Certificado do utilizador instalado."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 9f71375..74b1fc1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -29,8 +29,8 @@
     <string name="one_userkey" msgid="3500697912370644881">"一个用户密钥"</string>
     <string name="userkey_type" msgid="6214833257030657106">"算法:"</string>
     <string name="one_usercrt" msgid="7690798336332403106">"一个用户证书"</string>
-    <string name="one_cacrt" msgid="2667950425420663146">"1 个 CA 证书"</string>
-    <string name="n_cacrts" msgid="2141498640685639208">"%d 个 CA 证书"</string>
+    <string name="one_cacrt" msgid="2667950425420663146">"1个CA证书"</string>
+    <string name="n_cacrts" msgid="2141498640685639208">"%d个CA证书"</string>
     <string name="password_error" msgid="2042471639556516356">"键入正确的密码。"</string>
     <string name="password_empty_error" msgid="591713406761723025">"键入密码。"</string>
     <string name="name_empty_error" msgid="3808800768660110354">"键入名称。"</string>