diff --git a/Telegram/Resources/langs/lang_de.strings b/Telegram/Resources/langs/lang_de.strings index 9df91f2f0..c38bac991 100644 --- a/Telegram/Resources/langs/lang_de.strings +++ b/Telegram/Resources/langs/lang_de.strings @@ -584,8 +584,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_profile_convert_title" = "In Supergruppe ändern"; "lng_profile_convert_about" = "Supergruppen:"; "lng_profile_convert_feature1" = "— Neue Mitglieder sehen gesamten Verlauf"; -"lng_profile_convert_feature2" = "— Nachrichten werden bei allen gelöscht"; -"lng_profile_convert_feature3" = "Administratoren können wichtige Nachrichten anpinnen"; +"lng_profile_convert_feature2" = "— Löschen gilt für die ganze Gruppe"; +"lng_profile_convert_feature3" = "— Admins können Nachrichten anheften"; "lng_profile_convert_feature4" = "— Gründer kann Gruppe öffentlich machen"; "lng_profile_convert_warning" = "{bold_start}Wichtig:{bold_end} Die Änderung in eine Supergruppe kann nicht rückgängig gemacht werden."; "lng_profile_convert_confirm" = "Ändern"; diff --git a/Telegram/Resources/langs/lang_es.strings b/Telegram/Resources/langs/lang_es.strings index 425522101..f3d2fc9e8 100644 --- a/Telegram/Resources/langs/lang_es.strings +++ b/Telegram/Resources/langs/lang_es.strings @@ -585,7 +585,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_profile_convert_about" = "En los supergrupos:"; "lng_profile_convert_feature1" = "— Los nuevos miembros ven todo el historial"; "lng_profile_convert_feature2" = "— Los mensajes son eliminados para todos"; -"lng_profile_convert_feature3" = "— Los administradores pueden anclar mensajes importantes"; +"lng_profile_convert_feature3" = "— Los administradores pueden anclar mensajes"; "lng_profile_convert_feature4" = "— El creador puede generar un enlace público"; "lng_profile_convert_warning" = "{bold_start}Importante:{bold_end} Esta acción no se puede deshacer"; "lng_profile_convert_confirm" = "Convertir"; diff --git a/Telegram/Resources/langs/lang_ko.strings b/Telegram/Resources/langs/lang_ko.strings index 08ea56633..6dd7525c9 100644 --- a/Telegram/Resources/langs/lang_ko.strings +++ b/Telegram/Resources/langs/lang_ko.strings @@ -728,7 +728,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_willbe_history" = "대화하실 방을 선택해주세요."; "lng_message_with_from" = "[c]{from}:[/c] {message}"; "lng_from_you" = "회원님"; -"lng_from_draft" = "임시"; +"lng_from_draft" = "임시저장"; "lng_bot_description" = "봇이 할 수 있는 일은 무엇일까요?"; "lng_unblock_button" = "차단해제"; "lng_channel_join" = "채널 입장"; diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 3329d322d..ca250acf7 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,49,6 - PRODUCTVERSION 0,9,49,6 + FILEVERSION 0,9,50,0 + PRODUCTVERSION 0,9,50,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.9.49.6" + VALUE "FileVersion", "0.9.50.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.49.6" + VALUE "ProductVersion", "0.9.50.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 1cf966edf..9d4b225ae 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,49,6 - PRODUCTVERSION 0,9,49,6 + FILEVERSION 0,9,50,0 + PRODUCTVERSION 0,9,50,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Updater" - VALUE "FileVersion", "0.9.49.6" + VALUE "FileVersion", "0.9.50.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.49.6" + VALUE "ProductVersion", "0.9.50.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 9049cd0c1..68d185d5a 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,9 +22,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "core/basic_types.h" -#define BETA_VERSION_MACRO (9049006ULL) +#define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 9049; -constexpr str_const AppVersionStr = "0.9.49"; +constexpr int AppVersion = 9050; +constexpr str_const AppVersionStr = "0.9.50"; constexpr bool AppAlphaVersion = false; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index fc4e8a3f2..89210aa00 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -2282,7 +2282,7 @@ SDKROOT = macosx; SYMROOT = ./../Mac; TDESKTOP_MAJOR_VERSION = 0.9; - TDESKTOP_VERSION = 0.9.49; + TDESKTOP_VERSION = 0.9.50; ZLIB_PATH = /usr/local; }; name = Release; @@ -2423,7 +2423,7 @@ SDKROOT = macosx; SYMROOT = ./../Mac; TDESKTOP_MAJOR_VERSION = 0.9; - TDESKTOP_VERSION = 0.9.49; + TDESKTOP_VERSION = 0.9.50; ZLIB_PATH = /usr/local; }; name = Debug; diff --git a/Telegram/build/version b/Telegram/build/version index c1b8ac8da..8fed102c5 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 9049 +AppVersion 9050 AppVersionStrMajor 0.9 -AppVersionStrSmall 0.9.49 -AppVersionStr 0.9.49 +AppVersionStrSmall 0.9.50 +AppVersionStr 0.9.50 AlphaChannel 0 -BetaVersion 9049006 +BetaVersion 0