diff --git a/ui/i18n/en_US.ts b/ui/i18n/en_US.ts
index 1bedb46e3..8b93c376c 100644
--- a/ui/i18n/en_US.ts
+++ b/ui/i18n/en_US.ts
@@ -978,7 +978,7 @@
settings tab, general section, language label
- Language
+ Language
diff --git a/ui/i18n/es_ES.ts b/ui/i18n/es_ES.ts
index edf6a5a7d..1155eb819 100644
--- a/ui/i18n/es_ES.ts
+++ b/ui/i18n/es_ES.ts
@@ -978,7 +978,7 @@
settings tab, general section, language label
- Idioma
+ Idioma
diff --git a/ui/i18n/fr_FR.ts b/ui/i18n/fr_FR.ts
index 5e4c46b40..5e0da2a43 100644
--- a/ui/i18n/fr_FR.ts
+++ b/ui/i18n/fr_FR.ts
@@ -979,7 +979,7 @@ Vous essayez de restaurer un portefeuille Beam existant. Veuillez noter que si v
settings tab, general section, language label
- Langue
+ Langue
diff --git a/ui/i18n/ko_KR.ts b/ui/i18n/ko_KR.ts
index 2d48bff8d..3ff04cadc 100644
--- a/ui/i18n/ko_KR.ts
+++ b/ui/i18n/ko_KR.ts
@@ -978,7 +978,7 @@
settings tab, general section, language label
- 언어
+ 언어
diff --git a/ui/i18n/ru_RU.ts b/ui/i18n/ru_RU.ts
index 3fe443321..84eea80c8 100644
--- a/ui/i18n/ru_RU.ts
+++ b/ui/i18n/ru_RU.ts
@@ -978,7 +978,7 @@
settings tab, general section, language label
- Язык
+ Язык
diff --git a/ui/i18n/vi_VI.ts b/ui/i18n/vi_VI.ts
index c495c27fc..f2d03f005 100644
--- a/ui/i18n/vi_VI.ts
+++ b/ui/i18n/vi_VI.ts
@@ -978,7 +978,7 @@
settings tab, general section, language label
- Ngôn ngữ
+ Ngôn ngữ
diff --git a/ui/i18n/zh_CN.ts b/ui/i18n/zh_CN.ts
index 031131a72..87fa439fe 100644
--- a/ui/i18n/zh_CN.ts
+++ b/ui/i18n/zh_CN.ts
@@ -978,7 +978,7 @@
settings tab, general section, language label
- 语言
+ 语言
diff --git a/ui/view/loading.qml b/ui/view/loading.qml
index 117648d9e..91cde79d9 100644
--- a/ui/view/loading.qml
+++ b/ui/view/loading.qml
@@ -4,6 +4,7 @@ import QtQuick.Controls 2.4
import QtQuick.Controls.Styles 1.2
import QtGraphicalEffects 1.0
import "controls"
+import "utils.js" as Utils
import Beam.Wallet 1.0
import QtQuick.Layouts 1.3
@@ -113,7 +114,7 @@ Item
anchors.fill: parent
spacing: 0
Item {
- Layout.preferredHeight: parent.height * 0.18
+ Layout.preferredHeight: Utils.getLogoTopGapSize(parent.height)
}
LogoComponent {
@@ -176,7 +177,7 @@ Item
}
Row {
Layout.alignment: Qt.AlignHCenter
- Layout.topMargin: 25
+ Layout.topMargin: 20
SFText {
horizontalAlignment: Text.AlignHCenter
width: 548
diff --git a/ui/view/start.qml b/ui/view/start.qml
index 4937a0eba..64c75caf8 100644
--- a/ui/view/start.qml
+++ b/ui/view/start.qml
@@ -4,6 +4,7 @@ import QtQuick.Controls 2.4
import QtQuick.Controls.Styles 1.2
import QtGraphicalEffects 1.0
import "controls"
+import "utils.js" as Utils
import Beam.Wallet 1.0
import QtQuick.Layouts 1.3
@@ -110,7 +111,7 @@ Item
anchors.fill: parent
spacing: 0
Item {
- Layout.preferredHeight: parent.height * 0.18
+ Layout.preferredHeight: Utils.getLogoTopGapSize(parent.height)
}
LogoComponent {
@@ -216,7 +217,7 @@ Item
anchors.fill: parent
spacing: 0
Item {
- Layout.preferredHeight: parent.height * 0.18
+ Layout.preferredHeight: Utils.getLogoTopGapSize(parent.height)
}
LogoComponent {
@@ -1715,7 +1716,7 @@ Item
anchors.fill: parent
spacing: 0
Item {
- Layout.preferredHeight: parent.height * 0.18
+ Layout.preferredHeight: Utils.getLogoTopGapSize(parent.height)
}
LogoComponent {
diff --git a/ui/view/utils.js b/ui/view/utils.js
index 37997f0f2..100dbfa2d 100644
--- a/ui/view/utils.js
+++ b/ui/view/utils.js
@@ -13,3 +13,7 @@ function formatDateTime(datetime, localeName) {
+ timeZoneShort
+ ")";
}
+
+function getLogoTopGapSize(parentHeight) {
+ return parentHeight * (parentHeight < 768 ? 0.13 : 0.18)
+}
diff --git a/ui/view/wallet.qml b/ui/view/wallet.qml
index 8ab53b72a..e2179be22 100644
--- a/ui/view/wallet.qml
+++ b/ui/view/wallet.qml
@@ -910,7 +910,7 @@ Item {
Layout.fillWidth: true
SFText {
- //% "The minimum fee is %1 groth"
+ //% "The minimum fee is %1 GROTH"
text: qsTrId("send-fee-fail").arg(viewModel.minimumFeeInGroth)
color: Style.validator_error
font.pixelSize: 14