Merge branch 'release-1.9.4' into develop

2024-12-21 11:12:29 +00:00 · 2021-06-26 16:04:27 +02:00 · 2021-06-26 16:04:27 +02:00 · 075f9949c3
commit 075f9949c3
parent dbdf3ee3be a6044de2b1
17 changed files with 115 additions and 40 deletions
--- a/README.md
+++ b/README.md
@ -33,6 +33,30 @@ or write an email to sailfish _AT_ seiichiro0185.org

 SailOTP is licensed under a 3-Clause BSD-License. See COPYING for details.

+## Contributors
+
+The Following people have contributed code or other improvements to SailOTP:
+
+  * SteamGuard support: Robin Appelman
+  * Search function: Jyri-Petteri Paloposki
+  * Improved App Icon: JSEHV
+
+## Translations
+
+The following people have contributed to translating SailOTP:
+
+  * Brazilian Portuguese: caio2k
+  * Chinese: BirdZhang
+  * Finnish: Johan Heikkilä (hevanaa), Jyri-Petteri Paloposki (ZeiP)
+  * French: Romain Tartière (smortex)
+  * Italian: Tichy
+  * Hungarian: 1Zgp
+  * Russian: moorchegue
+  * Spanish: p4moedo
+  * Swedish: Åke Engelbrektson (eson57)
+  * English: Stefan Brand (seiichiro0185)
+  * German: Stefan Brand (seiichiro0185)
+
 ## Acknowledgements

 SailOTP uses the SHA-1 and HMAC-Implementation from 
@ -52,19 +76,3 @@ An adapted version of the QZXing-library is used for QRCode-decoding

 The qrencode library is used for QRCode-encoding existing tokens for export to other devices.
 <a href="http://fukuchi.org/works/qrencode/">http://fukuchi.org/works/qrencode/</a>
-
-## Translations
-
-The following people have contributed to translating SailOTP:
-
-  * Brazilian Portuguese: caio2k
-  * Chinese: BirdZhang
-  * Finnish: Johan Heikkilä (hevanaa), Jyri-Petteri Paloposki (ZeiP)
-  * French: Romain Tartière (smortex)
-  * Italian: Tichy
-  * Hungarian: 1Zgp
-  * Russian: moorchegue
-  * Spanish: p4moedo
-  * Swedish: Åke Engelbrektson (eson57)
-  * English: Stefan Brand (seiichiro0185)
-  * German: Stefan Brand (seiichiro0185)
--- a/harbour-sailotp.pro
+++ b/harbour-sailotp.pro
@ -8,6 +8,7 @@ CONFIG += sailfishapp
 SOURCES += src/harbour-sailotp.cpp

 DISTFILES += qml/harbour-sailotp.qml \
+    icons/86x86/sailotp.png \
    qml/cover/CoverPage.qml \
    qml/pages/MainView.qml \
    qml/pages/AddOTP.qml \
--- a/qml/pages/About.qml
+++ b/qml/pages/About.qml
@ -149,6 +149,13 @@ Page {
        alignment: Qt.AlignLeft
        leftMargin: Theme.paddingLarge*2
      }
