From b88ae5db28dca5c1d5b878f736bca905024b0c56 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Tue, 18 Dec 2018 19:14:11 +0300 Subject: [PATCH 1/8] Update localization --- Telegram-iOS/en.lproj/Localizable.strings | 14 ++++++++------ submodules/AsyncDisplayKit | 2 +- submodules/Display | 2 +- submodules/LegacyComponents | 2 +- submodules/MtProtoKit | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index cf2f0c22a6..da4bc913d2 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -3605,12 +3605,12 @@ Unused sets are archived when you add more."; "MessagePoll.LabelAnonymous" = "Anonymous Poll"; "MessagePoll.LabelClosed" = "Final Results"; -"MessagePoll.VotedCount_0" = "No votes"; -"MessagePoll.VotedCount_1" = "1 voted"; -"MessagePoll.VotedCount_2" = "2 voted"; -"MessagePoll.VotedCount_3_10" = "%@ voted"; -"MessagePoll.VotedCount_many" = "%@ voted"; -"MessagePoll.VotedCount_any" = "%@ voted"; +"MessagePoll.VotedCount_0" = "%@ votes"; +"MessagePoll.VotedCount_1" = "1 vote"; +"MessagePoll.VotedCount_2" = "2 votes"; +"MessagePoll.VotedCount_3_10" = "%@ votes"; +"MessagePoll.VotedCount_many" = "%@ votes"; +"MessagePoll.VotedCount_any" = "%@ votes"; "AttachmentMenu.Poll" = "Poll"; "Conversation.PinnedPoll" = "Pinned Poll"; @@ -3641,3 +3641,5 @@ Unused sets are archived when you add more."; "Conversation.UnvotePoll" = "Unvote"; "Conversation.StopPoll" = "Stop Poll"; +"Conversation.StopPollConfirmationTitle" = "If you stop this poll now, nobody will be able to vote in it anymore. This action cannot be undone."; +"Conversation.StopPollConfirmation" = "Stop Poll"; diff --git a/submodules/AsyncDisplayKit b/submodules/AsyncDisplayKit index 5ead5ef189..957bf00ddc 160000 --- a/submodules/AsyncDisplayKit +++ b/submodules/AsyncDisplayKit @@ -1 +1 @@ -Subproject commit 5ead5ef189ffb2e9695383a12ec1c246c3e9066b +Subproject commit 957bf00ddcd4ab1386d9986933742af39b99dcc1 diff --git a/submodules/Display b/submodules/Display index 8cd1f0fc78..052729d35b 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 8cd1f0fc784709445a8234a8df6d6a831bb4b056 +Subproject commit 052729d35bbcaac244e1e4530ac4e4105d28a10a diff --git a/submodules/LegacyComponents b/submodules/LegacyComponents index 01b7622735..94aadbb5b7 160000 --- a/submodules/LegacyComponents +++ b/submodules/LegacyComponents @@ -1 +1 @@ -Subproject commit 01b7622735a78c3892b7455084802cc4ea26ebdb +Subproject commit 94aadbb5b721763afb1f15b60f38e7624c625588 diff --git a/submodules/MtProtoKit b/submodules/MtProtoKit index 6df298b343..f432a58646 160000 --- a/submodules/MtProtoKit +++ b/submodules/MtProtoKit @@ -1 +1 @@ -Subproject commit 6df298b343b08470921864790023ef4309399fac +Subproject commit f432a58646f9e8b3d82ef8d5768e614e52e5b7b3 diff --git a/submodules/TelegramCore b/submodules/TelegramCore index e752d51c91..9ad014a2f9 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit e752d51c91f83c18244d28e99148c0dcebd3b263 +Subproject commit 9ad014a2f9795d326ba0b467966ef3d1e734f514 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index a4abbc4068..b13a4ad006 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit a4abbc4068bec3add4cac3eebd9d79fffce85dbe +Subproject commit b13a4ad00670c7e52d8a3f4ad3024c30bb99eb37 From 36def30350385873c7f06afc2413568ebbd9d3e5 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Tue, 18 Dec 2018 21:57:55 +0300 Subject: [PATCH 2/8] Update submodules --- Telegram-iOS/en.lproj/Localizable.strings | 8 ++++++-- submodules/Display | 2 +- submodules/TelegramUI | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index baeba2a387..b98c706645 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -20,6 +20,11 @@ "MESSAGE_PHOTOS" = "%1$@ sent you %2$@ photos"; "MESSAGES" = "%1$@ sent you %2$@ messages"; +"MESSAGE_POLL" = "%1$@ sent you a poll"; +"CHANNEL_MESSAGE_POLL" = "%1$@ posted a poll"; +"CHAT_MESSAGE_POLL" = "%1$@ sent a poll to the group %2$@"; +"PINNED_POLL" = "%1$@ pinned a poll"; + "CHAT_MESSAGE_TEXT" = "%1$@@%2$@: %3$@"; "CHAT_MESSAGE_NOTEXT" = "%1$@ sent a message to the group %2$@"; "CHAT_MESSAGE_PHOTO" = "%1$@ sent a photo to the group %2$@"; @@ -80,7 +85,6 @@ "PINNED_GEO" = "%1$@ pinned a map"; "PINNED_GEOLIVE" = "%1$@ pinned a live location"; "PINNED_GIF" = "%1$@ pinned a GIF"; -"PINNED_POLL" = "%1$@ pinned a poll"; "MESSAGE_GAME" = "%1$@ invited you to play %2$@"; "CHANNEL_MESSAGE_GAME" = "%1$@ invited you to play %2$@"; @@ -401,7 +405,6 @@ "Message.Audio" = "Voice Message"; "Message.ForwardedMessage" = "Forwarded Message\nFrom: %@"; "Message.Animation" = "GIF"; -"Message.Poll" = "Poll"; // Conversation Profile "ConversationProfile.ErrorCreatingConversation" = "An error occurred"; @@ -3605,6 +3608,7 @@ Unused sets are archived when you add more."; "MessagePoll.LabelAnonymous" = "Anonymous Poll"; "MessagePoll.LabelClosed" = "Final Results"; +"MessagePoll.NoVotes" = "No votes"; "MessagePoll.VotedCount_0" = "%@ votes"; "MessagePoll.VotedCount_1" = "1 vote"; "MessagePoll.VotedCount_2" = "2 votes"; diff --git a/submodules/Display b/submodules/Display index 052729d35b..b8744db09d 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 052729d35bbcaac244e1e4530ac4e4105d28a10a +Subproject commit b8744db09d3a0f3f4c40259727fd61cf118888aa diff --git a/submodules/TelegramUI b/submodules/TelegramUI index b53b20429d..9f2c27072c 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit b53b20429dade08edabe8fda2ed41c363b185989 +Subproject commit 9f2c27072ccf9604d1cd94780d3252523e8137a4 From a919bb38d338eaf1996b4be6ef74d49eb6c8afb1 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Wed, 19 Dec 2018 00:33:24 +0300 Subject: [PATCH 3/8] Update submodules --- submodules/Display | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/submodules/Display b/submodules/Display index b8744db09d..bd95025018 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit b8744db09d3a0f3f4c40259727fd61cf118888aa +Subproject commit bd9502501881b9195d0ecfa8f2186976df08f86e diff --git a/submodules/TelegramCore b/submodules/TelegramCore index 9ad014a2f9..e7113c410d 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit 9ad014a2f9795d326ba0b467966ef3d1e734f514 +Subproject commit e7113c410dfeefa75923a8ea5fdd6e9269f06087 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 9f2c27072c..49d76ffce7 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 9f2c27072ccf9604d1cd94780d3252523e8137a4 +Subproject commit 49d76ffce720cbc81a8da4417cd40d4eff519355 From 57d7f339fa701a94afa36a6b6af7af4b015cd902 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Wed, 19 Dec 2018 02:07:08 +0300 Subject: [PATCH 4/8] Update submodules --- submodules/TelegramUI | 2 +- submodules/ffmpeg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 49d76ffce7..ef65cfd111 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 49d76ffce720cbc81a8da4417cd40d4eff519355 +Subproject commit ef65cfd111b38d1f1e4bcfc7572709306c9960be diff --git a/submodules/ffmpeg b/submodules/ffmpeg index 84a71e9adf..1c1d21e84b 160000 --- a/submodules/ffmpeg +++ b/submodules/ffmpeg @@ -1 +1 @@ -Subproject commit 84a71e9adf9b6ea120db6ba96533c523bb8ddda5 +Subproject commit 1c1d21e84b46d865d5cb6e2abf867d38d501851d From 5c798aac4688b570826a109a06ec20acac9eef12 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Wed, 19 Dec 2018 02:59:08 +0300 Subject: [PATCH 5/8] Fix build --- Telegram-iOS/AppDelegate.swift | 2 +- submodules/MtProtoKit | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Telegram-iOS/AppDelegate.swift b/Telegram-iOS/AppDelegate.swift index 3a52455138..1ec7607b13 100644 --- a/Telegram-iOS/AppDelegate.swift +++ b/Telegram-iOS/AppDelegate.swift @@ -396,7 +396,7 @@ private enum QueuedWakeup: Int32 { telegramUIDeclareEncodables() #if DEBUG - LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true) + LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: true, redactSensitiveData: true) #else if BuildConfig.shared().isInternalBuild { LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true) diff --git a/submodules/MtProtoKit b/submodules/MtProtoKit index f432a58646..cc97fc2fa2 160000 --- a/submodules/MtProtoKit +++ b/submodules/MtProtoKit @@ -1 +1 @@ -Subproject commit f432a58646f9e8b3d82ef8d5768e614e52e5b7b3 +Subproject commit cc97fc2fa2a6fd875c2af18cbad65a365e9ffdd0 diff --git a/submodules/TelegramCore b/submodules/TelegramCore index e7113c410d..64447a5995 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit e7113c410dfeefa75923a8ea5fdd6e9269f06087 +Subproject commit 64447a59953e1d78e9e5938b28ec08b8e15f1c91 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index ef65cfd111..155e193ef6 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit ef65cfd111b38d1f1e4bcfc7572709306c9960be +Subproject commit 155e193ef682fc5c5fde99d7a2847ab698ed99bf From 1d7380e3300480113194aed6ebfe57f7087bd01c Mon Sep 17 00:00:00 2001 From: Peter <> Date: Wed, 19 Dec 2018 03:24:01 +0300 Subject: [PATCH 6/8] Update submodules --- Telegram-iOS/en.lproj/Localizable.strings | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index b98c706645..0e8388eb23 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -3643,7 +3643,7 @@ Unused sets are archived when you add more."; "ForwardedPolls_many" = "%@ forwarded polls"; "ForwardedPolls_0" = "%@ forwarded polls"; -"Conversation.UnvotePoll" = "Unvote"; +"Conversation.UnvotePoll" = "Retract Vote"; "Conversation.StopPoll" = "Stop Poll"; "Conversation.StopPollConfirmationTitle" = "If you stop this poll now, nobody will be able to vote in it anymore. This action cannot be undone."; "Conversation.StopPollConfirmation" = "Stop Poll"; diff --git a/submodules/TelegramCore b/submodules/TelegramCore index 64447a5995..ac166d7b61 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit 64447a59953e1d78e9e5938b28ec08b8e15f1c91 +Subproject commit ac166d7b6106fa9e0400d7175d38cc679b6c4f31 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 155e193ef6..59e2607e08 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 155e193ef682fc5c5fde99d7a2847ab698ed99bf +Subproject commit 59e2607e089204fdbcad96fcc25ef4c4e5ee7a44 From 5fe79a1e00ac6d189488dc1f9be33d9d838ec6a9 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Wed, 19 Dec 2018 03:34:48 +0300 Subject: [PATCH 7/8] Update submodule --- submodules/TelegramUI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 59e2607e08..ea4b62939b 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 59e2607e089204fdbcad96fcc25ef4c4e5ee7a44 +Subproject commit ea4b62939b3390f98c24cabeef42956d02a4e706 From d3e317b21049a0211de3cacd18750912650a1189 Mon Sep 17 00:00:00 2001 From: Grishka Date: Wed, 19 Dec 2018 05:13:20 +0300 Subject: [PATCH 8/8] Update libtgvoip --- .gitmodules | 2 +- submodules/libtgvoip | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7e8bfb8f81..8616cb54f7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ url=../Display.git url = git@github.com:peter-iakovlev/HockeySDK-iOS.git [submodule "submodules/libtgvoip"] path = submodules/libtgvoip -url=git@github.com:peter-iakovlev/libtgvoip.git +url=git@github.com:grishka/libtgvoip.git [submodule "submodules/lottie-ios"] path = submodules/lottie-ios url=git@github.com:peter-iakovlev/lottie-ios.git diff --git a/submodules/libtgvoip b/submodules/libtgvoip index 24fcebafe9..6d03dd9ae4 160000 --- a/submodules/libtgvoip +++ b/submodules/libtgvoip @@ -1 +1 @@ -Subproject commit 24fcebafe9cd449002f6b4a2662acd918905e5af +Subproject commit 6d03dd9ae4bf48d7344341cdd2d055ebd3a6a42e