added i386 define for fpc source dir, more localization from Olivier

git-svn-id: trunk@3892 -

components/codetools/codetoolsstrconsts.pas

@@ -161,6 +161,7 @@ ResourceString
   ctsSrcPathInitialization = 'SrcPath Initialization';
   ctsNestedCommentsOn = 'Nested Comments On';
   ctsCompiler = 'Compiler';
+  ctsDefineProzessorType = 'Define processor type';
   ctsRuntimeLibrary = 'Runtime library';
   ctsProcessorSpecific = 'processor specific';
   ctsFreePascalComponentLibrary = 'Free Pascal Component Library';

components/codetools/definetemplates.pas

@@ -2370,6 +2370,10 @@ begin
   CompilerDir:=TDefineTemplate.Create('Compiler',ctsCompiler,'','compiler',
      da_Directory);
   MainDir.AddChild(CompilerDir);
+  // define 'i386'   ToDo: other types like m68k
+  DefTempl:=TDefineTemplate.Create('Define i386',
+    ctsDefineProzessorType,'i386','',da_DefineRecurse);
+  CompilerDir.AddChild(DefTempl);
 
   // rtl
   RTLDir:=TDefineTemplate.Create('RTL',ctsRuntimeLibrary,'','rtl',da_Directory);
@@ -2385,6 +2389,10 @@ begin
     Format(ctsIncludeDirectoriesPlusDirs,
     ['objpas, inc,'+TargetProcessor+','+SrcOS]),
     ExternalMacroStart+'IncPath',s,da_DefineRecurse));
