diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings
index 4d5fd58030..cab7baab3e 100644
--- a/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram-iOS/en.lproj/Localizable.strings
@@ -94,107 +94,134 @@
 "PHONE_CALL_REQUEST" = "%1$@ is calling you";
 "PHONE_CALL_MISSED" = "You missed a call from %1$@";
 
-"MESSAGE_TEXT_SEPARATED" = "%1$@|%2$@";
-"MESSAGE_NOTEXT_SEPARATED" = "%1$@|sent you a message";
-"MESSAGE_PHOTO_SEPARATED" = "%1$@|sent you a photo";
-"MESSAGE_PHOTO_SECRET_SEPARATED" = "%1$@|sent you a self-destructing photo";
-"MESSAGE_VIDEO_SEPARATED" = "%1$@|sent you a video";
-"MESSAGE_VIDEO_SECRET_SEPARATED" = "%1$@|sent you a self-destructing video";
-"MESSAGE_SCREENSHOT_SEPARATED" = "%1$@|took a screenshot";
-"MESSAGE_ROUND_SEPARATED" = "%1$@|sent you a video message";
-"MESSAGE_DOC_SEPARATED" = "%1$@|sent you a file";
-"MESSAGE_STICKER_SEPARATED" = "%1$@|sent you a %2$@sticker";
-"MESSAGE_AUDIO_SEPARATED" = "%1$@|sent you a voice message";
-"MESSAGE_CONTACT_SEPARATED" = "%1$@|shared a contact with you";
-"MESSAGE_GEO_SEPARATED" = "%1$@|sent you a map";
-"MESSAGE_GEOLIVE_SEPARATED" = "%1$@|started sharing their live location";
-"MESSAGE_POLL_SEPARATED" = "%1$@|sent you a poll";
-"MESSAGE_GIF_SEPARATED" = "%1$@|sent you a GIF";
-"MESSAGE_GAME_SEPARATED" = "%1$@|invited you to play %2$@";
-"MESSAGE_INVOICE_SEPARATED" = "%1$@|sent you an invoice for %2$@";
-"NEW_MESSAGE_FWDS_SEPARATED_1" = "%1$@|forwarded you a message";
-"NEW_MESSAGE_FWDS_SEPARATED_any" = "%1$@|forwarded you %2$d messages";
-"NEW_MESSAGE_PHOTOS_SEPARATED_1" = "%1$@|sent you a photo";
-"NEW_MESSAGE_PHOTOS_SEPARATED_any" = "%1$@|sent you %2$d photos";
-"NEW_MESSAGES_SEPARATED_1" = "%1$@|sent you a message";
-"NEW_MESSAGES_SEPARATED_any" = "%1$@|sent you %2$d messages";
+"MESSAGE_TEXT" = "%1$@|%2$@";
+"MESSAGE_NOTEXT" = "%1$@|sent you a message";
+"MESSAGE_PHOTO" = "%1$@|sent you a photo";
+"MESSAGE_PHOTO_SECRET" = "%1$@|sent you a self-destructing photo";
+"MESSAGE_VIDEO" = "%1$@|sent you a video";
+"MESSAGE_VIDEO_SECRET" = "%1$@|sent you a self-destructing video";
+"MESSAGE_SCREENSHOT" = "%1$@|took a screenshot";
+"MESSAGE_ROUND" = "%1$@|sent you a video message";
+"MESSAGE_DOC" = "%1$@|sent you a file";
+"MESSAGE_STICKER" = "%1$@|sent you a %2$@sticker";
+"MESSAGE_AUDIO" = "%1$@|sent you a voice message";
+"MESSAGE_CONTACT" = "%1$@|shared a contact with you";
+"MESSAGE_GEO" = "%1$@|sent you a map";
+"MESSAGE_GEOLIVE" = "%1$@|started sharing their live location";
+"MESSAGE_POLL" = "%1$@|sent you a poll";
+"MESSAGE_GIF" = "%1$@|sent you a GIF";
+"MESSAGE_GAME" = "%1$@|invited you to play %2$@";
+"MESSAGE_INVOICE" = "%1$@|sent you an invoice for %2$@";
+"PUSH_MESSAGE_FWD" = "%1$@|forwarded you a message";
+"PUSH_MESSAGE_FWDS_1" = "%1$@|forwarded you a message";
+"PUSH_MESSAGE_FWDS_any" = "%1$@|forwarded you %2$d messages";
+"PUSH_MESSAGE_PHOTO" = "%1$@|sent you a photo";
+"PUSH_MESSAGE_PHOTOS_1" = "%1$@|sent you a photo";
+"PUSH_MESSAGE_PHOTOS_any" = "%1$@|sent you %2$d photos";
+"PUSH_MESSAGE_VIDEO" = "%1$@|sent you a video";
+"PUSH_MESSAGE_VIDEOS_1" = "%1$@|sent you a video";
+"PUSH_MESSAGE_VIDEOS_any" = "%1$@|sent you %2$d videos";
+"PUSH_MESSAGE_ROUND" = "%1$@|sent you a video message";
+"PUSH_MESSAGE_ROUNDS_1" = "%1$@|sent you a video message";
+"PUSH_MESSAGE_ROUNDS_any" = "%1$@|sent you %2$d video messages";
+"PUSH_MESSAGE" = "%1$@|sent you a message";
+"PUSH_MESSAGES_1" = "%1$@|sent you a message";
+"PUSH_MESSAGES_any" = "%1$@|sent you %2$d messages";
 
