From 11bcf4605f7a15604f8154c7b1daceb83e5f2566 Mon Sep 17 00:00:00 2001 From: Dart Raiden Date: Fri, 1 Apr 2016 21:07:06 +0000 Subject: unificate reconnect warnings (as in Jabber) git-svn-id: http://svn.miranda-ng.org/main/trunk@16571 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/res/aim.rc | 2 +- protocols/Gadu-Gadu/res/resource.rc | 2 +- protocols/ICQCorp/res/resource.rc | 2 +- protocols/IcqOscarJ/res/resources.rc | 2 +- protocols/MSN/src/msn_opts.cpp | 4 ++-- protocols/Twitter/res/twitter.rc | 2 +- protocols/Yahoo/src/options.cpp | 4 ++-- protocols/Yahoo/src/proto.cpp | 2 +- src/mir_app/res/resource.rc | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/protocols/AimOscar/res/aim.rc b/protocols/AimOscar/res/aim.rc index 58175d02fb..af3f07a46c 100755 --- a/protocols/AimOscar/res/aim.rc +++ b/protocols/AimOscar/res/aim.rc @@ -77,7 +77,7 @@ BEGIN CONTROL "Instant Idle on Login",IDC_II,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,18,131,15 CONTROL "Force Proxy File Transfers",IDC_FP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,31,130,11 CONTROL "Masquerade as a Sidekick/Hiptop User",IDC_HF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,42,135,13 - CTEXT "*Aim must be reconnected for some option to take effect",IDC_MASQ,171,169,115,28,NOT WS_VISIBLE + CTEXT "* Some changes will take effect the next time you connect to the AIM network",IDC_MASQ,171,169,115,28,NOT WS_VISIBLE GROUPBOX "Connection",IDC_STATIC,154,89,142,71 EDITTEXT IDC_PN,207,119,37,13,ES_AUTOHSCROLL LTEXT "Port:",IDC_STATIC,158,121,44,12 diff --git a/protocols/Gadu-Gadu/res/resource.rc b/protocols/Gadu-Gadu/res/resource.rc index 750a05dd52..5aca61eaf6 100644 --- a/protocols/Gadu-Gadu/res/resource.rc +++ b/protocols/Gadu-Gadu/res/resource.rc @@ -69,7 +69,7 @@ BEGIN COMBOBOX IDC_IMGMETHOD,190,133,104,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Show links from unknown contacts",IDC_SHOWLINKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,150,284,10 CONTROL "Enable avatars",IDC_ENABLEAVATARS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,165,284,10 - CTEXT "You will need to reconnect for the changes you have made on this page to take effect.",IDC_RELOADREQD,10,186,284,8,NOT WS_VISIBLE + CTEXT "These changes will take effect the next time you connect to the GG network.",IDC_RELOADREQD,10,186,284,8,NOT WS_VISIBLE END IDD_OPT_GG_CONFERENCE DIALOGEX 0, 0, 304, 75 diff --git a/protocols/ICQCorp/res/resource.rc b/protocols/ICQCorp/res/resource.rc index e1b198499f..61f0308b10 100644 --- a/protocols/ICQCorp/res/resource.rc +++ b/protocols/ICQCorp/res/resource.rc @@ -98,7 +98,7 @@ BEGIN RTEXT "Password:",IDC_STATIC,15,79,42,8 EDITTEXT IDC_OPT_PASSWORD,64,78,100,12,ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "You will need to reconnect to the ICQ network for the changes you have made on this page to take effect.", + LTEXT "These changes will take effect the next time you connect to the ICQ network.", IDC_OPT_RECONNECT,14,119,237,16,NOT WS_VISIBLE END diff --git a/protocols/IcqOscarJ/res/resources.rc b/protocols/IcqOscarJ/res/resources.rc index c6c45bd49f..63ef3dcfbd 100644 --- a/protocols/IcqOscarJ/res/resources.rc +++ b/protocols/IcqOscarJ/res/resources.rc @@ -121,7 +121,7 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,124,288,10 CONTROL "Load avatars automatically (like ICQ Lite)",IDC_AUTOLOADAVATARS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,138,288,10 - LTEXT "You will need to reconnect to the ICQ network for the changes you have made on this page to take effect.",IDC_RECONNECTREQD,10,172,290,16,NOT WS_VISIBLE + LTEXT "These changes will take effect the next time you connect to the ICQ network.",IDC_RECONNECTREQD,10,172,290,16,NOT WS_VISIBLE LTEXT "You cannot enable/disable the server-side contact list while you are connected to the ICQ network.",IDC_OFFLINETOENABLE,10,192,290,16,NOT WS_VISIBLE CTEXT "Note: The options marked with an asterisk have important side-effects or caveats that may not be initially apparent documented in the help.",IDC_STATIC,10,212,290,16 END diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp index 3b202a2d69..2adbe2c31f 100644 --- a/protocols/MSN/src/msn_opts.cpp +++ b/protocols/MSN/src/msn_opts.cpp @@ -280,8 +280,8 @@ LBL_Continue: if (reconnectRequired && proto->msnLoggedIn) MessageBox(hwndDlg, - TranslateT("The changes you have made require you to reconnect to the MSN Messenger network before they take effect"), - TranslateT("MSN Options"), MB_OK); + TranslateT("These changes will take effect the next time you connect to the MSN Messenger network."), + TranslateT("MSN options"), MB_OK); proto->LoadOptions(); return TRUE; diff --git a/protocols/Twitter/res/twitter.rc b/protocols/Twitter/res/twitter.rc index 1c05bc0676..c696bba542 100644 --- a/protocols/Twitter/res/twitter.rc +++ b/protocols/Twitter/res/twitter.rc @@ -89,7 +89,7 @@ BEGIN LTEXT "Once every",IDC_STATIC,72,60,40,8 EDITTEXT IDC_POLLRATE,113,58,30,14,ES_AUTOHSCROLL | ES_NUMBER LTEXT "sec",IDC_STATIC,148,60,19,8 - LTEXT "Please cycle your connection for these changes to take effect",IDC_RECONNECT,53,202,199,8,NOT WS_VISIBLE + LTEXT "These changes will take effect the next time you connect to the Twitter network.",IDC_RECONNECT,53,202,199,8,NOT WS_VISIBLE CONTROL "Treat tweets as messages",IDC_TWEET_MSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,76,139,10 END diff --git a/protocols/Yahoo/src/options.cpp b/protocols/Yahoo/src/options.cpp index 284dca5c0b..592f0a455e 100644 --- a/protocols/Yahoo/src/options.cpp +++ b/protocols/Yahoo/src/options.cpp @@ -137,7 +137,7 @@ static INT_PTR CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam, if (reconnectRequired) { ppro->delSetting(YAHOO_PWTOKEN); if (ppro->m_bLoggedIn) - MessageBox(hwndDlg, TranslateT("The changes you have made require you to reconnect to the Yahoo network before they take effect"), TranslateT("YAHOO Options"), MB_OK); + MessageBox(hwndDlg, TranslateT("These changes will take effect the next time you connect to the Yahoo network."), TranslateT("Yahoo options"), MB_OK); } @@ -230,7 +230,7 @@ YAHOO_DEFAULT_JAPAN_LOGIN_SERVER : ppro->setByte("YahooJapan", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_YAHOO_JAPAN)); if (reconnectRequired && ppro->m_bLoggedIn) - MessageBox(hwndDlg, TranslateT("The changes you have made require you to reconnect to the Yahoo network before they take effect"), TranslateT("YAHOO Options"), MB_OK); + MessageBox(hwndDlg, TranslateT("These changes will take effect the next time you connect to the Yahoo network."), TranslateT("Yahoo options"), MB_OK); return TRUE; } diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp index 519573f3aa..645bbb95bb 100644 --- a/protocols/Yahoo/src/proto.cpp +++ b/protocols/Yahoo/src/proto.cpp @@ -723,7 +723,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM if (reconnectRequired) { ppro->delSetting(YAHOO_PWTOKEN); if (ppro->m_bLoggedIn) - MessageBox(hwndDlg, TranslateT("The changes you have made require you to reconnect to the Yahoo network before they take effect"), TranslateT("YAHOO Options"), MB_OK); + MessageBox(hwndDlg, TranslateT("These changes will take effect the next time you connect to the Yahoo network."), TranslateT("Yahoo options"), MB_OK); } return TRUE; } diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc index 6176828d80..9b7293021a 100644 --- a/src/mir_app/res/resource.rc +++ b/src/mir_app/res/resource.rc @@ -383,7 +383,7 @@ BEGIN EDITTEXT IDC_PORTSRANGE,80,178,142,12,ES_AUTOHSCROLL | WS_DISABLED LTEXT "Example: 1050-1070, 2000-2010, 2500",IDC_STATIC52,80,193,196,8,WS_DISABLED CONTROL "Enable UPnP port mapping",IDC_ENABLEUPNP,"Button",BS_3STATE | BS_TOP | BS_MULTILINE | WS_TABSTOP,7,204,299,9 - CTEXT "You will need to reconnect for the changes you have made on this page to take effect.",IDC_RECONNECTREQD,4,224,307,8,NOT WS_VISIBLE + CTEXT "These changes will take effect the next time you connect to the network.",IDC_RECONNECTREQD,4,224,307,8,NOT WS_VISIBLE END IDD_PROFILE_SELECTION DIALOGEX 0, 0, 208, 122 -- cgit v1.2.3