tiny_mce 0.1.1 → 0.1.2

data/CHANGELOG_PLUGIN.rdoc

@@ -1,5 +1,9 @@
 = Plugin Changelog
 
+== Unreleased
+* Upgraded TinyMCE from 3.2.7 to 3.3.1 (see CHANGELOG_TINYMCE)
+* Multiple configurations supports and code cleanup (Marian Theisen)
+
 == Version 0.1.1
 * Upgraded TinyMCE from 3.2.6 to 3.2.7 (see CHANGELOG_TINYMCE) (Sergio Cambra)
 * Further compatibility fixes for Rails versions prior to 2.3.x

data/CHANGELOG_TINYMCE

@@ -1,3 +1,74 @@
+Version 3.3.1 (2010-03-18)
+	Added new live resize feature, the editor contents is now visible while resizing.
+	Fixed bug where some valid_element patterns would produce an unknown property error.
+	Fixed bug where it wasn't possible to toggle off blockquotes.
+	Fixed bug where an undo level wasn't produced when applying formatting using the styles dropdown.
+	Fixed bug where IE 6/7 wouldn't perform caret formatting due to a focus/event bug in IE.
+	Fixed bug where undo/redo wasn't restoring the previous selection correctly.
+	Fixed bug where the caret would become invisible if you resized the editor in latest Gecko.
+	Fixed bug where the class attribute wasn't completely removed in IE 6/7 when the removeClass function was used.
+	Fixed so the matchNode method of the Formatter class returns the matched format rule.
+	Fixed so it's possible to apply formatting to both blocks and as inline elements.
+Version 3.3 (2010-03-10)
+	Fixed bug where backspace on a table on IE would produce an empty tbody and some JS exceptions.
+	Fixed bug where some redundant children wasn't removed properly when applying inline styles to them.
+	Fixed bug where Chrome would produce incorect dialog sizes if the inlinepopups plugin wasn't used.
+	Fixed bug where spans with different classes would get merged if they where siblings to each other.
+	Fixed bug where IE 8 would crash if you used the spellchecker.
+	Fixed bug where Input Method for non western languages didn't work correctly.
+	Fixed bug where the UI would render incorrectly in FF 3.6 on Mac due to a bug n their rendering engine.
+	Fixed bug where WebKit wouldn't scroll down correctly if Shift+Enter was used. Patch contributed by Thomas Andersen.
+Version 3.3rc1 (2010-02-23)
+	Fixed bug with new legacyoutput plugin not working correctly on it's own.
+	Fixed bug some performance issues with removing text formats.
+	Fixed bug where TinyMCE specific attributes wasn't removed properly by remove format.
+	Fixed bug where it wasn't possible to align images within inline elements.
+	Fixed bug where Ctrl+Delete/Backspace would produce an invalid argument exception on IE.
+	Fixed bug where the search/replace logic could produce an infinite loop on IE for reverse searches.
+	Fixed bug where cloning formats in cells didn't work properly on IE.
+	Fixed bug where IE6 would produce a horizontal scroll bar.
+	Fixed so remove jQuery method removes the TinyMCE instance as well as the specified textarea.
+	Fixed so selected rows and cells gets updated using the row/cell properties dialogs.
+Version 3.3b2 (2010-02-04)
+	Fixed bug where sometimes img elements would be removed by split method in DOMUtils.
+	Fixed bug where merging of span elements could occur on bookmark nodes.
+	Fixed bug where classes wasn't properly removed when removeformat was used on IE 6.
+	Fixed bug where multiple calls to an tinyMCE.init with mode set to exact could produce the same unique ID.
+	Fixed bug with the IE selection implementation when it was feeded an document range.
+	Fixed bug where block elements formatting wasn't properly removed by removeformat on all browsers.
+	Fixed bug where selection location was lost if you performed a manual cleanup.
+	Fixed bug where removeformat wouldn't remove span elements within styled block elements.
+	Fixed bug where an error would be thrown if you clicked on the separator lines in menus.
+	Fixed bug with the jQuery plugin adding always adding a querystring value to other resources.
+	Fixed bug where IE would produce an error message if you had an empty editor instance.
+	Fixed bug where Shift+Enter didn't produce br elements on WebKit browsers.
+	Fixed bug where a temporary marker element wasn't removed by the paste plugin.
+	Fixed bug where inserting a table would produce two undo levels instead of one.
+Version 3.3b1 (2010-01-25)
+	Added new text formatting engine. Fixes a lot of browser quirks and adds new possibilities.
+	Added new advlist plugin that enables you to set the formats of list elements.
+	Added new paste plugin logic that enables you to retain style information from Office.
+	Added new autosave plugin logic that automatically saves contents in local storage.
+	Added new valid_styles option. Adds the possibility to restrict styles and their order.
+	Added new theme_advanced_runtime_fontsize option to display the runtime font size in font size select box.
+	Added new jquery plugin version that handles the gzip compressor amongst other things. Contributed by Speednet.
+	Added new $ function to tinymce namespace and editor instances for the jQuery build.
+	Added the possibility to get editors by index as well as name in the tinyMCE.editors collection.
+	Fixed so the contents inside the editor renders in standards mode by default.
+	Fixed bug where it wasn't possible to move the caret on short documents running in standards mode on IE.
+	Fixed bug where the decode method of the DOMUtils class could end up in an endless loop.
+	Fixed bug where it was possible to bypass the paste cleanup on non IE browsers if you clicked while pasting.
+	Fixed bug where some attributes wasn't serialized correctly on IE if wildcard attribute patters where used.
+	Fixed bug where entity decoding was performed on strings that didn't have any valid entities in them.
+	Fixed bugs with the insertNode method of the IE DOMRange implementation. Patch contributed by Scott McNaught.
+	Rewrote the getBookmark/moveToBookmark selection logic to boost performance on larger documents.
+	Rewrote the table plugin to include new cell selection logic and fixed various bugs and issues.
+	Merged the tinyMCE, tinymce and tinymce.EditorManager into the same instance makes more sense.
+	Removed browser setting since the browser support for TinyMCE is not far better than it was when that setting was introduced.
+	Changed the mce_ attribute prefix to the more standard _mce_ prefix. This is similar to browser vendors prefixes.
+	Optimized performance with named entities on Gecko. Regexp replace was executing very slowly probably due to a Gecko bug.
+	Optimized performance of the IE specific selection/range implementation.
+	Removed the safari plugin since we now replaced all text formatting logic to custom code.
 Version 3.2.7 (2009-09-22)
 	Fixed bug where uppercase paragraphs could still produce an invalid DOM tree on IE.
 	Fixed bug where split command didn't work on WebKit since the node serializer needs a real document to work with.