-"CHANNEL_MESSAGE_TEXT_SEPARATED" = "%1$@|%2$@";
-"CHANNEL_MESSAGE_NOTEXT_SEPARATED" = "%1$@|posted a message";
-"CHANNEL_MESSAGE_PHOTO_SEPARATED" = "%1$@|posted a photo";
-"CHANNEL_MESSAGE_VIDEO_SEPARATED" = "%1$@|posted a video";
-"CHANNEL_MESSAGE_ROUND_SEPARATED" = "%1$@|posted a video message";
-"CHANNEL_MESSAGE_DOC_SEPARATED" = "%1$@|posted a file";
-"CHANNEL_MESSAGE_STICKER_SEPARATED" = "%1$@|posted a %2$@sticker";
-"CHANNEL_MESSAGE_AUDIO_SEPARATED" = "%1$@|posted a voice message";
-"CHANNEL_MESSAGE_CONTACT_SEPARATED" = "%1$@|posted a contact";
-"CHANNEL_MESSAGE_GEO_SEPARATED" = "%1$@|posted a map";
-"CHANNEL_MESSAGE_GEOLIVE_SEPARATED" = "%1$@|posted a live location";
-"CHANNEL_MESSAGE_POLL_SEPARATED" = "%1$@|posted a poll";
-"CHANNEL_MESSAGE_GIF_SEPARATED" = "%1$@|posted a GIF";
-"CHANNEL_MESSAGE_GAME_SEPARATED" = "%1$@|invited you to play %2$@";
-"NEW_CHANNEL_MESSAGE_FWDS_SEPARATED_1" = "%1$@|posted a forwarded message";
-"NEW_CHANNEL_MESSAGE_FWDS_SEPARATED_any" = "%1$@|posted %2$d forwarded messages";
-"NEW_CHANNEL_MESSAGE_PHOTOS_SEPARATED_1" = "%1$@|posted a photo";
-"NEW_CHANNEL_MESSAGE_PHOTOS_SEPARATED_any" = "%1$@|posted %2$d photos";
-"NEW_CHANNEL_MESSAGES_SEPARATED_1" = "%1$@|posted a message";
-"NEW_CHANNEL_MESSAGES_SEPARATED_any" = "%1$@|posted %2$d messages";
+"CHANNEL_MESSAGE_TEXT" = "%1$@|%2$@";
+"CHANNEL_MESSAGE_NOTEXT" = "%1$@|posted a message";
+"CHANNEL_MESSAGE_PHOTO" = "%1$@|posted a photo";
+"CHANNEL_MESSAGE_VIDEO" = "%1$@|posted a video";
+"CHANNEL_MESSAGE_ROUND" = "%1$@|posted a video message";
+"CHANNEL_MESSAGE_DOC" = "%1$@|posted a file";
+"CHANNEL_MESSAGE_STICKER" = "%1$@|posted a %2$@sticker";
+"CHANNEL_MESSAGE_AUDIO" = "%1$@|posted a voice message";
+"CHANNEL_MESSAGE_CONTACT" = "%1$@|posted a contact";
+"CHANNEL_MESSAGE_GEO" = "%1$@|posted a map";
+"CHANNEL_MESSAGE_GEOLIVE" = "%1$@|posted a live location";
+"CHANNEL_MESSAGE_POLL" = "%1$@|posted a poll";
+"CHANNEL_MESSAGE_GIF" = "%1$@|posted a GIF";
+"CHANNEL_MESSAGE_GAME" = "%1$@|invited you to play %2$@";
+"PUSH_CHANNEL_MESSAGE_FWD" = "%1$@|posted a forwarded message";
+"PUSH_CHANNEL_MESSAGE_FWDS_1" = "%1$@|posted a forwarded message";
+"PUSH_CHANNEL_MESSAGE_FWDS_any" = "%1$@|posted %2$d forwarded messages";
+"PUSH_CHANNEL_MESSAGE_PHOTO" = "%1$@|posted a photo";
+"PUSH_CHANNEL_MESSAGE_PHOTOS_1" = "%1$@|posted a photo";
+"PUSH_CHANNEL_MESSAGE_PHOTOS_any" = "%1$@|posted %2$d photos";
+"PUSH_CHANNEL_MESSAGE_VIDEO" = "%1$@|posted a video";
+"PUSH_CHANNEL_MESSAGE_VIDEOS_1" = "%1$@|posted a video";
+"PUSH_CHANNEL_MESSAGE_VIDEOS_any" = "%1$@|posted %2$d videos";
+"PUSH_CHANNEL_MESSAGE_ROUND" = "%1$@|posted a round video";
+"PUSH_CHANNEL_MESSAGE_ROUNDS_1" = "%1$@|posted a round video";
+"PUSH_CHANNEL_MESSAGE_ROUNDS_any" = "%1$@|posted %2$d round videos";
+"PUSH_CHANNEL_MESSAGE" = "%1$@|posted a message";
+"PUSH_CHANNEL_MESSAGES_1" = "%1$@|posted a message";
+"PUSH_CHANNEL_MESSAGES_any" = "%1$@|posted %2$d messages";
 