+  // define 'i386'   ToDo: other types like m68k
+  DefTempl:=TDefineTemplate.Create('Define i386',
+    ctsDefineProzessorType,'i386','',da_DefineRecurse);
+  RTLDir.AddChild(DefTempl);
 
   // fcl
   FCLDir:=TDefineTemplate.Create('FCL',ctsFreePascalComponentLibrary,'','fcl',

ide/environmentopts.pp

@@ -1244,10 +1244,11 @@ end;
 constructor TEnvironmentOptionsDialog.Create(AOwner:TComponent);
 begin
   inherited Create(AOwner);
-  if LazarusResources.Find(ClassName)=nil then begin
+  if LazarusResources.Find(ClassName)=nil then
+  begin
     Position:=poScreenCenter;
     IDEDialogLayoutList.ApplyLayout(Self,485,435);
-    Caption:=dlgEnvOpts;
+    Caption:=lisMenuGeneralOptions;
     OnResize:=@EnvironmentOptionsDialogResize;
     
     NoteBook:=TNoteBook.Create(Self);
@@ -2432,7 +2433,7 @@ begin
     Top:=FormEditMiscGroupBox.Top+FormEditMiscGroupBox.Height+5;
     Width:=GridGroupBox.Width;
     Height:=120;
-    Caption:='Rubberband';
+    Caption:=dlgRubberBandGroup;
   end;
 
   SetupRubberbandBox;

ide/ideoptiondefs.pas

@@ -33,7 +33,8 @@ unit IDEOptionDefs;
 interface
 
 uses
-  Classes, SysUtils, Laz_XMLCfg, Forms, Controls, StdCtrls, Buttons;
+  Classes, SysUtils, Laz_XMLCfg, Forms, Controls, StdCtrls, Buttons,
+  LazarusIDEStrConsts;
 
 const
   // form names for non modal IDE windows:
@@ -698,41 +699,49 @@ var
     end;
   end;
 
-const
-  RadioBtnCaptions: array[TIDEWindowPlacement] of string = (
-      'Use windowmanager setting',
-      'Default',
-      'Restore window geometry',
-      'Docked',
-      'Custom position',
-      'Restore window size'
-    );
+  function GetRadioBtnCaptions(aPos : TIDEWindowPlacement) : String;
+  begin
+    Result:='?';
+    Case aPos of
+      iwpUseWindowManagerSetting : Result:= rsiwpUseWindowManagerSetting;
+      iwpDefault                 : Result:= rsiwpDefault;
+      iwpRestoreWindowGeometry   : Result:= rsiwpRestoreWindowGeometry;
+      iwpDocked                  : Result:= rsiwpDocked;
+      iwpCustomPosition          : Result:= rsiwpCustomPosition;
+      iwpRestoreWindowSize       : Result:= rsiwpRestoreWindowSize;
+    end;
+  end;
+  
 begin
   if AnLayout=nil then exit;
   CurY:=5;
-  for APlacement:=Low(TIDEWindowPlacement) to High(TIDEWindowPlacement) do begin
-    if APlacement in AnLayout.WindowPlacementsAllowed then begin
+  for APlacement:=Low(TIDEWindowPlacement) to High(TIDEWindowPlacement) do
+  begin
+    if APlacement in AnLayout.WindowPlacementsAllowed then
+    begin
       if PlacementRadioButtons[APlacement]=nil then
         PlacementRadioButtons[APlacement]:=TRadioButton.Create(Self);
-      with PlacementRadioButtons[APlacement] do begin
+      with PlacementRadioButtons[APlacement] do
+      begin
         Parent:=Self;
         SetBounds(5,CurY,Self.ClientWidth-Left,Height);
         inc(CurY,Height+2);
         OnClick:=@RadioButtonClick;
-        Caption:=RadioBtnCaptions[APlacement];
+        Caption:=GetRadioBtnCaptions(APlacement);
         Checked:=(APlacement=AnLayout.WindowPlacement);
         Visible:=true;
       end;
+      
       case APlacement of
       iwpCustomPosition:
         begin
           // custom window position
-          SetLabelAndEdit(LeftLabel,LeftEdit,'Left:',15,CurY);
-          SetLabelAndEdit(TopLabel,TopEdit,'Top:',
+          SetLabelAndEdit(LeftLabel,LeftEdit,dlgLeftPos,15,CurY);
+          SetLabelAndEdit(TopLabel,TopEdit,dlgTopPos,
             LeftEdit.Left+LeftEdit.Width+15,CurY);
           inc(CurY,LeftEdit.Height+3);
-          SetLabelAndEdit(WidthLabel,WidthEdit,'Width:',15,CurY);
-          SetLabelAndEdit(HeightLabel,HeightEdit,'Height:',
+          SetLabelAndEdit(WidthLabel,WidthEdit,dlgWidthPos,15,CurY);
+          SetLabelAndEdit(HeightLabel,HeightEdit,DlgHeightPos,
             WidthEdit.Left+WidthEdit.Width+15,CurY);
           inc(CurY,WidthEdit.Height+3);
           if AnLayout.CustomCoordinatesAreValid then begin
@@ -748,30 +757,38 @@ begin
           end;
         end;
       end;
-    end else begin
-      if PlacementRadioButtons[APlacement]<>nil then begin
-        PlacementRadioButtons[APlacement].Free;
-        PlacementRadioButtons[APlacement]:=nil;
-      end;
+    end else
+        begin
+          if PlacementRadioButtons[APlacement]<>nil then
+          begin
+              PlacementRadioButtons[APlacement].Free;
+              PlacementRadioButtons[APlacement]:=nil;
+          end;
+        end;
     end;
-  end;
-  inc(CurY,2);
-  if ApplyButton=nil then ApplyButton:=TButton.Create(Self);
-  with ApplyButton do begin
+    
+    inc(CurY,2);
+    if ApplyButton=nil then
+       ApplyButton:=TButton.Create(Self);
+       
+    with ApplyButton do
+    begin
     Parent:=Self;
     SetBounds(5,CurY,70,Height);
     OnClick:=@ApplyButtonClick;
-    Caption:='Apply';
+    Caption:=dlgButApply;
     Visible:=true;
   end;
-  if iwpCustomPosition in AnLayout.WindowPlacementsAllowed then begin
+  if iwpCustomPosition in AnLayout.WindowPlacementsAllowed then
+  begin
     if GetWindowPositionButton=nil then
       GetWindowPositionButton:=TButton.Create(Self);
-    with GetWindowPositionButton do begin
+    with GetWindowPositionButton do
+    begin
       Parent:=Self;
       SetBounds(85,CurY,110,Height);
       OnClick:=@GetWindowPositionButtonClick;
-      Caption:='Get position';
+      Caption:=dlgGetPosition;
       Visible:=true;
     end;
   end;

ide/lazarusidestrconsts.pas

@@ -304,7 +304,7 @@ resourcestring
   //Environment dialog
   dlgBakDirectory='(no subdirectoy)';
   
-  dlgEnvOpts = 'Environment Options';
+  //dlgEnvOpts = 'Environment Options';  = lisMenuGeneralOptions
   dlgDesktop = 'Desktop';
   dlgFrmEditor = 'Form Editor';
   dlgObjInsp = 'Object Inspector';
@@ -367,6 +367,7 @@ resourcestring
   dlgRuberbandSelectionColor = 'Selection';
   dlgRuberbandCreationColor = 'Creation';
   dlgRubberbandSelectsGrandChilds = 'Select grand childs';
+  dlgRubberBandGroup='Rubber band';
   dlgPasExt = 'Default pascal extension';
   dlgPasLower = 'Save pascal files lowercase';
   dlgAmbigFileAct = 'Ambigious file action:';
@@ -656,6 +657,19 @@ resourcestring
   dlgDownWord = 'Down';
   dlgReplaceAll = 'Replace All';
   
+  //IDEOptionDefs
+  dlgGetPosition = 'Get position';
+  dlgLeftPos     = 'Left:';
+  dlgWidthPos    = 'Width:';
+  dlgTopPos      = 'Top:';
+  DlgHeightPos   = 'Height:';
+  rsiwpUseWindowManagerSetting = 'Use windowmanager setting';
+  rsiwpDefault                 = 'Default';
+  rsiwpRestoreWindowGeometry   = 'Restore window geometry';
+  rsiwpDocked                  = 'Docked';
+  rsiwpCustomPosition          = 'Custom position';
+  rsiwpRestoreWindowSize       = 'Restore window size';
+
   // Code Explorer
   lisCodeExplorer = 'Code Explorer';
 

languages/lazaruside.fr.po

@@ -587,6 +587,10 @@ msgstr "Commandes de d
 msgid "Cursor row in current editor"
 msgstr "Ligne du curseur dans l'éditeur courant"
 
+#: lazarusidestrconsts:rsiwpcustomposition
+msgid "Custom position"
+msgstr "Position personnalisée"
+
 #: lazarusidestrconsts:lismenucut
 msgid "Cut"
 msgstr "Couper"
@@ -623,6 +627,10 @@ msgstr "Type de d
 msgid "Debugging:"
 msgstr "Débugueur"
 
+#: lazarusidestrconsts:rsiwpdefault
+msgid "Default"
+msgstr "Défaut"
+
 #: lazarusidestrconsts:dlgpasext
 msgid "Default pascal extension"
 msgstr "Extension pascal par défaut"
@@ -735,6 +743,10 @@ msgstr "Pas de ligne de s
 msgid "Do not split line In front of:"
 msgstr "Pas de ligne de séparation devant "
 
+#: lazarusidestrconsts:rsiwpdocked
+msgid "Docked"
+msgstr ""
+
 #: lazarusidestrconsts:dlgdoubleclickline
 msgid "Double click line"
 msgstr "Double-clic sélectionne la ligne"
@@ -1007,6 +1019,10 @@ msgstr "G
 msgid "Generate:"
 msgstr "Vous produisez"
 
+#: lazarusidestrconsts:dlggetposition
+msgid "Get position"
+msgstr "Récupérer"
+
 #: lazarusidestrconsts:dlgglobal
 msgid "Global"
 msgstr "Globale"
@@ -1073,7 +1089,7 @@ msgstr "Grille"
 
 #: lazarusidestrconsts:dlggridcolor
 msgid "Grid color"
-msgstr "Couleur de la grille"
+msgstr "Couleur"
 
 #: lazarusidestrconsts:dlggridx
 msgid "Grid size X"
@@ -1119,6 +1135,10 @@ msgstr ""
 msgid "Heap Size"
 msgstr "Taille de tas"
 
+#: lazarusidestrconsts:dlgheightpos
+msgid "Height:"
+msgstr "Hauteur:"
+
 #: lazarusidestrconsts:srvk_help
 msgid "Help"
 msgstr "Aide"
@@ -1423,6 +1443,10 @@ msgstr "Gauche"
 msgid "left windows key"
 msgstr "Touche Windows gauche"
 
+#: lazarusidestrconsts:dlgleftpos
+msgid "Left:"
+msgstr "Gauche:"
+
 #: lazarusidestrconsts:dlglevel1opt
 msgid "Level 1 (Quick Optimizations)"
 msgstr "Niveau 1 (Optimisation rapide)"
@@ -1657,7 +1681,7 @@ msgstr "Les composants s
 
 #: lazarusidestrconsts:dlgnaming
 msgid "Naming"
-msgstr "Extension"
+msgstr "Appellation"
 
 #: lazarusidestrconsts:srkmecnew
 msgid "New"
@@ -1995,6 +2019,14 @@ msgstr ""
 msgid "Report"
 msgstr "Rapport"
 
+#: lazarusidestrconsts:rsiwprestorewindowgeometry
+msgid "Restore window geometry"
+msgstr "Restaurer les dimensions"
+
+#: lazarusidestrconsts:rsiwprestorewindowsize
+msgid "Restore window size"
+msgstr "Restaurer les dimensions"
+
 #: lazarusidestrconsts:srvk_return
 msgid "Return"
 msgstr "Entrée"
@@ -2019,6 +2051,10 @@ msgstr "Couleur de la marge droite"
 msgid "right windows key"
 msgstr "Touche Windows droite"
 
+#: lazarusidestrconsts:dlgrubberbandgroup
+msgid "Rubber band"
+msgstr "Bande élastique"
+
 #: lazarusidestrconsts:lismenuprojectrun
 msgid "Run"
 msgstr "Exécuter"
@@ -2173,7 +2209,7 @@ msgstr "S
 
 #: lazarusidestrconsts:dlgrubberbandselectsgrandchilds
 msgid "Select grand childs"
-msgstr "Choisir les grands enfants"
+msgstr "Choisir les grands"
 
 #: lazarusidestrconsts:lismenuselectline
 msgid "Select line"
@@ -2643,6 +2679,10 @@ msgstr "ToolTip d'
 msgid "Tooltip symbol Tools"
 msgstr "Tooltip d'identification des symboles"
 
+#: lazarusidestrconsts:dlgtoppos
+msgid "Top:"
+msgstr "Haut:"
+
 #: lazarusidestrconsts:dlgbp7cptb
 msgid "TP/BP 7.0 Compatible"
 msgstr "Compatibilité TB/BP 7.0"
@@ -2759,6 +2799,10 @@ msgstr "Utilise le d
 msgid "Use syntax highlight"
 msgstr "Mise en évidence de la syntaxe"
 
+#: lazarusidestrconsts:rsiwpusewindowmanagersetting
+msgid "Use windowmanager setting"
+msgstr "Utiliser le gestionnaire de fenêtre"
+
 #: lazarusidestrconsts:dlgedcustomext
 msgid "User defined extension"
 msgstr "Extension utilisateur"
@@ -2879,6 +2923,10 @@ msgstr "Points de suivi"
 msgid "Whole Words Only"
 msgstr "Mots entiers seulement"
 
+#: lazarusidestrconsts:dlgwidthpos
+msgid "Width:"
+msgstr "Largeur:"
+
 #: lazarusidestrconsts:dlgwinpos
 msgid "Window Positions"
 msgstr "Positions de fenêtre"