diff options
33 files changed, 45 insertions, 45 deletions
diff --git a/plugins/DbChecker/res/resource.rc b/plugins/DbChecker/res/resource.rc index 78df7336a3..f3cc963ee7 100644 --- a/plugins/DbChecker/res/resource.rc +++ b/plugins/DbChecker/res/resource.rc @@ -35,7 +35,7 @@ BEGIN LTEXT "Welcome to the Miranda Database Wizard",IDC_TITLE,77,12,178,24,0,WS_EX_TRANSPARENT
LTEXT "Using this Wizard you can compact your Miranda profile database to remove dead space created during normal usage, as well as repair a large number of issues that could affect the database.",IDC_STATIC,77,46,178,32,0,WS_EX_TRANSPARENT
LTEXT "To continue, click Next.",IDC_STATIC,77,85,178,8,0,WS_EX_TRANSPARENT
- LTEXT "This program is licenced under the terms of the GNU General Public License.",IDC_STATIC,77,122,178,16,WS_DISABLED
+ LTEXT "This program is licensed under the terms of the GNU General Public License.",IDC_STATIC,77,122,178,16,WS_DISABLED
END
IDD_WIZARD DIALOGEX 0, 0, 262, 174
diff --git a/plugins/OpenFolder/src/Version.h b/plugins/OpenFolder/src/Version.h index 0f27e6ed7c..f060e480e8 100644 --- a/plugins/OpenFolder/src/Version.h +++ b/plugins/OpenFolder/src/Version.h @@ -7,7 +7,7 @@ #define __PLUGIN_NAME "Open Miranda folder"
#define __FILENAME "OpenFolder.dll"
-#define __DESCRIPTION "Adds a menu/toobar item which opens the main Miranda NG folder."
+#define __DESCRIPTION "Adds a menu/toolbar item which opens the main Miranda NG folder."
#define __AUTHOR "jarvis, Kreisquadratur"
#define __AUTHOREMAIL "jarvis@jabber.cz, djui@kreisquadratur.de"
#define __AUTHORWEB "http://miranda-ng.org/p/OpenFolder/"
diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp index 1443562de2..6eda62e7d2 100644 --- a/plugins/Quotes/src/Forex.cpp +++ b/plugins/Quotes/src/Forex.cpp @@ -276,7 +276,7 @@ namespace int Quotes_OnToolbarLoaded(WPARAM wParam, LPARAM lParam)
{
TTBButton ttb = { sizeof(ttb) };
- ttb.name = LPGEN("Enable/Diable Quotes Auto Update");
+ ttb.name = LPGEN("Enable/Disable Quotes Auto Update");
ttb.pszService = g_pszAutoUpdateCmd;
ttb.pszTooltipUp = LPGEN("Quotes Auto Update Enabled");
ttb.pszTooltipDn = LPGEN("Quotes Auto Update Disabled");
diff --git a/plugins/SMS/res/resource.rc b/plugins/SMS/res/resource.rc index 1f8eb7c957..edfb2324ff 100644 --- a/plugins/SMS/res/resource.rc +++ b/plugins/SMS/res/resource.rc @@ -94,7 +94,7 @@ BEGIN GROUPBOX "SMS Plugin",IDC_STATIC,6,4,244,150
GROUPBOX "",IDC_SIGNGROUP,12,28,231,74,WS_GROUP
EDITTEXT IDC_SIGNATURE,17,40,221,44,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
- CONTROL "Begining",IDC_BEGIN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,115,90,65,8
+ CONTROL "Beginning",IDC_BEGIN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,115,90,65,8
CONTROL "End",IDC_END,"Button",BS_AUTORADIOBUTTON,180,90,58,8
LTEXT "Put signature at the:",IDC_STATIC,18,90,89,10
CONTROL "Use Signature",IDC_USESIGNATURE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,21,226,10
diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc index b9181c9f5c..31445db2f2 100644 --- a/plugins/Scriver/res/resource.rc +++ b/plugins/Scriver/res/resource.rc @@ -121,7 +121,7 @@ BEGIN CONTROL "Relative date",IDC_USERELATIVEDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,80,123,10
CONTROL "Show names",IDC_SHOWNAMES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,25,140,10
CONTROL "Enable message grouping",IDC_GROUPMESSAGES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,36,140,10
- CONTROL "Mark follow-up msgs with timestamp",IDC_MARKFOLLOWUPS,
+ CONTROL "Mark follow-up messages with timestamp",IDC_MARKFOLLOWUPS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,47,132,10
CONTROL "Start message text on a new line",IDC_MESSAGEONNEWLINE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,58,140,10
diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp index 1c9adeb38a..25bf32a8e3 100644 --- a/plugins/Scriver/src/chat/options.cpp +++ b/plugins/Scriver/src/chat/options.cpp @@ -371,7 +371,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa _T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"),
// 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("%proto%"), TranslateT("protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts"),
_T("%accountname%"), TranslateT("user-defined account name of current contact (if defined)."),
_T("%userid%"), TranslateT("user ID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc."),
// global vars
diff --git a/plugins/SeenPlugin/res/resource.rc b/plugins/SeenPlugin/res/resource.rc index dfaa051b05..c6f8f5573f 100644 --- a/plugins/SeenPlugin/res/resource.rc +++ b/plugins/SeenPlugin/res/resource.rc @@ -54,7 +54,7 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Last seen options",IDC_MAINGROUP,0,0,310,237,WS_GROUP
- CONTROL "Last seen menuitem",IDC_MENUITEM,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,6,12,132,10
+ CONTROL "Last seen menu item",IDC_MENUITEM,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,6,12,132,10
CONTROL "Show icon",IDC_SHOWICON,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,162,12,69,10
EDITTEXT IDC_MENUSTAMP,18,23,137,12,ES_AUTOHSCROLL | WS_GROUP
CONTROL "User info tab",IDC_USERINFO,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,6,38,140,10
diff --git a/plugins/SimpleStatusMsg/res/resource.rc b/plugins/SimpleStatusMsg/res/resource.rc index a492e2ad72..2c6f98b10a 100644 --- a/plugins/SimpleStatusMsg/res/resource.rc +++ b/plugins/SimpleStatusMsg/res/resource.rc @@ -189,7 +189,7 @@ BEGIN LTEXT "Set status after",IDC_STATIC,15,18,80,8
EDITTEXT IDC_ESETSTATUS,96,16,36,12,ES_NUMBER | NOT WS_BORDER,WS_EX_CLIENTEDGE
CONTROL "Spin2",IDC_SSETSTATUS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,122,16,11,14
- LTEXT "miliseconds",IDC_STATIC,136,18,90,8
+ LTEXT "milliseconds",IDC_STATIC,136,18,90,8
LTEXT "Protocol:",IDC_STATIC,16,34,63,8
LISTBOX IDC_LISTPROTO,15,45,100,75,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
LTEXT "Status:",IDC_STATIC,126,34,63,8
diff --git a/plugins/SplashScreen/res/splash.rc b/plugins/SplashScreen/res/splash.rc index 34b9df722a..dcaf697a81 100644 --- a/plugins/SplashScreen/res/splash.rc +++ b/plugins/SplashScreen/res/splash.rc @@ -83,7 +83,7 @@ BEGIN UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,173,186,
10,10
LTEXT "steps",IDC_STATIC,176,187,95,9
- LTEXT "Advaimg library not found. Please get it from nigtlies to be able to use images.",
+ LTEXT "AdvaImg plugin not found. Please get it from http://miranda-ng.org/p/AdvaImg/ to be able to use images.",
IDC_PNG2DIBWARN,24,210,185,17,NOT WS_VISIBLE
PUSHBUTTON "Preview...",IDC_PREVIEW,218,211,75,19
END
diff --git a/plugins/StartPosition/src/Version.h b/plugins/StartPosition/src/Version.h index 95d7c836b4..a3ae874169 100644 --- a/plugins/StartPosition/src/Version.h +++ b/plugins/StartPosition/src/Version.h @@ -7,7 +7,7 @@ #define __PLUGIN_NAME "Start position"
#define __FILENAME "StartPosition.dll"
-#define __DESCRIPTION "Plugin supports starting position of Contact List relative to the the taskbar and screen side."
+#define __DESCRIPTION "Plugin supports starting position of Contact List relative to the taskbar and screen side."
#define __AUTHOR "Felipe Brahm - souFrag"
#define __AUTHOREMAIL "felipebrahm@gmail.com"
#define __AUTHORWEB "http://miranda-ng.org/p/StartPosition/"
diff --git a/plugins/StopSpamMod/res/stopspam.rc b/plugins/StopSpamMod/res/stopspam.rc index 984c05d07c..efdc27b4a9 100755 --- a/plugins/StopSpamMod/res/stopspam.rc +++ b/plugins/StopSpamMod/res/stopspam.rc @@ -96,7 +96,7 @@ BEGIN EDITTEXT IDC_AUTOADDGROUP,210,144,76,14,ES_AUTOHSCROLL
GROUPBOX "After congratulation (ICQ only)",IDC_STATIC,15,135,278,51
CONTROL "Automatically grant authorization",IDC_AUTOAUTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,158,263,10
- CONTROL "Request authorization from contacts which pass stopspam test",IDC_REQAUTH,
+ CONTROL "Request authorization from contacts which pass StopSpam test",IDC_REQAUTH,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,170,267,10
CONTROL "Remove all temporary contacts after restart",ID_REMOVE_TMP_ALL,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,55,287,8
diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp index 8703a7566d..ea72e9cc64 100644 --- a/plugins/TabSRMM/src/chat/options.cpp +++ b/plugins/TabSRMM/src/chat/options.cpp @@ -786,7 +786,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM _T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"),
// 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("%proto%"), TranslateT("protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts"),
_T("%accountname%"), TranslateT("user-defined account name of current contact (if defined)."),
_T("%userid%"), TranslateT("user ID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc."),
// global vars
diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp index 6b3ea4b366..9bc3091d00 100644 --- a/plugins/TabSRMM/src/chat/window.cpp +++ b/plugins/TabSRMM/src/chat/window.cpp @@ -3118,7 +3118,7 @@ LABEL_SHOWWINDOW: break; if (si->iLogFilterFlags == 0 && !si->bFilterEnabled) { - MessageBox(0, TranslateT("The filter canoot be enabled, because there are no event types selected either global or for this chat room"), TranslateT("Event filter error"), MB_OK); + MessageBox(0, TranslateT("The filter cannot be enabled, because there are no event types selected either global or for this chat room"), TranslateT("Event filter error"), MB_OK); si->bFilterEnabled = 0; } else si->bFilterEnabled = !si->bFilterEnabled; diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index f73761a911..392efccb23 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -1659,7 +1659,7 @@ void TSAPI DM_EventAdded(TWindowData *dat, WPARAM hContact, LPARAM lParam) dat->hQueuedEvents[dat->iNextQueuedEvent++] = hDbEvent; TCHAR szBuf[100]; - mir_sntprintf(szBuf, SIZEOF(szBuf), TranslateT("Autoscrolling is disabled, %d message(s) queued (press F12 to enable it)"), + mir_sntprintf(szBuf, SIZEOF(szBuf), TranslateT("Auto scrolling is disabled, %d message(s) queued (press F12 to enable it)"), dat->iNextQueuedEvent); SetDlgItemText(hwndDlg, IDC_LOGFROZENTEXT, szBuf); RedrawWindow(GetDlgItem(hwndDlg, IDC_LOGFROZENTEXT), NULL, NULL, RDW_INVALIDATE); diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 2f0e79c86c..0e0c476167 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -1379,7 +1379,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP SendDlgItemMessage(hwndDlg, tooltips[i].id, BUTTONADDTOOLTIP, (WPARAM)TranslateTS(tooltips[i].text), BATF_TCHAR);
SetDlgItemText(hwndDlg, IDC_LOGFROZENTEXT, dat->bNotOnList ? TranslateT("Contact not on list. You may add it...") :
- TranslateT("Autoscrolling is disabled (press F12 to enable it)"));
+ TranslateT("Auto scrolling is disabled (press F12 to enable it)"));
SendMessage(GetDlgItem(hwndDlg, IDC_SAVE), BUTTONADDTOOLTIP, (WPARAM)pszIDCSAVE_close, BATF_TCHAR);
SendMessage(GetDlgItem(hwndDlg, IDC_PROTOCOL), BUTTONADDTOOLTIP, (WPARAM)TranslateT("Click for contact menu\nClick dropdown for window settings"), BATF_TCHAR);
@@ -1965,7 +1965,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP if (!(dat->dwFlagsEx & MWF_SHOW_SCROLLINGDISABLED))
SetDlgItemText(hwndDlg, IDC_LOGFROZENTEXT, TranslateT("Contact not on list. You may add it..."));
else
- SetDlgItemText(hwndDlg, IDC_LOGFROZENTEXT, TranslateT("Autoscrolling is disabled (press F12 to enable it)"));
+ SetDlgItemText(hwndDlg, IDC_LOGFROZENTEXT, TranslateT("Auto scrolling is disabled (press F12 to enable it)"));
SendMessage(hwndDlg, WM_SIZE, 0, 0);
DM_ScrollToBottom(dat, 1, 1);
return(_dlgReturn(hwndDlg, 1));
@@ -2444,7 +2444,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP dat->iNextQueuedEvent = 0;
SetDlgItemText(hwndDlg, IDC_LOGFROZENTEXT, dat->bNotOnList ? TranslateT("Contact not on list. You may add it...") :
- TranslateT("Autoscrolling is disabled (press F12 to enable it)"));
+ TranslateT("Auto scrolling is disabled (press F12 to enable it)"));
return 0;
case DM_SCROLLIEVIEW:
diff --git a/plugins/TabSRMM/src/translator.cpp b/plugins/TabSRMM/src/translator.cpp index db2d64ec2d..5ae8b60173 100644 --- a/plugins/TabSRMM/src/translator.cpp +++ b/plugins/TabSRMM/src/translator.cpp @@ -127,7 +127,7 @@ TOptionListGroup m_lvGroupsLog[] = {
{ 0, LPGENT("Message log appearance") },
{ 0, LPGENT("Support for external plugins") },
- { 0, LPGENT("Timestamp settings (note: timstamps also depend on your templates)") },
+ { 0, LPGENT("Timestamp settings (note: timestamps also depend on your templates)") },
{ 0, LPGENT("Message log icons") },
{ 0, NULL }
};
diff --git a/plugins/UserInfoEx/res/resource.rc b/plugins/UserInfoEx/res/resource.rc index 9e52a49541..ab13d35ea1 100644 --- a/plugins/UserInfoEx/res/resource.rc +++ b/plugins/UserInfoEx/res/resource.rc @@ -141,7 +141,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPU CAPTION "Add phone number"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "Enter your phone number\nand don't worry about formating.",IDC_HEADERBAR,
+ CONTROL "Enter your phone number\nand don't worry about formatting.",IDC_HEADERBAR,
"MHeaderbarCtrl",0x0,0,0,242,25
CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,25,241,101
CONTROL "Enter a category for this number:",IDC_STATIC,"Static",SS_SIMPLE | WS_GROUP,5,32,199,9
@@ -363,7 +363,7 @@ BEGIN LTEXT "Changed information",TXT_OPT_CLR_CHANGED,187,47,96,8
CONTROL "Enable colors to give information about information's status.",CHECK_OPT_CLR,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,16,271,10
- CONTROL "Make protocol based contact information readonly",CHECK_OPT_READONLY,
+ CONTROL "Make protocol based contact information read only",CHECK_OPT_READONLY,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,104,271,10
CONTROL "Enable groups in details dialog's treeview",CHECK_OPT_GROUPS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,152,271,10
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index ac6100ae30..6eccd83b4e 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -269,7 +269,7 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam) metrics.x = GetSystemMetrics(SM_CXSMICON);
metrics.y = GetSystemMetrics(SM_CYSMICON);
if ((psh._hImages = ImageList_Create(metrics.x, metrics.y, ILC_COLOR32 | ILC_MASK, 0, 1)) == NULL) {
- MsgErr(NULL, LPGENT("Creating the imagelist failed!"));
+ MsgErr(NULL, LPGENT("Creating the image list failed!"));
return 1;
}
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp index 74cfe49000..71dd6bee93 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp @@ -501,7 +501,7 @@ BYTE CExImContactBase::isHandle(MCONTACT hContact) if (dbv.type == DBVT_UTF8 && dbv.pszVal && !mir_stricmp(dbv.pszVal,_pszNick)) {
LPTSTR ptszNick = mir_utf8decodeT(_pszNick);
LPTSTR ptszProto = mir_a2t(_pszProto);
- int ans = MsgBox(NULL, MB_ICONQUESTION|MB_YESNO, LPGENT("Question"), LPGENT("contact identificaion"),
+ int ans = MsgBox(NULL, MB_ICONQUESTION|MB_YESNO, LPGENT("Question"), LPGENT("contact identification"),
LPGENT("The contact %s(%s) has no unique ID in the vCard,\nbut there is a contact in your contact list with the same nick and protocol.\nDo you wish to use this contact?"),
ptszNick, ptszProto);
MIR_FREE(ptszNick);
diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index 553ccc1623..dc9d584a11 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -461,7 +461,7 @@ static INT_PTR CALLBACK DlgProc_AdvancedOpts(HWND hDlg, UINT uMsg, WPARAM wParam MB_ICON_WARNING | MB_YESNO,
LPGENT("Question"),
LPGENT("Reset factory defaults"),
- LPGENT("This will delete all settings, you've made!\nAll TreeView settings, window positions and any other settings!\n\nAre you sure to procceed?"));
+ LPGENT("This will delete all settings, you've made!\nAll TreeView settings, window positions and any other settings!\n\nAre you sure to proceed?"));
if (WantReset) {
MCONTACT hContact;
@@ -613,7 +613,7 @@ static INT_PTR CALLBACK DlgProc_ReminderOpts(HWND hDlg, UINT uMsg, WPARAM wParam if (hCtrl = GetDlgItem(hDlg, EDIT_REMIND_ENABLED)) {
ComboBox_AddString(hCtrl, TranslateT("Reminder disabled"));
ComboBox_AddString(hCtrl, TranslateT("Anniversaries only"));
- ComboBox_AddString(hCtrl, TranslateT("Bithdays only"));
+ ComboBox_AddString(hCtrl, TranslateT("Birthdays only"));
ComboBox_AddString(hCtrl, TranslateT("Everything"));
}
if (hCtrl = GetDlgItem(hDlg, EDIT_BIRTHMODULE)) {
diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp index fb6923e927..3fbbd3d2f9 100644 --- a/plugins/UserInfoEx/src/svc_refreshci.cpp +++ b/plugins/UserInfoEx/src/svc_refreshci.cpp @@ -644,7 +644,7 @@ class CContactUpdater : public CContactQueue if (_pProgress)
{
- _pProgress->SetTextParam(TranslateT("[b]%s (%S)...[/b]\n%d Contacts remaning"),
+ _pProgress->SetTextParam(TranslateT("[b]%s (%S)...[/b]\n%d Contacts remaining"),
DB::Contact::DisplayName(_hContact), pszProto, Size());
}
if (IsProtoOnline(pszProto))
diff --git a/plugins/Variables/src/parse_system.cpp b/plugins/Variables/src/parse_system.cpp index e2ad27966e..9788f986cd 100644 --- a/plugins/Variables/src/parse_system.cpp +++ b/plugins/Variables/src/parse_system.cpp @@ -880,7 +880,7 @@ void registerSystemTokens() {
registerIntToken(COMPUTERNAME, parseComputerName, TRF_FIELD, LPGEN("System Functions")"\t"LPGEN("computer name"));
#if _WIN32_WINNT>=0x0500
- registerIntToken(CPULOAD, parseCpuLoad, TRF_FUNCTION, LPGEN("System Functions")"\t(x)\t"LPGEN("cpu load of process x (without extension) (x is optional)"));
+ registerIntToken(CPULOAD, parseCpuLoad, TRF_FUNCTION, LPGEN("System Functions")"\t(x)\t"LPGEN("CPU load of process x (without extension) (x is optional)"));
#endif
registerIntToken(CDATE, parseCurrentDate, TRF_FUNCTION, LPGEN("System Functions")"\t(y)\t"LPGEN("current date in format y (y is optional)"));
registerIntToken(CTIME, parseCurrentTime, TRF_FUNCTION, LPGEN("System Functions")"\t(y)\t"LPGEN("current time in format y (y is optional)"));
diff --git a/plugins/Weather/res/resource.rc b/plugins/Weather/res/resource.rc index 9ecce9a26e..b8d8cd89b1 100644 --- a/plugins/Weather/res/resource.rc +++ b/plugins/Weather/res/resource.rc @@ -209,7 +209,7 @@ BEGIN LTEXT "Today's High",IDC_STATIC,112,70,54,8
LTEXT "Sunrise",IDC_STATIC,112,46,54,8
LTEXT "",IDC_INFO11,12,121,195,9
- LTEXT "Dewpoint",IDC_STATIC,12,94,39,8
+ LTEXT "Dew point",IDC_STATIC,12,94,39,8
LTEXT "Pressure",IDC_STATIC,12,58,39,8
GROUPBOX "",IDC_STATIC,4,36,211,84
GROUPBOX "",IDC_STATIC,4,1,211,35
diff --git a/plugins/YAMN/res/YAMN.rc b/plugins/YAMN/res/YAMN.rc index 1b6940a1df..fc539f6a0e 100644 --- a/plugins/YAMN/res/YAMN.rc +++ b/plugins/YAMN/res/YAMN.rc @@ -258,7 +258,7 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,293,9
GROUPBOX "MailBrowser Options",IDC_STATIC,3,68,151,47
CONTROL "Enable Close on Delete Button",IDC_CLOSEONDELETE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,80,143,11
- CONTROL "Show long localised date",IDC_LONGDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,77,130,10
+ CONTROL "Show long localized date",IDC_LONGDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,77,130,10
CONTROL "Don't show today's date",IDC_SMARTDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,89,131,10
GROUPBOX "Date/Time Representation",IDC_STATIC,166,68,141,47
CONTROL "Don't show seconds",IDC_NOSECONDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,101,129,8
@@ -280,7 +280,7 @@ BEGIN EDITTEXT IDC_EDITPOPS,23,65,20,12,ES_AUTOHSCROLL
GROUPBOX "No new mail notifications",IDC_GBNONEWMAIL,5,152,300,62
CONTROL "Popup if no mail",IDC_CHECKNPOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,161,94,10
- CONTROL "Persistant message",IDC_CHECKNMSGP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,188,110,10
+ CONTROL "Persistent message",IDC_CHECKNMSGP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,188,110,10
CONTROL "Use custom color",IDC_CHECKNCOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,201,107,10
CONTROL "",IDC_CPNB,"ColourPicker",WS_TABSTOP,145,181,29,12
CONTROL "",IDC_CPNT,"ColourPicker",WS_TABSTOP,145,198,29,12
diff --git a/protocols/Sametime/res/resource.rc b/protocols/Sametime/res/resource.rc index c520f68bf6..b0b55f294c 100644 --- a/protocols/Sametime/res/resource.rc +++ b/protocols/Sametime/res/resource.rc @@ -45,7 +45,7 @@ BEGIN GROUPBOX "Error display",IDC_STATIC,7,143,153,53
CONTROL "Use message boxes",IDC_RAD_ERRMB,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,156,145,10
CONTROL "Use popups",IDC_RAD_ERRPOP,"Button",BS_AUTORADIOBUTTON,10,169,145,10
- CONTROL "Use system tray baloons",IDC_RAD_ERRBAL,"Button",BS_AUTORADIOBUTTON,10,182,145,10
+ CONTROL "Use system tray balloons",IDC_RAD_ERRBAL,"Button",BS_AUTORADIOBUTTON,10,182,145,10
GROUPBOX "Contacts",IDC_STATIC,166,7,150,91
CONTROL "Get contacts from server",IDC_CHK_GETSERVERCONTACTS,
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,171,15,139,15
diff --git a/protocols/Skype/src/skype_chat.cpp b/protocols/Skype/src/skype_chat.cpp index 6a0f068fcf..2f2f166566 100644 --- a/protocols/Skype/src/skype_chat.cpp +++ b/protocols/Skype/src/skype_chat.cpp @@ -30,8 +30,8 @@ static struct gc_item crListItems[] = { LPGENT("&Kick"), ICM_KICK, MENU_ITEM },
{ LPGENT("Outlaw (&ban)"), ICM_BAN, MENU_ITEM },
{ NULL, 0, MENU_SEPARATOR },
- { LPGENT("Copy &skypename"), ICM_COPY_SID, MENU_ITEM },
- { LPGENT("Copy room &uri"), ICM_COPY_URI, MENU_ITEM }
+ { LPGENT("Copy &Skype name"), ICM_COPY_SID, MENU_ITEM },
+ { LPGENT("Copy room &URI"), ICM_COPY_URI, MENU_ITEM }
};
static void CheckChatMenuItem(CHAT_LIST_MENU checkedId)
diff --git a/protocols/Skype/src/skype_instances.cpp b/protocols/Skype/src/skype_instances.cpp index b5cf2c4494..66b8447fbc 100644 --- a/protocols/Skype/src/skype_instances.cpp +++ b/protocols/Skype/src/skype_instances.cpp @@ -12,7 +12,7 @@ CSkypeProto* CSkypeProto::InitSkypeProto(const char* protoName, const wchar_t* u if (CSkypeProto::instanceList.getCount() > 0)
{
CSkypeProto::ShowNotification(
- ::TranslateT("Skype protocol plugin only permits you to login to one account at a time. Adding multiple accounts is prohibited in the licence agreement and standard distribution terms of SkypeKit."),
+ ::TranslateT("Skype protocol plugin only permits you to login to one account at a time. Adding multiple accounts is prohibited in the license agreement and standard distribution terms of SkypeKit."),
MB_ICONERROR);
return NULL;
}
diff --git a/protocols/Tlen/res/tlen.rc b/protocols/Tlen/res/tlen.rc index 2e07488fab..8cb7316bd8 100644 --- a/protocols/Tlen/res/tlen.rc +++ b/protocols/Tlen/res/tlen.rc @@ -312,7 +312,7 @@ BEGIN WS_VSCROLL | WS_TABSTOP
LTEXT "School:",IDC_STATIC,15,150,50,8
EDITTEXT IDC_SCHOOL,65,148,91,12,ES_AUTOHSCROLL
- GROUPBOX "Extra Search Criterias",IDC_EXTRAGROUP,171,7,156,67
+ GROUPBOX "Extra Search Criteria",IDC_EXTRAGROUP,171,7,156,67
LTEXT "Status:",IDC_STATIC,177,22,50,8
COMBOBOX IDC_STATUS,227,20,91,113,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
diff --git a/protocols/Xfire/res/resource.rc b/protocols/Xfire/res/resource.rc index 477bf5a5a8..2ffca6f15a 100644 --- a/protocols/Xfire/res/resource.rc +++ b/protocols/Xfire/res/resource.rc @@ -110,7 +110,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN
GROUPBOX "Options",IDC_GRP1,2,1,300,152
GROUPBOX "More options",IDC_GRP5,2,155,300,71
- RTEXT "Display Error and Infomessage:",IDC_STC12,4,209,144,9,NOT WS_GROUP
+ RTEXT "Display Error and Info message:",IDC_STC12,4,209,144,9,NOT WS_GROUP
COMBOBOX IDC_NOMSG,152,207,142,61,CBS_DROPDOWNLIST | WS_TABSTOP
CONTROL "Tree1",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,6,11,292,138
RTEXT "Main group for clan groups:",IDC_STC25,4,194,144,9,NOT WS_GROUP
@@ -147,7 +147,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN
GROUPBOX "Status Message",IDC_GRP1,2,1,300,214
CONTROL "Enable",IDC_ENABLESTSMSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,14,132,9
- LTEXT "With this feature, following status message will be set on your other protocol plugins, if you are ingame. So your other buddies can also see what you play. It will also change the status to occupied, if this option is enabled.",IDC_STC28,10,38,286,24,NOT WS_GROUP
+ LTEXT "With this feature, following status message will be set on your other protocol plugins, if you are in game. So your other buddies can also see what you play. It will also change the status to occupied, if this option is enabled.",IDC_STC28,10,38,286,24,NOT WS_GROUP
LTEXT "Following Variables are available: %myxfiregame%, %myxfirevoice%, %myxfireserverip%, %myxfirevoiceip%",IDC_STC29,10,96,286,19,NOT WS_GROUP
EDITTEXT IDC_STATUSMSG,8,131,286,70,ES_MULTILINE | NOT WS_BORDER,WS_EX_CLIENTEDGE
LTEXT "Status message:",IDC_STC30,10,118,94,9,NOT WS_GROUP
@@ -191,7 +191,7 @@ BEGIN LTEXT "Username:",IDC_STC2,8,18,36,9,NOT WS_GROUP
LTEXT "Nick:",IDC_STC3,8,9,32,9,NOT WS_GROUP
GROUPBOX "Game",IDC_GRP2,2,44,220,32
- GROUPBOX "Voicechat",IDC_GRP3,2,77,220,33
+ GROUPBOX "Voice chat",IDC_GRP3,2,77,220,33
LTEXT "Name:",IDC_STC4,30,53,36,9,NOT WS_GROUP
EDITTEXT IDC_GAME,54,53,134,9,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
LTEXT "IP:",IDC_STC5,30,64,18,9,NOT WS_GROUP
@@ -243,7 +243,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIB CAPTION "New xfire_games.ini"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
- LTEXT "There is a new XFire gamelist online, do you want to update now?",IDC_STC34,30,5,154,19,NOT WS_GROUP
+ LTEXT "There is a new XFire game list online, do you want to update now?",IDC_STC34,30,5,154,19,NOT WS_GROUP
ICON IDI_TM,IDC_IMG2,4,3,22,19,SS_CENTERIMAGE
LTEXT "New supported games:",IDC_STC35,6,29,124,9,NOT WS_GROUP
DEFPUSHBUTTON "Update",IDOK,36,88,50,15
diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index b08edd0f1f..ef46e4020b 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -420,7 +420,7 @@ void XFireClient::sendmsg(char*usr,char*cmsg) { for(int i=0;i<claninv->numberOfInv;i++)
{
char msg[XFIRE_MAX_STATIC_STRING_LEN];
- mir_snprintf(msg, SIZEOF(msg), Translate("%s (Nickname: %s) has invited you to join the %s clan. Message: %s%sPlease go to the XFireclan-Site to accept the Invitation."),claninv->invitefromusername[i].c_str(),
+ mir_snprintf(msg, SIZEOF(msg), Translate("%s (Nickname: %s) has invited you to join the %s clan. Message: %s%sPlease go to the XFire clan site to accept the Invitation."),claninv->invitefromusername[i].c_str(),
claninv->invitefrom[i].c_str(),
claninv->clanname[i].c_str(),
claninv->invitemsg[i].c_str(),"\n");
diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp index c8b4bd153e..559c1ed0c7 100644 --- a/protocols/Xfire/src/options.cpp +++ b/protocols/Xfire/src/options.cpp @@ -85,12 +85,12 @@ static mytreeitem mytree[] = { {LPGENT("Display popup if someone starts a game"),"gamepopup",0,0},
{LPGENT("Don't automatically create clan groups"),"noclangroups",0,0},
{LPGENT("Enable MBot support"),"mbotsupport",0,0},
- {LPGENT("Gamedetection"),"",1,0},
+ {LPGENT("Game detection"),"",1,0},
/*{"Scan for games on every Miranda start","scanalways",0},*/
{LPGENT("Disable game detection"),"nogamedetect",0,0},
/*{"Enable server IP/Port detection","ipportdetec",0},*/
/*{"Enable TeamSpeak2/Ventrilo detection","",0},*/
- {LPGENT("Use TSRemote.dll to get teamspeak server info"),"ts2useremote",0,0},
+ {LPGENT("Use TSRemote.dll to get TeamSpeak server info"),"ts2useremote",0,0},
{LPGENT("Disable popups when ingame"),"nopopups",0,0},
{LPGENT("Disable sound events when ingame"),"nosoundev",0,0},
{LPGENT("Files"),"",1,0},
@@ -363,7 +363,7 @@ static INT_PTR CALLBACK DlgProcOpts3(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR SendMessage(hwndDlg, DM_REBUILD_TREE, 0, 0);
SendDlgItemMessage( hwndDlg, IDC_NOMSG, CB_ADDSTRING, 0, (LPARAM)TranslateT("Hidden" ));
- SendDlgItemMessage( hwndDlg, IDC_NOMSG, CB_ADDSTRING, 0, (LPARAM)TranslateT("Messagebox" ));
+ SendDlgItemMessage( hwndDlg, IDC_NOMSG, CB_ADDSTRING, 0, (LPARAM)TranslateT("Message box" ));
SendDlgItemMessage( hwndDlg, IDC_NOMSG, CB_ADDSTRING, 0, (LPARAM)TranslateT("Popup" ));
//scanalways
diff --git a/protocols/Yahoo/res/Yahoo.rc b/protocols/Yahoo/res/Yahoo.rc index f903d01eee..a9072b97d2 100644 --- a/protocols/Yahoo/res/Yahoo.rc +++ b/protocols/Yahoo/res/Yahoo.rc @@ -31,7 +31,7 @@ BEGIN GROUPBOX "Expert",IDC_STATIC,8,84,280,80 CONTROL "Use Yahoo Address Book (YAB)",IDC_USE_YAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,104,260,10 CONTROL "Show Avatars",IDC_SHOW_AVATARS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,114,260,10 - CONTROL "AutoLogin to Yahoo Website(s)",IDC_MAIL_AUTOLOGIN, + CONTROL "Auto login to Yahoo Website(s)",IDC_MAIL_AUTOLOGIN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,124,260,10 CONTROL "Display Yahoo notifications",IDC_DISABLEYAHOOMAIL, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,134,260,10 diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp index 51e1ea569b..0ac5740c41 100644 --- a/protocols/Yahoo/src/yahoo.cpp +++ b/protocols/Yahoo/src/yahoo.cpp @@ -984,10 +984,10 @@ void CYahooProto::ext_mail_notify(const char *from, const char *subj, int cnt) if (from == NULL) {
mir_sntprintf(title, SIZEOF(title), _T("%s: %s"), m_tszUserName, TranslateT("New Mail"));
- mir_sntprintf(z, SIZEOF(z), TranslateT("You have %i unread msgs"), cnt);
+ mir_sntprintf(z, SIZEOF(z), TranslateT("You have %i unread messages"), cnt);
}
else {
- mir_sntprintf(title, SIZEOF(title), TranslateT("New Mail (%i msgs)"), cnt);
+ mir_sntprintf(title, SIZEOF(title), TranslateT("New Mail (%i messages)"), cnt);
ptrT tszFrom( mir_utf8decodeT(from));
ptrT tszSubj( mir_utf8decodeT(subj));
|