diff --git a/source/createtable.dfm b/source/createtable.dfm
index 3b929fdb..715bad0d 100644
--- a/source/createtable.dfm
+++ b/source/createtable.dfm
@@ -25,7 +25,7 @@ object CreateTableForm: TCreateTableForm
     Top = 16
     Width = 71
     Height = 13
-    Caption = 'Table-Name:'
+    Caption = 'Table name:'
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
     Font.Height = -11
@@ -61,14 +61,14 @@ object CreateTableForm: TCreateTableForm
     Top = 41
     Width = 63
     Height = 13
-    Caption = 'In Database:'
+    Caption = 'In database:'
   end
   object Label5: TLabel
     Left = 264
     Top = 16
     Width = 58
     Height = 13
-    Caption = 'Table-Type:'
+    Caption = 'Table type:'
     OnClick = Button1Click
   end
   object Bevel2: TBevel
@@ -140,7 +140,7 @@ object CreateTableForm: TCreateTableForm
     Width = 225
     Height = 185
     Anchors = [akLeft, akRight, akBottom]
-    Caption = 'Column-Properties:'
+    Caption = 'Column properties:'
     TabOrder = 9
     object lblFieldType: TLabel
       Left = 16
diff --git a/source/fieldeditor.dfm b/source/fieldeditor.dfm
index 0ee51460..068500a0 100644
--- a/source/fieldeditor.dfm
+++ b/source/fieldeditor.dfm
@@ -2,7 +2,7 @@ object FieldEditForm: TFieldEditForm
   Left = 572
   Top = 111
   BorderIcons = [biSystemMenu]
-  Caption = 'Field-Editor'
+  Caption = 'Column and Index editor'
   ClientHeight = 354
   ClientWidth = 294
   Color = clBtnFace
@@ -25,13 +25,13 @@ object FieldEditForm: TFieldEditForm
     Top = 8
     Width = 278
     Height = 305
-    ActivePage = tabField
+    ActivePage = tabColumn
     Anchors = [akLeft, akTop, akRight, akBottom]
     Images = MainForm.PngImageListMain
     TabOrder = 0
     OnChange = pcChange
-    object tabField: TTabSheet
-      Caption = 'Field'
+    object tabColumn: TTabSheet
+      Caption = 'Column'
       ImageIndex = 42
       object lblName: TLabel
         Left = 8
diff --git a/source/fieldeditor.pas b/source/fieldeditor.pas
index 1f98db40..b5f08511 100644
--- a/source/fieldeditor.pas
+++ b/source/fieldeditor.pas
@@ -18,7 +18,7 @@ type
 
   TFieldEditForm = class(TForm)
     pc: TPageControl;
-    tabField: TTabSheet;
+    tabColumn: TTabSheet;
     ButtonCancel: TButton;
     ButtonOK: TButton;
     lblName: TLabel;
@@ -329,7 +329,7 @@ procedure TFieldEditForm.FormShow(Sender: TObject);
 begin
   if fMode in [femFieldUpdate, femFieldAdd] then
     begin
-      pc.ActivePage := tabField;
+      pc.ActivePage := tabColumn;
       EditFieldName.SetFocus();
     end;
 
@@ -640,7 +640,7 @@ end;
 procedure TFieldEditForm.pcChange(Sender: TObject);
 begin
   // Set FMode, according to selected tab
-  if pc.ActivePage = tabField then
+  if pc.ActivePage = tabColumn then
   begin
     if FModeWhenCalled = femFieldUpdate then
     begin
@@ -1094,12 +1094,12 @@ begin
 
     femFieldUpdate:
     begin
-      ButtonOK.Caption := 'Update Field';
+      ButtonOK.Caption := 'Update Column';
     end;
 
     femFieldAdd:
     begin
-      ButtonOK.Caption := 'Add Field';
+      ButtonOK.Caption := 'Add Column';
     end;
 
     femIndexEditor:
diff --git a/source/insertfiles.dfm b/source/insertfiles.dfm
index 05379bfb..1e595505 100644
--- a/source/insertfiles.dfm
+++ b/source/insertfiles.dfm
@@ -176,7 +176,7 @@ object frmInsertFiles: TfrmInsertFiles
     Width = 290
     Height = 17
     Anchors = [akLeft, akRight, akBottom]
-    Caption = 'Show only BLOB- and MEMO-columns'
+    Caption = 'Show only BLOB and TEXT columns'
     Checked = True
     State = cbChecked
     TabOrder = 7
@@ -199,7 +199,7 @@ object frmInsertFiles: TfrmInsertFiles
     Width = 492
     Height = 129
     Anchors = [akLeft, akRight, akBottom]
