diff options
author | Vincent <valodim@mugenguild.com> | 2016-04-12 10:13:30 +0200 |
---|---|---|
committer | Vincent <valodim@mugenguild.com> | 2016-04-12 10:13:30 +0200 |
commit | b55c505054cf68369ed3f123a1793b7c1e451cb7 (patch) | |
tree | b78472ea87584885b7b82230fbc96d4d6720befa /OpenKeychain/src/main/res | |
parent | 8efef3d248ad86400d66c682bde62fe93e50323b (diff) | |
parent | 360b5a658a412d9402a5fc9ea204329c91d306c3 (diff) | |
download | open-keychain-b55c505054cf68369ed3f123a1793b7c1e451cb7.tar.gz open-keychain-b55c505054cf68369ed3f123a1793b7c1e451cb7.tar.bz2 open-keychain-b55c505054cf68369ed3f123a1793b7c1e451cb7.zip |
Merge pull request #1772 from runnerway/importkey-encrypted
Handle encrypted files in "import key" file selection
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 8bb5093eb..18007c53f 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -367,6 +367,7 @@ <string name="error_file_delete_failed">"have not been deleted. Delete them manually!"</string> <string name="error_file_added_already">%s has already been added.</string> <string name="error_file_not_found">"file not found"</string> + <string name="error_bad_data">"Bad data!"</string> <string name="error_no_secret_key_found">"no suitable secret key found"</string> <string name="error_external_storage_not_ready">"external storage not ready"</string> <string name="error_key_size_minimum512bit">"key size must be at least 512bit"</string> |