"NA" -> "N/A"

git-svn-id: http://svn.miranda-ng.org/main/trunk@16019 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

39 files changed, 68 insertions, 68 deletions

diff --git a/plugins/BASS_interface/res/Bass.rc b/plugins/BASS_interface/res/Bass.rc
index b82783da8c..e87a4efa2c 100644
--- a/plugins/BASS_interface/res/Bass.rc
+++ b/plugins/BASS_interface/res/Bass.rc
@@ -60,7 +60,7 @@ BEGIN
 	AUTOCHECKBOX    "Offline", IDC_CHECKBOX1, 240, 20, 65, 8

 	AUTOCHECKBOX    "Online", IDC_CHECKBOX2, 240, 30, 65, 8

 	AUTOCHECKBOX    "Away", IDC_CHECKBOX3, 240, 40, 65, 8

-	AUTOCHECKBOX    "NA", IDC_CHECKBOX4, 240, 50, 65, 8

+	AUTOCHECKBOX    "N/A", IDC_CHECKBOX4, 240, 50, 65, 8

 	AUTOCHECKBOX    "Occupied", IDC_CHECKBOX5, 240, 60, 65, 8

 	AUTOCHECKBOX    "DND", IDC_CHECKBOX6, 240, 70, 65, 8

 	AUTOCHECKBOX    "Free for chat", IDC_CHECKBOX7, 240, 80, 65, 8

diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp
index 14230d91cb..9d910a78ef 100644
--- a/plugins/BuddyPounce/src/dialog.cpp
+++ b/plugins/BuddyPounce/src/dialog.cpp
@@ -135,13 +135,13 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta
 			SetDlgItemText(hwnd, IDC_CHECK1, TranslateT("Any"));

 			SetDlgItemText(hwnd, IDC_CHECK2, TranslateT("Online"));

 			SetDlgItemText(hwnd, IDC_CHECK3, TranslateT("Away"));

-			SetDlgItemText(hwnd, IDC_CHECK4, TranslateT("NA"));

+			SetDlgItemText(hwnd, IDC_CHECK4, TranslateT("N/A"));

 			SetDlgItemText(hwnd, IDC_CHECK5, TranslateT("Occupied"));

 			SetDlgItemText(hwnd, IDC_CHECK6, TranslateT("DND"));

-			SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("Free For Chat"));

+			SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("Free For chat"));

 			SetDlgItemText(hwnd, IDC_CHECK8, TranslateT("Invisible"));

-			SetDlgItemText(hwnd, IDC_CHECK9, TranslateT("On The Phone"));

-			SetDlgItemText(hwnd, IDC_CHECK10, TranslateT("Out To Lunch"));

+			SetDlgItemText(hwnd, IDC_CHECK9, TranslateT("On the phone"));

+			SetDlgItemText(hwnd, IDC_CHECK10, TranslateT("Out to lunch"));

 		}

 	}

 	else {

@@ -156,13 +156,13 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta
 			SetDlgItemText(hwnd, IDC_CHECK1, TranslateT("From Offline"));

 			SetDlgItemText(hwnd, IDC_CHECK2, TranslateT("To Online"));

 			SetDlgItemText(hwnd, IDC_CHECK3, TranslateT("To Away"));

-			SetDlgItemText(hwnd, IDC_CHECK4, TranslateT("To NA"));

+			SetDlgItemText(hwnd, IDC_CHECK4, TranslateT("To N/A"));

 			SetDlgItemText(hwnd, IDC_CHECK5, TranslateT("To Occupied"));

 			SetDlgItemText(hwnd, IDC_CHECK6, TranslateT("To DND"));

-			SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("To Free For Chat"));

+			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"));

-			SetDlgItemText(hwnd, IDC_CHECK10, TranslateT("To Out To Lunch"));

+			SetDlgItemText(hwnd, IDC_CHECK9, TranslateT("To On the phone"));

+			SetDlgItemText(hwnd, IDC_CHECK10, TranslateT("To Out to lunch"));

 		}

 	}

 	CheckDlgButton(hwnd, IDC_CHECK1, statusFlag&ANY ? BST_CHECKED : BST_UNCHECKED);

diff --git a/plugins/Clist_blind/res/resource.rc b/plugins/Clist_blind/res/resource.rc
index 0077545bab..cf06c730fb 100644
--- a/plugins/Clist_blind/res/resource.rc
+++ b/plugins/Clist_blind/res/resource.rc
@@ -328,7 +328,7 @@ BEGIN
         MENUITEM "&Offline\tCtrl+0",            ID_STATUS_OFFLINE, CHECKED

         MENUITEM "On&line\tCtrl+1",             ID_STATUS_ONLINE

         MENUITEM "&Away\tCtrl+2",               ID_STATUS_AWAY

-        MENUITEM "&NA\tCtrl+3",                 ID_STATUS_NA

+        MENUITEM "&N/A\tCtrl+3",                 ID_STATUS_NA

         MENUITEM "Occ&upied\tCtrl+4",           ID_STATUS_OCCUPIED

         MENUITEM "&DND\tCtrl+5",                ID_STATUS_DND

         MENUITEM "&Free for chat\tCtrl+6",      ID_STATUS_FREECHAT

