diff --git a/ide/frmsearch.lfm b/ide/frmsearch.lfm
index ccb823360f..41065d7382 100644
--- a/ide/frmsearch.lfm
+++ b/ide/frmsearch.lfm
@@ -6,7 +6,7 @@ object SearchForm: TSearchForm
   OnCreate = SearchFormCREATE
   OnDestroy = SearchFormDESTROY
   ParentFont = True
-  PixelsPerInch = 96
+  PixelsPerInch = 112
   Position = poOwnerFormCenter
   HorzScrollBar.Page = 427
   VertScrollBar.Page = 148
@@ -16,7 +16,6 @@ object SearchForm: TSearchForm
   Width = 428
   object Panel2: TPanel
     Align = alClient
-    BorderSpacing.OnChange = nil
     BevelInner = bvLowered
     ClientHeight = 149
     ClientWidth = 428
@@ -24,18 +23,17 @@ object SearchForm: TSearchForm
     ParentFont = True
     TabOrder = 0
     TabStop = True
+    OnClick = Panel2Click
     Height = 149
     Width = 428
     object lblMatches: TLabel
-      BorderSpacing.OnChange = nil
       Color = clNone
       Left = 96
       Height = 17
       Top = 80
       Width = 321
     end
-    object Label1: TLabel
-      BorderSpacing.OnChange = nil
+    object MatchesLabel: TLabel
       Caption = 'Matches'
       Color = clNone
       Left = 16
@@ -45,15 +43,13 @@ object SearchForm: TSearchForm
     end
     object lblProgress: TLabel
       AutoSize = False
-      BorderSpacing.OnChange = nil
       Color = clNone
       Left = 96
       Height = 17
       Top = 48
       Width = 320
     end
-    object Label2: TLabel
-      BorderSpacing.OnChange = nil
+    object SearchingLabel: TLabel
       Caption = 'Searching:'
       Color = clNone
       Left = 16
@@ -61,8 +57,7 @@ object SearchForm: TSearchForm
       Top = 48
       Width = 64
     end
-    object Label4: TLabel
-      BorderSpacing.OnChange = nil
+    object SearchTextLabel: TLabel
       Caption = 'Search Text:'
       Color = clNone
       Left = 16
@@ -71,7 +66,6 @@ object SearchForm: TSearchForm
       Width = 80
     end
     object lblSearchText: TLabel
-      BorderSpacing.OnChange = nil
       Color = clNone
       Left = 96
       Height = 17
@@ -79,7 +73,7 @@ object SearchForm: TSearchForm
       Width = 320
     end
     object btnCancel: TButton
-      BorderSpacing.OnChange = nil
+      AutoSize = True
       Caption = 'Cancel'
       Default = True
       OnClick = btnAbortCLICK
