diff --git a/.gitattributes b/.gitattributes
index e8b6a0aa02..32ce15dd3e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1968,10 +1968,6 @@ ideintf/idewindowintf.pas svneol=native#text/plain
 ideintf/imagelisteditor.lfm svneol=native#text/plain
 ideintf/imagelisteditor.lrs svneol=native#text/plain
 ideintf/imagelisteditor.pp svneol=native#text/pascal
-ideintf/languages/fieldseditor.id.po svneol=native#text/plain
-ideintf/languages/fieldseditor.po svneol=native#text/plain
-ideintf/languages/fieldslist.id.po svneol=native#text/plain
-ideintf/languages/fieldslist.po svneol=native#text/plain
 ideintf/languages/objinspstrconsts.ca.po svneol=native#text/plain
 ideintf/languages/objinspstrconsts.de.po svneol=native#text/plain
 ideintf/languages/objinspstrconsts.es.po svneol=native#text/plain
diff --git a/ideintf/fieldseditor.lfm b/ideintf/fieldseditor.lfm
index f80912a7e9..6b66cbffe8 100644
--- a/ideintf/fieldseditor.lfm
+++ b/ideintf/fieldseditor.lfm
@@ -1,27 +1,26 @@
 object DSFieldsEditorFrm: TDSFieldsEditorFrm
+  Left = 132
+  Height = 288
+  Top = 174
+  Width = 215
+  HorzScrollBar.Page = 214
+  VertScrollBar.Page = 287
+  ActiveControl = FieldsListBox
   Caption = 'Fields Editor'
   ClientHeight = 288
   ClientWidth = 215
   OnClose = FieldsEditorFrmClose
   OnDestroy = FieldsEditorFrmDestroy
-  PixelsPerInch = 96
   Position = poDefaultPosOnly
-  HorzScrollBar.Page = 214
-  VertScrollBar.Page = 287
-  Left = 256
-  Height = 288
-  Top = 117
-  Width = 215
   object FieldsListBox: TListBox
+    Height = 288
+    Width = 215
     Align = alClient
-    BorderSpacing.OnChange = nil
     MultiSelect = True
     OnClick = ListBox1Click
     OnKeyDown = FieldsListBoxKeyDown
     PopupMenu = PopupMenu1
     TabOrder = 0
-    Height = 288
-    Width = 215
   end
   object PopupMenu1: TPopupMenu
     left = 8
@@ -59,46 +58,53 @@ object DSFieldsEditorFrm: TDSFieldsEditorFrm
     left = 40
     top = 144
     object AddFieldsActn: TAction
+      Category = 'Fields'
       Caption = '&Add fields'
+      DisableIfNoHandler = True
       Hint = 'Add fields from FieldDefs'
       OnExecute = AddFieldsActnExecute
       ShortCut = 16429
-      Category = 'Fields'
     end
     object DeleteFieldsActn: TAction
+      Category = 'Fields'
       Caption = '&Delete'
+      DisableIfNoHandler = True
       Hint = 'Delete selected field(s)'
       OnExecute = DeleteFieldsActnExecute
       ShortCut = 46
-      Category = 'Fields'
     end
     object NewActn: TAction
+      Category = 'Fields'
       Caption = '&New'
+      DisableIfNoHandler = True
       Hint = 'Create new field and add it at current position'
       OnExecute = NewActnExecute
       ShortCut = 45
-      Category = 'Fields'
     end
     object MoveUpActn: TAction
-      Caption = 'Move &Up'
-      OnExecute = MoveUpActnExecute
       Category = 'Fields'
+      Caption = 'Move &Up'
+      DisableIfNoHandler = True
+      OnExecute = MoveUpActnExecute
     end
     object MoveDownActn: TAction
-      Caption = 'Move &Down'
-      OnExecute = MoveDownActnExecute
       Category = 'Fields'
+      Caption = 'Move &Down'
+      DisableIfNoHandler = True
+      OnExecute = MoveDownActnExecute
     end
     object SelectAllActn: TAction
+      Category = 'Fields'
       Caption = '&Select all'
+      DisableIfNoHandler = True
       OnExecute = SelectAllActnExecute
       ShortCut = 16449
-      Category = 'Fields'
     end
     object UnselectAllActn: TAction
-      Caption = '&Unselect all'
-      OnExecute = UnselectAllActnExecute
       Category = 'Fields'
+      Caption = '&Unselect all'
+      DisableIfNoHandler = True
+      OnExecute = UnselectAllActnExecute
     end
   end
 end
