Skip to content

Commit

Permalink
Updated to 4.6.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
23rd committed Feb 9, 2023
2 parents 7567305 + 646bb2f commit bf34682
Show file tree
Hide file tree
Showing 61 changed files with 577 additions and 243 deletions.
2 changes: 1 addition & 1 deletion Telegram/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL

add_executable(Telegram WIN32 MACOSX_BUNDLE)
init_non_host_target(Telegram ltcg)
init_non_host_target(Telegram)

add_subdirectory(lib_rpl)
add_subdirectory(lib_crl)
Expand Down
98 changes: 97 additions & 1 deletion Telegram/Resources/langs/cloud_lang.strings
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"cloud_lng_passport_in_it" = "Italian";
"cloud_lng_passport_in_ja" = "Japanese";
"cloud_lng_passport_in_ka" = "Georgian";
"cloud_lng_passport_in_km" = "Khmer";
// "cloud_lng_passport_in_km" = "Khmer";
"cloud_lng_passport_in_ko" = "Korean";
"cloud_lng_passport_in_lo" = "Lao";
"cloud_lng_passport_in_lt" = "Lithuanian";
Expand All @@ -58,3 +58,99 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"cloud_lng_passport_in_uk" = "Ukrainian";
"cloud_lng_passport_in_uz" = "Uzbek";
"cloud_lng_passport_in_vi" = "Vietnamese";

"cloud_lng_translate_to_ar" = "Arabic";
"cloud_lng_translate_to_az" = "Azerbaijani";
"cloud_lng_translate_to_bg" = "Bulgarian";
// "cloud_lng_translate_to_bn" = "Bangla";
"cloud_lng_translate_to_cs" = "Czech";
"cloud_lng_translate_to_da" = "Danish";
"cloud_lng_translate_to_de" = "German";
// "cloud_lng_translate_to_dv" = "Divehi";
// "cloud_lng_translate_to_dz" = "Dzongkha";
"cloud_lng_translate_to_el" = "Greek";
"cloud_lng_translate_to_en" = "English";
"cloud_lng_translate_to_es" = "Spanish";
"cloud_lng_translate_to_et" = "Estonian";
"cloud_lng_translate_to_fa" = "Persian";
"cloud_lng_translate_to_fr" = "French";
"cloud_lng_translate_to_he" = "Hebrew";
"cloud_lng_translate_to_hr" = "Croatian";
"cloud_lng_translate_to_hu" = "Hungarian";
"cloud_lng_translate_to_hy" = "Armenian";
"cloud_lng_translate_to_id" = "Indonesian";
"cloud_lng_translate_to_is" = "Icelandic";
"cloud_lng_translate_to_it" = "Italian";
"cloud_lng_translate_to_ja" = "Japanese";
"cloud_lng_translate_to_ka" = "Georgian";
// "cloud_lng_translate_to_km" = "Khmer";
"cloud_lng_translate_to_ko" = "Korean";
"cloud_lng_translate_to_lo" = "Lao";
"cloud_lng_translate_to_lt" = "Lithuanian";
"cloud_lng_translate_to_lv" = "Latvian";
"cloud_lng_translate_to_mk" = "Macedonian";
"cloud_lng_translate_to_mn" = "Mongolian";
"cloud_lng_translate_to_ms" = "Malay";
"cloud_lng_translate_to_my" = "Burmese";
"cloud_lng_translate_to_ne" = "Nepali";
"cloud_lng_translate_to_nl" = "Dutch";
"cloud_lng_translate_to_pl" = "Polish";
"cloud_lng_translate_to_pt" = "Portuguese";
"cloud_lng_translate_to_ro" = "Romanian";
"cloud_lng_translate_to_ru" = "Russian";
"cloud_lng_translate_to_sk" = "Slovak";
"cloud_lng_translate_to_sl" = "Slovenian";
"cloud_lng_translate_to_th" = "Thai";
"cloud_lng_translate_to_tk" = "Turkmen";
"cloud_lng_translate_to_tr" = "Turkish";
"cloud_lng_translate_to_uk" = "Ukrainian";
"cloud_lng_translate_to_uz" = "Uzbek";
"cloud_lng_translate_to_vi" = "Vietnamese";

"cloud_lng_language_ar" = "Arabic";
"cloud_lng_language_az" = "Azerbaijani";
"cloud_lng_language_bg" = "Bulgarian";
// "cloud_lng_language_bn" = "Bangla";
"cloud_lng_language_cs" = "Czech";
"cloud_lng_language_da" = "Danish";
"cloud_lng_language_de" = "German";
// "cloud_lng_language_dv" = "Divehi";
// "cloud_lng_language_dz" = "Dzongkha";
"cloud_lng_language_el" = "Greek";
"cloud_lng_language_en" = "English";
"cloud_lng_language_es" = "Spanish";
"cloud_lng_language_et" = "Estonian";
"cloud_lng_language_fa" = "Persian";
"cloud_lng_language_fr" = "French";
"cloud_lng_language_he" = "Hebrew";
"cloud_lng_language_hr" = "Croatian";
"cloud_lng_language_hu" = "Hungarian";
"cloud_lng_language_hy" = "Armenian";
"cloud_lng_language_id" = "Indonesian";
"cloud_lng_language_is" = "Icelandic";
"cloud_lng_language_it" = "Italian";
"cloud_lng_language_ja" = "Japanese";
"cloud_lng_language_ka" = "Georgian";
// "cloud_lng_language_km" = "Khmer";
"cloud_lng_language_ko" = "Korean";
"cloud_lng_language_lo" = "Lao";
"cloud_lng_language_lt" = "Lithuanian";
"cloud_lng_language_lv" = "Latvian";
"cloud_lng_language_mk" = "Macedonian";
"cloud_lng_language_mn" = "Mongolian";
"cloud_lng_language_ms" = "Malay";
"cloud_lng_language_my" = "Burmese";
"cloud_lng_language_ne" = "Nepali";
"cloud_lng_language_nl" = "Dutch";
"cloud_lng_language_pl" = "Polish";
"cloud_lng_language_pt" = "Portuguese";
"cloud_lng_language_ro" = "Romanian";
"cloud_lng_language_ru" = "Russian";
"cloud_lng_language_sk" = "Slovak";
"cloud_lng_language_sl" = "Slovenian";
"cloud_lng_language_th" = "Thai";
"cloud_lng_language_tk" = "Turkmen";
"cloud_lng_language_tr" = "Turkish";
"cloud_lng_language_uk" = "Ukrainian";
"cloud_lng_language_uz" = "Uzbek";
"cloud_lng_language_vi" = "Vietnamese";
3 changes: 3 additions & 0 deletions Telegram/Resources/langs/lang.strings
Original file line number Diff line number Diff line change
Expand Up @@ -2271,8 +2271,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL

"lng_translate_show_original" = "Show Original";
"lng_translate_bar_to" = "Translate to {name}";
"lng_translate_bar_to_other" = "Translate to {name}";
"lng_translate_menu_to" = "Translate To";
"lng_translate_menu_dont" = "Don't translate {name}";
"lng_translate_menu_dont_other" = "Don't translate {name}";
"lng_translate_menu_hide" = "Hide";
"lng_translate_hidden_user" = "Translation bar is now hidden for this chat.";
"lng_translate_hidden_group" = "Translation bar is now hidden for this group.";
Expand Down Expand Up @@ -3429,6 +3431,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_translate_settings_chat" = "Translate Entire Chat";
"lng_translate_settings_choose" = "Do Not Translate";
"lng_translate_settings_about" = "The 'Translate' button will appear when you open a context menu on a text message.";
"lng_translate_settings_one" = "Please choose at least one language so that it can be used as the \"Translate to\" language.";

"lng_launch_exe_warning" = "This file has a {extension} extension.\nAre you sure you want to run it?";
"lng_launch_svg_warning" = "Opening this file can potentially expose your IP address to its sender. Continue?";
Expand Down
Binary file modified Telegram/Resources/night-green.tdesktop-theme
Binary file not shown.
2 changes: 1 addition & 1 deletion Telegram/Resources/uwp/AppX/AppxManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Identity Name="TelegramMessengerLLP.TelegramDesktop"
ProcessorArchitecture="ARCHITECTURE"
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
Version="4.6.1.0" />
Version="4.6.2.0" />
<Properties>
<DisplayName>Telegram Desktop</DisplayName>
<PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
Expand Down
8 changes: 4 additions & 4 deletions Telegram/Resources/winrc/Telegram.rc
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,6,1,0
PRODUCTVERSION 4,6,1,0
FILEVERSION 4,6,2,0
PRODUCTVERSION 4,6,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -62,10 +62,10 @@ BEGIN
BEGIN
VALUE "CompanyName", ""
VALUE "FileDescription", "Telegram Desktop"
VALUE "FileVersion", "4.6.1.0"
VALUE "FileVersion", "4.6.2.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2023"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "4.6.1.0"
VALUE "ProductVersion", "4.6.2.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions Telegram/Resources/winrc/Updater.rc
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,6,1,0
PRODUCTVERSION 4,6,1,0
FILEVERSION 4,6,2,0
PRODUCTVERSION 4,6,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -53,10 +53,10 @@ BEGIN
BEGIN
VALUE "CompanyName", ""
VALUE "FileDescription", "Telegram Desktop Updater"
VALUE "FileVersion", "4.6.1.0"
VALUE "FileVersion", "4.6.2.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2023"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "4.6.1.0"
VALUE "ProductVersion", "4.6.2.0"
END
END
BLOCK "VarFileInfo"
Expand Down
7 changes: 6 additions & 1 deletion Telegram/SourceFiles/api/api_peer_photo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ For license and copyright information please follow this link:
#include "apiwrap.h"
#include "base/random.h"
#include "base/unixtime.h"
#include "data/stickers/data_stickers.h"
#include "data/data_channel.h"
#include "data/data_chat.h"
#include "data/data_document.h"
Expand Down Expand Up @@ -125,7 +126,11 @@ constexpr auto kSharedMediaLimit = 100;
colors,
ranges::back_inserter(mtpColors),
[&](const QColor &c) { return MTP_int(serializeColor(c)); });
if (sticker->set.id && sticker->set.accessHash) {
if (sticker->setType == Data::StickersType::Emoji) {
return MTP_videoSizeEmojiMarkup(
MTP_long(document->id),
MTP_vector(mtpColors));
} else if (sticker->set.id && sticker->set.accessHash) {
return MTP_videoSizeStickerMarkup(
MTP_inputStickerSetID(
MTP_long(sticker->set.id),
Expand Down
4 changes: 2 additions & 2 deletions Telegram/SourceFiles/api/api_premium_option.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ For license and copyright information please follow this link:

namespace Api {

constexpr auto kDiscountDivider = 5.;
constexpr auto kDiscountDivider = 1.;

Data::SubscriptionOption CreateSubscriptionOption(
int months,
Expand All @@ -20,7 +20,7 @@ Data::SubscriptionOption CreateSubscriptionOption(
const QString &currency,
const QString &botUrl) {
const auto discount = [&] {
const auto percent = monthlyAmount * months / float64(amount) - 1.;
const auto percent = 1. - float64(amount) / (monthlyAmount * months);
return std::round(percent * 100. / kDiscountDivider)
* kDiscountDivider;
}();
Expand Down
Loading

0 comments on commit bf34682

Please sign in to comment.