diff --git a/Telegram/Resources/lang.strings b/Telegram/Resources/lang.strings index 0804ba63be..4d0f0cce7a 100644 --- a/Telegram/Resources/lang.strings +++ b/Telegram/Resources/lang.strings @@ -488,8 +488,9 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org "lng_report_spam" = "Report Spam"; "lng_report_spam_hide" = "Hide"; "lng_report_spam_thanks" = "Thank you for your report!"; -"lng_cant_send_to_not_contact" = "Sorry, you can't send message to a user\nwho didn't add you to contacts right now."; -"lng_cant_invite_not_contact" = "Sorry, you can't invite a user who didn't\nadd you to contacts to groups right now."; +"lng_cant_send_to_not_contact" = "Sorry, you can only send messages to\nmutual contacts at the moment. {more_info}"; +"lng_cant_invite_not_contact" = "Sorry, you can only add mutual contacts\nto groups at the moment. {more_info}"; +"lng_cant_more_info" = "More info »"; "lng_send_button" = "Send"; "lng_message_ph" = "Write a message.."; @@ -654,7 +655,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org "lng_new_version_wrap" = "Telegram Desktop was updated to version {version}\n\n{changes}\n\nFull version history is available here:\n{link}"; "lng_new_version_minor" = "— Bug fixes and other minor improvements"; -"lng_new_version_text" = "— Include muted chats in unread count in Settings\n— Shared links overview and search in shared media\n— Preview when sending links to GIF animations and PDF files"; +"lng_new_version_text" = "— Spam report buttons in new chats\n— Other fixes and improvements\n— OS X 10.8 notifications fixed"; "lng_menu_insert_unicode" = "Insert Unicode control character"; diff --git a/Telegram/SourceFiles/boxes/contactsbox.cpp b/Telegram/SourceFiles/boxes/contactsbox.cpp index 424b10b005..eab47a3dcf 100644 --- a/Telegram/SourceFiles/boxes/contactsbox.cpp +++ b/Telegram/SourceFiles/boxes/contactsbox.cpp @@ -1293,7 +1293,7 @@ bool CreateGroupBox::failed(const RPCError &error) { return true; } else if (error.type() == "PEER_FLOOD") { emit closed(); - App::wnd()->showLayer(new ConfirmBox(lang(lng_cant_invite_not_contact), true)); + App::wnd()->showLayer(new ConfirmBox(lng_cant_invite_not_contact(lt_more_info, QString()), true)); return true; } return false; diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index da7d92fb95..5e4bfd66de 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -823,7 +823,7 @@ bool MainWidget::addParticipantFail(UserData *user, const RPCError &error) { } else if (error.type() == "USER_ALREADY_PARTICIPANT" && user->botInfo) { text = lang(lng_bot_already_in_group); } else if (error.type() == "PEER_FLOOD") { - text = lang(lng_cant_invite_not_contact); + text = lng_cant_invite_not_contact(lt_more_info, QString()); } App::wnd()->showLayer(new ConfirmBox(text, true)); return false; @@ -900,7 +900,7 @@ bool MainWidget::sendMessageFail(const RPCError &error) { if (mtpIsFlood(error)) return false; if (error.type() == qsl("PEER_FLOOD")) { - App::wnd()->showLayer(new ConfirmBox(lang(lng_cant_send_to_not_contact), true)); + App::wnd()->showLayer(new ConfirmBox(lng_cant_send_to_not_contact(lt_more_info, QString()), true)); return true; } return false; diff --git a/Telegram/_openal_patch.diff b/Telegram/_openal_patch.diff index 951e0e1c0d..5eda24496a 100644 --- a/Telegram/_openal_patch.diff +++ b/Telegram/_openal_patch.diff @@ -12,7 +12,7 @@ index cfd12d8..8a6f9fb 100644 return ALC_FALSE; } diff --git a/Alc/backends/winmm.c b/Alc/backends/winmm.c -index 03805ab..77212c2 100644 +index 03805ab..5035a36 100644 --- a/Alc/backends/winmm.c +++ b/Alc/backends/winmm.c @@ -220,7 +220,7 @@ FORCE_ALIGN static int ALCwinmmPlayback_mixerProc(void *arg) @@ -20,7 +20,7 @@ index 03805ab..77212c2 100644 althrd_setname(althrd_current(), MIXER_THREAD_NAME); - while(GetMessage(&msg, NULL, 0, 0)) -+ if (!self->killNow) while (GetMessage(&msg, NULL, 0, 0)) ++ if (!self->killNow) while(GetMessage(&msg, NULL, 0, 0)) { if(msg.message != WOM_DONE) continue; @@ -29,7 +29,7 @@ index 03805ab..77212c2 100644 althrd_setname(althrd_current(), RECORD_THREAD_NAME); - while(GetMessage(&msg, NULL, 0, 0)) -+ if (!self->killNow) while(GetMessage(&msg, NULL, 0, 0)) ++ if (!self->killNow) while (GetMessage(&msg, NULL, 0, 0)) { if(msg.message != WIM_DATA) continue;