diff --git a/ideintf/fieldseditor.lrs b/ideintf/fieldseditor.lrs
index 12a58aa848..033497e93c 100644
--- a/ideintf/fieldseditor.lrs
+++ b/ideintf/fieldseditor.lrs
@@ -1,36 +1,40 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TDSFieldsEditorFrm','FORMDATA',[
-  'TPF0'#18'TDSFieldsEditorFrm'#17'DSFieldsEditorFrm'#7'Caption'#6#13'Fields Ed'
-  +'itor'#12'ClientHeight'#3' '#1#11'ClientWidth'#3#215#0#7'OnClose'#7#20'Field'
-  +'sEditorFrmClose'#9'OnDestroy'#7#22'FieldsEditorFrmDestroy'#13'PixelsPerInch'
-  +#2'`'#8'Position'#7#16'poDefaultPosOnly'#18'HorzScrollBar.Page'#3#214#0#18'V'
-  +'ertScrollBar.Page'#3#31#1#4'Left'#3#0#1#6'Height'#3' '#1#3'Top'#2'u'#5'Widt'
-  +'h'#3#215#0#0#8'TListBox'#13'FieldsListBox'#5'Align'#7#8'alClient'#22'Border'
-  +'Spacing.OnChange'#13#11'MultiSelect'#9#7'OnClick'#7#13'ListBox1Click'#9'OnK'
-  +'eyDown'#7#20'FieldsListBoxKeyDown'#9'PopupMenu'#7#10'PopupMenu1'#8'TabOrder'
-  +#2#0#6'Height'#3' '#1#5'Width'#3#215#0#0#0#10'TPopupMenu'#10'PopupMenu1'#4'l'
-  +'eft'#2#8#3'top'#3#144#0#0#9'TMenuItem'#9'MenuItem1'#6'Action'#7#13'AddField'
-  +'sActn'#7'OnClick'#7#20'AddFieldsActnExecute'#0#0#9'TMenuItem'#9'MenuItem2'#6
-  +'Action'#7#16'DeleteFieldsActn'#7'OnClick'#7#23'DeleteFieldsActnExecute'#0#0
-  +#9'TMenuItem'#9'MenuItem5'#6'Action'#7#7'NewActn'#7'OnClick'#7#14'NewActnExe'
-  +'cute'#0#0#9'TMenuItem'#9'MenuItem3'#6'Action'#7#10'MoveUpActn'#7'OnClick'#7
-  +#17'MoveUpActnExecute'#0#0#9'TMenuItem'#9'MenuItem4'#6'Action'#7#12'MoveDown'
-  +'Actn'#7'OnClick'#7#19'MoveDownActnExecute'#0#0#9'TMenuItem'#9'MenuItem6'#6
-  +'Action'#7#13'SelectAllActn'#7'OnClick'#7#20'SelectAllActnExecute'#0#0#9'TMe'
-  +'nuItem'#9'MenuItem7'#6'Action'#7#15'UnselectAllActn'#7'OnClick'#7#22'Unsele'
-  +'ctAllActnExecute'#0#0#0#11'TActionList'#11'ActionList1'#4'left'#2'('#3'top'
-  +#3#144#0#0#7'TAction'#13'AddFieldsActn'#7'Caption'#6#11'&Add fields'#4'Hint'
-  +#6#25'Add fields from FieldDefs'#9'OnExecute'#7#20'AddFieldsActnExecute'#8'S'
-  +'hortCut'#3'-@'#8'Category'#6#6'Fields'#0#0#7'TAction'#16'DeleteFieldsActn'#7
-  +'Caption'#6#7'&Delete'#4'Hint'#6#24'Delete selected field(s)'#9'OnExecute'#7
-  +#23'DeleteFieldsActnExecute'#8'ShortCut'#2'.'#8'Category'#6#6'Fields'#0#0#7
-  +'TAction'#7'NewActn'#7'Caption'#6#4'&New'#4'Hint'#6'/Create new field and ad'
-  +'d it at current position'#9'OnExecute'#7#14'NewActnExecute'#8'ShortCut'#2'-'
-  +#8'Category'#6#6'Fields'#0#0#7'TAction'#10'MoveUpActn'#7'Caption'#6#8'Move &'
-  +'Up'#9'OnExecute'#7#17'MoveUpActnExecute'#8'Category'#6#6'Fields'#0#0#7'TAct'
-  +'ion'#12'MoveDownActn'#7'Caption'#6#10'Move &Down'#9'OnExecute'#7#19'MoveDow'
-  +'nActnExecute'#8'Category'#6#6'Fields'#0#0#7'TAction'#13'SelectAllActn'#7'Ca'
-  +'ption'#6#11'&Select all'#9'OnExecute'#7#20'SelectAllActnExecute'#8'ShortCut'
-  +#3'A@'#8'Category'#6#6'Fields'#0#0#7'TAction'#15'UnselectAllActn'#7'Caption'
-  +#6#13'&Unselect all'#9'OnExecute'#7#22'UnselectAllActnExecute'#8'Category'#6
-  +#6'Fields'#0#0#0#0
+  'TPF0'#18'TDSFieldsEditorFrm'#17'DSFieldsEditorFrm'#4'Left'#3#132#0#6'Height'
+  +#3' '#1#3'Top'#3#174#0#5'Width'#3#215#0#18'HorzScrollBar.Page'#3#214#0#18'Ve'
+  +'rtScrollBar.Page'#3#31#1#13'ActiveControl'#7#13'FieldsListBox'#7'Caption'#6
+  +#13'Fields Editor'#12'ClientHeight'#3' '#1#11'ClientWidth'#3#215#0#7'OnClose'
+  +#7#20'FieldsEditorFrmClose'#9'OnDestroy'#7#22'FieldsEditorFrmDestroy'#8'Posi'
+  +'tion'#7#16'poDefaultPosOnly'#0#8'TListBox'#13'FieldsListBox'#6'Height'#3' '
+  +#1#5'Width'#3#215#0#5'Align'#7#8'alClient'#11'MultiSelect'#9#7'OnClick'#7#13
+  +'ListBox1Click'#9'OnKeyDown'#7#20'FieldsListBoxKeyDown'#9'PopupMenu'#7#10'Po'
+  +'pupMenu1'#8'TabOrder'#2#0#0#0#10'TPopupMenu'#10'PopupMenu1'#4'left'#2#8#3't'
+  +'op'#3#144#0#0#9'TMenuItem'#9'MenuItem1'#6'Action'#7#13'AddFieldsActn'#7'OnC'
+  +'lick'#7#20'AddFieldsActnExecute'#0#0#9'TMenuItem'#9'MenuItem2'#6'Action'#7
+  +#16'DeleteFieldsActn'#7'OnClick'#7#23'DeleteFieldsActnExecute'#0#0#9'TMenuIt'
+  +'em'#9'MenuItem5'#6'Action'#7#7'NewActn'#7'OnClick'#7#14'NewActnExecute'#0#0
+  +#9'TMenuItem'#9'MenuItem3'#6'Action'#7#10'MoveUpActn'#7'OnClick'#7#17'MoveUp'
+  +'ActnExecute'#0#0#9'TMenuItem'#9'MenuItem4'#6'Action'#7#12'MoveDownActn'#7'O'
+  +'nClick'#7#19'MoveDownActnExecute'#0#0#9'TMenuItem'#9'MenuItem6'#6'Action'#7
+  +#13'SelectAllActn'#7'OnClick'#7#20'SelectAllActnExecute'#0#0#9'TMenuItem'#9
+  +'MenuItem7'#6'Action'#7#15'UnselectAllActn'#7'OnClick'#7#22'UnselectAllActnE'
+  +'xecute'#0#0#0#11'TActionList'#11'ActionList1'#4'left'#2'('#3'top'#3#144#0#0
+  +#7'TAction'#13'AddFieldsActn'#8'Category'#6#6'Fields'#7'Caption'#6#11'&Add f'
+  +'ields'#18'DisableIfNoHandler'#9#4'Hint'#6#25'Add fields from FieldDefs'#9'O'
+  +'nExecute'#7#20'AddFieldsActnExecute'#8'ShortCut'#3'-@'#0#0#7'TAction'#16'De'
+  +'leteFieldsActn'#8'Category'#6#6'Fields'#7'Caption'#6#7'&Delete'#18'DisableI'
+  +'fNoHandler'#9#4'Hint'#6#24'Delete selected field(s)'#9'OnExecute'#7#23'Dele'
+  +'teFieldsActnExecute'#8'ShortCut'#2'.'#0#0#7'TAction'#7'NewActn'#8'Category'
+  +#6#6'Fields'#7'Caption'#6#4'&New'#18'DisableIfNoHandler'#9#4'Hint'#6'/Create'
+  +' new field and add it at current position'#9'OnExecute'#7#14'NewActnExecute'
+  +#8'ShortCut'#2'-'#0#0#7'TAction'#10'MoveUpActn'#8'Category'#6#6'Fields'#7'Ca'
+  +'ption'#6#8'Move &Up'#18'DisableIfNoHandler'#9#9'OnExecute'#7#17'MoveUpActnE'
+  +'xecute'#0#0#7'TAction'#12'MoveDownActn'#8'Category'#6#6'Fields'#7'Caption'#6
+  +#10'Move &Down'#18'DisableIfNoHandler'#9#9'OnExecute'#7#19'MoveDownActnExecu'
+  +'te'#0#0#7'TAction'#13'SelectAllActn'#8'Category'#6#6'Fields'#7'Caption'#6#11
+  +'&Select all'#18'DisableIfNoHandler'#9#9'OnExecute'#7#20'SelectAllActnExecut'
+  +'e'#8'ShortCut'#3'A@'#0#0#7'TAction'#15'UnselectAllActn'#8'Category'#6#6'Fie'
+  +'lds'#7'Caption'#6#13'&Unselect all'#18'DisableIfNoHandler'#9#9'OnExecute'#7
+  +#22'UnselectAllActnExecute'#0#0#0#0
 ]);
diff --git a/ideintf/fieldseditor.pas b/ideintf/fieldseditor.pas
index d63a509c7e..8a496df3d0 100644
--- a/ideintf/fieldseditor.pas
+++ b/ideintf/fieldseditor.pas
@@ -22,8 +22,8 @@ interface
 uses
   Classes, SysUtils, LResources, TypInfo, LCLProc, Forms,
   Controls, Menus, Graphics, Dialogs, ComCtrls,
