mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2026-07-25 06:54:43 +00:00
Merge tag 'v6.7.8' into dev
# Conflicts: # .github/workflows/mac_packaged.yml # Telegram/Resources/winrc/Telegram.rc # Telegram/Resources/winrc/Updater.rc # Telegram/SourceFiles/api/api_chat_invite.h # Telegram/SourceFiles/boxes/language_box.cpp # Telegram/SourceFiles/boxes/send_files_box.h # Telegram/SourceFiles/boxes/sticker_set_box.cpp # Telegram/SourceFiles/core/version.h # Telegram/SourceFiles/data/data_types.h # Telegram/SourceFiles/history/history_item.cpp # Telegram/SourceFiles/history/history_widget.cpp # Telegram/SourceFiles/history/view/history_view_chat_section.cpp # Telegram/SourceFiles/history/view/history_view_message.cpp # Telegram/SourceFiles/history/view/history_view_translate_bar.cpp # Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp # Telegram/SourceFiles/platform/mac/main_window_mac.mm # Telegram/SourceFiles/settings/sections/settings_main.cpp # Telegram/lib_ui # snap/snapcraft.yaml
This commit is contained in:
@@ -339,6 +339,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
"lng_proxy_invalid" = "The proxy link is invalid.";
|
||||
"lng_proxy_unsupported" = "Your Telegram Desktop version doesn't support this proxy type or the proxy link is invalid. Please update Telegram Desktop to the latest version.";
|
||||
"lng_proxy_incorrect_secret" = "This proxy link uses invalid **secret** parameter. Please contact the proxy provider and ask him to update MTProxy source code and configure it with a correct **secret** value. Then let him provide a new link.";
|
||||
"lng_proxy_check_ip_warning_title" = "Warning";
|
||||
"lng_proxy_check_ip_warning" = "This will expose your IP address to the admin of the proxy server.";
|
||||
"lng_proxy_check_ip_proceed" = "Proceed";
|
||||
|
||||
"lng_edit_deleted" = "This message was deleted";
|
||||
"lng_edit_limit_reached#one" = "You've reached the message text limit. Please make the text shorter by {count} character.";
|
||||
@@ -1236,6 +1239,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
"lng_proxy_use_system_settings" = "Use system proxy settings";
|
||||
"lng_proxy_use_custom" = "Use custom proxy";
|
||||
"lng_proxy_use_for_calls" = "Use proxy for calls";
|
||||
"lng_proxy_auto_switch" = "Auto-switch proxies";
|
||||
"lng_proxy_auto_switch_about" = "You can choose how quickly the app should auto-connect to the nearest active proxy if the current one stops working.";
|
||||
"lng_proxy_auto_switch_timeout#one" = "{count} s";
|
||||
"lng_proxy_auto_switch_timeout#other" = "{count} s";
|
||||
"lng_proxy_about" = "Proxy servers may be helpful in accessing Telegram if there is no connection in a specific region.";
|
||||
"lng_proxy_add" = "Add proxy";
|
||||
"lng_proxy_share" = "Share";
|
||||
@@ -1388,6 +1395,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
"lng_blocked_list_confirm_title" = "Block {name}";
|
||||
"lng_blocked_list_confirm_text" = "Do you want to block {name} from messaging and calling you on Telegram?";
|
||||
"lng_blocked_list_confirm_clear" = "Delete this chat";
|
||||
"lng_blocked_list_confirm_reply" = "Delete this reply";
|
||||
"lng_blocked_list_confirm_reply_all" = "Delete all replies from {user}";
|
||||
"lng_blocked_list_confirm_ok" = "Block";
|
||||
"lng_blocked_list_empty_title" = "No blocked users";
|
||||
"lng_blocked_list_empty_description" = "You haven't blocked anyone yet.";
|
||||
@@ -4496,16 +4505,51 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
"lng_stickers_context_edit_name" = "Edit name";
|
||||
"lng_stickers_context_delete" = "Delete sticker";
|
||||
"lng_stickers_context_delete_sure" = "Are you sure you want to delete the sticker from your sticker set?";
|
||||
"lng_emoji_context_delete" = "Delete emoji";
|
||||
"lng_emoji_context_delete_sure" = "Are you sure you want to delete this emoji from your set?";
|
||||
"lng_stickers_context_delete_pack" = "Delete Pack";
|
||||
"lng_stickers_context_delete_pack_everyone" = "Delete for Everyone";
|
||||
"lng_stickers_context_delete_pack_self" = "Delete for Myself";
|
||||
"lng_stickers_delete_pack_sure" = "Are you sure you want to delete this sticker set for everyone? This cannot be undone.";
|
||||
"lng_stickers_bot_more_options" = "Check the {bot} bot for more options";
|
||||
"lng_stickers_box_edit_name_title" = "Edit Sticker Set Name";
|
||||
"lng_stickers_box_edit_name_about" = "Choose a name for your set.";
|
||||
"lng_stickers_creator_badge" = "edit";
|
||||
|
||||
"lng_stickers_create_new" = "Create a New Sticker";
|
||||
"lng_stickers_add_existing" = "Add an Existing Sticker";
|
||||
"lng_stickers_add_to_set" = "Add to Sticker Set";
|
||||
"lng_stickers_already_in_set" = "This Sticker is already in the Set.";
|
||||
"lng_stickers_set_is_full" = "This Sticker Set is full.";
|
||||
"lng_emoji_add_to_set" = "Add to Emoji Set";
|
||||
"lng_emoji_already_in_set" = "This Emoji is already in the Set.";
|
||||
"lng_emoji_set_is_full" = "This Emoji Set is full.";
|
||||
"lng_emoji_added" = "Emoji added.";
|
||||
"lng_stickers_pack_choose_emoji_title" = "Choose Emoji";
|
||||
"lng_stickers_pack_choose_emoji_about" = "Pick an emoji that corresponds to this sticker.";
|
||||
"lng_stickers_pick_existing_title" = "Choose Sticker";
|
||||
"lng_stickers_pick_existing_about" = "Pick a sticker from your library to add it to this set.";
|
||||
"lng_stickers_pick_existing_empty" = "You don't have any stickers yet.";
|
||||
"lng_stickers_create_image_title" = "New Sticker";
|
||||
"lng_stickers_create_image_about" = "Choose an image to add as a sticker.";
|
||||
"lng_stickers_create_choose_image" = "Choose Image";
|
||||
"lng_stickers_create_image_filter" = "Images";
|
||||
"lng_stickers_create_open_failed" = "Could not load image.";
|
||||
"lng_stickers_create_too_small" = "The image must be at least {size} pixels on each side.";
|
||||
"lng_stickers_create_choose_emoji" = "Choose an emoji that corresponds to your sticker:";
|
||||
"lng_stickers_create_emoji_about" = "Choose emojis that match your sticker";
|
||||
"lng_stickers_create_emoji_required" = "Please choose an emoji.";
|
||||
"lng_stickers_create_uploading" = "Uploading sticker…";
|
||||
"lng_stickers_create_upload_failed" = "Sticker upload failed. Please try again.";
|
||||
"lng_stickers_create_added" = "Sticker added.";
|
||||
|
||||
"lng_in_dlg_photo" = "Photo";
|
||||
"lng_in_dlg_album" = "Album";
|
||||
"lng_in_dlg_video" = "Video";
|
||||
"lng_in_dlg_audio_file" = "Audio file";
|
||||
"lng_in_dlg_contact" = "Contact";
|
||||
"lng_in_dlg_audio" = "Voice message";
|
||||
"lng_in_dlg_audio_unread" = "{emoji} Voice message";
|
||||
"lng_in_dlg_video_message" = "Video message";
|
||||
"lng_in_dlg_voice_message_ttl" = "One-time Voice Message";
|
||||
"lng_in_dlg_video_message_ttl" = "One-time Video Message";
|
||||
@@ -5120,6 +5164,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
"lng_context_animated_reactions" = "Reactions contain emoji from **{name} pack**.";
|
||||
"lng_context_animated_reactions_many#one" = "Reactions contain emoji from **{count} pack**.";
|
||||
"lng_context_animated_reactions_many#other" = "Reactions contain emoji from **{count} packs**.";
|
||||
"lng_context_animated_poll_option" = "This option contains emoji from **{name} pack**.";
|
||||
"lng_context_animated_poll_option_many#one" = "This option contains emoji from **{count} pack**.";
|
||||
"lng_context_animated_poll_option_many#other" = "This option contains emoji from **{count} packs**.";
|
||||
|
||||
"lng_context_noforwards_info_channel" = "Copying and forwarding is not allowed in this channel.";
|
||||
"lng_context_noforwards_info_group" = "Copying and forwarding is not allowed in this group.";
|
||||
@@ -5597,6 +5644,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
"lng_mediaview_playback_speed" = "Playback speed: {speed}";
|
||||
"lng_mediaview_rotate_video" = "Rotate video";
|
||||
"lng_mediaview_quality_auto" = "Auto";
|
||||
"lng_mediaview_quality_original" = "Original ({quality}p)";
|
||||
|
||||
"lng_theme_preview_title" = "Theme Preview";
|
||||
"lng_theme_preview_generating" = "Generating color theme preview...";
|
||||
@@ -7170,10 +7218,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
"lng_photo_editor_menu_flip" = "Flip";
|
||||
"lng_photo_editor_menu_duplicate" = "Duplicate";
|
||||
|
||||
"lng_photo_editor_text_style_plain" = "Plain";
|
||||
"lng_photo_editor_text_style_framed" = "Framed";
|
||||
"lng_photo_editor_text_style_semi_transparent" = "Semi-Transparent";
|
||||
|
||||
"lng_photo_editor_crop_original" = "Original";
|
||||
"lng_photo_editor_crop_square" = "Square";
|
||||
"lng_photo_editor_crop_free" = "Free";
|
||||
|
||||
"lng_photo_editor_corners_about" = "Choose how rounded the sticker corners should look.";
|
||||
"lng_photo_editor_corners_large" = "Large";
|
||||
"lng_photo_editor_corners_medium" = "Medium";
|
||||
"lng_photo_editor_corners_small" = "Small";
|
||||
"lng_photo_editor_corners_none" = "None";
|
||||
|
||||
"lng_voice_speed_slow" = "Slow";
|
||||
"lng_voice_speed_normal" = "Normal";
|
||||
"lng_voice_speed_medium" = "Medium";
|
||||
@@ -7838,6 +7896,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
"lng_ai_compose_apply_style" = "Apply Style";
|
||||
"lng_ai_compose_style_tooltip" = "Choose Style";
|
||||
|
||||
"lng_send_as_file_tooltip" = "Send text as a file.";
|
||||
|
||||
// Wnd specific
|
||||
|
||||
"lng_wnd_choose_program_menu" = "Choose Default Program...";
|
||||
@@ -7904,6 +7964,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
|
||||
"lng_mac_hold_to_quit" = "Hold {text} to Quit";
|
||||
|
||||
"lng_sr_country_column_name" = "Country name";
|
||||
"lng_sr_languages_column_native" = "Native name";
|
||||
"lng_sr_languages_column_name" = "Language name";
|
||||
|
||||
// Keys finished
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user