diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-31 17:32:13 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-31 17:32:13 +0200 |
| commit | 7da783228499ea9d5b0a98201e8ba5b17e30bb10 (patch) | |
| tree | 610e3d5ef33d717eaa56d091ebe7d92c5b237bbb /OpenKeychain/src/main/res | |
| parent | 38c6cf045c6e451b3a150bf9b659056c2252d27c (diff) | |
| download | open-keychain-7da783228499ea9d5b0a98201e8ba5b17e30bb10.tar.gz open-keychain-7da783228499ea9d5b0a98201e8ba5b17e30bb10.tar.bz2 open-keychain-7da783228499ea9d5b0a98201e8ba5b17e30bb10.zip | |
Add cancelable mechanism and support in key import
Closes #323
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 8eb452df6..270feb099 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -381,8 +381,10 @@ </plurals> <string name="view_log">View Log</string> <string name="import_error_nothing">Nothing to import.</string> + <string name="import_error_nothing_cancelled">Import cancelled.</string> <string name="import_error">Error importing keys!</string> <string name="import_with_warnings">, with warnings</string> + <string name="import_with_cancelled">, until cancelled</string> <!-- Intent labels --> <string name="intent_decrypt_file">Decrypt File with OpenKeychain</string> |