am c058bf00: Merge "Make the Phone options dialog use current language" into gingerbread

* commit 'c058bf0043290f098fb487ee33e0da13f00134f2':
  Make the Phone options dialog use current language