This reverts commit bf0ea5c4.

Those variables are used in bin/distro-install-*.
Unable to find any issue with both distro-install and dev-install so
reverting.
If something really does break it needs fixing. Reverting this is not
an option.

which allows us to simplify the read in DTable.cxx quite a bit

Vim tends to replace 8 spaces with 1 tab, must reconfigure...

It adds key IDs to pot entries in the form of #. type comments.
In Pootle the translator can search for strings using the key IDs.

it creates 4 letter key IDs (same as in pot/po files)

kid is language code of Koshin. It is better to use a code
from the ISO 639 private range.

We need to handle fragment span in case the HTML span is not provided
by the source application.  According to the MS spec it is allowed.

The old code assumed that the source app would always provide an
HTML span.  Apparently some apps don't, and only provides a fragment
span.