-  db, ActnList, StdCtrls, ComponentEditors, PropEdits, LCLType,
-  NewField, FieldsList, ComponentReg;
+  db, ActnList, StdCtrls, ObjInspStrConsts, ComponentEditors,
+  PropEdits, LCLType, NewField, FieldsList, ComponentReg;
 
 type
 
@@ -107,15 +107,19 @@ type
 
 implementation
 
-resourcestring
-  rsTitle = 'Edit fields';
-
 { TDSFieldsEditorFrm }
 
 procedure TDSFieldsEditorFrm.AddFieldsActnExecute(Sender: TObject);
 var FieldsList: TFieldsListFrm;
 begin
-  FieldsList :=  TFieldsListFrm.Create(Self, LinkDataset, Designer);
+  try
+    FieldsList :=  TFieldsListFrm.Create(Self, LinkDataset, Designer);
+  except
+    on E:Exception do begin
+      ShowMessage(fesNoFields+^M+fesCheckDSet+^M^M+E.Message);
+      exit;
+    end;
+  end;
   try
     FieldsList.ShowModal;
   finally
@@ -131,7 +135,7 @@ begin
 
   LinkDataset := ADataset;
   FDesigner := ADesigner;
-  Caption := rsTitle + ' - ' + LinkDataset.Name;
+  Caption := fesFeTitle + ' - ' + LinkDataset.Name;
   FieldsListBox.Clear;
   RefreshFieldsListBox(False);
 
@@ -338,7 +342,7 @@ begin
       FieldsListBox.Items[i] := Field.FieldName;
   end else
   if AComponent is TDataset And (AComponent = LinkDataset) then
-    Caption := rsTitle + ' - ' + LinkDataset.Name;
+    Caption := fesFeTitle + ' - ' + LinkDataset.Name;
 end;
 
 procedure TDSFieldsEditorFrm.OnPersistentDeleting(APersistent: TPersistent);
@@ -416,7 +420,7 @@ end;
 function TFieldsComponentEditor.GetVerb(Index: Integer): string;
 begin
   case Index of
-    0: Result := rsTitle;
+    0: Result := fesFeTitle;
   end;
 end;
 
diff --git a/ideintf/fieldslist.lfm b/ideintf/fieldslist.lfm
index 6d6bb6bb93..e83500d12c 100644
--- a/ideintf/fieldslist.lfm
+++ b/ideintf/fieldslist.lfm
@@ -1,46 +1,47 @@
 object FieldsListFrm: TFieldsListFrm
-  Caption = 'FieldsListFrm'
-  ClientHeight = 271
-  ClientWidth = 173
-  PixelsPerInch = 96
-  HorzScrollBar.Page = 172
-  VertScrollBar.Page = 270
   Left = 358
   Height = 271
   Top = 99
   Width = 173
+  HorzScrollBar.Page = 172
+  VertScrollBar.Page = 270
+  ActiveControl = BitBtnOk
+  Caption = 'FieldsListFrm'
+  ClientHeight = 271
+  ClientWidth = 173
   object BitBtnOk: TBitBtn
+    Left = 9
+    Height = 25
+    Top = 241
+    Width = 75
     Anchors = [akLeft, akBottom]
     Caption = '&Create'
     Default = True
     Kind = bkOK
     ModalResult = 1
+    NumGlyphs = 0
     OnClick = BitBtnOkClick
     TabOrder = 0
-    Left = 9
+  end
+  object BitBtnCancel: TBitBtn
+    Left = 89
     Height = 25
     Top = 241
     Width = 75
-  end
-  object BitBtnCancel: TBitBtn
     Anchors = [akLeft, akBottom]
     Cancel = True
     Caption = 'Cancel'
     Kind = bkCancel
     ModalResult = 2
+    NumGlyphs = 0
     TabOrder = 1
-    Left = 89
-    Height = 25
-    Top = 241
-    Width = 75
   end
   object ListBox1: TListBox
-    Align = alTop
-    Anchors = [akTop, akLeft, akRight, akBottom]
-    ExtendedSelect = True
-    MultiSelect = True
-    TabOrder = 2
     Height = 232
     Width = 173
+    Align = alTop
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    MultiSelect = True
+    TabOrder = 2
   end
 end
diff --git a/ideintf/fieldslist.lrs b/ideintf/fieldslist.lrs
index 5971605e15..2c631e4ddc 100644
--- a/ideintf/fieldslist.lrs
+++ b/ideintf/fieldslist.lrs
@@ -1,15 +1,17 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TFieldsListFrm','FORMDATA',[
-  'TPF0'#14'TFieldsListFrm'#13'FieldsListFrm'#7'Caption'#6#13'FieldsListFrm'#12
-  +'ClientHeight'#3#15#1#11'ClientWidth'#3#173#0#13'PixelsPerInch'#2'`'#18'Horz'
-  +'ScrollBar.Page'#3#172#0#18'VertScrollBar.Page'#3#14#1#4'Left'#3'f'#1#6'Heig'
-  +'ht'#3#15#1#3'Top'#2'c'#5'Width'#3#173#0#0#7'TBitBtn'#8'BitBtnOk'#7'Anchors'
-  +#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#7'&Create'#7'Default'#9#4'Kind'#7#4
-  +'bkOK'#11'ModalResult'#2#1#7'OnClick'#7#13'BitBtnOkClick'#8'TabOrder'#2#0#4
-  +'Left'#2#9#6'Height'#2#25#3'Top'#3#241#0#5'Width'#2'K'#0#0#7'TBitBtn'#12'Bit'
-  +'BtnCancel'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#6'Cancel'#9#7'Caption'#6#6
-  +'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#8'TabOrder'#2#1#4'Left'#2
-  +'Y'#6'Height'#2#25#3'Top'#3#241#0#5'Width'#2'K'#0#0#8'TListBox'#8'ListBox1'#5
+  'TPF0'#14'TFieldsListFrm'#13'FieldsListFrm'#4'Left'#3'f'#1#6'Height'#3#15#1#3
+  +'Top'#2'c'#5'Width'#3#173#0#18'HorzScrollBar.Page'#3#172#0#18'VertScrollBar.'
+  +'Page'#3#14#1#13'ActiveControl'#7#8'BitBtnOk'#7'Caption'#6#13'FieldsListFrm'
+  +#12'ClientHeight'#3#15#1#11'ClientWidth'#3#173#0#0#7'TBitBtn'#8'BitBtnOk'#4
+  +'Left'#2#9#6'Height'#2#25#3'Top'#3#241#0#5'Width'#2'K'#7'Anchors'#11#6'akLef'
+  +'t'#8'akBottom'#0#7'Caption'#6#7'&Create'#7'Default'#9#4'Kind'#7#4'bkOK'#11
+  +'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#13'BitBtnOkClick'#8'TabOrder'
+  +#2#0#0#0#7'TBitBtn'#12'BitBtnCancel'#4'Left'#2'Y'#6'Height'#2#25#3'Top'#3#241
+  +#0#5'Width'#2'K'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#6'Cancel'#9#7'Caption'
+  +#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'Ta'
+  +'bOrder'#2#1#0#0#8'TListBox'#8'ListBox1'#6'Height'#3#232#0#5'Width'#3#173#0#5
   +'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0
-  +#14'ExtendedSelect'#9#11'MultiSelect'#9#8'TabOrder'#2#2#6'Height'#3#232#0#5
-  +'Width'#3#173#0#0#0#0
+  +#11'MultiSelect'#9#8'TabOrder'#2#2#0#0#0
 ]);
