intl: another sync with transifex and en -> en_US change

.tx/config

@@ -4,12 +4,11 @@ host = https://www.transifex.com
 [tvheadend.c]
 file_filter = intl/tvheadend.<lang>.po
 source_file = intl/tvheadend.pot
-source_lang = en_US
+source_lang = en
 type = PO
 
 [tvheadend.js]
 file_filter = intl/js/tvheadend.js.<lang>.po
 source_file = intl/js/tvheadend.js.pot
-source_lang = en_US
+source_lang = en
 type = PO
-

Makefile

@@ -22,7 +22,7 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST))).config.mk
 PROG    := $(BUILDDIR)/tvheadend
-LANGUAGES ?= bg cs de en en_GB es fa fr he hr hu it lv nl pl pt ru sv
+LANGUAGES ?= bg cs de en_US en_GB es fa fr he hr hu it lv nl pl pt ru sv
 
 #
 # Common compiler flags

Makefile.webui

@@ -22,7 +22,7 @@
 
 IAM=$(lastword $(MAKEFILE_LIST))
 WEBDIR ?= src/webui
-LANGUAGES ?= bg cs de en en_GB es fa fr he hr hu it lv nl pl pt ru sv
+LANGUAGES ?= bg cs de en_US en_GB es fa fr he hr hu it lv nl pl pt ru sv
 ROOTPATH = static
 
 ifneq ($(WEBUI),)
@@ -254,7 +254,7 @@ intl:
 
 intl/js/tvheadend.js.pot:
 
-#intl/js/tvheadend.js.en.po: intl/js/tvheadend.js.pot
+#intl/js/tvheadend.js.en_US.po: intl/js/tvheadend.js.pot
 #	$(call merge-po,$@,$<)
 
 #intl/js/tvheadend.js.en_GB.po: intl/js/tvheadend.js.pot
@@ -284,7 +284,7 @@ intl/js/tvheadend.js.pot:
 #intl/js/tvheadend.js.it.po: intl/js/tvheadend.js.pot
 #	$(call merge-po,$@,$<)
 
-src/webui/static/intl/tvh.en.js.gz: intl/js/tvheadend.js.en.po
+src/webui/static/intl/tvh.en_US.js.gz: intl/js/tvheadend.js.en_US.po
 	$(call go-po,$@,$<)
 
 src/webui/static/intl/tvh.en_GB.js.gz: intl/js/tvheadend.js.en_GB.po

intl/js/tvheadend.js.bg.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Tvheadend\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-02 13:59+0200\n"
-"PO-Revision-Date: 2015-09-27 17:43+0000\n"
+"PO-Revision-Date: 2015-10-20 12:29+0000\n"
 "Last-Translator: Jaroslav Kysela\n"
 "Language-Team: Bulgarian (http://www.transifex.com/tvheadend-foundation-cic/tvheadend/language/bg/)\n"
 "MIME-Version: 1.0\n"

intl/js/tvheadend.js.cs.po

@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Tvheadend\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-02 13:59+0200\n"
-"PO-Revision-Date: 2015-10-02 12:13+0000\n"
+"PO-Revision-Date: 2015-10-20 12:29+0000\n"
 "Last-Translator: Jaroslav Kysela\n"
 "Language-Team: Czech (http://www.transifex.com/tvheadend-foundation-cic/tvheadend/language/cs/)\n"
 "MIME-Version: 1.0\n"

intl/js/tvheadend.js.de.po

@@ -5,16 +5,16 @@
 # Translators:
 # Alexander Knöbel <alex@belogy.de>, 2015
 # Alfred Zastrow <alfred.zastrow@t-online.de>, 2015
-# stbenz, 2015
 # Nilsen <nils.eickelkamp@gmail.com>, 2015
 # Nilsen <nilsen.e@web.de>, 2015
+# stbenz, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Tvheadend\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-02 13:59+0200\n"
-"PO-Revision-Date: 2015-10-05 09:37+0000\n"
-"Last-Translator: Nilsen <nils.eickelkamp@gmail.com>\n"
+"PO-Revision-Date: 2015-10-20 12:29+0000\n"
+"Last-Translator: Jaroslav Kysela\n"
 "Language-Team: German (http://www.transifex.com/tvheadend-foundation-cic/tvheadend/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"