From 59636ac0724b39427bdfdf934611b0ee982cbbbf Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 19 Mar 2017 00:14:23 +0300 Subject: [PATCH] Alpha 1.0.24: edit last seen and invite privacy. --- Telegram/Resources/langs/lang.strings | 8 ++++---- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/SourceFiles/messenger.cpp | 4 ++-- Telegram/build/version | 6 +++--- changelog.txt | 4 ++++ 8 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 569dcd888..d5ac61d11 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -406,7 +406,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org "lng_settings_blocked_users" = "Blocked users"; "lng_settings_last_seen_privacy" = "Last seen privacy"; -"lng_settings_groups_invite_privacy" = "Groups invite privacy"; +"lng_settings_groups_invite_privacy" = "Group invite settings"; "lng_settings_show_sessions" = "Show all sessions"; "lng_settings_reset" = "Terminate all other sessions"; "lng_settings_reset_sure" = "Are you sure you want to terminate\nall other sessions?"; @@ -446,10 +446,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org "lng_edit_privacy_nobody" = "Nobody"; "lng_edit_privacy_exceptions" = "Add exceptions"; -"lng_edit_privacy_lastseen_title" = "Last Seen time privacy"; +"lng_edit_privacy_lastseen_title" = "Last seen privacy"; "lng_edit_privacy_lastseen_everyone" = "Anyone can see my Last Seen time"; "lng_edit_privacy_lastseen_contacts" = "Only contacts can see my Last Seen time"; -"lng_edit_privacy_lastseen_nobody" = "No one can see my Last Seen time"; +"lng_edit_privacy_lastseen_nobody" = "Nobody can see my Last Seen time"; "lng_edit_privacy_lastseen_description" = "Important: you won't be able to see Last Seen times for people with whom you don't share your Last Seen time. Approximate last seen will be shown instead (recently, within a week, within a month)."; "lng_edit_privacy_lastseen_always" = "Always share with{count:| # user| # users}"; "lng_edit_privacy_lastseen_never" = "Never share with{count:| # user| # users}"; @@ -457,7 +457,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org "lng_edit_privacy_lastseen_always_title" = "Always share with"; "lng_edit_privacy_lastseen_never_title" = "Never share with"; -"lng_edit_privacy_groups_title" = "Group invite privacy"; +"lng_edit_privacy_groups_title" = "Group invite settings"; "lng_edit_privacy_groups_everyone" = "Anyone can invite me to groups and channels"; "lng_edit_privacy_groups_contacts" = "Only contacts can invite me to groups and channels"; "lng_edit_privacy_groups_description" = "You can restrict who can add you to groups and channels with granular precision."; diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index ceeb41af5..1db769eab 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.0.24.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index eae8e29dd..d7239c73c 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 1,0,23,0 - PRODUCTVERSION 1,0,23,0 + FILEVERSION 1,0,24,0 + PRODUCTVERSION 1,0,24,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -52,10 +52,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.0.23.0" + VALUE "FileVersion", "1.0.24.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.0.23.0" + VALUE "ProductVersion", "1.0.24.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 99402fe3e..1e36381d8 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 1,0,23,0 - PRODUCTVERSION 1,0,23,0 + FILEVERSION 1,0,24,0 + PRODUCTVERSION 1,0,24,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "1.0.23.0" + VALUE "FileVersion", "1.0.24.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.0.23.0" + VALUE "ProductVersion", "1.0.24.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 922b4a826..9347c5c14 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 1000023; -constexpr str_const AppVersionStr = "1.0.23"; +constexpr int AppVersion = 1000024; +constexpr str_const AppVersionStr = "1.0.24"; constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/SourceFiles/messenger.cpp b/Telegram/SourceFiles/messenger.cpp index bdf47dc59..d9ecd025a 100644 --- a/Telegram/SourceFiles/messenger.cpp +++ b/Telegram/SourceFiles/messenger.cpp @@ -637,8 +637,8 @@ void Messenger::checkMapVersion() { if (Local::oldMapVersion() < AppVersion) { if (Local::oldMapVersion()) { QString versionFeatures; - if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 1000023) { - versionFeatures = QString::fromUtf8("\xE2\x80\x94 Edit list of blocked users in Settings."); + if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 1000024) { + versionFeatures = QString::fromUtf8("\xE2\x80\x94 Added Last Seen and Group Invite privacy settings."); } else if (!(cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 1000012) { versionFeatures = langNewVersionText(); } else { diff --git a/Telegram/build/version b/Telegram/build/version index e38048383..e7f729f33 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1000023 +AppVersion 1000024 AppVersionStrMajor 1.0 -AppVersionStrSmall 1.0.23 -AppVersionStr 1.0.23 +AppVersionStrSmall 1.0.24 +AppVersionStr 1.0.24 AlphaChannel 1 BetaVersion 0 diff --git a/changelog.txt b/changelog.txt index 4c78da3e4..18d16e7fe 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +1.0.24 alpha (19.03.17) + +- Added Last Seen and Group Invite privacy settings. + 1.0.23 alpha (15.03.17) - Edit list of blocked users in Settings.