chore: resolve conflicts

Mastodon/Resources/en.lproj/Localizable.strings

@@ -15,9 +15,6 @@
 "Common.Controls.Actions.TakePhoto" = "Take photo";
 "Common.Controls.Timeline.LoadMore" = "Load More";
 
-"Common.Label.Slogan" = "Social networking\nback in your hands.";
-"Common.Label.PickAServer" = "Pick a server,\nany server.";
-
 "Button.SignUp" = "Sign Up";
 "Button.SignIn" = "Sign In";
 "Common.Countable.Photo.Multiple" = "photos";

Mastodon/Scene/PickServer/PickServerViewController.swift

@@ -12,7 +12,7 @@ class PickServerViewController: UIViewController {
         let label = UILabel()
         label.font = .boldSystemFont(ofSize: 34)
         label.textColor = Asset.Colors.Label.black.color
-        label.text = L10n.Common.Label.slogan
+        label.text = L10n.Scene.ServerPicker.title
         label.adjustsFontForContentSizeCategory = true
         label.translatesAutoresizingMaskIntoConstraints = false
         label.numberOfLines = 0

Mastodon/Scene/Welcome/WelcomeViewController.swift

@@ -18,7 +18,7 @@ final class WelcomeViewController: UIViewController {
         let label = UILabel()
         label.font = UIFontMetrics(forTextStyle: .largeTitle).scaledFont(for: UIFont.boldSystemFont(ofSize: 34))
         label.textColor = Asset.Colors.Label.black.color
-        label.text = L10n.Common.Label.slogan
+        label.text = L10n.Scene.Welcome.slogan
         label.adjustsFontForContentSizeCategory = true
         label.translatesAutoresizingMaskIntoConstraints = false
         label.numberOfLines = 0
@@ -52,7 +52,7 @@ extension WelcomeViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        view.backgroundColor = Asset.Colors.Background.signUpSystemBackground.color
+        view.backgroundColor = Asset.Colors.Background.onboardingBackground.color
         
         view.addSubview(logoImageView)
         NSLayoutConstraint.activate([