@@ -37,7 +108,7 @@ Version 3.2.6 (2009-08-19)
 	Fixed bug where the autoresize plugin would break the fullscreen functionality.
 	Fixed bug where tables would be chopped up running on IE using invalid contents and pasting paragraphs into a cell.
 	Fixed bug where the each method of jQuery build didn't iterate styleSheets. We now use the TinyMCE API one instead.
-	Fixed bug where auto switching to paragraphs after headers some times failed in Gecko.	
+	Fixed bug where auto switching to paragraphs after headers some times failed in Gecko.
 	Fixed so all editor options gets passed to the Serializer class. Patch contributed by Jasper Mattsson.
 	Fixed so script/style blocks isn't wrapped in paragraphs as other inline elements.
 	Fixed so the XHR requests sends the X-Requested-With HTTP header.
@@ -122,7 +193,7 @@ Version 3.2.2.1 (2009-03-19)
 	Added support for tel: URL prefixes. Even though this doesn't match any official RFC.
 	Fixed so the select method of the Selection class selects the first best suitable contents.
 	Fixed bug where the regexps for www. prefixes for link and advlink dialogs would match wwwX.
-	Fixed bug where the preview dialog would fail to open if the content_css wasn't defined. Patch contributed by David Bildstr�m (ChronoZ).
+	Fixed bug where the preview dialog would fail to open if the content_css wasn't defined. Patch contributed by David Bildstrˆm (ChronoZ).
 	Fixed bug where editors wasn't converted in application/xhtml+xml mode due to an issue with Sizzle.
 	Fixed bug where alignment would fail if multiple lines where selected.
 	Updated Sizzle engine to the latest version, this version fixes a few bugs that was reported.
@@ -171,7 +242,7 @@ Version 3.2.2 (2009-03-05)
 	Removed logic for compatibility with Safari 2.x, this browser is no longer supported since no one is using it.
 	Removed the auto domain relaxing feature. If loading scripts cross sub domains it's better to specify the document.domain by hand.
 Version 3.2.1.1 (2008-11-27)
-	Added new theme_advanced_default_background_color/theme_advanced_default_foreground_color options. Patch contributed by David Bildstr�m (ChronoZ).
+	Added new theme_advanced_default_background_color/theme_advanced_default_foreground_color options. Patch contributed by David Bildstrˆm (ChronoZ).
 	Fixed font style formatting compatibility issue with Adobe Air.
 	Fixed so legacy font elements get converted into spans even if cleanup_on_startup isn't enabled.
 	Fixed bug where pre elements could be incorrectly modified by an IE bug workaround. Patch contributed by hu vime.
@@ -382,7 +453,7 @@ Version 3.0.7 (2008-04-14)
 	Fixed bug where it was possible to add style information to the body element using the style plugin.
 	Fixed bug where Gecko would add an extra undo level some times due to the blur event.
 	Fixed bug where the underline icon would get active if the caret was inside a link element.
-	Fixed bug where merging th cells not working correctly. Patch contributed by Andr� R.
+	Fixed bug where merging th cells not working correctly. Patch contributed by AndrÈ R.
 	Fixed bug where forecolorpicker and backcolorpicker buttons where rendered incorrectly when the o2k7 skin was used.
 	Fixed bug where comment couldn't contain -- since it's invalid markup. It will now at least not break on those invalid comments.
 	Fixed bug where apos wasn't handled correctly in IE. It will now convert apos to ' on IE since that browser doesn't support that entity.
@@ -533,8 +604,8 @@ Version 3.0.3 (2008-03-03)
 Version 3.0.2.1 (2008-02-26)
 	Fixed alert/confirm dialogs so they display correctly.
 Version 3.0.2 (2008-02-26)
