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

1 files changed, 137 insertions, 0 deletions

diff --git a/program/js/tinymce/langs/vi.js b/program/js/tinymce/langs/vi.js
new file mode 100644
index 000000000..57fd1781d
--- /dev/null
+++ b/program/js/tinymce/langs/vi.js
@@ -0,0 +1,137 @@
+tinymce.addI18n('vi',{
+"Cut": "C\u1eaft",
+"Header 2": "Ti\u00eau \u0111\u1ec1 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Tr\u00ecnh duy\u1ec7t c\u1ee7a b\u1ea1n kh\u00f4ng h\u1ed7 tr\u1ee3 truy c\u1eadp truy c\u1eadp b\u1ed9 nh\u1edb \u1ea3o, vui l\u00f2ng s\u1eed d\u1ee5ng c\u00e1c t\u1ed5 h\u1ee3p ph\u00edm Ctrl + X, C, V.",
+"Div": "Khung",
+"Paste": "D\u00e1n",
+"Close": "\u0110\u00f3ng L\u1ea1i",
+"Pre": "\u0110\u1ecbnh d\u1ea1ng",
+"Align right": "Canh ph\u1ea3i",
+"New document": "T\u1ea1o t\u00e0i li\u1ec7u m\u1edbi",
+"Blockquote": "\u0110o\u1ea1n Tr\u00edch D\u1eabn",
+"Numbered list": "Danh s\u00e1ch d\u1ea1ng s\u1ed1",
+"Increase indent": "T\u0103ng kho\u1ea3ng c\u00e1ch d\u00f2ng",
+"Formats": "\u0110\u1ecbnh d\u1ea1ng",
+"Headers": "\u0110\u1ea7u trang",
+"Select all": "Ch\u1ecdn t\u1ea5t c\u1ea3",
+"Header 3": "Ti\u00eau \u0111\u1ec1 3",
+"Blocks": "Bao",
+"Undo": "H\u1ee7y thao t\u00e1c",
+"Strikethrough": "G\u1ea1ch ngang",
+"Bullet list": "Danh s\u00e1ch d\u1ea1ng bi\u1ec3u t\u01b0\u1ee3ng",
+"Header 1": "Ti\u00eau \u0111\u1ec1 1",
+"Superscript": "K\u00fd t\u1ef1 m\u0169",
+"Clear formatting": "L\u01b0\u1ee3c b\u1ecf ph\u1ea7n hi\u1ec7u \u1ee9ng",
+"Subscript": "K\u00fd t\u1ef1 th\u1ea5p",
+"Header 6": "Ti\u00eau \u0111\u1ec1 6",
+"Redo": "L\u00e0m l\u1ea1i",
+"Paragraph": "\u0110o\u1ea1n v\u0103n",
+"Ok": "\u0110\u1ed3ng \u00dd",
+"Bold": "In \u0111\u1eadm",
+"Code": "M\u00e3",
+"Italic": "In nghi\u00eang",
+"Align center": "Canh gi\u1eefa",
+"Header 5": "Ti\u00eau \u0111\u1ec1 5",
+"Decrease indent": "Th\u1ee5t l\u00f9i d\u00f2ng",
+"Header 4": "Ti\u00eau \u0111\u1ec1 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Ch\u1ee9c n\u0103ng D\u00e1n \u0111ang trong tr\u1ea1ng th\u00e1i v\u0103n b\u1ea3n \u0111\u01a1n gi\u1ea3n. N\u1ed9i dung s\u1ebd \u0111\u01b0\u1ee3c d\u00e1n d\u01b0\u1edbi d\u1ea1ng v\u0103n b\u1ea3n thu\u1ea7n, kh\u00f4ng c\u00f3 \u0111\u1ecbnh d\u1ea1ng.",
+"Underline": "G\u1ea1ch d\u01b0\u1edbi",
+"Cancel": "Hu\u1ef7 B\u1ecf",
+"Justify": "Canh \u0111\u1ec1u hai b\u00ean",
+"Inline": "C\u00f9ng d\u00f2ng",
+"Copy": "Sao ch\u00e9p",
+"Align left": "Canh tr\u00e1i",
+"Visual aids": "M\u1edf khung so\u1ea1n th\u1ea3o",
+"Lower Greek": "S\u1ed1 hy l\u1ea1p th\u01b0\u1eddng",
+"Square": "\u00d4 vu\u00f4ng",
+"Default": "M\u1eb7c \u0111\u1ecbnh",
+"Lower Alpha": "K\u00fd t\u1ef1 th\u01b0\u1eddng",
+"Circle": "H\u00ecnh tr\u00f2n",
+"Disc": "H\u00ecnh tr\u00f2n  d\u1ea1ng m\u1ecfng",
+"Upper Alpha": "K\u00fd t\u1ef1 hoa",
+"Upper Roman": "S\u1ed1 la m\u00e3 hoa",
+"Lower Roman": "S\u1ed1 la m\u00e3 th\u01b0\u1eddng",
+"You have unsaved changes are you sure you want to navigate away?": "B\u1ea1n ch\u01b0a l\u01b0u thay \u0111\u1ed5i b\u1ea1n c\u00f3 ch\u1eafc b\u1ea1n mu\u1ed1n di chuy\u1ec3n \u0111i?",
+"Restore last draft": "Kh\u00f4i ph\u1ee5c b\u1ea3n g\u1ea7n nh\u1ea5t",
+"Source code": "M\u00e3 ngu\u1ed3n",
+"Emoticons": "Bi\u1ec3u t\u01b0\u1ee3ng c\u1ea3m x\u00fac",
+"Robots": "Robots",
+"Document properties": "Thu\u1ed9c t\u00ednh t\u00e0i li\u1ec7u",
+"Title": "Ti\u00eau \u0111\u1ec1",
+"Keywords": "T\u1eeb kh\u00f3a",
+"Encoding": "M\u00e3 h\u00f3a",
+"Description": "M\u00f4 t\u1ea3",
+"Author": "T\u00e1c gi\u1ea3",
+"Horizontal line": "K\u1ebb ngang",
+"Horizontal space": "N\u1eb1m ngang",
+"Insert\/edit image": "Ch\u00e8n\/s\u1eeda \u1ea3nh",
+"General": "Chung",
+"Advanced": "N\u00e2ng cao",
+"Source": "Ngu\u1ed3n",
+"Border": "\u0110\u01b0\u1eddng vi\u1ec1n",
+"Constrain proportions": "T\u1ef7 l\u1ec7 h\u1ea1n ch\u1ebf",
+"Vertical space": "N\u1eb1m d\u1ecdc",
+"Image description": "M\u00f4 t\u1ea3 \u1ea3nh",
+"Style": "Ki\u1ec3u",
+"Dimensions": "K\u00edch th\u01b0\u1edbc",
+"Insert image": "Ch\u00e8n \u1ea3nh",
+"Insert\/edit video": "Ch\u00e8n\/s\u1eeda video",
+"Poster": "Ng\u01b0\u1eddi g\u1eedi",
+"Alternative source": "Ngu\u1ed3n thay th\u1ebf",
+"Paste your embed code below:": "D\u00e1n m\u00e3 nh\u00fang c\u1ee7a b\u1ea1n d\u01b0\u1edbi \u0111\u00e2y:",
+"Insert video": "Ch\u00e8n video",
+"Embed": "Nh\u00fang",
+"Page break": "Ng\u1eaft trang",
+"Paste as text": "D\u00e1n \u0111o\u1ea1n v\u0103n b\u1ea3n",
+"Preview": "Xem th\u1eed",
+"Print": "In",
+"Save": "L\u01b0u",
+"Spellcheck": "Ki\u1ec3m tra ch\u00ednh t\u1ea3",
+"Finish": "Ho\u00e0n t\u1ea5t",
+"Ignore all": "B\u1ecf qua t\u1ea5t",
+"Ignore": "B\u1ecf qua",
+"Insert row before": "Th\u00eam d\u00f2ng ph\u00eda tr\u00ean",
+"Rows": "D\u00f2ng",
+"Height": "Cao",
+"Paste row after": "D\u00e1n v\u00e0o ph\u00eda sau, d\u01b0\u1edbi",
+"Alignment": "Canh ch\u1ec9nh",
+"Column group": "Nh\u00f3m c\u1ed9t",
+"Row": "D\u00f2ng",
+"Insert column before": "Th\u00eam c\u1ed9t b\u00ean tr\u00e1i",
+"Split cell": "Chia \u00f4",
+"Cell padding": "Kho\u1ea3ng c\u00e1ch trong \u00f4",
+"Cell spacing": "Kho\u1ea3ng c\u00e1ch \u00f4",
+"Row type": "Lo\u1ea1i d\u00f2ng",
+"Insert table": "Th\u00eam b\u1ea3ng",
+"Body": "N\u1ed9i dung",
+"Caption": "Ti\u00eau \u0111\u1ec1",
+"Footer": "Ch\u00e2n",
+"Delete row": "Xo\u00e1 d\u00f2ng",
+"Paste row before": "D\u00e1n v\u00e0o ph\u00eda tr\u01b0\u1edbc, tr\u00ean",
+"Scope": "Quy\u1ec1n",
+"Delete table": "Xo\u00e1 b\u1ea3ng",
+"Header cell": "Ti\u00eau \u0111\u1ec1 \u00f4",
+"Column": "C\u1ed9t",
+"None": "Kh\u00f4ng",
+"Cell": "\u00d4",
+"Header": "Ti\u00eau \u0111\u1ec1",
+"Cell type": "Lo\u1ea1i \u00f4",
+"Copy row": "Ch\u00e9p d\u00f2ng",
+"Row properties": "Thu\u1ed9c t\u00ednh d\u00f2ng",
+"Table properties": "Thu\u1ed9c t\u00ednh b\u1ea3ng",
+"Row group": "Nh\u00f3m d\u00f2ng",
+"Right": "Ph\u1ea3i",
+"Insert column after": "Th\u00eam c\u1ed9t b\u00ean ph\u1ea3i",
+"Cols": "C\u1ed9t",
+"Insert row after": "Th\u00eam d\u00f2ng ph\u00eda d\u01b0\u1edbi",
+"Width": "R\u1ed9ng",
+"Cell properties": "Thu\u1ed9c t\u00ednh \u00f4",
+"Left": "Tr\u00e1i",
+"Cut row": "C\u1eaft d\u00f2ng",
+"Delete column": "Xo\u00e1 c\u1ed9t",
+"Center": "Gi\u1eefa",
+"Merge cells": "N\u1ed1i \u00f4",
+"Background color": "M\u00e0u n\u1ec1n",
+"Text color": "M\u00e0u v\u0103n b\u1ea3n",
+"Show invisible characters": "Hi\u1ec3n th\u1ecb k\u00fd t\u1ef1 \u1ea9n"
+});
\ No newline at end of file