From 3ef77b40f926008cac2d3f13e832710a226d8bf2 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Wed, 18 Mar 2020 16:48:05 +0300 Subject: Proper spelling of UTF-8 and SHA-1 --- plugins/Actman/iac_ini.rc | 2 +- plugins/Msg_Export/res/resource.rc | 2 +- plugins/SecureIM/src/cryptopp.h | 2 +- plugins/SecureIM/src/language.cpp | 8 ++++---- plugins/SecureIM/src/options.cpp | 4 ++-- protocols/IRCG/res/IRC.rc | 2 +- protocols/MSN/src/msn_proto.cpp | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/Actman/iac_ini.rc b/plugins/Actman/iac_ini.rc index 56658b91c4..f8ad678482 100644 --- a/plugins/Actman/iac_ini.rc +++ b/plugins/Actman/iac_ini.rc @@ -21,7 +21,7 @@ FONT 8, "MS Shell Dlg", 0, 0 LTEXT "Value", -1 , 4 90, 160, 11 EDITTEXT IDC_INI_VALUE , 4, 101, 160, 12, ES_AUTOHSCROLL AUTOCHECKBOX "Use LastResult", IDC_INI_LR , 4, 113, 160, 11 - AUTOCHECKBOX "UTF8 encoding" , IDC_INI_UTF, 4, 125, 160, 11 + AUTOCHECKBOX "UTF-8 encoding" , IDC_INI_UTF, 4, 125, 160, 11 } IDI_INI ICON "ico\ini.ico" diff --git a/plugins/Msg_Export/res/resource.rc b/plugins/Msg_Export/res/resource.rc index 98e0b18b9e..7efbe548d1 100755 --- a/plugins/Msg_Export/res/resource.rc +++ b/plugins/Msg_Export/res/resource.rc @@ -79,7 +79,7 @@ BEGIN COMBOBOX IDC_EXPORT_TIMEFORMAT,141,130,57,122,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Use JSON format for export",IDC_USE_JSON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,150,287,10 - CONTROL "Use UTF8 in new files",IDC_USE_UTF8_IN_NEW_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,163,287,10 + CONTROL "Use UTF-8 in new files",IDC_USE_UTF8_IN_NEW_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,163,287,10 CONTROL "Append extra new line",IDC_APPEND_NEWLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,176,287,10 CONTROL "Use << and >>",IDC_USE_LESS_AND_GREATER_IN_EXPORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,188,287,10 END diff --git a/plugins/SecureIM/src/cryptopp.h b/plugins/SecureIM/src/cryptopp.h index 089d101cd7..3bf3fdd778 100644 --- a/plugins/SecureIM/src/cryptopp.h +++ b/plugins/SecureIM/src/cryptopp.h @@ -43,7 +43,7 @@ typedef struct { int (__cdecl *rsa_set_pubkey)(HANDLE,PBYTE,int); // загружает паблик ключ для указанного контекста void (__cdecl *rsa_set_timeout)(int); // установить таймаут для установки секюрного соединения int (__cdecl *rsa_get_state)(HANDLE); // получить статус указанного контекста - int (__cdecl *rsa_get_hash)(PBYTE,int,PBYTE,int*); // вычисляет SHA1(key) + int (__cdecl *rsa_get_hash)(PBYTE,int,PBYTE,int*); // вычисляет SHA-1 (key) int (__cdecl *rsa_connect)(HANDLE); // запускает процесс установки содинения с указанным контекстом int (__cdecl *rsa_disconnect)(HANDLE); // разрывает соединение с указанным контекстом int (__cdecl *rsa_disabled)(HANDLE); // разрывает соединение по причине "disabled" diff --git a/plugins/SecureIM/src/language.cpp b/plugins/SecureIM/src/language.cpp index 5cfbfe113c..887e7ce496 100644 --- a/plugins/SecureIM/src/language.cpp +++ b/plugins/SecureIM/src/language.cpp @@ -95,7 +95,7 @@ LPCSTR sim506 = LPGEN("Error while decoding RSA message"); LPCSTR sim507 = LPGEN("Session closed on timeout"); LPCSTR sim508 = LPGEN("Session closed by other side when status \"disabled\""); LPCSTR sim510 = LPGEN("Session closed on error: %02x"); -LPCSTR sim520 = LPGEN("SecureIM received RSA Public Key from \"%s\"\n\nSHA1: %s\n\nDo you Accept this Key?"); -LPCSTR sim521 = LPGEN("SecureIM auto accepted RSA Public key from: %s uin: %s SHA1: %s"); -LPCSTR sim522 = LPGEN("SecureIM received NEW RSA Public Key from \"%s\"\n\nNew SHA1: %s\n\nOld SHA1: %s\n\nDo you Replace this Key?"); -LPCSTR sim523 = LPGEN("SecureIM auto accepted NEW RSA Public key from: %s uin: %s New SHA1: %s Old SHA1: %s"); +LPCSTR sim520 = LPGEN("SecureIM received RSA Public Key from \"%s\"\n\nSHA-1: %s\n\nDo you Accept this Key?"); +LPCSTR sim521 = LPGEN("SecureIM auto accepted RSA Public key from: %s uin: %s SHA-1: %s"); +LPCSTR sim522 = LPGEN("SecureIM received NEW RSA Public Key from \"%s\"\n\nNew SHA-1: %s\n\nOld SHA-1: %s\n\nDo you Replace this Key?"); +LPCSTR sim523 = LPGEN("SecureIM auto accepted NEW RSA Public key from: %s uin: %s New SHA-1: %s Old SHA-1: %s"); diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index de2c241c46..c441eea3be 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -439,7 +439,7 @@ INT_PTR CALLBACK DlgProcOptionsGeneral(HWND hDlg, UINT wMsg, WPARAM wParam, LPAR hMenu = LoadMenu(g_plugin.getInst(), MAKEINTRESOURCE((ptr->tmode == MODE_NATIVE) ? IDM_CLIST01 : IDM_CLIST11)); break; case 4: // PSK/PUB - case 5: // SHA1 + case 5: // SHA-1 hMenu = LoadMenu(g_plugin.getInst(), MAKEINTRESOURCE((ptr->tmode == MODE_NATIVE) ? IDM_CLIST02 : IDM_CLIST12)); break; default: // full menu @@ -555,7 +555,7 @@ INT_PTR CALLBACK DlgProcOptionsProto(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM if (res == IDOK) { if (!mir_exp->rsa_import_keypair(CPP_MODE_RSA, priv, passphrase)) msgbox(hDlg, sim113, MODULENAME, MB_OK | MB_ICONEXCLAMATION); - else // обновить SHA1 значение + else // обновить SHA-1 значение RefreshProtoDlg(hDlg); } } diff --git a/protocols/IRCG/res/IRC.rc b/protocols/IRCG/res/IRC.rc index 9dc719003b..d601b3d127 100644 --- a/protocols/IRCG/res/IRC.rc +++ b/protocols/IRCG/res/IRC.rc @@ -189,7 +189,7 @@ BEGIN EDITTEXT IDC_QUITMESSAGE,10,176,287,12,ES_AUTOHSCROLL COMBOBOX IDC_CODEPAGE,151,192,146,79,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP RTEXT "Server code page:",IDC_STATIC,12,194,133,8 - CONTROL "Enable UTF8 autodetection",IDC_UTF_AUTODETECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,208,287,10 + CONTROL "Enable UTF-8 autodetection",IDC_UTF_AUTODETECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,208,287,10 END IDD_ADDSERVER DIALOGEX 0, 0, 182, 136 diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index 0f22c2e977..a6a9e80d24 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -733,7 +733,7 @@ int CMsnProto::SendMsg(MCONTACT hContact, int flags, const char* pszSrc) case NETID_MOB: if (mir_strlen(msg) > 133) { seq = 999997; - ProtoBroadcastAsync(hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, (HANDLE)seq, (LPARAM)Translate("Message is too long: SMS page limited to 133 UTF8 chars")); + ProtoBroadcastAsync(hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, (HANDLE)seq, (LPARAM)Translate("Message is too long: SMS page limited to 133 UTF-8 chars")); } else { seq = msnNsThread->sendMessage('1', tEmail, netId, msg, rtlFlag); @@ -744,7 +744,7 @@ int CMsnProto::SendMsg(MCONTACT hContact, int flags, const char* pszSrc) case NETID_YAHOO: if (mir_strlen(msg) > 1202) { seq = 999996; - ProtoBroadcastAsync(hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, (HANDLE)seq, (LPARAM)Translate("Message is too long: MSN messages are limited by 1202 UTF8 chars")); + ProtoBroadcastAsync(hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, (HANDLE)seq, (LPARAM)Translate("Message is too long: MSN messages are limited by 1202 UTF-8 chars")); } else { seq = msnNsThread->sendMessage('1', tEmail, netId, msg, rtlFlag); @@ -755,7 +755,7 @@ int CMsnProto::SendMsg(MCONTACT hContact, int flags, const char* pszSrc) default: if (mir_strlen(msg) > 1202) { seq = 999996; - ProtoBroadcastAsync(hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, (HANDLE)seq, (LPARAM)Translate("Message is too long: MSN messages are limited by 1202 UTF8 chars")); + ProtoBroadcastAsync(hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, (HANDLE)seq, (LPARAM)Translate("Message is too long: MSN messages are limited by 1202 UTF-8 chars")); } else { if (netId != NETID_LCS) { -- cgit v1.2.3