diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-20 19:59:45 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-20 19:59:45 +0200 |
| commit | 475293a116b5c3f7937bc5075921a2a0cb9c9a29 (patch) | |
| tree | d1cb792bf5fe5ff651a4ec20df570b603f61a009 /OpenKeychain/src/main/res/values/strings.xml | |
| parent | 2a96912a96f6b740c40331fb83f715d4d1abf597 (diff) | |
| download | open-keychain-475293a116b5c3f7937bc5075921a2a0cb9c9a29.tar.gz open-keychain-475293a116b5c3f7937bc5075921a2a0cb9c9a29.tar.bz2 open-keychain-475293a116b5c3f7937bc5075921a2a0cb9c9a29.zip | |
consolidate: prevent concurrent calls of step 2
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 64c743ead..3175d679b 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -673,7 +673,8 @@ <!-- 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_error_bad_state">Consolidation was started while no database was cached! This is probably a programming error, please file a bug report.</string> + <string name="msg_con_error_concurrent">Consolidation aborted, already running on other thread!</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> |