diff --git a/glabels/ColorPaletteDialog.cpp b/glabels/ColorPaletteDialog.cpp
index eabf386..ab414c8 100644
--- a/glabels/ColorPaletteDialog.cpp
+++ b/glabels/ColorPaletteDialog.cpp
@@ -265,7 +265,7 @@ namespace glabels
mColorNode = newColorNode;
// TRANSLATORS
- //: %1 = color specification in hex. String must not contain a colon (:).
+ //: %1 = color specification in hex. String must not contain a colon (:).
mColorHistory->addColor( mColorNode.color(),
QString(tr("Custom Color %1")).arg(mColorNode.color().name()) );
diff --git a/glabels/MainWindow.cpp b/glabels/MainWindow.cpp
index e40e4ab..1c4ea4c 100644
--- a/glabels/MainWindow.cpp
+++ b/glabels/MainWindow.cpp
@@ -921,7 +921,8 @@ namespace glabels
if ( mUndoRedoModel->canUndo() )
{
editUndoAction->setEnabled( true );
- /* Translators: %1 is the action description to undo. */
+ // TRANSLATORS
+ //: %1 is the action name/description (e.g. move, delete, ...) to undo.
editUndoAction->setText( QString( tr("Undo %1") ).arg( mUndoRedoModel->undoDescription() ) );
}
else
@@ -932,7 +933,8 @@ namespace glabels
if ( mUndoRedoModel->canRedo() )
{
editRedoAction->setEnabled( true );
- /* Translators: %1 is the action description to redo. */
+ // TRANSLATORS
+ //: %1 is the action name/description (e.g. move, delete, ...) to redo.
editRedoAction->setText( QString( tr("Redo %1") ).arg( mUndoRedoModel->redoDescription() ) );
}
else
diff --git a/glabels/TemplateDesigner.cpp b/glabels/TemplateDesigner.cpp
index 7944445..858fbeb 100644
--- a/glabels/TemplateDesigner.cpp
+++ b/glabels/TemplateDesigner.cpp
@@ -1580,6 +1580,8 @@ namespace glabels
QMessageBox msgBox( wizard() );
msgBox.setWindowTitle( tr("Save Product Template") );
msgBox.setIcon( QMessageBox::Warning );
+ // TRANSLATORS
+ //: %1 = brand name of product (e.g. Avery), %2 = part number of product (e.g. 5026).
msgBox.setText( tr("User product template (%1 %2) already exists.").arg(brand).arg(part) );
msgBox.setInformativeText( tr("Do you want to replace it?") );
msgBox.setStandardButtons( QMessageBox::Yes | QMessageBox::No );
diff --git a/glabels/ui/PrintView.ui b/glabels/ui/PrintView.ui
index cdeef1a..b5d18fd 100644
--- a/glabels/ui/PrintView.ui
+++ b/glabels/ui/PrintView.ui
@@ -263,7 +263,8 @@
Uncollated (e.g. 1,1,1 2,2,2 3,3,3)
-
+
+ ..
@@ -271,7 +272,8 @@
Collated (e.g. 1,2,3 1,2,3 1,2,3)
-
+
+ ..
@@ -292,7 +294,8 @@
Merge groups are contiguous
-
+
+ ..
@@ -300,7 +303,8 @@
Merge groups start on a new page
-
+
+ ..
@@ -448,7 +452,8 @@
Print...
-
+
+ ..
@@ -491,7 +496,7 @@
- <html><head/><body><p>(Will print a total of xxxx items on nnn pages.)</p></body></html>
+ (Will print a total of xxxx items on nnn pages.)Qt::AlignCenter
diff --git a/glabels/ui/PropertiesView.ui b/glabels/ui/PropertiesView.ui
index dad9cb0..94b62dd 100644
--- a/glabels/ui/PropertiesView.ui
+++ b/glabels/ui/PropertiesView.ui
@@ -248,7 +248,7 @@
- <html><head/><body><p>Select another product for this gLabels project.</p></body></html>
+ Select another product for this gLabels project.text-align:left; padding:3px;
@@ -257,7 +257,8 @@
Change product
-
+
+ ..
@@ -351,7 +352,8 @@
Horizontal orientation
-
+
+ ..
@@ -359,7 +361,8 @@
Vertical orientation
-
+
+ ..
diff --git a/glabels/ui/TemplateDesignerContinuousPage.ui b/glabels/ui/TemplateDesignerContinuousPage.ui
index d3cc112..49679f1 100644
--- a/glabels/ui/TemplateDesignerContinuousPage.ui
+++ b/glabels/ui/TemplateDesignerContinuousPage.ui
@@ -32,7 +32,7 @@
- <html><head/><body><p>Click "Cancel" to quit, or click "Back" to begin with a different product.</p></body></html>
+ Click "Cancel" to quit, or click "Back" to begin with a different product.true
diff --git a/glabels/ui/TemplateDesignerIntroPage.ui b/glabels/ui/TemplateDesignerIntroPage.ui
index 9b397cb..9f74cb4 100644
--- a/glabels/ui/TemplateDesignerIntroPage.ui
+++ b/glabels/ui/TemplateDesignerIntroPage.ui
@@ -32,7 +32,10 @@
- <html><head/><body><p>This dialog will help you create a custom product template. Let's get started:</p></body></html>
+ This dialog will help you create a custom product template. Let's get started:
+
+
+ true
diff --git a/glabels/ui/TemplateDesignerPathPage.ui b/glabels/ui/TemplateDesignerPathPage.ui
index 3b59a4c..e9d273d 100644
--- a/glabels/ui/TemplateDesignerPathPage.ui
+++ b/glabels/ui/TemplateDesignerPathPage.ui
@@ -32,7 +32,7 @@
- <html><head/><body><p>Click "Cancel" to quit, or click "Back" to begin with a different product.</p></body></html>
+ Click "Cancel" to quit, or click "Back" to begin with a different product.true
diff --git a/glabels/ui/VariablesView.ui b/glabels/ui/VariablesView.ui
index c0953d6..5c37df5 100644
--- a/glabels/ui/VariablesView.ui
+++ b/glabels/ui/VariablesView.ui
@@ -66,7 +66,7 @@
- <html><head/><body><p>Add variable</p></body></html>
+ Add variableAdd
@@ -76,7 +76,7 @@
- <html><head/><body><p>Edit selected variable</p></body></html>
+ Edit selected variableEdit
@@ -86,7 +86,7 @@
- <html><head/><body><p>Delete selected variable</p></body></html>
+ Delete selected variableDelete
diff --git a/model/Frame.cpp b/model/Frame.cpp
index 8b9111a..e910422 100644
--- a/model/Frame.cpp
+++ b/model/Frame.cpp
@@ -120,17 +120,17 @@ namespace glabels
// Update layout description
if ( mLayouts.size() == 1 )
{
- /*
- * Translators: %1 = number of labels across a page,
- * %2 = number of labels down a page,
- * %3 = total number of labels on a page (sheet).
- */
+ // TRANSLATORS
+ //: %1 = number of labels across a page,
+ //: %2 = number of labels down a page,
+ //: %3 = total number of labels on a page (sheet).
mLayoutDescription = QString( tr("%1 x %2 (%3 per sheet)") )
.arg(layout.nx()).arg(layout.ny()).arg(mNLabels);
}
else
{
- /* Translators: %1 is the total number of labels on a page (sheet). */
+ // TRANSLATORS
+ //: %1 is the total number of labels on a page (sheet).
mLayoutDescription = QString( tr("%1 per sheet") ).arg(mNLabels);
}
}
diff --git a/test-data/glabels-3/raw/crew-orientation-name-tags-7.glabels b/test-data/glabels-3/raw/crew-orientation-name-tags-7.glabels
index 3932ff9..040c901 100644
--- a/test-data/glabels-3/raw/crew-orientation-name-tags-7.glabels
+++ b/test-data/glabels-3/raw/crew-orientation-name-tags-7.glabels
@@ -1,24 +1,22 @@
-
-
-
-
-
+
+
+
+
+
-
-
- Hello, my name is
+
+
+
Hello, my name is
-
-
-
-
+
+
${Name}
-
- Department:
+
+
Department: ${Department}
-
+
diff --git a/translations/glabels_C.ts b/translations/glabels_C.ts
index 990dbdc..4001933 100644
--- a/translations/glabels_C.ts
+++ b/translations/glabels_C.ts
@@ -241,10 +241,12 @@
Frame%1 x %2 (%3 per sheet)
+ %1 = number of labels across a page, %2 = number of labels down a page, %3 = total number of labels on a page (sheet).%1 per sheet
+ %1 is the total number of labels on a page (sheet).
@@ -659,10 +661,6 @@
Layout:
-
- <html><head/><body><p>Select another product for this gLabels project.</p></body></html>
-
- Change product
@@ -695,6 +693,10 @@
Similar Products
+
+ Select another product for this gLabels project.
+
+ ReportBugDialog
@@ -882,7 +884,7 @@
TemplateDesignerContinuousPage
- <html><head/><body><p>Click "Cancel" to quit, or click "Back" to begin with a different product.</p></body></html>
+ Click "Cancel" to quit, or click "Back" to begin with a different product.
@@ -907,10 +909,6 @@
TemplateDesignerIntroPage
-
- <html><head/><body><p>This dialog will help you create a custom product template. Let's get started:</p></body></html>
-
- Copy/Edit Product
@@ -927,6 +925,10 @@
Create a new product template from scratch
+
+ This dialog will help you create a custom product template. Let's get started:
+
+ TemplateDesignerNLayoutsPage
@@ -1035,7 +1037,7 @@
TemplateDesignerPathPage
- <html><head/><body><p>Click "Cancel" to quit, or click "Back" to begin with a different product.</p></body></html>
+ Click "Cancel" to quit, or click "Back" to begin with a different product.
@@ -1199,28 +1201,28 @@
VariablesView
-
- <html><head/><body><p>Add variable</p></body></html>
-
- Add
-
- <html><head/><body><p>Edit selected variable</p></body></html>
-
- Edit
- <html><head/><body><p>Delete selected variable</p></body></html>
+ Delete
- Delete
+ Add variable
+
+
+
+ Edit selected variable
+
+
+
+ Delete selected variable
@@ -1894,10 +1896,12 @@
Undo %1
+ %1 is the action name/description (e.g. move, delete, ...) to undo.Redo %1
+ %1 is the action name/description (e.g. move, delete, ...) to redo.
@@ -2189,6 +2193,7 @@
User product template (%1 %2) already exists.
+ %1 = brand name of product (e.g. Avery), %2 = part number of product (e.g. 5026).