diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-23 15:38:57 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-23 15:38:57 +0100 |
commit | 54cd414693aaf19fe9c1ff6428f8553584581b41 (patch) | |
tree | 7294da5c5f9e429c3a1afb2c1b5287b82cd95711 /OpenKeychain/src/main/res | |
parent | aa3565b857d088be3d12c1fb9acf052cc6cb7720 (diff) | |
parent | 9f5581463f1b2d07217f59fa32346c786069dbf5 (diff) | |
download | open-keychain-54cd414693aaf19fe9c1ff6428f8553584581b41.tar.gz open-keychain-54cd414693aaf19fe9c1ff6428f8553584581b41.tar.bz2 open-keychain-54cd414693aaf19fe9c1ff6428f8553584581b41.zip |
Merge pull request #1166 from adithyaphilip/multi-threaded
Multi-threaded key import, update all feature
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/menu/key_list.xml | 5 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml index 15e098138..c4797d5f7 100644 --- a/OpenKeychain/src/main/res/menu/key_list.xml +++ b/OpenKeychain/src/main/res/menu/key_list.xml @@ -20,6 +20,11 @@ app:showAsAction="never" /> <item + android:id="@+id/menu_key_list_update_all_keys" + android:title="@string/menu_update_all_keys" + app:showAsAction="never" /> + + <item android:id="@+id/menu_key_list_debug_cons" android:title="Debug / Consolidate" android:visible="false" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index f22a0c533..ffb88b05c 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -118,6 +118,7 @@ <string name="menu_add_keys">"Add keys"</string> <string name="menu_search_cloud">"Search cloud"</string> <string name="menu_export_all_keys">"Export all keys"</string> + <string name="menu_update_all_keys">"Update all keys"</string> <string name="menu_advanced">"Show advanced info"</string> <string name="menu_certify_fingerprint">"Confirm via fingerprint comparison"</string> <string name="menu_export_log">"Export Log"</string> @@ -316,6 +317,7 @@ <string name="progress_cancelling">"cancelling…"</string> <string name="progress_saving">"saving…"</string> <string name="progress_importing">"importing…"</string> + <string name="progress_updating">"Updating keys…"</string> <string name="progress_exporting">"exporting…"</string> <string name="progress_uploading">"uploading…"</string> <string name="progress_building_key">"building key…"</string> |