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

diff --git a/program/js/tiny_mce/plugins/emotions/langs/it_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/it_dlg.js
new file mode 100644
index 0000000..0699866
--- /dev/null
+++ b/program/js/tiny_mce/plugins/emotions/langs/it_dlg.js
@@ -0,0 +1 @@
+tinyMCE.addI18n('it.emotions_dlg',{cry:"Piango",cool:"Fico",desc:"Faccina",title:"Inserisci faccina",yell:"Arrabbiato",wink:"Occhiolino",undecided:"Indeciso","tongue_out":"Linguaccia",surprised:"Sorpreso",smile:"Sorridente",sealed:"Bocca sigillata","money_mouth":"Bocca danarosa",laughing:"Risatona",kiss:"Bacio",innocent:"Santarellino",frown:"Triste","foot_in_mouth":"Piede in bocca",embarassed:"Imbarazzato",usage:"Utilizza le freccie sinistra e destra per navigare."});
\ No newline at end of file

--
Gitblit v1.9.1