Fix merge issue

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)

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)

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";