Correct word for 'Manadarin' 國語

Apparently the previous word may be politically more sensitive.
Updated word for Mandarin

Takes into account that we'll be using both character sets soon.
Merge remote-tracking branch 'upstream/master'