4 files changed, 5 insertions, 3 deletions

diff --git a/main.cpp b/main.cpp
index f6a5e77..55b4d25 100755
--- a/main.cpp
+++ b/main.cpp
@@ -217,7 +217,8 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 				  DBWriteContactSettingTString(NULL, szGPGModuleName, dbsetting.c_str(), passwd);
 			  }
 			  {
-				  wstring keyinfo = _T("Current private key id: ");
+				  wstring keyinfo = TranslateT("Current private key id");
+				  keyinfo += _T(": ");
 				  keyinfo += (fp[0])?fp:_T("not set");
 				  extern HWND hwndCurKey_p;
 				  SetWindowText(hwndCurKey_p, keyinfo.c_str());
diff --git a/new_gpg.rc b/new_gpg.rc
index 6bf6f49..e2705d7 100755
--- a/new_gpg.rc
+++ b/new_gpg.rc
@@ -150,7 +150,7 @@ CAPTION "Enter password for your secret key"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

     DEFPUSHBUTTON   "ÎÊ",IDOK,7,87,50,14

-    PUSHBUTTON      "Îòìåíà",IDCANCEL,150,87,50,14

+    PUSHBUTTON      "Cancel",IDCANCEL,150,87,50,14

     EDITTEXT        IDC_PASSWORD,13,38,179,14,ES_PASSWORD | ES_AUTOHSCROLL

     LTEXT           "Password:",IDC_STATIC,14,28,34,8

     CONTROL         "Save password to database",IDC_SAVE_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,56,124,10

diff --git a/new_gpg.sln b/new_gpg.sln
index 6a74e17..6a74e17 100644..100755
--- a/new_gpg.sln
+++ b/new_gpg.sln
diff --git a/options.cpp b/options.cpp
index 6079dae..271a637 100755
--- a/options.cpp
+++ b/options.cpp
@@ -180,7 +180,8 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		EnableWindow(GetDlgItem(hwndDlg, IDC_JABBER_API), bIsMiranda09);

 		EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), (bIsMiranda09 && bJabberAPI));

 		{

-			string keyinfo = Translate("Current private key id: ");

+			string keyinfo = Translate("Current private key id");

+			keyinfo += ": ";

 			char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");

 			keyinfo += (strlen(keyid) > 0)?keyid:"not set";

 			mir_free(keyid);