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, 177 insertions, 0 deletions

diff --git a/program/js/tinymce/langs/en_CA.js b/program/js/tinymce/langs/en_CA.js
new file mode 100644
index 000000000..1ddc16dfc
--- /dev/null
+++ b/program/js/tinymce/langs/en_CA.js
@@ -0,0 +1,177 @@
+tinymce.addI18n('en_CA',{
+"Cut": "Cut",
+"Header 2": "Header 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.",
+"Div": "Div",
+"Paste": "Paste",
+"Close": "Close",
+"Font Family": "Font Family",
+"Pre": "Pre",
+"Align right": "Align right",
+"New document": "New document",
+"Blockquote": "Blockquote",
+"Numbered list": "Numbered list",
+"Increase indent": "Increase indent",
+"Formats": "Formats",
+"Headers": "Headers",
+"Select all": "Select all",
+"Header 3": "Header 3",
+"Blocks": "Blocks",
+"Undo": "Undo",
+"Strikethrough": "Strikethrough",
+"Bullet list": "Bullet list",
+"Header 1": "Header 1",
+"Superscript": "Superscript",
+"Clear formatting": "Clear formatting",
+"Font Sizes": "Font Sizes",
+"Subscript": "Subscript",
+"Header 6": "Header 6",
+"Redo": "Redo",
+"Paragraph": "Paragraph",
+"Ok": "Ok",
+"Bold": "Bold",
+"Code": "Code",
+"Italic": "Italic",
+"Align center": "Align center",
+"Header 5": "Header 5",
+"Decrease indent": "Decrease indent",
+"Header 4": "Header 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",
+"Underline": "Underline",
+"Cancel": "Cancel",
+"Justify": "Justify",
+"Inline": "Inline",
+"Copy": "Copy",
+"Align left": "Align left",
+"Visual aids": "Visual aids",
+"Lower Greek": "Lower Greek",
+"Square": "Square",
+"Default": "Default",
+"Lower Alpha": "Lower Alpha",
+"Circle": "Circle",
+"Disc": "Disc",
+"Upper Alpha": "Upper Alpha",
+"Upper Roman": "Upper Roman",
+"Lower Roman": "Lower Roman",
+"Name": "Name",
+"Anchor": "Anchor",
+"You have unsaved changes are you sure you want to navigate away?": "You have unsaved changes are you sure you want to navigate away?",
+"Restore last draft": "Restore last draft",
+"Special character": "Special character",
+"Source code": "Source code",
+"Right to left": "Right to left",
+"Left to right": "Left to right",
+"Emoticons": "Emoticons",
+"Robots": "Robots",
+"Document properties": "Document properties",
+"Title": "Title",
+"Keywords": "Keywords",
+"Encoding": "Encoding",
+"Description": "Description",
+"Author": "Author",
+"Fullscreen": "Fullscreen",
+"Horizontal line": "Horizontal line",
+"Horizontal space": "Horizontal space",
+"Insert\/edit image": "Insert\/edit image",
+"General": "General",
+"Advanced": "Advanced",
+"Source": "Source",
+"Border": "Border",
+"Constrain proportions": "Constrain proportions",
+"Vertical space": "Vertical space",
+"Image description": "Image description",
+"Style": "Style",
+"Dimensions": "Dimensions",
+"Insert image": "Insert image",
+"Insert date\/time": "Insert date\/time",
+"Remove link": "Remove link",
+"Url": "Url",
+"Text to display": "Text to display",
+"Anchors": "Anchors",
+"Insert link": "Insert link",
+"New window": "New window",
+"None": "None",
+"Target": "Target",
+"Insert\/edit link": "Insert\/edit link",
+"Insert\/edit video": "Insert\/edit video",
+"Poster": "Poster",
+"Alternative source": "Alternative source",
+"Paste your embed code below:": "Paste your embed code below:",
+"Insert video": "Insert video",
+"Embed": "Embed",
+"Nonbreaking space": "Nonbreaking space",
+"Page break": "Page break",
+"Paste as text": "Paste as text",
+"Preview": "Preview",
+"Print": "Print",
+"Save": "Save",
+"Could not find the specified string.": "Could not find the specified string.",
+"Replace": "Replace",
+"Next": "Next",
+"Whole words": "Whole words",
+"Find and replace": "Find and replace",
+"Replace with": "Replace with",
+"Find": "Find",
+"Replace all": "Replace all",
+"Match case": "Match case",
+"Prev": "Prev",
+"Spellcheck": "Spellcheck",
+"Finish": "Finish",
+"Ignore all": "Ignore all",
+"Ignore": "Ignore",
+"Insert row before": "Insert row before",
+"Rows": "Rows",
+"Height": "Height",
+"Paste row after": "Paste row after",
+"Alignment": "Alignment",
+"Column group": "Column group",
+"Row": "Row",
+"Insert column before": "Insert column before",
+"Split cell": "Split cell",
+"Cell padding": "Cell padding",
+"Cell spacing": "Cell spacing",
+"Row type": "Row type",
+"Insert table": "Insert table",
+"Body": "Body",
+"Caption": "Caption",
+"Footer": "Footer",
+"Delete row": "Delete row",
+"Paste row before": "Paste row before",
+"Scope": "Scope",
+"Delete table": "Delete table",
+"Header cell": "Header cell",
+"Column": "Column",
+"Cell": "Cell",
+"Header": "Header",
+"Cell type": "Cell type",
+"Copy row": "Copy row",
+"Row properties": "Row properties",
+"Table properties": "Table properties",
+"Row group": "Row group",
+"Right": "Right",
+"Insert column after": "Insert column after",
+"Cols": "Cols",
+"Insert row after": "Insert row after",
+"Width": "Width",
+"Cell properties": "Cell properties",
+"Left": "Left",
+"Cut row": "Cut row",
+"Delete column": "Delete column",
+"Center": "Center",
+"Merge cells": "Merge cells",
+"Insert template": "Insert template",
+"Templates": "Templates",
+"Background color": "Background colour",
+"Text color": "Text colour",
+"Show blocks": "Show blocks",
+"Show invisible characters": "Show invisible characters",
+"Words: {0}": "Words: {0}",
+"Insert": "Insert",
+"File": "File",
+"Edit": "Edit",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help",
+"Tools": "Tools",
+"View": "View",
+"Table": "Table",
+"Format": "Format"
+});
\ No newline at end of file