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/searchreplace/langs/mk_dlg.js |   17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)

diff --git a/program/js/tiny_mce/plugins/searchreplace/langs/mk_dlg.js b/program/js/tiny_mce/plugins/searchreplace/langs/mk_dlg.js
old mode 100755
new mode 100644
index d7d531f..bf3828a
--- a/program/js/tiny_mce/plugins/searchreplace/langs/mk_dlg.js
+++ b/program/js/tiny_mce/plugins/searchreplace/langs/mk_dlg.js
@@ -1,16 +1 @@
-tinyMCE.addI18n('mk.searchreplace_dlg',{
-searchnext_desc:"Prona\u0111i opet",
-notfound:"Pretra\u017Eivanje je zavr\u0161eno. Tra\u017Eeni tekst nije prona\u0111en.",
-search_title:"Prona\u0111i",
-replace_title:"Prona\u0111i/Zameni",
-allreplaced:"Sva pojavljivanja tra\u017Eenog teksta su zamenjena.",
-findwhat:"Prona\u0111i tekst",
-replacewith:"Zameni sa",
-direction:"Smjer",
-up:"Gore",
-down:"Dolje",
-mcase:"Match case",
-findnext:"Prona\u0111i sljede\u0107e",
-replace:"Zameni",
-replaceall:"Zameni sve"
-});
\ No newline at end of file
+tinyMCE.addI18n('mk.searchreplace_dlg',{findwhat:"\u041d\u0430\u0458\u0434\u0438 \u0442\u0435\u043a\u0441\u0442",replacewith:"\u0417\u0430\u043c\u0435\u043d\u0438 \u0441\u043e",direction:"\u0421\u043c\u0435\u0440",up:"\u0413\u043e\u0440\u0435",down:"\u0414\u043e\u043b\u0435",mcase:"\u0441\u043b\u0443\u0447\u0430\u0458 \u043a\u043e\u0433\u0430 \u0435 \u043f\u043e\u0433\u043e\u0434\u0435\u043d\u043e",findnext:"\u041d\u0430\u0458\u0434\u0438 \u0441\u043b\u0435\u0434\u043d\u043e",allreplaced:"\u0421\u0438\u0442\u0435 \u043f\u043e\u0458\u0430\u0432\u0443\u0432\u0430\u045a\u0430 \u043d\u0430 \u0431\u0430\u0440\u0430\u043d\u0438\u043e\u0442 \u0442\u0435\u043a\u0441\u0442 \u0441\u0435 \u0437\u0430\u043c\u0435\u043d\u0435\u0442\u0438","searchnext_desc":"\u041d\u0430\u0458\u0434\u0438 \u043f\u043e\u0432\u0442\u043e\u0440\u043d\u043e",notfound:"\u0411\u0430\u0440\u0430\u045a\u0435\u0442\u043e \u0437\u0430\u0432\u0440\u0448\u0438. \u0411\u0430\u0440\u0430\u043d\u0438\u043e\u0442 \u0442\u0435\u043a\u0441\u0442 \u043d\u0435 \u0435 \u043d\u0430\u0458\u0434\u0435\u043d.","search_title":"\u041d\u0430\u0458\u0434\u0438","replace_title":"\u041d\u0430\u0458\u0434\u0438/\u0417\u0430\u043c\u0435\u043d\u0438",replaceall:"\u0417\u0430\u043c\u0435\u043d\u0438 \u0433\u0438 \u0441\u0438\u0442\u0435",replace:"\u0417\u0430\u043c\u0435\u043d\u0438"});
\ No newline at end of file

--
Gitblit v1.9.1