diff --git a/ide/frmsearch.lrs b/ide/frmsearch.lrs
index 64d6d99361..f3d755fbab 100644
--- a/ide/frmsearch.lrs
+++ b/ide/frmsearch.lrs
@@ -4,25 +4,23 @@ LazarusResources.Add('TSearchForm','FORMDATA',[
   'TPF0'#11'TSearchForm'#10'SearchForm'#11'BorderStyle'#7#8'bsDialog'#7'Caption'
   +#6#13'Searching....'#12'ClientHeight'#3#149#0#11'ClientWidth'#3#172#1#8'OnCr'
   +'eate'#7#16'SearchFormCREATE'#9'OnDestroy'#7#17'SearchFormDESTROY'#10'Parent'
-  +'Font'#9#13'PixelsPerInch'#2'`'#8'Position'#7#17'poOwnerFormCenter'#18'HorzS'
+  +'Font'#9#13'PixelsPerInch'#2'p'#8'Position'#7#17'poOwnerFormCenter'#18'HorzS'
   +'crollBar.Page'#3#171#1#18'VertScrollBar.Page'#3#148#0#4'Left'#3#205#1#6'Hei'
   +'ght'#3#149#0#3'Top'#3'!'#1#5'Width'#3#172#1#0#6'TPanel'#6'Panel2'#5'Align'#7
-  +#8'alClient'#22'BorderSpacing.OnChange'#13#10'BevelInner'#7#9'bvLowered'#12
-  +'ClientHeight'#3#149#0#11'ClientWidth'#3#172#1#11'FullRepaint'#8#10'ParentFo'
-  +'nt'#9#8'TabOrder'#2#0#7'TabStop'#9#6'Height'#3#149#0#5'Width'#3#172#1#0#6'T'
-  +'Label'#10'lblMatches'#22'BorderSpacing.OnChange'#13#5'Color'#7#6'clNone'#4
-  +'Left'#2'`'#6'Height'#2#17#3'Top'#2'P'#5'Width'#3'A'#1#0#0#6'TLabel'#6'Label'
-  +'1'#22'BorderSpacing.OnChange'#13#7'Caption'#6#7'Matches'#5'Color'#7#6'clNon'
-  +'e'#4'Left'#2#16#6'Height'#2#17#3'Top'#2'P'#5'Width'#2'@'#0#0#6'TLabel'#11'l'
-  +'blProgress'#8'AutoSize'#8#22'BorderSpacing.OnChange'#13#5'Color'#7#6'clNone'
-  +#4'Left'#2'`'#6'Height'#2#17#3'Top'#2'0'#5'Width'#3'@'#1#0#0#6'TLabel'#6'Lab'
-  +'el2'#22'BorderSpacing.OnChange'#13#7'Caption'#6#10'Searching:'#5'Color'#7#6
-  +'clNone'#4'Left'#2#16#6'Height'#2#17#3'Top'#2'0'#5'Width'#2'@'#0#0#6'TLabel'
-  +#6'Label4'#22'BorderSpacing.OnChange'#13#7'Caption'#6#12'Search Text:'#5'Col'
-  +'or'#7#6'clNone'#4'Left'#2#16#6'Height'#2#17#3'Top'#2#16#5'Width'#2'P'#0#0#6
-  +'TLabel'#13'lblSearchText'#22'BorderSpacing.OnChange'#13#5'Color'#7#6'clNone'
-  +#4'Left'#2'`'#6'Height'#2#17#3'Top'#2#16#5'Width'#3'@'#1#0#0#7'TButton'#9'bt'
-  +'nCancel'#22'BorderSpacing.OnChange'#13#7'Caption'#6#6'Cancel'#7'Default'#9#7
-  +'OnClick'#7#13'btnAbortCLICK'#8'TabOrder'#2#0#4'Left'#3#177#0#6'Height'#2#25
-  +#3'Top'#2'p'#5'Width'#2'K'#0#0#0#0
+  +#8'alClient'#10'BevelInner'#7#9'bvLowered'#12'ClientHeight'#3#149#0#11'Clien'
+  +'tWidth'#3#172#1#11'FullRepaint'#8#10'ParentFont'#9#8'TabOrder'#2#0#7'TabSto'
+  +'p'#9#7'OnClick'#7#11'Panel2Click'#6'Height'#3#149#0#5'Width'#3#172#1#0#6'TL'
+  +'abel'#10'lblMatches'#5'Color'#7#6'clNone'#4'Left'#2'`'#6'Height'#2#17#3'Top'
+  +#2'P'#5'Width'#3'A'#1#0#0#6'TLabel'#12'MatchesLabel'#7'Caption'#6#7'Matches'
+  +#5'Color'#7#6'clNone'#4'Left'#2#16#6'Height'#2#17#3'Top'#2'P'#5'Width'#2'@'#0
+  +#0#6'TLabel'#11'lblProgress'#8'AutoSize'#8#5'Color'#7#6'clNone'#4'Left'#2'`'
+  +#6'Height'#2#17#3'Top'#2'0'#5'Width'#3'@'#1#0#0#6'TLabel'#14'SearchingLabel'
+  +#7'Caption'#6#10'Searching:'#5'Color'#7#6'clNone'#4'Left'#2#16#6'Height'#2#17
+  +#3'Top'#2'0'#5'Width'#2'@'#0#0#6'TLabel'#15'SearchTextLabel'#7'Caption'#6#12
+  +'Search Text:'#5'Color'#7#6'clNone'#4'Left'#2#16#6'Height'#2#17#3'Top'#2#16#5
+  +'Width'#2'P'#0#0#6'TLabel'#13'lblSearchText'#5'Color'#7#6'clNone'#4'Left'#2
+  +'`'#6'Height'#2#17#3'Top'#2#16#5'Width'#3'@'#1#0#0#7'TButton'#9'btnCancel'#8
+  +'AutoSize'#9#7'Caption'#6#6'Cancel'#7'Default'#9#7'OnClick'#7#13'btnAbortCLI'
+  +'CK'#8'TabOrder'#2#0#4'Left'#3#177#0#6'Height'#2#25#3'Top'#2'p'#5'Width'#2'K'
+  +#0#0#0#0
 ]);
