From 512c3411648b24505165d555a04e82ba689f8aed Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sun, 19 Aug 2018 22:14:10 -0400
Subject: integrate inx generation into ink/stitch proper

---
 templates/convert_to_satin.inx     | 17 +++++++++++++++++
 templates/embroider.inx            | 28 ++++++++++++++++++++++++++++
 templates/embroider_input.inx      | 17 -----------------
 templates/embroider_output.inx     | 19 -------------------
 templates/embroider_zip_output.inx | 21 ---------------------
 templates/flip.inx                 | 17 +++++++++++++++++
 templates/input.inx                | 17 +++++++++++++++++
 templates/install.inx              | 17 +++++++++++++++++
 templates/layer_commands.inx       | 19 +++++++++++++++++++
 templates/object_commands.inx      | 22 ++++++++++++++++++++++
 templates/output.inx               | 19 +++++++++++++++++++
 templates/params.inx               | 17 +++++++++++++++++
 templates/print.inx                | 17 +++++++++++++++++
 templates/simulate.inx             | 17 +++++++++++++++++
 templates/zip.inx                  | 21 +++++++++++++++++++++
 15 files changed, 228 insertions(+), 57 deletions(-)
 create mode 100644 templates/convert_to_satin.inx
 create mode 100644 templates/embroider.inx
 delete mode 100644 templates/embroider_input.inx
 delete mode 100644 templates/embroider_output.inx
 delete mode 100644 templates/embroider_zip_output.inx
 create mode 100644 templates/flip.inx
 create mode 100644 templates/input.inx
 create mode 100644 templates/install.inx
 create mode 100644 templates/layer_commands.inx
 create mode 100644 templates/object_commands.inx
 create mode 100644 templates/output.inx
 create mode 100644 templates/params.inx
 create mode 100644 templates/print.inx
 create mode 100644 templates/simulate.inx
 create mode 100644 templates/zip.inx

(limited to 'templates')

