Merge branch 'ContinuousRollLabels'

This commit is contained in:
Jim Evins
2018-11-30 21:04:41 -05:00
133 changed files with 7973 additions and 2822 deletions
+85 -2
View File
@@ -173,6 +173,10 @@
<source>Other</source>
<translation type="unfinished">Altele</translation>
</message>
<message>
<source>Roll</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Factory</name>
@@ -231,6 +235,13 @@
<translation type="unfinished">diametru</translation>
</message>
</context>
<context>
<name>FrameContinuous</name>
<message>
<source>wide</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FrameRound</name>
<message>
@@ -624,6 +635,14 @@
<source>Similar Products</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Adjustable Parameters</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Label length:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SelectProductDialog</name>
@@ -757,6 +776,17 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TemplateDesignerContinuousPage</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click &amp;quot;Cancel&amp;quot; to quit, or click &amp;quot;Back&amp;quot; to begin with a different product.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TemplateDesignerEllipsePage</name>
<message>
@@ -924,6 +954,21 @@
<source>Height:</source>
<translation type="unfinished">Înălțime:</translation>
</message>
<message>
<source>Roll width:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TemplateDesignerPathPage</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click &amp;quot;Cancel&amp;quot; to quit, or click &amp;quot;Back&amp;quot; to begin with a different product.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TemplateDesignerRectPage</name>
@@ -948,11 +993,19 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>6. Margin:</source>
<source>5. Vertical waste:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>5. Vertical waste:</source>
<source>6. Margin (X):</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>7. Margin (Y):</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>in</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1874,6 +1927,10 @@
<source>Copy</source>
<translation type="unfinished">Lipește</translation>
</message>
<message>
<source>Roll</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::TemplateDesignerApplyPage</name>
@@ -1905,6 +1962,17 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::TemplateDesignerContinuousPage</name>
<message>
<source>Unsupported Product Style</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Continuous tape product templates are not currently supported by the Product Template Designer.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::TemplateDesignerEllipsePage</name>
<message>
@@ -1978,6 +2046,21 @@
<source>Other</source>
<translation type="unfinished">Altele</translation>
</message>
<message>
<source>Roll</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::TemplateDesignerPathPage</name>
<message>
<source>Unsupported Product Style</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Path based product templates are not currently supported by the Product Template Designer.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::TemplateDesignerRectPage</name>