ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-03 21:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f6d0688d001d3e540ca9bb8d9692ee19def8d2df'

Browse Source
This commit is contained in:
Peter 2018-12-01 02:43:42 +04:00
commit 61c4e0c6e3
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram-iOS/ApplicationContext.swift
View File

@ -311,6 +311,7 @@ final class AuthorizedApplicationContext {
self.mainWindow.previewThemeAccentColor = presentationData.theme.rootController.navigationBar.accentTextColor
self.mainWindow.previewThemeDarkBlur = presentationData.theme.chatList.searchBarKeyboardColor == .dark
self.mainWindow.setupVolumeControlStatusBarGraphics(presentationData.volumeControlStatusBarIcons)
self.rootController = TelegramRootController(account: account)
@ -854,7 +855,7 @@ final class AuthorizedApplicationContext {
resolvedText = .inProgress(nil)
case .terminated:
resolvedText = .none
case let .active(timestamp, _):
case let .active(timestamp, _, _):
resolvedText = .inProgress(timestamp)
}
} else {

33
Telegram-iOS/en.lproj/Localizable.strings
View File

@ -3541,3 +3541,36 @@ Unused sets are archived when you add more.";
"Channel.Username.RevokeExistingUsernamesInfo" = "You can revoke the link from one of your older groups or channels, or create a private channel instead.";
"InstantPage.Reference" = "Reference";
"Permissions.Skip" = "Skip";
"Permissions.ContactsTitle" = "Sync Your Contacts";
"Permissions.ContactsText" = "See who's on Telegram and switch seamlessly, without having to \"add\" your friends.";
"Permissions.ContactsAllow" = "Allow Access";
"Permissions.ContactsAllowInSettings" = "Allow in Settings";
"Permissions.NotificationsTitle" = "Turn ON Notifications";
"Permissions.NotificationsText" = "Don't miss important messages from your friends and coworkers.";
"Permissions.NotificationsAllow" = "Turn Notifications ON";
"Permissions.NotificationsAllowInSettings" = "Turn ON in Settings";
"Permissions.CellularDataTitle" = "Turn ON Notifications";
"Permissions.CellularDataText" = "Don't worry, Telegram keeps network usage to a minimum. You can further control this in Settings > Data and Storage.";
"Permissions.CellularDataAllowInSettings" = "Turn ON in Settings";
"Permissions.SiriTitle" = "Turn ON Siri";
"Permissions.SiriText" = "Use Siri to send messages and make calls.";
"Permissions.SiriAllow" = "Turn Siri ON";
"Permissions.SiriAllowInSettings" = "Turn ON in Settings";
"Permissions.PrivacyPolicy" = "Privacy Policy";
"Contacts.PermissionsTitle" = "Access to Contacts";
"Contacts.PermissionsText" = "Please allow Telegram access to your phonebook to seamlessly find all your friends.";
"Contacts.PermissionsAllow" = "Allow Access";
"Contacts.PermissionsAllowInSettings" = "Allow in Settings";
"Notifications.PermissionsTitle" = "Turn ON Notifications";
"Notifications.PermissionsText" = "Don't miss important messages from your friends and coworkers.";
"Notifications.PermissionsAllow" = "Turn Notifications ON";
"Notifications.PermissionsAllowInSettings" = "Turn ON in Settings";

2
submodules/libtgvoip

@ -1 +1 @@
Subproject commit 78e584c443b93ce2794bee75c7448d1b00f1edc9
Subproject commit f85ce99894f16c1e10cd29321feeab8376adcf77