diff --git a/templates/convert_to_satin.inx b/templates/convert_to_satin.inx
new file mode 100644
index 00000000..d71b2081
--- /dev/null
+++ b/templates/convert_to_satin.inx
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Convert Line to Satin</_name>
+    <id>org.inkstitch.convert_to_satin</id>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <param name="extension" type="string" gui-hidden="true">convert_to_satin</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu _name="Embroidery" />
+        </effects-menu>
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
+    </script>
+</inkscape-extension>
diff --git a/templates/embroider.inx b/templates/embroider.inx
new file mode 100644
index 00000000..7c6544db
--- /dev/null
+++ b/templates/embroider.inx
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Embroider</_name>
+    <id>jonh.embroider</id>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <param name="collapse_len_mm" type="float" min="0.0" max="10.0" _gui-text="Collapse length (mm)" _gui-description="Jump stitches smaller than this will be treated as normal stitches.">3.0</param>
+    <param name="hide_layers" type="boolean" _gui-text="Hide other layers" _gui-description="Hide all other top-level layers when the embroidery layer is generated, in order to make stitching discernable.">true</param>
+    <param name="output_format" type="optiongroup" _gui-text="Output file format" appearance="minimal">
+        {% for format, description in formats %}
+        <_option value="{{ format }}">{{ description }} ({{ format | upper }})</_option>
+        {% endfor %}
+        {% for format, description in debug_formats %}
+        <_option value="{{ format }}">{{ description }} ({{ format | upper }}) [DEBUG]</_option>
+        {% endfor %}
+    </param>
+    <param name="path" type="string" _gui-text="Directory" _gui-description="Leave empty to save the output in Inkscape's extension directory."></param>
+    <param name="extension" type="string" gui-hidden="true">embroider</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu _name="Embroidery"/>
+        </effects-menu>
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
+    </script>
+</inkscape-extension>
diff --git a/templates/embroider_input.inx b/templates/embroider_input.inx
deleted file mode 100644
index 15ccdef8..00000000
--- a/templates/embroider_input.inx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>{{ format | upper }} file input</_name>
-    <id>org.inkstitch.input.{{ format }}</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <input>
-        <extension>.{{ format }}</extension>
-        <mimetype>application/x-embroidery-{{ format }}</mimetype>
-        <_filetypename>Ink/Stitch: {{ description }} (.{{ format }})</_filetypename>
-        <_filetypetooltip>convert {{ format | upper }} file to Ink/Stitch manual-stitch paths</_filetypetooltip>
-    </input>
-    <param name="extension" type="string" gui-hidden="true">input</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/templates/embroider_output.inx b/templates/embroider_output.inx
deleted file mode 100644
index 4f971fb3..00000000
--- a/templates/embroider_output.inx
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>{{ format | upper }} file output</_name>
-    <id>org.inkstitch.output.{{ format }}</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.{{ format }}</extension>
-        <mimetype>application/x-embroidery-{{ format }}</mimetype>
-        <_filetypename>Ink/Stitch: {{ description }} (.{{ format }})</_filetypename>
-        <_filetypetooltip>Save design in {{ format | upper }} format using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-    <param name="extension" type="string" gui-hidden="true">output</param>
-    <param name="format" type="string" gui-hidden="true">{{ format }}</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/templates/embroider_zip_output.inx b/templates/embroider_zip_output.inx
deleted file mode 100644
index 5d162357..00000000
--- a/templates/embroider_zip_output.inx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>embroidery ZIP file output</_name>
-    <id>org.inkstitch.output.zip</id>
-    <dependency type="executable" location="extensions">inkstitch.py</dependency>
-    <dependency type="executable" location="extensions">inkex.py</dependency>
-    <output>
-        <extension>.zip</extension>
-        <mimetype>application/zip</mimetype>
-        <_filetypename>Ink/Stitch: ZIP export multiple formats (.zip)</_filetypename>
-        <_filetypetooltip>Create a ZIP with multiple embroidery file formats using Ink/Stitch</_filetypetooltip>
-        <dataloss>true</dataloss>
-    </output>
-{% for format, description in formats %}
-    <param name="format-{{format}}" type="boolean" _gui-text=".{{format | upper}}: {{description}}">false</param>
-{% endfor %}
-    <param name="extension" type="string" gui-hidden="true">zip</param>
-    <script>
-        <command reldir="extensions" interpreter="python">inkstitch.py</command>
-    </script>
-</inkscape-extension>
diff --git a/templates/flip.inx b/templates/flip.inx
new file mode 100644
index 00000000..f129b8d9
--- /dev/null
+++ b/templates/flip.inx
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Flip Satin Columns</_name>
+    <id>org.inkstitch.flip_satins</id>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <param name="extension" type="string" gui-hidden="true">flip</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu _name="Embroidery"/>
+        </effects-menu>
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
+    </script>
+</inkscape-extension>
diff --git a/templates/input.inx b/templates/input.inx
new file mode 100644
index 00000000..15ccdef8
--- /dev/null
+++ b/templates/input.inx
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>{{ format | upper }} file input</_name>
+    <id>org.inkstitch.input.{{ format }}</id>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <input>
+        <extension>.{{ format }}</extension>
+        <mimetype>application/x-embroidery-{{ format }}</mimetype>
+        <_filetypename>Ink/Stitch: {{ description }} (.{{ format }})</_filetypename>
+        <_filetypetooltip>convert {{ format | upper }} file to Ink/Stitch manual-stitch paths</_filetypetooltip>
+    </input>
+    <param name="extension" type="string" gui-hidden="true">input</param>
+    <script>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
+    </script>
+</inkscape-extension>
diff --git a/templates/install.inx b/templates/install.inx
new file mode 100644
index 00000000..7275e13a
--- /dev/null
+++ b/templates/install.inx
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Install add-ons for Inkscape</_name>
+    <id>org.inkstitch.install</id>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <param name="extension" type="string" gui-hidden="true">install</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu _name="Embroidery"/>
+        </effects-menu>
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
+    </script>
+</inkscape-extension>
diff --git a/templates/layer_commands.inx b/templates/layer_commands.inx
new file mode 100644
index 00000000..7eadd094
--- /dev/null
+++ b/templates/layer_commands.inx
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Add Layer Commands</_name>
+    <id>org.inkstitch.layer_commands</id>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <param name="description" type="description">Commands will be added to the currently-selected layer.</param>
+    <param name="ignore_layer" type="boolean" _gui-text="Ignore layer (do not stitch any objects in this layer)">false</param>
+    <param name="extension" type="string" gui-hidden="true">layer_commands</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu _name="Embroidery" />
+        </effects-menu>
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
+    </script>
+</inkscape-extension>
diff --git a/templates/object_commands.inx b/templates/object_commands.inx
new file mode 100644
index 00000000..bba8602b
--- /dev/null
+++ b/templates/object_commands.inx
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Attach Commands</_name>
+    <id>org.inkstitch.commands</id>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <param name="fill_start" type="boolean" _gui-text="Fill stitch starting position">false</param>
+    <param name="fill_end" type="boolean" _gui-text="Fill stitch ending position">false</param>
+    <param name="stop" type="boolean" _gui-text="Stop after sewing this object">false</param>
+    <param name="trim" type="boolean" _gui-text="Trim thread after sewing this object">false</param>
+    <param name="ignore_object" type="boolean" _gui-text="Ignore this object (do not stitch)">false</param>
+    <param name="extension" type="string" gui-hidden="true">object_commands</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu _name="Embroidery" />
+        </effects-menu>
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
+    </script>
+</inkscape-extension>
diff --git a/templates/output.inx b/templates/output.inx
new file mode 100644
index 00000000..4f971fb3
--- /dev/null
+++ b/templates/output.inx
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>{{ format | upper }} file output</_name>
+    <id>org.inkstitch.output.{{ format }}</id>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <output>
+        <extension>.{{ format }}</extension>
+        <mimetype>application/x-embroidery-{{ format }}</mimetype>
+        <_filetypename>Ink/Stitch: {{ description }} (.{{ format }})</_filetypename>
+        <_filetypetooltip>Save design in {{ format | upper }} format using Ink/Stitch</_filetypetooltip>
+        <dataloss>true</dataloss>
+    </output>
+    <param name="extension" type="string" gui-hidden="true">output</param>
+    <param name="format" type="string" gui-hidden="true">{{ format }}</param>
+    <script>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
+    </script>
+</inkscape-extension>
diff --git a/templates/params.inx b/templates/params.inx
new file mode 100644
index 00000000..7b3b4e63
--- /dev/null
+++ b/templates/params.inx
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Params</_name>
+    <id>jonh.embroider.params</id>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <param name="extension" type="string" gui-hidden="true">params</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu _name="Embroidery"/>
+        </effects-menu>
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
+    </script>
+</inkscape-extension>
diff --git a/templates/print.inx b/templates/print.inx
new file mode 100644
index 00000000..edc96a4c
--- /dev/null
+++ b/templates/print.inx
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Print</_name>
+    <id>jonh.embroider.print</id>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <param name="extension" type="string" gui-hidden="true">print</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu _name="Embroidery"/>
+        </effects-menu>
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
+    </script>
+</inkscape-extension>
diff --git a/templates/simulate.inx b/templates/simulate.inx
new file mode 100644
index 00000000..66f892d8
--- /dev/null
+++ b/templates/simulate.inx
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Simulate</_name>
+    <id>jonh.embroider.simulate</id>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <param name="extension" type="string" gui-hidden="true">simulate</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu _name="Embroidery"/>
+        </effects-menu>
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
+    </script>
+</inkscape-extension>
diff --git a/templates/zip.inx b/templates/zip.inx
new file mode 100644
index 00000000..c85e849f
--- /dev/null
+++ b/templates/zip.inx
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>embroidery ZIP file output</_name>
+    <id>org.inkstitch.output.zip</id>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <output>
+        <extension>.zip</extension>
+        <mimetype>application/zip</mimetype>
+        <_filetypename>Ink/Stitch: ZIP export multiple formats (.zip)</_filetypename>
+        <_filetypetooltip>Create a ZIP with multiple embroidery file formats using Ink/Stitch</_filetypetooltip>
+        <dataloss>true</dataloss>
+    </output>
+    {% for format, description in formats %}
+    <param name="format-{{ format }}" type="boolean" _gui-text=".{{ format | upper }}: {{ description }}">false</param>
+    {% endfor %}
+    <param name="extension" type="string" gui-hidden="true">zip</param>
+    <script>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
+    </script>
+</inkscape-extension>
-- 
cgit v1.2.3


