Integrating keystore with keyguard (Part 4 of 4)

Summary:

frameworks/base
  keystore rewrite
  keyguard integration with keystore on keyguard entry or keyguard change
  KeyStore API simplification

packages/apps/Settings
  Removed com.android.credentials.SET_PASSWORD intent support
  Added keyguard requirement for keystore use

packages/apps/CertInstaller
  Tracking KeyStore API changes
  Fix for NPE in CertInstaller when certificate lacks basic constraints

packages/apps/KeyChain
  Tracking KeyStore API changes

Details:

frameworks/base

   Move keystore from C to C++ while rewriting password
   implementation. Removed global variables. Added many comments.

	cmds/keystore/Android.mk
	cmds/keystore/keystore.h
	cmds/keystore/keystore.c => cmds/keystore/keystore.cpp
	cmds/keystore/keystore_cli.c => cmds/keystore/keystore_cli.cpp

   Changed saveLockPattern and saveLockPassword to notify the keystore
   on changes so that the keystore master key can be reencrypted when
   the keyguard changes.

	core/java/com/android/internal/widget/LockPatternUtils.java

   Changed unlock screens to pass values for keystore unlock or initialization

	policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
	policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java

   KeyStore API changes
   - renamed test() to state(), which now return a State enum
   - made APIs with byte[] key arguments private
   - added new KeyStore.isEmpty used to determine if a keyguard is required

	keystore/java/android/security/KeyStore.java

   In addition to tracking KeyStore API changes, added new testIsEmpty
   and improved some existing tests to validate expect values.

	keystore/tests/src/android/security/KeyStoreTest.java

packages/apps/Settings

    Removing com.android.credentials.SET_PASSWORD intent with the
    removal of the ability to set an explicit keystore password now
    that the keyguard value is used. Changed to ensure keyguard is
    enabled for keystore install or unlock. Cleaned up interwoven
    dialog handing into discrete dialog helper classes.

	AndroidManifest.xml
	src/com/android/settings/CredentialStorage.java

    Remove layout for entering new password

	res/layout/credentials_dialog.xml

    Remove enable credentials checkbox

	res/xml/security_settings_misc.xml
	src/com/android/settings/SecuritySettings.java

    Added ability to specify minimum quality key to ChooseLockGeneric
    Activity. Used by CredentialStorage, but could also be used by
    CryptKeeperSettings. Changed ChooseLockGeneric to understand
    minimum quality for keystore in addition to DPM and device
    encryption.

	src/com/android/settings/ChooseLockGeneric.java

    Changed to use getActivePasswordQuality from
    getKeyguardStoredPasswordQuality based on experience in
    CredentialStorage. Removed bogus class javadoc.

	src/com/android/settings/CryptKeeperSettings.java

    Tracking KeyStore API changes

	src/com/android/settings/vpn/VpnSettings.java
	src/com/android/settings/wifi/WifiSettings.java

   Removing now unused string resources

	res/values-af/strings.xml
	res/values-am/strings.xml
	res/values-ar/strings.xml
	res/values-bg/strings.xml
	res/values-ca/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-en-rGB/strings.xml
	res/values-es-rUS/strings.xml
	res/values-es/strings.xml
	res/values-fa/strings.xml
	res/values-fi/strings.xml
	res/values-fr/strings.xml
	res/values-hr/strings.xml
	res/values-hu/strings.xml
	res/values-in/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-ko/strings.xml
	res/values-lt/strings.xml
	res/values-lv/strings.xml
	res/values-ms/strings.xml
	res/values-nb/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-pt/strings.xml
	res/values-rm/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-sk/strings.xml
	res/values-sl/strings.xml
	res/values-sr/strings.xml
	res/values-sv/strings.xml
	res/values-sw/strings.xml
	res/values-th/strings.xml
	res/values-tl/strings.xml
	res/values-tr/strings.xml
	res/values-uk/strings.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/strings.xml
	res/values-zu/strings.xml
	res/values/strings.xml

packages/apps/CertInstaller

  Tracking KeyStore API changes
	src/com/android/certinstaller/CertInstaller.java

  Fix for NPE in CertInstaller when certificate lacks basic constraints
	src/com/android/certinstaller/CredentialHelper.java

packages/apps/KeyChain

  Tracking KeyStore API changes
	src/com/android/keychain/KeyChainActivity.java
	src/com/android/keychain/KeyChainService.java
	support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl
	support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
	tests/src/com/android/keychain/tests/KeyChainServiceTest.java

Change-Id: I80533bf8986a92b0b99cd5fb1c4943e0f23fc1c8

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6151b13..81dc450 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -650,7 +650,6 @@
             <intent-filter>
                 <action android:name="com.android.credentials.UNLOCK" />
                 <action android:name="com.android.credentials.INSTALL" />
-                <action android:name="com.android.credentials.SET_PASSWORD" />
                 <action android:name="com.android.credentials.RESET" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>

diff --git a/res/layout/credentials_dialog.xml b/res/layout/credentials_dialog.xml
index 506b3d6..9eacd54 100644 (file)
--- a/res/layout/credentials_dialog.xml
+++ b/res/layout/credentials_dialog.xml
@@ -49,32 +49,5 @@
                 android:password="true"
                 android:singleLine="true"
                 android:visibility="gone"/>
-
-        <LinearLayout android:id="@+id/new_passwords"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone">
-
-            <TextView android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/credentials_new_password"/>
-
-            <EditText android:id="@+id/new_password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:password="true"
-                    android:singleLine="true"/>
-
-            <TextView android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/credentials_confirm_password"/>
-
-            <EditText android:id="@+id/confirm_password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:password="true"
-                    android:singleLine="true"/>
-        </LinearLayout>
     </LinearLayout>
 </ScrollView>

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 0abc59c..425c625 100644 (file)
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -2146,8 +2146,6 @@
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nie gestel nie)"</string>
     <!-- no translation found for credentials_title (4446234003860769883) -->
     <skip />
-    <string name="credentials_access" msgid="4843187230913860492">"Gebruik beveiligde eiebewyse"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Laat programme toe om beveiligde sertifikate en ander eiebewyse te gebruik"</string>
     <!-- no translation found for credentials_install (466093273825150847) -->
     <skip />
     <!-- no translation found for credentials_install (953914549998062317) -->
@@ -2156,8 +2154,6 @@
     <skip />
     <!-- no translation found for credentials_install_summary (5737658257407822713) -->
     <skip />
-    <string name="credentials_set_password" msgid="9104473585811899989">"Stel wagwoord"</string>
-    <!-- outdated translation 8287876917562085701 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Stel of verander die eiebewysberging-wagwoord"</string>
     <!-- outdated translation 9170150870552453457 -->     <string name="credentials_reset" msgid="3239382277144980418">"Vee berging uit"</string>
     <!-- outdated translation 1530388094693731636 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Vee eiebewysberging van alle inhoud uit en stel die wagwoord terug"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Voer wagwoord in"</string>
@@ -2165,10 +2161,7 @@
     <!-- no translation found for credentials_password_hint (4915128717409363024) -->
     <skip />
     <string name="credentials_old_password" msgid="7553393815538684028">"Huidige wagwoord:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nuwe wagwoord:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Bevestig nuwe wagwoord:"</string>
     <!-- outdated translation 819990295796804516 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Is jy seker jy wil alle eiebewyse uitvee en die eiebewysberging-wagwoord teruglaai?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Wagwoorde nie dieselfde nie."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Die wagwoord moet ten minste 8 karakters bevat."</string>
     <!-- outdated translation 7525192410790152041 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Voer asseblief die korrekte wagwoord in."</string>
     <!-- outdated translation 6392481296673345268 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Voer asseblief die korrekte wagwoord in. Jy het nog een kans om die korrekte wagwoord in te voer voordat die eiebewysberging uitgevee word."</string>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index c9e673c..8fc902c 100644 (file)
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1873,8 +1873,6 @@
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(አልተዘጋጀም)"</string>
     <!-- no translation found for credentials_title (4446234003860769883) -->
     <skip />
-    <string name="credentials_access" msgid="4843187230913860492">"ጥብቅመረጃዎች ተጠቀም"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"ትግበራዎች ጥብቅ ምስክሮች እና ሌላ መረጃዎች ለመድረስ ፍቀድ።"</string>
     <!-- no translation found for credentials_install (466093273825150847) -->
     <skip />
     <!-- no translation found for credentials_install (953914549998062317) -->
@@ -1883,8 +1881,6 @@
     <skip />
     <!-- no translation found for credentials_install_summary (5737658257407822713) -->
     <skip />
-    <string name="credentials_set_password" msgid="9104473585811899989">"የይለፍ ቃል አዘጋጅ"</string>
-    <!-- outdated translation 8287876917562085701 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"አዘጋጅ ወይም የመረጃ ማከማቻ ይለፍ ቃል ለውጥ"</string>
     <!-- outdated translation 9170150870552453457 -->     <string name="credentials_reset" msgid="3239382277144980418">"ማከማቻ አጥራ"</string>
     <!-- outdated translation 1530388094693731636 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"የሁሉም ይዘቶች የመረጃ ማከማቻአጥራ እና የይለፍ ቃሉን ዳግም አስጀመር።"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"የይለፍ ቃል አስገባ"</string>
