From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop
---
program/js/tiny_mce/plugins/emotions/langs/hy_dlg.js | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/program/js/tiny_mce/plugins/emotions/langs/hy_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/hy_dlg.js
new file mode 100644
index 0000000..a43f53f
--- /dev/null
+++ b/program/js/tiny_mce/plugins/emotions/langs/hy_dlg.js
@@ -0,0 +1 @@
+tinyMCE.addI18n('hy.emotions_dlg',{cry:"Cry",cool:"Cool",desc:"\u054d\u0574\u0561\u0575\u056c\u056b\u056f\u0576\u0565\u0580",title:"\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c \u057d\u0574\u0561\u0575\u056c\u056b\u056f",yell:"Yell",wink:"Wink",undecided:"Undecided","tongue_out":"Tongue out",surprised:"Surprised",smile:"Smile",sealed:"Sealed","money_mouth":"Money mouth",laughing:"Laughing",kiss:"Kiss",innocent:"Innocent",frown:"Frown","foot_in_mouth":"Foot in mouth",embarassed:"Embarassed"});
\ No newline at end of file
--
Gitblit v1.9.1