Merge pull request #1495 from zachcoyle/master

Fix PSP swapped Start/Select button highlighting
Fix ‘add untracked save states’ debug action.
Clean up & prepare for translations.