cleanup: unify terminology

`Leave conversation` instead of `Delete conversation`.

Change-Id: Ifb13f96faee1f6e52c9536b80318462c13f29c46

jami-android/app/src/main/java/cx/ring/fragments/ConversationActionsFragment.kt

@@ -184,7 +184,7 @@ class ConversationActionsFragment : Fragment() {
                         qrCode.setOnClickListener { showContactQRCode(identifier) }
                     }
             )
-            conversationDelete.text = resources.getString(R.string.delete_conversation)
+            conversationDelete.text = resources.getString(R.string.leave_conversation)
             conversationDelete.setOnClickListener {  }
 
             descriptionPanel.isVisible = false  // Disable description edit for 1-to-1 conversation
@@ -223,7 +223,7 @@ class ConversationActionsFragment : Fragment() {
                 builder.setNegativeButton(android.R.string.cancel, null).show()
             }
         } else {    // If conversation mode is not one to one
-            conversationDelete.text = resources.getString(R.string.leave_swarm)
+            conversationDelete.text = resources.getString(R.string.leave_conversation)
             blockSwitch.isVisible = false
         }
 

jami-android/app/src/main/res/values/arrays.xml

@@ -20,12 +20,12 @@ along with this program; if not, write to the Free Software
     <string-array name="conversation_actions">
         <item>@string/conversation_action_copy_peer_number</item>
         <item>@string/conversation_action_history_clear</item>
-        <item>@string/conversation_action_remove_this</item>
+        <item>@string/delete_contact</item>
         <item>@string/conversation_action_block_this</item>
     </string-array>
     <string-array name="swarm_one_to_one_actions">
         <item>@string/conversation_action_copy_peer_number</item>
-        <item>@string/conversation_action_remove_this</item>
+        <item>@string/delete_contact</item>
         <item>@string/conversation_action_block_this</item>
     </string-array>
     <string-array name="swarm_group_actions">

jami-android/app/src/main/res/values/strings.xml

@@ -317,13 +317,12 @@ along with this program; if not, write to the Free Software
     <string name="contact_details">Contact details</string>
     <string name="conversation_action_delete_this">Delete this conversation</string>
     <string name="conversation_action_delete_this_title">Delete this conversation?</string>
-    <string name="delete_conversation">Delete conversation</string>
-    <string name="leave_swarm">Leave Swarm</string>
+    <string name="leave_conversation">Leave conversation</string>
     <string name="conversation_action_delete_this_message">This action cannot be undone.</string>
     <string name="conversation_action_history_clear">Clear history</string>
     <string name="conversation_action_history_clear_title">Clear the conversation history?</string>
     <string name="conversation_action_history_clear_message">This will definitely clear the conversation history.</string>
-    <string name="conversation_action_remove_this">Delete contact</string>
+    <string name="delete_contact">Delete contact</string>
     <string name="conversation_action_remove_this_title">Delete this contact?</string>
     <string name="conversation_action_remove_this_message">This will delete the contact and definitely clear the conversation history.</string>
     <string name="swarm_group_action_leave">Leave group</string>

jami-android/app/src/main/res/xml/tv_contact_more_pref.xml

@@ -9,7 +9,7 @@
             />
         <Preference
             android:key="Contact.delete"
-            android:title="@string/conversation_action_remove_this"
+            android:title="@string/delete_contact"
             android:icon="@drawable/baseline_androidtv_deletecontact"
             />
     </PreferenceCategory>