diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-05-28 15:52:30 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-05-28 15:52:30 +0200 |
| commit | 731d190fecb1976d845f6bd18768ee528b007232 (patch) | |
| tree | 323c63555256ad7e5faa6a9d3c10f957295d0ce1 /program/js/tiny_mce/plugins/emotions/langs/nb_dlg.js | |
| parent | 586ed69aa8f9df34076f4e3bb5e1ecf0cfc6581a (diff) | |
| parent | 8763170d224408bb01998d0a3393d2eacfc781ad (diff) | |
Merge branch 'tinymce4'
Conflicts:
program/js/app.js
program/js/editor.js
program/js/tiny_mce/tiny_mce.js
program/steps/utils/spell_html.inc
Diffstat (limited to 'program/js/tiny_mce/plugins/emotions/langs/nb_dlg.js')
| -rw-r--r-- | program/js/tiny_mce/plugins/emotions/langs/nb_dlg.js | 1 |
1 files changed, 0 insertions, 1 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 deleted file mode 100644 index 24757d24a..000000000 --- a/program/js/tiny_mce/plugins/emotions/langs/nb_dlg.js +++ /dev/null @@ -1 +0,0 @@ -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 |