From e4de406be6e0487db1d9893e9a34d51dee1fa9a2 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 26 Apr 2019 16:13:29 +1000 Subject: [PATCH] Fix merge issue --- .../OnboardingAccountDetailsViewController.swift | 2 +- .../OnboardingPublicKeyViewController.swift | 2 +- Signal/translations/en.lproj/Localizable.strings | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/Registration/OnboardingAccountDetailsViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingAccountDetailsViewController.swift index 203070112..ad8022dbf 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingAccountDetailsViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingAccountDetailsViewController.swift @@ -50,7 +50,7 @@ final class OnboardingAccountDetailsViewController : OnboardingBaseViewControlle passwordTextField, bottomSpacer, nextButton - ]) + ]) stackView.axis = .vertical stackView.alignment = .fill stackView.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32) diff --git a/Signal/src/ViewControllers/Registration/OnboardingPublicKeyViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPublicKeyViewController.swift index 0c6f1baeb..5cc07f436 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPublicKeyViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPublicKeyViewController.swift @@ -41,7 +41,7 @@ final class OnboardingPublicKeyViewController : OnboardingBaseViewController { mnemonicLabel, bottomSpacer, registerButton - ]) + ]) stackView.axis = .vertical stackView.alignment = .fill stackView.layoutMargins = UIEdgeInsets(top: 32, left: 32, bottom: 32, right: 32) diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 3fbe2f448..45c0b21fe 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -2542,3 +2542,13 @@ /* Info message embedding a {{time amount}}, see the *_TIME_AMOUNT strings for context. */ "YOU_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION" = "You set disappearing message time to %@."; + +// -- Loki -- + +"Create Your Loki Messenger Account" = "Create Your Loki Messenger Account"; +"Enter a name that will be shown to all your contacts" = "Enter a name that will be shown to all your contacts"; +"Display Name (Optional)" = "Display Name (Optional)"; +"Type an optional password for added security" = "Type an optional password for added security"; +"Password (Optional)" = "Password (Optional)"; +"Please save the seed below in a safe location. They can be used to restore your account if you lose access or migrate to a new device." = "Please save the seed below in a safe location. They can be used to restore your account if you lose access or migrate to a new device."; +"Register" = "Register";