diff --git a/README.md b/README.md index fc269cc..067a898 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ gLabels-qt is the development version of the next major version of gLabels (4.0) gLabels-qt has been under off-and-on development for several years. It is still missing several features to bring it in parity with glabels-3.4. These include -- Compatability with older glabels project files +- Compatibility with older glabels project files - An online manual @@ -37,8 +37,8 @@ There are currently no official releases of gLabels 4. ### Continuous Integration Snapshots Continuous integration snapshots are not official releases. These snapshots represent the latest -bleading-edge development (unstable) code. Please, DO NOT use it in a production environment. Do not -expect compatability or consistency of features between snapshots. +bleeding-edge development (unstable) code. Please, DO NOT use it in a production environment. Do not +expect compatibility or consistency of features between snapshots. | Platform | Files | |:---------|:------| diff --git a/backends/barcode/Backends.cpp b/backends/barcode/Backends.cpp index f2525ba..040e81e 100644 --- a/backends/barcode/Backends.cpp +++ b/backends/barcode/Backends.cpp @@ -246,7 +246,7 @@ namespace glabels glbarcode::Factory::registerType( "zint::usps", Zint::Usps::create ); glbarcode::Factory::registerType( "zint::pls", Zint::Pls::create ); - registerStyle( "ausp", "zint", tr("Austraila Post Standard"), + registerStyle( "ausp", "zint", tr("Australia Post Standard"), false, false, true, false, "12345678901234567890123", true, 23 ); registerStyle( "ausrp", "zint", tr("Australia Post Reply Paid"), @@ -303,7 +303,7 @@ namespace glabels registerStyle( "code128", "zint", tr("Code 128"), true, true, true, false, "0000000000", true, 10 ); - registerStyle( "code128b", "zint", tr("Code 128 (Mode C supression)"), + registerStyle( "code128b", "zint", tr("Code 128 (Mode C suppression)"), true, true, true, false, "0000000000", true, 10 ); registerStyle( "daft", "zint", tr("DAFT Code"), diff --git a/backends/barcode/Style.cpp b/backends/barcode/Style.cpp index 59e5ff7..4f11416 100644 --- a/backends/barcode/Style.cpp +++ b/backends/barcode/Style.cpp @@ -171,7 +171,7 @@ namespace glabels /// - /// Prefered N Property Getter + /// Preferred N Property Getter /// int Style::preferedN() const { diff --git a/backends/merge/Text.cpp b/backends/merge/Text.cpp index be4765b..9d40cc3 100644 --- a/backends/merge/Text.cpp +++ b/backends/merge/Text.cpp @@ -217,7 +217,7 @@ namespace glabels } else { - /* begining of a simple field. */ + /* beginning of a simple field. */ field.append( c ); state = SIMPLE; } diff --git a/glabels/ColorHistory.cpp b/glabels/ColorHistory.cpp index e6c6d70..60ff08f 100644 --- a/glabels/ColorHistory.cpp +++ b/glabels/ColorHistory.cpp @@ -50,7 +50,7 @@ namespace glabels { QList colorList = readColorList(); - // Remove any occurances of this color already in list + // Remove any occurrences of this color already in list colorList.removeAll( color ); // Now add to list diff --git a/glabels/MergeView.cpp b/glabels/MergeView.cpp index 9ff3143..0a1eea6 100644 --- a/glabels/MergeView.cpp +++ b/glabels/MergeView.cpp @@ -245,7 +245,7 @@ namespace glabels { recordsTable->setColumnCount( mKeys.size() + 1 ); // Include extra column - // First column = primay Key + // First column = primary Key auto* item = new QTableWidgetItem( mPrimaryKey ); item->setFlags( Qt::ItemIsEnabled ); recordsTable->setHorizontalHeaderItem( 0, item ); @@ -287,7 +287,7 @@ namespace glabels int iRow = 0; foreach ( merge::Record* record, records ) { - // First column for primay field + // First column for primary field auto* item = new QTableWidgetItem(); if ( record->contains( mPrimaryKey ) ) { diff --git a/glabels/TemplateDesigner.cpp b/glabels/TemplateDesigner.cpp index ae0cac5..f9ee314 100644 --- a/glabels/TemplateDesigner.cpp +++ b/glabels/TemplateDesigner.cpp @@ -1174,7 +1174,7 @@ namespace glabels { alreadyInitialized = true; - // Set some realistic defaults based on symetric sheet using previosly chosen values + // Set some realistic defaults based on symmetric sheet using previously chosen values nxSpin->setValue( nxMax ); nySpin->setValue( nyMax ); x0Spin->setValue( (pageW - (nxMax-1)*dxMin - w) / 2 ); @@ -1333,7 +1333,7 @@ namespace glabels { alreadyInitialized = true; - // Set some realistic defaults based on symetric sheet using previosly chosen values + // Set some realistic defaults based on symmetric sheet using previously chosen values nxSpin1->setValue( nxMax ); nySpin1->setValue( nyMax - nyMax/2 ); x0Spin1->setValue( (pageW - (nxMax-1)*dxMin - w) / 2 ); diff --git a/glabels/ui/TemplateDesignerIntroPage.ui b/glabels/ui/TemplateDesignerIntroPage.ui index 4f9a594..90665ff 100644 --- a/glabels/ui/TemplateDesignerIntroPage.ui +++ b/glabels/ui/TemplateDesignerIntroPage.ui @@ -65,7 +65,7 @@ New Product - Create a a new product template from scratch + Create a new product template from scratch diff --git a/glbarcode/BarcodeCepnet.h b/glbarcode/BarcodeCepnet.h index 211be3c..2043dfe 100644 --- a/glbarcode/BarcodeCepnet.h +++ b/glbarcode/BarcodeCepnet.h @@ -31,9 +31,9 @@ namespace glbarcode /** * @class BarcodeCepnet BarcodeCepnet.h glbarcode/BarcodeCepnet.h * - * 8 digit *CEPNET* barcode (Brazillian Post, based on POSTNET), extends BarcodePostnet + * 8 digit *CEPNET* barcode (Brazilian Post, based on POSTNET), extends BarcodePostnet * - * @image html sample-cepnet.svg "Sample Brazillian Post CEPNET Barcode" + * @image html sample-cepnet.svg "Sample Brazilian Post CEPNET Barcode" * * * ### Input Data Format ### diff --git a/glbarcode/BarcodePostnet.cpp b/glbarcode/BarcodePostnet.cpp index 90497da..1815fd8 100644 --- a/glbarcode/BarcodePostnet.cpp +++ b/glbarcode/BarcodePostnet.cpp @@ -118,7 +118,7 @@ namespace glbarcode /* Left frame bar */ code += frameSymbol; - /* process each digit, adding approptiate symbol */ + /* process each digit, adding appropriate symbol */ int sum = 0; for (char c : cookedData) { diff --git a/model/Handles.h b/model/Handles.h index 10d4ab2..233177b 100644 --- a/model/Handles.h +++ b/model/Handles.h @@ -65,7 +65,7 @@ namespace glabels //////////////////////////// - // Attribue Methods + // Attribute Methods //////////////////////////// ModelObject* owner() const; Location location() const; diff --git a/model/XmlLabelParser.cpp b/model/XmlLabelParser.cpp index 5fbced5..27bb7e2 100644 --- a/model/XmlLabelParser.cpp +++ b/model/XmlLabelParser.cpp @@ -239,7 +239,7 @@ namespace glabels QString version = XmlUtil::getStringAttr( node, "version", "" ); if ( version != "4.0" ) { - qWarning() << "TODO: compatability mode."; + qWarning() << "TODO: compatibility mode."; } auto* label = new Model(); @@ -738,7 +738,7 @@ namespace glabels void XmlLabelParser::parsePixdataNode( const QDomElement& node, DataCache& data ) { - // TODO, compatability with glabels-3 + // TODO, compatibility with glabels-3 }