Merge pull request #866 from parente/fix-en-po

More translation fixes

Makefile

@@ -77,7 +77,7 @@ tx-en: ## rebuild en locale strings and push to master (req: GH_TOKEN)
 	@cd docs && sphinx-intl update -p _build/gettext -l en
 
 	@git add docs/locale/en
-	@git commit -m "Update en source strings for $$TRAVIS_COMMIT"
+	@git commit -m "[ci skip] Update en source strings (build: $$TRAVIS_JOB_NUMBER)"
 
 	@git remote add origin-tx https://$${GH_TOKEN}@github.com/jupyter/docker-stacks.git
 	@git push -u origin-tx master

base-notebook/hooks/post_checkout

@@ -0,0 +1,4 @@
+#!/bin/bash
+if [[ "$COMMIT_MSG" = *"skip ci"* || "$COMMIT_MSG" = *"ci skip"* ]]; then
+    exit 1;
+fi

docs/.tx/config

@@ -9,19 +9,19 @@ type = PO
 
 [jupyter-docker-stacks-1.maintaining-po--master]
 file_filter = locale/<lang>/LC_MESSAGES/maintaining.po
-source_file = locale/en/LC_MESSAGES/maintaining.pot
+source_file = locale/en/LC_MESSAGES/maintaining.po
 source_lang = en
 type = PO
 
 [jupyter-docker-stacks-1.index-po--master]
 file_filter = locale/<lang>/LC_MESSAGES/index.po
-source_file = locale/en/LC_MESSAGES/index.pot
+source_file = locale/en/LC_MESSAGES/index.po
 source_lang = en
 type = PO
 
 [jupyter-docker-stacks-1.contributing-po--master]
 file_filter = locale/<lang>/LC_MESSAGES/contributing.po
-source_file = locale/en/LC_MESSAGES/contributing.pot
+source_file = locale/en/LC_MESSAGES/contributing.po
 source_lang = en
 type = PO