From 7caade42be75d055aa969f7108efe43e73ead3ad Mon Sep 17 00:00:00 2001 From: Stefan Brand Date: Sun, 17 Jul 2016 19:06:09 +0200 Subject: [PATCH] Translation, UI-Fixes, Get Digits from OTP-URL --- i18n/de.ts | 74 ++++++++++++++++++++++++++----------------- i18n/en.ts | 74 ++++++++++++++++++++++++++----------------- i18n/sv.ts | 74 ++++++++++++++++++++++++++----------------- qml/lib/urldecoder.js | 1 + qml/pages/AddOTP.qml | 6 ++-- 5 files changed, 139 insertions(+), 90 deletions(-) diff --git a/i18n/de.ts b/i18n/de.ts index c74d5be..2187c75 100644 --- a/i18n/de.ts +++ b/i18n/de.ts @@ -49,72 +49,88 @@ Lizenz: BSD (3-Klausel) AddOTP - + Show QR-Code QR-Code anzeigen - + Can't create QR-Code from incomplete settings! Ein QR-Code kann nur mit vollständigen Einstellungen erzeugt werden! - + Save Speichern - + Add Hinzufügen - + Type Typ - + Time-based (TOTP) Zeitbasiert (TOTP) - + Counter-based (HOTP) Zählerbasiert (HOTP) - + Steam Guard Steam Guard - + Title Titel - + Title for the OTP Titel für das Token - + Secret (at least 16 characters) Schlüssel (mindestens 16 Zeichen) - + Secret OTP Key Geheimer Schlüssel - + + Length + Länge + + + + Length of the Token + Länge des Tokens + + + + + Time Derivation (Seconds) + Zeitabweichung (Sekunden) + + + Next Counter Value Nächster Zählerwert - + Next Value of the Counter Nächster Wert für den Zähler @@ -237,7 +253,7 @@ Lizenz: BSD (3-Klausel) MainView - + About Über @@ -250,57 +266,57 @@ Lizenz: BSD (3-Klausel) Datenbank importieren - + Export / Import Export / Import - + Add Token Token hinzufügen - + Nothing here Hier ist nichts - + Pull down to add a OTP Nach unten ziehen zum hinzufügen - + Deleting Lösche - + Token for Token für - + copied to clipboard kopiert - + Move up Nach oben - + Move down Nach unten - + Edit Bearbeiten - + Delete Löschen @@ -308,7 +324,7 @@ Lizenz: BSD (3-Klausel) QRPage - + Can't create QR-Code from incomplete settings! Ein QR-Code kann nur mit vollständigen Einstellungen erzeugt werden! @@ -336,12 +352,12 @@ Lizenz: BSD (3-Klausel) scanne... - + No valid Token data found. Kein gültiges Token gefunden. - + Tap the picture to start / stop scanning. Pull down to add Token manually. Vorschau antippen um den Scan zu starten / zu stoppen. Nach unten ziehen um manuell hinzu zu fügen. diff --git a/i18n/en.ts b/i18n/en.ts index eb435ab..2197812 100644 --- a/i18n/en.ts +++ b/i18n/en.ts @@ -39,72 +39,88 @@ License: BSD (3-clause) AddOTP - + Show QR-Code Show QR-Code - + Can't create QR-Code from incomplete settings! Can't create QR-Code from incomplete settings! - + Save - + Add - + Type - + Time-based (TOTP) - + Counter-based (HOTP) - + Steam Guard Steam Guard - + Title - + Title for the OTP - + Secret (at least 16 characters) - + Secret OTP Key - + + Length + Length + + + + Length of the Token + Length of the Token + + + + + Time Derivation (Seconds) + Time Derivation (Seconds) + + + Next Counter Value - + Next Value of the Counter @@ -227,62 +243,62 @@ License: BSD (3-clause) MainView - + About - + Export / Import - + Add Token - + Nothing here - + Pull down to add a OTP - + Deleting - + Token for - + copied to clipboard - + Move up Move up - + Move down Move down - + Edit - + Delete @@ -290,7 +306,7 @@ License: BSD (3-clause) QRPage - + Can't create QR-Code from incomplete settings! Can't create QR-Code from incomplete settings! @@ -318,12 +334,12 @@ License: BSD (3-clause) - + No valid Token data found. - + Tap the picture to start / stop scanning. Pull down to add Token manually. diff --git a/i18n/sv.ts b/i18n/sv.ts index 90b64e3..bc48975 100644 --- a/i18n/sv.ts +++ b/i18n/sv.ts @@ -41,72 +41,88 @@ Licens: BSD (3-clause) AddOTP - + Show QR-Code Visa QR-kod - + Can't create QR-Code from incomplete settings! Kan inte skapa QR-kod från ofullständiga inställningar! - + Save Spara - + Add Lägg till - + Type Typ - + Time-based (TOTP) Tidsbaserad (TOTP) - + Counter-based (HOTP) Räknarbaserad (HOTP) - + Steam Guard Steam Guard - + Title Namn - + Title for the OTP Namn på OTP:n - + Secret (at least 16 characters) Hemlighet (Minst 16 tecken) - + Secret OTP Key Hemlig OTP-nyckel - + + Length + längd + + + + Length of the Token + Längden av token + + + + + Time Derivation (Seconds) + Tidsavvikelsen (sekunder) + + + Next Counter Value Nästa räknarvärde - + Next Value of the Counter Nästa värde på räknaren @@ -229,62 +245,62 @@ Licens: BSD (3-clause) MainView - + About Om - + Export / Import Export / Import - + Add Token Lägg till Token - + Nothing here Inget här - + Pull down to add a OTP Dra neråt för att lägga till en OTP - + Deleting Tar bort - + Token for Token för - + copied to clipboard kopierad till urklipp - + Move up Flytta upp - + Move down Flytta ner - + Edit Redigera - + Delete Ta bort @@ -292,7 +308,7 @@ Licens: BSD (3-clause) QRPage - + Can't create QR-Code from incomplete settings! Kan inte skapa QR-kod från ofullständiga inställningar! @@ -320,12 +336,12 @@ Licens: BSD (3-clause) Skannar... - + No valid Token data found. Ingen giltig Token-data hittades. - + Tap the picture to start / stop scanning. Pull down to add Token manually. Tryck på bilden för att starta / stoppa skanning. Dra neråt för att lägga till Token manuellt. diff --git a/qml/lib/urldecoder.js b/qml/lib/urldecoder.js index 552df7b..c3ab55e 100644 --- a/qml/lib/urldecoder.js +++ b/qml/lib/urldecoder.js @@ -15,6 +15,7 @@ function decode(url) { var tmp = pstr.split("="); if (tmp[0] == "secret") ret.secret = tmp[1]; if (tmp[0] == "counter") ret.counter = tmp[1]; + if (tmp[0] == "digits") ret.digits = tmp[1]; } return ret; diff --git a/qml/pages/AddOTP.qml b/qml/pages/AddOTP.qml index 30aceb9..f4d895a 100644 --- a/qml/pages/AddOTP.qml +++ b/qml/pages/AddOTP.qml @@ -61,8 +61,7 @@ Dialog { SilicaFlickable { id: addOtpList anchors.fill: parent - - + contentHeight: dialog.height PullDownMenu { visible: checkQR() @@ -81,7 +80,8 @@ Dialog { VerticalScrollDecorator {} Column { - anchors.fill: parent + id: dialog + width: parent.width DialogHeader { acceptText: paramNew ? qsTr("Add") : qsTr("Save") }