-"CHAT_MESSAGE_TEXT_SEPARATED" = "%2$@|%1$@:%3$@";
-"CHAT_MESSAGE_NOTEXT_SEPARATED" = "%2$@|%1$@ sent a message to the group";
-"CHAT_MESSAGE_PHOTO_SEPARATED" = "%2$@|%1$@ sent a photo";
-"CHAT_MESSAGE_VIDEO_SEPARATED" = "%2$@|%1$@ sent a video ";
-"CHAT_MESSAGE_ROUND_SEPARATED" = "%2$@|%1$@ sent a video message";
-"CHAT_MESSAGE_DOC_SEPARATED" = "%2$@|%1$@ sent a file";
-"CHAT_MESSAGE_STICKER_SEPARATED" = "%2$@|%1$@ sent a %3$@sticker";
-"CHAT_MESSAGE_AUDIO_SEPARATED" = "%2$@|%1$@ sent a voice message";
-"CHAT_MESSAGE_CONTACT_SEPARATED" = "%2$@|%1$@ shared a contact";
-"CHAT_MESSAGE_GEO_SEPARATED" = "%2$@|%1$@ sent a map";
-"CHAT_MESSAGE_GEOLIVE_SEPARATED" = "%2$@|%1$@ started sharing their live location";
-"CHAT_MESSAGE_POLL_SEPARATED" = "%2$@|%1$@ sent a poll";
-"CHAT_MESSAGE_GIF_SEPARATED" = "%2$@|%1$@ sent a GIF";
-"CHAT_MESSAGE_GAME_SEPARATED" = "%2$@|%1$@ invited the group to play %3$@";
-"CHAT_MESSAGE_INVOICE_SEPARATED" = "%2$@|%1$@ sent an invoice for %3$@";
-"CHAT_CREATED_SEPARATED" = "%2$@|%1$@ invited you to the group";
-"CHAT_TITLE_EDITED_SEPARATED" = "%2$@|%1$@ edited the group\'s name";
-"CHAT_PHOTO_EDITED_SEPARATED" = "%2$@|%1$@ edited the group\'s photo";
-"CHAT_ADD_MEMBER_SEPARATED" = "%2$@|%1$@ invited %3$@ to the group";
-"CHAT_ADD_YOU_SEPARATED" = "%2$@|%1$@ invited you to the group";
-"CHAT_DELETE_MEMBER_SEPARATED" = "%2$@|%1$@ kicked %3$@ from the group";
-"CHAT_DELETE_YOU_SEPARATED" = "%2$@|%1$@ kicked you from the group ";
-"CHAT_LEFT_SEPARATED" = "%2$@|%1$@ has left the group";
-"CHAT_RETURNED_SEPARATED" = "%2$@|%1$@ has returned to the group";
-"CHAT_JOINED_SEPARATED" = "%2$@|%1$@ has joined the group";
-"NEW_CHAT_MESSAGE_FWDS_SEPARATED_1" = "%2$@|%1$@ forwarded a message";
-"NEW_CHAT_MESSAGE_FWDS_SEPARATED_any" = "%2$@|%1$@ forwarded %3$d messages";
-"NEW_CHAT_MESSAGE_PHOTOS_SEPARATED_1" = "%2$@|%1$@ sent a photo";
-"NEW_CHAT_MESSAGE_PHOTOS_SEPARATED_any" = "%2$@|%1$@ sent %3$d photos";
-"NEW_CHAT_MESSAGES_SEPARATED_1" = "%2$@|%1$@ sent a message";
-"NEW_CHAT_MESSAGES_SEPARATED_any" = "%2$@|%1$@ sent %3$d messages";
+"CHAT_MESSAGE_TEXT" = "%2$@|%1$@:%3$@";
+"CHAT_MESSAGE_NOTEXT" = "%2$@|%1$@ sent a message to the group";
+"CHAT_MESSAGE_PHOTO" = "%2$@|%1$@ sent a photo";
+"CHAT_MESSAGE_VIDEO" = "%2$@|%1$@ sent a video ";
+"CHAT_MESSAGE_ROUND" = "%2$@|%1$@ sent a video message";
+"CHAT_MESSAGE_DOC" = "%2$@|%1$@ sent a file";
+"CHAT_MESSAGE_STICKER" = "%2$@|%1$@ sent a %3$@sticker";
+"CHAT_MESSAGE_AUDIO" = "%2$@|%1$@ sent a voice message";
+"CHAT_MESSAGE_CONTACT" = "%2$@|%1$@ shared a contact";
+"CHAT_MESSAGE_GEO" = "%2$@|%1$@ sent a map";
+"CHAT_MESSAGE_GEOLIVE" = "%2$@|%1$@ started sharing their live location";
+"CHAT_MESSAGE_POLL" = "%2$@|%1$@ sent a poll";
+"CHAT_MESSAGE_GIF" = "%2$@|%1$@ sent a GIF";
+"CHAT_MESSAGE_GAME" = "%2$@|%1$@ invited the group to play %3$@";
+"CHAT_MESSAGE_INVOICE" = "%2$@|%1$@ sent an invoice for %3$@";
+"CHAT_CREATED" = "%2$@|%1$@ invited you to the group";
+"CHAT_TITLE_EDITED" = "%2$@|%1$@ edited the group\'s name";
+"CHAT_PHOTO_EDITED" = "%2$@|%1$@ edited the group\'s photo";
+"CHAT_ADD_MEMBER" = "%2$@|%1$@ invited %3$@ to the group";
+"CHAT_ADD_YOU" = "%2$@|%1$@ invited you to the group";
+"CHAT_DELETE_MEMBER" = "%2$@|%1$@ kicked %3$@ from the group";
+"CHAT_DELETE_YOU" = "%2$@|%1$@ kicked you from the group ";
+"CHAT_LEFT" = "%2$@|%1$@ has left the group";
+"CHAT_RETURNED" = "%2$@|%1$@ has returned to the group";
+"CHAT_JOINED" = "%2$@|%1$@ has joined the group";
+"PUSH_CHAT_MESSAGE_FWD" = "%2$@|%1$@ forwarded a message";
+"PUSH_CHAT_MESSAGE_FWDS_1" = "%2$@|%1$@ forwarded a message";
+"PUSH_CHAT_MESSAGE_FWDS_any" = "%2$@|%1$@ forwarded %3$d messages";
+"PUSH_CHAT_MESSAGE_PHOTO" = "%2$@|%1$@ sent a photo";
+"PUSH_CHAT_MESSAGE_PHOTOS_1" = "%2$@|%1$@ sent a photo";
+"PUSH_CHAT_MESSAGE_PHOTOS_any" = "%2$@|%1$@ sent %3$d photos";
+"PUSH_CHAT_MESSAGE_VIDEO" = "%2$@|%1$@ sent a video";
+"PUSH_CHAT_MESSAGE_VIDEOS_1" = "%2$@|%1$@ sent a video";
+"PUSH_CHAT_MESSAGE_VIDEOS_any" = "%2$@|%1$@ sent %3$d videos";
+"PUSH_CHAT_MESSAGE_ROUND" = "%2$@|%1$@ sent a video message";
+"PUSH_CHAT_MESSAGE_ROUNDS_1" = "%2$@|%1$@ sent a video message";
+"PUSH_CHAT_MESSAGE_ROUNDS_any" = "%2$@|%1$@ sent %3$d video messages";
+"PUSH_CHAT_MESSAGE" = "%2$@|%1$@ sent a message";
+"PUSH_CHAT_MESSAGES_1" = "%2$@|%1$@ sent a message";
+"PUSH_CHAT_MESSAGES_any" = "%2$@|%1$@ sent %3$d messages";
 
