cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consolidate: split into two steps, can pick up at second step if anything fails

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-08-19 15:45:42 +02:00
parent 8d668d170c
commit c725239a69
7 changed files with 112 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -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>