diff --git a/res/menu/key_scanning.xml b/res/menu/key_scanning.xml index 1c277f9c9e..d54c0e978b 100644 --- a/res/menu/key_scanning.xml +++ b/res/menu/key_scanning.xml @@ -7,10 +7,10 @@ app:showAsAction="ifRoom"> - - diff --git a/res/values/strings.xml b/res/values/strings.xml index 7c43d814fb..76745d29ed 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -529,8 +529,8 @@ You do not have an identity key. Recipient has no identity key. Recipient has no identity key! - Scan their key to compare - Get your key scanned + Scan contact's QR code + Display your QR code WARNING, the scanned key DOES NOT match! Please check the fingerprint text carefully. NOT Verified! Their key is correct. It is also necessary to verify your key with them as well. @@ -539,8 +539,8 @@ You do not have an identity key. - Scan to compare - Get scanned to compare + Scan contact's QR code + Display your QR code WARNING, the scanned key DOES NOT match! NOT verified! The scanned key matches! @@ -1118,8 +1118,8 @@ Compare - Get scanned to compare - Scan to compare + Display your QR code + Scan contact's QR code New message diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java index c7308294fc..a212fd6329 100644 --- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java +++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java @@ -112,12 +112,12 @@ public class VerifyIdentityActivity extends KeyScanningActivity { @Override protected String getScanString() { - return getString(R.string.VerifyIdentityActivity_scan_their_key_to_compare); + return getString(R.string.VerifyIdentityActivity_scan_contacts_qr_code); } @Override protected String getDisplayString() { - return getString(R.string.VerifyIdentityActivity_get_your_key_scanned); + return getString(R.string.VerifyIdentityActivity_display_your_qr_code); } @Override diff --git a/src/org/thoughtcrime/securesms/ViewIdentityActivity.java b/src/org/thoughtcrime/securesms/ViewIdentityActivity.java index aae6f223d4..6cd7dde8ac 100644 --- a/src/org/thoughtcrime/securesms/ViewIdentityActivity.java +++ b/src/org/thoughtcrime/securesms/ViewIdentityActivity.java @@ -76,12 +76,12 @@ public class ViewIdentityActivity extends KeyScanningActivity { @Override protected String getScanString() { - return getString(R.string.ViewIdentityActivity_scan_to_compare); + return getString(R.string.ViewIdentityActivity_scan_contacts_qr_code); } @Override protected String getDisplayString() { - return getString(R.string.ViewIdentityActivity_get_scanned_to_compare); + return getString(R.string.ViewIdentityActivity_display_your_qr_code); } @Override