mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2024-10-28 00:39:36 +01:00
misc: unify terminology
smart quotes {“,”,’}
remove spaces in keyboard shortcuts, eg Ctrl + F → Ctrl+F
add participant → invite member
A(n) [type] error occurred while [attempting to] {verb} {noun}.
avatar → profile picture
ban → block
join in… → join with…
mute camera → stop camera
plugin → extension
request → invitation
unmute camera → start camera
GitLab: #1730
Change-Id: Ied169aea3b15b341ff467bc838c70da6a3d5050f
This commit is contained in:
ovari
François-Simon Fauteux-Chapleau
parent
39833924af
commit
c55486988f
28 changed files with 223 additions and 224 deletions
|
|
@ -141,19 +141,19 @@ SBSMessageBase {
|
|||
}
|
||||
|
||||
JoinCallButton {
|
||||
id: joinCallInAudio
|
||||
objectName: "joinCallInAudio"
|
||||
id: joinCallWithAudio
|
||||
objectName: "joinCallWithAudio"
|
||||
Layout.topMargin: 4
|
||||
Layout.bottomMargin: 4
|
||||
|
||||
text: JamiStrings.joinInAudio
|
||||
text: JamiStrings.joinWithAudio
|
||||
onClicked: MessagesAdapter.joinCall(ActionUri, DeviceId, root.confId, true)
|
||||
}
|
||||
|
||||
JoinCallButton {
|
||||
id: joinCallInVideo
|
||||
objectName: "joinCallInVideo"
|
||||
text: JamiStrings.joinInVideo
|
||||
id: joinCallWithVideo
|
||||
objectName: "joinCallWithVideo"
|
||||
text: JamiStrings.joinWithVideo
|
||||
Layout.topMargin: 4
|
||||
Layout.bottomMargin: 4
|
||||
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ BaseModalDialog {
|
|||
Layout.bottomMargin: 5
|
||||
|
||||
color: JamiTheme.textColor
|
||||
text: JamiStrings.confirmDeleteQuestion
|
||||
text: JamiStrings.confirmDeleteAccount
|
||||
|
||||
font.pointSize: JamiTheme.textFontSize
|
||||
font.kerning: true
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ BaseModalDialog {
|
|||
appWindow,
|
||||
"commoncomponents/JamiFileDialog.qml",
|
||||
{
|
||||
title: JamiStrings.selectAvatarImage,
|
||||
title: JamiStrings.selectProfilePicture,
|
||||
fileMode: JamiFileDialog.OpenFile,
|
||||
folder: StandardPaths.writableLocation(
|
||||
StandardPaths.PicturesLocation),
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ Rectangle {
|
|||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 35
|
||||
|
||||
placeHolderText: JamiStrings.addParticipant
|
||||
placeHolderText: JamiStrings.inviteMember
|
||||
|
||||
onSearchBarTextChanged: function(text){
|
||||
ContactAdapter.setSearchFilter(text);
|
||||
|
|
|
|||
|
|
@ -315,7 +315,7 @@ Control {
|
|||
checkable: true
|
||||
icon.source: checked ? JamiResources.videocam_off_24dp_svg : JamiResources.videocam_24dp_svg
|
||||
icon.color: checked ? "red" : "white"
|
||||
text: !checked ? JamiStrings.muteCamera : JamiStrings.unmuteCamera
|
||||
text: !checked ? JamiStrings.stopCamera : JamiStrings.startCamera
|
||||
checked: !CurrentCall.isCapturing
|
||||
property var menuAction: videoInputMenuAction
|
||||
enabled: CurrentAccount.videoEnabled_Video
|
||||
|
|
@ -339,7 +339,7 @@ Control {
|
|||
onTriggered: root.addToConferenceClicked()
|
||||
icon.source: JamiResources.add_people_black_24dp_svg
|
||||
icon.color: "white"
|
||||
text: JamiStrings.addParticipants
|
||||
text: JamiStrings.inviteMembers
|
||||
enabled: CurrentCall.isModerator && !CurrentCall.isSIP
|
||||
onEnabledChanged: CallOverlayModel.setEnabled(this, addPersonAction.enabled)
|
||||
},
|
||||
|
|
@ -437,7 +437,7 @@ Control {
|
|||
onTriggered: root.pluginsClicked()
|
||||
icon.source: JamiResources.plugins_24dp_svg
|
||||
icon.color: "white"
|
||||
text: JamiStrings.viewPlugin
|
||||
text: JamiStrings.viewExtension
|
||||
enabled: PluginAdapter.callMediaHandlersListCount
|
||||
onEnabledChanged: CallOverlayModel.setEnabled(this, pluginsAction.enabled)
|
||||
},
|
||||
|
|
|
|||
|
|
@ -170,23 +170,23 @@ Rectangle {
|
|||
}
|
||||
|
||||
JamiPushButton { QWKSetParentHitTestVisible {}
|
||||
id: addParticipantsButton
|
||||
id: inviteMembersButton
|
||||
|
||||
checkable: true
|
||||
checked: extrasPanel.isOpen(ChatView.AddMemberPanel)
|
||||
visible: interactionButtonsVisibility && addMemberVisibility
|
||||
source: JamiResources.add_people_24dp_svg
|
||||
toolTipText: JamiStrings.addParticipants
|
||||
toolTipText: JamiStrings.inviteMembers
|
||||
|
||||
onClicked: extrasPanel.switchToPanel(ChatView.AddMemberPanel)
|
||||
}
|
||||
|
||||
JamiPushButton { QWKSetParentHitTestVisible {}
|
||||
id: selectPluginButton
|
||||
id: selectExtensionsButton
|
||||
|
||||
visible: PluginAdapter.chatHandlersListCount && interactionButtonsVisibility
|
||||
source: JamiResources.plugins_24dp_svg
|
||||
toolTipText: JamiStrings.showPlugins
|
||||
toolTipText: JamiStrings.showExtensions
|
||||
|
||||
onClicked: pluginSelector()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ BaseModalDialog {
|
|||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 35
|
||||
|
||||
placeHolderText: type === ContactList.TRANSFER ? JamiStrings.transferTo : JamiStrings.addParticipant
|
||||
placeHolderText: type === ContactList.TRANSFER ? JamiStrings.transferTo : JamiStrings.inviteMember
|
||||
|
||||
onSearchBarTextChanged: function(text){
|
||||
ContactAdapter.setSearchFilter(text);
|
||||
|
|
|
|||
|
|
@ -37,27 +37,27 @@ Window {
|
|||
id: keyboardGeneralShortcutsModel
|
||||
|
||||
ListElement {
|
||||
shortcut: "Ctrl + J"
|
||||
shortcut: "Ctrl+J"
|
||||
description: qsTr("Open account list")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + L"
|
||||
shortcut: "Ctrl+L"
|
||||
description: qsTr("Focus conversations list")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + R"
|
||||
shortcut: "Ctrl+R"
|
||||
description: qsTr("Requests list")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + ↑"
|
||||
shortcut: "Ctrl+↑"
|
||||
description: qsTr("Previous conversation")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + ↓"
|
||||
shortcut: "Ctrl+↓"
|
||||
description: qsTr("Next conversation")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + F"
|
||||
shortcut: "Ctrl+F"
|
||||
description: qsTr("Search bar")
|
||||
}
|
||||
ListElement {
|
||||
|
|
@ -65,15 +65,15 @@ Window {
|
|||
description: qsTr("Full screen")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + +"
|
||||
shortcut: "Ctrl++"
|
||||
description: qsTr("Increase font size")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + -"
|
||||
shortcut: "Ctrl+-"
|
||||
description: qsTr("Decrease font size")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + 0"
|
||||
shortcut: "Ctrl+0"
|
||||
description: qsTr("Reset font size")
|
||||
}
|
||||
},
|
||||
|
|
@ -81,33 +81,13 @@ Window {
|
|||
id: keyboardConversationShortcutsModel
|
||||
|
||||
ListElement {
|
||||
shortcut: "Ctrl + Shift + C"
|
||||
description: qsTr("Start audio call")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + Shift + X"
|
||||
description: qsTr("Start video call")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + Shift + L"
|
||||
description: qsTr("Clear history")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + Shift + F"
|
||||
description: qsTr("Search messages/files")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + Shift + B"
|
||||
description: qsTr("Block contact")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + Shift + Delete"
|
||||
description: qsTr("Leave conversation")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + Shift + A"
|
||||
shortcut: "Ctrl+Shift+A"
|
||||
description: qsTr("Accept contact request")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl+Shift+F"
|
||||
description: qsTr("Search messages/files")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "↑"
|
||||
description: qsTr("Edit last message")
|
||||
|
|
@ -116,20 +96,40 @@ Window {
|
|||
shortcut: "Esc"
|
||||
description: qsTr("Cancel message edition")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl+Shift+L"
|
||||
description: qsTr("Clear history")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl+Shift+B"
|
||||
description: qsTr("Block contact")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl+Shift+Delete"
|
||||
description: qsTr("Leave conversation")
|
||||
}
|
||||
},
|
||||
ListModel {
|
||||
id: keyboardCallsShortcutsModel
|
||||
|
||||
ListElement {
|
||||
shortcut: "Ctrl + Y"
|
||||
shortcut: "Ctrl+Shift+C"
|
||||
description: qsTr("Start audio call")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl+Shift+X"
|
||||
description: qsTr("Start video call")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl+Y"
|
||||
description: qsTr("Answer incoming call")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + D"
|
||||
shortcut: "Ctrl+D"
|
||||
description: qsTr("End call")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + Shift + D"
|
||||
shortcut: "Ctrl+Shift+D"
|
||||
description: qsTr("Decline call request")
|
||||
}
|
||||
ListElement {
|
||||
|
|
@ -141,86 +141,86 @@ Window {
|
|||
description: qsTr("Stop camera")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + Mouse middle click"
|
||||
shortcut: "Ctrl+Mouse middle click"
|
||||
description: qsTr("Take tile screenshot")
|
||||
}
|
||||
},
|
||||
ListModel {
|
||||
id: keyboardSettingsShortcutsModel
|
||||
|
||||
ListElement {
|
||||
shortcut: "Ctrl + Alt + I"
|
||||
description: qsTr("Open account settings")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + G"
|
||||
description: qsTr("Open general settings")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + M"
|
||||
description: qsTr("Open media settings")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + E"
|
||||
description: qsTr("Open extensions settings")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + Shift + N"
|
||||
description: qsTr("Open account creation wizard")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "F10"
|
||||
shortcut2: ""
|
||||
description: qsTr("View keyboard shortcuts")
|
||||
}
|
||||
},
|
||||
ListModel {
|
||||
id: keyboardMarkdownShortcutsModel
|
||||
|
||||
ListElement {
|
||||
shortcut: "Ctrl + B"
|
||||
shortcut: "Ctrl+B"
|
||||
description: qsTr("Bold")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + I"
|
||||
shortcut: "Ctrl+I"
|
||||
description: qsTr("Italic")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Shift + Alt + X"
|
||||
shortcut: "Shift+Alt+X"
|
||||
description: qsTr("Strikethrough")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + Alt + H"
|
||||
shortcut: "Ctrl+Alt+H"
|
||||
description: qsTr("Heading")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + Alt + K"
|
||||
shortcut: "Ctrl+Alt+K"
|
||||
description: qsTr("Link")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl + Alt + C"
|
||||
shortcut: "Ctrl+Alt+C"
|
||||
description: qsTr("Code")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Shift + Alt + 9"
|
||||
shortcut: "Shift+Alt+9"
|
||||
description: qsTr("Quote")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Shift + Alt + 8"
|
||||
shortcut: "Shift+Alt+8"
|
||||
description: qsTr("Unordered list")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Shift + Alt + 7"
|
||||
shortcut: "Shift+Alt+7"
|
||||
description: qsTr("Ordered list")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Shift + Alt + T"
|
||||
shortcut: "Shift+Alt+T"
|
||||
description: qsTr("Show/hide formatting")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Shift + Alt + P"
|
||||
shortcut: "Shift+Alt+P"
|
||||
description: qsTr("Show preview/Continue editing")
|
||||
}
|
||||
},
|
||||
ListModel {
|
||||
id: keyboardSettingsShortcutsModel
|
||||
|
||||
ListElement {
|
||||
shortcut: "Ctrl+Alt+I"
|
||||
description: qsTr("Open account settings")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl+G"
|
||||
description: qsTr("Open general settings")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl+M"
|
||||
description: qsTr("Open media settings")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl+E"
|
||||
description: qsTr("Open extensions settings")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "Ctrl+Shift+N"
|
||||
description: qsTr("Open account creation wizard")
|
||||
}
|
||||
ListElement {
|
||||
shortcut: "F10"
|
||||
shortcut2: ""
|
||||
description: qsTr("View keyboard shortcuts")
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
|
|
@ -302,7 +302,7 @@ Window {
|
|||
focus: true
|
||||
|
||||
Repeater {
|
||||
model: [JamiStrings.generalSettingsTitle, JamiStrings.conversationKeyboardShortcuts, JamiStrings.callKeyboardShortcuts, JamiStrings.settings, JamiStrings.markdownKeyboardShortcuts]
|
||||
model: [JamiStrings.generalSettingsTitle, JamiStrings.conversationKeyboardShortcuts, JamiStrings.callKeyboardShortcuts, JamiStrings.markdownKeyboardShortcuts, JamiStrings.settings]
|
||||
|
||||
TabButton {
|
||||
id: tabButton
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ DualPaneView {
|
|||
Layout.preferredWidth: JamiTheme.preferredFieldWidth
|
||||
|
||||
staticText: ""
|
||||
placeholderText: JamiStrings.addADescription
|
||||
placeholderText: JamiStrings.addDescription
|
||||
|
||||
textColor: {
|
||||
if (UtilsAdapter.luma(root.color)) {
|
||||
|
|
@ -205,7 +205,7 @@ DualPaneView {
|
|||
preferredWidth: textSize.width + 2 * JamiTheme.buttontextWizzardPadding
|
||||
|
||||
primary: true
|
||||
text: JamiStrings.createTheSwarm
|
||||
text: JamiStrings.createSwarm
|
||||
|
||||
onClicked: createSwarmClicked(title.dynamicText, description.dynamicText, UtilsAdapter.tempCreationImage())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ Rectangle {
|
|||
}
|
||||
|
||||
PushButton {
|
||||
id: joinCallInAudio
|
||||
id: joinCallWithAudio
|
||||
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
|
||||
Layout.rightMargin: JamiTheme.preferredMarginSize
|
||||
|
||||
|
|
@ -68,7 +68,7 @@ Rectangle {
|
|||
}
|
||||
|
||||
PushButton {
|
||||
id: joinCallInVideo
|
||||
id: joinCallWithVideo
|
||||
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
|
||||
Layout.rightMargin: JamiTheme.preferredMarginSize
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ Rectangle {
|
|||
}
|
||||
}
|
||||
|
||||
Behavior on opacity {
|
||||
Behavior on opacity {
|
||||
NumberAnimation {
|
||||
from: 0
|
||||
duration: JamiTheme.shortFadeDuration
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ Popup {
|
|||
verticalAlignment: Text.AlignVCenter
|
||||
color: JamiTheme.textColor
|
||||
|
||||
text: JamiStrings.choosePlugin
|
||||
text: JamiStrings.chooseExtension
|
||||
}
|
||||
|
||||
PushButton {
|
||||
|
|
@ -176,7 +176,7 @@ Popup {
|
|||
Layout.leftMargin: 5
|
||||
Layout.topMargin: 5
|
||||
|
||||
toolTipText: JamiStrings.goBackToPluginsList
|
||||
toolTipText: JamiStrings.goBackToExtensionsList
|
||||
|
||||
onClicked: {
|
||||
stack.pop(null, StackView.Immediate);
|
||||
|
|
@ -195,7 +195,7 @@ Popup {
|
|||
verticalAlignment: Text.AlignVCenter
|
||||
|
||||
color: JamiTheme.textColor
|
||||
text: JamiStrings.pluginPreferences
|
||||
text: JamiStrings.extensionPreferences
|
||||
}
|
||||
|
||||
PushButton {
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ ItemDelegate {
|
|||
Layout.fillWidth: true
|
||||
Layout.minimumHeight: 20
|
||||
Layout.alignment: Qt.AlignVCenter
|
||||
text: JamiStrings.banned
|
||||
text: JamiStrings.blocked
|
||||
textFormat: TextEdit.PlainText
|
||||
visible: IsBanned
|
||||
font.pointSize: JamiTheme.mediumFontSize
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ Rectangle {
|
|||
Layout.rightMargin: 2 * JamiTheme.settingsMarginSize
|
||||
|
||||
staticText: CurrentConversation.description
|
||||
placeholderText: JamiStrings.addADescription
|
||||
placeholderText: JamiStrings.addDescription
|
||||
elidedText: descriptionLineButtonTextSize.elidedText
|
||||
|
||||
textColor: root.textColor
|
||||
|
|
@ -156,7 +156,7 @@ Rectangle {
|
|||
descriptionLineButton.editMode = activeFocus;
|
||||
}
|
||||
|
||||
infoTipLineText: JamiStrings.addADescription
|
||||
infoTipLineText: JamiStrings.addDescription
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -663,7 +663,7 @@ Rectangle {
|
|||
if (MemberRole === Member.Role.INVITED)
|
||||
return JamiStrings.invited;
|
||||
if (MemberRole === Member.Role.BANNED)
|
||||
return JamiStrings.banned;
|
||||
return JamiStrings.blocked;
|
||||
return "";
|
||||
}
|
||||
maxWidth: JamiTheme.preferredFieldWidth
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ Item {
|
|||
property string incomingAudioCallFrom: qsTr("Incoming audio call from {}")
|
||||
property string incomingVideoCallFrom: qsTr("Incoming video call from {}")
|
||||
property string startSwarm: qsTr("Start swarm")
|
||||
property string createSwarm: qsTr("Create swarm")
|
||||
property string invitations: qsTr("Invitations")
|
||||
property string description: qsTr("Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.")
|
||||
property string updateToSwarm: qsTr("Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.")
|
||||
|
|
@ -85,8 +84,8 @@ Item {
|
|||
property string enableCustomRingtone: qsTr("Enable custom ringtone")
|
||||
property string selectCustomRingtone: qsTr("Select custom ringtone")
|
||||
property string selectNewRingtone: qsTr("Select a new ringtone")
|
||||
property string certificateFile: qsTr("Certificate File (*.crt)")
|
||||
property string audioFile: qsTr("Audio File (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)")
|
||||
property string certificateFile: qsTr("Certificate file (*.crt)")
|
||||
property string audioFile: qsTr("Audio file (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)")
|
||||
property string pushToTalk: qsTr("Push-to-talk")
|
||||
property string enablePTT: qsTr("Enable push-to-talk")
|
||||
property string keyboardShortcut: qsTr("Keyboard shortcut")
|
||||
|
|
@ -117,11 +116,11 @@ Item {
|
|||
property string verifyCertificatesClient: qsTr("Verify server TLS certificates")
|
||||
property string tlsRequireConnections: qsTr("Require certificate for incoming TLS connections")
|
||||
property string disableSecureDlgCheck: qsTr("Disable secure dialog check for incoming TLS data")
|
||||
property string selectPrivateKey: qsTr("Select a private key")
|
||||
property string selectUserCert: qsTr("Select a user certificate")
|
||||
property string selectCACert: qsTr("Select a CA certificate")
|
||||
property string selectPrivateKey: qsTr("Select private key")
|
||||
property string selectUserCert: qsTr("Select user certificate")
|
||||
property string selectCACert: qsTr("Select CA certificate")
|
||||
property string selectCACertDefault: qsTr("Select")
|
||||
property string keyFile: qsTr("Key File (*.key)")
|
||||
property string keyFile: qsTr("Key file (*.key)")
|
||||
|
||||
// AdvancedConnectivitySettings
|
||||
property string connectivity: qsTr("Connectivity")
|
||||
|
|
@ -133,7 +132,7 @@ Item {
|
|||
property string turnAdress: qsTr("TURN address")
|
||||
property string turnUsername: qsTr("TURN username")
|
||||
property string turnPassword: qsTr("TURN password")
|
||||
property string turnRealm: qsTr("TURN Realm")
|
||||
property string turnRealm: qsTr("TURN realm")
|
||||
property string useSTUN: qsTr("Use STUN")
|
||||
property string stunAdress: qsTr("STUN address")
|
||||
|
||||
|
|
@ -174,14 +173,14 @@ Item {
|
|||
property string back: qsTr("Back")
|
||||
property string accountSettingsMenuTitle: qsTr("Account")
|
||||
property string generalSettingsTitle: qsTr("General")
|
||||
property string pluginSettingsTitle: qsTr("Extensions")
|
||||
property string extensionSettingsTitle: qsTr("Extensions")
|
||||
property string enableAccountSettingsTitle: qsTr("Enable account")
|
||||
property string manageAccountSettingsTitle: qsTr("Manage account")
|
||||
property string linkedDevicesSettingsTitle: qsTr("Linked devices")
|
||||
property string callSettingsTitle: qsTr("Call settings")
|
||||
property string chatSettingsTitle: qsTr("Chat")
|
||||
property string advancedSettingsTitle: qsTr("Advanced settings")
|
||||
property string audioVideoSettingsTitle: qsTr("Media")
|
||||
property string mediaSettingsTitle: qsTr("Media")
|
||||
|
||||
// AudioSettings
|
||||
property string audio: qsTr("Audio")
|
||||
|
|
@ -206,7 +205,7 @@ Item {
|
|||
property string mirrorLocalVideo: qsTr("Mirror local video")
|
||||
property string screenSharing: qsTr("Screen sharing")
|
||||
property string selectScreenSharingFPS: qsTr("Select screen sharing frame rate (frames per second)")
|
||||
property string noVideo: qsTr("no video")
|
||||
property string noCamera: qsTr("No camera available")
|
||||
|
||||
// BackupKeyPage
|
||||
property string whyBackupAccount: qsTr("Why should I back-up this account?")
|
||||
|
|
@ -218,8 +217,7 @@ Item {
|
|||
property string jamiArchiveFiles: qsTr("Jami archive files (*.gz)")
|
||||
property string allFiles: qsTr("All files (*)")
|
||||
|
||||
// BannedItemDelegate
|
||||
property string reinstateContact: qsTr("Reinstate as contact")
|
||||
// ContactItemDelegate
|
||||
property string name: qsTr("name")
|
||||
property string identifier: qsTr("Identifier")
|
||||
|
||||
|
|
@ -230,10 +228,10 @@ Item {
|
|||
property string unmute: qsTr("Unmute")
|
||||
property string pauseCall: qsTr("Pause call")
|
||||
property string resumeCall: qsTr("Resume call")
|
||||
property string muteCamera: qsTr("Mute camera")
|
||||
property string unmuteCamera: qsTr("Unmute camera")
|
||||
property string addParticipant: qsTr("Add participant")
|
||||
property string addParticipants: qsTr("Add participants")
|
||||
property string stopCamera: qsTr("Stop camera")
|
||||
property string startCamera: qsTr("Start camera")
|
||||
property string inviteMember: qsTr("Invite member")
|
||||
property string inviteMembers: qsTr("Invite members")
|
||||
property string details: qsTr("Details")
|
||||
property string chat: qsTr("Chat")
|
||||
property string moreOptions: qsTr("More options")
|
||||
|
|
@ -272,7 +270,7 @@ Item {
|
|||
property string contactDetails: qsTr("Contact details")
|
||||
|
||||
// CallViewContextMenu
|
||||
property string sipInputPanel: qsTr("Sip input panel")
|
||||
property string sipInputPanel: qsTr("DTMF input panel")
|
||||
property string transferCall: qsTr("Transfer call")
|
||||
property string stopRec: qsTr("Stop recording")
|
||||
property string startRec: qsTr("Start recording")
|
||||
|
|
@ -283,7 +281,7 @@ Item {
|
|||
property string shareScreenArea: qsTr("Share screen area")
|
||||
property string shareFile: qsTr("Share file")
|
||||
property string selectShareMethod: qsTr("Select sharing method")
|
||||
property string viewPlugin: qsTr("View plugin")
|
||||
property string viewExtension: qsTr("View extension")
|
||||
property string advancedInformation: qsTr("Advanced information")
|
||||
property string noVideoDevice: qsTr("No video device")
|
||||
property string notAvailable: qsTr("Unavailable")
|
||||
|
|
@ -310,8 +308,8 @@ Item {
|
|||
// Share location/position
|
||||
property string shareLocation: qsTr("Share location")
|
||||
property string stopSharingLocation: qsTr("Stop sharing")
|
||||
property string locationServicesError: qsTr("Your precise location could not be determined.\nIn Device Settings, please turn on \"Location Services\".\nOther participants' location can still be received.")
|
||||
property string locationServicesClosedError: qsTr("Your precise location could not be determined. Please check your Internet connection.")
|
||||
property string locationServicesError: qsTr("An error occurred while sharing device location.\nEnable “Location Services” in device settings in order to use this feature.\nThe location of other members can still be received.")
|
||||
property string locationServicesClosedError: qsTr("An error occurred while sharing device location. Please check your Internet connection and try again.")
|
||||
property string stopAllSharings: qsTr("Turn off location sharing")
|
||||
property string shortStopAllSharings: qsTr("Turn off sharing")
|
||||
property string stopConvSharing: qsTr("Stop location sharing in this conversation (%1)")
|
||||
|
|
@ -340,7 +338,7 @@ Item {
|
|||
property string hideChat: qsTr("Hide chat")
|
||||
property string placeAudioCall: qsTr("Start audio call")
|
||||
property string placeVideoCall: qsTr("Start video call")
|
||||
property string showPlugins: qsTr("Show available plugins")
|
||||
property string showExtensions: qsTr("Show available extensions")
|
||||
property string addToConversations: qsTr("Add to conversations")
|
||||
property string backendError: qsTr("A backend system error occurred: %0")
|
||||
property string disabledAccount: qsTr("The account is disabled")
|
||||
|
|
@ -396,12 +394,12 @@ Item {
|
|||
property string sipAccount: qsTr("SIP account")
|
||||
property string proxy: qsTr("Proxy")
|
||||
property string server: qsTr("Server")
|
||||
property string configureExistingSIP: qsTr("Configure an existing SIP account")
|
||||
property string configureExistingSIP: qsTr("Configure existing SIP account")
|
||||
property string personalizeAccount: qsTr("Personalize account")
|
||||
property string addSip: qsTr("Add SIP account")
|
||||
property string tls: qsTr("TLS")
|
||||
property string udp: qsTr("UDP")
|
||||
property string displayName: qsTr("Display Name")
|
||||
property string displayName: qsTr("Display name")
|
||||
|
||||
// accountSettingsPages
|
||||
property string customizeAccountDescription: qsTr("Your profile is only shared with your contacts.\nYour picture and your nickname can be changed at all time in the settings of your account.")
|
||||
|
|
@ -432,8 +430,8 @@ Item {
|
|||
property string advancedAccountSettings: qsTr("Advanced account settings")
|
||||
property string encryptAccount: qsTr("Encrypt account with password")
|
||||
property string customizeProfile: qsTr("Customize profile")
|
||||
property string customizeProfileDescription: qsTr("This profile is only shared with this account's contacts.\nThe profile can be changed at all times from the account's settings.")
|
||||
property string encryptTitle: qsTr("Encrypt account with a password")
|
||||
property string customizeProfileDescription: qsTr("This profile is only shared with account contacts.\nThe profile can be changed in account settings.")
|
||||
property string encryptTitle: qsTr("Encrypt account with password")
|
||||
property string encryptDescription: qsTr("A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.")
|
||||
property string encryptWarning: qsTr("Please note that if you lose your password, it CANNOT be recovered!")
|
||||
property string enterNickname: qsTr("Enter a nickname, surname…")
|
||||
|
|
@ -451,17 +449,18 @@ Item {
|
|||
// LinkedDevices
|
||||
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("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 removeDevice: qsTr("Remove device")
|
||||
property string confirmRemoveDevice: qsTr("Do you really want to unlink selected device? To continue, enter account password and click Unlink.")
|
||||
property string yourPinIs: qsTr("Account PIN code is:")
|
||||
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")
|
||||
property string reinstateContact: qsTr("Reinstate as contact")
|
||||
property string blocked: qsTr("Blocked")
|
||||
property string blockedContacts: qsTr("Blocked contacts")
|
||||
|
||||
// DeleteAccountDialog
|
||||
property string confirmDeleteQuestion: qsTr("Do you really want to delete this account? To continue, click Delete.")
|
||||
property string confirmDeleteAccount: 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
|
||||
|
|
@ -504,8 +503,8 @@ Item {
|
|||
|
||||
// JamiUserIdentity settings
|
||||
property string register: qsTr("Register")
|
||||
property string incorrectPassword: qsTr("Incorrect password")
|
||||
property string networkError: qsTr("Network error")
|
||||
property string incorrectPassword: qsTr("Incorrect password.")
|
||||
property string networkError: qsTr("A network error occurred.")
|
||||
property string somethingWentWrong: qsTr("An unexpected error occurred.")
|
||||
|
||||
// Context Menu
|
||||
|
|
@ -521,15 +520,15 @@ Item {
|
|||
property string updateDialogTitle: qsTr("Update")
|
||||
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 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")
|
||||
property string updateCheckError: qsTr("An error occurred while checking for a new version.")
|
||||
property string updateNetworkError: qsTr("A network error occurred.")
|
||||
property string updateSSLError: qsTr("An SSL error occurred.")
|
||||
property string updateDownloadCanceled: qsTr("Installer download was canceled by user.")
|
||||
property string updateDownloading: "Downloading"
|
||||
property string confirmBeta: qsTr("This will uninstall your current Release version and you can always download the latest Release version on our website")
|
||||
property string confirmBeta: qsTr("This will replace the Release version with the Beta version on this device. The latest Release version can always be downloaded from the Jami website.")
|
||||
property string networkDisconnected: qsTr("Network disconnected")
|
||||
property string accessError: qsTr("Content access error")
|
||||
property string contentNotFoundError: qsTr("Content not found")
|
||||
property string accessError: qsTr("An error occurred while accessing contents.")
|
||||
property string contentNotFoundError: qsTr("Content not found.")
|
||||
property string genericError: qsTr("An unexpected error occurred.")
|
||||
|
||||
// Troubleshoot Settings
|
||||
|
|
@ -578,29 +577,29 @@ Item {
|
|||
// ImportFromDevicePage
|
||||
property string importButton: qsTr("Import")
|
||||
property string pin: qsTr("Enter the PIN code")
|
||||
property string importFromDeviceDescription: qsTr("A PIN is required to use an existing Jami account on this device.")
|
||||
property string importStep1: qsTr("Step 01")
|
||||
property string importStep2: qsTr("Step 02")
|
||||
property string importStep3: qsTr("Step 03")
|
||||
property string importStep4: qsTr("Step 04")
|
||||
property string importStep1Desc: qsTr("Go to the account management settings of a previous device")
|
||||
property string importStep2Desc: qsTr("Choose the account to link")
|
||||
property string importStep3Desc: qsTr("Select \"Link another device\"")
|
||||
property string importStep4Desc: qsTr("The PIN code will be available for 10 minutes")
|
||||
property string importFromDeviceDescription: qsTr("A PIN code is required to use an existing Jami account on this device.")
|
||||
property string importStep1: qsTr("Step 1")
|
||||
property string importStep2: qsTr("Step 2")
|
||||
property string importStep3: qsTr("Step 3")
|
||||
property string importStep4: qsTr("Step 4")
|
||||
property string importStep1Desc: qsTr("Go to the account management settings of a previous device.")
|
||||
property string importStep2Desc: qsTr("Choose the account to link.")
|
||||
property string importStep3Desc: qsTr("Select “Link another device.”")
|
||||
property string importStep4Desc: qsTr("The PIN code will expire in 10 minutes.")
|
||||
property string importPasswordDesc: qsTr("Fill if the account is password-encrypted.")
|
||||
|
||||
// LinkDevicesDialog
|
||||
property string pinTimerInfos: qsTr("The PIN and the account password should be entered in your device within 10 minutes.")
|
||||
property string pinTimerInfos: qsTr("The PIN code and the account password should be entered in your device within 10 minutes.")
|
||||
property string close: qsTr("Close")
|
||||
property string enterAccountPassword: qsTr("Enter account password")
|
||||
property string enterPasswordPinCode: qsTr("This account is password encrypted, enter the password to generate a PIN code.")
|
||||
property string addDevice: qsTr("Add Device")
|
||||
property string pinExpired: qsTr("PIN expired")
|
||||
property string pinExpired: qsTr("PIN code has expired.")
|
||||
property string onAnotherDevice: qsTr("On another device")
|
||||
property string onAnotherDeviceInstruction: qsTr("Install and launch Jami, select \"Import from another device\" and scan the QR code.")
|
||||
property string onAnotherDeviceInstruction: qsTr("Install and launch Jami, select “Import from another device” and scan the QR code.")
|
||||
property string linkNewDevice: qsTr("Link new device")
|
||||
property string linkingInstructions: qsTr("In Jami, scan QR code or manually enter the PIN.")
|
||||
property string pinValidity: qsTr("The PIN code is valid for: ")
|
||||
property string linkingInstructions: qsTr("In Jami, scan QR code or manually enter PIN code.")
|
||||
property string pinValidity: qsTr("The PIN code will expire in: ")
|
||||
|
||||
// PasswordDialog
|
||||
property string enterPassword: qsTr("Enter password")
|
||||
|
|
@ -612,12 +611,12 @@ Item {
|
|||
property string exportAccount: qsTr("Export")
|
||||
|
||||
// PhotoBoothView
|
||||
property string selectAvatarImage: qsTr("Select image as avatar")
|
||||
property string selectImage: qsTr("Select image")
|
||||
property string importFromFile: qsTr("Import avatar from image file")
|
||||
property string removeImage: qsTr("Remove image")
|
||||
property string selectProfilePicture: qsTr("Select image as profile picture")
|
||||
property string selectImage: qsTr("How do you want to set the profile picture?")
|
||||
property string importFromFile: qsTr("Import profile picture from image file")
|
||||
property string removeImage: qsTr("Remove profile picture")
|
||||
property string takePhoto: qsTr("Take photo")
|
||||
property string imageFiles: qsTr("Image Files (*.jpeg *.jpg *.png *.JPEG* .JPG *.PNG)")
|
||||
property string imageFiles: qsTr("Image files (*.jpeg *.jpg *.png *.JPEG* .JPG *.PNG)")
|
||||
|
||||
// Extensions
|
||||
property string autoUpdate: qsTr("Auto update")
|
||||
|
|
@ -627,30 +626,30 @@ Item {
|
|||
property string installing: qsTr("Installing")
|
||||
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("The Jami Extension Store is not currently available. Please try again later.")
|
||||
property string extensionStoreTitle: qsTr("Available")
|
||||
property string extensionStoreNotAvailable: 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 extensionPreferences: qsTr("Preferences")
|
||||
property string installationFailed: qsTr("Installation error")
|
||||
property string pluginInstallationFailed: qsTr("An error occurred while installing the extension.")
|
||||
property string extensionInstallationFailed: 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 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")
|
||||
property string selectFile: qsTr("Select a file")
|
||||
property string selectExtensionInstall: qsTr("Select extension to install")
|
||||
property string uninstallExtension: qsTr("Uninstall extension")
|
||||
property string confirmExtensionReset: qsTr("Do you really want to reset the preferences for the %1 extension?")
|
||||
property string confirmExtensionUninstall: qsTr("Do you really want to uninstall the %1 extension?")
|
||||
property string goBackToExtensionsList: qsTr("Go back to extensions list")
|
||||
property string selectFile: qsTr("Select file")
|
||||
property string select: qsTr("Select")
|
||||
property string chooseImageFile: qsTr("Choose image file")
|
||||
property string pluginFiles: qsTr("Plugin Files (*.jpl)")
|
||||
property string extensionFiles: qsTr("Extension files (*.jpl)")
|
||||
property string loadUnload: qsTr("Load/Unload")
|
||||
property string selectAnImage: qsTr("Select An Image to %1")
|
||||
property string editPreference: qsTr("Edit preference")
|
||||
property string onOff: qsTr("On/Off")
|
||||
property string choosePlugin: qsTr("Choose Plugin")
|
||||
property string versionPlugin: qsTr("Version %1")
|
||||
property string chooseExtension: qsTr("Choose extension")
|
||||
property string versionExtension: qsTr("Version %1")
|
||||
property string lastUpdate: qsTr("Last update %1")
|
||||
property string by: qsTr("By %1")
|
||||
property string proposedBy: qsTr("Proposed by %1")
|
||||
|
|
@ -684,7 +683,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("An error occurred while creating the account. Check check credentials and try again.")
|
||||
property string errorCreateAccount: qsTr("An error occurred while creating the account. 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")
|
||||
|
|
@ -717,7 +716,7 @@ Item {
|
|||
property string optionRemove: qsTr("Remove")
|
||||
property string optionLeave: qsTr("Leave")
|
||||
property string optionBlock: qsTr("Block")
|
||||
property string optionUnban: qsTr("Unban")
|
||||
property string optionUnblock: qsTr("Unblock")
|
||||
|
||||
// Conference moderation
|
||||
property string setModerator: qsTr("Set moderator")
|
||||
|
|
@ -777,8 +776,8 @@ Item {
|
|||
property string edit: qsTr("Edit")
|
||||
property string edited: qsTr("Edited")
|
||||
property string joinCall: qsTr("Join call")
|
||||
property string joinInAudio: qsTr("Join in audio")
|
||||
property string joinInVideo: qsTr("Join in video")
|
||||
property string joinWithAudio: qsTr("Join with audio")
|
||||
property string joinWithVideo: qsTr("Join with video")
|
||||
property string startedACall: qsTr("Started a call")
|
||||
property string wantToJoin: qsTr("A call is in progress. Do you want to join the call?")
|
||||
property string needsHost: qsTr("Current host for this swarm seems unreachable. Do you want to host the call?")
|
||||
|
|
@ -793,9 +792,9 @@ Item {
|
|||
property string hideLocalVideo: qsTr("Hide local video")
|
||||
|
||||
// Invitation View
|
||||
property string invitationViewSentRequest: qsTr("%1 has sent you a request for a conversation.")
|
||||
property string invitationViewSentRequest: qsTr("%1 sent you a conversation invitation.")
|
||||
property string invitationViewJoinConversation: qsTr("Hello,\nDo you want to join this conversation?")
|
||||
property string invitationViewAcceptedConversation: qsTr("You have accepted\nthe conversation request")
|
||||
property string invitationViewAcceptedConversation: qsTr("You have accepted\nthe conversation invitation.")
|
||||
property string invitationViewWaitingForSync: qsTr("Waiting until %1\nconnects to synchronize the conversation.")
|
||||
|
||||
// SwarmDetailsPanel
|
||||
|
|
@ -803,7 +802,7 @@ Item {
|
|||
property string member: qsTr("Member")
|
||||
property string swarmName: qsTr("Swarm name")
|
||||
property string contactName: qsTr("Contact name")
|
||||
property string addADescription: qsTr("Add a description")
|
||||
property string addDescription: qsTr("Add description")
|
||||
|
||||
property string muteConversation: qsTr("Mute conversation")
|
||||
property string ignoreNotificationsTooltip: qsTr("Ignore all notifications from this conversation")
|
||||
|
|
@ -814,7 +813,7 @@ Item {
|
|||
property string none: qsTr("None")
|
||||
|
||||
// NewSwarmPage
|
||||
property string createTheSwarm: qsTr("Create the swarm")
|
||||
property string createSwarm: qsTr("Create swarm")
|
||||
property string goToConversation: qsTr("Go to conversation")
|
||||
property string kickMember: qsTr("Kick member")
|
||||
property string reinstateMember: qsTr("Reinstate member")
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ SidePanelBase {
|
|||
"visible": AppVersionManager.isUpdaterEnabled()
|
||||
}]
|
||||
}, {
|
||||
"title": JamiStrings.audioVideoSettingsTitle,
|
||||
"title": JamiStrings.mediaSettingsTitle,
|
||||
"icon": JamiResources.media_black_24dp_svg,
|
||||
"first": 12,
|
||||
"last": 14,
|
||||
|
|
@ -103,13 +103,13 @@ SidePanelBase {
|
|||
"title": JamiStrings.screenSharing
|
||||
}]
|
||||
}, {
|
||||
"title": JamiStrings.pluginSettingsTitle,
|
||||
"title": JamiStrings.extensionSettingsTitle,
|
||||
"icon": JamiResources.plugins_24dp_svg,
|
||||
"first": 15,
|
||||
"last": 15,
|
||||
"children": [{
|
||||
"id": 15,
|
||||
"title": JamiStrings.pluginSettingsTitle
|
||||
"title": JamiStrings.extensionSettingsTitle
|
||||
}]
|
||||
}];
|
||||
} else {
|
||||
|
|
@ -160,7 +160,7 @@ SidePanelBase {
|
|||
"title": JamiStrings.troubleshootTitle
|
||||
}]
|
||||
}, {
|
||||
"title": JamiStrings.audioVideoSettingsTitle,
|
||||
"title": JamiStrings.mediaSettingsTitle,
|
||||
"icon": JamiResources.media_black_24dp_svg,
|
||||
"first": 12,
|
||||
"last": 14,
|
||||
|
|
@ -175,13 +175,13 @@ SidePanelBase {
|
|||
"title": JamiStrings.screenSharing
|
||||
}]
|
||||
}, {
|
||||
"title": JamiStrings.pluginSettingsTitle,
|
||||
"title": JamiStrings.extensionSettingsTitle,
|
||||
"icon": JamiResources.plugins_24dp_svg,
|
||||
"first": 15,
|
||||
"last": 15,
|
||||
"children": [{
|
||||
"id": 15,
|
||||
"title": JamiStrings.pluginSettingsTitle
|
||||
"title": JamiStrings.extensionSettingsTitle
|
||||
}]
|
||||
}];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ ColumnLayout {
|
|||
contactName: ContactName
|
||||
contactID: ContactID
|
||||
|
||||
btnImgSource: JamiStrings.optionUnban
|
||||
btnImgSource: JamiStrings.optionUnblock
|
||||
btnToolTip: JamiStrings.reinstateContact
|
||||
|
||||
onClicked: bannedListWidget.currentIndex = index
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@ import "../../commoncomponents"
|
|||
ColumnLayout {
|
||||
function installPlugin() {
|
||||
var dlg = viewCoordinator.presentDialog(appWindow, "commoncomponents/JamiFileDialog.qml", {
|
||||
"title": JamiStrings.selectPluginInstall,
|
||||
"title": JamiStrings.selectExtensionInstall,
|
||||
"fileMode": JamiFileDialog.OpenFile,
|
||||
"folder": StandardPaths.writableLocation(StandardPaths.DownloadLocation),
|
||||
"nameFilters": [JamiStrings.pluginFiles, JamiStrings.allFiles]
|
||||
"nameFilters": [JamiStrings.extensionFiles, JamiStrings.allFiles]
|
||||
});
|
||||
dlg.fileAccepted.connect(function (file) {
|
||||
var url = UtilsAdapter.getAbsPath(file.toString());
|
||||
|
|
@ -29,7 +29,7 @@ ColumnLayout {
|
|||
function presentErrorMessage() {
|
||||
viewCoordinator.presentDialog(appWindow, "commoncomponents/SimpleMessageDialog.qml", {
|
||||
"title": JamiStrings.installationFailed,
|
||||
"infoText": JamiStrings.pluginInstallationFailed,
|
||||
"infoText": JamiStrings.extensionInstallationFailed,
|
||||
"buttonStyles": [SimpleMessageDialog.ButtonStyle.TintedBlue],
|
||||
"buttonTitles": [JamiStrings.optionOk],
|
||||
"buttonCallBacks": [],
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ ColumnLayout {
|
|||
} else {
|
||||
viewCoordinator.presentDialog(appWindow, "commoncomponents/SimpleMessageDialog.qml", {
|
||||
"title": JamiStrings.removeDevice,
|
||||
"infoText": JamiStrings.sureToRemoveDevice,
|
||||
"infoText": JamiStrings.confirmRemoveDevice,
|
||||
"buttonTitles": [JamiStrings.optionOk, JamiStrings.optionCancel],
|
||||
"buttonStyles": [SimpleMessageDialog.ButtonStyle.TintedBlue, SimpleMessageDialog.ButtonStyle.TintedBlack],
|
||||
"buttonCallBacks": [function () {
|
||||
|
|
|
|||
|
|
@ -387,7 +387,7 @@ SettingsPageBase {
|
|||
Layout.alignment: Qt.AlignLeft
|
||||
Layout.preferredWidth: parent.width
|
||||
|
||||
text: JamiStrings.bannedContacts
|
||||
text: JamiStrings.blockedContacts
|
||||
color: JamiTheme.textColor
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ ItemDelegate {
|
|||
function presentErrorMessage() {
|
||||
viewCoordinator.presentDialog(appWindow, "commoncomponents/SimpleMessageDialog.qml", {
|
||||
"title": JamiStrings.installationFailed,
|
||||
"infoText": JamiStrings.pluginInstallationFailed,
|
||||
"infoText": JamiStrings.extensionInstallationFailed,
|
||||
"buttonStyles": [SimpleMessageDialog.ButtonStyle.TintedBlue],
|
||||
"buttonTitles": [JamiStrings.optionOk],
|
||||
"buttonCallBacks": [],
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ ItemDelegate {
|
|||
function presentErrorMessage() {
|
||||
viewCoordinator.presentDialog(appWindow, "commoncomponents/SimpleMessageDialog.qml", {
|
||||
"title": JamiStrings.installationFailed,
|
||||
"infoText": JamiStrings.pluginInstallationFailed,
|
||||
"infoText": JamiStrings.extensionInstallationFailed,
|
||||
"buttonStyles": [SimpleMessageDialog.ButtonStyle.TintedBlue],
|
||||
"buttonTitles": [JamiStrings.optionOk],
|
||||
"buttonCallBacks": []
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@ Rectangle {
|
|||
|
||||
onClicked: viewCoordinator.presentDialog(appWindow, "commoncomponents/SimpleMessageDialog.qml", {
|
||||
"title": JamiStrings.resetPreferences,
|
||||
"infoText": JamiStrings.pluginResetConfirmation.arg(pluginId),
|
||||
"infoText": JamiStrings.confirmExtensionReset.arg(pluginId),
|
||||
"buttonTitles": [JamiStrings.optionOk, JamiStrings.optionCancel],
|
||||
"buttonStyles": [SimpleMessageDialog.ButtonStyle.TintedBlue, SimpleMessageDialog.ButtonStyle.TintedBlack],
|
||||
"buttonCallBacks": [function () {
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@ Item {
|
|||
}
|
||||
Label {
|
||||
Layout.fillWidth: true
|
||||
text: JamiStrings.versionPlugin.arg(PluginVersion)
|
||||
text: JamiStrings.versionExtension.arg(PluginVersion)
|
||||
font.pixelSize: JamiTheme.headerFontSize
|
||||
font.kerning: true
|
||||
color: JamiTheme.textColor
|
||||
|
|
@ -273,13 +273,13 @@ Item {
|
|||
hoveredColor: JamiTheme.buttonTintedBlackHovered
|
||||
pressedColor: JamiTheme.buttonTintedBlackPressed
|
||||
tertiary: true
|
||||
toolTipText: JamiStrings.pluginUninstallConfirmation.arg(PluginId)
|
||||
toolTipText: JamiStrings.confirmExtensionUninstall.arg(PluginId)
|
||||
|
||||
text: JamiStrings.uninstall
|
||||
|
||||
onClicked: viewCoordinator.presentDialog(appWindow, "commoncomponents/SimpleMessageDialog.qml", {
|
||||
"title": JamiStrings.uninstallPlugin,
|
||||
"infoText": JamiStrings.pluginUninstallConfirmation.arg(PluginName),
|
||||
"title": JamiStrings.uninstallExtension,
|
||||
"infoText": JamiStrings.confirmExtensionUninstall.arg(PluginName),
|
||||
"buttonTitles": [JamiStrings.optionOk, JamiStrings.optionCancel],
|
||||
"buttonStyles": [SimpleMessageDialog.ButtonStyle.TintedBlue, SimpleMessageDialog.ButtonStyle.TintedBlack],
|
||||
"buttonCallBacks": [function () {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ import "../../commoncomponents"
|
|||
|
||||
SettingsPageBase {
|
||||
id: root
|
||||
title: JamiStrings.pluginSettingsTitle
|
||||
title: JamiStrings.extensionSettingsTitle
|
||||
onWidthChanged: resolvePanes()
|
||||
flickableContent: RowLayout {
|
||||
width: parent.width
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ ColumnLayout {
|
|||
Label {
|
||||
Layout.fillWidth: true
|
||||
Layout.bottomMargin: 20
|
||||
text: JamiStrings.pluginStoreTitle
|
||||
text: JamiStrings.extensionStoreTitle
|
||||
font.pixelSize: JamiTheme.settingsTitlePixelSize
|
||||
font.kerning: true
|
||||
color: JamiTheme.textColor
|
||||
|
|
@ -113,7 +113,7 @@ ColumnLayout {
|
|||
color: JamiTheme.textColor
|
||||
font.pixelSize: JamiTheme.bigFontSize
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
text: JamiStrings.pluginStoreNotAvailable
|
||||
text: JamiStrings.extensionStoreNotAvailable
|
||||
}
|
||||
}
|
||||
Loader {
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ SettingsPageBase {
|
|||
font.pointSize: 18
|
||||
font.capitalization: Font.AllUppercase
|
||||
color: "white"
|
||||
text: JamiStrings.noVideo
|
||||
text: JamiStrings.noCamera
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,14 +87,14 @@ TipsModel::reset()
|
|||
tips_.append({{"id", "1"},
|
||||
{"title", tr("What does Jami mean?")},
|
||||
{"desc",
|
||||
tr("The choice of the name Jami was inspired by the Swahili word 'jamii', which "
|
||||
"means 'community' as a noun and 'together' as an adverb.")},
|
||||
tr("The choice of the name Jami was inspired by the Swahili word “jamii”, which "
|
||||
"means “community” as a noun and “together” as an adverb.")},
|
||||
{"type", "tip"}});
|
||||
tips_.append({{"id", "2"},
|
||||
{"title", tr("What is the green dot next to my account?")},
|
||||
{"desc",
|
||||
tr("A red dot means that your account is disconnected from the network; it "
|
||||
"turns green when it's connected.")},
|
||||
"turns green when it’s connected.")},
|
||||
{"type", "tip"}});
|
||||
tips_.append(
|
||||
{{"id", "3"},
|
||||
|
|
@ -108,7 +108,7 @@ TipsModel::reset()
|
|||
{{"id", "4"},
|
||||
{"title", tr("Can I make a conference call?")},
|
||||
{"desc",
|
||||
tr("In a call, you can click on \"Add participants\" to add a contact to a call.")},
|
||||
tr("In a call, you can click on “Invite members” to add a contact to a call.")},
|
||||
{"type", "tip"}});
|
||||
tips_.append({{"id", "6"},
|
||||
{"title", tr("What is a Jami account?")},
|
||||
|
|
@ -124,7 +124,7 @@ TipsModel::reset()
|
|||
{"type", "tip"}});
|
||||
tips_.append(
|
||||
{{"id", "8"},
|
||||
{"title", tr("Why don't I have to use a password?")},
|
||||
{"title", tr("Why don’t I have to use a password?")},
|
||||
{"desc",
|
||||
tr("With Jami, your account is stored in a directory on your device. The password "
|
||||
"is only used to encrypt your account in order to protect you from someone "
|
||||
|
|
@ -132,7 +132,7 @@ TipsModel::reset()
|
|||
{"type", "tip"}});
|
||||
tips_.append(
|
||||
{{"id", "9"},
|
||||
{"title", tr("Why don't I have to register a username?")},
|
||||
{"title", tr("Why don’t I have to register a username?")},
|
||||
{"desc",
|
||||
tr("The most permanent, secure identifier is your Jami ID, but since these are difficult "
|
||||
"to use for some people, you also have the option of registering a username.")},
|
||||
|
|
|
|||
|
|
@ -51,15 +51,15 @@ TestWrapper {
|
|||
uut.currentCallId = "foo"
|
||||
uut.confId = "foo"
|
||||
var callLabel = findChild(uut, "callLabel")
|
||||
var joinCallInAudio = findChild(uut, "joinCallInAudio")
|
||||
var joinCallInVideo = findChild(uut, "joinCallInVideo")
|
||||
var joinCallWithAudio = findChild(uut, "joinCallWithAudio")
|
||||
var joinCallWithVideo = findChild(uut, "joinCallWithVideo")
|
||||
compare(callLabel.visible, true)
|
||||
compare(joinCallInAudio.visible, false)
|
||||
compare(joinCallInVideo.visible, false)
|
||||
compare(joinCallWithAudio.visible, false)
|
||||
compare(joinCallWithVideo.visible, false)
|
||||
uut.confId = "bar"
|
||||
compare(callLabel.visible, true)
|
||||
compare(joinCallInAudio.visible, true)
|
||||
compare(joinCallInVideo.visible, true)
|
||||
compare(joinCallWithAudio.visible, true)
|
||||
compare(joinCallWithVideo.visible, true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue