Bug 7317: Fix more translation issues