misc: unify terminology

Accept contact request → Accept invitation
Accept in audio → Accept with audio
Accept in video → Accept with video
Automatically answer calls → Automatically answer incoming calls
Decline call request → Decline call
Decline contact request → Decline invitation
Delete your account → Delete account
just now → Just now
Mute → Mute microphone
Type → Conversation type (https://review.jami.net/c/jami-client-android/+/29546)
Unmute → Unmute microphone

Change-Id: Ie88eabeb12514e2b0f0918c8ab77beaa0d90aecf
GitLab: #1730

src/app/mainview/components/KeyboardShortcutTable.qml

@@ -130,7 +130,7 @@ Window {
             }
             ListElement {
                 shortcut: "Ctrl+Shift+D"
-                description: qsTr("Decline call request")
+                description: qsTr("Decline call")
             }
             ListElement {
                 shortcut: "M"

src/app/messagesadapter.cpp

@@ -672,7 +672,7 @@ MessagesAdapter::getFormattedTime(const quint64 timestamp)
         timeLocale = curLocal.toString(curTime, curLocal.ShortFormat).toLower();
         return timeLocale;
     }
-    return QObject::tr("just now");
+    return QObject::tr("Just now");
 }
 
 QString

src/app/net/jami/Constants/JamiStrings.qml

