ReceiveTempSMS
/
Kurdtvs-Live-Kurdish-TV-Kurdmax
forked from zelo72/mastodon-ios
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

chore: resolve conflicts

This commit is contained in:
jk234ert 2021-02-23 12:41:56 +08:00
parent 8f5a52333a
commit 2fa11b6595
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mastodon/Resources/en.lproj/Localizable.strings
View File

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

2
Mastodon/Scene/PickServer/PickServerViewController.swift
View File

@ -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

4
Mastodon/Scene/Welcome/WelcomeViewController.swift
View File

@ -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([