diff --git a/Telegram-iOS/WatchBridge.swift b/Telegram-iOS/WatchBridge.swift index 486784844c..06b3c834c1 100644 --- a/Telegram-iOS/WatchBridge.swift +++ b/Telegram-iOS/WatchBridge.swift @@ -243,6 +243,12 @@ func makeBridgeMedia(message: Message, strings: PresentationStrings, chatPeer: P bridgeAttachment.title = "" bridgeMedia.append(bridgeAttachment) } + } else if let poll = m as? TelegramMediaPoll { + let bridgeAttachment = TGBridgeUnsupportedMediaAttachment() + bridgeAttachment.compactTitle = strings.Watch_Message_Poll + bridgeAttachment.title = strings.Watch_Message_Poll + bridgeAttachment.subtitle = poll.text + bridgeMedia.append(bridgeAttachment) } else if let contact = m as? TelegramMediaContact { let bridgeContact = TGBridgeContactMediaAttachment() if let peerId = contact.peerId { @@ -296,6 +302,12 @@ func makeBridgeMedia(message: Message, strings: PresentationStrings, chatPeer: P bridgeAttachment.title = strings.Watch_Message_Invoice bridgeAttachment.subtitle = invoice.title bridgeMedia.append(bridgeAttachment) + } else if let _ = m as? TelegramMediaUnsupported { + let bridgeAttachment = TGBridgeUnsupportedMediaAttachment() + bridgeAttachment.compactTitle = strings.Watch_Message_Unsupported + bridgeAttachment.title = strings.Watch_Message_Unsupported + bridgeAttachment.subtitle = "" + bridgeMedia.append(bridgeAttachment) } } return bridgeMedia diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 631751f68d..20ba2ca475 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -3595,6 +3595,8 @@ Unused sets are archived when you add more."; "Watch.Message.Call" = "Call"; "Watch.Message.Game" = "Game"; "Watch.Message.Invoice" = "Invoice"; +"Watch.Message.Poll" = "Poll"; +"Watch.Message.Unsupported" = "Unsupported Message"; "Notifications.ExceptionsResetToDefaults" = "Reset to Defaults"; @@ -3690,7 +3692,7 @@ Unused sets are archived when you add more."; "Permissions.NotificationsAllow.v0" = "Turn Notifications ON"; "Permissions.NotificationsAllowInSettings.v0" = "Turn ON in Settings"; -"Permissions.CellularDataTitle.v0" = "Turn ON Notifications"; +"Permissions.CellularDataTitle.v0" = "Enable Cellular Data"; "Permissions.CellularDataText.v0" = "Don't worry, Telegram keeps network usage to a minimum. You can further control this in Settings > Data and Storage."; "Permissions.CellularDataAllowInSettings.v0" = "Turn ON in Settings"; @@ -3777,6 +3779,14 @@ Unused sets are archived when you add more."; "Conversation.UnsupportedMediaPlaceholder" = "This message is not supported on your version of Telegram. Please update to the latest version."; "Conversation.UpdateTelegram" = "UPDATE TELEGRAM"; +"Cache.LowDiskSpaceText" = "Your phone has run out of available storage. Please free some space to download or upload media."; + +"Contacts.SortBy" = "Sort by"; +"Contacts.SortByName" = "Name"; +"Contacts.SortByPresence" = "Last Seen"; +"Contacts.SortedByName" = "Sorted by Name"; +"Contacts.SortedByPresence" = "Sorted by Last Seen"; + "GroupInfo.Permissions" = "Permissions"; "GroupInfo.Permissions.Title" = "Permissions"; "GroupInfo.Permissions.SectionTitle" = "WHAT CAN MEMBERS OF THIS GROUP DO?"; diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 993c5cd65a..24a235f527 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 993c5cd65a32a51b7a35e4cbc4de83f32c06c2a5 +Subproject commit 24a235f527da7bba061f26d0418bd403a1577fe9