From 416137d6dd6905b1f52cb412c43eec0b7a69d07f Mon Sep 17 00:00:00 2001
From: ovari123 <ovari123@zoho.com>
Date: Wed, 25 Dec 2024 17:26:56 -0400
Subject: [PATCH] JamiStrings.qml: merge "clearConversation" with
"deleteConversation"
https://review.jami.net/c/jami-client-ios/+/29862
Change-Id: I4a657f73a9240b335cfe04e88f0465abf9a73081
---
.../mainview/components/ConversationSmartListContextMenu.qml | 4 ++--
src/app/net/jami/Constants/JamiStrings.qml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/mainview/components/ConversationSmartListContextMenu.qml b/src/app/mainview/components/ConversationSmartListContextMenu.qml
index 6d9c6368..719758ed 100644
--- a/src/app/mainview/components/ConversationSmartListContextMenu.qml
+++ b/src/app/mainview/components/ConversationSmartListContextMenu.qml
@@ -65,10 +65,10 @@ ContextMenuAutoLoader {
}
},
GeneralMenuItem {
- id: clearConversation
+ id: deleteConversation
canTrigger: mode === Conversation.Mode.NON_SWARM && !hasCall && !root.isBanned
- itemName: JamiStrings.clearConversation
+ itemName: JamiStrings.deleteConversation
iconSource: JamiResources.ic_clear_24dp_svg
onClicked: MessagesAdapter.clearConversationHistory(responsibleAccountId, responsibleConvUid)
},
diff --git a/src/app/net/jami/Constants/JamiStrings.qml b/src/app/net/jami/Constants/JamiStrings.qml
index 5a0972c1..f9ab4902 100644
--- a/src/app/net/jami/Constants/JamiStrings.qml
+++ b/src/app/net/jami/Constants/JamiStrings.qml
@@ -264,7 +264,7 @@ Item {
// ConversationContextMenu
property string startAudioCall: qsTr("Start audio call")
property string startVideoCall: qsTr("Start video call")
- property string clearConversation: qsTr("Clear conversation")
+ property string deleteConversation: qsTr("Delete conversation")
property string confirmAction: qsTr("Confirm action")
property string removeConversation: qsTr("Leave conversation")
property string confirmLeaveConversation: qsTr("Do you want to leave this conversation?")
@@ -741,7 +741,7 @@ Item {
property string removeDefaultModerator: qsTr("Remove default moderator")
// Daemon reconnection
- property string reconnectDaemon: qsTr("Reconnection of the Jami daemon (jamid) is in progress. Please wait…")
+ property string reconnectDaemon: qsTr("Jami daemon (jamid) reconnection is in progress. Please wait…")
property string reconnectionFailed: qsTr("An error occurred while reconnecting to the Jami daemon (jamid).\nThe application will now exit.")
// Message view
--
GitLab