diff --git a/ideintf/fieldslist.pas b/ideintf/fieldslist.pas
index 09a32e65e5..8d8718ce96 100644
--- a/ideintf/fieldslist.pas
+++ b/ideintf/fieldslist.pas
@@ -33,7 +33,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  Buttons, DB, StdCtrls, ComponentEditors, PropEdits;
+  Buttons, DB, StdCtrls, ObjInspStrConsts, ComponentEditors, PropEdits;
 
 type
 
@@ -60,9 +60,6 @@ var
 
 implementation
 
-resourcestring
-  rsTitle = 'FieldDefs';
-  
 { TFieldsListFrm }
 
 procedure TFieldsListFrm.BitBtnOkClick(Sender: TObject);
@@ -137,7 +134,7 @@ begin
   if Not Assigned(LinkDataset) then ShowMessage('LinkDataset = nil!')
   else begin
     FDesigner := ADesigner;
-    Caption := rsTitle + ' - ' + LinkDataset.Name;
+    Caption := fesFlTitle + ' - ' + LinkDataset.Name;
   end;
   RefreshFieldsList;
 end;
diff --git a/ideintf/languages/fieldseditor.id.po b/ideintf/languages/fieldseditor.id.po
deleted file mode 100644
index 696f3a231f..0000000000
--- a/ideintf/languages/fieldseditor.id.po
+++ /dev/null
@@ -1,15 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: Lazarus 1.x\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-09-22 01:08+0700\n"
-"Last-Translator: Zaenal Mutaqin <ade999@gmail.com>\n"
-"Language-Team: Indonesian <ade999@gmail.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: fieldseditor:rstitle
-msgid "Edit fields"
-msgstr "Edit field"
-
diff --git a/ideintf/languages/fieldseditor.po b/ideintf/languages/fieldseditor.po
deleted file mode 100644
index 36e7fd36ff..0000000000
--- a/ideintf/languages/fieldseditor.po
+++ /dev/null
@@ -1,4 +0,0 @@
-#: fieldseditor:rstitle
-msgid "Edit fields"
-msgstr ""
-
diff --git a/ideintf/languages/fieldslist.id.po b/ideintf/languages/fieldslist.id.po
deleted file mode 100644
index 166f9f6963..0000000000
--- a/ideintf/languages/fieldslist.id.po
+++ /dev/null
@@ -1,15 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: Lazarus 1.x\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-09-22 01:08+0700\n"
-"Last-Translator: Zaenal Mutaqin <ade999@gmail.com>\n"
-"Language-Team: Indonesian <ade999@gmail.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: fieldslist:rstitle
-msgid "FieldDefs"
-msgstr "FieldDefs"
-
diff --git a/ideintf/languages/fieldslist.po b/ideintf/languages/fieldslist.po
deleted file mode 100644
index db104a6261..0000000000
--- a/ideintf/languages/fieldslist.po
+++ /dev/null
@@ -1,4 +0,0 @@
-#: fieldslist:rstitle
-msgid "FieldDefs"
-msgstr ""
-
diff --git a/ideintf/newfield.lfm b/ideintf/newfield.lfm
index 373ba61b8d..50146ce894 100644
--- a/ideintf/newfield.lfm
+++ b/ideintf/newfield.lfm
@@ -1,77 +1,81 @@
 object NewFieldFrm: TNewFieldFrm
+  Left = 243
+  Height = 376
+  Top = 176
+  Width = 262
+  HorzScrollBar.Page = 261
+  VertScrollBar.Page = 375
+  ActiveControl = EditName
   BorderStyle = bsDialog
   Caption = 'Dialog'
   ClientHeight = 376
   ClientWidth = 262
   OnCreate = FormCreate
   ParentFont = True
-  PixelsPerInch = 96
   Position = poScreenCenter
-  TextHeight = 13
-  HorzScrollBar.Page = 261
-  VertScrollBar.Page = 375
-  Left = 243
-  Height = 376
-  Top = 176
-  Width = 262
   object Panel2: TPanel
+    Height = 121
+    Top = 64
+    Width = 262
     Align = alTop
     ClientHeight = 121
     ClientWidth = 262
     FullRepaint = False
     TabOrder = 0
-    Height = 121
-    Top = 64
-    Width = 262
     object GroupBox1: TGroupBox
-      Caption = 'Field properties'
-      ClientHeight = 87
-      ClientWidth = 240
-      ParentColor = True
-      TabOrder = 0
       Left = 8
       Height = 105
       Top = 8
       Width = 244
+      Caption = 'Field properties'
+      ClientHeight = 87
+      ClientWidth = 240
+      TabOrder = 0
       object Label1: TLabel
-        Caption = '&Name:'
-        Color = clNone
-        FocusControl = EditName
         Left = 15
-        Height = 13
+        Height = 14
         Top = 11
-        Width = 31
+        Width = 32
+        Caption = '&Name:'
+        FocusControl = EditName
+        ParentColor = False
       end
       object Label2: TLabel
-        Caption = '&Type:'
-        Color = clNone
-        FocusControl = SelectType
         Left = 15
-        Height = 13
+        Height = 14
         Top = 35
-        Width = 27
+        Width = 29
+        Caption = '&Type:'
+        FocusControl = SelectType
+        ParentColor = False
       end
       object Label3: TLabel
-        Caption = '&Size:'
-        Color = clNone
-        FocusControl = EditSize
         Left = 15
-        Height = 13
+        Height = 14
         Top = 59
-        Width = 23
+        Width = 24
+        Caption = '&Size:'
+        FocusControl = EditSize
+        ParentColor = False
       end
       object EditName: TEdit
-        OnChange = EditNameChange
-        ParentShowHint = False
-        ShowHint = True
-        TabOrder = 0
         Left = 79
         Height = 21
         Hint = 'Field name'
         Top = 8
         Width = 145
+        OnChange = EditNameChange
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 0
       end
       object SelectType: TComboBox
