snapmergepuppy: various fixes + gettext