From 07dd81fca60f094c17049f63711d0be379cdfd2a Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Tue, 15 Jan 2019 19:58:33 +0400 Subject: [PATCH 1/3] Update submodules --- Telegram-iOS/en.lproj/Localizable.strings | 32 +++++++++++++++++++++-- submodules/Display | 2 +- submodules/TelegramUI | 2 +- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index b7b7978334..d8c6a04eb6 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -3868,8 +3868,16 @@ Unused sets are archived when you add more."; "EmptyGroupInfo.Line4" = "Admins with different rights"; "WallpaperPreview.Title" = "Background Preview"; -"WallpaperPreview.SwipeInfo" = "Swipe left or right to preview more backgrounds"; -"WallpaperPreview.MessageText" = "Lorem ipsum dolor sit amet"; +"WallpaperPreview.PreviewTopText" = "Press Set to apply the background"; +"WallpaperPreview.PreviewBottomText" = "Lorem ipsum dolor sit amet"; +"WallpaperPreview.SwipeTopText" = "Swipe left or right to preview more backgrounds"; +"WallpaperPreview.SwipeBottomText" = "Lorem ipsum dolor sit amet"; +"WallpaperPreview.SwipeColorsTopText" = "Swipe left or right to see more colors"; +"WallpaperPreview.SwipeColorsBottomText" = "Lorem ipsum dolor sit amet"; +"WallpaperPreview.CustomColorTopText" = "Use sliders to adjust color"; +"WallpaperPreview.CustomColorBottomText" = "Lorem ipsum dolor sit amet"; +"WallpaperPreview.CropTopText" = "Pinch and pan to adjust background"; +"WallpaperPreview.CropBottomText" = "Lorem ipsum dolor sit amet"; "WallpaperPreview.Still" = "Still"; "WallpaperPreview.Perspective" = "Perspective"; "WallpaperPreview.Blurred" = "Blurred"; @@ -3879,11 +3887,31 @@ Unused sets are archived when you add more."; "Wallpaper.SetCustomBackground" = "Choose from Gallery"; "Wallpaper.SetCustomBackgroundInfo" = "You can set a custom background image and share it with your friends."; +"Wallpaper.DeleteConfirmation_1" = "Delete Background"; +"Wallpaper.DeleteConfirmation_2" = "Delete 2 Backgrounds"; +"Wallpaper.DeleteConfirmation_3_10" = "Delete %@ Backgrounds"; +"Wallpaper.DeleteConfirmation_any" = "Delete %@ Backgrounds"; +"Wallpaper.DeleteConfirmation_many" = "Delete %@ Backgrounds"; +"Wallpaper.DeleteConfirmation_0" = "Delete %@ Backgrounds"; + "WallpaperColors.Title" = "Set a Color"; "WallpaperColors.SetCustomColor" = "Set Custom Color"; "WallpaperSearch.ColorTitle" = "SEARCH BY COLOR"; "WallpaperSearch.Recent" = "RECENT"; +"WallpaperSearch.ColorPrefix" = "color: "; +"WallpaperSearch.ColorBlue" = "Blue"; +"WallpaperSearch.ColorRed" = "Red"; +"WallpaperSearch.ColorOrange" = "Orange"; +"WallpaperSearch.ColorYellow" = "Yellow"; +"WallpaperSearch.ColorGreen" = "Green"; +"WallpaperSearch.ColorTeal" = "Teal"; +"WallpaperSearch.ColorPurple" = "Purple"; +"WallpaperSearch.ColorPink" = "Pink"; +"WallpaperSearch.ColorBrown" = "Brown"; +"WallpaperSearch.ColorBlack" = "Black"; +"WallpaperSearch.ColorGray" = "Gray"; +"WallpaperSearch.ColorWhite" = "White"; "Channel.AdminLog.DefaultRestrictionsUpdated" = "changed default permissions"; "Channel.AdminLog.PollStopped" = "%@ stopped poll"; diff --git a/submodules/Display b/submodules/Display index a533f7dd71..679283d018 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit a533f7dd716dd8e059b0e365e72867a9b6fb77a9 +Subproject commit 679283d018b3c0299ca9103f3048d9fae55e757a diff --git a/submodules/TelegramUI b/submodules/TelegramUI index de668ae9c2..7c40211c4b 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit de668ae9c2804130e5135ec085081670bcb10e2d +Subproject commit 7c40211c4bbb3cd5414b7e594772f4ae82d7998c From a3c747bde2a88f3e10b5deb1992006a18659fe0d Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Wed, 16 Jan 2019 21:33:20 +0400 Subject: [PATCH 2/3] Update submodules --- Telegram-iOS/SnapshotEnvironment.swift | 4 ++-- submodules/Display | 2 +- submodules/TelegramUI | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Telegram-iOS/SnapshotEnvironment.swift b/Telegram-iOS/SnapshotEnvironment.swift index 6e2cf9636c..05a4cdc687 100644 --- a/Telegram-iOS/SnapshotEnvironment.swift +++ b/Telegram-iOS/SnapshotEnvironment.swift @@ -89,9 +89,9 @@ func snapshotEnvironment(application: UIApplication, mainWindow: UIWindow, statu let _ = updatePresentationThemeSettingsInteractively(postbox: result!.postbox, { _ in switch theme { case .day: - return PresentationThemeSettings(chatWallpaper: .color(0xffffff), chatWallpaperMode: .still, theme: .builtin(.day), themeAccentColor: nil, fontSize: .regular, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .none, theme: .nightAccent), disableAnimations: false) + return PresentationThemeSettings(chatWallpaper: .color(0xffffff), chatWallpaperOptions: [], theme: .builtin(.day), themeAccentColor: nil, fontSize: .regular, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .none, theme: .nightAccent), disableAnimations: false) case .night: - return PresentationThemeSettings(chatWallpaper: .color(0x000000), chatWallpaperMode: .still, theme: .builtin(.nightAccent), themeAccentColor: nil, fontSize: .regular, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .none, theme: .nightAccent), disableAnimations: false) + return PresentationThemeSettings(chatWallpaper: .color(0x000000), chatWallpaperOptions: [], theme: .builtin(.nightAccent), themeAccentColor: nil, fontSize: .regular, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .none, theme: .nightAccent), disableAnimations: false) } }).start() diff --git a/submodules/Display b/submodules/Display index 679283d018..02bca94d9d 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 679283d018b3c0299ca9103f3048d9fae55e757a +Subproject commit 02bca94d9da397c147c14d61acb94cbfc9e58e75 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index c9631285bf..06fc9e6aab 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit c9631285bf9af4712b9c0b966f50d6e2ec1ac314 +Subproject commit 06fc9e6aabeeb2daa488ad95fb7984477fca5d9e From faf18be8134939362be1602f005563b42825ee8d Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Thu, 17 Jan 2019 15:22:32 +0400 Subject: [PATCH 3/3] Update submodules --- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/TelegramCore b/submodules/TelegramCore index ae844e1a20..c45aa06aa7 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit ae844e1a203745452ea630470db519dc152c0765 +Subproject commit c45aa06aa7fef4f0a50c6d31cc37738729e1092f diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 06fc9e6aab..1270d99fc2 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 06fc9e6aabeeb2daa488ad95fb7984477fca5d9e +Subproject commit 1270d99fc2f737c30efa43e3567fac869f843afb