aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-08-27 21:53:33 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-08-27 21:53:33 +0200
commit1b5afc32471c5c056acdb1ccdc749eda45f135cf (patch)
treea3a0489e34fb912249bea43405fd5f4e46675c60 /OpenKeychain/src/main/res
parent3f4150e4ef8bc0de7c9f971c4bea15115d506ebc (diff)
downloadopen-keychain-1b5afc32471c5c056acdb1ccdc749eda45f135cf.tar.gz
open-keychain-1b5afc32471c5c056acdb1ccdc749eda45f135cf.tar.bz2
open-keychain-1b5afc32471c5c056acdb1ccdc749eda45f135cf.zip
Experimental word comparison
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml1
-rw-r--r--OpenKeychain/src/main/res/menu/key_view.xml6
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml4
3 files changed, 10 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml b/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml
index bd7b00823..239cdcc95 100644
--- a/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml
@@ -16,6 +16,7 @@
android:padding="16dp">
<TextView
+ android:id="@+id/certify_fingerprint_intro"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index 4a9fe16c7..a76a83f07 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -37,4 +37,10 @@
android:visible="false"
android:title="@string/menu_certify_fingerprint" />
+ <item
+ android:id="@+id/menu_key_view_certify_fingerprint_word"
+ app:showAsAction="never"
+ android:visible="false"
+ android:title="@string/menu_certify_fingerprint_word" />
+
</menu> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 09211d9e5..76a6ecb69 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -115,6 +115,7 @@
<string name="menu_update_all_keys">"Update all keys"</string>
<string name="menu_advanced">"Extended information"</string>
<string name="menu_certify_fingerprint">"Confirm via fingerprint comparison"</string>
+ <string name="menu_certify_fingerprint_word">"Confirm via word comparison"</string>
<string name="menu_export_log">"Export Log"</string>
<string name="menu_keyserver_add">"Add"</string>
@@ -1404,7 +1405,8 @@
<string name="section_uids_to_certify">"Identities for "</string>
<string name="certify_text">"The keys you are importing contain “identities”: names and email addresses. Select exactly those for confirmation which match what you expected."</string>
<string name="certify_fingerprint_text">"Compare the displayed fingerprint, character by character, with the one displayed on your partners device."</string>
- <string name="certify_fingerprint_text2">"Do the displayed fingerprints match?"</string>
+ <string name="certify_fingerprint_text_words">"Compare the displayed fingerprint, word by word, with the one displayed on your partners device."</string>
+ <string name="certify_fingerprint_text2">"Do the fingerprints match?"</string>
<string name="label_revocation">"Revocation Reason"</string>
<string name="label_cert_type">"Type"</string>
<string name="error_key_not_found">"Key not found!"</string>