7
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 00:21:25 +00:00

fix misspelled 'an other' -> 'another'

This commit is contained in:
Carsten Schoenert 2018-04-08 12:28:59 +02:00 committed by Wayne Stambaugh
parent 77b3a662fc
commit a11714b1a4
47 changed files with 71 additions and 70 deletions

View File

@ -39,7 +39,7 @@
#include <class_board.h>
#include "status_text_reporter.h"
#include <gl_context_mgr.h>
#include <profile.h> // To use GetRunningMicroSecs or an other profiling utility
#include <profile.h> // To use GetRunningMicroSecs or another profiling utility
#include <bitmaps.h>
#include <hotkeys_basic.h>
#include <menus_helpers.h>

View File

@ -35,7 +35,7 @@
#include "../../3d_fastmath.h"
#include <trigo.h>
#include <project.h>
#include <profile.h> // To use GetRunningMicroSecs or an other profiling utility
#include <profile.h> // To use GetRunningMicroSecs or another profiling utility
void C3D_RENDER_OGL_LEGACY::add_object_to_triangle_layer( const CFILLEDCIRCLE2D * aFilledCircle,

View File

@ -46,7 +46,7 @@
#include <class_module.h>
#include <base_units.h>
#include <profile.h> // To use GetRunningMicroSecs or an other profiling utility
#include <profile.h> // To use GetRunningMicroSecs or another profiling utility
/**
* Scale convertion from 3d model units to pcb units

View File

@ -36,7 +36,7 @@
#include "3d_fastmath.h"
#include "3d_math.h"
#include "../common_ogl/ogl_utils.h"
#include <profile.h> // To use GetRunningMicroSecs or an other profiling utility
#include <profile.h> // To use GetRunningMicroSecs or another profiling utility
// This should be used in future for the function
// convertLinearToSRGB

View File

@ -1128,7 +1128,7 @@ removed: (common/infospgm.cpp) is no longer needed
When a sheet is deleted by block delete. it is put in undo list.
It is really deleted after 10 changes (when the undo list is full).
At this time, the associated data is also deleted.
If an other (not deleted) sheet shares the same data, this data is lost.
If another (not deleted) sheet shares the same data, this data is lost.
Need work to solve this problem and keep the undo/redo feature.

View File

@ -281,7 +281,7 @@ Component library object and other minor improvements.
Speed up ZONE_CONTAINER::Copy method
Speed up NETINFO_ITEM* BOARD::FindNet( const wxString& aNetname ) by using afast binary search
Switch to kbool V2.1. This version solves others problems in zones calculations.
Adding an other way to generate thermal shape; DO NOT USE: this is for kbool tests only
Adding another way to generate thermal shape; DO NOT USE: this is for kbool tests only
(I am thinking some bugs are remaining, so i am always working on kbool tests.
Klaas Olwerda is supporting me)

View File

@ -142,7 +142,7 @@ EDA_DRAW_PANEL::EDA_DRAW_PANEL( EDA_DRAW_FRAME* parent, int id,
m_ignoreMouseEvents = false;
// Be sure a mouse release button event will be ignored when creating the canvas
// if the mouse click was not made inside the canvas (can happen sometimes, when
// launching an editor from a double click made in an other frame)
// launching a editor from a double click made in another frame)
m_ignoreNextLeftButtonRelease = true;
m_mouseCaptureCallback = NULL;
@ -778,7 +778,7 @@ void EDA_DRAW_PANEL::DrawGrid( wxDC* aDC )
org.y += KiROUND( gridSize.y );
// Use a pixel based draw to display grid. There are a lot of calls, so the cost is
// high and grid is slowly drawn on some platforms. An other way using blit transfert was used,
// high and grid is slowly drawn on some platforms. Another way using blit transfert was used,
// a long time ago, but it did not give very good results.
// The better way is highly dependent on the platform and the graphic card.
int xpos;

View File

@ -112,7 +112,7 @@ bool KIWAY_PLAYER::ShowModal( wxString* aResult, wxWindow* aResultantFocusWindow
// We do not want to disable top level windows which are child of the modal one,
// if they are enabled.
// An example is an aui toolbar which was moved
// or a dialog or an other frame or miniframe opened by the modal one.
// or a dialog or another frame or miniframe opened by the modal one.
wxWindowList wlist = GetChildren();
std::vector<wxWindow*> enabledTopLevelWindows;

View File

@ -166,7 +166,7 @@ int LIB_ID::Parse( const UTF8& aId )
return partNdx; // Error: no library item name.
// Be sure the item name is valid.
// Some chars can be found in legacy files converted files from an other EDA tools.
// Some chars can be found in legacy files converted files from other EDA tools.
std::string fpname = aId.substr( partNdx, revNdx-partNdx );
ReplaceIllegalFileNameChars( &fpname, '_' );
SetLibItemName( UTF8( fpname ) );

View File

@ -480,7 +480,7 @@ void PAGE_LAYOUT_READER_PARSER::parseGraphic( WORKSHEET_DATAITEM * aItem )
token = NextTok();
else
{
// If an other token than T_LEFT is read here, this is an error
// If another token than T_LEFT is read here, this is an error
// however, due to a old bug in kicad, the token T_end can be found
// without T_LEFT in a very few .wks files (perhaps only one in a demo).
// So this ugly hack disables the error detection.

View File

@ -734,7 +734,7 @@ bool PGM_BASE::SetLanguage( bool first_time )
if( !first_time )
{
// If we are here, the user has selected an other language.
// If we are here, the user has selected another language.
// Therefore the new prefered language name is stored in common config.
// Do NOT store the wxWidgets language Id, it can change between wxWidgets
// versions, for a given language

View File

@ -318,7 +318,7 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
int type = aEvent.GetEventType();
// Sometimes there is no window that has the focus (it happens when an other PCB_BASE_FRAME
// Sometimes there is no window that has the focus (it happens when another PCB_BASE_FRAME
// is opened and is iconized on Windows).
// In this case, gives the focus to the parent PCB_BASE_FRAME (for an obscure reason,
// when happens, the GAL canvas itself does not accept the focus)

View File

@ -24,7 +24,7 @@
/**
* @file eeschema/dialogs/dialog_edit_components_libid.cpp
* @brief Dialog to remap library id of components to an other library id
* @brief Dialog to remap library id of components to another library id
*/
@ -81,9 +81,9 @@ public:
* DIALOG_EDIT_COMPONENTS_LIBID is a dialog to globally edit the LIB_ID of groups if components
* having the same initial LIB_ID.
* this is useful when you want:
* to move a symbol from a symbol library to an other symbol library
* to move a symbol from a symbol library to another symbol library
* to change the nickname of a library
* globally replace the symbol used by a group of components by an other symbol.
* globally replace the symbol used by a group of components by another symbol.
*/
class DIALOG_EDIT_COMPONENTS_LIBID : public DIALOG_EDIT_COMPONENTS_LIBID_BASE
{

View File

@ -274,7 +274,7 @@ void DIALOG_PRINT_USING_PRINTER::OnPrintPreview( wxCommandEvent& event )
// We use here wxPreviewFrame_WindowModal option to make the wxPrintPreview frame
// modal for its caller only.
// An other reason is the fact when closing the frame without this option,
// another reason is the fact when closing the frame without this option,
// all top level frames are reenabled.
// With this option, only the parent is reenabled.
// Reenabling all top level frames should be made by the parent dialog.
@ -435,7 +435,7 @@ void SCH_PRINTOUT::DrawPage( SCH_SCREEN* aScreen )
// For an obscure reason, OffsetLogicalOrigin creates issues,
// under some circumstances, when yoffset is not always null
// and changes from a page to an other page
// and changes from a page to another page
// This is only a workaround, not a fix
// see https://bugs.launchpad.net/kicad/+bug/1464773
// xoffset does not create issues.

View File

@ -127,7 +127,7 @@ SCH_TEXT* SCH_EDIT_FRAME::CreateNewText( wxDC* aDC, int aType )
/*
* OnConvertTextType is a command event handler to change a text type to an other one.
* OnConvertTextType is a command event handler to change a text type to another one.
* The new text, label, hierarchical label, or global label is created from the old text
* The old text is deleted.
* A tricky case is when the 'old" text is being edited (i.e. moving)

View File

@ -464,7 +464,7 @@ void TestOthersItems( NETLIST_OBJECT_LIST* aList,
{
/* This pin is not connected: for multiple part per
* package, and duplicated pin,
* search for an other instance of this pin
* search for another instance of this pin
* this will be flagged only if all instances of this pin
* are not connected
* TODO test also if instances connected are connected to
@ -489,7 +489,7 @@ void TestOthersItems( NETLIST_OBJECT_LIST* aList,
continue;
// Same component and same pin. Do dot create error for this pin
// if the other pin is connected (i.e. if duplicate net has an other
// if the other pin is connected (i.e. if duplicate net has another
// item)
if( (duplicate > 0)
&& ( aList->GetItemNet( duplicate ) ==

View File

@ -53,8 +53,8 @@ extern const wxString CommentERC_V[];
#define ERCE_DUPLICATE_SHEET_NAME 1 // duplicate sheet names within a given sheet
#define ERCE_PIN_NOT_CONNECTED 2 // pin not connected and not no connect symbol
#define ERCE_PIN_NOT_DRIVEN 3 // pin connected to some others pins but no pin to drive it
#define ERCE_PIN_TO_PIN_WARNING 4 // pin connected to an other pin: warning level
#define ERCE_PIN_TO_PIN_ERROR 5 // pin connected to an other pin: error level
#define ERCE_PIN_TO_PIN_WARNING 4 // pin connected to another pin: warning level
#define ERCE_PIN_TO_PIN_ERROR 5 // pin connected to another pin: error level
#define ERCE_HIERACHICAL_LABEL 6 // mismatch between hierarchical labels and pins sheets
#define ERCE_NOCONNECT_CONNECTED 7 // a no connect symbol is connected to more than 1 pin
#define ERCE_GLOBLABEL 8 // global label not connected to any other global label

View File

@ -96,7 +96,7 @@ int InvokeDialogNetList( SCH_EDIT_FRAME* aCaller );
/**
* Run a dialog to modify the LIB_ID of components for instance when a symbol has
* moved from a symbol library to an other symbol library
* moved from a symbol library to another symbol library
* @return true if changes are made, false if no change
*/
bool InvokeDialogEditComponentsLibId( SCH_EDIT_FRAME* aCaller );

View File

@ -389,8 +389,9 @@ public:
* Function TestforNonOrphanLabel
* Sheet labels are expected to be connected to a hierarchical label.
* Hierarchical labels are expected to be connected to a sheet label.
* Global labels are expected to be not orphan (connected to at least one other global label.
* this function tests the connection to an other suitable label
* Global labels are expected to be not orphan (connected to at least one
* other global label.
* This function tests the connection to another suitable label.
*/
void TestforNonOrphanLabel( unsigned aNetItemRef, unsigned aStartNet );

View File

@ -253,7 +253,7 @@ void LIB_EDIT_FRAME::PlacePin()
LIB_PART* part = GetCurPart();
// Test for an other pin in same new position in other units:
// Test for another pin in same new position in other units:
bool ask_for_pin = true;
for( LIB_PIN* pin = part->GetNextPin(); pin; pin = part->GetNextPin( pin ) )

View File

@ -245,7 +245,7 @@ protected:
/**
* Open the library viewer only to browse library contents.
* If the viewed is already opened from this, raise the viewer
* If the viewed is already opened from an other window, close it and reopen
* If the viewed is already opened from another window, close it and reopen
*/
void OnOpenLibraryViewer( wxCommandEvent& event );

View File

@ -1286,7 +1286,7 @@ void SCH_EDIT_FRAME::OnRemapSymbols( wxCommandEvent& event )
// This method is not the same as OnRemapSymbols.
// It allows renaming the lib id of groups of components when a symbol
// has moved from a library to an other library.
// has moved from a library to another library.
// For instance to rename libname1::mysymbol to libname2::mysymbol
// or any other lib id name
void SCH_EDIT_FRAME::OnEditComponentSymbolsId( wxCommandEvent& event )

View File

@ -900,7 +900,7 @@ private:
// a helper function to run the dialog that allows to rename the symbol library Id of
// groups of components, for instance after a symbol has moved from a library to
// an other library
// another library
void OnEditComponentSymbolsId( wxCommandEvent& aEvent );
void OnPreferencesOptions( wxCommandEvent& event );
void OnConfigurePaths( wxCommandEvent& aEvent );
@ -998,7 +998,7 @@ private:
void ChangeTextOrient( SCH_TEXT* aTextItem );
/**
* Command event handler to change a text type to an other one.
* Command event handler to change a text type to another one.
*
* The new text, label, hierarchical label, or global label is created from the old text
* and the old text object is deleted.
@ -1008,7 +1008,7 @@ private:
/**
* Creates a new segment ( WIRE, BUS ) or terminates the current segment in progress.
*
* If the end of the current segment is on an other segment, place a junction if needed
* If the end of the current segment is on a different segment, place a junction if needed
* and terminates the command. If the end of the current segment is on a pin, terminate
* the command. In all other cases starts a new segment.
*/

View File

@ -3754,7 +3754,7 @@ void SCH_LEGACY_PLUGIN_CACHE::saveField( LIB_FIELD* aField,
/* Save field name, if necessary
* Field name is saved only if it is not the default name.
* Just because default name depends on the language and can change from
* a country to an other
* a country to another
*/
wxString defName = TEMPLATE_FIELDNAME::GetDefaultFieldName( id );

View File

@ -775,7 +775,7 @@ void SCH_SCREEN::SelectBlockItems()
// this selected wire has no ends in block.
// But it was selected (because it intersects the selecting area),
// so we must keep it selected and select items connected to it
// Note: an other option could be: remove it from drag list
// Note: another option could be: remove it from drag list
item->SetFlags( SELECTED | SKIP_STRUCT );
addConnections( item );
}
@ -1143,7 +1143,7 @@ int SCH_SCREEN::GetConnection( const wxPoint& aPosition, PICKED_ITEMS_LIST& aLis
// when tmp != NULL, segment is a new candidate:
// put it in deleted list if
// the start point is not connected to an other item (like pin)
// the start point is not connected to another item (like pin)
if( tmp && !CountConnectedItems( segment->GetStartPoint(), true ) )
noconnect = true;
@ -1167,7 +1167,7 @@ int SCH_SCREEN::GetConnection( const wxPoint& aPosition, PICKED_ITEMS_LIST& aLis
// when tmp != NULL, segment is a new candidate:
// put it in deleted list if
// the end point is not connected to an other item (like pin)
// the end point is not connected to another item (like pin)
if( tmp && !CountConnectedItems( segment->GetEndPoint(), true ) )
noconnect = true;

Some files were not shown because too many files have changed in this diff Show More