kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #04741
OK vs Ok? Inconsistency...
Hi,
I notice some inconsistencies in writing "Ok" in some sentences, dialog boxes
or comments.
There is no reason to capitalize the k letter in Ok and OK should be everytime
written as Ok.
Here is a patch fot the stable revision.
Regards
--
Les pages de manuel Linux en français
http://manpagesfr.free.fr
diff -ru kicad-stable-build/common/class_marker_base.cpp kicad-stable-OK/common/class_marker_base.cpp
--- kicad-stable-build/common/class_marker_base.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/common/class_marker_base.cpp 2010-05-08 23:02:35.000000000 +0200
@@ -128,7 +128,7 @@
* returns the orthogonal, bounding box of this object for display purposes.
* This box should be an enclosing perimeter for visible components of this
* object, and the units should be in the pcb or schematic coordinate system.
- * It is OK to overestimate the size by a few counts.
+ * It is Ok to overestimate the size by a few counts.
*/
EDA_Rect MARKER_BASE::GetBoundingBoxMarker()
{
diff -ru kicad-stable-build/common/confirm.cpp kicad-stable-OK/common/confirm.cpp
--- kicad-stable-build/common/confirm.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/common/confirm.cpp 2010-05-08 23:08:52.000000000 +0200
@@ -121,7 +121,7 @@
* Leading and trailing spaces are removed
* Buffer is the initial text displayed, anr the returned text
* Return:
- * 1 if OK
+ * 1 if Ok
* 0 if ESCAPE
*/
int Get_Message( const wxString& title, // The question
diff -ru kicad-stable-build/common/get_component_dialog.cpp kicad-stable-OK/common/get_component_dialog.cpp
--- kicad-stable-build/common/get_component_dialog.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/common/get_component_dialog.cpp 2010-05-08 23:53:00.000000000 +0200
@@ -77,7 +77,7 @@
wxGROW | wxLEFT | wxRIGHT | wxBOTTOM | wxADJUST_MINSIZE,
5 );
- Button = new wxButton( this, ID_ACCEPT_NAME, _( "OK" ) );
+ Button = new wxButton( this, ID_ACCEPT_NAME, _( "Ok" ) );
Button->SetDefault();
RightBoxSizer->Add( Button,
0,
diff -ru kicad-stable-build/cvpcb/dialog_display_options.cpp kicad-stable-OK/cvpcb/dialog_display_options.cpp
--- kicad-stable-build/cvpcb/dialog_display_options.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/cvpcb/dialog_display_options.cpp 2010-05-08 23:14:07.000000000 +0200
@@ -199,7 +199,7 @@
0,
wxALIGN_CENTER_HORIZONTAL | wxALL,
5 );
- wxButton* itemButton11 = new wxButton( itemDialog1, wxID_OK, _( "&OK" ),
+ wxButton* itemButton11 = new wxButton( itemDialog1, wxID_OK, _( "&Ok" ),
wxDefaultPosition,
wxDefaultSize, 0 );
itemStdDialogButtonSizer10->AddButton( itemButton11 );
diff -ru kicad-stable-build/cvpcb/savecmp.cpp kicad-stable-OK/cvpcb/savecmp.cpp
--- kicad-stable-build/cvpcb/savecmp.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/cvpcb/savecmp.cpp 2010-05-09 00:03:17.000000000 +0200
@@ -28,7 +28,7 @@
* Backup modules file.
*
* @param NetlistFullFileName - Name of net list file to save.
- * @returns - 1 if OK, 0 if error.
+ * @returns - 1 if Ok, 0 if error.
*/
int WinEDA_CvpcbFrame::SaveComponentList( const wxString& NetlistFullFileName )
{
diff -ru kicad-stable-build/eeschema/backanno.cpp kicad-stable-OK/eeschema/backanno.cpp
--- kicad-stable-build/eeschema/backanno.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/eeschema/backanno.cpp 2010-05-08 22:58:44.000000000 +0200
@@ -96,7 +96,7 @@
* @param aStuffFile = file (*.stf) to Read.
* @param aSetFielsAttributeToVisible = true to set the footprint field flag to
* visible
- * @return true if OK.
+ * @return true if Ok.
*/
bool WinEDA_SchematicFrame::ProcessStuffFile( FILE* aStuffFile, bool
aSetFielsAttributeToVisible )
diff -ru kicad-stable-build/eeschema/class_drawsheet.cpp kicad-stable-OK/eeschema/class_drawsheet.cpp
--- kicad-stable-build/eeschema/class_drawsheet.cpp 2010-05-08 19:45:38.000000000 +0200
+++ kicad-stable-OK/eeschema/class_drawsheet.cpp 2010-05-08 23:01:21.000000000 +0200
@@ -501,7 +501,7 @@
* m_AssociatedScreen point on the screen, and its m_RefCount is incremented
* else creates a new associated screen and load the data file.
* @param aFrame = a WinEDA_SchematicFrame pointer to the maim schematic frame
- * @return true if OK
+ * @return true if Ok
*/
bool SCH_SHEET::Load( WinEDA_SchematicFrame* aFrame )
{
diff -ru kicad-stable-build/eeschema/class_drawsheet.h kicad-stable-OK/eeschema/class_drawsheet.h
--- kicad-stable-build/eeschema/class_drawsheet.h 2010-05-08 19:45:38.000000000 +0200
+++ kicad-stable-OK/eeschema/class_drawsheet.h 2010-05-09 00:18:30.000000000 +0200
@@ -232,7 +232,7 @@
* else creates a new associated screen and load the data file.
* @param aFrame = a WinEDA_SchematicFrame pointer to the maim schematic
* frame
- * @return true if OK
+ * @return true if Ok
*/
bool Load( WinEDA_SchematicFrame* aFrame );
diff -ru kicad-stable-build/eeschema/class_marker_sch.cpp kicad-stable-OK/eeschema/class_marker_sch.cpp
--- kicad-stable-build/eeschema/class_marker_sch.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/eeschema/class_marker_sch.cpp 2010-05-08 23:03:08.000000000 +0200
@@ -128,7 +128,7 @@
* returns the orthogonal, bounding box of this object for display purposes.
* This box should be an enclosing perimeter for visible components of this
* object, and the units should be in the pcb or schematic coordinate system.
- * It is OK to overestimate the size by a few counts.
+ * It is Ok to overestimate the size by a few counts.
*/
EDA_Rect SCH_MARKER::GetBoundingBox()
{
diff -ru kicad-stable-build/eeschema/class_marker_sch.h kicad-stable-OK/eeschema/class_marker_sch.h
--- kicad-stable-build/eeschema/class_marker_sch.h 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/eeschema/class_marker_sch.h 2010-05-08 23:03:28.000000000 +0200
@@ -73,7 +73,7 @@
* returns the orthogonal, bounding box of this object for display purposes.
* This box should be an enclosing perimeter for visible components of this
* object, and the units should be in the pcb or schematic coordinate system.
- * It is OK to overestimate the size by a few counts.
+ * It is Ok to overestimate the size by a few counts.
*/
virtual EDA_Rect GetBoundingBox();
diff -ru kicad-stable-build/eeschema/class_sch_component.cpp kicad-stable-OK/eeschema/class_sch_component.cpp
--- kicad-stable-build/eeschema/class_sch_component.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/eeschema/class_sch_component.cpp 2010-05-08 23:05:32.000000000 +0200
@@ -1072,7 +1072,7 @@
* returns the orthogonal, bounding box of this object for display purposes.
* This box should be an enclosing perimeter for visible components of this
* object, and the units should be in the pcb or schematic coordinate system.
- * It is OK to overestimate the size by a few counts.
+ * It is Ok to overestimate the size by a few counts.
*/
EDA_Rect SCH_COMPONENT::GetBoundingBox()
{
diff -ru kicad-stable-build/eeschema/class_sch_component.h kicad-stable-OK/eeschema/class_sch_component.h
--- kicad-stable-build/eeschema/class_sch_component.h 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/eeschema/class_sch_component.h 2010-05-08 23:06:08.000000000 +0200
@@ -226,7 +226,7 @@
* returns the orthogonal, bounding box of this object for display purposes.
* This box should be an enclosing perimeter for visible components of this
* object, and the units should be in the pcb or schematic coordinate system.
- * It is OK to overestimate the size by a few counts.
+ * It is Ok to overestimate the size by a few counts.
*/
EDA_Rect GetBoundingBox();
diff -ru kicad-stable-build/eeschema/class_schematic_items.h kicad-stable-OK/eeschema/class_schematic_items.h
--- kicad-stable-build/eeschema/class_schematic_items.h 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/eeschema/class_schematic_items.h 2010-05-08 23:06:51.000000000 +0200
@@ -52,7 +52,7 @@
* returns the orthogonal, bounding box of this object for display purposes.
* This box should be an enclosing perimeter for visible components of this
* object, and the units should be in the pcb or schematic coordinate system.
- * It is OK to overestimate the size by a few counts.
+ * It is Ok to overestimate the size by a few counts.
*/
EDA_Rect GetBoundingBox();
@@ -152,7 +152,7 @@
* returns the orthogonal, bounding box of this object for display
* purposes. This box should be an enclosing perimeter for visible
* components of this object, and the units should be in the pcb or
- * schematic coordinate system. It is OK to overestimate the size
+ * schematic coordinate system. It is Ok to overestimate the size
* by a few counts.
*/
EDA_Rect GetBoundingBox();
@@ -222,7 +222,7 @@
* returns the orthogonal, bounding box of this object for display
* purposes. This box should be an enclosing perimeter for visible
* components of this object, and the units should be in the pcb or
- * schematic coordinate system. It is OK to overestimate the size
+ * schematic coordinate system. It is Ok to overestimate the size
* by a few counts.
*/
EDA_Rect GetBoundingBox();
@@ -357,7 +357,7 @@
* returns the orthogonal, bounding box of this object for display
* purposes. This box should be an enclosing perimeter for visible
* components of this object, and the units should be in the pcb or
- * schematic coordinate system. It is OK to overestimate the size
+ * schematic coordinate system. It is Ok to overestimate the size
* by a few counts.
*/
EDA_Rect GetBoundingBox();
diff -ru kicad-stable-build/eeschema/class_text-label.h kicad-stable-OK/eeschema/class_text-label.h
--- kicad-stable-build/eeschema/class_text-label.h 2010-05-08 19:45:38.000000000 +0200
+++ kicad-stable-OK/eeschema/class_text-label.h 2010-05-08 23:07:26.000000000 +0200
@@ -109,7 +109,7 @@
* returns the orthogonal, bounding box of this object for display purposes.
* This box should be an enclosing perimeter for visible components of this
* object, and the units should be in the pcb or schematic coordinate system.
- * It is OK to overestimate the size by a few counts.
+ * It is Ok to overestimate the size by a few counts.
*/
EDA_Rect GetBoundingBox();
@@ -207,7 +207,7 @@
* returns the orthogonal, bounding box of this object for display purposes.
* This box should be an enclosing perimeter for visible components of this
* object, and the units should be in the pcb or schematic coordinate system.
- * It is OK to overestimate the size by a few counts.
+ * It is Ok to overestimate the size by a few counts.
*/
EDA_Rect GetBoundingBox();
@@ -283,7 +283,7 @@
* returns the orthogonal, bounding box of this object for display purposes.
* This box should be an enclosing perimeter for visible components of this
* object, and the units should be in the pcb or schematic coordinate system.
- * It is OK to overestimate the size by a few counts.
+ * It is Ok to overestimate the size by a few counts.
*/
EDA_Rect GetBoundingBox();
@@ -372,7 +372,7 @@
* returns the orthogonal, bounding box of this object for display purposes.
* This box should be an enclosing perimeter for visible components of this
* object, and the units should be in the pcb or schematic coordinate system.
- * It is OK to overestimate the size by a few counts.
+ * It is Ok to overestimate the size by a few counts.
*/
EDA_Rect GetBoundingBox();
diff -ru kicad-stable-build/eeschema/dialog_bodygraphictext_properties_base.cpp kicad-stable-OK/eeschema/dialog_bodygraphictext_properties_base.cpp
--- kicad-stable-build/eeschema/dialog_bodygraphictext_properties_base.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/eeschema/dialog_bodygraphictext_properties_base.cpp 2010-05-08 23:11:25.000000000 +0200
@@ -103,7 +103,7 @@
wxBoxSizer* bButtonsBoxSizer;
bButtonsBoxSizer = new wxBoxSizer( wxVERTICAL );
- m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_buttonOK = new wxButton( this, wxID_OK, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
bButtonsBoxSizer->Add( m_buttonOK, 0, wxALL, 5 );
m_buttonCANCEL = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
diff -ru kicad-stable-build/eeschema/dialog_create_component.cpp kicad-stable-OK/eeschema/dialog_create_component.cpp
--- kicad-stable-build/eeschema/dialog_create_component.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/eeschema/dialog_create_component.cpp 2010-05-08 23:13:01.000000000 +0200
@@ -184,7 +184,7 @@
wxBoxSizer* itemBoxSizer15 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer3->Add(itemBoxSizer15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
- wxButton* itemButton16 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton* itemButton16 = new wxButton( itemDialog1, wxID_OK, _("&Ok"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton16->SetDefault();
itemBoxSizer15->Add(itemButton16, 0, wxGROW|wxALL, 5);
diff -ru kicad-stable-build/eeschema/dialog_edit_libentry_fields_in_lib.cpp kicad-stable-OK/eeschema/dialog_edit_libentry_fields_in_lib.cpp
--- kicad-stable-build/eeschema/dialog_edit_libentry_fields_in_lib.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/eeschema/dialog_edit_libentry_fields_in_lib.cpp 2010-05-08 23:22:06.000000000 +0200
@@ -75,7 +75,7 @@
/**
* Function copyPanelToSelectedField
* copies the values displayed on the panel fields to the currently selected field
- * @return bool - true if all fields are OK, else false if the user has put
+ * @return bool - true if all fields are Ok, else false if the user has put
* bad data into a field, and this value can be used to deny a row change.
*/
bool copyPanelToSelectedField();
diff -ru kicad-stable-build/eeschema/eelayer.cpp kicad-stable-OK/eeschema/eelayer.cpp
--- kicad-stable-build/eeschema/eelayer.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/eeschema/eelayer.cpp 2010-05-08 23:49:15.000000000 +0200
@@ -249,20 +249,20 @@
5 );
// Provide a line to separate all of the controls added so far from the
- // "OK", "Cancel", and "Apply" buttons (which will be added after that
+ // "Ok", "Cancel", and "Apply" buttons (which will be added after that
// line).
Line = new wxStaticLine( this, -1, wxDefaultPosition, wxDefaultSize,
wxLI_HORIZONTAL );
OuterBoxSizer->Add( Line, 0, wxGROW | wxALL, 5 );
- // Provide a StdDialogButtonSizer to accommodate the OK, Cancel, and Apply
+ // Provide a StdDialogButtonSizer to accommodate the Ok, Cancel, and Apply
// buttons; using that type of sizer results in those buttons being
// automatically located in positions appropriate for each (OS) version of
// KiCad.
StdDialogButtonSizer = new wxStdDialogButtonSizer;
OuterBoxSizer->Add( StdDialogButtonSizer, 0, wxGROW | wxALL, 10 );
- Button = new wxButton( this, wxID_OK, _( "OK" ), wxDefaultPosition,
+ Button = new wxButton( this, wxID_OK, _( "Ok" ), wxDefaultPosition,
wxDefaultSize, 0 );
StdDialogButtonSizer->AddButton( Button );
@@ -337,7 +337,7 @@
}
// Update whether grid is actually displayed or otherwise
- // The previous command compiles OK, but to prevent a warning
+ // The previous command compiles Ok, but to prevent a warning
// from being generated when the Linux version is being compiled,
// the next two commands are provided instead.
m_Parent->SetGridVisibility( m_ShowGrid->GetValue() );
diff -ru kicad-stable-build/eeschema/files-io.cpp kicad-stable-OK/eeschema/files-io.cpp
--- kicad-stable-build/eeschema/files-io.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/eeschema/files-io.cpp 2010-05-08 23:50:38.000000000 +0200
@@ -182,7 +182,7 @@
if( LibCache )
{
LibCache->SetCache();
- msg += wxT( " OK" );
+ msg += wxT( " Ok" );
if ( use_oldcachename ) // set the new name
{
fn.SetName(cachename);
diff -ru kicad-stable-build/eeschema/libedit.cpp kicad-stable-OK/eeschema/libedit.cpp
--- kicad-stable-build/eeschema/libedit.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/eeschema/libedit.cpp 2010-05-08 23:56:22.000000000 +0200
@@ -121,7 +121,7 @@
/*
* Routine to load into memory a copy of 1 library part.
* Returns
- * 0 if OK
+ * 0 if Ok
* 1 if error
* m_component advanced copy and created
*/
diff -ru kicad-stable-build/eeschema/lib_export.cpp kicad-stable-OK/eeschema/lib_export.cpp
--- kicad-stable-build/eeschema/lib_export.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/eeschema/lib_export.cpp 2010-05-08 23:55:37.000000000 +0200
@@ -136,13 +136,13 @@
{
if( createLib )
{
- msg = fn.GetFullPath() + _( " - OK" );
+ msg = fn.GetFullPath() + _( " - Ok" );
DisplayInfoMessage( this, _( "This library will not be available \
until it is loaded by EESchema.\n\nModify the EESchema library configuration \
if you want to include it as part of this project." ) );
}
else
- msg = fn.GetFullPath() + _( " - Export OK" );
+ msg = fn.GetFullPath() + _( " - Export Ok" );
} // Error
else
msg = _( "Error creating " ) + fn.GetFullName();
diff -ru kicad-stable-build/eeschema/sheetlab.cpp kicad-stable-OK/eeschema/sheetlab.cpp
--- kicad-stable-build/eeschema/sheetlab.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/eeschema/sheetlab.cpp 2010-05-09 00:05:44.000000000 +0200
@@ -79,7 +79,7 @@
m_CurrentPinSheet = curr_pinsheet;
/* Create buttons: */
- Button = new wxButton( this, wxID_OK, _( "OK" ) );
+ Button = new wxButton( this, wxID_OK, _( "Ok" ) );
RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
diff -ru kicad-stable-build/gerbview/files.cpp kicad-stable-OK/gerbview/files.cpp
--- kicad-stable-build/gerbview/files.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/gerbview/files.cpp 2010-05-08 23:51:54.000000000 +0200
@@ -99,7 +99,7 @@
*
* Returns:
* 0 if file not read (cancellation of order ...)
- * 1 if OK
+ * 1 if Ok
*/
bool WinEDA_GerberFrame::LoadOneGerberFile( const wxString& FullFileName,
int mode )
@@ -177,7 +177,7 @@
* Just read a file format created by early versions of Pcbnew.
* Returns:
* 0 if file not read (cancellation of order ...)
- * 1 if OK
+ * 1 if Ok
*/
static void LoadDCodeFile( WinEDA_GerberFrame* frame,
const wxString& FullFileName )
diff -ru kicad-stable-build/gerbview/options.cpp kicad-stable-OK/gerbview/options.cpp
--- kicad-stable-build/gerbview/options.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/gerbview/options.cpp 2010-05-09 00:01:00.000000000 +0200
@@ -179,7 +179,7 @@
MainBoxSizer->Add( MiddleBoxSizer, 0, wxGROW | wxALL, 5 );
MainBoxSizer->Add( RightBoxSizer, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
- wxButton* Button = new wxButton( this, wxID_OK, _( "OK" ) );
+ wxButton* Button = new wxButton( this, wxID_OK, _( "Ok" ) );
RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
diff -ru kicad-stable-build/gerbview/reglage.cpp kicad-stable-OK/gerbview/reglage.cpp
--- kicad-stable-build/gerbview/reglage.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/gerbview/reglage.cpp 2010-05-09 00:02:53.000000000 +0200
@@ -95,7 +95,7 @@
// Provide a spacer to improve appearance of dialog box
RightBoxSizer->AddSpacer( 20 );
- Button = new wxButton( this, wxID_OK, _( "OK" ) );
+ Button = new wxButton( this, wxID_OK, _( "Ok" ) );
RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
diff -ru kicad-stable-build/gerbview/select_layers_to_pcb.cpp kicad-stable-OK/gerbview/select_layers_to_pcb.cpp
--- kicad-stable-build/gerbview/select_layers_to_pcb.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/gerbview/select_layers_to_pcb.cpp 2010-05-09 00:04:26.000000000 +0200
@@ -307,7 +307,7 @@
StdDialogButtonSizer = new wxStdDialogButtonSizer;
OuterBoxSizer->Add( StdDialogButtonSizer, 0, wxGROW | wxALL, 10 );
- Button = new wxButton( this, wxID_OK, _( "&OK" ), wxDefaultPosition,
+ Button = new wxButton( this, wxID_OK, _( "&Ok" ), wxDefaultPosition,
wxDefaultSize, 0 );
StdDialogButtonSizer->AddButton( Button );
diff -ru kicad-stable-build/include/base_struct.h kicad-stable-OK/include/base_struct.h
--- kicad-stable-build/include/base_struct.h 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/include/base_struct.h 2010-05-08 22:59:16.000000000 +0200
@@ -416,7 +416,7 @@
* This box should be an enclosing perimeter for visible components of this
* object, and the units should be in the pcb or schematic coordinate
* system.
- * It is OK to overestimate the size by a few counts.
+ * It is Ok to overestimate the size by a few counts.
*/
virtual EDA_Rect GetBoundingBox()
{
diff -ru kicad-stable-build/include/class_marker_base.h kicad-stable-OK/include/class_marker_base.h
--- kicad-stable-build/include/class_marker_base.h 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/include/class_marker_base.h 2010-05-08 23:02:51.000000000 +0200
@@ -181,7 +181,7 @@
* returns the orthogonal, bounding box of this object for display purposes.
* This box should be an enclosing perimeter for visible components of this
* object, and the units should be in the pcb or schematic coordinate system.
- * It is OK to overestimate the size by a few counts.
+ * It is Ok to overestimate the size by a few counts.
*/
EDA_Rect GetBoundingBoxMarker();
};
diff -ru kicad-stable-build/kicad/files-io.cpp kicad-stable-OK/kicad/files-io.cpp
--- kicad-stable-build/kicad/files-io.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/kicad/files-io.cpp 2010-05-08 23:50:57.000000000 +0200
@@ -92,7 +92,7 @@
if( ofile->Ok() )
{
ofile->Write( *stream );
- PrintMsg( _( " OK\n" ) );
+ PrintMsg( _( " Ok\n" ) );
}
else
PrintMsg( _( " *ERROR*\n" ) );
diff -ru kicad-stable-build/pcbnew/autoplac.cpp kicad-stable-OK/pcbnew/autoplac.cpp
--- kicad-stable-build/pcbnew/autoplac.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/autoplac.cpp 2010-05-08 22:57:38.000000000 +0200
@@ -559,7 +559,7 @@
* Entree:
* Module tip MODULE struct module's place.
* Returns:
- * 1 if placement impossible, 0 if OK
+ * 1 if placement impossible, 0 if Ok
* = MinCout and external variable = cost of best placement
*/
int WinEDA_PcbFrame::RecherchePlacementModule( MODULE* Module, wxDC* DC )
@@ -707,7 +707,7 @@
* - is a free zone (except OCCUPED_By_MODULE returns)
* - is on the working surface of the board (otherwise returns OUT_OF_BOARD)
*
- * Returns 0 if OK
+ * Returns 0 if Ok
*/
int TstRectangle( BOARD* Pcb, int ux0, int uy0, int ux1, int uy1, int side )
{
diff -ru kicad-stable-build/pcbnew/block.cpp kicad-stable-OK/pcbnew/block.cpp
--- kicad-stable-build/pcbnew/block.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/block.cpp 2010-05-08 22:50:51.000000000 +0200
@@ -164,7 +164,7 @@
m_button2 = new wxButton( this, wxID_CANCEL, _( "Cancel" ),
wxDefaultPosition, wxDefaultSize, 0 );
fgSizer2->Add( m_button2, 0, wxALL, 5 );
- m_button1 = new wxButton( this, wxID_OK, _( "OK" ), wxDefaultPosition,
+ m_button1 = new wxButton( this, wxID_OK, _( "Ok" ), wxDefaultPosition,
wxDefaultSize, 0 );
m_button1->SetDefault();
fgSizer2->Add( m_button1, 0, wxALL, 5 );
diff -ru kicad-stable-build/pcbnew/class_board.cpp kicad-stable-OK/pcbnew/class_board.cpp
--- kicad-stable-build/pcbnew/class_board.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/class_board.cpp 2010-05-08 23:00:45.000000000 +0200
@@ -1414,7 +1414,7 @@
if( fprintf( aFile, "$EndBOARD\n" ) != sizeof("$EndBOARD\n") - 1 )
goto out;
- rc = true; // wrote all OK
+ rc = true; // wrote all Ok
out:
return rc;
diff -ru kicad-stable-build/pcbnew/class_edge_mod.cpp kicad-stable-OK/pcbnew/class_edge_mod.cpp
--- kicad-stable-build/pcbnew/class_edge_mod.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/class_edge_mod.cpp 2010-05-08 23:02:01.000000000 +0200
@@ -60,7 +60,7 @@
* returns the orthogonal, bounding box of this object for display purposes.
* This box should be an enclosing perimeter for visible components of this
* object, and the units should be in the pcb or schematic coordinate system.
- * It is OK to overestimate the size by a few counts.
+ * It is Ok to overestimate the size by a few counts.
*/
EDA_Rect EDGE_MODULE::GetBoundingBox()
{
diff -ru kicad-stable-build/pcbnew/class_edge_mod.h kicad-stable-OK/pcbnew/class_edge_mod.h
--- kicad-stable-build/pcbnew/class_edge_mod.h 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/class_edge_mod.h 2010-05-08 23:02:18.000000000 +0200
@@ -75,7 +75,7 @@
* returns the orthogonal, bounding box of this object for display purposes.
* This box should be an enclosing perimeter for visible components of this
* object, and the units should be in the pcb or schematic coordinate system.
- * It is OK to overestimate the size by a few counts.
+ * It is Ok to overestimate the size by a few counts.
*/
virtual EDA_Rect GetBoundingBox();
diff -ru kicad-stable-build/pcbnew/class_module.cpp kicad-stable-OK/pcbnew/class_module.cpp
--- kicad-stable-build/pcbnew/class_module.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/class_module.cpp 2010-05-08 23:03:48.000000000 +0200
@@ -404,7 +404,7 @@
/* Read 3D module from file. (Ascii)
* The 1st line of descr ($MODULE) is assumed to be already read
- * Returns 0 if OK
+ * Returns 0 if Ok
*/
int MODULE::Read_3D_Descr( FILE* File, int* LineNum )
{
diff -ru kicad-stable-build/pcbnew/class_netclass.h kicad-stable-OK/pcbnew/class_netclass.h
--- kicad-stable-build/pcbnew/class_netclass.h 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/class_netclass.h 2010-05-08 23:04:07.000000000 +0200
@@ -280,7 +280,7 @@
* Function Add
* takes ownership of \a aNetclass and puts it into this NETCLASSES container.
* @param aNetclass is netclass to add
- * @return true if the name within aNetclass is unique and it could be inserted OK,
+ * @return true if the name within aNetclass is unique and it could be inserted Ok,
* else false because the name was not unique and caller still owns aNetclass.
*/
bool Add( NETCLASS* aNetclass );
diff -ru kicad-stable-build/pcbnew/class_netinfo.h kicad-stable-OK/pcbnew/class_netinfo.h
--- kicad-stable-build/pcbnew/class_netinfo.h 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/class_netinfo.h 2010-05-08 23:04:33.000000000 +0200
@@ -143,7 +143,7 @@
* Create the pad list
* initialise:
* m_Pads (list of pads)
- * set m_Status_Pcb = LISTE_PAD_OK;
+ * set m_Status_Pcb = LISTE_PAD_Ok;
* and clear for all pads in list the m_SubRatsnest member;
* clear m_Pcb->m_FullRatsnest
*/
@@ -384,7 +384,7 @@
LISTE_RATSNEST_ITEM_OK = 2, /* General Ratsnest is Ok */
RATSNEST_ITEM_LOCAL_OK = 4, /* current MODULE ratsnest is Ok */
CONNEXION_OK = 8, /* List of connections exists. */
- NET_CODES_OK = 0x10, /* Bit indicating that Netcode is OK,
+ NET_CODES_OK = 0x10, /* Bit indicating that Netcode is Ok,
* do not change net name. */
DO_NOT_SHOW_GENERAL_RASTNEST = 0x20 /* Do not display the general
* ratsnest (used in module moves) */
diff -ru kicad-stable-build/pcbnew/class_netinfo_item.cpp kicad-stable-OK/pcbnew/class_netinfo_item.cpp
--- kicad-stable-build/pcbnew/class_netinfo_item.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/class_netinfo_item.cpp 2010-05-08 23:04:51.000000000 +0200
@@ -39,7 +39,7 @@
/* Read NETINFO_ITEM from file.
- * Returns 0 if OK
+ * Returns 0 if Ok
* 1 if incomplete reading
*/
int NETINFO_ITEM::ReadDescr( FILE* File, int* LineNum )
diff -ru kicad-stable-build/pcbnew/clean.cpp kicad-stable-OK/pcbnew/clean.cpp
--- kicad-stable-build/pcbnew/clean.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/clean.cpp 2010-05-08 23:08:06.000000000 +0200
@@ -563,7 +563,7 @@
segStart->SetState( BUSY, OFF );
if( other == NULL )
- flag = 1; /* OK */
+ flag = 1; /* Ok */
break;
}
diff -ru kicad-stable-build/pcbnew/dialog_display_options_base.cpp kicad-stable-OK/pcbnew/dialog_display_options_base.cpp
--- kicad-stable-build/pcbnew/dialog_display_options_base.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_display_options_base.cpp 2010-05-08 23:15:29.000000000 +0200
@@ -134,7 +134,7 @@
bRightSizer->Add( 10, 10, 0, 0, 5 );
- m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_buttonOK = new wxButton( this, wxID_OK, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
bRightSizer->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
m_buttonCANCEL = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
diff -ru kicad-stable-build/pcbnew/dialog_display_options_base.fbp kicad-stable-OK/pcbnew/dialog_display_options_base.fbp
--- kicad-stable-build/pcbnew/dialog_display_options_base.fbp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_display_options_base.fbp 2010-05-08 23:17:00.000000000 +0200
@@ -884,7 +884,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_OK</property>
- <property name="label">OK</property>
+ <property name="label">Ok</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonOK</property>
diff -ru kicad-stable-build/pcbnew/dialog_drc.cpp kicad-stable-OK/pcbnew/dialog_drc.cpp
--- kicad-stable-build/pcbnew/dialog_drc.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_drc.cpp 2010-05-08 23:17:44.000000000 +0200
@@ -357,7 +357,7 @@
if( item )
{
/*
- * // after the goto, process a button OK command later.
+ * // after the goto, process a button Ok command later.
* wxCommandEvent cmd( wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK );
* ::wxPostEvent( GetEventHandler(), cmd );
*/
diff -ru kicad-stable-build/pcbnew/dialog_edit_module_text_base.cpp kicad-stable-OK/pcbnew/dialog_edit_module_text_base.cpp
--- kicad-stable-build/pcbnew/dialog_edit_module_text_base.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_edit_module_text_base.cpp 2010-05-08 23:25:21.000000000 +0200
@@ -102,7 +102,7 @@
bSizer5->Add( 10, 10, 0, 0, 5 );
- m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_buttonOK = new wxButton( this, wxID_OK, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonOK->SetDefault();
bSizer5->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
diff -ru kicad-stable-build/pcbnew/dialog_edit_module_text_base.fbp kicad-stable-OK/pcbnew/dialog_edit_module_text_base.fbp
--- kicad-stable-build/pcbnew/dialog_edit_module_text_base.fbp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_edit_module_text_base.fbp 2010-05-08 23:24:56.000000000 +0200
@@ -1036,7 +1036,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_OK</property>
- <property name="label">OK</property>
+ <property name="label">Ok</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonOK</property>
diff -ru kicad-stable-build/pcbnew/dialog_exchange_modules_base.cpp kicad-stable-OK/pcbnew/dialog_exchange_modules_base.cpp
--- kicad-stable-build/pcbnew/dialog_exchange_modules_base.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_exchange_modules_base.cpp 2010-05-08 23:29:05.000000000 +0200
@@ -59,7 +59,7 @@
wxBoxSizer* bRightSizer;
bRightSizer = new wxBoxSizer( wxVERTICAL );
- m_OKbutton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_OKbutton = new wxButton( this, wxID_OK, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
bRightSizer->Add( m_OKbutton, 0, wxALL, 5 );
m_Quitbutton = new wxButton( this, wxID_CANCEL, _("Quit"), wxDefaultPosition, wxDefaultSize, 0 );
diff -ru kicad-stable-build/pcbnew/dialog_exchange_modules_base.fbp kicad-stable-OK/pcbnew/dialog_exchange_modules_base.fbp
--- kicad-stable-build/pcbnew/dialog_exchange_modules_base.fbp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_exchange_modules_base.fbp 2010-05-08 23:29:32.000000000 +0200
@@ -500,7 +500,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_OK</property>
- <property name="label">OK</property>
+ <property name="label">Ok</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_OKbutton</property>
diff -ru kicad-stable-build/pcbnew/dialog_gendrill_base.cpp kicad-stable-OK/pcbnew/dialog_gendrill_base.cpp
--- kicad-stable-build/pcbnew/dialog_gendrill_base.cpp 2010-05-08 19:45:38.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_gendrill_base.cpp 2010-05-08 23:30:44.000000000 +0200
@@ -152,7 +152,7 @@
bRightBoxSizer->Add( 10, 10, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
- m_OkButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_OkButton = new wxButton( this, wxID_OK, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
m_OkButton->SetDefault();
bRightBoxSizer->Add( m_OkButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
diff -ru kicad-stable-build/pcbnew/dialog_gendrill_base.fbp kicad-stable-OK/pcbnew/dialog_gendrill_base.fbp
--- kicad-stable-build/pcbnew/dialog_gendrill_base.fbp 2010-05-08 19:45:38.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_gendrill_base.fbp 2010-05-08 23:31:07.000000000 +0200
@@ -1159,7 +1159,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_OK</property>
- <property name="label">OK</property>
+ <property name="label">Ok</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_OkButton</property>
diff -ru kicad-stable-build/pcbnew/dialog_general_options_BoardEditor_base.cpp kicad-stable-OK/pcbnew/dialog_general_options_BoardEditor_base.cpp
--- kicad-stable-build/pcbnew/dialog_general_options_BoardEditor_base.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_general_options_BoardEditor_base.cpp 2010-05-08 23:31:45.000000000 +0200
@@ -141,7 +141,7 @@
bRightSizer->Add( m_MagneticTrackOptCtrl, 0, wxALL|wxEXPAND, 5 );
- m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_buttonOK = new wxButton( this, wxID_OK, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonOK->SetDefault();
bRightSizer->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
diff -ru kicad-stable-build/pcbnew/dialog_general_options_BoardEditor_base.fbp kicad-stable-OK/pcbnew/dialog_general_options_BoardEditor_base.fbp
--- kicad-stable-build/pcbnew/dialog_general_options_BoardEditor_base.fbp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_general_options_BoardEditor_base.fbp 2010-05-08 23:32:07.000000000 +0200
@@ -1031,7 +1031,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_OK</property>
- <property name="label">OK</property>
+ <property name="label">Ok</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonOK</property>
diff -ru kicad-stable-build/pcbnew/dialog_graphic_item_properties_base.cpp kicad-stable-OK/pcbnew/dialog_graphic_item_properties_base.cpp
--- kicad-stable-build/pcbnew/dialog_graphic_item_properties_base.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_graphic_item_properties_base.cpp 2010-05-08 23:33:32.000000000 +0200
@@ -94,7 +94,7 @@
wxBoxSizer* bRightSizer;
bRightSizer = new wxBoxSizer( wxVERTICAL );
- m_buttonOK = new wxButton( this, wxID_OK, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_buttonOK = new wxButton( this, wxID_OK, wxT("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonOK->SetDefault();
bRightSizer->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
diff -ru kicad-stable-build/pcbnew/dialog_graphic_item_properties_base.fbp kicad-stable-OK/pcbnew/dialog_graphic_item_properties_base.fbp
--- kicad-stable-build/pcbnew/dialog_graphic_item_properties_base.fbp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_graphic_item_properties_base.fbp 2010-05-08 23:34:00.000000000 +0200
@@ -1012,7 +1012,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_OK</property>
- <property name="label">OK</property>
+ <property name="label">Ok</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonOK</property>
diff -ru kicad-stable-build/pcbnew/dialog_initpcb.cpp kicad-stable-OK/pcbnew/dialog_initpcb.cpp
--- kicad-stable-build/pcbnew/dialog_initpcb.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_initpcb.cpp 2010-05-08 23:35:20.000000000 +0200
@@ -156,7 +156,7 @@
wxBoxSizer* itemBoxSizer17 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer12->Add(itemBoxSizer17, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
- wxButton* itemButton18 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton* itemButton18 = new wxButton( itemDialog1, wxID_OK, _("&Ok"), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer17->Add(itemButton18, 0, wxGROW|wxALL, 5);
wxButton* itemButton19 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
diff -ru kicad-stable-build/pcbnew/dialog_initpcb.pjd kicad-stable-OK/pcbnew/dialog_initpcb.pjd
--- kicad-stable-build/pcbnew/dialog_initpcb.pjd 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_initpcb.pjd 2010-05-08 23:36:00.000000000 +0200
@@ -888,7 +888,7 @@
<long name="proxy-Id value">5100</long>
<string name="proxy-Class">"wxButton"</string>
<string name="proxy-Member variable name">""</string>
- <string name="proxy-Label">"&OK"</string>
+ <string name="proxy-Label">"&Ok"</string>
<bool name="proxy-Default">0</bool>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
diff -ru kicad-stable-build/pcbnew/dialog_non_copper_zones_properties_base.cpp kicad-stable-OK/pcbnew/dialog_non_copper_zones_properties_base.cpp
--- kicad-stable-build/pcbnew/dialog_non_copper_zones_properties_base.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_non_copper_zones_properties_base.cpp 2010-05-08 23:39:45.000000000 +0200
@@ -62,7 +62,7 @@
wxBoxSizer* m_ButtonsSizer;
m_ButtonsSizer = new wxBoxSizer( wxVERTICAL );
- m_buttonOk = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_buttonOk = new wxButton( this, wxID_OK, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonOk->SetDefault();
m_ButtonsSizer->Add( m_buttonOk, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
diff -ru kicad-stable-build/pcbnew/dialog_non_copper_zones_properties_base.fbp kicad-stable-OK/pcbnew/dialog_non_copper_zones_properties_base.fbp
--- kicad-stable-build/pcbnew/dialog_non_copper_zones_properties_base.fbp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_non_copper_zones_properties_base.fbp 2010-05-08 23:40:06.000000000 +0200
@@ -402,7 +402,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_OK</property>
- <property name="label">OK</property>
+ <property name="label">Ok4</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_buttonOk</property>
diff -ru kicad-stable-build/pcbnew/dialog_orient_footprints.cpp kicad-stable-OK/pcbnew/dialog_orient_footprints.cpp
--- kicad-stable-build/pcbnew/dialog_orient_footprints.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_orient_footprints.cpp 2010-05-08 23:40:36.000000000 +0200
@@ -162,7 +162,7 @@
wxBoxSizer* itemBoxSizer10 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer2->Add(itemBoxSizer10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
- wxButton* itemButton11 = new wxButton( itemDialog1, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxButton* itemButton11 = new wxButton( itemDialog1, wxID_OK, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer10->Add(itemButton11, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
m_CloseButton = new wxButton( itemDialog1, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
diff -ru kicad-stable-build/pcbnew/dialog_orient_footprints.pjd kicad-stable-OK/pcbnew/dialog_orient_footprints.pjd
--- kicad-stable-build/pcbnew/dialog_orient_footprints.pjd 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_orient_footprints.pjd 2010-05-08 23:41:03.000000000 +0200
@@ -757,7 +757,7 @@
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">""</string>
- <string name="proxy-Label">"OK"</string>
+ <string name="proxy-Label">"Ok"</string>
<bool name="proxy-Default">0</bool>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
diff -ru kicad-stable-build/pcbnew/dialog_pcb_text_properties.cpp kicad-stable-OK/pcbnew/dialog_pcb_text_properties.cpp
--- kicad-stable-build/pcbnew/dialog_pcb_text_properties.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/dialog_pcb_text_properties.cpp 2010-05-08 23:41:50.000000000 +0200
@@ -97,7 +97,7 @@
/* Creation des boutons de commande */
- Button = new wxButton( this, wxID_OK, _( "OK" ) );
+ Button = new wxButton( this, wxID_OK, _( "Ok" ) );
RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
Button->SetDefault();
diff -ru kicad-stable-build/pcbnew/dimension.cpp kicad-stable-OK/pcbnew/dimension.cpp
--- kicad-stable-build/pcbnew/dimension.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/dimension.cpp 2010-05-08 23:43:13.000000000 +0200
@@ -94,7 +94,7 @@
MainBoxSizer->Add( RightBoxSizer, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
/* Creation des boutons de commande */
- Button = new wxButton( this, wxID_OK, _( "OK" ) );
+ Button = new wxButton( this, wxID_OK, _( "Ok" ) );
RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
diff -ru kicad-stable-build/pcbnew/drc.cpp kicad-stable-OK/pcbnew/drc.cpp
--- kicad-stable-build/pcbnew/drc.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/drc.cpp 2010-05-08 23:44:50.000000000 +0200
@@ -86,7 +86,7 @@
{
if( aReason == wxID_OK )
{
- // if user clicked OK, save his choices in this DRC object.
+ // if user clicked Ok, save his choices in this DRC object.
m_doCreateRptFile = m_ui->m_CreateRptCtrl->GetValue();
m_rptFilename = m_ui->m_RptFilenameCtrl->GetValue();
}
@@ -170,7 +170,7 @@
* Test Edge too close other areas
* @param aEdge The areaparent which contains the corner.
* @param CornerIndex The starting point of the segment to test.
- * @return int - BAD_DRC (1) if DRC error or OK_DRC (0) if OK
+ * @return int - BAD_DRC (1) if DRC error or OK_DRC (0) if Ok
*/
{
updatePointers();
@@ -1260,7 +1260,7 @@
bool diag = true;
- // Quick test: Clearance is OK if the bounding circles are further away than "dist_min"
+ // Quick test: Clearance is Ok if the bounding circles are further away than "dist_min"
if( (dist - aRefPad->m_Rayon - aPad->m_Rayon) >= dist_min )
goto exit;
diff -ru kicad-stable-build/pcbnew/drc_stuff.h kicad-stable-OK/pcbnew/drc_stuff.h
--- kicad-stable-build/pcbnew/drc_stuff.h 2010-05-08 19:45:38.000000000 +0200
+++ kicad-stable-OK/pcbnew/drc_stuff.h 2010-05-08 23:45:35.000000000 +0200
@@ -282,7 +282,7 @@
* Test Edge too close other areas
* @param aArea The current area.
* @param aCornerIndex The first corner of the segment to test.
- * @return bool - false if DRC error or true if OK
+ * @return bool - false if DRC error or true if Ok
*/
bool doEdgeZoneDrc( ZONE_CONTAINER * aArea, int aCornerIndex );
@@ -354,7 +354,7 @@
* in the status panel only if one exists.
* @param aRefSeg The current segment to test.
* @param aList The track list to test (usually m_Pcb->m_Track)
- * @return int - BAD_DRC (1) if DRC error or OK_DRC (0) if OK
+ * @return int - BAD_DRC (1) if DRC error or OK_DRC (0) if Ok
*/
int Drc( TRACK* aRefSeg, TRACK* aList );
@@ -366,7 +366,7 @@
* Test Edge too close other areas
* @param aEdge The areaparent which contains the corner.
* @param CornerIndex The starting point of the segment to test.
- * @return int - BAD_DRC (1) if DRC error or OK_DRC (0) if OK
+ * @return int - BAD_DRC (1) if DRC error or OK_DRC (0) if Ok
*/
int Drc( ZONE_CONTAINER * aArea, int CornerIndex );
@@ -376,7 +376,7 @@
* displayed in the status panel.
* @param aRefSeg The current segment to test.
* @param aList The track list to test (usually m_Pcb->m_Track)
- * @return int - BAD_DRC (1) if DRC error or OK_DRC (0) if OK
+ * @return int - BAD_DRC (1) if DRC error or OK_DRC (0) if Ok
*/
int DrcBlind( TRACK* aRefSeg, TRACK* aList )
{
diff -ru kicad-stable-build/pcbnew/editrack.cpp kicad-stable-OK/pcbnew/editrack.cpp
--- kicad-stable-build/pcbnew/editrack.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/editrack.cpp 2010-05-08 23:48:23.000000000 +0200
@@ -77,7 +77,7 @@
* - Initialize the various trace pointers.
* If current track:
* - Control DRC
- * - OK if DRC: adding a new track.
+ * - Ok if DRC: adding a new track.
*/
TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC )
{
diff -ru kicad-stable-build/pcbnew/files.cpp kicad-stable-OK/pcbnew/files.cpp
--- kicad-stable-build/pcbnew/files.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/files.cpp 2010-05-08 23:51:34.000000000 +0200
@@ -74,7 +74,7 @@
}
else
{
- msg = _( "OK to load recovery file " ) + fn.GetFullPath();
+ msg = _( "Ok to load recovery file " ) + fn.GetFullPath();
if( !IsOK( this, msg ) )
break;
}
@@ -117,7 +117,7 @@
/**
* Read a board file
* @param FullFileName = file name. If empty, a file name will be asked
- * @return 0 if fails or abort, 1 if OK
+ * @return 0 if fails or abort, 1 if Ok
*/
bool WinEDA_PcbFrame::LoadOnePcbFile( const wxString& FullFileName, bool Append )
{
diff -ru kicad-stable-build/pcbnew/ioascii.cpp kicad-stable-OK/pcbnew/ioascii.cpp
--- kicad-stable-build/pcbnew/ioascii.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/ioascii.cpp 2010-05-08 23:54:47.000000000 +0200
@@ -101,7 +101,7 @@
if( line1[0] == '$' )
{
- return ii; /* end of segmentlist: OK */
+ return ii; /* end of segmentlist: Ok */
}
// Read the 2nd line to determine the exact type, one of:
@@ -161,7 +161,7 @@
newTrack->SetLayer( layer );
- if( makeType == TYPE_VIA ) // Ensure layers are OK when possible:
+ if( makeType == TYPE_VIA ) // Ensure layers are Ok when possible:
{
if( newTrack->Shape() == VIA_THROUGH )
( (SEGVIA*) newTrack )->SetLayerPair( LAYER_N_FRONT,
@@ -1058,7 +1058,7 @@
/* Save the current PCB in ASCII format
* Returns
- * 1 if OK
+ * 1 if Ok
* 0 if error occurs saving file.
*/
int WinEDA_PcbFrame::SavePcbFormatAscii( FILE* aFile )
@@ -1066,7 +1066,7 @@
bool rc;
char line[256];
- GetBoard()->m_Status_Pcb &= ~CONNEXION_OK;
+ GetBoard()->m_Status_Pcb &= ~CONNEXION_4;
wxBeginBusyCursor();
diff -ru kicad-stable-build/pcbnew/layer_widget.cpp kicad-stable-OK/pcbnew/layer_widget.cpp
--- kicad-stable-build/pcbnew/layer_widget.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/layer_widget.cpp 2010-05-08 23:55:13.000000000 +0200
@@ -122,7 +122,7 @@
int LAYER_WIDGET::getDecodedId( int aControlId )
{
- int id = aControlId / LYR_COLUMN_COUNT; // rounding is OK.
+ int id = aControlId / LYR_COLUMN_COUNT; // rounding is Ok.
return id;
}
diff -ru kicad-stable-build/pcbnew/librairi.cpp kicad-stable-OK/pcbnew/librairi.cpp
--- kicad-stable-build/pcbnew/librairi.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/librairi.cpp 2010-05-08 23:56:58.000000000 +0200
@@ -430,7 +430,7 @@
if( !NewModulesOnly && file_exists )
{
wxString msg;
- msg.Printf( _( "File %s exists, OK to replace ?" ),
+ msg.Printf( _( "File %s exists, Ok to replace ?" ),
GetChars( fileName ) );
if( !IsOK( this, msg ) )
return;
@@ -490,7 +490,7 @@
* @param aDisplayDialog = true to display a dialog to enter or confirm the
* footprint name
* @param aCreateDocFile = true to creates the associated doc file
- * @return : 1 if OK, 0 if abort
+ * @return : 1 if Ok, 0 if abort
*/
int WinEDA_BasePcbFrame::Save_Module_In_Library( const wxString& aLibName,
MODULE* aModule,
diff -ru kicad-stable-build/pcbnew/mirepcb.cpp kicad-stable-OK/pcbnew/mirepcb.cpp
--- kicad-stable-build/pcbnew/mirepcb.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/mirepcb.cpp 2010-05-08 23:58:13.000000000 +0200
@@ -96,7 +96,7 @@
MainBoxSizer->Add( RightBoxSizer, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
/* Create of the command buttons. */
- Button = new wxButton( this, wxID_OK, _( "OK" ) );
+ Button = new wxButton( this, wxID_OK, _( "Ok" ) );
RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
diff -ru kicad-stable-build/pcbnew/muonde.cpp kicad-stable-OK/pcbnew/muonde.cpp
--- kicad-stable-build/pcbnew/muonde.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/muonde.cpp 2010-05-08 23:59:29.000000000 +0200
@@ -842,7 +842,7 @@
MainBoxSizer->Add( LeftBoxSizer, 0, wxGROW | wxALL, 5 );
MainBoxSizer->Add( RightBoxSizer, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
- wxButton* Button = new wxButton( this, wxID_OK, _( "OK" ) );
+ wxButton* Button = new wxButton( this, wxID_OK, _( "Ok" ) );
RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
diff -ru kicad-stable-build/pcbnew/queue.cpp kicad-stable-OK/pcbnew/queue.cpp
--- kicad-stable-build/pcbnew/queue.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/queue.cpp 2010-05-09 00:01:58.000000000 +0200
@@ -90,7 +90,7 @@
/* add a search node to the list
* Return:
- * 1 - OK
+ * 1 - Ok
* 0 - Failed to allocate memory.
*/
int SetQueue( int r, int c, int side, int d, int a, int r2, int c2 )
diff -ru kicad-stable-build/pcbnew/sel_layer.cpp kicad-stable-OK/pcbnew/sel_layer.cpp
--- kicad-stable-build/pcbnew/sel_layer.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/sel_layer.cpp 2010-05-09 00:04:06.000000000 +0200
@@ -41,7 +41,7 @@
BEGIN_EVENT_TABLE( WinEDA_SelLayerFrame, wxDialog )
- EVT_BUTTON( wxID_OK, WinEDA_SelLayerFrame::Sel_Layer )
+ EVT_BUTTON( wxID_3, WinEDA_SelLayerFrame::Sel_Layer )
EVT_BUTTON( wxID_CANCEL, WinEDA_SelLayerFrame::OnCancelClick )
EVT_RADIOBOX( ID_LAYER_SELECT, WinEDA_SelLayerFrame::Sel_Layer )
END_EVENT_TABLE()
@@ -83,7 +83,7 @@
/*
- * The "OK" and "Cancel" buttons are positioned (in a horizontal line)
+ * The "Ok" and "Cancel" buttons are positioned (in a horizontal line)
* beneath the "Layer" radiobox, unless that contains only one column of
* radiobuttons, in which case they are positioned (in a vertical line)
* to the right of that radiobox.
@@ -156,7 +156,7 @@
wxBoxSizer* ButtonBoxSizer = new wxBoxSizer( wxVERTICAL );
FrameBoxSizer->Add( ButtonBoxSizer, 0, wxALIGN_BOTTOM | wxALL, 0 );
- Button = new wxButton( this, wxID_OK, _( "OK" ) );
+ Button = new wxButton( this, wxID_OK, _( "Ok" ) );
ButtonBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
@@ -306,7 +306,7 @@
RadioBoxSizer->Add( m_LayerListTOP, 0, wxALIGN_TOP | wxALL, 5 );
RadioBoxSizer->Add( m_LayerListBOTTOM, 0, wxALIGN_TOP | wxALL, 5 );
- Button = new wxButton( this, wxID_OK, _( "OK" ) );
+ Button = new wxButton( this, wxID_OK, _( "Ok" ) );
ButtonBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
diff -ru kicad-stable-build/pcbnew/set_grid.cpp kicad-stable-OK/pcbnew/set_grid.cpp
--- kicad-stable-build/pcbnew/set_grid.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/set_grid.cpp 2010-05-09 00:04:45.000000000 +0200
@@ -176,7 +176,7 @@
wxBoxSizer* itemBoxSizer10 = new wxBoxSizer( wxVERTICAL );
itemBoxSizer2->Add( itemBoxSizer10, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
- wxButton* itemButton11 = new wxButton( itemDialog1, wxID_OK, _( "&OK" ),
+ wxButton* itemButton11 = new wxButton( itemDialog1, wxID_OK, _( "&Ok" ),
wxDefaultPosition,
wxDefaultSize, 0 );
itemButton11->SetDefault();
diff -ru kicad-stable-build/pcbnew/set_grid.pjd kicad-stable-OK/pcbnew/set_grid.pjd
--- kicad-stable-build/pcbnew/set_grid.pjd 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/set_grid.pjd 2010-05-09 00:05:06.000000000 +0200
@@ -770,7 +770,7 @@
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">""</string>
- <string name="proxy-Label">"&OK"</string>
+ <string name="proxy-Label">"&Ok"</string>
<bool name="proxy-Default">1</bool>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
diff -ru kicad-stable-build/pcbnew/solve.cpp kicad-stable-OK/pcbnew/solve.cpp
--- kicad-stable-build/pcbnew/solve.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/solve.cpp 2010-05-09 00:06:14.000000000 +0200
@@ -223,7 +223,7 @@
/* Route all traces
* Return:
- * 1 if OK
+ * 1 if Ok
* -1 if escape (stop being routed) request
* -2 if default memory allocation
*/
@@ -565,7 +565,7 @@
curcell = GetCell( r, c, side );
if( curcell & CURRENT_PAD )
curcell &= ~HOLE;
- if( (r == row_target) && (c == col_target) /* success if layer OK */
+ if( (r == row_target) && (c == col_target) /* success if layer Ok */
&& ( tab_mask[side] & pad_masque_layer_e) )
{
/* Remove link. */
@@ -583,7 +583,7 @@
if( Retrace( pcbframe, DC, row_source, col_source,
row_target, col_target, side, current_net_code ) )
{
- result = SUCCESS; /* Success : Route OK */
+ result = SUCCESS; /* Success : Route Ok */
}
break; /* Routing complete. */
}
diff -ru kicad-stable-build/pcbnew/specctra_export.cpp kicad-stable-OK/pcbnew/specctra_export.cpp
--- kicad-stable-build/pcbnew/specctra_export.cpp 2010-05-08 19:45:38.000000000 +0200
+++ kicad-stable-OK/pcbnew/specctra_export.cpp 2010-05-09 00:07:30.000000000 +0200
@@ -134,7 +134,7 @@
if( ok )
{
- Affiche_Message( wxString( _("BOARD exported OK.")) );
+ Affiche_Message( wxString( _("BOARD exported Ok.")) );
}
else
{
@@ -905,7 +905,7 @@
GetChars( module->GetValue() ) );
}
- // if we cannot insert OK, that means the reference has been seen before.
+ // if we cannot insert Ok, that means the reference has been seen before.
STRINGSET_PAIR refpair = refs.insert( CONV_TO_UTF8( module->GetReference() ) );
if( !refpair.second ) // insert failed
{
diff -ru kicad-stable-build/pcbnew/specctra_import.cpp kicad-stable-OK/pcbnew/specctra_import.cpp
--- kicad-stable-build/pcbnew/specctra_import.cpp 2010-05-08 19:45:38.000000000 +0200
+++ kicad-stable-OK/pcbnew/specctra_import.cpp 2010-05-09 00:07:54.000000000 +0200
@@ -125,7 +125,7 @@
*/
//Compile_Ratsnest( NULL, true );
- Affiche_Message( wxString( _("Session file imported and merged OK.")) );
+ Affiche_Message( wxString( _("Session file imported and merged Ok.")) );
DrawPanel->Refresh( true );
}
diff -ru kicad-stable-build/pcbnew/swap_layers.cpp kicad-stable-OK/pcbnew/swap_layers.cpp
--- kicad-stable-build/pcbnew/swap_layers.cpp 2010-05-08 19:45:37.000000000 +0200
+++ kicad-stable-OK/pcbnew/swap_layers.cpp 2010-05-09 00:08:52.000000000 +0200
@@ -241,18 +241,18 @@
}
// Provide a line to separate the controls which have been provided so far
- // from the OK and Cancel buttons (which will be provided after this line)
+ // from the Ok and Cancel buttons (which will be provided after this line)
Line = new wxStaticLine( this, -1, wxDefaultPosition, wxDefaultSize,
wxLI_HORIZONTAL );
OuterBoxSizer->Add( Line, 0, wxGROW | wxLEFT | wxRIGHT | wxTOP, 5 );
- // Provide a StdDialogButtonSizer to accommodate the OK and Cancel buttons;
+ // Provide a StdDialogButtonSizer to accommodate the Ok and Cancel buttons;
// using that type of sizer results in those buttons being automatically
// located in positions appropriate for each (OS) version of KiCad.
StdDialogButtonSizer = new wxStdDialogButtonSizer;
OuterBoxSizer->Add( StdDialogButtonSizer, 0, wxGROW | wxALL, 10 );
- Button = new wxButton( this, wxID_OK, _( "&OK" ), wxDefaultPosition,
+ Button = new wxButton( this, wxID_OK, _( "&Ok" ), wxDefaultPosition,
wxDefaultSize, 0 );
StdDialogButtonSizer->AddButton( Button );
diff -ru kicad-stable-build/pcbnew/track.cpp kicad-stable-OK/pcbnew/track.cpp
--- kicad-stable-build/pcbnew/track.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/track.cpp 2010-05-09 00:09:27.000000000 +0200
@@ -399,7 +399,7 @@
/* Calculate the end points coordinates of a track (a list of connected
* segments)
* RefTrack is a segment of the track
- * return 1 if OK, 0 when a track is a closed loop
+ * return 1 if Ok, 0 when a track is a closed loop
* and the beginning and the end of the track in *StartTrack and *EndTrack
* Modify *StartTrack en *EndTrack :
* (*StartTrack)->m_Start coordinate is the beginning of the track
diff -ru kicad-stable-build/pcbnew/work.cpp kicad-stable-OK/pcbnew/work.cpp
--- kicad-stable-build/pcbnew/work.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/work.cpp 2010-05-09 00:09:41.000000000 +0200
@@ -65,7 +65,7 @@
/* add a unit of work to the work list
* Return:
- * 1 if OK
+ * 1 if Ok
* 0 if memory allocation failed
*/
static int GetCost( int r1, int c1, int r2, int c2 );
diff -ru kicad-stable-build/pcbnew/xchgmod.cpp kicad-stable-OK/pcbnew/xchgmod.cpp
--- kicad-stable-build/pcbnew/xchgmod.cpp 2010-05-08 19:45:36.000000000 +0200
+++ kicad-stable-OK/pcbnew/xchgmod.cpp 2010-05-09 00:10:00.000000000 +0200
@@ -390,7 +390,7 @@
* - Same NetNames for pads same name
* Returns:
* False if no change (if the new module is not free)
- * True if OK
+ * True if Ok
* Ratsnest must be recalculated after module exchange
*/
bool DIALOG_EXCHANGE_MODULE::Change_1_Module( MODULE* Module,
diff -ru kicad-stable-build/pcbnew/zones_test_and_combine_areas.cpp kicad-stable-OK/pcbnew/zones_test_and_combine_areas.cpp
--- kicad-stable-build/pcbnew/zones_test_and_combine_areas.cpp 2010-05-08 19:45:38.000000000 +0200
+++ kicad-stable-OK/pcbnew/zones_test_and_combine_areas.cpp 2010-05-09 00:10:37.000000000 +0200
@@ -1008,7 +1008,7 @@
* Test Edge too close other areas
* @param aArea The current area.
* @param aCornerIndex The first corner of the segment to test.
- * @return bool - false if DRC error or true if OK
+ * @return bool - false if DRC error or true if Ok
*/
bool DRC::doEdgeZoneDrc( ZONE_CONTAINER* aArea, int aCornerIndex )
Attachment:
signature.asc
Description: This is a digitally signed message part.
Follow ups
