HTML editing fixes, upgrade to TinyMCE v3.0.6

git-svn-id: https://svn.roundcube.net/trunk@1308 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 20 insertions, 22 deletions

diff --git a/roundcubemail/program/js/tiny_mce/plugins/emotions/langs/en.js b/roundcubemail/program/js/tiny_mce/plugins/emotions/langs/en.js
deleted file mode 100644
index 3cdd67517..000000000
--- a/roundcubemail/program/js/tiny_mce/plugins/emotions/langs/en.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// UK lang variables

-

-tinyMCE.addToLang('emotions',{

-title : 'Insert emotion',

-desc : 'Emotions',

-cool : 'Cool',

-cry : 'Cry',

-embarassed : 'Embarassed',

-foot_in_mouth : 'Foot in mouth',

-frown : 'Frown',

-innocent : 'Innocent',

-kiss : 'Kiss',

-laughing : 'Laughing',

-money_mouth : 'Money mouth',

-sealed : 'Sealed',

-smile : 'Smile',

-surprised : 'Surprised',

-tongue_out : 'Tongue out',

-undecided : 'Undecided',

-wink : 'Wink',

-yell : 'Yell'

-});

diff --git a/roundcubemail/program/js/tiny_mce/plugins/emotions/langs/en_dlg.js b/roundcubemail/program/js/tiny_mce/plugins/emotions/langs/en_dlg.js
new file mode 100644
index 000000000..3b57ad9e3
--- /dev/null
+++ b/roundcubemail/program/js/tiny_mce/plugins/emotions/langs/en_dlg.js
@@ -0,0 +1,20 @@
+tinyMCE.addI18n('en.emotions_dlg',{

+title:"Insert emotion",

+desc:"Emotions",

+cool:"Cool",

+cry:"Cry",

+embarassed:"Embarassed",

+foot_in_mouth:"Foot in mouth",

+frown:"Frown",

+innocent:"Innocent",

+kiss:"Kiss",

+laughing:"Laughing",

+money_mouth:"Money mouth",

+sealed:"Sealed",

+smile:"Smile",

+surprised:"Surprised",

+tongue_out:"Tongue out",

+undecided:"Undecided",

+wink:"Wink",

+yell:"Yell"

+});
\ No newline at end of file