i18n support, adding dap_translation table
Merging in latest changes from master