@@ -1892,10 +1888,7 @@
     <!-- no translation found for credentials_password_hint (4915128717409363024) -->
     <skip />
     <string name="credentials_old_password" msgid="7553393815538684028">"የአሁኑ ይለፍ ቃል፡"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"አዲስ ይለፍ ቃል፡"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"አዲስ ይለፍቃል አረጋግጥ፡"</string>
     <!-- outdated translation 819990295796804516 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"ሁሉም መረጃ ለመሰረዝ መፈለግዎን እና የመረጃ ማከማቻ ይለፍቃሉን ዳግም ለማስጀመር እርግጠኛ ነዎት?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">" የይለፍ ቃሎችህ አልተዛመዱም."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"የይለፍ ቃሉ ቢያንስ 8 ቁምፊዎች አሉት።"</string>
     <!-- outdated translation 7525192410790152041 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"እባክዎ ትክክለኛውን ይለፍቃል ያስገቡ።"</string>
     <!-- outdated translation 6392481296673345268 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"እባክዎ ትክከለኛውን የይለፍ ቃል ያስገቡ። የመረጃ ማከማቻው ከመጥፋቱ በፊት ትክክለኛውን የይለፍ ቃል ለማስገባት አንድ ተጨማሪ ሙከራ አለዎ።"</string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c2831ef..a341f07 100644 (file)
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(لم يتم التغيير)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(لم يتم التعيين)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"تخزين بيانات الاعتماد"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"استخدام بيانات الاعتماد الآمنة"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"السماح للتطبيقات بالوصول إلى الشهادات الآمنة وبيانات الاعتماد الأخرى"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"التثبيت من وحدة تخزين"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"التثبيت من بطاقة SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"تثبيت الشهادات من وحدة تخزين"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"تثبيت الشهادات من بطاقة SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"تعيين كلمة المرور"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"تعيين كلمة مرور لتخزين بيانات الاعتماد أو تغييرها"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"محو بيانات الاعتماد"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"إزالة جميع المحتويات وإعادة تعيين كلمة المرور"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"إدخال كلمة المرور"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"أدخل كلمة المرور تخزين بيانات الاعتماد."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"تعيين كلمة المرور لتخزين بيانات الاعتماد. يجب أن تكون 8 أحرف على الأقل."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"كلمة المرور الحالية:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"كلمة المرور الجديدة:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"تأكيد كلمة المرور الجديدة:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"ستتم إزالة كل المحتويات، وإعادة تعيين كلمة المرور. هل تريد بالتأكيد إجراء ذلك؟"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"كلمتا المرور غير متطابقتين."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"يجب أن تحتوي كلمة المرور على 8 أحرف على الأقل."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"كلمة مرور غير صحيحة."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"كلمة مرور غير صحيحة. بقي لديك محاولة واحدة أخرى قبل مسح تخزين بيانات الاعتماد."</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f130d51..084bb4b 100644 (file)
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(непроменени)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(не е зададенo)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Хранилище за идент. данни"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Използване на сигурни идентификационни данни"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Даване на достъп до защитени сертификати и други идентификационни данни"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Инсталиране от хранилището"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Инсталиране от SD картата"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Инсталиране на сертификати от хранилището"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Инсталиране на сертификати от SD картата"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Задаване на парола"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Задаване или промяна на паролата за хранилището за идентификационни данни"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Изчистване на идент. данни"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Премахване на цялото съдържание и задаване на нова парола"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Въвеждане на парола"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Въведете паролата за хранилището за идентификационни данни."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Задайте паролата за хранилището за идентификационни данни. Трябва да бъде поне 8 знака."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Текуща парола:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Нова парола:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Потвърждаване на нова парола:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Цялото съдържание ще бъде премахнато и ще бъде зададена нова парола. Наистина ли искате да го направите?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Паролите не си съответстват."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Паролата трябва да е поне 8 знака."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Паролата е неправилна."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Паролата е неправилна. Имате още един опит, преди хранилището за идентификационни данни да бъде изтрито."</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f839b95..0badb81 100644 (file)
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(sense canvis)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(sense definir)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Emmagatzematge de credencials"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Utilitza credencials segures"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Permet a les aplicacions accedir als certificats segurs i a altres credencials"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instal·la des de l\'emmagatzematge"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instal·la des de la targeta SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instal·la els certificats des de l\'emmagatzematge"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instal·la els certificats des de la targeta SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Defineix la contrasenya"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Estableix o canvia la contrasenya per a l\'emmagatzematge de credencials"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Esborra les credencials"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Elimina tot el contingut i restableix la contrasenya"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Introduïu la contrasenya"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introdueix la contrasenya per a l\'emmagatzematge de credencials."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Estableix la contrasenya per a l\'emmagatzematge de credencials. Ha de tenir com a mínim vuit caràcters."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contrasenya actual:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Contrasenya nova:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmeu la contrasenya nova:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"S\'eliminarà tot el contingut i es restablirà la contrasenya. N\'estàs segur?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Les contrasenyes no coincideixen."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"La contrasenya ha de tenir almenys 8 caràcters."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"La contrasenya no és correcta."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Contrasenya incorrecta. Tens una oportunitat més abans que no s\'esborri l\'emmagatzematge de credencials."</string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e08e313..6331640 100644 (file)
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nezměněno)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(není nastaveno)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Úložiště pověření"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Použít zabezpečená pověření"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Povolit aplikacím přístup k zabezpečeným certifikátům a dalším pověřením"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalovat z úložiště"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalace z karty SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Nainstalovat certifikáty z úložiště"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Nainstalovat certifikáty z karty SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Nastavit heslo"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Nastavit nebo změnit heslo pro úložiště pověření"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Vymazat pověření"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Odebrat veškerý obsah a obnovit heslo"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Zadejte heslo"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Zadejte heslo pro úložiště pověření."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Nastavit heslo pro úložiště pověření (nejméně 8 znaků)."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuální heslo:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nové heslo:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Potvrďte nové heslo:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Veškerý obsah bude odstraněn a heslo bude obnoveno. Opravdu chcete akci provést?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Hesla se neshodují."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Heslo musí mít alespoň 8 znaků."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Nesprávné heslo."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Nesprávné heslo. Zbývá vám jeden pokus, než bude úložiště pověření smazáno."</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 6dd3b9d..806f924 100644 (file)
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(uændret)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ikke indstillet)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Oplysningslagring"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Brug sikre oplysninger"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Giv programmer adgang til sikre certifikater og andre oplysninger"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installer fra lager"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Installer fra SD-kort"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Installer certifikater fra lager"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Installer certifikater fra SD-kortet"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Angiv adgangskode"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Indstil eller skift adgangskoden for oplysningslagring"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Ryd oplysninger"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Fjern alt indhold, og nulstil adgangskoden"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Indtast adgangskode"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Indtast adgangskoden for oplysningslagring."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Indstil adgangskode for oplysningslagring. Den skal være på mindst otte tegn."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nuværende adgangskode:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Ny adgangskode:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Bekræft ny adgangskode:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Alt indholdet vil blive slettet, og adgangskoden vil blive nulstillet. Er du sikker på, at du vil gøre det?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Adgangskoderne stemmer ikke overens."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Adgangskoden skal indeholde mindst 8 tegn."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Ugyldig adgangskode."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Forkert adgangskode. Du har ét forsøg mere, inden oplysningslagringen slettes."</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0c8adaf..76b723c 100644 (file)
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nicht geändert)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nicht festgelegt)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Anmeldedatenspeicher"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Sichere Anmeldeinfos"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Anwendungen können sichere Zertifikate und Anmeldeinformationen abrufen"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Von Speicher installieren"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Von SD-Karte installieren"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Zertifikate von Speicher installieren"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Zertifikate von SD-Karte installieren"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Passwort festlegen"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Passwort für Anmeldedatenspeicher festlegen oder ändern"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Anmeldedaten löschen"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Sämtliche Inhalte entfernen und Passwort zurücksetzen"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Passwort eingeben"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Geben Sie das Passwort für den Anmeldedatenspeicher ein."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Legen Sie das Passwort für den Anmeldedatenspeicher fest. Dieses muss mindestens acht Zeichen lang sein."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuelles Passwort:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Neues Passwort:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Neues Passwort bestätigen:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Sämtliche Inhalte werden gelöscht und das Passwort wird zurückgesetzt. Möchten Sie wirklich fortfahren?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Die Passwörter stimmen nicht überein."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Das Passwort muss mindestens acht Zeichen lang sein."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Falsches Passwort"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Falsches Passwort. Sie haben noch einen Versuch, bevor Ihr Anmeldedatenspeicher gelöscht wird."</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index edc8c5f..4761414 100644 (file)
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(δεν έγινε αλλαγή)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(δεν ορίστηκε)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Αποθηκ. χώρος διαπιστευτηρίων"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Χρήση ασφαλών διαπιστευτηρίων"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Να επιτρέπεται στις εφαρμογές η πρόσβαση σε ασφαλή πιστοποιητικά και άλλα διαπιστευτήρια"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Εγκατάσταση από συσκευή αποθ."</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Εγκατάσταση από κάρτα SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Εγκατάσταση πιστοποιητικών από συσκευή αποθήκευσης"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Εγκατάσταση πιστοποιητικών από την κάρτα SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Ορισμός κωδικού πρόσβασης"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Ορισμός ή αλλαγή του κωδικού πρόσβασης του αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Εκκαθάριση διαπιστευτηρίων"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Κατάργηση όλου του περιεχομένου και επαναφορά του κωδικού πρόσβασης"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Εισαγωγή κωδικού πρόσβασης"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Εισαγάγετε τον κωδικό πρόσβασης για τον αποθηκευτικό χώρο διαπιστευτηρίων."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Ορίστε τον κωδικό πρόσβασης για τον αποθηκευτικό χώρο διαπιστευτηρίων. Πρέπει να περιέχει τουλάχιστον 8 χαρακτήρες."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Τρέχον κωδικός πρόσβασης:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Νέος κωδικός πρόσβασης:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Επιβεβαίωση νέου κωδικού πρόσβασης:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Όλο το περιεχόμενο θα διαγραφεί και θα γίνει επαναφορά του κωδικού πρόσβασης. Είστε σίγουροι;"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Οι κωδικοί πρόσβασης δεν συμφωνούν."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Ο κωδικός πρόσβασης θα πρέπει να αποτελείται από τουλάχιστον 8 χαρακτήρες."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Λανθασμένος κωδικός πρόσβασης."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Λανθασμένος κωδικός πρόσβασης. Έχετε μία ακόμα ευκαιρία πριν διαγραφεί ο αποθηκευτικός χώρος των διαπιστευτηρίων."</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a105d6c..b234c91 100644 (file)
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(unchanged)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(not set)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Credential storage"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Use secure credentials"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Allow applications to access secure certificates and other credentials"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Install from storage"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Install from SD card"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Install certificates from storage"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Install certificates from SD card"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Set password"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Set or change the password for credential storage"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Clear credentials"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Remove all the contents and reset the password"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Enter Password"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Enter the password for credential storage."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Set the password for credential storage. It must have at least 8 characters."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Current password:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"New password:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirm new password:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"All the contents will be removed and the password will be reset. Are you sure about that?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"passwords do not match."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"The password must contain at least 8 characters."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Incorrect password."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Incorrect password. You have one more chance before credential storage is erased."</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 25e7a70..8062814 100644 (file)
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(sin cambios)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(no establecido)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Almacenamiento de la credencial"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Usar credenciales seg."</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Permitir a las aplic. acceder a certificados seguros y otras cred."</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar desde almacenamiento"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalar desde la tarjeta SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instalar certificados encriptados desde el almacenamiento"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalar certificados desde la tarjeta SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Establecer contraseña"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Establecer o cambiar la contraseña para el almacenamiento de la credencial"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Borrar credenciales"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Eliminar todos los contenidos y restablecer la contraseña"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ingresar contraseña"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ingresar la contraseña para el almacenamiento de la credencial."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Establecer la contraseña para el almacenamiento de la credencial. Debe tener al menos 8 caracteres."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contraseña actual:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Contraseña nueva:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar contraseña nueva:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Se eliminarán todos los contenidos, y la contraseña se restablecerá. ¿Estás seguro de eso?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Las contraseñas no coinciden."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"La contraseña debe tener 8 caracteres como mínimo."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Contraseña incorrecta."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Contraseña incorrecta. Tienes una oportunidad más antes de que se borre el almacenamiento de la credencial."</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2982b66..80cce51 100644 (file)
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(sin modificar)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(sin definir)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Almacenamiento de credenciales"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Credenciales seguras"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Permitir que las aplicaciones accedan a los certificados seguros y a otras credenciales"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar desde almacenamiento"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalar desde la tarjeta SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instalar certificados desde almacenamiento"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalar certificados desde la tarjeta SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Establecer contraseña"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Establecer o cambiar la contraseña del almacenamiento de credenciales"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Borrar credenciales"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Eliminar todo el contenido y restablecer la contraseña"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Introducir contraseña"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introduce la contraseña del almacenamiento de credenciales."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Establece la contraseña del almacenamiento de credenciales (debe tener un mínimo de 8 caracteres)."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contraseña actual:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Contraseña nueva:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar contraseña nueva:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Se eliminará todo el contenido y se restablecerá la contraseña. ¿Seguro que quieres continuar?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Las contraseñas no coinciden."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"La contraseña debe tener un mínimo de ocho caracteres."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Contraseña incorrecta"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Contraseña incorrecta. Tienes una oportunidad más antes de que se borre el almacenamiento de credenciales."</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 2633820..c4e0178 100644 (file)
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(بدون تغییر)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(تنظیم نشده)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"ذخیره اطلاعات کاربری"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"استفاده از اطلاعات کاربری ایمن"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"به برنامه های کاربردی اجازه می دهد به گواهی های ایمن و دیگر اطلاعات کاربری دسترسی داشته باشد."</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"نصب از حافظه"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"نصب از کارت SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"نصب گواهی ها از حافظه"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"نصب مجوزها از کارت SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"تنظیم رمز ورود"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"تنظیم یا تغییر رمز ورود برای ذخیره اطلاعات کاربری"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"پاک کردن اطلاعات کاربری"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"حذف همه محتواها و بازنشانی رمز ورود"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"رمز ورود را وارد کنید"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"رمز ورود را برای حافظه اطلاعات کاربری وارد کنید."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"رمز ورود را برای حافظه اطلاعات کاربری تنظیم کنید. این رمز ورود باید حداقل 8 نویسه داشته باشد."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"رمز ورود فعلی:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"رمز ورود جدید:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"تأیید رمز ورود جدید:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"همه محتواها حذف می شود و رمز ورود بازنشانی می شود. آیا مطمئن هستید؟"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"رمزهای ورود مطابقت ندارند."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"رمز ورود باید حداقل 8 نویسه داشته باشد."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"رمز ورود نادرست است."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"رمز ورود نادرست است. قبل از پاک کردن حافظه اطلاعات کاربری، یک بار دیگر می توانید رمز خود را وارد کنید."</string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 84b143f..38640c4 100644 (file)
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(ei muutettu)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ei asetettu)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Käyttöoikeustietojen tallennus"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Käytä suojattuja käyttöoikeustietoja"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Anna sovelluksien käyttää suojattuja varmenteita ja muita käyttöoikeustietoja"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Asenna tallennustilasta"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Asenna SD-kortilta"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Asenna varmenteet tallennustilasta"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Asenna varmenteet SD-kortilta"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Aseta salasana"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Aseta käyttöoikeustietojen tallennustilan salasana tai vaihda salasanaa"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Tyhjennä käyttöoikeustiedot"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Poista kaikki sisältö ja nollaa salasana"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Anna salasana"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Anna käyttöoikeustietojen tallennustilan salasana."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Aseta salasana käyttöoikeustietojen tallennustilalle. Salasanassa on oltava vähintään 8 merkkiä."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nykyinen salasana:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Uusi salasana:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Vahvista uusi salasana:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Kaikki sisältö poistetaan ja salasana nollataan. Haluatko jatkaa?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Salasanat eivät täsmää."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Salasanassa täytyy olla vähintään 8 merkkiä."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Virheellinen salasana."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Väärä salasana. Yksi yritys jäljellä, ennen kuin käyttöoikeustietojen tallennustila tyhjennetään."</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index cf05ea3..662fd87 100644 (file)
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(aucune modification)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(non défini)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Stockage des identifiants"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Identifiants sécurisés"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Autoriser l\'accès des applications aux certificats sécurisés et identifiants"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installer depuis la mémoire"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Installer depuis la carte SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Installer les certificats depuis la mémoire de stockage"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Installer les certificats depuis la carte SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Définir le mot de passe"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Définir ou modifier le mot de passe pour le stockage des identifiants"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Effacer les identifiants"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Supprimer l\'ensemble du contenu et réinitialiser le mot de passe"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Saisir le mot de passe"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Saisir le mot de passe de stockage des identifiants"</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Définir le mot de passe pour le stockage des identifiants. Il doit comporter au moins huit caractères."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Mot de passe actuel :"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nouveau mot de passe :"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmer le nouveau mot de passe :"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"L\'ensemble du contenu sera effacé et le mot de passe réinitialisé. Voulez-vous vraiment continuer ?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Les mots de passe ne concordent pas."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Le mot de passe doit contenir au moins 8 caractères."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Mot de passe incorrect"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Mot de passe incorrect. Vous disposez d\'une tentative supplémentaire avant la suppression des identifiants."</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 2b114fb..77a9fe9 100644 (file)
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nepromijenjeno)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nije postavljeno)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Pohrana vjerodajnica"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Korisnički sigurne vjerodajnice"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Aplikacijama omogući pristup sigurnim certifikatima i drugim vjerodajnicama"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instaliraj iz memorije"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instaliraj s kartice SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instaliraj certifikate iz memorije"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instaliraj certifikate s kartice SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Postavi zaporku"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Postavite ili promijenite zaporku za pohranu vjerodajnica"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Izbriši vjerodajnice"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Ukloni sav sadržaj i poništi zaporku"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Unesite zaporku"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Unesite zaporku za pohranu vjerodajnica."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Postavite zaporku za pohranu vjerodajnica. Mora sadržavati najmanje 8 znakova."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutačna zaporka:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nova zaporka:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Potvrdite novu zaporku:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Sav će sadržaj biti uklonjen, a zaporka će biti poništena. Jeste li sigurni?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Zaporke se ne podudaraju."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Zaporka treba imati barem 8 znakova."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Pogrešna zaporka."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Pogrešna zaporka. Imate još jedan pokušaj prije brisanja pohrane vjerodajnica."</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 3989b71..d2a2b56 100644 (file)
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nem változott)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nincs beállítva)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Hitelesítési adatok tárolója"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Biztonságos hitelesítő adatok használata"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Az alkalmazások hozzáférhetnek a biztonsági tanúsítványokhoz és más hitelesítési adatokhoz"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Telepítés tárhelyről"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Telepítés az SD-kártyáról"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Tanúsítványok telepítése tárhelyről"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Tanúsítványok telepítése az SD-kártyáról"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Jelszó beállítása"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"A hitelesítési adatok tárolója jelszavának beállítása vagy cseréje"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Hitelesítési adatok törlése"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Minden tartalom törlése és a jelszó visszaállítása"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Jelszó megadása"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Adja meg a hitelesítési adatok tárolójának jelszavát."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Állítsa be a hitelesítési adatok tárolójának jelszavát. Legalább 8 karakter hosszúnak kell lennie."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Jelenlegi jelszó:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Új jelszó:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Új jelszó megerősítése"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Minden tartalom eltávolításra kerül, és a jelszó visszaáll. Biztos benne?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"A jelszavak nem egyeznek."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"A jelszónak legalább 8 karakter hosszúnak kell lennie."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Helytelen jelszó."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Helytelen jelszó. Már csak egy lehetősége van, mielőtt a hitelesítési adatok tárolója törlődik."</string>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index dfab173..fcfce66 100644 (file)
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(tidak diubah)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(tidak disetel)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Penyimpanan kredensial"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Gunakan kredensial aman"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Izinkan aplikasi mengakses sertifikat aman dan kredensial lainnya"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Pasang dari penyimpanan"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Pasang dari kartu SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Pasang sertifikat dari penyimpanan"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Pasang sertifikat dari kartu SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Setel sandi"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Setel atau ubah sandi untuk penyimpanan kredensial"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Hapus kredensial"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Hapus semua konten dan setel ulang sandi"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Masukkan sandi"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Masukkan sandi untuk penyimpanan kredensial."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Setel sandi untuk penyimpanan kredensial. Gunakan setidaknya 8 karakter."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Sandi saat ini:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Sandi baru:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Konfirmasi sandi baru:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Semua konten akan dihapus dan sandi akan disetel ulang. Yakin dengan hal ini?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Sandi tidak cocok."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Sandi minimal terdiri dari 8 karakter."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Sandi salah."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Sandi salah. Anda memiliki satu kesempatan lagi sebelum penyimpanan kredensial dihapus."</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 6711321..5f8c114 100644 (file)
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(invariato)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(non impostato)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Archivio credenziali"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Usa credenziali protez."</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Consenti accesso applicazioni a certificati protezione e altre credenziali"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installa da archivio"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Installa da scheda SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Installa certificati da archivio"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Installa certificati da scheda SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Imposta password"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Imposta o modifica la password dell\'archivio credenziali"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Cancella credenziali"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Rimuovi tutti i contenuti e reimposta la password"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Inserisci password"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Inserisci la password per l\'archivio credenziali."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Imposta la password per l\'archivio credenziali. Deve essere formata da almeno 8 caratteri."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Password attuale:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nuova password:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Conferma nuova password:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Tutti i contenuti verranno rimossi e la password reimpostata. Procedere?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Le password non corrispondono."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"La password deve essere formata da almeno 8 caratteri."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Password errata."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Password non corretta. Hai un\'altra possibilità prima che l\'archivio credenziali venga cancellato."</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index d6fdf99..e89a936 100644 (file)
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(ללא שינוי)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(לא הוגדר)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"אחסון אישורים"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"שימוש באישורים מאובטחים"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"אפשר ליישומים לגשת לאישורים מאובטחים ואישורים אחרים"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"התקן מאמצעי אחסון"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"התקן מכרטיס SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"התקן אישורים מאמצעי אחסון"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"התקן אישורים מכרטיס SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"הגדרת סיסמה"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"הגדר או שנה את הסיסמה עבור אחסון האישורים"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"נקה אישורים"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"הסר את כל התוכן ואפס את הסיסמה"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"הזן סיסמה"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"הזן את הסיסמה עבור אחסון האישורים."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"הגדר את הסיסמה עבור אחסון האישורים. הסיסמה חייבת להכיל לפחות 8 תווים."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"הסיסמה הנוכחית:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"סיסמה חדשה:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"אשר את הסיסמה החדשה:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"כל התוכן יימחק והסיסמה תתאפס. האם אתה בטוח לגבי פעולה זו?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"הסיסמאות לא תואמות."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"אורך הסיסמה חייב להיות 8 תווים לפחות."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"סיסמה שגויה."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"סיסמה שגויה. יש לך עוד ניסיון אחד לפני שאחסון האישורים יימחק."</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2051edb..332b45b 100644 (file)
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"（変更なし）"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"（未設定）"</string>
     <string name="credentials_title" msgid="4446234003860769883">"認証情報ストレージ"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"安全な認証情報の使用"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"安全な証明書と他の認証情報へのアクセスをアプリケーションに許可する"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ストレージからのインストール"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"SDカードからインストール"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"ストレージから証明書をインストールする"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"証明書をSDカードからインストールする"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"パスワードの設定"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"認証ストレージのパスワードを設定または変更する"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"認証ストレージの消去"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"すべてのコンテンツを削除してパスワードをリセットする"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"パスワードを入力する"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"認証ストレージのパスワードを入力してください。"</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"認証情報ストレージのパスワードを設定します。パスワードは8文字以上で指定します。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"現在のパスワード:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"新しいパスワード:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"新しいパスワードの確認:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"コンテンツはすべて削除され、パスワードはリセットされます。操作を実行してもよろしいですか？"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"パスワードが一致しません。"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"パスワードを8文字以上で入力してください。"</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"パスワードが正しくありません。"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"パスワードが正しくありません。あと1回失敗すると、認証情報ストレージが消去されます。"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 6e2d932..46ec708 100644 (file)
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(변경 안함)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(설정 안함)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"자격증명 저장소"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"보안 자격증명 사용"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"애플리케이션이 보안 인증서 및 다른 자격증명에 액세스하도록 허용"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"저장소에서 설치"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"SD 카드에서 설치"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"저장소에서 인증서 설치"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SD 카드에서 인증서 설치"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"비밀번호 설정"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"자격증명 저장소에 대한 비밀번호 설정 또는 변경"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"자격증명 삭제"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"콘텐츠를 모두 삭제하고 비밀번호 재설정"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"비밀번호 입력"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"자격증명 저장소에 대한 비밀번호를 입력하세요."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"자격증명 저장소에 대한 비밀번호를 설정하세요. 8자 이상이어야 합니다."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"현재 비밀번호:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"새 비밀번호:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"새 비밀번호 확인:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"콘텐츠가 모두 삭제되고 비밀번호가 재설정됩니다. 계속하시겠습니까?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"비밀번호가 일치하지 않습니다."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"비밀번호는 8자 이상이어야 합니다."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"비밀번호가 잘못되었습니다."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"비밀번호가 잘못되었습니다. 한 번 더 실패하면 자격증명 저장소가 지워집니다."</string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 31ffece..8308745 100644 (file)
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nepakeista)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nenustatyta)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Įgaliojimų atmintinė"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Naudoti saugius įgaliojimus"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Leisti programoms pasiekti saugius sertifikatus ir kitus įgaliojimus"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Įdiegti iš atmintinės"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Įdiegti iš SD kortelės"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Įdiegti sertifikatus iš atmintinės"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Įdiegti sertifikatus iš SD kortelės"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Nustatyti slaptažodį"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Nustatyti arba pakeisti įgaliojimų atmintinės slaptažodį"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Valyti įgaliojimus"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Pašalinti visą turinį ir iš naujo nustatyti slaptažodį"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Įveskite slaptažodį"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Įvesti įgaliojimų atmintinės slaptažodį."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Nustatyti įgaliojimų atmintinės slaptažodį. Jis turi būti sudarytas mažiausiai iš 8 simbolių."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Dabartinis slaptažodis:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Naujas slaptažodis:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Patvirtinti naują slaptažodį:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Visas turinys bus pašalintas ir slaptažodis nustatytas iš naujo. Ar tikrai norite tai atlikti?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Slaptažodžiai neatitinka."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Slaptažodį turi sudaryti mažiausiai 8 simboliai."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Neteisingas slaptažodis."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Neteisingas slaptažodis. Dar galite bandyti vieną kartą, paskui įgaliojimų atmintinė bus ištrinta."</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 76d57e6..7ae569a 100644 (file)
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(bez izmaiņām)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nav iestatīta)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Akreditācijas datu krātuve"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Izmantot drošos akreditācijas datus"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Ļaut lietojumprogrammām piekļūt drošajiem sertifikātiem un citiem akreditācijas datiem"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalēšana no atmiņas"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalēt no SD kartes"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instalēt sertifikātus no atmiņas"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalēt sertifikātus no SD kartes"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Iestatīt paroli"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Iestatīt vai mainīt akreditācijas datu krātuves paroli"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Akreditācijas datu notīrīšana"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Noņemt visu saturu un atiestatīt paroli"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Paroles ievadīšana"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ievadiet akreditācijas datu krātuves paroli."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Iestatiet akreditācijas datu krātuves paroli. Tai jābūt vismaz 8 rakstzīmes garai."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Pašreizējā parole:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Jaunā parole:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Apstipriniet jauno paroli:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Tiks noņemts viss saturs, un tiks atiestatīta parole. Vai tiešām vēlaties veikt šo darbību?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Paroles nav vienādas."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Parolē jābūt vismaz astoņām rakstzīmēm."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Nepareiza parole."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Nepareiza parole. Varat vēl mēģināt vienu reizi, pirms tiek izdzēsta akreditācijas datu krātuve."</string>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 5a7b15d..6871ac6 100644 (file)
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1874,10 +1874,6 @@
     <skip />
     <!-- no translation found for credentials_title (4446234003860769883) -->
     <skip />
