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/advhr/langs/nn_dlg.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/program/js/tiny_mce/plugins/advhr/langs/nn_dlg.js b/program/js/tiny_mce/plugins/advhr/langs/nn_dlg.js
index 22720aa..535505a 100644
--- a/program/js/tiny_mce/plugins/advhr/langs/nn_dlg.js
+++ b/program/js/tiny_mce/plugins/advhr/langs/nn_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('nn.advhr_dlg',{size:"Storleik",noshade:"Inga skugge",width:"Breidd",normal:"Normal",widthunits:"Units"});
\ No newline at end of file
+tinyMCE.addI18n('nn.advhr_dlg',{size:"Storleik",noshade:"Inga skugge",width:"Breidd",normal:"Normal",widthunits:"Einingar"});
\ No newline at end of file
--
Gitblit v1.9.1