Merge pull request #8067 from Hinsbart/fix_ps_cross

InputMap: Rename joypad button "PS X" to "PS Cross".

editor/project_settings.cpp

@@ -39,7 +39,7 @@
 ProjectSettings *ProjectSettings::singleton = NULL;
 
 static const char *_button_names[JOY_BUTTON_MAX] = {
-	"PS X, XBox A, Nintendo B",
+	"PS Cross, XBox A, Nintendo B",
 	"PS Circle, XBox B, Nintendo A",
 	"PS Square, XBox X, Nintendo Y",
 	"PS Triangle, XBox Y, Nintendo X",