Fix address editing etc

[peteeveleigh]

Fixes for

• Address editing.
  • The correct address is now edited
  • The address selection radio button now behaves logically and doesn't change when you edit an address
• Payment screen
  • Shipping method is now shown
  • Changed "Edit" link for address and shipping method to "Change"
  • If only 1 shipping method available then change link is not shown
• Misc
  • Added new translation keys for "Change", "Choose", and "Choose another"
  • Put translations into alphabetical order to make it easier to find them