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/nn_dlg.js | 17 +----------------
1 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/program/js/tiny_mce/plugins/searchreplace/langs/nn_dlg.js b/program/js/tiny_mce/plugins/searchreplace/langs/nn_dlg.js
old mode 100755
new mode 100644
index 3bb232d..3dddb7f
--- a/program/js/tiny_mce/plugins/searchreplace/langs/nn_dlg.js
+++ b/program/js/tiny_mce/plugins/searchreplace/langs/nn_dlg.js
@@ -1,16 +1 @@
-tinyMCE.addI18n('nn.searchreplace_dlg',{
-searchnext_desc:"S\u00F8k igjen",
-notfound:"S\u00F8ket avslutta. Fann ikkje s\u00F8kjestrengen.",
-search_title:"S\u00F8k",
-replace_title:"S\u00F8k/Erstatt",
-allreplaced:"Alle f\u00F8rekomstar av s\u00F8kjestrengen er erstatta.",
-findwhat:"Finn kva",
-replacewith:"Erstatt med",
-direction:"Retning",
-up:"Oppover",
-down:"Nedover",
-mcase:"Skill mellom store og sm\u00E5 teikn",
-findnext:"Finn neste",
-replace:"Erstatt",
-replaceall:"Erstatt alt"
-});
\ No newline at end of file
+tinyMCE.addI18n('nn.searchreplace_dlg',{findwhat:"Finn kva",replacewith:"Erstatt med",direction:"Retning",up:"Oppover",down:"Nedover",mcase:"Skill mellom store og sm\u00e5 teikn",findnext:"Finn neste",allreplaced:"Alle f\u00f8rekomstar av s\u00f8kjestrengen er erstatta.","searchnext_desc":"S\u00f8k igjen",notfound:"S\u00f8ket avslutta. Fann ikkje s\u00f8kjestrengen.","search_title":"S\u00f8k","replace_title":"S\u00f8k/Erstatt",replaceall:"Erstatt alt",replace:"Erstatt"});
\ No newline at end of file
--
Gitblit v1.9.1