diff --git a/src/app/mainview/components/ChatViewHeader.qml b/src/app/mainview/components/ChatViewHeader.qml
index b11b0a7a491179091c7796a33c99cdf9dd2b3146..b03331a0bed36c2d738127f7fdeba0f81d4bf416 100644
--- a/src/app/mainview/components/ChatViewHeader.qml
+++ b/src/app/mainview/components/ChatViewHeader.qml
@@ -147,7 +147,7 @@ Rectangle {
}
JamiPushButton { QWKSetParentHitTestVisible {}
- id: startAAudioCallButton
+ id: startAudioCallButton
visible: interactionButtonsVisibility &&
(!addMemberVisibility || UtilsAdapter.getAppValue(Settings.EnableExperimentalSwarm))
@@ -158,7 +158,7 @@ Rectangle {
}
JamiPushButton { QWKSetParentHitTestVisible {}
- id: startAVideoCallButton
+ id: startVideoCallButton
visible: interactionButtonsVisibility &&
CurrentAccount.videoEnabled_Video &&
diff --git a/src/app/mainview/components/ConversationSmartListContextMenu.qml b/src/app/mainview/components/ConversationSmartListContextMenu.qml
index 38a0691505bebd910e83673e1cdfd87b91f222f3..df135c39d395c73d662de3b9e9e457464978dd7d 100644
--- a/src/app/mainview/components/ConversationSmartListContextMenu.qml
+++ b/src/app/mainview/components/ConversationSmartListContextMenu.qml
@@ -43,7 +43,7 @@ ContextMenuAutoLoader {
property list<GeneralMenuItem> menuItems: [
GeneralMenuItem {
- id: startVideoCallItem
+ id: startVideoCall
canTrigger: CurrentAccount.videoEnabled_Video && !hasCall && !readOnly
itemName: JamiStrings.startVideoCall
diff --git a/src/app/mainview/components/KeyboardShortcutTable.qml b/src/app/mainview/components/KeyboardShortcutTable.qml
index 61e511c9f3f50639bec387409921af4bee048fb7..16ac96f1c4c668a25560bf31c71a18d943d603af 100644
--- a/src/app/mainview/components/KeyboardShortcutTable.qml
+++ b/src/app/mainview/components/KeyboardShortcutTable.qml
@@ -82,11 +82,11 @@ Window {
ListElement {
shortcut: "Ctrl + Shift + C"
- description: qsTr("Start an audio call")
+ description: qsTr("Start audio call")
}
ListElement {
shortcut: "Ctrl + Shift + X"
- description: qsTr("Start a video call")
+ description: qsTr("Start video call")
}
ListElement {
shortcut: "Ctrl + Shift + L"
@@ -102,7 +102,7 @@ Window {
}
ListElement {
shortcut: "Ctrl + Shift + Delete"
- description: qsTr("Remove conversation")
+ description: qsTr("Leave conversation")
}
ListElement {
shortcut: "Ctrl + Shift + A"
@@ -118,60 +118,60 @@ Window {
}
},
ListModel {
- id: keyboardSettingsShortcutsModel
+ id: keyboardCallsShortcutsModel
ListElement {
- shortcut: "Ctrl + M"
- description: qsTr("Media settings")
+ shortcut: "Ctrl + Y"
+ description: qsTr("Answer incoming call")
}
ListElement {
- shortcut: "Ctrl + G"
- description: qsTr("General settings")
+ shortcut: "Ctrl + D"
+ description: qsTr("End call")
}
ListElement {
- shortcut: "Ctrl + Alt + I"
- description: qsTr("Account settings")
+ shortcut: "Ctrl + Shift + D"
+ description: qsTr("Decline call request")
}
ListElement {
- shortcut: "Ctrl + P"
- description: qsTr("Plugin settings")
+ shortcut: "M"
+ description: qsTr("Mute microphone")
}
ListElement {
- shortcut: "Ctrl + Shift + N"
- description: qsTr("Open account creation wizard")
+ shortcut: "V"
+ description: qsTr("Stop camera")
}
ListElement {
- shortcut: "F10"
- shortcut2: ""
- description: qsTr("Open keyboard shortcut table")
+ shortcut: "Ctrl + Mouse middle click"
+ description: qsTr("Take tile screenshot")
}
},
ListModel {
- id: keyboardCallsShortcutsModel
+ id: keyboardSettingsShortcutsModel
ListElement {
- shortcut: "Ctrl + Y"
- description: qsTr("Answer an incoming call")
+ shortcut: "Ctrl + Alt + I"
+ description: qsTr("Open account settings")
}
ListElement {
- shortcut: "Ctrl + D"
- description: qsTr("End call")
+ shortcut: "Ctrl + G"
+ description: qsTr("Open general settings")
}
ListElement {
- shortcut: "Ctrl + Shift + D"
- description: qsTr("Decline the call request")
+ shortcut: "Ctrl + M"
+ description: qsTr("Open media settings")
}
ListElement {
- shortcut: "M"
- description: qsTr("Mute microphone")
+ shortcut: "Ctrl + E"
+ description: qsTr("Open extensions settings")
}
ListElement {
- shortcut: "V"
- description: qsTr("Stop camera")
+ shortcut: "Ctrl + Shift + N"
+ description: qsTr("Open account creation wizard")
}
ListElement {
- shortcut: "Ctrl + Mouse middle click"
- description: qsTr("Take tile screenshot")
+ shortcut: "F10"
+ shortcut2: ""
+ description: qsTr("View keyboard shortcuts")
}
},
ListModel {
@@ -215,11 +215,11 @@ Window {
}
ListElement {
shortcut: "Shift + Alt + T"
- description: qsTr("Show formatting")
+ description: qsTr("Show/hide formatting")
}
ListElement {
shortcut: "Shift + Alt + P"
- description: qsTr("Show preview")
+ description: qsTr("Show preview/Continue editing")
}
}
]
diff --git a/src/app/mainview/components/SwarmParticipantContextMenu.qml b/src/app/mainview/components/SwarmParticipantContextMenu.qml
index fa5534d5dfc73d5ccc01bd6884c8b189784a1bd3..e31f060224e921edb14e6a1f53f6dedbb2678c38 100644
--- a/src/app/mainview/components/SwarmParticipantContextMenu.qml
+++ b/src/app/mainview/components/SwarmParticipantContextMenu.qml
@@ -30,7 +30,7 @@ ContextMenuAutoLoader {
property list<GeneralMenuItem> menuItems: [
GeneralMenuItem {
- id: startVideoCallItem
+ id: startVideoCall
itemName: JamiStrings.startVideoCall
canTrigger: ConversationsAdapter.dialogId(participantUri) !== ""
iconSource: JamiResources.videocam_24dp_svg
diff --git a/src/app/net/jami/Constants/JamiStrings.qml b/src/app/net/jami/Constants/JamiStrings.qml
index 1610904c3fc413f248d05f620749074665c9fb68..7d5bf45f138dfd531b23f2601a369d46f4d2f9b7 100644
--- a/src/app/net/jami/Constants/JamiStrings.qml
+++ b/src/app/net/jami/Constants/JamiStrings.qml
@@ -73,7 +73,7 @@ Item {
property string authenticate: qsTr("Authenticate")
property string deleteAccount: qsTr("Delete account")
property string inProgress: qsTr("In progress…")
- property string authenticationFailed: qsTr("Authentication failed")
+ property string authenticationFailed: qsTr("An error occurred while authenticating account.")
property string password: qsTr("Password")
property string username: qsTr("Username")
property string alias: qsTr("Alias")
@@ -181,7 +181,7 @@ Item {
property string callSettingsTitle: qsTr("Call settings")
property string chatSettingsTitle: qsTr("Chat")
property string advancedSettingsTitle: qsTr("Advanced settings")
- property string audioVideoSettingsTitle: qsTr("Audio and Video")
+ property string audioVideoSettingsTitle: qsTr("Media")
// AudioSettings
property string audio: qsTr("Audio")
@@ -259,13 +259,13 @@ Item {
property string paste: qsTr("Paste")
// ConversationContextMenu
- property string startVideoCall: qsTr("Start video call")
property string startAudioCall: qsTr("Start audio call")
+ property string startVideoCall: qsTr("Start video call")
property string clearConversation: qsTr("Clear conversation")
property string confirmAction: qsTr("Confirm action")
- property string removeConversation: qsTr("Remove conversation")
- property string confirmRmConversation: qsTr("Would you really like to remove this conversation?")
- property string confirmBlockConversation: qsTr("Would you really like to block this conversation?")
+ property string removeConversation: qsTr("Leave conversation")
+ property string confirmRmConversation: qsTr("Do you really want to leave this conversation?")
+ property string confirmBlockConversation: qsTr("Do you really want to block this conversation?")
property string removeContact: qsTr("Remove contact")
property string blockContact: qsTr("Block contact")
property string convDetails: qsTr("Conversation details")
@@ -294,7 +294,7 @@ Item {
property string screenshotTaken: qsTr("Screenshot saved to %1")
property string fileSaved: qsTr("File saved to %1")
- //advanced information
+ // Advanced information
property string renderersInformation: qsTr("Renderers information")
property string callInformation: qsTr("Call information")
property string peerNumber: qsTr("Peer number")
@@ -338,18 +338,18 @@ Item {
// Chatview header
property string hideChat: qsTr("Hide chat")
- property string placeAudioCall: qsTr("Place audio call")
- property string placeVideoCall: qsTr("Place video call")
+ property string placeAudioCall: qsTr("Start audio call")
+ property string placeVideoCall: qsTr("Start video call")
property string showPlugins: qsTr("Show available plugins")
property string addToConversations: qsTr("Add to conversations")
- property string backendError: qsTr("This is the error from the backend: %0")
+ property string backendError: qsTr("A backend system error occurred: %0")
property string disabledAccount: qsTr("The account is disabled")
property string noNetworkConnectivity: qsTr("No network connectivity")
property string deletedMessage: qsTr("deleted a message")
property string deletedMedia: qsTr("deleted a media")
property string returnToCall: qsTr("Return to call")
- //MessagesResearch
+ // MessagesResearch
property string jumpTo: qsTr("Jump to")
property string messages: qsTr("Messages")
property string files: qsTr("Files")
@@ -380,7 +380,7 @@ Item {
property string invalidUsername: qsTr("Invalid username")
property string nameAlreadyTaken: qsTr("Name already taken")
property string usernameAlreadyTaken: qsTr("Username already taken")
- property string joinJamiNoPassword: qsTr("Are you sure you would like to join Jami without a username?\nIf yes, only a randomly generated 40-character identifier will be assigned to this account.")
+ property string joinJamiNoPassword: qsTr("Do you really want to join Jami without a username?\nIf yes, only a randomly generated 40-character identifier will be assigned to this account.")
property string usernameToolTip: qsTr("- 32 characters maximum\n- Alphabetical characters (A to Z and a to z)\n- Numeric characters (0 to 9)\n- Special characters allowed: dash (-)")
// Good to know
@@ -417,11 +417,11 @@ Item {
// CurrentAccountSettings && AdvancedSettings
property string backupSuccessful: qsTr("Backup successful")
- property string backupFailed: qsTr("Backup failed")
+ property string backupFailed: qsTr("An error occurred while backing up account.")
property string changePasswordSuccess: qsTr("Password changed successfully")
- property string changePasswordFailed: qsTr("Password change failed")
+ property string changePasswordFailed: qsTr("An error occurred while changing account password.")
property string setPasswordSuccess: qsTr("Password set successfully")
- property string setPasswordFailed: qsTr("Password set failed")
+ property string setPasswordFailed: qsTr("An error occurred while setting account password.")
property string changePassword: qsTr("Change password")
property string setPassword: qsTr("Encrypt account")
property string setAPassword: qsTr("Set a password")
@@ -452,16 +452,16 @@ Item {
property string tipLinkNewDevice: qsTr("Link a new device to this account")
property string linkDevice: qsTr("Exporting account…")
property string removeDevice: qsTr("Remove Device")
- property string sureToRemoveDevice: qsTr("Are you sure you wish to remove this device?")
+ property string sureToRemoveDevice: qsTr("Do you really want to unlink selected device? To continue, enter account password and click Unlink.")
property string yourPinIs: qsTr("Your PIN is:")
- property string linkDeviceNetWorkError: qsTr("Error connecting to the network.\nPlease try again later.")
+ property string linkDeviceNetWorkError: qsTr("A network error occurred while linking device.\nPlease try again later.")
// BannedContacts
property string banned: qsTr("Banned")
property string bannedContacts: qsTr("Banned contacts")
// DeleteAccountDialog
- property string confirmDeleteQuestion: qsTr("Would you really like to delete this account?")
+ property string confirmDeleteQuestion: qsTr("Do you really want to delete this account? To continue, click Delete.")
property string deleteAccountInfos: qsTr("If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.")
// DeviceItemDelegate
@@ -499,14 +499,14 @@ Item {
// File transfer settings
property string fileTransfer: qsTr("File transfer")
property string autoAcceptFiles: qsTr("Automatically accept incoming files")
- property string acceptTransferBelow: qsTr("Accept transfer limit (in Mb)")
- property string acceptTransferTooltip: qsTr("in MB, 0 = unlimited")
+ property string acceptTransferBelow: qsTr("Accept transfer limit (Mb)")
+ property string acceptTransferTooltip: qsTr("MB, 0 = unlimited")
// JamiUserIdentity settings
property string register: qsTr("Register")
property string incorrectPassword: qsTr("Incorrect password")
property string networkError: qsTr("Network error")
- property string somethingWentWrong: qsTr("Something went wrong")
+ property string somethingWentWrong: qsTr("An unexpected error occurred.")
// Context Menu
property string saveFile: qsTr("Save file")
@@ -519,9 +519,9 @@ Item {
property string enableAutoUpdates: qsTr("Enable/Disable automatic updates")
property string updatesTitle: qsTr("Updates")
property string updateDialogTitle: qsTr("Update")
- property string updateFound: qsTr("A new version of Jami was found\nWould you like to update now?")
+ property string updateFound: qsTr("A new version of Jami was found.\nDo you want to update Jami now?\nTo continue, click Update.")
property string updateNotFound: qsTr("No new version of Jami was found")
- property string updateCheckError: qsTr("An error occured when checking for a new version")
+ property string updateCheckError: qsTr("An error occurred when checking for a new version.")
property string updateNetworkError: qsTr("Network error")
property string updateSSLError: qsTr("SSL error")
property string updateDownloadCanceled: qsTr("Installer download canceled")
@@ -530,9 +530,9 @@ Item {
property string networkDisconnected: qsTr("Network disconnected")
property string accessError: qsTr("Content access error")
property string contentNotFoundError: qsTr("Content not found")
- property string genericError: qsTr("Something went wrong")
+ property string genericError: qsTr("An unexpected error occurred.")
- //Troubleshoot Settings
+ // Troubleshoot Settings
property string troubleshootTitle: qsTr("Troubleshoot")
property string troubleshootButton: qsTr("Open logs")
property string troubleshootText: qsTr("Get logs")
@@ -547,9 +547,9 @@ Item {
property string callRecording: qsTr("Call recording")
property string alwaysRecordCalls: qsTr("Always record calls")
- // KeyboardShortCutTable
- property string keyboardShortcutTableWindowTitle: qsTr("Keyboard Shortcut Table")
- property string keyboardShortcuts: qsTr("Keyboard Shortcuts")
+ // Keyboard shortcuts
+ property string keyboardShortcutTableWindowTitle: qsTr("Keyboard shortcuts")
+ property string keyboardShortcuts: qsTr("Keyboard shortcuts")
property string conversationKeyboardShortcuts: qsTr("Conversation")
property string callKeyboardShortcuts: qsTr("Call")
property string settings: qsTr("Settings")
@@ -558,11 +558,11 @@ Item {
// View Logs
property string logsViewTitle: qsTr("Debug")
property string logsViewCopy: qsTr("Copy")
- property string logsViewReport: qsTr("Report Bug")
+ 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 logsViewDisplay: qsTr("Receive Logs")
+ property string logsViewDisplay: qsTr("View logs")
// ImportFromBackupPage
property string archive: qsTr("Archive")
@@ -619,7 +619,7 @@ Item {
property string takePhoto: qsTr("Take photo")
property string imageFiles: qsTr("Image Files (*.jpeg *.jpg *.png *.JPEG* .JPG *.PNG)")
- // Plugins
+ // Extensions
property string autoUpdate: qsTr("Auto update")
property string disableAll: qsTr("Disable all")
property string installed: qsTr("Installed")
@@ -628,16 +628,16 @@ Item {
property string installManually: qsTr("Install manually")
property string installMannuallyDescription: qsTr("Install an extension directly from your device.")
property string pluginStoreTitle: qsTr("Available")
- property string pluginStoreNotAvailable: qsTr("Plugins store is not available")
- property string storeNotSupportedPlatform: qsTr("The Jami Extension Store currently has no extension available for the platform in use. Check again later!")
+ property string pluginStoreNotAvailable: qsTr("The Jami Extension Store is not currently available. Please try again later.")
+ property string storeNotSupportedPlatform: qsTr("There are no extensions currently available in the Jami Extension Store for the platform in use. Please check again later.")
property string pluginPreferences: qsTr("Preferences")
- property string installationFailed: qsTr("Installation failed")
- property string pluginInstallationFailed: qsTr("The installation of the plugin failed")
+ property string installationFailed: qsTr("Installation error")
+ property string pluginInstallationFailed: qsTr("An error occurred while installing the extension.")
property string reset: qsTr("Reset")
property string uninstall: qsTr("Uninstall")
property string resetPreferences: qsTr("Reset Preferences")
- property string selectPluginInstall: qsTr("Select a plugin to install")
- property string uninstallPlugin: qsTr("Uninstall plugin")
+ property string selectPluginInstall: qsTr("Select extension to install")
+ property string uninstallPlugin: qsTr("Uninstall extension")
property string pluginResetConfirmation: qsTr("Are you sure you wish to reset %1 preferences?")
property string pluginUninstallConfirmation: qsTr("Are you sure you wish to uninstall %1?")
property string goBackToPluginsList: qsTr("Go back to plugins list")
@@ -654,6 +654,7 @@ Item {
property string lastUpdate: qsTr("Last update %1")
property string by: qsTr("By %1")
property string proposedBy: qsTr("Proposed by %1")
+
// ProfilePage
property string information: qsTr("Information")
property string moreInformation: qsTr("More information")
@@ -663,9 +664,9 @@ Item {
property string confirmRemovalRequest: qsTr("Enter the account password to confirm the removal of this device")
// SelectScreen
- property string selectScreen: qsTr("Select a screen to share")
- property string selectWindow: qsTr("Select a window to share")
- property string allScreens: qsTr("All Screens")
+ property string selectScreen: qsTr("Select screen to share")
+ property string selectWindow: qsTr("Select window to share")
+ property string allScreens: qsTr("All screens")
property string screens: qsTr("Screens")
property string windows: qsTr("Windows")
property string screen: qsTr("Screen %1")
@@ -683,7 +684,7 @@ Item {
property string connectJAMSServer: qsTr("Connect to a JAMS server")
property string createFromJAMS: qsTr("Create account from Jami Account Management Server (JAMS)")
property string addSIPAccount: qsTr("Configure a SIP account")
- property string errorCreateAccount: qsTr("Error while creating your account. Check your credentials.")
+ property string errorCreateAccount: qsTr("An error occurred while creating the account. Check check credentials and try again.")
property string createNewRV: qsTr("Create a rendezvous point")
property string joinJami: qsTr("Join Jami")
property string createNewJamiAccount: qsTr("Create new Jami account")
@@ -695,9 +696,9 @@ Item {
property string welcomeToJami: qsTr("Welcome to Jami")
// SmartList
- property string clearText: qsTr("Clear Text")
+ property string clearText: qsTr("Clear text")
property string conversations: qsTr("Conversations")
- property string searchResults: qsTr("Search Results")
+ property string searchResults: qsTr("Search results")
// SmartList context menu
property string declineContactRequest: qsTr("Decline contact request")
@@ -707,13 +708,14 @@ Item {
property string update: qsTr("Automatically check for updates")
// Generic dialog options
- property string optionOk: qsTr("Ok")
+ property string optionOk: qsTr("OK")
property string optionSave: qsTr("Save")
property string optionCancel: qsTr("Cancel")
property string optionUpgrade: qsTr("Upgrade")
property string optionLater: qsTr("Later")
property string optionDelete: qsTr("Delete")
property string optionRemove: qsTr("Remove")
+ property string optionLeave: qsTr("Leave")
property string optionBlock: qsTr("Block")
property string optionUnban: qsTr("Unban")
@@ -736,8 +738,8 @@ Item {
property string removeDefaultModerator: qsTr("Remove default moderator")
// Daemon reconnection
- property string reconnectDaemon: qsTr("Trying to reconnect to the Jami daemon (jamid)…")
- property string reconnectionFailed: qsTr("Could not re-connect to the Jami daemon (jamid).\nJami will now quit.")
+ property string reconnectDaemon: qsTr("Attempting to reconnect to the Jami daemon (jamid)…")
+ property string reconnectionFailed: qsTr("An error occurred while reconnecting to the Jami daemon (jamid).\nThe application will now exit.")
// Message view
property string addEmoji: qsTr("Add emoji")
@@ -792,23 +794,23 @@ Item {
// Invitation View
property string invitationViewSentRequest: qsTr("%1 has sent you a request for a conversation.")
- property string invitationViewJoinConversation: qsTr("Hello,\nWould you like to join the conversation?")
+ property string invitationViewJoinConversation: qsTr("Hello,\nDo you want to join this conversation?")
property string invitationViewAcceptedConversation: qsTr("You have accepted\nthe conversation request")
property string invitationViewWaitingForSync: qsTr("Waiting until %1\nconnects to synchronize the conversation.")
// SwarmDetailsPanel
property string members: qsTr("%1 Members")
property string member: qsTr("Member")
- property string swarmName: qsTr("Swarm's name")
- property string contactName: qsTr("Contact's name")
+ property string swarmName: qsTr("Swarm name")
+ property string contactName: qsTr("Contact name")
property string addADescription: qsTr("Add a description")
property string muteConversation: qsTr("Mute conversation")
property string ignoreNotificationsTooltip: qsTr("Ignore all notifications from this conversation")
- property string chooseAColor: qsTr("Choose a color")
+ property string chooseAColor: qsTr("Color")
property string defaultCallHost: qsTr("Default host (calls)")
property string leaveConversation: qsTr("Leave conversation")
- property string typeOfSwarm: qsTr("Type of swarm")
+ property string typeOfSwarm: qsTr("Type")
property string none: qsTr("None")
// NewSwarmPage
@@ -865,20 +867,20 @@ Item {
property string theme: qsTr("Theme")
property string zoomLevel: qsTr("Text zoom level")
- //Donation campaign
+ // Donation campaign
property string donationTipBoxText: qsTr("Free and private sharing. <a href=\"https://jami.net/whydonate/\">Donate</a> to expand it.")
property string donation: qsTr("Donate")
property string donationText: qsTr("If you enjoy using Jami and believe in our mission, would you make a donation?")
property string notNow: qsTr("Not now")
property string enableDonation: qsTr("Enable donation campaign")
- //Chat setting page
+ // Chat setting page
property string enter: qsTr("Enter")
property string shiftEnter: qsTr("Shift+Enter")
property string textFormattingDescription: qsTr("Enter or Shift+Enter to insert a new line")
property string textFormatting: qsTr("Text formatting")
- //Connection monitoring
+ // Connection monitoring
property string connected: qsTr("Connected")
property string connectingTLS: qsTr("Connecting TLS")
property string connectingICE: qsTr("Connecting ICE")
diff --git a/src/libclient/conversationmodel.cpp b/src/libclient/conversationmodel.cpp
index d661d743986282d81522a5048579dd62d24cec48..bfcf74251e2a7cf8bc3ebf6240d29e0ee5cd44e3 100644
--- a/src/libclient/conversationmodel.cpp
+++ b/src/libclient/conversationmodel.cpp
@@ -738,8 +738,8 @@ ConversationModel::makePermanent(const QString& uid)
if (conversation.participants.empty()) {
// Should not
- qDebug() << "ConversationModel::addConversation can't add a conversation with no "
- "participant";
+ qDebug() << "ConversationModel::addConversation cannot add a conversation with no "
+ "participant.";
return;
}
@@ -750,7 +750,7 @@ ConversationModel::makePermanent(const QString& uid)
}
pimpl_->sendContactRequest(peers.front());
} catch (const std::out_of_range& e) {
- qDebug() << "make permanent failed. conversation not found";
+ qDebug() << "Make permanent failed. Conversation not found.";
}
}
@@ -818,7 +818,7 @@ ConversationModel::selectConversation(const QString& uid) const
}
}
} catch (const std::out_of_range& e) {
- qDebug() << "select conversation failed. conversation not exists";
+ qDebug() << "Select conversation failed. Conversation does not exist.";
}
}
@@ -837,8 +837,8 @@ ConversationModel::removeConversation(const QString& uid, bool banned)
auto& peers = pimpl_->peersForConversation(conversation);
if (peers.empty()) {
// Should not
- qDebug() << "ConversationModel::removeConversation can't remove a conversation without "
- "participant";
+ qDebug() << "ConversationModel::removeConversation cannot remove a conversation without "
+ "participant.";
return;
}
if (conversation.isSwarm() && !banned && !conversation.isCoreDialog()) {
@@ -902,7 +902,7 @@ ConversationModelPimpl::placeCall(const QString& uid, bool isAudioOnly)
if (conversation.participants.empty()) {
// Should not
qDebug()
- << "ConversationModel::placeCall can't call a conversation without participant";
+ << "ConversationModel::placeCall cannot call a conversation without participants.";
return;
}
@@ -961,7 +961,7 @@ ConversationModelPimpl::placeCall(const QString& uid, bool isAudioOnly)
// Don't call banned contact
if (contactInfo.isBanned) {
- qDebug() << "ContactModel::placeCall: denied, contact is banned";
+ qDebug() << "ContactModel::placeCall: denied, contact is banned.";
return;
}
@@ -971,7 +971,7 @@ ConversationModelPimpl::placeCall(const QString& uid, bool isAudioOnly)
auto cb = ([this, isTemporary, uri, isAudioOnly, &conversation](QString conversationId) {
if (indexOf(conversationId) < 0) {
- qDebug() << "Can't place call: conversation not exists";
+ qDebug() << "Cannot place call: conversation does not exist.";
return;
}
@@ -980,7 +980,7 @@ ConversationModelPimpl::placeCall(const QString& uid, bool isAudioOnly)
newConv.callId = linked.owner.callModel->createCall(uri, isAudioOnly);
if (newConv.callId.isEmpty()) {
- qDebug() << "Can't place call (daemon side failure ?)";
+ qDebug() << "Cannot place call (daemon side failure?)";
return;
}
@@ -1012,7 +1012,7 @@ ConversationModelPimpl::placeCall(const QString& uid, bool isAudioOnly)
cb(convId);
}
} catch (const std::out_of_range& e) {
- qDebug() << "could not place call to not existing conversation";
+ qDebug() << "Cannot place call as conversation does not exist.";
}
}
@@ -1281,8 +1281,8 @@ ConversationModel::sendMessage(const QString& uid, const QString& body, const QS
auto& peers = pimpl_->peersForConversation(conversation);
if (peers.isEmpty()) {
// Should not
- qDebug() << "ConversationModel::sendMessage can't send a interaction to a conversation "
- "with no participant";
+ qDebug() << "ConversationModel::sendMessage cannot send an interaction to a conversation "
+ "with no participants.";
return;
}
auto convId = uid;
@@ -1382,7 +1382,7 @@ ConversationModel::sendMessage(const QString& uid, const QString& body, const QS
cb(convId);
}
} catch (const std::out_of_range& e) {
- qDebug() << "could not send message to not existing conversation";
+ qDebug() << "Cannot send message as conversation does not exist.";
}
}
@@ -2314,7 +2314,7 @@ ConversationModelPimpl::slotSwarmLoaded(uint32_t requestId,
// If message is loaded, insert message at beginning
if (!conversation.interactions->insert(msgId, msg, 0)) {
- qDebug() << Q_FUNC_INFO << "Insert failed: duplicate ID";
+ qDebug() << Q_FUNC_INFO << "Insert failed: duplicate ID.";
continue;
}
@@ -2426,7 +2426,7 @@ ConversationModelPimpl::slotMessageReceived(const QString& accountId,
}
if (!conversation.interactions->append(msgId, msg)) {
- qDebug() << Q_FUNC_INFO << "Append failed: duplicate ID" << msgId;
+ qDebug() << Q_FUNC_INFO << "Append failed: duplicate ID." << msgId;
return;
}
@@ -2459,7 +2459,7 @@ ConversationModelPimpl::slotMessageReceived(const QString& accountId,
conversation.interactions->setRead(uri, message.id);
}
} catch (const std::exception& e) {
- qDebug() << "messages received for not existing conversation";
+ qDebug() << "Messages received for conversation that does not exist.";
}
}
@@ -2476,7 +2476,7 @@ ConversationModelPimpl::slotMessageUpdated(const QString& accountId,
auto msg = interaction::Info(message, linked.owner.profileInfo.uri);
if (!conversation.interactions->update(msgId, msg)) {
- qDebug() << "message not found or could not be reparented";
+ qDebug() << "Message not found or cannot be reparented.";
return;
}
// The conversation is updated, so we need to notify the view.
@@ -2484,7 +2484,7 @@ ConversationModelPimpl::slotMessageUpdated(const QString& accountId,
Q_EMIT linked.modelChanged();
Q_EMIT linked.dataChanged(indexOf(conversationId));
} catch (const std::exception& e) {
- qDebug() << "messages received for not existing conversation";
+ qDebug() << "Messages received for conversation that does not exist.";
}
}
@@ -2906,7 +2906,7 @@ ConversationModelPimpl::slotPendingContactAccepted(const QString& uri)
Q_EMIT linked.newInteraction(convs[0], msgId, interaction);
Q_EMIT linked.dataChanged(convIdx);
} catch (std::out_of_range& e) {
- qDebug() << "ConversationModelPimpl::slotContactAdded can't find contact";
+ qDebug() << "ConversationModelPimpl::slotContactAdded cannot find contact.";
}
}
}
@@ -3227,7 +3227,7 @@ ConversationModelPimpl::slotNewCall(const QString& fromId,
auto conversationIndices = getIndicesForContact(fromId);
if (conversationIndices.empty()) {
- qDebug() << "ConversationModelPimpl::slotNewCall, but conversation not found";
+ qDebug() << "ConversationModelPimpl::slotNewCall, but conversation not found.";
return; // Not a contact
}
@@ -3260,7 +3260,7 @@ ConversationModelPimpl::slotCallStatusChanged(const QString& callId, int code)
Q_EMIT linked.dataChanged(indexOf(i->uid));
}
} catch (std::out_of_range& e) {
- qDebug() << "ConversationModelPimpl::slotCallStatusChanged can't get inexistant call";
+ qDebug() << "ConversationModelPimpl::slotCallStatusChanged cannot get nonexistent call.";
}
}
@@ -3271,7 +3271,7 @@ ConversationModelPimpl::slotCallStarted(const QString& callId)
auto call = linked.owner.callModel->getCall(callId);
addOrUpdateCallMessage(callId, call.peerUri.remove("ring:"), !call.isOutgoing);
} catch (std::out_of_range& e) {
- qDebug() << "ConversationModelPimpl::slotCallStarted can't start inexistant call";
+ qDebug() << "ConversationModelPimpl::slotCallStarted cannot start nonexistent call.";
}
}
@@ -3299,7 +3299,7 @@ ConversationModelPimpl::slotCallEnded(const QString& callId)
Q_EMIT linked.dataChanged(indexOf(conversation.uid));
}
} catch (std::out_of_range& e) {
- qDebug() << "ConversationModelPimpl::slotCallEnded can't end inexistant call";
+ qDebug() << "ConversationModelPimpl::slotCallEnded cannot end nonexistent call.";
}
}
@@ -3529,7 +3529,7 @@ ConversationModelPimpl::updateInteractionStatus(const QString& accountId,
if (emitDisplayed)
conversation.interactions->setRead(peerUri, messageId);
} catch (const std::out_of_range& e) {
- qDebug() << "could not update message status for not existing conversation";
+ qDebug() << "Cannot update message status for conversation that does not exist.";
}
}
@@ -3562,7 +3562,7 @@ ConversationModelPimpl::slotComposingStatusChanged(const QString& accountId,
else
conversation.typers.remove(contactUri);
} catch (const std::out_of_range& e) {
- qDebug() << "could not update message status for not existing conversation";
+ qDebug() << "Cannot update message status for conversation that does not exist.";
}
Q_EMIT linked.composingStatusChanged(convId, contactUri, isComposing);
@@ -3601,7 +3601,7 @@ ConversationModel::sendFile(const QString& convUid,
}
auto peers = pimpl_->peersForConversation(conversation);
if (peers.size() < 1) {
- qDebug() << "send file error: could not send file in conversation with no participants";
+ qDebug() << "Send file error: cannot send file in conversation with no participants.";
return;
}
/* isTemporary, and conversationReady callback used only for non-swarm conversation,
@@ -3624,12 +3624,12 @@ ConversationModel::sendFile(const QString& convUid,
try {
auto conversationOpt = getConversationForUid(conversationId);
if (!conversationOpt.has_value()) {
- qDebug() << "Can't send file";
+ qDebug() << "Cannot send file.";
return;
}
auto contactInfo = owner.contactModel->getContact(peerId);
if (contactInfo.isBanned) {
- qDebug() << "ContactModel::sendFile: denied, contact is banned";
+ qDebug() << "ContactModel::sendFile: denied, contact is banned.";
return;
}
owner.dataTransferModel->sendFile(owner.id, conversationId, path, filename, parent);
@@ -3656,7 +3656,7 @@ ConversationModel::sendFile(const QString& convUid,
cb(convUidCopy);
}
} catch (const std::out_of_range& e) {
- qDebug() << "could not send file to not existing conversation";
+ qDebug() << "Cannot send file to conversation that does not exist.";
}
}