Merge pull request #281 from inkstitch/lexelby/build-fixes

a couple build fixes

3 files changed, 33 insertions, 22 deletions

diff --git a/.travis.yml b/.travis.yml
index a5841ba5..a3f6360b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -152,8 +152,11 @@ notifications:
   on_success: never
   on_failure: never
 before_deploy:
-  - git tag -f dev-build-${TRAVIS_BRANCH}
-  - git push -f https://${TRAVIS_REPO_SLUG%/*}:${GITHUB_API_KEY}@github.com/${TRAVIS_REPO_SLUG}.git dev-build-${TRAVIS_BRANCH}
+  - |
+    if [[ !("$TRAVIS_TAG" =~ ^v[0-9.]+$) ]]; then
+      git tag -f dev-build-${TRAVIS_BRANCH//\//-}
+      git push -f https://${TRAVIS_REPO_SLUG%/*}:${GITHUB_API_KEY}@github.com/${TRAVIS_REPO_SLUG}.git dev-build-${TRAVIS_BRANCH//\//-}
+    fi
 deploy:
   - provider: releases
     api_key:
diff --git a/Makefile b/Makefile
index 52ac919f..4c31f17e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 EXTENSIONS:=inkstitch
 
 # This gets the branch name or the name of the tag
-VERSION:=$(TRAVIS_BRANCH)
+VERSION:=$(subst /,-,$(TRAVIS_BRANCH))
 OS:=$(TRAVIS_OS_NAME)
 ARCH:=$(shell uname -m)
 
diff --git a/messages.po b/messages.po
index de74f1a0..3465114f 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-11 22:57-0400\n"
+"POT-Creation-Date: 2018-08-17 15:47-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"
@@ -494,29 +494,29 @@ msgstr ""
 msgid "Apply and Quit"
 msgstr ""
 
-#: lib/extensions/params.py:436
+#: lib/extensions/params.py:439
 msgid "Preview"
 msgstr ""
 
-#: lib/extensions/params.py:454
+#: lib/extensions/params.py:458
 msgid "Internal Error"
 msgstr ""
 
-#: lib/extensions/params.py:507
+#: lib/extensions/params.py:511
 msgid "Please enter or select a preset name first."
 msgstr ""
 
-#: lib/extensions/params.py:507 lib/extensions/params.py:513
-#: lib/extensions/params.py:541
+#: lib/extensions/params.py:511 lib/extensions/params.py:517
+#: lib/extensions/params.py:545
 msgid "Preset"
 msgstr ""
 
-#: lib/extensions/params.py:513
+#: lib/extensions/params.py:517
 #, python-format
 msgid "Preset \"%s\" not found."
 msgstr ""
 
-#: lib/extensions/params.py:541
+#: lib/extensions/params.py:545
 #, python-format
 msgid ""
 "Preset \"%s\" already exists.  Please use another name or press "
@@ -545,7 +545,7 @@ msgstr ""
 msgid "Ink/Stitch Print"
 msgstr ""
 
-#: lib/extensions/simulate.py:24
+#: lib/extensions/simulate.py:29
 msgid "Embroidery Simulation"
 msgstr ""
 
@@ -553,46 +553,54 @@ msgstr ""
 msgid "No embroidery file formats selected."
 msgstr ""
 
-#: lib/simulator.py:34
+#: lib/simulator.py:40
 msgid "Speed up"
 msgstr ""
 
-#: lib/simulator.py:34
+#: lib/simulator.py:40
 msgid "Press + or arrow up to speed up"
 msgstr ""
 
-#: lib/simulator.py:35
+#: lib/simulator.py:41
 msgid "Slow down"
 msgstr ""
 
-#: lib/simulator.py:35
+#: lib/simulator.py:41
 msgid "Press - or arrow down to slow down"
 msgstr ""
 
-#: lib/simulator.py:36
+#: lib/simulator.py:42
 msgid "Pause"
 msgstr ""
 
-#: lib/simulator.py:36
+#: lib/simulator.py:42
 msgid "Press P to pause the animation"
 msgstr ""
 
-#: lib/simulator.py:37
+#: lib/simulator.py:43
 msgid "Restart"
 msgstr ""
 
-#: lib/simulator.py:37
+#: lib/simulator.py:43
 msgid "Press R to restart the animation"
 msgstr ""
 
-#: lib/simulator.py:38
+#: lib/simulator.py:44
 msgid "Quit"
 msgstr ""
 
-#: lib/simulator.py:38
+#: lib/simulator.py:44
 msgid "Press Q to close the simulation window"
 msgstr ""
 
+#: lib/simulator.py:169
+msgid "Stitch # "
+msgstr ""
+
+#: lib/simulator.py:172
+msgid "Stitch #"
+msgstr ""
+
 #: lib/stitches/auto_fill.py:167
 msgid ""
 "Unable to autofill.  This most often happens because your shape is made "