From f99e553d989945e44f81bd56307cb9c9a049b3a2 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Mon, 20 Aug 2018 15:07:12 -0400
Subject: add mkdir -p inx bin/generate-inx-files target and gitignore entry

---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 4c31f17e..1cc223e4 100644
--- a/Makefile
+++ b/Makefile
@@ -23,11 +23,16 @@ dist: distclean locales
 distclean:
 	rm -rf build dist *.spec *.tar.gz
 
+.PHONY: inx
+inx:
+	mkdir -p inx
+	bin/generate-inx-files
+
+.PHONY: messages.po
 messages.po:
 	rm -f messages.po
 	pybabel extract -o messages.po -F babel.conf --add-location=full --add-comments=l10n,L10n,L10N --sort-by-file --strip-comments .
 
-.PHONY: messages.po
 .PHONY: locales
 locales:
 	# message files will look like this:
-- 
cgit v1.3.1


From f7f59efd7d5117c6b9b43b100df5fe646ea46bc3 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Mon, 20 Aug 2018 15:17:55 -0400
Subject: gettextify pyembroidery format descriptions

---
 Makefile                 |   2 +
 bin/pyembroidery-gettext |  10 +++
 messages.po              | 161 ++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 172 insertions(+), 1 deletion(-)
 create mode 100755 bin/pyembroidery-gettext

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1cc223e4..a91eabe1 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,9 @@ inx:
 .PHONY: messages.po
 messages.po:
 	rm -f messages.po
+	bin/pyembroidery-gettext > pyembroidery-format-descriptions.py
 	pybabel extract -o messages.po -F babel.conf --add-location=full --add-comments=l10n,L10n,L10N --sort-by-file --strip-comments .
+	rm pyembroidery-format-descriptions.py
 
 .PHONY: locales
 locales:
diff --git a/bin/pyembroidery-gettext b/bin/pyembroidery-gettext
new file mode 100755
index 00000000..ac9bd1ab
--- /dev/null
+++ b/bin/pyembroidery-gettext
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+import pyembroidery
+
+
+# generate fake python code containing the descriptions of pyembroidery formats
+# as gettext calls so that pybabel will extract them into messages.po
+for format in pyembroidery.supported_formats():
+    print "# L10N description for pyembroidery file format: %s" % format['extension']
+    print "_(%s)" % repr(format['description'])
diff --git a/messages.po b/messages.po
index 5de56d8f..cfe111bc 100644
--- a/messages.po
+++ b/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-08-19 22:14-0400\n"
+"POT-Creation-Date: 2018-08-20 15:17-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -943,3 +943,162 @@ msgstr ""
 msgid "Realistic"
 msgstr ""
 
+#. description for pyembroidery file format: pec
+#. description for pyembroidery file format: pes
+#. description for pyembroidery file format: phb
+#. description for pyembroidery file format: phc
+#: pyembroidery-format-descriptions.py:2 pyembroidery-format-descriptions.py:4
+#: pyembroidery-format-descriptions.py:56
+#: pyembroidery-format-descriptions.py:58
+msgid "Brother Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: exp
+#: pyembroidery-format-descriptions.py:6
+msgid "Melco Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: dst
+#. description for pyembroidery file format: tbf
+#: pyembroidery-format-descriptions.py:8 pyembroidery-format-descriptions.py:48
+msgid "Tajima Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: jef
+#. description for pyembroidery file format: sew
+#. description for pyembroidery file format: jpx
+#: pyembroidery-format-descriptions.py:10
+#: pyembroidery-format-descriptions.py:20
+#: pyembroidery-format-descriptions.py:74
+msgid "Janome Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: vp3
+#. description for pyembroidery file format: ksm
+#. description for pyembroidery file format: max
+#. description for pyembroidery file format: pcd
+#. description for pyembroidery file format: pcq
+#. description for pyembroidery file format: pcm
+#. description for pyembroidery file format: pcs
+#: pyembroidery-format-descriptions.py:12
+#: pyembroidery-format-descriptions.py:50
+#: pyembroidery-format-descriptions.py:62
+#: pyembroidery-format-descriptions.py:66
+#: pyembroidery-format-descriptions.py:68
+#: pyembroidery-format-descriptions.py:70
+#: pyembroidery-format-descriptions.py:72
+msgid "Pfaff Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: svg
+#: pyembroidery-format-descriptions.py:14
+msgid "Scalable Vector Graphics"
+msgstr ""
+
+#. description for pyembroidery file format: csv
+#: pyembroidery-format-descriptions.py:16
+msgid "Comma-separated values"
+msgstr ""
+
+#. description for pyembroidery file format: xxx
+#: pyembroidery-format-descriptions.py:18
+msgid "Singer Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: u01
+#: pyembroidery-format-descriptions.py:22
+msgid "Barudan Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: shv
+#: pyembroidery-format-descriptions.py:24
+msgid "Husqvarna Viking Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: 10o
+#. description for pyembroidery file format: 100
+#: pyembroidery-format-descriptions.py:26
+#: pyembroidery-format-descriptions.py:28
+msgid "Toyota Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: bro
+#: pyembroidery-format-descriptions.py:30
+msgid "Bits & Volts Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: dat
+#: pyembroidery-format-descriptions.py:32
+msgid "Sunstar or Barudan Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: dsb
+#: pyembroidery-format-descriptions.py:34
+msgid "Tajima(Barudan) Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: dsz
+#: pyembroidery-format-descriptions.py:36
+msgid "ZSK USA Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: emd
+#: pyembroidery-format-descriptions.py:38
+msgid "Elna Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: exy
+#: pyembroidery-format-descriptions.py:40
+msgid "Eltac Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: fxy
+#: pyembroidery-format-descriptions.py:42
+msgid "Fortron Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: gt
+#: pyembroidery-format-descriptions.py:44
+msgid "Gold Thread Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: inb
+#: pyembroidery-format-descriptions.py:46
+msgid "Inbro Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: tap
+#: pyembroidery-format-descriptions.py:52
+msgid "Happy Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: stx
+#: pyembroidery-format-descriptions.py:54
+msgid "Data Stitch Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: new
+#: pyembroidery-format-descriptions.py:60
+msgid "Ameco Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: mit
+#: pyembroidery-format-descriptions.py:64
+msgid "Mitsubishi Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: stc
+#: pyembroidery-format-descriptions.py:76
+msgid "Gunold Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: zxy
+#: pyembroidery-format-descriptions.py:78
+msgid "ZSK TC Embroidery Format"
+msgstr ""
+
+#. description for pyembroidery file format: pmv
+#: pyembroidery-format-descriptions.py:80
+msgid "Brother Stitch Format"
+msgstr ""
+
-- 
cgit v1.3.1


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

---
 Makefile                       |  2 +-
 lib/commands.py                | 28 ++++++++++++++--------------
 lib/i18n.py                    |  5 +++++
 lib/inx/extensions.py          |  5 ++++-
 messages.po                    | 14 +++++++-------
 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 ++++----
 17 files changed, 76 insertions(+), 69 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a91eabe1..a7fd0e83 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ inx:
 messages.po:
 	rm -f messages.po
 	bin/pyembroidery-gettext > pyembroidery-format-descriptions.py
-	pybabel extract -o messages.po -F babel.conf --add-location=full --add-comments=l10n,L10n,L10N --sort-by-file --strip-comments .
+	pybabel extract -o messages.po -F babel.conf --add-location=full --add-comments=l10n,L10n,L10N --sort-by-file --strip-comments -k N_ .
 	rm pyembroidery-format-descriptions.py
 
 .PHONY: locales
diff --git a/lib/commands.py b/lib/commands.py
index 5a471c2e..214b5f40 100644
--- a/lib/commands.py
+++ b/lib/commands.py
@@ -4,26 +4,26 @@ import cubicsuperpath
 from .svg import apply_transforms
 from .svg.tags import SVG_USE_TAG, SVG_SYMBOL_TAG, CONNECTION_START, CONNECTION_END, XLINK_HREF
 from .utils import cache
