Apply Pluma gettext fix.
Added some fixes.