Merge branch 'release-1.7' into develop

README.md

@@ -57,9 +57,11 @@ The qrencode library is used for QRCode-encoding existing tokens for export to o
 
 The following people have contributed to translating SailOTP:
 
+  * Chinese: BirdZhang
   * Finnish: Johan Heikkilä (hevanaa)
   * French: Romain Tartière (smortex)
   * Russian: moorchegue
+  * Spanish: p4moedo
   * Swedish: Åke Engelbrektson (eson57)
   * English: Stefan Brand (seiichiro0185)
   * German: Stefan Brand (seiichiro0185)

qml/pages/About.qml

@@ -129,7 +129,7 @@ Page {
         font.pixelSize: Theme.fontSizeSmall
         horizontalAlignment: TextEdit.Center
         readOnly: true
-        text: qsTr("Translators:")+"\n\nSwedish: Åke Engelbrektson\nFrench: Romain Tartière\nFinnish: Johan Heikkilä\nRussian: moorchegue\nEnglish: Stefan Brand\nGerman: Stefan Brand"
+        text: qsTr("Translators:")+"\n\nChinese: BirdZhang\nFinnish: Johan Heikkilä\nFrench: Romain Tartière\nRussian: moorchegue\nSpanish: p4moedo\nSwedish: Åke Engelbrektson\nEnglish: Stefan Brand\nGerman: Stefan Brand"
         color: "white"
       }
     }

qml/pages/MainView.qml

@@ -98,6 +98,7 @@ Page {
       }
       MenuItem {
         text: qsTr("Settings")
+        visible: false
         onClicked: pageStack.push(Qt.resolvedUrl("Settings.qml"))
       }
       MenuItem {

rpm/harbour-sailotp.changes

@@ -1,3 +1,10 @@
+* Mon Apr 02 2019 Stefan Brand <sailfish@seiichiro0185.org> 1.7-1
+- Added Chinese Translation
+- Added Finish Translation
+- Added Russian Translation
+- Added Spanish Translation
+- Some internal Preparation for future features
+
 * Mon Oct 30 2017 Stefan Brand <sailfish@seiichiro0185.org> 1.6-1
 - Changed AES Engine to cryptojs for Export/Import
 

rpm/harbour-sailotp.yaml

@@ -1,6 +1,6 @@
 Name: harbour-sailotp
 Summary: SailOTP
-Version: 1.6
+Version: 1.7
 Release: 1
 Group: Security
 URL: https://github.com/seiichiro0185/sailotp/