-from .i18n import _
+from .i18n import _, N_
 
 COMMANDS = {
-    # l10n: command attached to an object
-    "fill_start": _("Fill stitch starting position"),
+    # L10N command attached to an object
+    "fill_start": N_("Fill stitch starting position"),
 
-    # l10n: command attached to an object
-    "fill_end": _("Fill stitch ending position"),
+    # L10N command attached to an object
+    "fill_end": N_("Fill stitch ending position"),
 
-    # l10n: command attached to an object
-    "stop": _("Stop (pause machine) after sewing this object"),
+    # L10N command attached to an object
+    "stop": N_("Stop (pause machine) after sewing this object"),
 
-    # l10n: command attached to an object
-    "trim": _("Trim thread after sewing this object"),
+    # L10N command attached to an object
+    "trim": N_("Trim thread after sewing this object"),
 
-    # l10n: command attached to an object
-    "ignore_object": _("Ignore this object (do not stitch)"),
+    # L10N command attached to an object
+    "ignore_object": N_("Ignore this object (do not stitch)"),
 
-    # l10n: command that affects entire layer
-    "ignore_layer": _("Ignore layer (do not stitch any objects in this layer)")
+    # L10N command that affects entire layer
+    "ignore_layer": N_("Ignore layer (do not stitch any objects in this layer)")
 }
 
 OBJECT_COMMANDS = [ "fill_start", "fill_end", "stop", "trim", "ignore_object" ]
@@ -117,7 +117,7 @@ class StandaloneCommand(BaseCommand):
         self.parse_symbol()
 
 def get_command_description(command):
-    return COMMANDS[command]
+    return _(COMMANDS[command])
 
 
 def find_commands(node):
diff --git a/lib/i18n.py b/lib/i18n.py
index d20f5d2f..06e0dd49 100644
--- a/lib/i18n.py
+++ b/lib/i18n.py
@@ -4,6 +4,11 @@ import gettext
 
 _ = translation = None
 
+# Use N_ to mark a string for translation but _not_ immediately translate it.
+# reference: https://docs.python.org/3/library/gettext.html#deferred-translations
+# Makefile configures pybabel to treat N_() the same as _()
+def N_(message): return message
+
 def localize():
     if getattr(sys, 'frozen', False):
         # we are in a pyinstaller installation
diff --git a/lib/inx/extensions.py b/lib/inx/extensions.py
index ba206d8f..2b097440 100755
--- a/lib/inx/extensions.py
+++ b/lib/inx/extensions.py
@@ -2,7 +2,7 @@ import pyembroidery
 
 from .utils import build_environment, write_inx_file
 from .outputs import pyembroidery_output_formats
-from ..extensions import extensions
+from ..extensions import extensions, Input, Output
 
 
 def pyembroidery_debug_formats():
@@ -15,6 +15,9 @@ def generate_extension_inx_files():
     env = build_environment()
 
     for extension in extensions:
