Merge commit '1e44235fdbbd78ee6d51b0dd0b0bcbbca2429f4d'

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:

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,12 @@ 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";
+
+"TextFormat.Link" = "Link";