[PATCH v2 3/3] Fix translations and clean general-functions.pl