From 386ef224d10ade757adac6d37da0d59fe60306f0 Mon Sep 17 00:00:00 2001 From: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com> Date: Tue, 8 Aug 2023 09:05:57 -0300 Subject: [PATCH] jamistrings: cleanup Change-Id: I10c7aa2c77a752c508821d018b7d54dfeb64d7df --- src/app/constant/JamiStrings.qml | 106 +----------------- .../mainview/components/CustomizeTipBox.qml | 2 +- .../mainview/components/DevicesListPopup.qml | 2 +- .../LocationSharingSettingsPage.qml | 6 +- .../map/MapPositionSharingControl.qml | 10 +- 5 files changed, 16 insertions(+), 110 deletions(-) diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml index b42e3b9c7..ad3f25cae 100644 --- a/src/app/constant/JamiStrings.qml +++ b/src/app/constant/JamiStrings.qml @@ -35,7 +35,6 @@ Item { property string incomingVideoCallFrom: qsTr("Incoming video call from {}") property string startSwarm: qsTr("Start swarm") property string createSwarm: qsTr("Create swarm") - property string showInvitations: qsTr("Show invitations") 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.") @@ -47,12 +46,9 @@ Item { // AboutPopUp property string version: qsTr("Version") + (AppVersionManager.isCurrentVersionBeta() ? " (Beta)" : "") - property string companyDeclarationYear: declarationYear + " " + companyName property string declarationYear: "© 2015-2023" - property string companyName: "Savoir-faire Linux Inc." property string slogan: "Világfa" property string declaration: qsTr("Jami is a free universal communication software that respects the freedom and privacy of its users.") - property string credits: qsTr("Credits") // AccountComboBox property string displayQRCode: qsTr("Display QR code") @@ -84,7 +80,6 @@ Item { property string autoAnswerCalls: qsTr("Automatically answer calls") property string enableCustomRingtone: qsTr("Enable custom ringtone") property string selectCustomRingtone: qsTr("Select custom ringtone") - property string addCustomRingtone: qsTr("Add a 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)") @@ -109,7 +104,6 @@ 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 audioDeviceSelector: qsTr("Audio input device selector") property string selectPrivateKey: qsTr("Select a private key") property string selectUserCert: qsTr("Select a user certificate") property string selectCACert: qsTr("Select a CA certificate") @@ -196,7 +190,6 @@ Item { property string selectFPS: qsTr("Select video frame rate (frames per second)") property string enableHWAccel: qsTr("Enable hardware acceleration") property string mirrorLocalVideo: qsTr("Mirror local video") - property string previewUnavailable: qsTr("Preview unavailable") property string screenSharing: qsTr("Screen sharing") property string selectScreenSharingFPS: qsTr("Select screen sharing frame rate (frames per second)") property string noVideo: qsTr("no video") @@ -206,11 +199,8 @@ Item { property string backupAccountInfos: qsTr("Your account only exists on this device. " + "If you lose your device or uninstall the application, " + "your account will be deleted and CANNOT be recovered. " + "You can <a href='blank'> back up your account </a> now or later (in the Account Settings).") property string backupAccountHere: qsTr("Back up account here") property string backupAccountBtn: qsTr("Back up account") - property string skip: qsTr("Skip") property string success: qsTr("Success") property string error: qsTr("Error") - property string neverShowAgain: qsTr("Never show me this again") - property string recommended: qsTr("Recommended") property string jamiArchiveFiles: qsTr("Jami archive files (*.gz)") property string allFiles: qsTr("All files (*)") @@ -222,8 +212,6 @@ Item { // CallOverlay property string isRecording: qsTr("is recording") property string areRecording: qsTr("are recording") - property string peerStoppedRecording: qsTr("Peer stopped recording") - property string isCallingYou: qsTr("is calling you") property string mute: qsTr("Mute") property string unmute: qsTr("Unmute") property string pauseCall: qsTr("Pause call") @@ -270,12 +258,10 @@ Item { property string contactDetails: qsTr("Contact details") // CallViewContextMenu - property string hold: qsTr("Hold") property string sipInputPanel: qsTr("Sip input panel") property string transferCall: qsTr("Transfer call") property string stopRec: qsTr("Stop recording") property string startRec: qsTr("Start recording") - property string exitFullScreen: qsTr("Exit full screen") property string viewFullScreen: qsTr("View full screen") property string shareScreen: qsTr("Share screen") property string shareWindow: qsTr("Share window") @@ -310,10 +296,6 @@ Item { // Share location/position property string shareLocation: qsTr("Share location") property string stopSharingLocation: qsTr("Stop sharing") - property string shortSharing: qsTr("10 minutes") - property string longSharing: qsTr("One hour") - property string minutesLeft: qsTr("%1 minutes left") - property string minuteLeft: qsTr("%1 minute left") 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 stopAllSharings: qsTr("Turn off location sharing") @@ -323,20 +305,22 @@ Item { property string unpinStopSharingTooltip: qsTr("Pin map to be able to share location or to turn off location in specific conversations") property string stopSharingSeveralConversationTooltip: qsTr("Location is shared in several conversations, click to choose how to turn off location sharing") property string shareLocationToolTip: qsTr("Share location to participants of this conversation (%1)") - property string minimizeMapTooltip: qsTr("Minimize") property string maximizeMapTooltip: qsTr("Maximize") property string reduceMapTooltip: qsTr("Reduce") - property string extendMapTooltip: qsTr("Extend") property string dragMapTooltip: qsTr("Drag") property string centerMapTooltip: qsTr("Center") property string closeMapTooltip: qsTr("Close") property string unpin: qsTr("Unpin") property string pinWindow: qsTr("Pin") property string positionShareDuration: qsTr("Position share duration") - property string positionShareLimit: qsTr("Limit the duration of location sharing") property string locationSharingLabel: qsTr("Location sharing") property string maxLocationDuration: qsTr("Unlimited") property string minLocationDuration: qsTr("1 min") + property string xhourxmin: qsTr("%1h%2min") + property string xhour: qsTr("%1h") + property string xminxsec: qsTr("%1min%2s") + property string xmin: qsTr("%1min") + property string xsec: qsTr("%sec") // Chatview header property string hideChat: qsTr("Hide chat") @@ -365,24 +349,16 @@ Item { // ConnectToAccountManager property string enterJAMSURL: qsTr("Enter the Jami Account Management Server (JAMS) URL") - property string required: qsTr("Required") property string jamiManagementServerURL: qsTr("Jami Account Management Server URL") property string jamsCredentials: qsTr("Enter JAMS credentials") property string connect: qsTr("Connect") property string creatingAccount: qsTr("Creating account…") - property string backToWelcome: qsTr("Back to welcome page") // CreateAccountPage property string chooseName: qsTr("Choose name") property string chooseUsername: qsTr("Choose username") property string chooseAUsername: qsTr("Choose a username") - property string chooseIdentifier: qsTr("Choose an identifier") - property string identifierNotAvailable: qsTr("The identifier is not available") - property string createPassword: qsTr("Encrypt account with password") - property string createAccount: qsTr("Create account") property string confirmPassword: qsTr("Confirm password") - property string notePasswordRecovery: qsTr("Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.") - property string optional: qsTr("Optional") property string chooseUsernameForAccount: qsTr("You can choose a username to help others more easily find and reach you on Jami.") property string chooseUsernameForRV: qsTr("Choose a name for your rendezvous point") property string chooseAName: qsTr("Choose a name") @@ -406,7 +382,6 @@ Item { property string sipAccount: qsTr("SIP account") property string proxy: qsTr("Proxy") property string server: qsTr("Server") - property string createSIPAccount: qsTr("Create SIP account") property string configureExistingSIP: qsTr("Configure an existing SIP account") property string personalizeAccount: qsTr("Personalize account") property string addSip: qsTr("Add SIP account") @@ -458,8 +433,6 @@ Item { property string registeringName: qsTr("Registering name") // JamiUserIdentity - property string registerAUsername: qsTr("Register a username") - property string registerUsername: qsTr("Register username") property string identity: qsTr("Identity") // LinkedDevices @@ -471,9 +444,7 @@ Item { property string linkDeviceNetWorkError: qsTr("Error connecting to the network.\nPlease try again later.") // BannedContacts - property string tipBannedContactsDisplay: qsTr("Display banned contacts") property string banned: qsTr("Banned") - property string tipBannedContactsHide: qsTr("Hide banned contacts") property string bannedContacts: qsTr("Banned contacts") // DeleteAccountDialog @@ -493,16 +464,12 @@ Item { property string light: qsTr("Light") property string selectFolder: qsTr("Select a folder") property string enableNotifications: qsTr("Enable notifications") - property string applicationTheme: qsTr("Application theme") property string showNotifications: qsTr("Show notifications") property string keepMinimized: qsTr("Minimize on close") property string tipRunStartup: qsTr("Run at system startup") property string runStartup: qsTr("Launch at startup") property string downloadFolder: qsTr("Choose download directory") - property string tipChooseDownloadFolder: qsTr("Choose download directory") property string includeLocalVideo: qsTr("Include local video in recording") - property string textZoom: qsTr("Text zoom") - property string changeTextSize: qsTr("Change text size (%)") property string defaultSettings: qsTr("Default settings") // ChatviewSettings @@ -511,7 +478,6 @@ Item { property string displayHyperlinkPreviews: qsTr("Show link preview in conversations") property string displayHyperlinkPreviewsDescription: qsTr("Preview requires downloading content from third-party servers.") - property string layout: qsTr("Layout") property string language: qsTr("User interface language") property string verticalViewOpt: qsTr("Vertical view") property string horizontalViewOpt: qsTr("Horizontal view") @@ -531,13 +497,11 @@ Item { // Context Menu property string saveFile: qsTr("Save file") property string openLocation: qsTr("Open location") - property string me: qsTr("Me") // Updates property string betaInstall: qsTr("Install beta version") property string checkForUpdates: qsTr("Check for updates now") property string enableAutoUpdates: qsTr("Enable/Disable automatic updates") - property string tipAutoUpdate: qsTr("Toggle 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?") @@ -560,7 +524,6 @@ Item { property string experimentalCallSwarmTooltip: qsTr("This feature will enable call buttons in swarms with multiple participants.") // Recording Settings - property string tipRecordFolder: qsTr("Select a record directory") property string quality: qsTr("Quality") property string saveRecordingsTo: qsTr("Save recordings to") property string saveScreenshotsTo: qsTr("Save screenshots to") @@ -574,27 +537,9 @@ Item { property string callKeyboardShortcuts: qsTr("Call") property string settings: qsTr("Settings") property string markdownKeyboardShortcuts: qsTr("Markdown") - property string openAccountList: qsTr("Open account list") - property string focusConversationsList: qsTr("Focus conversations list") - property string requestsList: qsTr("Requests list") - property string previousConversation: qsTr("Previous conversation") - property string nextConversation: qsTr("Next conversation") - property string searchBar: qsTr("Search bar") - property string fullScreen: qsTr("Full screen") - property string clearHistory: qsTr("Clear history") - property string mediaSettings: qsTr("Media settings") - property string generalSettings: qsTr("General settings") - property string pluginSettings: qsTr("Plugin settings") - property string answerIncoming: qsTr("Answer an incoming call") - property string declineCallRequest: qsTr("Decline the call request") - property string openAccountCreationWizard: qsTr("Open account creation wizard") - property string openKeyboardShortcutTable: qsTr("Open keyboard shortcut table") // View Logs property string logsViewTitle: qsTr("Debug") - property string logsViewShowStats: qsTr("Show Stats") - property string logsViewStart: qsTr("Start") - property string logsViewStop: qsTr("Stop") property string logsViewCopy: qsTr("Copy") property string logsViewReport: qsTr("Report Bug") property string logsViewClear: qsTr("Clear") @@ -606,19 +551,14 @@ Item { property string archive: qsTr("Archive") property string openFile: qsTr("Open file") property string importAccountArchive: qsTr("Create account from backup") - property string importAccountExplanation: qsTr("You can obtain an archive by clicking on \"Back up account\" " + "in the Account Settings. " + "This will create a .gz file on your device.") property string connectFromBackup: qsTr("Restore account from backup") property string generatingAccount: qsTr("Generating account…") - property string importFromBackup: qsTr("Import from backup") property string importFromArchiveBackup: qsTr("Import from archive backup") property string importFromArchiveBackupDescription: qsTr("Import Jami account from local archive file.") property string selectArchiveFile: qsTr("Select archive file") property string passwordArchive: qsTr("If the account is encrypted with a password, please fill the following field.") // ImportFromDevicePage - property string mainAccountPassword: qsTr("Enter Jami account password") - property string enterPIN: qsTr("Enter the PIN from another configured Jami account. " + "Use the \"Link Another Device\" feature to obtain a PIN.") - property string connectFromAnotherDevice: qsTr("Link device") 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.") @@ -645,20 +585,17 @@ Item { property string enterNewPassword: qsTr("Enter new password") property string confirmNewPassword: qsTr("Confirm new password") property string change: qsTr("Change") - property string confirm: qsTr("Confirm") property string exportAccount: qsTr("Export") // PhotoBoothView property string chooseAvatarImage: qsTr("Choose a picture as your avatar") property string chooseAvatarPicture: qsTr("Choose a picture") property string importFromFile: qsTr("Import avatar from image file") - property string stopTakingPhoto: qsTr("Stop taking photo") property string clearAvatar: qsTr("Clear avatar image") property string takePhoto: qsTr("Take photo") property string imageFiles: qsTr("Image Files (*.png *.jpg *.jpeg *.JPG *.JPEG *.PNG)") // Plugins - property string enable: qsTr("Enable") property string autoUpdate: qsTr("Auto update") property string disableAll: qsTr("Disable all") property string installed: qsTr("Installed") @@ -675,18 +612,13 @@ Item { property string uninstall: qsTr("Uninstall") property string resetPreferences: qsTr("Reset Preferences") property string selectPluginInstall: qsTr("Select a plugin to install") - property string installPlugin: qsTr("Install plugin") property string uninstallPlugin: qsTr("Uninstall plugin") 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 showHidePrefs: qsTr("Display or hide preferences") - property string addNewPlugin: qsTr("Add new plugin") property string goBackToPluginsList: qsTr("Go back to plugins list") property string selectFile: qsTr("Select a file") property string select: qsTr("Select") property string chooseImageFile: qsTr("Choose image file") - property string tipGeneralPluginSettingsDisplay: qsTr("Display or hide General plugin settings") - property string tipAccountPluginSettingsDisplay: qsTr("Display or hide Account plugin settings") property string pluginFiles: qsTr("Plugin Files (*.jpl)") property string loadUnload: qsTr("Load/Unload") property string selectAnImage: qsTr("Select An Image to %1") @@ -695,11 +627,6 @@ Item { property string choosePlugin: qsTr("Choose Plugin") // ProfilePage - property string profileSharedWithContacts: qsTr("Profile is only shared with contacts") - property string saveProfile: qsTr("Save profile") - property string enterYourName: qsTr("Enter your name") - property string enterRVName: qsTr("Enter the rendezvous point's name") - property string generatingRV: qsTr("Creating rendezvous point…") property string information: qsTr("Information") property string profile: qsTr("Profile") @@ -717,11 +644,7 @@ Item { // UserProfile property string qrCode: qsTr("QR code") - // Account QR - property string accountQr: qsTr("Account QR") - // WelcomePage - property string shareInvite: qsTr("This is your Jami username.\nCopy and share it with your friends!") property string linkFromAnotherDevice: qsTr("Link this device to an existing account") property string importAccountFromAnotherDevice: qsTr("Import from another device") property string importAccountFromBackup: qsTr("Import from an archive backup") @@ -733,12 +656,10 @@ Item { property string addSIPAccount: qsTr("Configure a SIP account") property string errorCreateAccount: qsTr("Error while creating your account. Check your credentials.") property string createNewRV: qsTr("Create a rendezvous point") - property string createAJamiAccount: qsTr("Create a Jami account") property string joinJami: qsTr("Join Jami") property string createNewJamiAccount: qsTr("Create new Jami account") property string createNewSipAccount: qsTr("Create new SIP account") property string aboutJami: qsTr("About Jami") - property string welcomeTo: qsTr("Welcome to") property string introductionJami: qsTr("Share freely and privately with Jami") property string alreadyHaveAccount: qsTr("I already have an account") property string useExistingAccount: qsTr("Use existing Jami account") @@ -747,7 +668,6 @@ Item { // SmartList property string clearText: qsTr("Clear Text") property string conversations: qsTr("Conversations") - property string conversation: qsTr("Conversation") property string searchResults: qsTr("Search Results") // SmartList context menu @@ -779,7 +699,6 @@ Item { property string localMuted: qsTr("Local muted") // Settings moderation - property string conferenceModeration: qsTr("Conference moderation") property string defaultModerators: qsTr("Default moderators") property string enableLocalModerators: qsTr("Enable local moderators") property string enableAllModerators: qsTr("Make all participants moderators") @@ -791,11 +710,6 @@ Item { 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.") - // Is Swarm - property string isSwarm: qsTr("Is swarm:") - property string trueStr: qsTr("True") - property string falseStr: qsTr("False") - // Message view property string addEmoji: qsTr("Add emoji") property string moreEmojis: qsTr("more emojis") @@ -803,7 +717,6 @@ Item { property string leaveAudioMessage: qsTr("Audio message") property string leaveVideoMessage: qsTr("Video message") property string showMore: qsTr("Show more") - property string showLess: qsTr("Show less") property string bold: qsTr("Bold") property string italic: qsTr("Italic") @@ -820,7 +733,6 @@ Item { property string shiftEnterNewLine: qsTr("Press Shift+Enter to insert a new line") property string enterNewLine: qsTr("Press Enter to insert a new line") property string send: qsTr("Send") - property string remove: qsTr("Remove") property string replyTo: qsTr("Reply to") property string inReplyTo: qsTr("In reply to") property string repliedTo: qsTr(" replied to") @@ -846,7 +758,6 @@ Item { property string invitationViewWaitingForSync: qsTr("Waiting until %1\nconnects to synchronize the conversation.") // SwarmDetailsPanel - property string about: qsTr("About") property string members: qsTr("%1 Members") property string member: qsTr("Member") property string swarmName: qsTr("Swarm's name") @@ -858,14 +769,12 @@ Item { property string chooseAColor: qsTr("Choose a color") property string defaultCallHost: qsTr("Default host (calls)") property string leaveConversation: qsTr("Leave conversation") - property string leave: qsTr("Leave") property string typeOfSwarm: qsTr("Type of swarm") property string none: qsTr("None") // NewSwarmPage property string createTheSwarm: qsTr("Create the swarm") property string goToConversation: qsTr("Go to conversation") - property string promoteAdministrator: qsTr("Promote to administrator") property string kickMember: qsTr("Kick member") property string reinstateMember: qsTr("Reinstate member") property string administrator: qsTr("Administrator") @@ -878,9 +787,7 @@ Item { property string tip: qsTr("Tip") property string dismiss: qsTr("Dismiss") property string customizeText: qsTr("Add a profile picture and nickname to complete your profile") - property string customizationDescription: qsTr("This profile is only shared with this account's contacts") - property string customizationDescription2: qsTr("Your profile is only shared with your contacts") - property string whySaveAccount: qsTr("Why should I save my account?") + property string customizationDescription: qsTr("Your profile is only shared with your contacts") // Message options property string deleteMessage: qsTr("Delete message") @@ -888,7 +795,6 @@ Item { property string editMessage: qsTr("Edit message") // Jami identifier - property string identifierDescription: qsTr("Share this Jami identifier to be contacted on this account!") property string hereIsIdentifier: qsTr("Share your Jami identifier in order to be contacted more easily!") property string jamiIdentity: qsTr("Jami identity") property string identifierURI: qsTr("Show fingerprint") diff --git a/src/app/mainview/components/CustomizeTipBox.qml b/src/app/mainview/components/CustomizeTipBox.qml index 0210d4a28..bc6f1aafd 100644 --- a/src/app/mainview/components/CustomizeTipBox.qml +++ b/src/app/mainview/components/CustomizeTipBox.qml @@ -128,7 +128,7 @@ ColumnLayout { font.pixelSize: JamiTheme.tipBoxContentFontSize visible: opened wrapMode: Text.WordWrap - text: JamiStrings.customizationDescription2 + text: JamiStrings.customizationDescription color: column.textColor } } diff --git a/src/app/mainview/components/DevicesListPopup.qml b/src/app/mainview/components/DevicesListPopup.qml index 4872f0744..054db9e0b 100644 --- a/src/app/mainview/components/DevicesListPopup.qml +++ b/src/app/mainview/components/DevicesListPopup.qml @@ -159,7 +159,7 @@ BaseModalDialog { elide: Text.ElideRight color: JamiTheme.textColor - text: deviceId === "" ? qsTr("Device Id") : deviceId + text: deviceId === "" ? JamiStrings.deviceId : deviceId } } } diff --git a/src/app/settingsview/components/LocationSharingSettingsPage.qml b/src/app/settingsview/components/LocationSharingSettingsPage.qml index 23361092a..1c294a0b5 100644 --- a/src/app/settingsview/components/LocationSharingSettingsPage.qml +++ b/src/app/settingsview/components/LocationSharingSettingsPage.qml @@ -53,11 +53,11 @@ SettingsPageBase { var min = minutes % 60; if (hour) { if (min) - return qsTr("%1h%2min").arg(hour).arg(min); + return JamiStrings.xhourxmin.arg(hour).arg(min); else - return qsTr("%1h").arg(hour); + return JamiStrings.xhour.arg(hour); } - return qsTr("%1min").arg(min); + return JamiStrings.xmin.arg(min); } Text { diff --git a/src/app/webengine/map/MapPositionSharingControl.qml b/src/app/webengine/map/MapPositionSharingControl.qml index 7e3b972be..96d76d8bd 100644 --- a/src/app/webengine/map/MapPositionSharingControl.qml +++ b/src/app/webengine/map/MapPositionSharingControl.qml @@ -53,17 +53,17 @@ ColumnLayout { var sec = seconds % 60; if (hour) { if (minutes) - return qsTr("%1h%2min").arg(hour).arg(minutes); + return JamiStrings.xhourxmin.arg(hour).arg(minutes); else - return qsTr("%1h").arg(hour); + return JamiStrings.xhour.arg(hour); } if (minutes) { if (sec) - return qsTr("%1m%2sec").arg(minutes).arg(sec); + return JamiStrings.xminxsec.arg(minutes).arg(sec); else - return qsTr("%1m").arg(minutes); + return JamiStrings.xmin.arg(minutes); } - return qsTr("%1sec").arg(sec); + return JamiStrings.xsec.arg(sec); } property int remainingTimeMs: 0 -- GitLab