diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings
index b2951e365a..f3a68b2da2 100644
--- a/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram-iOS/en.lproj/Localizable.strings
@@ -1,117 +1,107 @@
 // Notifications
-"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_ROUND" = "%1$@ sent you a video 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_DOC" = "%1$@ sent you a file";
-"MESSAGE_AUDIO" = "%1$@ sent you a voice message";
-"MESSAGE_GIF" = "%1$@ sent you a GIF";
-"ENCRYPTED_MESSAGE" = "You have a new message%1$@";
-"LOCKED_MESSAGE" = "You have a new message%1$@";
-"MESSAGE_SCREENSHOT" = "%1$@ took a screenshot!";
-"ENCRYPTION_REQUEST" = "New encryption request%1$@";
-"ENCRYPTION_ACCEPT" = "Your encryption request was accepted%1$@";
-"MESSAGE_PHOTOS" = "%1$@ sent you %2$@ photos";
-"MESSAGES" = "%1$@ sent you %2$@ messages";
+"PUSH_MESSAGE_TEXT" = "%1$@: %2$@";
+"PUSH_MESSAGE_NOTEXT" = "%1$@ sent you a message";
+"PUSH_MESSAGE_PHOTO" = "%1$@ sent you a photo";
+"PUSH_MESSAGE_PHOTO_SECRET" = "%1$@ sent you a self-destructing photo";
+"PUSH_MESSAGE_VIDEO" = "%1$@ sent you a video";
+"PUSH_MESSAGE_VIDEO_SECRET" = "%1$@ sent you a self-destructing video";
+"PUSH_MESSAGE_ROUND" = "%1$@ sent you a video message";
+"PUSH_MESSAGE_CONTACT" = "%1$@ shared a contact with you";
+"PUSH_MESSAGE_GEO" = "%1$@ sent you a map";
+"PUSH_MESSAGE_GEOLIVE" = "%1$@ started sharing their live location";
+"PUSH_MESSAGE_DOC" = "%1$@ sent you a file";
+"PUSH_MESSAGE_AUDIO" = "%1$@ sent you a voice message";
+"PUSH_MESSAGE_GIF" = "%1$@ sent you a GIF";
+"PUSH_ENCRYPTED_MESSAGE" = "You have a new message%1$@";
+"PUSH_LOCKED_MESSAGE" = "You have a new message%1$@";
+"PUSH_MESSAGE_SCREENSHOT" = "%1$@ took a screenshot!";
+"PUSH_ENCRYPTION_REQUEST" = "New encryption request%1$@";
+"PUSH_ENCRYPTION_ACCEPT" = "Your encryption request was accepted%1$@";
 
-"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";
+"PUSH_MESSAGE_POLL" = "%1$@ sent you a poll";
+"PUSH_CHANNEL_MESSAGE_POLL" = "%1$@ posted a poll";
+"PUSH_CHAT_MESSAGE_POLL" = "%1$@ sent a poll to the group %2$@";
+"PUSH_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$@";
-"CHAT_MESSAGE_VIDEO" = "%1$@ sent a video to the group %2$@";
-"CHAT_MESSAGE_ROUND" = "%1$@ sent a video message to the group %2$@";
-"CHAT_MESSAGE_CONTACT" = "%1$@ shared a contact in the group %2$@";
-"CHAT_MESSAGE_GEO" = "%1$@ sent a map to the group %2$@";
-"CHAT_MESSAGE_GEOLIVE" = "%1$@ started sharing their live location with %2$@";
-"CHAT_MESSAGE_DOC" = "%1$@ sent a file to the group %2$@";
-"CHAT_MESSAGE_AUDIO" = "%1$@ sent a voice message to the group %2$@";
-"CHAT_MESSAGE_GIF" = "%1$@ sent a GIF to the group %2$@";
-"CHAT_CREATED" = "%1$@ invited you to the group %2$@";
-"CHAT_TITLE_EDITED" = "%1$@ edited the group's %2$@ name";
-"CHAT_PHOTO_EDITED" = "%1$@ edited the group's %2$@ photo";
-"CHAT_ADD_MEMBER" = "%1$@ invited %3$@ to the group %2$@";
-"CHAT_ADD_YOU" = "%1$@ invited you to the group %2$@";
-"CHAT_DELETE_YOU" = "%1$@ removed you from the group %2$@";
-"CHAT_DELETE_MEMBER" = "%1$@ removed %3$@ from the group %2$@";
-"CHAT_LEFT" = "%1$@ left the group %2$@";
-"CHAT_RETURNED" = "%1$@ returned to the group %2$@";
-"CHAT_MESSAGE_PHOTOS" = "%1$@ sent %3$@ photos to the group %2$@";
-"CHAT_MESSAGES" = "%1$@ sent %3$@ messages to the group %2$@";
+"PUSH_CHAT_MESSAGE_TEXT" = "%1$@@%2$@: %3$@";
+"PUSH_CHAT_MESSAGE_NOTEXT" = "%1$@ sent a message to the group %2$@";
+"PUSH_CHAT_MESSAGE_PHOTO" = "%1$@ sent a photo to the group %2$@";
+"PUSH_CHAT_MESSAGE_VIDEO" = "%1$@ sent a video to the group %2$@";
+"PUSH_CHAT_MESSAGE_ROUND" = "%1$@ sent a video message to the group %2$@";
+"PUSH_CHAT_MESSAGE_CONTACT" = "%1$@ shared a contact in the group %2$@";
+"PUSH_CHAT_MESSAGE_GEO" = "%1$@ sent a map to the group %2$@";
+"PUSH_CHAT_MESSAGE_GEOLIVE" = "%1$@ started sharing their live location with %2$@";
+"PUSH_CHAT_MESSAGE_DOC" = "%1$@ sent a file to the group %2$@";
+"PUSH_CHAT_MESSAGE_AUDIO" = "%1$@ sent a voice message to the group %2$@";
+"PUSH_CHAT_MESSAGE_GIF" = "%1$@ sent a GIF to the group %2$@";
+"PUSH_CHAT_CREATED" = "%1$@ invited you to the group %2$@";
+"PUSH_CHAT_TITLE_EDITED" = "%1$@ edited the group's %2$@ name";
+"PUSH_CHAT_PHOTO_EDITED" = "%1$@ edited the group's %2$@ photo";
+"PUSH_CHAT_ADD_MEMBER" = "%1$@ invited %3$@ to the group %2$@";
+"PUSH_CHAT_ADD_YOU" = "%1$@ invited you to the group %2$@";
+"PUSH_CHAT_DELETE_YOU" = "%1$@ removed you from the group %2$@";
+"PUSH_CHAT_DELETE_MEMBER" = "%1$@ removed %3$@ from the group %2$@";
+"PUSH_CHAT_LEFT" = "%1$@ left the group %2$@";
+"PUSH_CHAT_RETURNED" = "%1$@ returned to the group %2$@";
+"PUSH_CHAT_MESSAGE_PHOTOS" = "%1$@ sent %3$@ photos to the group %2$@";
+"PUSH_CHAT_MESSAGES" = "%1$@ sent %3$@ messages to the group %2$@";
 
-"MESSAGE_STICKER" = "%1$@ sent you a %2$@sticker";
-"CHAT_MESSAGE_STICKER" = "%1$@ sent a %3$@sticker to the group %2$@";
+"PUSH_MESSAGE_STICKER" = "%1$@ sent you a %2$@sticker";
+"PUSH_CHAT_MESSAGE_STICKER" = "%1$@ sent a %3$@sticker to the group %2$@";
 
-"CONTACT_JOINED" = "%1$@ joined Telegram!";
+"PUSH_CONTACT_JOINED" = "%1$@ joined Telegram!";
 
-"AUTH_REGION" = "Login from a new device %1$@, location: %2$@";
+"PUSH_CHANNEL_MESSAGE_TEXT" = "%1$@: %2$@";
+"PUSH_CHANNEL_MESSAGE_NOTEXT" = "%1$@ posted a message";
+"PUSH_CHANNEL_MESSAGE_PHOTO" = "%1$@ posted a photo";
+"PUSH_CHANNEL_MESSAGE_VIDEO" = "%1$@ posted a video";
+"PUSH_CHANNEL_MESSAGE_ROUND" = "%1$@ posted a video message";
+"PUSH_CHANNEL_MESSAGE_DOC" = "%1$@ posted a document";
+"PUSH_CHANNEL_MESSAGE_STICKER" = "%1$@ posted a %2$@sticker";
+"PUSH_CHANNEL_MESSAGE_AUDIO" = "%1$@ posted a voice message";
+"PUSH_CHANNEL_MESSAGE_CONTACT" = "%1$@ posted a contact";
+"PUSH_CHANNEL_MESSAGE_GEO" = "%1$@ posted a map";
+"PUSH_CHANNEL_MESSAGE_GEOLIVE" = "%1$@ posted a live location";
+"PUSH_CHANNEL_MESSAGE_GIF" = "%1$@ posted a GIF";
+"PUSH_CHANNEL_MESSAGE_PHOTOS" = "%1$@ posted %2$@ photos";
+"PUSH_CHANNEL_MESSAGES" = "%1$@ posted %2$@ messages";
 
