Finish merging glossary, clean up temp files, unbreak some l10n