diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-11-08 20:02:54 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-11-08 20:02:54 +0100 |
| commit | d6a1be825c0ee2acad1c1115876f7f6d72354353 (patch) | |
| tree | 0466ba343be881556da1c7d63484b3200c777415 /OpenKeychain/src/main/res | |
| parent | 89d016c49be3d9258822f2803744697a0d48c80b (diff) | |
| parent | 33e8699be5fe7b1c756b3bdced7646772a6c6026 (diff) | |
| download | open-keychain-d6a1be825c0ee2acad1c1115876f7f6d72354353.tar.gz open-keychain-d6a1be825c0ee2acad1c1115876f7f6d72354353.tar.bz2 open-keychain-d6a1be825c0ee2acad1c1115876f7f6d72354353.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/menu/key_list.xml | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml index d3a2bd0fd..edaf0c999 100644 --- a/OpenKeychain/src/main/res/menu/key_list.xml +++ b/OpenKeychain/src/main/res/menu/key_list.xml @@ -26,6 +26,12 @@ app:showAsAction="never" /> <item + android:id="@+id/menu_key_list_debug_bench" + android:title="Debug / Benchmark" + android:visible="false" + app:showAsAction="never" /> + + <item android:id="@+id/menu_key_list_debug_read" android:title="Debug / DB restore" android:visible="false" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 2e2e7a19e..13b9923bc 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -397,6 +397,7 @@ <string name="progress_cancelling">"cancelling…"</string> <string name="progress_saving">"saving…"</string> <string name="progress_importing">"importing…"</string> + <string name="progress_benchmarking">"benchmarking…"</string> <string name="progress_revoking_uploading">"Revoking and uploading key…"</string> <string name="progress_updating">"Updating keys…"</string> <string name="progress_exporting">"exporting…"</string> @@ -1363,6 +1364,15 @@ <string name="msg_lv_fetch_error_format">"Format error!"</string> <string name="msg_lv_fetch_error_nothing">"Resource not found!"</string> + <string name="msg_bench">"Benchmarking some operations…"</string> + <string name="msg_bench_enc_time">"Encryption time: %ss"</string> + <string name="msg_bench_enc_time_avg">"Average time to encrypt 5M: %ss"</string> + <string name="msg_bench_dec_time">"Decryption time: %ss"</string> + <string name="msg_bench_dec_time_avg">"Average time to decrypt 5M: %ss"</string> + <string name="msg_bench_s2k_100ms_its">"S2K Iteration Count for 100ms: %s"</string> + <string name="msg_bench_s2k_for_it">"Time for %1$s SHA1 S2K iterations: %2$sms"</string> + <string name="msg_bench_success">"Benchmarking complete!"</string> + <string name="msg_data">"Processing input data"</string> <string name="msg_data_openpgp">"Attempting to process OpenPGP data"</string> <string name="msg_data_detached">"Encountered detached signature"</string> |