From 12957d96e0c885c73e1ac607d37d9cbd99e955a2 Mon Sep 17 00:00:00 2001
From: RiseT <twilite505-github9487@yahoo.de>
Date: Thu, 11 Feb 2016 22:45:49 +0100
Subject: [PATCH] Improve identity key scanning strings

Closes #5218
Fixes #1481
// FREEBIE
---
 res/menu/key_scanning.xml                            |  4 ++--
 res/values/strings.xml                               | 12 ++++++------
 .../securesms/VerifyIdentityActivity.java            |  4 ++--
 .../thoughtcrime/securesms/ViewIdentityActivity.java |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/res/menu/key_scanning.xml b/res/menu/key_scanning.xml
index 1c277f9c9..d54c0e978 100644
--- a/res/menu/key_scanning.xml
+++ b/res/menu/key_scanning.xml
@@ -7,10 +7,10 @@
           app:showAsAction="ifRoom">
 
         <menu>
-            <item android:title="@string/key_scanning__menu_scan_to_compare"
+            <item android:title="@string/key_scanning__menu_scan_contacts_qr_code"
                   android:id="@+id/menu_scan"/>
 
-            <item android:title="@string/key_scanning__menu_get_scanned_to_compare"
+            <item android:title="@string/key_scanning__menu_display_your_qr_code"
                   android:id="@+id/menu_get_scanned"/>
 
         </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7c43d814f..76745d29e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -529,8 +529,8 @@
     <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">You do not have an identity key.</string>
     <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Recipient has no identity key.</string>
     <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Recipient has no identity key!</string>
-    <string name="VerifyIdentityActivity_scan_their_key_to_compare">Scan their key to compare</string>
-    <string name="VerifyIdentityActivity_get_your_key_scanned">Get your key scanned</string>
+    <string name="VerifyIdentityActivity_scan_contacts_qr_code">Scan contact's QR code</string>
+    <string name="VerifyIdentityActivity_display_your_qr_code">Display your QR code</string>
     <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">WARNING, the scanned key DOES NOT match! Please check the fingerprint text carefully.</string>
     <string name="VerifyIdentityActivity_not_verified_exclamation">NOT Verified!</string>
     <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Their key is correct. It is also necessary to verify your key with them as well.</string>
@@ -539,8 +539,8 @@
 
     <!-- ViewIdentityActivity -->
     <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">You do not have an identity key.</string>
-    <string name="ViewIdentityActivity_scan_to_compare">Scan to compare</string>
-    <string name="ViewIdentityActivity_get_scanned_to_compare">Get scanned to compare</string>
+    <string name="ViewIdentityActivity_scan_contacts_qr_code">Scan contact's QR code</string>
+    <string name="ViewIdentityActivity_display_your_qr_code">Display your QR code</string>
     <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">WARNING, the scanned key DOES NOT match!</string>
     <string name="ViewIdentityActivity_not_verified_exclamation">NOT verified!</string>
     <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">The scanned key matches!</string>
@@ -1118,8 +1118,8 @@
 
     <!-- key_scanning -->
     <string name="key_scanning__menu_compare">Compare</string>
-    <string name="key_scanning__menu_get_scanned_to_compare">Get scanned to compare</string>
-    <string name="key_scanning__menu_scan_to_compare">Scan to compare</string>
+    <string name="key_scanning__menu_display_your_qr_code">Display your QR code</string>
+    <string name="key_scanning__menu_scan_contacts_qr_code">Scan contact's QR code</string>
 
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_message">New message</string>
diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
index c7308294f..a212fd632 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 aae6f223d..6cd7dde8a 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