-	Added new body_id option that enables you to specify the id of the body inside the editor iframe based on ideas by David Bildstr�m (ChronoZ).
-	Added new body_class option that enables you to set the class for the body of the editor iframe based on ideas by David Bildstr�m (ChronoZ).
+	Added new body_id option that enables you to specify the id of the body inside the editor iframe based on ideas by David Bildstrˆm (ChronoZ).
+	Added new body_class option that enables you to set the class for the body of the editor iframe based on ideas by David Bildstrˆm (ChronoZ).
 	Added new CSS class to the default content.css files mceForceColors that forces white background and black text can be used with the body_class option.
 	Added new type parameter to the Editor.getParam function to reduce redundant logic for parsing hash tables.
 	Added new isDone method to the ScriptLoaded class, this enables you to check if a script has been loaded or not.
@@ -834,7 +905,7 @@ Version 3.0b1 (2007-11-21)
 	Fixed bug where the fullscreen mode of the HTML view source box threw an error.
 	Fixed bug where the mceFocus command didn't work correctly.
 	Fixed bug where the selection could get lost in IE using inlinepopups.
-	Fixed so the body of the editor area has the mceContentBody class just like the 2.x branch. 
+	Fixed so the body of the editor area has the mceContentBody class just like the 2.x branch.
 	Fixed so the media icon gets active when a media element is selected.
 Version 3.0a3 (2007-11-13)
 	Added new experimental jQuery and Prototype framework adapters to the development package.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005 Blake Watters
+Copyright (c) 2005,2008,2009,2010 Blake Watters, Kieran Pilkington
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/README.rdoc

@@ -2,7 +2,7 @@
 
 This plugin provides for the installation and utilization of TinyMCE in Ruby on Rails applications.
 
