This reverts commit 995e00694bb38e00f3b2b8decd44c88d56863484, and
f6b3c7c837eec9f79e76c8e8587d9f635ff82203, to fix fdo#36907. It also permits
some user control over which dicts should be there.

Fix for fdo#34910. Also aligns dictionary names with
bootstrap's 838aba9d2f29464ffbecbdd12fa9e39ec7ce6dd6 commit - which
in turn fixes fdo#36926.
Signed-off-by: Andras Timar <timar74@gmail.com>