Fix occurrences of "edition" which should be "editing"

Fixes: lp:1778168
* https://bugs.launchpad.net/kicad/+bug/1778168

(cherry picked from commit bcb1220)

bitmap2component/bitmap2cmp_gui.cpp

@@ -125,7 +125,7 @@ private:
     // called when texts controls which handle the image resolution
     // lose the focus, to ensure the right values are displayed
     // because the m_imageDPI are clipped to acceptable values, and
-    // the text displayed could be differ during text edition
+    // the text displayed could be differ during text editing
     // We are using ChangeValue here to avoid generating a wxEVT_TEXT event.
     void UpdateDPITextValueX( wxMouseEvent& event )
     {

eeschema/hotkeys.cpp

@@ -606,8 +606,8 @@ bool SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition,
 
         // Fall through
     case HK_EDIT:
-        // Edit schematic item. Do not allow sheet edition when mowing
-        // Because a sheet edition can be complex.
+        // Edit schematic item. Do not allow sheet editing when mowing because sheet editing
+        // can be complex.
         if( itemInEdit && screen->GetCurItem()->Type() == SCH_SHEET_T )
                 break;
 

eeschema/lib_edit_frame.cpp

@@ -263,12 +263,11 @@ LIB_EDIT_FRAME::LIB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
     ReCreateVToolbar();
 
     // Ensure the current alias name is valid if a part is loaded
-    // Sometimes it is not valid. This is the case
-    // when a part value (the part lib name), or the alias list was modified
-    // during a previous session and the modifications not saved in lib.
-    // Reopen libedit in a new session gives a non valid m_aliasName
-    // because the curr part is reloaded from the library (and this is the unmodified part)
-    // and the old alias name (from the previous edition) can be invalid
+    // Sometimes it is not valid. This is the case when a part value (the part lib name), or
+    // the alias list was modified during a previous session and the modifications not saved
+    // in lib.  Reopen libedit in a new session gives a non valid m_aliasName because the curr
+    // part is reloaded from the library (and this is the unmodified part) and the old alias
+    // name (from the previous session) can be invalid
     LIB_PART* part = GetCurPart();
 
     if( part == NULL )
@@ -1450,8 +1449,7 @@ void LIB_EDIT_FRAME::deleteItem( wxDC* aDC, LIB_ITEM* aItem )
 
         part->RemoveDrawItem( (LIB_ITEM*) pin, m_canvas, aDC );
 
-        // when pin edition is synchronized, all pins of the same body style
-        // are removed:
+        // when pin editing is synchronized, all pins of the same body style are removed:
         if( SynchronizePins() )
         {
             int curr_convert = pin->GetConvert();

eeschema/lib_edit_frame.h

@@ -78,10 +78,10 @@ class LIB_EDIT_FRAME : public SCH_BASE_FRAME
      * Set to true to not synchronize pins at the same position when editing
      * symbols with multiple units or multiple body styles.
      * Therefore deleting, moving pins are made for all pins at the same location
-     * When units are interchangeable, synchronizing edition of pins is usually
+     * When units are interchangeable, synchronizing editing of pins is usually
      * the best way, because if units are interchangeable, it imply all similar
      * pins are on the same location.
-     * When units are non interchangeable, do not synchronize edition of pins, because
+     * When units are non interchangeable, do not synchronize editing of pins, because
      * each part is specific, and there are no similar pins between units.
      *
      * Setting this to false allows editing each pin per part or body style
@@ -213,7 +213,7 @@ public:
     void Process_Config( wxCommandEvent& event );
 
     /**
-     * Pin edition (add, delete, move...) can be synchronized between units
+     * Pin editing (add, delete, move...) can be synchronized between units
      * when units are interchangeable because in this case similar pins are expected
      * at the same location
      * @return true if the edit pins separately option is false and the current symbol

eeschema/lib_field.h

@@ -61,7 +61,7 @@ class LIB_FIELD : public LIB_ITEM, public EDA_TEXT
     int      m_id;           ///< @see enum NumFieldType
     wxString m_name;         ///< Name (not the field text value itself, that is .m_Text)
 
-    wxString m_savedText;    ///< Temporary storage for the string when edition.
+    wxString m_savedText;    ///< Temporary storage for the string when editing.
     bool     m_rotate;       ///< Flag to indicate a rotation occurred while editing.
     bool     m_updateText;   ///< Flag to indicate text change occurred while editing.
 

eeschema/lib_pin.h

@@ -349,7 +349,7 @@ public:
      * @param aEnable = true marks all common pins for editing mode.  False
      *                clears the editing mode.
      * @param aEditPinByPin == true enables the edit pin by pin mode.
-     * aEditPinByPin == false enables the pin edition coupling between pins at the same location
+     * aEditPinByPin == false enables the pin edit coupling between pins at the same location
      * if aEnable == false, aEditPinByPin is not used
      */
     void EnableEditMode( bool aEnable, bool aEditPinByPin = false );
@@ -464,7 +464,7 @@ public:
 
     /**
      * move this and all linked pins to the new position
-     * used in pin edition.
+     * used in pin editing.
      * use SetPinPosition to set the position of this only
      * @param aPosition is the new position of this and linked pins
      */

eeschema/lib_text.h

@@ -43,7 +43,7 @@
  */
 class LIB_TEXT : public LIB_ITEM, public EDA_TEXT
 {
-    wxString m_savedText;         ///< Temporary storage for the string when edition.
+    wxString m_savedText;         ///< Temporary storage for the string when editing.
     bool m_rotate;                ///< Flag to indicate a rotation occurred while editing.
     bool m_updateText;            ///< Flag to indicate text change occurred while editing.
 

eeschema/libedit_onrightclick.cpp

@@ -279,7 +279,6 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
     return true;
 }
 
-// Add menu items for pin edition
 void AddMenusForPin( wxMenu* PopMenu, LIB_PIN* Pin, LIB_EDIT_FRAME* frame )
 {
     bool selected    = Pin->IsSelected();

eeschema/onrightclick.cpp

@@ -84,8 +84,7 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
         AddMenusForBlock( PopMenu, this );
         PopMenu->AppendSeparator();
 
-        // If we have a block containing only one main element
-        // we append its edition submenu
+        // If we have a block containing only one main element we append its edit submenu
         if( item != NULL )
         {
             switch( item->Type() )

eeschema/pinedit.cpp

@@ -433,7 +433,7 @@ void LIB_EDIT_FRAME::CreateImagePins( LIB_PIN* aPin )
     int      ii;
     LIB_PIN* newPin;
 
-    // if "synchronize pins edition" option is off, do not create any similar pin for other
+    // if "synchronize pins editing" option is off, do not create any similar pin for other
     // units and/or shapes: each unit is edited regardless other units or body
     if( !SynchronizePins() )
         return;
@@ -443,7 +443,7 @@ void LIB_EDIT_FRAME::CreateImagePins( LIB_PIN* aPin )
 
     // When units are interchangeable, all units are expected to have similar pins
     // at the same position
-    // to facilitate pin edition, create pins for all other units for the current body style
+    // to facilitate pin editing, create pins for all other units for the current body style
     // at the same position as aPin
 
     for( ii = 1; ii <= aPin->GetParent()->GetUnitCount(); ii++ )

eeschema/sch_edit_frame.h

@@ -1314,7 +1314,7 @@ private:
     void PutDataInPreviousState( PICKED_ITEMS_LIST* aList, bool aRedoCommand );
 
     /**
-     *  Redo the last edition.
+     *  Redo the last edit.
      *
      *  - Save the current schematic in Undo list
      *  - Get an old version of the schematic from Redo list
@@ -1324,7 +1324,7 @@ private:
     void GetSchematicFromRedoList( wxCommandEvent& event );
 
     /**
-     * Perform an undo the last edition.
+     * Perform an undo the last edit.
      *
      *  - Save the current schematic in Redo list
      *  - Get an old version of the schematic from Undo list

eeschema/sch_screen.cpp

@@ -709,7 +709,7 @@ void SCH_SCREEN::ClearAnnotation( SCH_SHEET_PATH* aSheetPath )
 
             // Clear the modified component flag set by component->ClearAnnotation
             // because we do not use it here and we should not leave this flag set,
-            // when an edition is finished:
+            // when an editing is finished:
             component->ClearFlags();
         }
     }

eeschema/schematic_undo_redo.cpp

@@ -103,7 +103,7 @@
 
 /* Used if undo / redo command:
  * swap data between Item and its copy, pointed by its picked item link member
- * swapped data is data modified by edition, so not all values are swapped
+ * swapped data is data modified by editing, so not all values are swapped
  */
 
 void SCH_EDIT_FRAME::SaveCopyInUndoList( SCH_ITEM*      aItem,

include/board_design_settings.h

@@ -206,7 +206,7 @@ public:
     bool       m_TextItalic[ LAYER_CLASS_COUNT ];
     bool       m_TextUpright[ LAYER_CLASS_COUNT ];
 
-    // Variables used in footprint edition (default value in item/footprint creation)
+    // Variables used in footprint editing (default value in item/footprint creation)
 
     wxString   m_RefDefaultText;            ///< Default ref text on fp creation
                                             // if empty, use footprint name as default

include/class_board_item.h

@@ -156,7 +156,7 @@ public:
      * Swap data between aItem and aImage.
      * aItem and aImage should have the same type
      * Used in undo redo command to swap values between an item and its copy
-     * Only values like layer, size .. which are modified by edition are swapped,
+     * Only values like layer, size .. which are modified by editing are swapped,
      * not the pointers like
      * Pnext and Pback because aItem is not changed in the linked list
      * @param aImage = the item image which contains data to swap

include/worksheet_dataitem.h

@@ -266,7 +266,7 @@ public:
 
     /**
      * Function SetSelected
-     * Toggles on/off the selected flag (used in edition functions
+     * Toggles on/off the selected flag (used in editing functions)
      * @param aState = the flag value
      */
     void SetSelected( bool aState )

pagelayout_editor/pl_editor_frame.h

@@ -387,13 +387,13 @@ public:
      */
     void SaveCopyInUndoList();
 
-    /** Redo the last edition:
+    /** Redo the last edit:
      * - Place the current edited layout in undo list
      * - Get the previous version of the current edited layput
      */
     void GetLayoutFromRedoList( wxCommandEvent& event );
 
-    /** Undo the last edition:
+    /** Undo the last edit:
      * - Place the current layout in Redo list
      * - Get the previous version of the current edited layout
      */

pagelayout_editor/pl_editor_undo_redo.cpp

@@ -83,7 +83,7 @@ void PL_EDITOR_FRAME::SaveCopyInUndoList()
 }
 
 
-/* Redo the last edition:
+/* Redo the last edit:
  * - Place the current edited layout in undo list
  * - Get previous version of the current edited layput
  */
@@ -115,7 +115,7 @@ void PL_EDITOR_FRAME::GetLayoutFromRedoList( wxCommandEvent& event )
 }
 
 
-/* Undo the last edition:
+/* Undo the last edit:
  * - Place the current layout in Redo list
  * - Get previous version of the current edited layout
  */

pcbnew/class_board.h

@@ -913,7 +913,7 @@ public:
     /**
      * Function SynchronizeNetsAndNetClasses
      * copies NETCLASS info to each NET, based on NET membership in a NETCLASS.
-     * Must be called after a Design Rules edition, or after reading a netlist (or editing
+     * Must be called after a Design Rules edit, or after reading a netlist (or editing
      * the list of nets)  Also this function removes the non existing nets in netclasses
      * and add net nets in default netclass (this happens after reading a netlist)
      */
@@ -1262,7 +1262,7 @@ public:
      *                   integrated circuits from the pads connected to this track to the
      *                   die (if any) (can be NULL).
      * @param aReorder true for reorder the interesting segments (useful for
-     *                 track edition/deletion) in this case the flag BUSY is
+     *                 track editing/deleting) in this case the flag BUSY is
      *                 set (the user is responsible of flag clearing). False
      *                 for no reorder : useful when we want just calculate the
      *                 track length in this case, flags are reset

pcbnew/class_module.h

@@ -741,7 +741,7 @@ private:
     timestamp_t m_LastEditTime;
     int m_arflag;           ///< Use to trace ratsnest and auto routing.
     double m_Surface;       ///< Bounding box area
-    timestamp_t m_Link;     ///< Temporary logical link used in edition
+    timestamp_t m_Link;     ///< Temporary logical link used during editing
     int m_CntRot90;         ///< Horizontal automatic placement cost ( 0..10 ).
     int m_CntRot180;        ///< Vertical automatic placement cost ( 0..10 ).
 

pcbnew/class_pad.h

@@ -123,8 +123,7 @@ public:
     void ExportTo( DRAWSEGMENT* aTarget );
 
     /** Export the PAD_CS_PRIMITIVE parameters to a EDGE_MODULE
-     * useful to convert a primitive shape to a EDGE_MODULE shape for edition
-     * in footprint editor
+     * useful to convert a primitive shape to a EDGE_MODULE shape for editing in footprint editor
      * @param aTarget is the EDGE_MODULE to initialize
      */
     void ExportTo( EDGE_MODULE* aTarget );

pcbnew/class_text_mod.cpp

@@ -121,7 +121,7 @@ bool TEXTE_MODULE::TextHitTest( const EDA_RECT& aRect, bool aContains, int aAccu
 
 void TEXTE_MODULE::Rotate( const wxPoint& aRotCentre, double aAngle )
 {
-    // Used in footprint edition
+    // Used in footprint editing
     // Note also in module editor, m_Pos0 = m_Pos
 
     wxPoint pt = GetTextPos();

pcbnew/class_text_mod.h

@@ -106,7 +106,7 @@ public:
 
     bool IsParentFlipped() const;
 
-    /// Mirror text position in footprint edition
+    /// Mirror text position in footprint editing
     /// the text itself is not mirrored, and the layer not modified,
     /// only position is mirrored.
     /// (use Flip to change layer to its paired and mirror the text in fp editor).

pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp

@@ -657,7 +657,7 @@ bool DIALOG_FOOTPRINT_BOARD_EDITOR::TransferDataFromWindow()
 
     m_footprint->CalculateBoundingBox();
 
-    // This is a simple edition, we must create an undo entry
+    // This is a simple edit, we must create an undo entry
     if( m_footprint->GetFlags() == 0 )
         commit.Push( _( "Modify module properties" ) );
 

pcbnew/edit.cpp

@@ -300,7 +300,7 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
         break;
 
     case ID_DRC_CONTROL:
-        // Shows the DRC dialog in non modal mode, to allows board edition
+        // Shows the DRC dialog in non modal mode, to allows board editing
         // with the DRC dialog opened and showing errors.
         m_drc->ShowDRCDialog();
         break;