Refs #3510, #9113. Updated tinyMCE version in trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@9140 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 56 insertions, 3 deletions

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
index ea4a1b0e1..8a80d46b1 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
@@ -12,9 +12,54 @@ not_set:"-- Not set --",
 clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?",

 clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.",

 popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.",

-invalid_data:"Error: Invalid values entered, these are marked in red.",

+invalid_data:"{#field} is invalid",

+invalid_data_number:"{#field} must be a number",

+invalid_data_min:"{#field} must be a number greater than {#min}",

+invalid_data_size:"{#field} must be a number or percentage",

 more_colors:"More colors"

 },

+colors:{

+'000000':'Black',

+'993300':'Burnt orange',

+'333300':'Dark olive',

+'003300':'Dark green',

+'003366':'Dark azure',

+'000080':'Navy Blue',

+'333399':'Indigo',

+'333333':'Very dark gray',

+'800000':'Maroon',

+'FF6600':'Orange',

+'808000':'Olive',

+'008000':'Green',

+'008080':'Teal',

+'0000FF':'Blue',

+'666699':'Grayish blue',

+'808080':'Gray',

+'FF0000':'Red',

+'FF9900':'Amber',

+'99CC00':'Yellow green',

+'339966':'Sea green',

+'33CCCC':'Turquoise',

+'3366FF':'Royal blue',

+'800080':'Purple',

+'999999':'Medium gray',

+'FF00FF':'Magenta',

+'FFCC00':'Gold',

+'FFFF00':'Yellow',

+'00FF00':'Lime',

+'00FFFF':'Aqua',

+'00CCFF':'Sky blue',

+'993366':'Brown',

+'C0C0C0':'Silver',

+'FF99CC':'Pink',

+'FFCC99':'Peach',

+'FFFF99':'Light yellow',

+'CCFFCC':'Pale green',

+'CCFFFF':'Pale cyan',

+'99CCFF':'Light sky blue',

+'CC99FF':'Plum',

+'FFFFFF':'White'

+},

 contextmenu:{

 align:"Alignment",

 left:"Left",

@@ -151,7 +196,8 @@ langs:"Languages",
 wait:"Please wait...",

 sug:"Suggestions",

 no_sug:"No suggestions",

-no_mpell:"No misspellings found."

+no_mpell:"No misspellings found.",

+learn_word:"Learn word" 

 },

 pagebreak:{

 desc:"Insert page break."

@@ -167,4 +213,11 @@ upper_roman:"Upper roman",
 circle:"Circle",

 disc:"Disc",

 square:"Square"

-}}});
\ No newline at end of file
+},

+aria:{

+rich_text_area:"Rich Text Area"

+},

+wordcount:{

+words: 'Words: '

+}

+}});
\ No newline at end of file