+        Left = 79
+        Height = 21
+        Hint = 'Field type'
+        Top = 32
+        Width = 145
+        AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
         ItemHeight = 13
         Items.Strings = (
           'String'
@@ -93,115 +97,118 @@ object NewFieldFrm: TNewFieldFrm
         OnChange = SelectTypeChange
         Style = csDropDownList
         TabOrder = 1
-        Left = 79
-        Height = 21
-        Hint = 'Field type'
-        Top = 32
-        Width = 145
       end
       object EditSize: TEdit
-        Enabled = False
-        TabOrder = 2
         Left = 79
         Height = 21
         Hint = 'Field size'
         Top = 56
         Width = 145
+        Enabled = False
+        TabOrder = 2
       end
     end
   end
   object Panel3: TPanel
+    Height = 144
+    Top = 185
+    Width = 262
     Align = alTop
     ClientHeight = 144
     ClientWidth = 262
     FullRepaint = False
     TabOrder = 1
     Visible = False
-    Height = 144
-    Top = 185
-    Width = 262
     object GroupBox2: TGroupBox
-      Anchors = [akTop, akLeft, akRight, akBottom]
-      Caption = 'Lookup definition'
-      ClientHeight = 111
-      ClientWidth = 240
-      ParentColor = True
-      TabOrder = 0
       Left = 8
       Height = 129
       Top = 8
       Width = 244
+      Anchors = [akTop, akLeft, akRight, akBottom]
+      Caption = 'Lookup definition'
+      ClientHeight = 111
+      ClientWidth = 240
+      TabOrder = 0
       object Label4: TLabel
-        Caption = '&Key fields'
-        Color = clNone
-        FocusControl = SelectKeyFields
         Left = 16
-        Height = 13
+        Height = 14
         Top = 10
-        Width = 45
+        Width = 47
+        Caption = '&Key fields'
+        FocusControl = SelectKeyFields
+        ParentColor = False
       end
       object Label5: TLabel
-        Caption = 'L&ookup keys'
-        Color = clNone
-        FocusControl = SelectLookupKeys
         Left = 16
-        Height = 13
+        Height = 14
         Top = 58
-        Width = 61
+        Width = 60
+        Caption = 'L&ookup keys'
+        FocusControl = SelectLookupKeys
+        ParentColor = False
       end
       object Label6: TLabel
-        Caption = '&Result Fields'
-        Color = clNone
-        FocusControl = SelectResultField
         Left = 16
-        Height = 13
+        Height = 14
         Top = 82
-        Width = 60
+        Width = 61
+        Caption = '&Result Fields'
+        FocusControl = SelectResultField
+        ParentColor = False
       end
       object Label10: TLabel
-        Caption = 'Dataset'
-        Color = clNone
         Left = 16
-        Height = 13
+        Height = 14
         Top = 34
-        Width = 37
+        Width = 39
+        Caption = 'Dataset'
+        ParentColor = False
       end
       object SelectKeyFields: TComboBox
+        Left = 80
+        Height = 21
+        Hint = 'Key fields'
+        Top = 7
+        Width = 145
+        AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
         ItemHeight = 13
         MaxLength = 0
         OnChange = SelectKeyFieldsChange
         ParentShowHint = False
         ShowHint = True
         TabOrder = 0
-        Left = 80
-        Height = 21
-        Hint = 'Key fields'
-        Top = 7
-        Width = 145
       end
       object SelectLookupKeys: TComboBox
+        Left = 80
+        Height = 21
+        Top = 55
+        Width = 145
+        AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
         Enabled = False
         ItemHeight = 13
         MaxLength = 0
         OnChange = SelectLookupKeysChange
         TabOrder = 2
-        Left = 80
-        Height = 21
-        Top = 55
-        Width = 145
       end
       object SelectResultField: TComboBox
+        Left = 80
+        Height = 21
+        Top = 79
+        Width = 145
+        AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
         Enabled = False
         ItemHeight = 13
         MaxLength = 0
         OnChange = SelectResultFieldChange
         TabOrder = 3
-        Left = 80
-        Height = 21
-        Top = 79
-        Width = 145
       end
       object DataSetsCombo: TComboBox
+        Left = 80
+        Height = 21
+        Hint = 'Lookup dataset'
+        Top = 31
+        Width = 145
+        AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
         ItemHeight = 13
         MaxLength = 0
         OnChange = DataSetsComboChange
@@ -209,58 +216,81 @@ object NewFieldFrm: TNewFieldFrm
         ShowHint = True
         Style = csDropDownList
         TabOrder = 1
-        Left = 80
-        Height = 21
-        Hint = 'Lookup dataset'
-        Top = 31
-        Width = 145
       end
     end
   end
   object Panel4: TPanel
+    Height = 47
+    Top = 329
+    Width = 262
     Align = alBottom
     ClientHeight = 47
     ClientWidth = 262
     FullRepaint = False
     TabOrder = 2
-    Height = 47
-    Top = 329
-    Width = 262
     object OKBtn: TButton
+      Left = 56
+      Height = 25
+      Top = 11
+      Width = 75
       Anchors = [akLeft, akBottom]
+      BorderSpacing.InnerBorder = 4
       Caption = 'OK'
       Default = True
       Enabled = False
       ModalResult = 1
       OnClick = OKBtnClick
       TabOrder = 0
-      Left = 56
-      Height = 25
-      Top = 11
-      Width = 75
     end
     object CancelBtn: TButton
-      Anchors = [akLeft, akBottom]
-      Cancel = True
-      Caption = 'Cancel'
-      ModalResult = 2
-      TabOrder = 1
       Left = 136
       Height = 25
       Top = 11
       Width = 75
+      Anchors = [akLeft, akBottom]
+      BorderSpacing.InnerBorder = 4
+      Cancel = True
+      Caption = 'Cancel'
+      ModalResult = 2
+      TabOrder = 1
     end
   end
   object Panel1: TPanel
+    Height = 64
+    Width = 262
     Align = alTop
     ClientHeight = 64
     ClientWidth = 262
     FullRepaint = False
     TabOrder = 3
-    Height = 64
-    Width = 262
+    object NoteLbl: TLabel
+      Left = 36
+      Height = 28
+      Top = 64
+      Width = 216
+      AutoSize = False
+      Caption = 'NoteLbl'
+      ParentColor = False
+      Visible = False
+      WordWrap = True
+    end
     object RadioGroup1: TRadioGroup
+      Left = 8
+      Height = 48
+      Top = 8
+      Width = 244
+      AutoFill = True
       Caption = 'Field Type'
+      ChildSizing.LeftRightSpacing = 6
+      ChildSizing.TopBottomSpacing = 6
+      ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
+      ChildSizing.EnlargeVertical = crsHomogenousChildResize
+      ChildSizing.ShrinkHorizontal = crsScaleChilds
+      ChildSizing.ShrinkVertical = crsScaleChilds
+      ChildSizing.Layout = cclLeftToRightThenTopToBottom
+      ChildSizing.ControlsPerLine = 2
+      ClientHeight = 30
+      ClientWidth = 240
       Columns = 2
       ItemIndex = 0
       Items.Strings = (
@@ -268,11 +298,7 @@ object NewFieldFrm: TNewFieldFrm
         '&Lookup'
       )
       OnClick = RadioGroup1Click
-      ParentColor = True
-      Left = 8
-      Height = 48
-      Top = 8
-      Width = 244
+      TabOrder = 0
     end
   end
 end
diff --git a/ideintf/newfield.lrs b/ideintf/newfield.lrs
index 22603b0efd..b4f6e68a03 100644
--- a/ideintf/newfield.lrs
+++ b/ideintf/newfield.lrs
@@ -1,68 +1,84 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TNewFieldFrm','FORMDATA',[
-  'TPF0'#12'TNewFieldFrm'#11'NewFieldFrm'#11'BorderStyle'#7#8'bsDialog'#7'Capti'
-  +'on'#6#6'Dialog'#12'ClientHeight'#3'x'#1#11'ClientWidth'#3#6#1#8'OnCreate'#7
-  +#10'FormCreate'#10'ParentFont'#9#13'PixelsPerInch'#2'`'#8'Position'#7#14'poS'
-  +'creenCenter'#10'TextHeight'#2#13#18'HorzScrollBar.Page'#3#5#1#18'VertScroll'
-  +'Bar.Page'#3'w'#1#4'Left'#3#243#0#6'Height'#3'x'#1#3'Top'#3#176#0#5'Width'#3
-  +#6#1#0#6'TPanel'#6'Panel2'#5'Align'#7#5'alTop'#12'ClientHeight'#2'y'#11'Clie'
-  +'ntWidth'#3#6#1#11'FullRepaint'#8#8'TabOrder'#2#0#6'Height'#2'y'#3'Top'#2'@'
-  +#5'Width'#3#6#1#0#9'TGroupBox'#9'GroupBox1'#7'Caption'#6#16'Field properties'
-  +#12'ClientHeight'#2'W'#11'ClientWidth'#3#240#0#11'ParentColor'#9#8'TabOrder'
-  +#2#0#4'Left'#2#8#6'Height'#2'i'#3'Top'#2#8#5'Width'#3#244#0#0#6'TLabel'#6'La'
-  +'bel1'#7'Caption'#6#6'&Name:'#5'Color'#7#6'clNone'#12'FocusControl'#7#8'Edit'
-  +'Name'#4'Left'#2#15#6'Height'#2#13#3'Top'#2#11#5'Width'#2#31#0#0#6'TLabel'#6
-  +'Label2'#7'Caption'#6#6'&Type:'#5'Color'#7#6'clNone'#12'FocusControl'#7#10'S'
-  +'electType'#4'Left'#2#15#6'Height'#2#13#3'Top'#2'#'#5'Width'#2#27#0#0#6'TLab'
-  +'el'#6'Label3'#7'Caption'#6#6'&Size:'#5'Color'#7#6'clNone'#12'FocusControl'#7
-  +#8'EditSize'#4'Left'#2#15#6'Height'#2#13#3'Top'#2';'#5'Width'#2#23#0#0#5'TEd'
-  +'it'#8'EditName'#8'OnChange'#7#14'EditNameChange'#14'ParentShowHint'#8#8'Sho'
-  +'wHint'#9#8'TabOrder'#2#0#4'Left'#2'O'#6'Height'#2#21#4'Hint'#6#10'Field nam'
-  +'e'#3'Top'#2#8#5'Width'#3#145#0#0#0#9'TComboBox'#10'SelectType'#10'ItemHeigh'
-  +'t'#2#13#13'Items.Strings'#1#6#6'String'#6#7'Integer'#6#8'SmallInt'#6#4'Word'
-  +#6#5'Float'#6#8'Currency'#6#7'Boolean'#6#4'Date'#6#4'Time'#6#8'DateTime'#6#4
-  +'Blob'#6#4'Memo'#6#7'Graphic'#6#8'LargeInt'#0#9'MaxLength'#2#0#8'OnChange'#7
-  +#16'SelectTypeChange'#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#1#4'Left'#2
-  +'O'#6'Height'#2#21#4'Hint'#6#10'Field type'#3'Top'#2' '#5'Width'#3#145#0#0#0
-  +#5'TEdit'#8'EditSize'#7'Enabled'#8#8'TabOrder'#2#2#4'Left'#2'O'#6'Height'#2
-  +#21#4'Hint'#6#10'Field size'#3'Top'#2'8'#5'Width'#3#145#0#0#0#0#0#6'TPanel'#6
-  +'Panel3'#5'Align'#7#5'alTop'#12'ClientHeight'#3#144#0#11'ClientWidth'#3#6#1
-  +#11'FullRepaint'#8#8'TabOrder'#2#1#7'Visible'#8#6'Height'#3#144#0#3'Top'#3
-  +#185#0#5'Width'#3#6#1#0#9'TGroupBox'#9'GroupBox2'#7'Anchors'#11#5'akTop'#6'a'
-  +'kLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#17'Lookup definition'#12'Clien'
-  +'tHeight'#2'o'#11'ClientWidth'#3#240#0#11'ParentColor'#9#8'TabOrder'#2#0#4'L'
-  +'eft'#2#8#6'Height'#3#129#0#3'Top'#2#8#5'Width'#3#244#0#0#6'TLabel'#6'Label4'
-  +#7'Caption'#6#11'&Key fields'#5'Color'#7#6'clNone'#12'FocusControl'#7#15'Sel'
-  +'ectKeyFields'#4'Left'#2#16#6'Height'#2#13#3'Top'#2#10#5'Width'#2'-'#0#0#6'T'
-  +'Label'#6'Label5'#7'Caption'#6#12'L&ookup keys'#5'Color'#7#6'clNone'#12'Focu'
-  +'sControl'#7#16'SelectLookupKeys'#4'Left'#2#16#6'Height'#2#13#3'Top'#2':'#5
-  +'Width'#2'='#0#0#6'TLabel'#6'Label6'#7'Caption'#6#14'&Result Fields'#5'Color'
-  +#7#6'clNone'#12'FocusControl'#7#17'SelectResultField'#4'Left'#2#16#6'Height'
-  +#2#13#3'Top'#2'R'#5'Width'#2'<'#0#0#6'TLabel'#7'Label10'#7'Caption'#6#7'Data'
-  +'set'#5'Color'#7#6'clNone'#4'Left'#2#16#6'Height'#2#13#3'Top'#2'"'#5'Width'#2
-  +'%'#0#0#9'TComboBox'#15'SelectKeyFields'#10'ItemHeight'#2#13#9'MaxLength'#2#0
-  +#8'OnChange'#7#21'SelectKeyFieldsChange'#14'ParentShowHint'#8#8'ShowHint'#9#8
-  +'TabOrder'#2#0#4'Left'#2'P'#6'Height'#2#21#4'Hint'#6#10'Key fields'#3'Top'#2
-  +#7#5'Width'#3#145#0#0#0#9'TComboBox'#16'SelectLookupKeys'#7'Enabled'#8#10'It'
-  +'emHeight'#2#13#9'MaxLength'#2#0#8'OnChange'#7#22'SelectLookupKeysChange'#8
-  +'TabOrder'#2#2#4'Left'#2'P'#6'Height'#2#21#3'Top'#2'7'#5'Width'#3#145#0#0#0#9
-  +'TComboBox'#17'SelectResultField'#7'Enabled'#8#10'ItemHeight'#2#13#9'MaxLeng'
-  +'th'#2#0#8'OnChange'#7#23'SelectResultFieldChange'#8'TabOrder'#2#3#4'Left'#2
-  +'P'#6'Height'#2#21#3'Top'#2'O'#5'Width'#3#145#0#0#0#9'TComboBox'#13'DataSets'
-  +'Combo'#10'ItemHeight'#2#13#9'MaxLength'#2#0#8'OnChange'#7#19'DataSetsComboC'
-  +'hange'#14'ParentShowHint'#8#8'ShowHint'#9#5'Style'#7#14'csDropDownList'#8'T'
-  +'abOrder'#2#1#4'Left'#2'P'#6'Height'#2#21#4'Hint'#6#14'Lookup dataset'#3'Top'
-  +#2#31#5'Width'#3#145#0#0#0#0#0#6'TPanel'#6'Panel4'#5'Align'#7#8'alBottom'#12
-  +'ClientHeight'#2'/'#11'ClientWidth'#3#6#1#11'FullRepaint'#8#8'TabOrder'#2#2#6
-  +'Height'#2'/'#3'Top'#3'I'#1#5'Width'#3#6#1#0#7'TButton'#5'OKBtn'#7'Anchors'
-  +#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#2'OK'#7'Default'#9#7'Enabled'#8#11
-  +'ModalResult'#2#1#7'OnClick'#7#10'OKBtnClick'#8'TabOrder'#2#0#4'Left'#2'8'#6
-  +'Height'#2#25#3'Top'#2#11#5'Width'#2'K'#0#0#7'TButton'#9'CancelBtn'#7'Anchor'
-  +'s'#11#6'akLeft'#8'akBottom'#0#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalRe'
-  +'sult'#2#2#8'TabOrder'#2#1#4'Left'#3#136#0#6'Height'#2#25#3'Top'#2#11#5'Widt'
-  +'h'#2'K'#0#0#0#6'TPanel'#6'Panel1'#5'Align'#7#5'alTop'#12'ClientHeight'#2'@'
-  +#11'ClientWidth'#3#6#1#11'FullRepaint'#8#8'TabOrder'#2#3#6'Height'#2'@'#5'Wi'
-  +'dth'#3#6#1#0#11'TRadioGroup'#11'RadioGroup1'#7'Caption'#6#10'Field Type'#7
-  +'Columns'#2#2#9'ItemIndex'#2#0#13'Items.Strings'#1#6#11'&Calculated'#6#7'&Lo'
-  ,'okup'#0#7'OnClick'#7#16'RadioGroup1Click'#11'ParentColor'#9#4'Left'#2#8#6'H'
-  +'eight'#2'0'#3'Top'#2#8#5'Width'#3#244#0#0#0#0#0
+  'TPF0'#12'TNewFieldFrm'#11'NewFieldFrm'#4'Left'#3#243#0#6'Height'#3'x'#1#3'To'
+  +'p'#3#176#0#5'Width'#3#6#1#18'HorzScrollBar.Page'#3#5#1#18'VertScrollBar.Pag'
+  +'e'#3'w'#1#13'ActiveControl'#7#8'EditName'#11'BorderStyle'#7#8'bsDialog'#7'C'
+  +'aption'#6#6'Dialog'#12'ClientHeight'#3'x'#1#11'ClientWidth'#3#6#1#8'OnCreat'
+  +'e'#7#10'FormCreate'#10'ParentFont'#9#8'Position'#7#14'poScreenCenter'#0#6'T'
+  +'Panel'#6'Panel2'#6'Height'#2'y'#3'Top'#2'@'#5'Width'#3#6#1#5'Align'#7#5'alT'
+  +'op'#12'ClientHeight'#2'y'#11'ClientWidth'#3#6#1#11'FullRepaint'#8#8'TabOrde'
+  +'r'#2#0#0#9'TGroupBox'#9'GroupBox1'#4'Left'#2#8#6'Height'#2'i'#3'Top'#2#8#5
+  +'Width'#3#244#0#7'Caption'#6#16'Field properties'#12'ClientHeight'#2'W'#11'C'
+  +'lientWidth'#3#240#0#8'TabOrder'#2#0#0#6'TLabel'#6'Label1'#4'Left'#2#15#6'He'
+  +'ight'#2#14#3'Top'#2#11#5'Width'#2' '#7'Caption'#6#6'&Name:'#12'FocusControl'
+  +#7#8'EditName'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#4'Left'#2#15#6'Heig'
+  +'ht'#2#14#3'Top'#2'#'#5'Width'#2#29#7'Caption'#6#6'&Type:'#12'FocusControl'#7
+  +#10'SelectType'#11'ParentColor'#8#0#0#6'TLabel'#6'Label3'#4'Left'#2#15#6'Hei'
+  +'ght'#2#14#3'Top'#2';'#5'Width'#2#24#7'Caption'#6#6'&Size:'#12'FocusControl'
+  +#7#8'EditSize'#11'ParentColor'#8#0#0#5'TEdit'#8'EditName'#4'Left'#2'O'#6'Hei'
+  +'ght'#2#21#4'Hint'#6#10'Field name'#3'Top'#2#8#5'Width'#3#145#0#8'OnChange'#7
+  +#14'EditNameChange'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#0#0#0#9
+  +'TComboBox'#10'SelectType'#4'Left'#2'O'#6'Height'#2#21#4'Hint'#6#10'Field ty'
+  +'pe'#3'Top'#2' '#5'Width'#3#145#0#16'AutoCompleteText'#11#22'cbactEndOfLineC'
+  +'omplete'#20'cbactSearchAscending'#0#10'ItemHeight'#2#13#13'Items.Strings'#1
+  +#6#6'String'#6#7'Integer'#6#8'SmallInt'#6#4'Word'#6#5'Float'#6#8'Currency'#6
+  +#7'Boolean'#6#4'Date'#6#4'Time'#6#8'DateTime'#6#4'Blob'#6#4'Memo'#6#7'Graphi'
+  +'c'#6#8'LargeInt'#0#9'MaxLength'#2#0#8'OnChange'#7#16'SelectTypeChange'#5'St'
+  +'yle'#7#14'csDropDownList'#8'TabOrder'#2#1#0#0#5'TEdit'#8'EditSize'#4'Left'#2
+  +'O'#6'Height'#2#21#4'Hint'#6#10'Field size'#3'Top'#2'8'#5'Width'#3#145#0#7'E'
+  +'nabled'#8#8'TabOrder'#2#2#0#0#0#0#6'TPanel'#6'Panel3'#6'Height'#3#144#0#3'T'
+  +'op'#3#185#0#5'Width'#3#6#1#5'Align'#7#5'alTop'#12'ClientHeight'#3#144#0#11
+  +'ClientWidth'#3#6#1#11'FullRepaint'#8#8'TabOrder'#2#1#7'Visible'#8#0#9'TGrou'
+  +'pBox'#9'GroupBox2'#4'Left'#2#8#6'Height'#3#129#0#3'Top'#2#8#5'Width'#3#244#0
+  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#17'L'
+  +'ookup definition'#12'ClientHeight'#2'o'#11'ClientWidth'#3#240#0#8'TabOrder'
+  +#2#0#0#6'TLabel'#6'Label4'#4'Left'#2#16#6'Height'#2#14#3'Top'#2#10#5'Width'#2
+  +'/'#7'Caption'#6#11'&Key fields'#12'FocusControl'#7#15'SelectKeyFields'#11'P'
+  +'arentColor'#8#0#0#6'TLabel'#6'Label5'#4'Left'#2#16#6'Height'#2#14#3'Top'#2
+  +':'#5'Width'#2'<'#7'Caption'#6#12'L&ookup keys'#12'FocusControl'#7#16'Select'
+  +'LookupKeys'#11'ParentColor'#8#0#0#6'TLabel'#6'Label6'#4'Left'#2#16#6'Height'
+  +#2#14#3'Top'#2'R'#5'Width'#2'='#7'Caption'#6#14'&Result Fields'#12'FocusCont'
+  +'rol'#7#17'SelectResultField'#11'ParentColor'#8#0#0#6'TLabel'#7'Label10'#4'L'
+  +'eft'#2#16#6'Height'#2#14#3'Top'#2'"'#5'Width'#2''''#7'Caption'#6#7'Dataset'
+  +#11'ParentColor'#8#0#0#9'TComboBox'#15'SelectKeyFields'#4'Left'#2'P'#6'Heigh'
+  +'t'#2#21#4'Hint'#6#10'Key fields'#3'Top'#2#7#5'Width'#3#145#0#16'AutoComplet'
+  +'eText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#10'ItemHeig'
+  +'ht'#2#13#9'MaxLength'#2#0#8'OnChange'#7#21'SelectKeyFieldsChange'#14'Parent'
+  +'ShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#0#0#0#9'TComboBox'#16'SelectLookupK'
+  +'eys'#4'Left'#2'P'#6'Height'#2#21#3'Top'#2'7'#5'Width'#3#145#0#16'AutoComple'
+  +'teText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#7'Enabled'
+  +#8#10'ItemHeight'#2#13#9'MaxLength'#2#0#8'OnChange'#7#22'SelectLookupKeysCha'
+  +'nge'#8'TabOrder'#2#2#0#0#9'TComboBox'#17'SelectResultField'#4'Left'#2'P'#6
+  +'Height'#2#21#3'Top'#2'O'#5'Width'#3#145#0#16'AutoCompleteText'#11#22'cbactE'
+  +'ndOfLineComplete'#20'cbactSearchAscending'#0#7'Enabled'#8#10'ItemHeight'#2
+  +#13#9'MaxLength'#2#0#8'OnChange'#7#23'SelectResultFieldChange'#8'TabOrder'#2
+  +#3#0#0#9'TComboBox'#13'DataSetsCombo'#4'Left'#2'P'#6'Height'#2#21#4'Hint'#6
+  +#14'Lookup dataset'#3'Top'#2#31#5'Width'#3#145#0#16'AutoCompleteText'#11#22
+  +'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#10'ItemHeight'#2#13#9'Ma'
+  +'xLength'#2#0#8'OnChange'#7#19'DataSetsComboChange'#14'ParentShowHint'#8#8'S'
+  +'howHint'#9#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#1#0#0#0#0#6'TPanel'#6
+  +'Panel4'#6'Height'#2'/'#3'Top'#3'I'#1#5'Width'#3#6#1#5'Align'#7#8'alBottom'
+  +#12'ClientHeight'#2'/'#11'ClientWidth'#3#6#1#11'FullRepaint'#8#8'TabOrder'#2
+  +#2#0#7'TButton'#5'OKBtn'#4'Left'#2'8'#6'Height'#2#25#3'Top'#2#11#5'Width'#2
+  +'K'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#7
+  +'Caption'#6#2'OK'#7'Default'#9#7'Enabled'#8#11'ModalResult'#2#1#7'OnClick'#7
+  +#10'OKBtnClick'#8'TabOrder'#2#0#0#0#7'TButton'#9'CancelBtn'#4'Left'#3#136#0#6
+  +'Height'#2#25#3'Top'#2#11#5'Width'#2'K'#7'Anchors'#11#6'akLeft'#8'akBottom'#0
+  ,#25'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'Mod'
+  +'alResult'#2#2#8'TabOrder'#2#1#0#0#0#6'TPanel'#6'Panel1'#6'Height'#2'@'#5'Wi'
+  +'dth'#3#6#1#5'Align'#7#5'alTop'#12'ClientHeight'#2'@'#11'ClientWidth'#3#6#1
+  +#11'FullRepaint'#8#8'TabOrder'#2#3#0#6'TLabel'#7'NoteLbl'#4'Left'#2'$'#6'Hei'
+  +'ght'#2#28#3'Top'#2'@'#5'Width'#3#216#0#8'AutoSize'#8#7'Caption'#6#7'NoteLbl'
+  +#11'ParentColor'#8#7'Visible'#8#8'WordWrap'#9#0#0#11'TRadioGroup'#11'RadioGr'
+  +'oup1'#4'Left'#2#8#6'Height'#2'0'#3'Top'#2#8#5'Width'#3#244#0#8'AutoFill'#9#7
+  +'Caption'#6#10'Field Type'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizi'
+  +'ng.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogeno'
+  +'usChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResiz'
+  +'e'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.Shr'
+  +'inkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRigh'
+  +'tThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#2#12'ClientHeight'#2#30
+  +#11'ClientWidth'#3#240#0#7'Columns'#2#2#9'ItemIndex'#2#0#13'Items.Strings'#1
+  +#6#11'&Calculated'#6#7'&Lookup'#0#7'OnClick'#7#16'RadioGroup1Click'#8'TabOrd'
+  +'er'#2#0#0#0#0#0
 ]);