-    Caption = 'Other field-values'
+    Caption = 'Other field values'
     TabOrder = 10
     DesignSize = (
       492
@@ -210,8 +210,8 @@ object frmInsertFiles: TfrmInsertFiles
       Width = 215
       Height = 39
       Caption = 
-        'Note: Don'#39't quote functions or NULL-values, otherwise they will ' +
-        'be inserted as ordinary string-values.'
+        'Note: Don'#39't quote functions or NULL values, otherwise they will ' +
+        'be inserted as strings.'
       WordWrap = True
     end
     object ListBoxOtherFields: TListBox
diff --git a/source/main.dfm b/source/main.dfm
index 5f338afa..793b2a37 100644
--- a/source/main.dfm
+++ b/source/main.dfm
@@ -612,9 +612,9 @@ object MainForm: TMainForm
     object actUserManager: TAction
       Tag = 34
       Category = 'Tools'
-      Caption = 'User-Manager'
+      Caption = 'User manager'
       Enabled = False
-      Hint = 'User-Manager'
+      Hint = 'Manage user authentication and privileges'
       ImageIndex = 11
       OnExecute = actUserManagerExecute
     end
@@ -652,34 +652,34 @@ object MainForm: TMainForm
     object actCopyAsHTML: TAction
       Tag = 49
       Category = 'Export/Import'
-      Caption = 'Copy as HTML-table'
+      Caption = 'Copy grid data as HTML'
       Enabled = False
-      Hint = 'Copy data as HTML-table'
+      Hint = 'Copy grid data as HTML'
       ImageIndex = 32
       OnExecute = actCopyAsHTMLExecute
     end
     object actCopyAsCSV: TAction
       Tag = 48
       Category = 'Export/Import'
-      Caption = 'Copy as CSV-data'
+      Caption = 'Copy grid data as CSV'
       Enabled = False
-      Hint = 'Copy data as CSV-data'
+      Hint = 'Copy grid contents as CSV data'
       ImageIndex = 49
       OnExecute = actCopyAsCSVExecute
     end
     object actCopyAsXML: TAction
       Category = 'Export/Import'
-      Caption = 'Copy as XML-data'
+      Caption = 'Copy grid data as XML'
       Enabled = False
-      Hint = 'Copy data as XML-data'
+      Hint = 'Copy grid data as XML'
       ImageIndex = 48
       OnExecute = actCopyAsXMLExecute
     end
     object actExportData: TAction
       Category = 'Export/Import'
-      Caption = 'Export data ...'
+      Caption = 'Export grid data as CSV/HTML/XML...'
       Enabled = False
-      Hint = 'Save table-data to file ...'
+      Hint = 'Save grid data to file'
       ImageIndex = 20
       OnExecute = actExportDataExecute
     end
@@ -738,24 +738,24 @@ object MainForm: TMainForm
     end
     object actInsertFiles: TAction
       Category = 'Export/Import'
-      Caption = 'Insert files into BLOB-fields...'
+      Caption = 'Insert files into BLOB fields...'
       Enabled = False
       ImageIndex = 47
       OnExecute = actInsertFilesExecute
     end
     object actExportTables: TAction
       Category = 'Export/Import'
-      Caption = 'Export tables as SQL'
+      Caption = 'Export database as SQL'
       Enabled = False
-      Hint = 'Dump tables to an SQL file'
+      Hint = 'Dump database objects to an SQL file'
       ImageIndex = 20
       OnExecute = actExportTablesExecute
     end
     object actLoadSQL: TAction
       Category = 'SQL'
-      Caption = 'Load SQL-file ...'
+      Caption = 'Load SQL file...'
       Enabled = False
-      Hint = 'Load SQL-file ...'
+      Hint = 'Load SQL file...'
       ImageIndex = 52
       ShortCut = 16463
       OnExecute = actLoadSQLExecute
@@ -862,26 +862,26 @@ object MainForm: TMainForm
     end
     object actEditField: TAction
       Category = 'Table'
-      Caption = 'Edit field'
+      Caption = 'Edit column'
       Enabled = False
-      Hint = 'Edit field properties'
+      Hint = 'Edit column properties'
       ImageIndex = 93
       ShortCut = 32781
       OnExecute = actEditFieldExecute
     end
     object actCreateField: TAction
       Category = 'Table'
-      Caption = 'Add field'
+      Caption = 'Add column'
       Enabled = False
-      Hint = 'Create new field in selected table'
+      Hint = 'Create new column in selected table'
       ImageIndex = 91
       OnExecute = actCreateFieldExecute
     end
     object actDropFields: TAction
       Category = 'Table'
-      Caption = 'Delete selected field(s) ...'
+      Caption = 'Delete selected column(s) ...'
       Enabled = False
-      Hint = 'Delete selected field(s)'
+      Hint = 'Delete selected column(s)'
       ImageIndex = 92
       OnExecute = actDropFieldsExecute
     end
@@ -895,7 +895,7 @@ object MainForm: TMainForm
     end
     object actDropDatabase: TAction
       Category = 'Database'
-      Caption = 'Drop Database'
+      Caption = 'Drop database'
       Enabled = False
       Hint = 'Delete database and all contained tables and objects'
       ImageIndex = 7
@@ -936,7 +936,7 @@ object MainForm: TMainForm
     end
     object actImportCSV: TAction
       Category = 'Export/Import'
-      Caption = 'Import CSV file'
+      Caption = 'Import CSV file...'
       Enabled = False
       Hint = 'Import a CSV or tab delimited file'
       ImageIndex = 50