EFForg · jsha · Aug 13, 2015 · Aug 13, 2015 · Aug 13, 2015 · Aug 13, 2015
diff --git a/.gitmodules b/.gitmodules
@@ -5,3 +5,7 @@
 	path = https-everywhere-checker
 	url = https://github.com/jsha/https-everywhere-checker.git
 	branch = coverage
+[submodule "translations"]
+	path = translations
+	url = https://git.torproject.org/translation.git
+	branch = https_everywhere
diff --git a/makexpi.sh b/makexpi.sh
@@ -37,6 +37,21 @@ if [ -n "$1" ] && [ "$2" != "--no-recurse" ] ; then
   # Use the version of the build script that was current when that
   # tag/release/branch was made.
   ./makexpi.sh $1 --no-recurse || exit 1
+
+  # Check that all the string present in the English entities file are present in
+  # each other locale we use. A missing entity causes a nasty error at startup.
+  # Note that we only make this check when doing tagged builds, since otherwise
+  # the check would fail anytime someone adds a new string in the entities file,
+  # before it is included in Transifex. Once the new string is in the master
+  # branch, Transifex will automatically fill it in with the default English
+  # value in all the other locales.
+  if bash utils/compare-locales.sh pkg/$XPI_NAME.xpi >&2
+  then
+    echo Validation of included locales completed. >&2
+  else
+    die "Validation of locales failed."
+  fi
+
   # The fact that the above works even when the thing you are building predates
   # support for --no-recurse in this script is (1) non-intuitive; (2) crazy; and (3)
   # involves two pristine checkouts of $1 within each other
@@ -100,6 +115,7 @@ fi
 [ -d pkg ] || mkdir pkg
 [ -e pkg/xpi-eff ] && rm -rf pkg/xpi-eff
 cp -a src/ pkg/xpi-eff/
+cp -a translations/ pkg/xpi-eff/chrome/locale/
 rm -r pkg/xpi-eff/chrome/content/rules
 [ -e pkg/xpi-amo ] && rm -rf pkg/xpi-amo
 cp -a pkg/xpi-eff/ pkg/xpi-amo/

diff --git a/src/chrome/content/rules/Stack-Exchange.xml b/src/chrome/content/rules/Stack-Exchange.xml
@@ -1,19 +1,7 @@
 <!--
-<<<<<<< HEAD
-	For rules causing false/broken MCB, Stack-Exchange-mixedcontent.xml.
-
-
-	Other Stack Exchange rulesets:
-
-		- Ask_Ubuntu.com.xml
-		- MathOverflow.net.xml
-		- Server_Fault.com.xml
-
-=======
 	This ruleset aims to cover all sites in the Stackexchange family
 
 	For rules causing false/broken MCB, see Stack-Exchange-mixedcontent.xml
->>>>>>> 783d04068f6f0f8568590e6332a23a7ce94c9430
 
 	Problematic domains:
 

diff --git a/src/chrome/locale/README.txt b/src/chrome/locale/README.txt
@@ -0,0 +1,15 @@
+We handle translations through Transifex, using the Tor Project's
+account. If you'd like to improve a translation, please visit
+https://www.transifex.com/otf/torproject/translate and sign up as a
+translator. The results will be automatically pushed to the https_everywhere
+branch of https://git.torproject.org/translation.git, which is included as
+a submodule here.
+
+If you'd like to update the translations in your locally checked-out repo, run:
+
+cd translations/
+git pull origin https_everywhere
+
+If you'd like to add a new string for translation, add it to the `en` locale.
+Once your change has been merged to master, it will show up in Transifex as
+available for translation.
diff --git a/src/chrome/locale/ar/https-everywhere.dtd b/src/chrome/locale/ar/https-everywhere.dtd
diff --git a/src/chrome/locale/ar/https-everywhere.properties b/src/chrome/locale/ar/https-everywhere.properties
diff --git a/src/chrome/locale/ar/ssl-observatory.dtd b/src/chrome/locale/ar/ssl-observatory.dtd
diff --git a/src/chrome/locale/bg/https-everywhere.dtd b/src/chrome/locale/bg/https-everywhere.dtd