From 871358d990d4a06b2eaaf0e405f2d18e26753d52 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Mon, 20 Aug 2018 15:49:19 -0400
Subject: gettextify INX templates

---
 templates/convert_to_satin.inx |  4 ++--
 templates/embroider.inx        | 18 +++++++++---------
 templates/flip.inx             |  4 ++--
 templates/input.inx            |  6 +++---
 templates/install.inx          |  4 ++--
 templates/layer_commands.inx   | 10 ++++++----
 templates/object_commands.inx  | 13 +++++--------
 templates/output.inx           |  6 +++---
 templates/params.inx           |  6 +++---
 templates/print.inx            |  6 +++---
 templates/simulate.inx         |  6 +++---
 templates/zip.inx              |  8 ++++----
 12 files changed, 45 insertions(+), 46 deletions(-)

(limited to 'templates')

diff --git a/templates/convert_to_satin.inx b/templates/convert_to_satin.inx
index d71b2081..446e4b5c 100644
--- a/templates/convert_to_satin.inx
+++ b/templates/convert_to_satin.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Convert Line to Satin</_name>
+    <name>{% trans %}Convert Line to Satin{% endtrans %}</name>
     <id>org.inkstitch.convert_to_satin</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
@@ -8,7 +8,7 @@
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu _name="Embroidery" />
+            <submenu name="Ink/Stitch" />
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/embroider.inx b/templates/embroider.inx
index 7c6544db..f4a78d73 100644
--- a/templates/embroider.inx
+++ b/templates/embroider.inx
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Embroider</_name>
-    <id>jonh.embroider</id>
+    <name>{% trans %}Embroider{% endtrans %}</name>
+    <id>org.inkstitch.embroider</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
-    <param name="collapse_len_mm" type="float" min="0.0" max="10.0" _gui-text="Collapse length (mm)" _gui-description="Jump stitches smaller than this will be treated as normal stitches.">3.0</param>
-    <param name="hide_layers" type="boolean" _gui-text="Hide other layers" _gui-description="Hide all other top-level layers when the embroidery layer is generated, in order to make stitching discernable.">true</param>
-    <param name="output_format" type="optiongroup" _gui-text="Output file format" appearance="minimal">
+    <param name="collapse_len_mm" type="float" min="0.0" max="10.0" gui-text="{% trans %}Collapse length (mm){% endtrans %}" gui-description="{% trans %}Jump stitches smaller than this will be treated as normal stitches.{% endtrans %}">3.0</param>
+    <param name="hide_layers" type="boolean" gui-text="{% trans %}Hide other layers{% endtrans %}" gui-description="{% trans %}Hide all other top-level layers when the embroidery layer is generated, in order to make stitching discernible.{% endtrans %}">true</param>
+    <param name="output_format" type="optiongroup" gui-text="{% trans %}Output file format{% endtrans %}" appearance="minimal">
         {% for format, description in formats %}
-        <_option value="{{ format }}">{{ description }} ({{ format | upper }})</_option>
+        <_option value="{{ format }}">{{ _(description) }} ({{ format | upper }})</_option>
         {% endfor %}
         {% for format, description in debug_formats %}
-        <_option value="{{ format }}">{{ description }} ({{ format | upper }}) [DEBUG]</_option>
+        <_option value="{{ format }}">{{ _(description) }} ({{ format | upper }}) [{{ _("DEBUG") }}]</_option>
         {% endfor %}
     </param>
-    <param name="path" type="string" _gui-text="Directory" _gui-description="Leave empty to save the output in Inkscape's extension directory."></param>
+    <param name="path" type="string" gui-text="{% trans %}Directory{% endtrans %}" gui-description="{% trans %}Leave empty to save the output in Inkscape's extension directory.{% endtrans %}"></param>
     <param name="extension" type="string" gui-hidden="true">embroider</param>
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu _name="Embroidery"/>
+            <submenu name="Ink/Stitch"/>
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/flip.inx b/templates/flip.inx
index f129b8d9..6ce7c6ef 100644
--- a/templates/flip.inx
+++ b/templates/flip.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Flip Satin Columns</_name>
+    <name>{% trans %}Flip Satin Columns{% endtrans %}</name>
     <id>org.inkstitch.flip_satins</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
