diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 247ea2213..6c99f6878 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -250,7 +250,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_dlg_new_channel_name" = "Channel name";
"lng_no_contacts" = "You have no contacts";
"lng_no_chats" = "Your chats will be here";
-"lng_no_chats_filter" = "No chats currently match this folder.";
+"lng_no_chats_filter" = "No chats currently belong to this folder.";
"lng_contacts_loading" = "Loading...";
"lng_contacts_not_found" = "No contacts found";
"lng_dlg_search_for_messages" = "Search for messages";
@@ -2233,15 +2233,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_outdated_now" = "So that Telegram Desktop can update to newer versions.";
"lng_filters_all" = "All chats";
-"lng_filters_setup" = "Setup";
+"lng_filters_setup" = "Edit";
"lng_filters_title" = "Folders";
"lng_filters_subtitle" = "My folders";
"lng_filters_no_chats" = "No chats";
"lng_filters_chats_count#one" = "{count} chat";
"lng_filters_chats_count#other" = "{count} chats";
-"lng_filters_create" = "Add a custom folder";
+"lng_filters_create" = "Create new folder";
"lng_filters_about" = "Create folders for different groups of chats and quickly switch between them.";
-"lng_filters_recommended" = "Recommended";
+"lng_filters_recommended" = "Recommended folders";
"lng_filters_recommended_add" = "Add";
"lng_filters_restore" = "Undo";
"lng_filters_new" = "New Folder";
@@ -2281,7 +2281,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_filters_type_no_archived" = "Archived";
"lng_filters_type_no_muted" = "Muted";
"lng_filters_type_no_read" = "Read";
-"lng_filters_icon_header" = "Choose icon";
+"lng_filters_icon_header" = "Choose an icon";
"lng_filters_error_pinned_max" = "Sorry, you can't pin any more chats to the top.";
"lng_filters_context_edit" = "Edit Folder";
"lng_filters_context_remove" = "Remove";
diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 1090e98ef..5db8923b4 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
+ Version="1.9.22.0" />
Telegram Desktop
Telegram FZ-LLC
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 05d092923..9d7cda51b 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -33,8 +33,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,9,21,3
- PRODUCTVERSION 1,9,21,3
+ FILEVERSION 1,9,22,0
+ PRODUCTVERSION 1,9,22,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -51,10 +51,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram FZ-LLC"
VALUE "FileDescription", "Telegram Desktop"
- VALUE "FileVersion", "1.9.21.3"
+ VALUE "FileVersion", "1.9.22.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2020"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "1.9.21.3"
+ VALUE "ProductVersion", "1.9.22.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index a416a28b5..2c0f6c43c 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,9,21,3
- PRODUCTVERSION 1,9,21,3
+ FILEVERSION 1,9,22,0
+ PRODUCTVERSION 1,9,22,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -42,10 +42,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram FZ-LLC"
VALUE "FileDescription", "Telegram Desktop Updater"
- VALUE "FileVersion", "1.9.21.3"
+ VALUE "FileVersion", "1.9.22.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2020"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "1.9.21.3"
+ VALUE "ProductVersion", "1.9.22.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index dcda47479..1e5b6df3d 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -49,6 +49,11 @@ std::map BetaLogs() {
"\xE2\x80\xA2 Fix blurred thumbnails in albums with video files.\n"
"\xE2\x80\xA2 Fix a possible crash in animated stickers rendering."
+ },
+ {
+ 1009022,
+ "\xE2\x80\xA2 Organize chats into Chat Folders "
+ "if you have too many chats.\n"
}
};
};
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 0df01b4a0..455f6c8b7 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/const_string.h"
-#define TDESKTOP_REQUESTED_ALPHA_VERSION (1009021003ULL)
+#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL)
#ifdef TDESKTOP_ALLOW_CLOSED_ALPHA
#define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
constexpr auto AppName = "Telegram Desktop"_cs;
constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 1009021;
-constexpr auto AppVersionStr = "1.9.21";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 1009022;
+constexpr auto AppVersionStr = "1.9.22";
+constexpr auto AppBetaVersion = true;
constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 6c4833480..a1f24723d 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion 1009021
+AppVersion 1009022
AppVersionStrMajor 1.9
-AppVersionStrSmall 1.9.21
-AppVersionStr 1.9.21
-BetaChannel 0
-AlphaVersion 1009021003
-AppVersionOriginal 1.9.21.3
+AppVersionStrSmall 1.9.22
+AppVersionStr 1.9.22
+BetaChannel 1
+AlphaVersion 0
+AppVersionOriginal 1.9.22.beta
diff --git a/changelog.txt b/changelog.txt
index bbe824ae5..248375afd 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+1.9.22 (27.03.20)
+
+- Organize chats into Chat Folders if you have too many chats.
+
1.9.21 (16.03.20)
- Mark new messages as read while scrolling down through them.