-    <!-- no translation found for credentials_access (4843187230913860492) -->
-    <skip />
-    <!-- no translation found for credentials_access_summary (319662078718574168) -->
-    <skip />
     <!-- no translation found for credentials_install (466093273825150847) -->
     <skip />
     <!-- no translation found for credentials_install (953914549998062317) -->
@@ -1886,10 +1882,6 @@
     <skip />
     <!-- no translation found for credentials_install_summary (5737658257407822713) -->
     <skip />
-    <!-- no translation found for credentials_set_password (9104473585811899989) -->
-    <skip />
-    <!-- no translation found for credentials_set_password_summary (6756719720826053228) -->
-    <skip />
     <!-- no translation found for credentials_reset (3239382277144980418) -->
     <skip />
     <!-- no translation found for credentials_reset_summary (3810369467217453606) -->
@@ -1902,14 +1894,8 @@
     <skip />
     <!-- no translation found for credentials_old_password (7553393815538684028) -->
     <skip />
-    <!-- no translation found for credentials_new_password (267487774686796938) -->
-    <skip />
-    <!-- no translation found for credentials_confirm_password (4732250000633424345) -->
-    <skip />
     <!-- no translation found for credentials_reset_hint (2336340927894094814) -->
     <skip />
-    <!-- no translation found for credentials_passwords_mismatch (5288565139590031733) -->
-    <skip />
     <!-- no translation found for credentials_password_too_short (7502749986405522663) -->
     <skip />
     <!-- no translation found for credentials_wrong_password (2541932597104054807) -->

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 7b2ca85..d2a1cb7 100644 (file)
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(uendret)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ikke satt)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Legitimasjonslager"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Bruk sikre akkreditiver"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Gir applikasjoner tilgang til sikre sertifikater og andre akkreditiver"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installer fra lagringsenhet"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Installer fra SD-kort"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Installer sertifikater fra lagringsenhet"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Installer sertifikater fra SD-kort"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Velg passord"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Angi eller endre passordet for legitimasjonslageret"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Tøm legitimasjonslageret"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Fjern alt innhold og tilbakestill passordet"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Velg passord"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Skriv inn passordet for legitimasjonslagring."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Angi et passord for legitimasjonslageret. Det må inneholde minst åtte tegn."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nåværende passord:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nytt passord:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Bekreft nytt passord:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Alt innholdet fjernes, og passordet tilbakestilles. Er du sikker?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Passordene stemmer ikke overens."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Passordet må bestå av minst åtte tegn."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Feil passord."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Feil passord. Du har ett forsøk til før legitimasjonslageret slettes."</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e891230..f979fc1 100644 (file)
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(ongewijzigd)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(niet ingesteld)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Opslag van referenties"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Beveiligingsreferenties"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Toepassingen mogen veilige certificaten en andere referenties openen"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installeren vanuit opslag"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Installeren vanaf SD-kaart"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Certificaten vanuit opslag installeren"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Certificaten installeren vanaf SD-kaart"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Wachtwoord instellen"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Het wachtwoord voor de opslag van referenties instellen of wijzigen"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Referenties wissen"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Alle inhoud verwijderen en het wachtwoord opnieuw instellen"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Voer het wachtwoord in"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Geef het wachtwoord voor de opslag van referenties op."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Stel het wachtwoord voor de opslag van referenties in. Het wachtwoord moet bestaan uit ten minste acht tekens."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Huidig wachtwoord:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nieuw wachtwoord:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Nieuw wachtwoord bevestigen:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Alle inhoud wordt verwijderd en het wachtwoord wordt opnieuw ingesteld. Weet u het zeker?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"De wachtwoorden komen niet overeen."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Het wachtwoord moet uit ten minste 8 tekens bestaan."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Onjuist wachtwoord."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Onjuist wachtwoord. U heeft nog één poging voordat de opslag van referenties wordt gewist."</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index bf9fe25..0ac7d6d 100644 (file)
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nie zmieniono)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nie ustawiono)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Magazyn danych logowania"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Dostęp do poufnych danych"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Zezwalaj aplikacjom na dostęp do bezpiecznych certyfikatów i innych danych logowania"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Zainstaluj z nośnika"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Zainstaluj z karty SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Zainstaluj certyfikaty z nośnika"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Zainstaluj certyfikaty z karty SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Ustaw hasło"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Ustaw lub zmień hasło do magazynu danych logowania:"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Wyczyść dane logowania"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Usuń całą zawartość i zresetuj hasło"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Wprowadź hasło"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Wprowadź hasło magazynu danych logowania."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Ustaw hasło do magazynu danych logowania. Musi ono mieć co najmniej 8 znaków."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Bieżące hasło:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nowe hasło:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Potwierdź nowe hasło:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Cała zawartość zostanie usunięta, a hasło zostanie zresetowane. Czy na pewno chcesz to zrobić?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Hasła nie są identyczne."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Hasło musi mieć co najmniej 8 znaków."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Nieprawidłowe hasło."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Nieprawidłowe hasło. Pozostała jedna próba przed wyczyszczeniem magazynu danych logowania."</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index af29caf..3ef1598 100644 (file)
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(não alterado)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(não definido)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Armazenamento de credenciais"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Utilizar credenciais seguras"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Acesso das aplicações a certificados seguros e outras credenciais"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar do armazenamento"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalar a partir do cartão SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instalar certificados a partir do armazenamento"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalar certificados a partir do cartão SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Definir palavra-passe"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Definir ou alterar a palavra-passe do armazenamento de credenciais"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Limpar credenciais"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Remover todo o conteúdo e repor a palavra-passe"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Introduzir palavra-passe"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introduza a palavra-passe do armazenamento de credenciais."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Defina a palavra-passe do armazenamento de credenciais. Tem de ter, pelo menos, 8 caracteres."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Palavra-passe actual:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nova palavra-passe:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar nova palavra-passe:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Todo o conteúdo será removido e a palavra-passe será reposta. Tem a certeza de que pretende continuar?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"As palavras-passe não correspondem."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"A palavra-passe deve ter, pelo menos, 8 caracteres."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Palavra-passe incorrecta."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Palavra-passe incorrecta. Tem mais uma tentativa antes de o armazenamento de credenciais ser apagado."</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index cff5c07..f7251a3 100644 (file)
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(não alterado)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(não definido)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Armazenamento de credenciais"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Usar credenciais seguras"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Permitir que os aplicativos acessem credenciais e certificados seguros"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar do armazenamento"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalar do cartão SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instalar certificados do armazenamento"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalar certificados do cartão SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Definir senha"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Configurar ou alterar a senha para o armazenamento de credencial"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Limpar credenciais"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Remover todos os conteúdos e redefinir a senha"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Inserir senha"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Digite a senha para o armazenamento de credencial."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Configure a senha para o armazenamento de credencial. A senha deve ter no mínimo 8 caracteres."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Senha atual:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nova senha:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar nova senha:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Todos os conteúdos serão removidos e a senha será redefinida. Tem certeza de que deseja fazer isso?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"As senhas não correspondem."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"A senha deve ter no mínimo 8 caracteres."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Senha incorreta."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Senha incorreta. Você tem uma ou mais tentativas antes do armazenamento de credencial ser apagado."</string>

diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 39326fd..295f0da 100644 (file)
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -1502,8 +1502,6 @@
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(betg definì)"</string>
     <!-- no translation found for credentials_title (4446234003860769883) -->
     <skip />
-    <string name="credentials_access" msgid="4843187230913860492">"Identitads segiradas"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Las applicaziuns pon acceder a certificats segirads ed infurmaziuns d\'annunzia"</string>
     <!-- no translation found for credentials_install (466093273825150847) -->
     <skip />
     <!-- no translation found for credentials_install (953914549998062317) -->
@@ -1512,19 +1510,12 @@
     <skip />
     <!-- no translation found for credentials_install_summary (5737658257407822713) -->
     <skip />
-    <string name="credentials_set_password" msgid="9104473585811899989">"Definir il pled-clav"</string>
-    <!-- outdated translation 8287876917562085701 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Definir/midar il pled-clav da la memoria da las infurmaziuns d\'annunzia"</string>
     <!-- outdated translation 9170150870552453457 -->     <string name="credentials_reset" msgid="3239382277144980418">"Stizzar la memoria"</string>
     <!-- outdated translation 1530388094693731636 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Stizzar il cuntegn da la memoria da las infurmaziuns d\'annunzia e reinizialisar il pled-clav"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Endatar il pled-clav"</string>
     <!-- outdated translation 594679530407918031 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Endatai il pled-clav per la memoria da las infurmaziuns d\'annunzia."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
     <string name="credentials_old_password" msgid="7553393815538684028">"Pled-clav actual:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nov pled-clav:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confermar il nov pled-clav:"</string>
     <!-- outdated translation 819990295796804516 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Vulais Vus propi stizzar tut las infurmaziuns d\'annunzia e reinizialisar il pled-clav per la memorisaziun da las infurmaziuns d\'annunzia?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Ils pleds-clav na correspundan betg."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Il pled-clav sto cuntegnair almain 8 caracters."</string>
     <!-- outdated translation 7525192410790152041 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Endatai il pled-clav correct."</string>
     <!-- outdated translation 6392481296673345268 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Endatai il pled clav correct. Vus avais anc ina emprova avant che la memoria da las infurmaziuns d\'annunzia vegn stizzada."</string>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index dc93731..36f0007 100644 (file)
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nemodificat)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nesetat)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Stocarea acreditărilor"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Utilizaţi acreditări securizate"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Permiteţi aplicaţiilor să acceseze certificate securizate şi alte acreditări"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalaţi de pe stocare"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalaţi de pe cardul SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instalaţi certificate de pe stocare"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalaţi certificate de pe cardul SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Setaţi parola"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Setaţi sau schimbaţi parola pentru stocarea acreditărilor"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Ştergeţi acreditările"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Eliminaţi întregul conţinut şi resetaţi parola"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Introduceţi parola"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introduceţi parola pentru stocarea acreditărilor."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Setaţi parola pentru stocarea acreditărilor. Parola trebuie să aibă cel puţin 8 caractere."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Parola actuală:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Parola nouă:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmaţi noua parolă:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Întregul conţinut va fi eliminat, iar parola va fi resetată. Sigur doriţi acest lucru?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Parolele nu corespund."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Parola trebuie să conţină minimum 8 caractere."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Parolă incorectă."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Parolă incorectă. Mai aveţi dreptul la o singură încercare înainte ca stocarea acreditărilor să fie ştearsă."</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f297729..96605a7 100644 (file)
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(не изменялось)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(не настроено)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Хранилище регистрационных данных"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Доступ к хранилищу"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Разрешить приложениям использовать хранилище сертификатов и учет. данных"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Устанавливать с карты памяти."</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Установка с SD-карты"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Устанавливать сертификаты с карты памяти"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Установить сертификаты с SD-карты"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Установить пароль"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Установить или изменить пароль для хранилища регистрационных данных"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Очистить учетные данные"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Удалить все содержание и сбросить пароль"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ввод пароля"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Введите пароль для хранилища регистрационных данных."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Установите пароль для хранилища регистрационных данных. Он должен иметь не менее 8 знаков."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Текущий пароль:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Новый пароль:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Подтвердите новый пароль:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Все содержание будет удалено, а пароль изменен. Продолжить?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Пароли не совпадают."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"В пароле должно быть не менее 8 символов."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Неправильный пароль."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Неверный пароль. У вас осталась одна попытка, после которой хранилище регистрационных данных будет очищено."</string>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 2412c80..849a9d2 100644 (file)
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nezmenené)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nie je nastavené)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Ukladací priestor poverení"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Použiť zabezpečené poverenia"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Povoliť aplikáciám prístup k zabezpečeným certifikátom a ďalším povereniam"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Inštalovať z uklad. priestoru"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Inštalácia z karty SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Inštalovať certifikáty z ukladacieho priestoru"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Inštalovať certifikáty z karty SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Nastaviť heslo"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Nastaviť alebo zmeniť heslo pre ukladací priestor poverení"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Vymazať poverenia"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Odstrániť všetok obsah a obnoviť heslo"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Zadajte heslo"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Zadajte heslo pre ukladací priestor poverení."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Nastaviť heslo pre ukladací priestor poverení (najmenej 8 znakov)."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuálne heslo:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nové heslo:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Potvrďte nové heslo:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Všetok obsah bude odstránený a heslo bude obnovené. Naozaj chcete pokračovať?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Heslá sa nezhodujú."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Heslo musí mať aspoň 8 znakov."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Nesprávne heslo."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Nesprávne heslo. Do vymazania ukladacieho priestoru poverení vám zostáva jeden pokus."</string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 68c7f8c..d08b54c 100644 (file)
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nespremenjeno)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ni nastavljeno)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Shramba poverilnic"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Uporabi zaščitene poverilnice"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Dovoli programom dostop do zaščitenih potrdil in drugih poverilnic"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Namesti iz shrambe"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Namesti s kartice SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Namesti šifrirana potrdila iz shrambe"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Namesti potrdila s kartice SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Nastavi geslo"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Nastavitev ali spreminjanje gesla za shrambo poverilnic"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Brisanje poverilnic"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Odstranitev vsebine in obnovitev gesla"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Vnesite geslo"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Vnesite geslo za shrambo poverilnic."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Nastavite geslo za shrambo poverilnic. Imeti mora vsaj 8 znakov."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutno geslo:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Novo geslo:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Potrdite novo geslo:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Vsebina bo izbrisana in geslo ponastavljeno. Ali ste prepričani, da želite to?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Gesli se ne ujemata."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Geslo mora imeti vsaj 8 znakov"</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Napačno geslo."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Napačno geslo. Poskusite lahko še enkrat, preden se shramba poverilnic izbriše."</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 117731f..da7adb8 100644 (file)
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(непромењено)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(није подешено)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Складиште акредитива"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Коришћење безбедносних акредитива"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Дозвољавање да апликације приступе безбедносним сертификатима и другим акредитивима"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Инсталирање из меморије"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Инсталирање са SD картице"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Инсталирај сертификате из меморије"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Инсталирање сертификата са SD картице"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Подешавање лозинке"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Подешавање или промена лозинке за складиште акредитива"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Брисање акредитива"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Уклањање целокупног садржаја и поновно постављање лозинке"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Унос лозинке"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Унесите лозинку за складиште акредитива."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Подесите лозинку за складиште акредитива. Мора да има најмање 8 знакова."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Тренутна лозинка:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Нова лозинка:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Потврдите нову лозинку:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Сав садржај ће бити уклоњен, а лозинка ће бити поново постављена. Јесте ли сигурни да то желите?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Лозинке се не подударају."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Лозинка мора да има најмање 8 знакова."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Нетачна лозинка."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Нетачна лозинка. Имате још један унос пре брисања складишта акредитива."</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5f68227..79f2203 100644 (file)
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(oförändrat)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ej angivet)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Uppgiftslagring"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Använd säkra uppgifter"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Tillåt att appar får åtkomst till säkra certifikat och andra uppgifter"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installera från lagringsenhet"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Installera från SD-kort"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Installera certifikat från lagringsenhet"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Installera certifikat från SD-kort"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Ange lösenord"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Ange eller ändra lösenordet för uppgiftslagring"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Rensa användaruppgifter"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Ta bort allt innehåll och återställ lösenordet"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ange lösenord"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ange lösenordet för uppgiftslagring."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Ange lösenordet för uppgiftslagring. Det måste innehålla minst 8 tecken."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nuvarande lösenord:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nytt lösenord:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Bekräfta det nya lösenordet:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Allt innehåll tas bort och lösenordet återställs. Vill du ändå fortsätta?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Lösenorden stämmer inte överens."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Lösenordet måste innehålla minst 8 tecken."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Fel lösenord."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Fel lösenord. Du har ett försök till att ange rätt lösenord, därefter raderas uppgiftslagringen"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 37a3843..34d9aba 100644 (file)
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1873,8 +1873,6 @@
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(haijawekwa)"</string>
     <!-- no translation found for credentials_title (4446234003860769883) -->
     <skip />
