"Nickname" occurs much more frequently in sources

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

8 files changed, 12 insertions, 12 deletions

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index 5759f4ae5f..3b699c035a 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -815,7 +815,7 @@ static void ProcessNickListHovering(HWND hwnd, int hoveredItem, POINT * pt, SESS
 					

 			if (tszBuf[0] == 0)

 				mir_sntprintf(tszBuf, SIZEOF(tszBuf), _T("%s: %s\r\n%s: %s\r\n%s: %s"),

-					TranslateT("Nick name"), ui->pszNick,

+					TranslateT("Nickname"), ui->pszNick,

 					TranslateT("Unique ID"), ui->pszUID,

 					TranslateT("Status"), TM_WordToString(parentdat->pStatuses, ui->Status));

 

@@ -1752,7 +1752,7 @@ LABEL_SHOWWINDOW:
 					if ( ui != NULL ) {

 						static TCHAR ptszBuf[ 1024 ];

 						mir_sntprintf( ptszBuf, SIZEOF(ptszBuf), _T("%s: %s\r\n%s: %s\r\n%s: %s"),

-							TranslateT( "Nick name" ), ui->pszNick,

+							TranslateT( "Nickname" ), ui->pszNick,

 							TranslateT( "Unique ID" ), ui->pszUID,

 							TranslateT( "Status" ), TM_WordToString( parentdat->pStatuses, ui->Status ));

 						lpttd->lpszText = ptszBuf;

diff --git a/plugins/TabSRMM/res/chat.rc b/plugins/TabSRMM/res/chat.rc
index a2b69bbc5a..98bfd23542 100644
--- a/plugins/TabSRMM/res/chat.rc
+++ b/plugins/TabSRMM/res/chat.rc
@@ -215,8 +215,8 @@ BEGIN
     CONTROL         "Enable highlighting for message text",IDC_HIGHLIGHTTEXTENABLE,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,125,278,11

     EDITTEXT        IDC_HIGHLIGHTTEXTPATTERN,11,170,283,35,ES_AUTOHSCROLL

-    LTEXT           "Words to highlight, wildcards like * and ? are allowed, separate multiple entries with spaces. Leave it empty if you only want to highlight your own nick name.",IDC_STATIC,10,141,284,23

-    CONTROL         "Highlight messages containing my own nick name",IDC_HIGHLIGHTME,

+    LTEXT           "Words to highlight, wildcards like * and ? are allowed, separate multiple entries with spaces. Leave it empty if you only want to highlight your own nickname.",IDC_STATIC,10,141,284,23

+    CONTROL         "Highlight messages containing my own nickname",IDC_HIGHLIGHTME,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,211,278,11

 END

 

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index 417be331ec..8866ceeb7e 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -1409,7 +1409,7 @@ static void ProcessNickListHovering(HWND hwnd, int hoveredItem, POINT * pt, SESS
 

 		if (tszBuf[0] == 0)

 			mir_sntprintf(tszBuf, SIZEOF(tszBuf), _T("%s: %s\r\n%s: %s\r\n%s: %s"),

-				TranslateT("Nick name"), ui1->pszNick,

+				TranslateT("Nickname"), ui1->pszNick,

 				TranslateT("Unique ID"), ui1->pszUID,

 				TranslateT("Status"), TM_WordToString( parentdat->pStatuses, ui1->Status));

 		ti.lpszText = tszBuf;

diff --git a/plugins/YAMN/res/YAMN.rc b/plugins/YAMN/res/YAMN.rc
index 12f22c8080..1b6940a1df 100644
--- a/plugins/YAMN/res/YAMN.rc
+++ b/plugins/YAMN/res/YAMN.rc
@@ -206,7 +206,7 @@ BEGIN
     CONTROL         "Check from menu",IDC_CHECKFORCE,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,166,97,137,8

     CONTROL         "Use contact notification for this account",IDC_CHECKCONTACT,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,166,107,138,10,WS_EX_TRANSPARENT

-    CONTROL         "Replace nick name",IDC_CHECKCONTACTNICK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,117,117,10,WS_EX_TRANSPARENT

+    CONTROL         "Replace nickname",IDC_CHECKCONTACTNICK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,117,117,10,WS_EX_TRANSPARENT

     CONTROL         "Disable Events",IDC_CHECKCONTACTNOEVENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,128,115,10,WS_EX_TRANSPARENT

     GROUPBOX        "Notifications",IDC_GBNEWMAIL,4,143,304,87

     GROUPBOX        "New Mail",IDC_STATIC,7,153,149,73

diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index 067a357344..ff75157663 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -418,7 +418,7 @@ INT_PTR __cdecl CIrcProto::OnChangeNickMenuCommand(WPARAM, LPARAM)
 		m_nickDlg->Show();

 	}

 

-	SetDlgItemText( m_nickDlg->GetHwnd(), IDC_CAPTION, TranslateT("Change nick name"));

+	SetDlgItemText( m_nickDlg->GetHwnd(), IDC_CAPTION, TranslateT("Change nickname"));

 	SetWindowText( GetDlgItem( m_nickDlg->GetHwnd(), IDC_TEXT), TranslateT("Please enter a unique nickname"));

 	m_nickDlg->m_Enick.SetText( m_info.sNick.c_str());

 	m_nickDlg->m_Enick.SendMsg( CB_SETEDITSEL, 0, MAKELPARAM(0,-1));

diff --git a/protocols/JabberG/res/jabber.rc b/protocols/JabberG/res/jabber.rc
index abea1fbb15..3bc42153e4 100644
--- a/protocols/JabberG/res/jabber.rc
+++ b/protocols/JabberG/res/jabber.rc
@@ -273,7 +273,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

     LTEXT           "Full name:",IDC_STATIC,5,7,51,8

     EDITTEXT        IDC_FULLNAME,58,5,159,12,ES_AUTOHSCROLL

-    LTEXT           "Nick name:",IDC_STATIC,5,20,51,8

+    LTEXT           "Nickname:",IDC_STATIC,5,20,51,8

     EDITTEXT        IDC_NICKNAME,58,19,82,12,ES_AUTOHSCROLL

     LTEXT           "First name:",IDC_STATIC,5,34,51,8

     EDITTEXT        IDC_FIRSTNAME,58,33,82,12,ES_AUTOHSCROLL

@@ -426,7 +426,7 @@ BEGIN
     COMBOBOX        IDC_SERVER,75,38,176,100,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP

     LTEXT           "Room:",IDC_STATIC,7,56,63,12,SS_CENTERIMAGE,WS_EX_RIGHT

     COMBOBOX        IDC_ROOM,75,56,176,158,CBS_DROPDOWN | CBS_OWNERDRAWVARIABLE | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP

-    LTEXT           "Nick name:",IDC_STATIC,7,73,63,12,SS_CENTERIMAGE,WS_EX_RIGHT

+    LTEXT           "Nickname:",IDC_STATIC,7,73,63,12,SS_CENTERIMAGE,WS_EX_RIGHT

     EDITTEXT        IDC_NICK,75,73,176,12,ES_AUTOHSCROLL

     LTEXT           "Password:",IDC_STATIC,7,90,63,12,SS_CENTERIMAGE,WS_EX_RIGHT

     EDITTEXT        IDC_PASSWORD,75,90,176,12,ES_PASSWORD | ES_AUTOHSCROLL

@@ -531,7 +531,7 @@ BEGIN
     EDITTEXT        IDC_ROOM_JID,76,62,138,12,ES_AUTOHSCROLL

     LTEXT           "Bookmark Name:",IDC_STATIC,7,77,65,8

     EDITTEXT        IDC_NAME,76,75,138,12,ES_AUTOHSCROLL

-    LTEXT           "Nick name:",IDC_STATIC,7,91,65,8

+    LTEXT           "Nickname:",IDC_STATIC,7,91,65,8

     EDITTEXT        IDC_NICK,76,90,138,12,ES_AUTOHSCROLL

     LTEXT           "Password:",IDC_STATIC,7,105,65,8

     EDITTEXT        IDC_PASSWORD,76,104,138,12,ES_PASSWORD | ES_AUTOHSCROLL

diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index 524050fd1c..089a486aa3 100644
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -994,7 +994,7 @@ static void _RosterListClear(HWND hwndDlg)
 	column.pszText = TranslateT("JID");

 	ListView_InsertColumn(hList, 1, &column);

 

-	column.pszText = TranslateT("Nick Name");

+	column.pszText = TranslateT("Nickname");

 	ListView_InsertColumn(hList, 2, &column);

 

 	column.pszText = TranslateT("Group");

diff --git a/protocols/Tlen/res/tlen.rc b/protocols/Tlen/res/tlen.rc
index c926f9ac58..2e07488fab 100644
--- a/protocols/Tlen/res/tlen.rc
+++ b/protocols/Tlen/res/tlen.rc
@@ -212,7 +212,7 @@ STYLE DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

-    LTEXT           "Nick name:",IDC_STATIC,5,8,51,8

+    LTEXT           "Nickname:",IDC_STATIC,5,8,51,8

     EDITTEXT        IDC_NICKNAME,58,6,102,12,ES_AUTOHSCROLL

     LTEXT           "First name:",IDC_STATIC,5,21,51,8

     EDITTEXT        IDC_FIRSTNAME,58,19,102,12,ES_AUTOHSCROLL