Merged Farhod's unlock dlg fix, and tweaked some strings