UserVariables branch merge

This commit is contained in:
gitlost
2019-08-21 03:37:56 +01:00
92 changed files with 3624 additions and 1283 deletions
+264 -167
View File
@@ -178,6 +178,37 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditVariableDialog</name>
<message>
<source>Dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Step size:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Variable</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Type:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Value:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Factory</name>
<message>
@@ -251,18 +282,10 @@
</context>
<context>
<name>MergeView</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Source</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Location</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Format:</source>
<translation type="unfinished"></translation>
@@ -283,11 +306,15 @@
<source>Unselect all</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Browse...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ObjectEditor</name>
<message>
<source>Form</source>
<source>Object properties</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -314,6 +341,14 @@
<source>Word</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Anywhere</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>None</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Allow printing to shrink text to fit object</source>
<translation type="unfinished"></translation>
@@ -375,23 +410,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>None</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Anywhere</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select File...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>or</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select Merge Field...</source>
<source>Browse...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -470,10 +489,6 @@
<source>Opacity:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Object properties</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PreferencesDialog</name>
@@ -516,22 +531,6 @@
</context>
<context>
<name>PrintView</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Page</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>of</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>nn</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Copies</source>
<translation type="unfinished"></translation>
@@ -568,13 +567,21 @@
<source>Print</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Page</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>of</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>nn</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PropertiesView</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Product</source>
<translation type="unfinished"></translation>
@@ -615,6 +622,14 @@
<source>Change product</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>
<message>
<source>Orientation</source>
<translation type="unfinished"></translation>
@@ -635,14 +650,6 @@
<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>ReportBugDialog</name>
@@ -724,10 +731,6 @@
</context>
<context>
<name>StartupView</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Welcome to gLabels. Let&apos;s get started:</source>
<translation type="unfinished"></translation>
@@ -751,10 +754,6 @@
</context>
<context>
<name>TemplateDesignerApplyPage</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You have completed the gLabels Product Template Designer. If you wish to accept and save your product template, click &quot;Save.&quot;</source>
<translation type="unfinished"></translation>
@@ -767,7 +766,11 @@
<context>
<name>TemplateDesignerCdPage</name>
<message>
<source>Form</source>
<source>6. Margin:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>1. Outer radius:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -779,28 +782,16 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>1. Outer radius:</source>
<source>3. Clipping width:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>5. Waste:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3. Clipping width:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>6. Margin:</source>
<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>
@@ -808,14 +799,6 @@
</context>
<context>
<name>TemplateDesignerEllipsePage</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3. Waste:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>2. Height:</source>
<translation type="unfinished"></translation>
@@ -824,6 +807,10 @@
<source>1. Width:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>3. Waste:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>4. Margin:</source>
<translation type="unfinished"></translation>
@@ -831,10 +818,6 @@
</context>
<context>
<name>TemplateDesignerIntroPage</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This dialog will help you create a custom product template. Let&apos;s get started:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
@@ -858,10 +841,6 @@
</context>
<context>
<name>TemplateDesignerNLayoutsPage</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>A layout is a set of labels or cards that can be arranged in a simple grid. Most products only need one layout, as in the first example below. The second example illustrates when two layouts are needed.</source>
<translation type="unfinished"></translation>
@@ -890,40 +869,32 @@
<context>
<name>TemplateDesignerNamePage</name>
<message>
<source>Form</source>
<source>(e.g. &quot;Mailing Labels,&quot; &quot;Business Cards,&quot; ...)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Brand:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>(e.g. Avery, Acme, ...)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Part #:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>(e.g. 8163A)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Description:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>(e.g. &quot;Mailing Labels,&quot; &quot;Business Cards,&quot; ...)</source>
<source>(e.g. 8163A)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>(e.g. Avery, Acme, ...)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TemplateDesignerOneLayoutPage</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Number across (nx):</source>
<translation type="unfinished"></translation>
@@ -956,15 +927,7 @@
<context>
<name>TemplateDesignerPageSizePage</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Page size:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Width:</source>
<source>Roll width:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -972,16 +935,16 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Roll width:</source>
<source>Width:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Page size:</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>
@@ -990,15 +953,7 @@
<context>
<name>TemplateDesignerRectPage</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>1. Width:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>2. Height:</source>
<source>4. Horizontal waste:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1006,13 +961,17 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>4. Horizontal waste:</source>
<source>1. Width:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>5. Vertical waste:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>2. Height:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>6. Margin (X):</source>
<translation type="unfinished"></translation>
@@ -1029,11 +988,7 @@
<context>
<name>TemplateDesignerRoundPage</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>2. Waste:</source>
<source>3. Margin</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1041,16 +996,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>3. Margin</source>
<source>2. Waste:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TemplateDesignerShapePage</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rectangular or square (can have rounded corners)</source>
<translation type="unfinished"></translation>
@@ -1070,10 +1021,6 @@
</context>
<context>
<name>TemplateDesignerTwoLayoutPage</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Distance from left edge (x0):</source>
<translation type="unfinished"></translation>
@@ -1126,6 +1073,68 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Variable</name>
<message>
<source>String</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Integer</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Floating Point</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Never</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Per item</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Per copy</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Per page</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Color</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>VariablesView</name>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Add variable&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Edit selected variable&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Edit</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Delete selected variable&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::AboutDialog</name>
<message>
@@ -1145,14 +1154,25 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::ColorHistory</name>
<message>
<source>color %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::ColorPaletteDialog</name>
<message>
<source>Custom color...</source>
<source>Standard Colors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Merge key...</source>
<source>Recent Colors</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Custom color...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1160,7 +1180,30 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Custom color #%1</source>
<source>Custom Color %1</source>
<extracomment>%1 = color specification in hex. String must not contain a colon (:).</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use substitution field</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::EditVariableDialog</name>
<message>
<source>Default</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::FieldButton</name>
<message>
<source>Merge fields</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Variables</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1220,6 +1263,10 @@
<source>Welcome</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Edit</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Properties</source>
<translation type="unfinished"></translation>
@@ -1229,11 +1276,11 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Print</source>
<source>Variables</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Edit</source>
<source>Print</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1292,6 +1339,14 @@
<source>Select project Merge mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Variables</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select project Variables mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Print</source>
<translation type="unfinished"></translation>
@@ -1782,14 +1837,6 @@
<source>Default</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Insert Field</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Original size</source>
<translation type="unfinished"></translation>
@@ -1934,6 +1981,14 @@
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Insert substitution field</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use substitution field</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::PrintView</name>
@@ -2002,11 +2057,11 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Copy</source>
<source>Roll</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Roll</source>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -2184,6 +2239,41 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::VariablesView</name>
<message>
<source>Variables</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Type</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Increment</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Step Size</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add Variable</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Edit Variable</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Value</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::barcode::Backends</name>
<message>
@@ -2322,6 +2412,10 @@
<source>IEC18004 (QRCode)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Australia Post Standard</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Australia Post Reply Paid</source>
<translation type="unfinished"></translation>
@@ -2374,10 +2468,6 @@
<source>Code 49</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Australia Post Standard</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Code 128 (Mode C suppression)</source>
<translation type="unfinished"></translation>
@@ -2565,6 +2655,13 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::model::ModelImageObject</name>
<message>
<source>No image</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>glabels::model::ModelTextObject</name>
<message>