-"MESSAGE_FWDS" = "%1$@ forwarded you %2$@ messages";
-"CHAT_MESSAGE_FWDS" = "%1$@ forwarded %3$@ messages to the group %2$@";
+"PUSH_PINNED_TEXT" = "%1$@ pinned \"%2$@\"";
+"PUSH_PINNED_NOTEXT" = "%1$@ pinned a message";
+"PUSH_PINNED_PHOTO" = "%1$@ pinned a photo";
+"PUSH_PINNED_VIDEO" = "%1$@ pinned a video";
+"PUSH_PINNED_ROUND" = "%1$@ pinned a video message";
+"PUSH_PINNED_DOC" = "%1$@ pinned a file";
+"PUSH_PINNED_STICKER" = "%1$@ pinned a %2$@sticker";
+"PUSH_PINNED_AUDIO" = "%1$@ pinned a voice message";
+"PUSH_PINNED_CONTACT" = "%1$@ pinned a contact";
+"PUSH_PINNED_GEO" = "%1$@ pinned a map";
+"PUSH_PINNED_GEOLIVE" = "%1$@ pinned a live location";
+"PUSH_PINNED_GIF" = "%1$@ pinned a GIF";
 
-"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 document";
-"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_GIF" = "%1$@ posted a GIF";
-"CHANNEL_MESSAGE_PHOTOS" = "%1$@ posted %2$@ photos";
-"CHANNEL_MESSAGES" = "%1$@ posted %2$@ messages";
+"PUSH_MESSAGE_GAME" = "%1$@ invited you to play %2$@";
+"PUSH_CHANNEL_MESSAGE_GAME" = "%1$@ invited you to play %2$@";
+"PUSH_CHAT_MESSAGE_GAME" = "%1$@ invited the group %2$@ to play %3$@";
+"PUSH_PINNED_GAME" = "%1$@ pinned a game";
 
-"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_GIF" = "%1$@ pinned a GIF";
-
-"MESSAGE_GAME" = "%1$@ invited you to play %2$@";
-"CHANNEL_MESSAGE_GAME" = "%1$@ invited you to play %2$@";
-"CHAT_MESSAGE_GAME" = "%1$@ invited the group %2$@ to play %3$@";
-"PINNED_GAME" = "%1$@ pinned a game";
-
-"PHONE_CALL_REQUEST" = "%1$@ is calling you";
-"PHONE_CALL_MISSED" = "You missed a call from %1$@";
-
-"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_TEXT" = "%1$@|%2$@";
+"PUSH_MESSAGE_NOTEXT" = "%1$@|sent you a message";
+"PUSH_MESSAGE_PHOTO" = "%1$@|sent you a photo";
+"PUSH_MESSAGE_PHOTO_SECRET" = "%1$@|sent you a self-destructing photo";
+"PUSH_MESSAGE_VIDEO" = "%1$@|sent you a video";
+"PUSH_MESSAGE_VIDEO_SECRET" = "%1$@|sent you a self-destructing video";
+"PUSH_MESSAGE_SCREENSHOT" = "%1$@|took a screenshot";
+"PUSH_MESSAGE_ROUND" = "%1$@|sent you a video message";
+"PUSH_MESSAGE_DOC" = "%1$@|sent you a file";
+"PUSH_MESSAGE_STICKER" = "%1$@|sent you a %2$@sticker";
+"PUSH_MESSAGE_AUDIO" = "%1$@|sent you a voice message";
+"PUSH_MESSAGE_CONTACT" = "%1$@|shared a contact with you";
+"PUSH_MESSAGE_GEO" = "%1$@|sent you a map";
+"PUSH_MESSAGE_GEOLIVE" = "%1$@|started sharing their live location";
+"PUSH_MESSAGE_POLL" = "%1$@|sent you a poll";
+"PUSH_MESSAGE_GIF" = "%1$@|sent you a GIF";
+"PUSH_MESSAGE_GAME" = "%1$@|invited you to play %2$@";
+"PUSH_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";
@@ -128,20 +118,20 @@
 "PUSH_MESSAGES_1" = "%1$@|sent you a message";
 "PUSH_MESSAGES_any" = "%1$@|sent you %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_TEXT" = "%1$@|%2$@";
