Improved Shop Page Display option

I tweaked the text of the second option in Shop Page Display because i guess it confuse users that only read "Show subcategories". What about main categories?

I'd like to change also "Show both" to "Show all". What do you think?
Merge pull request #6733 from SiR-DanieL/patch-3

Improved Shop Page Display option