diff --git a/ideintf/newfield.pas b/ideintf/newfield.pas
index e40f68a4c3..611036948f 100644
--- a/ideintf/newfield.pas
+++ b/ideintf/newfield.pas
@@ -21,14 +21,15 @@ interface
 
 uses
   Classes, Math, SysUtils, DBConst, LCLIntf, Graphics, Controls, Forms, Dialogs,
-  ExtCtrls, StdCtrls, Buttons, DB, LResources, ComponentEditors,
-  PropEdits, TypInfo;
+  ExtCtrls, StdCtrls, Buttons, DB, LResources, ObjInspStrConsts,
+  ComponentEditors, PropEdits, TypInfo;
 
 type
 
   { TNewFieldFrm }
 
   TNewFieldFrm=class(TForm)
+    NoteLbl: TLabel;
     Panel2: TPanel;
     GroupBox1: TGroupBox;
     Label1: TLabel;
@@ -85,6 +86,8 @@ var
 
 implementation
 
+
+
 procedure SplitFieldsList(FldList: string; AList: TStrings);
 const
    SplitChars: Array[0..2] of Char = ('+',';',':');
@@ -154,11 +157,20 @@ end ;
 procedure TNewFieldFrm.FormCreate(Sender: TObject);
 var i: integer;
 begin
