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

32 files changed, 54 insertions, 55 deletions

diff --git a/langpacks/english/Plugins/HistoryPP.txt b/langpacks/english/Plugins/HistoryPP.txt
index a9bb919102..e31f45bfa8 100644
--- a/langpacks/english/Plugins/HistoryPP.txt
+++ b/langpacks/english/Plugins/HistoryPP.txt
@@ -189,7 +189,6 @@
 [Leave this fields blank to disable password]

 [Pay attention to CAPS LOCK button state]

 [Password and Confirm fields should be similar]

-[Unknown id]

 [Outgoing file transfer: %s]

 [Incoming file transfer: %s]

 [Authorization request by %s (%s%d): %s]

diff --git a/langpacks/english/Plugins/QuickSearch.txt b/langpacks/english/Plugins/QuickSearch.txt
index a5238ddd1e..06a5193b3c 100644
--- a/langpacks/english/Plugins/QuickSearch.txt
+++ b/langpacks/english/Plugins/QuickSearch.txt
@@ -18,7 +18,7 @@
 [Draw Grid]

 [integer value]

 [Save Item]

-[ClientID]

+[Client ID]

 [Quick Search]

 [Quick search]

 [Search on:]

diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
index 313e1d3323..4415e69a78 100644
--- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
+++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
@@ -410,7 +410,7 @@ int MirandaLoaded(WPARAM wParam, LPARAM lParam)
 	if (!bFingerprintExists && !db_get_b(NULL, MOD_NAME, DB_NO_FINGERPRINT_ERROR, 0))

 		CreateDialog(g_hInstance, MAKEINTRESOURCE(IDD_CCN_ERROR), NULL, CCNErrorDlgProc);

 

-	logservice_register(LOG_ID, LPGENT("ClientChangeNotify"), _T("ClientChangeNotify?puts(p,?dbsetting(%subject%,Protocol,p))?if2(_?dbsetting(,?get(p),?pinfo(?get(p),uidsetting)),).log"), TranslateT("`[`!cdate()-!ctime()`]`  ?cinfo(%subject%,display) (?cinfo(%subject%,id)) changed client to %extratext%"));

+	logservice_register(LOG_ID, LPGENT("ClientChangeNotify"), _T("ClientChangeNotify?puts(p,?dbsetting(%subject%,Protocol,p))?if2(_?dbsetting(,?get(p),?pinfo(?get(p),uidsetting)),).log"), TranslateT("`[`!cdate()-!ctime()`]`  ?cinfo(%subject%,display) (?cinfo(%subject%,ID)) changed client to %extratext%"));

 	return 0;

 }

 

diff --git a/plugins/CmdLine/src/mimcmd_data.h b/plugins/CmdLine/src/mimcmd_data.h
index 4eec540ac7..32ca9ec018 100644
--- a/plugins/CmdLine/src/mimcmd_data.h
+++ b/plugins/CmdLine/src/mimcmd_data.h
@@ -103,7 +103,7 @@ typedef TSharedData *PSharedData;
 #define MIMCMD_HELP_MESSAGE     LPGEN("Sends a message to the specified contact(s).\nUsage: message <contact> [<contact> [<contact> [...]]] <message>. The command will send <message> to the specified contact(s) - at least one contact must be specified - all parameters except the last one are considered recipients.\n<Contact> has the following format:<name>[:<account>]. <Name> is the contact display name or unique ID and <account> is an optional parameter representing the account of the contact (useful in case there is more than one contact with the same name).\nNOTE:The message string cannot exceed 512 characters.")

 #define MIMCMD_HELP_DATABASE    LPGEN("Allows you to manage database settings.\nUsage:\n db set <module> <name> (b|i|d|s|w)<value>\n  db delete <module> <name>\n  db get <module> <name>.\nThe command can set a database entry to the specified value (if the entry does not exist it will be created) as well as read or delete a specified database entry. <Module> is the name of the module where the key should be located, <name> is the name of the key and <value> is the value to be written. A character must be placed before <value> in order to specify what kind of data to write: b - byte, i - integer (word), d - double word, s - string, w - wide string.")

 #define MIMCMD_HELP_PROXY       LPGEN("Configures proxy settings either globally or per account.\nUsage: proxy (global|<account>) <setting> [<params>].\n  <setting> is one of the following settings:\n    status (disable | enable | toggle).\n    server <proxy type> <server> <port>")

-#define MIMCMD_HELP_CONTACTS    LPGEN("Allows you to search/list contacts or open a message windows for specified contacts.\nUsage:\n contacts list [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]]. The command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain id use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'.\n contacts open [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]]. The command will open a message window for all contacts that match the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain id use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'. If no keyword is specified the command will open a message window for all contacts that have unread messages.")

