diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index f15b237683..dfff5dd622 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -6322,38 +6322,41 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ayu_DontSendOnlinePackets" = "Don't Send Online"; "ayu_DontSendUploadProgress" = "Don't Send Typing"; "ayu_SendOfflinePacketAfterOnline" = "Go Offline Automatically"; -"ayu_GhostModeOptionLongTapDescription" = "Long tap on any option to prevent it from changing on toggling Ghost Mode."; +"ayu_GhostModeOptionLongTapDescription" = "Long-press any option to prevent it from changing when toggling Ghost Mode."; "ayu_MarkReadAfterAction" = "Read on Interact"; -"ayu_MarkReadAfterActionDescription" = "Automatically reads message when you send a new one or tap a reaction."; +"ayu_MarkReadAfterActionDescription" = "Automatically marks a message as read when you send a new one or tap a reaction."; "ayu_MarkReadAfterSend" = "Send"; "ayu_MarkReadAfterReaction" = "Reaction"; "ayu_MarkReadAfterPoll" = "Poll"; "ayu_UseScheduledMessages" = "Schedule Messages"; -"ayu_UseScheduledMessagesDescription" = "Automatically schedules outgoing messages for ~12 seconds, and more for media. Sending messages this way, you won't appear online.\nDon't use on bad networks."; +"ayu_UseScheduledMessagesDescription" = "Automatically schedules outgoing messages to send after ~12 seconds (longer for media). Using this feature, you won't appear online.\nAvoid using on unreliable networks."; "ayu_SendWithoutSoundByDefault" = "Send without Sound"; -"ayu_SendWithoutSoundByDefaultDescription" = "Automatically sends outgoing messages without sound."; +"ayu_SendWithoutSoundByDefaultDescription" = "Sends outgoing messages without sound by default."; "ayu_SuggestGhostModeBeforeViewingStory" = "Story Ghost Mode Alert"; -"ayu_SuggestGhostModeBeforeViewingStoryDescription" = "Shows an alert before opening the story, suggesting to turn on Ghost Mode."; +"ayu_SuggestGhostModeBeforeViewingStoryDescription" = "Displays an alert before opening a story, suggesting you enable Ghost Mode."; "ayu_SpyEssentialsHeader" = "Spy essentials"; "ayu_SaveDeletedMessages" = "Save Deleted Messages"; "ayu_SaveMessagesHistory" = "Save Edits History"; -"ayu_MessageSavingActionBarHeader" = "Message Saving Preferences"; -"ayu_MessageSavingSaveMedia" = "Save Media"; -"ayu_MessageSavingSaveMediaHint" = "Click for More"; -"ayu_MessageSavingSaveMediaInPrivateChats" = "…in private chats"; -"ayu_MessageSavingSaveMediaInPublicChannels" = "…in public channels"; -"ayu_MessageSavingSaveMediaInPrivateChannels" = "…in private channels"; -"ayu_MessageSavingSaveMediaInPublicGroups" = "…in public groups"; -"ayu_MessageSavingSaveMediaInPrivateGroups" = "…in private groups"; +"ayu_MessageSavingSaveMedia" = "Save Attachments"; +"ayu_MessageSavingSaveMediaHint" = "Configure chats & limits"; +"ayu_MessageSavingSaveMediaInPrivateChats" = "Private Chats"; +"ayu_MessageSavingSaveMediaInPublicChannels" = "Public Channels"; +"ayu_MessageSavingSaveMediaInPrivateChannels" = "Private Channels"; +"ayu_MessageSavingSaveMediaInPublicGroups" = "Public Groups"; +"ayu_MessageSavingSaveMediaInPrivateGroups" = "Private Groups"; +"ayu_MessageSavingSaveMediaHintPopup" = "Make sure it's configured to your needs."; "ayu_MaximumMediaSizeCellular" = "Media size limit (cellular data)"; "ayu_MaximumMediaSizeWiFi" = "Media size limit (WiFi)"; "ayu_MessageSavingOtherHeader" = "Other"; -"ayu_MessageSavingSaveReactions" = "Save reactions"; "ayu_MessageSavingSaveForBots" = "Save in Bot Dialogs"; "ayu_MessageSavingSavePath" = "Attachments Folder"; "ayu_MessageSavingSavePathTitle" = "Choose folder"; "ayu_SpySaveReadMarks" = "Save Read Date"; -"ayu_SpySaveReadMarksDescription" = "Locally saves data about reading messages. This will be shown if Telegram does not provide read date."; +"ayu_SpySaveReadMarksDescription" = "Locally saves data about reading messages. This will be shown if Telegram does not provide a read date."; +"ayu_SpySaveLocalOnline" = "Save Last Seen Date"; +"ayu_SpySaveLocalOnlineDescription" = "Saves the last online date for users with hidden online status based on their actions. You'll be able to see **very approximately** when they were last online."; +"ayu_ExportDatabaseButton" = "Export Database"; +"ayu_ImportDatabaseButton" = "Import Database"; "ayu_QoLTogglesHeader" = "Useful features"; "ayu_KeepAliveService" = "AyuGram Push Service"; "ayu_DisableAds" = "Disable Ads"; @@ -6383,7 +6386,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ayu_SettingsShowID_Hide" = "Hide"; "ayu_SettingsShowMessageShot" = "Show Message Shot"; "ayu_SettingsRecentStickersCount" = "Recent Stickers Count"; -"ayu_SettingsCustomizationHint" = "After making changes to the \"Customization\" section, you must restart the application."; +"ayu_SettingsCustomizationHint" = "You must restart the application after making changes in the \"Customization\" section."; "ayu_SettingsContextMenuTitle" = "Choose when to show the item"; "ayu_SettingsContextMenuDescription" = "Extended menu items will be displayed if you hold CTRL or SHIFT while right-clicking on the message."; "ayu_SettingsContextMenuItemHidden" = "Hidden"; @@ -6407,7 +6410,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ayu_SettingsIncreaseWebviewHeight" = "Increase Content Height"; "ayu_SettingsIncreaseWebviewWidth" = "Increase Content Width"; "ayu_ExportDataTitle" = "Export AyuGram Database?"; -"ayu_ExportDataDescription" = "It will be exported to the public folder, to Saved Attachments."; +"ayu_ExportDataDescription" = "It will be exported to the public folder under Saved Attachments."; "ayu_ExportDataConfirm" = "Yes, export"; "ayu_ExportDataCancel" = "No, close window"; "ayu_ExportDataSuccess" = "Database exported successfully."; @@ -6485,11 +6488,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ayu_IconYaPlus" = "Yandex Plus"; "ayu_WALMode" = "Enable WAL mode"; "ayu_PushNotificationCount" = "FCM notifications received"; -"ayu_ClearAyuDatabase" = "Clear Messages Database"; -"ayu_ClearAyuAttachmentsNotification" = "AyuGram attachments folder cleared"; -"ayu_ClearTelegramDatabase" = "Clear Telegram Database"; -"ayu_ClearAyuDatabaseNotification" = "AyuGram database cleared"; -"ayu_ClearAyuAttachments" = "Clear Attachments Folder"; +"ayu_AyuAttachments" = "AyuGram Attachments Folder"; +"ayu_AyuDatabase" = "AyuGram Messages Database"; +"ayu_TelegramCacheDatabase" = "Telegram Messages Database"; "ayu_ConfirmationsTitle" = "Confirmations"; "ayu_StickerConfirmation" = "For Stickers"; "ayu_GIFConfirmation" = "For GIFs"; @@ -6557,13 +6558,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ayu_SuggestGhostModeStoryText" = "Do you want to enable **Ghost Mode** before viewing the story?"; "ayu_SuggestGhostModeStoryActionTextYes" = "Yes"; "ayu_SuggestGhostModeStoryActionTextNo" = "No"; -"ayu_ClearAttachmentsFolderWarning" = "Are you sure you want to clear the **attachments folder**? This action cannot be undone."; -"ayu_ClearMessagesDatabaseWarning" = "Are you sure you want to clear **all deleted & edited messages**? This action cannot be undone."; -"ayu_ClearTelegramDatabaseWarning" = "Are you sure you want to clear the **Telegram internal database**? This action cannot be undone."; "ayu_FirstLaunchAlert" = "AyuGram is **free** software and should only be obtained from our **official sources**. You assume **full responsibility** for using this application with your account."; -"ayu_LocalPremiumAlert" = "With local Telegram Premium you won't have increased limits and won't be able to send animated emojis. Other users won't see your premium emoji and quote color."; +"ayu_LocalPremiumAlert" = "With local Telegram Premium, you won't get increased limits or be able to send animated emojis. Other users won't see your premium emoji and quote color."; "ayu_ExteraChatsAlert" = "Don't ask questions related to **AyuGram** in **exteraGram** chats. If you need help, ask in the official **AyuGram** chat."; -"ayu_HideNextViewsDescriptionAyu" = "Hide my views forever, until Ghost Mode disabled."; +"ayu_HideNextViewsDescriptionAyu" = "Hide my views forever, until Ghost Mode is disabled."; "ayu_EnableGhostModeStories" = "Enable Ghost Mode"; "ayu_GhostModeIsActive" = "Ghost Mode is Active"; "ayu_SimpleQuotesAndReplies" = "Disable Colorful Replies"; @@ -6589,6 +6587,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ayu_MessageShotShowReactions" = "Show reactions"; "ayu_MessageShotShowColorfulReplies" = "Show colorful replies"; "ayu_SendAsSticker" = "Send as Sticker"; +"ayu_SendWithSound" = "Send With Sound"; "ayu_AyuForwardStatusPreparing" = "Forwarding messages"; "ayu_AyuForwardStatusLoadingMedia" = "Loading media"; "ayu_AyuForwardStatusForwarding" = "Forwarding messages"; @@ -6607,11 +6606,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ayu_LikelyOfflineStatus" = "offline ?"; "ayu_GhostModeShortcut" = "Enter with Ghost"; "ayu_SettingsShowMessageSeconds" = "Show Message Seconds"; +"ayu_ShowOnlyAddedEmojisAndStickers" = "Show Only Added Emojis & Stickers"; "ayu_ContextCopyID" = "Copy ID"; "ayu_IDCopiedToast" = "ID copied to clipboard."; "ayu_ContextHideMessage" = "Hide"; "ayu_ContextCopyCallbackData" = "Copy Callback Data"; "ayu_RegisterURLScheme" = "Register URL Scheme"; +"ayu_SessionTerminated" = "Session **{item}** was terminated. You may still browse cached messages."; "ayu_LocalPremiumNotice" = "You're using **local** Telegram Premium.\nIt **won't** give you any benefits.\n**Enjoy the star near your nickname!**"; "ayu_DeveloperPopup" = "**{item}** is a member of the **exteraGram** development team."; "ayu_SupporterPopup" = "**{item}** supported the development of **exteraGram** or **AyuGram** and received an exclusive badge."; @@ -6622,5 +6623,4 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ayu_IntroAbout" = "Welcome to the AyuGram Desktop.\nMake Telegram your own."; "ayu_AboutText1" = "ToS breaking Telegram client based on {api_link}."; "ayu_UpdateAyuGram" = "Update AyuGram"; -"ayu_UtilityRestartRequired" = "App will close in 5 seconds."; -"ayu_ShowOnlyAddedEmojisAndStickers" = "Show Only Added Emojis and Stickers"; +"ayu_UtilityRestartRequired" = "The app will close in 5 seconds."; diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp index 380272a247..b6cd54754c 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp @@ -767,25 +767,6 @@ void SetupQoLToggles(not_null container) { }, container->lifetime()); - AddButtonWithIcon( - container, - tr::ayu_ShowOnlyAddedEmojisAndStickers(), - st::settingsButtonNoIcon - )->toggleOn( - rpl::single(settings->showOnlyAddedEmojisAndStickers) - )->toggledValue( - ) | rpl::filter( - [=](bool enabled) - { - return (enabled != settings->showOnlyAddedEmojisAndStickers); - }) | start_with_next( - [=](bool enabled) - { - settings->set_showOnlyAddedEmojisAndStickers(enabled); - AyuSettings::save(); - }, - container->lifetime()); - std::vector checkboxes = { NestedEntry{ tr::ayu_CollapseSimilarChannels(tr::now), settings->collapseSimilarChannels, [=](bool enabled) @@ -828,6 +809,25 @@ void SetupQoLToggles(not_null container) { }, container->lifetime()); + AddButtonWithIcon( + container, + tr::ayu_ShowOnlyAddedEmojisAndStickers(), + st::settingsButtonNoIcon + )->toggleOn( + rpl::single(settings->showOnlyAddedEmojisAndStickers) + )->toggledValue( + ) | rpl::filter( + [=](bool enabled) + { + return (enabled != settings->showOnlyAddedEmojisAndStickers); + }) | start_with_next( + [=](bool enabled) + { + settings->set_showOnlyAddedEmojisAndStickers(enabled); + AyuSettings::save(); + }, + container->lifetime()); + AddButtonWithIcon( container, tr::ayu_LocalPremium(), diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp index f9e8e54c86..de43168a3a 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp @@ -58,6 +58,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL // AyuGram includes #include "ayu/ayu_settings.h" + namespace ChatHelpers { namespace { diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp index cd9693f84c..6c6a18e1b9 100644 --- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp +++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp @@ -57,6 +57,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL // AyuGram includes #include "ayu/ayu_settings.h" + namespace ChatHelpers { namespace {