aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-20 23:26:09 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-20 23:26:09 +0200
commit642a63fab6f50d7baf5aff7ccf1fc4cd57cdb96a (patch)
treed7b6c86a70654e00bf41e189c26091a344432e65 /OpenKeychain/src/main/res
parent418e922c78c365cd1c428f334de6814cbbc17b47 (diff)
parentce4bfdf94555a90b47818546a8e51ffd35db8ec5 (diff)
downloadopen-keychain-642a63fab6f50d7baf5aff7ccf1fc4cd57cdb96a.tar.gz
open-keychain-642a63fab6f50d7baf5aff7ccf1fc4cd57cdb96a.tar.bz2
open-keychain-642a63fab6f50d7baf5aff7ccf1fc4cd57cdb96a.zip
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 556df3923..2eb9f2b97 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -301,8 +301,10 @@
<string name="progress_decompressing_data">decompressing data…</string>
<string name="progress_verifying_integrity">verifying integrity…</string>
<string name="progress_deleting_securely">deleting \'%s\' securely…</string>
+ <string name="progress_deleting">deleting keys…</string>
- <string name="progress_con_reimport">reimporting database…</string>
+ <string name="progress_con_saving">consolidate: saving to cache…</string>
+ <string name="progress_con_reimport">consolidate: reimporting…</string>
<!-- action strings -->
<string name="hint_keyserver_search_hint">Name/Email/Key ID…</string>