diff options
| author | Vincent <valodim@mugenguild.com> | 2016-04-04 10:53:11 +0200 |
|---|---|---|
| committer | Vincent <valodim@mugenguild.com> | 2016-04-04 10:53:11 +0200 |
| commit | e0463ec8180cee0af9d9987a3d529d391cfe6a2e (patch) | |
| tree | 5b289f54ccc509bb5e5906f11103f8288e6229b6 /OpenKeychain/src/main/res/values/strings.xml | |
| parent | f98279bc7002a0cb1ca073cd1c57a36b8b491211 (diff) | |
| parent | cb9bdb3cf72ec387e6f34d29a31e701f5f5e7d92 (diff) | |
| download | open-keychain-e0463ec8180cee0af9d9987a3d529d391cfe6a2e.tar.gz open-keychain-e0463ec8180cee0af9d9987a3d529d391cfe6a2e.tar.bz2 open-keychain-e0463ec8180cee0af9d9987a3d529d391cfe6a2e.zip | |
Merge pull request #1796 from AlexFJW/LimitCreateKeyOptions
Refer to issue #1600 Limit create key options
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index c8a07c8ef..8e29fc00f 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -13,6 +13,7 @@ <string name="title_encrypt_files">"Encrypt"</string> <string name="title_decrypt">"Decrypt"</string> <string name="title_add_subkey">"Add subkey"</string> + <string name="title_change_master_key">Change master key</string> <string name="title_edit_key">"Edit Key"</string> <string name="title_linked_create">"Create a Linked Identity"</string> <string name="title_preferences">"Settings"</string> @@ -165,6 +166,7 @@ <string name="label_keyservers">"Select OpenPGP keyservers"</string> <string name="label_key_id">"Key ID"</string> <string name="label_key_created">"Key created %s"</string> + <string name="label_key_type">"Type"</string> <string name="label_creation">"Creation"</string> <string name="label_expiry">"Expiry"</string> <string name="label_usage">"Usage"</string> @@ -282,23 +284,26 @@ <string name="choice_8hours">"8 hours"</string> <string name="choice_forever">"forever"</string> <string name="choice_select_cert">"Select a Key"</string> - <string name="dsa">"DSA"</string> - <string name="elgamal">"ElGamal"</string> - <string name="rsa">"RSA"</string> - <string name="ecdh">"ECDH"</string> - <string name="ecdsa">"ECDSA"</string> <string name="filemanager_title_open">"Open…"</string> + <string name="rsa_2048">"RSA 2048"</string> + <string name="rsa_2048_description_html">"smaller filesize, considered secure until 2030"</string> + <string name="rsa_3072">"RSA 3072"</string> + <string name="rsa_3072_description_html">"recommended, considered secure until 2040"</string> + <string name="rsa_4096">"RSA 4096"</string> + <string name="rsa_4096_description_html">"larger file size, considered secure until 2040+"</string> + <string name="ecc_p256">"ECC P-256"</string> + <string name="ecc_p256_description_html">"very tiny filesize, considered secure until 2040 <br/> <u>experimental and not supported by all implementations</u>"</string> + <string name="ecc_p521">"ECC P-521"</string> + <string name="ecc_p521_description_html">"tiny filesize, considered secure until 2040+ <br/> <u>experimental and not supported by all implementations"</u></string> + <string name="usage_none">"None (subkey binding only)"</string> + <string name="usage_sign">"Sign"</string> + <string name="usage_encrypt">"Encrypt"</string> + <string name="usage_sign_and_encrypt">"Sign & Encrypt"</string> <string name="error">"Error"</string> <string name="error_message">"Error: %s"</string> <string name="theme_dark">"Dark"</string> <string name="theme_light">"Light"</string> - <!-- key flags --> - <string name="flag_certify">"Certify"</string> - <string name="flag_sign">"Sign"</string> - <string name="flag_encrypt">"Encrypt"</string> - <string name="flag_authenticate">"Authenticate"</string> - <!-- sentences --> <string name="wrong_passphrase">"Wrong password."</string> <string name="no_filemanager_installed">"No compatible file manager installed."</string> @@ -747,7 +752,7 @@ <item>"Move Subkey to Security Token"</item> </string-array> <string name="edit_key_new_subkey">"new subkey"</string> - <string name="edit_key_select_flag">"Please select at least one flag!"</string> + <string name="edit_key_select_usage">"Please select key usage!"</string> <string name="edit_key_error_add_identity">"Add at least one identity!"</string> <string name="edit_key_error_add_subkey">"Add at least one subkey!"</string> <string name="edit_key_error_bad_security_token_algo">"Algorithm not supported by Security Token!"</string> |