@@ -8,7 +8,7 @@
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu _name="Embroidery"/>
+            <submenu name="Ink/Stitch"/>
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/input.inx b/templates/input.inx
index 15ccdef8..1e50d841 100644
--- a/templates/input.inx
+++ b/templates/input.inx
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>{{ format | upper }} file input</_name>
+    <name>{{ format | upper }} file input</name>
     <id>org.inkstitch.input.{{ format }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
         <extension>.{{ format }}</extension>
         <mimetype>application/x-embroidery-{{ format }}</mimetype>
-        <_filetypename>Ink/Stitch: {{ description }} (.{{ format }})</_filetypename>
-        <_filetypetooltip>convert {{ format | upper }} file to Ink/Stitch manual-stitch paths</_filetypetooltip>
+        <_filetypename>Ink/Stitch: {{ _(description) }} (.{{ format }})</_filetypename>
+        <_filetypetooltip>{{ _("convert %(file_extension)s file to Ink/Stitch manual-stitch paths") % dict(file_extension=format.upper()) }}</_filetypetooltip>
     </input>
     <param name="extension" type="string" gui-hidden="true">input</param>
     <script>
diff --git a/templates/install.inx b/templates/install.inx
index 7275e13a..9ee020fe 100644
--- a/templates/install.inx
+++ b/templates/install.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Install add-ons for Inkscape</_name>
+    <name>{% trans %}Install add-ons for Inkscape{% endtrans %}</name>
     <id>org.inkstitch.install</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
@@ -8,7 +8,7 @@
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu _name="Embroidery"/>
+            <submenu name="Ink/Stitch"/>
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/layer_commands.inx b/templates/layer_commands.inx
index 7eadd094..e04d2540 100644
--- a/templates/layer_commands.inx
+++ b/templates/layer_commands.inx
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Add Layer Commands</_name>
+    <name>{% trans %}Add Layer Commands{% endtrans %}</name>
     <id>org.inkstitch.layer_commands</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
-    <param name="description" type="description">Commands will be added to the currently-selected layer.</param>
-    <param name="ignore_layer" type="boolean" _gui-text="Ignore layer (do not stitch any objects in this layer)">false</param>
+    <param name="description" type="description">{% trans %}Commands will be added to the currently-selected layer.{% endtrans %}</param>
+    {% for command, description in layer_commands %}
+    <param name="{{ command }}" type="boolean" gui-text="{{ _(description) }}">false</param>
+    {% endfor %}
     <param name="extension" type="string" gui-hidden="true">layer_commands</param>
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu _name="Embroidery" />
+            <submenu name="Ink/Stitch" />
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/object_commands.inx b/templates/object_commands.inx
index bba8602b..71f9d0b3 100644
--- a/templates/object_commands.inx
+++ b/templates/object_commands.inx
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Attach Commands</_name>
+    <name>{% trans %}Attach Commands{% endtrans %}</name>
     <id>org.inkstitch.commands</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
-    <param name="fill_start" type="boolean" _gui-text="Fill stitch starting position">false</param>
-    <param name="fill_end" type="boolean" _gui-text="Fill stitch ending position">false</param>
-    <param name="stop" type="boolean" _gui-text="Stop after sewing this object">false</param>
-    <param name="trim" type="boolean" _gui-text="Trim thread after sewing this object">false</param>
-    <param name="ignore_object" type="boolean" _gui-text="Ignore this object (do not stitch)">false</param>
-    <param name="extension" type="string" gui-hidden="true">object_commands</param>
+    {% for command, description in object_commands %}
+    <param name="{{ object }}" type="boolean" gui-text="{{ _(description ) }}">false</param>
+    {% endfor %}
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu _name="Embroidery" />
+            <submenu name="Ink/Stitch" />
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/output.inx b/templates/output.inx
index 4f971fb3..b517ea70 100644
--- a/templates/output.inx
+++ b/templates/output.inx
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>{{ format | upper }} file output</_name>
+    <name>{{ format | upper }} file output</name>
     <id>org.inkstitch.output.{{ format }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <output>
         <extension>.{{ format }}</extension>
         <mimetype>application/x-embroidery-{{ format }}</mimetype>
-        <_filetypename>Ink/Stitch: {{ description }} (.{{ format }})</_filetypename>
-        <_filetypetooltip>Save design in {{ format | upper }} format using Ink/Stitch</_filetypetooltip>
+        <_filetypename>Ink/Stitch: {{ _(description) }} (.{{ format }})</_filetypename>
+        <_filetypetooltip>{{ _("Save design in %(file_extension)s format using Ink/Stitch") % dict(file_extension=format.upper()) }}</_filetypetooltip>
         <dataloss>true</dataloss>
     </output>
     <param name="extension" type="string" gui-hidden="true">output</param>
diff --git a/templates/params.inx b/templates/params.inx
index 7b3b4e63..2397be8e 100644
--- a/templates/params.inx
+++ b/templates/params.inx
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Params</_name>
-    <id>jonh.embroider.params</id>
+    <name>{% trans %}Params{% endtrans %}</name>
+    <id>org.inkstitch.params</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <param name="extension" type="string" gui-hidden="true">params</param>
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu _name="Embroidery"/>
+            <submenu name="Ink/Stitch"/>
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/print.inx b/templates/print.inx
index edc96a4c..2670d30e 100644
--- a/templates/print.inx
+++ b/templates/print.inx
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Print</_name>
-    <id>jonh.embroider.print</id>
+    <name>{% trans %}Print{% endtrans %}</name>
+    <id>org.inkstitch.print</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <param name="extension" type="string" gui-hidden="true">print</param>
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu _name="Embroidery"/>
+            <submenu name="Ink/Stitch"/>
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/simulate.inx b/templates/simulate.inx
index 66f892d8..7a0174a3 100644
--- a/templates/simulate.inx
+++ b/templates/simulate.inx
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Simulate</_name>
-    <id>jonh.embroider.simulate</id>
+    <name>{% trans %}Simulate{% endtrans %}</name>
+    <id>org.inkstitch.simulate</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <param name="extension" type="string" gui-hidden="true">simulate</param>
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu _name="Embroidery"/>
+            <submenu name="Ink/Stitch"/>
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/zip.inx b/templates/zip.inx
index c85e849f..9af05ab9 100644
--- a/templates/zip.inx
+++ b/templates/zip.inx
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>embroidery ZIP file output</_name>
+    <name>embroidery ZIP file output</name>
     <id>org.inkstitch.output.zip</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <output>
         <extension>.zip</extension>
         <mimetype>application/zip</mimetype>
-        <_filetypename>Ink/Stitch: ZIP export multiple formats (.zip)</_filetypename>
-        <_filetypetooltip>Create a ZIP with multiple embroidery file formats using Ink/Stitch</_filetypetooltip>
+        <_filetypename>{{ _("Ink/Stitch: ZIP export multiple formats (.zip)") }}"</_filetypename>
+        <_filetypetooltip>{{ _("Create a ZIP with multiple embroidery file formats using Ink/Stitch") }}</_filetypetooltip>
         <dataloss>true</dataloss>
     </output>
     {% for format, description in formats %}
-    <param name="format-{{ format }}" type="boolean" _gui-text=".{{ format | upper }}: {{ description }}">false</param>
+    <param name="format-{{ format }}" type="boolean" gui-text=".{{ format | upper }}: {{ _(description) }}">false</param>
     {% endfor %}
     <param name="extension" type="string" gui-hidden="true">zip</param>
     <script>
-- 
cgit v1.2.3


From a2cad1f522074b84895897632ac69dcb5deda340 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Mon, 20 Aug 2018 20:42:02 -0400
Subject: generate INX files for all languages

---
 templates/convert_to_satin.inx |  6 ++++--
 templates/embroider.inx        | 14 ++++++++------
 templates/flip.inx             |  8 +++++---
 templates/input.inx            |  4 ++--
 templates/install.inx          |  8 +++++---
 templates/layer_commands.inx   | 14 ++++++++------
 templates/object_commands.inx  | 14 ++++++++------
 templates/output.inx           |  4 ++--
 templates/params.inx           |  8 +++++---
 templates/print.inx            |  8 +++++---
 templates/simulate.inx         |  8 +++++---
 templates/zip.inx              |  6 +++---
 12 files changed, 60 insertions(+), 42 deletions(-)

(limited to 'templates')

diff --git a/templates/convert_to_satin.inx b/templates/convert_to_satin.inx
index 446e4b5c..50886d4a 100644
--- a/templates/convert_to_satin.inx
+++ b/templates/convert_to_satin.inx
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <name>{% trans %}Convert Line to Satin{% endtrans %}</name>
-    <id>org.inkstitch.convert_to_satin</id>
+    <id>org.inkstitch.convert_to_satin.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <param name="extension" type="string" gui-hidden="true">convert_to_satin</param>
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu name="Ink/Stitch" />
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}English{% endtrans %}" />
+            </submenu>
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/embroider.inx b/templates/embroider.inx
index f4a78d73..d89b4d6f 100644
--- a/templates/embroider.inx
+++ b/templates/embroider.inx
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <name>{% trans %}Embroider{% endtrans %}</name>
-    <id>org.inkstitch.embroider</id>
+    <id>org.inkstitch.embroider.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
-    <param name="collapse_len_mm" type="float" min="0.0" max="10.0" gui-text="{% trans %}Collapse length (mm){% endtrans %}" gui-description="{% trans %}Jump stitches smaller than this will be treated as normal stitches.{% endtrans %}">3.0</param>
-    <param name="hide_layers" type="boolean" gui-text="{% trans %}Hide other layers{% endtrans %}" gui-description="{% trans %}Hide all other top-level layers when the embroidery layer is generated, in order to make stitching discernible.{% endtrans %}">true</param>
-    <param name="output_format" type="optiongroup" gui-text="{% trans %}Output file format{% endtrans %}" appearance="minimal">
+    <param name="collapse_len_mm" type="float" min="0.0" max="10.0" _gui-text="{% trans %}Collapse length (mm){% endtrans %}" _gui-description="{% trans %}Jump stitches smaller than this will be treated as normal stitches.{% endtrans %}">3.0</param>
+    <param name="hide_layers" type="boolean" _gui-text="{% trans %}Hide other layers{% endtrans %}" _gui-description="{% trans %}Hide all other top-level layers when the embroidery layer is generated, in order to make stitching discernible.{% endtrans %}">true</param>
+    <param name="output_format" type="optiongroup" _gui-text="{% trans %}Output file format{% endtrans %}" appearance="minimal">
         {% for format, description in formats %}
         <_option value="{{ format }}">{{ _(description) }} ({{ format | upper }})</_option>
         {% endfor %}
@@ -14,12 +14,14 @@
         <_option value="{{ format }}">{{ _(description) }} ({{ format | upper }}) [{{ _("DEBUG") }}]</_option>
         {% endfor %}
     </param>
-    <param name="path" type="string" gui-text="{% trans %}Directory{% endtrans %}" gui-description="{% trans %}Leave empty to save the output in Inkscape's extension directory.{% endtrans %}"></param>
+    <param name="path" type="string" _gui-text="{% trans %}Directory{% endtrans %}" _gui-description="{% trans %}Leave empty to save the output in Inkscape's extension directory.{% endtrans %}"></param>
     <param name="extension" type="string" gui-hidden="true">embroider</param>
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu name="Ink/Stitch"/>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}English{% endtrans %}" />
+            </submenu>
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/flip.inx b/templates/flip.inx
index 6ce7c6ef..22bcdd36 100644
--- a/templates/flip.inx
+++ b/templates/flip.inx
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Flip Satin Columns{% endtrans %}</name>
-    <id>org.inkstitch.flip_satins</id>
+    <name>{% trans %}Flip Satin Columns{% endtrans %}</_name>
+    <id>org.inkstitch.flip_satins.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <param name="extension" type="string" gui-hidden="true">flip</param>
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu name="Ink/Stitch"/>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}English{% endtrans %}" />
+            </submenu>
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/input.inx b/templates/input.inx
index 1e50d841..d2a0d678 100644
--- a/templates/input.inx
+++ b/templates/input.inx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{{ format | upper }} file input</name>
-    <id>org.inkstitch.input.{{ format }}</id>
+    <name>{{ format | upper }} file input</_name>
+    <id>org.inkstitch.input.{{ format }}.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <input>
diff --git a/templates/install.inx b/templates/install.inx
index 9ee020fe..503e1e03 100644
--- a/templates/install.inx
+++ b/templates/install.inx
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Install add-ons for Inkscape{% endtrans %}</name>
-    <id>org.inkstitch.install</id>
+    <name>{% trans %}Install add-ons for Inkscape{% endtrans %}</_name>
+    <id>org.inkstitch.install.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <param name="extension" type="string" gui-hidden="true">install</param>
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu name="Ink/Stitch"/>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}English{% endtrans %}" />
+            </submenu>
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/layer_commands.inx b/templates/layer_commands.inx
index e04d2540..acf0f199 100644
--- a/templates/layer_commands.inx
+++ b/templates/layer_commands.inx
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Add Layer Commands{% endtrans %}</name>
-    <id>org.inkstitch.layer_commands</id>
+    <name>{% trans %}Add Layer Commands{% endtrans %}</_name>
+    <id>org.inkstitch.layer_commands.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <param name="description" type="description">{% trans %}Commands will be added to the currently-selected layer.{% endtrans %}</param>
     {% for command, description in layer_commands %}
