Merge branch 'ContinuousRollLabels'

translations/glabels_zh_CN.ts

@@ -173,6 +173,10 @@
         <source>Other</source>
         <translation type="unfinished">其它</translation>
     </message>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Factory</name>
@@ -232,6 +236,13 @@
         <translation type="unfinished">直径</translation>
     </message>
 </context>
+<context>
+    <name>FrameContinuous</name>
+    <message>
+        <source>wide</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FrameRound</name>
     <message>
@@ -625,6 +636,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>
@@ -758,6 +777,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>
@@ -923,6 +953,21 @@
         <source>Height:</source>
         <translation type="unfinished">高度：</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>
@@ -947,11 +992,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>
@@ -1872,6 +1925,10 @@
         <source>Copy</source>
         <translation type="unfinished">复制</translation>
     </message>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>glabels::TemplateDesignerApplyPage</name>
@@ -1903,6 +1960,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>
@@ -1976,6 +2044,21 @@
         <source>Other</source>
         <translation type="unfinished">其它</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>