remove 'friend' reference from messages.json

_locales/en/messages.json

@@ -674,10 +674,6 @@
     "message": "Conversations",
     "description": "Shown to separate the types of search results"
   },
-  "friendsHeader": {
-    "message": "Friends",
-    "description": "Shown to separate the types of search results"
-  },
   "contactsHeader": {
     "message": "Contacts",
     "description": "Shown to separate the types of search results"
@@ -991,18 +987,6 @@
     "message": " Type your message",
     "description": "Placeholder text in the message entry field"
   },
-  "sendMessageDisabledSecondary": {
-    "message": "This pubkey belongs to a secondary device. You should never see this message",
-    "description": "Placeholder text in the message entry field when it is disabled because a secondary device conversation is visible"
-  },
-  "sendMessageDisabled": {
-    "message": "Waiting for friend request approval",
-    "description": "Placeholder text in the message entry field when it is disabled while we are waiting for a friend request approval"
-  },
-  "sendMessageFriendRequest": {
-    "message": "Send your first message",
-    "description": "Placeholder text in the message entry field when it is the first message sent to that contact"
-  },
   "sendMessageLeftGroup": {
     "message": "You left this group"
   },
@@ -1860,50 +1844,6 @@
       }
     }
   },
-  "friendRequestPending": {
-    "message": "Friend request",
-    "description": "Shown in the conversation history when the user sends or recieves a friend request"
-  },
-  "friendRequestAccepted": {
-    "message": "Friend request accepted",
-    "description": "Shown in the conversation history when the user accepts a friend request"
-  },
-  "friendRequestDeclined": {
-    "message": "Session request declined",
-    "description": "Shown in the conversation history when the user declines a friend request"
-  },
-  "friendRequestExpired": {
-    "message": "Friend request expired",
-    "description": "Shown in the conversation history when the users friend request expires"
-  },
-  "friendRequestNotificationTitle": {
-    "message": "Friend request",
-    "description": "Shown in a notification title when receiving a friend request"
-  },
-  "friendRequestNotificationMessage": {
-    "message": "$name$ sent you a friend request",
-    "description": "Shown in a notification body when receiving a friend request",
-    "placeholders": {
-      "name": {
-        "content": "$1",
-        "example": "Bob"
-      }
-    }
-  },
-  "friendRequestAcceptedNotificationTitle": {
-    "message": "Friend request accepted",
-    "description": "Shown in a notification title when friend request was accepted by the other user"
-  },
-  "friendRequestAcceptedNotificationMessage": {
-    "message": "$name$ accepted your friend request",
-    "description": "Shown in a notification body when friend request was accepted by the other user",
-    "placeholders": {
-      "name": {
-        "content": "$1",
-        "example": "Bob"
-      }
-    }
-  },
   "blockUser": {
     "message": "Block User"
   },
@@ -2270,18 +2210,6 @@
     "message": "Conversations",
     "description": "conversation tab title"
   },
-  "friendsTab": {
-    "message": "Friends",
-    "description": "friend tab title"
-  },
-  "pendingAcceptance": {
-    "message": "Pending Acceptance",
-    "description": "Indicates that a friend request is pending"
-  },
-  "notFriends": {
-    "message": "Not Friends",
-    "description": "Indicates that a conversation is not friends with us"
-  },
   "emptyGroupNameError": {
     "message": "Group Name cannot be empty",
     "description": "Error message displayed on empty group name"
@@ -2326,11 +2254,11 @@
   "groupInvitation": {
     "message": "Group Invitation"
   },
-  "addingFriends": {
+  "addingContacts": {
-    "message": "Adding friends to"
+    "message": "Adding contacts to"
   },
-  "noFriendsToAdd": {
+  "noContactsToAdd": {
-    "message": "No friends to add"
+    "message": "No contacts to add"
   },
   "noMembersInThisGroup": {
     "message": "No other members in this group"
@@ -2534,9 +2462,6 @@
   "displayNameEmpty": {
     "message": "Display Name Is Mandatory"
   },
-  "youHaveFriendRequestFrom": {
-    "message": "You have friend requests from..."
-  },
   "members": {
     "message": "$count$ members",
     "placeholders": {

js/views/conversation_view.js

@@ -529,12 +529,6 @@
       }
       let placeholder;
       switch (type) {
-        case 'disabled':
-          placeholder = i18n('sendMessageDisabled');
-          break;
-        case 'secondary':
-          placeholder = i18n('sendMessageDisabledSecondary');
-          break;
         case 'left-group':
           placeholder = i18n('sendMessageLeftGroup');
           break;

ts/components/SearchResults.tsx

@@ -72,7 +72,7 @@ export class SearchResults extends React.Component<Props> {
           </div>
         ) : null}
         {haveContacts
-          ? this.renderContacts(i18n('friendsHeader'), contacts, true)
+          ? this.renderContacts(i18n('contactsHeader'), contacts, true)
           : null}
 
         {haveMessages ? (

ts/components/conversation/InviteContactsDialog.tsx

@@ -58,7 +58,7 @@ export class InviteContactsDialog extends React.Component<Props, State> {
   }
 
   public render() {
-    const titleText = `${window.i18n('addingFriends')} ${this.props.chatName}`;
+    const titleText = `${window.i18n('addingContacts')} ${this.props.chatName}`;
     const cancelText = window.i18n('cancel');
     const okText = window.i18n('ok');
 
@@ -76,7 +76,7 @@ export class InviteContactsDialog extends React.Component<Props, State> {
         {hasContacts ? null : (
           <>
             <div className="spacer-lg" />
-            <p className="no-friends">{window.i18n('noFriendsToAdd')}</p>
+            <p className="no-friends">{window.i18n('noContactsToAdd')}</p>
             <div className="spacer-lg" />
           </>
         )}

ts/components/conversation/ModeratorsAddDialog.tsx

@@ -157,7 +157,7 @@ export class AddModeratorsDialog extends React.Component<Props, State> {
             />
           </div>
           {hasContacts ? null : (
-            <p className="no-friends">{i18n('noFriendsToAdd')}</p>
+            <p className="no-friends">{i18n('noContactsToAdd')}</p>
           )}
         </div>
         <div className="buttons">