@@ -27,8 +27,8 @@ Item {
 
     // Misc
     property string accept: qsTr("Accept")
-    property string acceptAudio: qsTr("Accept in audio")
+    property string acceptAudio: qsTr("Accept with audio")
-    property string acceptVideo: qsTr("Accept in video")
+    property string acceptVideo: qsTr("Accept with video")
     property string refuse: qsTr("Decline")
     property string endCall: qsTr("End call")
     property string incomingAudioCallFrom: qsTr("Incoming audio call from {}")
@@ -82,7 +82,7 @@ Item {
     // AdvancedCallSettings
     property string allowCallsUnknownContacs: qsTr("Allow incoming calls from unknown contacts")
     property string rendezVous: qsTr("Convert your account into a rendezvous point")
-    property string autoAnswerCalls: qsTr("Automatically answer calls")
+    property string autoAnswerCalls: qsTr("Automatically answer incoming calls")
     property string enableCustomRingtone: qsTr("Enable custom ringtone")
     property string selectCustomRingtone: qsTr("Select custom ringtone")
     property string selectNewRingtone: qsTr("Select a new ringtone")
@@ -226,8 +226,8 @@ Item {
     // CallOverlay
     property string isRecording: qsTr("is recording")
     property string areRecording: qsTr("are recording")
-    property string mute: qsTr("Mute")
+    property string mute: qsTr("Mute microphone")
-    property string unmute: qsTr("Unmute")
+    property string unmute: qsTr("Unmute microphone")
     property string pauseCall: qsTr("Pause call")
     property string resumeCall: qsTr("Resume call")
     property string stopCamera: qsTr("Stop camera")
@@ -238,8 +238,8 @@ Item {
     property string chat: qsTr("Chat")
     property string moreOptions: qsTr("More options")
     property string mosaic: qsTr("Mosaic")
-    property string participantMicIsStillMuted: qsTr("Participant is still muted on their device")
+    property string participantMicIsStillMuted: qsTr("Participant microphone is still muted.")
-    property string mutedLocally: qsTr("You are still muted on your device")
+    property string mutedLocally: qsTr("Device microphone is still muted.")
     property string participantModIsStillMuted: qsTr("You are still muted by moderator")
     property string mutedByModerator: qsTr("You are muted by a moderator")
     property string moderator: qsTr("Moderator")
@@ -406,9 +406,9 @@ Item {
     property string usernameAccountDescription: qsTr("A chosen username can help to be found more easily on Jami.\nIf a username is not chosen, a randomly generated 40-character identifier will be assigned to this account as a username. It is more difficult to be found and reached with this identifier.")
     property string encryptAccountDescription: qsTr("Your Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.")
     property string saveAccountTitle: qsTr("Backup account")
-    property string saveAccountDescription: qsTr("This Jami account exists only on this device.\nThe account will be lost if this device is lost or the application is uninstalled. It is recommended to make a backup of this account.")
+    property string saveAccountDescription: qsTr("This Jami account exists only on this device. The account will be lost if this device is lost or the application is uninstalled. It is recommended to make a backup of this account.")
-    property string deleteAccountTitle: qsTr("Delete your account")
+    property string deleteAccountTitle: qsTr("Delete account")
-    property string deleteAccountDescription: qsTr("If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.")
+    property string deleteAccountDescription: qsTr("If this account has not been backed up or added to another device, this account and registered name will be irrevocably lost.")
     property string linkedAccountList: qsTr("List of the devices that are linked to this account:")
     property string linkedThisDevice: qsTr("This device")
     property string linkedOtherDevices: qsTr("Other linked devices")
@@ -700,8 +700,8 @@ Item {
     property string searchResults: qsTr("Search results")
 
     // SmartList context menu
-    property string declineContactRequest: qsTr("Decline contact request")
+    property string declineContactRequest: qsTr("Decline invitation")
-    property string acceptContactRequest: qsTr("Accept contact request")
+    property string acceptContactRequest: qsTr("Accept invitation")
 
     // Update settings
     property string update: qsTr("Automatically check for updates")
@@ -721,8 +721,8 @@ Item {
     // Conference moderation
     property string setModerator: qsTr("Set moderator")
     property string unsetModerator: qsTr("Unset moderator")
-    property string muteParticipant: qsTr("Mute")
+    property string muteParticipant: qsTr("Mute participant")
-    property string unmuteParticipant: qsTr("Unmute")
+    property string unmuteParticipant: qsTr("Unmute participant")
     property string maximizeParticipant: qsTr("Maximize")
     property string minimizeParticipant: qsTr("Minimize")
     property string hangupParticipant: qsTr("Hangup")
@@ -809,7 +809,7 @@ Item {
     property string chooseAColor: qsTr("Color")
     property string defaultCallHost: qsTr("Default host (calls)")
     property string leaveConversation: qsTr("Leave conversation")
-    property string typeOfSwarm: qsTr("Type")
+    property string typeOfSwarm: qsTr("Conversation type")
     property string none: qsTr("None")
 
     // NewSwarmPage (new group conversation page)

src/app/selectablelistproxymodel.cpp

@@ -81,7 +81,7 @@ SelectableListProxyModel::dataForRow(int row, int role) const
 void
 SelectableListProxyModel::selectSourceRow(int row)
 {
-    // note: the convId <-> index binding loop present
+    // note: the convId ↔ index binding loop present
     // is broken here
     if (row == -1 || selectedSourceIndex_.row() == row)
         return;

src/app/systemtray.cpp

@@ -222,13 +222,13 @@ SystemTray::showNotification(const QString& id,
 
     if (pimpl_->actions) {
         if (type == NotificationType::CALL) {
-            pimpl_->addNotificationAction(n, tr("Answer"), (void*) answerCall);
+            pimpl_->addNotificationAction(n, tr("Answer call"), (void*) answerCall);
-            pimpl_->addNotificationAction(n, tr("Decline"), (void*) declineCall);
+            pimpl_->addNotificationAction(n, tr("Decline call"), (void*) declineCall);
         } else {
             pimpl_->addNotificationAction(n, tr("Open conversation"), (void*) openConversation);
             if (type != NotificationType::CHAT) {
-                pimpl_->addNotificationAction(n, tr("Accept"), (void*) acceptPending);
+                pimpl_->addNotificationAction(n, tr("Accept invitation"), (void*) acceptPending);
-                pimpl_->addNotificationAction(n, tr("Refuse"), (void*) refusePending);
+                pimpl_->addNotificationAction(n, tr("Decline invitation"), (void*) refusePending);
             }
         }
     }

src/libclient/api/interaction.h

@@ -283,15 +283,15 @@ getContactInteractionString(const QString& authorUri, const ContactAction& actio
         if (authorUri.isEmpty()) {
             return QObject::tr("Contact added");
         }
-        return QObject::tr("%1 was invited to join").arg(authorUri);
+        return QObject::tr("%1 was invited to join the conversation.").arg(authorUri);
     case ContactAction::JOIN:
-        return QObject::tr("%1 joined").arg(authorUri);
+        return QObject::tr("%1 joined the conversation.").arg(authorUri);
     case ContactAction::LEAVE:
-        return QObject::tr("%1 left").arg(authorUri);
+        return QObject::tr("%1 left the conversation.").arg(authorUri);
     case ContactAction::BANNED:
-        return QObject::tr("%1 was kicked").arg(authorUri);
+        return QObject::tr("%1 was kicked from the conversation.").arg(authorUri);
     case ContactAction::UNBANNED:
-        return QObject::tr("%1 was re-added").arg(authorUri);
+        return QObject::tr("%1 rejoined the conversation.").arg(authorUri);
     case ContactAction::INVALID:
         return QObject::tr("Contact added");
     }
@@ -332,11 +332,11 @@ getCallInteractionStringNonSwarm(bool isSelf,
                                  const QString& reason = "")
 {
     if (reason == "busy") {
-        return QObject::tr("User busy");
+        return QObject::tr("Busy");
     } else if (reason == "declined") {
-        return QObject::tr("User declined");
+        return QObject::tr("Call declined");
     } else if (reason == "no_device") {
-        return QObject::tr("User offline");
+        return QObject::tr("Unreachable peer");
     }
 
     if (duration < 0) {
@@ -478,7 +478,7 @@ static inline QString
 getProfileUpdatedString()
 {
     // Perhaps one day this will be more detailed.
-    return QObject::tr("(profile updated)");
+    return QObject::tr("(Profile updated)");
 }
 
 } // namespace interaction