From d783b07eeb0776f3763e3ce8d725748b7290c257 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Mon, 7 Nov 2011 02:46:59 +0200 Subject: removed old warning about gpg version small ui corrections possible translation fixes --- main.cpp | 6 +++--- new_gpg.rc | 6 +++--- options.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) mode change 100644 => 100755 main.cpp diff --git a/main.cpp b/main.cpp old mode 100644 new mode 100755 index e75ec4d..913ecbf --- a/main.cpp +++ b/main.cpp @@ -1803,14 +1803,14 @@ void InitCheck() mir_free(home_dir); tmp_dir += _T("\\tmp"); _wmkdir(tmp_dir.c_str()); - string question = "Your secret key whith id: "; + string question = Translate("Your secret key whith id: "); char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", ""); question += keyid; mir_free(keyid); - question += " deleted from gpg secret keyring\nDo you want to set another key ?"; + question += Translate(" deleted from gpg secret keyring\nDo you want to set another key ?"); void ShowFirstRunDialog(); if(out.find(keyid) == string::npos) - if(MessageBoxA(0, question.c_str(), "Own secret key warning", MB_YESNO) == IDYES) + if(MessageBoxA(0, question.c_str(), Translate("Own secret key warning"), MB_YESNO) == IDYES) ShowFirstRunDialog(); } { diff --git a/new_gpg.rc b/new_gpg.rc index 50aa6c2..c40b0c5 100755 --- a/new_gpg.rc +++ b/new_gpg.rc @@ -316,16 +316,16 @@ BEGIN CTEXT "Userlist:",IDC_STATIC,25,7,201,8 PUSHBUTTON "Export PubKey",IDC_SAVE_KEY_BUTTON,8,135,75,14 PUSHBUTTON "Delete key",IDC_DELETE_KEY_BUTTON,90,135,70,14 - PUSHBUTTON "Select own key",IDC_SELECT_KEY,203,193,76,14 + PUSHBUTTON "Select own key",IDC_SELECT_KEY,205,193,74,14 CONTROL "Turn on debug log",IDC_DEBUG_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,181,159,89,10 EDITTEXT IDC_LOG_FILE_EDIT,11,157,98,14,ES_AUTOHSCROLL PUSHBUTTON "Browse",IDC_LOG_FILE_SET,119,156,50,14 CONTROL "Use jabber api on Miranda IM >= 0.9 (recomended)",IDC_JABBER_API, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,175,251,10 - LTEXT "Current key",IDC_CURRENT_KEY,12,196,116,8 + LTEXT "Current key",IDC_CURRENT_KEY,12,196,110,8 CONTROL "Encrypt file transfers",IDC_FILE_TRANSFERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,185,137,10 CONTROL "Automatic key exchange",IDC_AUTO_EXCHANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,137,111,10 - PUSHBUTTON "Copy own key",IDC_COPY_KEY,137,193,62,14 + PUSHBUTTON "Copy own key",IDC_COPY_KEY,127,193,74,14 END IDD_OPT_GPG_BIN DIALOGEX 0, 0, 282, 214 diff --git a/options.cpp b/options.cpp index 3fffe3a..6079dae 100755 --- a/options.cpp +++ b/options.cpp @@ -526,10 +526,10 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP else { bad_version = false; - MessageBox(0, _T("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK); + MessageBox(0, TranslateT("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK); } - if(bad_version) - MessageBox(0, _T("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK); +/* if(bad_version) //looks like working fine with gpg2 + MessageBox(0, TranslateT("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK); */ } } char mir_path[MAX_PATH]; -- cgit v1.2.3