From 2371de040beb9b4d593e2cf4e2b2262cf4bc2839 Mon Sep 17 00:00:00 2001 From: Peter Iakovlev Date: Thu, 17 Jan 2019 21:50:08 +0400 Subject: [PATCH 1/9] Update localization --- Telegram-iOS/en.lproj/Localizable.strings | 3 +-- submodules/Display | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index a04a6aecf4..5dc363f3cf 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -2545,9 +2545,8 @@ Unused sets are archived when you add more."; "Channel.AdminLog.BanReadMessages" = "Read Messages"; "Channel.AdminLog.BanSendMessages" = "Send Messages"; "Channel.AdminLog.BanSendMedia" = "Send Media"; -"Channel.AdminLog.BanSendStickers" = "Send Stickers"; +"Channel.AdminLog.BanSendStickersAndGifs" = "Send Stickers & GIFs"; "Channel.AdminLog.BanEmbedLinks" = "Embed Links"; -"Channel.AdminLog.BanSendGifs" = "Send GIFs"; "Channel.AdminLog.MessageRestricted" = "%@ changed restrictions for %@ (%@)"; "Channel.AdminLog.MessageAdmin" = "%@ changed privileges for %@ (%@)"; "Channel.AdminLog.ChangeInfo" = "Change Info"; diff --git a/submodules/Display b/submodules/Display index 679283d018..02bca94d9d 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 679283d018b3c0299ca9103f3048d9fae55e757a +Subproject commit 02bca94d9da397c147c14d61acb94cbfc9e58e75 diff --git a/submodules/TelegramCore b/submodules/TelegramCore index ae844e1a20..f698cfce37 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit ae844e1a203745452ea630470db519dc152c0765 +Subproject commit f698cfce379e924e8b650dca8a01cf4c85bcccac diff --git a/submodules/TelegramUI b/submodules/TelegramUI index c9631285bf..2d8375de26 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit c9631285bf9af4712b9c0b966f50d6e2ec1ac314 +Subproject commit 2d8375de26041b9cb6243b5194bf5292c721c97c From 570b5178b54b9bf61f7152b1985ebcb840c3407c Mon Sep 17 00:00:00 2001 From: Peter Iakovlev Date: Thu, 17 Jan 2019 21:52:31 +0400 Subject: [PATCH 2/9] Update submodule --- submodules/TelegramUI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 2d8375de26..4acdfbfb74 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 2d8375de26041b9cb6243b5194bf5292c721c97c +Subproject commit 4acdfbfb74e1d352b1b31fe24ec75cc36ed68fbb From b4ac389b4a852dbbdc90d4ad7907b4e6a0d08dbf Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Thu, 17 Jan 2019 22:07:02 +0400 Subject: [PATCH 3/9] Update localization --- Telegram-iOS/en.lproj/Localizable.strings | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index a04a6aecf4..3605fc6609 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -3936,3 +3936,7 @@ Unused sets are archived when you add more."; "Conversation.ChatBackground" = "Chat Background"; "Conversation.ViewBackground" = "VIEW BACKGROUND"; + +"SocksProxySetup.ShareQRCodeInfo" = "Your friends can add this proxy by scanning this code with phone or in-app camera."; +"SocksProxySetup.ShareQRCode" = "Share QR Code"; +"SocksProxySetup.ShareLink" = "Share Link"; From 1bb5eec37b8d8f75f8b8f81fcd78513be541ae9a Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Thu, 17 Jan 2019 22:16:16 +0400 Subject: [PATCH 4/9] Update submodules --- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/TelegramCore b/submodules/TelegramCore index f698cfce37..c45aa06aa7 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit f698cfce379e924e8b650dca8a01cf4c85bcccac +Subproject commit c45aa06aa7fef4f0a50c6d31cc37738729e1092f diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 4acdfbfb74..6fe1f84daf 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 4acdfbfb74e1d352b1b31fe24ec75cc36ed68fbb +Subproject commit 6fe1f84dafb5cd1f849c2731520e4921ced0b0b2 From 25451433b10894f55464efc3b76f017bce2a8f6b Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Thu, 17 Jan 2019 22:20:51 +0400 Subject: [PATCH 5/9] Update submodules --- submodules/TelegramCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/TelegramCore b/submodules/TelegramCore index c45aa06aa7..db569ff49b 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit c45aa06aa7fef4f0a50c6d31cc37738729e1092f +Subproject commit db569ff49b2dfd51fd8b9b413029634fb997dab3 From af3b85c83f27514063c7d827d89b79348c4bc5bb Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Fri, 18 Jan 2019 00:55:37 +0400 Subject: [PATCH 6/9] Update submodule --- submodules/TelegramUI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 6fe1f84daf..a4c8aca9a1 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 6fe1f84dafb5cd1f849c2731520e4921ced0b0b2 +Subproject commit a4c8aca9a1aacd92d51dc1b9fbe6bd3e19549a44 From 00b43105c19fff67e214f758a62bb3d4446461a4 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Fri, 18 Jan 2019 01:04:52 +0400 Subject: [PATCH 7/9] Update submodules --- submodules/AsyncDisplayKit | 2 +- submodules/Display | 2 +- submodules/LegacyComponents | 2 +- submodules/MtProtoKit | 2 +- submodules/Postbox | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- submodules/ffmpeg | 2 +- submodules/libtgvoip | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/submodules/AsyncDisplayKit b/submodules/AsyncDisplayKit index 711f2e46be..258b0686d2 160000 --- a/submodules/AsyncDisplayKit +++ b/submodules/AsyncDisplayKit @@ -1 +1 @@ -Subproject commit 711f2e46be8d366805e65166ecade31f8b342eb4 +Subproject commit 258b0686d2fe03c96d4a8a9309d5408f4af323b5 diff --git a/submodules/Display b/submodules/Display index 02bca94d9d..883b92dc8e 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 02bca94d9da397c147c14d61acb94cbfc9e58e75 +Subproject commit 883b92dc8e9ebd7588c911e2553bfb0a5bfacd1b diff --git a/submodules/LegacyComponents b/submodules/LegacyComponents index 7a701d1be4..f161e2a23a 160000 --- a/submodules/LegacyComponents +++ b/submodules/LegacyComponents @@ -1 +1 @@ -Subproject commit 7a701d1be4632630e90ae3a2326ffb4e72023df5 +Subproject commit f161e2a23a48fd7526a9a94116edc8237d803a20 diff --git a/submodules/MtProtoKit b/submodules/MtProtoKit index bead1574a0..a7e2581217 160000 --- a/submodules/MtProtoKit +++ b/submodules/MtProtoKit @@ -1 +1 @@ -Subproject commit bead1574a09c72ce8411938124c717180926789a +Subproject commit a7e2581217adaadb0dbe3aa9c94c243facd7f16f diff --git a/submodules/Postbox b/submodules/Postbox index dd47abf3cb..834b746e79 160000 --- a/submodules/Postbox +++ b/submodules/Postbox @@ -1 +1 @@ -Subproject commit dd47abf3cb255317b19ff252297495e70e32cca4 +Subproject commit 834b746e79e4643e231dae68bbbeba274e9ea0dc diff --git a/submodules/TelegramCore b/submodules/TelegramCore index db569ff49b..331fcd9be8 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit db569ff49b2dfd51fd8b9b413029634fb997dab3 +Subproject commit 331fcd9be8d5b66b7d49c900667a683c8643a396 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index a4c8aca9a1..be6d8b34a8 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit a4c8aca9a1aacd92d51dc1b9fbe6bd3e19549a44 +Subproject commit be6d8b34a80cc72b59800b237bd1b60c063f694f diff --git a/submodules/ffmpeg b/submodules/ffmpeg index a9d906d655..1c1d21e84b 160000 --- a/submodules/ffmpeg +++ b/submodules/ffmpeg @@ -1 +1 @@ -Subproject commit a9d906d655fd337ab4d8f5e067e92a14c8837b77 +Subproject commit 1c1d21e84b46d865d5cb6e2abf867d38d501851d diff --git a/submodules/libtgvoip b/submodules/libtgvoip index 564eada171..fed3bb73ee 160000 --- a/submodules/libtgvoip +++ b/submodules/libtgvoip @@ -1 +1 @@ -Subproject commit 564eada171b3fb97a9740c30899d617b98fe1714 +Subproject commit fed3bb73ee58beb8713ae92d3d9d0e496d88f96c From 76763d9ddeaf37a7aa63da77ec7a47528ee989f3 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Fri, 18 Jan 2019 01:13:01 +0400 Subject: [PATCH 8/9] Update submodules --- submodules/AsyncDisplayKit | 2 +- submodules/Display | 2 +- submodules/LegacyComponents | 2 +- submodules/MtProtoKit | 2 +- submodules/Postbox | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- submodules/ffmpeg | 2 +- submodules/libtgvoip | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/submodules/AsyncDisplayKit b/submodules/AsyncDisplayKit index 258b0686d2..711f2e46be 160000 --- a/submodules/AsyncDisplayKit +++ b/submodules/AsyncDisplayKit @@ -1 +1 @@ -Subproject commit 258b0686d2fe03c96d4a8a9309d5408f4af323b5 +Subproject commit 711f2e46be8d366805e65166ecade31f8b342eb4 diff --git a/submodules/Display b/submodules/Display index 883b92dc8e..02bca94d9d 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 883b92dc8e9ebd7588c911e2553bfb0a5bfacd1b +Subproject commit 02bca94d9da397c147c14d61acb94cbfc9e58e75 diff --git a/submodules/LegacyComponents b/submodules/LegacyComponents index f161e2a23a..7a701d1be4 160000 --- a/submodules/LegacyComponents +++ b/submodules/LegacyComponents @@ -1 +1 @@ -Subproject commit f161e2a23a48fd7526a9a94116edc8237d803a20 +Subproject commit 7a701d1be4632630e90ae3a2326ffb4e72023df5 diff --git a/submodules/MtProtoKit b/submodules/MtProtoKit index a7e2581217..bead1574a0 160000 --- a/submodules/MtProtoKit +++ b/submodules/MtProtoKit @@ -1 +1 @@ -Subproject commit a7e2581217adaadb0dbe3aa9c94c243facd7f16f +Subproject commit bead1574a09c72ce8411938124c717180926789a diff --git a/submodules/Postbox b/submodules/Postbox index 834b746e79..dd47abf3cb 160000 --- a/submodules/Postbox +++ b/submodules/Postbox @@ -1 +1 @@ -Subproject commit 834b746e79e4643e231dae68bbbeba274e9ea0dc +Subproject commit dd47abf3cb255317b19ff252297495e70e32cca4 diff --git a/submodules/TelegramCore b/submodules/TelegramCore index 331fcd9be8..db569ff49b 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit 331fcd9be8d5b66b7d49c900667a683c8643a396 +Subproject commit db569ff49b2dfd51fd8b9b413029634fb997dab3 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index be6d8b34a8..4bbda0846e 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit be6d8b34a80cc72b59800b237bd1b60c063f694f +Subproject commit 4bbda0846e5fdc0112e2c2bc7a25c93349ee6fc8 diff --git a/submodules/ffmpeg b/submodules/ffmpeg index 1c1d21e84b..a9d906d655 160000 --- a/submodules/ffmpeg +++ b/submodules/ffmpeg @@ -1 +1 @@ -Subproject commit 1c1d21e84b46d865d5cb6e2abf867d38d501851d +Subproject commit a9d906d655fd337ab4d8f5e067e92a14c8837b77 diff --git a/submodules/libtgvoip b/submodules/libtgvoip index fed3bb73ee..564eada171 160000 --- a/submodules/libtgvoip +++ b/submodules/libtgvoip @@ -1 +1 @@ -Subproject commit fed3bb73ee58beb8713ae92d3d9d0e496d88f96c +Subproject commit 564eada171b3fb97a9740c30899d617b98fe1714 From b830a2f88e119bd4504c2632dfe5e00f5c35efa2 Mon Sep 17 00:00:00 2001 From: Peter Iakovlev Date: Fri, 18 Jan 2019 01:47:34 +0400 Subject: [PATCH 9/9] Update submodules --- submodules/Postbox | 2 +- submodules/TelegramUI | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/Postbox b/submodules/Postbox index dd47abf3cb..95e2f0a689 160000 --- a/submodules/Postbox +++ b/submodules/Postbox @@ -1 +1 @@ -Subproject commit dd47abf3cb255317b19ff252297495e70e32cca4 +Subproject commit 95e2f0a68966eb7d8ae8befab62874081bca9f36 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 4bbda0846e..3e64475b95 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 4bbda0846e5fdc0112e2c2bc7a25c93349ee6fc8 +Subproject commit 3e64475b95347d38effd0241ac816e6765ea7f88