-"PINNED_TEXT_SEPARATED" = "%1$@|pinned \"%2$@\"";
-"PINNED_NOTEXT_SEPARATED" = "%1$@|pinned a message";
-"PINNED_PHOTO_SEPARATED" = "%1$@|pinned a photo";
-"PINNED_VIDEO_SEPARATED" = "%1$@|pinned a video";
-"PINNED_ROUND_SEPARATED" = "%1$@|pinned a video message";
-"PINNED_DOC_SEPARATED" = "%1$@|pinned a file";
-"PINNED_STICKER_SEPARATED" = "%1$@|pinned a %2$@sticker";
-"PINNED_AUDIO_SEPARATED" = "%1$@|pinned a voice message";
-"PINNED_CONTACT_SEPARATED" = "%1$@|pinned a contact";
-"PINNED_GEO_SEPARATED" = "%1$@|pinned a map";
-"PINNED_GEOLIVE_SEPARATED" = "%1$@|pinned a live location";
-"PINNED_POLL_SEPARATED" = "|%1$@|pinned a poll";
-"PINNED_GAME_SEPARATED" = "%1$@|pinned a game";
-"PINNED_INVOICE_SEPARATED" = "%1$@|pinned an invoice";
-"PINNED_GIF_SEPARATED" = "%1$@|pinned a GIF";
+"PINNED_TEXT" = "%1$@|pinned \"%2$@\"";
+"PINNED_NOTEXT" = "%1$@|pinned a message";
+"PINNED_PHOTO" = "%1$@|pinned a photo";
+"PINNED_VIDEO" = "%1$@|pinned a video";
+"PINNED_ROUND" = "%1$@|pinned a video message";
+"PINNED_DOC" = "%1$@|pinned a file";
+"PINNED_STICKER" = "%1$@|pinned a %2$@sticker";
+"PINNED_AUDIO" = "%1$@|pinned a voice message";
+"PINNED_CONTACT" = "%1$@|pinned a contact";
+"PINNED_GEO" = "%1$@|pinned a map";
+"PINNED_GEOLIVE" = "%1$@|pinned a live location";
+"PINNED_POLL" = "|%1$@|pinned a poll";
+"PINNED_GAME" = "%1$@|pinned a game";
+"PINNED_INVOICE" = "%1$@|pinned an invoice";
+"PINNED_GIF" = "%1$@|pinned a GIF";
 
