handle more cases in msgstr