From 4467bc3883e1cd1075c5534148929fc1906a0c65 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Sat, 25 May 2019 00:27:45 +0200 Subject: [PATCH] Update submodules --- Telegram-iOS/en.lproj/Localizable.strings | 25 ++++++++++++++++++++++- submodules/Display | 2 +- submodules/MtProtoKit | 2 +- submodules/Postbox | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- 6 files changed, 29 insertions(+), 6 deletions(-) diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 67bc2bb2e1..4d0eb23046 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -4275,7 +4275,7 @@ Sorry for the inconvenience."; "Privacy.AddNewPeer" = "Add Users or Groups"; "PrivacyPhoneNumberSettings.WhoCanSeeMyPhoneNumber" = "WHO CAN SEE MY PHONE NUMBER"; -"PrivacyLastSeenSettings.CustomHelp" = "Users who already have your number saved in the contacts will also see it on Telegram."; +"PrivacyPhoneNumberSettings.CustomHelp" = "Users who already have your number saved in the contacts will also see it on Telegram."; "Privacy.PhoneNumber" = "Phone Number"; "PrivacySettings.PhoneNumber" = "Phone Number"; "Contacts.SearchUsersAndGroupsLabel" = "Search for users and groups"; @@ -4286,3 +4286,26 @@ 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"; +"Group.LinkedChannel" = "Linked Channel"; +"Channel.DiscussionGroupAdd" = "Add"; +"Channel.DiscussionGroupInfo" = "Add group chat for comments."; +"Channel.DiscussionGroup.Header" = "Select a group chat for discussion that will be displayed in your channel."; +"Channel.DiscussionGroup.HeaderSet" = "A link to %@ is shown to all subscrbers in the bottom panel."; +"Channel.DiscussionGroup.HeaderGroupSet" = "%@ is linking the group as it's discussion board."; +"Channel.DiscussionGroup.HeaderLabel" = "Discuss"; +"Channel.DiscussionGroup.Create" = "Create New Group"; +"Channel.DiscussionGroup.PrivateGroup" = "private group"; +"Channel.DiscussionGroup.Info" = "Everything you post in the channel will be forwarded to this group."; +"Channel.DiscussionGroup.LinkGroup" = "Link Group"; +"Channel.DiscussionGroup.UnlinkGroup" = "Unlink Group"; +"Channel.DiscussionGroup.UnlinkChannel" = "Unlink Channel"; +"Channel.DiscussionGroup.PublicChannelLink" = "Do you want to make %1$@ the discussion board for %2$@?"; +"Channel.DiscussionGroup.PrivateChannelLink" = "Do you want to make %1$@ the discussion board for %2$@? + +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"; diff --git a/submodules/Display b/submodules/Display index 774d601b0a..64c069c038 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 774d601b0ac2719ca28fabacb2b5e272753a3973 +Subproject commit 64c069c038c95f5a2ceaf82691c96d83186a59ec diff --git a/submodules/MtProtoKit b/submodules/MtProtoKit index 855add62f0..3c271bb144 160000 --- a/submodules/MtProtoKit +++ b/submodules/MtProtoKit @@ -1 +1 @@ -Subproject commit 855add62f094fb4818090a541ac0bb9aae44cdda +Subproject commit 3c271bb1446bafe39bb460dfaa926ccc7ffb20d9 diff --git a/submodules/Postbox b/submodules/Postbox index 16bdc6f26e..85955922e8 160000 --- a/submodules/Postbox +++ b/submodules/Postbox @@ -1 +1 @@ -Subproject commit 16bdc6f26e451f2f690a4d5af81512e88aad2b05 +Subproject commit 85955922e8d22aef0ccf08a2fdf093e83aa9a6c9 diff --git a/submodules/TelegramCore b/submodules/TelegramCore index da6880ce35..a54ca1601a 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit da6880ce35c402dcb9504d4f43551c46c214ee31 +Subproject commit a54ca1601ab9b6a2c3c14c6c072f90a194577d20 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 42160412d7..553156f25c 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 42160412d7e431f55347fb0cd49746ccf29380ad +Subproject commit 553156f25ccd374e93be473b093a037af1ebfe79