diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp index 2ffb611fd..43bac1d6e 100644 --- a/Telegram/SourceFiles/boxes/about_box.cpp +++ b/Telegram/SourceFiles/boxes/about_box.cpp @@ -27,12 +27,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace { rpl::producer Text1() { - return rpl::single( - qsl("Unofficial experimental fork of ") + - Ui::Text::Link( - "Telegram Desktop", - "https://github.com/telegramdesktop/tdesktop") + - qsl(".")); + return tr::lng_about_text1( + lt_api_link, + tr::lng_about_text1_api( + ) | Ui::Text::ToLink("https://core.telegram.org/api"), + Ui::Text::WithEntities); } rpl::producer Text2() { @@ -40,25 +39,19 @@ rpl::producer Text2() { lt_gpl_link, rpl::single(Ui::Text::Link( "GNU GPL", - "https://github.com/kotatogram/kotatogram-desktop/blob/master/LICENSE")), + "https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE")), lt_github_link, rpl::single(Ui::Text::Link( "GitHub", - "https://github.com/kotatogram/kotatogram-desktop")), + "https://github.com/telegramdesktop/tdesktop")), Ui::Text::WithEntities); } rpl::producer Text3() { - return rpl::single( - qsl("Visit ") + - Ui::Text::Link( - "Telegram FAQ", - telegramFaqLink()) + - qsl(" or ") + - Ui::Text::Link( - "Kotatogram channel", - telegramFaqLink()) + - qsl(" for more info.")); + return tr::lng_about_text3( + lt_faq_link, + tr::lng_about_text3_faq() | Ui::Text::ToLink(telegramFaqLink()), + Ui::Text::WithEntities); } } // namespace diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h index c621bc9c5..bd28252e7 100644 --- a/Telegram/SourceFiles/history/history_widget.h +++ b/Telegram/SourceFiles/history/history_widget.h @@ -311,7 +311,7 @@ public slots: private slots: void onHashtagOrBotCommandInsert(QString str, FieldAutocomplete::ChooseMethod method); - void onMentionInsert(UserData *user); + void onMentionInsert(UserData *user, FieldAutocomplete::ChooseMethod method); void onInlineBotCancel(); void onMembersDropdownShow(); diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp index ef433d884..e90d560cd 100644 --- a/Telegram/SourceFiles/window/window_main_menu.cpp +++ b/Telegram/SourceFiles/window/window_main_menu.cpp @@ -202,7 +202,7 @@ MainMenu::MainMenu( refreshBackground(); _telegram->setMarkedText(Ui::Text::Link( - qsl("kotatogram Desktop"), + qsl("Kotatogram Desktop"), qsl("https://t.me/kotatogram"))); _telegram->setLinksTrusted(); _version->setRichText(textcmdLink(1, tr::lng_settings_current_version(tr::now, lt_version, currentVersionText())) + QChar(' ') + QChar(8211) + QChar(' ') + textcmdLink(2, tr::lng_menu_about(tr::now)));