-    <string name="credentials_access" msgid="4843187230913860492">"Tumia hati-tambulishi salama"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Ruhusu programu zifikie vyeti salama na hati-tambulishi zingine"</string>
     <!-- no translation found for credentials_install (466093273825150847) -->
     <skip />
     <!-- no translation found for credentials_install (953914549998062317) -->
@@ -1883,8 +1881,6 @@
     <skip />
     <!-- no translation found for credentials_install_summary (5737658257407822713) -->
     <skip />
-    <string name="credentials_set_password" msgid="9104473585811899989">"Weka nenosiri"</string>
-    <!-- outdated translation 8287876917562085701 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Weka au badilisha nenosiri la hifadhi ya hati tambulishi"</string>
     <!-- outdated translation 9170150870552453457 -->     <string name="credentials_reset" msgid="3239382277144980418">"Futa hifadhi"</string>
     <!-- outdated translation 1530388094693731636 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Futa hifadhi ya hati-tambulishi ya maudhui yote na uweke upya nenosiri lake"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ingiza nenosiri"</string>
@@ -1892,10 +1888,7 @@
     <!-- no translation found for credentials_password_hint (4915128717409363024) -->
     <skip />
     <string name="credentials_old_password" msgid="7553393815538684028">"Nenosiri la sasa:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nenosiri jipya:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Thibitisha nenosiri jipya:"</string>
     <!-- outdated translation 819990295796804516 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Una uhakika unataka kufuta hati-tambulishi zote na kuweka upya nenosiri la kuhifadhi hati-tambulishi?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Manenosiri hayaoani."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Nenosiri lazima liwe na angalau vibambo 8."</string>
     <!-- outdated translation 7525192410790152041 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Tafadhali ingiza nenosiri sahihi."</string>
     <!-- outdated translation 6392481296673345268 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Tafadhali ingiza nenosiri sahihi. Una jaribio moja zaidi la kujaribu kuingiza nenosiri sahihi kabla ya hifadhi ya hati-tambulishi kufutwa."</string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 241b22d..bfb1d07 100644 (file)
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1314,24 +1314,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(ไม่เปลี่ยน)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ไม่ได้ตั้งค่า)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"ที่จัดเก็บข้อมูลรับรอง"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"ใช้ข้อมูลรับรองความปลอดภัย"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"อนุญาตให้แอปพลิเคชันนี้เข้าถึงใบรับรองความปลอดภัยและข้อมูลรับรองอื่น"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ติดตั้งจากที่เก็บข้อมูล"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"ติดตั้งจากการ์ด SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"ติดตั้งใบรับรองจากที่เก็บข้อมูล"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"ติดตั้งใบรับรองจากการ์ด SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"ตั้งค่ารหัสผ่าน"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"ตั้งหรือเปลี่ยนรหัสผ่านสำหรับที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"ล้างข้อมูลรับรอง"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"นำข้อมูลทั้งหมดออกและรีเซ็ตรหัสผ่าน"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"ป้อนรหัสผ่าน"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"ใส่รหัสผ่านสำหรับที่จัดเก็บข้อมูลรับรอง"</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"ตั้งรหัสผ่านสำหรับที่จัดเก็บข้อมูลรับรอง ต้องมีอย่างน้อย 8 อักขระ"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"รหัสผ่านปัจจุบัน:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"รหัสผ่านใหม่:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"ยืนยันรหัสผ่านใหม่:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"เนื้อหาทั้งหมดจะถูกลบและมีการรีเซ็ตรหัสผ่านนี้ คุณแน่ใจหรือไม่"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"รหัสผ่านของคุณไม่ตรง"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"รหัสผ่านต้องมีอักขระอย่างน้อย 8 ตัว"</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"รหัสผ่านไม่ถูกต้อง"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"รหัสผ่านไม่ถูกต้อง คุณมีโอกาสหนึ่งครั้งก่อนที่ที่จัดเก็บข้อมูลรับรองจะถูกลบ"</string>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 096385c..82966fd 100644 (file)
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1314,24 +1314,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(di-nabago)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(hindi nakatakda)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Storage ng kredensyal"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Gumamit ng mga secure na kredensyal"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Payagan ang mga application upang ma-access ang mga secure na certificate at iba pang mga kredensyal"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"I-install mula sa imbakan"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"I-install mula sa SD card"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Mag-install ng mga certificate mula sa storage"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Mag-install ng mga certificate mula sa SD card"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Itakda ang password"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Itakda o baguhin ang password para sa imbakan ng kredensyal"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"I-clear ang mga kredensyal"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Alisin ang lahat ng mga nilalaman at i-reset ang password"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Magpasok ng password"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ipasok ang password para sa storage ng kredensyal."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Itakda ang password para sa storage ng kredensyal. Dapat na mayroon itong hindi bababa sa 8 character."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kasalukuyang password:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Bagong password:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Kumpirmahin ang bagong password:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Maaalis ang lahat ng mga nilalaman, at mare-reset ang password. Sigurado ka ba tungkol doon?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Hindi tumutugma ang iyong mga password."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Dapat na may hindi bababa sa 8 character ang password."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Hindi tamang password."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Hindi tamang password. Mayroon kang isa pang pagkakataon bago mabura ang imbakan ng kredensyal."</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c35c782..4a491b8 100644 (file)
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(değişmedi)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ayarlanmadı)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Kimlik bilgileri deposu"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Güvenli kimlik bilgilerini kullan"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Uygulamaların güvenli sertifikalara ve diğer kimlik bilgilerine erişmesine izin verin"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Depolama biriminden yükle"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"SD karttan yükle"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Sertifikaları depolama biriminden yükle"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Sertifikaları SD karttan yükle"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Şifreyi ayarla"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Kimlik bilgileri deposu için şifre ayarla veya mevcut şifreyi değiştir"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Kimlik bilgilerini temizle"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Tüm içeriği kaldır ve şifreyi sıfırla"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Şifreyi girin"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Kimlik bilgileri deposu için şifre girin."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Kimlik bilgileri deposu için şifreyi girin. En az 8 karakter olmalıdır."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Geçerli şifre:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Yeni şifre:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Yeni şifreyi doğrulayın:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Tüm içerik kaldırılacak ve şifre sıfırlanacak. Bundan emin misiniz?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Şifreler eşleşmiyor."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Şifre, en az 8 karakterden oluşmalıdır."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Yanlış şifre."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Yanlış şifre. Kimlik bilgileri deposu silinmeden önce tek bir şansınız kaldı."</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4c4a72d..01d2f55 100644 (file)
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(незмін.)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(не встан.)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Сховище облікових даних"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Викор. безпечні обл. дані"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Дозвол. програмі отр. доступ до безпечних сертифікатів й інших обл. даних"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Установити з носія"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Установити з карти SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Установлювати сертифікати з носія"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Установлювати сертифікати з карти SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Устан. пароль"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Установлювати чи змінювати пароль для сховища облікових даних"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Видалити облікові дані"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Видалити весь вміст і змінити пароль"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Введіть пароль"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ввести пароль для сховища облікових даних."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Установіть пароль для сховища облікових даних. Він має складатися щонайменше з 8 символів."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Поточний пароль:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Новий пароль:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Підтвердьте нов. пароль:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Увесь вміст буде видалено, а пароль буде змінено. Ви впевнені?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Паролі не збігаються."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Пароль має складатися принаймні з 8 символів."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Неправильний пароль."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Неправильний пароль. У вас залишилася ще одна спроба до очищення сховища облікових даних."</string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 45dce29..13fe9d8 100644 (file)
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(không thay đổi)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(chưa được đặt)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Lưu thông tin xác thực"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Sử dụng thông tin xác thực bảo mật"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Cho phép các ứng dụng truy cập vào chứng chỉ bảo mật và thông tin xác thực khác"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Cài đặt từ bộ nhớ"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Cài đặt từ thẻ SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Cài đặt chứng chỉ từ bộ nhớ"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Cài đặt chứng chỉ từ thẻ SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Đặt mật khẩu"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Đặt hoặc thay đổi mật khẩu cho bộ nhớ thông tin xác thực"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Xóa thông tin xác thực"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"Xóa tất cả nội dung và đặt lại mật khẩu"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Nhập mật khẩu"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Nhập mật khẩu cho bộ nhớ thông tin xác thực."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Đặt mật khẩu cho bộ nhớ thông tin xác thực. Mật khẩu phải có ít nhất 8 ký tự."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Mật khẩu hiện tại:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Mật khẩu mới:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Xác nhận mật khẩu mới:"</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"Tất cả nội dung sẽ bị xóa và mật khẩu sẽ được đặt lại. Bạn có chắc chắn việc đó không?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Mật khẩu không khớp."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Mật khẩu phải có ít nhất 8 ký tự."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Mật khẩu không chính xác."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Mật khẩu không chính xác. Bạn còn một cơ hội nữa trước khi bộ nhớ thông tin xác thực bị xóa."</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5a9107e..fe7b4c6 100644 (file)
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"（未更改）"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"（未设置）"</string>
     <string name="credentials_title" msgid="4446234003860769883">"凭据存储"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"使用安全凭证"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"允许应用程序访问安全凭证和其他凭证"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"从存储设备安装"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"从 SD 卡安装"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"从存储设备安装证书"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"从 SD 卡安装证书"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"设置密码"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"设置或更改凭据存储密码"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"清除凭据"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"删除所有内容并重置密码"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"输入密码"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"输入凭据存储密码。"</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"设置凭据存储密码（至少 8 个字符）。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"当前密码："</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"新密码："</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"确认新密码："</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"系统会删除所有内容并重置密码。您确定要执行此操作吗？"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"密码不匹配。"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"密码至少应包含 8 个字符。"</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"密码不正确。"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"密码不正确。您还可以重试一次，如果输入的密码仍不正确，系统将删除凭据存储。"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 904a91d..fa747ac 100644 (file)
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1311,24 +1311,16 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(未變更)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(未設定)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"憑證儲存空間"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"使用安全認證"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"允許應用程式存取安全認證及其他認證"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"從儲存裝置安裝"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"從 SD 卡安裝"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"從儲存裝置安裝憑證"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"從 SD 卡安裝憑證"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"設定密碼"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"設定或變更憑證儲存空間的密碼"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"清除憑證"</string>
     <string name="credentials_reset_summary" msgid="3810369467217453606">"移除所有內容並重設密碼"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"輸入密碼"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"輸入憑證儲存空間的密碼。"</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"設定憑證儲存空間的密碼，密碼至少必須包含 8 個字元。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"目前的密碼："</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"新密碼："</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"確認新密碼："</string>
     <string name="credentials_reset_hint" msgid="2336340927894094814">"這會移除所有內容並重設密碼，您確定要繼續進行嗎？"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"密碼不符。"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"密碼最少必須包含 8 個字元。"</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"密碼不正確。"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"密碼不正確。您還有 1 次輸入密碼的機會，如果輸入錯誤，憑證儲存空間將遭到清除。"</string>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9ecc93b..b74a92e 100644 (file)
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1873,8 +1873,6 @@
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(akuhleliwe)"</string>
     <!-- no translation found for credentials_title (4446234003860769883) -->
     <skip />
