Comment 8 for bug 910297

The proposed fix (to the best of my testing) fully fixes this problem. However, it's a little non-obvious, because there are still some missing/untranslated strings...