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/emotions/langs/nb_dlg.js | 21 +--------------------
1 files changed, 1 insertions(+), 20 deletions(-)
diff --git a/program/js/tiny_mce/plugins/emotions/langs/nb_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/nb_dlg.js
old mode 100755
new mode 100644
index b593f7c..24757d2
--- a/program/js/tiny_mce/plugins/emotions/langs/nb_dlg.js
+++ b/program/js/tiny_mce/plugins/emotions/langs/nb_dlg.js
@@ -1,20 +1 @@
-tinyMCE.addI18n('nb.emotions_dlg',{
-title:"Sett inn hum\u00F8rfjes",
-desc:"Hum\u00F8rfjes",
-cool:"Cool",
-cry:"Gr\u00E5ter",
-embarassed:"Flau",
-foot_in_mouth:"Fot i munnen",
-frown:"Skuffet",
-innocent:"Uskyldig",
-kiss:"Kyss",
-laughing:"Ler",
-money_mouth:"Penger i munnen",
-sealed:"Hemmelig",
-smile:"Glad",
-surprised:"Overrasket",
-tongue_out:"Rekke tunge",
-undecided:"Skeptisk",
-wink:"Blunke",
-yell:"Skri"
-});
\ No newline at end of file
+tinyMCE.addI18n('nb.emotions_dlg',{cry:"Gr\u00e5ter",cool:"Kul",desc:"Hum\u00f8rfjes",title:"Sett inn hum\u00f8rfjes",yell:"Rope",wink:"Blunke",undecided:"Skeptisk","tongue_out":"Rekke tunge",surprised:"Overrasket",smile:"Smile",sealed:"Hemmelig","money_mouth":"Penger i munnen",laughing:"Ler",kiss:"Kyss",innocent:"Uskyldig",frown:"Skuffet","foot_in_mouth":"Fot i munnen",embarassed:"Flau",usage:"Bruk venstre og h\u00f8yre piltast for \u00e5 navigere."});
\ No newline at end of file
--
Gitblit v1.9.1