-TinyMCE is a WYSIWYG HTML editing component released under the GNU Public License 2.1 (GPL 2.1) by Moxiecode Systems (http://tinymce.moxiecode.com/).
+TinyMCE is a WYSIWYG HTML editing component released under the GNU Lesser General Public License 2.1 (LGPL 2.1) by Moxiecode Systems (http://tinymce.moxiecode.com/).
 
 
 == Installation
@@ -11,27 +11,28 @@ Installing TinyMCE for Rails takes no more than a few minutes to install.
 
 === Step 1
 
-Open a console, and in the root of you Rails application, install the plugin by running one of the following (depending on the method you use to import plugins):
+The recommended installation method for getting tiny_mce working in your application is to use the gem version. To do so, open the console and run:
+
+  [sudo] gem install tiny_mce
+
+Then add this to config/environment.rb of your Rails application:
+
+  config.gem 'tiny_mce'
+
+Alternatively, you can install it as a plugin. To do so, open a console, and in the root of you Rails application, install the plugin by running *one* of the following (depending on the method you use to import plugins):
 
 * script/plugin install git://github.com/kete/tiny_mce.git
 * piston import git://github.com/kete/tiny_mce.git vendor/plugins/tiny_mce
 * git submodule add git://github.com/kete/tiny_mce.git vendor/plugins/tiny_mce
 * Download the latest files ( http://github.com/kete/tiny_mce/tarball/master ) and extract to vendor/plugins/tiny_mce
 
-Alternatively, you can use the gem version:
-
-* sudo gem install kete-tiny_mce -s http://gems.github.com
-* Add this to config/environment.rb of your Rails application:
-
-  config.gem 'kete-tiny_mce', :lib => 'tiny_mce', :source => 'http://gems.github.com'
-
 === Step 2
 
-Add the following to the controller of the page you want to add TinyMCE to.
+Add the following to the top of the controller of the page you want to add TinyMCE to.
 
   uses_tiny_mce
 
-Then append the following to the text area you want to transform into a TinyMCE editor. You can change the name by editing the 'editor_selector' param in the controller code options.
+Then append the following to the text area you want to transform into a TinyMCE editor. You can change the name of the class you want to use by editing the 'editor_selector' param in the controller code options.
 
   :class => "mceEditor"
 
@@ -39,7 +40,6 @@ Lastly, add the following line(s) to the <head> element of your application view
 
   <%= include_tiny_mce_if_needed %>
 
-
 Now you're all set! Start your server. The gem/plugin will automatically copy the sources to the public javascripts directory when the server is started.
 
 
@@ -47,6 +47,28 @@ Now you're all set! Start your server. The gem/plugin will automatically copy th
 
 There are several ways to configure the plugin to get the desirable effect you're looking for. The following ways can be combined to create complex tiny mce setups
 
+=== Load Order
+
+A load order is present so that you have finer grained control over what shows up where. The load order currently looks like this. The later ones receive more power, that is, the overwrite similar settings in previous configurations.
+
+1. The default tiny_mce plugin settings. Sets it to work on textareas with class of mceEditor, with the english advanced theme.
+2. config/tiny_mce.yml if present. You set your own options here, used across all editors on the site.
+3. uses_tiny_mce declaration. You set you own options here, used across all editors in the controller.
+4. include_tiny_mce_if_needed declaration. You set your own options here, used across all editors contained within that layout.
+
+Below, I'll cover how to use #2, and #3, which are the most likely ones you'll want to use.
+
+=== Global Options
+
+If you have a set of default options that is used throughout all editors in your application, you might want to make them global. You can do this by putting your settings into config/tiny_mce.yml. If the file exists, the tiny_mce plugin will parse the options in it first.
+
+==== Example
+
+  theme: advanced
+  plugins:
+  - table
+  - fullscreen
+
 === TinyMCE options
 
 You can change the theme, order/choice of buttons, selectors Id, plugins, and many more by passing an :options hash to the uses_tiny_mce declaration.
@@ -114,7 +136,7 @@ TinyMCE has a range of convenience methods for loading TinyMCE. Besides the uses
 
 == Spellchecking
 
-See SPELLCHECKING_PLUGIN.rdoc
+See SPELLCHECKING_PLUGIN.rdoc . Note: Spell checking is not tested o regularly maintained. Use with caution.
 
 http://github.com/kete/tiny_mce/tree/master/SPELLCHECKING_PLUGIN.rdoc
 
@@ -150,4 +172,4 @@ This plugin was created by Blake Watters <blake@near-time.com>
 
 This plugin is currently maintained by Kieran Pilkington <kieran@katipo.co.nz>
 
-Bundled TinyMCE version: 3.2.7
+Bundled TinyMCE version: 3.3.1

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.description = %Q{Gem that allows easy implementation of the TinyMCE editor into your applications.}
     gem.email = 'kieran@katipo.co.nz'
     gem.homepage = 'http://github.com/kete/tiny_mce'
-    gem.authors = ['Blake Watters', 'Kieran Pilkington', 'Sergio Cambra', 'Alexander Semyonov']
+    gem.authors = ['Blake Watters', 'Kieran Pilkington', 'Sergio Cambra', 'Alexander Semyonov', 'Marian Theisen']
     gem.extra_rdoc_files = ['README.rdoc', 'SPELLCHECKING_PLUGIN.rdoc', 'CHANGELOG_PLUGIN.rdoc', 'DEV_UPGRADE_NOTES.rdoc']
     gem.rdoc_options << '--exclude=lib/tiny_mce/assets'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
@@ -20,8 +20,6 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-
-
 desc 'Default: run unit tests.'
 task :default => :test
 

data/SPELLCHECKING_PLUGIN.rdoc

@@ -1,3 +1,5 @@
+Note: Spell checking is not tested o regularly maintained. Use with caution.
+
 = Spellchecking in TinyMCE for Rails
 
 TinyMCE comes packed with a spellcheck plugin that relies on a server-side call to function.
@@ -39,7 +41,7 @@ By default, Spellchecking calls "/controller/spellchecker". But this won't alway
 Also, if you want to have other languages spellchecked, make sure they're installed for Aspell to use and then add to the comma delimited value of :spellchecker_languages in the format of
 
   FriendlyName=code
-  
+
 So the value for English, French, German and Spanish would look like this for example
 
   :spellchecker_languages => "+English=en,French=fr,German=de,Spanish=es",

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/tiny_mce.rb

@@ -1,6 +1,7 @@
 # Require all the necessary files to run TinyMCE
 require 'tiny_mce/base'
-require 'tiny_mce/option_validator'
+require 'tiny_mce/exceptions'
+require 'tiny_mce/configuration'
 require 'tiny_mce/spell_checker'
 require 'tiny_mce/helpers'
 
@@ -60,17 +61,11 @@ module TinyMCE
   end
 
   module Base
-    include TinyMCE::OptionValidator
     include TinyMCE::SpellChecker
   end
 end
 
-# Load up the available configuration options (we do it here because
-# the result doesn't, so we don't want to load it per request)
-TinyMCE::OptionValidator.load
-
 # Include the TinyMCE methods and TinyMCE Helpers into ActionController::Base
-
 if defined?(Rails) && defined?(ActionController)
   ActionController::Base.send(:include, TinyMCE::Base)
   ActionController::Base.send(:helper, TinyMCE::Helpers)

data/lib/tiny_mce/assets/tiny_mce/langs/ar.js

@@ -1,154 +1,154 @@
 tinyMCE.addI18n({ar:{
 common:{
-edit_confirm:"\u0647\u0644 \u062A\u0631\u064A\u062F \u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0627\u0644\u0645\u062D\u0631\u0631 \u0644\u0645\u0631\u0628\u0639 \u0627\u0644\u0646\u0635 \u0647\u0630\u0627?",
-apply:"\u062A\u0637\u0628\u064A\u0642",
-insert:"\u0627\u062F\u0631\u0627\u062C",
-update:"\u062A\u062D\u062F\u064A\u062B",
-cancel:"\u062A\u0631\u0627\u062C\u0639",
-close:"\u0627\u063A\u0644\u0627\u0642",
-browse:"\u0627\u0633\u062A\u0639\u0631\u0627\u0636",
-class_name:"\u0641\u0626\u0629",
-not_set:"-- \u0628\u062F\u0648\u0646 \u062A\u062D\u062F\u064A\u062F --",
-clipboard_msg:"\u0646\u0633\u062E/\u0642\u0635/\u0644\u0635\u0642 \u063A\u064A\u0631 \u0645\u062A\u0648\u0641\u0631\u0629 \u0644\u0645\u062A\u0635\u0641\u062D Mozilla \u0648 Firefox.\n\u0647\u0644 \u062A\u0631\u064A\u062F \u0645\u0639\u0631\u0641\u0629 \u0627\u0644\u0645\u0632\u064A\u062F \u0645\u0646 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062A \u062D\u0648\u0644 \u0647\u0630\u0627 \u0627\u0644\u0645\u0648\u0636\u0648\u0639?",
-clipboard_no_support:"\u062D\u0627\u0644\u064A\u0627\u060C \u0647\u0630\u0647 \u0627\u0644\u062E\u0627\u0635\u064A\u0629 \u063A\u064A\u0631 \u0645\u062F\u0639\u0648\u0645\u0629 \u0645\u0646 \u0642\u0628\u0644 \u0647\u0630\u0627 \u0627\u0644\u0645\u062A\u0635\u0641\u062D\u060C \u0627\u0633\u062A\u0639\u0645\u0644 \u0627\u062E\u062A\u0635\u0627\u0631\u0627\u062A \u0644\u0648\u062D\u0629 \u0627\u0644\u0645\u0641\u0627\u062A\u064A\u062D.",
-popup_blocked:"pop-up \u0644\u062A\u0633\u062A\u0639\u0645\u0644 \u0627\u0644\u0645\u062D\u0631\u0631 \u0628\u0635\u0648\u0631\u0629 \u0637\u0628\u064A\u0639\u064A\u0629 \u0644\u0627 \u0628\u062F \u0645\u0646 \u0627\u0644\u0633\u0645\u0627\u062D \u0644\u0644\u0646\u0648\u0627\u0641\u0630 \u0627\u0644\u0645\u0646\u0628\u062B\u0642\u0629 \u060C\u0627\u0636\u063A\u0637 \u0639\u0644\u0649 \u0627\u0644\u0634\u0631\u064A\u0637 \u0627\u0644\u0627\u0635\u0641\u0631 \u0627\u0639\u0644\u0649 \u0645\u062A\u0635\u0641\u062D\u0643 \u062B\u0645 \u0627\u062E\u062A\u064A\u0627\u0631 :\u0627\u0644\u0633\u0645\u0627\u062D \u0644",
-invalid_data:"\u062E\u0637\u0623: \u0627\u0644\u0642\u064A\u0645 \u0627\u0644\u0645\u062F\u062E\u0644\u0629 \u062E\u0627\u0637\u0626\u0629, \u0644\u0642\u062F \u062A\u0645 \u062A\u062D\u062F\u064A\u062F\u0647\u0627 \u0628\u0627\u0644\u0644\u0648\u0646 \u0627\u0644\u0623\u062D\u0645\u0631.",
-more_colors:"\u0645\u0632\u064A\u062F \u0645\u0646 \u0627\u0644\u0623\u0644\u0648\u0627\u0646"
+edit_confirm:"Do you want to use the WYSIWYG mode for this textarea?",
+apply:"Apply",
+insert:"Insert",
+update:"Update",
+cancel:"Cancel",
+close:"Close",
+browse:"Browse",
+class_name:"Class",
+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.",
+more_colors:"More colors"
 },
 contextmenu:{
-align:"\u0645\u062D\u0627\u0630\u0627\u0629",
-left:"\u064A\u0633\u0627\u0631",
-center:"\u0648\u0633\u0637",
-right:"\u064A\u0645\u064A\u0646",
-full:"\u0636\u0628\u0637"
+align:"Alignment",
+left:"Left",
+center:"Center",
+right:"Right",
+full:"Full"
 },
 insertdatetime:{
 date_fmt:"%Y-%m-%d",
 time_fmt:"%H:%M:%S",
-insertdate_desc:"\u0625\u062F\u0631\u0627\u062C \u0627\u0644\u062A\u0627\u0631\u064A\u062E",
-inserttime_desc:"\u0625\u062F\u0631\u0627\u062C \u0627\u0644\u0648\u0642\u062A",
-months_long:"\u064A\u0646\u0627\u064A\u0631,\u0641\u0628\u0631\u0627\u064A\u0631,\u0645\u0627\u0631\u0633,\u0627\u0628\u0631\u064A\u0644,\u0645\u0627\u064A\u0648,\u064A\u0648\u0646\u064A\u0648,\u064A\u0648\u0644\u064A\u0648,\u0627\u063A\u0633\u0637\u0633,\u0633\u0628\u062A\u0645\u0628\u0631,\u0627\u0643\u062A\u0648\u0628\u0631,\u0646\u0648\u0641\u0645\u0628\u0631,\u062F\u064A\u0633\u0645\u0628\u0631",
-months_short:"\u064A\u0646\u0627\u064A\u0631,\u0641\u0628\u0631\u0627\u064A\u0631,\u0645\u0627\u0631\u0633,\u0627\u0628\u0631\u064A\u0644,\u0645\u0627\u064A\u0648,\u064A\u0648\u0646\u064A\u0648,\u064A\u0648\u0644\u064A\u0648,\u0627\u063A\u0633\u0637\u0633,\u0633\u0628\u062A\u0645\u0628\u0631,\u0627\u0643\u062A\u0648\u0628\u0631,\u0646\u0648\u0641\u0645\u0628\u0631,\u062F\u064A\u0633\u0645\u0628\u0631",
-day_long:"\u0627\u0644\u0623\u062D\u062F,\u0627\u0644\u0625\u062B\u0646\u064A\u0646,\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621,\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621,\u0627\u0644\u062E\u0645\u064A\u0633,\u0627\u0644\u062C\u0645\u0639\u0629,\u0627\u0644\u0633\u0628\u062A,\u0627\u0644\u0623\u062D\u062F",
-day_short:"\u0627\u0644\u0623\u062D\u062F,\u0627\u0644\u0625\u062B\u0646\u064A\u0646,\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621,\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621,\u0627\u0644\u062E\u0645\u064A\u0633,\u0627\u0644\u062C\u0645\u0639\u0629,\u0627\u0644\u0633\u0628\u062A,\u0627\u0644\u0623\u062D\u062F"
+insertdate_desc:"Insert date",
+inserttime_desc:"Insert time",
+months_long:"January,February,March,April,May,June,July,August,September,October,November,December",
+months_short:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec",
+day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday",
+day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"
 },
 print:{
-print_desc:"\u0637\u0628\u0627\u0639\u0629"
+print_desc:"Print"
 },
 preview:{
-preview_desc:"\u0645\u0639\u0627\u064A\u0646\u0629"
+preview_desc:"Preview"
 },
 directionality:{
-ltr_desc:"\u0645\u0646 \u0627\u0644\u064A\u0633\u0627\u0631 \u0627\u0644\u0649 \u0627\u0644\u064A\u0645\u064A\u0646",
-rtl_desc:"\u0645\u0646 \u0627\u0644\u064A\u0645\u064A\u0646 \u0627\u0644\u0649 \u0627\u0644\u064A\u0633\u0627\u0631"
+ltr_desc:"Direction left to right",
+rtl_desc:"Direction right to left"
 },
 layer:{
-insertlayer_desc:"\u0625\u062F\u0631\u0627\u062C \u0637\u0628\u0642\u0629 \u062C\u062F\u064A\u062F\u0629",
-forward_desc:"\u062A\u062D\u0631\u064A\u0643 \u0644\u0644\u0645\u0642\u062F\u0645\u0629",
-backward_desc:"\u062A\u062D\u0631\u064A\u0643 \u0644\u0644\u0645\u0624\u062E\u0631\u0629",
-absolute_desc:"\u062A\u062B\u0628\u064A\u062A \u0645\u0637\u0644\u0642 \u0644\u0644\u0645\u0648\u0627\u0636\u0639",
-content:"\u0637\u0628\u0642\u0629 \u062C\u062F\u064A\u062F\u0629..."
+insertlayer_desc:"Insert new layer",
+forward_desc:"Move forward",
+backward_desc:"Move backward",
+absolute_desc:"Toggle absolute positioning",
+content:"New layer..."
 },
 save:{
-save_desc:"\u062D\u0641\u0638",
-cancel_desc:"\u0627\u0644\u063A\u0627\u0621 \u062C\u0645\u064A\u0639 \u0627\u0644\u062A\u0639\u062F\u064A\u0644\u0627\u062A"
+save_desc:"Save",
+cancel_desc:"Cancel all changes"
 },
 nonbreaking:{
-nonbreaking_desc:"\u0625\u062F\u0631\u0627\u062C \u0627\u0644\u062D\u0631\u0641 non-breaking space"
+nonbreaking_desc:"Insert non-breaking space character"
 },
 iespell:{
-iespell_desc:"\u062A\u0634\u063A\u064A\u0644 \u0627\u0644\u062A\u062F\u0642\u064A\u0642 \u0627\u0644\u0625\u0645\u0644\u0627\u0626\u064A",
-download:"\u0628\u0631\u0646\u0627\u0645\u062C ieSpell \u063A\u064A\u0631 \u0645\u0648\u062C\u0648\u062F. \u0647\u0644 \u062A\u0631\u064A\u062F \u0623\u0646 \u062A\u0642\u0648\u0645 \u0628\u062A\u062B\u0628\u064A\u062A\u0647 \u0627\u0644\u0622\u0646\u061F"
+iespell_desc:"Run spell checking",
+download:"ieSpell not detected. Do you want to install it now?"
 },
 advhr:{
-advhr_desc:"\u062E\u0637 \u0627\u0641\u0642\u064A"
+advhr_desc:"Horizontal rule"
 },
 emotions:{
-emotions_desc:"\u0627\u0644\u0625\u0628\u062A\u0633\u0627\u0645\u0627\u062A"
+emotions_desc:"Emotions"
 },
 searchreplace:{
-search_desc:"\u0628\u062D\u062B",
-replace_desc:"\u0628\u062D\u062B/\u0627\u0633\u062A\u0628\u062F\u0627\u0644"
+search_desc:"Find",
+replace_desc:"Find/Replace"
 },
 advimage:{
-image_desc:"\u0625\u062F\u0631\u0627\u062C/\u062A\u062D\u0631\u064A\u0631 \u0635\u0648\u0631\u0629"
+image_desc:"Insert/edit image"
 },
 advlink:{
-link_desc:"\u0625\u062F\u0631\u0627\u062C/\u062A\u0639\u062F\u064A\u0644 \u0631\u0627\u0628\u0637"
+link_desc:"Insert/edit link"
 },
 xhtmlxtras:{
-cite_desc:"\u0627\u0642\u062A\u0628\u0627\u0633",
-abbr_desc:"\u0627\u0644\u0627\u062E\u062A\u0635\u0627\u0631",
-acronym_desc:"\u0627\u0644\u0627\u062E\u062A\u0635\u0627\u0631",
-del_desc:"\u062D\u0630\u0641",
-ins_desc:"\u0625\u062F\u0631\u0627\u062C",
-attribs_desc:"\u0625\u062F\u0631\u0627\u062C/\u062A\u062D\u0631\u064A\u0631 \u0627\u0644\u062E\u0635\u0627\u0626\u0635"
+cite_desc:"Citation",
+abbr_desc:"Abbreviation",
+acronym_desc:"Acronym",
+del_desc:"Deletion",
+ins_desc:"Insertion",
+attribs_desc:"Insert/Edit Attributes"
 },
 style:{
-desc:"\u062A\u0639\u062F\u064A\u0644 CSS Style"
+desc:"Edit CSS Style"
 },
 paste:{
-paste_text_desc:"\u0644\u0635\u0642 \u0643\u0646\u0635 \u0639\u0627\u062F\u064A",
-paste_word_desc:"\u0644\u0635\u0642 \u0645\u0646 \u0645\u0633\u062A\u0646\u062F \u0648\u0648\u0631\u062F",
-selectall_desc:"\u062A\u062D\u062F\u064A\u062F \u0627\u0644\u0643\u0644"
+paste_text_desc:"Paste as Plain Text",
+paste_word_desc:"Paste from Word",
+selectall_desc:"Select All"
 },
 paste_dlg:{
-text_title:"\u0627\u0633\u062A\u062E\u062F\u0645 CTRL+V \u0641\u064A \u0644\u0648\u062D\u0629 \u0627\u0644\u0645\u0641\u0627\u062A\u064A\u062D \u0644\u0644\u0635\u0642 \u0627\u0644\u0646\u0635\u0641 \u0641\u064A \u0627\u0644\u0646\u0627\u0641\u0630\u0629.",
-text_linebreaks:"\u0627\u0628\u0642\u064A \u0641\u0648\u0627\u0635\u0644 \u0627\u0644\u0623\u0633\u0637\u0631",
-word_title:"\u0633\u062A\u062E\u062F\u0645 CTRL+V \u0641\u064A \u0644\u0648\u062D\u0629 \u0627\u0644\u0645\u0641\u0627\u062A\u064A\u062D \u0644\u0644\u0635\u0642 \u0627\u0644\u0646\u0635\u0641 \u0641\u064A \u0627\u0644\u0646\u0627\u0641\u0630\u0629."
+text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
+text_linebreaks:"Keep linebreaks",
+word_title:"Use CTRL+V on your keyboard to paste the text into the window."
 },
 table:{
-desc:"\u0625\u062F\u0631\u0627\u062C \u062C\u062F\u0648\u0644 \u062C\u062F\u064A\u062F",
-row_before_desc:"\u0627\u062F\u0631\u0627\u062C \u0635\u0641 \u0642\u0628\u0644",
-row_after_desc:"\u0627\u062F\u0631\u0627\u062C \u0635\u0641 \u0628\u0639\u062F",
-delete_row_desc:"\u062D\u0630\u0641 \u0635\u0641",
-col_before_desc:"\u0625\u062F\u0631\u0627\u062C \u0639\u0645\u0648\u062F \u0642\u0628\u0644",
-col_after_desc:"\u0625\u062F\u0631\u0627\u062C \u0639\u0645\u0648\u062F \u0628\u0639\u062F",
-delete_col_desc:"\u062D\u0630\u0641 \u0639\u0645\u0648\u062F",
-split_cells_desc:"\u062A\u0642\u0633\u064A\u0645 \u0627\u0644\u062E\u0644\u0627\u064A\u0627 \u0627\u0644\u0645\u062F\u0645\u0648\u062C\u0629",
-merge_cells_desc:"\u062F\u0645\u062C \u062E\u0644\u0627\u064A\u0627 \u0627\u0644\u062C\u062F\u0648\u0644",
-row_desc:"\u062E\u0635\u0627\u0626\u0635 \u0635\u0641 \u0627\u0644\u062C\u062F\u0648\u0644",
-cell_desc:"\u062E\u0635\u0627\u0626\u0635 \u062E\u0644\u064A\u0629 \u0627\u0644\u062C\u062F\u0648\u0644",
-props_desc:"\u062E\u0635\u0627\u0626\u0635 \u0627\u0644\u062C\u062F\u0648\u0644",
-paste_row_before_desc:"\u0644\u0635\u0642 \u0635\u0641 \u062C\u062F\u0648\u0644 \u0642\u0628\u0644",
-paste_row_after_desc:"\u0644\u0635\u0642 \u0635\u0641 \u062C\u062F\u0648\u0644 \u0628\u0639\u062F",
-cut_row_desc:"\u0642\u0635 \u0635\u0641",
-copy_row_desc:"\u0646\u0633\u062E \u0635\u0641",
-del:"\u062D\u0630\u0641 \u062C\u062F\u0648\u0644",
-row:"\u0635\u0641",
-col:"\u0639\u0645\u0648\u062F",
-cell:"\u062E\u0644\u064A\u0629"
+desc:"Inserts a new table",
+row_before_desc:"Insert row before",
+row_after_desc:"Insert row after",
+delete_row_desc:"Delete row",
+col_before_desc:"Insert column before",
+col_after_desc:"Insert column after",
+delete_col_desc:"Remove column",
+split_cells_desc:"Split merged table cells",
+merge_cells_desc:"Merge table cells",
+row_desc:"Table row properties",
+cell_desc:"Table cell properties",
+props_desc:"Table properties",
+paste_row_before_desc:"Paste table row before",
+paste_row_after_desc:"Paste table row after",
+cut_row_desc:"Cut table row",
+copy_row_desc:"Copy table row",
+del:"Delete table",
+row:"Row",
+col:"Column",
+cell:"Cell"
 },
 autosave:{
-unload_msg:"\u0627\u0644\u062A\u063A\u064A\u064A\u0631\u0627\u062A \u0627\u0644\u062A\u064A \u0642\u0645\u062A \u0628\u0647\u0627 \u0633\u062A\u0641\u0642\u062F \u0627\u0646 \u0642\u0645\u062A \u0628\u0627\u0644\u062A\u0646\u0642\u0644 \u0625\u0644\u0649 \u0635\u0641\u062D\u0627\u062A \u0623\u062E\u0631\u0649."
+unload_msg:"The changes you made will be lost if you navigate away from this page."
 },
 fullscreen:{
-desc:"\u0645\u0644\u0621 \u0627\u0644\u0634\u0627\u0634\u0629"
+desc:"Toggle fullscreen mode"
 },
 media:{
-desc:"\u0625\u062F\u0631\u0627\u062C / \u062A\u0639\u062F\u064A\u0644 \u0645\u0644\u0641 \u0645\u0635\u0627\u062F\u0631 \u0645\u062A\u0639\u062F\u062F\u0629 \u0645\u062F\u0645\u062C",
-edit:"\u062A\u0639\u062F\u064A\u0644 \u0645\u0644\u0641 \u0645\u0635\u0627\u062F\u0631 \u0645\u062A\u0639\u062F\u062F\u0629 \u0645\u062F\u0645\u062C"
+desc:"Insert / edit embedded media",
+edit:"Edit embedded media"
 },
 fullpage:{
-desc:"\u062E\u0635\u0627\u0626\u0635 \u0627\u0644\u0645\u0633\u062A\u0646\u062F"
+desc:"Document properties"
 },
 template:{
-desc:"\u0625\u062F\u0631\u0627\u062C \u0642\u0627\u0644\u0628 \u0645\u0648\u062C\u0648\u062F \u0645\u0633\u0628\u0642\u0627"
+desc:"Insert predefined template content"
 },
 visualchars:{
-desc:"\u062A\u0634\u063A\u064A\u0644/\u0627\u064A\u0642\u0627\u0641 \u0627\u0644\u0645\u0631\u0627\u0642\u0628\u0629 \u0627\u0644\u0628\u0635\u0631\u064A\u0629 \u0644\u0644\u0623\u062D\u0631\u0641"
+desc:"Visual control characters on/off."
 },
 spellchecker:{
-desc:"\u0627\u0644\u0645\u062F\u0642\u0642 \u0627\u0644\u0625\u0645\u0644\u0627\u0626\u064A",
-menu:"\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0645\u062F\u0642\u0642 \u0627\u0644\u0625\u0645\u0644\u0627\u0626\u064A",
-ignore_word:"\u062A\u062C\u0627\u0647\u0644 \u0627\u0644\u0643\u0644\u0645\u0629",
-ignore_words:"\u062A\u062C\u0627\u0647\u0644 \u0627\u0644\u0643\u0644",
-langs:"\u0627\u0644\u0644\u063A\u0627\u062A",
-wait:"\u0627\u0644\u0631\u062C\u0627\u0621 \u0627\u0644\u0625\u0646\u062A\u0638\u0627\u0631...",
-sug:"\u0627\u0644\u0625\u0642\u062A\u0631\u0627\u062D\u0627\u062A",
-no_sug:"\u0644\u0627 \u064A\u0648\u062C\u062F \u0627\u0642\u062A\u0631\u0627\u062D\u0627\u062A",
-no_mpell:"\u0644\u0645 \u064A\u062A\u0645 \u0627\u0644\u0639\u062B\u0648\u0631 \u0639\u0644\u0649 \u0623\u062E\u0637\u0627\u0621 \u0625\u0645\u0644\u0627\u0626\u064A\u0629."
+desc:"Toggle spellchecker",
+menu:"Spellchecker settings",
+ignore_word:"Ignore word",
+ignore_words:"Ignore all",
+langs:"Languages",
+wait:"Please wait...",
+sug:"Suggestions",
+no_sug:"No suggestions",
+no_mpell:"No misspellings found."
 },
 pagebreak:{
-desc:"\u0625\u062F\u0631\u0627\u062C \u0641\u0627\u0635\u0644 \u0627\u0644\u0635\u0641\u062D\u0627\u062A"
+desc:"Insert page break."
 }}});