-    <string name="credentials_access" msgid="4843187230913860492">"Sebenzisa iziqinisekiso ezivikelekile"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Vumela izinhlelo zokusebenza ukufinyelela izitifikethi eziphephile nezinye iziqinisekiso"</string>
     <!-- no translation found for credentials_install (466093273825150847) -->
     <skip />
     <!-- no translation found for credentials_install (953914549998062317) -->
@@ -1883,8 +1881,6 @@
     <skip />
     <!-- no translation found for credentials_install_summary (5737658257407822713) -->
     <skip />
-    <string name="credentials_set_password" msgid="9104473585811899989">"Hlela iphasiwedi"</string>
-    <!-- outdated translation 8287876917562085701 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Hlela noma shintsha ukuqinisekisa iphasiwedi yokugcina"</string>
     <!-- outdated translation 9170150870552453457 -->     <string name="credentials_reset" msgid="3239382277144980418">"Sula ukugcina"</string>
     <!-- outdated translation 1530388094693731636 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Sula ukugcina ukuqinisekisa kwakho konke okuqukethwe bese uhlela futhi iphasiwedi yayo."</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Faka iphasiwedi"</string>
@@ -1892,10 +1888,7 @@
     <!-- no translation found for credentials_password_hint (4915128717409363024) -->
     <skip />
     <string name="credentials_old_password" msgid="7553393815538684028">"Iphasiwedi yamanje:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Iphasiwedi entsha:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Qinisekisa iphasiwedi entsha:"</string>
     <!-- outdated translation 819990295796804516 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Uqinisekile ukuthi ufuna ukusula zonke iziqinisekiso bese uhlela futhi iphasiwedi yokugcina ukuqinisekisa?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Amaphasiwedi awafani."</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Okungenani iphasiwedi kumele ibe nezinhlamvu ezingu-8."</string>
     <!-- outdated translation 7525192410790152041 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Sicela ufake iphasiwedi elungile."</string>
     <!-- outdated translation 6392481296673345268 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Sicela ufake iphasiwedi elungile. Unokuzama okukodwa kokufaka iphasiwedi elungile ngaphambi kokuba ukugcina isiqinisekiso kusulwe."</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 064700f..9d3f939 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -744,8 +744,8 @@
     <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_password_summary">Require a password to unlock the screen</string>
 
-    <!-- Summary for preference that has been disabled by DevicePolicyAdmin [CHAR LIMIT=50] -->
-    <string name="unlock_set_unlock_disabled_summary">Disabled by administrator or encryption policy</string>
+    <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
+    <string name="unlock_set_unlock_disabled_summary">Disabled by administrator, encryption policy, or credential storage</string>
 
     <!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_mode_off">Off</string>
@@ -3022,10 +3022,6 @@ found in the list of installed applications.</string>
 
     <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
     <string name="credentials_title">Credential storage</string>
-    <!-- Title of preference to enable/dislable access to credential storage [CHAR LIMIT=30] -->
-    <string name="credentials_access">Use secure credentials</string>
-    <!-- Summary of preference to enable/dislable access to credential storage [CHAR LIMIT=NONE] -->
-    <string name="credentials_access_summary">Allow applications to access secure certificates and other credentials</string>
     <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
     <string name="credentials_install" product="nosdcard">Install from storage</string>
     <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
@@ -3034,31 +3030,19 @@ found in the list of installed applications.</string>
     <string name="credentials_install_summary" product="nosdcard">Install certificates from storage</string>
     <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
     <string name="credentials_install_summary" product="default">Install certificates from SD card</string>
-    <!-- Title of preference to set the password for credential storage [CHAR LIMIT=30] -->
-    <string name="credentials_set_password">Set password</string>
-    <!-- Summary of preference to set the password for credential storage [CHAR LIMIT=NONE] -->
-    <string name="credentials_set_password_summary">Set or change the password for credential storage</string>
     <!-- Title of preference to reset credential storage [CHAR LIMIT=30] -->
     <string name="credentials_reset">Clear credentials</string>
     <!-- Summary of preference to reset credential storage [CHAR LIMIT=NONE] -->
-    <string name="credentials_reset_summary">Remove all the contents and reset the password</string>
+    <string name="credentials_reset_summary">Remove all certificates</string>
 
     <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
     <string name="credentials_unlock">Enter password</string>
     <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
     <string name="credentials_unlock_hint">Enter the password for credential storage.</string>
-    <!-- Description of dialog to set the password for credential storage [CHAR LIMIT=NONE] -->
-    <string name="credentials_password_hint">Set the password for credential storage. It must have at least 8 characters.</string>
     <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
     <string name="credentials_old_password">Current password:</string>
-    <!-- Description of the input box for the new password [CHAR LIMIT=30] -->
-    <string name="credentials_new_password">New password:</string>
-    <!-- Description of the input box to confirm the new password [CHAR LIMIT=30] -->
-    <string name="credentials_confirm_password">Confirm new password:</string>
     <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
-    <string name="credentials_reset_hint">All the contents will be removed, and the password will be reset. Are you sure about that?</string>
-    <!-- Error message [CHAR LIMIT=NONE] -->
-    <string name="credentials_passwords_mismatch">Passwords do not match.</string>
+    <string name="credentials_reset_hint">All the contents will be removed. Are you sure about that?</string>
     <string name="credentials_password_too_short">The password must have at least 8 characters.</string>
     <!-- Error message [CHAR LIMIT=NONE] -->
     <string name="credentials_wrong_password">Incorrect password.</string>
@@ -3068,10 +3052,12 @@ found in the list of installed applications.</string>
     <string name="credentials_reset_warning_plural">Incorrect password. You have <xliff:g id="number" example="5">%1$d</xliff:g> more chances before credential storage is erased.</string>
     <!-- Toast message [CHAR LIMIT=30] -->
     <string name="credentials_erased">Credential storage is erased.</string>
-    <!-- Toast message [CHAR LIMIT=30] -->
-    <string name="credentials_not_erased">Credential could not be erased.</string>
+    <!-- Toast message [CHAR LIMIT=30] when credential storage containing private keys and certificates could not be erased (opposite of string credentials_erased) -->
+    <string name="credentials_not_erased">Credential storage could not be erased.</string>
     <!-- Toast message [CHAR LIMIT=30] -->
     <string name="credentials_enabled">Credential storage is enabled.</string>
+    <!-- Description of dialog to explain that a lock screen password is required to use credential storage [CHAR LIMIT=NONE] -->
+    <string name="credentials_configure_lock_screen_hint">You must set a lock screen PIN or password before you can use credential storage. Would you like to do that now?</string>
 
     <!-- Sound settings screen, setting check box label -->
     <string name="emergency_tone_title">Emergency tone</string>

diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index 68ee8c0..95b2aca 100644 (file)
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -47,11 +47,6 @@
 
     <PreferenceCategory android:title="@string/credentials_title"
             android:persistent="false">
-        <CheckBoxPreference android:key="enable_credentials"
-                android:title="@string/credentials_access"
-                android:summary="@string/credentials_access_summary"
-                android:persistent="false"/>
-
         <Preference android:title="@string/credentials_install"
                 android:summary="@string/credentials_install_summary"
                 android:persistent="false">
@@ -60,14 +55,6 @@
                     android:targetClass="com.android.certinstaller.CertInstallerMain"/>
         </Preference>
 
