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/themes/simple/langs/nb.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/themes/simple/langs/nb.js')
-rw-r--r-- | program/js/tiny_mce/themes/simple/langs/nb.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/program/js/tiny_mce/themes/simple/langs/nb.js b/program/js/tiny_mce/themes/simple/langs/nb.js deleted file mode 100644 index 178bae8fa..000000000 --- a/program/js/tiny_mce/themes/simple/langs/nb.js +++ /dev/null @@ -1 +0,0 @@ -tinyMCE.addI18n('nb.simple',{"cleanup_desc":"Rens ukurant kode","redo_desc":"Gj\u00f8r om (Ctrl + Y)","undo_desc":"Angre (Ctrl+Z)","numlist_desc":"Nummerliste","bullist_desc":"Punktliste","striketrough_desc":"Gjennomstreking","underline_desc":"Understreking","italic_desc":"Kursiv","bold_desc":"Fet"});
\ No newline at end of file |