-"CONTACT_JOINED_SEPARATED" = "%1$@|joined Telegram!";
+"CONTACT_JOINED" = "%1$@|joined Telegram!";
 
-"AUTH_UNKNOWN_SEPARATED" = "New login|from unrecognized device %1$@";
-"AUTH_REGION_SEPARATED" = "New login|from unrecognized device %1$@, location: %2$@";
+"AUTH_UNKNOWN" = "New login|from unrecognized device %1$@";
+"AUTH_REGION" = "New login|from unrecognized device %1$@, location: %2$@";
 
-"PHONE_CALL_REQUEST_SEPARATED" = "%1$@|is calling you!";
-"PHONE_CALL_MISSED_SEPARATED" = "%1$@|You missed a call";
+"PHONE_CALL_REQUEST" = "%1$@|is calling you!";
+"PHONE_CALL_MISSED" = "%1$@|You missed a call";
 
 // Common
 "Common.OK" = "OK";
@@ -2484,7 +2511,9 @@ Unused sets are archived when you add more.";
 "Channel.EditAdmin.PermissionEditMessages" = "Edit Messages";
 "Channel.EditAdmin.PermissionDeleteMessages" = "Delete Messages";
 "Channel.EditAdmin.PermissionBanUsers" = "Ban Users";
-"Channel.EditAdmin.PermissionInviteUsers" = "Add Users";
+"Channel.EditAdmin.PermissionInviteSubscribers" = "Add Subscribers";
+"Channel.EditAdmin.PermissionInviteMembers" = "Add Members";
+"Channel.EditAdmin.PermissionInviteViaLink" = "Invite Users via Link";
 "Channel.EditAdmin.PermissionPinMessages" = "Pin Messages";
 "Channel.EditAdmin.PermissionAddAdmins" = "Add New Admins";
 