+        if extension is Input or extension is Output:
+            continue
+
         name = extension.name()
         template = env.get_template('%s.inx' % name)
         write_inx_file(name, template.render(formats=pyembroidery_output_formats(),
diff --git a/messages.po b/messages.po
index cfe111bc..0dcd185a 100644
--- a/messages.po
+++ b/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-08-20 15:17-0400\n"
+"POT-Creation-Date: 2018-08-20 15:49-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,32 +17,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.5.3\n"
 
-#. : command attached to an object
+#. command attached to an object
 #: lib/commands.py:11
 msgid "Fill stitch starting position"
 msgstr ""
 
-#. : command attached to an object
+#. command attached to an object
 #: lib/commands.py:14
 msgid "Fill stitch ending position"
 msgstr ""
 
-#. : command attached to an object
+#. command attached to an object
 #: lib/commands.py:17
 msgid "Stop (pause machine) after sewing this object"
 msgstr ""
 
-#. : command attached to an object
+#. command attached to an object
 #: lib/commands.py:20
 msgid "Trim thread after sewing this object"
 msgstr ""
 
-#. : command attached to an object
+#. command attached to an object
 #: lib/commands.py:23
 msgid "Ignore this object (do not stitch)"
 msgstr ""
 
-#. : command that affects entire layer
+#. command that affects entire layer
 #: lib/commands.py:26
 msgid "Ignore layer (do not stitch any objects in this layer)"
 msgstr ""
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.3.1


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

---
 Makefile                       |   2 +-
 babel.conf                     |   2 +-
 lib/i18n.py                    |  10 +++-
 lib/inx/generate.py            |  10 ++--
 lib/inx/utils.py               |  29 +++++++++--
 messages.po                    | 106 ++++++++++++++++++++++++++++++++++++++++-
 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 +--
 18 files changed, 207 insertions(+), 54 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a7fd0e83..476a920d 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ distclean:
 	rm -rf build dist *.spec *.tar.gz
 
 .PHONY: inx
-inx:
+inx: locales
 	mkdir -p inx
 	bin/generate-inx-files
 
diff --git a/babel.conf b/babel.conf
index 712fc342..770e8b7c 100644
--- a/babel.conf
+++ b/babel.conf
@@ -3,4 +3,4 @@
 [python: **.py]
 
 [jinja2: print/templates/*.html]
-
+[jinja2: templates/*]
diff --git a/lib/i18n.py b/lib/i18n.py
index 06e0dd49..419c03dc 100644
--- a/lib/i18n.py
+++ b/lib/i18n.py
@@ -1,26 +1,32 @@
 import sys
 import os
+from os.path import dirname, realpath
 import gettext
 
 _ = translation = None
+locale_dir = None
 
 # Use N_ to mark a string for translation but _not_ immediately translate it.
 # reference: https://docs.python.org/3/library/gettext.html#deferred-translations
 # Makefile configures pybabel to treat N_() the same as _()
 def N_(message): return message
 
-def localize():
+def _set_locale_dir():
+    global locale_dir
+
     if getattr(sys, 'frozen', False):
         # we are in a pyinstaller installation
         locale_dir = sys._MEIPASS
     else:
-        locale_dir = os.path.dirname(__file__)
+        locale_dir = dirname(dirname(realpath(__file__)))
 
     locale_dir = os.path.join(locale_dir, 'locales')
 
+def localize(languages=None):
     global translation, _
 
     translation = gettext.translation("inkstitch", locale_dir, fallback=True)
     _ = translation.gettext
 
+_set_locale_dir()
 localize()
diff --git a/lib/inx/generate.py b/lib/inx/generate.py
index 4773a92d..f9ed799b 100644
--- a/lib/inx/generate.py
+++ b/lib/inx/generate.py
@@ -1,8 +1,12 @@
+import os
+
 from .inputs import generate_input_inx_files
 from .outputs import generate_output_inx_files
 from .extensions import generate_extension_inx_files
+from .utils import iterate_inx_locales, inx_path
 
 def generate_inx_files():
-    generate_input_inx_files()
-    generate_output_inx_files()
-    generate_extension_inx_files()
+    for locale in iterate_inx_locales():
+        generate_input_inx_files()
+        generate_output_inx_files()
+        generate_extension_inx_files()
diff --git a/lib/inx/utils.py b/lib/inx/utils.py
index da0a4614..6103f360 100644
--- a/lib/inx/utils.py
+++ b/lib/inx/utils.py
@@ -1,14 +1,18 @@
 import os
+import gettext
 from os.path import dirname
 from jinja2 import Environment, FileSystemLoader
 
-from ..i18n import translation as inkstitch_translation
+from ..i18n import translation as default_translation, locale_dir, _, N_
 
 
 _top_path = dirname(dirname(dirname(os.path.realpath(__file__))))
 inx_path = os.path.join(_top_path, "inx")
 template_path = os.path.join(_top_path, "templates")
 
+current_translation = default_translation
+current_locale = "en_US"
+
 def build_environment():
     env = Environment(
         loader = FileSystemLoader(template_path),
@@ -16,11 +20,30 @@ def build_environment():
         extensions=['jinja2.ext.i18n']
     )
 
-    env.install_gettext_translations(inkstitch_translation)
+    env.install_gettext_translations(current_translation)
+    env.globals["locale"] = current_locale
 
     return env
 
 def write_inx_file(name, contents):
-    inx_file_name = "inkstitch_%s.inx" % name
+    inx_file_name = "inkstitch_%s_%s.inx" % (name, current_locale)
     with open(os.path.join(inx_path, inx_file_name), 'w') as inx_file:
         print >> inx_file, contents
+
+def iterate_inx_locales():
+    global current_translation, current_locale
+
+    locales = sorted(os.listdir(locale_dir))
+    for locale in locales:
+        translation = gettext.translation("inkstitch", locale_dir, languages=[locale], fallback=True)
+
+        # L10N If you translate this string, that will tell Ink/Stitch to
+        # generate menu items for this language in Inkscape's "Extensions"
+        # menu.
+        magic_string = N_("Generate INX files")
+        translated_magic_string = translation.gettext(magic_string)
+
+        if translated_magic_string != magic_string or locale == "en_US":
+            current_translation = translation
+            current_locale = locale
+            yield locale
diff --git a/messages.po b/messages.po
index 0dcd185a..074159c4 100644
--- a/messages.po
+++ b/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-08-20 15:49-0400\n"
+"POT-Creation-Date: 2018-08-20 20:42-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -608,6 +608,13 @@ msgstr ""
 msgid "No embroidery file formats selected."
 msgstr ""
 
+#. If you translate this string, that will tell Ink/Stitch to
+#. generate menu items for this language in Inkscape's "Extensions"
+#. menu.
+#: lib/inx/utils.py:43
+msgid "Generate INX files"
+msgstr ""
+
 #: lib/simulator.py:40
 msgid "Speed up"
 msgstr ""
@@ -844,7 +851,7 @@ msgstr ""
 msgid "Ink/Stitch Print Preview"
 msgstr ""
 
-#: print/templates/ui.html:4
+#: print/templates/ui.html:4 templates/print.inx:3
 msgid "Print"
 msgstr ""
 
@@ -1102,3 +1109,98 @@ msgstr ""
 msgid "Brother Stitch Format"
 msgstr ""
 
+#: templates/convert_to_satin.inx:3
+msgid "Convert Line to Satin"
+msgstr ""
+
+#: templates/convert_to_satin.inx:12 templates/embroider.inx:23
+#: templates/flip.inx:12 templates/install.inx:12
+#: templates/layer_commands.inx:16 templates/object_commands.inx:14
+#: templates/params.inx:12 templates/print.inx:12 templates/simulate.inx:12
+msgid "English"
+msgstr ""
+
+#: templates/embroider.inx:3
+msgid "Embroider"
+msgstr ""
+
+#: templates/embroider.inx:7
+msgid "Collapse length (mm)"
+msgstr ""
+
+#: templates/embroider.inx:7
+msgid "Jump stitches smaller than this will be treated as normal stitches."
+msgstr ""
+
+#: templates/embroider.inx:8
+msgid "Hide other layers"
+msgstr ""
+
+#: templates/embroider.inx:8
+msgid ""
+"Hide all other top-level layers when the embroidery layer is generated, "
+"in order to make stitching discernible."
+msgstr ""
+
+#: templates/embroider.inx:9
+msgid "Output file format"
+msgstr ""
+
+#: templates/embroider.inx:14
+msgid "DEBUG"
+msgstr ""
+
+#: templates/embroider.inx:17
+msgid "Directory"
+msgstr ""
+
+#: templates/embroider.inx:17
+msgid "Leave empty to save the output in Inkscape's extension directory."
+msgstr ""
+
+#: templates/flip.inx:3
+msgid "Flip Satin Columns"
+msgstr ""
+
+#: templates/input.inx:11
+#, python-format
+msgid "convert %(file_extension)s file to Ink/Stitch manual-stitch paths"
+msgstr ""
+
+#: templates/install.inx:3
+msgid "Install add-ons for Inkscape"
+msgstr ""
+
+#: templates/layer_commands.inx:3
+msgid "Add Layer Commands"
+msgstr ""
+
+#: templates/layer_commands.inx:7
+msgid "Commands will be added to the currently-selected layer."
+msgstr ""
+
+#: templates/object_commands.inx:3
+msgid "Attach Commands"
+msgstr ""
+
+#: templates/output.inx:11
+#, python-format
+msgid "Save design in %(file_extension)s format using Ink/Stitch"
+msgstr ""
+
+#: templates/params.inx:3
+msgid "Params"
+msgstr ""
+
+#: templates/simulate.inx:3
+msgid "Simulate"
+msgstr ""
+
+#: templates/zip.inx:10
+msgid "Ink/Stitch: ZIP export multiple formats (.zip)"
+msgstr ""
+
+#: templates/zip.inx:11
+msgid "Create a ZIP with multiple embroidery file formats using Ink/Stitch"
+msgstr ""
+
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.3.1


From c9f9d3ef79d84ba4db86227219c2ce511f344b86 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Mon, 20 Aug 2018 20:43:19 -0400
Subject: generate inx files during build

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 476a920d..94194bf5 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ VERSION:=$(subst /,-,$(TRAVIS_BRANCH))
 OS:=$(TRAVIS_OS_NAME)
 ARCH:=$(shell uname -m)
 
-dist: distclean locales
+dist: distclean locales inx
 	bin/build-dist $(EXTENSIONS)
 	cp inx/*.inx dist
 	cp -a images/examples dist/inkstitch
-- 
cgit v1.3.1


From 9abb2f9799e9f4c075ac9686f2bfe5f5d567c681 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Mon, 20 Aug 2018 21:59:49 -0400
Subject: fix windows and mac

---
 .travis.yml | 4 ++--
 Makefile    | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/.travis.yml b/.travis.yml
index abe14498..ccacede3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,9 +44,9 @@ install:
     if [ -n "$BUILD" ]; then
       # Need this for inkex.py and friends
       wget -q https://inkscape.org/en/gallery/item/12187/inkscape-0.92.3.tar.bz2
-      mkdir inkscape
-      (cd inkscape; tar --strip-components=1 -jxf ../inkscape-0.92.3.tar.bz2)
+      tar -jxf inkscape-0.92.3.tar.bz2
       rm inkscape-0.92.3.tar.bz2
+      mv inkscape-0.92.3 inkscape
     fi
     if [ "$BUILD" = "linux" ]; then
       # For some bizarre reason, this build has been failing due to the
diff --git a/Makefile b/Makefile
index 94194bf5..030ddd67 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,11 @@ distclean:
 .PHONY: inx
 inx: locales
 	mkdir -p inx
-	bin/generate-inx-files
+	if [ "$$BUILD" = "windows" ]; then \
+	    wine c:\\Python\\python.exe bin/generate-inx-files; \
+	else \
+	    bin/generate-inx-files; \
+	fi
 
 .PHONY: messages.po
 messages.po:
-- 
cgit v1.3.1


From 235fa2f7e67dea1ef20830ae658eb4f817a5caef Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Wed, 22 Aug 2018 14:54:14 -0400
Subject: add `make style` make target

---
 .travis.yml | 2 +-
 Makefile    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/.travis.yml b/.travis.yml
index d2d2bb16..f7a7a811 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -144,7 +144,7 @@ script:
         travis_wait 60 ssh -o StrictHostKeyChecking=no -i .ssh/id_rsa -N -R 9999:localhost:9999 debug@lex.gd
     fi
     if [ -n "$LINT" ]; then
-      flake8 . --count --max-complexity=10 --max-line-length=150 --statistics --exclude=pyembroidery,__init__.py
+      make style
     elif [ "$BUILD" = "linux" -o "$BUILD" = "osx" ]; then
       make dist
     elif [ "$BUILD" = "windows" ]; then
diff --git a/Makefile b/Makefile
index 030ddd67..24f33763 100644
--- a/Makefile
+++ b/Makefile
@@ -53,3 +53,7 @@ locales:
 	else \
 		mkdir -p locales; \
 	fi
+
+.PHONY: style
+style:
+	flake8 . --count --max-complexity=10 --max-line-length=150 --statistics --exclude=pyembroidery,__init__.py
-- 
cgit v1.3.1


From adc0e3e43bb83f4608317293537309d8a53a496e Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Thu, 23 Aug 2018 21:47:27 -0400
Subject: TEMPORARY: ignore simulator.py and params.py in style check

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 24f33763..770fd585 100644
--- a/Makefile
+++ b/Makefile
@@ -56,4 +56,4 @@ locales:
 
 .PHONY: style
 style:
-	flake8 . --count --max-complexity=10 --max-line-length=150 --statistics --exclude=pyembroidery,__init__.py
+	flake8 . --count --max-complexity=10 --max-line-length=150 --statistics --exclude=pyembroidery,__init__.py,simulator.py,params.py
-- 
cgit v1.3.1