-        <Preference android:title="@string/credentials_set_password"
-                android:summary="@string/credentials_set_password_summary"
-                android:persistent="false">
-            <intent android:action="com.android.credentials.SET_PASSWORD"
-                    android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.CredentialStorage"/>
-        </Preference>
-
         <Preference android:key="reset_credentials"
                 android:title="@string/credentials_reset"
                 android:summary="@string/credentials_reset_summary"

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 118bc6f..8311c4a 100644 (file)
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -27,6 +27,7 @@ import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
+import android.security.KeyStore;
 
 public class ChooseLockGeneric extends PreferenceActivity {
 
@@ -48,9 +49,11 @@ public class ChooseLockGeneric extends PreferenceActivity {
         private static final int CONFIRM_EXISTING_REQUEST = 100;
         private static final String PASSWORD_CONFIRMED = "password_confirmed";
         private static final String CONFIRM_CREDENTIALS = "confirm_credentials";
+        public static final String MINIMUM_QUALITY_KEY = "minimum_quality";
 
         private ChooseLockSettingsHelper mChooseLockSettingsHelper;
         private DevicePolicyManager mDPM;
+        private KeyStore mKeyStore;
         private boolean mPasswordConfirmed = false;
 
         @Override
@@ -58,6 +61,7 @@ public class ChooseLockGeneric extends PreferenceActivity {
             super.onCreate(savedInstanceState);
 
             mDPM = (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+            mKeyStore = KeyStore.getInstance();
             mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this.getActivity());
 
             if (savedInstanceState != null) {
@@ -126,8 +130,8 @@ public class ChooseLockGeneric extends PreferenceActivity {
                     .getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, -1);
             if (quality == -1) {
                 // If caller didn't specify password quality, show UI and allow the user to choose.
-                quality = mDPM.getPasswordQuality(null);
-                quality = upgradeQualityForEncryption(quality);
+                quality = getActivity().getIntent().getIntExtra(MINIMUM_QUALITY_KEY, -1);
+                quality = upgradeQuality(quality);
                 final PreferenceScreen prefScreen = getPreferenceScreen();
                 if (prefScreen != null) {
                     prefScreen.removeAll();
@@ -135,11 +139,26 @@ public class ChooseLockGeneric extends PreferenceActivity {
                 addPreferencesFromResource(R.xml.security_settings_picker);
                 disableUnusablePreferences(quality);
             } else {
-                quality = upgradeQualityForEncryption(quality);
                 updateUnlockMethodAndFinish(quality, false);
             }
         }
 
+        private int upgradeQuality(int quality) {
+            quality = upgradeQualityForDPM(quality);
+            quality = upgradeQualityForEncryption(quality);
+            quality = upgradeQualityForKeyStore(quality);
+            return quality;
+        }
+
+        private int upgradeQualityForDPM(int quality) {
+            // Compare min allowed password quality
+            int minQuality = mDPM.getPasswordQuality(null);
+            if (quality < minQuality) {
+                quality = minQuality;
+            }
+            return quality;
+        }
+
         /**
          * Mix in "encryption minimums" to any given quality value.  This prevents users
          * from downgrading the pattern/pin/password to a level below the minimums.
@@ -152,8 +171,17 @@ public class ChooseLockGeneric extends PreferenceActivity {
             boolean encrypted = (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE)
                     || (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING);
             if (encrypted) {
-                if (quality < DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
-                    quality = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
+                if (quality < CryptKeeperSettings.MIN_PASSWORD_QUALITY) {
+                    quality = CryptKeeperSettings.MIN_PASSWORD_QUALITY;
+                }
+            }
+            return quality;
+        }
+
+        private int upgradeQualityForKeyStore(int quality) {
+            if (!mKeyStore.isEmpty()) {
+                if (quality < CredentialStorage.MIN_PASSWORD_QUALITY) {
+                    quality = CredentialStorage.MIN_PASSWORD_QUALITY;
                 }
             }
             return quality;
@@ -208,13 +236,7 @@ public class ChooseLockGeneric extends PreferenceActivity {
                 throw new IllegalStateException("Tried to update password without confirming it");
             }
 
-            // Compare min allowed password quality and launch appropriate security setting method
-            int minQuality = mDPM.getPasswordQuality(null);
-            if (quality < minQuality) {
-                quality = minQuality;
-            }
-            quality = upgradeQualityForEncryption(quality);
-
+            quality = upgradeQuality(quality);
             if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
                 int minLength = mDPM.getPasswordMinimumLength(null);
                 if (minLength < MIN_PASSWORD_LENGTH) {

diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index a47c06d..d926d47 100644 (file)
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -18,18 +18,14 @@ package com.android.settings;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.content.ComponentName;
-import android.content.Context;
+import android.app.admin.DevicePolicyManager;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.ServiceConnection;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.IBinder;
 import android.os.RemoteException;
-import android.security.KeyChain;
 import android.security.KeyChain.KeyChainConnection;
-import android.security.IKeyChainService;
+import android.security.KeyChain;
 import android.security.KeyStore;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -38,208 +34,105 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
+import com.android.internal.widget.LockPatternUtils;
 
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.io.UnsupportedEncodingException;
+public class CredentialStorage extends Activity {
 
-public class CredentialStorage extends Activity implements TextWatcher,
-        DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
+    private static final String TAG = "CredentialStorage";
 
     public static final String ACTION_UNLOCK = "com.android.credentials.UNLOCK";
-    public static final String ACTION_SET_PASSWORD = "com.android.credentials.SET_PASSWORD";
     public static final String ACTION_INSTALL = "com.android.credentials.INSTALL";
     public static final String ACTION_RESET = "com.android.credentials.RESET";
 
-    private static final String TAG = "CredentialStorage";
+    // This is the minimum acceptable password quality.  If the current password quality is
+    // lower than this, keystore should not be activated.
+    static final int MIN_PASSWORD_QUALITY = DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
 
-    private KeyStore mKeyStore = KeyStore.getInstance();
-    private boolean mPositive = false;
-    private boolean mNeutral = false;
+    private final KeyStore mKeyStore = KeyStore.getInstance();
     private Bundle mBundle;
 
-    private TextView mOldPassword;
-    private TextView mNewPassword;
-    private TextView mConfirmPassword;
-    private TextView mError;
-    private Button mButton;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    @Override protected void onResume() {
+        super.onResume();
 
         Intent intent = getIntent();
         String action = intent.getAction();
-        int state = mKeyStore.test();
 
         if (ACTION_RESET.equals(action)) {
-            showResetDialog();
-        } else if (ACTION_SET_PASSWORD.equals(action)) {
-            showPasswordDialog(state == KeyStore.UNINITIALIZED);
+            new ResetDialog();
         } else {
+            if (!checkKeyguardQuality()) {
+                new ConfigureLockScreenDialog();
+                return;
+            }
             if (ACTION_INSTALL.equals(action) &&
                     "com.android.certinstaller".equals(getCallingPackage())) {
                 mBundle = intent.getExtras();
             }
-            if (state == KeyStore.UNINITIALIZED) {
-                showPasswordDialog(true);
-            } else if (state == KeyStore.LOCKED) {
-                showUnlockDialog();
-            } else {
-                install();
-                finish();
+            // ACTION_UNLOCK also handled here
+            switch (mKeyStore.state()) {
+                case UNINITIALIZED:
+                    // if we had a keyguard set, we should be initialized
+                    throw new AssertionError();
+                case LOCKED:
+                    // if we have a keyguard, why didn't we unlock?
+                    // possibly old style password, display prompt
+                    new UnlockDialog();
+                    break;
+                case UNLOCKED:
+                    install();
+                    finish();
+                    break;
             }
         }
     }
 
+    private boolean checkKeyguardQuality() {
+        int quality = new LockPatternUtils(this).getActivePasswordQuality();
+        return (quality >= MIN_PASSWORD_QUALITY);
+    }
+
     private void install() {
         if (mBundle != null && !mBundle.isEmpty()) {
-            try {
-                for (String key : mBundle.keySet()) {
-                    byte[] value = mBundle.getByteArray(key);
-                    if (value != null && !mKeyStore.put(key.getBytes("UTF-8"), value)) {
-                        Log.e(TAG, "Failed to install " + key);
-                        return;
-                    }
+            for (String key : mBundle.keySet()) {
+                byte[] value = mBundle.getByteArray(key);
+                if (value != null && !mKeyStore.put(key, value)) {
+                    Log.e(TAG, "Failed to install " + key);
+                    return;
                 }
-                setResult(RESULT_OK);
-            } catch (UnsupportedEncodingException e) {
-                // Should never happen.
-                throw new RuntimeException(e);
             }
+            setResult(RESULT_OK);
         }
     }
 
-    private void showResetDialog() {
-        AlertDialog dialog = new AlertDialog.Builder(this)
-                .setTitle(android.R.string.dialog_alert_title)
-                .setIcon(android.R.drawable.ic_dialog_alert)
-                .setMessage(R.string.credentials_reset_hint)
-                .setNeutralButton(android.R.string.ok, this)
-                .setNegativeButton(android.R.string.cancel, this)
-                .create();
-        dialog.setOnDismissListener(this);
-        dialog.show();
-    }
-
-    private void showPasswordDialog(boolean firstTime) {
-        View view = View.inflate(this, R.layout.credentials_dialog, null);
-
-        ((TextView) view.findViewById(R.id.hint)).setText(R.string.credentials_password_hint);
-        if (!firstTime) {
-            view.findViewById(R.id.old_password_prompt).setVisibility(View.VISIBLE);
-            mOldPassword = (TextView) view.findViewById(R.id.old_password);
-            mOldPassword.setVisibility(View.VISIBLE);
-            mOldPassword.addTextChangedListener(this);
+    private class ResetDialog
+            implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener
+    {
+        private boolean mResetConfirmed;
+
+        private ResetDialog() {
+            AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this)
+                    .setTitle(android.R.string.dialog_alert_title)
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setMessage(R.string.credentials_reset_hint)
+                    .setPositiveButton(android.R.string.ok, this)
+                    .setNegativeButton(android.R.string.cancel, this)
+                    .create();
+            dialog.setOnDismissListener(this);
+            dialog.show();
         }
-        view.findViewById(R.id.new_passwords).setVisibility(View.VISIBLE);
-        mNewPassword = (TextView) view.findViewById(R.id.new_password);
-        mNewPassword.addTextChangedListener(this);
-        mConfirmPassword = (TextView) view.findViewById(R.id.confirm_password);
-        mConfirmPassword.addTextChangedListener(this);
-        mError = (TextView) view.findViewById(R.id.error);
-
-        AlertDialog dialog = new AlertDialog.Builder(this)
-                .setView(view)
-                .setTitle(R.string.credentials_set_password)
-                .setPositiveButton(android.R.string.ok, this)
-                .setNegativeButton(android.R.string.cancel, this)
-                .create();
-        dialog.setOnDismissListener(this);
-        dialog.show();
-        mButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
-        mButton.setEnabled(false);
-    }
 
-    private void showUnlockDialog() {
-        View view = View.inflate(this, R.layout.credentials_dialog, null);
-
-        ((TextView) view.findViewById(R.id.hint)).setText(R.string.credentials_unlock_hint);
-        mOldPassword = (TextView) view.findViewById(R.id.old_password);
-        mOldPassword.setVisibility(View.VISIBLE);
-        mOldPassword.addTextChangedListener(this);
-        mError = (TextView) view.findViewById(R.id.error);
-
-        AlertDialog dialog = new AlertDialog.Builder(this)
-                .setView(view)
-                .setTitle(R.string.credentials_unlock)
-                .setPositiveButton(android.R.string.ok, this)
-                .setNegativeButton(android.R.string.cancel, this)
-                .create();
-        dialog.setOnDismissListener(this);
-        dialog.show();
-        mButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
-        mButton.setEnabled(false);
-    }
-
-    public void afterTextChanged(Editable editable) {
-        if ((mOldPassword == null || mOldPassword.getText().length() > 0) &&
-            (mNewPassword == null || mNewPassword.getText().length() >= 8) &&
-            (mConfirmPassword == null || mConfirmPassword.getText().length() >= 8)) {
-            mButton.setEnabled(true);
-        } else {
-            mButton.setEnabled(false);
+        @Override public void onClick(DialogInterface dialog, int button) {
+            mResetConfirmed = (button == DialogInterface.BUTTON_POSITIVE);
         }
-    }
-
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-    }
-
-    public void onTextChanged(CharSequence s,int start, int before, int count) {
-    }
-
-    public void onClick(DialogInterface dialog, int button) {
-        mPositive = (button == DialogInterface.BUTTON_POSITIVE);
-        mNeutral = (button == DialogInterface.BUTTON_NEUTRAL);
-    }
-
-    public void onDismiss(DialogInterface dialog) {
-        if (mPositive) {
-            mPositive = false;
-            mError.setVisibility(View.VISIBLE);
-
-            if (mNewPassword == null) {
-                mKeyStore.unlock(mOldPassword.getText().toString());
-            } else {
-                String newPassword = mNewPassword.getText().toString();
-                String confirmPassword = mConfirmPassword.getText().toString();
-
-                if (!newPassword.equals(confirmPassword)) {
-                    mError.setText(R.string.credentials_passwords_mismatch);
-                    ((AlertDialog) dialog).show();
-                    return;
-                } else if (mOldPassword == null) {
-                    mKeyStore.password(newPassword);
-                } else {
-                    mKeyStore.password(mOldPassword.getText().toString(), newPassword);
-                }
-            }
 
-            int error = mKeyStore.getLastError();
-            if (error == KeyStore.NO_ERROR) {
-                Toast.makeText(this, R.string.credentials_enabled, Toast.LENGTH_SHORT).show();
-                install();
-            } else if (error == KeyStore.UNINITIALIZED) {
-                Toast.makeText(this, R.string.credentials_erased,  Toast.LENGTH_SHORT).show();
-            } else if (error >= KeyStore.WRONG_PASSWORD) {
-                int count = error - KeyStore.WRONG_PASSWORD + 1;
-                if (count > 3) {
-                    mError.setText(R.string.credentials_wrong_password);
-                } else if (count == 1) {
-                    mError.setText(R.string.credentials_reset_warning);
-                } else {
-                    mError.setText(getString(R.string.credentials_reset_warning_plural, count));
-                }
-                ((AlertDialog) dialog).show();
+        @Override public void onDismiss(DialogInterface dialog) {
+            if (mResetConfirmed) {
+                mResetConfirmed = false;
+                new ResetKeyStoreAndKeyChain().execute();
                 return;
             }
+            finish();
         }
-        if (mNeutral) {
-            mNeutral = false;
-            new ResetKeyStoreAndKeyChain().execute();
-            return;
-        }
-        finish();
     }
 
     private class ResetKeyStoreAndKeyChain extends AsyncTask<Void, Void, Boolean> {
@@ -274,4 +167,114 @@ public class CredentialStorage extends Activity implements TextWatcher,
             finish();
         }
     }
+
+    private class ConfigureLockScreenDialog
+            implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener
+    {
+        private boolean mConfigureConfirmed;
+
+        private ConfigureLockScreenDialog() {
+            AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this)
+                    .setTitle(android.R.string.dialog_alert_title)
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setMessage(R.string.credentials_configure_lock_screen_hint)
+                    .setPositiveButton(android.R.string.ok, this)
+                    .setNegativeButton(android.R.string.cancel, this)
+                    .create();
+            dialog.setOnDismissListener(this);
+            dialog.show();
+        }
+
+        @Override public void onClick(DialogInterface dialog, int button) {
+            mConfigureConfirmed = (button == DialogInterface.BUTTON_POSITIVE);
+        }
+
+        @Override public void onDismiss(DialogInterface dialog) {
+            if (mConfigureConfirmed) {
+                mConfigureConfirmed = false;
+                Intent intent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD);
+                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                                MIN_PASSWORD_QUALITY);
+                startActivity(intent);
+                return;
+            }
+            finish();
+        }
+    }
+
+    private class UnlockDialog implements TextWatcher,
+            DialogInterface.OnClickListener, DialogInterface.OnDismissListener
+    {
+        private boolean mUnlockConfirmed;
+
+        private final Button mButton;
+        private final TextView mOldPassword;
+        private final TextView mError;
+
+        private UnlockDialog() {
+            View view = View.inflate(CredentialStorage.this, R.layout.credentials_dialog, null);
+
+            ((TextView) view.findViewById(R.id.hint)).setText(R.string.credentials_unlock_hint);
+            mOldPassword = (TextView) view.findViewById(R.id.old_password);
+            mOldPassword.setVisibility(View.VISIBLE);
+            mOldPassword.addTextChangedListener(this);
+            mError = (TextView) view.findViewById(R.id.error);
+
+            AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this)
+                    .setView(view)
+                    .setTitle(R.string.credentials_unlock)
+                    .setPositiveButton(android.R.string.ok, this)
+                    .setNegativeButton(android.R.string.cancel, this)
+                    .create();
+            dialog.setOnDismissListener(this);
+            dialog.show();
+            mButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+            mButton.setEnabled(false);
+        }
+
+        @Override public void afterTextChanged(Editable editable) {
+            mButton.setEnabled(mOldPassword == null || mOldPassword.getText().length() > 0);
+        }
+
+        @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        }
+
+        @Override public void onTextChanged(CharSequence s,int start, int before, int count) {
+        }
+
+        @Override public void onClick(DialogInterface dialog, int button) {
+            mUnlockConfirmed = (button == DialogInterface.BUTTON_POSITIVE);
+        }
+
+        @Override public void onDismiss(DialogInterface dialog) {
+            if (mUnlockConfirmed) {
+                mUnlockConfirmed = false;
+                mError.setVisibility(View.VISIBLE);
+                mKeyStore.unlock(mOldPassword.getText().toString());
+                int error = mKeyStore.getLastError();
+                if (error == KeyStore.NO_ERROR) {
+                    Toast.makeText(CredentialStorage.this,
+                                   R.string.credentials_enabled,
+                                   Toast.LENGTH_SHORT).show();
+                    install();
+                } else if (error == KeyStore.UNINITIALIZED) {
+                    Toast.makeText(CredentialStorage.this,
+                                   R.string.credentials_erased,
+                                   Toast.LENGTH_SHORT).show();
+                } else if (error >= KeyStore.WRONG_PASSWORD) {
+                    int count = error - KeyStore.WRONG_PASSWORD + 1;
+                    if (count > 3) {
+                        mError.setText(R.string.credentials_wrong_password);
+                    } else if (count == 1) {
+                        mError.setText(R.string.credentials_reset_warning);
+                    } else {
+                        mError.setText(getString(R.string.credentials_reset_warning_plural, count));
+                    }
+                    ((AlertDialog) dialog).show();
+                    return;
+                }
+            }
+            finish();
+        }
+    }
 }

diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index 10fa8ac..20fd652 100644 (file)
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -37,16 +37,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
-/**
- * Confirm and execute a reset of the device to a clean "just out of the box"
- * state.  Multiple confirmations are required: first, a general "are you sure
- * you want to do this?" prompt, followed by a keyguard pattern trace if the user
- * has defined one, followed by a final strongly-worded "THIS WILL ERASE EVERYTHING
- * ON THE PHONE" prompt.  If at any time the phone is allowed to go to sleep, is
- * locked, et cetera, then the confirmation sequence is abandoned.
- *
- * This is the initial screen.
- */
 public class CryptKeeperSettings extends Fragment {
     private static final String TAG = "CryptKeeper";
 
@@ -54,7 +44,7 @@ public class CryptKeeperSettings extends Fragment {
 
     // This is the minimum acceptable password quality.  If the current password quality is
     // lower than this, encryption should not be activated.
-    private static final int MIN_PASSWORD_QUALITY = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
+    static final int MIN_PASSWORD_QUALITY = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
 
     // Minimum battery charge level (in percent) to launch encryption.  If the battery charge is
     // lower than this, encryption should not be activated.
@@ -163,7 +153,7 @@ public class CryptKeeperSettings extends Fragment {
      */
     private boolean runKeyguardConfirmation(int request) {
         // 1.  Confirm that we have a sufficient PIN/Password to continue
-        int quality = new LockPatternUtils(getActivity()).getKeyguardStoredPasswordQuality();
+        int quality = new LockPatternUtils(getActivity()).getActivePasswordQuality();
         if (quality < MIN_PASSWORD_QUALITY) {
             return false;
         }

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index dc4c42b..5d77e53 100644 (file)
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -70,7 +70,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
     // Misc Settings
     private static final String KEY_SIM_LOCK = "sim_lock";
     private static final String KEY_SHOW_PASSWORD = "show_password";
-    private static final String KEY_ENABLE_CREDENTIALS = "enable_credentials";
     private static final String KEY_RESET_CREDENTIALS = "reset_credentials";
 
     private static final String TAG = "SecuritySettings";
@@ -98,7 +97,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
 
     private CheckBoxPreference mShowPassword;
 
-    private CheckBoxPreference mEnableCredentials;
     private Preference mResetCredentials;
 
     @Override
@@ -239,8 +237,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
         mShowPassword = (CheckBoxPreference) root.findPreference(KEY_SHOW_PASSWORD);
 
         // Credential storage
-        mEnableCredentials = (CheckBoxPreference) root.findPreference(KEY_ENABLE_CREDENTIALS);
-        mEnableCredentials.setOnPreferenceChangeListener(this);
         mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS);
 
         return root;
@@ -337,10 +333,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
         mShowPassword.setChecked(Settings.System.getInt(getContentResolver(),
                 Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
 
-        int state = KeyStore.getInstance().test();
-        mEnableCredentials.setChecked(state == KeyStore.NO_ERROR);
-        mEnableCredentials.setEnabled(state != KeyStore.UNINITIALIZED);
-        mResetCredentials.setEnabled(state != KeyStore.UNINITIALIZED);
+        KeyStore.State state = KeyStore.getInstance().state();
+        mResetCredentials.setEnabled(state != KeyStore.State.UNINITIALIZED);
     }
 
     @Override
@@ -430,13 +424,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
             // activity will be restated and the new value re-read, so the checkbox will get its
             // new value then.
             return false;
-        } else if (preference == mEnableCredentials) {
-            if (value != null && (Boolean) value) {
-                getActivity().startActivity(new Intent(CredentialStorage.ACTION_UNLOCK));
-                return false;
-            } else {
-                KeyStore.getInstance().lock();
-            }
         }
         return true;
     }

diff --git a/src/com/android/settings/vpn/VpnSettings.java b/src/com/android/settings/vpn/VpnSettings.java
index 5d75b6a..9b96761 100644 (file)
--- a/src/com/android/settings/vpn/VpnSettings.java
+++ b/src/com/android/settings/vpn/VpnSettings.java
@@ -55,6 +55,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.nio.charset.Charsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -698,7 +699,7 @@ public class VpnSettings extends SettingsPreferenceFragment
     }
 
     private boolean isKeyStoreUnlocked() {
-        return mKeyStore.test() == KeyStore.NO_ERROR;
+        return mKeyStore.state() == KeyStore.State.UNLOCKED;
     }
 
     // Returns true if the profile needs to access keystore
@@ -1034,7 +1035,7 @@ public class VpnSettings extends SettingsPreferenceFragment
                 String presharedKey = pskProfile.getPresharedKey();
                 String key = KEY_PREFIX_IPSEC_PSK + p.getId();
                 if (!TextUtils.isEmpty(presharedKey) &&
-                        !mKeyStore.put(key, presharedKey)) {
+                        !mKeyStore.put(key, presharedKey.getBytes(Charsets.UTF_8))) {
                     Log.e(TAG, "keystore write failed: key=" + key);
                 }
                 pskProfile.setPresharedKey(key);
@@ -1046,7 +1047,7 @@ public class VpnSettings extends SettingsPreferenceFragment
                 if (l2tpProfile.isSecretEnabled()) {
                     String secret = l2tpProfile.getSecretString();
                     if (!TextUtils.isEmpty(secret) &&
-                            !mKeyStore.put(key, secret)) {
+                            !mKeyStore.put(key, secret.getBytes(Charsets.UTF_8))) {
                         Log.e(TAG, "keystore write failed: key=" + key);
                     }
                     l2tpProfile.setSecretString(key);

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 7e07162..993633f 100644 (file)
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -245,7 +245,7 @@ public class WifiSettings extends SettingsPreferenceFragment
 
         getActivity().registerReceiver(mReceiver, mFilter);
         if (mKeyStoreNetworkId != INVALID_NETWORK_ID &&
-                KeyStore.getInstance().test() == KeyStore.NO_ERROR) {
+                KeyStore.getInstance().state() == KeyStore.State.UNLOCKED) {
             mWifiManager.connectNetwork(mKeyStoreNetworkId);
         }
         mKeyStoreNetworkId = INVALID_NETWORK_ID;
@@ -417,7 +417,7 @@ public class WifiSettings extends SettingsPreferenceFragment
 
     private boolean requireKeyStore(WifiConfiguration config) {
         if (WifiConfigController.requireKeyStore(config) &&
-                KeyStore.getInstance().test() != KeyStore.NO_ERROR) {
+                KeyStore.getInstance().state() != KeyStore.State.UNLOCKED) {
             mKeyStoreNetworkId = config.networkId;
             Credentials.getInstance().unlock(getActivity());
             return true;