summaryrefslogtreecommitdiffstats
path: root/res/values-ca
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2011-05-25 13:24:20 -0700
committerBrian Carlstrom <bdc@google.com>2011-06-01 10:47:42 -0700
commitd4023b7cca11e33e84df39dee9e9a737efab47c2 (patch)
treea204d6a63ffe26ad92c17438494b58b9c3118dfa /res/values-ca
parenta862f2b14b94fe246a1f47919885d9a81ede9376 (diff)
downloadpackages_apps_settings-d4023b7cca11e33e84df39dee9e9a737efab47c2.zip
packages_apps_settings-d4023b7cca11e33e84df39dee9e9a737efab47c2.tar.gz
packages_apps_settings-d4023b7cca11e33e84df39dee9e9a737efab47c2.tar.bz2
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
Diffstat (limited to 'res/values-ca')
-rw-r--r--res/values-ca/strings.xml8
1 files changed, 0 insertions, 8 deletions
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f839b95..0badb81 100644
--- 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>