From 79e72b2ecb9b6c2e3dd5b6b87c9c8634ab5463f2 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Wed, 9 Oct 2013 18:25:12 +0000 Subject: English US correction (patch by RMN) git-svn-id: http://svn.miranda-ng.org/main/trunk@6420 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/New_GPG/res/new_gpg.rc | 6 +++--- plugins/New_GPG/src/main.cpp | 2 +- plugins/New_GPG/src/utilities.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/New_GPG') diff --git a/plugins/New_GPG/res/new_gpg.rc b/plugins/New_GPG/res/new_gpg.rc index 05097df479..0283fae151 100644 --- a/plugins/New_GPG/res/new_gpg.rc +++ b/plugins/New_GPG/res/new_gpg.rc @@ -104,7 +104,7 @@ END IDD_NEW_KEY DIALOGEX 0, 0, 427, 68 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "The new public key was recieved" +CAPTION "The new public key was received" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Import key",ID_IMPORT,9,47,46,14 @@ -177,12 +177,12 @@ END IDD_ENCRYPTED_FILE_MSG_BOX DIALOGEX 0, 0, 229, 63 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Recieved encrypted file" +CAPTION "Received encrypted file" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN PUSHBUTTON "Ignore",IDC_IGNORE,7,42,50,14 PUSHBUTTON "Decrypt",IDC_DECRYPT,97,42,50,14 - LTEXT "Recieved encrypted file form contact with disabled encryption.",IDC_STATIC,7,7,215,14 + LTEXT "Received encrypted file form contact with disabled encryption.",IDC_STATIC,7,7,215,14 CONTROL "Remember choice",IDC_REMEMBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,22,157,10 END diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp index 5fef3135af..9aa42f44d2 100755 --- a/plugins/New_GPG/src/main.cpp +++ b/plugins/New_GPG/src/main.cpp @@ -880,7 +880,7 @@ static INT_PTR CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, if(boost::filesystem::exists(gpg_lang_path)) lang_exists = true; if(gpg_exists && !lang_exists) - MessageBox(0, TranslateT("GPG binary found in Miranda folder, but English locale does not exist.\nIt's highly recommended to place \\gnupg.nls\\en@quot.mo in GnuPG folder under Miranda root.\nWithout this file you may experience many problems with GPG output on non-English systems\nand plugin may completely not work.\nYou have beed warned."), TranslateT("Warning"), MB_OK); + MessageBox(0, TranslateT("GPG binary found in Miranda folder, but English locale does not exist.\nIt's highly recommended to place \\gnupg.nls\\en@quot.mo in GnuPG folder under Miranda root.\nWithout this file you may experience many problems with GPG output on non-English systems\nand plugin may completely not work.\nYou have been warned."), TranslateT("Warning"), MB_OK); mir_free(gpg_path); mir_free(gpg_lang_path); } diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp index f36538e19e..1558a12453 100755 --- a/plugins/New_GPG/src/utilities.cpp +++ b/plugins/New_GPG/src/utilities.cpp @@ -332,7 +332,7 @@ int onProtoAck(WPARAM w, LPARAM l) return 0; if(file_msg_state < 1) return 0; - HistoryLog(ack->hContact, db_event("Recieved encrypted file, trying to decrypt", 0,0, 0)); + HistoryLog(ack->hContact, db_event("Received encrypted file, trying to decrypt", 0,0, 0)); if(!boost::filesystem::exists(f->tszCurrentFile)) return 0; string out; -- cgit v1.2.3