merge of 'f846ca475de93d40904281e52da91281427a54e7'

merge of '19c55a6cca66e0a33172318a95601394c5b4d519'

Updated Simplified Chinese translation and email update. Closes #10165.

Eighth^WNinth time's the charm...

I guess this pref name was changed but this one line was not. This would

Fix some typos.

Minor merge duplication.

Always use Google jingle when the other end supports, will have to do this cpw.malu.xmpp.google_relay

Some unfinished code to take advantage of Google's relays cpw.malu.xmpp.google_relay

merge of 'f5c49596f57fc83dc46ab2d16a55561d871b3716'

(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 tip

mercurial