- rev [3582] reverted

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

5 files changed, 20 insertions, 20 deletions

diff --git a/plugins/DbEditorPP/src/addeditsettingsdlg.cpp b/plugins/DbEditorPP/src/addeditsettingsdlg.cpp
index 6cd364ef04..968ee92bc0 100644
--- a/plugins/DbEditorPP/src/addeditsettingsdlg.cpp
+++ b/plugins/DbEditorPP/src/addeditsettingsdlg.cpp
@@ -80,7 +80,7 @@ BOOL convertSetting(HANDLE hContact, char* module, char* setting, int toType) //
 		}

 

 		if (!Result)

-			msg("Cannot Convert!", modFullname);

+			msg(Translate("Cannot Convert!"), modFullname);

 

 		DBFreeVariant(&dbv);

 	}

@@ -335,7 +335,7 @@ INT_PTR CALLBACK EditSettingDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 

 						if (!setting || !value)

 						{

-							msg("Couldnt allocate enough memory!", modFullname);

+							msg(Translate("Couldnt allocate enough memory!"), modFullname);

 							DestroyWindow(hwnd);

 							break;

 						}

diff --git a/plugins/DbEditorPP/src/findwindow.cpp b/plugins/DbEditorPP/src/findwindow.cpp
index 3d2e34588f..e8fd22aa70 100644
--- a/plugins/DbEditorPP/src/findwindow.cpp
+++ b/plugins/DbEditorPP/src/findwindow.cpp
@@ -547,7 +547,7 @@ void __cdecl FindSettings(LPVOID di)
 	freeItems(hwnd);

 	if (!text) return;

 

-	if (!EnumModules(&ModuleList)) { msg("Error Loading Module List",modFullname); mir_free(di); return;}

+	if (!EnumModules(&ModuleList)) { msg(Translate("Error Loading Module List"),modFullname); mir_free(di); return;}

 

 	SendMessage(GetDlgItem(GetParent(hwnd),IDC_SBAR),SB_SETTEXT,0,(LPARAM)Translate("Searching..."));

 