diff --git a/ide/frmsearch.pas b/ide/frmsearch.pas
index 71143cf4db..47bc99fd15 100644
--- a/ide/frmsearch.pas
+++ b/ide/frmsearch.pas
@@ -41,15 +41,19 @@ uses
 
 
 type
+
+  { TSearchForm }
+
   TSearchForm = class(TForm)
     btnCancel: TBUTTON;
-    Label1: TLABEL;
-    Label2: TLABEL;
-    Label4: TLABEL;
+    MatchesLabel: TLABEL;
+    SearchingLabel: TLABEL;
+    SearchTextLabel: TLABEL;
     lblMatches: TLABEL;
     lblProgress: TLABEL;
     lblSearchText: TLABEL;
     Panel2: TPANEL;
+    procedure Panel2Click(Sender: TObject);
     procedure SearchFormCREATE(Sender: TObject);
     procedure SearchFormDESTROY(Sender: TObject);
     procedure btnAbortCLICK(Sender: TObject);
@@ -117,6 +121,12 @@ var
   DC: HDC;
 begin
   //Set Defaults
+  MatchesLabel.Caption:=lissMatches;
+  SearchingLabel.Caption:=lissSearching;
+  SearchTextLabel.Caption:=lissSearchText;
+  btnCancel.Caption:=dlgCancel;
+  Caption:=dlgSearchCaption;
+
   fWholeWord:= false;
   fCaseSensitive:= false;
   fRecursive:= True;
@@ -140,6 +150,11 @@ begin
   end;//finally
 end;//SearchFormCreate
 
+procedure TSearchForm.Panel2Click(Sender: TObject);
+begin
+
+end;
+
 procedure TSearchForm.SearchFormDESTROY(Sender: TObject);
 begin
   FreeAndNil(fParsedMasks);
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 0ef5fc792b..b54dc1c500 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -637,6 +637,9 @@ resourcestring
   // Search dialog
   dlgSearchCaption = 'Searching...';
   dlgSearchAbort = 'Search terminated by user.';
+  lissMatches = 'Matches';
+  lissSearching = 'Searching';
+  lissSearchText = 'Search text';
   
   dlgDesktop = 'Desktop';
   dlgWindows = 'Windows';
diff --git a/ide/main.pp b/ide/main.pp
index f508ac2bd9..1a6d22444d 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -2330,7 +2330,7 @@ begin
 //  Handled:=false;
 //  OnProcessIDECommand(Sender,CommandRelation.Command,Handled);
 //  if Handled then Key:=VK_UNKNOWN;
-debugln('Key '+IntToStr(Key)+' pressed');
+  //debugln('TMainIDE.OnExecuteIDEShortCut Key '+dbgs(Key)+' pressed');
   Command := EditorOpts.KeyMap.TranslateKey(Key,Shift,Areas);
   if (Command = ecNone) then exit;
   Handled := false;
@@ -11810,6 +11810,9 @@ end.
 
 { =============================================================================
   $Log$
+  Revision 1.884  2005/07/15 15:00:01  mattias
+  added resourcestrings for search progress form
+
   Revision 1.883  2005/07/13 07:33:14  mattias
   implemented renaming of new package files