+#define MIMCMD_HELP_CONTACTS    LPGEN("Allows you to search/list contacts or open a message windows for specified contacts.\nUsage:\n contacts list [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]]. The command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'.\n contacts open [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]]. The command will open a message window for all contacts that match the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'. If no keyword is specified the command will open a message window for all contacts that have unread messages.")

 #define MIMCMD_HELP_HISTORY     LPGEN("Shows history or unread messages for a contact.\nUsage:\n history <command> <contact>.\n <command> is one of the following commands:\n    unread - show unread messages for that contact.\n    show <contact> <start> <finish> - show history from event number <start> to <finish>. If any number is negative it is interpreted as a relative index from the last event number + 1 (so the last event for a contact is -1).")

 #define MIMCMD_HELP_VERSION     LPGEN("Shows version information for Miranda and CmdLine plugin. If VersionInfo plugin is installed it will use its report instead.\nUsage:\n version. The command will print Miranda's and CmdLine's version numbers or, if VersionInfo plugin is installed, it will show VersionInfo's report.")

 #define MIMCMD_HELP_SETNICKNAME LPGEN("Changes the user's nickname on the given protocol to the new name.\nUsage:\n setnickname <protocol> new_nickname")

diff --git a/plugins/MetaContacts/res/MetaContacts.rc b/plugins/MetaContacts/res/MetaContacts.rc
index 3b8c65ca91..836d0c8f05 100644
--- a/plugins/MetaContacts/res/MetaContacts.rc
+++ b/plugins/MetaContacts/res/MetaContacts.rc
@@ -140,7 +140,7 @@ BEGIN
     GROUPBOX        "Options",IDC_STATIC,0,0,297,178

     CONTROL         "Suppress status notification for subcontacts",IDC_CHK_SUPPRESSSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,42,290,10

     GROUPBOX        "Context Menu",IDC_STATIC,4,79,289,58

-    CONTROL         "Use contact's unique id",IDC_RAD_UID,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,100,112,10

+    CONTROL         "Use contact's unique ID",IDC_RAD_UID,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,100,112,10

     CONTROL         "Use contact's display name",IDC_RAD_DID,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,114,112,10

     GROUPBOX        "Contact Labels",IDC_STATIC,9,87,120,45,WS_GROUP

     GROUPBOX        "Function",IDC_STATIC,133,87,155,45,WS_GROUP

diff --git a/plugins/MetaContacts/src/edit.cpp b/plugins/MetaContacts/src/edit.cpp
index f3f23c39b9..f5977e27c2 100644
--- a/plugins/MetaContacts/src/edit.cpp
+++ b/plugins/MetaContacts/src/edit.cpp
@@ -248,7 +248,7 @@ INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			LvCol.cx = 100;

 			ListView_InsertColumn(hwnd, 0, &LvCol);

 

-			LvCol.pszText = TranslateT("Id");

+			LvCol.pszText = TranslateT("ID");

 			LvCol.cx = 130;

 			ListView_InsertColumn(hwnd, 1, &LvCol);

 