@@ -3867,12 +3896,17 @@ Unused sets are archived when you add more.";
 "Channel.AdminLog.PollStopped" = "%@ stopped poll";
 
 "ChatList.DeleteChat" = "Delete Chat";
+"ChatList.DeleteSecretChat" = "Delete Secret Chat";
 "ChatList.DeleteChatConfirmation" = "Are you sure you want to delete chat\nwith %@?";
+"ChatList.DeleteSecretChatConfirmation" = "Are you sure you want to delete secret chat\nwith %@?";
 "ChatList.LeaveGroupConfirmation" = "Are you sure you want to leave %@?";
 
 "Undo.Undo" = "Undo";
 "Undo.MessagesDeleted" = "Messages deleted";
 "Undo.ChatDeleted" = "Chat deleted";
+"Undo.SecretChatDeleted" = "Secret Chat deleted";
+"Undo.LeftChannel" = "Left channel";
+"Undo.LeftGroup" = "Left group";
 
 "AccessDenied.Wallpapers" = "Telegram needs access to your photo library to set a custom wallpaper.\n\nPlease go to Settings > Privacy > Photos and set Telegram to ON.";
 
diff --git a/submodules/TelegramUI b/submodules/TelegramUI
index f5daa2e653..c9aa4a85da 160000
--- a/submodules/TelegramUI
+++ b/submodules/TelegramUI
@@ -1 +1 @@
-Subproject commit f5daa2e65399261b5a50e827e2d8c2fcd0b73516
+Subproject commit c9aa4a85da7d15f2f4227e301b2f92f5dd46aae5