* Extention -> extension (By Reinier, bug ID #25979)

git-svn-id: trunk@27749 -

packages/fpgtk/src/editor/gtkdeftexts.pp

@@ -9,7 +9,7 @@ resourcestring
   sOptions = 'Options';
   sOk = '  Ok  ';
   sCancel = 'Cancel';
-  sExtention = 'Extention';
+  sExtension = 'Extension';
   sSaveonclose = '_Save on close';
   sFileFormat = 'File format';
   sMRUcount = 'MRU count';

packages/fpgtk/src/editor/gtkeditor.pp

@@ -1242,7 +1242,7 @@ begin
     else
       FDefs.Write (TheFile, nil, nil);
     TheFile.EndUpdate;
-    Thefile.SaveToFile (FDefs.UnitName+'.'+FSettings.Extention);
+    Thefile.SaveToFile (FDefs.UnitName+'.'+FSettings.Extension);
   finally
     TheFile.Free;
   end;
@@ -1381,7 +1381,7 @@ const
   keySaveOnExit = 'SaveOnExit';
   keyFileFormat = 'TextFormat';
   keyMRUCount = 'MRUCount';
-  keyExtention = 'Extention';
+  keyExtension = 'Extention'; //keep wrong spelling so cmpatibility kept with existing settings
   keyProgressWindow = 'ShowProgress';
   secMRU = 'Last open files';
   keyFile = 'File';
@@ -1396,7 +1396,7 @@ begin
     try
       saveonclose := readbool (SecSettings, keySaveOnExit, true);
       Fileformat := TFileFormat(readinteger (secSettings, keyFileFormat, 2));
-      Extention := readstring (secSettings, keyExtention, '.pp');
+      Extension := readstring (secSettings, keyExtension, '.pp');
       MRUCount := readinteger (secSettings, keyMRUCount, 5);
       ShowProgress := readbool (SecSettings, keyProgressWindow, true);
       FReopenList.capacity := MRUCount;
@@ -1420,7 +1420,7 @@ begin
     try
       writebool (SecSettings, keySaveOnExit, saveonclose);
       writeinteger (secSettings, keyFileFormat, Ord(FileFormat));
-      writestring (secSettings, keyExtention, Extention);
+      writestring (secSettings, keyExtension, Extension);
       writeinteger (secSettings, keyMRUCount, MRUCount);
       writebool (SecSettings, keyProgressWindow, ShowProgress);
       writeinteger (secMRU, keyCount, FReopenlist.count);

packages/fpgtk/src/editor/settingsrec.pp

@@ -15,7 +15,7 @@ type
   TSettingsRec = record
     SaveOnClose : boolean;
     FileFormat : TFileFormat;
-    Extention : string;
+    Extension : string;
     MRUCount : integer;
     ShowProgress : boolean;
   end;
@@ -25,7 +25,7 @@ type
     FCBSaveOnClose : TFPgtkToggleButton;
     FEFileFormat : TFPgtkOptionMenu;
     FMenuFileFormat : TFPgtkMenu;
-    FEExtention : TFPgtkCombo;
+    FEExtension : TFPgtkCombo;
     FEMRUCount : TFPgtkSpinButton;
     FCBProgressWindow : TFPgtkToggleButton;
     procedure BuildDialog;
@@ -108,16 +108,16 @@ begin
   FCBProgressWindow := TFPgtkCheckedButton.CreateWithLabel(sProgressWindow, AGroup);
   b.PackStart (FCBProgressWindow, False, False, 10);
 
-  FEExtention := TFPgtkCombo.Create;
-  with FEExtention do
+  FEExtension := TFPgtkCombo.Create;
+  with FEExtension do
     begin
     SetValueInList (false, false);
     List.Add (TFPgtkListItem.CreateWithLabel('pp'));
     List.Add (TFPgtkListItem.CreateWithLabel('pas'));
     end;
   b := TFPgtkHBox.Create;
-  b.PackStart (TFPgtkLabel.Create (sExtention), false, false, 0);
-  b.PackStart (FEExtention, false, false, 5);
+  b.PackStart (TFPgtkLabel.Create (sExtension), false, false, 0);
+  b.PackStart (FEExtension, false, false, 5);
   box.PackStart (b, false, false, 10);
 
   FEMRUCount := TFPgtkSpinButton.Create;
@@ -143,7 +143,7 @@ begin
       begin
       SaveOnClose := FCBSaveOnClose.Active;
       FileFormat := TFileFormat(FMenuFileFormat.ActiveIndex);
-      Extention := FEExtention.Entry.Text;
+      Extension := FEExtension.Entry.Text;
       MRUCount := FEMRUCount.AsInteger;
       ShowProgress := FCBProgressWindow.Active;
       end;
@@ -156,7 +156,7 @@ begin
     begin
     FCBSaveOnClose.Active := SaveOnClose;
     FEFileFormat.SetHistory (ord(FileFormat));
-    FEExtention.Entry.Text := Extention;
+    FEExtension.Entry.Text := Extension;
     FEMRUCount.AsInteger := MRUCount;
     FCBProgressWindow.Active := ShowProgress;
     end;