Merge pull request #1007 from SamWhited/issue998

s/Verify Recipient/Verify Identity/

res/menu/conversation_secure_identity.xml

@@ -5,8 +5,8 @@
           android:icon="?menu_lock_icon"
           android:showAsAction="ifRoom">
           <menu>
-              <item android:title="@string/conversation_secure_verified__menu_verify_recipient"
-                    android:id="@+id/menu_verify_recipient"/>
+              <item android:title="@string/conversation_secure_verified__menu_verify_identity"
+                    android:id="@+id/menu_verify_identity"/>
           </menu>
     </item>
-</menu>
+</menu>

res/values/strings.xml

@@ -773,7 +773,7 @@
     <!-- conversation_secure_verified -->
     <string name="conversation_secure_verified__menu_security">Security</string>
     <string name="conversation_secure_verified__menu_no_identity">No Identity Available</string>
-    <string name="conversation_secure_verified__menu_verify_recipient">Verify Recipient</string>
+    <string name="conversation_secure_verified__menu_verify_identity">Verify Identity</string>
     <string name="conversation_secure_verified__menu_abort_secure_session">End Secure Session</string>
 
     <!-- conversation -->

src/org/thoughtcrime/securesms/ConversationActivity.java

@@ -312,7 +312,7 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
     case R.id.menu_add_attachment:            handleAddAttachment();                             return true;
     case R.id.menu_start_secure_session:      handleStartSecureSession();                        return true;
     case R.id.menu_abort_session:             handleAbortSecureSession();                        return true;
-    case R.id.menu_verify_recipient:          handleVerifyRecipient();                           return true;
+    case R.id.menu_verify_identity:           handleVerifyIdentity();                            return true;
     case R.id.menu_group_recipients:          handleDisplayGroupRecipients();                    return true;
     case R.id.menu_distribution_broadcast:    handleDistributionBroadcastEnabled(item);          return true;
     case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item);       return true;
@@ -361,7 +361,7 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
     finish();
   }
 
-  private void handleVerifyRecipient() {
+  private void handleVerifyIdentity() {
     Intent verifyIdentityIntent = new Intent(this, VerifyIdentityActivity.class);
     verifyIdentityIntent.putExtra("recipient", getRecipients().getPrimaryRecipient());
     verifyIdentityIntent.putExtra("master_secret", masterSecret);