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

Merge branch 'master' of github.com:open-keychain/open-keychain

Browse Source
This commit is contained in:
Dominik Schürmann
2015-11-08 20:02:54 +01:00
parent 89d016c49b 33e8699be5
commit d6a1be825c
13 changed files with 367 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/res/menu/key_list.xml
View File

@@ -25,6 +25,12 @@
android:visible="false"
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"

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

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