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/da_dlg.js | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/program/js/tiny_mce/plugins/emotions/langs/da_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/da_dlg.js
new file mode 100644
index 0000000..165137e
--- /dev/null
+++ b/program/js/tiny_mce/plugins/emotions/langs/da_dlg.js
@@ -0,0 +1 @@
+tinyMCE.addI18n('da.emotions_dlg',{cry:"Gr\u00e6de",cool:"Cool",desc:"Hum\u00f8rikoner",title:"Inds\u00e6t hum\u00f8rikon",yell:"R\u00e5be",wink:"Vink",undecided:"Ubeslutsom","tongue_out":"Tunge ud",surprised:"Overrasket",smile:"Smil",sealed:"Lukket","money_mouth":"Pengemund",laughing:"Grine",kiss:"Kys",innocent:"Uskyldig",frown:"Forskr\u00e6kket","foot_in_mouth":"Fod i munden",embarassed:"Flov",usage:"Brug venstre og h\u00f8jre piletaster til at navigere"});
\ No newline at end of file
--
Gitblit v1.9.1