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/eu_dlg.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/program/js/tiny_mce/plugins/emotions/langs/eu_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/eu_dlg.js
new file mode 100644
index 0000000..e8c51bc
--- /dev/null
+++ b/program/js/tiny_mce/plugins/emotions/langs/eu_dlg.js
@@ -0,0 +1 @@
+tinyMCE.addI18n('eu.emotions_dlg',{cry:"Negarrez",cool:"Ondo",desc:"Ikonotsoak",title:"Ikonotxoa sartu",yell:"Oihua",wink:"Keinua",undecided:"Zalantzan","tongue_out":"Mihia atera",surprised:"Harrituta",smile:"Irriparra",sealed:"Ixilik","money_mouth":"Ahoa diruz beteta",laughing:"Barrez",kiss:"Muxua",innocent:"Ni ez naiz izan",frown:"Desadostasuna","foot_in_mouth":"Hanka ahoan",embarassed:"Lotsatuta"});
\ No newline at end of file

--
Gitblit v1.9.1