Merge pull request #504

44bcb3d Update PrivacyLevelSmall.qml (xmr-eric)
e8875e0 PrivacyLevelSmall.qml: mixed case for Wizard (xmr-eric)
d354d4a Sign Verify: keep text mixed case (xmr-eric)
d1202e4 TxKey.qml: Keep text mixed case (xmr-eric)
08d5730 History.qml: Keep text mixed case (xmr-eric)
92a5781 Addressbook.qml: Keep text mixed case (xmr-eric)
9ac8e26 TickDelegate.qml: Keep text mixed case (xmr-eric)
0b017ff Transfer.qml: Keep buttons mixed case (xmr-eric)

5 files changed, 20 insertions, 20 deletions

diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml
index 0af5dba1..3dc2a407 100644
--- a/pages/AddressBook.qml
+++ b/pages/AddressBook.qml
@@ -150,7 +150,7 @@ Rectangle {
         shadowPressedColor: "#B32D00"
         releasedColor: "#FF6C3C"
         pressedColor: "#FF4304"
-        text: qsTr("ADD")
+        text: qsTr("Add")
         enabled: checkInformation(addressLine.text, paymentIdLine.text, appWindow.persistentSettings.testnet)
 
         onClicked: {
diff --git a/pages/History.qml b/pages/History.qml
index b1c99076..601e8800 100644
--- a/pages/History.qml
+++ b/pages/History.qml
@@ -270,7 +270,7 @@ Rectangle {
         anchors.left: toDatePicker.right
         anchors.leftMargin: 17
         width: 60
-        text: qsTr("FILTER")
+        text: qsTr("Filter")
         shadowReleasedColor: "#4D0051"
         shadowPressedColor: "#2D002F"
         releasedColor: "#6B0072"
@@ -333,9 +333,9 @@ Rectangle {
 
     ListModel {
         id: transactionsModel
-        ListElement { column1: "ALL"; column2: ""; value: TransactionInfo.Direction_Both }
-        ListElement { column1: "SENT"; column2: ""; value: TransactionInfo.Direction_Out }
-        ListElement { column1: "RECEIVED"; column2: ""; value: TransactionInfo.Direction_In }
+        ListElement { column1: "All"; column2: ""; value: TransactionInfo.Direction_Both }
+        ListElement { column1: "Sent"; column2: ""; value: TransactionInfo.Direction_Out }
+        ListElement { column1: "Received"; column2: ""; value: TransactionInfo.Direction_In }
 
     }
 
diff --git a/pages/Sign.qml b/pages/Sign.qml
index f77508bc..a5ace1a4 100644
--- a/pages/Sign.qml
+++ b/pages/Sign.qml
@@ -164,7 +164,7 @@ Rectangle {
                     id: signMessageButton
                     anchors.right: parent.right
                     width: 60
-                    text: qsTr("SIGN") + translationManager.emptyString
+                    text: qsTr("Sign") + translationManager.emptyString
                     shadowReleasedColor: "#FF4304"
                     shadowPressedColor: "#B32D00"
                     releasedColor: "#FF6C3C"
@@ -205,7 +205,7 @@ Rectangle {
                     id: loadFileToSignButton
                     anchors.rightMargin: 17
                     width: 60
-                    text: qsTr("SELECT") + translationManager.emptyString
+                    text: qsTr("Select") + translationManager.emptyString
                     shadowReleasedColor: "#FF4304"
                     shadowPressedColor: "#B32D00"
                     releasedColor: "#FF6C3C"
@@ -239,7 +239,7 @@ Rectangle {
                     id: signFileButton
                     anchors.right: parent.right
                     width: 60
-                    text: qsTr("SIGN") + translationManager.emptyString
+                    text: qsTr("Sign") + translationManager.emptyString
                     shadowReleasedColor: "#FF4304"
                     shadowPressedColor: "#B32D00"
                     releasedColor: "#FF6C3C"
@@ -349,7 +349,7 @@ Rectangle {
                     id: verifyMessageButton
                     anchors.right: parent.right
                     width: 60
-                    text: qsTr("VERIFY") + translationManager.emptyString
+                    text: qsTr("Verify") + translationManager.emptyString
                     shadowReleasedColor: "#FF4304"
                     shadowPressedColor: "#B32D00"
                     releasedColor: "#FF6C3C"
@@ -390,7 +390,7 @@ Rectangle {
                     id: loadFileToVerifyButton
                     anchors.rightMargin: 17
                     width: 60
-                    text: qsTr("SELECT") + translationManager.emptyString
+                    text: qsTr("Select") + translationManager.emptyString
                     shadowReleasedColor: "#FF4304"
                     shadowPressedColor: "#B32D00"
                     releasedColor: "#FF6C3C"
@@ -423,7 +423,7 @@ Rectangle {
                     id: verifyFileButton
                     anchors.right: parent.right
                     width: 60
-                    text: qsTr("VERIFY") + translationManager.emptyString
+                    text: qsTr("Verify") + translationManager.emptyString
                     shadowReleasedColor: "#FF4304"
                     shadowPressedColor: "#B32D00"
                     releasedColor: "#FF6C3C"
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index 6f0079a9..8d187cc7 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -168,7 +168,7 @@ Rectangle {
             //anchors.top: amountLine.top
             //anchors.bottom: amountLine.bottom
             width: 60
-            text: qsTr("ALL") + translationManager.emptyString
+            text: qsTr("All") + translationManager.emptyString
             shadowReleasedColor: "#FF4304"
             shadowPressedColor: "#B32D00"
             releasedColor: "#FF6C3C"
@@ -182,11 +182,11 @@ Rectangle {
         id: priorityModel
         // ListElement: cannot use script for property value, so
         // code like this wont work:
-        // ListElement { column1: qsTr("LOW") + translationManager.emptyString ; column2: ""; priority: PendingTransaction.Priority_Low }
+        // ListElement { column1: qsTr("Low") + translationManager.emptyString ; column2: ""; priority: PendingTransaction.Priority_Low }
 
-        ListElement { column1: qsTr("LOW (x1 fee)") ; column2: ""; priority: PendingTransaction.Priority_Low }
-        ListElement { column1: qsTr("MEDIUM (x20 fee)") ; column2: ""; priority: PendingTransaction.Priority_Medium }
-        ListElement { column1: qsTr("HIGH (x166 fee)")  ; column2: "";  priority: PendingTransaction.Priority_High }
+        ListElement { column1: qsTr("Low (x1 fee)") ; column2: ""; priority: PendingTransaction.Priority_Low }
+        ListElement { column1: qsTr("Medium (x20 fee)") ; column2: ""; priority: PendingTransaction.Priority_Medium }
+        ListElement { column1: qsTr("High (x166 fee)")  ; column2: "";  priority: PendingTransaction.Priority_High }
     }
 
     StandardDropdown {
@@ -300,7 +300,7 @@ Rectangle {
             anchors.topMargin: 17
             anchors.rightMargin: 17
             width: 60
-            text: qsTr("RESOLVE") + translationManager.emptyString
+            text: qsTr("Resolve") + translationManager.emptyString
             shadowReleasedColor: "#FF4304"
             shadowPressedColor: "#B32D00"
             releasedColor: "#FF6C3C"
@@ -414,7 +414,7 @@ Rectangle {
         anchors.leftMargin: 17
         anchors.topMargin: 17
         width: 60
-        text: qsTr("SEND") + translationManager.emptyString
+        text: qsTr("Send") + translationManager.emptyString
         shadowReleasedColor: "#FF4304"
         shadowPressedColor: "#B32D00"
         releasedColor: "#FF6C3C"
@@ -471,7 +471,7 @@ Rectangle {
         RowLayout {
             StandardButton {
                 id: sweepUnmixableButton
-                text: qsTr("SWEEP UNMIXABLE") + translationManager.emptyString
+                text: qsTr("Sweep Unmixable") + translationManager.emptyString
                 shadowReleasedColor: "#FF4304"
                 shadowPressedColor: "#B32D00"
                 releasedColor: "#FF6C3C"
diff --git a/pages/TxKey.qml b/pages/TxKey.qml
index cc44625c..a22d56e4 100644
--- a/pages/TxKey.qml
+++ b/pages/TxKey.qml
@@ -209,7 +209,7 @@ Rectangle {
             anchors.top: txKeyRow.bottom
             anchors.topMargin: 17
             width: 60
-            text: qsTr("CHECK") + translationManager.emptyString
+            text: qsTr("Check") + translationManager.emptyString
             shadowReleasedColor: "#FF4304"
             shadowPressedColor: "#B32D00"
             releasedColor: "#FF6C3C"