From a3b85d7b8560cdc1057fcaffa3acbd247b4b5b7a Mon Sep 17 00:00:00 2001
From: Thomas B. <thomas@roundcube.net>
Date: Mon, 07 Oct 2013 13:19:03 -0400
Subject: [PATCH] Merge pull request #133 from cwickert/release-0.9-canned-responses

---
 program/js/tiny_mce/plugins/emotions/langs/nn_dlg.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/program/js/tiny_mce/plugins/emotions/langs/nn_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/nn_dlg.js
old mode 100755
new mode 100644
index 5b52074..17ad594
--- a/program/js/tiny_mce/plugins/emotions/langs/nn_dlg.js
+++ b/program/js/tiny_mce/plugins/emotions/langs/nn_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('nn.emotions_dlg',{cry:"Gret",cool:"Cool",desc:"Hum\u00f8rfjes",title:"Set inn hum\u00f8rfjes",yell:"Skri",wink:"Blunke",undecided:"Skeptisk",tongue_out:"Rekkje tunge",surprised:"Overraska",smile:"Glad",sealed:"Hemmeleg",money_mouth:"Pengar i munnen",laughing:"Ler",kiss:"Kyss",innocent:"Uskyldig",frown:"Skuffa",foot_in_mouth:"Fot i munnen",embarassed:"Flau"});
\ No newline at end of file
+tinyMCE.addI18n('nn.emotions_dlg',{cry:"Gret",cool:"Cool",desc:"Hum\u00f8rfjes",title:"Set inn hum\u00f8rfjes",yell:"Skri",wink:"Blunke",undecided:"Skeptisk","tongue_out":"Rekkje tunge",surprised:"Overraska",smile:"Glad",sealed:"Hemmeleg","money_mouth":"Pengar i munnen",laughing:"Ler",kiss:"Kyss",innocent:"Uskyldig",frown:"Skuffa","foot_in_mouth":"Fot i munnen",embarassed:"Flau",usage:"Bruk venstre og h\u00f8gre piltast for \u00e5 navigere"});
\ No newline at end of file

--
Gitblit v1.9.1