summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDart Raiden <wowemuh@gmail.com>2016-01-23 22:55:04 +0000
committerDart Raiden <wowemuh@gmail.com>2016-01-23 22:55:04 +0000
commit70ae1f696437caeef54556541c134bcd5bceb1cf (patch)
treed5bd53b25212f26fa8ad9725bbc57f8d0800f65b /src
parentd75191e83c56ea503ee9e4791b75cbe2b3bf0c5e (diff)
DND → Do not disturb
git-svn-id: http://svn.miranda-ng.org/main/trunk@16157 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
-rw-r--r--src/core/stdclist/res/resource.rc2
-rw-r--r--src/core/stdclist/src/clcopts.cpp4
-rw-r--r--src/core/stdmsg/src/msgoptions.cpp2
-rw-r--r--src/mir_app/src/clistmod.cpp2
-rw-r--r--src/mir_app/src/skinicons.cpp2
5 files changed, 6 insertions, 6 deletions
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 },