* a couple localization updates * fix merge conflicts * fix * fixes
The note is not visible to the blocked user.