You know what folks, a lot of Mercurial merges failed, and I just now figured out why. So now all changes from stable are permanently synced in.

     1

// UK lang variables

     2

     3

tinyMCE.addToLang('nonbreaking',{

     4

desc : 'Insert non-breaking space character'

     5

});