summaryrefslogtreecommitdiff
path: root/translations
diff options
context:
space:
mode:
Diffstat (limited to 'translations')
-rw-r--r--translations/messages_af_ZA.po125
-rw-r--r--translations/messages_ar_SA.po125
-rw-r--r--translations/messages_ca_ES.po125
-rw-r--r--translations/messages_cs_CZ.po125
-rw-r--r--translations/messages_da_DK.po125
-rw-r--r--translations/messages_de_DE.po137
-rw-r--r--translations/messages_el_GR.po125
-rw-r--r--translations/messages_en_US.po125
-rw-r--r--translations/messages_es_ES.po125
-rw-r--r--translations/messages_fi_FI.po125
-rw-r--r--translations/messages_fr_FR.po125
-rw-r--r--translations/messages_he_IL.po125
-rw-r--r--translations/messages_hu_HU.po125
-rw-r--r--translations/messages_it_IT.po125
-rw-r--r--translations/messages_ja_JP.po125
-rw-r--r--translations/messages_ko_KR.po125
-rw-r--r--translations/messages_nl_NL.po125
-rw-r--r--translations/messages_no_NO.po125
-rw-r--r--translations/messages_pl_PL.po125
-rw-r--r--translations/messages_pt_BR.po125
-rw-r--r--translations/messages_pt_PT.po125
-rw-r--r--translations/messages_ro_RO.po125
-rw-r--r--translations/messages_ru_RU.po125
-rw-r--r--translations/messages_sr_SP.po125
-rw-r--r--translations/messages_sv_SE.po125
-rw-r--r--translations/messages_tr_TR.po125
-rw-r--r--translations/messages_uk_UA.po125
-rw-r--r--translations/messages_vi_VN.po125
-rw-r--r--translations/messages_zh_CN.po125
-rw-r--r--translations/messages_zh_TW.po125
30 files changed, 2256 insertions, 1506 deletions
diff --git a/translations/messages_af_ZA.po b/translations/messages_af_ZA.po
index 8f85f323..bbe8ae86 100644
--- a/translations/messages_af_ZA.po
+++ b/translations/messages_af_ZA.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:46\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:44\n"
"Last-Translator: \n"
"Language-Team: Afrikaans\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_ar_SA.po b/translations/messages_ar_SA.po
index 7e6d7b6a..7e8776f4 100644
--- a/translations/messages_ar_SA.po
+++ b/translations/messages_ar_SA.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:44\n"
"Last-Translator: \n"
"Language-Team: Arabic\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_ca_ES.po b/translations/messages_ca_ES.po
index 9667aaf5..aa69054a 100644
--- a/translations/messages_ca_ES.po
+++ b/translations/messages_ca_ES.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:44\n"
"Last-Translator: \n"
"Language-Team: Catalan\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_cs_CZ.po b/translations/messages_cs_CZ.po
index 69a5f36a..f91b579d 100644
--- a/translations/messages_cs_CZ.po
+++ b/translations/messages_cs_CZ.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:44\n"
"Last-Translator: \n"
"Language-Team: Czech\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr "chyba:"
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr "Zrušit"
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr "Použít a odejít"
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr "Objekty Inscape"
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr "Použít poslední nastavení"
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr "Simulace vyšívání"
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_da_DK.po b/translations/messages_da_DK.po
index 3f7976b6..b18ab8c2 100644
--- a/translations/messages_da_DK.po
+++ b/translations/messages_da_DK.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:44\n"
"Last-Translator: \n"
"Language-Team: Danish\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_de_DE.po b/translations/messages_de_DE.po
index bd5d5eb9..e5155d37 100644
--- a/translations/messages_de_DE.po
+++ b/translations/messages_de_DE.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr "Benutzerdefinierter Füllwinkel"
msgid "This setting will apply a custom fill angle for the clone."
msgstr "Diese Einstellung wendet einen benutzerdefinierten Füllwinkel für den Klon an."
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr "Vernähen erlauben"
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr "Faden am Anfang und/oder Ende dieses Objektes vernähen. Manuelle Stiche werden nie vernäht."
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr "Anfang und Ende"
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr "Anfang"
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr "Ende"
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr "Nie"
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr "Objekt %(id)s hat ein leeres Attribut 'd'. Bitte lösche dieses Objekt aus dem Dokument."
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr "%(id)s beinhaltet mehr als einen Befehl vom Typ '%(command)s'"
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr "Fehler:"
@@ -874,7 +869,7 @@ msgstr "Sticke Textzeilen vor und zurück"
msgid "Add trims"
msgstr "Schnittmarker hinzufügen"
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -883,7 +878,7 @@ msgstr "Schnittmarker hinzufügen"
msgid "Cancel"
msgstr "Abbrechen"
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr "Anwenden und schließen"
@@ -915,7 +910,7 @@ msgstr "Du hast Objekte ausgewählt, die nicht von der Text-Erweiterung erstellt
msgid "Please specify the directory of your custom fonts."
msgstr "Bitte den Ordner für die benutzerdefinierte Schriften angeben."
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr "Bitte eine Schriftdatei auswählen."
@@ -927,50 +922,50 @@ msgstr "Wählen Sie ein oder mehrere Objekte aus, an die Sie die Befehle anhäng
msgid "Please choose one or more commands to attach."
msgstr "Bitte wählen Sie einen oder mehrere Befehle um diese zu verknüpfen."
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr "Diese Einstellung wird auf 1 Objekt angewendet."
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr "Diese Einstellungen werden auf %d Objekte angewendet."
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr "Einige Einstellungen hatten unterschiedliche Werte der Objekte. Bitte einen Wert aus der Liste auswählen oder einen neuen Namen eingeben."
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr "Deaktivierung dieser Registerkarte, deaktiviert die folgenden %d Registerkarten."
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr "Deaktivierung dieser Registerkarte, deaktiviert die folgende Registerkarte."
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr "Aktivierung dieser Registerkarte deaktiviert %s und umgekehrt."
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr "Inkscape Objekte"
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr "Klicke hier, um zu erzwingen, dass dieser Parameter gespeichert wird, wenn man auf \"Übernehmen und Beenden\" klickt"
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr "Dieser Parameter wird gespeichert, wenn man auf \"Übernehmen und beenden\" klickt"
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr "Stickparameter"
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr "Letzte Einstellungen verwenden"
@@ -986,7 +981,7 @@ msgstr "Wenn eine Form noch immer nicht nicht gestickt wird, bitte überprüfen,
msgid "Invalid Pointer"
msgstr "Fehlerzeiger"
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr "Beschreibung"
@@ -1208,7 +1203,7 @@ msgstr "Stick Simulation"
msgid "Generate INX files"
msgstr "Erzeuge INX Dateien"
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr "Die Schrift '%s' hat keine Varianten."
@@ -1969,8 +1964,8 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr "Definiere einen Ordner mit zusätzliche Schriften für das Textwerkzeug."
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
-msgstr "Anwendungshinweis: Erstelle für jede Schrift einen Unterordner."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
+msgstr ""
#: templates/lettering_generate_json.xml:3
msgid "Generate JSON"
@@ -1980,53 +1975,83 @@ msgstr "JSON erstellen"
msgid "Generates font.json which can be used by the lettering tool."
msgstr "Erstellt die font.json-Datei, um die Schrift für das Textwerkzeug nutzbar zu machen."
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
-msgstr "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
+msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
-msgstr "Füge eine SVG-Schriftdatei ein."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
+msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
-msgstr "Schriftdatei"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
+msgstr "Name"
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr "Automatisch geführte Satinkolumne"
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr "Deaktiviere diese Funktion, wenn du für eine manuelle Stichführung in deiner Schriftdatei angelegt hast."
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr "Umkehrbar"
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr "Wenn diese Funktion deaktiviert ist, ist die Option \"Sticke Textzeilen vor und zurück\" für diese Schrift nicht verfügbar."
-#: templates/lettering_generate_json.xml:34
-msgid "Default Glyph"
-msgstr "Standard-Glyphe"
-
-#: templates/lettering_generate_json.xml:37
+#: templates/lettering_generate_json.xml:38
msgid "Min Scale"
msgstr "Minimale Skalierung"
-#: templates/lettering_generate_json.xml:38
+#: templates/lettering_generate_json.xml:39
msgid "Max Scale"
msgstr "Maximale Skalierung"
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:43
+msgid "Default Glyph"
+msgstr "Standard-Glyphe"
+
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr "Zeilenhöhe (px)"
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
-msgstr "Bei 0 wird der Wert berechnet oder auf den Standardwert 100 gesetzt"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
+msgstr ""
#: templates/lettering_remove_kerning.xml:3
msgid "Remove Kerning"
diff --git a/translations/messages_el_GR.po b/translations/messages_el_GR.po
index 0db369f8..cf5f8018 100644
--- a/translations/messages_el_GR.po
+++ b/translations/messages_el_GR.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Greek\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_en_US.po b/translations/messages_en_US.po
index 179e63a6..842aff90 100644
--- a/translations/messages_en_US.po
+++ b/translations/messages_en_US.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:44\n"
"Last-Translator: \n"
"Language-Team: English\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_es_ES.po b/translations/messages_es_ES.po
index 36e05efe..bd84bba6 100644
--- a/translations/messages_es_ES.po
+++ b/translations/messages_es_ES.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Spanish\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr "%(id)s tiene más de un comando de tipo '%(command)s' ligado a él"
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr "error:"
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_fi_FI.po b/translations/messages_fi_FI.po
index d70ea99e..eceefa4f 100644
--- a/translations/messages_fi_FI.po
+++ b/translations/messages_fi_FI.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Finnish\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr "virhe:"
@@ -872,7 +867,7 @@ msgstr "Tikkaa tekstiviivat molempiin suuntiin"
msgid "Add trims"
msgstr "Lisää trimmaus"
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr "Lisää trimmaus"
msgid "Cancel"
msgstr "Peru"
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr "Hyväksy ja lopeta"
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr "Valitse yksi tai useampi objekti liittääksesi käskyjä."
msgid "Please choose one or more commands to attach."
msgstr "Valitse lisättäväksi yksi tai useampi komento."
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr "Nämä asetukset lisätään yhteen objektiin."
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr "Nämä asetukset lisätään %d objekteihin."
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr "Tämäm välilehden sammuttaminen sulkee myös %d välilehden."
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr "Tämän välilehden sammuttaminen sammuttaa seuraavan välilehden."
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr "Tämän välilehden käyttöönotto poistaa käytöstä %s ja päinvastoin."
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr "Inkscapen objekteja"
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr "Klikkaa pakottaaksesi tämän asetuksen tallentumaan kun klikkaat \"Hyväksy ja lopeta\""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr "Tämä asetus tullaan tallentamaan kun klikkaat \"Hyväksy ja lopeta\""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr "Brodeeraus Parametrit"
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr "Käytä viimeisempiä asetuksia"
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr "Epäkelpo osoitin"
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr "Kuvaus"
@@ -1206,7 +1201,7 @@ msgstr "Brodeeraus simulaatio"
msgid "Generate INX files"
msgstr "Generoi INX tiedostot"
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_fr_FR.po b/translations/messages_fr_FR.po
index 45561683..838b947b 100644
--- a/translations/messages_fr_FR.po
+++ b/translations/messages_fr_FR.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: French\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr "Angle de remplissage personnalisé"
msgid "This setting will apply a custom fill angle for the clone."
msgstr "Ce paramètre appliquera un angle de remplissage personnalisé pour le clone."
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr "L'objet %(id)s a un attribut 'd' vide. S’il vous plaît supprimer cet objet dans votre document."
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr "Plus d’une commande de type «%(command)s» est liée à %(id)s"
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr "erreur :"
@@ -872,7 +867,7 @@ msgstr "Broder les lignes de texte en aller-retour"
msgid "Add trims"
msgstr "Ajouter des coupures"
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr "Ajouter des coupures"
msgid "Cancel"
msgstr "Quitter"
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr "Appliquer et Quitter"
@@ -913,7 +908,7 @@ msgstr "Vous avez sélectionné des objets qui ne sont pas créées par l’exte
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr "Veuillez sélectionner un ou plusieurs objets pour y attacher des comman
msgid "Please choose one or more commands to attach."
msgstr "Veuillez choisir une ou plusieurs commandes à attacher."
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr "Ces paramètres seront appliqués à 1 objet."
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr "Ces paramètres seront appliqués aux %d objets."
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr "Certains paramètres ont des valeurs différentes d'un objet à l'autre. Sélectionnez une valeur dans la liste déroulante ou entrez-en une nouvelle."
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr "La désactivation de cet onglet désactivera les onglets %d suivants."
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr "La désactivation de cet onglet désactivera l'onglet suivant."
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr "Activer cet onglet désactivera %s et vice-versa."
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr "Objets Inkscape"
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr "Cliquez pour forcer l’enregistrement de ce paramètre lorsque vous cliquez sur « Appliquer et quitter »"
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr "Ce paramètre sera enregistré lorsque vous cliquez sur « Appliquer et quitter »"
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr "Paramètres de broderie"
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr "Utiliser les derniers paramètres"
@@ -984,7 +979,7 @@ msgstr "Si vous avez toujours des difficultés avec une forme qui n'est pas brod
msgid "Invalid Pointer"
msgstr "Curseur invalide"
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr "Description"
@@ -1206,7 +1201,7 @@ msgstr "Simulation de broderie"
msgid "Generate INX files"
msgstr "Générer les fichiers INX"
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_he_IL.po b/translations/messages_he_IL.po
index 5d802568..fa8470ae 100644
--- a/translations/messages_he_IL.po
+++ b/translations/messages_he_IL.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Hebrew\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_hu_HU.po b/translations/messages_hu_HU.po
index 7c80e406..ea5d3778 100644
--- a/translations/messages_hu_HU.po
+++ b/translations/messages_hu_HU.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Hungarian\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_it_IT.po b/translations/messages_it_IT.po
index a34c71ae..a9d29ca3 100644
--- a/translations/messages_it_IT.po
+++ b/translations/messages_it_IT.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Italian\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr "L'oggetto %(id)s ha un attributo vuoto. Cancella questo oggetto dal tuo documento."
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr "%(id)s ha più di un comando del tipo '%(command)s' collegato ad esso"
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr "errore:"
@@ -873,7 +868,7 @@ msgstr "Cucire le linee di testo avanti e indietro"
msgid "Add trims"
msgstr "Aggiungi tagli"
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -882,7 +877,7 @@ msgstr "Aggiungi tagli"
msgid "Cancel"
msgstr "Annulla"
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr "Applica ed esci"
@@ -914,7 +909,7 @@ msgstr "Hai selezionato degli oggetti che non sono stati creati dalla estensione
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -926,50 +921,50 @@ msgstr "Selezionare uno o più oggetti a cui collegare comandi."
msgid "Please choose one or more commands to attach."
msgstr "Selezionare uno o più comandi da collegare."
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr "Queste impostazioni saranno applicate ad un oggetto."
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr "Queste impostazioni saranno applicate agli oggetti %d."
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr "Alcuni parametri hanno valori diversi tra gli oggetti. Selezionare un valore dalla lista a discesa o inserirne uno."
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr "Disabilitando questa scheda saranno disabilitate le schede seguenti: %d ."
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr "Disabilitando questa scheda saranno disabilitate le schede seguenti."
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr "Abilitando questa scheda sarà disabilitata %s e viceversa."
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr "Oggetti Inkscape"
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr "Clicca per fare in modo che questo parametro venga salvato quando si premere \"Applica ed esci\""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr "Questo parametro sarà salvato quando verrà premuto \"Applica ed esci\""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr "Parametri di ricamo"
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr "Utilizza le ultime impostazioni"
@@ -985,7 +980,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr "Puntatore non valido"
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr "Descrizione"
@@ -1207,7 +1202,7 @@ msgstr "Simulazione di ricamo"
msgid "Generate INX files"
msgstr "Genera file INX"
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1968,7 +1963,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1979,52 +1974,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_ja_JP.po b/translations/messages_ja_JP.po
index 50568672..84e76bc2 100644
--- a/translations/messages_ja_JP.po
+++ b/translations/messages_ja_JP.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Japanese\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_ko_KR.po b/translations/messages_ko_KR.po
index c3c7203e..317437ea 100644
--- a/translations/messages_ko_KR.po
+++ b/translations/messages_ko_KR.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Korean\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_nl_NL.po b/translations/messages_nl_NL.po
index ff680ce9..21b30890 100644
--- a/translations/messages_nl_NL.po
+++ b/translations/messages_nl_NL.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:44\n"
"Last-Translator: \n"
"Language-Team: Dutch\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr "Aangepaste opvulhoek"
msgid "This setting will apply a custom fill angle for the clone."
msgstr "Deze instelling zet een aangepaste opvulhoek voor de kloon."
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr "Object %(id)s heeft een leeg 'd' attribuut. Verwijder het object uit het document."
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr "%(id)s heeft meer dan één commando van type '%(command)s' gekoppeld"
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr "fout:"
@@ -873,7 +868,7 @@ msgstr "Borduur regels tekst heen en terug"
msgid "Add trims"
msgstr "Afknippen toevoegen"
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -882,7 +877,7 @@ msgstr "Afknippen toevoegen"
msgid "Cancel"
msgstr "Annuleren"
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr "Toepassen en Sluiten"
@@ -914,7 +909,7 @@ msgstr "Er zijn objecten geselecteerd die niet met de Belettering uitbreiding zi
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -926,50 +921,50 @@ msgstr "Selecteer een of meer objecten om commando's aan te koppelen."
msgid "Please choose one or more commands to attach."
msgstr "Selecteer een of meer commando's om te koppelen."
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr "Deze instellingen worden toegepast op 1 object."
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr "Deze instellingen worden toegepast op %d objecten."
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr "Sommige instellingen hadden verschillende waarden voor verschillende objecten. Selecteer een waarde uit de lijst of voer een nieuwe in."
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr "Uitschakelen van dit tabblad zal de volgende %d tabbladen uitschakelen."
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr "Uitschakelen van dit tabblad zal het volgende tabblad uitschakelen."
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr "Inschakelen van dit tabblad zal %s uitschakelen en vice-versa."
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr "Inkscape objecten"
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr "Klik om deze parameter op te slaan als je \"Toepassen en Afsluiten\" kiest"
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr "Deze parameter wordt opgeslagen als je \"Toepassen en Afsluiten\" klikt"
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr "Borduur Parameters"
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr "Gebruik Vorige Instellingen"
@@ -985,7 +980,7 @@ msgstr "Als je nog steeds problemen hebt met een vorm die niet wordt geborduurd,
msgid "Invalid Pointer"
msgstr "Ongeldige Pointer"
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr "Beschrijving"
@@ -1207,7 +1202,7 @@ msgstr "Borduursimulatie"
msgid "Generate INX files"
msgstr "Genereer INX bestanden"
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1968,7 +1963,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1979,52 +1974,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_no_NO.po b/translations/messages_no_NO.po
index f4e731d3..68b5ba16 100644
--- a/translations/messages_no_NO.po
+++ b/translations/messages_no_NO.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Norwegian\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_pl_PL.po b/translations/messages_pl_PL.po
index c61231f4..2ad1fa84 100644
--- a/translations/messages_pl_PL.po
+++ b/translations/messages_pl_PL.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Polish\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_pt_BR.po b/translations/messages_pt_BR.po
index a3183fdd..436a402d 100644
--- a/translations/messages_pt_BR.po
+++ b/translations/messages_pt_BR.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Portuguese, Brazilian\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr "Simulador de Bordado"
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_pt_PT.po b/translations/messages_pt_PT.po
index 50c8dde0..c3021188 100644
--- a/translations/messages_pt_PT.po
+++ b/translations/messages_pt_PT.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Portuguese\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr "Cancelar"
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr "Aplicar e Sair"
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr "Definições serão aplicadas a 1 objecto."
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr "Definições serão aplicadas a %d objectos."
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr "Algumas definições com valores diferentes entre objectos. Seleccione um valor da lista ou digite novo valor."
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr "Desactivar esta aba desactivará as seguintes %d abas."
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr "Desactivar esta aba desactivará a seguinte aba."
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr "Activar esta aba desactivará %s e vice-versa."
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr "Objectos do Inkscape"
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr "Parametros de Bordado"
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr "Usar ultimas definições"
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr "Simulação de Bordado"
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_ro_RO.po b/translations/messages_ro_RO.po
index 6082e8c3..a3e2dfe5 100644
--- a/translations/messages_ro_RO.po
+++ b/translations/messages_ro_RO.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Romanian\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_ru_RU.po b/translations/messages_ru_RU.po
index 31ccf2c2..339f6f1b 100644
--- a/translations/messages_ru_RU.po
+++ b/translations/messages_ru_RU.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Russian\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_sr_SP.po b/translations/messages_sr_SP.po
index e032a5ec..8c19376e 100644
--- a/translations/messages_sr_SP.po
+++ b/translations/messages_sr_SP.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Serbian (Cyrillic)\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_sv_SE.po b/translations/messages_sv_SE.po
index eba8082f..adb03abe 100644
--- a/translations/messages_sv_SE.po
+++ b/translations/messages_sv_SE.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Swedish\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_tr_TR.po b/translations/messages_tr_TR.po
index 2a01759c..cdf6fc9c 100644
--- a/translations/messages_tr_TR.po
+++ b/translations/messages_tr_TR.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Turkish\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr "hata:"
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr "İptal et"
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr "Uygula ve Kapat"
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr "Bu ayarlar sadece 1 objeye uygulanacaktır."
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr "Bu ayarlar sadece %d objeye uygulanacaktır."
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr "Inkscape objeleri"
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr "En Son Ayarları Kullan"
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr "Nakış Simülasyonu"
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_uk_UA.po b/translations/messages_uk_UA.po
index d81f4aba..28640fd0 100644
--- a/translations/messages_uk_UA.po
+++ b/translations/messages_uk_UA.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Ukrainian\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr "помилка:"
@@ -872,7 +867,7 @@ msgstr "Прошийте рядки тексту вперед і назад"
msgid "Add trims"
msgstr "Додати обрізку"
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr "Додати обрізку"
msgid "Cancel"
msgstr "Скасувати"
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr "Застосувати і закрити"
@@ -913,7 +908,7 @@ msgstr "Ви вибрали об'єкти, які не були створені
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr "Опис"
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_vi_VN.po b/translations/messages_vi_VN.po
index bead5951..039a96ae 100644
--- a/translations/messages_vi_VN.po
+++ b/translations/messages_vi_VN.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:45\n"
"Last-Translator: \n"
"Language-Team: Vietnamese\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_zh_CN.po b/translations/messages_zh_CN.po
index b100dae5..180e5b37 100644
--- a/translations/messages_zh_CN.po
+++ b/translations/messages_zh_CN.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:44\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3
diff --git a/translations/messages_zh_TW.po b/translations/messages_zh_TW.po
index f94ff6ec..f88b3cc5 100644
--- a/translations/messages_zh_TW.po
+++ b/translations/messages_zh_TW.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: inkstitch\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-03-16 00:42+0000\n"
-"PO-Revision-Date: 2021-03-21 00:47\n"
+"POT-Creation-Date: 2021-03-23 00:43+0000\n"
+"PO-Revision-Date: 2021-03-23 00:44\n"
"Last-Translator: \n"
"Language-Team: Chinese Traditional\n"
"MIME-Version: 1.0\n"
@@ -367,45 +367,40 @@ msgstr ""
msgid "This setting will apply a custom fill angle for the clone."
msgstr ""
-#: lib/elements/element.py:246
+#: lib/elements/element.py:247
msgid "Allow lock stitches"
msgstr ""
-#: lib/elements/element.py:247
+#: lib/elements/element.py:248
msgid "Tie thread at the beginning and/or end of this object. Manual stitch will not add lock stitches."
msgstr ""
#. options to allow lock stitch before and after objects
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Both"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Before"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "After"
msgstr ""
-#: lib/elements/element.py:251
+#: lib/elements/element.py:252
msgid "Neither"
msgstr ""
-#: lib/elements/element.py:293
+#: lib/elements/element.py:294
#, python-format
msgid "Object %(id)s has an empty 'd' attribute. Please delete this object from your document."
msgstr ""
-#: lib/elements/element.py:325
-#, python-format
-msgid "%(id)s has more than one command of type '%(command)s' linked to it"
-msgstr ""
-
#. used when showing an error message to the user such as
#. "Some Path (path1234): error: satin column: One or more of the rungs doesn't
#. intersect both rails."
-#: lib/elements/element.py:382
+#: lib/elements/element.py:380
msgid "error:"
msgstr ""
@@ -872,7 +867,7 @@ msgstr ""
msgid "Add trims"
msgstr ""
-#: lib/extensions/lettering.py:68 lib/extensions/params.py:340
+#: lib/extensions/lettering.py:68 lib/extensions/params.py:343
#: print/templates/custom-page.html:23 print/templates/custom-page.html:27
#: print/templates/custom-page.html:33 print/templates/ui.html:92
#: print/templates/ui.html:96 print/templates/ui.html:102
@@ -881,7 +876,7 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: lib/extensions/lettering.py:72 lib/extensions/params.py:347
+#: lib/extensions/lettering.py:72 lib/extensions/params.py:350
msgid "Apply and Quit"
msgstr ""
@@ -913,7 +908,7 @@ msgstr ""
msgid "Please specify the directory of your custom fonts."
msgstr ""
-#: lib/extensions/lettering_generate_json.py:32
+#: lib/extensions/lettering_generate_json.py:35
msgid "Please specify a font file."
msgstr ""
@@ -925,50 +920,50 @@ msgstr ""
msgid "Please choose one or more commands to attach."
msgstr ""
-#: lib/extensions/params.py:200
+#: lib/extensions/params.py:203
msgid "These settings will be applied to 1 object."
msgstr ""
-#: lib/extensions/params.py:202
+#: lib/extensions/params.py:205
#, python-format
msgid "These settings will be applied to %d objects."
msgstr ""
-#: lib/extensions/params.py:205
+#: lib/extensions/params.py:208
msgid "Some settings had different values across objects. Select a value from the dropdown or enter a new one."
msgstr ""
-#: lib/extensions/params.py:209
+#: lib/extensions/params.py:212
#, python-format
msgid "Disabling this tab will disable the following %d tabs."
msgstr ""
-#: lib/extensions/params.py:211
+#: lib/extensions/params.py:214
msgid "Disabling this tab will disable the following tab."
msgstr ""
-#: lib/extensions/params.py:214
+#: lib/extensions/params.py:217
#, python-format
msgid "Enabling this tab will disable %s and vice-versa."
msgstr ""
-#: lib/extensions/params.py:244
+#: lib/extensions/params.py:247
msgid "Inkscape objects"
msgstr ""
-#: lib/extensions/params.py:305
+#: lib/extensions/params.py:308
msgid "Click to force this parameter to be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:313
+#: lib/extensions/params.py:316
msgid "This parameter will be saved when you click \"Apply and Quit\""
msgstr ""
-#: lib/extensions/params.py:329
+#: lib/extensions/params.py:332
msgid "Embroidery Params"
msgstr ""
-#: lib/extensions/params.py:344
+#: lib/extensions/params.py:347
msgid "Use Last Settings"
msgstr ""
@@ -984,7 +979,7 @@ msgstr ""
msgid "Invalid Pointer"
msgstr ""
-#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:20
+#: lib/extensions/troubleshoot.py:80 templates/lettering_generate_json.xml:26
msgid "Description"
msgstr ""
@@ -1206,7 +1201,7 @@ msgstr ""
msgid "Generate INX files"
msgstr ""
-#: lib/lettering/font.py:153
+#: lib/lettering/font.py:152
#, python-format
msgid "The font '%s' has no variants."
msgstr ""
@@ -1967,7 +1962,7 @@ msgid "Set a custom directory for additional fonts to be used with the lettering
msgstr ""
#: templates/lettering_custom_font_dir.xml:21
-msgid "Usage: Create a subdirectory for each font you add."
+msgid "Usage: The custom font directory must contain a subdirectory for each font."
msgstr ""
#: templates/lettering_generate_json.xml:3
@@ -1978,52 +1973,82 @@ msgstr ""
msgid "Generates font.json which can be used by the lettering tool."
msgstr ""
-#: templates/lettering_generate_json.xml:19
-msgid "Name"
+#: templates/lettering_generate_json.xml:17
+msgid "The generated file can be viewed and updated with a standard text editor tool."
msgstr ""
-#: templates/lettering_generate_json.xml:24
-msgid "Insert a font SVG file with kerning information."
+#: templates/lettering_generate_json.xml:21
+msgid "SVG Font File"
msgstr ""
-#: templates/lettering_generate_json.xml:26
-msgid "Font File"
+#: templates/lettering_generate_json.xml:25
+msgid "Name"
msgstr ""
-#: templates/lettering_generate_json.xml:29
+#: templates/lettering_generate_json.xml:32
msgid "Autoroute Satin"
msgstr ""
-#: templates/lettering_generate_json.xml:30
+#: templates/lettering_generate_json.xml:33
msgid "Disable if you defined manual routing in your font."
msgstr ""
-#: templates/lettering_generate_json.xml:31
+#: templates/lettering_generate_json.xml:34
msgid "Reversible"
msgstr ""
-#: templates/lettering_generate_json.xml:32
+#: templates/lettering_generate_json.xml:35
msgid "If disabled back and forth stitching will not be possile for this font."
msgstr ""
-#: templates/lettering_generate_json.xml:34
+#: templates/lettering_generate_json.xml:38
+msgid "Min Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:39
+msgid "Max Scale"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:43
msgid "Default Glyph"
msgstr ""
-#: templates/lettering_generate_json.xml:37
-msgid "Min Scale"
+#: templates/lettering_generate_json.xml:47
+msgid "Kerning"
msgstr ""
-#: templates/lettering_generate_json.xml:38
-msgid "Max Scale"
+#: templates/lettering_generate_json.xml:49
+msgid "If your font file contains kerning information, you can completely ignore the following settings (unless you want to overwrite them).\n"
+" If the kerning information cannot be found, these values will apply automatically."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:54
+#: templates/lettering_generate_json.xml:61
+msgid "Force"
msgstr ""
-#: templates/lettering_generate_json.xml:40
+#: templates/lettering_generate_json.xml:55
+msgid "Overwrite leading information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:56
msgid "Leading (px)"
msgstr ""
-#: templates/lettering_generate_json.xml:40
-msgid "If 0, the value will be calculated or defaults to 100"
+#: templates/lettering_generate_json.xml:57
+msgid "Line height (default: 100)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:62
+msgid "Overwrite word spacing information from font file."
+msgstr ""
+
+#: templates/lettering_generate_json.xml:63
+msgid "Word spacing (px)"
+msgstr ""
+
+#: templates/lettering_generate_json.xml:64
+msgid "Space character width (default: 20)"
msgstr ""
#: templates/lettering_remove_kerning.xml:3