+"PUSH_CHANNEL_MESSAGE_NOTEXT" = "%1$@|posted a message";
+"PUSH_CHANNEL_MESSAGE_PHOTO" = "%1$@|posted a photo";
+"PUSH_CHANNEL_MESSAGE_VIDEO" = "%1$@|posted a video";
+"PUSH_CHANNEL_MESSAGE_ROUND" = "%1$@|posted a video message";
+"PUSH_CHANNEL_MESSAGE_DOC" = "%1$@|posted a file";
+"PUSH_CHANNEL_MESSAGE_STICKER" = "%1$@|posted a %2$@sticker";
+"PUSH_CHANNEL_MESSAGE_AUDIO" = "%1$@|posted a voice message";
+"PUSH_CHANNEL_MESSAGE_CONTACT" = "%1$@|posted a contact";
+"PUSH_CHANNEL_MESSAGE_GEO" = "%1$@|posted a map";
+"PUSH_CHANNEL_MESSAGE_GEOLIVE" = "%1$@|posted a live location";
+"PUSH_CHANNEL_MESSAGE_POLL" = "%1$@|posted a poll";
+"PUSH_CHANNEL_MESSAGE_GIF" = "%1$@|posted a GIF";
+"PUSH_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";
@@ -158,31 +148,31 @@
 "PUSH_CHANNEL_MESSAGES_1" = "%1$@|posted a message";
 "PUSH_CHANNEL_MESSAGES_any" = "%1$@|posted %2$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_TEXT" = "%2$@|%1$@:%3$@";
+"PUSH_CHAT_MESSAGE_NOTEXT" = "%2$@|%1$@ sent a message to the group";
+"PUSH_CHAT_MESSAGE_PHOTO" = "%2$@|%1$@ sent a photo";
+"PUSH_CHAT_MESSAGE_VIDEO" = "%2$@|%1$@ sent a video ";
+"PUSH_CHAT_MESSAGE_ROUND" = "%2$@|%1$@ sent a video message";
+"PUSH_CHAT_MESSAGE_DOC" = "%2$@|%1$@ sent a file";
+"PUSH_CHAT_MESSAGE_STICKER" = "%2$@|%1$@ sent a %3$@sticker";
+"PUSH_CHAT_MESSAGE_AUDIO" = "%2$@|%1$@ sent a voice message";
+"PUSH_CHAT_MESSAGE_CONTACT" = "%2$@|%1$@ shared a contact";
+"PUSH_CHAT_MESSAGE_GEO" = "%2$@|%1$@ sent a map";
+"PUSH_CHAT_MESSAGE_GEOLIVE" = "%2$@|%1$@ started sharing their live location";
+"PUSH_CHAT_MESSAGE_POLL" = "%2$@|%1$@ sent a poll";
+"PUSH_CHAT_MESSAGE_GIF" = "%2$@|%1$@ sent a GIF";
+"PUSH_CHAT_MESSAGE_GAME" = "%2$@|%1$@ invited the group to play %3$@";
+"PUSH_CHAT_MESSAGE_INVOICE" = "%2$@|%1$@ sent an invoice for %3$@";
+"PUSH_CHAT_CREATED" = "%2$@|%1$@ invited you to the group";
+"PUSH_CHAT_TITLE_EDITED" = "%2$@|%1$@ edited the group\'s name";
+"PUSH_CHAT_PHOTO_EDITED" = "%2$@|%1$@ edited the group\'s photo";
+"PUSH_CHAT_ADD_MEMBER" = "%2$@|%1$@ invited %3$@ to the group";
+"PUSH_CHAT_ADD_YOU" = "%2$@|%1$@ invited you to the group";
+"PUSH_CHAT_DELETE_MEMBER" = "%2$@|%1$@ kicked %3$@ from the group";
+"PUSH_CHAT_DELETE_YOU" = "%2$@|%1$@ kicked you from the group ";
+"PUSH_CHAT_LEFT" = "%2$@|%1$@ has left the group";
+"PUSH_CHAT_RETURNED" = "%2$@|%1$@ has returned to the group";
+"PUSH_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";
@@ -199,29 +189,29 @@
 "PUSH_CHAT_MESSAGES_1" = "%2$@|%1$@ sent a message";
 "PUSH_CHAT_MESSAGES_any" = "%2$@|%1$@ sent %3$d messages";
 
