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/hr_dlg.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/program/js/tiny_mce/plugins/searchreplace/langs/hr_dlg.js b/program/js/tiny_mce/plugins/searchreplace/langs/hr_dlg.js
old mode 100755
new mode 100644
index 14d96a5..9dafb45
--- a/program/js/tiny_mce/plugins/searchreplace/langs/hr_dlg.js
+++ b/program/js/tiny_mce/plugins/searchreplace/langs/hr_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('hr.searchreplace_dlg',{findwhat:"Prona\u0111i tekst",replacewith:"Zamijeni sa",direction:"Smjer",up:"Gore",down:"Dolje",mcase:"Match case",findnext:"Prona\u0111i sljede\u0107e",allreplaced:"Sva pojavljivanja tra\u017eenog teksta su zamijenjena.",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/Zamijeni",replaceall:"Zamijeni sve",replace:"Zamijeni"});
\ No newline at end of file
+tinyMCE.addI18n('hr.searchreplace_dlg',{findwhat:"Prona\u0111i tekst",replacewith:"Zamijeni sa",direction:"Smjer",up:"Gore",down:"Dolje",mcase:"Usporedi velika/mala slova",findnext:"Prona\u0111i sljede\u0107e",allreplaced:"Sva pojavljivanja tra\u017eenog teksta su zamijenjena.","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/Zamijeni",replaceall:"Zamijeni sve",replace:"Zamijeni"});
\ No newline at end of file
--
Gitblit v1.9.1