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/ms_dlg.js | 17 +----------------
1 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/program/js/tiny_mce/plugins/searchreplace/langs/ms_dlg.js b/program/js/tiny_mce/plugins/searchreplace/langs/ms_dlg.js
old mode 100755
new mode 100644
index bd52c34..6ec6c15
--- a/program/js/tiny_mce/plugins/searchreplace/langs/ms_dlg.js
+++ b/program/js/tiny_mce/plugins/searchreplace/langs/ms_dlg.js
@@ -1,16 +1 @@
-tinyMCE.addI18n('ms.searchreplace_dlg',{
-searchnext_desc:"Cari lagi",
-notfound:"Carian tamat. Perkataan yang dicari tiada.",
-search_title:"Cari",
-replace_title:"Cari/Ganti",
-allreplaced:"Kesemua perkataan telah digantikan.",
-findwhat:"Cari apa",
-replacewith:"Ganti dengan",
-direction:"Arah",
-up:"Atas",
-down:"Bawah",
-mcase:"Samakan kes",
-findnext:"Carian seterusnya",
-replace:"Ganti",
-replaceall:"Ganti kesemuanya"
-});
\ No newline at end of file
+tinyMCE.addI18n('ms.searchreplace_dlg',{findwhat:"Cari apa",replacewith:"Ganti dengan",direction:"Arah",up:"Atas",down:"Bawah",mcase:"Samakan kes",findnext:"Carian seterusnya",allreplaced:"Kesemua perkataan telah digantikan.","searchnext_desc":"Cari lagi",notfound:"Carian tamat. Perkataan yang dicari tiada.","search_title":"Cari","replace_title":"Cari/Ganti",replaceall:"Ganti kesemuanya",replace:"Ganti"});
\ No newline at end of file
--
Gitblit v1.9.1