fix up lintian warnings, merge updated translations