diff --git a/ctl/ctlSQLBox.cpp b/ctl/ctlSQLBox.cpp
index abd8ba2..fa42891 100644
--- a/ctl/ctlSQLBox.cpp
+++ b/ctl/ctlSQLBox.cpp
@@ -1345,13 +1345,13 @@ wxString ctlSQLBox::ExternalFormat(int typecmd)
 			}
 			wxArrayString choiceCmpOpts;
 			wxArrayInt choiceSelectOpts;
-			choiceCmpOpts.Add("All line (use all EOL)");
-			choiceCmpOpts.Add("First line pattern (ignore all but the first EOL)");
-			choiceCmpOpts.Add("Try looking for patterns above");
-			choiceCmpOpts.Add("Remove multi spaces");
+			choiceCmpOpts.Add(_("All line (use all EOL)"));
+			choiceCmpOpts.Add(_("First line pattern (ignore all but the first EOL)"));
+			choiceCmpOpts.Add(_("Try looking for patterns above"));
+			choiceCmpOpts.Add(_("Remove multi spaces"));
 			wxMultiChoiceDialog dialog(this,
-				wxT("A multi-choice convenience dialog"),
-				wxT("Please select several align options"),
+				_("A multi-choice convenience dialog"),
+				_("Please select several align options"),
 				choiceCmpOpts);
 			dialog.SetSelections(choiceSelectOpts);
 			int cfg = 0;
diff --git a/frm/frmStatus.cpp b/frm/frmStatus.cpp
index 0f94999..a7e5ed3 100644
--- a/frm/frmStatus.cpp
+++ b/frm/frmStatus.cpp
@@ -369,10 +369,10 @@ frmStatus::frmStatus(frmMain *form, const wxString &_title, pgConn *conn) : pgFr
     viewMenu->Append(MNU_LOGPAGE, _("Log&file\tCtrl-Alt-F"), _("Show or hide the logfile tab."), wxITEM_CHECK);
     viewMenu->AppendSeparator();
     viewMenu->Append(MNU_QUERYSTATEPAGE, _("&Query state\tCtrl-Alt-Q"), _("Show or hide the query state tab."), wxITEM_CHECK);
-    viewMenu->Append(MNU_QUERYSTATEVERBOSE, _("Append verbose"), _("Append verbose."), wxITEM_CHECK);
-    viewMenu->Append(MNU_QUERYSTATEBUFFER, _("Append use buffers"), _("Append use buffers."), wxITEM_CHECK);
-    viewMenu->Append(MNU_QUERYSTATETIME, _("Append real timing"), _("Append real timing."), wxITEM_CHECK);
-    viewMenu->Append(MNU_QUERYSTATETRIGGER, _("Append triggers"), _("Append triggers."), wxITEM_CHECK);
+    viewMenu->Append(MNU_QUERYSTATEVERBOSE, _("Append verbose"), _("Append verbose"), wxITEM_CHECK);
+    viewMenu->Append(MNU_QUERYSTATEBUFFER, _("Append use buffers"), _("Append use buffers"), wxITEM_CHECK);
+    viewMenu->Append(MNU_QUERYSTATETIME, _("Append real timing"), _("Append real timing"), wxITEM_CHECK);
+    viewMenu->Append(MNU_QUERYSTATETRIGGER, _("Append triggers"), _("Append triggers"), wxITEM_CHECK);
 
     viewMenu->AppendSeparator();
     viewMenu->Append(MNU_TOOLBAR, _("Tool&bar\tCtrl-Alt-B"), _("Show or hide the toolbar."), wxITEM_CHECK);
diff --git a/pro_scheduler/pgproJob.cpp b/pro_scheduler/pgproJob.cpp
index 6c86374..3d5da42 100644
--- a/pro_scheduler/pgproJob.cpp
+++ b/pro_scheduler/pgproJob.cpp
@@ -502,7 +502,7 @@ bool prorunNowFactory::CheckEnable(pgObject *obj)
 }
 enabledisableJobFactory::enabledisableJobFactory(menuFactoryList *list, wxMenu *mnu, ctlMenuToolbar *toolbar) : contextActionFactory(list)
 {
-	mnu->Append(id, _("Enabled?"), _("Включить или выключить задание."), wxITEM_CHECK);
+	mnu->Append(id, _("Enabled?"), _("Enabled or disabled job"), wxITEM_CHECK);
 }
 
 wxWindow *enabledisableJobFactory::StartDialog(frmMain *form, pgObject *obj)
diff --git a/schema/pgIndex.cpp b/schema/pgIndex.cpp
index 0f26bb1..9cd3a26 100644
--- a/schema/pgIndex.cpp
+++ b/schema/pgIndex.cpp
@@ -503,7 +503,7 @@ executePgcheckindexFactory::executePgcheckindexFactory(menuFactoryList* list, wx
 wxWindow* executePgcheckindexFactory::StartDialog(frmMain* form, pgObject* obj)
 {
 	pgIndexBase* i = (pgIndexBase*)obj;
-	form->StartMsg(_("Check Btree index "+i->GetName()+" "));
+	form->StartMsg(_("Check Btree index")+" "+i->GetName()+" ");
 	wxString sql = "SELECT bt_index_parent_check("+i->GetOidStr()+",true);";
 	i->GetConnection()->ExecuteVoid(sql);
 	form->EndMsg(true);
diff --git a/schema/pgServer.cpp b/schema/pgServer.cpp
index 117023c..15a280a 100644
--- a/schema/pgServer.cpp
+++ b/schema/pgServer.cpp
@@ -826,7 +826,7 @@ int pgServer::Connect(frmMain *form, bool askPassword, const wxString &pwd, bool
 		}
 		else
 		{
-			conn = new pgConn(host, service, hostaddr, database, username, password, iPort, rolename,connstr, ssl, 0, appearanceFactory->GetLongAppName() + _(" ")+usr, sslcert, sslkey, sslrootcert, sslcrl, sslcompression);
+			conn = new pgConn(host, service, hostaddr, database, username, password, iPort, rolename,connstr, ssl, 0, appearanceFactory->GetLongAppName() + " "+usr, sslcert, sslkey, sslrootcert, sslcrl, sslcompression);
 			if (!conn)
 			{
 				form->EndMsg(false);