diff --git a/src/app/net/jami/Constants/JamiStrings.qml b/src/app/net/jami/Constants/JamiStrings.qml index 8dfdf2ffc1b970811c7c2aa2878edf92baa3996e..c8090cff2795c8ac61d14d97b102427529543442 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 9d6345b15a26d2375cc21a0e05f1b4d7330941d6..7850c12a8512235fca56ca62ca7c22afff548057 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"); }