-"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";
+"PUSH_PINNED_TEXT" = "%1$@|pinned \"%2$@\"";
+"PUSH_PINNED_NOTEXT" = "%1$@|pinned a message";
+"PUSH_PINNED_PHOTO" = "%1$@|pinned a photo";
+"PUSH_PINNED_VIDEO" = "%1$@|pinned a video";
+"PUSH_PINNED_ROUND" = "%1$@|pinned a video message";
+"PUSH_PINNED_DOC" = "%1$@|pinned a file";
+"PUSH_PINNED_STICKER" = "%1$@|pinned a %2$@sticker";
+"PUSH_PINNED_AUDIO" = "%1$@|pinned a voice message";
+"PUSH_PINNED_CONTACT" = "%1$@|pinned a contact";
+"PUSH_PINNED_GEO" = "%1$@|pinned a map";
+"PUSH_PINNED_GEOLIVE" = "%1$@|pinned a live location";
+"PUSH_PINNED_POLL" = "|%1$@|pinned a poll";
+"PUSH_PINNED_GAME" = "%1$@|pinned a game";
+"PUSH_PINNED_INVOICE" = "%1$@|pinned an invoice";
+"PUSH_PINNED_GIF" = "%1$@|pinned a GIF";
 
-"CONTACT_JOINED" = "%1$@|joined Telegram!";
+"PUSH_CONTACT_JOINED" = "%1$@|joined Telegram!";
 
-"AUTH_UNKNOWN" = "New login|from unrecognized device %1$@";
-"AUTH_REGION" = "New login|from unrecognized device %1$@, location: %2$@";
+"PUSH_AUTH_UNKNOWN" = "New login|from unrecognized device %1$@";
+"PUSH_AUTH_REGION" = "New login|from unrecognized device %1$@, location: %2$@";
 
-"PHONE_CALL_REQUEST" = "%1$@|is calling you!";
-"PHONE_CALL_MISSED" = "%1$@|You missed a call";
+"PUSH_PHONE_CALL_REQUEST" = "%1$@|is calling you!";
+"PUSH_PHONE_CALL_MISSED" = "%1$@|You missed a call";
 
 // Common
 "Common.OK" = "OK";
@@ -3889,7 +3879,6 @@ 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 %@?";
@@ -3900,5 +3889,7 @@ Unused sets are archived when you add more.";
 "Undo.SecretChatDeleted" = "Secret Chat deleted";
 "Undo.LeftChannel" = "Left channel";
 "Undo.LeftGroup" = "Left group";
+"Undo.DeletedChannel" = "Deleted channel";
+"Undo.DeletedGroup" = "Deleted 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/Display b/submodules/Display
index 668258d9d8..a533f7dd71 160000
--- a/submodules/Display
+++ b/submodules/Display
@@ -1 +1 @@
-Subproject commit 668258d9d8c034a5f31c464cd8d1537665458030
+Subproject commit a533f7dd716dd8e059b0e365e72867a9b6fb77a9
diff --git a/submodules/TelegramCore b/submodules/TelegramCore
index 4241cd07ec..0341c221f6 160000
--- a/submodules/TelegramCore
+++ b/submodules/TelegramCore
@@ -1 +1 @@
-Subproject commit 4241cd07ecda748a0fbd33f4d3d622b036c957a0
+Subproject commit 0341c221f6c6d68a6054482e1d10d16bc3f587e2
diff --git a/submodules/TelegramUI b/submodules/TelegramUI
index d544c2dd06..4e9b52480d 160000
--- a/submodules/TelegramUI
+++ b/submodules/TelegramUI
@@ -1 +1 @@
-Subproject commit d544c2dd069f4b0ab1709798e5b7e7eddb9e210c
+Subproject commit 4e9b52480d865a8b04d5393f19b670934c8e6b58