diff options
| author | Dart Raiden <wowemuh@gmail.com> | 2016-01-23 22:55:04 +0000 |
|---|---|---|
| committer | Dart Raiden <wowemuh@gmail.com> | 2016-01-23 22:55:04 +0000 |
| commit | 70ae1f696437caeef54556541c134bcd5bceb1cf (patch) | |
| tree | d5bd53b25212f26fa8ad9725bbc57f8d0800f65b | |
| parent | d75191e83c56ea503ee9e4791b75cbe2b3bf0c5e (diff) | |
DND → Do not disturb
git-svn-id: http://svn.miranda-ng.org/main/trunk@16157 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
35 files changed, 53 insertions, 53 deletions
diff --git a/plugins/BASS_interface/res/Bass.rc b/plugins/BASS_interface/res/Bass.rc index 52a613ffaa..7b09529eca 100644 --- a/plugins/BASS_interface/res/Bass.rc +++ b/plugins/BASS_interface/res/Bass.rc @@ -62,7 +62,7 @@ BEGIN AUTOCHECKBOX "Away", IDC_CHECKBOX3, 240, 40, 65, 8
AUTOCHECKBOX "Not available", IDC_CHECKBOX4, 240, 50, 65, 8
AUTOCHECKBOX "Occupied", IDC_CHECKBOX5, 240, 60, 65, 8
- AUTOCHECKBOX "DND", IDC_CHECKBOX6, 240, 70, 65, 8
+ AUTOCHECKBOX "Do not disturb", IDC_CHECKBOX6, 240, 70, 65, 8
AUTOCHECKBOX "Free for chat", IDC_CHECKBOX7, 240, 80, 65, 8
AUTOCHECKBOX "Invisible", IDC_CHECKBOX8, 240, 90, 65, 8
AUTOCHECKBOX "On the phone", IDC_CHECKBOX9, 240, 100, 65, 8
diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp index 10636ad4a8..84d4dd90ac 100644 --- a/plugins/BuddyPounce/src/dialog.cpp +++ b/plugins/BuddyPounce/src/dialog.cpp @@ -137,7 +137,7 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta SetDlgItemText(hwnd, IDC_CHECK3, TranslateT("Away"));
SetDlgItemText(hwnd, IDC_CHECK4, TranslateT("Not available"));
SetDlgItemText(hwnd, IDC_CHECK5, TranslateT("Occupied"));
- SetDlgItemText(hwnd, IDC_CHECK6, TranslateT("DND"));
+ SetDlgItemText(hwnd, IDC_CHECK6, TranslateT("Do not disturb"));
SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("Free for chat"));
SetDlgItemText(hwnd, IDC_CHECK8, TranslateT("Invisible"));
SetDlgItemText(hwnd, IDC_CHECK9, TranslateT("On the phone"));
@@ -158,7 +158,7 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta SetDlgItemText(hwnd, IDC_CHECK3, TranslateT("To Away"));
SetDlgItemText(hwnd, IDC_CHECK4, TranslateT("To Not available"));
SetDlgItemText(hwnd, IDC_CHECK5, TranslateT("To Occupied"));
- SetDlgItemText(hwnd, IDC_CHECK6, TranslateT("To DND"));
+ SetDlgItemText(hwnd, IDC_CHECK6, TranslateT("To Do not disturb"));
SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("To Free for chat"));
SetDlgItemText(hwnd, IDC_CHECK8, TranslateT("To Invisible"));
SetDlgItemText(hwnd, IDC_CHECK9, TranslateT("To On the phone"));
diff --git a/plugins/Clist_blind/res/resource.rc b/plugins/Clist_blind/res/resource.rc index e528963fcc..3e2416404f 100644 --- a/plugins/Clist_blind/res/resource.rc +++ b/plugins/Clist_blind/res/resource.rc @@ -330,7 +330,7 @@ BEGIN MENUITEM "&Away\tCtrl+2", ID_STATUS_AWAY
MENUITEM "&Not available\tCtrl+3", ID_STATUS_NA
MENUITEM "Occ&upied\tCtrl+4", ID_STATUS_OCCUPIED
- MENUITEM "&DND\tCtrl+5", ID_STATUS_DND
+ MENUITEM "&Do not disturb\tCtrl+5", ID_STATUS_DND
MENUITEM "&Free for chat\tCtrl+6", ID_STATUS_FREECHAT
MENUITEM "&Invisible\tCtrl+7", ID_STATUS_INVISIBLE
MENUITEM "On the &phone\tCtrl+8", ID_STATUS_ONTHEPHONE
diff --git a/plugins/Clist_blind/src/clcopts.cpp b/plugins/Clist_blind/src/clcopts.cpp index 89577380d8..36a6dad54c 100644 --- a/plugins/Clist_blind/src/clcopts.cpp +++ b/plugins/Clist_blind/src/clcopts.cpp @@ -65,7 +65,7 @@ static const struct CheckBoxValues_t greyoutValues[] = { { PF2_SHORTAWAY, LPGENT("Away") },
{ PF2_LONGAWAY, LPGENT("Not available") },
{ PF2_LIGHTDND, LPGENT("Occupied") },
- { PF2_HEAVYDND, LPGENT("DND") },
+ { PF2_HEAVYDND, LPGENT("Do not disturb")},
{ PF2_FREECHAT, LPGENT("Free for chat") },
{ PF2_INVISIBLE, LPGENT("Invisible") },
{ PF2_OUTTOLUNCH, LPGENT("Out to lunch") },
@@ -78,7 +78,7 @@ static const struct CheckBoxValues_t offlineValues[] = { { PF2_SHORTAWAY, LPGENT("Away") },
{ PF2_LONGAWAY, LPGENT("Not available") },
{ PF2_LIGHTDND, LPGENT("Occupied") },
- { PF2_HEAVYDND, LPGENT("DND") },
+ { PF2_HEAVYDND, LPGENT("Do not disturb")},
{ PF2_FREECHAT, LPGENT("Free for chat") },
{ PF2_INVISIBLE, LPGENT("Invisible") },
{ PF2_OUTTOLUNCH, LPGENT("Out to lunch") },
diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc index db4890713d..09f227ac48 100644 --- a/plugins/Clist_modern/res/resource.rc +++ b/plugins/Clist_modern/res/resource.rc @@ -812,7 +812,7 @@ BEGIN MENUITEM "&Away\tCtrl+2", ID_STATUS_AWAY
MENUITEM "&Not available\tCtrl+3", ID_STATUS_NA
MENUITEM "Occ&upied\tCtrl+4", ID_STATUS_OCCUPIED
- MENUITEM "&DND\tCtrl+5", ID_STATUS_DND
+ MENUITEM "&Do not disturb\tCtrl+5", ID_STATUS_DND
MENUITEM "&Free for chat\tCtrl+6", ID_STATUS_FREECHAT
MENUITEM "&Invisible\tCtrl+7", ID_STATUS_INVISIBLE
MENUITEM "On the &phone\tCtrl+8", ID_STATUS_ONTHEPHONE
diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index 97383088c8..78d275012f 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -75,7 +75,7 @@ struct FontOptionsList { static struct FontOptionsList fontOptionsList[] = {
{ FIDF_CLASSGENERAL, FONTID_CONTACTS, CLCGROUP, LPGENT("Standard contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },
{ FIDF_CLASSGENERAL, FONTID_AWAY, CLCGROUP, LPGENT("Away contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },
- { FIDF_CLASSGENERAL, FONTID_DND, CLCGROUP, LPGENT("DND contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },
+ { FIDF_CLASSGENERAL, FONTID_DND, CLCGROUP, LPGENT("Do not disturb contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },
{ FIDF_CLASSGENERAL, FONTID_NA, CLCGROUP, LPGENT("Not available contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },
{ FIDF_CLASSGENERAL, FONTID_OCCUPIED, CLCGROUP, LPGENT("Occupied contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },
{ FIDF_CLASSGENERAL, FONTID_CHAT, CLCGROUP, LPGENT("Free for chat contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },
@@ -264,7 +264,7 @@ static const struct CheckBoxValues_t greyoutValues[] = { { PF2_SHORTAWAY, LPGENT("Away") },
{ PF2_LONGAWAY, LPGENT("Not available") },
{ PF2_LIGHTDND, LPGENT("Occupied") },
- { PF2_HEAVYDND, LPGENT("DND") },
+ { PF2_HEAVYDND, LPGENT("Do not disturb") },
{ PF2_FREECHAT, LPGENT("Free for chat") },
{ PF2_INVISIBLE, LPGENT("Invisible") },
{ PF2_OUTTOLUNCH, LPGENT("Out to lunch") },
@@ -277,7 +277,7 @@ static const struct CheckBoxValues_t offlineValues[] = { { PF2_SHORTAWAY, LPGENT("Away") },
{ PF2_LONGAWAY, LPGENT("Not available") },
{ PF2_LIGHTDND, LPGENT("Occupied") },
- { PF2_HEAVYDND, LPGENT("DND") },
+ { PF2_HEAVYDND, LPGENT("Do not disturb") },
{ PF2_FREECHAT, LPGENT("Free for chat") },
{ PF2_INVISIBLE, LPGENT("Invisible") },
{ PF2_OUTTOLUNCH, LPGENT("Out to lunch") },
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index bd91816a4a..f939fbefc2 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -122,7 +122,7 @@ OVERLAYICONINFO g_pAvatarOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + { "AVATAR_OVERLAY_OFFLINE", LPGEN("Offline"), IDI_AVATAR_OVERLAY_OFFLINE, -1 },
{ "AVATAR_OVERLAY_ONLINE", LPGEN("Online"), IDI_AVATAR_OVERLAY_ONLINE, -1 },
{ "AVATAR_OVERLAY_AWAY", LPGEN("Away"), IDI_AVATAR_OVERLAY_AWAY, -1 },
- { "AVATAR_OVERLAY_DND", LPGEN("DND"), IDI_AVATAR_OVERLAY_DND, -1 },
+ { "AVATAR_OVERLAY_DND", LPGEN("Do not disturb"), IDI_AVATAR_OVERLAY_DND, -1 },
{ "AVATAR_OVERLAY_NA", LPGEN("Not available"), IDI_AVATAR_OVERLAY_NA, -1 },
{ "AVATAR_OVERLAY_OCCUPIED", LPGEN("Occupied"), IDI_AVATAR_OVERLAY_OCCUPIED, -1 },
{ "AVATAR_OVERLAY_CHAT", LPGEN("Free for chat"), IDI_AVATAR_OVERLAY_CHAT, -1 },
@@ -136,7 +136,7 @@ OVERLAYICONINFO g_pStatusOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + { "STATUS_OVERLAY_OFFLINE", LPGEN("Offline"), IDI_STATUS_OVERLAY_OFFLINE, -1 },
{ "STATUS_OVERLAY_ONLINE", LPGEN("Online"), IDI_STATUS_OVERLAY_ONLINE, -1 },
{ "STATUS_OVERLAY_AWAY", LPGEN("Away"), IDI_STATUS_OVERLAY_AWAY, -1 },
- { "STATUS_OVERLAY_DND", LPGEN("DND"), IDI_STATUS_OVERLAY_DND, -1 },
+ { "STATUS_OVERLAY_DND", LPGEN("Do not disturb"), IDI_STATUS_OVERLAY_DND, -1 },
{ "STATUS_OVERLAY_NA", LPGEN("Not available"), IDI_STATUS_OVERLAY_NA, -1 },
{ "STATUS_OVERLAY_OCCUPIED", LPGEN("Occupied"), IDI_STATUS_OVERLAY_OCCUPIED, -1 },
{ "STATUS_OVERLAY_CHAT", LPGEN("Free for chat"), IDI_STATUS_OVERLAY_CHAT, -1 },
diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc index d44d96587c..258c9e4a56 100644 --- a/plugins/Clist_nicer/res/resource.rc +++ b/plugins/Clist_nicer/res/resource.rc @@ -590,7 +590,7 @@ BEGIN MENUITEM "&Away\tCtrl+2", ID_STATUS_AWAY
MENUITEM "&Not available\tCtrl+3", ID_STATUS_NA
MENUITEM "Occ&upied\tCtrl+4", ID_STATUS_OCCUPIED
- MENUITEM "&DND\tCtrl+5", ID_STATUS_DND
+ MENUITEM "&Do not disturb\tCtrl+5", ID_STATUS_DND
MENUITEM "&Free for chat\tCtrl+6", ID_STATUS_FREECHAT
MENUITEM "&Invisible\tCtrl+7", ID_STATUS_INVISIBLE
MENUITEM "On the &phone\tCtrl+8", ID_STATUS_ONTHEPHONE
diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp index 53e1915f59..654fe2be0b 100644 --- a/plugins/Clist_nicer/src/clcopts.cpp +++ b/plugins/Clist_nicer/src/clcopts.cpp @@ -67,12 +67,12 @@ struct CheckBoxValues_t { static const struct CheckBoxValues_t greyoutValues[] = {
{ GREYF_UNFOCUS, LPGENT("Not focused") }, { MODEF_OFFLINE, LPGENT("Offline") }, { PF2_ONLINE, LPGENT("Online") }, { PF2_SHORTAWAY, LPGENT("Away") },
- { PF2_LONGAWAY, LPGENT("Not available") }, { PF2_LIGHTDND, LPGENT("Occupied") }, { PF2_HEAVYDND, LPGENT("DND") }, { PF2_FREECHAT, LPGENT("Free for chat") },
+ { PF2_LONGAWAY, LPGENT("Not available") }, { PF2_LIGHTDND, LPGENT("Occupied") }, { PF2_HEAVYDND, LPGENT("Do not disturb") }, { PF2_FREECHAT, LPGENT("Free for chat") },
{ PF2_INVISIBLE, LPGENT("Invisible") }, { PF2_OUTTOLUNCH, LPGENT("Out to lunch") }, { PF2_ONTHEPHONE, LPGENT("On the phone") }
};
static const struct CheckBoxValues_t offlineValues[] = {
{ MODEF_OFFLINE, LPGENT("Offline") }, { PF2_ONLINE, LPGENT("Online") }, { PF2_SHORTAWAY, LPGENT("Away") }, { PF2_LONGAWAY, LPGENT("Not available") },
- { PF2_LIGHTDND, LPGENT("Occupied") }, { PF2_HEAVYDND, LPGENT("DND") }, { PF2_FREECHAT, LPGENT("Free for chat") }, { PF2_INVISIBLE, LPGENT("Invisible") },
+ { PF2_LIGHTDND, LPGENT("Occupied") }, { PF2_HEAVYDND, LPGENT("Do not disturb") }, { PF2_FREECHAT, LPGENT("Free for chat") }, { PF2_INVISIBLE, LPGENT("Invisible") },
{ PF2_OUTTOLUNCH, LPGENT("Out to lunch") }, { PF2_ONTHEPHONE, LPGENT("On the phone") }
};
diff --git a/plugins/KeyboardNotify/res/resources.rc b/plugins/KeyboardNotify/res/resources.rc index cd1e9b9314..cf121394fc 100644 --- a/plugins/KeyboardNotify/res/resources.rc +++ b/plugins/KeyboardNotify/res/resources.rc @@ -80,7 +80,7 @@ BEGIN CONTROL "Away",IDC_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,98,128,9
CONTROL "Occupied",IDC_OCCUPIED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,118,128,9
CONTROL "Not available",IDC_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,108,128,9
- CONTROL "DND",IDC_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,128,85,9
+ CONTROL "Do not disturb",IDC_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,128,85,9
CONTROL "Free for chat",IDC_FREECHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,138,127,9
CONTROL "Invisible",IDC_INVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,148,128,9
CONTROL "On the phone",IDC_ONTHEPHONE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,158,128,9
diff --git a/plugins/MyDetails/res/resource.rc b/plugins/MyDetails/res/resource.rc index 3e1ca6732b..83737cefca 100644 --- a/plugins/MyDetails/res/resource.rc +++ b/plugins/MyDetails/res/resource.rc @@ -195,7 +195,7 @@ BEGIN MENUITEM "&Away", ID_STATUS_AWAY
MENUITEM "&Not available", ID_STATUS_NA
MENUITEM "Occ&upied", ID_STATUS_OCCUPIED
- MENUITEM "&DND", ID_STATUS_DND
+ MENUITEM "&Do not disturb", ID_STATUS_DND
MENUITEM "&Free for chat", ID_STATUS_FREECHAT
MENUITEM "&Invisible", ID_STATUS_INVISIBLE
MENUITEM "On the &phone", ID_STATUS_ONTHEPHONE
diff --git a/plugins/NewAwaySysMod/res/NewAwaySys.rc b/plugins/NewAwaySysMod/res/NewAwaySys.rc index 0219bcc0ad..e95c33762c 100644 --- a/plugins/NewAwaySysMod/res/NewAwaySys.rc +++ b/plugins/NewAwaySysMod/res/NewAwaySys.rc @@ -100,7 +100,7 @@ BEGIN CONTROL "&Away",IDC_REPLYDLG_DISABLE_AWAY,"MButtonClass",WS_TABSTOP,37,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "&Not available",IDC_REPLYDLG_DISABLE_NA,"MButtonClass",WS_TABSTOP,53,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "Occ&upied",IDC_REPLYDLG_DISABLE_OCC,"MButtonClass",WS_TABSTOP,69,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
- CONTROL "&DND",IDC_REPLYDLG_DISABLE_DND,"MButtonClass",WS_TABSTOP,85,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Do not disturb",IDC_REPLYDLG_DISABLE_DND,"MButtonClass",WS_TABSTOP,85,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "&Free for chat",IDC_REPLYDLG_DISABLE_FFC,"MButtonClass",WS_TABSTOP,101,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "&Invisible",IDC_REPLYDLG_DISABLE_INV,"MButtonClass",WS_TABSTOP,117,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "On the &phone",IDC_REPLYDLG_DISABLE_OTP,"MButtonClass",WS_TABSTOP,133,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
@@ -147,7 +147,7 @@ BEGIN CONTROL "&Away",IDC_MESSAGEDLG_DEF_AWAY,"MButtonClass",WS_TABSTOP,165,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "&Not available",IDC_MESSAGEDLG_DEF_NA,"MButtonClass",WS_TABSTOP,181,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "Occ&upied",IDC_MESSAGEDLG_DEF_OCC,"MButtonClass",WS_TABSTOP,197,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
- CONTROL "&DND",IDC_MESSAGEDLG_DEF_DND,"MButtonClass",WS_TABSTOP,213,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Do not disturb",IDC_MESSAGEDLG_DEF_DND,"MButtonClass",WS_TABSTOP,213,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "&Free for chat",IDC_MESSAGEDLG_DEF_FFC,"MButtonClass",WS_TABSTOP,229,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "&Invisible",IDC_MESSAGEDLG_DEF_INV,"MButtonClass",WS_TABSTOP,245,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "On the &phone",IDC_MESSAGEDLG_DEF_OTP,"MButtonClass",WS_TABSTOP,261,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
@@ -171,7 +171,7 @@ BEGIN CONTROL "&Away",IDC_MESSAGEDLG_DEF_AWAY,"MButtonClass",WS_TABSTOP,160,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "&Not available",IDC_MESSAGEDLG_DEF_NA,"MButtonClass",WS_TABSTOP,176,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "Occ&upied",IDC_MESSAGEDLG_DEF_OCC,"MButtonClass",WS_TABSTOP,192,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
- CONTROL "&DND",IDC_MESSAGEDLG_DEF_DND,"MButtonClass",WS_TABSTOP,208,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Do not disturb",IDC_MESSAGEDLG_DEF_DND,"MButtonClass",WS_TABSTOP,208,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "&Free for chat",IDC_MESSAGEDLG_DEF_FFC,"MButtonClass",WS_TABSTOP,224,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "&Invisible",IDC_MESSAGEDLG_DEF_INV,"MButtonClass",WS_TABSTOP,240,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "On the &phone",IDC_MESSAGEDLG_DEF_OTP,"MButtonClass",WS_TABSTOP,256,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
@@ -230,7 +230,7 @@ BEGIN CONTROL "&Away",IDC_MOREOPTDLG_DONTPOPDLG_AWAY,"MButtonClass",WS_TABSTOP,28,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "&Not available",IDC_MOREOPTDLG_DONTPOPDLG_NA,"MButtonClass",WS_TABSTOP,44,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "Occ&upied",IDC_MOREOPTDLG_DONTPOPDLG_OCC,"MButtonClass",WS_TABSTOP,60,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
- CONTROL "&DND",IDC_MOREOPTDLG_DONTPOPDLG_DND,"MButtonClass",WS_TABSTOP,76,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Do not disturb",IDC_MOREOPTDLG_DONTPOPDLG_DND,"MButtonClass",WS_TABSTOP,76,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "&Free for chat",IDC_MOREOPTDLG_DONTPOPDLG_FFC,
"MButtonClass",WS_TABSTOP,92,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "&Invisible",IDC_MOREOPTDLG_DONTPOPDLG_INV,"MButtonClass",WS_TABSTOP,108,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
@@ -399,7 +399,7 @@ BEGIN MENUITEM "&Away", IDR_MSGTREEMENU_DEF_AWAY
MENUITEM "&Not available", IDR_MSGTREEMENU_DEF_NA
MENUITEM "Occ&upied", IDR_MSGTREEMENU_DEF_OCC
- MENUITEM "&DND", IDR_MSGTREEMENU_DEF_DND
+ MENUITEM "&Do not disturb", IDR_MSGTREEMENU_DEF_DND
MENUITEM "&Free for chat", IDR_MSGTREEMENU_DEF_FFC
MENUITEM "&Invisible", IDR_MSGTREEMENU_DEF_INV
MENUITEM "On the &phone", IDR_MSGTREEMENU_DEF_OTP
diff --git a/plugins/NewAwaySysMod/src/AwayOpt.cpp b/plugins/NewAwaySysMod/src/AwayOpt.cpp index 32f96ae60c..33f9bc22ee 100644 --- a/plugins/NewAwaySysMod/src/AwayOpt.cpp +++ b/plugins/NewAwaySysMod/src/AwayOpt.cpp @@ -1293,7 +1293,7 @@ void InitOptions() g_MsgTreePage.Items.AddElem(new COptItem_IntDBSetting(IDS_MESSAGEDLG_DEF_OCC, StatusToDBSetting(ID_STATUS_OCCUPIED, MESSAGES_DB_MSGTREEDEF), DBVT_WORD, false, ID));
DefMsgTree.AddElem(CTreeItem(TranslateT("Occupied"), ParentID1, ID++, 0, TranslateT("Not right now.")));
g_MsgTreePage.Items.AddElem(new COptItem_IntDBSetting(IDS_MESSAGEDLG_DEF_DND, StatusToDBSetting(ID_STATUS_DND, MESSAGES_DB_MSGTREEDEF), DBVT_WORD, false, ID));
- DefMsgTree.AddElem(CTreeItem(TranslateT("DND"), ParentID1, ID++, 0, TranslateT("Give a guy some peace, would ya?")));
+ DefMsgTree.AddElem(CTreeItem(TranslateT("Do not disturb"), ParentID1, ID++, 0, TranslateT("Give a guy some peace, would ya?")));
g_MsgTreePage.Items.AddElem(new COptItem_IntDBSetting(IDS_MESSAGEDLG_DEF_FFC, StatusToDBSetting(ID_STATUS_FREECHAT, MESSAGES_DB_MSGTREEDEF), DBVT_WORD, false, ID));
DefMsgTree.AddElem(CTreeItem(TranslateT("Free for chat"), ParentID1, ID++, 0, TranslateT("I'm a chatbot!")));
g_MsgTreePage.Items.AddElem(new COptItem_IntDBSetting(IDS_MESSAGEDLG_DEF_INV, StatusToDBSetting(ID_STATUS_INVISIBLE, MESSAGES_DB_MSGTREEDEF), DBVT_WORD, false, ID));
diff --git a/plugins/NewXstatusNotify/res/resource.rc b/plugins/NewXstatusNotify/res/resource.rc index e8dbe3ae71..30a324cbe3 100644 --- a/plugins/NewXstatusNotify/res/resource.rc +++ b/plugins/NewXstatusNotify/res/resource.rc @@ -37,7 +37,7 @@ BEGIN CONTROL "Away",IDC_CHK_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,103,25,87,8
CONTROL "Not available",IDC_CHK_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,196,25,94,8
CONTROL "Occupied",IDC_CHK_OCCUPIED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,36,89,8
- CONTROL "DND",IDC_CHK_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,103,36,87,8
+ CONTROL "Do not disturb",IDC_CHK_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,103,36,87,8
CONTROL "Out to lunch",IDC_CHK_OUTTOLUNCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,196,36,94,8
CONTROL "On the phone",IDC_CHK_ONTHEPHONE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,47,89,8
CONTROL "Always when changing from offline",IDC_CHK_FROMOFFLINE,
@@ -124,7 +124,7 @@ BEGIN LTEXT "Occupied",IDC_STATIC,10,88,56,8
CONTROL "",IDC_OCCUPIED_BG,"ColourPicker",WS_TABSTOP,73,86,24,12
CONTROL "",IDC_OCCUPIED_TX,"ColourPicker",WS_TABSTOP,106,86,24,12
- LTEXT "DND",IDC_STATIC,10,103,56,8
+ LTEXT "Do not disturb",IDC_STATIC,10,103,56,8
CONTROL "",IDC_DND_BG,"ColourPicker",WS_TABSTOP,73,101,24,12
CONTROL "",IDC_DND_TX,"ColourPicker",WS_TABSTOP,106,101,24,12
LTEXT "Free for chat",IDC_STATIC,10,118,56,8
@@ -222,7 +222,7 @@ BEGIN CONTROL "Away",IDC_CHK_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,79,116,10
CONTROL "Not available",IDC_CHK_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,89,116,10
CONTROL "Occupied",IDC_CHK_OCCUPIED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,99,116,10
- CONTROL "DND",IDC_CHK_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,109,116,10
+ CONTROL "Do not disturb",IDC_CHK_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,109,116,10
CONTROL "Out to lunch",IDC_CHK_OUTTOLUNCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,129,116,10
CONTROL "On the phone",IDC_CHK_ONTHEPHONE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,119,116,10
GROUPBOX "Sounds",IDC_STATIC,147,8,132,136
@@ -234,7 +234,7 @@ BEGIN CONTROL "Away",IDC_CHK_AWAY2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,80,116,10
CONTROL "Not available",IDC_CHK_NA2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,90,116,10
CONTROL "Occupied",IDC_CHK_OCCUPIED2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,100,116,10
- CONTROL "DND",IDC_CHK_DND2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,110,116,10
+ CONTROL "Do not disturb",IDC_CHK_DND2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,110,116,10
CONTROL "Out to lunch",IDC_CHK_OUTTOLUNCH2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,130,116,10
CONTROL "On the phone",IDC_CHK_ONTHEPHONE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,120,116,10
CONTROL "Disable only if I change global status",IDC_CHK_ONLYGLOBAL,
diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index 981edd6d95..ee1910fd42 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -933,12 +933,12 @@ void InitStatusList() StatusList[index].colorBack = db_get_dw(NULL, MODULE, "40076bg", COLOR_BG_NAVAILDEFAULT);
StatusList[index].colorText = db_get_dw(NULL, MODULE, "40076tx", COLOR_TX_DEFAULT);
- //DND
+ //Do not disturb
index = Index(ID_STATUS_DND);
mir_tstrncpy(StatusList[index].lpzMStatusText, TranslateT("(M) doesn't want to be disturbed!"), MAX_STATUSTEXT);
mir_tstrncpy(StatusList[index].lpzFStatusText, TranslateT("(F) doesn't want to be disturbed!"), MAX_STATUSTEXT);
mir_tstrncpy(StatusList[index].lpzUStatusText, TranslateT("(U) doesn't want to be disturbed!"), MAX_STATUSTEXT);
- mir_tstrncpy(StatusList[index].lpzStandardText, TranslateT("DND"), MAX_STANDARDTEXT);
+ mir_tstrncpy(StatusList[index].lpzStandardText, TranslateT("Do not disturb"), MAX_STANDARDTEXT);
mir_strncpy(StatusList[index].lpzSkinSoundName, "UserDND", MAX_SKINSOUNDNAME);
mir_tstrncpy(StatusList[index].lpzSkinSoundDesc, LPGENT("User: Do not disturb"), MAX_SKINSOUNDDESC);
mir_tstrncpy(StatusList[index].lpzSkinSoundFile, _T("dnd.wav"), MAX_PATH);
diff --git a/plugins/Nudge/res/resource.rc b/plugins/Nudge/res/resource.rc index cd86e544f4..ae06a8dd88 100644 --- a/plugins/Nudge/res/resource.rc +++ b/plugins/Nudge/res/resource.rc @@ -90,7 +90,7 @@ BEGIN CONTROL "Away",IDC_CHECKST2,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,18,167,58,9
CONTROL "Not available",IDC_CHECKST3,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,18,177,58,9
CONTROL "Occupied",IDC_CHECKST4,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,18,187,58,9
- CONTROL "DND",IDC_CHECKST5,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,84,147,72,9
+ CONTROL "Do not disturb",IDC_CHECKST5,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,84,147,72,9
CONTROL "Free for chat",IDC_CHECKST6,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,84,157,72,9
CONTROL "Invisible",IDC_CHECKST7,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,84,167,72,9
CONTROL "On the phone",IDC_CHECKST8,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,84,177,72,9
diff --git a/plugins/Popup/src/opt_class.cpp b/plugins/Popup/src/opt_class.cpp index efb49de95b..8c6a1943a9 100644 --- a/plugins/Popup/src/opt_class.cpp +++ b/plugins/Popup/src/opt_class.cpp @@ -148,7 +148,7 @@ static statusButtons[] = { { IDC_SAWAY, SKINICON_STATUS_AWAY, "Away", PF2_SHORTAWAY, PF2_SHORTAWAY },
{ IDC_SNA, SKINICON_STATUS_NA, "Not available", PF2_LONGAWAY, PF2_LONGAWAY },
{ IDC_SOCCUPIED, SKINICON_STATUS_OCCUPIED, "Occupied", PF2_LIGHTDND, PF2_LIGHTDND },
- { IDC_SDND, SKINICON_STATUS_DND, "DND", PF2_HEAVYDND, PF2_HEAVYDND },
+ { IDC_SDND, SKINICON_STATUS_DND, "Do not disturb", PF2_HEAVYDND, PF2_HEAVYDND },
{ IDC_SFREE4CHAT, SKINICON_STATUS_FREE4CHAT, "Free for chat", PF2_FREECHAT, PF2_FREECHAT },
{ IDC_SINVISIBLE, SKINICON_STATUS_INVISIBLE, "Invisible", PF2_INVISIBLE, PF2_INVISIBLE },
{ IDC_SPHONE, SKINICON_STATUS_ONTHEPHONE, "On the phone", PF2_ONTHEPHONE, PF2_ONTHEPHONE },
@@ -159,7 +159,7 @@ static statusButtons[] = { { IDC_SAWAY2, SKINICON_STATUS_AWAY, "Away", PF2_SHORTAWAY, PF2_SHORTAWAY << 16 },
{ IDC_SNA2, SKINICON_STATUS_NA, "Not available", PF2_LONGAWAY, PF2_LONGAWAY << 16 },
{ IDC_SOCCUPIED2, SKINICON_STATUS_OCCUPIED, "Occupied", PF2_LIGHTDND, PF2_LIGHTDND << 16 },
- { IDC_SDND2, SKINICON_STATUS_DND, "DND", PF2_HEAVYDND, PF2_HEAVYDND << 16 },
+ { IDC_SDND2, SKINICON_STATUS_DND, "Do not disturb", PF2_HEAVYDND, PF2_HEAVYDND << 16 },
{ IDC_SFREE4CHAT2, SKINICON_STATUS_FREE4CHAT, "Free for chat", PF2_FREECHAT, PF2_FREECHAT << 16 },
{ IDC_SINVISIBLE2, SKINICON_STATUS_INVISIBLE, "Invisible", PF2_INVISIBLE, PF2_INVISIBLE << 16 },
{ IDC_SPHONE2, SKINICON_STATUS_ONTHEPHONE, "On the phone", PF2_ONTHEPHONE, PF2_ONTHEPHONE << 16 },
diff --git a/plugins/Popup/src/opt_gen.cpp b/plugins/Popup/src/opt_gen.cpp index 2d7d25e21b..200a2c6467 100644 --- a/plugins/Popup/src/opt_gen.cpp +++ b/plugins/Popup/src/opt_gen.cpp @@ -61,7 +61,7 @@ int AddStatusMode(OPTTREE_OPTION *options, int pos, LPTSTR prefix, DWORD flag) case PF2_SHORTAWAY: mir_tstrcat(options[pos].pszOptionName, LPGENT("Away")); break;
case PF2_LONGAWAY: mir_tstrcat(options[pos].pszOptionName, LPGENT("Not available")); break;
case PF2_LIGHTDND: mir_tstrcat(options[pos].pszOptionName, LPGENT("Occupied")); break;
- case PF2_HEAVYDND: mir_tstrcat(options[pos].pszOptionName, LPGENT("DND")); break;
+ case PF2_HEAVYDND: mir_tstrcat(options[pos].pszOptionName, LPGENT("Do not disturb")); break;
case PF2_FREECHAT: mir_tstrcat(options[pos].pszOptionName, LPGENT("Free for chat")); break;
case PF2_OUTTOLUNCH: mir_tstrcat(options[pos].pszOptionName, LPGENT("Out to lunch")); break;
case PF2_ONTHEPHONE: mir_tstrcat(options[pos].pszOptionName, LPGENT("On the phone")); break;
diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index 10731df4d1..2467f63d21 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -212,7 +212,7 @@ static const struct CheckBoxValues_t statusValues[] = { PF2_SHORTAWAY, LPGENT("Away") },
{ PF2_LONGAWAY, LPGENT("Not available") },
{ PF2_LIGHTDND, LPGENT("Occupied") },
- { PF2_HEAVYDND, LPGENT("DND") },
+ { PF2_HEAVYDND, LPGENT("Do not disturb") },
{ PF2_FREECHAT, LPGENT("Free for chat") },
{ PF2_INVISIBLE, LPGENT("Invisible") },
{ PF2_OUTTOLUNCH, LPGENT("Out to lunch") },
diff --git a/plugins/SeenPlugin/res/resource.rc b/plugins/SeenPlugin/res/resource.rc index c3104b0faf..548af8b9c4 100644 --- a/plugins/SeenPlugin/res/resource.rc +++ b/plugins/SeenPlugin/res/resource.rc @@ -99,7 +99,7 @@ BEGIN RTEXT "Occupied",IDC_STATIC,10,143,60,10
CONTROL "",ID_STATUS_OCCUPIED,"ColourPicker",WS_TABSTOP,80,140,20,14
CONTROL "",40096,"ColourPicker",WS_TABSTOP,105,140,20,14
- RTEXT "DND",IDC_STATIC,10,163,60,10
+ RTEXT "Do not disturb",IDC_STATIC,10,163,60,10
CONTROL "",ID_STATUS_DND,"ColourPicker",WS_TABSTOP,80,160,20,14
CONTROL "",40094,"ColourPicker",WS_TABSTOP,105,160,20,14
RTEXT "On the phone",IDC_STATIC,140,83,60,10
diff --git a/plugins/SkypeStatusChange/src/main.cpp b/plugins/SkypeStatusChange/src/main.cpp index c7f76d60c6..33e6baa20a 100644 --- a/plugins/SkypeStatusChange/src/main.cpp +++ b/plugins/SkypeStatusChange/src/main.cpp @@ -51,7 +51,7 @@ const CMirandaStatus2SkypeStatus g_aStatusCode[10] = {
{ID_STATUS_AWAY, "AWAY",_T("Away")},
{ID_STATUS_NA, "AWAY",_T("Not available")}, // removed in Skype 5
- {ID_STATUS_DND, "DND",_T("DND")},
+ {ID_STATUS_DND, "DND",_T("Do not disturb")},
{ID_STATUS_ONLINE, "ONLINE",_T("Online")},
{ID_STATUS_FREECHAT, "ONLINE",_T("Free for chat")}, // SKYPEME status doesn't work in Skype 4!
{ID_STATUS_OFFLINE, "OFFLINE",_T("Offline")},
diff --git a/plugins/StatusChange/res/resource.rc b/plugins/StatusChange/res/resource.rc index cc7bfb1b79..6e2580b089 100644 --- a/plugins/StatusChange/res/resource.rc +++ b/plugins/StatusChange/res/resource.rc @@ -42,7 +42,7 @@ BEGIN CONTROL "Away",IDC_RAD_AWAY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,121,95,10
CONTROL "Not available",IDC_RAD_NA,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,131,95,10
CONTROL "Occupied",IDC_RAD_OCCUPIED,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,141,95,10
- CONTROL "DND",IDC_RAD_DND,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,165,101,95,10
+ CONTROL "Do not disturb",IDC_RAD_DND,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,165,101,95,10
CONTROL "Free for chat",IDC_RAD_FREECHAT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,165,111,95,10
CONTROL "Invisible",IDC_RAD_INVISIBLE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,165,121,95,10
CONTROL "On the phone",IDC_RAD_ONTHEPHONE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,165,131,95,10
@@ -52,7 +52,7 @@ BEGIN CONTROL "Away",IDC_CHK_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,198,95,10
CONTROL "Not available",IDC_CHK_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,208,95,10
CONTROL "Occupied",IDC_CHK_OCCUPIED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,217,95,10
- CONTROL "DND",IDC_CHK_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,178,95,10
+ CONTROL "Do not disturb",IDC_CHK_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,178,95,10
CONTROL "Free for chat",IDC_CHK_FREECHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,188,95,10
CONTROL "Invisible",IDC_CHK_INVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,198,95,10
CONTROL "On the phone",IDC_CHK_ONTHEPHONE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,208,95,10
diff --git a/plugins/Utils.pas/protocols.pas b/plugins/Utils.pas/protocols.pas index d798d13ba9..bb57e337ad 100644 --- a/plugins/Utils.pas/protocols.pas +++ b/plugins/Utils.pas/protocols.pas @@ -74,7 +74,7 @@ const ID_STATUS_ONTHEPHONE);
const
StatNames:array [0..NumStatus-1] of PWideChar=(
- 'Default'{'Offline'},'Online','Invisible','Away','Not available','Occupied','DND',
+ 'Default'{'Offline'},'Online','Invisible','Away','Not available','Occupied','Do not disturb',
'Free for chat','Out to lunch','On the phone');
type
diff --git a/plugins/WinterSpeak/res/Speak.rc b/plugins/WinterSpeak/res/Speak.rc index c2e8596020..c62f905fcc 100644 --- a/plugins/WinterSpeak/res/Speak.rc +++ b/plugins/WinterSpeak/res/Speak.rc @@ -55,7 +55,7 @@ BEGIN CONTROL "Offline",IDC_STATUS_OFFLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,85,10
CONTROL "Online",IDC_STATUS_ONLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,85,10
CONTROL "Away",IDC_STATUS_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,41,85,10
- CONTROL "DND",IDC_STATUS_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,52,85,10
+ CONTROL "Do not disturb",IDC_STATUS_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,52,85,10
CONTROL "Not available",IDC_STATUS_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,63,85,10
CONTROL "Occupied",IDC_STATUS_OCCUPIED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,74,85,10
CONTROL "Free for chat",IDC_STATUS_FREEFORCHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,85,85,10
@@ -87,7 +87,7 @@ BEGIN GROUPBOX "Active Modes",IDC_STATIC,0,0,85,240
CONTROL "Online",IDC_ACTIVE_ONLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,13,75,10
CONTROL "Away",IDC_ACTIVE_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,24,75,10
- CONTROL "DND",IDC_ACTIVE_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,35,75,10
+ CONTROL "Do not disturb",IDC_ACTIVE_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,35,75,10
CONTROL "Not available",IDC_ACTIVE_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,46,75,10
CONTROL "Occupied",IDC_ACTIVE_OCCUPIED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,57,75,10
CONTROL "Free for chat",IDC_ACTIVE_FREEFORCHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,68,75,10
diff --git a/plugins/YAMN/res/YAMN.rc b/plugins/YAMN/res/YAMN.rc index ce2041a768..e0a8449871 100644 --- a/plugins/YAMN/res/YAMN.rc +++ b/plugins/YAMN/res/YAMN.rc @@ -239,7 +239,7 @@ BEGIN CONTROL "Away",IDC_CHECKST2,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,15,62,70,9
CONTROL "Not available",IDC_CHECKST3,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,15,83,70,9
CONTROL "Occupied",IDC_CHECKST4,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,15,104,70,9
- CONTROL "DND",IDC_CHECKST5,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,134,19,70,9
+ CONTROL "Do not disturb",IDC_CHECKST5,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,134,19,70,9
CONTROL "Free for chat",IDC_CHECKST6,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,134,39,70,9
CONTROL "Invisible",IDC_CHECKST7,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,134,62,70,9
CONTROL "On the phone",IDC_CHECKST8,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,134,83,70,9
diff --git a/plugins/YARelay/res/yaRelay.rc b/plugins/YARelay/res/yaRelay.rc index 737d02a626..9a09e0dab8 100644 --- a/plugins/YARelay/res/yaRelay.rc +++ b/plugins/YARelay/res/yaRelay.rc @@ -51,7 +51,7 @@ BEGIN 97,67,10
CONTROL "Occupied",IDC_CHECK5,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,78,64,67,10
- CONTROL "DND",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
+ CONTROL "Do not disturb",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
78,75,67,10
CONTROL "Free for chat",IDC_CHECK7,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,78,86,67,10
diff --git a/plugins/ZeroNotification/src/main.cpp b/plugins/ZeroNotification/src/main.cpp index a88e1d8b84..eafa43a031 100644 --- a/plugins/ZeroNotification/src/main.cpp +++ b/plugins/ZeroNotification/src/main.cpp @@ -28,7 +28,7 @@ static const struct CheckBoxValues_t statusValues[] = { { PF2_SHORTAWAY, TEXT("Away") },
{ PF2_LONGAWAY, TEXT("Not available") },
{ PF2_LIGHTDND, TEXT("Occupied") },
- { PF2_HEAVYDND, TEXT("DND") },
+ { PF2_HEAVYDND, TEXT("Do not disturb") },
{ PF2_FREECHAT, TEXT("Free for chat") },
{ PF2_INVISIBLE, TEXT("Invisible") },
{ PF2_OUTTOLUNCH, TEXT("Out to lunch") },
diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp index 3550c1a4f9..22d1a408ae 100644 --- a/protocols/IRCG/src/commandmonitor.cpp +++ b/protocols/IRCG/src/commandmonitor.cpp @@ -330,7 +330,7 @@ bool CIrcProto::OnIrc_SETAWAY(const CIrcMessage* pmsg) DoPerform("Event: Not available");
break;
case ID_STATUS_DND:
- DoPerform("Event: DND");
+ DoPerform("Event: Do not disturb");
break;
case ID_STATUS_OCCUPIED:
DoPerform("Event: Occupied");
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index 13767def86..4fe3b827e4 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -956,7 +956,7 @@ static char* sttPerformEvents[] = { LPGEN("Event: Away"),
LPGEN("Event: Not available"),
LPGEN("Event: Occupied"),
- LPGEN("Event: DND"),
+ LPGEN("Event: Do not disturb"),
LPGEN("Event: Free for chat"),
LPGEN("Event: On the phone"),
LPGEN("Event: Out for lunch"),
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index 7d2c089f9b..5038fd7160 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -447,7 +447,7 @@ static gc_item sttLogListItems[] = { LPGENT("Online"), IDM_PRESENCE_ONLINE, MENU_POPUPITEM },
{ LPGENT("Away"), IDM_PRESENCE_AWAY, MENU_POPUPITEM },
{ LPGENT("Not available"), IDM_PRESENCE_NA, MENU_POPUPITEM },
- { LPGENT("DND"), IDM_PRESENCE_DND, MENU_POPUPITEM },
+ { LPGENT("Do not disturb"), IDM_PRESENCE_DND, MENU_POPUPITEM },
{ LPGENT("Free for chat"), IDM_PRESENCE_FREE4CHAT, MENU_POPUPITEM },
{ LPGENT("&Leave chat session"), IDM_LEAVE, MENU_ITEM }
diff --git a/src/core/stdclist/res/resource.rc b/src/core/stdclist/res/resource.rc index fb0fd779e1..6d32d6bf7d 100644 --- a/src/core/stdclist/res/resource.rc +++ b/src/core/stdclist/res/resource.rc @@ -478,7 +478,7 @@ BEGIN MENUITEM "&Away\tCtrl+2", ID_STATUS_AWAY
MENUITEM "&Not available\tCtrl+3", ID_STATUS_NA
MENUITEM "Occ&upied\tCtrl+4", ID_STATUS_OCCUPIED
- MENUITEM "&DND\tCtrl+5", ID_STATUS_DND
+ MENUITEM "&Do not disturb\tCtrl+5", ID_STATUS_DND
MENUITEM "&Free for chat\tCtrl+6", ID_STATUS_FREECHAT
MENUITEM "&Invisible\tCtrl+7", ID_STATUS_INVISIBLE
MENUITEM "On the &phone\tCtrl+8", ID_STATUS_ONTHEPHONE
diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp index 4713ca180d..37747c7b2b 100644 --- a/src/core/stdclist/src/clcopts.cpp +++ b/src/core/stdclist/src/clcopts.cpp @@ -65,7 +65,7 @@ static const struct CheckBoxValues_t greyoutValues[] = { PF2_SHORTAWAY, LPGENT("Away") },
{ PF2_LONGAWAY, LPGENT("Not available") },
{ PF2_LIGHTDND, LPGENT("Occupied") },
- { PF2_HEAVYDND, LPGENT("DND") },
+ { PF2_HEAVYDND, LPGENT("Do not disturb")},
{ PF2_FREECHAT, LPGENT("Free for chat") },
{ PF2_INVISIBLE, LPGENT("Invisible") },
{ PF2_OUTTOLUNCH, LPGENT("Out to lunch") },
@@ -79,7 +79,7 @@ static const struct CheckBoxValues_t offlineValues[] = { PF2_SHORTAWAY, LPGENT("Away") },
{ PF2_LONGAWAY, LPGENT("Not available") },
{ PF2_LIGHTDND, LPGENT("Occupied") },
- { PF2_HEAVYDND, LPGENT("DND") },
+ { PF2_HEAVYDND, LPGENT("Do not disturb")},
{ PF2_FREECHAT, LPGENT("Free for chat") },
{ PF2_INVISIBLE, LPGENT("Invisible") },
{ PF2_OUTTOLUNCH, LPGENT("Out to lunch") },
diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 62715f1688..f3367d4234 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -143,7 +143,7 @@ statusValues[] = { PF2_SHORTAWAY, LPGENT("Away") },
{ PF2_LONGAWAY, LPGENT("Not available") },
{ PF2_LIGHTDND, LPGENT("Occupied") },
- { PF2_HEAVYDND, LPGENT("DND") },
+ { PF2_HEAVYDND, LPGENT("Do not disturb") },
{ PF2_FREECHAT, LPGENT("Free for chat") },
{ PF2_INVISIBLE, LPGENT("Invisible") },
{ PF2_OUTTOLUNCH, LPGENT("Out to lunch") },
diff --git a/src/mir_app/src/clistmod.cpp b/src/mir_app/src/clistmod.cpp index 7a315baadf..2f9b3bd220 100644 --- a/src/mir_app/src/clistmod.cpp +++ b/src/mir_app/src/clistmod.cpp @@ -75,7 +75,7 @@ TCHAR* fnGetStatusModeDescription(int mode, int flags) descr = LPGENT("Away");
break;
case ID_STATUS_DND:
- descr = LPGENT("DND");
+ descr = LPGENT("Do not disturb");
break;
case ID_STATUS_NA:
descr = LPGENT("Not available");
diff --git a/src/mir_app/src/skinicons.cpp b/src/mir_app/src/skinicons.cpp index 79c29c8a30..a6db6c3a7c 100644 --- a/src/mir_app/src/skinicons.cpp +++ b/src/mir_app/src/skinicons.cpp @@ -105,7 +105,7 @@ static struct StandardIconDescription statusIcons[] = { ID_STATUS_AWAY, LPGEN("Away"), -IDI_AWAY, PF2_SHORTAWAY },
{ ID_STATUS_NA, LPGEN("Not available"), -IDI_NA, PF2_LONGAWAY },
{ ID_STATUS_OCCUPIED, LPGEN("Occupied"), -IDI_OCCUPIED, PF2_LIGHTDND },
- { ID_STATUS_DND, LPGEN("DND"), -IDI_DND, PF2_HEAVYDND },
+ { ID_STATUS_DND, LPGEN("Do not disturb"), -IDI_DND, PF2_HEAVYDND },
{ ID_STATUS_FREECHAT, LPGEN("Free for chat"), -IDI_FREE4CHAT, PF2_FREECHAT },
{ ID_STATUS_INVISIBLE, LPGEN("Invisible"), -IDI_INVISIBLE, PF2_INVISIBLE },
{ ID_STATUS_ONTHEPHONE, LPGEN("On the phone"), -IDI_ONTHEPHONE, PF2_ONTHEPHONE },
|