+      DetailItem {
+        label: qsTr("Icon")
+        value: "JSEHV"
+        width: parent.width
+        alignment: Qt.AlignLeft
+        leftMargin: Theme.paddingLarge*2
+      }
      Item {
        width: parent.width
        height: Theme.paddingMedium
--- a/qml/sailotp.png
+++ b/qml/sailotp.png
--- a/rpm/harbour-sailotp.changes
+++ b/rpm/harbour-sailotp.changes
@ -1,3 +1,7 @@
+* Sat Jun 26 2021 Stefan Brand <sailfish@seiichiro0185.org> 1.9.4-1
+- Update pt_br Translation (contributed by caio2k)
+- Refreshed App Icon (contributed by JSEHV)
+
 * Sun Feb 21 2021 Stefan Brand <sailfish@seiichiro0185.org> 1.9.3-1
 - Added Hungarian Translation (conbtributed by 1Zgp)

--- a/rpm/harbour-sailotp.yaml
+++ b/rpm/harbour-sailotp.yaml
@ -1,6 +1,6 @@
 Name: harbour-sailotp
 Summary: SailOTP
-Version: 1.9.3
+Version: 1.9.4
 Release: 1
 Group: Security
 URL: https://github.com/seiichiro0185/sailotp/
--- a/translations/harbour-sailotp-de.ts
+++ b/translations/harbour-sailotp-de.ts
@ -49,7 +49,12 @@
        <translation>Suche</translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="247"/>
+        <location filename="../qml/pages/About.qml" line="153"/>
+        <source>Icon</source>
+        <translation>Icon</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/About.qml" line="261"/>
        <source>SailOTP uses the following third party libs:</source>
        <translation>SailOTP verwendet folgende externe Bibliotheken:</translation>
    </message>
@ -59,7 +64,7 @@
        <translation>Mitwirkende:</translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="162"/>
+        <location filename="../qml/pages/About.qml" line="169"/>
        <source>Translators:</source>
        <translation>Übersetzer:</translation>
    </message>
--- a/translations/harbour-sailotp-es.ts
+++ b/translations/harbour-sailotp-es.ts
@ -49,7 +49,12 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="247"/>
+        <location filename="../qml/pages/About.qml" line="153"/>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/About.qml" line="261"/>
        <source>SailOTP uses the following third party libs:</source>
        <translation>SailOTP usa las siguientes librerías de terceros:</translation>
    </message>
@ -59,7 +64,7 @@
        <translation>Contribuidor:</translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="162"/>
+        <location filename="../qml/pages/About.qml" line="169"/>
        <source>Translators:</source>
        <translation>Traductores:</translation>
    </message>
--- a/translations/harbour-sailotp-fi.ts
+++ b/translations/harbour-sailotp-fi.ts
@ -44,7 +44,12 @@
        <translation type="unfinished">Etsi</translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="247"/>
+        <location filename="../qml/pages/About.qml" line="153"/>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/About.qml" line="261"/>
        <source>SailOTP uses the following third party libs:</source>
        <translation>SailOTP käyttää seuraavia kolmannen osapuolen kirjastoja:</translation>
    </message>
@ -59,7 +64,7 @@
        <translation>(RFC 6238/4226 -yhteensopiva)</translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="162"/>
+        <location filename="../qml/pages/About.qml" line="169"/>
        <source>Translators:</source>
        <translation>Kääntäjät:</translation>
    </message>
--- a/translations/harbour-sailotp-fr.ts
+++ b/translations/harbour-sailotp-fr.ts
@ -49,7 +49,12 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="247"/>
+        <location filename="../qml/pages/About.qml" line="153"/>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/About.qml" line="261"/>
        <source>SailOTP uses the following third party libs:</source>
        <translation>SailOTP utilise les bibliothèques tierces suivantes :</translation>
    </message>
@ -59,7 +64,7 @@
        <translation>Contributeurs :</translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="162"/>
+        <location filename="../qml/pages/About.qml" line="169"/>
        <source>Translators:</source>
        <translation>Traducteurs :</translation>
    </message>
--- a/translations/harbour-sailotp-hu.ts
+++ b/translations/harbour-sailotp-hu.ts
@ -44,7 +44,12 @@
        <translation>Keresés</translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="247"/>
+        <location filename="../qml/pages/About.qml" line="153"/>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/About.qml" line="261"/>
        <source>SailOTP uses the following third party libs:</source>
        <translation>A SailOTP a következő harmadik féltől származó könyvtárakat használja:</translation>
    </message>
@ -59,7 +64,7 @@
        <translation>(RFC 6238/4226 kompatibilis)</translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="162"/>
+        <location filename="../qml/pages/About.qml" line="169"/>
        <source>Translators:</source>
        <translation>Fordítók:</translation>
    </message>
--- a/translations/harbour-sailotp-it.ts
+++ b/translations/harbour-sailotp-it.ts
@ -49,7 +49,12 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="247"/>
+        <location filename="../qml/pages/About.qml" line="153"/>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/About.qml" line="261"/>
        <source>SailOTP uses the following third party libs:</source>
        <translation>SailOTP utilizza le seguenti librerie di terzi:</translation>
    </message>
@ -59,7 +64,7 @@
        <translation>Collaboratori:</translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="162"/>
+        <location filename="../qml/pages/About.qml" line="169"/>
        <source>Translators:</source>
        <translation>Traduttori:</translation>
    </message>
--- a/translations/harbour-sailotp-nl.ts
+++ b/translations/harbour-sailotp-nl.ts
@ -49,7 +49,12 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="247"/>
+        <location filename="../qml/pages/About.qml" line="153"/>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/About.qml" line="261"/>
        <source>SailOTP uses the following third party libs:</source>
        <translation>SailOTP gebruikt de volgende bibliotheken van derden:</translation>
    </message>
@ -59,7 +64,7 @@
        <translation>Bijdragers:</translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="162"/>
+        <location filename="../qml/pages/About.qml" line="169"/>
        <source>Translators:</source>
        <translation>Vertalers:</translation>
    </message>
--- a/translations/harbour-sailotp-ru.ts
+++ b/translations/harbour-sailotp-ru.ts
@ -49,7 +49,12 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="247"/>
+        <location filename="../qml/pages/About.qml" line="153"/>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/About.qml" line="261"/>
        <source>SailOTP uses the following third party libs:</source>
        <translation>SailOTP использует следующие сторонние библиотеки:</translation>
    </message>
@ -59,7 +64,7 @@
        <translation>Участники:</translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="162"/>
+        <location filename="../qml/pages/About.qml" line="169"/>
        <source>Translators:</source>
        <translation>Переводчики:</translation>
    </message>
--- a/translations/harbour-sailotp-sv.ts
+++ b/translations/harbour-sailotp-sv.ts
@ -49,7 +49,12 @@
        <translation type="unfinished">Sök</translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="247"/>
+        <location filename="../qml/pages/About.qml" line="153"/>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/About.qml" line="261"/>
        <source>SailOTP uses the following third party libs:</source>
        <translation>SailOTP använder följande tredjeparts bibliotek:</translation>
    </message>
@ -59,7 +64,7 @@
        <translation>Medarbetare:</translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="162"/>
+        <location filename="../qml/pages/About.qml" line="169"/>
        <source>Translators:</source>
        <translation>Översättare:</translation>
    </message>
--- a/translations/harbour-sailotp-zh_CN.ts
+++ b/translations/harbour-sailotp-zh_CN.ts
@ -49,7 +49,12 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="247"/>
+        <location filename="../qml/pages/About.qml" line="153"/>
+        <source>Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/About.qml" line="261"/>
        <source>SailOTP uses the following third party libs:</source>
        <translation>SailOTP使用下面的第三方库：</translation>
    </message>
@ -59,7 +64,7 @@
        <translation>贡献者:</translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="162"/>
+        <location filename="../qml/pages/About.qml" line="169"/>
        <source>Translators:</source>
        <translation>翻译:</translation>
    </message>
--- a/translations/harbour-sailotp.ts
+++ b/translations/harbour-sailotp.ts
@ -44,14 +44,19 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="247"/>
+        <location filename="../qml/pages/About.qml" line="153"/>
+        <source>Icon</source>
+        <translation>Icon</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/About.qml" line="261"/>
        <source>SailOTP uses the following third party libs:</source>
        <translation></translation>
    </message>
    <message>
        <location filename="../qml/pages/About.qml" line="70"/>
        <source>A simple Sailfish OTP generator</source>
-        <translation type="unfinished"></translation>
+        <translation>Icon</translation>
    </message>
    <message>
        <location filename="../qml/pages/About.qml" line="78"/>
@ -59,7 +64,7 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/pages/About.qml" line="162"/>
+        <location filename="../qml/pages/About.qml" line="169"/>
        <source>Translators:</source>
        <translation>Translators:</translation>
    </message>