diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-19 16:31:59 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-19 16:31:59 +0200 |
| commit | 4be8c36b43f0ba720b58893dab0b553ac02def71 (patch) | |
| tree | ace9887ea0e1b7e6aafd3e032da9745efa8da8b6 /OpenKeychain/src/main/res | |
| parent | 5f8bbab5694bfe1e1c45205b075481d696f34738 (diff) | |
| parent | 9fb1050fed5cdaa238219b29958cba1c484dff7e (diff) | |
| download | open-keychain-4be8c36b43f0ba720b58893dab0b553ac02def71.tar.gz open-keychain-4be8c36b43f0ba720b58893dab0b553ac02def71.tar.bz2 open-keychain-4be8c36b43f0ba720b58893dab0b553ac02def71.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.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 8d57f6f2e..e506bf488 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -302,6 +302,8 @@ <string name="progress_verifying_integrity">verifying integrity…</string> <string name="progress_deleting_securely">deleting \'%s\' securely…</string> + <string name="progress_con_reimport">reimporting database…</string> + <!-- action strings --> <string name="hint_keyserver_search_hint">Name/Email/Key ID…</string> <string name="hint_keybase_search_hint">Name/Email/Proof/Key…</string> @@ -671,6 +673,7 @@ <!-- Consolidate --> <string name="msg_con">Consolidating database</string> + <string name="msg_con_error_bad_state">Consolidation started while no database was cached! This is probably a programming error, please file a bug report.</string> <string name="msg_con_save_secret">Saving secret keyrings</string> <string name="msg_con_save_public">Saving public keyrings</string> <string name="msg_con_db_clear">Clearing database</string> |