-    <param name="{{ command }}" type="boolean" gui-text="{{ _(description) }}">false</param>
+    <param name="{{ command }}" type="boolean" _gui-text="{{ _(description) }}">false</param>
     {% endfor %}
     <param name="extension" type="string" gui-hidden="true">layer_commands</param>
     <effect>
         <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch" />
-        </effects-menu>
+        <submenu name="Ink/Stitch">
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}English{% endtrans %}" />
+            </submenu>
+        </submenu>
     </effect>
     <script>
         <command reldir="extensions" interpreter="python">inkstitch.py</command>
diff --git a/templates/object_commands.inx b/templates/object_commands.inx
index 71f9d0b3..024a694b 100644
--- a/templates/object_commands.inx
+++ b/templates/object_commands.inx
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Attach Commands{% endtrans %}</name>
-    <id>org.inkstitch.commands</id>
+    <name>{% trans %}Attach Commands{% endtrans %}</_name>
+    <id>org.inkstitch.commands.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     {% for command, description in object_commands %}
-    <param name="{{ object }}" type="boolean" gui-text="{{ _(description ) }}">false</param>
+    <param name="{{ object }}" type="boolean" _gui-text="{{ _(description ) }}">false</param>
     {% endfor %}
     <effect>
         <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch" />
