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/fi_dlg.js | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/program/js/tiny_mce/plugins/emotions/langs/fi_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/fi_dlg.js
new file mode 100644
index 0000000..7e620dd
--- /dev/null
+++ b/program/js/tiny_mce/plugins/emotions/langs/fi_dlg.js
@@ -0,0 +1 @@
+tinyMCE.addI18n('fi.emotions_dlg',{cry:"Itku",cool:"Cool",desc:"Hymi\u00f6t",title:"Lis\u00e4\u00e4 hymi\u00f6",yell:"Huuto",wink:"Silm\u00e4nisku",undecided:"P\u00e4\u00e4tt\u00e4m\u00e4t\u00f6n","tongue_out":"Kieli ulkona",surprised:"Yll\u00e4ttynyt",smile:"Hymy",sealed:"Tukittu","money_mouth":"Klink Klink (raha)",laughing:"Nauru",kiss:"Pusu",innocent:"Viaton",frown:"Otsan rypistys","foot_in_mouth":"Jalka suussa",embarassed:"Nolostunut",usage:"K\u00e4yt\u00e4 vasenta ja oikeata nuolin\u00e4pp\u00e4int\u00e4 navigointiin."});
\ No newline at end of file
--
Gitblit v1.9.1