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/cy_dlg.js | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/program/js/tiny_mce/plugins/emotions/langs/cy_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/cy_dlg.js
new file mode 100644
index 0000000..6e40f0c
--- /dev/null
+++ b/program/js/tiny_mce/plugins/emotions/langs/cy_dlg.js
@@ -0,0 +1 @@
+tinyMCE.addI18n('cy.emotions_dlg',{cry:"Crio",cool:"Iawn",desc:"Emosiynau",title:"Mewnosod Emosiwn",yell:"Gweiddi",wink:"Wincio",undecided:"Heb benderfynu","tongue_out":"Tafod allan",surprised:"Wedi synnu",smile:"Gw\u00ean",sealed:"Wedi\'i selio","money_mouth":"Ceg arian",laughing:"Chwerthin",kiss:"Cusan",innocent:"Dieuog",frown:"Gwgu","foot_in_mouth":"Troed yn y geg",embarassed:"Embaras",usage:"Defnyddiwch saethau dde a chwith i fforio."});
\ No newline at end of file
--
Gitblit v1.9.1