-        </effects-menu>
+        <submenu name="Ink/Stitch">
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}English{% endtrans %}" />
+            </submenu>
+        </submenu>
     </effect>
     <script>
         <command reldir="extensions" interpreter="python">inkstitch.py</command>
diff --git a/templates/output.inx b/templates/output.inx
index b517ea70..87befee4 100644
--- a/templates/output.inx
+++ b/templates/output.inx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{{ format | upper }} file output</name>
-    <id>org.inkstitch.output.{{ format }}</id>
+    <name>{{ format | upper }} file output</_name>
+    <id>org.inkstitch.output.{{ format }}.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <output>
diff --git a/templates/params.inx b/templates/params.inx
index 2397be8e..1d06e56f 100644
--- a/templates/params.inx
+++ b/templates/params.inx
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Params{% endtrans %}</name>
-    <id>org.inkstitch.params</id>
+    <name>{% trans %}Params{% endtrans %}</_name>
+    <id>org.inkstitch.params.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <param name="extension" type="string" gui-hidden="true">params</param>
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu name="Ink/Stitch"/>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}English{% endtrans %}" />
+            </submenu>
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/print.inx b/templates/print.inx
index 2670d30e..eee9c55e 100644
--- a/templates/print.inx
+++ b/templates/print.inx
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Print{% endtrans %}</name>
-    <id>org.inkstitch.print</id>
+    <name>{% trans %}Print{% endtrans %}</_name>
+    <id>org.inkstitch.print.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <param name="extension" type="string" gui-hidden="true">print</param>
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu name="Ink/Stitch"/>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}English{% endtrans %}" />
+            </submenu>
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/simulate.inx b/templates/simulate.inx
index 7a0174a3..4a517994 100644
--- a/templates/simulate.inx
+++ b/templates/simulate.inx
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Simulate{% endtrans %}</name>
-    <id>org.inkstitch.simulate</id>
+    <name>{% trans %}Simulate{% endtrans %}</_name>
+    <id>org.inkstitch.simulate.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <param name="extension" type="string" gui-hidden="true">simulate</param>
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu name="Ink/Stitch"/>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}English{% endtrans %}" />
+            </submenu>
         </effects-menu>
     </effect>
     <script>
