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/hr_dlg.js | 21 +--------------------
1 files changed, 1 insertions(+), 20 deletions(-)
diff --git a/program/js/tiny_mce/plugins/emotions/langs/hr_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/hr_dlg.js
old mode 100755
new mode 100644
index 7d8f68a..d71e4a2
--- a/program/js/tiny_mce/plugins/emotions/langs/hr_dlg.js
+++ b/program/js/tiny_mce/plugins/emotions/langs/hr_dlg.js
@@ -1,20 +1 @@
-tinyMCE.addI18n('hr.emotions_dlg',{
-title:"Umetni emociju",
-desc:"Emocije",
-cool:"Cool",
-cry:"Pla\u010D",
-embarassed:"Sramim se",
-foot_in_mouth:"Izlanuo se",
-frown:"Mr\u0161ti se",
-innocent:"Nevina\u0161ce",
-kiss:"Poljubac",
-laughing:"Smijeh",
-money_mouth:"Bogata\u0161",
-sealed:"\u0160utim",
-smile:"Osmijeh",
-surprised:"Iznena\u0111en",
-tongue_out:"Belji se",
-undecided:"Neodlu\u010Dan",
-wink:"Namigiva",
-yell:"Vi\u010De"
-});
\ No newline at end of file
+tinyMCE.addI18n('hr.emotions_dlg',{cry:"Pla\u010d",cool:"Cool",desc:"Emotikoni",title:"Umetni emotikona",yell:"Vi\u010de",wink:"Namiguje",undecided:"Neodlu\u010dan","tongue_out":"Plazi jezik",surprised:"Iznena\u0111en",smile:"Osmijeh",sealed:"\u0160uti","money_mouth":"Bogata\u0161",laughing:"Smije se",kiss:"Poljubac",innocent:"Nevina\u0161ce",frown:"Mr\u0161ti se","foot_in_mouth":"Izlanuo se",embarassed:"Srami se"});
\ No newline at end of file
--
Gitblit v1.9.1