diff --git a/qml/pages/About.qml b/qml/pages/About.qml index fa87166..2fa4dc7 100644 --- a/qml/pages/About.qml +++ b/qml/pages/About.qml @@ -102,51 +102,141 @@ Page { width: parent.width height: Theme.paddingMedium } - DetailItem { - width: parent.width - label: qsTr("Copyright") - value: "Stefan Brand" - } - DetailItem { - width: parent.width - label: qsTr("License") - value: qsTr("BSD (3-clause)") - } Label { anchors.horizontalCenter: parent.horizontalCenter width: parent.width font.pixelSize: Theme.fontSizeSmall - horizontalAlignment: TextEdit.Center + horizontalAlignment: Text.Center wrapMode: Text.WordWrap - text: qsTr("Contributors:") + text: qsTr("Copyright") + " Stefan Brand" color: Theme.secondaryHighlightColor } - DetailItem { - label: qsTr("SteamGuard support") - value: "Robin Appelman" - } Label { anchors.horizontalCenter: parent.horizontalCenter width: parent.width font.pixelSize: Theme.fontSizeSmall horizontalAlignment: Text.Center wrapMode: Text.WordWrap - text: qsTr("Translators:") + text: qsTr("License") + " " + qsTr("BSD (3-clause)") color: Theme.secondaryHighlightColor } + Item { + width: parent.width + height: Theme.paddingMedium + } Label { anchors.horizontalCenter: parent.horizontalCenter - width: parent.width * 0.8 - font.pixelSize: Theme.fontSizeSmall + width: parent.width + font.pixelSize: Theme.fontSizeMedium + horizontalAlignment: TextEdit.Center wrapMode: Text.WordWrap - text: "Chinese: BirdZhang\nFinnish: Johan Heikkilä\nFrench: Romain Tartière\nItalian: Tichy\nDutch: JSEHV\nRussian: moorchegue\nSpanish: p4moedo\nSwedish: Åke Engelbrektson\nEnglish: Stefan Brand\nGerman: Stefan Brand" - color: Theme.highlightColor + text: qsTr("Contributors:") + color: Theme.secondaryHighlightColor + } + DetailItem { + width: parent.width + anchors.horizontalCenter: parent.horizontalCenter + label: qsTr("SteamGuard support") + value: "Robin Appelman" + alignment: Qt.AlignLeft + leftMargin: Theme.paddingLarge*2 + + } + DetailItem { + label: qsTr("Search") + value: "Jyri-Petteri Paloposki" + width: parent.width + alignment: Qt.AlignLeft + leftMargin: Theme.paddingLarge*2 + } + Item { + width: parent.width + height: Theme.paddingMedium + } + Label { + anchors.horizontalCenter: parent.horizontalCenter + width: parent.width + font.pixelSize: Theme.fontSizeMedium + horizontalAlignment: Text.Center + wrapMode: Text.WordWrap + text: qsTr("Translators:") + color: Theme.secondaryHighlightColor + } + DetailItem { + label: "Chinese" + value: "BirdZhang" + width: parent.width + alignment: Qt.AlignLeft + leftMargin: Theme.paddingLarge*2 + } + DetailItem { + label: "Finnish" + value: "Johan Heikkilä, Jyri-Petteri Paloposki" + width: parent.width + alignment: Qt.AlignLeft + leftMargin: Theme.paddingLarge*2 + } + DetailItem { + label: "French" + value: "Romain Tartière" + width: parent.width + alignment: Qt.AlignLeft + leftMargin: Theme.paddingLarge*2 + } + DetailItem { + label: "Italian" + value: "Tichy" + width: parent.width + alignment: Qt.AlignLeft + leftMargin: Theme.paddingLarge*2 + } + DetailItem { + label: "Dutch" + value: "JSEHV" + width: parent.width + alignment: Qt.AlignLeft + leftMargin: Theme.paddingLarge*2 + } + DetailItem { + label: "Russian" + value: "moorchegue" + width: parent.width + alignment: Qt.AlignLeft + leftMargin: Theme.paddingLarge*2 + } + DetailItem { + label: "Spanish" + value: "p4moedo" + width: parent.width + alignment: Qt.AlignLeft + leftMargin: Theme.paddingLarge*2 + } + DetailItem { + label: "Swedish" + value: "Åke Engelbrektson" + width: parent.width + alignment: Qt.AlignLeft + leftMargin: Theme.paddingLarge*2 + } + DetailItem { + label: "English" + value: "Stefan Brand" + width: parent.width + alignment: Qt.AlignLeft + leftMargin: Theme.paddingLarge*2 + } + DetailItem { + label: "German" + value: "Stefan Brand" + width: parent.width + alignment: Qt.AlignLeft + leftMargin: Theme.paddingLarge*2 } LinkedLabel { anchors.horizontalCenter: parent.horizontalCenter - width: parent.width + width: parent.width - Theme.paddingLarge*4 font.pixelSize: Theme.fontSizeSmall - horizontalAlignment: TextEdit.Center + horizontalAlignment: TextEdit.left plainText: "\n"+qsTr("SailOTP uses the following third party libs:")+' http://caligatio.github.io/jsSHA/ https://code.google.com/archive/p/crypto-js/ diff --git a/qml/pages/MainView.qml b/qml/pages/MainView.qml index f1e57b9..a81ecd3 100644 --- a/qml/pages/MainView.qml +++ b/qml/pages/MainView.qml @@ -139,9 +139,10 @@ Page { width: parent.width ProgressBar { id: updateProgress - // Hack to get the Progress Bar in roughly the same spot on Light and Dark Ambiances - anchors.topMargin: Theme.colorScheme === 0 ? Theme.paddingLarge * 1.1 : Theme.paddingSmall * 0.6 - height: Theme.itemSizeSmall + anchors.topMargin: Theme.paddingLarge * 1.15 + anchors.top: parent.top + anchors.bottom: parent.bottom + height: parent.height width: parent.width * 0.65 maximumValue: 29 value: 29 - seconds_global diff --git a/rpm/harbour-sailotp.changes b/rpm/harbour-sailotp.changes index 996df04..19e142a 100644 --- a/rpm/harbour-sailotp.changes +++ b/rpm/harbour-sailotp.changes @@ -1,3 +1,8 @@ +* Mon Jan 11 2021 Stefan Brand 1.9.1-1 +- Fix About Page (contributed in parts by Jyri-Petteri Paloposki) +- Update Swedish Translation (contributed by Åke Engelbrektson) +- Small Visual Fix for the Progressbar + * Mon Jan 04 2021 Stefan Brand 1.9.0-1 - Add Search Functionality (conbtributed by Jyri-Petteri Paloposki) - Updated Finnish Translation (contributed by Jyri-Petteri Paloposki) diff --git a/rpm/harbour-sailotp.yaml b/rpm/harbour-sailotp.yaml index 85ff0a5..a786b0e 100644 --- a/rpm/harbour-sailotp.yaml +++ b/rpm/harbour-sailotp.yaml @@ -1,6 +1,6 @@ Name: harbour-sailotp Summary: SailOTP -Version: 1.9.0 +Version: 1.9.1 Release: 1 Group: Security URL: https://github.com/seiichiro0185/sailotp/ diff --git a/translations/harbour-sailotp-de.ts b/translations/harbour-sailotp-de.ts index 2dcc3d4..83721ef 100644 --- a/translations/harbour-sailotp-de.ts +++ b/translations/harbour-sailotp-de.ts @@ -4,36 +4,62 @@ About - - A Simple Sailfish OTP Generator -(RFC 6238/4226 compatible) - Ein einfacher Sailfish OTP-Generator -(RFC 6238/4226-kompatibel) + + A simple Sailfish OTP generator + Ein einfacher Sailfish OTP Generator - - Copyright: Stefan Brand -License: BSD (3-clause) - Copyright: Stefan Brand -Lizenz: BSD (3-Klausel) + + (RFC 6238/4226 compatible) + (RFC 6238/4226 kompatibel) - + + Online Manual + Onlinehilfe + + + + Source Code & Issue Tracker + Sourcecode & Bugtracker + + + + Copyright + Copyright + + + + License + Lizenz + + + + BSD (3-clause) + BSD (3-Klausel) + + + + SteamGuard support + Steamguard-Unterstützung + + + + Search + Suche + + + SailOTP uses the following third party libs: SailOTP verwendet folgende externe Bibliotheken: - + Contributors: Mitwirkende: - - Support - Unterstützung - - - + Translators: Übersetzer: @@ -281,54 +307,54 @@ Lizenz: BSD (3-Klausel) Nach unten ziehen zum Hinzufügen - + Search Suchen - + Deleting Lösche - - + + Token for Token für - - + + copied to clipboard in die Zwischenablage kopiert - + Copy to Clipboard In die Zwischenablage - + Show Token as QR-Code Als QR-Code Zeigen - + Move up Nach oben - + Move down Nach unten - + Edit Bearbeiten - + Delete Löschen diff --git a/translations/harbour-sailotp-es.ts b/translations/harbour-sailotp-es.ts index 2010a29..7b5533c 100644 --- a/translations/harbour-sailotp-es.ts +++ b/translations/harbour-sailotp-es.ts @@ -4,36 +4,62 @@ About - - A Simple Sailfish OTP Generator -(RFC 6238/4226 compatible) - Un sencillo generador de códigos OTP -(Compatible con RFC 6238/4226) + + A simple Sailfish OTP generator + - - Copyright: Stefan Brand -License: BSD (3-clause) - Derechos de autor: Stefan Brand -Licencia: BSD (de 3 cláusulas) + + (RFC 6238/4226 compatible) + - + + Online Manual + + + + + Source Code & Issue Tracker + + + + + Copyright + + + + + License + + + + + BSD (3-clause) + + + + + SteamGuard support + + + + + Search + + + + SailOTP uses the following third party libs: SailOTP usa las siguientes librerías de terceros: - + Contributors: Contribuidor: - - Support - soporte - - - + Translators: Traductores: @@ -281,54 +307,54 @@ Licencia: BSD (de 3 cláusulas) Tire hacia abajo para añadir tokens OTP - + Search - + Deleting Borrando - - + + Token for Token para - - + + copied to clipboard copiado al portapapeles - + Copy to Clipboard Copiar al portapapeles - + Show Token as QR-Code Mostrar código QR - + Move up Ascender - + Move down Descender - + Edit Editar - + Delete Borrar diff --git a/translations/harbour-sailotp-fi.ts b/translations/harbour-sailotp-fi.ts index 31f7e1e..9fc4f59 100644 --- a/translations/harbour-sailotp-fi.ts +++ b/translations/harbour-sailotp-fi.ts @@ -14,32 +14,37 @@ Lähdekoodi ja virheilmoitukset - + Copyright Tekijänoikeus - + License Lisenssi - + BSD (3-clause) BSD (3 lauseen) - + Contributors: Projektiin osallistuneet: - + SteamGuard support SteamGuard-tuki - + + Search + Etsi + + + SailOTP uses the following third party libs: SailOTP käyttää seuraavia kolmannen osapuolen kirjastoja: @@ -54,7 +59,7 @@ (RFC 6238/4226 -yhteensopiva) - + Translators: Kääntäjät: @@ -302,54 +307,54 @@ Vedä alaspäin lisätäksesi kertasalasanatunnuksen - + Search Etsi - + Deleting Poistetaan - - + + Token for Kertasalasana palveluun - - + + copied to clipboard on kopioitu leikepöydälle - + Copy to Clipboard Kopioi leikepöydälle - + Show Token as QR-Code Näytä kertasalasana QR-koodina - + Move up Siirrä ylöspäin - + Move down Siirrä alaspäin - + Edit Muokkaa - + Delete Poista diff --git a/translations/harbour-sailotp-fr.ts b/translations/harbour-sailotp-fr.ts index 469af15..54c6b6f 100644 --- a/translations/harbour-sailotp-fr.ts +++ b/translations/harbour-sailotp-fr.ts @@ -4,35 +4,62 @@ About - - A Simple Sailfish OTP Generator -(RFC 6238/4226 compatible) - Un générateur d'OTP simple pour Sailfish (compatible avec les RFC6238 et 4226) + + A simple Sailfish OTP generator + - - Copyright: Stefan Brand -License: BSD (3-clause) - Copyright: Stefan Brand -Licence : BSD (3 clauses) + + (RFC 6238/4226 compatible) + - + + Online Manual + + + + + Source Code & Issue Tracker + + + + + Copyright + + + + + License + + + + + BSD (3-clause) + + + + + SteamGuard support + + + + + Search + + + + SailOTP uses the following third party libs: SailOTP utilise les bibliothèques tierces suivantes : - + Contributors: Contributeurs : - - Support - Support - - - + Translators: Traducteurs : @@ -281,54 +308,54 @@ Licence : BSD (3 clauses) Glissez vers le bas pour ajouter un OTP - + Search - + Deleting Suppression - - + + Token for OTP pour - - + + copied to clipboard copié dans le presse-papier - + Copy to Clipboard Copier dans le presse-papier - + Show Token as QR-Code Afficher le code QR - + Move up Déplacer vers le haut - + Move down Déplacer vers le bas - + Edit Modifier - + Delete Supprimer diff --git a/translations/harbour-sailotp-it.ts b/translations/harbour-sailotp-it.ts index 8989250..3a95f51 100644 --- a/translations/harbour-sailotp-it.ts +++ b/translations/harbour-sailotp-it.ts @@ -4,36 +4,62 @@ About - - A Simple Sailfish OTP Generator -(RFC 6238/4226 compatible) - Un semplice generatore di OTP per Sailfish -(compatibile con RFC 6238/4226) + + A simple Sailfish OTP generator + - - Copyright: Stefan Brand -License: BSD (3-clause) - Copyright: Stefan Brand -Licenza: BSD (3-clause) + + (RFC 6238/4226 compatible) + - + + Online Manual + + + + + Source Code & Issue Tracker + + + + + Copyright + + + + + License + + + + + BSD (3-clause) + + + + + SteamGuard support + + + + + Search + + + + SailOTP uses the following third party libs: SailOTP utilizza le seguenti librerie di terzi: - + Contributors: Collaboratori: - - Support - Supporto - - - + Translators: Traduttori: @@ -281,54 +307,54 @@ Licenza: BSD (3-clause) Trascina giù per aggiungere una OTP - + Search - + Deleting Cancellazione - - + + Token for Token per - - + + copied to clipboard copiato negli appunti - + Copy to Clipboard Copia negli appunti - + Show Token as QR-Code Mostra Codice QR - + Move up >Sposta su - + Move down Sposta giù - + Edit Modifica - + Delete Cancella diff --git a/translations/harbour-sailotp-nl.ts b/translations/harbour-sailotp-nl.ts index 79d26cb..c9114d3 100644 --- a/translations/harbour-sailotp-nl.ts +++ b/translations/harbour-sailotp-nl.ts @@ -4,36 +4,62 @@ About - - A Simple Sailfish OTP Generator -(RFC 6238/4226 compatible) - Een simple Sailfish OTP generator -(RFC 6238/4226 compatible) + + A simple Sailfish OTP generator + - - Copyright: Stefan Brand -License: BSD (3-clause) - Auteursrechten: Stefan Brand -Licentie: BSD (3-clause) + + (RFC 6238/4226 compatible) + - + + Online Manual + + + + + Source Code & Issue Tracker + + + + + Copyright + + + + + License + + + + + BSD (3-clause) + + + + + SteamGuard support + + + + + Search + + + + SailOTP uses the following third party libs: SailOTP gebruikt de volgende bibliotheken van derden: - + Contributors: Bijdragers: - - Support - Ondersteuning - - - + Translators: Vertalers: @@ -281,54 +307,54 @@ Licentie: BSD (3-clause) Veeg naar beneden om een OTP toe te voegen - + Search - + Deleting Wissen - - + + Token for Token voor - - + + copied to clipboard gekopieerd naar het klembord - + Copy to Clipboard Kopieer naar klembord - + Show Token as QR-Code Geeft token als QR-code weer - + Move up Verplaats naar boven - + Move down Verplaats naar beneden - + Edit Wijzig - + Delete Verwijder diff --git a/translations/harbour-sailotp-pt_BR.ts b/translations/harbour-sailotp-pt_BR.ts index b713be2..f4095ff 100644 --- a/translations/harbour-sailotp-pt_BR.ts +++ b/translations/harbour-sailotp-pt_BR.ts @@ -4,35 +4,62 @@ About - - A Simple Sailfish OTP Generator -(RFC 6238/4226 compatible) - Um Simples Gerador de OTP para Sailfish + + A simple Sailfish OTP generator + - - Copyright: Stefan Brand -License: BSD (3-clause) - Copyright: Stefan Brand -Licença: BSD (3-clause) + + (RFC 6238/4226 compatible) + - + + Online Manual + + + + + Source Code & Issue Tracker + + + + + Copyright + + + + + License + + + + + BSD (3-clause) + + + + + SteamGuard support + + + + + Search + + + + SailOTP uses the following third party libs: SailOTP usa as seguintes bibliotecas de terceiros - + Contributors: Contribuiram: - - Support - Suporte - - - + Translators: Tradutores: @@ -280,54 +307,54 @@ Licença: BSD (3-clause) Puxe para baixo para adicionar um OTP - + Search - + Deleting Apagando - - + + Token for Token para - - + + copied to clipboard copiado para a área de transferência - + Copy to Clipboard Copiar para área de transferência - + Show Token as QR-Code Mostrar código QR - + Move up Mover para cima - + Move down Mover para baixo - + Edit Editar - + Delete Apagar diff --git a/translations/harbour-sailotp-ru.ts b/translations/harbour-sailotp-ru.ts index 294e6c4..8eea636 100644 --- a/translations/harbour-sailotp-ru.ts +++ b/translations/harbour-sailotp-ru.ts @@ -4,36 +4,62 @@ About - - A Simple Sailfish OTP Generator -(RFC 6238/4226 compatible) - Простой генератор OTP для Sailfish -(совместим с RFS 6238/4226) + + A simple Sailfish OTP generator + - - Copyright: Stefan Brand -License: BSD (3-clause) - Авторские права: Стефан Брэнд -Лицензия: BSD (3-clause) + + (RFC 6238/4226 compatible) + - + + Online Manual + + + + + Source Code & Issue Tracker + + + + + Copyright + + + + + License + + + + + BSD (3-clause) + + + + + SteamGuard support + + + + + Search + + + + SailOTP uses the following third party libs: SailOTP использует следующие сторонние библиотеки: - + Contributors: Участники: - - Support - Поддержка - - - + Translators: Переводчики: @@ -282,54 +308,54 @@ License: BSD (3-clause) Потяните вниз чтобы добавить OTP - + Search - + Deleting Удаление - - + + Token for Токен для - - + + copied to clipboard скопирован в буфер обмена - + Copy to Clipboard Скопировать в буфер обмена - + Show Token as QR-Code Показать QR-код - + Move up Передвинуть вниз - + Move down Передвинуть вверх - + Edit Редактировать - + Delete Удалить diff --git a/translations/harbour-sailotp-sv.ts b/translations/harbour-sailotp-sv.ts index 836a601..44a8d52 100644 --- a/translations/harbour-sailotp-sv.ts +++ b/translations/harbour-sailotp-sv.ts @@ -4,36 +4,62 @@ About - - A Simple Sailfish OTP Generator -(RFC 6238/4226 compatible) - En enkel Sailfish OTP-generator -(RFC 6238/4226-kompatibel) + + A simple Sailfish OTP generator + - - Copyright: Stefan Brand -License: BSD (3-clause) - Copyright: Stefan Brand -Licens: BSD (3-clause) + + (RFC 6238/4226 compatible) + - + + Online Manual + + + + + Source Code & Issue Tracker + + + + + Copyright + + + + + License + + + + + BSD (3-clause) + + + + + SteamGuard support + + + + + Search + Sök + + + SailOTP uses the following third party libs: SailOTP använder följande tredjeparts bibliotek: - + Contributors: Medarbetare: - - Support - Support - - - + Translators: Översättare: @@ -281,54 +307,54 @@ Licens: BSD (3-clause) Dra neråt för att lägga till en OTP - + Search Sök - + Deleting Tar bort - - + + Token for Token för - - + + copied to clipboard kopierad till urklipp - + Copy to Clipboard Kopiera till Urklipp - + Show Token as QR-Code Visa token som QR-kod - + Move up Flytta upp - + Move down Flytta ner - + Edit Redigera - + Delete Ta bort diff --git a/translations/harbour-sailotp-zh_CN.ts b/translations/harbour-sailotp-zh_CN.ts index e607888..f3d29ce 100644 --- a/translations/harbour-sailotp-zh_CN.ts +++ b/translations/harbour-sailotp-zh_CN.ts @@ -4,35 +4,62 @@ About - - A Simple Sailfish OTP Generator -(RFC 6238/4226 compatible) - 一个简单的旗鱼OTP生成器<br/>(RFC 6238/4226 兼容) + + A simple Sailfish OTP generator + - - Copyright: Stefan Brand -License: BSD (3-clause) - 版权所有：Stefan Brand -许可证: BSD (3-clause) + + (RFC 6238/4226 compatible) + - + + Online Manual + + + + + Source Code & Issue Tracker + + + + + Copyright + + + + + License + + + + + BSD (3-clause) + + + + + SteamGuard support + + + + + Search + + + + SailOTP uses the following third party libs: SailOTP使用下面的第三方库： - + Contributors: 贡献者: - - Support - 支持 - - - + Translators: 翻译: @@ -280,54 +307,54 @@ License: BSD (3-clause) 下拉添加一个OTP - + Search - + Deleting 删除中 - - + + Token for 令牌 - - + + copied to clipboard 已复制到剪切板 - + Copy to Clipboard 复制到剪贴板 - + Show Token as QR-Code 显示二维码 - + Move up 向上 - + Move down 向下 - + Edit 编辑 - + Delete 删除 diff --git a/translations/harbour-sailotp.ts b/translations/harbour-sailotp.ts index b875539..7af6cf8 100644 --- a/translations/harbour-sailotp.ts +++ b/translations/harbour-sailotp.ts @@ -14,32 +14,37 @@ - + Copyright - + License - + BSD (3-clause) - + Contributors: - + SteamGuard support - + + Search + + + + SailOTP uses the following third party libs: @@ -54,7 +59,7 @@ - + Translators: Translators: @@ -302,54 +307,54 @@ - + Search - + Deleting - - + + Token for - - + + copied to clipboard - + Copy to Clipboard - + Show Token as QR-Code - + Move up - + Move down - + Edit - + Delete