diff --git a/templates/zip.inx b/templates/zip.inx
index 9af05ab9..bf01dea2 100644
--- a/templates/zip.inx
+++ b/templates/zip.inx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>embroidery ZIP file output</name>
-    <id>org.inkstitch.output.zip</id>
+    <name>embroidery ZIP file output</_name>
+    <id>org.inkstitch.output.zip.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <output>
@@ -12,7 +12,7 @@
         <dataloss>true</dataloss>
     </output>
     {% for format, description in formats %}
-    <param name="format-{{ format }}" type="boolean" gui-text=".{{ format | upper }}: {{ _(description) }}">false</param>
+    <param name="format-{{ format }}" type="boolean" _gui-text=".{{ format | upper }}: {{ _(description) }}">false</param>
     {% endfor %}
     <param name="extension" type="string" gui-hidden="true">zip</param>
     <script>
-- 
cgit v1.2.3


From 8f700007fc7d3b7866d4e4a3dac6a36bb3e1be2a Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Tue, 21 Aug 2018 16:37:47 -0400
Subject: fix leftover </_name>

---
 templates/flip.inx            | 2 +-
 templates/input.inx           | 2 +-
 templates/install.inx         | 2 +-
 templates/layer_commands.inx  | 2 +-
 templates/object_commands.inx | 2 +-
 templates/output.inx          | 2 +-
 templates/params.inx          | 2 +-
 templates/print.inx           | 2 +-
 templates/simulate.inx        | 2 +-
 templates/zip.inx             | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'templates')

diff --git a/templates/flip.inx b/templates/flip.inx
index 22bcdd36..ebeb4090 100644
--- a/templates/flip.inx
+++ b/templates/flip.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Flip Satin Columns{% endtrans %}</_name>
+    <name>{% trans %}Flip Satin Columns{% endtrans %}</name>
     <id>org.inkstitch.flip_satins.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
diff --git a/templates/input.inx b/templates/input.inx
index d2a0d678..6e810a70 100644
--- a/templates/input.inx
+++ b/templates/input.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{{ format | upper }} file input</_name>
+    <name>{{ format | upper }} file input</name>
     <id>org.inkstitch.input.{{ format }}.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
diff --git a/templates/install.inx b/templates/install.inx
index 503e1e03..f3aa6c0a 100644
--- a/templates/install.inx
+++ b/templates/install.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Install add-ons for Inkscape{% endtrans %}</_name>
+    <name>{% trans %}Install add-ons for Inkscape{% endtrans %}</name>
     <id>org.inkstitch.install.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
diff --git a/templates/layer_commands.inx b/templates/layer_commands.inx
index acf0f199..17eb3d83 100644
--- a/templates/layer_commands.inx
+++ b/templates/layer_commands.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Add Layer Commands{% endtrans %}</_name>
+    <name>{% trans %}Add Layer Commands{% endtrans %}</name>
     <id>org.inkstitch.layer_commands.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
diff --git a/templates/object_commands.inx b/templates/object_commands.inx
index 024a694b..5807dc47 100644
--- a/templates/object_commands.inx
+++ b/templates/object_commands.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Attach Commands{% endtrans %}</_name>
+    <name>{% trans %}Attach Commands{% endtrans %}</name>
     <id>org.inkstitch.commands.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
diff --git a/templates/output.inx b/templates/output.inx
index 87befee4..2dc36d72 100644
--- a/templates/output.inx
+++ b/templates/output.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{{ format | upper }} file output</_name>
+    <name>{{ format | upper }} file output</name>
     <id>org.inkstitch.output.{{ format }}.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
diff --git a/templates/params.inx b/templates/params.inx
index 1d06e56f..f785b15c 100644
--- a/templates/params.inx
+++ b/templates/params.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Params{% endtrans %}</_name>
+    <name>{% trans %}Params{% endtrans %}</name>
     <id>org.inkstitch.params.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
diff --git a/templates/print.inx b/templates/print.inx
index eee9c55e..9e5a9dcd 100644
--- a/templates/print.inx
+++ b/templates/print.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Print{% endtrans %}</_name>
+    <name>{% trans %}Print{% endtrans %}</name>
     <id>org.inkstitch.print.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
diff --git a/templates/simulate.inx b/templates/simulate.inx
index 4a517994..33919cbb 100644
--- a/templates/simulate.inx
+++ b/templates/simulate.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Simulate{% endtrans %}</_name>
+    <name>{% trans %}Simulate{% endtrans %}</name>
     <id>org.inkstitch.simulate.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
diff --git a/templates/zip.inx b/templates/zip.inx
index bf01dea2..7b576349 100644
--- a/templates/zip.inx
+++ b/templates/zip.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>embroidery ZIP file output</_name>
+    <name>embroidery ZIP file output</name>
     <id>org.inkstitch.output.zip.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
