diff --git a/ui/app/AppLayouts/Browser/BrowserLayout.qml b/ui/app/AppLayouts/Browser/BrowserLayout.qml
index f8f470b1ae..4e70885dc8 100644
--- a/ui/app/AppLayouts/Browser/BrowserLayout.qml
+++ b/ui/app/AppLayouts/Browser/BrowserLayout.qml
@@ -65,15 +65,13 @@ Rectangle {
         property Component signMessageModalComponent: SignMessageModal {}
 
         property MessageDialog sendingError: MessageDialog {
-            //% "Error sending the transaction"
-            title: qsTrId("error-sending-the-transaction")
+            title: qsTr("Error sending the transaction")
             icon: StandardIcon.Critical
             standardButtons: StandardButton.Ok
         }
 
         property MessageDialog signingError: MessageDialog {
-            //% "Error signing message"
-            title: qsTrId("error-signing-message")
+            title: qsTr("Error signing message")
             icon: StandardIcon.Critical
             standardButtons: StandardButton.Ok
         }
@@ -344,12 +342,9 @@ Rectangle {
         property var certErrors: []
         icon: StandardIcon.Warning
         standardButtons: StandardButton.No | StandardButton.Yes
-        //% "Server's certificate not trusted"
-        title: qsTrId("server-s-certificate-not-trusted")
-        //% "Do you wish to continue?"
-        text: qsTrId("do-you-wish-to-continue-")
-        //% "If you wish so, you may continue with an unverified certificate. Accepting an unverified certificate means you may not be connected with the host you tried to connect to.\nDo you wish to override the security check and continue?"
-        detailedText: qsTrId("if-you-wish-so--you-may-continue-with-an-unverified-certificate--accepting-an-unverified-certificate-means-you-may-not-be-connected-with-the-host-you-tried-to-connect-to--ndo-you-wish-to-override-the-security-check-and-continue-")
+        title: qsTr("Server's certificate not trusted")
+        text: qsTr("Do you wish to continue?")
+        detailedText: qsTr("If you wish so, you may continue with an unverified certificate. Accepting an unverified certificate means you may not be connected with the host you tried to connect to.\nDo you wish to override the security check and continue?")
         onYes: {
             certErrors.shift().ignoreCertificateError();
             presentError();
diff --git a/ui/app/AppLayouts/Browser/controls/styles/BrowserTabStyle.qml b/ui/app/AppLayouts/Browser/controls/styles/BrowserTabStyle.qml
index aaef794b89..b0b25f2f14 100644
--- a/ui/app/AppLayouts/Browser/controls/styles/BrowserTabStyle.qml
+++ b/ui/app/AppLayouts/Browser/controls/styles/BrowserTabStyle.qml
@@ -75,8 +75,7 @@ TabViewStyle {
                 anchors.rightMargin: Style.current.halfPadding
                 icon.name: "close"
                 type: StatusFlatRoundButton.Type.Quaternary
-                //% "Start Page"
-                visible: control.count > 1 || styleData.title !== qsTrId("start-page")
+                visible: control.count > 1 || styleData.title !== qsTr("Start Page")
                 enabled: visible
                 onClicked: control.closeButtonClicked(styleData.index)
             }
diff --git a/ui/app/AppLayouts/Browser/panels/BrowserHeader.qml b/ui/app/AppLayouts/Browser/panels/BrowserHeader.qml
index a9c0621cec..2427bab033 100644
--- a/ui/app/AppLayouts/Browser/panels/BrowserHeader.qml
+++ b/ui/app/AppLayouts/Browser/panels/BrowserHeader.qml
@@ -105,8 +105,7 @@ Rectangle {
             }
             leftPadding: Style.current.padding
             rightPadding: addFavoriteBtn.width + reloadBtn.width + Style.current.bigPadding
-            //% "Enter URL"
-            placeholderText: qsTrId("enter-url")
+            placeholderText: qsTr("Enter URL")
             focus: true
             text: ""
             color: Style.current.textColor
diff --git a/ui/app/AppLayouts/Browser/panels/BrowserTabView.qml b/ui/app/AppLayouts/Browser/panels/BrowserTabView.qml
index 98e049bd71..6694f82471 100644
--- a/ui/app/AppLayouts/Browser/panels/BrowserTabView.qml
+++ b/ui/app/AppLayouts/Browser/panels/BrowserTabView.qml
@@ -26,12 +26,10 @@ QQC1.TabView {
                 tabTitle = tab.item.title
             }
             else if (createAsStartPage) {
-                //% "Start Page"
-                tabTitle = qsTrId("start-page")
+                tabTitle = qsTr("Start Page")
             }
             else {
-                //% "New Tab"
-                tabTitle = qsTrId("new-tab")
+                tabTitle = qsTr("New Tab")
             }
 
             return Utils.escapeHtml(tabTitle);
@@ -51,8 +49,7 @@ QQC1.TabView {
     function createDownloadTab(profile) {
         var tab = addTab("", tabComponent);
         tab.active = true;
-        //% "Downloads Page"
-        tab.title = qsTrId("downloads-page")
+        tab.title = qsTr("Downloads Page")
         tab.item.profile = profile
         tab.item.url = "status://downloads";
     }
diff --git a/ui/app/AppLayouts/Browser/panels/DownloadBar.qml b/ui/app/AppLayouts/Browser/panels/DownloadBar.qml
index d1006b4242..33a89f28c9 100644
--- a/ui/app/AppLayouts/Browser/panels/DownloadBar.qml
+++ b/ui/app/AppLayouts/Browser/panels/DownloadBar.qml
@@ -59,12 +59,10 @@ Rectangle {
                 primaryText: downloadFileName
                 downloadText: {
                     if (isCanceled) {
-                        //% "Cancelled"
-                        return qsTrId("cancelled")
+                        return qsTr("Cancelled")
                     }
                     if (isPaused) {
-                        //% "Paused"
-                        return qsTrId("paused")
+                        return qsTr("Paused")
                     }
                     return `${downloadsModel.downloads[index] ? (downloadsModel.downloads[index].receivedBytes / 1000000).toFixed(2) : 0}/${downloadsModel.downloads[index] ? (downloadsModel.downloads[index].totalBytes / 1000000).toFixed(2) : 0} MB` //"14.4/109 MB, 26 sec left"
                 }
@@ -97,8 +95,7 @@ Rectangle {
     StatusButton {
         id: showAllBtn
         size: StatusBaseButton.Size.Small
-        //% "Show All"
-        text: qsTrId("show-all")
+        text: qsTr("Show All")
         anchors.verticalCenter: parent.verticalCenter
         anchors.right: closeBtn.left
         anchors.rightMargin: Style.current.padding
diff --git a/ui/app/AppLayouts/Browser/panels/DownloadView.qml b/ui/app/AppLayouts/Browser/panels/DownloadView.qml
index 3e07238632..f7f8db52de 100644
--- a/ui/app/AppLayouts/Browser/panels/DownloadView.qml
+++ b/ui/app/AppLayouts/Browser/panels/DownloadView.qml
@@ -34,12 +34,10 @@ import "../controls"
             primaryText: downloadFileName
             downloadText: {
                 if (isCanceled) {
-                    //% "Cancelled"
-                    return qsTrId("cancelled")
+                    return qsTr("Cancelled")
                 }
                 if (isPaused) {
-                    //% "Paused"
-                    return qsTrId("paused")
+                    return qsTr("Paused")
                 }
                 return `${downloadsModel.downloads[index] ? (downloadsModel.downloads[index].receivedBytes / 1000000).toFixed(2) : 0}/${downloadsModel.downloads[index] ? (downloadsModel.downloads[index].totalBytes / 1000000).toFixed(2) : 0} MB` //"14.4/109 MB, 26 sec left"
             }
@@ -73,8 +71,7 @@ import "../controls"
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
         font.pixelSize: 15
-        //% "Downloaded files will appear here."
-        text: qsTrId("downloaded-files-will-appear-here-")
+        text: qsTr("Downloaded files will appear here.")
         color: Style.current.secondaryText
     }
 }
diff --git a/ui/app/AppLayouts/Browser/popups/AddFavoriteModal.qml b/ui/app/AppLayouts/Browser/popups/AddFavoriteModal.qml
index 8bda917cdb..a3f668e3be 100644
--- a/ui/app/AppLayouts/Browser/popups/AddFavoriteModal.qml
+++ b/ui/app/AppLayouts/Browser/popups/AddFavoriteModal.qml
@@ -67,12 +67,9 @@ ModalPopup {
 
     title: modifiyModal ?
                toolbarMode ?
-                   //% "Favorite added"
-                   qsTrId("favorite-added") :
-                   //% "Edit"
-                   qsTrId("edit")
-               //% "Add favorite"
-               : qsTrId("add-favorite")
+                   qsTr("Favorite added") :
+                   qsTr("Edit")
+               : qsTr("Add favorite")
 
     Column {
         width: parent.width
@@ -132,8 +129,7 @@ ModalPopup {
             anchors.right: addBtn.left
             anchors.rightMargin: Style.current.padding
             visible: popup.modifiyModal
-            //% "Remove"
-            text: qsTrId("remove")
+            text: qsTr("Remove")
             anchors.bottom: parent.bottom
             type: StatusBaseButton.Type.Danger
             onClicked: {
@@ -147,10 +143,8 @@ ModalPopup {
             anchors.right: parent.right
             anchors.rightMargin: Style.current.smallPadding
             text: popup.modifiyModal ?
-                      //% "Done"
-                      qsTrId("done") :
-                      //% "Add"
-                      qsTrId("add")
+                      qsTr("Done") :
+                      qsTr("Add")
             anchors.bottom: parent.bottom
             enabled: nameInput.valid && !!nameInput.text && urlInput.valid && !!urlInput.text
             onClicked: {
diff --git a/ui/app/AppLayouts/Browser/popups/BrowserConnectionModal.qml b/ui/app/AppLayouts/Browser/popups/BrowserConnectionModal.qml
index 8dce5977fb..8b1981612c 100644
--- a/ui/app/AppLayouts/Browser/popups/BrowserConnectionModal.qml
+++ b/ui/app/AppLayouts/Browser/popups/BrowserConnectionModal.qml
@@ -94,8 +94,7 @@ StatusModal {
 
             StatusBaseText {
                 id: titleText
-                //% "'%1' would like to connect to"
-                text: qsTrId("--1--would-like-to-connect-to").arg(request.title)
+                text: qsTr("'%1' would like to connect to").arg(request.title)
                 wrapMode: Text.WordWrap
                 font.weight: Font.Bold
                 font.pixelSize: 17
@@ -140,10 +139,8 @@ StatusModal {
                 id: infoText
                 text: {
                     switch(request.permission){
-                        //% "Allowing authorizes this DApp to retrieve your wallet address and enable Web3"
-                    case Constants.permission_web3: return qsTrId("allowing-authorizes-this-dapp");
-                        //% "Granting access authorizes this DApp to retrieve your chat key"
-                    case Constants.permission_contactCode: return qsTrId("your-contact-code");
+                    case Constants.permission_web3: return qsTr("Allowing authorizes this DApp to retrieve your wallet address and enable Web3");
+                    case Constants.permission_contactCode: return qsTr("Granting access authorizes this DApp to retrieve your chat key");
                     default: return qsTr("Unknown permission: " + request.permission);
                     }
                 }
@@ -163,8 +160,7 @@ StatusModal {
                 StatusButton {
                     type: StatusBaseButton.Type.Danger
                     width: 151
-                    //% "Deny"
-                    text: qsTrId("deny")
+                    text: qsTr("Deny")
                     onClicked: {
                         postMessage(false);
                         browserConnectionModal.close();
@@ -175,8 +171,7 @@ StatusModal {
                     normalColor: Utils.setColorAlpha(Style.current.success, 0.1)
                     textColor: Style.current.success
                     width: 151
-                    //% "Allow"
-                    text: qsTrId("allow")
+                    text: qsTr("Allow")
                     onClicked: {
                         postMessage(true);
                         browserConnectionModal.close();
diff --git a/ui/app/AppLayouts/Browser/popups/BrowserSettingsMenu.qml b/ui/app/AppLayouts/Browser/popups/BrowserSettingsMenu.qml
index 6379389e00..3217d9184e 100644
--- a/ui/app/AppLayouts/Browser/popups/BrowserSettingsMenu.qml
+++ b/ui/app/AppLayouts/Browser/popups/BrowserSettingsMenu.qml
@@ -27,8 +27,7 @@ PopupMenu {
     closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
 
     Action {
-        //% "New Tab"
-        text: qsTrId("new-tab")
+        text: qsTr("New Tab")
         shortcut: StandardKey.AddTab
         onTriggered: addNewTab()
     }
@@ -37,10 +36,8 @@ PopupMenu {
         id: offTheRecordEnabled
         // TODO show an indicator on the browser or tab?
         text: checked ?
-                  //% "Exit Incognito mode"
-                  qsTrId("exit-incognito-mode") :
-                  //% "Go Incognito"
-                  qsTrId("go-incognito")
+                  qsTr("Exit Incognito mode") :
+                  qsTr("Go Incognito")
         checkable: true
         checked: isIncognito
         onToggled: goIncognito(checked)
@@ -50,15 +47,13 @@ PopupMenu {
 
     // TODO find a way to put both in one button
     Action {
-        //% "Zoom In"
-        text: qsTrId("zoom-in")
+        text: qsTr("Zoom In")
         shortcut: StandardKey.ZoomIn
         onTriggered: zoomIn()
     }
 
     Action {
-        //% "Zoom Out"
-        text: qsTrId("zoom-out")
+        text: qsTr("Zoom Out")
         shortcut: StandardKey.ZoomOut
         onTriggered: zoomOut()
     }
@@ -71,23 +66,20 @@ PopupMenu {
     Separator {}
 
     Action {
-        //% "Find"
-        text: qsTrId("find")
+        text: qsTr("Find")
         shortcut: StandardKey.Find
         onTriggered: launchFindBar()
     }
 
     Action {
-        //% "Compatibility mode"
-        text: qsTrId("compatibility-mode")
+        text: qsTr("Compatibility mode")
         checkable: true
         checked: true
         onToggled: toggleCompatibilityMode(checked)
     }
 
     Action {
-        //% "Developer Tools"
-        text: qsTrId("developer-tools")
+        text: qsTr("Developer Tools")
         shortcut: "F12"
         onTriggered: {
             localAccountSensitiveSettings.devToolsEnabled = !localAccountSensitiveSettings.devToolsEnabled
@@ -97,8 +89,7 @@ PopupMenu {
     Separator {}
 
     Action {
-        //% "Settings"
-        text: qsTrId("settings")
+        text: qsTr("Settings")
         shortcut: "Ctrl+,"
         onTriggered: launchBrowserSettings()
     }
diff --git a/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml b/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml
index 89dbf6b7e5..80e3a64ee0 100644
--- a/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml
+++ b/ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml
@@ -73,7 +73,7 @@ Popup {
                 switch (Web3ProviderStore.chainName) {
                     case Constants.networkMainnet: return qsTr("Mainnet");
                     case Constants.networkRopsten: return qsTr("Ropsten");
-                    default: return qsTrId("Unknown")
+                    default: return qsTr("Unknown")
                 }
             }
             font.pixelSize: 15
@@ -190,7 +190,7 @@ Popup {
             StatusTabButton {
                 id: historyBtn
                 width: implicitWidth
-                text: qsTrId("History")
+                text: qsTr("History")
             }
         }
 
diff --git a/ui/app/AppLayouts/Browser/popups/DownloadMenu.qml b/ui/app/AppLayouts/Browser/popups/DownloadMenu.qml
index fae6e1ab00..f006bfb827 100644
--- a/ui/app/AppLayouts/Browser/popups/DownloadMenu.qml
+++ b/ui/app/AppLayouts/Browser/popups/DownloadMenu.qml
@@ -23,16 +23,14 @@ PopupMenu {
         icon.source: Style.svg("browser/file")
         icon.width: 16
         icon.height: 16
-        //% "Open"
-        text: qsTrId("open")
+        text: qsTr("Open")
         onTriggered: DownloadsStore.openFile(index)
     }
     Action {
         icon.source: Style.svg("add_watch_only")
         icon.width: 13
         icon.height: 9
-        //% "Show in folder"
-        text: qsTrId("show-in-folder")
+        text: qsTr("Show in folder")
         onTriggered: DownloadsStore.openDirectory(index)
     }
     Action {
@@ -40,8 +38,7 @@ PopupMenu {
         icon.source: Style.svg("browser/pause")
         icon.width: 16
         icon.height: 16
-        //% "Pause"
-        text: qsTrId("pause")
+        text: qsTr("Pause")
         onTriggered: {
             download.pause()
         }
@@ -51,8 +48,7 @@ PopupMenu {
         icon.source: Style.svg("browser/play")
         icon.width: 16
         icon.height: 16
-        //% "Resume"
-        text: qsTrId("resume")
+        text: qsTr("Resume")
         onTriggered: {
             download.resume()
         }
@@ -65,8 +61,7 @@ PopupMenu {
         icon.source: Style.svg("block-icon")
         icon.width: 13
         icon.height: 13
-        //% "Cancel"
-        text: qsTrId("browsing-cancel")
+        text: qsTr("Cancel")
         onTriggered: {
             download.cancel()
             cancelClicked()
diff --git a/ui/app/AppLayouts/Browser/popups/FavoriteMenu.qml b/ui/app/AppLayouts/Browser/popups/FavoriteMenu.qml
index 77033c1ad5..9124b93825 100644
--- a/ui/app/AppLayouts/Browser/popups/FavoriteMenu.qml
+++ b/ui/app/AppLayouts/Browser/popups/FavoriteMenu.qml
@@ -21,8 +21,7 @@ PopupMenu {
     closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
 
     Action {
-        //% "Open in new Tab"
-        text: qsTrId("open-in-new-tab")
+        text: qsTr("Open in new Tab")
         icon.source: Style.svg("generate_account")
         icon.width: 16
         icon.height: 16
@@ -34,8 +33,7 @@ PopupMenu {
     Separator {}
 
     Action {
-        //% "Edit"
-        text: qsTrId("edit")
+        text: qsTr("Edit")
         icon.source: Style.svg("edit")
         icon.width: 16
         icon.height: 16
@@ -47,8 +45,7 @@ PopupMenu {
     }
 
     Action {
-        //% "Remove"
-        text: qsTrId("remove")
+        text: qsTr("Remove")
         icon.source: Style.svg("remove")
         icon.color: Style.current.danger
         icon.width: 16
diff --git a/ui/app/AppLayouts/Browser/popups/JSDialogWindow.qml b/ui/app/AppLayouts/Browser/popups/JSDialogWindow.qml
index 7352b22034..b56a0b5a39 100644
--- a/ui/app/AppLayouts/Browser/popups/JSDialogWindow.qml
+++ b/ui/app/AppLayouts/Browser/popups/JSDialogWindow.qml
@@ -63,8 +63,7 @@ ModalPopup {
         StatusButton {
             id: okButton
             anchors.right: parent.right
-            //% "Ok"
-            text: qsTrId("ok")
+            text: qsTr("Ok")
             anchors.bottom: parent.bottom
             onClicked: {
                 request.dialogAccept(prompt.text);
@@ -76,8 +75,7 @@ ModalPopup {
             id: cancelButton
             anchors.right: okButton.left
             anchors.rightMargin: Style.current.smallPadding
-            //% "Cancel"
-            text: qsTrId("browsing-cancel")
+            text: qsTr("Cancel")
             anchors.bottom: parent.bottom
             onClicked: {
                 request.dialogReject();
diff --git a/ui/app/AppLayouts/Browser/popups/SignMessageModal.qml b/ui/app/AppLayouts/Browser/popups/SignMessageModal.qml
index 9fe68f619c..81f1351611 100644
--- a/ui/app/AppLayouts/Browser/popups/SignMessageModal.qml
+++ b/ui/app/AppLayouts/Browser/popups/SignMessageModal.qml
@@ -34,8 +34,7 @@ StatusModal {
     anchors.centerIn: parent
     id: root
 
-    //% "Signature request"
-    header.title: qsTrId("signature-request")
+    header.title: qsTr("Signature request")
     height: 504
 
     onClosed: {
@@ -96,8 +95,7 @@ StatusModal {
             anchors.leftMargin: Style.current.padding
 
             LabelValueRow {
-                //% "From"
-                label: qsTrId("from")
+                label: qsTr("From")
                 value: Item {
                     id: itmFromValue
                     anchors.fill: parent
@@ -139,8 +137,7 @@ StatusModal {
             }
 
             LabelValueRow {
-                //% "Data"
-                label: qsTrId("data")
+                label: qsTr("Data")
                 value: Item {
                     anchors.fill: parent
                     anchors.verticalCenter: parent.verticalCenter
@@ -148,8 +145,7 @@ StatusModal {
                     // TODO; replace with StatusModal
                     ModalPopup {
                         id: messagePopup
-                        //% "Message"
-                        title: qsTrId("message")
+                        title: qsTr("Message")
                         height: 286
                         width: 400
                         Item {
@@ -212,8 +208,7 @@ StatusModal {
     leftButtons: [
         StatusFlatButton {
             id: btnReject
-            //% "Reject"
-            text: qsTrId("reject")
+            text: qsTr("Reject")
             type: StatusBaseButton.Type.Danger
             onClicked: close()
         }
@@ -223,10 +218,8 @@ StatusModal {
         StatusButton {
             id: btnNext
             text: showSigningPhrase ?
-                    //% "Sign"
-                    qsTrId("transactions-sign") :
-                    //% "Sign with password"
-                    qsTrId("sign-with-password")
+                    qsTr("Sign") :
+                    qsTr("Sign with password")
             onClicked: {
                 if(!showSigningPhrase){
                     showSigningPhrase = true;
diff --git a/ui/app/AppLayouts/Chat/controls/Contact.qml b/ui/app/AppLayouts/Chat/controls/Contact.qml
index 9b7a050221..7d4bfcef41 100644
--- a/ui/app/AppLayouts/Chat/controls/Contact.qml
+++ b/ui/app/AppLayouts/Chat/controls/Contact.qml
@@ -79,8 +79,7 @@ Rectangle {
 
     StyledText {
         visible: isUser
-        //% "Admin"
-        text: qsTrId("group-chat-admin")
+        text: qsTr("Admin")
         anchors.right: parent.right
         anchors.rightMargin: Style.current.padding
         font.pixelSize: 15
diff --git a/ui/app/AppLayouts/Chat/panels/ActivityCenterPopupTopBarPanel.qml b/ui/app/AppLayouts/Chat/panels/ActivityCenterPopupTopBarPanel.qml
index f932e375ea..12337495d6 100644
--- a/ui/app/AppLayouts/Chat/panels/ActivityCenterPopupTopBarPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/ActivityCenterPopupTopBarPanel.qml
@@ -37,8 +37,7 @@ Item {
 
        StatusFlatButton {
            id: allBtn
-           //% "All"
-           text: qsTrId("all")
+           text: qsTr("All")
            size: StatusBaseButton.Size.Small
            highlighted: root.allBtnHighlighted
            onClicked: root.allBtnClicked();
@@ -46,8 +45,7 @@ Item {
 
        StatusFlatButton {
            id: mentionsBtn
-           //% "Mentions"
-           text: qsTrId("mentions")
+           text: qsTr("Mentions")
            enabled: hasMentions
            size: StatusBaseButton.Size.Small
            highlighted: root.mentionsBtnHighlighted
@@ -58,8 +56,7 @@ Item {
 
        StatusFlatButton {
            id: repliesbtn
-           //% "Replies"
-           text: qsTrId("replies")
+           text: qsTr("Replies")
            enabled: hasReplies
            size: StatusBaseButton.Size.Small
            highlighted: root.repliesBtnHighlighted
@@ -71,7 +68,7 @@ Item {
 //       StatusFlatButton {
 //           id: contactRequestsBtn
 //           //% "Contact requests"
-//           text: qsTrId("contact-requests")
+//           text: qsTr("Replies")
 //           enabled: hasContactRequests
 //           size: StatusBaseButton.Size.Small
 //           highlighted: activityCenter.currentFilter === ActivityCenter.Filter.ContactRequests
@@ -96,8 +93,7 @@ Item {
 
             StatusToolTip {
               visible: markAllReadBtn.hovered
-              //% "Mark all as Read"
-              text: qsTrId("mark-all-as-read")
+              text: qsTr("Mark all as Read")
             }
         }
 
@@ -118,17 +114,14 @@ Item {
                 StatusMenuItem {
                     icon.name: "hide"
                     text: hideReadNotifications ?
-                              //% "Show read notifications"
-                              qsTrId("show-read-notifications") :
-                              //% "Hide read notifications"
-                              qsTrId("hide-read-notifications")
+                              qsTr("Show read notifications") :
+                              qsTr("Hide read notifications")
                     onTriggered: hideReadNotifications = !hideReadNotifications
                 }
 
                 StatusMenuItem {
                     icon.name: "notification"
-                    //% "Notification settings"
-                    text: qsTrId("chat-notification-preferences")
+                    text: qsTr("Notification settings")
                     onTriggered: {
                         root.preferencesClicked();
                     }
diff --git a/ui/app/AppLayouts/Chat/panels/ChatRequestMessagePanel.qml b/ui/app/AppLayouts/Chat/panels/ChatRequestMessagePanel.qml
index 4619f243be..1177671261 100644
--- a/ui/app/AppLayouts/Chat/panels/ChatRequestMessagePanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/ChatRequestMessagePanel.qml
@@ -25,12 +25,9 @@ Item {
 
     StatusBaseText {
         id: contactText1
-        //% "You need to be mutual contacts with this person for them to receive your messages"
-        text: qsTrId("you-need-to-be-mutual-contacts-with-this-person-for-them-to-receive-your-messages")
-        //% "You need to be mutual contacts with this person for them to receive your messages"
-        // text: !isContact ? qsTrId("you-need-to-be-mutual-contacts-with-this-person-for-them-to-receive-your-messages") :
-        //% "Waiting for %1 to accept your request"
-        // qsTrId("waiting-for--1-to-accept-your-request").arg(Utils.removeStatusEns(chatsModel.channelView.activeChannel.name))
+        text: qsTr("You need to be mutual contacts with this person for them to receive your messages")
+        // text: !isContact ? qsTr("You need to be mutual contacts with this person for them to receive your messages") :
+        // qsTr("Waiting for %1 to accept your request").arg(Utils.removeStatusEns(chatsModel.channelView.activeChannel.name))
         anchors.top: waveImg.bottom
         horizontalAlignment: Text.AlignHCenter
         wrapMode: Text.WordWrap
@@ -43,8 +40,7 @@ Item {
     StatusBaseText {
         id: contactText2
         visible: !isContact
-        //% "Just click this button to add them as contact. They will receive a notification. Once they accept the request, you'll be able to chat"
-        text: qsTrId("just-click-this-button-to-add-them-as-contact--they-will-receive-a-notification--once-they-accept-the-request--you-ll-be-able-to-chat")
+        text: qsTr("Just click this button to add them as contact. They will receive a notification. Once they accept the request, you'll be able to chat")
         horizontalAlignment: Text.AlignHCenter
         wrapMode: Text.WordWrap
         anchors.top: contactText1.bottom
@@ -56,8 +52,7 @@ Item {
 
     StatusButton {
         visible: !isContact
-        //% "Add to contacts"
-        text: qsTrId("add-to-contacts")
+        text: qsTr("Add to contacts")
         anchors.top: contactText2.bottom
         anchors.topMargin: Style.current.smallPadding
         anchors.horizontalCenter: parent.horizontalCenter
diff --git a/ui/app/AppLayouts/Chat/panels/ClosedEmptyPanel.qml b/ui/app/AppLayouts/Chat/panels/ClosedEmptyPanel.qml
index 46e2a37c9c..1ef4f7f32a 100644
--- a/ui/app/AppLayouts/Chat/panels/ClosedEmptyPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/ClosedEmptyPanel.qml
@@ -13,8 +13,7 @@ Item {
     Layout.fillWidth: true
 
     StyledText {
-        //% "Your chats will appear here. To start new chats press the  button at the top"
-        text: qsTrId("your-chats-will-appear-here--to-start-new-chats-press-the---button-at-the-top")
+        text: qsTr("Your chats will appear here. To start new chats press the  button at the top")
         anchors.verticalCenterOffset: -80
         horizontalAlignment: Text.AlignHCenter
         wrapMode: Text.WordWrap
diff --git a/ui/app/AppLayouts/Chat/panels/EmptyChatPanel.qml b/ui/app/AppLayouts/Chat/panels/EmptyChatPanel.qml
index 805bb23a03..da0d9314d5 100644
--- a/ui/app/AppLayouts/Chat/panels/EmptyChatPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/EmptyChatPanel.qml
@@ -32,8 +32,7 @@ Item {
 
         StyledText {
             id: shareKeyLink
-            //% "Share your chat key"
-            text: qsTrId("share-your-chat-key")
+            text: qsTr("Share your chat key")
             font.pixelSize: 15
             color: Style.current.blue
 
@@ -53,8 +52,7 @@ Item {
 
         StyledText {
             id: orText
-            //% "or"
-            text: qsTrId("or")
+            text: qsTr("or")
             font.pixelSize: 15
             color: Style.current.secondaryText
             anchors.left: shareKeyLink.right
@@ -64,8 +62,7 @@ Item {
 
         StyledText {
             id: inviteLink
-            //% "invite"
-            text: qsTrId("invite")
+            text: qsTr("invite")
             font.pixelSize: 15
             color: Style.current.blue
             anchors.left: orText.right
@@ -90,8 +87,7 @@ Item {
     }
 
     StyledText {
-        //% "friends to start messaging in Status"
-        text: qsTrId("friends-to-start-messaging-in-status")
+        text: qsTr("friends to start messaging in Status")
         font.pixelSize: 15
         color: Style.current.secondaryText
         anchors.horizontalCenter: walkieTalkieImage.horizontalCenter
diff --git a/ui/app/AppLayouts/Chat/panels/EmptyViewPanel.qml b/ui/app/AppLayouts/Chat/panels/EmptyViewPanel.qml
index f4e36b7eec..03fd2b3ab7 100644
--- a/ui/app/AppLayouts/Chat/panels/EmptyViewPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/EmptyViewPanel.qml
@@ -73,8 +73,7 @@ Rectangle {
 
         StatusBaseText {
             id: chatAndTransactText
-            //% "Chat and transact privately with your friends"
-            text: qsTrId("chat-and-transact-privately-with-your-friends")
+            text: qsTr("Chat and transact privately with your friends")
             anchors.top: parent.top
             anchors.topMargin: 56
             horizontalAlignment: Text.AlignHCenter
@@ -88,8 +87,7 @@ Rectangle {
         }
 
         StatusQControls.StatusButton {
-            //% "Invite friends"
-            text: qsTrId("invite-friends")
+            text: qsTr("Invite friends")
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.bottom: parent.bottom
             anchors.bottomMargin: Style.current.xlPadding
@@ -130,8 +128,7 @@ Rectangle {
         StatusBaseText {
             id: suggestionsText
             width: parent.width
-            //% "Follow your interests in one of the many Public Chats."
-            text: qsTrId("follow-your-interests-in-one-of-the-many-public-chats.")
+            text: qsTr("Follow your interests in one of the many Public Chats.")
             anchors.top: parent.top
             anchors.topMargin: Style.current.xlPadding
             font.pointSize: 15
diff --git a/ui/app/AppLayouts/Chat/panels/communities/BackUpCommuntyBannerPanel.qml b/ui/app/AppLayouts/Chat/panels/communities/BackUpCommuntyBannerPanel.qml
index 0dd3d21e30..9a943f8922 100644
--- a/ui/app/AppLayouts/Chat/panels/communities/BackUpCommuntyBannerPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/communities/BackUpCommuntyBannerPanel.qml
@@ -64,8 +64,7 @@ Rectangle {
 
     StatusBaseText {
         id: backUpText
-        //% "Back up community key"
-        text: qsTrId("back-up-community-key")
+        text: qsTr("Back up community key")
         anchors.top: parent.top
         anchors.topMargin: 48
         horizontalAlignment: Text.AlignHCenter
@@ -80,8 +79,7 @@ Rectangle {
 
     StatusButton {
         id: backUpBtn
-        //% "Back up"
-        text: qsTrId("back-up")
+        text: qsTr("Back up")
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: backUpText.bottom
         anchors.topMargin: Style.current.padding
diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityChannelsAndCategoriesBannerPanel.qml b/ui/app/AppLayouts/Chat/panels/communities/CommunityChannelsAndCategoriesBannerPanel.qml
index 245a42756e..7187e09db7 100644
--- a/ui/app/AppLayouts/Chat/panels/communities/CommunityChannelsAndCategoriesBannerPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/communities/CommunityChannelsAndCategoriesBannerPanel.qml
@@ -82,7 +82,7 @@ Rectangle {
 
     StatusButton {
         id: addMembersBtn
-        text: qsTrId("Add channels")
+        text: qsTr("Add channels")
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: descriptionText.bottom
         anchors.topMargin: Style.current.padding
diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersSettingsPanel.qml b/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersSettingsPanel.qml
index e67329e5df..f4ab65cc14 100644
--- a/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersSettingsPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersSettingsPanel.qml
@@ -47,8 +47,7 @@ SettingsPageLayout {
             Layout.fillWidth: true
 
             visible: root.editable && root.pendingRequests > 0
-            //% "Membership requests"
-            title: qsTrId("membership-requests")
+            title: qsTr("Membership requests")
             requestsCount: root.pendingRequests
             sensor.onClicked: root.membershipRequestsClicked()
         }
@@ -65,8 +64,7 @@ SettingsPageLayout {
             Layout.alignment: Qt.AlignHCenter
 
             visible: memberList.count === 0
-            //% "Community members will appear here"
-            text: qsTrId("community-members-will-appear-here")
+            text: qsTr("Community members will appear here")
             font.pixelSize: 15
             color: Theme.palette.baseColor1
         }
@@ -75,8 +73,7 @@ SettingsPageLayout {
             Layout.alignment: Qt.AlignHCenter
 
             visible: !!memberSearch.input.text && memberList.height == 0
-            //% "No contacts found"
-            text: qsTrId("no-contacts-found")
+            text: qsTr("No contacts found")
             font.pixelSize: 15
             color: Theme.palette.baseColor1
         }
@@ -105,8 +102,7 @@ SettingsPageLayout {
 
                 title: {
                     if (memberItem.itsMe) {
-                        //% "You"
-                        return qsTrId("You")
+                        return qsTr("You")
                     }
                     return !model.displayName.endsWith(".eth") ? model.displayName : Utils.removeStatusEns(model.displayName)
                 }
diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupInviteFriendsPanel.qml b/ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupInviteFriendsPanel.qml
index 7c29013bf0..d6e8df0a7d 100644
--- a/ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupInviteFriendsPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupInviteFriendsPanel.qml
@@ -23,8 +23,7 @@ Column {
     property alias contactListSearch: contactFieldAndList
 
     StatusDescriptionListItem {
-        //% "Share community"
-        title: qsTrId("share-community")
+        title: qsTr("Share community")
         subTitle: `${Constants.communityLinkPrefix}${root.community && root.community.id.substring(0, 4)}...${root.community && root.community.id.substring(root.community.id.length -2)}`
         tooltip.text: qsTr("Copied!")
         icon.name: "copy"
diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupOverviewPanel.qml b/ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupOverviewPanel.qml
index 080618f79a..98286bc783 100644
--- a/ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupOverviewPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupOverviewPanel.qml
@@ -45,8 +45,7 @@ Column {
     }
 
     StatusDescriptionListItem {
-        //% "Share community"
-        title: qsTrId("share-community")
+        title: qsTr("Share community")
         subTitle: `${Constants.communityLinkPrefix}${root.community.id.substring(0, 4)}...${root.community.id.substring(root.community.id.length -2)}`
         tooltip.text: qsTr("Copied!")
         icon.name: "copy"
@@ -66,8 +65,7 @@ Column {
     StatusListItem {
         anchors.horizontalCenter: parent.horizontalCenter
         visible: root.community.amISectionAdmin
-        //% "Transfer ownership"
-        title: qsTrId("transfer-ownership")
+        title: qsTr("Transfer ownership")
         icon.name: "exchange"
         type: StatusListItem.Type.Secondary
         sensor.onClicked: root.transferOwnershipButtonClicked()
@@ -75,8 +73,7 @@ Column {
 
     StatusListItem {
         anchors.horizontalCenter: parent.horizontalCenter
-        //% "Leave community"
-        title: qsTrId("leave-community")
+        title: qsTr("Leave community")
         icon.name: "arrow-right"
         icon.height: 16
         icon.width: 20
@@ -85,13 +82,12 @@ Column {
         sensor.onClicked: root.leaveButtonClicked()
     }
 
-    //% "Roles"
     /*     // TODO add this back when roles exist */
 /* //        Loader { */
 /* //            active: root.community.isAdmin */
 /* //            width: parent.width */
 /* //            sourceComponent: CommunityPopupButton { */
-/* //                label: qsTrId("community-roles") */
+/* //                label: qsTr("Roles") */
 /* //                iconName: "roles" */
 /* //                width: parent.width */
 /* //                onClicked: console.log("TODO:") */
diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityWelcomeBannerPanel.qml b/ui/app/AppLayouts/Chat/panels/communities/CommunityWelcomeBannerPanel.qml
index 2b80970b6d..2f2747b177 100644
--- a/ui/app/AppLayouts/Chat/panels/communities/CommunityWelcomeBannerPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/communities/CommunityWelcomeBannerPanel.qml
@@ -81,8 +81,7 @@ Rectangle {
 
     StatusBaseText {
         id: welcomeText
-        //% "Welcome to your community!"
-        text: qsTrId("welcome-to-your-community-")
+        text: qsTr("Welcome to your community!")
         anchors.top: parent.top
         anchors.topMargin: 60
         horizontalAlignment: Text.AlignHCenter
@@ -97,8 +96,7 @@ Rectangle {
 
     StatusQControls.StatusButton {
         id: addMembersBtn
-        //% "Add members"
-        text: qsTrId("add-members")
+        text: qsTr("Add members")
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.bottom: manageBtn.top
         anchors.bottomMargin: Style.current.halfPadding
@@ -111,8 +109,7 @@ Rectangle {
 
     StatusQControls.StatusFlatButton {
         id: manageBtn
-        //% "Manage community"
-        text: qsTrId("manage-community")
+        text: qsTr("Manage community")
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.bottom: parent.bottom
         anchors.bottomMargin: Style.current.padding
diff --git a/ui/app/AppLayouts/Chat/popups/ActivityCenterPopup.qml b/ui/app/AppLayouts/Chat/popups/ActivityCenterPopup.qml
index fc5a12582c..065ff87518 100644
--- a/ui/app/AppLayouts/Chat/popups/ActivityCenterPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/ActivityCenterPopup.qml
@@ -241,8 +241,7 @@ Popup {
                 height: visible ? showMoreBtn.height + showMoreBtn.anchors.topMargin : 0
                 StatusButton {
                     id: showMoreBtn
-                    //% "Show more"
-                    text: qsTrId("show-more")
+                    text: qsTr("Show more")
                     anchors.horizontalCenter: parent.horizontalCenter
                     anchors.top: parent.top
                     anchors.topMargin: Style.current.smallPadding
diff --git a/ui/app/AppLayouts/Chat/popups/ChatCommandModal.qml b/ui/app/AppLayouts/Chat/popups/ChatCommandModal.qml
index 3a14b897b7..f48995b17a 100644
--- a/ui/app/AppLayouts/Chat/popups/ChatCommandModal.qml
+++ b/ui/app/AppLayouts/Chat/popups/ChatCommandModal.qml
@@ -48,8 +48,7 @@ StatusModal {
             TransactionFormGroup {
                 id: group1
                 headerText: root.commandTitle
-                //% "Continue"
-                footerText: qsTrId("continue")
+                footerText: qsTr("Continue")
 
                 StatusAccountSelector {
                     id: selectFromAccount
@@ -65,10 +64,8 @@ StatusModal {
                     width: stack.width
                     label: {
                         return root.isRequested ?
-                            //% "Receive on account"
-                            qsTrId("receive-on-account") :
-                            //% "From account"
-                            qsTrId("from-account")
+                            qsTr("Receive on account") :
+                            qsTr("From account")
                     }
                 }
                 SeparatorWithIcon {
@@ -83,8 +80,7 @@ StatusModal {
                     anchors.right: selectRecipient.right
                     anchors.bottom: selectRecipient.top
                     anchors.bottomMargin: -Style.current.padding
-                    //% "Address request required"
-                    text: qsTrId("address-request-required")
+                    text: qsTr("Address request required")
                     color: Theme.palette.dangerColor1
                     visible: addressRequiredValidator.isWarn
                 }
@@ -94,10 +90,8 @@ StatusModal {
                     accounts: root.store.accounts
                     contactsStore: root.contactsStore
                     label: root.isRequested ?
-                      //% "From"
-                      qsTrId("from") :
-                      //% "To"
-                      qsTrId("to")
+                      qsTr("From") :
+                      qsTr("To")
                     anchors.top: separator.bottom
                     anchors.topMargin: 10
                     width: stack.width
@@ -109,8 +103,7 @@ StatusModal {
             TransactionFormGroup {
                 id: group2
                 headerText: root.commandTitle
-                //% "Preview"
-                footerText: qsTrId("preview")
+                footerText: qsTr("Preview")
 
                 AssetAndAmountInput {
                     id: txtAmount
@@ -126,10 +119,8 @@ StatusModal {
             TransactionFormGroup {
                 id: group3
                 headerText: root.isRequested ?
-                    //% "Preview"
-                    qsTrId("preview") :
-                    //% "Transaction preview"
-                    qsTrId("transaction-preview")
+                    qsTr("Preview") :
+                    qsTr("Transaction preview")
                 footerText: root.finalButtonLabel
 
                 TransactionPreview {
@@ -168,8 +159,7 @@ StatusModal {
     rightButtons: [
         StatusButton {
             id: btnNext
-            //% "Next"
-            text: qsTrId("next")
+            text: qsTr("Next")
             enabled: stack.currentGroup.isValid && !stack.currentGroup.isPending
             onClicked: {
                 const validity = stack.currentGroup.validate()
diff --git a/ui/app/AppLayouts/Chat/popups/ChooseBrowserPopup.qml b/ui/app/AppLayouts/Chat/popups/ChooseBrowserPopup.qml
index 04fef36bbe..ecb258c9c7 100644
--- a/ui/app/AppLayouts/Chat/popups/ChooseBrowserPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/ChooseBrowserPopup.qml
@@ -12,8 +12,7 @@ StatusModal {
     id: popup
     anchors.centerIn: parent
 
-    //% "Choose browser"
-    header.title: qsTrId("choose-browser")
+    header.title: qsTr("Choose browser")
     width: 440
 
     contentItem: Column {
@@ -29,8 +28,7 @@ StatusModal {
         }
 
         StatusButton {
-            //% "Open in Status"
-            text: qsTrId("browsing-open-in-status")
+            text: qsTr("Open in Status")
             anchors.horizontalCenter: parent.horizontalCenter
             onClicked: {
                 localAccountSensitiveSettings.showBrowserSelector = !rememberChoiceCheckBox.checked
@@ -44,8 +42,7 @@ StatusModal {
         }
 
         StatusFlatButton {
-            //% "Open in my default browser"
-            text: qsTrId("open-in-my-default-browser")
+            text: qsTr("Open in my default browser")
             anchors.horizontalCenter: parent.horizontalCenter
             onClicked: {
                 localAccountSensitiveSettings.showBrowserSelector = !rememberChoiceCheckBox.checked
@@ -60,8 +57,7 @@ StatusModal {
 
         StatusCheckBox {
             id: rememberChoiceCheckBox
-            //% "Remember my choice. To override it, go to settings."
-            text: qsTrId("remember-my-choice--to-override-it--go-to-settings-")
+            text: qsTr("Remember my choice. To override it, go to settings.")
             width: parent.width
         }
     }
diff --git a/ui/app/AppLayouts/Chat/popups/ContactRequestsPopup.qml b/ui/app/AppLayouts/Chat/popups/ContactRequestsPopup.qml
index b26b0a4451..52e79f9c6a 100644
--- a/ui/app/AppLayouts/Chat/popups/ContactRequestsPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/ContactRequestsPopup.qml
@@ -17,8 +17,7 @@ ModalPopup {
 
     property var store
 
-    //% "Contact requests"
-    title: qsTrId("contact-requests")
+    title: qsTr("Contact requests")
 
     ListView {
         id: contactList
@@ -66,10 +65,8 @@ ModalPopup {
 
         ConfirmationDialog {
             id: declineAllDialog
-            //% "Decline all contacts"
-            header.title: qsTrId("decline-all-contacts")
-            //% "Are you sure you want to decline all these contact requests"
-            confirmationText: qsTrId("are-you-sure-you-want-to-decline-all-these-contact-requests")
+            header.title: qsTr("Decline all contacts")
+            confirmationText: qsTr("Are you sure you want to decline all these contact requests")
             onConfirmButtonClicked: {
                 popup.store.dismissAllContactRequests()
                 declineAllDialog.close()
@@ -79,10 +76,8 @@ ModalPopup {
 
         ConfirmationDialog {
             id: acceptAllDialog
-            //% "Accept all contacts"
-            header.title: qsTrId("accept-all-contacts")
-            //% "Are you sure you want to accept all these contact requests"
-            confirmationText: qsTrId("are-you-sure-you-want-to-accept-all-these-contact-requests")
+            header.title: qsTr("Accept all contacts")
+            confirmationText: qsTr("Are you sure you want to accept all these contact requests")
             onConfirmButtonClicked: {
                 popup.store.acceptAllContactRequests()
                 acceptAllDialog.close()
@@ -97,8 +92,7 @@ ModalPopup {
             anchors.rightMargin: Style.current.padding
             anchors.bottom: parent.bottom
             type: StatusBaseButton.Type.Danger
-            //% "Decline all"
-            text: qsTrId("decline-all")
+            text: qsTr("Decline all")
             onClicked: declineAllDialog.open()
         }
 
@@ -106,8 +100,7 @@ ModalPopup {
             id: addToContactsButton
             enabled: contactList.count > 0
             anchors.right: parent.right
-            //% "Accept all"
-            text: qsTrId("accept-all")
+            text: qsTr("Accept all")
             anchors.bottom: parent.bottom
             onClicked: acceptAllDialog.open()
         }
diff --git a/ui/app/AppLayouts/Chat/popups/GroupInfoPopup.qml b/ui/app/AppLayouts/Chat/popups/GroupInfoPopup.qml
index e62b3a6708..336cbb5bf1 100644
--- a/ui/app/AppLayouts/Chat/popups/GroupInfoPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/GroupInfoPopup.qml
@@ -55,18 +55,15 @@ StatusModal {
     height: 504
     anchors.centerIn: parent
 
-    //% "Add members"
-    header.title: addMembers ? qsTrId("add-members") : (popup.chatDetails ? popup.chatDetails.name : "")
+    header.title: addMembers ? qsTr("Add members") : (popup.chatDetails ? popup.chatDetails.name : "")
     header.subTitle:  {
         if (addMembers) {
             return qsTr("%1/%2 members").arg(memberCount).arg(maxMembers)
         } else {
-            //% "%1 members"
             if (currMemberCount > 1) {
-                return qsTrId("%1-members").arg(currMemberCount);
+                return qsTr("%1 members").arg(currMemberCount);
             }
-            //% "1 member"
-            return qsTrId("1-member");
+            return qsTr("1 member");
         }
     }
     header.editable: !addMembers && popup.isAdmin
@@ -110,8 +107,7 @@ StatusModal {
             Layout.alignment: Qt.AlignTop
 
             implicitHeight: 36
-            //% "Search"
-            placeholderText: qsTrId("search")
+            placeholderText: qsTr("Search")
             placeholderFont.pixelSize: 15
 
             icon.name: "search"
@@ -135,8 +131,7 @@ StatusModal {
             Layout.bottomMargin: childrenRect.height
 
             visible: chatSectionModule.listOfMyContacts.count === 0
-            //% "All your contacts are already in the group"
-            text: qsTrId("group-chat-all-contacts-invited")
+            text: qsTr("All your contacts are already in the group")
             textColor: Style.current.textColor
         }
 
@@ -175,8 +170,7 @@ StatusModal {
 
             id: pinnedMessagesBtn
             visible: pinnedCount > 0
-            //% "Pinned messages"
-            text: qsTrId("pinned-messages")
+            text: qsTr("Pinned messages")
             currentValue: pinnedCount
             onClicked: {
                 popup.store.messageStore.messageModule = popup.chatContentModule.messagesModule
@@ -212,7 +206,7 @@ StatusModal {
                 title: model.displayName
                 statusListItemTitle.font.pixelSize: 17
                 statusListItemTitleAside.font.pixelSize: 17
-                label: model.isAdmin ? qsTrId("group-chat-admin"): ""
+                label: model.isAdmin ? qsTr("Admin"): ""
                 image.source: model.icon
                 ringSettings.ringSpecModel: Utils.getColorHashAsJson(model.pubKey)
                 icon: StatusIconSettings {
@@ -240,8 +234,7 @@ StatusModal {
                                 icon.name: "admin"
                                 icon.width: 16
                                 icon.height: 16
-                                //% "Make Admin"
-                                text: qsTrId("make-admin")
+                                text: qsTr("Make Admin")
                                 onTriggered: popup.chatSectionModule.makeAdmin("", popup.chatDetails.id,  model.pubKey)
                             }
                             StatusMenuItem {
@@ -249,8 +242,7 @@ StatusModal {
                                 icon.width: 16
                                 icon.height: 16
                                 type: StatusMenuItem.Type.Danger
-                                //% "Remove From Group"
-                                text: qsTrId("remove-from-group")
+                                text: qsTr("Remove From Group")
                                 onTriggered: popup.chatSectionModule.removeMemberFromGroupChat("", popup.chatDetails.id,  model.pubKey)
                             }
                         }
@@ -280,8 +272,7 @@ StatusModal {
     rightButtons: [
         StatusButton {
             visible: !popup.addMembers && popup.isAdmin
-            //% "Add members"
-            text: qsTrId("add-members")
+            text: qsTr("Add members")
             onClicked: {
                 popup.addMembers = true;
             }
@@ -290,8 +281,7 @@ StatusModal {
             id: btnSelectMembers
             visible: popup.addMembers
             enabled: popup.memberCount >= popup.currMemberCount
-            //% "Add selected"
-            text: qsTrId("add-selected")
+            text: qsTr("Add selected")
             onClicked: popup.doAddMembers()
         }
     ]
diff --git a/ui/app/AppLayouts/Chat/popups/PinnedMessagesPopup.qml b/ui/app/AppLayouts/Chat/popups/PinnedMessagesPopup.qml
index 33bc243974..25c9a43b0d 100644
--- a/ui/app/AppLayouts/Chat/popups/PinnedMessagesPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/PinnedMessagesPopup.qml
@@ -32,10 +32,8 @@ ModalPopup {
 
         StyledText {
             id: title
-            //% "Pin limit reached"
-            text: !!popup.messageToPin ? qsTrId("pin-limit-reached") :
-                                               //% "Pinned messages"
-                                               qsTrId("pinned-messages")
+            text: !!popup.messageToPin ? qsTr("Pin limit reached") :
+                                               qsTr("Pinned messages")
             anchors.top: parent.top
             anchors.left: parent.left
             font.bold: true
@@ -48,14 +46,11 @@ ModalPopup {
             id: nbPinnedMessages
             text: {
                 if (!!popup.messageToPin) {
-                    //% "Unpin a previous message first"
-                    return qsTrId("unpin-a-previous-message-first")
+                    return qsTr("Unpin a previous message first")
                 }
 
-                //% "%1 messages"
-                return nbMessages > 1 ? qsTrId("-1-messages").arg(nbMessages) :
-                                        //% "%1 message"
-                                        qsTrId("-1-message").arg(nbMessages)
+                return nbMessages > 1 ? qsTr("%1 messages").arg(nbMessages) :
+                                        qsTr("%1 message").arg(nbMessages)
             }
             anchors.left: parent.left
             anchors.top: title.bottom
@@ -79,8 +74,7 @@ ModalPopup {
 
         StyledText {
             visible: pinnedMessageListView.count === 0
-            //% "Pinned messages will appear here."
-            text: qsTrId("pinned-messages-will-appear-here-")
+            text: qsTr("Pinned messages will appear here.")
             anchors.centerIn: parent
             color: Style.current.secondaryText
         }
@@ -206,8 +200,7 @@ ModalPopup {
             id: btnUnpin
             visible: !!popup.messageToPin
             enabled: !!popup.messageToUnpin
-            //% "Unpin"
-            text: qsTrId("unpin")
+            text: qsTr("Unpin")
             type: StatusQControls.StatusBaseButton.Type.Danger
             anchors.right: parent.right
             onClicked: {
diff --git a/ui/app/AppLayouts/Chat/popups/PrivateChatPopup.qml b/ui/app/AppLayouts/Chat/popups/PrivateChatPopup.qml
index bd42beb702..68b5f0046f 100644
--- a/ui/app/AppLayouts/Chat/popups/PrivateChatPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/PrivateChatPopup.qml
@@ -13,8 +13,7 @@ import "./"
 // TODO: replace with StatusModal
 ModalPopup {
     id: popup
-    //% "New chat"
-    title: qsTrId("new-chat")
+    title: qsTr("New chat")
     property var store
     property var contactsStore
 
@@ -77,8 +76,7 @@ ModalPopup {
                 anchors.left: dollarEmoji.right
                 anchors.leftMargin: 6
                 anchors.verticalCenter: parent.verticalCenter
-                //% "My Profile"
-                text: qsTrId("my-profile")
+                text: qsTr("My Profile")
                 font.pixelSize: 15
                 color: Style.current.white
             }
diff --git a/ui/app/AppLayouts/Chat/popups/PublicChatPopup.qml b/ui/app/AppLayouts/Chat/popups/PublicChatPopup.qml
index cae493c718..5773bffd1e 100644
--- a/ui/app/AppLayouts/Chat/popups/PublicChatPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/PublicChatPopup.qml
@@ -19,11 +19,9 @@ ModalPopup {
     signal suggestedMessageClicked(string channel)
     function validate() {
         if (channelName.text === "") {
-            //% "You need to enter a channel name"
-            channelNameValidationError = qsTrId("you-need-to-enter-a-channel-name")
+            channelNameValidationError = qsTr("You need to enter a channel name")
         } else if (!Utils.isValidChannelName(channelName.text)) {
-            //% "The channel name can only contain lowercase letters, numbers and dashes"
-            channelNameValidationError = qsTrId("the-channel-name-can-only-contain-lowercase-letters--numbers-and-dashes")
+            channelNameValidationError = qsTr("The channel name can only contain lowercase letters, numbers and dashes")
         } else {
             channelNameValidationError = ""
         }
@@ -40,8 +38,7 @@ ModalPopup {
     }
 
     id: popup
-    //% "Join public chat"
-    title: qsTrId("new-public-group-chat")
+    title: qsTr("Join public chat")
 
     onOpened: {
         channelName.text = "";
@@ -57,8 +54,7 @@ ModalPopup {
         StyledText {
             width: parent.width
             font.pixelSize: 15
-            //% "A public chat is where you get to hang out with others, make friends and talk about subjects of your interest."
-            text: qsTrId("a-public-chat-is-where-you-get-to-hang-out-with-others,-make-friends-and-talk-about-subjects-of-your-interest.")
+            text: qsTr("A public chat is where you get to hang out with others, make friends and talk about subjects of your interest.")
             wrapMode: Text.WordWrap
             verticalAlignment: Text.AlignTop
         }
@@ -68,8 +64,7 @@ ModalPopup {
         id: channelName
         anchors.top: description.bottom
         anchors.topMargin: Style.current.padding
-        //% "chat-name"
-        placeholderText: qsTrId("chat-name")
+        placeholderText: qsTr("chat-name")
         Keys.onEnterPressed: doJoin()
         Keys.onReturnPressed: doJoin()
         icon: Style.svg("hash")
@@ -111,7 +106,6 @@ ModalPopup {
         anchors.bottom: parent.bottom
         anchors.right: parent.right
         onClicked : doJoin()
-        //% "Start chat"
-        text: qsTrId("start-chat")
+        text: qsTr("Start chat")
     }
 }
diff --git a/ui/app/AppLayouts/Chat/popups/RenameGroupPopup.qml b/ui/app/AppLayouts/Chat/popups/RenameGroupPopup.qml
index 67197234be..7d31e1ea3e 100644
--- a/ui/app/AppLayouts/Chat/popups/RenameGroupPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/RenameGroupPopup.qml
@@ -14,8 +14,7 @@ StatusModal {
     height: 210
     anchors.centerIn: parent
 
-    //% "Group name"
-    header.title: qsTrId("group-name")
+    header.title: qsTr("Group name")
 
     property string activeChannelName
     signal doRename(string groupName)
@@ -36,8 +35,7 @@ StatusModal {
             anchors.rightMargin: Style.current.padding
             anchors.top: parent.top
             anchors.topMargin: Style.current.padding
-            //% "Group name"
-            placeholderText: qsTrId("group-name")
+            placeholderText: qsTr("Group name")
             Keys.onEnterPressed: doRename(groupName.text)
             Keys.onReturnPressed: doRename(groupName.text)
         }
@@ -46,8 +44,7 @@ StatusModal {
     rightButtons: [
         StatusButton {
             id: saveBtn
-            //% "Save"
-            text: qsTrId("save")
+            text: qsTr("Save")
             onClicked : { doRename(groupName.text) }
         }
     ]
diff --git a/ui/app/AppLayouts/Chat/popups/community/CommunitiesPopup.qml b/ui/app/AppLayouts/Chat/popups/community/CommunitiesPopup.qml
index 0c503e5229..a1394787a4 100644
--- a/ui/app/AppLayouts/Chat/popups/community/CommunitiesPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/community/CommunitiesPopup.qml
@@ -24,8 +24,7 @@ StatusModal {
         contentItem.searchBox.input.forceActiveFocus(Qt.MouseFocusReason)
     }
 
-    //% "Communities"
-    header.title: qsTrId("communities")
+    header.title: qsTr("Communities")
     headerActionButton: StatusFlatRoundButton {
         type: StatusFlatRoundButton.Type.Secondary
         width: 32
@@ -39,8 +38,7 @@ StatusModal {
             width: 230
             StatusMenuItem {
                 icon.name: "download"
-                //% "Access existing community"
-                text: qsTrId("access-existing-community")
+                text: qsTr("Access existing community")
                 onTriggered: Global.openPopup(importCommunitiesPopupComponent)
             }
         }
@@ -121,8 +119,7 @@ StatusModal {
                         anchors.horizontalCenter: parent.horizontalCenter
                         title: model.name
                         subTitle: model.description
-                        //% "%1 members"
-                        tertiaryTitle: qsTrId("-1-members").arg(model.members.count)
+                        tertiaryTitle: qsTr("%1 members").arg(model.members.count)
                         statusListItemTitle.font.weight: Font.Bold
                         statusListItemTitle.font.pixelSize: 17
                         image.source: model.image
@@ -146,8 +143,7 @@ StatusModal {
 
     rightButtons: [
         StatusButton {
-            //% "Create a community"
-            text: qsTrId("create-community")
+            text: qsTr("Create a community")
             onClicked: {
                 Global.openPopup(createCommunitiesPopupComponent)
                 popup.close()
diff --git a/ui/app/AppLayouts/Chat/popups/community/CommunityDetailPopup.qml b/ui/app/AppLayouts/Chat/popups/community/CommunityDetailPopup.qml
index 8abf65ea8e..50172a8f5f 100644
--- a/ui/app/AppLayouts/Chat/popups/community/CommunityDetailPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/community/CommunityDetailPopup.qml
@@ -33,24 +33,20 @@ StatusModal {
         let subTitle = ""
         switch(access) {
             case Constants.communityChatPublicAccess:
-                //% "Public community"
-                subTitle = qsTrId("public-community");
+                subTitle = qsTr("Public community");
                 break;
             case Constants.communityChatInvitationOnlyAccess:
-                //% "Invitation only community"
-                subTitle = qsTrId("invitation-only-community");
+                subTitle = qsTr("Invitation only community");
                 break;
             case Constants.communityChatOnRequestAccess:
-                //% "On request community"
-                subTitle = qsTrId("on-request-community");
+                subTitle = qsTr("On request community");
                 break;
             default:
                 subTitle = qsTr("Unknown community");
                 break;
         }
         if (ensOnly) {
-            //% " - ENS only"
-            subTitle += qsTrId("---ens-only")
+            subTitle += qsTr(" - ENS only")
         }
         return subTitle
     }
@@ -86,8 +82,7 @@ StatusModal {
             }
 
             StatusBaseText {
-                //% "%1 members"
-                text: qsTrId("-1-members").arg(nbMembers)
+                text: qsTr("%1 members").arg(nbMembers)
                 font.pixelSize: 15
                 font.weight: Font.Medium
                 color: Theme.palette.directColor1
@@ -107,8 +102,7 @@ StatusModal {
             width: parent.width - 32
             height: 34
             StatusBaseText {
-                //% "Channels"
-                text: qsTrId("channels")
+                text: qsTr("Channels")
                 anchors.bottom: parent.bottom
                 anchors.bottomMargin: 4
                 font.pixelSize: 15
@@ -166,26 +160,19 @@ StatusModal {
             text: {
                 // Not Refactored Yet
 //                if (root.ensOnly && !root.store.profileModelInst.profile.ensVerified) {
-//                    //% "Membership requires an ENS username"
-//                    return qsTrId("membership-requires-an-ens-username")
+//                    return qsTr("Membership requires an ENS username")
 //                }
                 if (root.canJoin) {
-                    //% "Join ‘%1’"
-                    return qsTrId("join---1-").arg(root.name);
+                    return qsTr("Join ‘%1’").arg(root.name);
                 }
                 if (isPendingRequest) {
-                     //% "Pending"
-                     return qsTrId("invite-chat-pending")
+                     return qsTr("Pending")
                 }
                 switch(root.access) {
-                    //% "Join ‘%1’"
-                    case Constants.communityChatPublicAccess: return qsTrId("join---1-").arg(root.name);
-                    //% "You need to be invited"
-                    case Constants.communityChatInvitationOnlyAccess: return qsTrId("you-need-to-be-invited");
-                    //% "Request to join ‘%1’"
-                    case Constants.communityChatOnRequestAccess: return qsTrId("request-to-join---1-").arg(root.name);
-                    //% "Unknown community"
-                    default: return qsTrId("unknown-community");
+                    case Constants.communityChatPublicAccess: return qsTr("Join ‘%1’").arg(root.name);
+                    case Constants.communityChatInvitationOnlyAccess: return qsTr("You need to be invited");
+                    case Constants.communityChatOnRequestAccess: return qsTr("Request to join ‘%1’").arg(root.name);
+                    default: return qsTr("Unknown community");
                 }
             }
             enabled: {
@@ -212,8 +199,7 @@ StatusModal {
                 //    error = root.store.chatsModelInst.communities.requestToJoinCommunity(root.communityId, userProfile.name)
                 //    if (!error) {
                 //        enabled = false
-                //        //% "Pending"
-                //        text = qsTrId("invite-chat-pending")
+                //        text = qsTr("Pending")
                 //    }
                } else {
                    error = root.store.communitiesModuleInst.joinCommunity(root.communityId)
@@ -231,8 +217,7 @@ StatusModal {
 
     MessageDialog {
         id: joiningError
-        //% "Error joining the community"
-        title: qsTrId("error-joining-the-community")
+        title: qsTr("Error joining the community")
         icon: StandardIcon.Critical
         standardButtons: StandardButton.Ok
     }
diff --git a/ui/app/AppLayouts/Chat/popups/community/CommunityProfilePopup.qml b/ui/app/AppLayouts/Chat/popups/community/CommunityProfilePopup.qml
index a3ab591867..ef3f9c004a 100644
--- a/ui/app/AppLayouts/Chat/popups/community/CommunityProfilePopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/community/CommunityProfilePopup.qml
@@ -49,14 +49,10 @@ StatusModal {
                 headerTitle: root.community.name
                 headerSubtitle: {
                     switch(root.community.access) {
-                        //% "Public community"
-                        case Constants.communityChatPublicAccess: return qsTrId("public-community");
-                        //% "Invitation only community"
-                        case Constants.communityChatInvitationOnlyAccess: return qsTrId("invitation-only-community");
-                        //% "On request community"
-                        case Constants.communityChatOnRequestAccess: return qsTrId("on-request-community");
-                        //% "Unknown community"
-                        default: return qsTrId("unknown-community");
+                        case Constants.communityChatPublicAccess: return qsTr("Public community");
+                        case Constants.communityChatInvitationOnlyAccess: return qsTr("Invitation only community");
+                        case Constants.communityChatOnRequestAccess: return qsTr("On request community");
+                        default: return qsTr("Unknown community");
                     }
                 }
                 headerImageSource: root.community.image
@@ -90,8 +86,7 @@ StatusModal {
             id: inviteFriendsView
             CommunityProfilePopupInviteFriendsPanel {
                 width: stack.width
-                //% "Invite friends"
-                headerTitle: qsTrId("invite-friends")
+                headerTitle: qsTr("Invite friends")
                 community: root.community
                 contactsStore: root.contactsStore
                 rootStore: root.store
@@ -123,8 +118,7 @@ StatusModal {
 
     rightButtons: [
         StatusButton {
-            //% "Invite"
-            text: qsTrId("community-invite-title")
+            text: qsTr("Invite")
             visible: root.contentItem.depth > 2
             height: !visible ? 0 : implicitHeight
             enabled: root.contentItem.currentItem.contactListSearch !== undefined && root.contentItem.currentItem.contactListSearch.pubKeys.length > 0
diff --git a/ui/app/AppLayouts/Chat/popups/community/CreateCategoryPopup.qml b/ui/app/AppLayouts/Chat/popups/community/CreateCategoryPopup.qml
index e5a5399b26..2b20fd0d0e 100644
--- a/ui/app/AppLayouts/Chat/popups/community/CreateCategoryPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/community/CreateCategoryPopup.qml
@@ -42,10 +42,8 @@ StatusModal {
     }
 
     header.title: isEdit ?
-            //% "Edit category"
-            qsTrId("edit-category") :
-            //% "New category"
-            qsTrId("new-category")
+            qsTr("Edit category") :
+            qsTr("New category")
 
     contentItem: Column {
         property alias categoryName: nameInput
@@ -101,8 +99,7 @@ StatusModal {
                     width: parent.width - 32
                     height: 34
                     StatusBaseText {
-                        //% "Channels"
-                        text: qsTrId("channels")
+                        text: qsTr("Channels")
                         anchors.bottom: parent.bottom
                         anchors.bottomMargin: 4
                         font.pixelSize: 15
@@ -166,16 +163,13 @@ StatusModal {
             anchors.horizontalCenter: parent.horizontalCenter
             visible: isEdit
 
-            //% "Delete category"
-            title: qsTrId("delete-category")
+            title: qsTr("Delete category")
             icon.name: "delete"
             type: StatusListItem.Type.Danger
             sensor.onClicked: {
                 Global.openPopup(deleteCategoryConfirmationDialogComponent, {
-                    //% "Delete %1 category"
-                    title: qsTrId("delete--1-category").arg(root.contentItem.categoryName.input.text),
-                    //% "Are you sure you want to delete %1 category? Channels inside the category won’t be deleted."
-                    confirmationText: qsTrId("are-you-sure-you-want-to-delete--1-category--channels-inside-the-category-won-t-be-deleted-").arg(root.contentItem.categoryName.input.text)
+                    title: qsTr("Delete %1 category").arg(root.contentItem.categoryName.input.text),
+                    confirmationText: qsTr("Are you sure you want to delete %1 category? Channels inside the category won’t be deleted.").arg(root.contentItem.categoryName.input.text)
 
                 })
             }
@@ -214,10 +208,8 @@ StatusModal {
         StatusButton {
             enabled: isFormValid()
             text: isEdit ?
-                //% "Save"
-                qsTrId("save") :
-                //% "Create"
-                qsTrId("create")
+                qsTr("Save") :
+                qsTr("Create")
             onClicked: {
                 if (!isFormValid()) {
                     scrollView.scrollBackUp()
@@ -244,10 +236,8 @@ StatusModal {
     MessageDialog {
         id: categoryError
         title: isEdit ?
-                //% "Error editing the category"
-                qsTrId("error-editing-the-category") :
-                //% "Error creating the category"
-                qsTrId("error-creating-the-category")
+                qsTr("Error editing the category") :
+                qsTr("Error creating the category")
         icon: StandardIcon.Critical
         standardButtons: StandardButton.Ok
     }
diff --git a/ui/app/AppLayouts/Chat/popups/community/CreateChannelPopup.qml b/ui/app/AppLayouts/Chat/popups/community/CreateChannelPopup.qml
index e9a6cefa48..6df7134c18 100644
--- a/ui/app/AppLayouts/Chat/popups/community/CreateChannelPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/community/CreateChannelPopup.qml
@@ -35,16 +35,14 @@ StatusModal {
     signal editCommunityChannel(string chName, string chDescription, string chEmoji, string chColor,
         string chCategoryId)
 
-    //% "New channel"
-    header.title: qsTrId("create-channel-title")
+    header.title: qsTr("New channel")
 
     onOpened: {
         contentItem.channelName.input.text = ""
         contentItem.channelName.input.icon.emoji = ""
         contentItem.channelName.input.edit.forceActiveFocus(Qt.MouseFocusReason)
         if (isEdit) {
-            //% "Edit #%1"
-            header.title = qsTrId("edit---1").arg(popup.channelName);
+            header.title = qsTr("Edit #%1").arg(popup.channelName);
             contentItem.channelName.input.text = popup.channelName
             contentItem.channelDescription.input.text = popup.channelDescription
             if (popup.channelEmoji) {
@@ -181,8 +179,7 @@ StatusModal {
                     // contentColor: colorDialog.colorSelected ? Theme.palette.indirectColor1 : Theme.palette.baseColor1
                     text: colorDialog.colorSelected ?
                         colorDialog.color.toString().toUpperCase() :
-                        //% "Pick a color"
-                        qsTrId("pick-a-color")
+                        qsTr("Pick a color")
 
                     onClicked: colorDialog.open();
                     onTextChanged: {
@@ -235,8 +232,7 @@ StatusModal {
             /*     width: parent.width */
             /*     height: 56 */
             /*     sensor.enabled: false */
-            //% "Private channel"
-            /*     title: qsTrId("private-channel") */
+            /*     title: qsTr("Private channel") */
             /*     components: [ */
             /*         StatusSwitch { */
             /*             id: privateSwitch */
@@ -252,8 +248,7 @@ StatusModal {
             /*     anchors.leftMargin: 16 */
             /*     color: Theme.palette.baseColor1 */
             /*     wrapMode: Text.WordWrap */
-            //% "By making a channel private, only members with selected permission will be able to access it"
-            /*     text: qsTrId("by-making-a-channel-private--only-members-with-selected-permission-will-be-able-to-access-it") */
+            /*     text: qsTr("By making a channel private, only members with selected permission will be able to access it") */
             /* } */
 
             /* StatusModalDivider { */
@@ -265,8 +260,7 @@ StatusModal {
             /*     width: parent.width */
             /*     height: 56 */
             /*     sensor.enabled: false */
-            //% "Message limit"
-            /*     title: qsTrId("message-limit") */
+            /*     title: qsTr("Message limit") */
             /*     components: [ */
             /*         StatusSwitch {} */
             /*     ] */
@@ -280,8 +274,7 @@ StatusModal {
             /*     anchors.leftMargin: 16 */
             /*     color: Theme.palette.baseColor1 */
             /*     wrapMode: Text.WordWrap */
-            //% "Limit channel members to sending one message per chose time interval"
-            /*     text: qsTrId("limit-channel-members-to-sending-one-message-per-chose-time-interval") */
+            /*     text: qsTr("Limit channel members to sending one message per chose time interval") */
             /* } */
 
             Item {
@@ -295,10 +288,8 @@ StatusModal {
         StatusButton {
             enabled: isFormValid()
             text: isEdit ?
-                  //% "Save"
-                  qsTrId("save") :
-                  //% "Create"
-                  qsTrId("create")
+                  qsTr("Save") :
+                  qsTr("Create")
             onClicked: {
                 if (!isFormValid()) {
                     scrollView.scrollBackUp()
@@ -336,8 +327,7 @@ StatusModal {
 
     MessageDialog {
         id: creatingError
-        //% "Error creating the community"
-        title: qsTrId("error-creating-the-community")
+        title: qsTr("Error creating the community")
         icon: StandardIcon.Critical
         standardButtons: StandardButton.Ok
     }
diff --git a/ui/app/AppLayouts/Chat/popups/community/InviteFriendsToCommunityPopup.qml b/ui/app/AppLayouts/Chat/popups/community/InviteFriendsToCommunityPopup.qml
index e1a775f25e..fef4ff445b 100644
--- a/ui/app/AppLayouts/Chat/popups/community/InviteFriendsToCommunityPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/community/InviteFriendsToCommunityPopup.qml
@@ -38,8 +38,7 @@ StatusModal {
     margins: 32
     height: 550
 
-    //% "Invite friends"
-    header.title: qsTrId("invite-friends")
+    header.title: qsTr("Invite friends")
 
     function processInviteResult(error) {
         if (error) {
@@ -47,8 +46,7 @@ StatusModal {
             contactFieldAndList.validationError = error
             return
         }
-        //% "Invite successfully sent"
-        popup.contentItem.contactListSearch.successMessage = qsTrId("invite-successfully-sent")
+        popup.contentItem.contactListSearch.successMessage = qsTr("Invite successfully sent")
     }
 
     contentItem: CommunityProfilePopupInviteFriendsPanel {
@@ -73,8 +71,7 @@ StatusModal {
     rightButtons: [
         StatusButton {
             enabled: popup.contentItem.contactListSearch.pubKeys.length > 0
-            //% "Invite"
-            text: qsTrId("invite-button")
+            text: qsTr("Invite")
             onClicked : {
                 popup.sendInvites(popup.contentItem.contactListSearch.pubKeys)
             }
diff --git a/ui/app/AppLayouts/Chat/popups/community/MembershipRequestsPopup.qml b/ui/app/AppLayouts/Chat/popups/community/MembershipRequestsPopup.qml
index 849a62bb27..0977bbceb7 100644
--- a/ui/app/AppLayouts/Chat/popups/community/MembershipRequestsPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/community/MembershipRequestsPopup.qml
@@ -20,8 +20,7 @@ StatusModal {
         contentItem.errorText.text = ""
     }
 
-    //% "Membership requests"
-    header.title: qsTrId("membership-requests")
+    header.title: qsTr("Membership requests")
     header.subTitle: contentItem.membershipRequestList.count
 
     contentItem: Column {
diff --git a/ui/app/AppLayouts/Chat/stores/MessageStore.qml b/ui/app/AppLayouts/Chat/stores/MessageStore.qml
index ef08cda20e..ca298a9825 100644
--- a/ui/app/AppLayouts/Chat/stores/MessageStore.qml
+++ b/ui/app/AppLayouts/Chat/stores/MessageStore.qml
@@ -136,8 +136,7 @@ QtObject {
     }
 
     function lastTwoItems(nodes) {
-        //% " and "
-        return nodes.join(qsTrId("-and-"));
+        return nodes.join(qsTr(" and "));
     }
 
     function showReactionAuthors(jsonArrayOfUsersReactedWithThisEmoji, emojiId) {
@@ -163,8 +162,7 @@ QtObject {
                 rightNode = listOfUsers.slice(maxReactions, listOfUsers.length);
                 return (rightNode.length === 1) ?
                             lastTwoItems([leftNode.join(", "), rightNode[0]]) :
-                            //% "%1 more"
-                            lastTwoItems([leftNode.join(", "), qsTrId("-1-more").arg(rightNode.length)]);
+                            lastTwoItems([leftNode.join(", "), qsTr("%1 more").arg(rightNode.length)]);
             }
 
             leftNode = listOfUsers.slice(0, maximum - 1);
@@ -172,8 +170,7 @@ QtObject {
             tooltip = lastTwoItems([leftNode.join(", "), rightNode[0]])
         }
 
-        //% " reacted with "
-        tooltip += qsTrId("-reacted-with-");
+        tooltip += qsTr(" reacted with ");
         let emojiHtml = StatusQUtils.Emoji.getEmojiFromId(emojiId);
         if (emojiHtml) {
             tooltip += emojiHtml;
diff --git a/ui/app/AppLayouts/Chat/stores/RootStore.qml b/ui/app/AppLayouts/Chat/stores/RootStore.qml
index ac88ae8ef9..43d2380e5b 100644
--- a/ui/app/AppLayouts/Chat/stores/RootStore.qml
+++ b/ui/app/AppLayouts/Chat/stores/RootStore.qml
@@ -383,8 +383,7 @@ QtObject {
         }
         if (index > -1) {
             const pk = link.substring(index + 3)
-            //% "Start a 1-on-1 chat with %1"
-            result.title = qsTrId("start-a-1-on-1-chat-with--1")
+            result.title = qsTr("Start a 1-on-1 chat with %1")
                             .arg(isChatKey(pk) ? globalUtils.generateAlias(pk) : ("@" + removeStatusEns(pk)))
             result.callback = function () {
                 if (isChatKey(pk)) {
@@ -412,8 +411,7 @@ QtObject {
                 return result
             }
 
-            //% "Join the %1 community"
-            result.title = qsTrId("join-the--1-community").arg(communityName)
+            result.title = qsTr("Join the %1 community").arg(communityName)
             result.communityId = communityId
             result.callback = function () {
                 const isUserMemberOfCommunity = isUserMemberOfCommunity(communityId)
@@ -440,8 +438,7 @@ QtObject {
             const pubKey = link.substring(indexAdminPk + 2, indexChatName - 1)
             const chatName = link.substring(indexChatName + 3, indexChatId - 1)
             const chatId = link.substring(indexChatId + 3, link.length)
-            //% "Join the %1 group chat"
-            result.title = qsTrId("join-the--1-group-chat").arg(chatName)
+            result.title = qsTr("Join the %1 group chat").arg(chatName)
             result.callback = function () {
                 // Not Refactored Yet
 //                chatsModel.groups.joinGroupChatFromInvitation(chatName, chatId, pubKey);
@@ -456,8 +453,7 @@ QtObject {
 //        index = link.lastIndexOf("/")
 //        if (index > -1) {
 //            const chatId = link.substring(index + 1)
-//            //% "Join the %1 public channel"
-//            result.title = qsTrId("join-the--1-public-channel").arg(chatId)
+//            result.title = qsTr("Join the %1 public channel").arg(chatId)
 //            result.callback = function () {
 //                chatsModel.channelView.joinPublicChat(chatId);
 //            }
diff --git a/ui/app/AppLayouts/Chat/views/ActivityCenterGroupRequest.qml b/ui/app/AppLayouts/Chat/views/ActivityCenterGroupRequest.qml
index 600ce1e68b..8cd55b495e 100644
--- a/ui/app/AppLayouts/Chat/views/ActivityCenterGroupRequest.qml
+++ b/ui/app/AppLayouts/Chat/views/ActivityCenterGroupRequest.qml
@@ -123,8 +123,7 @@ Item {
 //                    name = name.substring(0, 9) + "..." + name.substring(name.length - 10)
 //                }
 
-//                //% "%1 invited you to join the group"
-//                return qsTrId("-1-invited-you-to-join-the-group")
+//                return qsTr("%1 invited you to join the group")
 //                .arg(`<style type="text/css">`+
 //                     `a {`+
 //                     `color: ${Style.current.primary};`+
diff --git a/ui/app/AppLayouts/Chat/views/ChatColumnView.qml b/ui/app/AppLayouts/Chat/views/ChatColumnView.qml
index 0f4120df79..b292c82554 100644
--- a/ui/app/AppLayouts/Chat/views/ChatColumnView.qml
+++ b/ui/app/AppLayouts/Chat/views/ChatColumnView.qml
@@ -313,11 +313,9 @@ Item {
             }
             sendChatCommand: root.requestAddressForTransaction
             isRequested: false
-            //% "Send"
-            commandTitle: qsTrId("command-button-send")
+            commandTitle: qsTr("Send")
             header.title: commandTitle
-            //% "Request Address"
-            finalButtonLabel: qsTrId("request-address")
+            finalButtonLabel: qsTr("Request Address")
             selectRecipient.selectedRecipient: {
                 parentModule.prepareChatContentModuleForChatId(activeChatId)
                 let chatContentModule = parentModule.getChatContentModule()
@@ -348,11 +346,9 @@ Item {
             }
             sendChatCommand: root.requestTransaction
             isRequested: true
-            //% "Request"
-            commandTitle: qsTrId("wallet-request")
+            commandTitle: qsTr("Request")
             header.title: commandTitle
-            //% "Request"
-            finalButtonLabel: qsTrId("wallet-request")
+            finalButtonLabel: qsTr("Request")
             selectRecipient.selectedRecipient: {
                 parentModule.prepareChatContentModuleForChatId(activeChatId)
                 let chatContentModule = parentModule.getChatContentModule()
@@ -420,11 +416,9 @@ Item {
 //            }
 //            onTransactionCompleted: {
 //                toastMessage.title = !success ?
-//                                     //% "Could not buy Stickerpack"
-//                                     qsTrId("could-not-buy-stickerpack")
+//                                     qsTr("Could not buy Stickerpack")
 //                                     :
-//                                     //% "Stickerpack bought successfully"
-//                                     qsTrId("stickerpack-bought-successfully");
+//                                     qsTr("Stickerpack bought successfully");
 //                if (success) {
 //                    toastMessage.source = Style.svg("check-circle")
 //                    toastMessage.iconColor = Style.current.success
diff --git a/ui/app/AppLayouts/Chat/views/ChatContentView.qml b/ui/app/AppLayouts/Chat/views/ChatContentView.qml
index dfaad35d52..da8cd665dc 100644
--- a/ui/app/AppLayouts/Chat/views/ChatContentView.qml
+++ b/ui/app/AppLayouts/Chat/views/ChatContentView.qml
@@ -77,19 +77,14 @@ ColumnLayout {
                 switch (chatContentModule.chatDetails.type) {
                 case Constants.chatType.oneToOne:
                     return (chatContentModule.isMyContact(chatContentModule.chatDetails.id) ?
-                                //% "Contact"
-                                qsTrId("chat-is-a-contact") :
-                                //% "Not a contact"
-                                qsTrId("chat-is-not-a-contact"))
+                                qsTr("Contact") :
+                                qsTr("Not a contact"))
                 case Constants.chatType.publicChat:
-                    //% "Public chat"
-                    return qsTrId("public-chat")
+                    return qsTr("Public chat")
                 case Constants.chatType.privateGroupChat:
                     let cnt = chatContentRoot.usersStore.usersModule.model.count
-                    //% "%1 members"
-                    if(cnt > 1) return qsTrId("-1-members").arg(cnt);
-                    //% "1 member"
-                    return qsTrId("1-member");
+                    if(cnt > 1) return qsTr("%1 members").arg(cnt);
+                    return qsTr("1 member");
                 case Constants.chatType.communityChat:
                     return Utils.linkifyAndXSS(chatContentModule.chatDetails.description).trim()
                 default:
@@ -318,10 +313,8 @@ ColumnLayout {
             color: Style.current.white
             id: connectedStatusLbl
             text: isConnected ?
-                      //% "Connected"
-                      qsTrId("connected") :
-                      //% "Disconnected"
-                      qsTrId("disconnected")
+                      qsTr("Connected") :
+                      qsTr("Disconnected")
         }
 
         Connections {
@@ -488,10 +481,8 @@ ColumnLayout {
                 isContactBlocked: chatContentRoot.isBlocked
                 isActiveChannel: chatContentRoot.isActiveChannel
                 chatInputPlaceholder: chatContentRoot.isBlocked ?
-                                          //% "This user has been blocked."
-                                          qsTrId("this-user-has-been-blocked-") :
-                                          //% "Type a message."
-                                          qsTrId("type-a-message-")
+                                          qsTr("This user has been blocked.") :
+                                          qsTr("Type a message.")
                 anchors.bottom: parent.bottom
                 recentStickers: chatContentRoot.rootStore.stickersModuleInst.recent
                 stickerPackList: chatContentRoot.rootStore.stickersModuleInst.stickerPacks
diff --git a/ui/app/AppLayouts/Chat/views/ChatContextMenuView.qml b/ui/app/AppLayouts/Chat/views/ChatContextMenuView.qml
index 1b7f42cae6..72e4692c52 100644
--- a/ui/app/AppLayouts/Chat/views/ChatContextMenuView.qml
+++ b/ui/app/AppLayouts/Chat/views/ChatContextMenuView.qml
@@ -78,8 +78,7 @@ StatusPopupMenu {
                  root.currentFleet === Constants.status_test ||
                  root.currentFleet === Constants.status_prod
 
-        //% "Test WakuV2 - requestAllHistoricMessages"
-        text: qsTrId("test-wakuv2---requestallhistoricmessages")
+        text: qsTr("Test WakuV2 - requestAllHistoricMessages")
         onTriggered: {
             root.requestAllHistoricMessages(root.chatId)
         }
@@ -118,8 +117,7 @@ StatusPopupMenu {
     }
 
     StatusMenuItem {
-        //% "Mark as Read"
-        text: qsTrId("mark-as-read")
+        text: qsTr("Mark as Read")
         icon.name: "checkmark-circle"
         onTriggered: {
             root.markAllMessagesRead(root.chatId)
@@ -161,8 +159,7 @@ StatusPopupMenu {
 //    }
 
     StatusMenuItem {
-        //% "Clear history"
-        text: qsTrId("clear-history")
+        text: qsTr("Clear history")
         icon.name: "close-circle"
         onTriggered: {
             root.clearChatHistory(root.chatId)
@@ -170,8 +167,7 @@ StatusPopupMenu {
     }
 
     StatusMenuItem {
-        //% "Edit Channel"
-        text: qsTrId("edit-channel")
+        text: qsTr("Edit Channel")
         icon.name: "edit"
         enabled: root.isCommunityChat && root.amIChatAdmin
         onTriggered: {
@@ -226,10 +222,8 @@ StatusPopupMenu {
                 return qsTr("Leave group")
             }
             return root.chatType === Constants.chatType.oneToOne ?
-                        //% "Delete chat"
-                        qsTrId("delete-chat") :
-                        //% "Leave chat"
-                        qsTrId("leave-chat")
+                        qsTr("Delete chat") :
+                        qsTr("Leave chat")
         }
         icon.name: root.chatType === Constants.chatType.oneToOne || root.isCommunityChat ? "delete" : "arrow-right"
         icon.width: root.chatType === Constants.chatType.oneToOne || root.isCommunityChat ? 18 : 14
@@ -266,10 +260,8 @@ StatusPopupMenu {
             btnType: "warn"
             header.title: root.isCommunityChat ? qsTr("Delete #%1").arg(root.chatName) :
                                             root.chatType === Constants.chatType.oneToOne ?
-                                            //% "Delete chat"
-                                            qsTrId("delete-chat") :
-                                            //% "Leave chat"
-                                            qsTrId("leave-chat")
+                                            qsTr("Delete chat") :
+                                            qsTr("Leave chat")
             confirmButtonLabel: root.isCommunityChat ? qsTr("Delete") : header.title
             confirmationText: root.isCommunityChat ? qsTr("Are you sure you want to delete #%1 channel?").arg(root.chatName) :
                                                 root.chatType === Constants.chatType.oneToOne ?
diff --git a/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml b/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
index 72a47c4bb8..b1da2dff8f 100644
--- a/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
+++ b/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
@@ -348,8 +348,7 @@ Item {
     MessageDialog {
         id: sendingMsgFailedPopup
         standardButtons: StandardButton.Ok
-        //% "Failed to send message."
-        text: qsTrId("failed-to-send-message-")
+        text: qsTr("Failed to send message.")
         icon: StandardIcon.Critical
     }
 }
diff --git a/ui/app/AppLayouts/Chat/views/ChatView.qml b/ui/app/AppLayouts/Chat/views/ChatView.qml
index 25c34ac14c..5b8de397c4 100644
--- a/ui/app/AppLayouts/Chat/views/ChatView.qml
+++ b/ui/app/AppLayouts/Chat/views/ChatView.qml
@@ -173,9 +173,8 @@ StatusAppThreePanelLayout {
     ConfirmationDialog {
         id: removeContactConfirmationDialog
         // % "Remove contact"
-        header.title: qsTrId("remove-contact")
-        //% "Are you sure you want to remove this contact?"
-        confirmationText: qsTrId("are-you-sure-you-want-to-remove-this-contact-")
+        header.title: qsTr("Remove contact")
+        confirmationText: qsTr("Are you sure you want to remove this contact?")
         onConfirmButtonClicked: {
             let pk = chatColumn.contactToRemove
             if (Utils.getContactDetailsAsJson(pk).isContact) {
diff --git a/ui/app/AppLayouts/Chat/views/CommunityColumnView.qml b/ui/app/AppLayouts/Chat/views/CommunityColumnView.qml
index cb7586a352..8cc4d74985 100644
--- a/ui/app/AppLayouts/Chat/views/CommunityColumnView.qml
+++ b/ui/app/AppLayouts/Chat/views/CommunityColumnView.qml
@@ -41,10 +41,8 @@ Item {
         id: communityHeader
         title: communityData.name
         subTitle: communityData.members.count <= 1 ?
-                                     //% "1 Member"
-                                     qsTrId("1-member") :
-                                     //% "%1 Members"
-                                     qsTrId("-1-members").arg(communityData.members.count)
+                                     qsTr("1 Member") :
+                                     qsTr("%1 Members").arg(communityData.members.count)
         image.source: communityData.image
         icon.color: communityData.color
         onClicked: root.infoButtonClicked()
@@ -93,8 +91,7 @@ Item {
         height: nbRequests > 0 ? 64 : 0
         sourceComponent: Component {
             StatusContactRequestsIndicatorListItem {
-                //% "Membership requests"
-                title: qsTrId("membership-requests")
+                title: qsTr("Membership requests")
                 requestsCount: membershipRequests.nbRequests
                 sensor.onClicked: Global.openPopup(root.membershipRequestPopup, {
                     communitySectionModule: root.communitySectionModule
@@ -188,8 +185,7 @@ Item {
 
             popupMenu: StatusPopupMenu {
                 StatusMenuItem {
-                    //% "Create channel"
-                    text: qsTrId("create-channel")
+                    text: qsTr("Create channel")
                     icon.name: "channel"
                     // Not Refactored Yet
                     enabled: communityData.amISectionAdmin
@@ -197,8 +193,7 @@ Item {
                 }
 
                 StatusMenuItem {
-                    //% "Create category"
-                    text: qsTrId("create-category")
+                    text: qsTr("Create category")
                     icon.name: "channel-category"
                     enabled: communityData.amISectionAdmin
                     onTriggered: Global.openPopup(createCategoryPopup)
@@ -207,8 +202,7 @@ Item {
                 StatusMenuSeparator {}
 
                 StatusMenuItem {
-                    //% "Invite people"
-                    text: qsTrId("invite-people")
+                    text: qsTr("Invite people")
                     icon.name: "share-ios"
                     enabled: communityData.canManageUsers
                     onTriggered: Global.openPopup(inviteFriendsToCommunityPopup, {
@@ -248,8 +242,7 @@ Item {
 
                 StatusMenuItem {
                     enabled: communityData.amISectionAdmin
-                    //% "Edit Category"
-                    text: qsTrId("edit-category")
+                    text: qsTr("Edit Category")
                     icon.name: "edit"
                     onTriggered: {
                        Global.openPopup(createCategoryPopup, {
@@ -267,16 +260,13 @@ Item {
 
                 StatusMenuItem {
                     enabled: communityData.amISectionAdmin
-                    //% "Delete Category"
-                    text: qsTrId("delete-category")
+                    text: qsTr("Delete Category")
                     icon.name: "delete"
                     type: StatusMenuItem.Type.Danger
                     onTriggered: {
                         Global.openPopup(deleteCategoryConfirmationDialogComponent, {
-                            //% "Delete %1 category"
-                            title: qsTrId("delete--1-category").arg(categoryItem.name),
-                            //% "Are you sure you want to delete %1 category? Channels inside the category won’t be deleted."
-                            confirmationText: qsTrId("are-you-sure-you-want-to-delete--1-category--channels-inside-the-category-won-t-be-deleted-")
+                            title: qsTr("Delete %1 category").arg(categoryItem.name),
+                            confirmationText: qsTr("Are you sure you want to delete %1 category? Channels inside the category won’t be deleted.")
                                 .arg(categoryItem.name),
                             categoryId: categoryItem.categoryId
                         })
@@ -513,7 +503,7 @@ Item {
                     }
 
                     StatusMenuItem {
-                        text: qsTrId("Create category")
+                        text: qsTr("Create category")
                         icon.name: "channel-category"
                         onTriggered: Global.openPopup(createCategoryPopup)
                     }
@@ -574,8 +564,7 @@ Item {
 
     MessageDialog {
         id: deleteError
-        //% "Error deleting the category"
-        title: qsTrId("error-deleting-the-category")
+        title: qsTr("Error deleting the category")
         icon: StandardIcon.Critical
         standardButtons: StandardButton.Ok
     }
diff --git a/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml b/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml
index 3ca92dcedc..fdec777ab6 100644
--- a/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml
+++ b/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml
@@ -55,8 +55,7 @@ Item {
         anchors.top: parent.top
         anchors.topMargin: 16
         anchors.horizontalCenter: parent.horizontalCenter
-        //% "Chat"
-        text: qsTrId("chat")
+        text: qsTr("Chat")
     }
 
     RowLayout {
@@ -73,8 +72,7 @@ Item {
             Layout.alignment: Qt.AlignVCenter
             implicitHeight: 36
             topPadding: 9
-            //% "Search"
-            placeholderText: qsTrId("search")
+            placeholderText: qsTr("Search")
             icon.name: "search"
             MouseArea {
                 anchors.fill: parent
@@ -134,8 +132,7 @@ Item {
         visible: nbRequests > 0
         height: visible ? implicitHeight : 0
 
-        //% "Contact requests"
-        title: qsTrId("contact-requests")
+        title: qsTr("Contact requests")
         requestsCount: nbRequests
 
         sensor.onClicked: Global.openPopup(contactRequestsPopup)
@@ -337,13 +334,11 @@ Item {
 
             if (state === Constants.communityImported)
             {
-                //% "Community imported"
-                title = qsTrId("community-imported")
+                title = qsTr("Community imported")
             }
             else if (state === Constants.communityImportingInProgress)
             {
-                //% "Importing community is in progress"
-                title = qsTrId("importing-community-is-in-progress")
+                title = qsTr("Importing community is in progress")
                 loading = true
             }
             else if (state === Constants.communityImportingError)
diff --git a/ui/app/AppLayouts/Node/NodeLayout.qml b/ui/app/AppLayouts/Node/NodeLayout.qml
index d24e5a0749..f134ac5da6 100644
--- a/ui/app/AppLayouts/Node/NodeLayout.qml
+++ b/ui/app/AppLayouts/Node/NodeLayout.qml
@@ -236,8 +236,7 @@ Item {
                         leftPadding: 0
                         padding: 0
                         font.pixelSize: 14
-                        //% "Type json-rpc message... e.g {\"method\": \"eth_accounts\"}"
-                        placeholderText: qsTrId("type-json-rpc-message")
+                        placeholderText: qsTr("Type json-rpc message... e.g {\"method\": \"eth_accounts\"}")
                         anchors.right: rpcSendBtn.left
                         anchors.rightMargin: 16
                         anchors.top: parent.top
diff --git a/ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml b/ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml
index b959725e9b..73609c3591 100644
--- a/ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml
+++ b/ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml
@@ -13,7 +13,7 @@ StatusModal {
     id: popup
 
     anchors.centerIn: parent
-    header.title: qsTrId("before-you-get-started---")
+    header.title: qsTr("Before you get started")
     hasCloseButton: false
     closePolicy: Popup.NoAutoClose
 
@@ -33,7 +33,7 @@ StatusModal {
                 id: acknowledge
                 objectName: "acknowledgeCheckBox"
                 width: parent.width
-                text: qsTrId("i-acknowledge-that-status-desktop-is-in-beta-and-by-using-it--i-take-the-full-responsibility-for-all-risks-concerning-my-data-and-funds-")
+                text: qsTr("I acknowledge that status desktop is in beta and by using it I take the full responsibility for all risks concerning my data and funds")
             }
 
             StatusCheckBox {
@@ -51,7 +51,7 @@ StatusModal {
 
                     StatusBaseText {
                         objectName: "termsOfUseLink"
-                        text: qsTrId("terms-of-service")
+                        text: qsTr("Terms of service")
                         color: Theme.palette.primaryColor1
 
                         MouseArea {
@@ -107,7 +107,7 @@ StatusModal {
             id: getStartedButton
             objectName: "getStartedStatusButton"
             enabled: acknowledge.checked && termsOfUse.checked
-            text: qsTrId("get-started")
+            text: qsTr("Get started")
             onClicked: {
                 popup.close()
             }
diff --git a/ui/app/AppLayouts/Onboarding/popups/ConfirmAddExistingKeyModal.qml b/ui/app/AppLayouts/Onboarding/popups/ConfirmAddExistingKeyModal.qml
index 73cff526cc..8fe1622f09 100644
--- a/ui/app/AppLayouts/Onboarding/popups/ConfirmAddExistingKeyModal.qml
+++ b/ui/app/AppLayouts/Onboarding/popups/ConfirmAddExistingKeyModal.qml
@@ -11,8 +11,7 @@ import shared.popups 1.0
 // TODO: replace with StatusModal
 ModalPopup {
     id: popup
-    //% "Enter seed phrase"
-    title: qsTrId("enter-seed-phrase")
+    title: qsTr("Enter seed phrase")
     height: 200
     signal openModalClicked()
 
diff --git a/ui/app/AppLayouts/Onboarding/popups/SelectAnotherAccountModal.qml b/ui/app/AppLayouts/Onboarding/popups/SelectAnotherAccountModal.qml
index c26e93a442..28d1fe5eef 100644
--- a/ui/app/AppLayouts/Onboarding/popups/SelectAnotherAccountModal.qml
+++ b/ui/app/AppLayouts/Onboarding/popups/SelectAnotherAccountModal.qml
@@ -15,8 +15,7 @@ ModalPopup {
     signal accountSelected(int index)
     signal openModalClicked()
     id: popup
-    //% "Your keys"
-    title: qsTrId("your-keys")
+    title: qsTr("Your keys")
 
     AccountListPanel {
         id: accountList
@@ -37,8 +36,7 @@ ModalPopup {
         anchors.bottom: parent.bottom
         anchors.topMargin: Style.current.padding
         anchors.right: parent.right
-        //% "Add another existing key"
-        text: qsTrId("add-another-existing-key")
+        text: qsTr("Add another existing key")
 
         onClicked : {
            openModalClicked()
diff --git a/ui/app/AppLayouts/Onboarding/shared/CreatePasswordModal.qml b/ui/app/AppLayouts/Onboarding/shared/CreatePasswordModal.qml
index 9a1c786698..56aeef7636 100644
--- a/ui/app/AppLayouts/Onboarding/shared/CreatePasswordModal.qml
+++ b/ui/app/AppLayouts/Onboarding/shared/CreatePasswordModal.qml
@@ -27,8 +27,7 @@ ModalPopup {
     id: popup
     title: storingPasswordModal?
                qsTr("Store password") :
-               //% "Create a password"
-               qsTrId("intro-wizard-title-alt4")
+               qsTr("Create a password")
     height: 500
 
     onOpened: {
@@ -44,8 +43,7 @@ ModalPopup {
         anchors.topMargin: storingPasswordModal? Style.current.xlPadding : 88
         placeholderText: storingPasswordModal?
                              qsTr("Current password...") :
-                             //% "New password..."
-                             qsTrId("new-password...")
+                             qsTr("New password...")
         textField.echoMode: TextInput.Password
         onTextChanged: {
             [firstPasswordFieldValid, passwordValidationError] =
@@ -64,8 +62,7 @@ ModalPopup {
         anchors.left: firstPasswordField.left
         anchors.top: firstPasswordField.bottom
         anchors.topMargin: Style.current.xlPadding
-        //% "Confirm password…"
-        placeholderText: qsTrId("confirm-password…")
+        placeholderText: qsTr("Confirm password…")
         textField.echoMode: TextInput.Password
         Keys.onReturnPressed: function(event) {
             if (submitBtn.enabled) {
@@ -98,8 +95,7 @@ ModalPopup {
 
     StyledText {
         visible: !storingPasswordModal
-        //% "At least 6 characters. You will use this password to unlock status on this device & sign transactions."
-        text: qsTrId("at-least-6-characters-you-will-use-this-password-to-unlock-status-on-this-device-sign-transactions.")
+        text: qsTr("At least 6 characters. You will use this password to unlock status on this device & sign transactions.")
         wrapMode: Text.WordWrap
         anchors.right: parent.right
         anchors.rightMargin: Style.current.xlPadding
@@ -125,17 +121,14 @@ ModalPopup {
 
             text: storingPasswordModal?
                       qsTr("Store password") :
-                      //% "Create password"
-                      qsTrId("create-password")
+                      qsTr("Create password")
 
             enabled: firstPasswordFieldValid && repeatPasswordFieldValid && !loading
 
             MessageDialog {
                 id: importError
-                //% "Error importing account"
-                title: qsTrId("error-importing-account")
-                //% "An error occurred while importing your account: "
-                text: qsTrId("an-error-occurred-while-importing-your-account:-")
+                title: qsTr("Error importing account")
+                text: qsTr("An error occurred while importing your account: ")
                 icon: StandardIcon.Critical
                 standardButtons: StandardButton.Ok
                 onVisibilityChanged: {
@@ -145,10 +138,8 @@ ModalPopup {
 
             MessageDialog {
                 id: importLoginError
-                //% "Login failed"
-                title: qsTrId("login-failed")
-                //% "Login failed. Please re-enter your password and try again."
-                text: qsTrId("login-failed.-please-re-enter-your-password-and-try-again.")
+                title: qsTr("Login failed")
+                text: qsTr("Login failed. Please re-enter your password and try again.")
                 icon: StandardIcon.Critical
                 standardButtons: StandardButton.Ok
                 onVisibilityChanged: {
diff --git a/ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml b/ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml
index 13995d1681..e753b411e1 100644
--- a/ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml
+++ b/ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml
@@ -177,10 +177,8 @@ OnboardingBasePage {
                         importLoginError.title = qsTr("Keys for this account already exist")
                         importLoginError.text = qsTr("Keys for this account already exist and can't be added again. If you've lost your password, passcode or Keycard, uninstall the app, reinstall and access your keys by entering your seed phrase")
                     } else {
-                        //% "Login failed"
-                        importLoginError.title = qsTrId("login-failed")
-                        //% "Login failed. Please re-enter your password and try again."
-                        importLoginError.text = qsTrId("login-failed.-please-re-enter-your-password-and-try-again.")
+                        importLoginError.title = qsTr("Login failed")
+                        importLoginError.text = qsTr("Login failed. Please re-enter your password and try again.")
                     }
                     importLoginError.open()
                 }
@@ -188,10 +186,8 @@ OnboardingBasePage {
 
             MessageDialog {
                 id: importLoginError
-                //% "Login failed"
-                title: qsTrId("login-failed")
-                //% "Login failed. Please re-enter your password and try again."
-                text: qsTrId("login-failed.-please-re-enter-your-password-and-try-again.")
+                title: qsTr("Login failed")
+                text: qsTr("Login failed. Please re-enter your password and try again.")
                 icon: StandardIcon.Critical
                 standardButtons: StandardButton.Ok
                 onVisibilityChanged: {
diff --git a/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml b/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml
index aee96d1733..73b0a8d167 100644
--- a/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml
+++ b/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml
@@ -45,7 +45,7 @@ OnboardingBasePage {
 
         StyledText {
             id: txtTitle
-            text: qsTrId("intro-wizard-title1")
+            text: qsTr("intro-wizard-title1") // FIXME: translations
             font.bold: true
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.top: keysImgWrapperItem.bottom
@@ -62,7 +62,7 @@ OnboardingBasePage {
             anchors.top: txtTitle.bottom
             anchors.topMargin: Style.current.padding
             color: Style.current.secondaryText
-            text: qsTrId("a-set-of-keys-controls-your-account.-your-keys-live-on-your-device,-so-only-you-can-use-them.")
+            text: qsTr("a-set-of-keys-controls-your-account.-your-keys-live-on-your-device,-so-only-you-can-use-them.") // FIXME: translations
             horizontalAlignment: Text.AlignHCenter
             wrapMode: Text.WordWrap
             font.pixelSize: 15
diff --git a/ui/app/AppLayouts/Onboarding/views/LoginView.qml b/ui/app/AppLayouts/Onboarding/views/LoginView.qml
index 99d8b5dc4d..c6d4f80b2b 100644
--- a/ui/app/AppLayouts/Onboarding/views/LoginView.qml
+++ b/ui/app/AppLayouts/Onboarding/views/LoginView.qml
@@ -226,10 +226,8 @@ Item {
             width: 318
             enabled: !loading
             placeholderText: loading ?
-                //% "Connecting..."
-                qsTrId("connecting") :
-                //% "Enter password"
-                qsTrId("enter-password")
+                qsTr("Connecting...") :
+                qsTr("Enter password")
             textField.echoMode: TextInput.Password
             Keys.onReturnPressed: {
                 doLogin(textField.text)
@@ -279,8 +277,7 @@ Item {
                     if (error === "file is not a database") {
                         errMsg.text = errMsg.incorrectPasswordMsg
                     } else {
-                        //% "Login failed: %1"
-                        errMsg.text = qsTrId("login-failed---1").arg(error.toUpperCase())
+                        errMsg.text = qsTr("Login failed: %1").arg(error.toUpperCase())
                     }
                     errMsg.visible = true
                     loading = false
@@ -291,8 +288,7 @@ Item {
 
         StyledText {
             id: errMsg
-            //% "Login failed. Please re-enter your password and try again."
-            readonly property string incorrectPasswordMsg: qsTrId("login-failed--please-re-enter-your-password-and-try-again-")
+            readonly property string incorrectPasswordMsg: qsTr("Login failed. Please re-enter your password and try again.")
             anchors.top: txtPassword.bottom
             anchors.topMargin: Style.current.padding
             anchors.horizontalCenter: parent.horizontalCenter
diff --git a/ui/app/AppLayouts/Onboarding/views/TouchIDAuthView.qml b/ui/app/AppLayouts/Onboarding/views/TouchIDAuthView.qml
index aebb4fe11a..cce2925f6d 100644
--- a/ui/app/AppLayouts/Onboarding/views/TouchIDAuthView.qml
+++ b/ui/app/AppLayouts/Onboarding/views/TouchIDAuthView.qml
@@ -66,7 +66,7 @@ OnboardingBasePage {
             anchors.top: txtTitle.bottom
             anchors.topMargin: Style.current.padding
             color: Style.current.secondaryText
-            text: qsTrId("Would you like to use your Touch ID to login to Status?")
+            text: qsTr("Would you like to use your Touch ID to login to Status?")
             horizontalAlignment: Text.AlignHCenter
             wrapMode: Text.WordWrap
             font.pixelSize: 15
diff --git a/ui/app/AppLayouts/Onboarding/views/WelcomeView.qml b/ui/app/AppLayouts/Onboarding/views/WelcomeView.qml
index cfe2d063d6..83bdc87a54 100644
--- a/ui/app/AppLayouts/Onboarding/views/WelcomeView.qml
+++ b/ui/app/AppLayouts/Onboarding/views/WelcomeView.qml
@@ -52,7 +52,6 @@ Page {
 
         StyledText {
             id: txtTitle1
-            //% "Get your keys"
             text: qsTr("Welcome to Status")
             anchors.topMargin: Style.current.padding
             font.bold: true
diff --git a/ui/app/AppLayouts/Profile/controls/BloomSelectorButton.qml b/ui/app/AppLayouts/Profile/controls/BloomSelectorButton.qml
index a803aec0eb..e5e5aaa1ef 100644
--- a/ui/app/AppLayouts/Profile/controls/BloomSelectorButton.qml
+++ b/ui/app/AppLayouts/Profile/controls/BloomSelectorButton.qml
@@ -10,8 +10,7 @@ import StatusQ.Controls 0.1
 
 Rectangle {
     property var buttonGroup
-    //% "TODO"
-    property string btnText: qsTrId("todo")
+    property string btnText: qsTr("TODO")
     property bool hovered: false
     property bool checkedByDefault: false
 
diff --git a/ui/app/AppLayouts/Profile/controls/FleetRadioSelector.qml b/ui/app/AppLayouts/Profile/controls/FleetRadioSelector.qml
index 4baa695bea..9125b48ed6 100644
--- a/ui/app/AppLayouts/Profile/controls/FleetRadioSelector.qml
+++ b/ui/app/AppLayouts/Profile/controls/FleetRadioSelector.qml
@@ -30,10 +30,8 @@ RadioButtonSelector {
     Component {
         id: confirmDialogComponent
         ConfirmationDialog {
-            //% "Warning!"
-            header.title: qsTrId("close-app-title")
-            //% "Change fleet to %1"
-            confirmationText: qsTrId("change-fleet-to--1").arg(root.newFleet)
+            header.title: qsTr("Warning!")
+            confirmationText: qsTr("Change fleet to %1").arg(root.newFleet)
             onConfirmButtonClicked: {
                 root.advancedStore.setFleet(root.newFleet)
             }
diff --git a/ui/app/AppLayouts/Profile/panels/CommunitiesListPanel.qml b/ui/app/AppLayouts/Profile/panels/CommunitiesListPanel.qml
index 7c58cc1038..1e891c27fb 100644
--- a/ui/app/AppLayouts/Profile/panels/CommunitiesListPanel.qml
+++ b/ui/app/AppLayouts/Profile/panels/CommunitiesListPanel.qml
@@ -41,7 +41,7 @@ ListView {
                 size: StatusBaseButton.Size.Small
                 type: StatusBaseButton.Type.Danger
                 border.color: "transparent"
-                text: qsTrId("leave-community")
+                text: qsTr("Leave community")
                 onClicked: {
                     Global.openPopup(leaveCommunityPopup, {
                                          community: model.name,
diff --git a/ui/app/AppLayouts/Profile/panels/TokenSettingsModalContent.qml b/ui/app/AppLayouts/Profile/panels/TokenSettingsModalContent.qml
index c852c472a4..2712478be6 100644
--- a/ui/app/AppLayouts/Profile/panels/TokenSettingsModalContent.qml
+++ b/ui/app/AppLayouts/Profile/panels/TokenSettingsModalContent.qml
@@ -51,8 +51,7 @@ Item {
                     id: contextMenu
                     Action {
                         icon.name: "admin"
-                        //% "Token details"
-                        text: qsTrId("token-details")
+                        text: qsTr("Token details")
                         onTriggered: {
                             modalBody.showTokenDetailsTriggered(chainId, address, name, symbol, decimals);
                         }
@@ -61,8 +60,7 @@ Item {
                         icon.name: "remove"
                         icon.color: Style.current.red
                         enabled: isCustom
-                        //% "Remove token"
-                        text: qsTrId("remove-token")
+                        text: qsTr("Remove token")
                         onTriggered: removeCustomTokenTriggered(chainId, address)
                     }
                 }
@@ -106,8 +104,7 @@ Item {
 
                 StyledText {
                     id: customLbl
-                    //% "Custom"
-                    text: qsTrId("custom")
+                    text: qsTr("Custom")
                     font.pixelSize: 13
                     color: Style.current.secondaryText
                     height: 20
@@ -130,8 +127,7 @@ Item {
 
                 StyledText {
                     id: defaultLbl
-                    //% "Default"
-                    text: qsTrId("default")
+                    text: qsTr("Default")
                     font.pixelSize: 13
                     color: Style.current.secondaryText
                     height: 20
diff --git a/ui/app/AppLayouts/Profile/popups/AddShowTokenModal.qml b/ui/app/AppLayouts/Profile/popups/AddShowTokenModal.qml
index e1f6c038e3..6cab56a81e 100644
--- a/ui/app/AppLayouts/Profile/popups/AddShowTokenModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/AddShowTokenModal.qml
@@ -19,8 +19,7 @@ StatusModal {
     property WalletStore walletStore
 
     header.title: editable ?
-        //% "Add custom token"
-        qsTrId("add-custom-token")
+        qsTr("Add custom token")
         : nameInput.text
 
     x: Math.round(((parent ? parent.width : 0) - width) / 2)
@@ -53,8 +52,7 @@ StatusModal {
 
     function validate() {
         if (addressInput.text !== "" && !Utils.isAddress(addressInput.text)) {
-            //% "This needs to be a valid address"
-            validationError = qsTrId("this-needs-to-be-a-valid-address");
+            validationError = qsTr("This needs to be a valid address");
         }
         return validationError === ""
     }
@@ -80,8 +78,7 @@ StatusModal {
                 return
             }
             if (jsonObj.name === "" && jsonObj.symbol === "" && jsonObj.decimals === "") {
-                //% "Invalid ERC20 address"
-                validationError = qsTrId("invalid-erc20-address")
+                validationError = qsTr("Invalid ERC20 address")
                 return;
             }
 
@@ -102,10 +99,8 @@ StatusModal {
             id: addressInput
             readOnly: !editable
             textField.maximumLength: 42
-            //% "Enter contract address..."
-            placeholderText: qsTrId("enter-contract-address...")
-            //% "Contract address"
-            label: qsTrId("contract-address")
+            placeholderText: qsTr("Enter contract address...")
+            label: qsTr("Contract address")
             validationError: popup.validationError
             Keys.onReleased: onKeyReleased()
         }
@@ -115,19 +110,15 @@ StatusModal {
             readOnly: !editable
             anchors.top: addressInput.bottom
             anchors.topMargin: marginBetweenInputs
-            //% "The name of your token..."
-            placeholderText: qsTrId("the-name-of-your-token...")
-            //% "Name"
-            label: qsTrId("name")
+            placeholderText: qsTr("The name of your token...")
+            label: qsTr("Name")
         }
 
         Input {
             id: symbolInput
             readOnly: !editable
-            //% "ABC"
-            placeholderText: qsTrId("abc")
-            //% "Symbol"
-            label: qsTrId("symbol")
+            placeholderText: qsTr("ABC")
+            label: qsTr("Symbol")
             anchors.top: nameInput.bottom
             anchors.topMargin: marginBetweenInputs
             anchors.left: parent.left
@@ -139,8 +130,7 @@ StatusModal {
             id: decimalsInput
             readOnly: !editable
             placeholderText: "18"
-            //% "Decimals"
-            label: qsTrId("decimals")
+            label: qsTr("Decimals")
             text: "18"
             anchors.top: nameInput.bottom
             anchors.topMargin: marginBetweenInputs
@@ -159,8 +149,7 @@ StatusModal {
 
     rightButtons: [
         StatusButton {
-            //% "Add"
-            text: qsTrId("add")
+            text: qsTr("Add")
             enabled: validationError === "" && addressInput.text !== "" && nameInput.text !== "" && symbolInput.text !== "" && decimalsInput.text !== ""
             visible: editable
             onClicked: {
diff --git a/ui/app/AppLayouts/Profile/popups/AddWakuNodeModal.qml b/ui/app/AppLayouts/Profile/popups/AddWakuNodeModal.qml
index 20cbbf41a1..772e6cdbb4 100644
--- a/ui/app/AppLayouts/Profile/popups/AddWakuNodeModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/AddWakuNodeModal.qml
@@ -35,27 +35,22 @@ StatusModal {
 
         StatusInput {
             id: nameInput
-            //% "Name"
-            label: qsTrId("name")
-            //% "Specify a name"
-            input.placeholderText: qsTrId("specify-name")
+            label: qsTr("Name")
+            input.placeholderText: qsTr("Specify a name")
             validators: [StatusMinLengthValidator {
                 minLength: 1
-                //% "You need to enter a name"
-                errorMessage: qsTrId("you-need-to-enter-a-name")
+                errorMessage: qsTr("You need to enter a name")
             }]
             validationMode: StatusInput.ValidationMode.OnlyWhenDirty
         }
 
         StatusInput {
             id: enodeInput
-            //% "History node address"
-            label: qsTrId("history-node-address")
+            label: qsTr("History node address")
             input.placeholderText:  "enode://{enode-id}:{password}@{ip-address}:{port-number}"
             validators: [StatusMinLengthValidator {
                 minLength: 1
-                //% "You need to enter the enode address"
-                errorMessage: qsTrId("you-need-to-enter-the-enode-address")
+                errorMessage: qsTr("You need to enter the enode address")
             },
             StatusRegularExpressionValidator {
                 errorMessage: qsTr("The format must be: enode://{enode-id}:{password}@{ip-address}:{port}")
@@ -69,8 +64,7 @@ StatusModal {
 
     rightButtons: [
        StatusButton {
-            //% "Save"
-            text: qsTrId("save")
+            text: qsTr("Save")
             enabled: nameInput.valid && enodeInput.valid
             // enabled: nameInput.text !== "" && enodeInput.text !== ""
             onClicked: {
diff --git a/ui/app/AppLayouts/Profile/popups/ChangeProfilePicModal.qml b/ui/app/AppLayouts/Profile/popups/ChangeProfilePicModal.qml
index 375a7344c7..fd895a666f 100644
--- a/ui/app/AppLayouts/Profile/popups/ChangeProfilePicModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/ChangeProfilePicModal.qml
@@ -12,8 +12,7 @@ import shared.popups 1.0
 // TODO: replace with StatusModal
 ModalPopup {
     id: popup
-    //% "Profile picture"
-    title: qsTrId("profile-picture")
+    title: qsTr("Profile picture")
 
     property var profileStore
 
@@ -81,8 +80,7 @@ ModalPopup {
         StatusFlatButton {
             visible: popup.hasIdentityImage
             type: StatusBaseButton.Type.Danger
-            //% "Remove"
-            text: qsTrId("remove")
+            text: qsTr("Remove")
             anchors.right: uploadBtn.left
             anchors.rightMargin: Style.current.padding
             anchors.bottom: parent.bottom
@@ -93,8 +91,7 @@ ModalPopup {
 
         StatusButton {
             id: uploadBtn
-            //% "Upload"
-            text: qsTrId("upload")
+            text: qsTr("Upload")
             anchors.right: parent.right
             anchors.bottom: parent.bottom
             onClicked: {
@@ -103,12 +100,10 @@ ModalPopup {
 
             FileDialog {
                 id: imageDialog
-                //% "Please choose an image"
-                title: qsTrId("please-choose-an-image")
+                title: qsTr("Please choose an image")
                 folder: shortcuts.pictures
                 nameFilters: [
-                    //% "Image files (*.jpg *.jpeg *.png)"
-                    qsTrId("image-files----jpg---jpeg---png-")
+                    qsTr("Image files (*.jpg *.jpeg *.png)")
                 ]
                 onAccepted: {
                     selectedImage = imageDialog.fileUrls[0]
diff --git a/ui/app/AppLayouts/Profile/popups/ENSPopup.qml b/ui/app/AppLayouts/Profile/popups/ENSPopup.qml
index 80591efd4d..93e8b3659c 100644
--- a/ui/app/AppLayouts/Profile/popups/ENSPopup.qml
+++ b/ui/app/AppLayouts/Profile/popups/ENSPopup.qml
@@ -12,8 +12,7 @@ import shared.popups 1.0
 ModalPopup {
     id: popup
 
-    //% "Primary username"
-    title: qsTrId("ens-primary-username")
+    title: qsTr("Primary username")
 
     property var ensUsernamesStore
     property string newUsername: ""
@@ -27,11 +26,9 @@ ModalPopup {
     StyledText {
         id: lbl1
         text: popup.ensUsernamesStore.preferredUsername ?
-              //% "Your messages are displayed to others with this username:"
-              qsTrId("your-messages-are-displayed-to-others-with-this-username-")
+              qsTr("Your messages are displayed to others with this username:")
               :
-              //% "Once you select a username, you won’t be able to disable it afterwards. You will only be able choose a different username to display."
-              qsTrId("once-you-select-a-username--you-won-t-be-able-to-disable-it-afterwards--you-will-only-be-able-choose-a-different-username-to-display-")
+              qsTr("Once you select a username, you won’t be able to disable it afterwards. You will only be able choose a different username to display.")
         font.pixelSize: 15
         wrapMode: Text.WordWrap
         width: parent.width
diff --git a/ui/app/AppLayouts/Profile/popups/FleetsModal.qml b/ui/app/AppLayouts/Profile/popups/FleetsModal.qml
index efb85a01aa..89e78f62c2 100644
--- a/ui/app/AppLayouts/Profile/popups/FleetsModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/FleetsModal.qml
@@ -12,8 +12,7 @@ import "../controls"
 // TODO: replace with StatusModal
 ModalPopup {
     id: popup
-    //% "Fleet"
-    title: qsTrId("fleet")
+    title: qsTr("Fleet")
 
     property var advancedStore
 
diff --git a/ui/app/AppLayouts/Profile/popups/MutedChatsModal.qml b/ui/app/AppLayouts/Profile/popups/MutedChatsModal.qml
index 54dfbf547c..ef4bf37b70 100644
--- a/ui/app/AppLayouts/Profile/popups/MutedChatsModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/MutedChatsModal.qml
@@ -17,8 +17,7 @@ import shared.popups 1.0
 // TODO: replace with StatusModal
 ModalPopup {
     id: root
-    //% "Muted chats"
-    title: qsTrId("muted-chats")
+    title: qsTr("Muted chats")
 
     property var model: []
     property string noContentText: ""
@@ -85,8 +84,7 @@ ModalPopup {
                 anchors.right: parent.right
                 anchors.rightMargin: Style.current.smallPadding
                 anchors.verticalCenter: parent.verticalCenter
-                //% "Unmute"
-                text: qsTrId("unmute")
+                text: qsTr("Unmute")
 
                 MouseArea {
                     anchors.fill: parent
diff --git a/ui/app/AppLayouts/Profile/popups/RenameAccontModal.qml b/ui/app/AppLayouts/Profile/popups/RenameAccontModal.qml
index dddd7f70e3..ad7a52b7a2 100644
--- a/ui/app/AppLayouts/Profile/popups/RenameAccontModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/RenameAccontModal.qml
@@ -23,7 +23,6 @@ StatusModal {
     property var currentAccount: walletStore.currentAccount
     property var emojiPopup
 
-    //% "'%1' would like to connect to"
     header.title: qsTr("Rename %1").arg(currentAccount.name)
 
     property int marginBetweenInputs: 30
@@ -49,9 +48,8 @@ StatusModal {
 
         StatusInput {
             id: accountNameInput
-            //% "Enter an account name..."
             input.isIconSelectable: true
-            input.placeholderText: qsTrId("enter-an-account-name...")
+            input.placeholderText: qsTr("Enter an account name...")
             input.text: currentAccount.name
             input.icon.emoji: currentAccount.emoji
             input.icon.color: currentAccount.color
@@ -63,8 +61,7 @@ StatusModal {
             }
             validators: [
                 StatusMinLengthValidator {
-                    //% "You need to enter an account name"
-                    errorMessage: qsTrId("you-need-to-enter-an-account-name")
+                    errorMessage: qsTr("You need to enter an account name")
                     minLength: 1
                 },
                 StatusRegularExpressionValidator {
@@ -80,7 +77,6 @@ StatusModal {
             anchors.top: selectedColor.bottom
             anchors.topMargin: 10
             anchors.horizontalCenter: parent.horizontalCenter
-            //% "color"
             titleText: qsTr("color").toUpperCase()
             selectedColor: currentAccount.color
             selectedColorIndex: {
@@ -106,7 +102,6 @@ StatusModal {
     rightButtons: [
         StatusButton {
             id: saveBtn
-            //% "Change Name"
             text: qsTr("Change Name")
 
             enabled: accountNameInput.text !== "" && accountNameInput.valid
diff --git a/ui/app/AppLayouts/Profile/popups/SearchEngineModal.qml b/ui/app/AppLayouts/Profile/popups/SearchEngineModal.qml
index 59c26baef0..84722bcdc8 100644
--- a/ui/app/AppLayouts/Profile/popups/SearchEngineModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/SearchEngineModal.qml
@@ -9,8 +9,7 @@ import shared.controls 1.0
 ModalPopup {
     id: popup
 
-    //% "Search engine"
-    title: qsTrId("search-engine")
+    title: qsTr("Search engine")
 
     onClosed: {
         destroy()
@@ -29,8 +28,7 @@ ModalPopup {
         }
 
         RadioButtonSelector {
-            //% "None"
-            title: qsTrId("none")
+            title: qsTr("None")
             buttonGroup: searchEnginGroup
             checked: localAccountSensitiveSettings.shouldShowBrowserSearchEngine === Constants.browserSearchEngineNone
             onCheckedChanged: {
diff --git a/ui/app/AppLayouts/Profile/popups/TokenSettingsModal.qml b/ui/app/AppLayouts/Profile/popups/TokenSettingsModal.qml
index 42477e7d61..30392a3151 100644
--- a/ui/app/AppLayouts/Profile/popups/TokenSettingsModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/TokenSettingsModal.qml
@@ -15,13 +15,11 @@ StatusModal {
     y: Math.round(((parent ? parent.height : 0) - height) / 2)
     height: 480
     property WalletStore walletStore
-    //% "Manage Assets"
-    header.title: qsTrId("manage-assets")
+    header.title: qsTr("Manage Assets")
     
     rightButtons: [
         StatusButton {
-            //% "Add custom token"
-            text: qsTrId("add-custom-token")
+            text: qsTr("Add custom token")
             onClicked: {
                 addShowTokenModal.openEditable();
             }
diff --git a/ui/app/AppLayouts/Profile/popups/backupseed/Acknowledgements.qml b/ui/app/AppLayouts/Profile/popups/backupseed/Acknowledgements.qml
index 019fb23b88..4c8685afac 100644
--- a/ui/app/AppLayouts/Profile/popups/backupseed/Acknowledgements.qml
+++ b/ui/app/AppLayouts/Profile/popups/backupseed/Acknowledgements.qml
@@ -67,12 +67,12 @@ Item {
         StatusCheckBox {
             id: havePen
             width: parent.width
-            text: qsTrId("I have a pen and paper")
+            text: qsTr("I have a pen and paper")
         }
         StatusCheckBox {
             id: writeDown
             width: parent.width
-            text: qsTrId("I am ready to write down my seed phrase")
+            text: qsTr("I am ready to write down my seed phrase")
         }
         StatusCheckBox {
             id: storeIt
diff --git a/ui/app/AppLayouts/Profile/views/AboutView.qml b/ui/app/AppLayouts/Profile/views/AboutView.qml
index 3ab90cd2e2..1e4f863aee 100644
--- a/ui/app/AppLayouts/Profile/views/AboutView.qml
+++ b/ui/app/AppLayouts/Profile/views/AboutView.qml
@@ -20,7 +20,7 @@ SettingsContentBase {
 
     titleRowComponentLoader.sourceComponent: StatusButton {
         size: StatusBaseButton.Size.Small
-        text: qsTrId("check-for-updates")
+        text: qsTr("Check for updates")
         onClicked: {
             root.store.checkForUpdates()
         }
@@ -171,7 +171,7 @@ SettingsContentBase {
                 Layout.fillWidth: true
                 leftPadding: Style.current.padding
                 rightPadding: Style.current.padding
-                text: qsTrId("Software License")
+                text: qsTr("Software License")
                 icon.width: 0
             }
         } // Column
diff --git a/ui/app/AppLayouts/Profile/views/AdvancedView.qml b/ui/app/AppLayouts/Profile/views/AdvancedView.qml
index ac8ecd1911..1bd8cc6da8 100644
--- a/ui/app/AppLayouts/Profile/views/AdvancedView.qml
+++ b/ui/app/AppLayouts/Profile/views/AdvancedView.qml
@@ -34,8 +34,7 @@ SettingsContentBase {
             StatusSettingsLineButton {
                 anchors.leftMargin: 0
                 anchors.rightMargin: 0
-                //% "Fleet"
-                text: qsTrId("fleet")
+                text: qsTr("Fleet")
                 currentValue: root.advancedStore.fleet
                 onClicked: fleetModal.open()
             }
@@ -44,8 +43,7 @@ SettingsContentBase {
             StatusSettingsLineButton {
                 anchors.leftMargin: 0
                 anchors.rightMargin: 0
-                //% "Minimize on close"
-                text: qsTrId("minimize-on-close")
+                text: qsTr("Minimize on close")
                 isSwitch: true
                 switchChecked: !localAccountSensitiveSettings.quitOnClose
                 onClicked: function (checked) {
@@ -59,7 +57,6 @@ SettingsContentBase {
                 anchors.right: parent.right
                 anchors.leftMargin: Style.current.padding
                 anchors.rightMargin: Style.current.padding
-                //% "Application Logs"
                 text: qsTr("Application Logs")
                 font.pixelSize: 15
                 font.underline: mouseArea.containsMouse
@@ -92,8 +89,7 @@ SettingsContentBase {
                 anchors.right: parent.right
                 anchors.leftMargin: Style.current.padding
                 anchors.rightMargin: Style.current.padding
-                //% "Experimental features"
-                text: qsTrId("experimental-features")
+                text: qsTr("Experimental features")
                 topPadding: Style.current.bigPadding
                 bottomPadding: Style.current.padding
             }
@@ -102,8 +98,7 @@ SettingsContentBase {
             StatusSettingsLineButton {
                 anchors.leftMargin: 0
                 anchors.rightMargin: 0
-                //% "Wallet"
-                text: qsTrId("wallet")
+                text: qsTr("Wallet")
                 isSwitch: true
                 switchChecked: localAccountSensitiveSettings.isWalletEnabled
                 onClicked: {
@@ -120,8 +115,7 @@ SettingsContentBase {
             StatusSettingsLineButton {
                 anchors.leftMargin: 0
                 anchors.rightMargin: 0
-                //% "Dapp Browser"
-                text: qsTrId("dapp-browser")
+                text: qsTr("Dapp Browser")
                 isSwitch: true
                 switchChecked: localAccountSensitiveSettings.isBrowserEnabled
                 onClicked: {
@@ -154,8 +148,7 @@ SettingsContentBase {
             StatusSettingsLineButton {
                 anchors.leftMargin: 0
                 anchors.rightMargin: 0
-                //% "Node Management"
-                text: qsTrId("node-management")
+                text: qsTr("Node Management")
                 isSwitch: true
                 switchChecked: localAccountSensitiveSettings.nodeManagementEnabled
                 onClicked: {
@@ -172,7 +165,6 @@ SettingsContentBase {
             StatusSettingsLineButton {
                 anchors.leftMargin: 0
                 anchors.rightMargin: 0
-                //% "Keycard"
                 text: qsTr("Keycard")
                 isSwitch: true
                 switchChecked: localAccountSettings.isKeycardEnabled
@@ -187,8 +179,7 @@ SettingsContentBase {
                 anchors.leftMargin: Style.current.padding
                 anchors.rightMargin: Style.current.padding
                 visible: !root.advancedStore.isWakuV2
-                //% "Bloom filter level"
-                text: qsTrId("bloom-filter-level")
+                text: qsTr("Bloom filter level")
                 topPadding: Style.current.bigPadding
                 bottomPadding: Style.current.padding
             }
@@ -207,10 +198,8 @@ SettingsContentBase {
                         property string mode: "normal"
 
                         id: confirmDialog
-                        //% "Warning!"
-                        header.title: qsTrId("close-app-title")
-                        //% "The account will be logged out. When you login again, the selected mode will be enabled"
-                        confirmationText: qsTrId("the-account-will-be-logged-out--when-you-login-again--the-selected-mode-will-be-enabled")
+                        header.title: qsTr("Warning!")
+                        confirmationText: qsTr("The account will be logged out. When you login again, the selected mode will be enabled")
                         onConfirmButtonClicked: {
                             root.advancedStore.setBloomLevel(mode)
                         }
@@ -233,8 +222,7 @@ SettingsContentBase {
                     id: btnBloomLight
                     buttonGroup: bloomGroup
                     checkedByDefault: root.advancedStore.bloomLevel == "light"
-                    //% "Light Node"
-                    btnText: qsTrId("light-node")
+                    btnText: qsTr("Light Node")
                     onToggled: {
                         if (root.advancedStore.bloomLevel != "light") {
                             Global.openPopup(bloomConfirmationDialogComponent, {mode: "light"})
@@ -248,8 +236,7 @@ SettingsContentBase {
                     id: btnBloomNormal
                     buttonGroup: bloomGroup
                     checkedByDefault: root.advancedStore.bloomLevel == "normal"
-                    //% "Normal"
-                    btnText: qsTrId("normal")
+                    btnText: qsTr("Normal")
                     onToggled: {
                         if (root.advancedStore.bloomLevel != "normal") {
                             Global.openPopup(bloomConfirmationDialogComponent, {mode: "normal"})
@@ -263,8 +250,7 @@ SettingsContentBase {
                     id: btnBloomFull
                     buttonGroup: bloomGroup
                     checkedByDefault: root.advancedStore.bloomLevel == "full"
-                    //% "Full Node"
-                    btnText: qsTrId("full-node")
+                    btnText: qsTr("Full Node")
                     onToggled: {
                         if (root.advancedStore.bloomLevel != "full") {
                             Global.openPopup(bloomConfirmationDialogComponent, {mode: "full"})
@@ -299,8 +285,7 @@ SettingsContentBase {
                         property bool mode: false
 
                         id: confirmDialog
-                        //% "The account will be logged out. When you login again, the selected mode will be enabled"
-                        confirmationText: qsTrId("the-account-will-be-logged-out--when-you-login-again--the-selected-mode-will-be-enabled")
+                        confirmationText: qsTr("The account will be logged out. When you login again, the selected mode will be enabled")
                         onConfirmButtonClicked: {
                             root.advancedStore.setWakuV2LightClientEnabled(mode)
                         }
@@ -323,8 +308,7 @@ SettingsContentBase {
                     id: btnWakuV2Light
                     buttonGroup: wakuV2Group
                     checkedByDefault: root.advancedStore.wakuV2LightClientEnabled
-                    //% "Light Node"
-                    btnText: qsTrId("light-node")
+                    btnText: qsTr("Light Node")
                     onToggled: {
                         if (!root.advancedStore.wakuV2LightClientEnabled) {
                             Global.openPopup(wakuV2ModeConfirmationDialogComponent, {mode: true})
@@ -338,8 +322,7 @@ SettingsContentBase {
                     id: btnWakuV2Full
                     buttonGroup: wakuV2Group
                     checkedByDefault: !root.advancedStore.wakuV2LightClientEnabled
-                    //% "Full Node"
-                    btnText: qsTrId("full-node")
+                    btnText: qsTr("Full Node")
                     onToggled: {
                         if (root.advancedStore.wakuV2LightClientEnabled) {
                             Global.openPopup(wakuV2ModeConfirmationDialogComponent, {mode: false})
@@ -516,10 +499,8 @@ SettingsContentBase {
             id: confirmationPopup
             property string experimentalFeature: ""
             showCancelButton: true
-            //% "This feature is experimental and is meant for testing purposes by core contributors and the community. It's not meant for real use and makes no claims of security or integrity of funds or data. Use at your own risk."
-            confirmationText: qsTrId("this-feature-is-experimental-and-is-meant-for-testing-purposes-by-core-contributors-and-the-community--it-s-not-meant-for-real-use-and-makes-no-claims-of-security-or-integrity-of-funds-or-data--use-at-your-own-risk-")
-            //% "I understand"
-            confirmButtonLabel: qsTrId("i-understand")
+            confirmationText: qsTr("This feature is experimental and is meant for testing purposes by core contributors and the community. It's not meant for real use and makes no claims of security or integrity of funds or data. Use at your own risk.")
+            confirmButtonLabel: qsTr("I understand")
             onConfirmButtonClicked: {
                 root.advancedStore.toggleExperimentalFeature(experimentalFeature)
                 experimentalFeature = ""
diff --git a/ui/app/AppLayouts/Profile/views/AppearanceView.qml b/ui/app/AppLayouts/Profile/views/AppearanceView.qml
index b87078ba2d..c10d55ffba 100644
--- a/ui/app/AppLayouts/Profile/views/AppearanceView.qml
+++ b/ui/app/AppLayouts/Profile/views/AppearanceView.qml
@@ -59,8 +59,7 @@ SettingsContentBase {
 
         StatusSectionHeadline {
             id: sectionHeadlinePreview
-            //% "Preview"
-            text: qsTrId("preview")
+            text: qsTr("Preview")
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
@@ -89,8 +88,7 @@ SettingsContentBase {
                 messageTimestamp:Date.now()
                 senderDisplayName: "@vitalik"
                 senderIcon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAb0lEQVR4Ae3UQQqAIBRF0Wj9ba9Bq6l5JBQqfn/ngDMH3YS3AAB/tO3H+XRG3b9bR/+gVoREI2RapVXpfd5+X5oXERKNkHS+rk3tOpWkeREh0QiZVu91ql2zNC8iJBoh0yqtSqt1slpCghICANDPBc0ESPh0bHkHAAAAAElFTkSuQmCC"
-                //% "Blockchains will drop search costs, causing a kind of decomposition that allows you to have markets of entities that are horizontally segregated and vertically segregated."
-                message: qsTrId("blockchains-will-drop-search-costs--causing-a-kind-of-decomposition-that-allows-you-to-have-markets-of-entities-that-are-horizontally-segregated-and-vertically-segregated-")
+                message: qsTr("Blockchains will drop search costs, causing a kind of decomposition that allows you to have markets of entities that are horizontally segregated and vertically segregated.")
                 messageContentType: Constants.messageContentType.messageType
                 placeholderMessage: true
             }
@@ -98,8 +96,7 @@ SettingsContentBase {
 
         StatusSectionHeadline {
             id: sectionHeadlineFontSize
-            //% "Size"
-            text: qsTrId("size")
+            text: qsTr("Size")
             anchors.top: preview.bottom
             anchors.topMargin: Style.current.padding
             anchors.left: parent.left
@@ -112,8 +109,7 @@ SettingsContentBase {
             anchors.topMargin: Style.current.padding
             anchors.left: parent.left
             font.pixelSize: 15
-            //% "Change font size"
-            text: qsTrId("change-font-size")
+            text: qsTr("Change font size")
             color: Theme.palette.directColor1
         }
 
@@ -184,8 +180,7 @@ SettingsContentBase {
 
         StatusSectionHeadline {
             id: sectionHeadlineAppearance
-            //% "Appearance"
-            text: qsTrId("appearance")
+            text: qsTr("Appearance")
             // anchors.top: chatModeSection.bottom
             anchors.top: zoomSlider.bottom
             anchors.topMargin: Style.current.padding*3
@@ -206,8 +201,7 @@ SettingsContentBase {
                 height: 184
                 image.source: Style.png("appearance-light")
                 image.height: 128
-                //% "Light"
-                control.text: qsTrId("Light")
+                control.text: qsTr("Light")
                 control.checked: localAppSettings.theme === Universal.Light
                 onRadioCheckedChanged: {
                     if (checked) {
@@ -222,8 +216,7 @@ SettingsContentBase {
                 height: 184
                 image.source: Style.png("appearance-dark")
                 image.height: 128
-                //% "Dark"
-                control.text: qsTrId("dark")
+                control.text: qsTr("Dark")
                 control.checked: localAppSettings.theme === Universal.Dark
                 onRadioCheckedChanged: {
                     if (checked) {
@@ -238,8 +231,7 @@ SettingsContentBase {
                 height: 184
                 image.source: Style.png("appearance-system")
                 image.height: 128
-                //% "System"
-                control.text: qsTrId("system")
+                control.text: qsTr("System")
                 control.checked: localAppSettings.theme === Universal.System
                 onRadioCheckedChanged: {
                     if (checked) {
diff --git a/ui/app/AppLayouts/Profile/views/BrowserView.qml b/ui/app/AppLayouts/Profile/views/BrowserView.qml
index ceea661d80..f6b6952f1e 100644
--- a/ui/app/AppLayouts/Profile/views/BrowserView.qml
+++ b/ui/app/AppLayouts/Profile/views/BrowserView.qml
@@ -49,16 +49,14 @@ SettingsContentBase {
             StatusSettingsLineButton {
                 anchors.leftMargin: 0
                 anchors.rightMargin: 0
-                //% "Search engine used in the address bar"
-                text: qsTrId("search-engine-used-in-the-address-bar")
+                text: qsTr("Search engine used in the address bar")
                 currentValue: {
                     switch (localAccountSensitiveSettings.shouldShowBrowserSearchEngine) {
                     case Constants.browserSearchEngineGoogle: return "Google"
                     case Constants.browserSearchEngineYahoo: return "Yahoo!"
                     case Constants.browserSearchEngineDuckDuckGo: return "DuckDuckGo"
                     case Constants.browserSearchEngineNone:
-                        //% "None"
-                    default: return qsTrId("none")
+                    default: return qsTr("None")
                     }
                 }
                 onClicked: searchEngineModal.createObject(root).open()
diff --git a/ui/app/AppLayouts/Profile/views/ContactsView.qml b/ui/app/AppLayouts/Profile/views/ContactsView.qml
index 6134e9a9bb..eebc70a397 100644
--- a/ui/app/AppLayouts/Profile/views/ContactsView.qml
+++ b/ui/app/AppLayouts/Profile/views/ContactsView.qml
@@ -143,8 +143,7 @@ SettingsContentBase {
                     NoFriendsRectangle {
                         anchors.centerIn: parent
                         visible: root.contactsStore.myContactsModel.count === 0
-                        //% "You don’t have any contacts yet"
-                        text: qsTrId("you-don-t-have-any-contacts-yet")
+                        text: qsTr("You don’t have any contacts yet")
                     }
                 }
             }
@@ -310,10 +309,8 @@ SettingsContentBase {
         // TODO: Make ConfirmationDialog a dynamic component on a future refactor
         ConfirmationDialog {
             id: removeContactConfirmationDialog
-            //% "Remove contact"
-            header.title: qsTrId("remove-contact")
-            //% "Are you sure you want to remove this contact?"
-            confirmationText: qsTrId("are-you-sure-you-want-to-remove-this-contact-")
+            header.title: qsTr("Remove contact")
+            confirmationText: qsTr("Are you sure you want to remove this contact?")
             onConfirmButtonClicked: {
                 if (Utils.getContactDetailsAsJson(removeContactConfirmationDialog.value).isContact) {
                     root.contactsStore.removeContact(removeContactConfirmationDialog.value);
diff --git a/ui/app/AppLayouts/Profile/views/DevicesView.qml b/ui/app/AppLayouts/Profile/views/DevicesView.qml
index 422b58b408..9aa1237e82 100644
--- a/ui/app/AppLayouts/Profile/views/DevicesView.qml
+++ b/ui/app/AppLayouts/Profile/views/DevicesView.qml
@@ -37,16 +37,14 @@ SettingsContentBase {
 
             StatusBaseText {
                 id: deviceNameLbl
-                //% "Please set a name for your device."
-                text: qsTrId("pairing-please-set-a-name")
+                text: qsTr("Please set a name for your device.")
                 font.pixelSize: 14
                 color: Theme.palette.directColor1
             }
 
             Input {
                 id: deviceNameTxt
-                //% "Specify a name"
-                placeholderText: qsTrId("specify-name")
+                placeholderText: qsTr("Specify a name")
                 anchors.top: deviceNameLbl.bottom
                 anchors.topMargin: Style.current.padding
             }
@@ -56,8 +54,7 @@ SettingsContentBase {
                 anchors.top: deviceNameTxt.bottom
                 anchors.topMargin: 10
                 anchors.right: deviceNameTxt.right
-                //% "Continue"
-                text: qsTrId("continue")
+                text: qsTr("Continue")
                 enabled: deviceNameTxt.text !== ""
                 onClicked : root.devicesStore.setName(deviceNameTxt.text.trim())
             }
@@ -98,8 +95,7 @@ SettingsContentBase {
 
                 StatusBaseText {
                     id: advertiseDeviceTitle
-                    //% "Advertise device"
-                    text: qsTrId("pair-this-device")
+                    text: qsTr("Advertise device")
                     font.pixelSize: 18
                     font.weight: Font.Bold
                     color: Theme.palette.primaryColor1
@@ -109,8 +105,7 @@ SettingsContentBase {
 
                 StatusBaseText {
                     id: advertiseDeviceDesk
-                    //% "Pair your devices to sync contacts and chats between them"
-                    text: qsTrId("pair-this-device-description")
+                    text: qsTr("Pair your devices to sync contacts and chats between them")
                     font.pixelSize: 14
                     anchors.top: advertiseDeviceTitle.bottom
                     anchors.topMargin: 6
@@ -129,8 +124,7 @@ SettingsContentBase {
             StatusBaseText {
                 anchors.top: advertiseDevice.bottom
                 anchors.topMargin: Style.current.padding
-                //% "Learn more"
-                text: qsTrId("learn-more")
+                text: qsTr("Learn more")
                 font.pixelSize: 16
                 color: Theme.palette.primaryColor1
                 anchors.left: parent.left
@@ -155,8 +149,7 @@ SettingsContentBase {
 
             StatusBaseText {
                 id: deviceListLbl
-                //% "Paired devices"
-                text: qsTrId("paired-devices")
+                text: qsTr("Paired devices")
                 font.pixelSize: 16
                 font.weight: Font.Bold
                 color: Theme.palette.directColor1
@@ -188,10 +181,8 @@ SettingsContentBase {
                         id: deviceItemLbl
                         text: {
                             let deviceId = model.installationId.split("-")[0].substr(0, 5)
-                            //% "No info"
-                            let labelText = `${model.name || qsTrId("pairing-no-info")} ` +
-                                //% "you"
-                                `(${model.isCurrentDevice ? qsTrId("you") + ", ": ""}${deviceId})`;
+                            let labelText = `${model.name || qsTr("No info")} ` +
+                                `(${model.isCurrentDevice ? qsTr("you") + ", ": ""}${deviceId})`;
                             return labelText;
                         }
                         elide: Text.ElideRight
@@ -222,10 +213,8 @@ SettingsContentBase {
                 anchors.horizontalCenter: listView.horizontalCenter
 
                 text: isSyncing ?
-                        //% "Syncing..."
-                        qsTrId("sync-in-progress") :
-                        //% "Sync all devices"
-                        qsTrId("sync-all-devices")
+                        qsTr("Syncing...") :
+                        qsTr("Sync all devices")
                 enabled: !isSyncing
                 onClicked : {
                     isSyncing = true;
diff --git a/ui/app/AppLayouts/Profile/views/EnsAddedView.qml b/ui/app/AppLayouts/Profile/views/EnsAddedView.qml
index d4ac18945b..f92618fe40 100644
--- a/ui/app/AppLayouts/Profile/views/EnsAddedView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsAddedView.qml
@@ -14,8 +14,7 @@ Item {
 
     StatusBaseText {
         id: sectionTitle
-        //% "ENS usernames"
-        text: qsTrId("ens-usernames")
+        text: qsTr("ENS usernames")
         anchors.left: parent.left
         anchors.leftMargin: 24
         anchors.top: parent.top
@@ -50,8 +49,7 @@ Item {
 
     StatusBaseText {
         id: title
-        //% "Username added"
-        text: qsTrId("ens-saved-title")
+        text: qsTr("Username added")
         anchors.top: circle.bottom
         anchors.topMargin: 24
         font.weight: Font.Bold
@@ -65,8 +63,7 @@ Item {
 
     StatusBaseText {
         id: subtitle
-        //% "%1 is now connected with your chat key and can be used in Status."
-        text: qsTrId("-1-is-now-connected-with-your-chat-key-and-can-be-used-in-status-").arg(ensUsername)
+        text: qsTr("%1 is now connected with your chat key and can be used in Status.").arg(ensUsername)
         anchors.top: title.bottom
         anchors.topMargin: 24
         font.pixelSize: 14
@@ -82,8 +79,7 @@ Item {
         anchors.top: subtitle.bottom
         anchors.topMargin: Style.current.padding
         anchors.horizontalCenter: parent.horizontalCenter
-        //% "Ok, got it"
-        text: qsTrId("ens-got-it")
+        text: qsTr("Ok, got it")
         onClicked: okBtnClicked()
     }
 }
diff --git a/ui/app/AppLayouts/Profile/views/EnsConnectedView.qml b/ui/app/AppLayouts/Profile/views/EnsConnectedView.qml
index b05f3f8ddb..9001c16f37 100644
--- a/ui/app/AppLayouts/Profile/views/EnsConnectedView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsConnectedView.qml
@@ -14,8 +14,7 @@ Item {
 
     StatusBaseText {
         id: sectionTitle
-        //% "ENS usernames"
-        text: qsTrId("ens-usernames")
+        text: qsTr("ENS usernames")
         anchors.left: parent.left
         anchors.leftMargin: 24
         anchors.top: parent.top
@@ -50,8 +49,7 @@ Item {
 
     StatusBaseText {
         id: title
-        //% "Username added"
-        text: qsTrId("ens-saved-title")
+        text: qsTr("Username added")
         anchors.top: circle.bottom
         anchors.topMargin: 24
         font.weight: Font.Bold
@@ -65,8 +63,7 @@ Item {
 
     StatusBaseText {
         id: subtitle
-        //% "%1 will be connected once the transaction is complete."
-        text: qsTrId("-1-will-be-connected-once-the-transaction-is-complete-").arg(ensUsername)
+        text: qsTr("%1 will be connected once the transaction is complete.").arg(ensUsername)
         anchors.top: title.bottom
         anchors.topMargin: 24
         font.pixelSize: 14
@@ -79,8 +76,7 @@ Item {
 
     StatusBaseText {
         id: progress
-        //% "You can follow the progress in the Transaction History section of your wallet."
-        text: qsTrId("ens-username-you-can-follow-progress")
+        text: qsTr("You can follow the progress in the Transaction History section of your wallet.")
         anchors.top: subtitle.bottom
         anchors.topMargin: 24
         font.pixelSize: 12
@@ -97,8 +93,7 @@ Item {
         anchors.top: progress.bottom
         anchors.topMargin: Style.current.padding
         anchors.horizontalCenter: parent.horizontalCenter
-        //% "Ok, got it"
-        text: qsTrId("ens-got-it")
+        text: qsTr("Ok, got it")
         onClicked: okBtnClicked()
     }
 }
diff --git a/ui/app/AppLayouts/Profile/views/EnsDetailsView.qml b/ui/app/AppLayouts/Profile/views/EnsDetailsView.qml
index a55c76da47..a66cc63d68 100644
--- a/ui/app/AppLayouts/Profile/views/EnsDetailsView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsDetailsView.qml
@@ -139,7 +139,7 @@ Item {
         anchors.topMargin: 24
         anchors.left: parent.left
         anchors.leftMargin: 24
-        text: qsTrId("Release username")
+        text: qsTr("Release username")
         onClicked: {
             Global.openPopup(transactionDialogComponent)
         }
@@ -160,8 +160,7 @@ Item {
         anchors.bottom: parent.bottom
         anchors.bottomMargin: Style.current.padding
         anchors.horizontalCenter: parent.horizontalCenter
-        //% "Back"
-        text: qsTrId("back")
+        text: qsTr("Back")
         onClicked: backBtnClicked()
     }
 }
diff --git a/ui/app/AppLayouts/Profile/views/EnsListView.qml b/ui/app/AppLayouts/Profile/views/EnsListView.qml
index 000f6ec95b..8c2981f9a6 100644
--- a/ui/app/AppLayouts/Profile/views/EnsListView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsListView.qml
@@ -29,8 +29,7 @@ Item {
     property bool isEmoji: false
     property bool isCurrentUser: false
     property int contentType: 1
-    //% "Hey"
-    property string message: qsTrId("ens-test-message")
+    property string message: qsTr("Hey")
     property string authorCurrentMsg: "0"
     property string authorPrevMsg: "1"
     property bool isText: true
@@ -53,8 +52,7 @@ Item {
             Item {
                 Text {
                     id: usernameTxt
-                    //% "(pending)"
-                    text: username.substr(0, username.indexOf(".")) + " " + (isPending ? qsTrId("-pending-") : "")
+                    text: username.substr(0, username.indexOf(".")) + " " + (isPending ? qsTr("(pending)") : "")
                     color: Style.current.textColor
                 }
 
@@ -73,8 +71,7 @@ Item {
             Item {
                 Text {
                     id: usernameTxt
-                    //% "(pending)"
-                    text: username  + " " + (isPending ? qsTrId("-pending-") : "")
+                    text: username  + " " + (isPending ? qsTr("(pending)") : "")
                     font.pixelSize: 16
                     color: Theme.palette.directColor1
                     anchors.top: parent.top
@@ -134,8 +131,7 @@ Item {
 
         StatusBaseText {
             id: sectionTitle
-            //% "ENS usernames"
-            text: qsTrId("ens-usernames")
+            text: qsTr("ENS usernames")
             anchors.left: parent.left
             anchors.leftMargin: 24
             anchors.top: parent.top
@@ -163,8 +159,7 @@ Item {
 
             StatusBaseText {
                 id: usernameText
-                //% "Add username"
-                text: qsTrId("ens-add-username")
+                text: qsTr("Add username")
                 color: Theme.palette.primaryColor1
                 anchors.left: addButton.right
                 anchors.leftMargin: Style.current.padding
@@ -182,8 +177,7 @@ Item {
 
         StatusBaseText {
             id: usernamesLabel
-            //% "Your usernames"
-            text: qsTrId("ens-your-usernames")
+            text: qsTr("Your usernames")
             anchors.left: parent.left
             anchors.top: addUsername.bottom
             anchors.topMargin: 24
@@ -228,8 +222,7 @@ Item {
             id: chatSettingsLabel
             visible: root.ensUsernamesStore.ensUsernamesModel.count > 0 &&
                      root.ensUsernamesStore.numOfPendingEnsUsernames() != root.ensUsernamesStore.ensUsernamesModel.count
-            //% "Chat settings"
-            text: qsTrId("chat-settings")
+            text: qsTr("Chat settings")
             anchors.left: parent.left
             anchors.top: ensList.bottom
             anchors.topMargin: 24
@@ -249,8 +242,7 @@ Item {
             StatusBaseText {
                 id: usernameLabel
                 visible: chatSettingsLabel.visible
-                //% "Primary Username"
-                text: qsTrId("primary-username")
+                text: qsTr("Primary Username")
                 font.pixelSize: 14
                 font.weight: Font.Bold
                 color: Theme.palette.directColor1
@@ -259,8 +251,7 @@ Item {
             StatusBaseText {
                 id: usernameLabel2
                 visible: chatSettingsLabel.visible
-                //% "None selected"
-                text: root.ensUsernamesStore.preferredUsername || qsTrId("none-selected")
+                text: root.ensUsernamesStore.preferredUsername || qsTr("None selected")
                 anchors.left: usernameLabel.right
                 anchors.leftMargin: Style.current.padding
                 font.pixelSize: 14
@@ -346,8 +337,7 @@ Item {
                 anchors.top: chatTime.bottom
                 anchors.left: chatImage.left
                 anchors.topMargin: Style.current.padding
-                //% "You’re displaying your ENS username in chats"
-                text: qsTrId("you-re-displaying-your-ens-username-in-chats")
+                text: qsTr("You’re displaying your ENS username in chats")
                 font.pixelSize: 14
                 color: Theme.palette.baseColor1
             }
diff --git a/ui/app/AppLayouts/Profile/views/EnsRegisteredView.qml b/ui/app/AppLayouts/Profile/views/EnsRegisteredView.qml
index d05f7e3397..745a3f8e43 100644
--- a/ui/app/AppLayouts/Profile/views/EnsRegisteredView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsRegisteredView.qml
@@ -14,8 +14,7 @@ Item {
 
     StatusBaseText {
         id: sectionTitle
-        //% "ENS usernames"
-        text: qsTrId("ens-usernames")
+        text: qsTr("ENS usernames")
         anchors.left: parent.left
         anchors.leftMargin: Style.current.bigPadding
         anchors.top: parent.top
@@ -50,8 +49,7 @@ Item {
 
     StatusBaseText {
         id: title
-        //% "Username added"
-        text: qsTrId("ens-saved-title")
+        text: qsTr("Username added")
         anchors.top: circle.bottom
         anchors.topMargin: Style.current.bigPadding
         font.weight: Font.Bold
@@ -65,8 +63,7 @@ Item {
 
     StatusBaseText {
         id: subtitle
-        //% "Nice! You own %1.stateofus.eth once the transaction is complete."
-        text: qsTrId("nice--you-own--1-stateofus-eth-once-the-transaction-is-complete-").arg(ensUsername)
+        text: qsTr("Nice! You own %1.stateofus.eth once the transaction is complete.").arg(ensUsername)
         anchors.top: title.bottom
         anchors.topMargin: 24
         font.pixelSize: 14
@@ -79,8 +76,7 @@ Item {
 
     StatusBaseText {
         id: progress
-        //% "You can follow the progress in the Transaction History section of your wallet."
-        text: qsTrId("ens-username-you-can-follow-progress")
+        text: qsTr("You can follow the progress in the Transaction History section of your wallet.")
         anchors.top: subtitle.bottom
         anchors.topMargin: 24
         font.pixelSize: 12
@@ -97,8 +93,7 @@ Item {
         anchors.top: progress.bottom
         anchors.topMargin: Style.current.padding
         anchors.horizontalCenter: parent.horizontalCenter
-        //% "Ok, got it"
-        text: qsTrId("ens-got-it")
+        text: qsTr("Ok, got it")
         onClicked: okBtnClicked()
     }
 }
diff --git a/ui/app/AppLayouts/Profile/views/EnsReleasedView.qml b/ui/app/AppLayouts/Profile/views/EnsReleasedView.qml
index 43cc154d5b..91d40e4cd5 100644
--- a/ui/app/AppLayouts/Profile/views/EnsReleasedView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsReleasedView.qml
@@ -14,8 +14,7 @@ Item {
 
     StatusBaseText {
         id: sectionTitle
-        //% "ENS usernames"
-        text: qsTrId("ens-usernames")
+        text: qsTr("ENS usernames")
         anchors.left: parent.left
         anchors.leftMargin: Style.current.bigPadding
         anchors.top: parent.top
@@ -77,8 +76,7 @@ Item {
 
     StatusBaseText {
         id: progress
-        //% "You can follow the progress in the Transaction History section of your wallet."
-        text: qsTrId("ens-username-you-can-follow-progress")
+        text: qsTr("You can follow the progress in the Transaction History section of your wallet.")
         anchors.top: subtitle.bottom
         anchors.topMargin: 24
         font.pixelSize: 12
@@ -95,8 +93,7 @@ Item {
         anchors.top: progress.bottom
         anchors.topMargin: Style.current.padding
         anchors.horizontalCenter: parent.horizontalCenter
-        //% "Ok, got it"
-        text: qsTrId("ens-got-it")
+        text: qsTr("Ok, got it")
         onClicked: okBtnClicked()
     }
 }
diff --git a/ui/app/AppLayouts/Profile/views/EnsSearchView.qml b/ui/app/AppLayouts/Profile/views/EnsSearchView.qml
index 1752527ef9..08a8b840fb 100644
--- a/ui/app/AppLayouts/Profile/views/EnsSearchView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsSearchView.qml
@@ -38,14 +38,11 @@ Item {
         valid = false;
         ensStatus = "";
         if (ensUsername.length < 4) {
-            //% "At least 4 characters. Latin letters, numbers, and lowercase only."
-            validationMessage = qsTrId("ens-username-hints");
+            validationMessage = qsTr("At least 4 characters. Latin letters, numbers, and lowercase only.");
         } else if(isStatus && !ensUsername.match(/^[a-z0-9]+$/)){
-            //% "Letters and numbers only."
-            validationMessage = qsTrId("ens-username-invalid");
+            validationMessage = qsTr("Letters and numbers only.");
         } else if(!isStatus && !ensUsername.endsWith(".eth")){
-            //% "Type the entire username including the custom domain like username.domain.eth"
-            validationMessage = qsTrId("ens-custom-username-hints")
+            validationMessage = qsTr("Type the entire username including the custom domain like username.domain.eth")
         }
         return validationMessage === "";
     }
@@ -229,8 +226,7 @@ Item {
 
                 StatusBaseText {
                     text: !isStatus ?
-                        //% "Custom domain"
-                        qsTrId("ens-custom-domain")
+                        qsTr("Custom domain")
                         :
                         ".stateofus.eth"
                     font.weight: Font.Bold
@@ -241,11 +237,9 @@ Item {
 
                 StatusBaseText {
                     text: !isStatus ?
-                        //% "I want a stateofus.eth domain"
-                        qsTrId("ens-want-domain")
+                        qsTr("I want a stateofus.eth domain")
                         :
-                        //% "I own a name on another domain"
-                        qsTrId("ens-want-custom-domain")
+                        qsTr("I own a name on another domain")
                     font.pixelSize: 12
                     color: Theme.palette.primaryColor1
                     anchors.right: parent.right
diff --git a/ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml b/ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml
index 822f21e062..d4bba9c2a7 100644
--- a/ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml
@@ -25,8 +25,7 @@ Item {
 
     StatusBaseText {
         id: sectionTitle
-        //% "ENS usernames"
-        text: qsTrId("ens-usernames")
+        text: qsTr("ENS usernames")
         anchors.left: parent.left
         anchors.leftMargin: 24
         anchors.top: parent.top
@@ -81,8 +80,7 @@ Item {
     // TODO: Replace with StatusModal
     ModalPopup {
         id: popup
-        //% "Terms of name registration"
-        title: qsTrId("ens-terms-header")
+        title: qsTr("Terms of name registration")
 
         ScrollView {
             ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
@@ -98,8 +96,7 @@ Item {
 
 
                 StatusBaseText {
-                    //% "Funds are deposited for 1 year. Your SNT will be locked, but not spent."
-                    text: qsTrId("ens-terms-point-1")
+                    text: qsTr("Funds are deposited for 1 year. Your SNT will be locked, but not spent.")
                     wrapMode: Text.WordWrap
                     anchors.left: parent.left
                     anchors.right: parent.right
@@ -107,8 +104,7 @@ Item {
                 }
 
                 StatusBaseText {
-                    //% "After 1 year, you can release the name and get your deposit back, or take no action to keep the name."
-                    text: qsTrId("ens-terms-point-2")
+                    text: qsTr("After 1 year, you can release the name and get your deposit back, or take no action to keep the name.")
                     wrapMode: Text.WordWrap
                     anchors.left: parent.left
                     anchors.right: parent.right
@@ -116,8 +112,7 @@ Item {
                 }
 
                 StatusBaseText {
-                    //% "If terms of the contract change — e.g. Status makes contract upgrades — user has the right to release the username regardless of time held."
-                    text: qsTrId("ens-terms-point-3")
+                    text: qsTr("If terms of the contract change — e.g. Status makes contract upgrades — user has the right to release the username regardless of time held.")
                     wrapMode: Text.WordWrap
                     anchors.left: parent.left
                     anchors.right: parent.right
@@ -125,8 +120,7 @@ Item {
                 }
 
                 StatusBaseText {
-                    //% "The contract controller cannot access your deposited funds. They can only be moved back to the address that sent them."
-                    text: qsTrId("ens-terms-point-4")
+                    text: qsTr("The contract controller cannot access your deposited funds. They can only be moved back to the address that sent them.")
                     wrapMode: Text.WordWrap
                     anchors.left: parent.left
                     anchors.right: parent.right
@@ -134,8 +128,7 @@ Item {
                 }
 
                 StatusBaseText {
-                    //% "Your address(es) will be publicly associated with your ENS name."
-                    text: qsTrId("ens-terms-point-5")
+                    text: qsTr("Your address(es) will be publicly associated with your ENS name.")
                     wrapMode: Text.WordWrap
                     anchors.left: parent.left
                     anchors.right: parent.right
@@ -143,8 +136,7 @@ Item {
                 }
 
                 StatusBaseText {
-                    //% "Usernames are created as subdomain nodes of stateofus.eth and are subject to the ENS smart contract terms."
-                    text: qsTrId("ens-terms-point-6")
+                    text: qsTr("Usernames are created as subdomain nodes of stateofus.eth and are subject to the ENS smart contract terms.")
                     wrapMode: Text.WordWrap
                     anchors.left: parent.left
                     anchors.right: parent.right
@@ -152,8 +144,7 @@ Item {
                 }
 
                 StatusBaseText {
-                    //% "You authorize the contract to transfer SNT on your behalf. This can only occur when you approve a transaction to authorize the transfer."
-                    text: qsTrId("ens-terms-point-7")
+                    text: qsTr("You authorize the contract to transfer SNT on your behalf. This can only occur when you approve a transaction to authorize the transfer.")
                     wrapMode: Text.WordWrap
                     anchors.left: parent.left
                     anchors.right: parent.right
@@ -161,8 +152,7 @@ Item {
                 }
 
                 StatusBaseText {
-                    //% "These terms are guaranteed by the smart contract logic at addresses:"
-                    text: qsTrId("ens-terms-point-8")
+                    text: qsTr("These terms are guaranteed by the smart contract logic at addresses:")
                     wrapMode: Text.WordWrap
                     anchors.left: parent.left
                     anchors.right: parent.right
@@ -171,8 +161,7 @@ Item {
                 }
 
                 StatusBaseText {
-                    //% "%1 (Status UsernameRegistrar)."
-                    text: qsTrId("-1--status-usernameregistrar--").arg(root.ensUsernamesStore.getEnsRegisteredAddress())
+                    text: qsTr("%1 (Status UsernameRegistrar).").arg(root.ensUsernamesStore.getEnsRegisteredAddress())
                     wrapMode: Text.WordWrap
                     anchors.left: parent.left
                     anchors.right: parent.right
@@ -181,8 +170,7 @@ Item {
                 }
 
                 StatusBaseText {
-                    //% "<a href='%1%2'>Look up on Etherscan</a>"
-                    text: qsTrId("-a-href---1-2--look-up-on-etherscan--a-")
+                    text: qsTr("<a href='%1%2'>Look up on Etherscan</a>")
                     .arg(root.ensUsernamesStore.getEtherscanLink())
                     .arg(root.ensUsernamesStore.getEnsRegisteredAddress())
                     anchors.left: parent.left
@@ -197,8 +185,7 @@ Item {
                 }
 
                 StatusBaseText {
-                    //% "%1 (ENS Registry)."
-                    text: qsTrId("-1--ens-registry--").arg(root.ensUsernamesStore.getEnsRegistry())
+                    text: qsTr("%1 (ENS Registry).").arg(root.ensUsernamesStore.getEnsRegistry())
                     wrapMode: Text.WordWrap
                     anchors.left: parent.left
                     anchors.right: parent.right
@@ -207,8 +194,7 @@ Item {
                 }
 
                 StatusBaseText {
-                    //% "<a href='%1%2'>Look up on Etherscan</a>"
-                    text: qsTrId("-a-href---1-2--look-up-on-etherscan--a-")
+                    text: qsTr("<a href='%1%2'>Look up on Etherscan</a>")
                     .arg(root.ensUsernamesStore.getEtherscanLink())
                     .arg(root.ensUsernamesStore.getEnsRegistry())
                     anchors.left: parent.left
@@ -279,8 +265,7 @@ Item {
 
             StatusDescriptionListItem {
                 id: walletAddressLbl
-                //% "Wallet address"
-                title: qsTrId("wallet-address")
+                title: qsTr("Wallet address")
                 subTitle: root.ensUsernamesStore.getWalletDefaultAddress()
                 tooltip.text: qsTr("Copied to clipboard!")
                 icon.name: "copy"
@@ -294,8 +279,7 @@ Item {
 
             StatusDescriptionListItem {
                 id: keyLbl
-                //% "Key"
-                title: qsTrId("key")
+                title: qsTr("Key")
                 subTitle: {
                     let pubKey = root.ensUsernamesStore.pubkey;
                     return pubKey.substring(0, 20) + "..." + pubKey.substring(pubKey.length - 20);
@@ -319,8 +303,7 @@ Item {
             }
 
             StatusBaseText {
-                //% "Agree to <a href=\"#\">Terms of name registration.</a> I understand that my wallet address will be publicly connected to my username."
-                text: qsTrId("agree-to--a-href-------terms-of-name-registration---a--i-understand-that-my-wallet-address-will-be-publicly-connected-to-my-username-")
+                text: qsTr("Agree to <a href=\"#\">Terms of name registration.</a> I understand that my wallet address will be publicly connected to my username.")
                 anchors.left: termsAndConditionsCheckbox.right
                 anchors.right: parent.right
                 wrapMode: Text.WordWrap
@@ -341,8 +324,7 @@ Item {
         anchors.bottomMargin: Style.current.padding
         anchors.left: parent.left
         anchors.leftMargin: Style.current.padding
-        //% "Back"
-        text: qsTrId("back")
+        text: qsTr("Back")
         onClicked: backBtnClicked()
     }
 
@@ -362,8 +344,7 @@ Item {
 
         StatusBaseText {
             id: ensPriceLbl
-            //% "10 SNT"
-            text: qsTrId("ens-10-SNT")
+            text: qsTr("10 SNT")
             anchors.left: image1.right
             anchors.leftMargin: 5
             anchors.top: image1.top
@@ -372,8 +353,7 @@ Item {
         }
 
         StatusBaseText {
-            //% "Deposit"
-            text: qsTrId("ens-deposit")
+            text: qsTr("Deposit")
             anchors.left: image1.right
             anchors.leftMargin: 5
             anchors.topMargin: 5
@@ -390,10 +370,8 @@ Item {
         anchors.right: parent.right
         anchors.rightMargin: Style.current.padding
         text: parseFloat(root.ensUsernamesStore.getSntBalance()) < 10 ?
-          //% "Not enough SNT"
-          qsTrId("not-enough-snt") :
-          //% "Register"
-          qsTrId("ens-register")
+          qsTr("Not enough SNT") :
+          qsTr("Register")
         enabled: parseFloat(root.ensUsernamesStore.getSntBalance()) >= 10 && termsAndConditionsCheckbox.checked
         onClicked: transactionDialog.open()
     }
diff --git a/ui/app/AppLayouts/Profile/views/EnsView.qml b/ui/app/AppLayouts/Profile/views/EnsView.qml
index 674a0ed1d0..17530ac382 100644
--- a/ui/app/AppLayouts/Profile/views/EnsView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsView.qml
@@ -336,19 +336,15 @@ Item {
             switch(trxType){
             case "RegisterENS":
                 title = !success ?
-                            //% "ENS Registration failed"
-                            qsTrId("ens-registration-failed")
+                            qsTr("ENS Registration failed")
                           :
-                            //% "ENS Registration completed"
-                            qsTrId("ens-registration-completed");
+                            qsTr("ENS Registration completed");
                 break;
             case "SetPubKey":
                 title = !success ?
-                            //% "Updating ENS pubkey failed"
-                            qsTrId("updating-ens-pubkey-failed")
+                            qsTr("Updating ENS pubkey failed")
                           :
-                            //% "Updating ENS pubkey completed"
-                            qsTrId("updating-ens-pubkey-completed");
+                            qsTr("Updating ENS pubkey completed");
                 break;
             default:
                 console.error("unknown transaction type: ", trxType);
diff --git a/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml b/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml
index 70c2af5ea0..0ea72eaeaf 100644
--- a/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml
@@ -43,8 +43,7 @@ Item {
 
             StatusBaseText {
                 id: title
-                //% "Get a universal username"
-                text: qsTrId("ens-get-name")
+                text: qsTr("Get a universal username")
                 anchors.top: image.bottom
                 anchors.topMargin: 24
                 font.weight: Font.Bold
@@ -58,8 +57,7 @@ Item {
 
             StatusBaseText {
                 id: subtitle
-                //% "ENS names transform those crazy-long addresses into unique usernames."
-                text: qsTrId("ens-welcome-hints")
+                text: qsTr("ENS names transform those crazy-long addresses into unique usernames.")
                 anchors.top: title.bottom
                 anchors.topMargin: 24
                 font.pixelSize: 14
@@ -84,8 +82,7 @@ Item {
 
             StatusBaseText {
                 id: element1Title
-                //% "Customize your chat name"
-                text: qsTrId("ens-welcome-point-customize-title")
+                text: qsTr("Customize your chat name")
                 anchors.left: element1Number.right
                 anchors.leftMargin: 24
                 anchors.top: subtitle.bottom
@@ -99,8 +96,7 @@ Item {
 
             StatusBaseText {
                 id: element1Subtitle
-                //% "An ENS name can replace your random 3-word name in chat. Be @yourname instead of %1."
-                text: qsTrId("an-ens-name-can-replace-your-random-3-word-name-in-chat--be--yourname-instead-of--1-").arg(root.username)
+                text: qsTr("An ENS name can replace your random 3-word name in chat. Be @yourname instead of %1.").arg(root.username)
                 anchors.left: element1Number.right
                 anchors.leftMargin: 24
                 anchors.top: element1Title.bottom
@@ -125,8 +121,7 @@ Item {
 
             StatusBaseText {
                 id: element2Title
-                //% "Simplify your ETH address"
-                text: qsTrId("ens-welcome-point-simplify-title")
+                text: qsTr("Simplify your ETH address")
                 anchors.left: element2Number.right
                 anchors.leftMargin: 24
                 anchors.top: element1Subtitle.bottom
@@ -140,8 +135,7 @@ Item {
 
             StatusBaseText {
                 id: element2Subtitle
-                //% "You can receive funds to your easy-to-share ENS name rather than your hexadecimal hash (0x...)."
-                text: qsTrId("ens-welcome-point-simplify")
+                text: qsTr("You can receive funds to your easy-to-share ENS name rather than your hexadecimal hash (0x...).")
                 anchors.left: element2Number.right
                 anchors.leftMargin: 24
                 anchors.top: element2Title.bottom
@@ -166,8 +160,7 @@ Item {
 
             StatusBaseText {
                 id: element3Title
-                //% "Receive transactions in chat"
-                text: qsTrId("ens-welcome-point-receive-title")
+                text: qsTr("Receive transactions in chat")
                 anchors.left: element3Number.right
                 anchors.leftMargin: 24
                 anchors.top: element2Subtitle.bottom
@@ -181,8 +174,7 @@ Item {
 
             StatusBaseText {
                 id: element3Subtitle
-                //% "Others can send you funds via chat in one simple step."
-                text: qsTrId("ens-welcome-point-receive")
+                text: qsTr("Others can send you funds via chat in one simple step.")
                 anchors.left: element3Number.right
                 anchors.leftMargin: 24
                 anchors.top: element3Title.bottom
@@ -207,8 +199,7 @@ Item {
 
             StatusBaseText {
                 id: element4Title
-                //% "10 SNT to register"
-                text: qsTrId("ens-welcome-point-register-title")
+                text: qsTr("10 SNT to register")
                 anchors.left: element4Number.right
                 anchors.leftMargin: 24
                 anchors.top: element3Subtitle.bottom
@@ -222,8 +213,7 @@ Item {
 
             StatusBaseText {
                 id: element4Subtitle
-                //% "Register once to keep the name forever. After 1 year you can release the name and get your SNT back."
-                text: qsTrId("ens-welcome-point-register")
+                text: qsTr("Register once to keep the name forever. After 1 year you can release the name and get your SNT back.")
                 anchors.left: element4Number.right
                 anchors.leftMargin: 24
                 anchors.top: element4Title.bottom
@@ -249,8 +239,7 @@ Item {
 
             StatusBaseText {
                 id: element5Title
-                //% "Already own a username?"
-                text: qsTrId("ens-welcome-point-verify-title")
+                text: qsTr("Already own a username?")
                 anchors.left: element5Number.right
                 anchors.leftMargin: 24
                 anchors.top: element4Subtitle.bottom
@@ -264,8 +253,7 @@ Item {
 
             StatusBaseText {
                 id: element5Subtitle
-                //% "You can verify and add any usernames you own in the next steps."
-                text: qsTrId("ens-welcome-point-verify")
+                text: qsTr("You can verify and add any usernames you own in the next steps.")
                 anchors.left: element5Number.right
                 anchors.leftMargin: 24
                 anchors.top: element5Title.bottom
@@ -278,8 +266,7 @@ Item {
 
             StatusBaseText {
                 id: poweredBy
-                //% "Powered by Ethereum Name Services"
-                text: qsTrId("ens-powered-by")
+                text: qsTr("Powered by Ethereum Name Services")
                 anchors.left: element5Number.right
                 anchors.leftMargin: 24
                 anchors.top: element5Subtitle.bottom
@@ -297,11 +284,9 @@ Item {
         anchors.bottom: parent.bottom
         anchors.bottomMargin: Style.current.padding
         anchors.horizontalCenter: parent.horizontalCenter
-        //% "Start"
         text: enabled ?
-          qsTrId("start") :
-          //% "Only available on Mainnet"
-          qsTrId("ens-network-restriction")
+          qsTr("Start") :
+          qsTr("Only available on Mainnet")
         onClicked: startBtnClicked()
     }
 }
diff --git a/ui/app/AppLayouts/Profile/views/MessagingView.qml b/ui/app/AppLayouts/Profile/views/MessagingView.qml
index 07bfd5afbd..165661afcf 100644
--- a/ui/app/AppLayouts/Profile/views/MessagingView.qml
+++ b/ui/app/AppLayouts/Profile/views/MessagingView.qml
@@ -49,8 +49,7 @@ SettingsContentBase {
             Layout.fillWidth: true
             implicitHeight: 64
 
-            //% "Allow new contact requests"
-            title: qsTrId("allow-new-contact-requests")
+            title: qsTr("Allow new contact requests")
 
             components: [
                 StatusSwitch {
diff --git a/ui/app/AppLayouts/Profile/views/browser/DefaultDAppExplorerView.qml b/ui/app/AppLayouts/Profile/views/browser/DefaultDAppExplorerView.qml
index da37e6393b..39d3103ecc 100644
--- a/ui/app/AppLayouts/Profile/views/browser/DefaultDAppExplorerView.qml
+++ b/ui/app/AppLayouts/Profile/views/browser/DefaultDAppExplorerView.qml
@@ -34,7 +34,7 @@ ColumnLayout {
         Layout.alignment: Qt.AlignTop
         Layout.topMargin: 10
         checked: localAccountSensitiveSettings.useBrowserEthereumExplorer === Constants.browserEthereumExplorerNone
-        text: qsTrId("none")
+        text: qsTr("none")
         onCheckedChanged: {
             if (checked) {
                 localAccountSensitiveSettings.useBrowserEthereumExplorer = Constants.browserEthereumExplorerNone
diff --git a/ui/app/AppLayouts/Profile/views/browser/HomePageView.qml b/ui/app/AppLayouts/Profile/views/browser/HomePageView.qml
index 22c68f29be..d1280559e4 100644
--- a/ui/app/AppLayouts/Profile/views/browser/HomePageView.qml
+++ b/ui/app/AppLayouts/Profile/views/browser/HomePageView.qml
@@ -15,7 +15,7 @@ ColumnLayout {
     spacing: 0
 
     StatusBaseText {
-        text: qsTrId("homepage")
+        text: qsTr("homepage")
         font.pixelSize: 15
         color: Theme.palette.directColor1
     }
diff --git a/ui/app/AppLayouts/Wallet/controls/CollectiblesHeader.qml b/ui/app/AppLayouts/Wallet/controls/CollectiblesHeader.qml
index 08849bb1eb..6325022619 100644
--- a/ui/app/AppLayouts/Wallet/controls/CollectiblesHeader.qml
+++ b/ui/app/AppLayouts/Wallet/controls/CollectiblesHeader.qml
@@ -42,8 +42,7 @@ Rectangle {
 
     StyledText {
         visible: collectiblesQty >= Constants.maxTokens
-        //% "Maximum number of collectibles to display reached"
-        text: qsTrId("maximum-number-of-collectibles-to-display-reached")
+        text: qsTr("Maximum number of collectibles to display reached")
         font.pixelSize: 17
         color: Style.current.secondaryText
         anchors.left: collectibleName.right
diff --git a/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml b/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml
index 03a7e7701f..ea14c168f5 100644
--- a/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml
+++ b/ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml
@@ -24,7 +24,6 @@ Item {
         border.width: 1
         border.color: Theme.palette.baseColor2
         color: Theme.palette.statusListItem.backgroundColor
-        //% "All networks"
         title: qsTr("All networks")
         components:[
             StatusIcon {
diff --git a/ui/app/AppLayouts/Wallet/panels/CollectiblesContent.qml b/ui/app/AppLayouts/Wallet/panels/CollectiblesContent.qml
index dad80d6423..df699f445f 100644
--- a/ui/app/AppLayouts/Wallet/panels/CollectiblesContent.qml
+++ b/ui/app/AppLayouts/Wallet/panels/CollectiblesContent.qml
@@ -48,16 +48,14 @@ ScrollView {
 
                 StyledText {
                     id: somethingWentWrongText
-                    //% "Something went wrong"
-                    text: qsTrId("something-went-wrong")
+                    text: qsTr("Something went wrong")
                     anchors.horizontalCenter: parent.horizontalCenter
                     color: Style.current.secondaryText
                     font.pixelSize: 13
                 }
 
                 StatusButton {
-                    //% "Reload"
-                    text: qsTrId("reload")
+                    text: qsTr("Reload")
                     anchors.horizontalCenter: parent.horizontalCenter
                     anchors.top: somethingWentWrongText.bottom
                     anchors.topMargin: Style.current.halfPadding
diff --git a/ui/app/AppLayouts/Wallet/panels/CollectiblesModalContent.qml b/ui/app/AppLayouts/Wallet/panels/CollectiblesModalContent.qml
index 5837489bde..69daa3710f 100644
--- a/ui/app/AppLayouts/Wallet/panels/CollectiblesModalContent.qml
+++ b/ui/app/AppLayouts/Wallet/panels/CollectiblesModalContent.qml
@@ -26,8 +26,7 @@ Item {
 
     TextWithLabel {
         id: idText
-        //% "ID"
-        label: qsTrId("id")
+        label: qsTr("ID")
         text: root.collectibleId
         anchors.top: collectibleImage.bottom
         anchors.topMargin:0
@@ -37,8 +36,7 @@ Item {
     TextWithLabel {
         visible: !!root.collectibleDescription
         id: descriptionText
-        //% "Description"
-        label: qsTrId("description")
+        label: qsTr("Description")
         text: root.collectibleDescription
         anchors.top: idText.bottom
         anchors.topMargin: 0
diff --git a/ui/app/AppLayouts/Wallet/panels/ImportPrivateKeyPanel.qml b/ui/app/AppLayouts/Wallet/panels/ImportPrivateKeyPanel.qml
index 861a0ede5e..396676dd6d 100644
--- a/ui/app/AppLayouts/Wallet/panels/ImportPrivateKeyPanel.qml
+++ b/ui/app/AppLayouts/Wallet/panels/ImportPrivateKeyPanel.qml
@@ -24,11 +24,9 @@ ColumnLayout {
 
     function validateMe()  {
         if (privateKey.text === "") {
-            //% "You need to enter a private key"
-            _internal.errorString = qsTrId("you-need-to-enter-a-private-key")
+            _internal.errorString = qsTr("You need to enter a private key")
         } else if (!Utils.isPrivateKey(privateKey.text)) {
-            //% "Enter a valid private key (64 characters hexadecimal string)"
-            _internal.errorString = qsTrId("enter-a-valid-private-key-(64-characters-hexadecimal-string)")
+            _internal.errorString = qsTr("Enter a valid private key (64 characters hexadecimal string)")
         } else {
             _internal.errorString = ""
         }
@@ -47,27 +45,23 @@ ColumnLayout {
     StatusInput {
         id: privateKey
 
-        //% "Private key"
-        label: qsTrId("private-key")
+        label: qsTr("Private key")
         charLimit: _internal.privateKeyCharLimit
         input.multiline: true
         input.minimumHeight: 80
         input.maximumHeight: 108
-        //% "Paste the contents of your private key"
-        input.placeholderText: qsTrId("paste-the-contents-of-your-private-key")
+        input.placeholderText: qsTr("Paste the contents of your private key")
         errorMessage: _internal.errorString
         validators: [
             StatusMinLengthValidator {
                 minLength: 1
-                //% "You need to enter a private key"
-                errorMessage: qsTrId("you-need-to-enter-a-private-key")
+                errorMessage: qsTr("You need to enter a private key")
             },
             StatusValidator {
                 property var validate: function (value) {
                     return Utils.isPrivateKey(value)
                 }
-                //% "Enter a valid private key (64 characters hexadecimal string)"
-                errorMessage: qsTrId("enter-a-valid-private-key-(64-characters-hexadecimal-string)")
+                errorMessage: qsTr("Enter a valid private key (64 characters hexadecimal string)")
             }
         ]
         onTextChanged: {
diff --git a/ui/app/AppLayouts/Wallet/panels/ImportSeedPhrasePanel.qml b/ui/app/AppLayouts/Wallet/panels/ImportSeedPhrasePanel.qml
index 80d8834a2e..654f42f387 100644
--- a/ui/app/AppLayouts/Wallet/panels/ImportSeedPhrasePanel.qml
+++ b/ui/app/AppLayouts/Wallet/panels/ImportSeedPhrasePanel.qml
@@ -35,16 +35,13 @@ GridView {
     function validate() {
         _internal.errorString  = ""
         if (!Utils.isMnemonic(mnemonicString)) {
-            //% "Invalid seed phrase"
-            _internal.errorString = qsTrId("custom-seed-phrase")
+            _internal.errorString = qsTr("Invalid seed phrase")
         } else {
             _internal.errorString = RootStore.vaildateMnemonic(mnemonicString)
             const regex = new RegExp('word [a-z]+ not found in the dictionary', 'i');
             if (regex.test(_internal.errorString)) {
-                //% "Invalid seed phrase"
-                _internal.errorString = qsTrId("custom-seed-phrase") + '. ' +
-                        //% "This seed phrase doesn't match our supported dictionary. Check for misspelled words."
-                        qsTrId("custom-seed-phrase-text-1")
+                _internal.errorString = qsTr("Invalid seed phrase") + '. ' +
+                        qsTr("This seed phrase doesn't match our supported dictionary. Check for misspelled words.")
             }
         }
         return _internal.errorString === ""
diff --git a/ui/app/AppLayouts/Wallet/panels/SeedPhraseBackupWarning.qml b/ui/app/AppLayouts/Wallet/panels/SeedPhraseBackupWarning.qml
index 88ffe3fb08..b733303619 100644
--- a/ui/app/AppLayouts/Wallet/panels/SeedPhraseBackupWarning.qml
+++ b/ui/app/AppLayouts/Wallet/panels/SeedPhraseBackupWarning.qml
@@ -20,8 +20,7 @@ Rectangle {
         anchors.verticalCenter: parent.verticalCenter
 
         StyledText {
-            //% "Back up your seed phrase"
-            text: qsTrId("back-up-your-seed-phrase")
+            text: qsTr("Back up your seed phrase")
             font.pixelSize: 13
             anchors.verticalCenter: parent.verticalCenter
             color: Style.current.white
diff --git a/ui/app/AppLayouts/Wallet/panels/SelectGeneratedAccount.qml b/ui/app/AppLayouts/Wallet/panels/SelectGeneratedAccount.qml
index b71fde4083..a21e9e704d 100644
--- a/ui/app/AppLayouts/Wallet/panels/SelectGeneratedAccount.qml
+++ b/ui/app/AppLayouts/Wallet/panels/SelectGeneratedAccount.qml
@@ -39,8 +39,7 @@ StatusSelect {
         id: _internal
         property string importSeedPhraseString : qsTr("Import new Seed Phrase")
         property string importPrivateKeyString : qsTr("Generate from Private key")
-        //% "Add a watch-only address"
-        property string addWatchOnlyAccountString : qsTrId("add-a-watch-account")
+        property string addWatchOnlyAccountString : qsTr("Add a watch-only address")
 
         property var delegateModel: DelegateModel {
             model: RootStore.generatedAccountsViewModel
diff --git a/ui/app/AppLayouts/Wallet/panels/WalletFooter.qml b/ui/app/AppLayouts/Wallet/panels/WalletFooter.qml
index 88bb971ac4..f11be885f2 100644
--- a/ui/app/AppLayouts/Wallet/panels/WalletFooter.qml
+++ b/ui/app/AppLayouts/Wallet/panels/WalletFooter.qml
@@ -30,8 +30,7 @@ Rectangle {
 
         StatusFlatButton {
             icon.name: "send"
-            //% "Send"
-            text: qsTrId("command-button-send")
+            text: qsTr("Send")
             onClicked: function() {
                 sendModal.open()
             }
@@ -39,8 +38,7 @@ Rectangle {
 
         StatusFlatButton {
             icon.name: "receive"
-            //% "Receive"
-            text: qsTrId("receive")
+            text: qsTr("Receive")
             onClicked: function () {
                 Global.openPopup(receiveModalComponent);
             }
@@ -49,8 +47,7 @@ Rectangle {
         StatusFlatButton {
             id: buySellBtn
             icon.name: "token"
-            //% "Buy / Sell"
-            text: qsTrId("Buy / Sell")
+            text: qsTr("Buy / Sell")
             onClicked: function () {
                 Global.openPopup(buySellModal);
             }
diff --git a/ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml b/ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml
index 0b09889b49..b12c472020 100644
--- a/ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml
@@ -31,8 +31,7 @@ StatusModal {
 
     signal afterAddAccount()
 
-    //% "Generate an account"
-    header.title: qsTrId("generate-a-new-account")
+    header.title: qsTr("Generate an account")
 
     QtObject {
         id: _internal
@@ -57,15 +56,13 @@ StatusModal {
 
         onDerivedPathErrorChanged: {
             if(Utils.isInvalidPasswordMessage(derivedPathError))
-                //% "Wrong password"
-                popup.passwordValidationError = qsTrId("wrong-password")
+                popup.passwordValidationError = qsTr("Wrong password")
         }
 
         function showPasswordError(errMessage) {
             if (errMessage) {
                 if (Utils.isInvalidPasswordMessage(errMessage)) {
-                    //% "Wrong password"
-                    popup.passwordValidationError = qsTrId("wrong-password")
+                    popup.passwordValidationError = qsTr("Wrong password")
                 } else {
                     accountError.text = errMessage;
                     accountError.open();
@@ -88,11 +85,9 @@ StatusModal {
         }
 
         if (passwordInput.text === "") {
-            //% "You need to enter a password"
-            passwordValidationError = qsTrId("you-need-to-enter-a-password")
+            passwordValidationError = qsTr("You need to enter a password")
         } else if (passwordInput.text.length < 6) {
-            //% "Password needs to be 6 characters or more"
-            passwordValidationError = qsTrId("password-needs-to-be-6-characters-or-more")
+            passwordValidationError = qsTr("Password needs to be 6 characters or more")
         } else {
             passwordValidationError = ""
         }
@@ -145,10 +140,8 @@ StatusModal {
                     id: passwordInput
                     anchors.fill: parent
 
-                    //% "Enter your password…"
-                    placeholderText: qsTrId("enter-your-password…")
-                    //% "Password"
-                    label: qsTrId("password")
+                    placeholderText: qsTr("Enter your password…")
+                    label: qsTr("Password")
                     textField.echoMode: TextInput.Password
                     validationError: popup.passwordValidationError
                     inputLabel.font.pixelSize: 15
@@ -162,11 +155,8 @@ StatusModal {
 
             StatusInput {
                 id: accountNameInput
-                width: parent.width
-                //% "Enter an account name..."
-                input.placeholderText: qsTrId("enter-an-account-name...")
-                //% "Account name"
-                label: qsTrId("account-name")
+                input.placeholderText: qsTr("Enter an account name...")
+                label: qsTr("Account name")
                 input.isIconSelectable: true
                 input.icon.color: colorSelectionGrid.selectedColor ? colorSelectionGrid.selectedColor : Theme.palette.directColor1
                 input.leftPadding: Style.current.padding
@@ -178,8 +168,7 @@ StatusModal {
                 }
                 validators: [
                     StatusMinLengthValidator {
-                        //% "You need to enter an account name"
-                        errorMessage: qsTrId("you-need-to-enter-an-account-name")
+                        errorMessage: qsTr("You need to enter an account name")
                         minLength: 1
                     }
                 ]
@@ -234,10 +223,8 @@ StatusModal {
         StatusButton {
             id: nextButton
             text: loading ?
-                      //% "Loading..."
-                      qsTrId("loading") :
-                      //% "Add account"
-                      qsTrId("add-account")
+                      qsTr("Loading...") :
+                      qsTr("Add account")
 
             enabled: {
                 if (loading) {
diff --git a/ui/app/AppLayouts/Wallet/popups/CollectiblesModal.qml b/ui/app/AppLayouts/Wallet/popups/CollectiblesModal.qml
index 771d85230f..a4cc6f3622 100644
--- a/ui/app/AppLayouts/Wallet/popups/CollectiblesModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/CollectiblesModal.qml
@@ -21,15 +21,13 @@ ModalPopup {
         popup.collectibleId = options.id
         popup.collectibleDescription = options.description
         popup.collectibleImage = options.image
-        //% "View"
-        popup.buttonText = options.buttonText || qsTrId("view")
+        popup.buttonText = options.buttonText || qsTr("View")
         popup.buttonLink = options.link
         popup.open()
     }
 
     id: popup
-    //% "Unnamed"
-    title: collectibleName || qsTrId("unnamed")
+    title: collectibleName || qsTr("Unnamed")
 
     CollectiblesModalContent {
         collectibleName: popup.collectibleName
diff --git a/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml b/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
index b300a6810d..0a901c1228 100644
--- a/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
@@ -34,8 +34,7 @@ StatusModal {
         qrCodeImage.source = RootStore.getQrCode(completeAddressWithNetworkPrefix)
     }
 
-    //% "Receive"
-    header.title: qsTrId("receive")
+    header.title: qsTr("Receive")
     contentHeight: layout.implicitHeight
     width: 556
 
diff --git a/ui/app/AppLayouts/Wallet/popups/SignPhraseModal.qml b/ui/app/AppLayouts/Wallet/popups/SignPhraseModal.qml
index b2f110a3d4..5f9647f5bd 100644
--- a/ui/app/AppLayouts/Wallet/popups/SignPhraseModal.qml
+++ b/ui/app/AppLayouts/Wallet/popups/SignPhraseModal.qml
@@ -17,8 +17,7 @@ ModalPopup {
     signal remindLaterClicked()
     signal acceptClicked()
 
-    //% "Signing phrase"
-    title: qsTrId("signing-phrase")
+    title: qsTr("Signing phrase")
     height: 390
     closePolicy: Popup.NoAutoClose
 
@@ -28,8 +27,7 @@ ModalPopup {
 
         StyledText {
             anchors.horizontalCenter: parent.horizontalCenter
-            //% "This is your signing phrase"
-            text: qsTrId("this-is-you-signing")
+            text: qsTr("This is your signing phrase")
             font.pixelSize: 17
             font.weight: Font.Bold
             horizontalAlignment: Text.AlignHCenter
@@ -38,8 +36,7 @@ ModalPopup {
 
         StyledText {
             anchors.horizontalCenter: parent.horizontalCenter
-            //% "You should see these 3 words before signing each transaction"
-            text: qsTrId("three-words-description")
+            text: qsTr("You should see these 3 words before signing each transaction")
             font.pixelSize: 15
             width: 330
             wrapMode: Text.WordWrap
@@ -76,8 +73,7 @@ ModalPopup {
         }
 
         StyledText {
-            //% "If you see a different combination, cancel the transaction and sign out"
-            text: qsTrId("three-words-description-2")
+            text: qsTr("If you see a different combination, cancel the transaction and sign out")
             verticalAlignment: Text.AlignVCenter
             horizontalAlignment: Text.AlignHCenter
             width: parent.width
@@ -95,8 +91,7 @@ ModalPopup {
         StatusFlatButton {
             anchors.right: btnRemindLater.left
             anchors.rightMargin: Style.current.padding
-            //% "Ok, got it"
-            text: qsTrId("ens-got-it")
+            text: qsTr("Ok, got it")
             onClicked: {
                 acceptClicked()
                 close()
@@ -106,8 +101,7 @@ ModalPopup {
         StatusButton {
             id: btnRemindLater
             anchors.right: parent.right
-            //% "Remind me later"
-            text: qsTrId("remind-me-later")
+            text: qsTr("Remind me later")
             onClicked: {
                 remindLaterClicked()
                 close()
diff --git a/ui/app/AppLayouts/Wallet/stores/CurrenciesStore.qml b/ui/app/AppLayouts/Wallet/stores/CurrenciesStore.qml
index 9448c0c269..8426f5e3ee 100644
--- a/ui/app/AppLayouts/Wallet/stores/CurrenciesStore.qml
+++ b/ui/app/AppLayouts/Wallet/stores/CurrenciesStore.qml
@@ -9,8 +9,7 @@ QtObject {
        ListElement {
            key: "usd"
            shortName: "USD"
-           //% "US Dollars"
-           name: qsTrId("us-dollars")
+           name: qsTr("US Dollars")
            symbol: "$"
            category: ""
            imageSource: "../../assets/twemoji/26x26/1f1fa-1f1f8.png"
@@ -20,8 +19,7 @@ QtObject {
        ListElement {
            key: "gbp"
            shortName: "GBP"
-           //% "British Pound"
-           name: qsTrId("british-pound")
+           name: qsTr("British Pound")
            symbol: "£"
            category: ""
            imageSource: "../../assets/twemoji/26x26/1f1ec-1f1e7.png"
@@ -31,8 +29,7 @@ QtObject {
        ListElement {
            key: "eur"
            shortName: "EUR"
-           //% "Euros"
-           name: qsTrId("euros")
+           name: qsTr("Euros")
            symbol: "€"
            category: ""
            imageSource: "../../assets/twemoji/26x26/1f1ea-1f1fa.png"
@@ -42,8 +39,7 @@ QtObject {
        ListElement {
            key: "rub"
            shortName: "RUB"
-           //% "Russian ruble"
-           name: qsTrId("russian-ruble")
+           name: qsTr("Russian ruble")
            symbol: "₽"
            category: ""
            imageSource: "../../assets/twemoji/26x26/1f1f7-1f1fa.png"
@@ -53,8 +49,7 @@ QtObject {
        ListElement {
            key: "krw"
            shortName: "KRW"
-           //% "South Korean won"
-           name: qsTrId("south-korean-won")
+           name: qsTr("South Korean won")
            symbol: "₩"
            category: ""
            imageSource: "../../assets/twemoji/26x26/1f1f0-1f1f7.png"
@@ -104,8 +99,7 @@ QtObject {
        ListElement {
            key: "aed"
            shortName: "AED"
-           //% "United Arab Emirates dirham"
-           name: qsTrId("united-arab-emirates-dirham")
+           name: qsTr("United Arab Emirates dirham")
            symbol: "د.إ"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e6-1f1ea.png"
@@ -115,8 +109,7 @@ QtObject {
        ListElement {
            key: "afn"
            shortName: "AFN"
-           //% "Afghan afghani"
-           name: qsTrId("afghan-afghani")
+           name: qsTr("Afghan afghani")
            symbol: "؋"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e6-1f1eb.png"
@@ -126,8 +119,7 @@ QtObject {
        ListElement {
            key: "ars"
            shortName: "ARS"
-           //% "Argentine peso"
-           name: qsTrId("argentine-peso")
+           name: qsTr("Argentine peso")
            symbol: "$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e6-1f1f7.png"
@@ -137,8 +129,7 @@ QtObject {
        ListElement {
            key: "aud"
            shortName: "AUD"
-           //% "Australian dollar"
-           name: qsTrId("australian-dollar")
+           name: qsTr("Australian dollar")
            symbol: "$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e6-1f1fa.png"
@@ -148,8 +139,7 @@ QtObject {
        ListElement {
            key: "bbd"
            shortName: "BBD"
-           //% "Barbadian dollar"
-           name: qsTrId("barbadian-dollar")
+           name: qsTr("Barbadian dollar")
            symbol: "$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e7-1f1e7.png"
@@ -159,8 +149,7 @@ QtObject {
        ListElement {
            key: "bdt"
            shortName: "BDT"
-           //% "Bangladeshi taka"
-           name: qsTrId("bangladeshi-taka")
+           name: qsTr("Bangladeshi taka")
            symbol: " Tk"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e7-1f1e9.png"
@@ -170,8 +159,7 @@ QtObject {
        ListElement {
            key: "bgn"
            shortName: "BGN"
-           //% "Bulgarian lev"
-           name: qsTrId("bulgarian-lev")
+           name: qsTr("Bulgarian lev")
            symbol: "лв"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e7-1f1ec.png"
@@ -181,8 +169,7 @@ QtObject {
        ListElement {
            key: "bhd"
            shortName: "BHD"
-           //% "Bahraini dinar"
-           name: qsTrId("bahraini-dinar")
+           name: qsTr("Bahraini dinar")
            symbol: "BD"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e7-1f1ed.png"
@@ -192,8 +179,7 @@ QtObject {
        ListElement {
            key: "bnd"
            shortName: "BND"
-           //% "Brunei dollar"
-           name: qsTrId("brunei-dollar")
+           name: qsTr("Brunei dollar")
            symbol: "$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e7-1f1f3.png"
@@ -203,8 +189,7 @@ QtObject {
        ListElement {
            key: "bob"
            shortName: "BOB"
-           //% "Bolivian boliviano"
-           name: qsTrId("bolivian-boliviano")
+           name: qsTr("Bolivian boliviano")
            symbol: "$b"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e7-1f1f4.png"
@@ -214,8 +199,7 @@ QtObject {
        ListElement {
            key: "brl"
            shortName: "BRL"
-           //% "Brazillian real"
-           name: qsTrId("brazillian-real")
+           name: qsTr("Brazillian real")
            symbol: "R$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e7-1f1f7.png"
@@ -225,8 +209,7 @@ QtObject {
        ListElement {
            key: "btn"
            shortName: "BTN"
-           //% "Bhutanese ngultrum"
-           name: qsTrId("bhutanese-ngultrum")
+           name: qsTr("Bhutanese ngultrum")
            symbol: "Nu."
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e7-1f1f9.png"
@@ -236,8 +219,7 @@ QtObject {
        ListElement {
            key: "cad"
            shortName: "CAD"
-           //% "Canadian dollar"
-           name: qsTrId("canadian-dollar")
+           name: qsTr("Canadian dollar")
            symbol: "$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e8-1f1e6.png"
@@ -247,8 +229,7 @@ QtObject {
        ListElement {
            key: "chf"
            shortName: "CHF"
-           //% "Swiss franc"
-           name: qsTrId("swiss-franc")
+           name: qsTr("Swiss franc")
            symbol: "CHF"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e8-1f1ed.png"
@@ -258,8 +239,7 @@ QtObject {
        ListElement {
            key: "clp"
            shortName: "CLP"
-           //% "Chilean peso"
-           name: qsTrId("chilean-peso")
+           name: qsTr("Chilean peso")
            symbol: "$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e8-1f1f1.png"
@@ -269,8 +249,7 @@ QtObject {
        ListElement {
            key: "cny"
            shortName: "CNY"
-           //% "Chinese yuan"
-           name: qsTrId("chinese-yuan")
+           name: qsTr("Chinese yuan")
            symbol: "¥"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e8-1f1f3.png"
@@ -280,8 +259,7 @@ QtObject {
        ListElement {
            key: "cop"
            shortName: "COP"
-           //% "Colombian peso"
-           name: qsTrId("colombian-peso")
+           name: qsTr("Colombian peso")
            symbol: "$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e8-1f1f4.png"
@@ -291,8 +269,7 @@ QtObject {
        ListElement {
            key: "crc"
            shortName: "CRC"
-           //% "Costa Rican colón"
-           name: qsTrId("costa-rican-colón")
+           name: qsTr("Costa Rican colón")
            symbol: "₡"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e8-1f1f7.png"
@@ -302,8 +279,7 @@ QtObject {
        ListElement {
            key: "czk"
            shortName: "CZK"
-           //% "Czech koruna"
-           name: qsTrId("czech-koruna")
+           name: qsTr("Czech koruna")
            symbol: "Kč"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e8-1f1ff.png"
@@ -313,8 +289,7 @@ QtObject {
        ListElement {
            key: "dkk"
            shortName: "DKK"
-           //% "Danish krone"
-           name: qsTrId("danish-krone")
+           name: qsTr("Danish krone")
            symbol: "kr"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e9-1f1f0.png"
@@ -324,8 +299,7 @@ QtObject {
        ListElement {
            key: "dop"
            shortName: "DOP"
-           //% "Dominican peso"
-           name: qsTrId("dominican-peso")
+           name: qsTr("Dominican peso")
            symbol: "RD$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1e9-1f1f4.png"
@@ -335,8 +309,7 @@ QtObject {
        ListElement {
            key: "egp"
            shortName: "EGP"
-           //% "Egyptian pound"
-           name: qsTrId("egyptian-pound")
+           name: qsTr("Egyptian pound")
            symbol: "£"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1ea-1f1ec.png"
@@ -346,8 +319,7 @@ QtObject {
        ListElement {
            key: "etb"
            shortName: "ETB"
-           //% "Ethiopian birr"
-           name: qsTrId("ethiopian-birr")
+           name: qsTr("Ethiopian birr")
            symbol: "Br"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1ea-1f1f9.png"
@@ -357,8 +329,7 @@ QtObject {
        ListElement {
            key: "gel"
            shortName: "GEL"
-           //% "Georgian lari"
-           name: qsTrId("georgian-lari")
+           name: qsTr("Georgian lari")
            symbol: "₾"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1ec-1f1ea.png"
@@ -368,8 +339,7 @@ QtObject {
        ListElement {
            key: "ghs"
            shortName: "GHS"
-           //% "Ghanaian cedi"
-           name: qsTrId("ghanaian-cedi")
+           name: qsTr("Ghanaian cedi")
            symbol: "¢"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1ec-1f1ed.png"
@@ -379,8 +349,7 @@ QtObject {
        ListElement {
            key: "hkd"
            shortName: "HKD"
-           //% "Hong Kong dollar"
-           name: qsTrId("hong-kong-dollar")
+           name: qsTr("Hong Kong dollar")
            symbol: "$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1ed-1f1f0.png"
@@ -390,8 +359,7 @@ QtObject {
        ListElement {
            key: "hrk"
            shortName: "HRK"
-           //% "Croatian kuna"
-           name: qsTrId("croatian-kuna")
+           name: qsTr("Croatian kuna")
            symbol: "kn"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1ed-1f1f7.png"
@@ -401,8 +369,7 @@ QtObject {
        ListElement {
            key: "huf"
            shortName: "HUF"
-           //% "Hungarian forint"
-           name: qsTrId("hungarian-forint")
+           name: qsTr("Hungarian forint")
            symbol: "Ft"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1ed-1f1fa.png"
@@ -412,8 +379,7 @@ QtObject {
        ListElement {
            key: "idr"
            shortName: "IDR"
-           //% "Indonesian rupiah"
-           name: qsTrId("indonesian-rupiah")
+           name: qsTr("Indonesian rupiah")
            symbol: "Rp"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1ee-1f1e9.png"
@@ -423,8 +389,7 @@ QtObject {
        ListElement {
            key: "ils"
            shortName: "ILS"
-           //% "Israeli new shekel"
-           name: qsTrId("israeli-new-shekel")
+           name: qsTr("Israeli new shekel")
            symbol: "₪"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1ee-1f1f1.png"
@@ -434,8 +399,7 @@ QtObject {
        ListElement {
            key: "inr"
            shortName: "INR"
-           //% "Indian rupee"
-           name: qsTrId("indian-rupee")
+           name: qsTr("Indian rupee")
            symbol: "₹"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1ee-1f1f3.png"
@@ -445,8 +409,7 @@ QtObject {
        ListElement {
            key: "isk"
            shortName: "ISK"
-           //% "Icelandic króna"
-           name: qsTrId("icelandic-króna")
+           name: qsTr("Icelandic króna")
            symbol: "kr"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1ee-1f1f8.png"
@@ -456,8 +419,7 @@ QtObject {
        ListElement {
            key: "jmd"
            shortName: "JMD"
-           //% "Jamaican dollar"
-           name: qsTrId("jamaican-dollar")
+           name: qsTr("Jamaican dollar")
            symbol: "J$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1ef-1f1f2.png"
@@ -467,8 +429,7 @@ QtObject {
        ListElement {
            key: "jpy"
            shortName: "JPY"
-           //% "Japanese yen"
-           name: qsTrId("japanese-yen")
+           name: qsTr("Japanese yen")
            symbol: "¥"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1ef-1f1f5.png"
@@ -478,8 +439,7 @@ QtObject {
        ListElement {
            key: "kes"
            shortName: "KES"
-           //% "Kenyan shilling"
-           name: qsTrId("kenyan-shilling")
+           name: qsTr("Kenyan shilling")
            symbol: "KSh"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f0-1f1ea.png"
@@ -489,8 +449,7 @@ QtObject {
        ListElement {
            key: "kwd"
            shortName: "KWD"
-           //% "Kuwaiti dinar"
-           name: qsTrId("kuwaiti-dinar")
+           name: qsTr("Kuwaiti dinar")
            symbol: "د.ك"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f0-1f1fc.png"
@@ -500,8 +459,7 @@ QtObject {
        ListElement {
            key: "kzt"
            shortName: "KZT"
-           //% "Kazakhstani tenge"
-           name: qsTrId("kazakhstani-tenge")
+           name: qsTr("Kazakhstani tenge")
            symbol: "лв"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f0-1f1ff.png"
@@ -511,8 +469,7 @@ QtObject {
        ListElement {
            key: "lkr"
            shortName: "LKR"
-           //% "Sri Lankan rupee"
-           name: qsTrId("sri-lankan-rupee")
+           name: qsTr("Sri Lankan rupee")
            symbol: "₨"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f1-1f1f0.png"
@@ -522,8 +479,7 @@ QtObject {
        ListElement {
            key: "mad"
            shortName: "MAD"
-           //% "Moroccan dirham"
-           name: qsTrId("moroccan-dirham")
+           name: qsTr("Moroccan dirham")
            symbol: "MAD"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f2-1f1e6.png"
@@ -533,8 +489,7 @@ QtObject {
        ListElement {
            key: "mdl"
            shortName: "MDL"
-           //% "Moldovan leu"
-           name: qsTrId("moldovan-leu")
+           name: qsTr("Moldovan leu")
            symbol: "MDL"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f2-1f1e9.png"
@@ -544,8 +499,7 @@ QtObject {
        ListElement {
            key: "mur"
            shortName: "MUR"
-           //% "Mauritian rupee"
-           name: qsTrId("mauritian-rupee ")
+           name: qsTr("Mauritian rupee")
            symbol: "₨"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f2-1f1f7.png"
@@ -555,8 +509,7 @@ QtObject {
        ListElement {
            key: "mwk"
            shortName: "MWK"
-           //% "Malawian kwacha"
-           name: qsTrId("malawian-kwacha")
+           name: qsTr("Malawian kwacha")
            symbol: "MK"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f2-1f1fc.png"
@@ -566,8 +519,7 @@ QtObject {
        ListElement {
            key: "mxn"
            shortName: "MXN"
-           //% "Mexican peso"
-           name: qsTrId("mexican-peso")
+           name: qsTr("Mexican peso")
            symbol: "$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f2-1f1fd.png"
@@ -577,8 +529,7 @@ QtObject {
        ListElement {
            key: "myr"
            shortName: "MYR"
-           //% "Malaysian ringgit"
-           name: qsTrId("malaysian-ringgit")
+           name: qsTr("Malaysian ringgit")
            symbol: "RM"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f2-1f1fe.png"
@@ -588,8 +539,7 @@ QtObject {
        ListElement {
            key: "mzn"
            shortName: "MZN"
-           //% "Mozambican metical"
-           name: qsTrId("mozambican-metical")
+           name: qsTr("Mozambican metical")
            symbol: "MT"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f2-1f1ff.png"
@@ -599,8 +549,7 @@ QtObject {
        ListElement {
            key: "nad"
            shortName: "NAD"
-           //% "Namibian dollar"
-           name: qsTrId("namibian-dollar")
+           name: qsTr("Namibian dollar")
            symbol: "$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f3-1f1e6.png"
@@ -610,8 +559,7 @@ QtObject {
        ListElement {
            key: "ngn"
            shortName: "NGN"
-           //% "Nigerian naira"
-           name: qsTrId("nigerian-naira")
+           name: qsTr("Nigerian naira")
            symbol: "₦"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f3-1f1ec.png"
@@ -621,8 +569,7 @@ QtObject {
        ListElement {
            key: "nok"
            shortName: "NOK"
-           //% "Norwegian krone"
-           name: qsTrId("norwegian-krone")
+           name: qsTr("Norwegian krone")
            symbol: "kr"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f3-1f1f4.png"
@@ -632,8 +579,7 @@ QtObject {
        ListElement {
            key: "npr"
            shortName: "NPR"
-           //% "Nepalese rupee"
-           name: qsTrId("nepalese-rupee")
+           name: qsTr("Nepalese rupee")
            symbol: "₨"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f3-1f1f5.png"
@@ -643,8 +589,7 @@ QtObject {
        ListElement {
            key: "nzd"
            shortName: "NZD"
-           //% "New Zealand dollar"
-           name: qsTrId("new-zealand-dollar")
+           name: qsTr("New Zealand dollar")
            symbol: "$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f3-1f1ff.png"
@@ -654,8 +599,7 @@ QtObject {
        ListElement {
            key: "omr"
            shortName: "OMR"
-           //% "Omani rial"
-           name: qsTrId("omani-rial")
+           name: qsTr("Omani rial")
            symbol: "﷼"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f4-1f1f2.png"
@@ -665,8 +609,7 @@ QtObject {
        ListElement {
            key: "pen"
            shortName: "PEN"
-           //% "Peruvian sol"
-           name: qsTrId("peruvian-sol")
+           name: qsTr("Peruvian sol")
            symbol: "S/."
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f5-1f1ea.png"
@@ -676,8 +619,7 @@ QtObject {
        ListElement {
            key: "pgk"
            shortName: "PGK"
-           //% "Papua New Guinean kina"
-           name: qsTrId("papua-new-guinean-kina")
+           name: qsTr("Papua New Guinean kina")
            symbol: "K"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f5-1f1ec.png"
@@ -687,8 +629,7 @@ QtObject {
        ListElement {
            key: "php"
            shortName: "PHP"
-           //% "Philippine peso"
-           name: qsTrId("philippine-peso")
+           name: qsTr("Philippine peso")
            symbol: "₱"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f5-1f1ed.png"
@@ -698,8 +639,7 @@ QtObject {
        ListElement {
            key: "pkr"
            shortName: "PKR"
-           //% "Pakistani rupee"
-           name: qsTrId("pakistani-rupee")
+           name: qsTr("Pakistani rupee")
            symbol: "₨"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f5-1f1f0.png"
@@ -709,8 +649,7 @@ QtObject {
        ListElement {
            key: "pln"
            shortName: "PLN"
-           //% "Polish złoty"
-           name: qsTrId("polish-złoty")
+           name: qsTr("Polish złoty")
            symbol: "zł"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f5-1f1f1.png"
@@ -720,8 +659,7 @@ QtObject {
        ListElement {
            key: "pyg"
            shortName: "PYG"
-           //% "Paraguayan guaraní"
-           name: qsTrId("paraguayan-guaraní")
+           name: qsTr("Paraguayan guaraní")
            symbol: "Gs"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f5-1f1fe.png"
@@ -731,8 +669,7 @@ QtObject {
        ListElement {
            key: "qar"
            shortName: "QAR"
-           //% "Qatari riyal"
-           name: qsTrId("qatari-riyal")
+           name: qsTr("Qatari riyal")
            symbol: "﷼"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f6-1f1e6.png"
@@ -742,8 +679,7 @@ QtObject {
        ListElement {
            key: "ron"
            shortName: "RON"
-           //% "Romanian leu"
-           name: qsTrId("romanian-leu")
+           name: qsTr("Romanian leu")
            symbol: "lei"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f7-1f1f4.png"
@@ -753,8 +689,7 @@ QtObject {
        ListElement {
            key: "rsd"
            shortName: "RSD"
-           //% "Serbian dinar"
-           name: qsTrId("serbian-dinar")
+           name: qsTr("Serbian dinar")
            symbol: "Дин."
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f7-1f1f8.png"
@@ -764,8 +699,7 @@ QtObject {
        ListElement {
            key: "sar"
            shortName: "SAR"
-           //% "Saudi riyal"
-           name: qsTrId("saudi-riyal")
+           name: qsTr("Saudi riyal")
            symbol: "﷼"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f8-1f1e6.png"
@@ -775,8 +709,7 @@ QtObject {
        ListElement {
            key: "sek"
            shortName: "SEK"
-           //% "Swedish krona"
-           name: qsTrId("swedish-krona")
+           name: qsTr("Swedish krona")
            symbol: "kr"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f8-1f1ea.png"
@@ -786,8 +719,7 @@ QtObject {
        ListElement {
            key: "sgd"
            shortName: "SGD"
-           //% "Singapore dollar"
-           name: qsTrId("singapore-dollar")
+           name: qsTr("Singapore dollar")
            symbol: "$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f8-1f1ec.png"
@@ -797,8 +729,7 @@ QtObject {
        ListElement {
            key: "thb"
            shortName: "THB"
-           //% "Thai baht"
-           name: qsTrId("thai-baht")
+           name: qsTr("Thai baht")
            symbol: "฿"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f9-1f1ed.png"
@@ -808,8 +739,7 @@ QtObject {
        ListElement {
            key: "ttd"
            shortName: "TTD"
-           //% "Trinidad and Tobago dollar"
-           name: qsTrId("trinidad-and-tobago-dollar")
+           name: qsTr("Trinidad and Tobago dollar")
            symbol: "TT$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f9-1f1f9.png"
@@ -819,8 +749,7 @@ QtObject {
        ListElement {
            key: "twd"
            shortName: "TWD"
-           //% "New Taiwan dollar"
-           name: qsTrId("new-taiwan-dollar")
+           name: qsTr("New Taiwan dollar")
            symbol: "NT$"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f9-1f1fc.png"
@@ -830,8 +759,7 @@ QtObject {
        ListElement {
            key: "tzs"
            shortName: "TZS"
-           //% "Tanzanian shilling"
-           name: qsTrId("tanzanian-shilling")
+           name: qsTr("Tanzanian shilling")
            symbol: "TSh"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f9-1f1ff.png"
@@ -841,8 +769,7 @@ QtObject {
        ListElement {
            key: "try"
            shortName: "TRY"
-           //% "Turkish lira"
-           name: qsTrId("turkish-lira")
+           name: qsTr("Turkish lira")
            symbol: "₺"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1f9-1f1f7.png"
@@ -852,8 +779,7 @@ QtObject {
        ListElement {
            key: "uah"
            shortName: "UAH"
-           //% "Ukrainian hryvnia"
-           name: qsTrId("ukrainian-hryvnia")
+           name: qsTr("Ukrainian hryvnia")
            symbol: "₴"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1fa-1f1e6.png"
@@ -863,8 +789,7 @@ QtObject {
        ListElement {
            key: "ugx"
            shortName: "UGX"
-           //% "Ugandan shilling"
-           name: qsTrId("ugandan-shilling")
+           name: qsTr("Ugandan shilling")
            symbol: "USh"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1fa-1f1ec.png"
@@ -874,8 +799,7 @@ QtObject {
        ListElement {
            key: "uyu"
            shortName: "UYU"
-           //% "Uruguayan peso"
-           name: qsTrId("uruguayan-peso")
+           name: qsTr("Uruguayan peso")
            symbol: "$U"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1fa-1f1fe.png"
@@ -885,8 +809,7 @@ QtObject {
        ListElement {
            key: "vef"
            shortName: "VEF"
-           //% "Venezuelan bolívar"
-           name: qsTrId("venezuelan-bolívar")
+           name: qsTr("Venezuelan bolívar")
            symbol: "Bs"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1fb-1f1ea.png"
@@ -896,8 +819,7 @@ QtObject {
        ListElement {
            key: "vnd"
            shortName: "VND"
-           //% "Vietnamese đồng"
-           name: qsTrId("vietnamese-đồng")
+           name: qsTr("Vietnamese đồng")
            symbol: "₫"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1fb-1f1f3.png"
@@ -907,8 +829,7 @@ QtObject {
        ListElement {
            key: "zar"
            shortName: "ZAR"
-           //% "South African rand"
-           name: qsTrId("south-african-rand")
+           name: qsTr("South African rand")
            symbol: "R"
            category: "Other Fiat"
            imageSource: "../../assets/twemoji/26x26/1f1ff-1f1e6.png"
diff --git a/ui/app/AppLayouts/Wallet/views/AdvancedAddAccountView.qml b/ui/app/AppLayouts/Wallet/views/AdvancedAddAccountView.qml
index 9be1d44e48..cd5444b27a 100644
--- a/ui/app/AppLayouts/Wallet/views/AdvancedAddAccountView.qml
+++ b/ui/app/AppLayouts/Wallet/views/AdvancedAddAccountView.qml
@@ -128,18 +128,14 @@ ColumnLayout {
     StatusInput {
         id: addressInput
         visible: advancedSection.addAccountType === SelectGeneratedAccount.AddAccountType.WatchOnly && advancedSection.visible
-        //% "Enter address..."
-        input.placeholderText: qsTrId("enter-address...")
-        //% "Account address"
-        label: qsTrId("wallet-key-title")
+        input.placeholderText: qsTr("Enter address...")
+        label: qsTr("Account address")
         validators: [
             StatusAddressValidator {
-                //% "This needs to be a valid address (starting with 0x)"
-                errorMessage: qsTrId("this-needs-to-be-a-valid-address-(starting-with-0x)")
+                errorMessage: qsTr("This needs to be a valid address (starting with 0x)")
             },
             StatusMinLengthValidator {
-                //% "You need to enter an address"
-                errorMessage: qsTrId("you-need-to-enter-an-address")
+                errorMessage: qsTr("You need to enter an address")
                 minLength: 1
             }
         ]
diff --git a/ui/app/AppLayouts/Wallet/views/LeftTabView.qml b/ui/app/AppLayouts/Wallet/views/LeftTabView.qml
index a7fd79b847..b0aff968ce 100644
--- a/ui/app/AppLayouts/Wallet/views/LeftTabView.qml
+++ b/ui/app/AppLayouts/Wallet/views/LeftTabView.qml
@@ -31,8 +31,7 @@ Rectangle {
 
     StyledText {
         id: title
-        //% "Wallet"
-        text: qsTrId("wallet")
+        text: qsTr("Wallet")
         anchors.top: parent.top
         anchors.topMargin: Style.current.padding
         anchors.horizontalCenter: parent.horizontalCenter
@@ -67,8 +66,7 @@ Rectangle {
         StyledText {
             id: totalValue
             color: Style.current.secondaryText
-            //% "Total value"
-            text: qsTrId("wallet-total-value")
+            text: qsTr("Total value")
             anchors.left: walletAmountValue.left
             anchors.top: walletAmountValue.bottom
             font.weight: Font.Medium
@@ -129,8 +127,7 @@ Rectangle {
                     anchors.top: parent.top
                     anchors.horizontalCenter: parent.horizontalCenter
                     anchors.margins: Style.current.bigPadding
-                    //% "Add account"
-                    text: qsTrId("add-account")
+                    text: qsTr("Add account")
                     onClicked: addAccountModal.open()
                 }
             }
diff --git a/ui/app/AppLayouts/Wallet/views/RightTabView.qml b/ui/app/AppLayouts/Wallet/views/RightTabView.qml
index 418293ec0e..7d5084a2d5 100644
--- a/ui/app/AppLayouts/Wallet/views/RightTabView.qml
+++ b/ui/app/AppLayouts/Wallet/views/RightTabView.qml
@@ -53,21 +53,18 @@ Item {
                 
                 StatusTabButton {
                     id: assetBtn
-                    //% "Assets"
                     width: implicitWidth
-                    text: qsTrId("wallet-assets")
+                    text: qsTr("Assets")
                 }
                 StatusTabButton {
                     id: collectiblesBtn
-                    //% "Collectibles"
                     width: implicitWidth
-                    text: qsTrId("wallet-collectibles")
+                    text: qsTr("Collectibles")
                 }
                 StatusTabButton {
                     id: historyBtn
-                    //% "History"
                     width: implicitWidth
-                    text: qsTrId("history")
+                    text: qsTr("History")
                 }
             }
 
diff --git a/ui/app/AppLayouts/stores/MessageStore.qml b/ui/app/AppLayouts/stores/MessageStore.qml
index 173343c94f..fc5cac6825 100644
--- a/ui/app/AppLayouts/stores/MessageStore.qml
+++ b/ui/app/AppLayouts/stores/MessageStore.qml
@@ -43,8 +43,7 @@ QtObject {
     property bool isMessageActive: typeof root.activeMessage !== "undefined" && root.activeMessage === root.messageId
     property string displayUserName: {
         if (isCurrentUser) {
-            //% "You"
-            return qsTrId("You")
+            return qsTr("You")
         }
 
         if (localName !== "") {
diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml
index b57be18920..29e3cce95f 100644
--- a/ui/app/mainui/AppMain.qml
+++ b/ui/app/mainui/AppMain.qml
@@ -336,8 +336,7 @@ Item {
                     }
 
                     StatusMenuItem {
-                        //% "Invite People"
-                        text: qsTrId("invite-people")
+                        text: qsTr("Invite People")
                         icon.name: "share-ios"
                         enabled: model.canManageUsers
                         onTriggered: Global.openPopup(inviteFriendsToCommunityPopup, {
@@ -348,8 +347,7 @@ Item {
                     }
 
                     StatusMenuItem {
-                        //% "View Community"
-                        text: qsTrId("view-community")
+                        text: qsTr("View Community")
                         icon.name: "group-chat"
                         onTriggered: Global.openPopup(communityProfilePopup, {
                             store: appMain.rootStore,
@@ -361,8 +359,7 @@ Item {
                     StatusMenuSeparator {}
 
                     StatusMenuItem {
-                        //% "Leave Community"
-                        text: qsTrId("leave-community")
+                        text: qsTr("Leave Community")
                         icon.name: "arrow-right"
                         icon.width: 14
                         iconRotation: 180
diff --git a/ui/imports/shared/controls/AddressInput.qml b/ui/imports/shared/controls/AddressInput.qml
index 7a49a1c33a..c071e8247a 100644
--- a/ui/imports/shared/controls/AddressInput.qml
+++ b/ui/imports/shared/controls/AddressInput.qml
@@ -12,8 +12,7 @@ Item {
     property var contactsStore
 
     property string validationError: "Error"
-    //% "ENS Username not found"
-    property string ensAsyncValidationError: qsTrId("ens-username-not-found")
+    property string ensAsyncValidationError: qsTr("ENS Username not found")
     property alias input: contactFieldAndList.chatKey
     property string selectedAddress
     property var isValid: false
diff --git a/ui/imports/shared/controls/AddressSourceSelector.qml b/ui/imports/shared/controls/AddressSourceSelector.qml
index 6d8947ccca..61eaf253c7 100644
--- a/ui/imports/shared/controls/AddressSourceSelector.qml
+++ b/ui/imports/shared/controls/AddressSourceSelector.qml
@@ -26,8 +26,7 @@ Item {
             anchors.fill: parent
             StatusBaseText {
                 id: selectedTextField
-                //% "Invalid source"
-                text: !!root.selectedSource ? root.selectedSource.text : qsTrId("invalid-source")
+                text: !!root.selectedSource ? root.selectedSource.text : qsTr("Invalid source")
                 anchors.left: parent.left
                 anchors.leftMargin: Style.current.padding
                 anchors.verticalCenter: parent.verticalCenter
diff --git a/ui/imports/shared/controls/AssetAndAmountInput.qml b/ui/imports/shared/controls/AssetAndAmountInput.qml
index 5ebb503f47..27b1c97505 100644
--- a/ui/imports/shared/controls/AssetAndAmountInput.qml
+++ b/ui/imports/shared/controls/AssetAndAmountInput.qml
@@ -14,14 +14,10 @@ import "."
 
 Item {
     id: root
-    //% "Insufficient balance"
-    property string balanceErrorMessage: qsTrId("insufficient-balance")
-    //% "Must be greater than or equal to 0"
-    property string greaterThanOrEqualTo0ErrorMessage: qsTrId("must-be-greater-than-or-equal-to-0")
-    //% "This needs to be a number"
-    property string invalidInputErrorMessage: qsTrId("this-needs-to-be-a-number")
-    //% "Please enter an amount"
-    property string noInputErrorMessage: qsTrId("please-enter-an-amount")
+    property string balanceErrorMessage: qsTr("Insufficient balance")
+    property string greaterThanOrEqualTo0ErrorMessage: qsTr("Must be greater than or equal to 0")
+    property string invalidInputErrorMessage: qsTr("This needs to be a number")
+    property string noInputErrorMessage: qsTr("Please enter an amount")
     property string currentCurrency: "USD"
     property alias selectedFiatAmount: txtFiatBalance.text
     property alias selectedAmount: inputAmount.text
@@ -92,8 +88,7 @@ Item {
 
         StyledText {
             id: txtBalanceDesc
-            //% "Balance: "
-            text: qsTrId("balance--")
+            text: qsTr("Balance: ")
             anchors.right: txtBalance.left
             font.weight: Font.Medium
             font.pixelSize: 13
@@ -129,8 +124,7 @@ Item {
 
     Input {
         id: inputAmount
-        //% "Asset & Amount"
-        label: qsTrId("asset---amount")
+        label: qsTr("Asset & Amount")
         placeholderText: "0.00"
         anchors.top: parent.top
         customHeight: 56
@@ -142,8 +136,7 @@ Item {
                 return root.validationError
             }
             if (formattedInputValue === 0) {
-                //% "The amount is 0. Proceed only if this is desired."
-                return qsTrId("the-amount-is-0--proceed-only-if-this-is-desired-")
+                return qsTr("The amount is 0. Proceed only if this is desired.")
             }
             return ""
         }
diff --git a/ui/imports/shared/controls/ContactSelector.qml b/ui/imports/shared/controls/ContactSelector.qml
index 65310a6de0..fc30f610d4 100644
--- a/ui/imports/shared/controls/ContactSelector.qml
+++ b/ui/imports/shared/controls/ContactSelector.qml
@@ -20,18 +20,15 @@ Item {
     property var selectedContact
     height: select.height
     property int dropdownWidth: width
-    //% "Please select a contact"
-    property string validationError: qsTrId("please-select-a-contact")
+    property string validationError: qsTr("Please select a contact")
     property alias validationErrorAlignment: select.validationErrorAlignment
     property bool isValid: false
     property alias isPending: ensResolver.isPending
 
     property bool readOnly: false
     property bool isResolvedAddress: false
-    //% "Select a contact"
-    property string selectAContact: qsTrId("select-a-contact")
-    //% "Contact does not have an ENS address. Please send a transaction in chat."
-    property string noEnsAddressMessage: qsTrId("contact-does-not-have-an-ens-address--please-send-a-transaction-in-chat-")
+    property string selectAContact: qsTr("Select a contact")
+    property string noEnsAddressMessage: qsTr("Contact does not have an ENS address. Please send a transaction in chat.")
     property bool isContact: false
 
     function resolveEns() {
@@ -74,8 +71,7 @@ Item {
         id: inpReadOnly
         visible: root.readOnly
         width: parent.width
-        //% "No contact selected"
-        text: (root.selectedContact && root.selectedContact.alias) ? root.selectedContact.alias : qsTrId("no-contact-selected")
+        text: (root.selectedContact && root.selectedContact.alias) ? root.selectedContact.alias : qsTr("No contact selected")
         textField.leftPadding: 14
         textField.topPadding: 18
         textField.bottomPadding: 18
@@ -123,8 +119,7 @@ Item {
             height: 186
             StatusBaseText {
                 anchors.fill: parent
-                //% "You don’t have any contacts yet"
-                text: qsTrId("you-don-t-have-any-contacts-yet")
+                text: qsTr("You don’t have any contacts yet")
                 verticalAlignment: Text.AlignVCenter
                 horizontalAlignment: Text.AlignHCenter
                 font.pixelSize: 13
diff --git a/ui/imports/shared/controls/ContactsListAndSearch.qml b/ui/imports/shared/controls/ContactsListAndSearch.qml
index 4bf68a38e3..e598695a66 100644
--- a/ui/imports/shared/controls/ContactsListAndSearch.qml
+++ b/ui/imports/shared/controls/ContactsListAndSearch.qml
@@ -54,8 +54,7 @@ Item {
             pubKey = ""
             ensUsername = "";
         } else if (RootStore.userProfileInst.pubKey === chatKey.text) {
-            //% "Can't chat with yourself"
-            root.validationError = qsTrId("can-t-chat-with-yourself");
+            root.validationError = qsTr("Can't chat with yourself");
         } else {
             root.validationError = "";
         }
@@ -66,8 +65,7 @@ Item {
         id: chatKey
         property bool hasValidSearchResult: false
 
-        //% "Enter ENS username or chat key"
-        placeholderText: qsTrId("enter-contact-code")
+        placeholderText: qsTr("Enter ENS username or chat key")
         visible: showSearch
         height: visible ? implicitHeight : 0
         Keys.onReleased: {
@@ -117,8 +115,7 @@ Item {
                     searchResults.showProfileNotFoundMessage = root.showContactList
                 } else {
                     if (userProfile.pubKey === resolvedPubKey) {
-                        //% "Can't chat with yourself"
-                        root.validationError = qsTrId("can-t-chat-with-yourself");
+                        root.validationError = qsTr("Can't chat with yourself");
                     } else {
                         chatKey.hasValidSearchResult = true
                         searchResults.username = Utils.addStatusEns(chatKey.text.trim())
diff --git a/ui/imports/shared/controls/CopyToClipBoardButton.qml b/ui/imports/shared/controls/CopyToClipBoardButton.qml
index 8daf31dc18..79e69dd142 100644
--- a/ui/imports/shared/controls/CopyToClipBoardButton.qml
+++ b/ui/imports/shared/controls/CopyToClipBoardButton.qml
@@ -30,8 +30,7 @@ StatusRoundButton {
 
     StatusToolTip {
         id: toolTip
-        //% "Copied!"
-        text: qsTrId("copied-")
+        text: qsTr("Copied!")
         orientation: tooltipUnder ? StatusToolTip.Orientation.Bottom: StatusToolTip.Orientation.Top
     }
 
diff --git a/ui/imports/shared/controls/GasSelector.qml b/ui/imports/shared/controls/GasSelector.qml
index 933b48fa25..b53c91784b 100644
--- a/ui/imports/shared/controls/GasSelector.qml
+++ b/ui/imports/shared/controls/GasSelector.qml
@@ -36,12 +36,9 @@ Item {
 
     property double selectedGasEthValue
     property double selectedGasFiatValue
-    //% "Must be greater than 0"
-    property string greaterThan0ErrorMessage: qsTrId("must-be-greater-than-0")
-    //% "This needs to be a number"
-    property string invalidInputErrorMessage: qsTrId("this-needs-to-be-a-number")
-    //% "Please enter an amount"
-    property string noInputErrorMessage: qsTrId("please-enter-an-amount")
+    property string greaterThan0ErrorMessage: qsTr("Must be greater than 0")
+    property string invalidInputErrorMessage: qsTr("This needs to be a number")
+    property string noInputErrorMessage: qsTr("Please enter an amount")
     property bool isValid: true
     readonly property string uuid: Utils.uuid()
 
@@ -200,10 +197,8 @@ Item {
         anchors.right: parent.right
         visible: root.suggestedFees.eip1559Enabled
         text: advancedMode ?
-            //% "Use suggestions"
-            qsTrId("use-suggestions") :
-            //% "Use custom"
-            qsTrId("use-custom")
+            qsTr("Use suggestions") :
+            qsTr("Use custom")
         font.pixelSize: 13
         onClicked: advancedMode = !advancedMode
     }
@@ -246,8 +241,7 @@ Item {
         GasSelectorButton {
             id: optimalGasButton
             buttonGroup: gasGroup
-            //% "Optimal"
-            text: qsTrId("optimal")
+            text: qsTr("Optimal")
             price: {
                 if (!root.suggestedFees.eip1559Enabled) {
                     // Setting the gas price field here because the binding didn't work
@@ -308,8 +302,7 @@ Item {
 
         Input {
             id: inputGasLimit
-            //% "Gas amount limit"
-            label: qsTrId("gas-amount-limit")
+            label: qsTr("Gas amount limit")
             text: "21000"
             inputLabel.color: Style.current.secondaryText
             customHeight: 56
@@ -354,8 +347,7 @@ Item {
 
         StyledText {
             color: Style.current.secondaryText
-            //% "Gwei"
-            text: qsTrId("gwei")
+            text: qsTr("Gwei")
             visible: root.suggestedFees.eip1559Enabled
             anchors.top: parent.top
             anchors.topMargin: 42
@@ -366,8 +358,7 @@ Item {
 
         Input {
             id: inputGasPrice
-            //% "Per-gas overall limit"
-            label: qsTrId("per-gas-overall-limit")
+            label: qsTr("Per-gas overall limit")
             inputLabel.color: Style.current.secondaryText
             anchors.top: parent.top
             anchors.left: undefined
@@ -385,8 +376,7 @@ Item {
 
         StyledText {
             color: Style.current.secondaryText
-            //% "Gwei"
-            text: qsTrId("gwei")
+            text: qsTr("Gwei")
             anchors.top: parent.top
             anchors.topMargin: 42
             anchors.right: inputGasPrice.right
@@ -412,11 +402,10 @@ Item {
             id: maxPriorityFeeText
             anchors.left: parent.left
             visible: root.suggestedFees.eip1559Enabled
-            //% "Maximum priority fee: %1 ETH"
             text: {
                 let v = selectedGasEthValue > 0.00009 ? selectedGasEthValue :
                     (selectedGasEthValue < 0.000001 ? "0.000000..." : selectedGasEthValue.toFixed(6))
-                return qsTrId("maximum-priority-fee---1-eth").arg(v)
+                return qsTr("Maximum priority fee: %1 ETH").arg(v)
             }
             anchors.top: errorsText.bottom
             anchors.topMargin: Style.current.smallPadding + 5
@@ -438,8 +427,7 @@ Item {
 
         StyledText {
             id: maxPriorityFeeDetailsText
-            //% "Maximum overall price for the transaction. If the block base fee exceeds this, it will be included in a following block with a lower base fee."
-            text: qsTrId("maximum-overall-price-for-the-transaction--if-the-block-base-fee-exceeds-this--it-will-be-included-in-a-following-block-with-a-lower-base-fee-")
+            text: qsTr("Maximum overall price for the transaction. If the block base fee exceeds this, it will be included in a following block with a lower base fee.")
             visible: root.suggestedFees.eip1559Enabled
             width: parent.width
             anchors.top: maxPriorityFeeText.bottom
diff --git a/ui/imports/shared/controls/GasValidator.qml b/ui/imports/shared/controls/GasValidator.qml
index 48bce5650a..a807a6798c 100644
--- a/ui/imports/shared/controls/GasValidator.qml
+++ b/ui/imports/shared/controls/GasValidator.qml
@@ -59,8 +59,7 @@ Column {
     }
     StyledText {
         id: txtValidationError
-        //% "Not enough ETH for gas"
-        text: qsTrId("wallet-insufficient-gas")
+        text: qsTr("Not enough ETH for gas")
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignHCenter
         font.pixelSize: 13
diff --git a/ui/imports/shared/controls/Input.qml b/ui/imports/shared/controls/Input.qml
index 85eaec2a1d..baef9b4b38 100644
--- a/ui/imports/shared/controls/Input.qml
+++ b/ui/imports/shared/controls/Input.qml
@@ -162,16 +162,12 @@ Item {
                         text: {
                             if (copied) {
                                 return inputBox.copyToClipboard ?
-                                            //% "Copied"
-                                            qsTrId("sharing-copied-to-clipboard")  :
-                                            //% "Pasted"
-                                            qsTrId("pasted")
+                                            qsTr("Copied")  :
+                                            qsTr("Pasted")
                             }
                             return inputBox.copyToClipboard ?
-                                        //% "Copy"
-                                        qsTrId("copy-to-clipboard") :
-                                        //% "Paste"
-                                        qsTrId("paste")
+                                        qsTr("Copy") :
+                                        qsTr("Paste")
 
                         }
                         onClicked: {
diff --git a/ui/imports/shared/controls/RecipientSelector.qml b/ui/imports/shared/controls/RecipientSelector.qml
index addd005214..5c222632e0 100644
--- a/ui/imports/shared/controls/RecipientSelector.qml
+++ b/ui/imports/shared/controls/RecipientSelector.qml
@@ -26,8 +26,7 @@ Item {
     property var selectedRecipient
     property bool readOnly: false
     height: inpAddress.height + txtLabel.height
-    //% "Invalid ethereum address"
-    readonly property string addressValidationError: qsTrId("invalid-ethereum-address")
+    readonly property string addressValidationError: qsTr("Invalid ethereum address")
     property alias wrongInputValidationError: inpAddress.wrongInputValidationError
     property bool isValid: false
     property bool isSelectorVisible: true
@@ -46,12 +45,9 @@ Item {
         }
     }
     readonly property var sources: [
-        //% "Address"
-        { text: qsTrId("address"), value: RecipientSelector.Type.Address, visible: true },
-        //% "My account"
-        { text: qsTrId("my-account"), value: RecipientSelector.Type.Account, visible: true },
-        //% "Contact"
-        { text: qsTrId("chat-is-a-contact"), value: RecipientSelector.Type.Contact, visible: true }
+        { text: qsTr("Address"), value: RecipientSelector.Type.Address, visible: true },
+        { text: qsTr("My account"), value: RecipientSelector.Type.Account, visible: true },
+        { text: qsTr("Contact"), value: RecipientSelector.Type.Contact, visible: true }
     ]
     property var selectedType: RecipientSelector.Type.Address
 
@@ -122,8 +118,7 @@ Item {
     Text {
         id: txtLabel
         visible: label !== ""
-        //% "Recipient"
-        text: qsTrId("recipient")
+        text: qsTr("Recipient")
         font.pixelSize: 13
         font.family: Style.current.fontRegular.name
         font.weight: Font.Medium
diff --git a/ui/imports/shared/controls/SearchBox.qml b/ui/imports/shared/controls/SearchBox.qml
index 1813d0e1e8..1c2b62eb13 100644
--- a/ui/imports/shared/controls/SearchBox.qml
+++ b/ui/imports/shared/controls/SearchBox.qml
@@ -8,8 +8,7 @@ import StatusQ.Controls 0.1
 
 StatusInput {
     id: searchBox
-    //% "Search"
-    input.placeholderText: qsTrId("search")
+    input.placeholderText: qsTr("Search")
     input.icon.name: "search"
     input.clearable: true
     leftPadding: 0
diff --git a/ui/imports/shared/controls/SeedPhraseTextArea.qml b/ui/imports/shared/controls/SeedPhraseTextArea.qml
index a0f3f4df8a..9aa9358549 100644
--- a/ui/imports/shared/controls/SeedPhraseTextArea.qml
+++ b/ui/imports/shared/controls/SeedPhraseTextArea.qml
@@ -21,16 +21,13 @@ Item {
         errorText.text = "";
 
         if (!Utils.isMnemonic(mnemonicTextField.textField.text)) {
-            //% "Invalid seed phrase"
-            errorText.text = qsTrId("custom-seed-phrase")
+            errorText.text = qsTr("Invalid seed phrase")
         } else {
             errorText.text = onboardingModule.validateMnemonic(mnemonicTextField.textField.text)
             const regex = new RegExp('word [a-z]+ not found in the dictionary', 'i');
             if (regex.test(errorText.text)) {
-                //% "Invalid seed phrase"
-                errorText.text = qsTrId("custom-seed-phrase") + '. ' +
-                        //% "This seed phrase doesn't match our supported dictionary. Check for misspelled words."
-                        qsTrId("custom-seed-phrase-text-1")
+                errorText.text = qsTr("Invalid seed phrase") + '. ' +
+                        qsTr("This seed phrase doesn't match our supported dictionary. Check for misspelled words.")
             }
         }
         return errorText.text === ""
@@ -48,8 +45,7 @@ Item {
         textField.verticalAlignment: TextEdit.AlignVCenter
         textField.font.pixelSize: 15
         textField.font.weight: Font.DemiBold
-        //% "Start with the first word"
-        placeholderText: qsTrId("start-with-the-first-word")
+        placeholderText: qsTr("Start with the first word")
         textField.placeholderTextColor: Style.current.secondaryText
         textField.selectByMouse: true
         textField.selectByKeyboard: true
diff --git a/ui/imports/shared/controls/SendToContractWarning.qml b/ui/imports/shared/controls/SendToContractWarning.qml
index 59401603ca..b81a63f80d 100644
--- a/ui/imports/shared/controls/SendToContractWarning.qml
+++ b/ui/imports/shared/controls/SendToContractWarning.qml
@@ -10,8 +10,7 @@ Item {
     id: root
     anchors.left: parent.left
     anchors.right: parent.right
-    //% "Tokens will be sent directly to a contract address, which may result in a loss of funds. To transfer ERC-20 tokens, ensure the recipient address is the address of the destination wallet."
-    property string sendToContractWarningMessage: qsTrId("tokens-will-be-sent-directly-to-a-contract-address--which-may-result-in-a-loss-of-funds--to-transfer-erc-20-tokens--ensure-the-recipient-address-is-the-address-of-the-destination-wallet-")
+    property string sendToContractWarningMessage: qsTr("Tokens will be sent directly to a contract address, which may result in a loss of funds. To transfer ERC-20 tokens, ensure the recipient address is the address of the destination wallet.")
     property var selectedRecipient
     property bool isValid: true
 
diff --git a/ui/imports/shared/controls/TransactionDelegate.qml b/ui/imports/shared/controls/TransactionDelegate.qml
index 72d1ed616e..ce425c3165 100644
--- a/ui/imports/shared/controls/TransactionDelegate.qml
+++ b/ui/imports/shared/controls/TransactionDelegate.qml
@@ -98,10 +98,8 @@ Rectangle {
 
         StyledText {
             text: isIncoming ?
-                    //% "From "
-                    qsTrId("from-") :
-                    //% "To "
-                    qsTrId("to-")
+                    qsTr("From ") :
+                    qsTr("To ")
             color: Style.current.secondaryText
             font.pixelSize: Style.current.primaryTextFontSize
             font.strikeout: false
@@ -135,8 +133,7 @@ Rectangle {
 
         StyledText {
             id: timeIndicator
-            //% "At "
-            text: qsTrId("at-")
+            text: qsTr("At ")
             color: Style.current.secondaryText
             font.pixelSize: Style.current.primaryTextFontSize
             font.strikeout: false
diff --git a/ui/imports/shared/controls/chat/DateGroup.qml b/ui/imports/shared/controls/chat/DateGroup.qml
index 04a0874ebf..6efdb76789 100644
--- a/ui/imports/shared/controls/chat/DateGroup.qml
+++ b/ui/imports/shared/controls/chat/DateGroup.qml
@@ -35,37 +35,23 @@ StyledText {
         }
 
         if (now.toDateString() === currentMsgDate.toDateString()) {
-            //% "Today"
-            return qsTrId("today")
+            return qsTr("Today")
         } else if (yesterday.toDateString() === currentMsgDate.toDateString()) {
-            //% "Yesterday"
-            return qsTrId("yesterday")
+            return qsTr("Yesterday")
         } else {
             const monthNames = [
-                //% "January"
-                qsTrId("january"),
-                //% "February"
-                qsTrId("february"),
-                //% "March"
-                qsTrId("march"),
-                //% "April"
-                qsTrId("april"),
-                //% "May"
-                qsTrId("may"),
-                //% "June"
-                qsTrId("june"),
-                //% "July"
-                qsTrId("july"),
-                //% "August"
-                qsTrId("august"),
-                //% "September"
-                qsTrId("september"),
-                //% "October"
-                qsTrId("october"),
-                //% "November"
-                qsTrId("november"),
-                //% "December"
-                qsTrId("december")
+                qsTr("January"),
+                qsTr("February"),
+                qsTr("March"),
+                qsTr("April"),
+                qsTr("May"),
+                qsTr("June"),
+                qsTr("July"),
+                qsTr("August"),
+                qsTr("September"),
+                qsTr("October"),
+                qsTr("November"),
+                qsTr("December")
             ];
             return monthNames[currentMsgDate.getMonth()] + ", " + currentMsgDate.getDate()
         }
diff --git a/ui/imports/shared/controls/chat/FetchMoreMessagesButton.qml b/ui/imports/shared/controls/chat/FetchMoreMessagesButton.qml
index cb55af8651..920016e417 100644
--- a/ui/imports/shared/controls/chat/FetchMoreMessagesButton.qml
+++ b/ui/imports/shared/controls/chat/FetchMoreMessagesButton.qml
@@ -56,8 +56,7 @@ Item {
         font.weight: Font.Medium
         font.pixelSize: Style.current.primaryTextFontSize
         color: Style.current.blue
-        //% "↓ Fetch more messages"
-        text: qsTrId("load-more-messages")
+        text: qsTr("↓ Fetch more messages")
         horizontalAlignment: Text.AlignHCenter
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: sep1.bottom
diff --git a/ui/imports/shared/controls/chat/GapComponent.qml b/ui/imports/shared/controls/chat/GapComponent.qml
index da5dc64d0f..ba27c79d68 100644
--- a/ui/imports/shared/controls/chat/GapComponent.qml
+++ b/ui/imports/shared/controls/chat/GapComponent.qml
@@ -23,7 +23,7 @@ Item {
         font.weight: Font.Medium
         font.pixelSize: Style.current.primaryTextFontSize
         color: Style.current.blue
-        text: qsTrId("fetch-messages")
+        text: qsTr("fetch-messages")
         horizontalAlignment: Text.AlignHCenter
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: sep1.bottom
@@ -45,7 +45,7 @@ Item {
         wrapMode: Text.WordWrap
         horizontalAlignment: Text.AlignHCenter
         color: Style.current.secondaryText
-        text: qsTrId("between--1-and--2").arg(new Date(root.gapFrom * 1000)).arg(new Date(root.gapTo * 1000))
+        text: qsTr("between--1-and--2").arg(new Date(root.gapFrom * 1000)).arg(new Date(root.gapTo * 1000))
     }
     Separator {
         anchors.top: fetchDate.bottom
diff --git a/ui/imports/shared/controls/chat/GasSelectorButton.qml b/ui/imports/shared/controls/chat/GasSelectorButton.qml
index cdd2900aac..b22909fdd4 100644
--- a/ui/imports/shared/controls/chat/GasSelectorButton.qml
+++ b/ui/imports/shared/controls/chat/GasSelectorButton.qml
@@ -10,8 +10,7 @@ import shared.controls 1.0
 // TODO: use StatusQ components
 Rectangle {
     property var buttonGroup
-    //% "Low"
-    property string text: qsTrId("low")
+    property string text: qsTr("Low")
     property string gasLimit
     property double price: 1
     property string defaultCurrency: "USD"
diff --git a/ui/imports/shared/controls/chat/Retry.qml b/ui/imports/shared/controls/chat/Retry.qml
index d7cba050f1..d263a492db 100644
--- a/ui/imports/shared/controls/chat/Retry.qml
+++ b/ui/imports/shared/controls/chat/Retry.qml
@@ -7,8 +7,7 @@ import utils 1.0
 StyledText {
     id: retryLbl
     color: Style.current.red
-    //% "Resend"
-    text: qsTrId("resend-message")
+    text: qsTr("Resend")
     font.pixelSize: Style.current.tertiaryTextFontSize
     visible: isCurrentUser && (timeout || isExpired)
     property bool isCurrentUser: false
diff --git a/ui/imports/shared/controls/chat/SendTransactionButton.qml b/ui/imports/shared/controls/chat/SendTransactionButton.qml
index eca19a429f..971634332f 100644
--- a/ui/imports/shared/controls/chat/SendTransactionButton.qml
+++ b/ui/imports/shared/controls/chat/SendTransactionButton.qml
@@ -25,8 +25,7 @@ Item {
     StyledText {
         id: signText
         color: Style.current.blue
-        //% "Sign and send"
-        text: qsTrId("sign-and-send")
+        text: qsTr("Sign and send")
         horizontalAlignment: Text.AlignHCenter
         wrapMode: Text.WordWrap
         font.weight: Font.Medium
diff --git a/ui/imports/shared/controls/chat/StateBubble.qml b/ui/imports/shared/controls/chat/StateBubble.qml
index c5b3d988d0..56bba194f6 100644
--- a/ui/imports/shared/controls/chat/StateBubble.qml
+++ b/ui/imports/shared/controls/chat/StateBubble.qml
@@ -58,28 +58,18 @@ Rectangle {
         }
         text: {
             switch (root.state) {
-            //% "Pending"
-            case Constants.pending: return qsTrId("invite-chat-pending")
-            //% "Confirmed"
-            case Constants.confirmed: return qsTrId("status-confirmed")
-            //% "Unknown token"
-            case Constants.unknown: return qsTrId("unknown-token")
-            //% "Address requested"
-            case Constants.addressRequested: return qsTrId("address-requested")
-            //% "Waiting to accept"
-            case Constants.transactionRequested: return qsTrId("waiting-to-accept")
+            case Constants.pending: return qsTr("Pending")
+            case Constants.confirmed: return qsTr("Confirmed")
+            case Constants.unknown: return qsTr("Unknown token")
+            case Constants.addressRequested: return qsTr("Address requested")
+            case Constants.transactionRequested: return qsTr("Waiting to accept")
             case Constants.addressReceived: return (!root.outgoing ?
-                //% "Address shared"
-                qsTrId("address-shared") :
-                //% "Address received"
-                qsTrId("address-received"))
+                qsTr("Address shared") :
+                qsTr("Address received"))
             case Constants.transactionDeclined:
-            //% "Transaction declined"
-            case Constants.declined: return qsTrId("transaction-declined")
-            //% "failure"
-            case Constants.failure: return qsTrId("failure")
-            //% "Unknown state"
-            default: return qsTrId("unknown-state")
+            case Constants.declined: return qsTr("Transaction declined")
+            case Constants.failure: return qsTr("failure")
+            default: return qsTr("Unknown state")
             }
         }
         font.weight: Font.Medium
diff --git a/ui/imports/shared/panels/AddressRequiredValidator.qml b/ui/imports/shared/panels/AddressRequiredValidator.qml
index e54c6b856e..bbd18a61ee 100644
--- a/ui/imports/shared/panels/AddressRequiredValidator.qml
+++ b/ui/imports/shared/panels/AddressRequiredValidator.qml
@@ -29,8 +29,7 @@ Column {
 
     StatusBaseText {
         id: txtValidationError
-        //% "You need to request the recipient’s address first.\nAssets won’t be sent yet."
-        text: qsTrId("you-need-to-request-the-recipient-s-address-first--nassets-won-t-be-sent-yet-")
+        text: qsTr("You need to request the recipient’s address first.\nAssets won’t be sent yet.")
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignHCenter
         wrapMode: Text.WordWrap
diff --git a/ui/imports/shared/panels/BalanceValidator.qml b/ui/imports/shared/panels/BalanceValidator.qml
index 37de650804..ea0ca6ec65 100644
--- a/ui/imports/shared/panels/BalanceValidator.qml
+++ b/ui/imports/shared/panels/BalanceValidator.qml
@@ -48,8 +48,7 @@ Column {
     }
     StyledText {
         id: txtValidationError
-        //% "Insufficient balance"
-        text: qsTrId("insufficient-balance")
+        text: qsTr("Insufficient balance")
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignHCenter
         font.pixelSize: 13
diff --git a/ui/imports/shared/panels/chat/ChatButtonsPanel.qml b/ui/imports/shared/panels/chat/ChatButtonsPanel.qml
index 92df0bfbb8..c96c300c77 100644
--- a/ui/imports/shared/panels/chat/ChatButtonsPanel.qml
+++ b/ui/imports/shared/panels/chat/ChatButtonsPanel.qml
@@ -189,8 +189,8 @@ Rectangle {
             id: deleteMessageConfirmationDialogComponent
 
             ConfirmationDialog {
-                header.title: qsTrId("Confirm deleting this message")
-                confirmationText: qsTrId("Are you sure you want to delete this message? Be aware that other clients are not guaranteed to delete the message as well.")
+                header.title: qsTr("Confirm deleting this message")
+                confirmationText: qsTr("Are you sure you want to delete this message? Be aware that other clients are not guaranteed to delete the message as well.")
                 height: 260
                 checkbox.visible: true
                 executeConfirm: function () {
diff --git a/ui/imports/shared/panels/chat/EmojiReactionsPanel.qml b/ui/imports/shared/panels/chat/EmojiReactionsPanel.qml
index a1bbfe9361..b6c6bd5955 100644
--- a/ui/imports/shared/panels/chat/EmojiReactionsPanel.qml
+++ b/ui/imports/shared/panels/chat/EmojiReactionsPanel.qml
@@ -185,8 +185,7 @@ Item {
 
             StatusQ.StatusToolTip {
               visible: addEmojiBtn.isHovered
-              //% "Add reaction"
-              text: qsTrId("add-reaction")
+              text: qsTr("Add reaction")
             }
         }
     }
diff --git a/ui/imports/shared/popups/BlockContactConfirmationDialog.qml b/ui/imports/shared/popups/BlockContactConfirmationDialog.qml
index e56b395939..c0f569eb8f 100644
--- a/ui/imports/shared/popups/BlockContactConfirmationDialog.qml
+++ b/ui/imports/shared/popups/BlockContactConfirmationDialog.qml
@@ -21,8 +21,7 @@ ModalPopup {
 
     signal blockButtonClicked()
 
-    //% "Block User"
-    title: qsTrId("block-user")
+    title: qsTr("Block User")
 
     StyledText {
         text: qsTr("Blocking will stop new messages from reaching you from %1.").arg(contactName)
@@ -41,8 +40,7 @@ ModalPopup {
             anchors.right: parent.right
             anchors.rightMargin: Style.current.smallPadding
             type: StatusBaseButton.Type.Danger
-            //% "Block User"
-            text: qsTrId("block-user")
+            text: qsTr("Block User")
             anchors.bottom: parent.bottom
             onClicked: blockContactConfirmationDialog.blockButtonClicked()
         }
diff --git a/ui/imports/shared/popups/ChatCommandsPopup.qml b/ui/imports/shared/popups/ChatCommandsPopup.qml
index 91554f89c9..396cd6e252 100644
--- a/ui/imports/shared/popups/ChatCommandsPopup.qml
+++ b/ui/imports/shared/popups/ChatCommandsPopup.qml
@@ -44,8 +44,7 @@ Popup {
         spacing: Style.current.halfPadding
 
         StatusChatCommandButton {
-            //% "Send transaction"
-            text: qsTrId("send-transaction")
+            text: qsTr("Send transaction")
             icon.color: Style.current.purple
             icon.name: "send"
             onClicked: root.sendTransactionCommandButtonClicked()
@@ -53,8 +52,7 @@ Popup {
 
 
         StatusChatCommandButton {
-            //% "Request transaction"
-            text: qsTrId("request-transaction")
+            text: qsTr("Request transaction")
             icon.color: Style.current.orange
             icon.name: "send"
             icon.rotation: 180
diff --git a/ui/imports/shared/popups/ImageCropperModal.qml b/ui/imports/shared/popups/ImageCropperModal.qml
index d0a63a6f2f..429a7e42ed 100644
--- a/ui/imports/shared/popups/ImageCropperModal.qml
+++ b/ui/imports/shared/popups/ImageCropperModal.qml
@@ -22,8 +22,7 @@ ModalPopup {
     id: cropImageModal
     width: image.width + 50
     height: image.height + 170
-    //% "Crop your image (optional)"
-    title: qsTrId("crop-your-image--optional-")
+    title: qsTr("Crop your image (optional)")
 
     Image {
         id: image
@@ -66,8 +65,7 @@ ModalPopup {
 
     footer: StatusButton {
         id: doneBtn
-        //% "Finish"
-        text: qsTrId("finish")
+        text: qsTr("Finish")
         anchors.right: parent.right
         anchors.bottom: parent.bottom
         onClicked: {
diff --git a/ui/imports/shared/popups/ImportCommunityPopup.qml b/ui/imports/shared/popups/ImportCommunityPopup.qml
index f7a97659f7..7ff9796690 100644
--- a/ui/imports/shared/popups/ImportCommunityPopup.qml
+++ b/ui/imports/shared/popups/ImportCommunityPopup.qml
@@ -22,8 +22,7 @@ StatusModal {
         return Utils.isPrivateKey(communityKey) && Utils.startsWith0x(communityKey)
     }
 
-    //% "Import Community"
-    header.title: qsTrId("Import Community")
+    header.title: qsTr("Import Community")
 
     onClosed: {
         root.destroy();
@@ -41,8 +40,7 @@ StatusModal {
             id: infoText1
             anchors.top: parent.top
             anchors.topMargin: Style.current.padding
-            //% "Entering a community key will grant you the ownership of that community. Please be responsible with it and don’t share the key with people you don’t trust."
-            text: qsTrId("entering-a-community-key-will-grant-you-the-ownership-of-that-community--please-be-responsible-with-it-and-don-t-share-the-key-with-people-you-don-t-trust-")
+            text: qsTr("Entering a community key will grant you the ownership of that community. Please be responsible with it and don’t share the key with people you don’t trust.")
             wrapMode: Text.WordWrap
             width: parent.width
             font.pixelSize: 13
@@ -51,8 +49,7 @@ StatusModal {
 
         StyledTextArea {
             id: keyInput
-            //% "Community private key"
-            label: qsTrId("Community key")
+            label: qsTr("Community private key")
             placeholderText: "0x0..."
             customHeight: 110
             anchors.top: infoText1.bottom
@@ -70,8 +67,7 @@ StatusModal {
         StatusQControls.StatusButton {
             id: importButton
             enabled: false
-            //% "Import"
-            text: qsTrId("import")
+            text: qsTr("Import")
             onClicked: {
                 let communityKey = keyInput.text.trim();
                 if (!communityKey.startsWith("0x")) {
diff --git a/ui/imports/shared/popups/InviteFriendsPopup.qml b/ui/imports/shared/popups/InviteFriendsPopup.qml
index e588527855..4ec74c381d 100644
--- a/ui/imports/shared/popups/InviteFriendsPopup.qml
+++ b/ui/imports/shared/popups/InviteFriendsPopup.qml
@@ -6,13 +6,11 @@ StatusModal {
     id: root
     anchors.centerIn: parent
 
-    //% "Get Status at https://status.im"
-    readonly property string getStatusText: qsTrId("get-status-at-https---status-im")
+    readonly property string getStatusText: qsTr("Get Status at https://status.im")
 
     property var rootStore
 
-    //% "Download Status link"
-    header.title: qsTrId("download-status-link")
+    header.title: qsTr("Download Status link")
     height: 156
 
     StatusDescriptionListItem {
diff --git a/ui/imports/shared/popups/NicknamePopup.qml b/ui/imports/shared/popups/NicknamePopup.qml
index 74afacd6bf..b7b27a66bd 100644
--- a/ui/imports/shared/popups/NicknamePopup.qml
+++ b/ui/imports/shared/popups/NicknamePopup.qml
@@ -43,8 +43,7 @@ StatusModal {
 
             StatusBaseText {
                 id: descriptionText
-                //% "Nicknames help you identify others in Status. Only you can see the nicknames you’ve added"
-                text: qsTrId("nicknames-help-you-identify-others-in-status--only-you-can-see-the-nicknames-you-ve-added")
+                text: qsTr("Nicknames help you identify others in Status. Only you can see the nicknames you’ve added")
                 font.pixelSize: 15
                 wrapMode: Text.WordWrap
                 color: Theme.palette.baseColor1
@@ -53,8 +52,7 @@ StatusModal {
 
             StatusInput {
                 id: nicknameInput
-                //% "Nickname"
-                input.placeholderText: qsTrId("nickname")
+                input.placeholderText: qsTr("Nickname")
                 text: nickname
 
                 width: parent.width
@@ -78,8 +76,7 @@ StatusModal {
     rightButtons: [
         StatusButton {
             id: doneBtn
-            //% "Done"
-            text: qsTrId("done")
+            text: qsTr("Done")
             enabled: !popup.nicknameTooLong
             onClicked: editDone(nicknameInput.text)
         }
diff --git a/ui/imports/shared/popups/SelectAccountModal.qml b/ui/imports/shared/popups/SelectAccountModal.qml
index 1f5d91cfe2..ba998c3556 100644
--- a/ui/imports/shared/popups/SelectAccountModal.qml
+++ b/ui/imports/shared/popups/SelectAccountModal.qml
@@ -11,8 +11,7 @@ import StatusQ.Controls 0.1
 
 StatusModal {
     id: root
-    //% "Select account"
-    header.title: qsTrId("select-account")
+    header.title: qsTr("Select account")
     height: 284
 
     property var accounts
@@ -33,17 +32,14 @@ StatusModal {
               accounts: root.accounts
               currency: root.currency
               width: parent.width
-              //% "Choose account"
-              //% "Select account to share and receive assets"
-              label: qsTrId("select-account-to-share-and-receive-assets")
+              label: qsTr("Select account to share and receive assets")
           }
         }
     }
 
     rightButtons: [
         StatusButton {
-            //% "Confirm and share address"
-            text: qsTrId("confirm-and-share-address")
+            text: qsTr("Confirm and share address")
             onClicked: root.selectAndShareAddressButtonClicked()
         }
     ]
diff --git a/ui/imports/shared/popups/SendModal.qml b/ui/imports/shared/popups/SendModal.qml
index a58de82379..d48f42c5b5 100644
--- a/ui/imports/shared/popups/SendModal.qml
+++ b/ui/imports/shared/popups/SendModal.qml
@@ -30,8 +30,7 @@ StatusModal {
     property bool launchedFromChat: false
     property MessageDialog sendingError: MessageDialog {
         id: sendingError
-        //% "Error sending the transaction"
-        title: qsTrId("error-sending-the-transaction")
+        title: qsTr("Error sending the transaction")
         icon: StandardIcon.Critical
         standardButtons: StandardButton.Ok
     }
@@ -135,14 +134,12 @@ StatusModal {
                 RowLayout {
                     spacing: 16
                     StatusBaseText {
-                        //% "Send"
-                        text: qsTrId("command-button-send")
+                        text: qsTr("Send")
                         font.pixelSize: 15
                         color: Theme.palette.directColor1
                         Layout.alignment: Qt.AlignVCenter
                     }
                     StatusListItemTag {
-                        //% "No balances active"
                         title: assetSelector.selectedAsset.totalBalance > 0 ? qsTr("Max: ") + (assetSelector.selectedAsset ? d.maxFiatBalance : "0.00") : qsTr("No balances active")
                         closeButtonVisible: false
                         titleText.font.pixelSize: 12
@@ -285,10 +282,8 @@ StatusModal {
                     id: recipientSelector
                     accounts: popup.store.accounts
                     contactsStore: popup.contactsStore
-                    //% To
                     label: qsTr("To")
                     Layout.fillWidth: true
-                    //% "Enter an ENS name or address"
                     input.placeholderText: qsTr("Enter an ENS name or address")
                     input.anchors.leftMargin: 0
                     input.anchors.rightMargin: 0
@@ -351,8 +346,7 @@ StatusModal {
 
                         if (!gasEstimate.success) {
                             
-                            //% "Error estimating gas: %1"
-                            console.warn(qsTrId("error-estimating-gas---1").arg(gasEstimate.error.message))
+                            console.warn(qsTr("Error estimating gas: %1").arg(gasEstimate.error.message))
                             return
                         }
 
@@ -443,8 +437,7 @@ StatusModal {
 
                 if (!response.success) {
                     if (Utils.isInvalidPasswordMessage(response.result)){
-                        //% "Wrong password"
-                        transactionSigner.validationError = qsTrId("wrong-password")
+                        transactionSigner.validationError = qsTr("Wrong password")
                         return
                     }
                     sendingError.text = response.result
@@ -467,12 +460,12 @@ StatusModal {
         //            onTransactionCompleted: {
         //                if (success) {
         //                    //% "Transaction completed"
-        //                    Global.toastMessage.title = qsTrId("transaction-completed")
+        //                    Global.toastMessage.title = qsTr("Wrong password")
         //                    Global.toastMessage.source = Style.svg("check-circle")
         //                    Global.toastMessage.iconColor = Style.current.success
         //                } else {
         //                    //% "Transaction failed"
-        //                    Global.toastMessage.title = qsTrId("ens-registration-failed-title")
+        //                    Global.toastMessage.title = qsTr("Wrong password")
         //                    Global.toastMessage.source = Style.svg("block-icon")
         //                    Global.toastMessage.iconColor = Style.current.danger
         //                }
diff --git a/ui/imports/shared/popups/SignTransactionModal.qml b/ui/imports/shared/popups/SignTransactionModal.qml
index d1d6732742..d860c3872a 100644
--- a/ui/imports/shared/popups/SignTransactionModal.qml
+++ b/ui/imports/shared/popups/SignTransactionModal.qml
@@ -16,8 +16,7 @@ import AppLayouts.Wallet 1.0
 
 StatusModal {
     id: root
-    //% "Send"
-    header.title: qsTrId("command-button-send")
+    header.title: qsTr("Send")
     height: 540
 
     property var store
@@ -57,15 +56,14 @@ StatusModal {
         // TODO remove this else once the thread and connection are back
 //        if(!success){
 //            //% "Invalid transaction parameters"
-//            sendingError.text = qsTrId("invalid-transaction-parameters")
+//            sendingError.text = qsTr("Invalid transaction parameters")
 //            sendingError.open()
 //        }
     }
 
     property MessageDialog sendingError: MessageDialog {
         id: sendingError
-        //% "Error sending the transaction"
-        title: qsTrId("error-sending-the-transaction")
+        title: qsTr("Error sending the transaction")
         icon: StandardIcon.Critical
         standardButtons: StandardButton.Ok
     }
@@ -101,12 +99,11 @@ StatusModal {
 //                        const approveData = JSON.parse(root.store.walletModelInst.tokensView.decodeTokenApproval(selectedRecipient.address, trxData))
 //                        if(approveData.symbol)
 //                            //% "Authorize %1 %2"
-//                            return qsTrId("authorize--1--2").arg(approveData.amount).arg(approveData.symbol)
+//                            return qsTr("Error sending the transaction").arg(approveData.amount).arg(approveData.symbol)
 //                    }
                     return qsTr("Send");
                 }
-                //% "Continue"
-                footerText: qsTrId("continue")
+                footerText: qsTr("Continue")
                 showNextBtn: false
                 onBackClicked: function() {
                     if(validate()) {
@@ -119,8 +116,7 @@ StatusModal {
                     currency: root.store.currentCurrency
                     width: stack.width
                     selectedAccount: root.selectedAccount
-                    //% "Choose account"
-                    label: qsTrId("choose-account")
+                    label: qsTr("Choose account")
                     showBalanceForAssetSymbol: root.selectedAsset.symbol
                     chainId: root.chainId
                     minRequiredAssetBalance: parseFloat(root.selectedAmount)
@@ -138,8 +134,7 @@ StatusModal {
             }
             TransactionFormGroup {
                 id: groupSelectGas
-                //% "Network fee"
-                headerText: qsTrId("network-fee")
+                headerText: qsTr("Network fee")
                 footerText: qsTr("Continue")
                 showNextBtn: false
                 onBackClicked: function() {
@@ -193,10 +188,8 @@ StatusModal {
 
             TransactionFormGroup {
                 id: groupPreview
-                //% "Transaction preview"
-                headerText: qsTrId("transaction-preview")
-                //% "Sign with password"
-                footerText: qsTrId("sign-with-password")
+                headerText: qsTr("Transaction preview")
+                footerText: qsTr("Sign with password")
                 showBackBtn: false
                 onNextClicked: function() {
                     stack.push(groupSignTx, StackView.Immediate)
@@ -246,10 +239,8 @@ StatusModal {
             }
             TransactionFormGroup {
                 id: groupSignTx
-                //% "Sign with password"
-                headerText: qsTrId("sign-with-password")
-                //% "Send %1 %2"
-                footerText: qsTrId("send--1--2").arg(root.selectedAmount).arg(!!root.selectedAsset ? root.selectedAsset.symbol : "")
+                headerText: qsTr("Sign with password")
+                footerText: qsTr("Send %1 %2").arg(root.selectedAmount).arg(!!root.selectedAsset ? root.selectedAsset.symbol : "")
                 onBackClicked: function() {
                     stack.pop()
                 }
@@ -284,8 +275,7 @@ StatusModal {
     rightButtons: [
         StatusButton {
             id: btnNext
-            //% "Next"
-            text: qsTrId("next")
+            text: qsTr("Next")
             enabled: stack.currentGroup.isValid && !stack.currentGroup.isPending
             visible: stack.currentGroup.showNextBtn
             onClicked: {
@@ -348,8 +338,7 @@ StatusModal {
 
                 if (!response.success) {
                     if (Utils.isInvalidPasswordMessage(transactionId)){
-                        //% "Wrong password"
-                        transactionSigner.validationError = qsTrId("wrong-password")
+                        transactionSigner.validationError = qsTr("Wrong password")
                         return
                     }
                     sendingError.text = transactionId
diff --git a/ui/imports/shared/popups/ToastMessage.qml b/ui/imports/shared/popups/ToastMessage.qml
index cb1dd15f5c..291ab4c480 100644
--- a/ui/imports/shared/popups/ToastMessage.qml
+++ b/ui/imports/shared/popups/ToastMessage.qml
@@ -21,15 +21,13 @@ Popup {
     y: parent.height - height - Style.current.bigPadding
 
 
-    //% "View on Etherscan"
-    readonly property string defaultLinkText: qsTrId("view-on-etherscan")
+    readonly property string defaultLinkText: qsTr("View on Etherscan")
 
     property string uuid: "" // set this if you want to distinct among multiple toasts
     property url source: Style.svg("check-circle")
     property color iconColor: Style.current.primary
     property bool iconRotates: false
-    //% "Transaction pending..."
-    property string title: qsTrId("ens-transaction-pending")
+    property string title: qsTr("Transaction pending...")
     property string link: "https://etherscan.io/"
     property string linkText: defaultLinkText
     property int dissapearInMs: 4000 /* setting this to -1 makes caller responsible to close it */
@@ -49,8 +47,7 @@ Popup {
         source = Style.svg("check-circle")
         iconColor = Style.current.primary
         iconRotates = false
-        //% "Transaction pending..."
-        title = qsTrId("ens-transaction-pending")
+        title = qsTr("Transaction pending...")
         link = "https://etherscan.io/"
         linkText = defaultLinkText
         dissapearInMs = 4000
diff --git a/ui/imports/shared/popups/TransactionModal.qml b/ui/imports/shared/popups/TransactionModal.qml
index fcb4a2e81b..d4fcff622d 100644
--- a/ui/imports/shared/popups/TransactionModal.qml
+++ b/ui/imports/shared/popups/TransactionModal.qml
@@ -11,8 +11,7 @@ ModalPopup {
   id: popup
 
   property var transaction
-  //% "Transaction Details"
-  title: qsTrId("transaction-details")
+  title: qsTr("Transaction Details")
 
   Item {
     id: confirmations
@@ -37,8 +36,7 @@ ModalPopup {
 
     StyledText {
       id: confirmationsInfo
-      //% "When the transaction has 12 confirmations you can consider it settled."
-      text: qsTrId("confirmations-helper-text")
+      text: qsTr("When the transaction has 12 confirmations you can consider it settled.")
       wrapMode: Text.WordWrap
       font.pixelSize: 14
       font.weight: Font.Medium
@@ -69,8 +67,7 @@ ModalPopup {
 
     StyledText {
       id: labelBlock
-      //% "Block"
-      text: qsTrId("block")
+      text: qsTr("Block")
       font.pixelSize: 14
       font.weight: Font.Medium
       color: Style.current.secondaryText
@@ -97,8 +94,7 @@ ModalPopup {
 
     StyledText {
       id: labelHash
-      //% "Hash"
-      text: qsTrId("hash")
+      text: qsTr("Hash")
       font.pixelSize: 14
       font.weight: Font.Medium
       color: Style.current.secondaryText
@@ -126,8 +122,7 @@ ModalPopup {
 
     StyledText {
       id: labelFrom
-      //% "From"
-      text: qsTrId("from")
+      text: qsTr("From")
       font.pixelSize: 14
       font.weight: Font.Medium
       color: Style.current.secondaryText
@@ -154,8 +149,7 @@ ModalPopup {
 
     StyledText {
       id: labelTo
-      //% "To"
-      text: qsTrId("to")
+      text: qsTr("To")
       font.pixelSize: 14
       font.weight: Font.Medium
       color: Style.current.secondaryText
@@ -182,8 +176,7 @@ ModalPopup {
 
     StyledText {
       id: labelGasLimit
-      //% "Gas limit"
-      text: qsTrId("gas-limit")
+      text: qsTr("Gas limit")
       font.pixelSize: 14
       font.weight: Font.Medium
       color: Style.current.secondaryText
@@ -208,8 +201,7 @@ ModalPopup {
 
     StyledText {
       id: labelGasPrice
-      //% "Gas price"
-      text: qsTrId("gas-price")
+      text: qsTr("Gas price")
       font.pixelSize: 14
       font.weight: Font.Medium
       color: Style.current.secondaryText
@@ -234,8 +226,7 @@ ModalPopup {
 
     StyledText {
       id: labelGasUsed
-      //% "Gas used"
-      text: qsTrId("gas-used")
+      text: qsTr("Gas used")
       font.pixelSize: 14
       font.weight: Font.Medium
       color: Style.current.secondaryText
@@ -260,8 +251,7 @@ ModalPopup {
 
     StyledText {
       id: labelNonce
-      //% "Nonce"
-      text: qsTrId("nonce")
+      text: qsTr("Nonce")
       font.pixelSize: 14
       font.weight: Font.Medium
       color: Style.current.secondaryText
diff --git a/ui/imports/shared/popups/UnblockContactConfirmationDialog.qml b/ui/imports/shared/popups/UnblockContactConfirmationDialog.qml
index d02c4c73c7..b54be91f82 100644
--- a/ui/imports/shared/popups/UnblockContactConfirmationDialog.qml
+++ b/ui/imports/shared/popups/UnblockContactConfirmationDialog.qml
@@ -21,12 +21,10 @@ ModalPopup {
 
     signal unblockButtonClicked()
 
-    //% "Unblock User"
-    title: qsTrId("unblock-user")
+    title: qsTr("Unblock User")
 
     StyledText {
-        //% "Unblocking will allow new messages you received from %1 to reach you."
-        text: qsTrId("unblocking-will-allow-new-messages-you-received-from--1-to-reach-you-").arg(contactName)
+        text: qsTr("Unblocking will allow new messages you received from %1 to reach you.").arg(contactName)
         font.pixelSize: 15
         anchors.left: parent.left
         anchors.right: parent.right
@@ -43,8 +41,7 @@ ModalPopup {
             anchors.right: parent.right
             anchors.rightMargin: Style.current.smallPadding
             type: StatusBaseButton.Type.Danger
-            //% "Unblock User"
-            text: qsTrId("unblock-user")
+            text: qsTr("Unblock User")
             anchors.bottom: parent.bottom
             onClicked: unblockContactConfirmationDialog.unblockButtonClicked()
         }
diff --git a/ui/imports/shared/status/StatusChatImageExtensionValidator.qml b/ui/imports/shared/status/StatusChatImageExtensionValidator.qml
index e8002bedf3..a4780574d9 100644
--- a/ui/imports/shared/status/StatusChatImageExtensionValidator.qml
+++ b/ui/imports/shared/status/StatusChatImageExtensionValidator.qml
@@ -9,10 +9,8 @@ import ".."
 StatusChatImageValidator {
     id: root
 
-    //% "Format not supported."
-    errorMessage: qsTrId("format-not-supported-")
-    //% "Upload %1 only"
-    secondaryErrorMessage: qsTrId("upload--1-only").arg(Constants.acceptedDragNDropImageExtensions.map(ext => ext.replace(".", "").toUpperCase() + "s").join(", "))
+    errorMessage: qsTr("Format not supported.")
+    secondaryErrorMessage: qsTr("Upload %1 only").arg(Constants.acceptedDragNDropImageExtensions.map(ext => ext.replace(".", "").toUpperCase() + "s").join(", "))
 
     onImagesChanged: {
         let isValid = true
diff --git a/ui/imports/shared/status/StatusChatImageLoader.qml b/ui/imports/shared/status/StatusChatImageLoader.qml
index be46b19dec..d0ab1af5f7 100644
--- a/ui/imports/shared/status/StatusChatImageLoader.qml
+++ b/ui/imports/shared/status/StatusChatImageLoader.qml
@@ -87,10 +87,8 @@ Item {
             StyledText {
                 anchors.centerIn: parent
                 text: imageMessage.status === Image.Error?
-                        //% "Error loading the image"
-                        qsTrId("error-loading-the-image") :
-                        //% "Loading image..."
-                        qsTrId("loading-image---")
+                        qsTr("Error loading the image") :
+                        qsTr("Loading image...")
                 color: imageMessage.status === Image.Error?
                         Style.current.red :
                         Style.current.textColor
diff --git a/ui/imports/shared/status/StatusChatImageQtyValidator.qml b/ui/imports/shared/status/StatusChatImageQtyValidator.qml
index baf22b3f05..aa2e9bd038 100644
--- a/ui/imports/shared/status/StatusChatImageQtyValidator.qml
+++ b/ui/imports/shared/status/StatusChatImageQtyValidator.qml
@@ -8,8 +8,7 @@ import ".."
 
 StatusChatImageValidator {
     id: root
-    //% "You can only upload %1 images at a time"
-    errorMessage: qsTrId("you-can-only-upload--1-images-at-a-time").arg(Constants.maxUploadFiles)
+    errorMessage: qsTr("You can only upload %1 images at a time").arg(Constants.maxUploadFiles)
 
     onImagesChanged: {
         root.isValid = images.length <= Constants.maxUploadFiles
diff --git a/ui/imports/shared/status/StatusChatImageSizeValidator.qml b/ui/imports/shared/status/StatusChatImageSizeValidator.qml
index 1cfc50cb35..1d1234a6da 100644
--- a/ui/imports/shared/status/StatusChatImageSizeValidator.qml
+++ b/ui/imports/shared/status/StatusChatImageSizeValidator.qml
@@ -20,6 +20,5 @@ StatusChatImageValidator {
         })
         root.isValid = isValid
     }
-    //% "Max image size is %1 MB"
-    errorMessage: qsTrId("max-image-size-is--1-mb").arg(Constants.maxUploadFilesizeMB)
+    errorMessage: qsTr("Max image size is %1 MB").arg(Constants.maxUploadFilesizeMB)
 }
diff --git a/ui/imports/shared/status/StatusChatInput.qml b/ui/imports/shared/status/StatusChatInput.qml
index 277c143ef8..0c9c0985ea 100644
--- a/ui/imports/shared/status/StatusChatInput.qml
+++ b/ui/imports/shared/status/StatusChatInput.qml
@@ -57,8 +57,7 @@ Rectangle {
 
     property int chatType
 
-    //% "Type a message."
-    property string chatInputPlaceholder: qsTrId("type-a-message-")
+    property string chatInputPlaceholder: qsTr("Type a message.")
 
     property alias textInput: messageInputField
     property bool isStatusUpdateInput: chatType === Constants.chatType.profile
@@ -643,13 +642,11 @@ Rectangle {
 
     FileDialog {
         id: imageDialog
-        //% "Please choose an image"
-        title: qsTrId("please-choose-an-image")
+        title: qsTr("Please choose an image")
         folder: shortcuts.pictures
         selectMultiple: true
         nameFilters: [
-            //% "Image files (%1)"
-            qsTrId("image-files---1-").arg(Constants.acceptedDragNDropImageExtensions.map(img => "*" + img).join(" "))
+            qsTr("Image files (%1)").arg(Constants.acceptedDragNDropImageExtensions.map(img => "*" + img).join(" "))
         ]
         onAccepted: {
             imageBtn.highlighted = false
@@ -668,11 +665,9 @@ Rectangle {
 
     MessageDialog {
         id: messageTooLongDialog
-        //% "Your message is too long."
-        title: qsTrId("your-message-is-too-long.")
+        title: qsTr("Your message is too long.")
         icon: StandardIcon.Critical
-        //% "Please make your message shorter. We have set the limit to 2000 characters to be courteous of others."
-        text: qsTrId("please-make-your-message-shorter.-we-have-set-the-limit-to-2000-characters-to-be-courteous-of-others.")
+        text: qsTr("Please make your message shorter. We have set the limit to 2000 characters to be courteous of others.")
         standardButtons: StandardButton.Ok
     }
 
@@ -1061,8 +1056,7 @@ Rectangle {
                     StatusChatInputTextFormationAction {
                         wrapper: "**"
                         icon.name: "bold"
-                        //% "Bold"
-                        text: qsTrId("bold")
+                        text: qsTr("Bold")
                         selectedTextWithFormationChars: RootStore.getSelectedTextWithFormationChars(messageInputField)
                         onActionTriggered: checked ?
                                          unwrapSelection(wrapper, RootStore.getSelectedTextWithFormationChars(messageInputField)) :
@@ -1071,8 +1065,7 @@ Rectangle {
                     StatusChatInputTextFormationAction {
                         wrapper: "*"
                         icon.name: "italic"
-                        //% "Italic"
-                        text: qsTrId("italic")
+                        text: qsTr("Italic")
                         selectedTextWithFormationChars: RootStore.getSelectedTextWithFormationChars(messageInputField)
                         checked: (surroundedBy("*") && !surroundedBy("**")) || surroundedBy("***")
                         onActionTriggered: checked ?
@@ -1082,8 +1075,7 @@ Rectangle {
                     StatusChatInputTextFormationAction {
                         wrapper: "~~"
                         icon.name: "strikethrough"
-                        //% "Strikethrough"
-                        text: qsTrId("strikethrough")
+                        text: qsTr("Strikethrough")
                         selectedTextWithFormationChars: RootStore.getSelectedTextWithFormationChars(messageInputField)
                         onActionTriggered: checked ?
                                          unwrapSelection(wrapper, RootStore.getSelectedTextWithFormationChars(messageInputField)) :
@@ -1092,8 +1084,7 @@ Rectangle {
                     StatusChatInputTextFormationAction {
                         wrapper: "`"
                         icon.name: "code"
-                        //% "Code"
-                        text: qsTrId("code")
+                        text: qsTr("Code")
                         selectedTextWithFormationChars: RootStore.getSelectedTextWithFormationChars(messageInputField)
                         onActionTriggered: checked ?
                                          unwrapSelection(wrapper, RootStore.getSelectedTextWithFormationChars(messageInputField)) :
diff --git a/ui/imports/shared/status/StatusETHTransactionModal.qml b/ui/imports/shared/status/StatusETHTransactionModal.qml
index 693ab08f0b..140e53368b 100644
--- a/ui/imports/shared/status/StatusETHTransactionModal.qml
+++ b/ui/imports/shared/status/StatusETHTransactionModal.qml
@@ -45,8 +45,7 @@ ModalPopup {
 
             if (!response.success) {
                 if (Utils.isInvalidPasswordMessage(response.result)){
-                    //% "Wrong password"
-                    transactionSigner.validationError = qsTrId("wrong-password")
+                    transactionSigner.validationError = qsTr("Wrong password")
                     return
                 }
                 sendingError.text = response.result
@@ -69,8 +68,7 @@ ModalPopup {
 
     property MessageDialog sendingError: MessageDialog {
         id: sendingError
-        //% "Error sending the transaction"
-        title: qsTrId("error-sending-the-transaction")
+        title: qsTr("Error sending the transaction")
         icon: StandardIcon.Critical
         standardButtons: StandardButton.Ok
     }
@@ -88,8 +86,7 @@ ModalPopup {
         TransactionFormGroup {
             id: group1
             headerText: root.title
-            //% "Continue"
-            footerText: qsTrId("continue")
+            footerText: qsTr("Continue")
 
             StatusAccountSelector {
                 id: selectFromAccount
@@ -104,8 +101,7 @@ ModalPopup {
                 currency: root.ensUsernamesStore.getCurrentCurrency()
                 width: stack.width
                 chainId: root.chainId
-                //% "Choose account"
-                label: qsTrId("choose-account")
+                label: qsTr("Choose account")
                 showBalanceForAssetSymbol: "ETH"
                 minRequiredAssetBalance: 0
                 onSelectedAccountChanged: if (isValid) { gasSelector.estimateGas() }
@@ -146,8 +142,7 @@ ModalPopup {
         TransactionFormGroup {
             id: group3
             headerText: root.title
-            //% "Sign with password"
-            footerText: qsTrId("sign-with-password")
+            footerText: qsTr("Sign with password")
 
             TransactionPreview {
                 id: pvwTransaction
@@ -170,8 +165,7 @@ ModalPopup {
         TransactionFormGroup {
             id: group4
             headerText: root.title
-            //% "Sign with password"
-            footerText: qsTrId("sign-with-password")
+            footerText: qsTr("Sign with password")
 
             TransactionSigner {
                 id: transactionSigner
@@ -212,8 +206,7 @@ ModalPopup {
         StatusButton {
             id: btnNext
             anchors.right: parent.right
-            //% "Next"
-            text: qsTrId("next")
+            text: qsTr("Next")
             enabled: stack.currentGroup.isValid
             onClicked: {
                 const validity = stack.currentGroup.validate()
diff --git a/ui/imports/shared/status/StatusEmojiSection.qml b/ui/imports/shared/status/StatusEmojiSection.qml
index 730317fe9d..14354ae8ed 100644
--- a/ui/imports/shared/status/StatusEmojiSection.qml
+++ b/ui/imports/shared/status/StatusEmojiSection.qml
@@ -36,8 +36,7 @@ Item {
     StyledText {
         id: noRecentText
         visible: !!(allEmojis && allEmojis.length && allEmojis[0].empty)
-        //% "No recent emojis"
-        text: qsTrId("no-recent-emojis")
+        text: qsTr("No recent emojis")
         color: Style.current.secondaryText
         font.pixelSize: 10
         anchors.top: categoryText.bottom
diff --git a/ui/imports/shared/status/StatusNotification.qml b/ui/imports/shared/status/StatusNotification.qml
index c0e5bce8ba..fb9f6f758a 100644
--- a/ui/imports/shared/status/StatusNotification.qml
+++ b/ui/imports/shared/status/StatusNotification.qml
@@ -113,8 +113,7 @@ Rectangle {
             font.pixelSize: 14
             anchors.verticalCenter: parent.verticalCenter
             anchors.horizontalCenter: parent.horizontalCenter
-            //% "Open"
-            text: qsTrId("open")
+            text: qsTr("Open")
             color: Style.current.darkerGrey
         }
     }
diff --git a/ui/imports/shared/status/StatusSNTTransactionModal.qml b/ui/imports/shared/status/StatusSNTTransactionModal.qml
index c946213042..f1ddb793b3 100644
--- a/ui/imports/shared/status/StatusSNTTransactionModal.qml
+++ b/ui/imports/shared/status/StatusSNTTransactionModal.qml
@@ -34,13 +34,11 @@ ModalPopup {
 
     height: 540
 
-    //% "Authorize %1 %2"
-    title: qsTrId("authorize--1--2").arg(Utils.stripTrailingZeros(assetPrice)).arg(asset.symbol)
+    title: qsTr("Authorize %1 %2").arg(Utils.stripTrailingZeros(assetPrice)).arg(asset.symbol)
 
     property MessageDialog sendingError: MessageDialog {
         id: sendingError
-        //% "Error sending the transaction"
-        title: qsTrId("error-sending-the-transaction")
+        title: qsTr("Error sending the transaction")
         icon: StandardIcon.Critical
         standardButtons: StandardButton.Ok
     }
@@ -65,8 +63,7 @@ ModalPopup {
         let response = JSON.parse(responseStr)
         if (!response.success) {
             if (Utils.isInvalidPasswordMessage(response.result)){
-                //% "Wrong password"
-                transactionSigner.validationError = qsTrId("wrong-password")
+                transactionSigner.validationError = qsTr("Wrong password")
                 return
             }
             sendingError.text = response.result
@@ -96,10 +93,8 @@ ModalPopup {
         }
         TransactionFormGroup {
             id: group1
-            //% "Authorize %1 %2"
-            headerText: qsTrId("authorize--1--2").arg(Utils.stripTrailingZeros(root.assetPrice)).arg(root.asset.symbol)
-            //% "Continue"
-            footerText: qsTrId("continue")
+            headerText: qsTr("Authorize %1 %2").arg(Utils.stripTrailingZeros(root.assetPrice)).arg(root.asset.symbol)
+            footerText: qsTr("Continue")
             showBackBtn: false
             StatusAccountSelector {
                 id: selectFromAccount
@@ -113,8 +108,7 @@ ModalPopup {
                 }
                 currency: walletSection.currentCurrency
                 width: stack.width
-                //% "Choose account"
-                label: qsTrId("choose-account")
+                label: qsTr("Choose account")
                 showBalanceForAssetSymbol: root.asset.symbol
                 minRequiredAssetBalance: root.assetPrice
                 chainId: root.chainId
@@ -165,10 +159,8 @@ ModalPopup {
         }
         TransactionFormGroup {
             id: group2
-            //% "Authorize %1 %2"
-            headerText: qsTrId("authorize--1--2").arg(Utils.stripTrailingZeros(root.assetPrice)).arg(root.asset.symbol)
-            //% "Sign with password"
-            footerText: qsTrId("sign-with-password")
+            headerText: qsTr("Authorize %1 %2").arg(Utils.stripTrailingZeros(root.assetPrice)).arg(root.asset.symbol)
+            footerText: qsTr("Sign with password")
 
             TransactionPreview {
                 id: pvwTransaction
@@ -190,10 +182,8 @@ ModalPopup {
         }
         TransactionFormGroup {
             id: group3
-            //% "Send %1 %2"
-            headerText: qsTrId("send--1--2").arg(Utils.stripTrailingZeros(root.assetPrice)).arg(root.asset.symbol)
-            //% "Sign with password"
-            footerText: qsTrId("sign-with-password")
+            headerText: qsTr("Send %1 %2").arg(Utils.stripTrailingZeros(root.assetPrice)).arg(root.asset.symbol)
+            footerText: qsTr("Sign with password")
 
             TransactionSigner {
                 id: transactionSigner
@@ -236,8 +226,7 @@ ModalPopup {
         StatusButton {
             id: btnNext
             anchors.right: parent.right
-            //% "Next"
-            text: qsTrId("next")
+            text: qsTr("Next")
             enabled: stack.currentGroup.isValid && !stack.currentGroup.isPending
             loading: stack.currentGroup.isPending
             onClicked: {
diff --git a/ui/imports/shared/status/StatusStickerButton.qml b/ui/imports/shared/status/StatusStickerButton.qml
index 362ceb8298..03052d981a 100644
--- a/ui/imports/shared/status/StatusStickerButton.qml
+++ b/ui/imports/shared/status/StatusStickerButton.qml
@@ -27,8 +27,7 @@ Item {
         rotation: 0,
         runAnimation: false
     })
-    //% "Buy for %1 SNT"
-    property string text: root.style === StatusStickerButton.StyleType.Default ? packPrice : qsTrId("buy-for--1-snt").arg(packPrice )
+    property string text: root.style === StatusStickerButton.StyleType.Default ? packPrice : qsTr("Buy for %1 SNT").arg(packPrice )
     property color textColor: style === StatusStickerButton.StyleType.Default ? Style.current.roundedButtonSecondaryForegroundColor : Style.current.buttonForegroundColor
     property color bgColor: style === StatusStickerButton.StyleType.Default ? Style.current.blue : Style.current.secondaryBackground
     signal uninstallClicked()
@@ -44,8 +43,7 @@ Item {
             when: root.isInstalled
             PropertyChanges {
                 target: root;
-                //% "Uninstall"
-                text: root.style === StatusStickerButton.StyleType.Default ? "" : qsTrId("uninstall");
+                text: root.style === StatusStickerButton.StyleType.Default ? "" : qsTr("Uninstall");
                 textColor: root.style === StatusStickerButton.StyleType.Default ? Style.current.roundedButtonSecondaryForegroundColor : Style.current.red;
                 bgColor: root.style === StatusStickerButton.StyleType.Default ? Style.current.green : Style.current.lightRed;
                 icon: new Object({
@@ -60,8 +58,7 @@ Item {
             when: root.isBought;
             PropertyChanges {
                 target: root;
-                //% "Install"
-                text: qsTrId("install");
+                text: qsTr("Install");
                 icon: new Object({
                     path: Style.svg("arrowUp"),
                     rotation: 180,
@@ -75,8 +72,7 @@ Item {
             extend: "bought"
             PropertyChanges {
                 target: root;
-                //% "Free"
-                text: qsTrId("free");
+                text: qsTr("Free");
             }
         },
         State {
@@ -95,8 +91,7 @@ Item {
             when: root.isPending
             PropertyChanges {
                 target: root;
-                //% "Pending..."
-                text: qsTrId("pending---");
+                text: qsTr("Pending...");
                 textColor: root.style === StatusStickerButton.StyleType.Default ? Style.current.roundedButtonSecondaryForegroundColor : Style.current.darkGrey
                 bgColor: root.style === StatusStickerButton.StyleType.Default ? Style.current.darkGrey : Style.current.grey;
                 enabled: false;
@@ -113,8 +108,7 @@ Item {
             extend: "pending"
             PropertyChanges {
                 target: root;
-                //% "Cancel"
-                text: qsTrId("browsing-cancel");
+                text: qsTr("Cancel");
                 textColor: root.style === StatusStickerButton.StyleType.Default ? Style.current.pillButtonTexroundedButtonSecondaryForegroundColortColor : Style.current.red;
                 bgColor: root.style === StatusStickerButton.StyleType.Default ? Style.current.red : Style.current.lightRed;
             }
@@ -125,8 +119,7 @@ Item {
             extend: "bought"
             PropertyChanges {
                 target: root;
-                //% "Update"
-                text: qsTrId("update");
+                text: qsTr("Update");
             }
         }
     ]
diff --git a/ui/imports/shared/status/StatusStickersPopup.qml b/ui/imports/shared/status/StatusStickersPopup.qml
index 6074b3171b..925c3d9481 100644
--- a/ui/imports/shared/status/StatusStickersPopup.qml
+++ b/ui/imports/shared/status/StatusStickersPopup.qml
@@ -137,8 +137,7 @@ Popup {
                         visible: root.installedPacksCount === 0
                         anchors.fill: parent
                         font.pixelSize: 15
-                        //% "You don't have any stickers yet"
-                        text: qsTrId("you-don't-have-any-stickers-yet")
+                        text: qsTr("You don't have any stickers yet")
                         lineHeight: 22
                         horizontalAlignment: Text.AlignHCenter
                     }
@@ -148,8 +147,7 @@ Popup {
                         visible: stickerPackListView.selectedPackId === -1 && stickersModule.recent.rowCount() === 0 && !lblNoStickersYet.visible
                         anchors.fill: parent
                         font.pixelSize: 15
-                        //% "Recently used stickers will appear here"
-                        text: qsTrId("recently-used-stickers")
+                        text: qsTr("Recently used stickers will appear here")
                         lineHeight: 22
                         horizontalAlignment: Text.AlignHCenter
                     }
@@ -157,8 +155,7 @@ Popup {
 
                 StatusQControls.StatusButton {
                     visible: lblNoStickersYet.visible
-                    //% "Get Stickers"
-                    text: qsTrId("get-stickers")
+                    text: qsTr("Get Stickers")
                     anchors.top: noStickersContainer.bottom
                     anchors.topMargin: Style.current.padding
                     anchors.horizontalCenter: parent.horizontalCenter
diff --git a/ui/imports/shared/views/HistoryView.qml b/ui/imports/shared/views/HistoryView.qml
index 54d1cb590b..105b1f58aa 100644
--- a/ui/imports/shared/views/HistoryView.qml
+++ b/ui/imports/shared/views/HistoryView.qml
@@ -54,8 +54,7 @@ Item {
         visible: RootStore.isNonArchivalNode
         height: visible ? implicitHeight : 0
         anchors.top: parent.top
-        //% "Status Desktop is connected to a non-archival node. Transaction history may be incomplete."
-        text: qsTrId("status-desktop-is-connected-to-a-non-archival-node--transaction-history-may-be-incomplete-")
+        text: qsTr("Status Desktop is connected to a non-archival node. Transaction history may be incomplete.")
         font.pixelSize: Style.current.primaryTextFontSize
         color: Style.current.danger
     }
@@ -65,8 +64,7 @@ Item {
         anchors.top: nonArchivalNodeError.bottom
         visible: transactionListRoot.count === 0
         height: visible ? implicitHeight : 0
-        //% "No transactions found"
-        text: qsTrId("no-transactions-found")
+        text: qsTr("No transactions found")
         font.pixelSize: Style.current.primaryTextFontSize
     }
 
@@ -103,8 +101,7 @@ Item {
 
     StatusButton {
         id: loadMoreButton
-        //% "Load More"
-        text: qsTrId("load-more")
+        text: qsTr("Load More")
         // TODO: handle case when requested limit === transaction count -- there
         // is currently no way to know that there are no more results
         enabled: !loadingImg.active && RootStore.historyTransactions.hasMore
diff --git a/ui/imports/shared/views/NetworkSelector.qml b/ui/imports/shared/views/NetworkSelector.qml
index 2a272a175f..978c61d421 100644
--- a/ui/imports/shared/views/NetworkSelector.qml
+++ b/ui/imports/shared/views/NetworkSelector.qml
@@ -62,7 +62,6 @@ Item {
                                 font.pixelSize: 15
                                 font.weight: Font.Medium
                                 color: Theme.palette.directColor1
-                                //% "Networks"
                                 text: qsTr("Networks")
                                 wrapMode: Text.WordWrap
                             }
diff --git a/ui/imports/shared/views/NoFriendsRectangle.qml b/ui/imports/shared/views/NoFriendsRectangle.qml
index a88a82ad41..2f578dde81 100644
--- a/ui/imports/shared/views/NoFriendsRectangle.qml
+++ b/ui/imports/shared/views/NoFriendsRectangle.qml
@@ -13,8 +13,7 @@ Item {
     width: 260
     height: visible ? 120 : 0
 
-    //% "You don’t have any contacts yet. Invite your friends to start chatting."
-    property string text: qsTrId("you-don-t-have-any-contacts-yet--invite-your-friends-to-start-chatting-")
+    property string text: qsTr("You don’t have any contacts yet. Invite your friends to start chatting.")
     property alias textColor: noContacts.color
     property var rootStore
 
@@ -31,8 +30,7 @@ Item {
         horizontalAlignment: Text.AlignHCenter
     }
     StatusButton {
-        //% "Invite friends"
-        text: qsTrId("invite-friends")
+        text: qsTr("Invite friends")
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: noContacts.bottom
         anchors.topMargin: Style.current.padding
diff --git a/ui/imports/shared/views/SearchResults.qml b/ui/imports/shared/views/SearchResults.qml
index 4210fe9aa3..87b6b0652a 100644
--- a/ui/imports/shared/views/SearchResults.qml
+++ b/ui/imports/shared/views/SearchResults.qml
@@ -52,8 +52,7 @@ Item {
 
     StyledText {
         id: nonContactsLabel
-        //% "Non contacts"
-        text: qsTrId("non-contacts")
+        text: qsTr("Non contacts")
         anchors.top: parent.top
         color: Style.current.secondaryText
         font.pixelSize: 15
@@ -161,8 +160,7 @@ Item {
         font.pixelSize: 15
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
-        //% "No profile found"
-        text: qsTrId("no-profile-found")
+        text: qsTr("No profile found")
     }
 
 }
diff --git a/ui/imports/shared/views/SendModalFooter.qml b/ui/imports/shared/views/SendModalFooter.qml
index bac097b2cb..1db1537f85 100644
--- a/ui/imports/shared/views/SendModalFooter.qml
+++ b/ui/imports/shared/views/SendModalFooter.qml
@@ -52,7 +52,6 @@ Rectangle {
             StatusBaseText {
                 font.pixelSize: 15
                 color: Theme.palette.directColor5
-                //% "Estimated Time:"
                 text: qsTr("Estimated Time:")
                 wrapMode: Text.WordWrap
             }
@@ -77,7 +76,6 @@ Rectangle {
                 StatusBaseText {
                     font.pixelSize: 15
                     color: Theme.palette.directColor5
-                    //% "Max Fees:"
                     text: qsTr("Max Fees:")
                     wrapMode: Text.WordWrap
                 }
@@ -92,8 +90,7 @@ Rectangle {
 
             StatusFlatButton {
                 icon.name: isLastGroup ? "" : "password"
-                //% "Send"
-                text: qsTrId("command-button-send")
+                text: qsTr("Send")
                 size: StatusBaseButton.Size.Large
                 normalColor: Theme.palette.primaryColor2
                 disaledColor: Theme.palette.baseColor2
diff --git a/ui/imports/shared/views/TabAddressSelectorView.qml b/ui/imports/shared/views/TabAddressSelectorView.qml
index 0552a22c75..a53b3f26a3 100644
--- a/ui/imports/shared/views/TabAddressSelectorView.qml
+++ b/ui/imports/shared/views/TabAddressSelectorView.qml
@@ -33,19 +33,16 @@ Item {
         
         StatusTabButton {
             id: assetBtn
-            //% "Saved"
             width: implicitWidth
             text: qsTr("Saved")
         }
         StatusTabButton {
             id: collectiblesBtn
-            //% "My Accounts"
             width: implicitWidth
             text: qsTr("My Accounts")
         }
         StatusTabButton {
             id: historyBtn
-            //% "Recent"
             width: implicitWidth
             text: qsTr("Recent")
         }
@@ -111,7 +108,6 @@ Item {
                     StatusBaseText {
                         font.pixelSize: 15
                         color: Theme.palette.directColor1
-                        //% "No Saved Address"
                         text: qsTr("No Saved Address")
                     }
                 }
@@ -172,7 +168,6 @@ Item {
                 header: StatusBaseText {
                     font.pixelSize: 15
                     color: Theme.palette.directColor1
-                    //% "No Recents"
                     text: qsTr("No Recents")
                     visible: recents.count <= 0
                 }
diff --git a/ui/imports/shared/views/TransactionPreview.qml b/ui/imports/shared/views/TransactionPreview.qml
index ff141786ad..367bdf81d1 100644
--- a/ui/imports/shared/views/TransactionPreview.qml
+++ b/ui/imports/shared/views/TransactionPreview.qml
@@ -45,8 +45,7 @@ Item {
         anchors.right: parent.right
         LabelValueRow {
             id: itmFrom
-            //% "From"
-            label: qsTrId("from")
+            label: qsTr("From")
             value: Item {
                 id: itmFromValue
                 anchors.fill: parent
@@ -127,16 +126,14 @@ Item {
             function needsRightPadding() {
                 return !root.toValid || root.toWarn
             }
-            //% "Recipient"
-            label: qsTrId("recipient")
+            label: qsTr("Recipient")
             states: [
                 State {
                     name: "Address"
                     when: !!root.toAccount && root.toAccount.type === RecipientSelector.Type.Address
                     PropertyChanges {
                         target: txtToPrimary
-                        //% "Unknown"
-                        text: (!!root.toAccount && root.toAccount.address) ? root.toAccount.address : qsTrId("active-unknown")
+                        text: (!!root.toAccount && root.toAccount.address) ? root.toAccount.address : qsTr("Unknown")
                         elide: Text.ElideMiddle
                         anchors.leftMargin: 190
                         anchors.right: parent.right
@@ -281,8 +278,7 @@ Item {
         }
         LabelValueRow {
             id: itmAsset
-            //% "Asset"
-            label: qsTrId("wallet-asset")
+            label: qsTr("Asset")
             value: Item {
                 anchors.fill: parent
                 anchors.verticalCenter: parent.verticalCenter
@@ -328,8 +324,7 @@ Item {
         }
         LabelValueRow {
             id: itmAmount
-            //% "Amount"
-            label: qsTrId("amount")
+            label: qsTr("Amount")
             value: Item {
                 id: amountRoot
                 anchors.fill: parent
@@ -385,8 +380,7 @@ Item {
         }
         LabelValueRow {
             id: itmNetworkFee
-            //% "Network fee"
-            label: qsTrId("network-fee")
+            label: qsTr("Network fee")
             visible: !!root.gas
             value: Item {
                 id: networkFeeRoot
@@ -492,8 +486,7 @@ Item {
         }
         LabelValueRow {
             id: itmData
-            //% "Data"
-            label: qsTrId("data")
+            label: qsTr("Data")
             visible: trxData !== "0x" && trxData !== ""
             value: Item {
                 id: dataRoot
@@ -535,8 +528,7 @@ Item {
                 // TODO: replace with StatusModal
                 ModalPopup {
                     id: dataPopup
-                    //% "Data field"
-                    title: qsTrId("data-field")
+                    title: qsTr("Data field")
                     height: 286
                     width: 400
                     Item {
diff --git a/ui/imports/shared/views/TransactionSigner.qml b/ui/imports/shared/views/TransactionSigner.qml
index 362d13c274..264869c3b7 100644
--- a/ui/imports/shared/views/TransactionSigner.qml
+++ b/ui/imports/shared/views/TransactionSigner.qml
@@ -18,10 +18,8 @@ Item {
     property alias signingPhrase: signingPhrase.text
     property string enteredPassword
     property alias validationError: txtPassword.validationError
-    //% "You need to enter a password"
-    property string noInputErrorMessage: qsTrId("you-need-to-enter-a-password")
-    //% "Password needs to be 6 characters or more"
-    property string invalidInputErrorMessage: qsTrId("password-needs-to-be-6-characters-or-more")
+    property string noInputErrorMessage: qsTr("You need to enter a password")
+    property string invalidInputErrorMessage: qsTr("Password needs to be 6 characters or more")
     property bool isValid: false
 
     function forceActiveFocus(reason) {
@@ -50,8 +48,7 @@ Item {
             id: labelSigningPhrase
             color: Style.current.secondaryText
             font.pixelSize: 15
-            //% "Signing phrase"
-            text: qsTrId("signing-phrase")
+            text: qsTr("Signing phrase")
         }
 
         StatusQControls.StatusRoundButton {
@@ -66,8 +63,7 @@ Item {
             icon.name: "info"
             StatusQ.StatusToolTip {
               visible: infoButton.hovered
-              //% "Signing phrase is a 3 word combination that displayed when you entered the wallet on this device for the first time."
-              text: qsTrId("signing-phrase-is-a-3-word-combination-that-displayed-when-you-entered-the-wallet-on-this-device-for-the-first-time-")
+              text: qsTr("Signing phrase is a 3 word combination that displayed when you entered the wallet on this device for the first time.")
             }
         }
     }
@@ -94,8 +90,7 @@ Item {
         icon.name: "info"
         StatusQ.StatusToolTip {
           visible: passwordInfoButton.hovered
-          //% "Enter the password you use to unlock this device"
-          text: qsTrId("enter-the-password-you-use-to-unlock-this-device")
+          text: qsTr("Enter the password you use to unlock this device")
         }
     }
 
@@ -105,10 +100,8 @@ Item {
         anchors.topMargin: Style.current.bigPadding
         focus: true
         customHeight: 56
-        //% "Password"
-        label: qsTrId("password")
-        //% "Enter password"
-        placeholderText: qsTrId("enter-password")
+        label: qsTr("Password")
+        placeholderText: qsTr("Enter password")
         textField.echoMode: TextInput.Password
         validationErrorAlignment: TextEdit.AlignRight
         validationErrorTopMargin: 8
diff --git a/ui/imports/shared/views/chat/AcceptTransactionView.qml b/ui/imports/shared/views/chat/AcceptTransactionView.qml
index c682052a9c..9b1de6f97c 100644
--- a/ui/imports/shared/views/chat/AcceptTransactionView.qml
+++ b/ui/imports/shared/views/chat/AcceptTransactionView.qml
@@ -29,11 +29,9 @@ Item {
     StyledText {
         id: acceptText
         color: Style.current.blue
-        //% "Accept and share address"
         text: root.state === Constants.addressRequested ?
-          qsTrId("accept-and-share-address") :
-          //% "Accept and send"
-          qsTrId("accept-and-send")
+          qsTr("Accept and share address") :
+          qsTr("Accept and send")
         padding: Style.current.halfPadding
         horizontalAlignment: Text.AlignHCenter
         wrapMode: Text.WordWrap
@@ -65,8 +63,7 @@ Item {
     StyledText {
         id: declineText
         color: Style.current.blue
-        //% "Decline"
-        text: qsTrId("decline")
+        text: qsTr("Decline")
         horizontalAlignment: Text.AlignHCenter
         wrapMode: Text.WordWrap
         font.weight: Font.Medium
@@ -108,7 +105,7 @@ Item {
             chainId: root.store.getChainIdForChat()
             onClosed: destroy()
             onOpenGasEstimateErrorPopup: {
-                gasEstimateErrorPopup.confirmationText = message + qsTrId("--the-transaction-will-probably-fail-");
+                gasEstimateErrorPopup.confirmationText = message + qsTr("Decline");
                 gasEstimateErrorPopup.open();
                 return;
             }
diff --git a/ui/imports/shared/views/chat/ChannelIdentifierView.qml b/ui/imports/shared/views/chat/ChannelIdentifierView.qml
index e5024e85a9..4c4c59a79d 100644
--- a/ui/imports/shared/views/chat/ChannelIdentifierView.qml
+++ b/ui/imports/shared/views/chat/ChannelIdentifierView.qml
@@ -58,11 +58,9 @@ Column {
         text: {
             switch(root.chatType) {
                 case Constants.chatType.privateGroupChat:
-                    //% "Welcome to the beginning of the <span style='color: %1'>%2</span> group!"
-                    return qsTrId("welcome-to-the-beginning-of-the--span-style--color---1---2--span--group-").arg(Style.current.textColor).arg(root.chatName);
+                    return qsTr("Welcome to the beginning of the <span style='color: %1'>%2</span> group!").arg(Style.current.textColor).arg(root.chatName);
                 case Constants.chatType.oneToOne:
-                    //% "Any messages you send here are encrypted and can only be read by you and <span style='color: %1'>%2</span>"
-                    return qsTrId("any-messages-you-send-here-are-encrypted-and-can-only-be-read-by-you-and--span-style--color---1---2--span-").arg(Style.current.textColor).arg(root.chatName)
+                    return qsTr("Any messages you send here are encrypted and can only be read by you and <span style='color: %1'>%2</span>").arg(Style.current.textColor).arg(root.chatName)
                 default: return "";
             }
         }
diff --git a/ui/imports/shared/views/chat/CompactMessageView.qml b/ui/imports/shared/views/chat/CompactMessageView.qml
index 446fea0b34..ee82fa0280 100644
--- a/ui/imports/shared/views/chat/CompactMessageView.qml
+++ b/ui/imports/shared/views/chat/CompactMessageView.qml
@@ -283,8 +283,7 @@ Item {
                     }
 
                     StyledText {
-                        //% "Pinned by %1"
-                        text: qsTrId("pinned-by--1").arg(Utils.getContactDetailsAsJson(messagePinnedBy).displayName)
+                        text: qsTr("Pinned by %1").arg(Utils.getContactDetailsAsJson(messagePinnedBy).displayName)
                         anchors.left: pinImage.right
                         anchors.verticalCenter: parent.verticalCenter
                         font.pixelSize: 13
@@ -432,7 +431,7 @@ Item {
                     store: root.store
                     usersStore: root.usersStore
 
-                    chatInputPlaceholder: qsTrId("type-a-message-")
+                    chatInputPlaceholder: qsTr("Pinned by %1")
                     chatType: messageStore.getChatType()
                     isEdit: true
                     emojiPopup: root.emojiPopup
@@ -493,8 +492,7 @@ Item {
                     anchors.left: parent.left
                     anchors.leftMargin: Style.current.halfPadding
                     anchors.top: editTextInput.bottom
-                    //% "Cancel"
-                    text: qsTrId("browsing-cancel")
+                    text: qsTr("Cancel")
                     onClicked: {
                         messageStore.setEditModeOff(messageId)
                         editTextInput.textInput.text = StatusQUtils.Emoji.parse(message)
@@ -507,8 +505,7 @@ Item {
                     anchors.left: cancelBtn.right
                     anchors.leftMargin: Style.current.halfPadding
                     anchors.top: editTextInput.bottom
-                    //% "Save"
-                    text: qsTrId("save")
+                    text: qsTr("Save")
                     enabled: editTextInput.textInput.text.trim().length > 0
                     onClicked: {
                         let msg = rootStore.plainText(StatusQUtils.Emoji.deparse(editTextInput.textInput.text))
diff --git a/ui/imports/shared/views/chat/InvitationBubbleView.qml b/ui/imports/shared/views/chat/InvitationBubbleView.qml
index 74f3ce8ddf..fd2dd05792 100644
--- a/ui/imports/shared/views/chat/InvitationBubbleView.qml
+++ b/ui/imports/shared/views/chat/InvitationBubbleView.qml
@@ -89,8 +89,7 @@ Item {
                         when: invitedCommunity.ensOnly && !userProfile.ensName
                         PropertyChanges {
                             target: joinBtn
-                            //% "Membership requires an ENS username"
-                            text: qsTrId("membership-requires-an-ens-username")
+                            text: qsTr("Membership requires an ENS username")
                             enabled: false
                         }
                     },
@@ -99,8 +98,7 @@ Item {
                         when: invitedCommunity.access === Constants.communityChatInvitationOnlyAccess
                         PropertyChanges {
                             target: joinBtn
-                            //% "You need to be invited"
-                            text: qsTrId("you-need-to-be-invited")
+                            text: qsTr("You need to be invited")
                             enabled: false
                         }
                     },
@@ -110,8 +108,7 @@ Item {
                               rectangleBubble.isPendingRequest
                         PropertyChanges {
                             target: joinBtn
-                            //% "Pending"
-                            text: qsTrId("invite-chat-pending")
+                            text: qsTr("Pending")
                             enabled: false
                         }
                     },
@@ -122,8 +119,7 @@ Item {
                                 invitedCommunity.joined)
                         PropertyChanges {
                             target: joinBtn
-                            //% "View"
-                            text: qsTrId("view")
+                            text: qsTr("View")
                         }
                     },
                     State {
@@ -133,8 +129,7 @@ Item {
                               invitedCommunity.canRequestAccess
                         PropertyChanges {
                             target: joinBtn
-                            //% "Request Access"
-                            text: qsTrId("request-access")
+                            text: qsTr("Request Access")
 
                         }
                     },
@@ -146,8 +141,7 @@ Item {
                                 !invitedCommunity.joined)
                         PropertyChanges {
                             target: joinBtn
-                            //% "Join"
-                            text: qsTrId("join")
+                            text: qsTr("Join")
                         }
                     }
                 ]
@@ -172,10 +166,8 @@ Item {
                         id: title
                         color: invitedCommunity.verifed ? Theme.palette.primaryColor1 : Theme.palette.baseColor1
                         text: invitedCommunity.verifed ?
-                                  //% "Verified community invitation"
-                                  qsTrId("verified-community-invitation") :
-                                  //% "Community invitation"
-                                  qsTrId("community-invitation")
+                                  qsTr("Verified community invitation") :
+                                  qsTr("Community invitation")
                         font.weight: Font.Medium
                         Layout.topMargin: Style.current.halfPadding
                         Layout.leftMargin: root.innerMargin
@@ -189,16 +181,12 @@ Item {
                             return ""
     //                        if (root.store.chatsModelInst.channelView.activeChannel.chatType === Constants.chatType.oneToOne) {
     //                            return isCurrentUser ?
-    //                                        //% "You invited %1 to join a community"
-    //                                        qsTrId("you-invited--1-to-join-a-community").arg(root.store.chatsModelInst.userNameOrAlias(root.store.chatsModelInst.channelView.activeChannel.id))
-    //                                        //% "%1 invited you to join a community"
-    //                                      : qsTrId("-1-invited-you-to-join-a-community").arg(displayUserName)
+    //                                        qsTr("You invited %1 to join a community").arg(root.store.chatsModelInst.userNameOrAlias(root.store.chatsModelInst.channelView.activeChannel.id))
+    //                                      : qsTr("%1 invited you to join a community").arg(displayUserName)
     //                        } else {
     //                            return isCurrentUser ?
-    //                                        //% "You shared a community"
-    //                                        qsTrId("you-shared-a-community")
-    //                                        //% "A community has been shared"
-    //                                      : qsTrId("a-community-has-been-shared")
+    //                                        qsTr("You shared a community")
+    //                                      : qsTr("A community has been shared")
     //                        }
                         }
                         Layout.leftMargin: root.innerMargin
@@ -241,8 +229,7 @@ Item {
                     StatusBaseText {
                         id: communityNbMembers
                         // TODO add the plural support
-                        //% "%1 members"
-                        text: qsTrId("-1-members").arg(invitedCommunity.nbMembers)
+                        text: qsTr("%1 members").arg(invitedCommunity.nbMembers)
                         Layout.leftMargin: root.innerMargin
                         font.pixelSize: 13
                         font.weight: Font.Medium
@@ -298,8 +285,7 @@ Item {
                                     joiningError.open()
                                 }
 
-                                //% "Error joining the community"
-                                title: qsTrId("error-joining-the-community")
+                                title: qsTr("Error joining the community")
                                 icon: StandardIcon.Critical
                                 standardButtons: StandardButton.Ok
                             }
diff --git a/ui/imports/shared/views/chat/LinksMessageView.qml b/ui/imports/shared/views/chat/LinksMessageView.qml
index 272ff39658..008aa5e17b 100644
--- a/ui/imports/shared/views/chat/LinksMessageView.qml
+++ b/ui/imports/shared/views/chat/LinksMessageView.qml
@@ -344,10 +344,8 @@ Column {
 
             StatusBaseText {
                 id: enableText
-                //% "Enable automatic image unfurling"
-                text: isImageLink ? qsTrId("enable-automatic-image-unfurling") :
-                                    //% "Enable link previews in chat?"
-                                    qsTrId("enable-link-previews")
+                text: isImageLink ? qsTr("Enable automatic image unfurling") :
+                                    qsTr("Enable link previews in chat?")
                 horizontalAlignment: Text.AlignHCenter
                 width: parent.width
                 wrapMode: Text.WordWrap
@@ -359,8 +357,7 @@ Column {
 
             StatusBaseText {
                 id: infoText
-                //% "Once enabled, links posted in the chat may share your metadata with their owners"
-                text: qsTrId("once-enabled--links-posted-in-the-chat-may-share-your-metadata-with-their-owners")
+                text: qsTr("Once enabled, links posted in the chat may share your metadata with their owners")
                 horizontalAlignment: Text.AlignHCenter
                 width: parent.width
                 wrapMode: Text.WordWrap
@@ -377,8 +374,7 @@ Column {
 
             StatusFlatButton {
                 id: enableBtn
-                //% "Enable in Settings"
-                text: qsTrId("enable-in-settings")
+                text: qsTr("Enable in Settings")
                 onClicked: {
                     Global.changeAppSectionBySectionType(Constants.appSection.profile, Constants.settingsSubsection.messaging);
                 }
@@ -393,8 +389,7 @@ Column {
             }
 
             StatusFlatButton {
-                //% "Don't ask me again"
-                text: qsTrId("dont-ask")
+                text: qsTr("Don't ask me again")
                 onClicked: {
                     RootStore.setNeverAskAboutUnfurlingAgain(true);
                 }
diff --git a/ui/imports/shared/views/chat/MessageContextMenuView.qml b/ui/imports/shared/views/chat/MessageContextMenuView.qml
index bee8b2983c..d0a13e3a96 100644
--- a/ui/imports/shared/views/chat/MessageContextMenuView.qml
+++ b/ui/imports/shared/views/chat/MessageContextMenuView.qml
@@ -245,8 +245,7 @@ StatusPopupMenu {
 
     StatusMenuItem {
         id: editMessageAction
-        //% "Edit message"
-        text: qsTrId("edit-message")
+        text: qsTr("Edit message")
         onTriggered: {
             editClicked(messageId)
         }
@@ -275,11 +274,9 @@ StatusPopupMenu {
         id: pinAction
         text: {
             if (root.pinnedMessage) {
-                //% "Unpin"
-                return qsTrId("unpin")
+                return qsTr("Unpin")
             }
-            //% "Pin"
-            return qsTrId("pin")
+            return qsTr("Pin")
 
         }
         onTriggered: {
@@ -339,8 +336,7 @@ StatusPopupMenu {
                   root.messageContentType === Constants.messageContentType.emojiType ||
                   root.messageContentType === Constants.messageContentType.imageType ||
                   root.messageContentType === Constants.messageContentType.audioType)
-        //% "Delete message"
-        text: qsTrId("delete-message")
+        text: qsTr("Delete message")
         onTriggered: {
             if (!localAccountSensitiveSettings.showDeleteMessageWarning) {
                 deleteMessage(messageId)
@@ -384,10 +380,8 @@ StatusPopupMenu {
     Component {
         id: deleteMessageConfirmationDialogComponent
         ConfirmationDialog {
-            //% "Confirm deleting this message"
-            header.title: qsTrId("confirm-deleting-this-message")
-            //% "Are you sure you want to delete this message? Be aware that other clients are not guaranteed to delete the message as well."
-            confirmationText: qsTrId("are-you-sure-you-want-to-delete-this-message--be-aware-that-other-clients-are-not-guaranteed-to-delete-the-message-as-well-")
+            header.title: qsTr("Confirm deleting this message")
+            confirmationText: qsTr("Are you sure you want to delete this message? Be aware that other clients are not guaranteed to delete the message as well.")
             height: 260
             checkbox.visible: true
             executeConfirm: function () {
diff --git a/ui/imports/shared/views/chat/TransactionBubbleView.qml b/ui/imports/shared/views/chat/TransactionBubbleView.qml
index c982fb458a..1ad44efc36 100644
--- a/ui/imports/shared/views/chat/TransactionBubbleView.qml
+++ b/ui/imports/shared/views/chat/TransactionBubbleView.qml
@@ -96,15 +96,12 @@ Item {
             text: {
                 if (root.state === Constants.transactionRequested) {
                     let prefix = outgoing? "↑ " : "↓ "
-                    //% "Transaction request"
-                    return prefix + qsTrId("transaction-request")
+                    return prefix + qsTr("Transaction request")
                 }
 
                 return outgoing ?
-                    //% "↑ Outgoing transaction"
-                    qsTrId("--outgoing-transaction") :
-                    //% "↓ Incoming transaction"
-                    qsTrId("--incoming-transaction")
+                    qsTr("↑ Outgoing transaction") :
+                    qsTr("↓ Incoming transaction")
             }
             font.weight: Font.Medium
             anchors.top: parent.top
diff --git a/ui/imports/utils/Constants.qml b/ui/imports/utils/Constants.qml
index fbe1f812d1..b05aced8b8 100644
--- a/ui/imports/utils/Constants.qml
+++ b/ui/imports/utils/Constants.qml
@@ -337,29 +337,21 @@ QtObject {
     readonly property string storeToKeychainValueNotNow: "notNow"
     readonly property string storeToKeychainValueNever: "never"
 
-    //% "(edited)"
-    readonly property string editLabel: ` <span class="isEdited">` + qsTrId("-edited-") + `</span>`
+    readonly property string editLabel: ` <span class="isEdited">` + qsTr("(edited)") + `</span>`
 
     readonly property string newBookmark: " "
 
     readonly property var ensState: {
-        //% "Username already taken :("
-        "taken": qsTrId("ens-username-taken"),
-        //% "Username doesn’t belong to you :("
-        "taken-custom": qsTrId("ens-custom-username-taken"),
-        //% "Continuing will connect this username with your chat key."
-        "owned": qsTrId("ens-username-owned-continue"),
-        //% "✓ Username available!"
-        "available": qsTrId("ens-username-available"),
-        //% "Username is already connected with your chat key and can be used inside Status."
-        "already-connected": qsTrId("ens-username-already-added"),
-        //% "This user name is owned by you and connected with your chat key. Continue to set `Show my ENS username in chats`."
-        "connected": qsTrId("this-user-name-is-owned-by-you-and-connected-with-your-chat-key--continue-to-set--show-my-ens-username-in-chats--"),
-        //% "Continuing will require a transaction to connect the username with your current chat key."
-        "connected-different-key": qsTrId("ens-username-connected-with-different-key"),
+        "taken": qsTr("Username already taken :("),
+        "taken-custom": qsTr("Username doesn’t belong to you :("),
+        "owned": qsTr("Continuing will connect this username with your chat key."),
+        "available": qsTr("✓ Username available!"),
+        "already-connected": qsTr("Username is already connected with your chat key and can be used inside Status."),
+        "connected": qsTr("This user name is owned by you and connected with your chat key. Continue to set `Show my ENS username in chats`."),
+        "connected-different-key": qsTr("Continuing will require a transaction to connect the username with your current chat key."),
     }
 
     readonly property bool isCppApp: typeof cppApp !== "undefined" ? cppApp : false
-    
+
     readonly property string existingAccountError: "account already exists"
 }
diff --git a/ui/imports/utils/Utils.qml b/ui/imports/utils/Utils.qml
index d0b42745e0..0d72da2c4d 100644
--- a/ui/imports/utils/Utils.qml
+++ b/ui/imports/utils/Utils.qml
@@ -253,45 +253,26 @@ QtObject {
     function formatShortDateStr(longStr) {
         const dmKeys = {
             // Days
-            //% "Sun"
-            Sunday: qsTrId("sun"),
-            //% "Mon"
-            Monday: qsTrId("mon"),
-            //% "Tue"
-            Tuesday: qsTrId("tue"),
-            //% "Wed"
-            Wednesday: qsTrId("wed"),
-            //% "Thu"
-            Thursday: qsTrId("thu"),
-            //% "Fri"
-            Friday: qsTrId("fri"),
-            //% "Sat"
-            Saturday: qsTrId("sat"),
+            Sunday: qsTr("Sun"),
+            Monday: qsTr("Mon"),
+            Tuesday: qsTr("Tue"),
+            Wednesday: qsTr("Wed"),
+            Thursday: qsTr("Thu"),
+            Friday: qsTr("Fri"),
+            Saturday: qsTr("Sat"),
             // Months
-            //% "Jan"
-            January: qsTrId("jan"),
-            //% "Feb"
-            February: qsTrId("feb"),
-            //% "Mar"
-            March: qsTrId("mar"),
-            //% "Apr"
-            April: qsTrId("apr"),
-            //% "May"
-            May: qsTrId("may"),
-            //% "Jun"
-            June: qsTrId("jun"),
-            //% "Jul"
-            July: qsTrId("jul"),
-            //% "Aug"
-            August: qsTrId("aug"),
-            //% "Sep"
-            September: qsTrId("sep"),
-            //% "Oct"
-            October: qsTrId("oct"),
-            //% "Nov"
-            November: qsTrId("nov"),
-            //% "Dec"
-            December: qsTrId("dec")
+            January: qsTr("Jan"),
+            February: qsTr("Feb"),
+            March: qsTr("Mar"),
+            April: qsTr("Apr"),
+            May: qsTr("May"),
+            June: qsTr("Jun"),
+            July: qsTr("Jul"),
+            August: qsTr("Aug"),
+            September: qsTr("Sep"),
+            October: qsTr("Oct"),
+            November: qsTr("Nov"),
+            December: qsTr("Dec")
         };
 
         let shortStr = longStr;
@@ -338,23 +319,15 @@ QtObject {
         if (now.toDateString() === messageDate.toDateString()) {
             return (hours < 10 ? "0" + hours : hours) + ":" + (minutes < 10 ? "0" + minutes : minutes)
         } else if (yesterday.toDateString() === messageDate.toDateString()) {
-            //% "Yesterday"
-            return qsTrId("yesterday")
+            return qsTr("Yesterday")
         } else if (lastWeek.getTime() < messageDate.getTime()) {
-            //% "Sunday"
-            let days = [qsTrId("sunday"),
-                        //% "Monday"
-                        qsTrId("monday"),
-                        //% "Tuesday"
-                        qsTrId("tuesday"),
-                        //% "Wednesday"
-                        qsTrId("wednesday"),
-                        //% "Thursday"
-                        qsTrId("thursday"),
-                        //% "Friday"
-                        qsTrId("friday"),
-                        //% "Saturday"
-                        qsTrId("saturday")];
+            let days = [qsTr("Sunday"),
+                        qsTr("Monday"),
+                        qsTr("Tuesday"),
+                        qsTr("Wednesday"),
+                        qsTr("Thursday"),
+                        qsTr("Friday"),
+                        qsTr("Saturday")];
             return days[messageDate.getDay()];
         } else {
             return formatShortDateStr(new Date().toLocaleDateString(Qt.locale(locale)))
@@ -369,21 +342,17 @@ QtObject {
         const diffMs = now - messageDate
         const diffMin = Math.floor(diffMs / 60000)
         if (diffMin < 1) {
-            //% "NOW"
-            return qsTrId("now")
+            return qsTr("NOW")
         }
         const diffHour = Math.floor(diffMin / 60)
         if (diffHour < 1) {
-            //% "%1M"
-            return qsTrId("-1m").arg(diffMin)
+            return qsTr("%1M").arg(diffMin)
         }
         const diffDay = Math.floor(diffHour / 24)
         if (diffDay < 1) {
-            //% "%1H"
-            return qsTrId("-1h").arg(diffHour)
+            return qsTr("%1H").arg(diffHour)
         }
-        //% "%1D"
-        return qsTrId("-1d").arg(diffDay)
+        return qsTr("%1D").arg(diffDay)
     }
 
     function findAssetByChainAndSymbol(chainIdToFind, assets, symbolToFind) {
@@ -447,8 +416,7 @@ QtObject {
      */
     function seedPhraseWordCountText(text) {
         let wordCount = countWords(text);
-        //% "words"
-        return getTick(wordCount) + wordCount.toString() + " " + qsTrId("words")
+        return getTick(wordCount) + wordCount.toString() + " " + qsTr("words")
     }
 
     function uuid() {
@@ -460,21 +428,17 @@ QtObject {
         switch (item) {
             case "first":
                 if (firstPasswordField.text === "") {
-                    //% "You need to enter a password"
-                    return [false, qsTrId("you-need-to-enter-a-password")];
+                    return [false, qsTr("You need to enter a password")];
                 } else if (firstPasswordField.text.length < 6) {
-                    //% "Password needs to be 6 characters or more"
-                    return [false, qsTrId("password-needs-to-be-6-characters-or-more")];
+                    return [false, qsTr("Password needs to be 6 characters or more")];
                 }
                 return [true, ""];
 
             case "repeat":
                 if (repeatPasswordField.text === "") {
-                    //% "You need to repeat your password"
-                    return [false, qsTrId("you-need-to-repeat-your-password")];
+                    return [false, qsTr("You need to repeat your password")];
                 } else if (repeatPasswordField.text !== firstPasswordField.text) {
-                    //% "Passwords don't match"
-                    return [false, qsTrId("passwords-don-t-match")];
+                    return [false, qsTr("Passwords don't match")];
                 }
                 return [true, ""];
 
@@ -565,23 +529,19 @@ QtObject {
         let errMsg = ""
 
         if(validation & Utils.Validate.NoEmpty && str === "") {
-            //% "You need to enter a %1"
-            errMsg = qsTrId("you-need-to-enter-a--1").arg(fieldName)
+            errMsg = qsTr("You need to enter a %1").arg(fieldName)
         }
 
         if(validation & Utils.Validate.TextLength && str.length > limit) {
-            //% "The %1 cannot exceed %2 characters"
-            errMsg = qsTrId("the--1-cannot-exceed--2-characters").arg(fieldName, limit)
+            errMsg = qsTr("The %1 cannot exceed %2 characters").arg(fieldName, limit)
         }
 
         if(validation & Utils.Validate.TextHexColor && !isHexColor(str)) {
-            //% "Must be an hexadecimal color (eg: #4360DF)"
-            errMsg = qsTrId("must-be-an-hexadecimal-color--eg---4360df-")
+            errMsg = qsTr("Must be an hexadecimal color (eg: #4360DF)")
         }
 
         if(validation & Utils.Validate.TextLowercaseLettersNumberAndDashes && !isValidChannelName(str)) {
-            //% "Use only lowercase letters (a to z), numbers & dashes (-). Do not use chat keys."
-            errMsg = qsTrId("use-only-lowercase-letters--a-to-z---numbers---dashes------do-not-use-chat-keys-")
+            errMsg = qsTr("Use only lowercase letters (a to z), numbers & dashes (-). Do not use chat keys.")
         }
 
         return errMsg
@@ -706,8 +666,6 @@ QtObject {
         var inYears = day2Year-day1Year
 
         if(inYears > 0) {
-            //% "years ago"
-            //% "year ago"
             timeString =  inYears > 1 ? qsTr("years ago") : qsTr("year ago")
             return inYears + " " + timeString
         }
@@ -715,8 +673,6 @@ QtObject {
         var inMonths = (day2Month+12*day2Year)-(day1Month+12*day1Year)
 
         if(inMonths > 0) {
-            //% "months ago"
-            //% "month ago"
             timeString =  inMonths > 1 ? qsTr("months ago") : qsTr("month ago")
             return inMonths + " " + timeString
         }
@@ -724,8 +680,6 @@ QtObject {
         var inWeeks = parseInt((day2Time-day2Time)/(24*3600*1000*7))
 
         if(inWeeks > 0) {
-            //% "weeks ago"
-            //% "week ago"
             timeString =  inWeeks > 1 ? qsTr("weeks ago") : qsTr("week ago")
             return inWeeks + " " + timeString
         }
@@ -733,8 +687,6 @@ QtObject {
         var inDays = parseInt((day2Time-day1Time)/(24*3600*1000))
 
         if(inDays > 0) {
-            //% "days ago"
-            //% "day ago"
             timeString =  inDays > 1 ? qsTr("days ago") : qsTr("day ago")
             return inDays + " " + timeString
         }
@@ -742,8 +694,6 @@ QtObject {
         var inHours = parseInt((day2Time-day1Time)/(3600*1000));
 
         if(inHours > 0) {
-            //% "hours ago"
-            //% "hour ago"
             timeString =  inHours > 1 ? qsTr("hours ago") : qsTr("hour ago")
             return inHours + " " + timeString
         }
@@ -751,8 +701,6 @@ QtObject {
         var inMins = parseInt((day2Time-day1Time)/(60*1000))
 
         if(inMins > 0) {
-            //% "mins ago"
-            //% "min ago"
             timeString =  inMins > 1 ? qsTr("mins ago") : qsTr("min ago")
             return inMins + " " + timeString
         }
@@ -760,13 +708,10 @@ QtObject {
         var inSecs = parseInt((day2Time-day1Time)/(1000));
 
         if(inSecs > 0) {
-            //% "secs ago"
-            //% "sec ago"
             timeString =  inSecs > 1 ? qsTr("secs ago") : qsTr("sec ago")
             return inSecs + " " + timeString
         }
 
-        //% "now"
         return qsTr("now")
     }
 
diff --git a/ui/main.qml b/ui/main.qml
index 902141780b..131d0d6bf7 100644
--- a/ui/main.qml
+++ b/ui/main.qml
@@ -31,8 +31,7 @@ StatusWindow {
     color: Style.current.background
     title: {
         // Set application settings
-        //% "Status Desktop"
-        Qt.application.name = qsTrId("status-desktop")
+        Qt.application.name = qsTr("Status Desktop")
         Qt.application.organization = "Status"
         Qt.application.domain = "status.im"
         return Qt.application.name
@@ -244,8 +243,7 @@ StatusWindow {
 
         menu: Menu {
             MenuItem {
-                //% "Open Status"
-                text: qsTrId("open-status")
+                text: qsTr("Open Status")
                 onTriggered: {
                     applicationWindow.makeStatusAppActive()
                 }
@@ -255,8 +253,7 @@ StatusWindow {
             }
 
             MenuItem {
-                //% "Quit"
-                text: qsTrId("quit")
+                text: qsTr("Quit")
                 onTriggered: Qt.quit()
             }
         }