From 6ee1d3b35843e7f1a6c9a8a9530967649bd69afe Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sat, 26 May 2018 09:42:34 -0400 Subject: [PATCH] Include previously missed translatable strings. --- glabels/ObjectEditor.cpp | 52 +-- translations/CMakeLists.txt | 8 +- translations/glabels_C.ts | 685 ++++++++++++++++++++++++++++++++++ translations/glabels_de_DE.ts | 685 ++++++++++++++++++++++++++++++++++ 4 files changed, 1402 insertions(+), 28 deletions(-) diff --git a/glabels/ObjectEditor.cpp b/glabels/ObjectEditor.cpp index f575cc2..f5a9aa1 100644 --- a/glabels/ObjectEditor.cpp +++ b/glabels/ObjectEditor.cpp @@ -61,15 +61,15 @@ namespace glabels textVAlignGroup->addButton( textVAlignMiddleToggle, Qt::AlignVCenter ); textVAlignGroup->addButton( textVAlignBottomToggle, Qt::AlignBottom ); - lineColorButton->init( "No line", QColor(0,0,0,0), QColor(0,0,0,255) ); - fillColorButton->init( "No fill", QColor(0,0,0,0), QColor(0,0,0,255) ); - textColorButton->init( "Default", QColor(0,0,0,255), QColor(0,0,0,255) ); - barcodeColorButton->init( "Default", QColor(0,0,0,255), QColor(0,0,0,255) ); - shadowColorButton->init( "Default", QColor(0,0,0,255), QColor(0,0,0,255) ); + lineColorButton->init( tr("No line"), QColor(0,0,0,0), QColor(0,0,0,255) ); + fillColorButton->init( tr("No fill"), QColor(0,0,0,0), QColor(0,0,0,255) ); + textColorButton->init( tr("Default"), QColor(0,0,0,255), QColor(0,0,0,255) ); + barcodeColorButton->init( tr("Default"), QColor(0,0,0,255), QColor(0,0,0,255) ); + shadowColorButton->init( tr("Default"), QColor(0,0,0,255), QColor(0,0,0,255) ); - textInsertFieldCombo->setName( "Insert Field" ); - barcodeInsertFieldCombo->setName( "Insert Field" ); - imageFieldCombo->setName( "Key" ); + textInsertFieldCombo->setName( tr("Insert Field") ); + barcodeInsertFieldCombo->setName( tr("Insert Field") ); + imageFieldCombo->setName( tr("Key") ); setEnabled( false ); hidePages(); @@ -351,9 +351,9 @@ namespace glabels titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-box.svg") ); titleLabel->setText( tr("Box object properties") ); - notebook->addTab( lineFillPage, "line/fill" ); - notebook->addTab( posSizePage, "position/size" ); - notebook->addTab( shadowPage, "shadow" ); + notebook->addTab( lineFillPage, tr("line/fill") ); + notebook->addTab( posSizePage, tr("position/size") ); + notebook->addTab( shadowPage, tr("shadow") ); fillFrame->setVisible( true ); sizeRectFrame->setVisible( true ); @@ -372,9 +372,9 @@ namespace glabels titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-ellipse.svg") ); titleLabel->setText( tr("Ellipse object properties") ); - notebook->addTab( lineFillPage, "line/fill" ); - notebook->addTab( posSizePage, "position/size" ); - notebook->addTab( shadowPage, "shadow" ); + notebook->addTab( lineFillPage, tr("line/fill") ); + notebook->addTab( posSizePage, tr("position/size") ); + notebook->addTab( shadowPage, tr("shadow") ); fillFrame->setVisible( true ); sizeRectFrame->setVisible( true ); @@ -393,9 +393,9 @@ namespace glabels titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-image.svg") ); titleLabel->setText( tr("Image object properties") ); - notebook->addTab( imagePage, "image" ); - notebook->addTab( posSizePage, "position/size" ); - notebook->addTab( shadowPage, "shadow" ); + notebook->addTab( imagePage, tr("image") ); + notebook->addTab( posSizePage, tr("position/size") ); + notebook->addTab( shadowPage, tr("shadow") ); sizeRectFrame->setVisible( true ); sizeOriginalSizeGroup->setVisible( true ); @@ -413,9 +413,9 @@ namespace glabels titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-line.svg") ); titleLabel->setText( tr("Line object properties") ); - notebook->addTab( lineFillPage, "line/fill" ); - notebook->addTab( posSizePage, "position/size" ); - notebook->addTab( shadowPage, "shadow" ); + notebook->addTab( lineFillPage, tr("line/fill") ); + notebook->addTab( posSizePage, tr("position/size") ); + notebook->addTab( shadowPage, tr("shadow") ); fillFrame->setVisible( false ); sizeRectFrame->setVisible( false ); @@ -434,9 +434,9 @@ namespace glabels titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-text.svg") ); titleLabel->setText( tr("Text object properties") ); - notebook->addTab( textPage, "text" ); - notebook->addTab( posSizePage, "position/size" ); - notebook->addTab( shadowPage, "shadow" ); + notebook->addTab( textPage, tr("text") ); + notebook->addTab( posSizePage, tr("position/size") ); + notebook->addTab( shadowPage, tr("shadow") ); sizeRectFrame->setVisible( true ); sizeOriginalSizeGroup->setVisible( false ); @@ -453,8 +453,8 @@ namespace glabels titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-barcode.svg") ); titleLabel->setText( tr("Barcode object properties") ); - notebook->addTab( barcodePage, "barcode" ); - notebook->addTab( posSizePage, "position/size" ); + notebook->addTab( barcodePage, tr("barcode") ); + notebook->addTab( posSizePage, tr("position/size") ); sizeRectFrame->setVisible( true ); sizeOriginalSizeGroup->setVisible( false ); @@ -479,7 +479,7 @@ namespace glabels mObject = nullptr; titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-object-properties.svg") ); - titleLabel->setText( "Object properties" ); + titleLabel->setText( tr("Object properties") ); setEnabled( false ); } } diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt index fcff48e..e41fd5d 100644 --- a/translations/CMakeLists.txt +++ b/translations/CMakeLists.txt @@ -7,12 +7,16 @@ set_directory_properties (PROPERTIES CLEAN_NO_CUSTOM 1) include (TRANSLATION_FILES.txt) qt5_create_translation (glabels_qm_files - ${CMAKE_SOURCE_DIR}/glabels ${GLABELS_TS_FILES} + ${CMAKE_SOURCE_DIR}/glabels + ${CMAKE_SOURCE_DIR}/model + ${CMAKE_SOURCE_DIR}/backends + ${GLABELS_TS_FILES} OPTIONS -no-obsolete ) qt5_create_translation (templates_qm_files - ${CMAKE_CURRENT_BINARY_DIR}/template-strings.h ${TEMPLATES_TS_FILES} + ${CMAKE_CURRENT_BINARY_DIR}/template-strings.h + ${TEMPLATES_TS_FILES} OPTIONS -no-obsolete -locations none ) diff --git a/translations/glabels_C.ts b/translations/glabels_C.ts index 1074633..c67ff58 100644 --- a/translations/glabels_C.ts +++ b/translations/glabels_C.ts @@ -207,6 +207,94 @@ + + Db + + + Other + + + + + Factory + + + + None + + + + + Text: Comma Separated Values (CSV) + + + + + Text: Comma Separated Values (CSV), keys on line 1 + + + + + Text: Tab Separated Values (TSV) + + + + + Text: Tab Separated Values (TSV), keys on line 1 + + + + + Text: Colon Separated Values + + + + + Text: Colon Separated Values, keys on line 1 + + + + + Text: Semicolon Separated Values + + + + + Text: Semicolon Separated Values, keys on line 1 + + + + + Frame + + + %1 x %2 (%3 per sheet) + + + + + %1 per sheet + + + + + FrameCd + + + + diameter + + + + + FrameRound + + + + diameter + + + MergeView @@ -1176,6 +1264,34 @@ + + Units + + + points + + + + + inches + + + + + mm + + + + + cm + + + + + picas + + + glabels::AboutDialog @@ -1997,6 +2113,34 @@ glabels::ObjectEditor + + + No line + + + + + No fill + + + + + + + Default + + + + + + Insert Field + + + + + Key + + Original size @@ -2007,6 +2151,32 @@ Box object properties + + + + + line/fill + + + + + + + + + + position/size + + + + + + + + + shadow + + Ellipse object properties @@ -2017,6 +2187,11 @@ Image object properties + + + image + + Line object properties @@ -2027,11 +2202,26 @@ Text object properties + + + text + + Barcode object properties + + + barcode + + + + + Object properties + + Line @@ -2370,6 +2560,501 @@ + + glabels::barcode::Backends + + + + + Code 39 + + + + + + Code 39 Extended + + + + + + + UPC-A + + + + + + EAN-13 + + + + + POSTNET (any) + + + + + POSTNET-5 (ZIP only) + + + + + POSTNET-9 (ZIP+4) + + + + + POSTNET-11 (DPBC) + + + + + CEPNET + + + + + USPS Intelligent Mail + + + + + IEC16022 (DataMatrix) + + + + + EAN (any) + + + + + EAN-8 + + + + + EAN-8+2 + + + + + EAN-8+5 + + + + + EAN-13+2 + + + + + EAN-13+5 + + + + + UPC (UPC-A or UPC-E) + + + + + UPC-A +2 + + + + + UPC-A +5 + + + + + + UPC-E + + + + + UPC-E +2 + + + + + UPC-E +5 + + + + + + ISBN + + + + + ISBN +5 + + + + + + Code 128 + + + + + Code 128C + + + + + Code 128B + + + + + + Interleaved 2 of 5 + + + + + + Codabar + + + + + MSI + + + + + Plessey + + + + + + Code 93 + + + + + IEC18004 (QRCode) + + + + + Austraila Post Standard + + + + + Australia Post Reply Paid + + + + + Australia Post Route Code + + + + + Australia Post Redirect + + + + + Aztec Code + + + + + Aztec Rune + + + + + Code One + + + + + Code 11 + + + + + Code 16K + + + + + Code 2 of 5 Matrix + + + + + Code 2 of 5 IATA + + + + + Code 2 of 5 Data Logic + + + + + Code 32 (Italian Pharmacode) + + + + + Code 49 + + + + + Code 128 (Mode C supression) + + + + + DAFT Code + + + + + Data Matrix + + + + + Deutsche Post Leitcode + + + + + Deutsche Post Identcode + + + + + Dutch Post KIX Code + + + + + EAN + + + + + Grid Matrix + + + + + GS1-128 + + + + + GS1 DataBar-14 + + + + + GS1 DataBar-14 Stacked + + + + + GS1 DataBar-14 Stacked Omni. + + + + + GS1 DataBar Extended Stacked + + + + + HIBC Code 128 + + + + + HIBC Code 39 + + + + + HIBC Data Matrix + + + + + HIBC QR Code + + + + + HIBC PDF417 + + + + + HIBC Micro PDF417 + + + + + HIBC Aztec Code + + + + + ITF-14 + + + + + Japanese Postal + + + + + Korean Postal + + + + + LOGMARS + + + + + Maxicode + + + + + Micro PDF417 + + + + + Micro QR Code + + + + + MSI Plessey + + + + + NVE-18 + + + + + PDF417 + + + + + PDF417 Truncated + + + + + PLANET + + + + + PostNet + + + + + Pharmacode + + + + + Pharmacode 2-track + + + + + Pharmazentral Nummer (PZN) + + + + + QR Code + + + + + Royal Mail 4-State + + + + + Telepen + + + + + Telepen Numeric + + + + + USPS One Code + + + + + UK Plessey + + + + + glabels::model::Model + + + Untitled + + + + + glabels::model::ModelBarcodeObject + + + No barcode data + + + + + Invalid barcode data + + + + + glabels::model::ModelTextObject + + + + Text + + + main diff --git a/translations/glabels_de_DE.ts b/translations/glabels_de_DE.ts index 02f8484..a3e02c3 100644 --- a/translations/glabels_de_DE.ts +++ b/translations/glabels_de_DE.ts @@ -207,6 +207,94 @@ Weiß + + Db + + + Other + Andere + + + + Factory + + + + None + Keine + + + + Text: Comma Separated Values (CSV) + + + + + Text: Comma Separated Values (CSV), keys on line 1 + + + + + Text: Tab Separated Values (TSV) + + + + + Text: Tab Separated Values (TSV), keys on line 1 + + + + + Text: Colon Separated Values + + + + + Text: Colon Separated Values, keys on line 1 + + + + + Text: Semicolon Separated Values + + + + + Text: Semicolon Separated Values, keys on line 1 + + + + + Frame + + + %1 x %2 (%3 per sheet) + + + + + %1 per sheet + + + + + FrameCd + + + + diameter + + + + + FrameRound + + + + diameter + + + MergeView @@ -1176,6 +1264,34 @@ Testseite drucken + + Units + + + points + + + + + inches + + + + + mm + + + + + cm + + + + + picas + + + glabels::AboutDialog @@ -1997,6 +2113,34 @@ glabels::ObjectEditor + + + No line + + + + + No fill + + + + + + + Default + + + + + + Insert Field + + + + + Key + + Original size @@ -2007,6 +2151,32 @@ Box object properties Eigenschaften des Rechteck-Objekts + + + + + line/fill + + + + + + + + + + position/size + + + + + + + + + shadow + + Ellipse object properties @@ -2017,6 +2187,11 @@ Image object properties Eigenschaften des Bildobjekts + + + image + + Line object properties @@ -2027,11 +2202,26 @@ Text object properties Eigenschaften des Textobjekts + + + text + + Barcode object properties Eigenschaften des Strichcode-Objekts + + + barcode + + + + + Object properties + Objekteigenschaften + Line @@ -2370,6 +2560,501 @@ Bitte geben Sie die Größenwerte für zwei Layouts an. + + glabels::barcode::Backends + + + + + Code 39 + + + + + + Code 39 Extended + + + + + + + UPC-A + + + + + + EAN-13 + + + + + POSTNET (any) + + + + + POSTNET-5 (ZIP only) + + + + + POSTNET-9 (ZIP+4) + + + + + POSTNET-11 (DPBC) + + + + + CEPNET + + + + + USPS Intelligent Mail + + + + + IEC16022 (DataMatrix) + + + + + EAN (any) + + + + + EAN-8 + + + + + EAN-8+2 + + + + + EAN-8+5 + + + + + EAN-13+2 + + + + + EAN-13+5 + + + + + UPC (UPC-A or UPC-E) + + + + + UPC-A +2 + + + + + UPC-A +5 + + + + + + UPC-E + + + + + UPC-E +2 + + + + + UPC-E +5 + + + + + + ISBN + + + + + ISBN +5 + + + + + + Code 128 + + + + + Code 128C + + + + + Code 128B + + + + + + Interleaved 2 of 5 + + + + + + Codabar + + + + + MSI + + + + + Plessey + + + + + + Code 93 + + + + + IEC18004 (QRCode) + + + + + Austraila Post Standard + + + + + Australia Post Reply Paid + + + + + Australia Post Route Code + + + + + Australia Post Redirect + + + + + Aztec Code + + + + + Aztec Rune + + + + + Code One + + + + + Code 11 + + + + + Code 16K + + + + + Code 2 of 5 Matrix + + + + + Code 2 of 5 IATA + + + + + Code 2 of 5 Data Logic + + + + + Code 32 (Italian Pharmacode) + + + + + Code 49 + + + + + Code 128 (Mode C supression) + + + + + DAFT Code + + + + + Data Matrix + + + + + Deutsche Post Leitcode + + + + + Deutsche Post Identcode + + + + + Dutch Post KIX Code + + + + + EAN + + + + + Grid Matrix + + + + + GS1-128 + + + + + GS1 DataBar-14 + + + + + GS1 DataBar-14 Stacked + + + + + GS1 DataBar-14 Stacked Omni. + + + + + GS1 DataBar Extended Stacked + + + + + HIBC Code 128 + + + + + HIBC Code 39 + + + + + HIBC Data Matrix + + + + + HIBC QR Code + + + + + HIBC PDF417 + + + + + HIBC Micro PDF417 + + + + + HIBC Aztec Code + + + + + ITF-14 + + + + + Japanese Postal + + + + + Korean Postal + + + + + LOGMARS + + + + + Maxicode + + + + + Micro PDF417 + + + + + Micro QR Code + + + + + MSI Plessey + + + + + NVE-18 + + + + + PDF417 + + + + + PDF417 Truncated + + + + + PLANET + + + + + PostNet + + + + + Pharmacode + + + + + Pharmacode 2-track + + + + + Pharmazentral Nummer (PZN) + + + + + QR Code + + + + + Royal Mail 4-State + + + + + Telepen + + + + + Telepen Numeric + + + + + USPS One Code + + + + + UK Plessey + + + + + glabels::model::Model + + + Untitled + + + + + glabels::model::ModelBarcodeObject + + + No barcode data + + + + + Invalid barcode data + + + + + glabels::model::ModelTextObject + + + + Text + Text + + main