-- 
cgit v1.2.3


From 4e15a2ead213ebcf1e52347e1a94eadf18481286 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Wed, 22 Aug 2018 14:16:33 -0400
Subject: add context for 'English' translation string

---
 templates/embroider.inx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'templates')

diff --git a/templates/embroider.inx b/templates/embroider.inx
index d89b4d6f..54f3be1b 100644
--- a/templates/embroider.inx
+++ b/templates/embroider.inx
@@ -20,6 +20,7 @@
         <object-type>all</object-type>
         <effects-menu>
             <submenu name="Ink/Stitch">
+                {# L10N This is used for the submenu under Extensions -> Ink/Stitch.  Translate this to your language's word for its language, e.g. "Español" for the spanish translation. #}
                 <submenu name="{% trans %}English{% endtrans %}" />
             </submenu>
         </effects-menu>
-- 
cgit v1.2.3


From d2f16f0666e4e294b5050a5e70449da8c23b9ea2 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Thu, 23 Aug 2018 20:53:30 -0400
Subject: fix layer and object commands templates

---
 templates/layer_commands.inx  | 4 ++--
 templates/object_commands.inx | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'templates')

diff --git a/templates/layer_commands.inx b/templates/layer_commands.inx
index 17eb3d83..a6c0283c 100644
--- a/templates/layer_commands.inx
+++ b/templates/layer_commands.inx
@@ -11,11 +11,11 @@
     <param name="extension" type="string" gui-hidden="true">layer_commands</param>
     <effect>
         <object-type>all</object-type>
-        <submenu name="Ink/Stitch">
+        <effects-menu>
             <submenu name="Ink/Stitch">
                 <submenu name="{% trans %}English{% endtrans %}" />
             </submenu>
-        </submenu>
+        </effects-menu>
     </effect>
     <script>
         <command reldir="extensions" interpreter="python">inkstitch.py</command>
diff --git a/templates/object_commands.inx b/templates/object_commands.inx
index 5807dc47..6de2a3fc 100644
--- a/templates/object_commands.inx
+++ b/templates/object_commands.inx
@@ -5,15 +5,16 @@
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     {% for command, description in object_commands %}
-    <param name="{{ object }}" type="boolean" _gui-text="{{ _(description ) }}">false</param>
+    <param name="{{ command }}" type="boolean" _gui-text="{{ _(description ) }}">false</param>
     {% endfor %}
+    <param name="extension" type="string" gui-hidden="true">object_commands</param>
     <effect>
         <object-type>all</object-type>
-        <submenu name="Ink/Stitch">
+        <effects-menu>
             <submenu name="Ink/Stitch">
                 <submenu name="{% trans %}English{% endtrans %}" />
             </submenu>
-        </submenu>
+        </effects-menu>
     </effect>
     <script>
         <command reldir="extensions" interpreter="python">inkstitch.py</command>
-- 
cgit v1.2.3


From 53f92df05635668783a6b9407a01326de14a1291 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Fri, 24 Aug 2018 16:29:13 -0400
Subject: add 'Add Commands' extension

---
 templates/global_commands.inx | 26 ++++++++++++++++++++++++++
 templates/layer_commands.inx  |  4 +++-
 templates/object_commands.inx |  6 ++++--
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 templates/global_commands.inx

(limited to 'templates')

diff --git a/templates/global_commands.inx b/templates/global_commands.inx
new file mode 100644
index 00000000..eda2721d
--- /dev/null
+++ b/templates/global_commands.inx
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <name>{% trans %}Add Commands{% endtrans %}</name>
+    <id>org.inkstitch.global_commands.{{ locale }}</id>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <param name="description" type="description">{% trans %}These commands affect the entire embroidery design.{% endtrans %}</param>
+    {% for command, description in global_commands %}
+    <param name="{{ command }}" type="boolean" _gui-text="{{ _(description) }}">false</param>
+    {% endfor %}
+    <param name="extension" type="string" gui-hidden="true">global_commands</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}English{% endtrans %}">
+                    {# L10N Inkscape submenu under Extensions -> Ink/Stitch #}
+                    <submenu name="{% trans %}Commands{% endtrans %}" />
+                </submenu>
+            </submenu>
+        </effects-menu>
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
+    </script>
+</inkscape-extension>
diff --git a/templates/layer_commands.inx b/templates/layer_commands.inx
index a6c0283c..f1a8f987 100644
--- a/templates/layer_commands.inx
+++ b/templates/layer_commands.inx
@@ -13,7 +13,9 @@
         <object-type>all</object-type>
         <effects-menu>
             <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}English{% endtrans %}" />
+                <submenu name="{% trans %}English{% endtrans %}">
+                    <submenu name="{% trans %}Commands{% endtrans %}" />
+                </submenu>
             </submenu>
         </effects-menu>
     </effect>
diff --git a/templates/object_commands.inx b/templates/object_commands.inx
index 6de2a3fc..68535db2 100644
--- a/templates/object_commands.inx
+++ b/templates/object_commands.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Attach Commands{% endtrans %}</name>
+    <name>{% trans %}Attach Commands to Selected Objects{% endtrans %}</name>
     <id>org.inkstitch.commands.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
@@ -12,7 +12,9 @@
         <object-type>all</object-type>
         <effects-menu>
             <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}English{% endtrans %}" />
+                <submenu name="{% trans %}English{% endtrans %}">
+                    <submenu name="{% trans %}Commands{% endtrans %}" />
+                </submenu>
             </submenu>
         </effects-menu>
     </effect>
-- 
cgit v1.2.3