diff options
author | Jan Mulder <jlmulder@xs4all.nl> | 2017-09-29 09:15:43 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2017-09-29 08:13:25 -0700 |
commit | e2aaa43d8c53289928e8d9cbc2cbad5e4518da29 (patch) | |
tree | d4ff93ed8a377c5fb63fa91ef2814b97903ab339 /mobile-widgets/qml/StartPage.qml | |
parent | dbed88bd810c545a100840d02f2e72168680ed72 (diff) | |
download | subsurface-e2aaa43d8c53289928e8d9cbc2cbad5e4518da29.tar.gz |
QML UI: cleanup some whitespace and string formatting
This addresses some review comment on whitespace and translated
string formatting.
In the string formatting, a tiny additional change is made.
I wanted the email address in the explanation text in a bold
font. Using the HTML <b> for this, removed the /n newline
characters in the output. Apparantly, mixing these two
formatting styles does not work. No problem, replaced the
/n to HTML style too.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Diffstat (limited to 'mobile-widgets/qml/StartPage.qml')
-rw-r--r-- | mobile-widgets/qml/StartPage.qml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mobile-widgets/qml/StartPage.qml b/mobile-widgets/qml/StartPage.qml index f23510522..0f43d845e 100644 --- a/mobile-widgets/qml/StartPage.qml +++ b/mobile-widgets/qml/StartPage.qml @@ -32,10 +32,10 @@ Kirigami.ScrollablePage { Layout.fillWidth: true Layout.margins: Kirigami.Units.gridUnit Layout.topMargin: Kirigami.Units.gridUnit * 3 - text: qsTr("To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.\n\n") + - qsTr("If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) " + - "and a password of your choice (letters and numbers).\n\n") + - qsTr("To use Subsurface-mobile only with local data on this device, select " + + text: qsTr("To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>" + + "If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) " + + "and a password of your choice (letters and numbers).<br/><br/>" + + "To use Subsurface-mobile only with local data on this device, select " + "the no cloud buttton above.") wrapMode: Text.WordWrap } @@ -45,12 +45,12 @@ Kirigami.ScrollablePage { Layout.fillWidth: true Layout.margins: Kirigami.Units.gridUnit Layout.topMargin: Kirigami.Units.gridUnit * 3 - text: qsTr("Thank you for registering with Subsurface. We sent ") + manager.cloudUserName + - qsTr(" a PIN code to complete the registration. ") + - qsTr("If you do not receive an email from us within 15 minutes, please check " + - "the correct spelling of your email address and your spam box first.\n\n" + - "In case of any problems regarding cloud account setup, please contact us " + - "at our user forum \(https://subsurface-divelog.org/user-forum/\).\n\n") + text: qsTr("Thank you for registering with Subsurface. We sent <b>%1</b>" + + " a PIN code to complete the registration. " + + "If you do not receive an email from us within 15 minutes, please check " + + "the correct spelling of your email address and your spam box first.<br/><br/>" + + "In case of any problems regarding cloud account setup, please contact us " + + "at our user forum \(https://subsurface-divelog.org/user-forum/\).<br/><br/>").arg(manager.cloudUserName) wrapMode: Text.WordWrap } Item { width: Kirigami.Units.gridUnit; height: 3 * Kirigami.Units.gridUnit} |