diff --git a/plugins/MetaContacts/src/meta_utils.cpp b/plugins/MetaContacts/src/meta_utils.cpp
index 1a5998f574..5a9130b585 100644
--- a/plugins/MetaContacts/src/meta_utils.cpp
+++ b/plugins/MetaContacts/src/meta_utils.cpp
@@ -217,18 +217,18 @@ BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default)
 	HANDLE most_online;

 		

 	if ((metaID = db_get_dw(dest, META_PROTO, META_ID,(DWORD)-1))==-1) {

-		MessageBox(0, TranslateT("Could not get MetaContact id"), TranslateT("Assignment Error"), MB_OK | MB_ICONWARNING);

+		MessageBox(0, TranslateT("Could not get MetaContact ID"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		return FALSE;

 	}

 

 	if ((num_contacts = db_get_dw(dest, META_PROTO, "NumContacts",(DWORD)-1))==-1) {

-		MessageBox(0, TranslateT("Could not retreive MetaContact contact count"), TranslateT("Assignment Error"), MB_OK | MB_ICONWARNING);

+		MessageBox(0, TranslateT("Could not retreive MetaContact contact count"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		return FALSE;

 	}

 

 	char *szProto = GetContactProto(src);

 	if (szProto == NULL) {

-		MessageBox(0, TranslateT("Could not retreive contact protocol"), TranslateT("Assignment Error"), MB_OK | MB_ICONWARNING);

+		MessageBox(0, TranslateT("Could not retreive contact protocol"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		return FALSE;

 	}

 

@@ -236,20 +236,20 @@ BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default)
 	char *field = (char *)CallProtoService(szProto, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);

 	DBVARIANT dbv;

 	if ( db_get(src,szProto, field, &dbv)) {

-		MessageBox(0, TranslateT("Could not get unique id of contact"), TranslateT("Assignment Error"), MB_OK | MB_ICONWARNING);

+		MessageBox(0, TranslateT("Could not get unique ID of contact"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		return FALSE;

 	}

 

 	// Check that is is 'on the list'

 	if ( db_get_b(src, "CList", "NotOnList", 0) == 1) {

-		MessageBox(0, TranslateT("Contact is 'Not on List' - please add the contact to your contact list before assigning."), TranslateT("Assignment Error"), MB_OK | MB_ICONWARNING);

+		MessageBox(0, TranslateT("Contact is 'Not on List' - please add the contact to your contact list before assigning."), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		db_free(&dbv);

 		return FALSE;

 	}

 

 	num_contacts++;

 	if (num_contacts >= MAX_CONTACTS) {

-		MessageBox(0, TranslateT("MetaContact is full"), TranslateT("Assignment Error"), MB_OK | MB_ICONWARNING);

+		MessageBox(0, TranslateT("MetaContact is full"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		db_free(&dbv);

 		return FALSE;

 	}

@@ -259,7 +259,7 @@ BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default)
 	strcat(buffer, _itoa(num_contacts-1, szId, 10));

 

 	if ( db_set_s(dest, META_PROTO, buffer, szProto)) {

-		MessageBox(0, TranslateT("Could not write contact protocol to MetaContact"), TranslateT("Assignment Error"), MB_OK | MB_ICONWARNING);

+		MessageBox(0, TranslateT("Could not write contact protocol to MetaContact"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		db_free(&dbv);

 		return FALSE;

 	}

@@ -269,7 +269,7 @@ BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default)
 	strcat(buffer, szId);

 

 	if ( db_set(dest, META_PROTO, buffer, &dbv)) {

-		MessageBox(0, TranslateT("Could not write unique id of contact to MetaContact"), TranslateT("Assignment Error"), MB_OK | MB_ICONWARNING);

+		MessageBox(0, TranslateT("Could not write unique ID of contact to MetaContact"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		db_free(&dbv);

 		return FALSE;

 	}

@@ -282,7 +282,7 @@ BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default)
 		strcpy(buffer, "Nick");

 		strcat(buffer, szId);

 		if (db_set(dest, META_PROTO, buffer, &dbv)) {

-			MessageBox(0, TranslateT("Could not write nickname of contact to MetaContact"), TranslateT("Assignment Error"), MB_OK | MB_ICONWARNING);

+			MessageBox(0, TranslateT("Could not write nickname of contact to MetaContact"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 			return FALSE;

 		}

 

@@ -837,7 +837,7 @@ int Meta_SetHandles(void)
 			if (num_contacts != (DWORD)db_get_dw(hContact, META_PROTO, "NumContacts", (DWORD)-1)) {

 				hNextContact = db_find_next(hContact);

 

-				_tcscpy(nick_buffer, TranslateT("MetaId: "));

+				_tcscpy(nick_buffer, TranslateT("Meta ID: "));

 				_tcscat(nick_buffer, _itot(meta_id, buffer2, 10));

 				MessageBox(0, TranslateT("MetaContact corrupted - the number of subcontacts is incorrect.\nDeleting MetaContact."), nick_buffer, MB_OK | MB_ICONERROR);

 				

diff --git a/plugins/New_GPG/res/new_gpg.rc b/plugins/New_GPG/res/new_gpg.rc
index 0283fae151..0cf212d80f 100644
--- a/plugins/New_GPG/res/new_gpg.rc
+++ b/plugins/New_GPG/res/new_gpg.rc
@@ -79,7 +79,7 @@ BEGIN
     PUSHBUTTON      "Generate and use random key",IDC_GENERATE_RANDOM,143,220,141,14

     LTEXT           "",IDC_GENERATING_KEY,82,207,174,8

     LTEXT           "Account:",IDC_STATIC,15,12,42,8

-    LTEXT           "Key id:",IDC_KEY_ID,178,12,99,8

+    LTEXT           "Key ID:",IDC_KEY_ID,178,12,99,8

     COMBOBOX        IDC_ACCOUNT,66,9,104,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

     PUSHBUTTON      "Copy public key",IDC_COPY_PUBKEY,7,169,101,14

     PUSHBUTTON      "Export private key",IDC_EXPORT_PRIVATE,182,169,102,14

diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp
index 2240d85bfb..5f1b61f782 100755
--- a/plugins/New_GPG/src/main.cpp
+++ b/plugins/New_GPG/src/main.cpp
@@ -267,7 +267,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				SendMessageA(GetDlgItem(hwndDlg, IDC_ACCOUNT), CB_ADDSTRING, 0, (LPARAM)acc.c_str());
 			}
 			SendMessageA(GetDlgItem(hwndDlg, IDC_ACCOUNT), CB_SELECTSTRING, 0, (LPARAM)Translate("Default"));
-			string keyinfo = Translate("key id");
+			string keyinfo = Translate("key ID");
 			keyinfo += ": ";
 			char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
 			keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");
@@ -342,7 +342,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				  }
 				  if(!strcmp(buf, Translate("Default")))
 				  {
-					  wstring keyinfo = TranslateT("Default private key id");
+					  wstring keyinfo = TranslateT("Default private key ID");
 					  keyinfo += _T(": ");
 					  keyinfo += (fp[0])?fp:_T("not set");
 					  extern HWND hwndCurKey_p;
@@ -654,7 +654,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, 63);
 				if(!strcmp(buf, Translate("Default")))
 				{
-					string keyinfo = Translate("key id");
+					string keyinfo = Translate("key ID");
 					keyinfo += ": ";
 					char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
 					keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");
@@ -663,7 +663,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				}
 				else
 				{
-					string keyinfo = Translate("key id");
+					string keyinfo = Translate("key ID");
 					keyinfo += ": ";
 					std::string acc_str= buf;
 					acc_str += "_KeyID";
@@ -2091,9 +2091,9 @@ void InitCheck()
 		if(!home_dir_access || !temp_access || !gpg_valid)
 		{
 			char buf[4096];
-			strcpy(buf, gpg_valid?Translate("GPG binary is set and valid (This is good).\n"):Translate("GPG binary unset or invalid (Plugin will not work).\n"));
-			strcat(buf, home_dir_access?Translate("Home dir write access granted (This is good).\n"):Translate("Home dir has no write access (Plugin most probably will not work).\n"));
-			strcat(buf, temp_access?Translate("Temp dir write access granted (This is good).\n"):Translate("Temp dir has no write access (Plugin should work, but may have some problems, file transfers will not work)."));
+			strcpy(buf, gpg_valid?Translate("GPG binary is set and valid (this is good).\n"):Translate("GPG binary unset or invalid (plugin will not work).\n"));
+			strcat(buf, home_dir_access?Translate("Home dir write access granted (this is good).\n"):Translate("Home dir has no write access (plugin most probably will not work).\n"));
+			strcat(buf, temp_access?Translate("Temp dir write access granted (this is good).\n"):Translate("Temp dir has no write access (plugin should work, but may have some problems, file transfers will not work)."));
 			if(!gpg_valid)
 				strcat(buf, Translate("\nGPG will be disabled until you solve these problems"));
 			MessageBoxA(0, buf, Translate("GPG plugin problems"), MB_OK);
@@ -2142,7 +2142,7 @@ void InitCheck()
 			keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, acc.c_str(), "");
 			if(keyid[0])
 			{
-				question = Translate("Your secret key with id: ");
+				question = Translate("Your secret key with ID: ");
 				mir_free(keyid);
 				keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
 				key = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");
@@ -2207,7 +2207,7 @@ void InitCheck()
 				keyid = nullptr;
 			}
 		}
-		question = Translate("Your secret key with id: ");
+		question = Translate("Your secret key with ID: ");
 		keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
 		key = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");
 		void ShowFirstRunDialog();
diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp
index ea98e6acce..cff898dae5 100755
--- a/plugins/New_GPG/src/messages.cpp
+++ b/plugins/New_GPG/src/messages.cpp
@@ -109,7 +109,7 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
 						dbsetting += "_Password";
 						pass = UniGetContactSettingUtf(NULL, szGPGModuleName, dbsetting.c_str(), _T(""));
 						if(pass[0] && bDebugLog)
-							debuglog<<std::string(time_str()+": info: found password in database for key id: "+inkeyid+", trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR))+" with password");
+							debuglog<<std::string(time_str()+": info: found password in database for key ID: "+inkeyid+", trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR))+" with password");
 					}
 					else
 					{
diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp
index d666e7ba23..8418e49bf9 100755
--- a/plugins/New_GPG/src/options.cpp
+++ b/plugins/New_GPG/src/options.cpp
@@ -173,7 +173,7 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		EnableWindow(GetDlgItem(hwndDlg, IDC_JABBER_API), bIsMiranda09);

 		EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), (bIsMiranda09 && bJabberAPI));

 		{

-			string keyinfo = Translate("Default private key id");

+			string keyinfo = Translate("Default private key ID");

 			keyinfo += ": ";

 			char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");

 			keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");

diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index 1558a12453..1e758bf53d 100755
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -361,7 +361,7 @@ int onProtoAck(WPARAM w, LPARAM l)
 								dbsetting += "_Password";
 								pass = UniGetContactSettingUtf(NULL, szGPGModuleName, dbsetting.c_str(), _T(""));
 								if(_tcslen(pass) > 0 && bDebugLog)
-									debuglog<<std::string(time_str()+": info: found password in database for key id: "+keyid+", trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR))+" with password");
+									debuglog<<std::string(time_str()+": info: found password in database for key ID: "+keyid+", trying to decrypt message from "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR))+" with password");
 							}
 							else
 							{
@@ -807,7 +807,7 @@ static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void *pU
 							dbsetting += "_Password";
 							pass = UniGetContactSettingUtf(NULL, szGPGModuleName, dbsetting.c_str(), _T(""));
 							if(pass[0] && bDebugLog)
-								debuglog<<std::string(time_str()+": info: found password in database for key id: "+inkeyid+", trying to encrypt message from self with password");
+								debuglog<<std::string(time_str()+": info: found password in database for key ID: "+inkeyid+", trying to encrypt message from self with password");
 						}
 						else
 						{
diff --git a/plugins/NotifyAnything/src/main.cpp b/plugins/NotifyAnything/src/main.cpp
index 3d4a684add..ec676f05b5 100644
--- a/plugins/NotifyAnything/src/main.cpp
+++ b/plugins/NotifyAnything/src/main.cpp
@@ -715,7 +715,7 @@ bool parseComplexMessage(const std::string &buf, popup_t &msg, char sep)
 				dbg_msg(Translate("No argument given to msg option."), SM_WARNING);

 				return false;

 			} else if (msg.replace != xno && msg.id.empty()) {

-				dbg_msg(Translate("Id is required for replacement."), SM_WARNING);

+				dbg_msg(Translate("ID is required for replacement."), SM_WARNING);

 				return false;

 			}

 			msg.message = arg;

diff --git a/plugins/QuickSearch/sr_global.pas b/plugins/QuickSearch/sr_global.pas
index 46d53df0f9..5110ef8de8 100644
--- a/plugins/QuickSearch/sr_global.pas
+++ b/plugins/QuickSearch/sr_global.pas
@@ -437,7 +437,7 @@ begin
  //miranda version

   with qsopt.columns[9] do

   begin

-    MakeTitle(title,'ClientID');

+    MakeTitle(title,'Client ID');

     StrDup(wparam.a,'MirVer');

     width       :=60;

     setting_type:=ST_STRING;

diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp
index 761c152ea0..631142669a 100644
--- a/plugins/Scriver/src/chat/options.cpp
+++ b/plugins/Scriver/src/chat/options.cpp
@@ -390,7 +390,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa
 				// contact vars

 				_T("%nick%"),					TranslateT("nick of current contact (if defined)"),

 				_T("%proto%"),					TranslateT("protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts"),

-				_T("%userid%"),					TranslateT("UserID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc."),

+				_T("%userid%"),					TranslateT("User ID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc."),

 				// global vars

 				_T("%miranda_path%"),			TranslateT("path to root miranda folder"),

 				_T("%miranda_profile%"),		TranslateT("path to current miranda profile"),

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index 7bebdeccbb..2ae9934434 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -820,7 +820,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("Unique id"), ui->pszUID,

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

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

 

 			ti.lpszText = tszBuf;

@@ -1756,7 +1756,7 @@ LABEL_SHOWWINDOW:
 						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( "Unique id" ), ui->pszUID,

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

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

 						lpttd->lpszText = ptszBuf;

 					}

diff --git a/plugins/SeenPlugin/src/seen.h b/plugins/SeenPlugin/src/seen.h
index e9846be1ce..b716ead0a5 100644
--- a/plugins/SeenPlugin/src/seen.h
+++ b/plugins/SeenPlugin/src/seen.h
@@ -79,7 +79,7 @@ WCHAR *any_to_Idle(HANDLE hContact, const char *module_name, const char *setting
 #define DEFAULT_MENUSTAMP          _T("%d.%m.%Y - %H:%M [%s]")

 #define DEFAULT_POPUPSTAMP         TranslateT("%n is %s (%u)")

 #define DEFAULT_POPUPSTAMPTEXT     TranslateT("%i(%r)%bWas %o")

-#define DEFAULT_USERSTAMP          TranslateT("Name:%t%N%bStatus:%t%s%bDay:%t%d.%m.%Y%bTime:%t%H:%M:%S%bPrevious Status:%t%o%b%b%P ID:%t%u%bExternal IP:%t%i%bInternal IP:%t%r%bClientID: %t%C%b%bStatus Message:%t%T")

+#define DEFAULT_USERSTAMP          TranslateT("Name:%t%N%bStatus:%t%s%bDay:%t%d.%m.%Y%bTime:%t%H:%M:%S%bPrevious Status:%t%o%b%b%P ID:%t%u%bExternal IP:%t%i%bInternal IP:%t%r%bClient ID: %t%C%b%bStatus Message:%t%T")

 #define DEFAULT_FILESTAMP          _T("%d.%m.%Y %H:%M:%S%t%n%t%s%t%u%t%r | %i%t%N")

 #define DEFAULT_FILENAME           _T("logs\\%P.txt")

 #define DEFAULT_HISTORYSTAMP       _T("%d.%m.%Y - %H:%M [%s]")

diff --git a/plugins/TabSRMM/res/chat.rc b/plugins/TabSRMM/res/chat.rc
index 79c79d97a2..3d269581b1 100644
--- a/plugins/TabSRMM/res/chat.rc
+++ b/plugins/TabSRMM/res/chat.rc
@@ -43,7 +43,7 @@ BEGIN
     LTEXT           "",IDC_STATIC,0,0,211,97

     LTEXT           "",IDC_ADDHIGHLIGHTTITLE,7,3,201,12,SS_CENTERIMAGE

     COMBOBOX        IDC_ADDHIGHLIGHTNAME,17,24,178,17,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP

-    LTEXT           "You can add the user by user name or his id. Wildcards are allowed and recommended.",IDC_ADDHIGHLIGHTEXPLAIN,15,49,179,21

+    LTEXT           "You can add the user by user name or his ID. Wildcards are allowed and recommended.",IDC_ADDHIGHLIGHTEXPLAIN,15,49,179,21

     DEFPUSHBUTTON   "OK",IDOK,152,76,55,14

     DEFPUSHBUTTON   "Cancel",IDCANCEL,91,76,55,14

     EDITTEXT        IDC_ADDHIGHLIGHTEDITLIST,9,18,192,47,ES_AUTOHSCROLL

diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp
index fd0f4a5814..df3d6d1ab0 100644
--- a/plugins/TabSRMM/src/chat/options.cpp
+++ b/plugins/TabSRMM/src/chat/options.cpp
@@ -876,7 +876,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 					// contact vars

 					_T("%nick%"),					TranslateT("nick of current contact (if defined)"),

 					_T("%proto%"),					TranslateT("protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts"),

-					_T("%userid%"),					TranslateT("UserID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc."),

+					_T("%userid%"),					TranslateT("User ID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc."),

 					// global vars

 					_T("%miranda_path%"),			TranslateT("path to root miranda folder"),

 					_T("%miranda_profile%"),		TranslateT("path to current miranda profile"),

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index 28e5f4e985..1ac9ed8ecc 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -1430,7 +1430,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("Unique Id"), ui1->pszUID,

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

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

 		ti.lpszText = tszBuf;

 	}

@@ -1793,7 +1793,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 				if (tszBuf[0] == 0)

 					mir_sntprintf(tszBuf, SIZEOF(tszBuf), _T("<b>%s:</b>\t%s\n<b>%s:</b>\t%s\n<b>%s:</b>\t%s"),

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

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

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

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

 

 				CLCINFOTIP ti = { sizeof(ti) };

diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
index a33df3f01f..ba57af54d5 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
@@ -506,7 +506,7 @@ BYTE CExImContactBase::isHandle(HANDLE hContact)
 			LPTSTR ptszNick = mir_utf8decodeT(_pszNick);

 			LPTSTR ptszProto = mir_a2t(_pszProto);

 			int ans = MsgBox(NULL, MB_ICONQUESTION|MB_YESNO, LPGENT("Question"), LPGENT("contact identificaion"),

-				LPGENT("The contact %s(%s) has no unique id in the vCard,\nbut there is a contact in your clist with the same nick and protocol.\nDo you wish to use this contact?"),

+				LPGENT("The contact %s(%s) has no unique ID in the vCard,\nbut there is a contact in your clist with the same nick and protocol.\nDo you wish to use this contact?"),

 				ptszNick, ptszProto);

 			MIR_FREE(ptszNick);

 			MIR_FREE(ptszProto);

diff --git a/plugins/Variables/src/help.cpp b/plugins/Variables/src/help.cpp
index 0f6d23b423..f1463c9c78 100644
--- a/plugins/Variables/src/help.cpp
+++ b/plugins/Variables/src/help.cpp
@@ -833,11 +833,11 @@ This will not parse the given string, any function, field or special character i
 This will add a comment in the formatting string. Everything from the # character to the end of the line will be removed. Example: %dbprofile% #this is a useless comment.\r\n\r\n\r\n\

 --- Contacts ---\r\n\r\n\

 Whenever a functions requires a contact as an argument, you can specify it in two ways:\r\n\r\n\

-(1) Using a unique id (UIN for ICQ, email for MSN) or, a protocol id followed by a unique id in the form <PROTOID:UNIQUEID>, for example <MSN:miranda@hotmail.com> or <ICQ:123456789>.\r\n\r\n\

+(1) Using a unique ID (UIN for ICQ, email for MSN) or, a protocol ID followed by a unique ID in the form <PROTOID:UNIQUEID>, for example <MSN:miranda@hotmail.com> or <ICQ:123456789>.\r\n\r\n\

 (2) Using the contact function:\r\n\

 ?contact(x,y)\r\n\

 A contact will be searched which will have value x for its property y, y can be one of the following:\r\n\

-first, last, nick, email, id or display\r\n\r\n\

+first, last, nick, email, ID or display\r\n\r\n\

 For example: ?contact(miranda@hotmail.com,email) or ?contact(Miranda,nick). The contact function will return either a unique contact according to the arguments or nothing if none or multiple contacts exists with the given property.\

 "));

 		TranslateDialogDefault(hwndDlg);

diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp
index 4b71d307d8..5fcb052efa 100644
--- a/plugins/Variables/src/parse_miranda.cpp
+++ b/plugins/Variables/src/parse_miranda.cpp
@@ -789,7 +789,7 @@ int registerMirandaTokens() {
 	registerIntToken(_T(LSSTATUS), parseLastSeenStatus, TRF_FUNCTION, LPGEN("Miranda Related")"\t(x)\t"LPGEN("get last seen status of contact x"));

 	registerIntToken(_T(MIRANDAPATH), parseMirandaPath, TRF_FIELD, LPGEN("Miranda Related")"\t"LPGEN("path to the Miranda NG executable"));

 	registerIntToken(_T(MYSTATUS), parseMyStatus, TRF_FUNCTION, LPGEN("Miranda Related")"\t(x)\t"LPGEN("current status description of protocol x (without x, the global status is retrieved)"));

-	registerIntToken(_T(PROTOINFO), parseProtoInfo, TRF_FUNCTION, LPGEN("Miranda Related")"\t(x,y)\t"LPGEN("info property y of protocol id x"));

+	registerIntToken(_T(PROTOINFO), parseProtoInfo, TRF_FUNCTION, LPGEN("Miranda Related")"\t(x,y)\t"LPGEN("info property y of protocol ID x"));

 	registerIntToken(_T(SUBJECT), parseSpecialContact, TRF_FIELD, LPGEN("Miranda Related")"\t"LPGEN("retrieves the subject, depending on situation"));

 	registerIntToken(_T(TRANSLATE), parseTranslate, TRF_FUNCTION, LPGEN("Miranda Related")"\t(x)\t"LPGEN("translates x"));

 	registerIntToken(_T(VERSIONSTRING), parseVersionString, TRF_FIELD, LPGEN("Miranda Related")"\t"LPGEN("get the version of Miranda"));

diff --git a/protocols/AimOscar/src/server.cpp b/protocols/AimOscar/src/server.cpp
index a81b8e2ed6..2e62f8c9c1 100644
--- a/protocols/AimOscar/src/server.cpp
+++ b/protocols/AimOscar/src/server.cpp
@@ -1644,7 +1644,7 @@ void CAimProto::snac_list_modification_ack(SNAC &snac)//family 0x0013
 				break;

 

 			case 0x000a:

-				ShowPopup(LPGEN("Error adding buddy(invalid id?, already in list?)"), ERROR_POPUP);

+				ShowPopup(LPGEN("Error adding buddy(invalid ID or already in list?)"), ERROR_POPUP);

 				break;

 

 			case 0x000c:

diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index 4631eda7ff..c411819a1d 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -657,7 +657,7 @@ int __cdecl CIrcProto::GCEventHook(WPARAM wParam,LPARAM lParam)
 						break;

 					case 11:		// nickserv set language

 						PostIrcMessage( _T("/nickserv SET LANGUAGE %%question=\"%s\",\"%s\""),

-							TranslateT("Please enter desired languageID (numeric value, depends on server)"), TranslateT("Change language of NickServ messages"));

+							TranslateT("Please enter desired language ID (numeric value, depends on server)"), TranslateT("Change language of NickServ messages"));

 						break;

 					case 12:		// nickserv set homepage

 						PostIrcMessage( _T("/nickserv SET URL %%question=\"%s\",\"%s\""),

diff --git a/protocols/JabberG/res/jabber.rc b/protocols/JabberG/res/jabber.rc
index 121fe6b2ca..e0b4597292 100644
--- a/protocols/JabberG/res/jabber.rc
+++ b/protocols/JabberG/res/jabber.rc
@@ -667,7 +667,7 @@ EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "Member Information"

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

 BEGIN

-    CONTROL         "Member Information\n<user id>",IDC_HEADERBAR,

+    CONTROL         "Member Information\n<user ID>",IDC_HEADERBAR,

                     "MHeaderbarCtrl",0x0,0,0,183,25

     ICON            IDI_JABBER,IDC_ICO_STATUS,5,38,16,17,SS_CENTERIMAGE | SS_REALSIZEIMAGE

     EDITTEXT        IDC_TXT_NICK,26,38,152,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER

diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 2c0c260c86..e26ba930a4 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -987,7 +987,7 @@ void CJabberDlgPrivacyLists::ShowAdvancedList(CPrivacyList *pList)
 		TCHAR szTypeValue[ 512 ];

 		switch (pRule->GetType()) {

 		case Jid:

-			mir_sntprintf(szTypeValue, SIZEOF(szTypeValue), _T("If jabber id is '%s' then"), pRule->GetValue());

+			mir_sntprintf(szTypeValue, SIZEOF(szTypeValue), _T("If Jabber ID is '%s' then"), pRule->GetValue());

 			break;

 		case Group:

 			mir_sntprintf(szTypeValue, SIZEOF(szTypeValue), _T("If group is '%s' then"), pRule->GetValue());

@@ -1149,7 +1149,7 @@ void CJabberDlgPrivacyLists::DrawRulesList(LPDRAWITEMSTRUCT lpdis)
 		switch (pRule->GetType()) {

 		case Jid:

 			{

-				DrawNextRulePart(lpdis->hDC, clLine2, TranslateT("If jabber id is '"), &rc);

+				DrawNextRulePart(lpdis->hDC, clLine2, TranslateT("If Jabber ID is '"), &rc);

 				DrawNextRulePart(lpdis->hDC, clLine1, pRule->GetValue(), &rc);

 				DrawNextRulePart(lpdis->hDC, clLine2, TranslateT("'"), &rc);

 

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index af4857d102..44561e2faa 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -1053,7 +1053,7 @@ int __cdecl CJabberProto::SendMsg(HANDLE hContact, int flags, const char* pszSrc
 {

 	TCHAR szClientJid[JABBER_MAX_JID_LEN];

 	if ( !m_bJabberOnline || !GetClientJID(hContact, szClientJid, SIZEOF(szClientJid))) {

-		TFakeAckParams *param = new TFakeAckParams(hContact, Translate("Protocol is offline or no jid"));

+		TFakeAckParams *param = new TFakeAckParams(hContact, Translate("Protocol is offline or no JID"));

 		ForkThread(&CJabberProto::SendMessageAckThread, param);

 		return 1;

 	}

diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index 37e234cd89..9c7be6525d 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -451,7 +451,7 @@ int __cdecl CYahooProto::SetStatus( int iNewStatus )
 		}

 

 		if (err) {

-			lstrcpynA(errmsg, Translate("Please enter your yahoo id in Options/Network/Yahoo"), 80);

+			lstrcpynA(errmsg, Translate("Please enter your Yahoo ID in Options/Network/Yahoo"), 80);

 		} else {

 			if (!getString(YAHOO_PASSWORD, &dbv)) {

 				CallService(MS_DB_CRYPT_DECODESTRING, lstrlenA(dbv.pszVal) + 1, (LPARAM) dbv.pszVal);

diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp
index 0df9cbbf41..4730a59211 100644
--- a/protocols/Yahoo/src/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
@@ -282,7 +282,7 @@ INT_PTR __cdecl CYahooProto::OnShowMyProfileCommand( WPARAM wParam, LPARAM lPara
 	DBVARIANT dbv;

 

 	if ( getString( YAHOO_LOGINID, &dbv) != 0)	{

-		ShowError( TranslateT("Yahoo Error"), TranslateT("Please enter your yahoo id in Options/Network/Yahoo"));

+		ShowError( TranslateT("Yahoo Error"), TranslateT("Please enter your Yahoo ID in Options/Network/Yahoo"));

 		return 0;

 	}

 

diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp
index 60f5815421..6b4b9f4dc4 100644
--- a/protocols/Yahoo/src/yahoo.cpp
+++ b/protocols/Yahoo/src/yahoo.cpp
@@ -754,7 +754,7 @@ void CYahooProto::ext_buddy_added(char *myid, char *who, char *group, int status
 	case 1:  /* invalid ID? */

 	case 3:  /* invalid ID  */

 		if (hContact != NULL) {

-			ShowPopup( TranslateT("Invalid Contact"), TranslateT("The id you tried to add is invalid."), NULL);

+			ShowPopup( TranslateT("Invalid Contact"), TranslateT("The ID you tried to add is invalid."), NULL);

 			/* Make it TEMP first, we don't want to send any extra packets for FALSE ids */

 			db_set_b( hContact, "CList", "NotOnList", 1 );

 			CallService(MS_DB_CONTACT_DELETE, (WPARAM) hContact, 0);

@@ -764,7 +764,7 @@ void CYahooProto::ext_buddy_added(char *myid, char *who, char *group, int status
 	default:

 		/* ??? */

 		if (hContact != NULL) {

-			ShowPopup( TranslateT("Invalid Contact"), TranslateT("Unknown Error??."), NULL);

+			ShowPopup( TranslateT("Invalid Contact"), TranslateT("Unknown Error."), NULL);

 			/* Make it TEMP first, we don't want to send any extra packets for FALSE ids */

 			db_set_b( hContact, "CList", "NotOnList", 1 );

 			CallService(MS_DB_CONTACT_DELETE, (WPARAM) hContact, 0);

diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp
index 22c5fbe05d..987c68be7c 100644
--- a/src/core/stdchat/src/window.cpp
+++ b/src/core/stdchat/src/window.cpp
@@ -2392,7 +2392,7 @@ LABEL_SHOWWINDOW:
 						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( "Unique id" ), ui->pszUID,

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

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

 						lpttd->lpszText = ptszBuf;

 				}	}