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.
// UK lang variables
tinyMCE.addToLang('flash',{
title : 'Insert / edit Flash Movie',
desc : 'Insert / edit Flash Movie',
file : 'Flash-File (.swf)',
size : 'Size',
list : 'Flash files',
props : 'Flash properties',
general : 'General'
});