aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/menu/key_list.xml6
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml15
2 files changed, 21 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index 056dd5986..6e571243d 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -32,6 +32,12 @@
android:title="@string/menu_import_existing_key" />
<item
+ android:id="@+id/menu_key_list_debug_cons"
+ app:showAsAction="never"
+ android:title="Debug / Consolidate"
+ android:visible="false" />
+
+ <item
android:id="@+id/menu_key_list_debug_read"
app:showAsAction="never"
android:title="Debug / DB restore"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 5259336ec..51053754e 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -668,6 +668,21 @@
<string name="msg_mf_unlock_error">Error unlocking keyring!</string>
<string name="msg_mf_unlock">Unlocking keyring</string>
+ <!-- Consolidate -->
+ <string name="msg_con">Consolidating database</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>
+ <plurals name="msg_con_reimport_secret">
+ <item quantity="one">Reimporting one secret key</item>
+ <item quantity="other">Reimporting %d secret keys</item>
+ </plurals>
+ <plurals name="msg_con_reimport_public">
+ <item quantity="one">Reimporting one public key</item>
+ <item quantity="other">Reimporting %d public keys</item>
+ </plurals>
+ <string name="msg_con_success">Successfully consolidated database</string>
+
<!-- PassphraseCache -->
<string name="passp_cache_notif_click_to_clear">Click to clear cached passphrases</string>
<string name="passp_cache_notif_n_keys">OpenKeychain has cached %d passphrases</string>