From 3c9978a044edf3d34cc6ccb3db4495199472cc59 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Fri, 17 May 2019 06:24:53 +0200 Subject: [PATCH 1/5] Update submodules --- submodules/TelegramUI | 2 +- submodules/libtgvoip | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 8637a43861..4dffa90851 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 8637a43861ee32873a9392612c0d4bccffd7b00e +Subproject commit 4dffa90851172e48848639eef41e48965bb95b11 diff --git a/submodules/libtgvoip b/submodules/libtgvoip index 35653dbdb2..16711e2023 160000 --- a/submodules/libtgvoip +++ b/submodules/libtgvoip @@ -1 +1 @@ -Subproject commit 35653dbdb22688c0f1f4a2ce913eec3dd3705082 +Subproject commit 16711e202393ae7e1b160436f4291c5f06a3d375 From c5d0fa005a2ffbbe030d0f4e0763e3e320cd38e0 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Mon, 20 May 2019 15:07:17 +0200 Subject: [PATCH 2/5] Update submodules --- Telegram-iOS/en.lproj/Localizable.strings | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 4d0eb23046..31cfaf0aca 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -4286,6 +4286,7 @@ Sorry for the inconvenience."; "UserInfo.BlockConfirmationTitle" = "Do you want to block %@ from messaging and calling you on Telegram?"; "UserInfo.BlockActionTitle" = "Block %@"; "ReportSpam.DeleteThisChat" = "Delete this Chat"; + "PrivacySettings.BlockedPeersEmpty" = "None"; "Channel.DiscussionGroup" = "Discussion"; @@ -4309,3 +4310,10 @@ Any member of this group will be able to see messages in the channel."; "Channel.AdminLog.MessageChangedLinkedGroup" = "%1$@ linked %2$@ as the discussion group"; "Channel.AdminLog.MessageChangedUnlinkedGroup" = "%@ removed discussion group"; + + +"Conversation.OpenBotLinkTitle" = "Open Link"; +"Conversation.OpenBotLinkText" = "Do you want to open\n**%@**?"; +"Conversation.OpenBotLinkLogin" = "Log in to **%1$@** as %2$@"; +"Conversation.OpenBotLinkAllowMessages" = "Allow **%@** to send me messages"; +"Conversation.OpenBotLinkOpen" = "Open"; From 8a1fa740c721f356a1c75d3acecdd9da339c8da1 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Sat, 25 May 2019 15:30:01 +0200 Subject: [PATCH 3/5] Update submodules --- Telegram-iOS/LegacyPreferencesImport.swift | 2 +- Telegram-iOS/en.lproj/Localizable.strings | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Telegram-iOS/LegacyPreferencesImport.swift b/Telegram-iOS/LegacyPreferencesImport.swift index 781b5d4ca6..458ecb3257 100644 --- a/Telegram-iOS/LegacyPreferencesImport.swift +++ b/Telegram-iOS/LegacyPreferencesImport.swift @@ -220,7 +220,7 @@ func importLegacyPreferences(accountManager: AccountManager, account: TemporaryA } switch autoNightPreferences.mode { case TGPresentationAutoNightModeSunsetSunrise: - settings.automaticThemeSwitchSetting = AutomaticThemeSwitchSetting(trigger: .timeBased(setting: .automatic(latitude: Double(autoNightPreferences.latitude), longitude: Double(autoNightPreferences.longitude), sunset: autoNightPreferences.scheduleStart, sunrise: autoNightPreferences.scheduleEnd, localizedName: autoNightPreferences.cachedLocationName)), theme: nightTheme) + settings.automaticThemeSwitchSetting = AutomaticThemeSwitchSetting(trigger: .timeBased(setting: .automatic(latitude: Double(autoNightPreferences.latitude), longitude: Double(autoNightPreferences.longitude), localizedName: autoNightPreferences.cachedLocationName)), theme: nightTheme) case TGPresentationAutoNightModeScheduled: settings.automaticThemeSwitchSetting = AutomaticThemeSwitchSetting(trigger: .timeBased(setting: .manual(fromSeconds: autoNightPreferences.scheduleStart, toSeconds: autoNightPreferences.scheduleEnd)), theme: nightTheme) case TGPresentationAutoNightModeBrightness: diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 31cfaf0aca..8e88fcacd5 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -4317,3 +4317,5 @@ Any member of this group will be able to see messages in the channel."; "Conversation.OpenBotLinkLogin" = "Log in to **%1$@** as %2$@"; "Conversation.OpenBotLinkAllowMessages" = "Allow **%@** to send me messages"; "Conversation.OpenBotLinkOpen" = "Open"; + +"TextFormat.Link" = "Link"; From f74d689052adc626d55f5b5ae871d07c724bd595 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Sat, 25 May 2019 16:10:08 +0200 Subject: [PATCH 4/5] Update submodules --- submodules/LegacyComponents | 2 +- submodules/TelegramUI | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/LegacyComponents b/submodules/LegacyComponents index 596995e181..b9aa02a21d 160000 --- a/submodules/LegacyComponents +++ b/submodules/LegacyComponents @@ -1 +1 @@ -Subproject commit 596995e1811e5202d627ec27e92c298512ba745e +Subproject commit b9aa02a21dcac0e25c02343677b1675be2602d4e diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 4dffa90851..872bc05be5 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 4dffa90851172e48848639eef41e48965bb95b11 +Subproject commit 872bc05be595d7a6d08854c5dddaeab1f20c2f62 From 1e44235fdbbd78ee6d51b0dd0b0bcbbca2429f4d Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Sat, 25 May 2019 16:27:40 +0200 Subject: [PATCH 5/5] Update submodules --- submodules/TelegramUI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 872bc05be5..d07e69a5f6 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 872bc05be595d7a6d08854c5dddaeab1f20c2f62 +Subproject commit d07e69a5f6fc7398004bc3630238d466f9afebd6