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/da_dlg.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/program/js/tiny_mce/plugins/searchreplace/langs/da_dlg.js b/program/js/tiny_mce/plugins/searchreplace/langs/da_dlg.js
old mode 100755
new mode 100644
index 89436c6..b551cea
--- a/program/js/tiny_mce/plugins/searchreplace/langs/da_dlg.js
+++ b/program/js/tiny_mce/plugins/searchreplace/langs/da_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('da.searchreplace_dlg',{findwhat:"S\u00f8g efter",replacewith:"Erstat med",direction:"Retning",up:"Op",down:"Ned",mcase:"Forskel p\u00e5 store og sm\u00e5 bogstaver",findnext:"Find n\u00e6ste",allreplaced:"Alle forekomster af s\u00f8gestrengen er erstattet.",searchnext_desc:"S\u00f8g igen",notfound:"S\u00f8gningen gav intet resultat.",search_title:"S\u00f8g",replace_title:"S\u00f8g / erstat",replaceall:"Erstat alle",replace:"Erstat"});
\ No newline at end of file
+tinyMCE.addI18n('da.searchreplace_dlg',{findwhat:"S\u00f8g efter",replacewith:"Erstat med",direction:"Retning",up:"Op",down:"Ned",mcase:"Forskel p\u00e5 store og sm\u00e5 bogstaver",findnext:"Find n\u00e6ste",allreplaced:"Alle forekomster af s\u00f8gestrengen er erstattet.","searchnext_desc":"S\u00f8g igen",notfound:"S\u00f8gningen gav intet resultat.","search_title":"S\u00f8g","replace_title":"S\u00f8g / erstat",replaceall:"Erstat alle",replace:"Erstat"});
\ No newline at end of file
--
Gitblit v1.9.1