db => database

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

7 files changed, 10 insertions, 10 deletions

diff --git a/plugins/DbEditorPP/res/resource.rc b/plugins/DbEditorPP/res/resource.rc
index cfdedb3b69..79db75d01c 100644
--- a/plugins/DbEditorPP/res/resource.rc
+++ b/plugins/DbEditorPP/res/resource.rc
@@ -145,7 +145,7 @@ END
 

 IDD_MAIN DIALOGEX 0, 0, 408, 225

 STYLE DS_ABSALIGN | DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

-CAPTION "DBEditor++"

+CAPTION "Database Editor++"

 MENU IDR_MAINMENU

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

 BEGIN

diff --git a/plugins/DbEditorPP/src/findwindow.cpp b/plugins/DbEditorPP/src/findwindow.cpp
index ae1eabcde8..da1b9cf673 100644
--- a/plugins/DbEditorPP/src/findwindow.cpp
+++ b/plugins/DbEditorPP/src/findwindow.cpp
@@ -65,7 +65,7 @@ INT_PTR CALLBACK FindWindowDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 		case WM_INITDIALOG:

 		{

 			TranslateDialogDefault(hwnd);

-			SendMessage(GetDlgItem(hwnd,IDC_SBAR),SB_SETTEXT,0,(LPARAM)Translate("Enter a string to search the DB for"));

+			SendMessage(GetDlgItem(hwnd,IDC_SBAR),SB_SETTEXT,0,(LPARAM)Translate("Enter a string to search the database for"));

 			CheckDlgButton(hwnd,IDC_MODNAME,1);

 			CheckDlgButton(hwnd,IDC_SETTINGNAME,1);

 			CheckDlgButton(hwnd,IDC_SETTINGVALUE,1);

diff --git a/plugins/Db_autobackups/src/version.h b/plugins/Db_autobackups/src/version.h
index b883b2e917..e7e251a961 100644
--- a/plugins/Db_autobackups/src/version.h
+++ b/plugins/Db_autobackups/src/version.h
@@ -7,7 +7,7 @@
 

 #define __PLUGIN_NAME			"Db autobackuper"

 #define __FILENAME				"Db_autobackups.dll"

-#define __DESCRIPTION 			"Db autobackuper plugin."

+#define __DESCRIPTION 			"Database autobackuper plugin."

 #define __AUTHOR				"chaos.persei, sje, Kildor, Billy_Bons"

 #define __AUTHOREMAIL			"chaos.persei@gmail.com"

 #define __AUTHORWEB				"http://miranda-ng.org/p/Db_autobackups/"

diff --git a/plugins/HistorySweeperLight/res/historysweeperlight.rc b/plugins/HistorySweeperLight/res/historysweeperlight.rc
index 69890044f8..bce1dc9742 100644
--- a/plugins/HistorySweeperLight/res/historysweeperlight.rc
+++ b/plugins/HistorySweeperLight/res/historysweeperlight.rc
@@ -42,7 +42,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,197,294,10

     CONTROL         "Clicking on the icon in the status bar will change settings",IDC_HISTMW,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,211,294,10

-    CONTROL         "Use UNSAFE mode (sweep fastest as possible, but dangerous for DB)",IDC_UNSAFEMODE,

+    CONTROL         "Use UNSAFE mode (sweep fastest as possible, but dangerous for database)",IDC_UNSAFEMODE,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,225,294,10

 END

 

diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp
index 877ce7d7c6..64fbf69bb9 100755
--- a/plugins/Msg_Export/src/utils.cpp
+++ b/plugins/Msg_Export/src/utils.cpp
@@ -288,7 +288,7 @@ tstring _DBGetStringW(HANDLE hContact,const char *szModule,const char *szSetting
 	{

 		if (dbv.type != DBVT_WCHAR)

 		{

-			MessageBox(NULL, TranslateT("DB: Attempt to get wrong type of value, string"), MSG_BOX_TITEL, MB_OK);

+			MessageBox(NULL, TranslateT("Database: Attempt to get wrong type of value, string"), MSG_BOX_TITEL, MB_OK);

 			ret = pszError;

 		}

 		else

@@ -310,7 +310,7 @@ string _DBGetStringA(HANDLE hContact,const char *szModule,const char *szSetting,
 	{

 		if (dbv.type != DBVT_ASCIIZ)

 		{

-			MessageBox(NULL, TranslateT("DB: Attempt to get wrong type of value, string"), MSG_BOX_TITEL, MB_OK);

+			MessageBox(NULL, TranslateT("Database: Attempt to get wrong type of value, string"), MSG_BOX_TITEL, MB_OK);

 			ret = pszError;

 		}

 		else

diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp
index b87dd9a500..3c9d067990 100644
--- a/plugins/Variables/src/parse_miranda.cpp
+++ b/plugins/Variables/src/parse_miranda.cpp
@@ -779,9 +779,9 @@ int registerMirandaTokens()
 	registerIntToken(_T(CONTACT), parseContact, TRF_FUNCTION, LPGEN("Miranda Related")"\t(x,y,z)\t"LPGEN("zth contact with property y described by x, example: (unregistered,nick) (z is optional)"));

 	registerIntToken(_T(CONTACTCOUNT), parseContactCount, TRF_FUNCTION, LPGEN("Miranda Related")"\t(x,y)\t"LPGEN("number of contacts with property y described by x, example: (unregistered,nick)"));

 	registerIntToken(_T(MIR_CONTACTINFO), parseContactInfo, TRF_FUNCTION, LPGEN("Miranda Related")"\t(x,y)\t"LPGEN("info property y of contact x"));

-	registerIntToken(_T(DBPROFILENAME), parseDBProfileName, TRF_FIELD, LPGEN("Miranda Related")"\t"LPGEN("db profile name"));

-	registerIntToken(_T(DBPROFILEPATH), parseDBProfilePath, TRF_FIELD, LPGEN("Miranda Related")"\t"LPGEN("db profile path"));

-	registerIntToken(_T(DBSETTING), parseDBSetting, TRF_FUNCTION, LPGEN("Miranda Related")"\t(x,y,z,w)\t"LPGEN("db setting z of module y of contact x and return w if z isn't exist (w is optional)"));

+	registerIntToken(_T(DBPROFILENAME), parseDBProfileName, TRF_FIELD, LPGEN("Miranda Related")"\t"LPGEN("database profile name"));

+	registerIntToken(_T(DBPROFILEPATH), parseDBProfilePath, TRF_FIELD, LPGEN("Miranda Related")"\t"LPGEN("database profile path"));

+	registerIntToken(_T(DBSETTING), parseDBSetting, TRF_FUNCTION, LPGEN("Miranda Related")"\t(x,y,z,w)\t"LPGEN("database setting z of module y of contact x and return w if z isn't exist (w is optional)"));

 	registerIntToken(_T(DBEVENT), parseDbEvent, TRF_FUNCTION, LPGEN("Miranda Related")"\t(x,y,z,w)\t"LPGEN("get event for contact x (optional), according to y,z,w, see documentation"));

 	registerIntToken(_T(LSTIME), parseLastSeenTime, TRF_FUNCTION, LPGEN("Miranda Related")"\t(x,y)\t"LPGEN("get last seen time of contact x in format y (y is optional)"));

 	registerIntToken(_T(LSDATE), parseLastSeenDate, TRF_FUNCTION, LPGEN("Miranda Related")"\t(x,y)\t"LPGEN("get last seen date of contact x in format y (y is optional)"));

diff --git a/src/modules/database/database.cpp b/src/modules/database/database.cpp
index 7380631318..303198d9d0 100644
--- a/src/modules/database/database.cpp
+++ b/src/modules/database/database.cpp
@@ -446,7 +446,7 @@ int LoadDatabaseModule(void)
 	if (arDbPlugins.getCount() == 0) {

 		TCHAR buf[256];

 		TCHAR* p = _tcsrchr(szProfile, '\\');

-		mir_sntprintf(buf, SIZEOF(buf), TranslateT("Miranda is unable to open '%s' because you do not have any profile plugins installed.\nYou need to install dbx_mmap.dll or equivalent."), p ? ++p : szProfile);

+		mir_sntprintf(buf, SIZEOF(buf), TranslateT("Miranda is unable to open '%s' because you do not have any profile plugins installed.\nYou need to install dbx_mmap.dll"), p ? ++p : szProfile);

 		MessageBox(0, buf, TranslateT("No profile support installed!"), MB_OK | MB_ICONERROR);

 	}