summaryrefslogtreecommitdiff
path: root/protocols/JabberG
diff options
context:
space:
mode:
authorDart Raiden <wowemuh@gmail.com>2013-12-30 13:10:45 +0000
committerDart Raiden <wowemuh@gmail.com>2013-12-30 13:10:45 +0000
commitb3ab8a9c737cbd5753b1914087d91ef3558cf9fd (patch)
treee51b112319339b4bcd933157a6e9c79787da1c09 /protocols/JabberG
parentbb4dacc84d5edf29afb4352af1b1ad742949c0b3 (diff)
"Nickname" occurs much more frequently in sources
git-svn-id: http://svn.miranda-ng.org/main/trunk@7427 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG')
-rw-r--r--protocols/JabberG/res/jabber.rc6
-rw-r--r--protocols/JabberG/src/jabber_opt.cpp2
2 files changed, 4 insertions, 4 deletions
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");