From c989c00ce9e0a8422e7efb3c21350ca3f5276d86 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Tue, 12 Feb 2013 19:41:45 +0000 Subject: - rev [3582] reverted git-svn-id: http://svn.miranda-ng.org/main/trunk@3584 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/DbEditorPP/src/addeditsettingsdlg.cpp | 4 ++-- plugins/DbEditorPP/src/findwindow.cpp | 4 ++-- plugins/DbEditorPP/src/main.cpp | 2 +- plugins/DbEditorPP/src/moduletree.cpp | 6 +++--- plugins/DbEditorPP/src/settinglist.cpp | 24 ++++++++++++------------ 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'plugins/DbEditorPP') 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"); - ListView_SetItemText(hwnd2Settings,index,2,"UNICODE"); - ListView_SetItemText(hwnd2Settings,index,3,""); + ListView_SetItemText(hwnd2Settings,index,1,Translate("")); + ListView_SetItemText(hwnd2Settings,index,2,Translate("UNICODE")); + ListView_SetItemText(hwnd2Settings,index,3,Translate("")); } 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