@@ -579,7 +579,7 @@ void __cdecl FindSettings(LPVOID di)
 

 			if (!EnumSettings(hContact,module->name,&SettingList))

 			{

-				msg("Error Loading Setting List",modFullname);

+				msg(Translate("Error Loading Setting List"),modFullname);

 				mir_free(text);

 				mir_free(di);

 				FreeModuleSettingLL(&ModuleList);

diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp
index 765dedf571..cb79c9739f 100644
--- a/plugins/DbEditorPP/src/main.cpp
+++ b/plugins/DbEditorPP/src/main.cpp
@@ -346,7 +346,7 @@ int WriteBlobFromString(HANDLE hContact,const char *szModule,const char *szSetti
 

 	if (!(data = (BYTE *)_alloca(2+len/2)))

 	{

-		msg("Couldnt allocate enough memory!", modFullname);

+		msg(Translate("Couldnt allocate enough memory!"), modFullname);

 		return 0;

 	}

 

diff --git a/plugins/DbEditorPP/src/moduletree.cpp b/plugins/DbEditorPP/src/moduletree.cpp
index c2fec5e1c3..f7667f6f27 100644
--- a/plugins/DbEditorPP/src/moduletree.cpp
+++ b/plugins/DbEditorPP/src/moduletree.cpp
@@ -405,7 +405,7 @@ void __cdecl PopulateModuleTreeThreadFunc(LPVOID di)
 

 	hRestore = NULL;

 

-	if (!hwnd2Tree) { msg("Module tree not found",modFullname); return;}

+	if (!hwnd2Tree) { msg(Translate("Module tree not found"),modFullname); return;}

 

 	Select = 0;

 

@@ -449,7 +449,7 @@ void __cdecl PopulateModuleTreeThreadFunc(LPVOID di)
 

 	if ((int)di != 4) { // do not rebuild on just going to another setting

 		if (!EnumModules(&modlist)) {

-			msg("Error Loading Module List",modFullname);

+			msg(Translate("Error Loading Module List"),modFullname);

 			return;

 		}

 

@@ -607,7 +607,7 @@ void moduleListWM_NOTIFY(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)// hwnd
 

 				mtis->type = CONTACT;

 

-				if (!EnumModules(&modlist)) { msg("Error Loading Module List",modFullname); break;}

+				if (!EnumModules(&modlist)) { msg(Translate("Error Loading Module List"),modFullname); break;}

 

 				module = modlist.first;

 				while(module && hwnd2mainWindow)

diff --git a/plugins/DbEditorPP/src/settinglist.cpp b/plugins/DbEditorPP/src/settinglist.cpp
index eb95b7fc23..3afbc56629 100644
--- a/plugins/DbEditorPP/src/settinglist.cpp
+++ b/plugins/DbEditorPP/src/settinglist.cpp
@@ -125,7 +125,7 @@ void additem(HWND hwnd2Settings,HANDLE hContact, char* module, char* setting, in
 			{

 				int j;

 				if (!(data = (char*)mir_realloc(data, 3*(dbv.cpbVal+1)+10)))

-					{msg("Couldnt allocate enough memory!", modFullname); return;}

+					{msg(Translate("Couldnt allocate enough memory!"), modFullname); return;}

 				data[0] = '\0';

 				for (j=0; j<dbv.cpbVal; j++)

 				{

@@ -136,7 +136,7 @@ void additem(HWND hwnd2Settings,HANDLE hContact, char* module, char* setting, in
 				lvi.iImage = 0;

 				ListView_SetItem(hwnd2Settings,&lvi);

 				ListView_SetItemText(hwnd2Settings,index,1,data);

-				ListView_SetItemText(hwnd2Settings,index,2,"BLOB");

+				ListView_SetItemText(hwnd2Settings,index,2,Translate("BLOB"));

 				mir_snprintf(data, 3*(dbv.cpbVal+1)+10, "0x%04X (%d)", dbv.cpbVal,dbv.cpbVal);

 				ListView_SetItemText(hwnd2Settings,index,3,data);

 			}

@@ -148,7 +148,7 @@ void additem(HWND hwnd2Settings,HANDLE hContact, char* module, char* setting, in
 				ListView_SetItem(hwnd2Settings,&lvi);

 				mir_snprintf(data, 16, "0x%02X (%d)", dbv.bVal, dbv.bVal);

 				ListView_SetItemText(hwnd2Settings,index,1,data);

-				ListView_SetItemText(hwnd2Settings,index,2,"BYTE");

+				ListView_SetItemText(hwnd2Settings,index,2,Translate("BYTE"));

 				ListView_SetItemText(hwnd2Settings,index,3,"0x0001 (1)");

 			break;

 			case DBVT_WORD:

@@ -159,7 +159,7 @@ void additem(HWND hwnd2Settings,HANDLE hContact, char* module, char* setting, in
 				ListView_SetItem(hwnd2Settings,&lvi);

 				mir_snprintf(data, 16, "0x%04X (%ld)", dbv.wVal,dbv.wVal);

 				ListView_SetItemText(hwnd2Settings,index,1,data);

-				ListView_SetItemText(hwnd2Settings,index,2,"WORD");

+				ListView_SetItemText(hwnd2Settings,index,2,Translate("WORD"));

 				ListView_SetItemText(hwnd2Settings,index,3,"0x0002 (2)");

 			break;

 			case DBVT_DWORD:

@@ -170,7 +170,7 @@ void additem(HWND hwnd2Settings,HANDLE hContact, char* module, char* setting, in
 				ListView_SetItem(hwnd2Settings,&lvi);

 				mir_snprintf(data, 32, "0x%08X (%ld)", dbv.dVal, dbv.dVal);

 				ListView_SetItemText(hwnd2Settings,index,1,data);

-				ListView_SetItemText(hwnd2Settings,index,2,"DWORD");

+				ListView_SetItemText(hwnd2Settings,index,2,Translate("DWORD"));

 				ListView_SetItemText(hwnd2Settings,index,3,"0x0004 (4)");

 			break;

 			case DBVT_ASCIIZ:

@@ -182,7 +182,7 @@ void additem(HWND hwnd2Settings,HANDLE hContact, char* module, char* setting, in
 				lvi.iImage = 4;

 				ListView_SetItem(hwnd2Settings,&lvi);

 				ListView_SetItemText(hwnd2Settings,index,1,dbv.pszVal);

-				ListView_SetItemText(hwnd2Settings,index,2,"STRING");

+				ListView_SetItemText(hwnd2Settings,index,2,Translate("STRING"));

 				mir_snprintf(data, 512, "0x%04X (%d)", length,length);

 				ListView_SetItemText(hwnd2Settings,index,3,data);

 			}

@@ -201,7 +201,7 @@ void additem(HWND hwnd2Settings,HANDLE hContact, char* module, char* setting, in
 				MultiByteToWideChar(CP_UTF8, 0, dbv.pszVal, -1, wc, length);

 				ListView_SetItemTextW(hwnd2Settings,index,1,wc);

 

-				ListView_SetItemText(hwnd2Settings,index,2,"UNICODE");

+				ListView_SetItemText(hwnd2Settings,index,2,Translate("UNICODE"));

 				mir_snprintf(data, 512, "0x%04X (%d)", length,length);

 				ListView_SetItemText(hwnd2Settings,index,3,data);

 			}

@@ -217,9 +217,9 @@ void additem(HWND hwnd2Settings,HANDLE hContact, char* module, char* setting, in
 	{

 		lvi.iImage = 5;

 		ListView_SetItem(hwnd2Settings,&lvi);

-		ListView_SetItemText(hwnd2Settings,index,1,"<unsupported>");

-		ListView_SetItemText(hwnd2Settings,index,2,"UNICODE");

-		ListView_SetItemText(hwnd2Settings,index,3,"<unknown>");

+		ListView_SetItemText(hwnd2Settings,index,1,Translate("<unsupported>"));

+		ListView_SetItemText(hwnd2Settings,index,2,Translate("UNICODE"));

+		ListView_SetItemText(hwnd2Settings,index,3,Translate("<unknown>"));

 	}

 	else

 		ListView_DeleteItem(hwnd2Settings,index);

@@ -235,7 +235,7 @@ void PopulateSettings(HWND hwnd2Settings, HANDLE hContact, char* module)
 

 	struct ModSetLinkLinkItem *setting;

 	ModuleSettingLL setlist;

-	if (!EnumSettings(hContact,module,&setlist)) { msg("Error Loading Setting List",modFullname); mir_free(info); return;}

+	if (!EnumSettings(hContact,module,&setlist)) { msg(Translate("Error Loading Setting List"),modFullname); mir_free(info); return;}

 

 	// clear any settings that may be there...

 	ClearListview(hwnd2Settings);

@@ -691,7 +691,7 @@ void EditLabel(HWND hwnd2List, int item, int subitem)
 			char tmp[16];

 			char *data = (char*)_alloca(3*(dbv.cpbVal+1)+10);

 

-			if (!data) {msg("Couldnt allocate enough memory!", modFullname); return;}

+			if (!data) {msg(Translate("Couldnt allocate enough memory!"), modFullname); return;}

 			data[0] = '\0';

 

 			for(j=0; j<dbv.cpbVal; j++)