-  if Assigned(LinkDataSet) then
-    LinkDataset.FieldDefs.Update;
-    for i := 0 to LinkDataSet.FieldDefs.Count - 1 do begin
-      SelectKeyFields.Items.Add(LinkDataSet.FieldDefs[i].Name);
+  NoteLbl.Caption := fesNoFieldsNote;
+  if Assigned(LinkDataSet) then begin
+    try
+      LinkDataset.FieldDefs.Update;
+    except
+      on E:Exception do begin
+        NoteLbl.visible := true;
+        Panel1.Height := 100;
+      end;
     end;
+  end;
+  for i := 0 to LinkDataSet.FieldDefs.Count - 1 do begin
+    SelectKeyFields.Items.Add(LinkDataSet.FieldDefs[i].Name);
+  end;
   RadioGroup1.ItemIndex := 0;
   RadioGroup1Click(Nil);
 end;
diff --git a/ideintf/objinspstrconsts.pas b/ideintf/objinspstrconsts.pas
index 258afeddfe..3ee6533308 100644
--- a/ideintf/objinspstrconsts.pas
+++ b/ideintf/objinspstrconsts.pas
@@ -316,8 +316,14 @@ resourcestring
   s_SuggestSplitImage = 'Do you want to split the image?';
   s_AddAsSingle = 'Add as single';
   s_SplitImage = 'Split image';
