From 05954191a2c73ca98f8f3d275adbe2fd245355a5 Mon Sep 17 00:00:00 2001
From: ovari123 <ovari123@zoho.com>
Date: Mon, 2 Dec 2024 05:20:02 -0400
Subject: [PATCH] misc: unify terminology
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
kicked → blocked
{reinstate, reinstate as} → unblock
rejoined → unblocked
waiting until → waiting for
Change-Id: Ide75e75e840dc2933aab0aa4e8615051516a78ad
GitLab: #1730
---
src/app/net/jami/Constants/JamiStrings.qml | 12 ++++++------
src/libclient/api/interaction.h | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/app/net/jami/Constants/JamiStrings.qml b/src/app/net/jami/Constants/JamiStrings.qml
index 8dfdf2ffc..c8090cff2 100644
--- a/src/app/net/jami/Constants/JamiStrings.qml
+++ b/src/app/net/jami/Constants/JamiStrings.qml
@@ -459,7 +459,7 @@ Item {
property string linkDeviceNetWorkError: qsTr("A network error occurred while linking device.\nPlease try again later.")
// BannedContacts
- property string reinstateContact: qsTr("Reinstate as contact")
+ property string reinstateContact: qsTr("Unblock contact")
property string blocked: qsTr("Blocked")
property string blockedContacts: qsTr("Blocked contacts")
@@ -564,7 +564,7 @@ Item {
property string logsViewReport: qsTr("Submit issue")
property string logsViewClear: qsTr("Clear")
property string cancel: qsTr("Cancel")
- property string logsViewCopied: qsTr("Copied to clipboard!")
+ property string logsViewCopied: qsTr("Copied to clipboard.")
property string logsViewDisplay: qsTr("View logs")
// ImportFromBackupPage
@@ -800,9 +800,9 @@ Item {
// Invitation View
property string invitationViewSentRequest: qsTr("%1 sent you a conversation invitation.")
- property string invitationViewJoinConversation: qsTr("Hello,\nDo you want to join this conversation?")
+ property string invitationViewJoinConversation: qsTr("Hello,\nDo you want to join the conversation?")
property string invitationViewAcceptedConversation: qsTr("You have accepted\nthe conversation invitation.")
- property string invitationViewWaitingForSync: qsTr("Waiting until %1\nconnects to synchronize the conversation.")
+ property string invitationViewWaitingForSync: qsTr("Waiting for %1\nto connect to synchronize the conversation…")
// SwarmDetailsPanel (group conversation panel)
property string members: qsTr("%1 Members")
@@ -821,8 +821,8 @@ Item {
// NewSwarmPage (new group conversation page)
property string goToConversation: qsTr("Go to conversation")
- property string kickMember: qsTr("Kick member")
- property string reinstateMember: qsTr("Reinstate member")
+ property string kickMember: qsTr("Block member")
+ property string reinstateMember: qsTr("Unblock member")
property string administrator: qsTr("Administrator")
property string invited: qsTr("Invited")
property string removeMember: qsTr("Remove member")
diff --git a/src/libclient/api/interaction.h b/src/libclient/api/interaction.h
index 9d6345b15..7850c12a8 100644
--- a/src/libclient/api/interaction.h
+++ b/src/libclient/api/interaction.h
@@ -289,9 +289,9 @@ getContactInteractionString(const QString& authorUri, const ContactAction& actio
case ContactAction::LEAVE:
return QObject::tr("%1 left the conversation.").arg(authorUri);
case ContactAction::BANNED:
- return QObject::tr("%1 was kicked from the conversation.").arg(authorUri);
+ return QObject::tr("%1 was blocked from the conversation.").arg(authorUri);
case ContactAction::UNBANNED:
- return QObject::tr("%1 rejoined the conversation.").arg(authorUri);
+ return QObject::tr("%1 was unblocked from the conversation.").arg(authorUri);
case ContactAction::INVALID:
return QObject::tr("Contact added");
}
--
GitLab