Merge wake up when plugged/unplugged into plug-in prompt:

- changed few strings
- redundant java edits