-
-
+  
+  // Fields Editor
+  fesFeTitle = 'Edit Fields';
+  fesNoFields = 'It was not possible to get the dataset field''s list';
+  fesCheckDset = 'Check dataset settings';
+  fesFlTitle = 'FieldDefs';
+  fesNoFieldsNote = 'Field''s list is not available, can''t check for duplicates';
+  
 implementation
 
 end.
diff --git a/localize.bat b/localize.bat
index 745c2b441e..9cd8aeeb5b 100644
--- a/localize.bat
+++ b/localize.bat
@@ -43,16 +43,6 @@ tools\updatepofiles languages\lazaruside.po
 rstconv -i %ObjInsp_RST% -o ideintf\languages\objinspstrconsts.po
 tools\updatepofiles ideintf\languages\objinspstrconsts.po
 
-@REM FieldsEditor
-@set FieldsEditor_RST=ideintf\units\%ArchOS%\fieldseditor.rst
-rstconv -i %FieldsEditor_RST% -o ideintf\languages\fieldseditor.po
-tools\updatepofiles ideintf\languages\fieldseditor.po
-
-@REM FieldsList
-@set FieldsList_RST=ideintf\units\%ArchOS%\fieldslist.rst
-rstconv -i %FieldsList_RST% -o ideintf\languages\fieldslist.po
-tools\updatepofiles ideintf\languages\fieldslist.po
-
 @REM INSTALLER
 @set Installer_RST=tools\install\win\installerstrconsts.rst
 if not exist %Installer_RST% goto SkipInstaller
diff --git a/localize.sh b/localize.sh
index 575f6d4368..8a97a14ffe 100755
--- a/localize.sh
+++ b/localize.sh
@@ -30,8 +30,6 @@ fi
 RSTFILES=(
   ". lazarusidestrconsts lazaruside"
   "ideintf objinspstrconsts"
-  "ideintf fieldslist"
-  "ideintf fieldseditor"
   "components/codetools codetoolsstrconsts"
   "components/synedit syneditstrconst synedit"
   "components/synedit synmacrorecorder"