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/paste/langs/hy_dlg.js | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/program/js/tiny_mce/plugins/paste/langs/hy_dlg.js b/program/js/tiny_mce/plugins/paste/langs/hy_dlg.js
index a2e4561..adc0b31 100644
--- a/program/js/tiny_mce/plugins/paste/langs/hy_dlg.js
+++ b/program/js/tiny_mce/plugins/paste/langs/hy_dlg.js
@@ -1,5 +1 @@
-tinyMCE.addI18n('hy.paste_dlg',{
-text_title:"\u0555\u0563\u057F\u0561\u0563\u0578\u0580\u056E\u0565\u0584 CTRL + V \u057A\u0561\u057F\u0573\u0565\u0576\u057E\u0561\u056E \u057F\u0565\u0584\u057D\u057F\u056B \u057F\u0565\u0572\u0561\u0564\u0580\u0574\u0561\u0576 \u0570\u0561\u0574\u0561\u0580",
-text_linebreaks:"\u054A\u0561\u0570\u057A\u0561\u0576\u0565\u056C \u057F\u0578\u0572\u0561\u0564\u0561\u0580\u0571\u0565\u0580\u0568",
-word_title:"\u0555\u0563\u057F\u0561\u0563\u0578\u0580\u056E\u0565\u0584 CTRL + V \u057A\u0561\u057F\u0573\u0565\u0576\u057E\u0561\u056E \u057F\u0565\u0584\u057D\u057F\u056B \u057F\u0565\u0572\u0561\u0564\u0580\u0574\u0561\u0576 \u0570\u0561\u0574\u0561\u0580"
-});
\ No newline at end of file
+tinyMCE.addI18n('hy.paste_dlg',{"word_title":"\u0555\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u0565\u0584 CTRL + V \u057a\u0561\u057f\u0573\u0565\u0576\u057e\u0561\u056e \u057f\u0565\u0584\u057d\u057f\u056b \u057f\u0565\u0572\u0561\u0564\u0580\u0574\u0561\u0576 \u0570\u0561\u0574\u0561\u0580","text_linebreaks":"\u054a\u0561\u0570\u057a\u0561\u0576\u0565\u056c \u057f\u0578\u0572\u0561\u0564\u0561\u0580\u0571\u0565\u0580\u0568","text_title":"\u0555\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u0565\u0584 CTRL + V \u057a\u0561\u057f\u0573\u0565\u0576\u057e\u0561\u056e \u057f\u0565\u0584\u057d\u057f\u056b \u057f\u0565\u0572\u0561\u0564\u0580\u0574\u0561\u0576 \u0570\u0561\u0574\u0561\u0580"});
\ No newline at end of file
--
Gitblit v1.9.1