summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/BossKeyPlus/res/BossKey.rc2
-rw-r--r--plugins/Clist_blind/src/init.cpp2
-rw-r--r--plugins/HistorySweeperLight/res/historysweeperlight.rc4
-rw-r--r--plugins/KeyboardNotify/res/resources.rc2
-rwxr-xr-xplugins/Msg_Export/src/FileViewer.cpp2
-rw-r--r--plugins/Msg_Export/src/Version.h2
-rwxr-xr-xplugins/Msg_Export/src/options.cpp4
-rw-r--r--plugins/NewXstatusNotify/res/resource.rc2
-rw-r--r--plugins/Popup/src/opt_gen.cpp2
-rw-r--r--plugins/VersionInfo/res/resource.rc2
-rw-r--r--plugins/VersionInfo/src/dlgHandlers.cpp2
-rw-r--r--plugins/YAMN/src/proto/pop3/pop3comm.cpp2
-rw-r--r--protocols/MRA/src/Mra_proto.cpp2
-rw-r--r--protocols/MSN/src/msn_p2p.cpp2
-rw-r--r--protocols/Tlen/src/tlen_avatar.cpp2
-rw-r--r--protocols/Yahoo/src/yahoo.cpp2
16 files changed, 18 insertions, 18 deletions
diff --git a/plugins/BossKeyPlus/res/BossKey.rc b/plugins/BossKeyPlus/res/BossKey.rc
index 193b9face4..97fab81b3b 100644
--- a/plugins/BossKeyPlus/res/BossKey.rc
+++ b/plugins/BossKeyPlus/res/BossKey.rc
@@ -70,7 +70,7 @@ EXSTYLE WS_EX_CONTROLPARENT
CAPTION "BossKey"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "Workstation is Locked",IDC_MAINOPT_HIDEIFLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,18,204,8
+ CONTROL "Workstation is locked",IDC_MAINOPT_HIDEIFLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,18,204,8
CONTROL "Screen Saver is running",IDC_MAINOPT_HIDEIFSCRSVR,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,32,204,8
CONTROL "Windows is inactive",IDC_MAINOPT_HIDEIFWINIDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,46,116,8
diff --git a/plugins/Clist_blind/src/init.cpp b/plugins/Clist_blind/src/init.cpp
index a800916b8d..d6257b5c09 100644
--- a/plugins/Clist_blind/src/init.cpp
+++ b/plugins/Clist_blind/src/init.cpp
@@ -583,7 +583,7 @@ void RebuildEntireListInternal(HWND hwnd, ClcData *tmp_dat, BOOL call_orig)
const TCHAR *v[] = {
item->szText,
count,
- item->group->expanded ? TranslateT("Expanded") : TranslateT("Colapsed")
+ item->group->expanded ? TranslateT("Expanded") : TranslateT("Collapsed")
};
TCHAR *txt;
diff --git a/plugins/HistorySweeperLight/res/historysweeperlight.rc b/plugins/HistorySweeperLight/res/historysweeperlight.rc
index bce1dc9742..0c04d1d4ac 100644
--- a/plugins/HistorySweeperLight/res/historysweeperlight.rc
+++ b/plugins/HistorySweeperLight/res/historysweeperlight.rc
@@ -30,7 +30,7 @@ EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "History Sweeper Light",IDC_STATIC,0,0,313,240
- LTEXT "Sweep history for this contacts:",IDC_STATIC,8,12,296,10
+ LTEXT "Sweep history for these contacts:",IDC_STATIC,8,12,296,10
CONTROL "",IDC_LIST,"CListControl",WS_TABSTOP | 0x1d2,8,22,297,139,WS_EX_CLIENTEDGE
ICON "",IDC_ACT1,8,164,20,20
LTEXT "Action 1",IDC_STATIC,22,164,118,10
@@ -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 database)",IDC_UNSAFEMODE,
+ CONTROL "Use UNSAFE mode (sweep as fast as possible, but dangerous for database)",IDC_UNSAFEMODE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,225,294,10
END
diff --git a/plugins/KeyboardNotify/res/resources.rc b/plugins/KeyboardNotify/res/resources.rc
index 38e13fdd5e..c1ee0d79a6 100644
--- a/plugins/KeyboardNotify/res/resources.rc
+++ b/plugins/KeyboardNotify/res/resources.rc
@@ -71,7 +71,7 @@ BEGIN
GROUPBOX "Notify when",IDC_STATIC,155,4,147,68
CONTROL "Full Screen mode",IDC_FSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,14,117,10
CONTROL "Screen Saver is running",IDC_SSAVER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,25,117,10
- CONTROL "Workstation is Locked",IDC_LOCKED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,36,117,10
+ CONTROL "Workstation is locked",IDC_LOCKED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,36,117,10
CONTROL "Defined programs are running",IDC_PGMS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,47,111,10
PUSHBUTTON "...",IDC_ASSIGNPGMS,282,49,15,9
CONTROL "All other situations",IDC_ACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,58,117,10
diff --git a/plugins/Msg_Export/src/FileViewer.cpp b/plugins/Msg_Export/src/FileViewer.cpp
index 21b8396764..b3f46b2dc6 100755
--- a/plugins/Msg_Export/src/FileViewer.cpp
+++ b/plugins/Msg_Export/src/FileViewer.cpp
@@ -525,7 +525,7 @@ bool bOpenExternaly( MCONTACT hContact )
&sStartupInfo,
&stProcesses))
{
- DisplayLastError( LPGENT("Faile to execute external file view"));
+ DisplayLastError( LPGENT("Failed to execute external file view"));
}
return true;
}
diff --git a/plugins/Msg_Export/src/Version.h b/plugins/Msg_Export/src/Version.h
index 573ac7a98a..f97c21c63b 100644
--- a/plugins/Msg_Export/src/Version.h
+++ b/plugins/Msg_Export/src/Version.h
@@ -7,7 +7,7 @@
#define __PLUGIN_NAME "Message export"
#define __FILENAME "Msg_Export.dll"
-#define __DESCRIPTION "Exports every message, URL or File you receive to a text file."
+#define __DESCRIPTION "Exports every message, URL or file you receive to a text file."
#define __AUTHOR "Kennet Nielsen, mod by ring0"
#define __AUTHOREMAIL "Kennet_N@ofir.dk"
#define __AUTHORWEB "http://miranda-ng.org/p/Msg_Export/"
diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp
index cee3a516be..f6dfa69f44 100755
--- a/plugins/Msg_Export/src/options.cpp
+++ b/plugins/Msg_Export/src/options.cpp
@@ -244,7 +244,7 @@ int nExportCompleatList(HWND hParent, bool bOnlySelected )
{ // window text update
- SetWindowText( hStatus, TranslateT("Sorting and writing database information ( Phase 2 of 2 )"));
+ SetWindowText( hStatus, TranslateT("Sorting and writing database information (Phase 2 of 2)"));
SendMessage( hProg, PBM_SETRANGE, 0, MAKELPARAM( 0, AllEvents.size()));
SendMessage( hProg, PBM_SETPOS, 0, 0);
}
@@ -594,7 +594,7 @@ void OpenHelp(HWND hwndDlg)
}
}
- MessageBox(hwndDlg, TranslateT("Failed to get the path to Msg_Export.dll\nPlease locate Msg_Export.txt your self"), MSG_BOX_TITEL, MB_OK);
+ MessageBox(hwndDlg, TranslateT("Failed to get the path to Msg_Export.dll\nPlease locate Msg_Export.txt yourself"), MSG_BOX_TITEL, MB_OK);
}
/////////////////////////////////////////////////////////////////////
diff --git a/plugins/NewXstatusNotify/res/resource.rc b/plugins/NewXstatusNotify/res/resource.rc
index a8ef4b0729..cb13b65fb9 100644
--- a/plugins/NewXstatusNotify/res/resource.rc
+++ b/plugins/NewXstatusNotify/res/resource.rc
@@ -147,7 +147,7 @@ BEGIN
CONTROL "Enable sounds",IDC_CHECK_NOTIFYSOUNDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,117,131,96,10
CONTROL "Enable popups",IDC_CHECK_NOTIFYPOPUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,131,101,10
GROUPBOX "Status Notify",IDC_STATIC,4,119,213,29
- CTEXT "Individual sounds are disabled.\n\nTo enable them, go to Options - Status - Notify, enable \n""Use individual sounds"" checkbox, and then reopen this dialog.",IDC_TEXT_ENABLE_IS,5,22,210,56
+ CTEXT "Individual sounds are disabled.\n\nTo enable them, go to Options -> Status -> Status Notify, enable\n""Use individual sounds"" checkbox, and then reopen this dialog.",IDC_TEXT_ENABLE_IS,5,22,210,56
END
IDD_OPT_FILTERS DIALOGEX 0, 0, 300, 230
diff --git a/plugins/Popup/src/opt_gen.cpp b/plugins/Popup/src/opt_gen.cpp
index f6287bf1bf..90103fb7b8 100644
--- a/plugins/Popup/src/opt_gen.cpp
+++ b/plugins/Popup/src/opt_gen.cpp
@@ -585,7 +585,7 @@ void ErrorMSG(int minValue, int maxValue)
void Check_ReorderPopups(HWND hwnd) {
if (!PopupOptions.ReorderPopups && PopupOptions.ReorderPopupsWarning) {
int res = MessageBox(hwnd,
- TranslateT("'Reorder Popups' option is currently diabled.\r\nThis may cause misaligned popups when used with\r\navatars and text replacement (mainly NewStatusNotify).\r\n\r\nDo you want to enable popup reordering now?\r\n"),
+ TranslateT("'Reorder Popups' option is currently diabled.\r\nThis may cause misaligned popups when used with\r\navatars and text replacement (mainly NewXstatusNotify).\r\n\r\nDo you want to enable popup reordering now?\r\n"),
TranslateT("Popup Plus Warning"), MB_ICONEXCLAMATION | MB_YESNOCANCEL);
switch (res) {
diff --git a/plugins/VersionInfo/res/resource.rc b/plugins/VersionInfo/res/resource.rc
index a509586c34..631a272b4e 100644
--- a/plugins/VersionInfo/res/resource.rc
+++ b/plugins/VersionInfo/res/resource.rc
@@ -41,7 +41,7 @@ BEGIN
GROUPBOX "Select output:",IDC_STATIC,7,7,217,72
CONTROL "Upload to site",IDC_ASK_TOUPLOAD,"Button",BS_AUTORADIOBUTTON | WS_DISABLED | WS_TABSTOP,15,67,206,10
CONTROL "Forum style formatting",IDC_ASK_FORUMSTYLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,92,206,9
- GROUPBOX "Aditional options:",IDC_STATIC,7,81,217,39
+ GROUPBOX "Additional options:",IDC_STATIC,7,81,217,39
COMBOBOX IDC_ASK_QUOTECOMBOBOX,15,104,75,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_ASK_SIZECOMBOBOX,93,104,71,48,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_ASK_BOLDCOMBOBOX,167,104,54,47,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
diff --git a/plugins/VersionInfo/src/dlgHandlers.cpp b/plugins/VersionInfo/src/dlgHandlers.cpp
index 8a36de678c..933c197910 100644
--- a/plugins/VersionInfo/src/dlgHandlers.cpp
+++ b/plugins/VersionInfo/src/dlgHandlers.cpp
@@ -384,7 +384,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
case IDC_SHOWUUIDS:
if (IsDlgButtonChecked(hWnd, IDC_SHOWUUIDS) && MessageBox(hWnd,
- TranslateT("Are you sure you want to enable this option ?\nPlease only enable this option if you really know what you're doing and what the option is for or if someone asked you to do it."),
+ TranslateT("Are you sure you want to enable this option?\nPlease only enable this option if you really know what you're doing and what the option is for or if someone asked you to do it."),
TranslateT("Show plugin UUIDs?"), MB_YESNO | MB_ICONWARNING) == IDNO)
{
CheckDlgButton(hWnd, IDC_SHOWUUIDS, FALSE);
diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
index b05e3ad1ff..e2994d88b9 100644
--- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
@@ -332,7 +332,7 @@ DWORD WINAPI WritePOP3Accounts()
if (ReturnValue == EACC_SYSTEM) {
TCHAR temp[1024] = {0};
mir_sntprintf(temp, SIZEOF(temp), _T("%s\n%s"), TranslateT("Error while copying data to disk occurred. Is file in use?"), FileName);
- MessageBox(NULL, temp, TranslateT("POP3 plugin- write file error"), MB_OK );
+ MessageBox(NULL, temp, TranslateT("POP3 plugin - write file error"), MB_OK );
}
return ReturnValue;
diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp
index 1f30dff05c..4191017bd8 100644
--- a/protocols/MRA/src/Mra_proto.cpp
+++ b/protocols/MRA/src/Mra_proto.cpp
@@ -734,7 +734,7 @@ bool CMraProto::CmdContactAck(int cmd, int seq, BinBuffer &buf)
ShowFormattedErrorMessage(_T("Invalid user name"), NO_ERROR);
break;
case CONTACT_OPER_USER_EXISTS:// ## пользователь уже есть в контакт-листе
- ShowFormattedErrorMessage(_T("User allready added"), NO_ERROR);
+ ShowFormattedErrorMessage(_T("User already added"), NO_ERROR);
break;
case CONTACT_OPER_GROUP_LIMIT:// ## превышено максимально допустимое количество групп (20)
ShowFormattedErrorMessage(_T("Group limit is 20"), NO_ERROR);
diff --git a/protocols/MSN/src/msn_p2p.cpp b/protocols/MSN/src/msn_p2p.cpp
index faeee37d8b..28001e66cc 100644
--- a/protocols/MSN/src/msn_p2p.cpp
+++ b/protocols/MSN/src/msn_p2p.cpp
@@ -1341,7 +1341,7 @@ void CMsnProto::p2p_InitFileTransfer(
}
if (!_stricmp(szEufGuid, "{1C9AA97E-9C05-4583-A3BD-908A196F1E92}")) {
MSN_ShowPopup(ft->std.hContact,
- TranslateT("Contact tried to view our webcam data (not currently supported)"),
+ TranslateT("Contact tried to view your webcam data (not currently supported)"),
MSN_ALLOW_MSGBOX | MSN_SHOW_ERROR);
}
p2p_sendStatus(ft, 603);
diff --git a/protocols/Tlen/src/tlen_avatar.cpp b/protocols/Tlen/src/tlen_avatar.cpp
index b75ac787ba..e6b1673ce0 100644
--- a/protocols/Tlen/src/tlen_avatar.cpp
+++ b/protocols/Tlen/src/tlen_avatar.cpp
@@ -111,7 +111,7 @@ static void SetAvatar(TlenProtocol *proto, MCONTACT hContact, TLEN_LIST_ITEM *it
db_set_dw(hContact, proto->m_szModuleName, "AvatarFormat", format);
} else {
TCHAR buffer[128];
- mir_sntprintf(buffer, SIZEOF(buffer), TranslateT("Can not save new avatar file \"%s\" Error:\n\t%s (Error: %d)"), filename, _tcserror(errno), errno);
+ mir_sntprintf(buffer, SIZEOF(buffer), TranslateT("Cannot save new avatar file \"%s\" Error:\n\t%s (Error: %d)"), filename, _tcserror(errno), errno);
PUShowMessageT(buffer, SM_WARNING);
proto->debugLog(buffer);
return;
diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp
index d23fa6926c..25488ce8a8 100644
--- a/protocols/Yahoo/src/yahoo.cpp
+++ b/protocols/Yahoo/src/yahoo.cpp
@@ -984,7 +984,7 @@ 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 msgs"), cnt);
}
else {
mir_sntprintf(title, SIZEOF(title), TranslateT("New Mail (%i msgs)"), cnt);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 08:06:14 +0000