diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-04 10:51:26 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-04 10:51:26 +0100 |
| commit | 07bb421da57c555de9a7c76eb746070543b59c70 (patch) | |
| tree | 152f21e5f3fa6f6f2d2655df11350bbcdd942790 /OpenPGP-Keychain/src/main/res | |
| parent | b837579cdcb88c5c71708d66b78c9e21cf33a4e8 (diff) | |
| parent | af6713dc78448b7686a546d77c022f4aacd58dfb (diff) | |
| download | open-keychain-07bb421da57c555de9a7c76eb746070543b59c70.tar.gz open-keychain-07bb421da57c555de9a7c76eb746070543b59c70.tar.bz2 open-keychain-07bb421da57c555de9a7c76eb746070543b59c70.zip | |
Merge pull request #315 from jessicayuen/master
#226: Added cancel option to ProgressDialogFragments. Create Key is now cancelable.
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/values/strings.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index 46ffe5493..3ca5f5426 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -296,6 +296,7 @@ <!-- progress dialogs, usually ending in '…' --> <string name="progress_done">done.</string> + <string name="progress_cancel">cancel</string> <string name="progress_saving">saving…</string> <string name="progress_importing">importing…</string> <string name="progress_exporting">exporting…</string> |