diff --git a/Telegram/Resources/lang.strings b/Telegram/Resources/lang.strings index 9bfdde0a14db55..4c295b562a459d 100644 --- a/Telegram/Resources/lang.strings +++ b/Telegram/Resources/lang.strings @@ -487,6 +487,9 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org "lng_action_add_user" = "{from} added {user}"; "lng_action_add_user_and_user" = "{from} added {user} and {second_user}"; "lng_action_add_users" = "{from} added {user} and {count:_not_used|# more member|# more members}"; +"lng_action_add_users_many" = "{from} added {users}"; +"lng_action_add_users_and_one" = "{accumulated}, {user}"; +"lng_action_add_users_and_last" = "{accumulated} and {user}"; "lng_action_add_you" = "{from} added you to this channel"; "lng_action_you_joined" = "You joined this channel"; "lng_action_add_you_group" = "{from} added you to this group"; @@ -613,7 +616,6 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org "lng_bot_description" = "What can this bot do?"; "lng_unblock_button" = "Unblock"; "lng_channel_join" = "Join Channel"; -"lng_group_join" = "Join Group"; "lng_channel_mute" = "Mute"; "lng_channel_unmute" = "Unmute"; diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index ae9afd26a15fad..86ebda72370153 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -3289,7 +3289,7 @@ void HistoryWidget::showHistory(const PeerId &peerId, MsgId showAtMsgId, bool re _canSendMessages = canSendMessages(_peer); if (_peer && _peer->isChannel()) { _peer->asChannel()->updateFull(); - _joinChannel.setText(lang(_peer->isMegagroup() ? lng_group_join : lng_channel_join)); + _joinChannel.setText(lang(lng_channel_join)); } _unblockRequest = _reportSpamRequest = 0;