diff --git a/plugins/Clist_blind/src/clcopts.cpp b/plugins/Clist_blind/src/clcopts.cpp
index bc10aa10f0..7134f060f5 100644
--- a/plugins/Clist_blind/src/clcopts.cpp
+++ b/plugins/Clist_blind/src/clcopts.cpp
@@ -63,7 +63,7 @@ static const struct CheckBoxValues_t greyoutValues[] = {
 	{ MODEF_OFFLINE,  LPGENT("Offline")       },

 	{ PF2_ONLINE,     LPGENT("Online")        },

 	{ PF2_SHORTAWAY,  LPGENT("Away")          },

-	{ PF2_LONGAWAY,   LPGENT("NA")            },

+	{ PF2_LONGAWAY,   LPGENT("N/A")            },

 	{ PF2_LIGHTDND,   LPGENT("Occupied")      },

 	{ PF2_HEAVYDND,   LPGENT("DND")           },

 	{ PF2_FREECHAT,   LPGENT("Free for chat") },

@@ -76,7 +76,7 @@ static const struct CheckBoxValues_t offlineValues[] = {
 	{ MODEF_OFFLINE,  LPGENT("Offline")       },

 	{ PF2_ONLINE,     LPGENT("Online")        },

 	{ PF2_SHORTAWAY,  LPGENT("Away")          },

-	{ PF2_LONGAWAY,   LPGENT("NA")            },

+	{ PF2_LONGAWAY,   LPGENT("N/A")            },

 	{ PF2_LIGHTDND,   LPGENT("Occupied")      },

 	{ PF2_HEAVYDND,   LPGENT("DND")           },

 	{ PF2_FREECHAT,   LPGENT("Free for chat") },

diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index d06850f4be..86485ef6e6 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -810,7 +810,7 @@ BEGIN
         MENUITEM "&Offline\tCtrl+0",            ID_STATUS_OFFLINE, CHECKED

         MENUITEM "On&line\tCtrl+1",             ID_STATUS_ONLINE

         MENUITEM "&Away\tCtrl+2",               ID_STATUS_AWAY

-        MENUITEM "&NA\tCtrl+3",                 ID_STATUS_NA

+        MENUITEM "&N/A\tCtrl+3",                 ID_STATUS_NA

         MENUITEM "Occ&upied\tCtrl+4",           ID_STATUS_OCCUPIED

         MENUITEM "&DND\tCtrl+5",                ID_STATUS_DND

         MENUITEM "&Free for chat\tCtrl+6",      ID_STATUS_FREECHAT

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 51a59ba563..8a10e540aa 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -76,7 +76,7 @@ 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_NA, CLCGROUP, LPGENT("NA contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

+	{ FIDF_CLASSGENERAL, FONTID_NA, CLCGROUP, LPGENT("N/A 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 },

 	{ FIDF_CLASSGENERAL, FONTID_INVISIBLE, CLCGROUP, LPGENT("Invisible contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

@@ -262,7 +262,7 @@ static const struct CheckBoxValues_t greyoutValues[] = {
 	{ MODEF_OFFLINE, LPGENT("Offline") },

 	{ PF2_ONLINE, LPGENT("Online") },

 	{ PF2_SHORTAWAY, LPGENT("Away") },

-	{ PF2_LONGAWAY, LPGENT("NA") },

+	{ PF2_LONGAWAY, LPGENT("N/A") },

 	{ PF2_LIGHTDND, LPGENT("Occupied") },

 	{ PF2_HEAVYDND, LPGENT("DND") },

 	{ PF2_FREECHAT, LPGENT("Free for chat") },

@@ -275,7 +275,7 @@ static const struct CheckBoxValues_t offlineValues[] = {
 	{ MODEF_OFFLINE, LPGENT("Offline") },

 	{ PF2_ONLINE, LPGENT("Online") },

 	{ PF2_SHORTAWAY, LPGENT("Away") },

-	{ PF2_LONGAWAY, LPGENT("NA") },

+	{ PF2_LONGAWAY, LPGENT("N/A") },

 	{ PF2_LIGHTDND, LPGENT("Occupied") },

 	{ PF2_HEAVYDND, LPGENT("DND") },

 	{ PF2_FREECHAT, LPGENT("Free for chat") },

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index ece75814f1..d5a26196d8 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -123,7 +123,7 @@ OVERLAYICONINFO g_pAvatarOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE +
 	{ "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_NA", LPGEN("NA"), IDI_AVATAR_OVERLAY_NA, -1 },

+	{ "AVATAR_OVERLAY_NA", LPGEN("N/A"), 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 },

 	{ "AVATAR_OVERLAY_INVISIBLE", LPGEN("Invisible"), IDI_AVATAR_OVERLAY_INVISIBLE, -1 },

@@ -137,7 +137,7 @@ OVERLAYICONINFO g_pStatusOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE +
 	{ "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_NA", LPGEN("NA"), IDI_STATUS_OVERLAY_NA, -1 },

+	{ "STATUS_OVERLAY_NA", LPGEN("N/A"), 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 },

 	{ "STATUS_OVERLAY_INVISIBLE", LPGEN("Invisible"), IDI_STATUS_OVERLAY_INVISIBLE, -1 },

diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc
index fae63168e0..b66c3ef266 100644
--- a/plugins/Clist_nicer/res/resource.rc
+++ b/plugins/Clist_nicer/res/resource.rc
@@ -590,7 +590,7 @@ BEGIN
         MENUITEM "&Offline\tCtrl+0",            ID_STATUS_OFFLINE, CHECKED

         MENUITEM "On&line\tCtrl+1",             ID_STATUS_ONLINE

         MENUITEM "&Away\tCtrl+2",               ID_STATUS_AWAY

-        MENUITEM "&NA\tCtrl+3",                 ID_STATUS_NA

+        MENUITEM "&N/A\tCtrl+3",                 ID_STATUS_NA

         MENUITEM "Occ&upied\tCtrl+4",           ID_STATUS_OCCUPIED

         MENUITEM "&DND\tCtrl+5",                ID_STATUS_DND

         MENUITEM "&Free for chat\tCtrl+6",      ID_STATUS_FREECHAT

diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp
index 7a912adc3c..c7e4d1e5b5 100644
--- a/plugins/Clist_nicer/src/clcopts.cpp
+++ b/plugins/Clist_nicer/src/clcopts.cpp
@@ -67,11 +67,11 @@ 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("NA") }, { PF2_LIGHTDND, LPGENT("Occupied") }, { PF2_HEAVYDND, LPGENT("DND") }, { PF2_FREECHAT, LPGENT("Free for chat") },

+	{ PF2_LONGAWAY, LPGENT("N/A") }, { PF2_LIGHTDND, LPGENT("Occupied") }, { PF2_HEAVYDND, LPGENT("DND") }, { 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("NA") },

+	{ MODEF_OFFLINE, LPGENT("Offline") }, { PF2_ONLINE, LPGENT("Online") }, { PF2_SHORTAWAY, LPGENT("Away") }, { PF2_LONGAWAY, LPGENT("N/A") },

 	{ PF2_LIGHTDND, LPGENT("Occupied") }, { PF2_HEAVYDND, LPGENT("DND") }, { 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/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp
index 76d80cc0c9..3ea300cd80 100644
--- a/plugins/Clist_nicer/src/extBackg.cpp
+++ b/plugins/Clist_nicer/src/extBackg.cpp
@@ -60,7 +60,7 @@ static StatusItems_t _StatusItems[] = {
 	CLCDEFAULT_GRADIENT,CLCDEFAULT_CORNER,

 	CLCDEFAULT_COLOR, CLCDEFAULT_COLOR2, CLCDEFAULT_COLOR2_TRANSPARENT, CLCDEFAULT_TEXTCOLOR, CLCDEFAULT_ALPHA, CLCDEFAULT_MRGN_LEFT,

 	CLCDEFAULT_MRGN_TOP, CLCDEFAULT_MRGN_RIGHT, CLCDEFAULT_MRGN_BOTTOM, CLCDEFAULT_IGNORE

-	}, {"NA", "EXBK_NA", ID_STATUS_NA,

+	}, {"N/A", "EXBK_NA", ID_STATUS_NA,

 	CLCDEFAULT_GRADIENT,CLCDEFAULT_CORNER,

 	CLCDEFAULT_COLOR, CLCDEFAULT_COLOR2, CLCDEFAULT_COLOR2_TRANSPARENT, CLCDEFAULT_TEXTCOLOR, CLCDEFAULT_ALPHA, CLCDEFAULT_MRGN_LEFT,

 	CLCDEFAULT_MRGN_TOP, CLCDEFAULT_MRGN_RIGHT, CLCDEFAULT_MRGN_BOTTOM, CLCDEFAULT_IGNORE

diff --git a/plugins/HTTPServer/res/resource.rc b/plugins/HTTPServer/res/resource.rc
index acc656b326..b0c384df04 100644
--- a/plugins/HTTPServer/res/resource.rc
+++ b/plugins/HTTPServer/res/resource.rc
@@ -88,7 +88,7 @@ BEGIN
     PUSHBUTTON      "Test",IDC_TEST_EXTERNALIP,224,126,51,14

     EDITTEXT        IDC_MAX_SPEED,35,181,24,12,ES_AUTOHSCROLL

     LTEXT           "Transfer limit (Kb/s)",IDC_STATIC,62,183,91,8

-    CONTROL         "No control when Away/NA",IDC_LIMIT_ONLY_WHEN_ONLINE,

+    CONTROL         "No control when Away or N/A",IDC_LIMIT_ONLY_WHEN_ONLINE,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,35,224,114,10

     GROUPBOX        "Connection control",IDC_STATIC,30,155,127,81

     GROUPBOX        "Index creation",IDC_STATIC,162,155,122,56

diff --git a/plugins/KeyboardNotify/res/resources.rc b/plugins/KeyboardNotify/res/resources.rc
index 428b825334..25575a9a0c 100644
--- a/plugins/KeyboardNotify/res/resources.rc
+++ b/plugins/KeyboardNotify/res/resources.rc
@@ -79,7 +79,7 @@ BEGIN
     CONTROL         "Online",IDC_ONLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,88,65,9

     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         "NA",IDC_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,108,128,9

+    CONTROL         "N/A",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         "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

diff --git a/plugins/MyDetails/res/resource.rc b/plugins/MyDetails/res/resource.rc
index 63f8a2ebc8..7bb206443d 100644
--- a/plugins/MyDetails/res/resource.rc
+++ b/plugins/MyDetails/res/resource.rc
@@ -193,7 +193,7 @@ BEGIN
         MENUITEM "&Offline",                    ID_STATUS_OFFLINE

         MENUITEM "On&line",                     ID_STATUS_ONLINE

         MENUITEM "&Away",                       ID_STATUS_AWAY

-        MENUITEM "&NA",                         ID_STATUS_NA

+        MENUITEM "&N/A",                         ID_STATUS_NA

         MENUITEM "Occ&upied",                   ID_STATUS_OCCUPIED

         MENUITEM "&DND",                        ID_STATUS_DND

         MENUITEM "&Free for chat",              ID_STATUS_FREECHAT

diff --git a/plugins/NewAwaySysMod/res/NewAwaySys.rc b/plugins/NewAwaySysMod/res/NewAwaySys.rc
index 30dd7b6466..d6e1ab18f2 100644
--- a/plugins/NewAwaySysMod/res/NewAwaySys.rc
+++ b/plugins/NewAwaySysMod/res/NewAwaySys.rc
@@ -98,7 +98,7 @@ BEGIN
     LTEXT           "Disable autoreply when...",IDC_REPLYDLG_STATIC_DISABLEWHENSTATUS,13,134,283,8

     CONTROL         "On&line",IDC_REPLYDLG_DISABLE_ONL,"MButtonClass",WS_TABSTOP,21,146,16,14,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&Away",IDC_REPLYDLG_DISABLE_AWAY,"MButtonClass",WS_TABSTOP,37,146,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "&NA",IDC_REPLYDLG_DISABLE_NA,"MButtonClass",WS_TABSTOP,53,146,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "&N/A",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         "&Free for chat",IDC_REPLYDLG_DISABLE_FFC,"MButtonClass",WS_TABSTOP,101,146,16,14,WS_EX_NOACTIVATE | 0x10000000L

@@ -145,7 +145,7 @@ BEGIN
     GROUPBOX        "Use this message as default for",IDC_STATIC,138,186,166,30,BS_LEFT

     CONTROL         "On&line",IDC_MESSAGEDLG_DEF_ONL,"MButtonClass",WS_TABSTOP,149,197,16,14,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&Away",IDC_MESSAGEDLG_DEF_AWAY,"MButtonClass",WS_TABSTOP,165,197,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "&NA",IDC_MESSAGEDLG_DEF_NA,"MButtonClass",WS_TABSTOP,181,197,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "&N/A",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         "&Free for chat",IDC_MESSAGEDLG_DEF_FFC,"MButtonClass",WS_TABSTOP,229,197,16,14,WS_EX_NOACTIVATE | 0x10000000L

@@ -169,7 +169,7 @@ BEGIN
     GROUPBOX        "Use this message as default for",IDC_TXT_TITLE3,138,111,228,30,BS_LEFT

     CONTROL         "On&line",IDC_MESSAGEDLG_DEF_ONL,"MButtonClass",WS_TABSTOP,144,122,16,14,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&Away",IDC_MESSAGEDLG_DEF_AWAY,"MButtonClass",WS_TABSTOP,160,122,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "&NA",IDC_MESSAGEDLG_DEF_NA,"MButtonClass",WS_TABSTOP,176,122,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "&N/A",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         "&Free for chat",IDC_MESSAGEDLG_DEF_FFC,"MButtonClass",WS_TABSTOP,224,122,16,14,WS_EX_NOACTIVATE | 0x10000000L

@@ -228,7 +228,7 @@ BEGIN
     GROUPBOX        "Don't show the message dialog for",IDC_STATIC,6,200,156,31

     CONTROL         "On&line",IDC_MOREOPTDLG_DONTPOPDLG_ONL,"MButtonClass",WS_TABSTOP,12,212,16,14,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "&Away",IDC_MOREOPTDLG_DONTPOPDLG_AWAY,"MButtonClass",WS_TABSTOP,28,212,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "&NA",IDC_MOREOPTDLG_DONTPOPDLG_NA,"MButtonClass",WS_TABSTOP,44,212,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "&N/A",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         "&Free for chat",IDC_MOREOPTDLG_DONTPOPDLG_FFC,

@@ -397,7 +397,7 @@ BEGIN
         BEGIN

             MENUITEM "On&line",                     IDR_MSGTREEMENU_DEF_ONL

             MENUITEM "&Away",                       IDR_MSGTREEMENU_DEF_AWAY

-            MENUITEM "&NA",                         IDR_MSGTREEMENU_DEF_NA

+            MENUITEM "&N/A",                        IDR_MSGTREEMENU_DEF_NA

             MENUITEM "Occ&upied",                   IDR_MSGTREEMENU_DEF_OCC

             MENUITEM "&DND",                        IDR_MSGTREEMENU_DEF_DND

             MENUITEM "&Free for chat",              IDR_MSGTREEMENU_DEF_FFC

diff --git a/plugins/NewAwaySysMod/src/AwayOpt.cpp b/plugins/NewAwaySysMod/src/AwayOpt.cpp
index 8aaffbe189..5877ff0601 100644
--- a/plugins/NewAwaySysMod/src/AwayOpt.cpp
+++ b/plugins/NewAwaySysMod/src/AwayOpt.cpp
@@ -1289,7 +1289,7 @@ void InitOptions()
 	g_MsgTreePage.Items.AddElem(new COptItem_IntDBSetting(IDS_MESSAGEDLG_DEF_AWAY, StatusToDBSetting(ID_STATUS_AWAY, MESSAGES_DB_MSGTREEDEF), DBVT_WORD, false, ID));

 	DefMsgTree.AddElem(CTreeItem(TranslateT("Away"), ParentID1, ID++, 0, TranslateT("Been gone since %nas_awaysince_time%, will be back later.")));

 	g_MsgTreePage.Items.AddElem(new COptItem_IntDBSetting(IDS_MESSAGEDLG_DEF_NA, StatusToDBSetting(ID_STATUS_NA, MESSAGES_DB_MSGTREEDEF), DBVT_WORD, false, ID));

-	DefMsgTree.AddElem(CTreeItem(TranslateT("NA"), ParentID1, ID++, 0, TranslateT("Give it up, I'm not in!")));

+	DefMsgTree.AddElem(CTreeItem(TranslateT("N/A"), ParentID1, ID++, 0, TranslateT("Give it up, I'm not in!")));

 	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));

diff --git a/plugins/NewXstatusNotify/res/resource.rc b/plugins/NewXstatusNotify/res/resource.rc
index 7590645455..1671f206db 100644
--- a/plugins/NewXstatusNotify/res/resource.rc
+++ b/plugins/NewXstatusNotify/res/resource.rc
@@ -35,7 +35,7 @@ BEGIN
     CONTROL         "Invisible",IDC_CHK_INVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,196,14,94,8

     CONTROL         "Free for chat",IDC_CHK_FREECHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,89,8

     CONTROL         "Away",IDC_CHK_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,103,25,87,8

-    CONTROL         "NA",IDC_CHK_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,196,25,94,8

+    CONTROL         "N/A",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         "Out to lunch",IDC_CHK_OUTTOLUNCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,196,36,94,8

@@ -118,7 +118,7 @@ BEGIN
     LTEXT           "Away",IDC_STATIC,10,58,56,8

     CONTROL         "",IDC_AWAY_BG,"ColourPicker",WS_TABSTOP,73,56,24,12

     CONTROL         "",IDC_AWAY_TX,"ColourPicker",WS_TABSTOP,106,56,24,12

-    LTEXT           "NA",IDC_STATIC,10,73,56,8

+    LTEXT           "N/A",IDC_STATIC,10,73,56,8

     CONTROL         "",IDC_NA_BG,"ColourPicker",WS_TABSTOP,73,71,24,12

     CONTROL         "",IDC_NA_TX,"ColourPicker",WS_TABSTOP,106,71,24,12

     LTEXT           "Occupied",IDC_STATIC,10,88,56,8

@@ -220,7 +220,7 @@ BEGIN
     CONTROL         "Invisible",IDC_CHK_INVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,59,116,10

     CONTROL         "Free for chat",IDC_CHK_FREECHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,69,116,10

     CONTROL         "Away",IDC_CHK_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,79,116,10

-    CONTROL         "NA",IDC_CHK_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,89,116,10

+    CONTROL         "N/A",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         "Out to lunch",IDC_CHK_OUTTOLUNCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,129,116,10

@@ -232,7 +232,7 @@ BEGIN
     CONTROL         "Invisible",IDC_CHK_INVISIBLE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,60,116,10

     CONTROL         "Free for chat",IDC_CHK_FREECHAT2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,70,116,10

     CONTROL         "Away",IDC_CHK_AWAY2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,80,116,10

-    CONTROL         "NA",IDC_CHK_NA2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,90,116,10

+    CONTROL         "N/A",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         "Out to lunch",IDC_CHK_OUTTOLUNCH2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,130,116,10

diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index 24404222a9..7ae3c90b0e 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -914,7 +914,7 @@ void InitStatusList()
 	mir_tstrncpy(StatusList[index].lpzMStatusText, TranslateT("(M) isn't there anymore!"), MAX_STATUSTEXT);

 	mir_tstrncpy(StatusList[index].lpzFStatusText, TranslateT("(F) isn't there anymore!"), MAX_STATUSTEXT);

 	mir_tstrncpy(StatusList[index].lpzUStatusText, TranslateT("(U) isn't there anymore!"), MAX_STATUSTEXT);

-	mir_tstrncpy(StatusList[index].lpzStandardText, TranslateT("NA"), MAX_STANDARDTEXT);

+	mir_tstrncpy(StatusList[index].lpzStandardText, TranslateT("N/A"), MAX_STANDARDTEXT);

 	mir_strncpy(StatusList[index].lpzSkinSoundName, "UserNA", MAX_SKINSOUNDNAME);

 	mir_tstrncpy(StatusList[index].lpzSkinSoundDesc, LPGENT("User: Not available"), MAX_SKINSOUNDDESC);

 	mir_tstrncpy(StatusList[index].lpzSkinSoundFile, _T("na.wav"), MAX_PATH);

diff --git a/plugins/Non-IM Contact/src/contactinfo.cpp b/plugins/Non-IM Contact/src/contactinfo.cpp
index 1c028354a3..095d04bc7d 100644
--- a/plugins/Non-IM Contact/src/contactinfo.cpp
+++ b/plugins/Non-IM Contact/src/contactinfo.cpp
@@ -595,19 +595,19 @@ INT_PTR ImportContacts(WPARAM, LPARAM)
 				else if (icon == ID_STATUS_AWAY)

 					mir_snprintf(tmp, "Icon: Away\r\n");

 				else if (icon == ID_STATUS_NA)

-					mir_snprintf(tmp, "Icon: NA\r\n");

+					mir_snprintf(tmp, "Icon: N/A\r\n");

 				else if (icon == ID_STATUS_DND)

 					mir_snprintf(tmp, "Icon: DND\r\n");

 				else if (icon == ID_STATUS_OCCUPIED)

 					mir_snprintf(tmp, "Icon: Occupied\r\n");

 				else if (icon == ID_STATUS_FREECHAT)

-					mir_snprintf(tmp, "Icon: Free For Chat\r\n");

+					mir_snprintf(tmp, "Icon: Free for chat\r\n");

 				else if (icon == ID_STATUS_INVISIBLE)

 					mir_snprintf(tmp, "Icon: Invisible\r\n");

 				else if (icon == ID_STATUS_ONTHEPHONE)

-					mir_snprintf(tmp, "Icon: On The Phone\r\n");

+					mir_snprintf(tmp, "Icon: On the phone\r\n");

 				else if (icon == ID_STATUS_OUTTOLUNCH)

-					mir_snprintf(tmp, "Icon: Out To Lunch\r\n");

+					mir_snprintf(tmp, "Icon: Out to lunch\r\n");

 				else {

 					free(msg);

 					continue;

diff --git a/plugins/Nudge/res/resource.rc b/plugins/Nudge/res/resource.rc
index f4260d9efa..43592078d1 100644
--- a/plugins/Nudge/res/resource.rc
+++ b/plugins/Nudge/res/resource.rc
@@ -88,7 +88,7 @@ BEGIN
     CONTROL         "Offline",IDC_CHECKST0,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,18,147,58,9

     CONTROL         "Online",IDC_CHECKST1,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,18,157,58,9

     CONTROL         "Away",IDC_CHECKST2,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,18,167,58,9

-    CONTROL         "NA",IDC_CHECKST3,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,18,177,58,9

+    CONTROL         "N/A",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         "Free for chat",IDC_CHECKST6,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,84,157,72,9

diff --git a/plugins/Popup/src/opt_class.cpp b/plugins/Popup/src/opt_class.cpp
index 558dfcd321..1c2a5c9299 100644
--- a/plugins/Popup/src/opt_class.cpp
+++ b/plugins/Popup/src/opt_class.cpp
@@ -146,7 +146,7 @@ static statusButtons[] = {
 	{ IDC_SOFFLINE, SKINICON_STATUS_OFFLINE, "Offline", PF2_IDLE, PF2_IDLE },

 	{ IDC_SONLINE, SKINICON_STATUS_ONLINE, "Online", PF2_ONLINE, PF2_ONLINE },

 	{ IDC_SAWAY, SKINICON_STATUS_AWAY, "Away", PF2_SHORTAWAY, PF2_SHORTAWAY },

-	{ IDC_SNA, SKINICON_STATUS_NA, "NA", PF2_LONGAWAY, PF2_LONGAWAY },

+	{ IDC_SNA, SKINICON_STATUS_NA, "N/A", 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_SFREE4CHAT, SKINICON_STATUS_FREE4CHAT, "Free for chat", PF2_FREECHAT, PF2_FREECHAT },

@@ -157,7 +157,7 @@ static statusButtons[] = {
 	{ IDC_SOFFLINE2, SKINICON_STATUS_OFFLINE, "Offline", PF2_IDLE, PF2_IDLE << 16 },

 	{ IDC_SONLINE2, SKINICON_STATUS_ONLINE, "Online", PF2_ONLINE, PF2_ONLINE << 16 },

 	{ IDC_SAWAY2, SKINICON_STATUS_AWAY, "Away", PF2_SHORTAWAY, PF2_SHORTAWAY << 16 },

-	{ IDC_SNA2, SKINICON_STATUS_NA, "NA", PF2_LONGAWAY, PF2_LONGAWAY << 16 },

+	{ IDC_SNA2, SKINICON_STATUS_NA, "N/A", 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_SFREE4CHAT2, SKINICON_STATUS_FREE4CHAT, "Free for chat", PF2_FREECHAT, PF2_FREECHAT << 16 },

diff --git a/plugins/Popup/src/opt_gen.cpp b/plugins/Popup/src/opt_gen.cpp
index 9196160c67..6af7196d0b 100644
--- a/plugins/Popup/src/opt_gen.cpp
+++ b/plugins/Popup/src/opt_gen.cpp
@@ -59,7 +59,7 @@ int AddStatusMode(OPTTREE_OPTION *options, int pos, LPTSTR prefix, DWORD flag)
 	case PF2_ONLINE: mir_tstrcat(options[pos].pszOptionName, LPGENT("Online")); break;

 	case PF2_INVISIBLE: mir_tstrcat(options[pos].pszOptionName, LPGENT("Invisible")); break;

 	case PF2_SHORTAWAY: mir_tstrcat(options[pos].pszOptionName, LPGENT("Away")); break;

-	case PF2_LONGAWAY: mir_tstrcat(options[pos].pszOptionName, LPGENT("NA")); break;

+	case PF2_LONGAWAY: mir_tstrcat(options[pos].pszOptionName, LPGENT("N/A")); 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_FREECHAT: mir_tstrcat(options[pos].pszOptionName, LPGENT("Free for chat")); break;

diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index 39cb044c5a..f862ea0c25 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -210,7 +210,7 @@ static const struct CheckBoxValues_t statusValues[] =
 	{ MODEF_OFFLINE, LPGENT("Offline") },

 	{ PF2_ONLINE, LPGENT("Online") },

 	{ PF2_SHORTAWAY, LPGENT("Away") },

-	{ PF2_LONGAWAY, LPGENT("NA") },

+	{ PF2_LONGAWAY, LPGENT("N/A") },

 	{ PF2_LIGHTDND, LPGENT("Occupied") },

 	{ PF2_HEAVYDND, LPGENT("DND") },

 	{ PF2_FREECHAT, LPGENT("Free for chat") },

diff --git a/plugins/SeenPlugin/res/resource.rc b/plugins/SeenPlugin/res/resource.rc
index ef7120a80d..b50819bd92 100644
--- a/plugins/SeenPlugin/res/resource.rc
+++ b/plugins/SeenPlugin/res/resource.rc
@@ -93,7 +93,7 @@ BEGIN
     RTEXT           "Away",IDC_STATIC,10,103,60,10

     CONTROL         "",ID_STATUS_AWAY,"ColourPicker",WS_TABSTOP,80,100,20,14

     CONTROL         "",40093,"ColourPicker",WS_TABSTOP,105,100,20,14

-    RTEXT           "NA",IDC_STATIC,10,123,60,10

+    RTEXT           "N/A",IDC_STATIC,10,123,60,10

     CONTROL         "",ID_STATUS_NA,"ColourPicker",WS_TABSTOP,80,120,20,14

     CONTROL         "",40095,"ColourPicker",WS_TABSTOP,105,120,20,14

     RTEXT           "Occupied",IDC_STATIC,10,143,60,10

diff --git a/plugins/SkypeStatusChange/src/main.cpp b/plugins/SkypeStatusChange/src/main.cpp
index a736c1d421..41fe5997ef 100644
--- a/plugins/SkypeStatusChange/src/main.cpp
+++ b/plugins/SkypeStatusChange/src/main.cpp
@@ -50,7 +50,7 @@ LPCTSTR g_pszSkypeWndClassName = _T("SkypeHelperWindow{155198f0-8749-47b7-ac53-5
 const CMirandaStatus2SkypeStatus g_aStatusCode[10] =

 {

 	{ID_STATUS_AWAY, "AWAY",_T("Away")},

-	{ID_STATUS_NA, "AWAY",_T("NA")}, // removed in Skype 5

+	{ID_STATUS_NA, "AWAY",_T("N/A")}, // removed in Skype 5

 	{ID_STATUS_DND, "DND",_T("DND")},

 	{ID_STATUS_ONLINE, "ONLINE",_T("Online")},

 	{ID_STATUS_FREECHAT, "ONLINE",_T("Free for chat")},	// SKYPEME status doesn't work in Skype 4!

diff --git a/plugins/StatusChange/res/resource.rc b/plugins/StatusChange/res/resource.rc
index 9196aea0a3..aecb6d914e 100644
--- a/plugins/StatusChange/res/resource.rc
+++ b/plugins/StatusChange/res/resource.rc
@@ -40,7 +40,7 @@ BEGIN
     CONTROL         "Offline",IDC_RAD_OFFLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,101,95,10

     CONTROL         "Online",IDC_RAD_ONLINE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,111,95,10

     CONTROL         "Away",IDC_RAD_AWAY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,121,95,10

-    CONTROL         "NA",IDC_RAD_NA,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,131,95,10

+    CONTROL         "N/A",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         "Free for chat",IDC_RAD_FREECHAT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,165,111,95,10

@@ -50,7 +50,7 @@ BEGIN
     CONTROL         "Offline",IDC_CHK_OFFLINE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,60,178,95,10

     CONTROL         "Online",IDC_CHK_ONLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,188,95,10

     CONTROL         "Away",IDC_CHK_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,198,95,10

-    CONTROL         "NA",IDC_CHK_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,208,95,10

+    CONTROL         "N/A",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         "Free for chat",IDC_CHK_FREECHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,188,95,10

diff --git a/plugins/Utils.pas/editwrapper.rc b/plugins/Utils.pas/editwrapper.rc
index 105a112119..663f64194e 100644
--- a/plugins/Utils.pas/editwrapper.rc
+++ b/plugins/Utils.pas/editwrapper.rc
@@ -4,7 +4,7 @@ LANGUAGE 0,0
 

 IDD_EDITCONTROL DIALOGEX 0, 0, 226,184, 0

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_VISIBLE | WS_THICKFRAME

-CAPTION "Text Editor"

+CAPTION "Text editor"

 EXSTYLE  WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0

 {

@@ -16,7 +16,7 @@ FONT 8, "MS Shell Dlg", 0, 0
            ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_HSCROLL | WS_VSCROLL

   EDITTEXT IDC_TEXT_EDIT_W, 4, 40, 218, 124, 

            ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL

-  AUTOCHECKBOX "Wrap Text", IDC_TEXT_WRAP, 4, 168, 116, 14

+  AUTOCHECKBOX "Wrap text", IDC_TEXT_WRAP, 4, 168, 116, 14

 

   PUSHBUTTON "&OK"    , IDOK    , 124, 168,  46, 14

   PUSHBUTTON "C&ancel", IDCANCEL, 176, 168,  46, 14

diff --git a/plugins/Utils.pas/protocols.pas b/plugins/Utils.pas/protocols.pas
index 85fadc4001..2ed2ac0954 100644
--- a/plugins/Utils.pas/protocols.pas
+++ b/plugins/Utils.pas/protocols.pas
@@ -75,7 +75,7 @@ const
 const

   StatNames:array [0..NumStatus-1] of PWideChar=(

   'Default'{'Offline'},'Online','Invisible','Away','N/A','Occupied','DND',

-  'Free for chat','Out to lunch','On the Phone');

+  'Free for chat','Out to lunch','On the phone');

 

 type

   pMyProto = ^tMyProto;

diff --git a/plugins/Utils.pas/strans.pas b/plugins/Utils.pas/strans.pas
index 350f937018..bf5191e3e3 100644
--- a/plugins/Utils.pas/strans.pas
+++ b/plugins/Utils.pas/strans.pas
@@ -50,8 +50,8 @@ const
     (typ:SST_DWORD ; short:'dword' ; full:'DWord'),

     (typ:SST_QWORD ; short:'qword' ; full:'QWord'),

     (typ:SST_NATIVE; short:'native'; full:'NativeInt'),

-    (typ:SST_BARR  ; short:'b.arr' ; full:'Byte Array'),

-    (typ:SST_WARR  ; short:'w.arr' ; full:'Word Array'),

+    (typ:SST_BARR  ; short:'b.arr' ; full:'Byte array'),

+    (typ:SST_WARR  ; short:'w.arr' ; full:'Word array'),

     (typ:SST_BPTR  ; short:'b.ptr' ; full:'Pointer to bytes'),

     (typ:SST_WPTR  ; short:'w.ptr' ; full:'Pointer to words'),

 {$IFDEF Miranda}

diff --git a/plugins/WinterSpeak/res/Speak.rc b/plugins/WinterSpeak/res/Speak.rc
index 336d23981a..34add84779 100644
--- a/plugins/WinterSpeak/res/Speak.rc
+++ b/plugins/WinterSpeak/res/Speak.rc
@@ -56,7 +56,7 @@ BEGIN
     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         "NA",IDC_STATUS_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,63,85,10

+    CONTROL         "N/A",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

     CONTROL         "Invisible",IDC_STATUS_INVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,96,85,10

@@ -88,7 +88,7 @@ BEGIN
     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         "NA",IDC_ACTIVE_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,46,75,10

+    CONTROL         "N/A",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

     CONTROL         "Invisible",IDC_ACTIVE_INVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,79,75,10

diff --git a/plugins/YARelay/res/yaRelay.rc b/plugins/YARelay/res/yaRelay.rc
index ffd41632bc..32d0d180cd 100644
--- a/plugins/YARelay/res/yaRelay.rc
+++ b/plugins/YARelay/res/yaRelay.rc
@@ -47,7 +47,7 @@ BEGIN
                     WS_TABSTOP,8,75,67,10

     CONTROL         "Away",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,

                     8,86,67,10

-    CONTROL         "NA",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,

+    CONTROL         "N/A",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,

                     97,67,10

     CONTROL         "Occupied",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | 

                     WS_TABSTOP,78,64,67,10

diff --git a/plugins/ZeroNotification/src/main.cpp b/plugins/ZeroNotification/src/main.cpp
index 20fb46f141..09bbdbd6cd 100644
--- a/plugins/ZeroNotification/src/main.cpp
+++ b/plugins/ZeroNotification/src/main.cpp
@@ -26,7 +26,7 @@ struct CheckBoxValues_t
 static const struct CheckBoxValues_t statusValues[] = {

 	{ PF2_ONLINE, TEXT("Online") },

 	{ PF2_SHORTAWAY, TEXT("Away") },

-	{ PF2_LONGAWAY, TEXT("NA") },

+	{ PF2_LONGAWAY, TEXT("N/A") },

 	{ PF2_LIGHTDND, TEXT("Occupied") },

 	{ PF2_HEAVYDND, TEXT("DND") },

 	{ PF2_FREECHAT, TEXT("Free for chat") },

diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp
index 251841a4c9..d2443c4943 100644
--- a/protocols/IcqOscarJ/src/icq_xstatus.cpp
+++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp
@@ -290,7 +290,7 @@ const char *nameXStatus[XSTATUS_COUNT] = {
 	LPGEN("Kitty"),         //58

 	LPGEN("Sumo"),          //59

 	LPGEN("Broken hearted"),//60

-	LPGEN("Free for Chat"), //62

+	LPGEN("Free for chat"), //62

 	LPGEN("@home"),         //63

 	LPGEN("@work"),         //64

 	LPGEN("Strawberry"),    //65

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 0e89732c0a..1c981710f6 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -446,7 +446,7 @@ static gc_item sttLogListItems[] =
 	{ LPGENT("&Send presence"), 0, MENU_NEWPOPUP },

 	{ LPGENT("Online"), IDM_PRESENCE_ONLINE, MENU_POPUPITEM },

 	{ LPGENT("Away"), IDM_PRESENCE_AWAY, MENU_POPUPITEM },

-	{ LPGENT("NA"), IDM_PRESENCE_NA, MENU_POPUPITEM },

+	{ LPGENT("N/A"), IDM_PRESENCE_NA, MENU_POPUPITEM },

 	{ LPGENT("DND"), IDM_PRESENCE_DND, MENU_POPUPITEM },

 	{ LPGENT("Free for chat"), IDM_PRESENCE_FREE4CHAT, MENU_POPUPITEM },

 

diff --git a/protocols/JabberG/src/jabber_rc.cpp b/protocols/JabberG/src/jabber_rc.cpp
index 5ac6acfe57..ad2c0a89ef 100644
--- a/protocols/JabberG/src/jabber_rc.cpp
+++ b/protocols/JabberG/src/jabber_rc.cpp
@@ -303,8 +303,8 @@ int CJabberProto::AdhocSetStatusHandler(HXML, CJabberIqInfo *pInfo, CJabberAdhoc
 		fieldNode << XCHILD(_T("option")) << XATTR(_T("label"), TranslateT("Free for chat")) << XCHILD(_T("value"), _T("chat"));

 		fieldNode << XCHILD(_T("option")) << XATTR(_T("label"), TranslateT("Online")) << XCHILD(_T("value"), _T("online"));

 		fieldNode << XCHILD(_T("option")) << XATTR(_T("label"), TranslateT("Away")) << XCHILD(_T("value"), _T("away"));

-		fieldNode << XCHILD(_T("option")) << XATTR(_T("label"), TranslateT("Extended Away (N/A)")) << XCHILD(_T("value"), _T("xa"));

-		fieldNode << XCHILD(_T("option")) << XATTR(_T("label"), TranslateT("Do Not Disturb")) << XCHILD(_T("value"), _T("dnd"));

+		fieldNode << XCHILD(_T("option")) << XATTR(_T("label"), TranslateT("Extended away (N/A)")) << XCHILD(_T("value"), _T("xa"));

+		fieldNode << XCHILD(_T("option")) << XATTR(_T("label"), TranslateT("Do not disturb (DND)")) << XCHILD(_T("value"), _T("dnd"));

 		fieldNode << XCHILD(_T("option")) << XATTR(_T("label"), TranslateT("Invisible")) << XCHILD(_T("value"), _T("invisible"));

 		fieldNode << XCHILD(_T("option")) << XATTR(_T("label"), TranslateT("Offline")) << XCHILD(_T("value"), _T("offline"));

 

diff --git a/src/core/stdclist/res/resource.rc b/src/core/stdclist/res/resource.rc
index 8c82256bfe..452f1bfec8 100644
--- a/src/core/stdclist/res/resource.rc
+++ b/src/core/stdclist/res/resource.rc
@@ -476,7 +476,7 @@ BEGIN
         MENUITEM "&Offline\tCtrl+0",            ID_STATUS_OFFLINE, CHECKED

         MENUITEM "On&line\tCtrl+1",             ID_STATUS_ONLINE

         MENUITEM "&Away\tCtrl+2",               ID_STATUS_AWAY

-        MENUITEM "&NA\tCtrl+3",                 ID_STATUS_NA

+        MENUITEM "&N/A\tCtrl+3",                 ID_STATUS_NA

         MENUITEM "Occ&upied\tCtrl+4",           ID_STATUS_OCCUPIED

         MENUITEM "&DND\tCtrl+5",                ID_STATUS_DND

         MENUITEM "&Free for chat\tCtrl+6",      ID_STATUS_FREECHAT

diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp
index 0f4628721b..9d6c8e7f02 100644
--- a/src/core/stdclist/src/clcopts.cpp
+++ b/src/core/stdclist/src/clcopts.cpp
@@ -63,7 +63,7 @@ static const struct CheckBoxValues_t greyoutValues[] =
 	{ MODEF_OFFLINE,  LPGENT("Offline")       },

 	{ PF2_ONLINE,     LPGENT("Online")        },

 	{ PF2_SHORTAWAY,  LPGENT("Away")          },

-	{ PF2_LONGAWAY,   LPGENT("NA")            },

+	{ PF2_LONGAWAY,   LPGENT("N/A")            },

 	{ PF2_LIGHTDND,   LPGENT("Occupied")      },

 	{ PF2_HEAVYDND,   LPGENT("DND")           },

 	{ PF2_FREECHAT,   LPGENT("Free for chat") },

@@ -77,7 +77,7 @@ static const struct CheckBoxValues_t offlineValues[] =
 	{ MODEF_OFFLINE,  LPGENT("Offline")       },

 	{ PF2_ONLINE,     LPGENT("Online")        },

 	{ PF2_SHORTAWAY,  LPGENT("Away")          },

-	{ PF2_LONGAWAY,   LPGENT("NA")            },

+	{ PF2_LONGAWAY,   LPGENT("N/A")            },

 	{ PF2_LIGHTDND,   LPGENT("Occupied")      },

 	{ PF2_HEAVYDND,   LPGENT("DND")           },

 	{ PF2_FREECHAT,   LPGENT("Free for chat") },

diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index 91dde6f5ac..aae9126c76 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -141,7 +141,7 @@ statusValues[] =
 	{ MODEF_OFFLINE, LPGENT("Offline") },

 	{ PF2_ONLINE, LPGENT("Online") },

 	{ PF2_SHORTAWAY, LPGENT("Away") },

-	{ PF2_LONGAWAY, LPGENT("NA") },

+	{ PF2_LONGAWAY, LPGENT("N/A") },

 	{ PF2_LIGHTDND, LPGENT("Occupied") },

 	{ PF2_HEAVYDND, LPGENT("DND") },

 	{ PF2_FREECHAT, LPGENT("Free for chat") },

diff --git a/src/mir_app/src/clistmod.cpp b/src/mir_app/src/clistmod.cpp
index 4468054c2e..a6c6052bf4 100644
--- a/src/mir_app/src/clistmod.cpp
+++ b/src/mir_app/src/clistmod.cpp
@@ -78,7 +78,7 @@ TCHAR* fnGetStatusModeDescription(int mode, int flags)
 		descr = LPGENT("DND");

 		break;

 	case ID_STATUS_NA:

-		descr = LPGENT("NA");

+		descr = LPGENT("N/A");

 		break;

 	case ID_STATUS_OCCUPIED:

 		descr = LPGENT("Occupied");

diff --git a/src/mir_app/src/skinicons.cpp b/src/mir_app/src/skinicons.cpp
index 14a242cee1..5d77acec78 100644
--- a/src/mir_app/src/skinicons.cpp
+++ b/src/mir_app/src/skinicons.cpp
@@ -103,7 +103,7 @@ static struct StandardIconDescription statusIcons[] =
 	{ ID_STATUS_OFFLINE,         LPGEN("Offline"),          -IDI_OFFLINE,       0xFFFFFFFF     },

 	{ ID_STATUS_ONLINE,          LPGEN("Online"),           -IDI_ONLINE,        PF2_ONLINE     },

 	{ ID_STATUS_AWAY,            LPGEN("Away"),             -IDI_AWAY,          PF2_SHORTAWAY  },

-	{ ID_STATUS_NA,              LPGEN("NA"),               -IDI_NA,            PF2_LONGAWAY   },

+	{ ID_STATUS_NA,              LPGEN("N/A"),               -IDI_NA,            PF2_LONGAWAY   },

 	{ ID_STATUS_OCCUPIED,        LPGEN("Occupied"),         -IDI_OCCUPIED,      PF2_LIGHTDND   },

 	{ ID_STATUS_DND,             LPGEN("DND"),              -IDI_DND,           PF2_HEAVYDND   },

 	{ ID_STATUS_FREECHAT,        LPGEN("Free for chat"),    -IDI_FREE4CHAT,     PF2_FREECHAT   },