Speak English no longer included
Revert "Speak English no longer included"

This reverts commit b5832c1aa6effca25f898ed8070ee00252710c6f.
enableModXOR: SWMH and VIETi selections are now treated equally
Updated version, removed unimplemented dynamic version embedding
Merge branch 'hipi-swmh-viet-mutex'

Conflicts:
	installer/main.py
NBRT+ on Mac/Linux
Revert "NBRT+ on Mac/Linux"

This reverts commit 720c6a8dd8b7da80a3f85c7869586a5cbffe32f9.
French and Spanish translations updated, ext. character fixes
Allowed NBRT on Mac/Lin but warned & non-default + char encoding work

Known issue: I can't figure out how to get ARKO's translation fixes,
namely to the accent characters that are extended, to work reliably
on Windows Command Prompt (or PowerShell... only cygwin will ever
do the right thing).  I've tried pure UTF-8, pure Windows-1252,
pure ISO-8859-1 (Latin-1).  None of them give consistent results.
To top it off, it also depends upon how Python itself interprets
the characters (as indicated by the -*- coding: latin-1 -*- directive
at the top of the file), of which I've tried all the possible combos.

Text-based UIs suck, in other words.  At least ones that aren't UTF-8
aware such as cygwin.
Merge branch 'hist-cpp' into culture-splitter
Fixed multi-brace rewrite rule, exclude dynasty from rewrite if lowborn