Merge branch 'develop' into feature/gradient-slider

Readme.md

@@ -1,25 +1,29 @@
-[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](https://www.gnu.org/licenses/agpl-3.0.en.html)
-
-## web-apps
-
-The frontend for [ONLYOFFICE Document Server][2]. Builds the program interface and allows the user create, edit, save and export text, spreadsheet and presentation documents using the common interface of a document editor.
-
-## Project Information
-
-Official website: [http://www.onlyoffice.org](http://onlyoffice.org "http://www.onlyoffice.org")
-
-Code repository: [https://github.com/ONLYOFFICE/web-apps](https://github.com/ONLYOFFICE/web-apps "https://github.com/ONLYOFFICE/web-apps")
-
-SaaS version: [http://www.onlyoffice.com](http://www.onlyoffice.com "http://www.onlyoffice.com")
-
-## User Feedback and Support
-
-If you have any problems with or questions about [ONLYOFFICE Document Server][2], please visit our official forum to find answers to your questions: [dev.onlyoffice.org][1] or you can ask and answer ONLYOFFICE development questions on [Stack Overflow][3].
-
-  [1]: http://dev.onlyoffice.org
-  [2]: https://github.com/ONLYOFFICE/DocumentServer
-  [3]: http://stackoverflow.com/questions/tagged/onlyoffice
-
-## License
-
-web-apps is released under an GNU AGPL v3.0 license. See the LICENSE file for more information.
+[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](https://www.gnu.org/licenses/agpl-3.0.en.html)
+
+## web-apps
+
+The frontend for [ONLYOFFICE Document Server][2]. Builds the program interface and allows the user create, edit, save and export text, spreadsheet and presentation documents using the common interface of a document editor.
+
+## Previos versions
+
+Until 2019-10-23 the repository was called web-apps-pro
+
+## Project Information
+
+Official website: [http://www.onlyoffice.org](http://onlyoffice.org "http://www.onlyoffice.org")
+
+Code repository: [https://github.com/ONLYOFFICE/web-apps](https://github.com/ONLYOFFICE/web-apps "https://github.com/ONLYOFFICE/web-apps")
+
+SaaS version: [http://www.onlyoffice.com](http://www.onlyoffice.com "http://www.onlyoffice.com")
+
+## User Feedback and Support
+
+If you have any problems with or questions about [ONLYOFFICE Document Server][2], please visit our official forum to find answers to your questions: [dev.onlyoffice.org][1] or you can ask and answer ONLYOFFICE development questions on [Stack Overflow][3].
+
+  [1]: http://dev.onlyoffice.org
+  [2]: https://github.com/ONLYOFFICE/DocumentServer
+  [3]: http://stackoverflow.com/questions/tagged/onlyoffice
+
+## License
+
+web-apps is released under an GNU AGPL v3.0 license. See the LICENSE file for more information.

apps/api/documents/api.js

@@ -129,7 +129,8 @@
                     toolbarNoTabs: false,
                     toolbarHideFileName: false,
                     reviewDisplay: 'original',
-                    spellcheck: true
+                    spellcheck: true,
+                    compatibleFeatures: false
                 },
                 plugins: {
                     autostart: ['asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}'],
@@ -797,7 +798,8 @@
         iframe.allowFullscreen = true;
         iframe.setAttribute("allowfullscreen",""); // for IE11
         iframe.setAttribute("onmousewheel",""); // for Safari on Mac
-		
+        iframe.setAttribute("allow", "autoplay");
+        
 		if (config.type == "mobile")
 		{
 			iframe.style.position = "fixed";

apps/common/main/lib/component/TabBar.js

@@ -103,6 +103,8 @@ define([
                     var me = this,
                         length = me.bar.tabs.length,
                         barBounds = me.bar.$bar.get(0).getBoundingClientRect();
+                    me.leftBorder = barBounds.left;
+                    me.rightBorder = barBounds.right;
 
                     if (barBounds) {
                         me.bounds       = [];
@@ -113,6 +115,8 @@ define([
                             this.bounds.push(me.bar.tabs[i].$el.get(0).getBoundingClientRect());
                         }
 
+                        me.lastTabRight = me.bounds[length - 1].right;
+
                         me.tabBarLeft   = me.bounds[0].left;
                         me.tabBarRight  = me.bounds[length - 1].right;
                         me.tabBarRight  = Math.min(me.tabBarRight, barBounds.right - 1);
@@ -322,18 +326,30 @@ define([
                     function dragMove (event) {
                         if (!_.isUndefined(me.drag)) {
                             me.drag.moveX = event.clientX*Common.Utils.zoom();
-                            if (me.drag.moveX > me.tabBarRight) {
+                           if (me.drag.moveX < me.leftBorder) {
+                                me.scrollLeft -= 20;
+                                me.bar.$bar.scrollLeft(me.scrollLeft);
+                                me.calculateBounds();
+                           } else if (me.drag.moveX < me.tabBarRight && me.drag.moveX > me.tabBarLeft) {
+                                var name = $(event.target).parent().data('label'),
+                                    currentTab = _.findIndex(bar.tabs, {label: name});
+                                if (currentTab === -1) {
+                                    bar.$el.find('li.mousemove').removeClass('mousemove right');
+                                    me.drag.place = undefined;
+                                } else if (me.bounds[currentTab].left - me.scrollLeft >= me.tabBarLeft) {
+                                    me.drag.place = currentTab;
+                                    $(event.target).parent().parent().find('li.mousemove').removeClass('mousemove right');
+                                    $(event.target).parent().addClass('mousemove');
+                                }
+                           } else if (me.drag.moveX > me.lastTabRight && Math.abs(me.tabBarRight - me.bounds[me.bar.tabs.length - 1].right) < 1) { //move to end of list, right border of the right tab is visible
+                                bar.$el.find('li.mousemove').removeClass('mousemove right');
                                 bar.tabs[bar.tabs.length - 1].$el.addClass('mousemove right');
                                 me.drag.place = bar.tabs.length;
-                            } else {
-                                $(event.target).parent().parent().find('li.mousemove').removeClass('mousemove right');
-                                $(event.target).parent().addClass('mousemove');
-                                var name = event.target.parentElement.dataset.label,
-                                    currentTab = _.findWhere(bar.tabs, {label: name});
-                                if (!_.isUndefined(currentTab)) {
-                                    me.drag.place = currentTab.sheetindex;
-                                }
-                            }
+                           } else if (me.drag.moveX - me.rightBorder > 3) {
+                               me.scrollLeft += 20;
+                               me.bar.$bar.scrollLeft(me.scrollLeft);
+                               me.calculateBounds();
+                           }
                         }
                     }
                     if (!_.isUndefined(bar) && !_.isUndefined(tabs) && bar.tabs.length > 1) {
@@ -357,7 +373,9 @@ define([
             click: $.proxy(function (event) {
                 if (!tab.disabled) {
                     if (event.ctrlKey || event.metaKey) {
-                        tab.changeState(true);
+                        if (!tab.isActive()) {
+                            tab.changeState(true);
+                        }
                     } else if (event.shiftKey) {
                         this.bar.$el.find('ul > li.selected').removeClass('selected');
                         this.bar.selectTabs.length = 0;
@@ -391,10 +409,12 @@ define([
             }, this.bar),
             mousedown: $.proxy(function (e) {
                 if (this.bar.options.draggable && !_.isUndefined(dragHelper) && (3 !== e.which)) {
-                    if (this.bar.selectTabs.length > 1) {
-                        dragHelper.setHookTabs(e, this.bar, this.bar.selectTabs);
-                    } else {
-                        dragHelper.setHook(e, this.bar, tab);
+                    if (!tab.isLockTheDrag) {
+                        if (this.bar.selectTabs.length > 1) {
+                            dragHelper.setHookTabs(e, this.bar, this.bar.selectTabs);
+                        } else {
+                            dragHelper.setHook(e, this.bar, tab);
+                        }
                     }
                 }
             }, this)

apps/common/main/lib/component/Window.js

@@ -348,20 +348,11 @@ define([
                 maxwidth = (this.initConfig.maxwidth) ? this.initConfig.maxwidth : main_width,
                 maxheight = (this.initConfig.maxheight) ? this.initConfig.maxheight : main_height;
 
-            if (this.resizing.type[0]>0) {
-                this.resizing.maxx  = Math.min(main_width, left+maxwidth);
-                this.resizing.minx  = left+this.initConfig.minwidth;
-            } else if (this.resizing.type[0]<0) {
-                this.resizing.maxx  = left+this.resizing.initw-this.initConfig.minwidth;
-                this.resizing.minx  = Math.max(0, left+this.resizing.initw-maxwidth);
-            }
-            if (this.resizing.type[1]>0) {
-                this.resizing.maxy  = Math.min(main_height, top+maxheight);
-                this.resizing.miny  = top+this.initConfig.minheight;
-            } else if (this.resizing.type[1]<0) {
-                this.resizing.maxy  = top+this.resizing.inith-this.initConfig.minheight;
-                this.resizing.miny  = Math.max(0, top+this.resizing.inith-maxheight);
-            }
+            this.resizing.minw  = this.initConfig.minwidth;
+            this.resizing.maxw = (this.resizing.type[0]>0) ? Math.min(main_width-left, maxwidth) : Math.min(left+this.resizing.initw, maxwidth);
+
+            this.resizing.minh  = this.initConfig.minheight;
+            this.resizing.maxh  = (this.resizing.type[1]>0) ? Math.min(main_height-top, maxheight) : Math.min(top+this.resizing.inith, maxheight);
 
             $(document.body).css('cursor', el.css('cursor'));
             this.$window.find('.resize-border').addClass('resizing');
@@ -378,16 +369,34 @@ define([
                     zoom = (event instanceof jQuery.Event) ? Common.Utils.zoom() : 1,
                     pageX = event.pageX*zoom,
                     pageY = event.pageY*zoom;
-                if (this.resizing.type[0] && pageX<this.resizing.maxx && pageX>this.resizing.minx) {
+                if (this.resizing.type[0]) {
+                    var new_width = this.resizing.initw + (pageX - this.resizing.initpage_x) * this.resizing.type[0];
+                    if (new_width>this.resizing.maxw) {
+                        pageX = pageX - (new_width-this.resizing.maxw) * this.resizing.type[0];
+                        new_width = this.resizing.maxw;
+                    } else if (new_width<this.resizing.minw) {
+                        pageX = pageX - (new_width-this.resizing.minw) * this.resizing.type[0];
+                        new_width = this.resizing.minw;
+                    }
+
                     if (this.resizing.type[0]<0)
                         this.$window.css({left: pageX - this.resizing.initx});
-                    this.setWidth(this.resizing.initw + (pageX - this.resizing.initpage_x) * this.resizing.type[0]);
+                    this.setWidth(new_width);
                     resized = true;
                 }
-                if (this.resizing.type[1] && pageY<this.resizing.maxy && pageY>this.resizing.miny) {
+                if (this.resizing.type[1]) {
+                    var new_height = this.resizing.inith + (pageY - this.resizing.initpage_y) * this.resizing.type[1];
+                    if (new_height>this.resizing.maxh) {
+                        pageY = pageY - (new_height-this.resizing.maxh) * this.resizing.type[1];
+                        new_height = this.resizing.maxh;
+                    } else if (new_height<this.resizing.minh) {
+                        pageY = pageY - (new_height-this.resizing.minh) * this.resizing.type[1];
+                        new_height = this.resizing.minh;
+                    }
+
                     if (this.resizing.type[1]<0)
                         this.$window.css({top: pageY - this.resizing.inity});
-                    this.setHeight(this.resizing.inith + (pageY - this.resizing.initpage_y) * this.resizing.type[1]);
+                    this.setHeight(new_height);
                     resized = true;
                 }
                 if (resized) this.fireEvent('resizing');

apps/common/main/lib/controller/Comments.js

@@ -821,6 +821,7 @@ define([
             }
         },
         onApiShowComment: function (uids, posX, posY, leftX, opts, hint) {
+            var apihint = hint;
             var same_uids = (0 === _.difference(this.uids, uids).length) && (0 === _.difference(uids, this.uids).length);
             
             if (hint && this.isSelectedComment && same_uids && !this.isModeChanged) {
@@ -886,7 +887,7 @@ define([
                         this.animate = false;
                     }
 
-                    this.isSelectedComment = !hint || !this.hintmode;
+                    this.isSelectedComment = !apihint || !this.hintmode;
                     this.uids = _.clone(uids);
 
                     comments.push(comment);

apps/common/main/lib/controller/History.js

@@ -177,7 +177,7 @@ define([
                 if (historyStore && data!==null) {
                     var rev, revisions = historyStore.findRevisions(data.version),
                         urlGetTime = new Date();
-                    var diff = (this.currentChangeId===undefined) ? null : opts.data.changesUrl, // if revision has changes, but serverVersion !== app.buildVersion -> hide revision changes
+                    var diff = (!opts.data.previous || this.currentChangeId===undefined) ? null : opts.data.changesUrl, // if revision has changes, but serverVersion !== app.buildVersion -> hide revision changes
                         url = (!_.isEmpty(diff) && opts.data.previous) ? opts.data.previous.url : opts.data.url,
                         docId = opts.data.key ? opts.data.key : this.currentDocId,
                         docIdPrev = opts.data.previous && opts.data.previous.key ? opts.data.previous.key : this.currentDocIdPrev,

apps/common/main/lib/view/Comments.js

@@ -559,9 +559,13 @@ define([
                 add = $('.new-comment-ct', this.el),
                 to = $('.add-link-ct', this.el),
                 msgs = $('.messages-ct', this.el);
-            msgs.toggleClass('stretch', !mode.canComments);
-            if (!mode.canComments) {
-                add.hide(); to.hide();
+            msgs.toggleClass('stretch', !mode.canComments || mode.compatibleFeatures);
+            if (!mode.canComments || mode.compatibleFeatures) {
+                if (mode.compatibleFeatures) {
+                    add.remove(); to.remove();
+                } else {
+                    add.hide(); to.hide();
+                }
                 this.layout.changeLayout([{el: msgs[0], rely: false, stretch: true}]);
             } else {
                 var container = $('#comments-box', this.el),

apps/common/main/lib/view/Header.js

@@ -183,7 +183,7 @@ define([
 
         function onLostEditRights() {
             _readonlyRights = true;
-            $panelUsers.find('#tlb-change-rights').hide();
+            $panelUsers && $panelUsers.find('#tlb-change-rights').hide();
             $btnUsers && !$btnUsers.menu && $panelUsers.hide();
         }
 

apps/common/main/lib/view/ImageFromUrlDialog.js

@@ -47,8 +47,7 @@ define([
             width: 330,
             header: false,
             cls: 'modal-dlg',
-            buttons: ['ok', 'cancel'],
-            footerCls: 'right'
+            buttons: ['ok', 'cancel']
         },
 
         initialize : function(options) {

apps/common/main/lib/view/LanguageDialog.js

@@ -52,8 +52,7 @@ define([
         header: false,
         width: 350,
         cls: 'modal-dlg',
-        buttons: ['ok', 'cancel'],
-        footerCls: 'right'
+        buttons: ['ok', 'cancel']
     },
 
     template:   '<div class="box">' +

apps/common/main/lib/view/ListSettingsDialog.js

@@ -0,0 +1,242 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  ListSettingsDialog.js
+ *
+ *  Created by Julia Radzhabova on 30.10.2019
+ *  Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+if (Common === undefined)
+    var Common = {};
+
+define([
+    'common/main/lib/component/Window',
+    'common/main/lib/component/MetricSpinner',
+    'common/main/lib/component/ThemeColorPalette',
+    'common/main/lib/component/ColorButton'
+], function () { 'use strict';
+
+    Common.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({
+        options: {
+            type: 0, // 0 - markers, 1 - numbers
+            width: 230,
+            height: 156,
+            style: 'min-width: 230px;',
+            cls: 'modal-dlg',
+            split: false,
+            buttons: ['ok', 'cancel']
+        },
+
+        initialize : function(options) {
+            this.type = options.type || 0;
+
+            _.extend(this.options, {
+                title: this.txtTitle,
+                height: this.type==1 ? 190 : 156
+            }, options || {});
+
+            this.template = [
+                '<div class="box">',
+                    '<div class="input-row">',
+                    '<label class="text" style="width: 70px;">' + this.txtSize + '</label><div id="id-dlg-list-size"></div><label class="text" style="margin-left: 10px;">' + this.txtOfText + '</label>',
+                    '</div>',
+                    '<div style="margin-top: 10px;">',
+                    '<label class="text" style="width: 70px;">' + this.txtColor + '</label><div id="id-dlg-list-color" style="display: inline-block;"></div>',
+                    '</div>',
+                    '<% if (type == 1) { %>',
+                    '<div class="input-row" style="margin-top: 10px;">',
+                    '<label class="text" style="width: 70px;">' + this.txtStart + '</label><div id="id-dlg-list-start"></div>',
+                    '</div>',
+                    '<% } %>',
+                '</div>'
+            ].join('');
+
+            this.props = options.props;
+            this.options.tpl = _.template(this.template)(this.options);
+
+            Common.UI.Window.prototype.initialize.call(this, this.options);
+        },
+
+        render: function() {
+            Common.UI.Window.prototype.render.call(this);
+
+            var me = this,
+                $window = this.getChild();
+            $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+
+            this.spnSize = new Common.UI.MetricSpinner({
+                el          : $window.find('#id-dlg-list-size'),
+                step        : 1,
+                width       : 53,
+                value       : 100,
+                defaultUnit : '',
+                maxValue    : 400,
+                minValue    : 25,
+                allowDecimal: false
+            }).on('change', function(field, newValue, oldValue, eOpts){
+                if (me._changedProps) {
+                    me._changedProps.asc_putBulletSize(field.getNumberValue());
+                }
+            });
+
+            this.btnColor = new Common.UI.ColorButton({
+                style: "width:53px;",
+                menu        : new Common.UI.Menu({
+                    additionalAlign: this.menuAddAlign,
+                    items: [
+                        { template: _.template('<div id="id-dlg-list-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
+                        { template: _.template('<a id="id-dlg-list-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
+                    ]
+                })
+            });
+            this.btnColor.on('render:after', function(btn) {
+                me.colors = new Common.UI.ThemeColorPalette({
+                    el: $('#id-dlg-list-color-menu'),
+                    transparent: false
+                });
+                me.colors.on('select', _.bind(me.onColorsSelect, me));
+            });
+            this.btnColor.render($window.find('#id-dlg-list-color'));
+            $('#id-dlg-list-color-new').on('click', _.bind(this.addNewColor, this, this.colors));
+
+            this.menuAddAlign = function(menuRoot, left, top) {
+                var self = this;
+                if (!$window.hasClass('notransform')) {
+                    $window.addClass('notransform');
+                    menuRoot.addClass('hidden');
+                    setTimeout(function() {
+                        menuRoot.removeClass('hidden');
+                        menuRoot.css({left: left, top: top});
+                        self.options.additionalAlign = null;
+                    }, 300);
+                } else {
+                    menuRoot.css({left: left, top: top});
+                    self.options.additionalAlign = null;
+                }
+            };
+
+            this.spnStart = new Common.UI.MetricSpinner({
+                el          : $window.find('#id-dlg-list-start'),
+                step        : 1,
+                width       : 53,
+                value       : 1,
+                defaultUnit : '',
+                maxValue    : 32767,
+                minValue    : 1,
+                allowDecimal: false
+            }).on('change', function(field, newValue, oldValue, eOpts){
+                if (me._changedProps) {
+                    me._changedProps.put_NumStartAt(field.getNumberValue());
+                }
+            });
+
+            this.afterRender();
+        },
+
+        afterRender: function() {
+            this.updateThemeColors();
+            this._setDefaults(this.props);
+        },
+
+        updateThemeColors: function() {
+            this.colors.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
+        },
+
+        addNewColor: function(picker, btn) {
+            picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
+        },
+
+        onColorsSelect: function(picker, color) {
+            this.btnColor.setColor(color);
+            if (this._changedProps) {
+                this._changedProps.asc_putBulletColor(Common.Utils.ThemeColor.getRgbColor(color));
+            }
+        },
+
+        _handleInput: function(state) {
+            if (this.options.handler) {
+                this.options.handler.call(this, state, this._changedProps);
+            }
+            this.close();
+        },
+
+        onBtnClick: function(event) {
+            this._handleInput(event.currentTarget.attributes['result'].value);
+        },
+
+        onPrimary: function(event) {
+            this._handleInput('ok');
+            return false;
+        },
+
+        _setDefaults: function (props) {
+            if (props) {
+                this.spnSize.setValue(props.asc_getBulletSize() || '', true);
+                this.spnStart.setValue(props.get_NumStartAt() || '', true);
+                var color = props.asc_getBulletColor();
+                if (color) {
+                    if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
+                        color = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()};
+                    } else {
+                        color = Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b());
+                    }
+                } else
+                    color = 'transparent';
+                this.btnColor.setColor(color);
+                if ( typeof(color) == 'object' ) {
+                    var isselected = false;
+                    for (var i=0; i<10; i++) {
+                        if ( Common.Utils.ThemeColor.ThemeValues[i] == color.effectValue ) {
+                            this.colors.select(color,true);
+                            isselected = true;
+                            break;
+                        }
+                    }
+                    if (!isselected) this.colors.clearSelection();
+                } else
+                    this.colors.select(color,true);
+            }
+            this._changedProps = new Asc.asc_CParagraphProperty();
+        },
+
+        txtTitle: 'List Settings',
+        txtSize: 'Size',
+        txtColor: 'Color',
+        txtOfText: '% of text',
+        textNewColor: 'Add New Custom Color',
+        txtStart: 'Start at'
+    }, Common.Views.ListSettingsDialog || {}))
+});

apps/common/main/lib/view/RenameDialog.js

@@ -48,8 +48,7 @@ define([
             header: false,
             cls: 'modal-dlg',
             filename: '',
-            buttons: ['ok', 'cancel'],
-            footerCls: 'right'
+            buttons: ['ok', 'cancel']
         },
 
         initialize : function(options) {

apps/common/main/resources/less/buttons.less

@@ -399,6 +399,11 @@
                 }
             }
         }
+        .dropdown-menu {
+            li.disabled {
+                opacity: 0.65;
+            }
+        }
     }
 
 @color-gray: @secondary;

apps/common/main/resources/less/symboltable.less

@@ -0,0 +1,54 @@
+#symbol-table-scrollable-div, #symbol-table-recent {
+  div{
+    display: inline-block;
+    vertical-align: top;
+  }
+
+  .cell{
+    width: 31px;
+    height: 33px;
+    border-right: 1px solid @gray-soft;
+    border-bottom: 1px solid @gray-soft;
+    background: #ffffff;
+    align-content: center;
+    vertical-align: middle;
+    text-align: center;
+    font-size: 22px;
+    -khtml-user-select: none;
+    user-select: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    cursor: default;
+    overflow:hidden;
+    display: inline-block;
+  }
+
+  .cell-selected{
+    background-color: @gray-darker;
+    color: white;
+  }
+}
+
+#symbol-table-recent {
+  width: 100%;
+  height: 32px;
+  overflow: hidden;
+  border: @gray-soft solid 1px;
+}
+
+#symbol-table-scrollable-div {
+  #id-preview {
+    width: 100%;
+    height: 132px;
+    position:relative;
+    overflow:hidden;
+    border: @gray-soft solid 1px;
+  }
+
+  #id-preview-data {
+    width: 100%;
+    height: 132px;
+    position:relative;
+    overflow:hidden;
+  }
+}

apps/common/main/resources/less/toolbar.less

@@ -533,6 +533,7 @@
 .button-normal-icon(btn-caption,            76, @toolbar-big-icon-size);
 .button-normal-icon(btn-calculation,        80, @toolbar-big-icon-size);
 .button-normal-icon(btn-scale,              81, @toolbar-big-icon-size);
+.button-normal-icon(btn-symbol,              84, @toolbar-big-icon-size);
 
 [applang=ru] {
     .btn-toolbar {

apps/common/main/resources/symboltable/ru.json

@@ -0,0 +1,275 @@
+{
+	"Basic Latin": "Основная латиница",
+	"Latin 1 Supplement": "Дополнительная латиница-1",
+	"Latin Extended A": "Расширенная латиница-A",
+	"Latin Extended B": "Расширенная латиница-B",
+	"IPA Extensions": "Международный фонетический алфавит",
+	"Spacing Modifier Letters": "Некомбинируемые протяжённые символы-модификаторы",
+	"Combining Diacritical Marks": "Комбинируемые диакритические знаки",
+	"Greek and Coptic": "Греческий и коптский алфавиты",
+	"Cyrillic": "Кириллица",
+	"Cyrillic Supplement": "Кириллица. Дополнительные символы",
+	"Armenian": "Армянский алфавит",
+	"Hebrew": "Иврит",
+	"Arabic": "Арабский",
+	"Syriac": "Сирийский",
+	"Arabic Supplement": "Дополнительные символы арабского письма",
+	"Thaana": "Тана",
+	"NKo": "Нко",
+	"Samaritan": "Самаритянское письмо",
+	"Mandaic": "Мандейский алфавит",
+	"Arabic Extended A": "Расширенный набор символов арабского письма-A",
+	"Devanagari": "Деванагари",
+	"Bengali": "Бенгальский",
+	"Gurmukhi": "Гурмукхи",
+	"Gujarati": "Гуджарати",
+	"Oriya": "Ория",
+	"Tamil": "Тамильская письменность",
+	"Telugu": "Телугу",
+	"Kannada": "Каннада",
+	"Malayalam": "Малаялам",
+	"Sinhala": "Сингальская письменность",
+	"Thai": "Тайская письменность",
+	"Lao": "Лаосская письменность",
+	"Tibetan": "Тибетская письменность",
+	"Myanmar": "Бирманский",
+	"Georgian": "Грузинский",
+	"Hangul Jamo": "Хангыль чамо",
+	"Ethiopic": "Эфиопская слоговая письменность",
+	"Ethiopic Supplement": "Дополнительные символы эфиопской письменности",
+	"Cherokee": "Письменность чероки",
+	"Unified Canadian Aboriginal Syllabics": "Канадское слоговое письмо",
+	"Ogham": "Огамическое письмо",
+	"Runic": "Руническая письменность",
+	"Tagalog": "Тагальская письменность. Байбайин",
+	"Hanunoo": "Хануноо",
+	"Buhid": "Бухид",
+	"Tagbanwa": "Тагбанва",
+	"Khmer": "Кхмерская письменность",
+	"Mongolian": "Старомонгольская письменность",
+	"Unified Canadian Aboriginal Syllabics Extended": "Расширенный набор символов канадского слогового письма",
+	"Limbu": "Письменность лимбу",
+	"Tai Le": "Письменность тай лы",
+	"New Tai Lue": "Новый алфавит тай лы",
+	"Khmer Symbols": "Кхмерские символы",
+	"Buginese": "Бугийская письменность. Лонтара",
+	"Tai Tham": "Тай Тхам",
+	"Combining Diacritical Marks Extended": "Комбинируемые диакритические знаки (расширение)",
+	"Balinese": "Балийское письмо",
+	"Sundanese": "Сунданское письмо",
+	"Batak": "Батакское письмо",
+	"Lepcha": "Письмо лепча",
+	"Ol Chiki": "Письменность Ол-чики",
+	"Cyrillic Extended C": "Расширенная кириллица C",
+	"Sundanese Supplement": "Сунданское расширенное письмо",
+	"Vedic Extensions": "Ведические символы",
+	"Phonetic Extensions": "Фонетические расширения",
+	"Phonetic Extensions Supplement": "Дополнительные фонетические расширения",
+	"Combining Diacritical Marks Supplement": "Дополнительные комбинируемые диакритические знаки",
+	"Latin Extended Additional": "Дополнительная расширенная латиница",
+	"Greek Extended": "Расширенный набор символов греческого алфавита",
+	"General Punctuation": "Знаки пунктуации",
+	"Superscripts and Subscripts": "Надстрочные и подстрочные знаки",
+	"Currency Symbols": "Символы валют",
+	"Combining Diacritical Marks for Symbols": "Комбинируемые диакритические знаки для символов",
+	"Letterlike Symbols": "Буквоподобные символы",
+	"Number Forms": "Числовые формы",
+	"Arrows": "Стрелки",
+	"Mathematical Operators": "Математические операторы",
+	"Miscellaneous Technical": "Разнообразные технические символы",
+	"Control Pictures": "Значки управляющих кодов",
+	"Optical Character Recognition": "Символы оптического распознавания",
+	"Enclosed Alphanumerics": "Вложенные буквы и цифры",
+	"Box Drawing": "Символы для рисования рамок",
+	"Block Elements": "Символы заполнения",
+	"Geometric Shapes": "Геометрические фигуры",
+	"Miscellaneous Symbols": "Разнообразные символы",
+	"Dingbats": "Дингбаты",
+	"Miscellaneous Mathematical Symbols A": "Разнообразные математические символы-A",
+	"Supplemental Arrows A": "Дополнительные стрелки-A",
+	"Braille Patterns": "Азбука Брайля",
+	"Supplemental Arrows B": "Дополнительные стрелки-B",
+	"Miscellaneous Mathematical Symbols B": "Разнообразные математические символы-B",
+	"Supplemental Mathematical Operators": "Дополнительные математические операторы",
+	"Miscellaneous Symbols and Arrows": "Разнообразные символы и стрелки",
+	"Glagolitic": "Глаголица",
+	"Latin Extended C": "Расширенная латиница C",
+	"Coptic": "Коптский алфавит",
+	"Georgian Supplement": "Дополнительные символы грузинского алфавита",
+	"Tifinagh": "Тифинаг (Древнеливийское письмо)",
+	"Ethiopic Extended": "Расширенный набор символов эфиопского письма",
+	"Cyrillic Extended A": "Расширенная кириллица A",
+	"Supplemental Punctuation": "Дополнительные знаки пунктуации",
+	"CJK Radicals Supplement": "Дополнительные иероглифические ключи ККЯ",
+	"Kangxi Radicals": "Иероглифические ключи словаря Канси",
+	"Ideographic Description Characters": "Символы описания иероглифов",
+	"CJK Symbols and Punctuation": "Символы и пунктуация ККЯ",
+	"Hiragana": "Хирагана",
+	"Katakana": "Катакана",
+	"Bopomofo": "Чжуинь. Бопомофо",
+	"Hangul Compatibility Jamo": "Комбинируемые чамо Хангыля",
+	"Kanbun": "Канбун(китайский)",
+	"Bopomofo Extended": "Расширенный набор символов бопомофо, чжуинь",
+	"CJK Strokes": "Черты ККЯ",
+	"Katakana Phonetic Extensions": "Фонетические расширения катаканы",
+	"Enclosed CJK Letters and Months": "Вложенные буквы и месяцы ККЯ",
+	"CJK Compatibility": "Знаки совместимости ККЯ",
+	"CJK Unified Ideographs Extension": "Унифицированные иероглифы ККЯ. Расширение А",
+	"Yijing Hexagram Symbols": "Гексаграммы И-Цзин",
+	"CJK Unified Ideographs": "Унифицированные иероглифы ККЯ",
+	"Yi Syllables": "Слоги. Письмо И",
+	"Yi Radicals": "Радикалы. Письмо И",
+	"Lisu": "Лису",
+	"Vai": "Слоговая письменность ваи",
+	"Cyrillic Extended B": "Расширенная кириллица-B",
+	"Bamum": "Письмо бамум",
+	"Modifier Tone Letters": "Символы изменения тона",
+	"Latin Extended D": "Расширенная латиница-D",
+	"Syloti Nagri": "Силоти нагри",
+	"Common Indic Number Forms": "Индийские числовые символы",
+	"Phags pa": "Квадратное письмо Пагба-ламы",
+	"Saurashtra": "Саураштра",
+	"Devanagari Extended": "Расширенный набор символов деванагари",
+	"Kayah Li": "Кайях Ли",
+	"Rejang": "Реджанг",
+	"Hangul Jamo Extended A": "Хангыль",
+	"Javanese": "Яванская письменность",
+	"Myanmar Extended B": "Расширенный бирманский-B",
+	"Cham": "Чамское письмо",
+	"Myanmar Extended A": "Мьянманская письменность. Расширение A",
+	"Tai Viet": "Письменность Тай Вьет",
+	"Meetei Mayek Extensions": "Мейтей расширенная",
+	"Ethiopic Extended A": "Набор расширенных символов эфиопского письма-А",
+	"Latin Extended E": "Расширенная латиница-E",
+	"Cherokee Supplement": "Письменность чероки (дополнение)",
+	"Meetei Mayek": "Мейтей (Манипури)",
+	"Hangul Syllables": "Слоги Хангыля",
+	"Hangul Jamo Extended B": "Расширенные хангыль чамо B",
+	"High Surrogates": "Верхняя часть суррогатных пар",
+	"High Private Use Surrogates": "Верхняя часть суррогатных пар для частного использования",
+	"Low Surrogates": "Нижняя часть суррогатных пар",
+	"Private Use Area": "Область для частного использования",
+	"CJK Compatibility Ideographs": "Совместимые иероглифы ККЯ",
+	"Alphabetic Presentation Forms": "Алфавитные формы представления",
+	"Arabic Presentation Forms A": "Формы представления арабских букв-A",
+	"Variation Selectors": "Селекторы вариантов начертания",
+	"Vertical Forms": "Вертикальные формы",
+	"Combining Half Marks": "Комбинируемые половинки символов",
+	"CJK Compatibility Forms": "Формы совместимости ККЯ",
+	"Small Form Variants": "Варианты малого размера",
+	"Arabic Presentation Forms B": "Формы представления арабских букв-B",
+	"Halfwidth and Fullwidth Forms": "Полуширинные и полноширинные формы",
+	"Specials": "Специальные символы",
+	"Linear B Syllabary": "Слоги линейного письма Б",
+	"Linear B Ideograms": "Идеограммы линейного письма Б",
+	"Aegean Numbers": "Эгейские цифры",
+	"Ancient Greek Numbers": "Древнегреческие единицы измерения",
+	"Ancient Symbols": "Древние символы",
+	"Phaistos Disc": "Символы фестского диска",
+	"Lycian": "Ликийский алфавит",
+	"Carian": "Алфавит карийского языка",
+	"Coptic Epact Numbers": "Коптские числа епакты",
+	"Old Italic": "Этрусский (староитальянский) алфавит",
+	"Gothic": "Готский алфавит",
+	"Old Permic": "Древнепермское письмо",
+	"Ugaritic": "Угаритский алфавит",
+	"Old Persian": "Древнеперсидский клинописный алфавит",
+	"Deseret": "Дезеретский алфавит",
+	"Shavian": "Алфавит Бернарда Шоу",
+	"Osmanya": "Османья (сомалийский алфавит)",
+	"Osage": "Оседж",
+	"Elbasan": "Эльбасанское письмо",
+	"Caucasian Albanian": "Агванское письмо (Кавказская Албания)",
+	"Linear A": "Линейное письмо А",
+	"Cypriot Syllabary": "Слоговая письменность острова Кипр",
+	"Imperial Aramaic": "Имперское арамейское письмо",
+	"Palmyrene": "Пальмирский алфавит",
+	"Nabataean": "Набатейское письмо",
+	"Hatran": "Хатран",
+	"Phoenician": "Финикийское письмо",
+	"Lydian": "Лидийский алфавит",
+	"Meroitic Hieroglyphs": "Лидийский алфавит",
+	"Meroitic Cursive": "Курсивное мероитское письмо",
+	"Kharoshthi": "Кхароштхи",
+	"Old South Arabian": "Старый южноаравийский алфавит",
+	"Old North Arabian": "Старый североаравийский алфавит",
+	"Manichaean": "Манихейское письмо",
+	"Avestan": "Авестийский алфавит",
+	"Inscriptional Parthian": "Пехлевийское письмо для парфянского языка",
+	"Inscriptional Pahlavi": "Эпиграфическое пехлевийское письмо",
+	"Psalter Pahlavi": "Псалтырь пехлеви",
+	"Old Turkic": "Древнетюркское руническое письмо",
+	"Old Hungarian": "Венгерские руны",
+	"Rumi Numeral Symbols": "Цифры системы руми",
+	"Brahmi": "Брахмическая письменность",
+	"Kaithi": "Кайтхи",
+	"Sora Sompeng": "Соранг сомпенг",
+	"Chakma": "Чакма",
+	"Mahajani": "Махаяни",
+	"Sharada": "Шарада",
+	"Sinhala Archaic Numbers": "Сингальские архаические цифры",
+	"Khojki": "Кходжики",
+	"Multani": "Мултани",
+	"Khudawadi": "Кхудабади",
+	"Grantha": "Грантха",
+	"Newa": "Нева",
+	"Tirhuta": "Тирхута",
+	"Siddham": "Сиддхаматрика",
+	"Modi": "Моди",
+	"Mongolian Supplement": "Монгольский (дополнение)",
+	"Takri": "Такри",
+	"Ahom": "Письмо ахом",
+	"Warang Citi": "Варанг-кшити",
+	"Pau Cin Hau": "Пау Цин Хау",
+	"Bhaiksuki": "Байсаки",
+	"Marchen": "Марчен",
+	"Cuneiform": "Клинопись",
+	"Cuneiform Numbers and Punctuation": "Клинописные цифры и знаки препинания",
+	"Early Dynastic Cuneiform": "Ранняя династическая клинопись",
+	"Egyptian Hieroglyphs": "Египетские иероглифы",
+	"Anatolian Hieroglyphs": "Анатолийские иероглифы",
+	"Bamum Supplement": "Письмо бамум (дополнение)",
+	"Mro": "Мру",
+	"Bassa Vah": "Письмо басса",
+	"Pahawh Hmong": "Пахау хмонг",
+	"Miao": "Письмо Полларда (миао)",
+	"Ideographic Symbols and Punctuation": "Идеографические символы и знаки препинания",
+	"Tangut": "Тангутское письмо",
+	"Tangut Components": "Компоненты тангутского письма",
+	"Kana Supplement": "Кана (дополнение)",
+	"Duployan": "Дюплойе",
+	"Shorthand Format Controls": "Форматирующие символы стенографии",
+	"Byzantine Musical Symbols": "Византийские музыкальные символы",
+	"Musical Symbols": "Музыкальные символы",
+	"Ancient Greek Musical Notation": "Древнегреческие музыкальные символы",
+	"Tai Xuan Jing Symbols": "Символы Тай Сюань Цзин",
+	"Counting Rod Numerals": "Счётные палочки",
+	"Mathematical Alphanumeric Symbols": "Математические буквенно-цифровые символы",
+	"Sutton SignWriting": "Жестовая письменность Саттон",
+	"Glagolitic Supplement": "Глаголица (расширение)",
+	"Mende Kikakui": "Письмо кикакуи для языка менде",
+	"Adlam": "Адлам",
+	"Arabic Mathematical Alphabetic Symbols": "Арабские математические буквенно-цифровые символы",
+	"Mahjong Tiles": "Кости для маджонга",
+	"Domino Tiles": "Кости для домино",
+	"Playing Cards": "Игральные карты",
+	"Enclosed Alphanumeric Supplement": "Вложенные буквенно-цифровые символы (дополнение)",
+	"Enclosed Ideographic Supplement": "Вложенные идеографические символы (дополнение)",
+	"Miscellaneous Symbols and Pictographs": "Различные символы и пиктограммы",
+	"Emoticons": "Эмотикон (эмоджи)",
+	"Ornamental Dingbats": "Элементы орнамента",
+	"Transport and Map Symbols": "Транспортные и картографические символы",
+	"Alchemical Symbols": "Алхимические символы",
+	"Geometric Shapes Extended": "Геометрические фигуры (расширение)",
+	"Supplemental Arrows C": "Дополнительные стрелки-С",
+	"Supplemental Symbols and Pictographs": "Символы и пиктограммы (дополнение)",
+	"CJK Unified Ideographs Extension B": "Унифицированные иероглифы ККЯ. Расширение B",
+	"CJK Unified Ideographs Extension C": "Унифицированные иероглифы ККЯ. Расширение C",
+	"CJK Unified Ideographs Extension D": "Унифицированные иероглифы ККЯ. Расширение D",
+	"CJK Unified Ideographs Extension E": "Унифицированные иероглифы ККЯ. Расширение E",
+	"CJK Compatibility Ideographs Supplement": "Унифицированные иероглифы ККЯ (дополнение)",
+	"Tags": "Теги",
+	"Variation Selectors Supplement": "Селекторы вариантов начертания (дополнение)",
+	"Supplementary Private Use Area A": "Дополнительная область для частного использования — A",
+	"Supplementary Private Use Area B": "Дополнительная область для частного использования — B"	
+}

apps/common/mobile/lib/component/HsbColorPicker.js

@@ -0,0 +1,327 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  HsbColorPicker.js
+ *
+ *  Created by Julia Svinareva on 02/10/19
+ *  Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+if (Common === undefined)
+    var Common = {};
+
+Common.UI = Common.UI || {};
+
+define([
+    'jquery',
+    'underscore',
+    'backbone'
+], function ($, _, Backbone) {
+    'use strict';
+
+    Common.UI.HsbColorPicker = Backbone.View.extend(_.extend({
+        options: {
+            color: '#000000'
+        },
+        template: _.template([
+            '<div class="custom-colors <% if (phone) { %> phone <% } %>">',
+                '<div class="color-picker-wheel">',
+                    '<svg id="id-wheel" viewBox="0 0 300 300" width="300" height="300"><%=circlesColors%></svg>',
+                    '<div class="color-picker-wheel-handle"></div>',
+                    '<div class="color-picker-sb-spectrum" style="background-color: hsl(0, 100%, 50%)">',
+                        '<div class="color-picker-sb-spectrum-handle"></div>',
+                    '</div>',
+                '</div>',
+                '<div class="right-block">',
+                    '<div class="color-hsb-preview">',
+                        '<div class="new-color-hsb-preview" style=""></div>',
+                        '<div class="current-color-hsb-preview" style=""></div>',
+                    '</div>',
+                    '<a href="#" class="button button-round" id="add-new-color"><i class="icon icon-plus" style="height: 30px;width: 30px;"></i></a>',
+                '</div>',
+            '</div>'
+        ].join('')),
+
+        initialize : function(options) {
+            var me = this,
+                el = $(me.el);
+            me.currentColor = options.color;
+            if(_.isObject(me.currentColor)) {
+                me.currentColor = me.currentColor.color;
+            }
+            if (!me.currentColor) {
+                me.currentColor = me.options.color;
+            }
+            if (me.currentColor === 'transparent') {
+                me.currentColor = 'ffffff';
+            }
+            var colorRgb = me.colorHexToRgb(me.currentColor);
+            me.currentHsl = me.colorRgbToHsl(colorRgb[0],colorRgb[1],colorRgb[2]);
+            me.currentHsb = me.colorHslToHsb(me.currentHsl[0],me.currentHsl[1],me.currentHsl[2]);
+            me.currentHue = [];
+
+            me.options = _({}).extend(me.options, options);
+            me.render();
+        },
+
+        render: function () {
+            var me = this;
+
+            var total = 256,
+                circles = '';
+            for (var i = total; i > 0; i -= 1) {
+                var angle = i * Math.PI / (total / 2);
+                var hue = 360 / total * i;
+                circles += '<circle cx="' + (150 - Math.sin(angle) * 125) + '" cy="' + (150 - Math.cos(angle) * 125) + '" r="25" fill="hsl( ' + hue + ', 100%, 50%)"></circle>';
+            }
+
+            (me.$el || $(me.el)).html(me.template({
+                circlesColors: circles,
+                scope: me,
+                phone: Common.SharedSettings.get('phone'),
+                android: Common.SharedSettings.get('android')
+            }));
+
+            $('.current-color-hsb-preview').css({'background-color': '#' + me.currentColor});
+
+            this.afterRender();
+
+            return me;
+        },
+
+        afterRender: function () {
+            this.$colorPicker = $('.color-picker-wheel');
+            this.$colorPicker.on({
+                'touchstart': this.handleTouchStart.bind(this),
+                'touchmove': this.handleTouchMove.bind(this),
+                'touchend': this.handleTouchEnd.bind(this)
+            });
+            $('#add-new-color').single('click', _.bind(this.onClickAddNewColor, this));
+            this.updateCustomColor();
+        },
+
+        colorHexToRgb: function(hex) {
+            var h = hex.replace(/^#?([a-f\d])([a-f\d])([a-f\d])$/i, function(m, r, g, b) { return (r + r + g + g + b + b)});
+            var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(h);
+            return result
+                ? result.slice(1).map(function (n) { return parseInt(n, 16)})
+                : null;
+        },
+
+        colorRgbToHsl: function(r, g, b) {
+            r /= 255;
+            g /= 255;
+            b /= 255;
+            var max = Math.max(r, g, b);
+            var min = Math.min(r, g, b);
+            var d = max - min;
+            var h;
+            if (d === 0) h = 0;
+            else if (max === r) h = ((g - b) / d) % 6;
+            else if (max === g) h = (b - r) / d + 2;
+            else if (max === b) h = (r - g) / d + 4;
+            var l = (min + max) / 2;
+            var s = d === 0 ? 0 : d / (1 - Math.abs(2 * l - 1));
+            if (h < 0) h = 360 / 60 + h;
+            return [h * 60, s, l];
+        },
+
+        colorHslToHsb: function(h, s, l) {
+            var HSB = {h: h, s: 0, b: 0};
+            var HSL = {h: h, s: s, l: l};
+            var t = HSL.s * (HSL.l < 0.5 ? HSL.l : 1 - HSL.l);
+            HSB.b = HSL.l + t;
+            HSB.s = HSL.l > 0 ? 2 * t / HSB.b : HSB.s;
+            return [HSB.h, HSB.s, HSB.b];
+        },
+
+        colorHsbToHsl: function(h, s, b) {
+            var HSL = {h: h, s: 0, l: 0};
+            var HSB = { h: h, s: s, b: b };
+            HSL.l = (2 - HSB.s) * HSB.b / 2;
+            HSL.s = HSL.l && HSL.l < 1 ? HSB.s * HSB.b / (HSL.l < 0.5 ? HSL.l * 2 : 2 - HSL.l * 2) : HSL.s;
+            return [HSL.h, HSL.s, HSL.l];
+        },
+
+        colorHslToRgb: function(h, s, l) {
+            var c = (1 - Math.abs(2 * l - 1)) * s;
+            var hp = h / 60;
+            var x = c * (1 - Math.abs((hp % 2) - 1));
+            var rgb1;
+            if (Number.isNaN(h) || typeof h === 'undefined') {
+                rgb1 = [0, 0, 0];
+            } else if (hp <= 1) rgb1 = [c, x, 0];
+            else if (hp <= 2) rgb1 = [x, c, 0];
+            else if (hp <= 3) rgb1 = [0, c, x];
+            else if (hp <= 4) rgb1 = [0, x, c];
+            else if (hp <= 5) rgb1 = [x, 0, c];
+            else if (hp <= 6) rgb1 = [c, 0, x];
+            var m = l - (c / 2);
+            var result = rgb1.map(function (n) {
+                return Math.max(0, Math.min(255, Math.round(255 * (n + m))));
+            });
+            return result;
+        },
+
+        colorRgbToHex: function(r, g, b) {
+            var result = [r, g, b].map( function (n) {
+                var hex = n.toString(16);
+                return hex.length === 1 ? ('0' + hex) : hex;
+            }).join('');
+            return ('#' + result);
+        },
+
+        setHueFromWheelCoords: function (x, y) {
+            var wheelCenterX = this.wheelRect.left + this.wheelRect.width / 2;
+            var wheelCenterY = this.wheelRect.top + this.wheelRect.height / 2;
+            var angleRad = Math.atan2(y - wheelCenterY, x - wheelCenterX);
+            var angleDeg = angleRad * 180 / Math.PI + 90;
+            if (angleDeg < 0) angleDeg += 360;
+            angleDeg = 360 - angleDeg;
+            this.currentHsl[0] = angleDeg;
+            this.updateCustomColor();
+        },
+
+        setSBFromSpecterCoords: function (x, y) {
+            var s = (x - this.specterRect.left) / this.specterRect.width;
+            var b = (y - this.specterRect.top) / this.specterRect.height;
+            s = Math.max(0, Math.min(1, s));
+            b = 1 - Math.max(0, Math.min(1, b));
+
+            this.currentHsb = [this.currentHsl[0], s, b];
+            this.currentHsl = this.colorHsbToHsl(this.currentHsl[0], s, b);
+            this.updateCustomColor();
+        },
+
+        handleTouchStart: function (e) {
+            if (this.isMoved || this.isTouched) return;
+            this.touchStartX = e.type === 'touchstart' ? e.targetTouches[0].pageX : e.pageX;
+            this.touchCurrentX = this.touchStartX;
+            this.touchStartY = e.type === 'touchstart' ? e.targetTouches[0].pageY : e.pageY;
+            this.touchCurrentY = this.touchStartY;
+            var $targetEl = $(e.target);
+            this.wheelHandleIsTouched = $targetEl.closest('.color-picker-wheel-handle').length > 0;
+            this.wheelIsTouched = $targetEl.closest('circle').length > 0;
+            this.specterHandleIsTouched = $targetEl.closest('.color-picker-sb-spectrum-handle').length > 0;
+            if (!this.specterHandleIsTouched) {
+                this.specterIsTouched = $targetEl.closest('.color-picker-sb-spectrum').length > 0;
+            }
+            if (this.wheelIsTouched) {
+                this.wheelRect = this.$el.find('.color-picker-wheel')[0].getBoundingClientRect();
+                this.setHueFromWheelCoords(this.touchStartX, this.touchStartY);
+            }
+            if (this.specterIsTouched) {
+                this.specterRect = this.$el.find('.color-picker-sb-spectrum')[0].getBoundingClientRect();
+                this.setSBFromSpecterCoords(this.touchStartX, this.touchStartY);
+            }
+            if (this.specterHandleIsTouched || this.specterIsTouched) {
+                this.$el.find('.color-picker-sb-spectrum-handle').addClass('color-picker-sb-spectrum-handle-pressed');
+            }
+        },
+
+        handleTouchMove: function (e) {
+            if (!(this.wheelIsTouched || this.wheelHandleIsTouched) && !(this.specterIsTouched || this.specterHandleIsTouched)) return;
+            this.touchCurrentX = e.type === 'touchmove' ? e.targetTouches[0].pageX : e.pageX;
+            this.touchCurrentY = e.type === 'touchmove' ? e.targetTouches[0].pageY : e.pageY;
+            e.preventDefault();
+            if (!this.isMoved) {
+                // First move
+                this.isMoved = true;
+                if (this.wheelHandleIsTouched) {
+                    this.wheelRect = this.$el.find('.color-picker-wheel')[0].getBoundingClientRect();
+                }
+                if (this.specterHandleIsTouched) {
+                    this.specterRect = this.$el.find('.color-picker-sb-spectrum')[0].getBoundingClientRect();
+                }
+            }
+            if (this.wheelIsTouched || this.wheelHandleIsTouched) {
+                this.setHueFromWheelCoords(this.touchCurrentX, this.touchCurrentY);
+            }
+            if (this.specterIsTouched || this.specterHandleIsTouched) {
+                this.setSBFromSpecterCoords(this.touchCurrentX, this.touchCurrentY);
+            }
+        },
+
+        handleTouchEnd: function () {
+            this.isMoved = false;
+            if (this.specterIsTouched || this.specterHandleIsTouched) {
+                this.$el.find('.color-picker-sb-spectrum-handle').removeClass('color-picker-sb-spectrum-handle-pressed');
+            }
+            this.wheelIsTouched = false;
+            this.wheelHandleIsTouched = false;
+            this.specterIsTouched = false;
+            this.specterHandleIsTouched = false;
+        },
+
+        updateCustomColor: function (first) {
+            var specterWidth = this.$el.find('.color-picker-sb-spectrum')[0].offsetWidth,
+                specterHeight = this.$el.find('.color-picker-sb-spectrum')[0].offsetHeight,
+                wheelSize = this.$el.find('.color-picker-wheel')[0].offsetWidth,
+                wheelHalfSize = wheelSize / 2,
+                angleRad = this.currentHsl[0] * Math.PI / 180,
+                handleSize = wheelSize / 6,
+                handleHalfSize = handleSize / 2,
+                tX = wheelHalfSize - Math.sin(angleRad) * (wheelHalfSize - handleHalfSize) - handleHalfSize,
+                tY = wheelHalfSize - Math.cos(angleRad) * (wheelHalfSize - handleHalfSize) - handleHalfSize;
+            this.$el.find('.color-picker-wheel-handle')
+                .css({'background-color':  'hsl(' + this.currentHsl[0] + ', 100%, 50%)'})
+                .css({transform: 'translate(' + tX + 'px,' + tY + 'px)'});
+
+            this.$el.find('.color-picker-sb-spectrum')
+                .css({'background-color':  'hsl(' + this.currentHsl[0] + ', 100%, 50%)'});
+
+            if (this.currentHsb && this.currentHsl) {
+                this.$el.find('.color-picker-sb-spectrum-handle')
+                    .css({'background-color': 'hsl(' + this.currentHsl[0] + ', ' + (this.currentHsl[1] * 100) + '%,' + (this.currentHsl[2] * 100) + '%)'})
+                    .css({transform: 'translate(' + specterWidth * this.currentHsb[1] + 'px, ' + specterHeight * (1 - this.currentHsb[2]) + 'px)'});
+            }
+            var color = this.colorHslToRgb(this.currentHsl[0], this.currentHsl[1], this.currentHsl[2]);
+            this.currentColor = this.colorRgbToHex(color[0], color[1], color[2]);
+            $('.new-color-hsb-preview').css({'background-color': this.currentColor});
+
+        },
+
+        onClickAddNewColor: function() {
+            var color = this.currentColor;
+            if (color) {
+                if (color.charAt(0) === '#') {
+                    color = color.substr(1);
+                }
+                this.trigger('addcustomcolor', this, color);
+            }
+        }
+
+    }, Common.UI.HsbColorPicker || {}));
+});

apps/common/mobile/lib/component/ThemeColorPalette.js

@@ -97,6 +97,21 @@ define([
                             '</div>',
                         '</div>',
                     '</li>',
+                    '<li class="dynamic-colors">',
+                        '<div style="padding: 15px 0 0 15px;"><%= me.textCustomColors %></div>',
+                        '<div class="item-content">',
+                            '<div class="item-inner">',
+                                '<% _.each(dynamicColors, function(color, index) { %>',
+                                    '<a data-color="<%=color%>" style="background:#<%=color%>"></a>',
+                                '<% }); %>',
+                                '<% if (dynamicColors.length < me.options.dynamiccolors) { %>',
+                                '<% for(var i = dynamicColors.length; i < me.options.dynamiccolors; i++) { %>',
+                                    '<a data-color="empty" style="background:#ffffff"></a>',
+                                '<% } %>',
+                                '<% } %>',
+                            '</div>',
+                        '</div>',
+                    '</li>',
                 '</ul>',
             '</div>'
         ].join('')),
@@ -133,9 +148,15 @@ define([
                 themeColors[row].push(effect);
             });
 
+            // custom color
+            this.dynamicColors = Common.localStorage.getItem('asc.'+Common.localStorage.getId()+'.colors.custom');
+            this.dynamicColors = this.dynamicColors ? this.dynamicColors.toLowerCase().split(',') : [];
+
+
             $(me.el).append(me.template({
                 themeColors: themeColors,
-                standartColors: standartColors
+                standartColors: standartColors,
+                dynamicColors: me.dynamicColors
             }));
 
             return me;
@@ -157,29 +178,26 @@ define([
                 el = $(me.el),
                 $target = $(e.currentTarget);
 
-            el.find('.color-palette a').removeClass('active');
-            $target.addClass('active');
-
             var color = $target.data('color').toString(),
                 effectId = $target.data('effectid');
 
-            me.currentColor = color;
-
-            if (effectId) {
-                me.currentColor = {color: color, effectId: effectId};
+            if (color !== 'empty') {
+                el.find('.color-palette a').removeClass('active');
+                $target.addClass('active');
+                me.currentColor = color;
+                if (effectId) {
+                    me.currentColor = {color: color, effectId: effectId};
+                }
+                me.trigger('select', me, me.currentColor);
+            } else {
+                me.fireEvent('customcolor', me);
             }
-
-            me.trigger('select', me, me.currentColor);
         },
 
         select: function(color) {
             var me = this,
                 el = $(me.el);
 
-            if (color == me.currentColor) {
-                return;
-            }
-
             me.currentColor = color;
 
             me.clearSelection();
@@ -195,11 +213,10 @@ define([
                     color = /#?([a-fA-F0-9]{6})/.exec(color)[1];
                 }
 
-                if (/^[a-fA-F0-9]{6}|transparent$/.test(color) || _.indexOf(Common.Utils.ThemeColor.getStandartColors(), color) > -1) {
-                    el.find('.standart-colors a[data-color=' + color + ']').addClass('active');
-                } else {
-                    el.find('.custom-colors a[data-color=' + color + ']').addClass('active');
+                if (/^[a-fA-F0-9]{6}|transparent$/.test(color) || _.indexOf(Common.Utils.ThemeColor.getStandartColors(), color) > -1 || _.indexOf(this.dynamicColors, color) > -1) {
+                    el.find('.color-palette a[data-color=' + color + ']').first().addClass('active');
                 }
+
             }
         },
 
@@ -208,7 +225,43 @@ define([
             $(this.el).find('.color-palette a').removeClass('active');
         },
 
+        saveDynamicColor: function(color) {
+            var key_name = 'asc.'+Common.localStorage.getId()+'.colors.custom';
+            var colors = Common.localStorage.getItem(key_name);
+            colors = colors ? colors.split(',') : [];
+            if (colors.push(color) > this.options.dynamiccolors) colors.shift();
+            this.dynamicColors = colors;
+            Common.localStorage.setItem(key_name, colors.join().toUpperCase());
+        },
+
+        updateDynamicColors: function() {
+            var me = this;
+            var dynamicColors = Common.localStorage.getItem('asc.'+Common.localStorage.getId()+'.colors.custom');
+            dynamicColors = dynamicColors ? dynamicColors.toLowerCase().split(',') : [];
+            var templateColors = '';
+            _.each(dynamicColors, function(color) {
+                templateColors += '<a data-color="' + color + '" style="background:#' + color + '"></a>';
+            });
+            if (dynamicColors.length < this.options.dynamiccolors) {
+                for (var i = dynamicColors.length; i < this.options.dynamiccolors; i++) {
+                    templateColors += '<a data-color="empty" style="background-color: #ffffff;"></a>';
+                }
+            }
+            $(this.el).find('.dynamic-colors .item-inner').html(_.template(templateColors));
+            $(this.el).find('.color-palette .dynamic-colors a').on('click', _.bind(this.onColorClick, this));
+        },
+
+        addNewDynamicColor: function(colorPicker, color) {
+            if (color) {
+                this.saveDynamicColor(color);
+                this.updateDynamicColors();
+                this.trigger('select', this, color);
+                this.select(color);
+            }
+        },
+
         textThemeColors: 'Theme Colors',
-        textStandartColors: 'Standard Colors'
+        textStandartColors: 'Standard Colors',
+        textCustomColors: 'Custom Colors'
     }, Common.UI.ThemeColorPalette || {}));
 });

apps/common/mobile/resources/less/ios/_color-palette.less

@@ -35,9 +35,132 @@
     }
   }
 
-  .standart-colors {
+  .standart-colors, .dynamic-colors {
     .item-inner {
       overflow: visible;
     }
   }
-}
+}
+
+.custom-colors {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  margin: 15px;
+  &.phone {
+    max-width: 300px;
+    margin: 0 auto;
+    margin-top: 4px;
+    .button-round {
+      margin-top: 20px;
+    }
+  }
+  .right-block {
+    margin-left: 20px;
+  }
+  .button-round {
+    height: 72px;
+    width: 72px;
+    padding: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 100px;
+    background-color: #ffffff;
+    box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
+    border-color: transparent;
+    margin-top: 25px;
+    &.active-state {
+      background-color: rgba(0, 0, 0, 0.1);
+    }
+  }
+  .color-hsb-preview {
+    width: 72px;
+    height: 72px;
+    border-radius: 100px;
+    overflow: hidden;
+    border: 1px solid #c4c4c4;
+  }
+  .new-color-hsb-preview {
+    width: 100%;
+    height: 36px;
+  }
+  .current-color-hsb-preview {
+    width: 100%;
+    height: 36px;
+  }
+  .list-block ul:before, .list-block ul:after {
+    content: none;
+  }
+  .list-block ul li {
+    border: 1px solid rgba(0, 0, 0, 0.3);
+  }
+  .color-picker-wheel {
+    position: relative;
+    width: 290px;
+    max-width: 100%;
+    height: auto;
+    font-size: 0;
+
+    svg {
+      width: 100%;
+      height: auto;
+    }
+
+    .color-picker-wheel-handle {
+      width: calc(100% / 6);
+      height: calc(100% / 6);
+      position: absolute;
+      box-sizing: border-box;
+      border: 2px solid #fff;
+      box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
+      background: red;
+      border-radius: 50%;
+      left: 0;
+      top: 0;
+    }
+
+    .color-picker-sb-spectrum {
+      background-color: #000;
+      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%);
+      position: relative;
+      width: 45%;
+      height: 45%;
+      left: 50%;
+      top: 50%;
+      transform: translate3d(-50%, -50%, 0);
+      position: absolute;
+    }
+
+    .color-picker-sb-spectrum-handle {
+      width: 4px;
+      height: 4px;
+      position: absolute;
+      left: -2px;
+      top: -2px;
+      z-index: 1;
+
+      &:after {
+        background-color: inherit;
+        content: '';
+        position: absolute;
+        width: 16px;
+        height: 16px;
+        border: 1px solid #fff;
+        border-radius: 50%;
+        box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5);
+        box-sizing: border-box;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+        transition: 150ms;
+        transition-property: transform;
+        transform-origin: center;
+      }
+
+      &.color-picker-sb-spectrum-handle-pressed:after {
+        transform: scale(1.5) translate(-33.333%, -33.333%);
+      }
+    }
+  }
+}

apps/common/mobile/resources/less/material/_color-palette.less

@@ -35,7 +35,7 @@
     }
   }
 
-  .standart-colors {
+  .standart-colors, .dynamic-colors {
     .item-inner {
       overflow: visible;
     }
@@ -44,4 +44,128 @@
   &.list-block:last-child li:last-child a {
     border-radius: 0;
   }
+
+}
+
+.custom-colors {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  margin: 15px;
+  &.phone {
+    max-width: 300px;
+    margin: 0 auto;
+    margin-top: 4px;
+    .button-round {
+      margin-top: 20px;
+    }
+  }
+  .right-block {
+    margin-left: 20px;
+  }
+  .button-round {
+    height: 72px;
+    width: 72px;
+    padding: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 100px;
+    background-color: @themeColor;
+    box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
+    border-color: transparent;
+    margin-top: 25px;
+    &.active-state {
+      background-color: rgba(0, 0, 0, 0.1);
+    }
+  }
+  .color-hsb-preview {
+    width: 72px;
+    height: 72px;
+    border-radius: 100px;
+    overflow: hidden;
+    border: 1px solid #ededed;
+  }
+  .new-color-hsb-preview {
+    width: 100%;
+    height: 36px;
+  }
+  .current-color-hsb-preview {
+    width: 100%;
+    height: 36px;
+  }
+  .list-block ul:before, .list-block ul:after {
+    content: none;
+  }
+  .list-block ul li {
+    border: 1px solid rgba(0, 0, 0, 0.3);
+  }
+  .color-picker-wheel {
+    position: relative;
+    width: 290px;
+    max-width: 100%;
+    height: auto;
+    font-size: 0;
+
+    svg {
+      width: 100%;
+      height: auto;
+    }
+
+    .color-picker-wheel-handle {
+      width: calc(100% / 6);
+      height: calc(100% / 6);
+      position: absolute;
+      box-sizing: border-box;
+      border: 2px solid #fff;
+      box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
+      background: red;
+      border-radius: 50%;
+      left: 0;
+      top: 0;
+    }
+
+    .color-picker-sb-spectrum {
+      background-color: #000;
+      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%);
+      position: relative;
+      width: 45%;
+      height: 45%;
+      left: 50%;
+      top: 50%;
+      transform: translate3d(-50%, -50%, 0);
+      position: absolute;
+    }
+
+    .color-picker-sb-spectrum-handle {
+      width: 4px;
+      height: 4px;
+      position: absolute;
+      left: -2px;
+      top: -2px;
+      z-index: 1;
+
+      &:after {
+        background-color: inherit;
+        content: '';
+        position: absolute;
+        width: 16px;
+        height: 16px;
+        border: 1px solid #fff;
+        border-radius: 50%;
+        box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5);
+        box-sizing: border-box;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+        transition: 150ms;
+        transition-property: transform;
+        transform-origin: center;
+      }
+
+      &.color-picker-sb-spectrum-handle-pressed:after {
+        transform: scale(1.5) translate(-33.333%, -33.333%);
+      }
+    }
+  }
 }

apps/documenteditor/embed/js/ApplicationController.js

@@ -402,6 +402,10 @@ DE.ApplicationController = new(function(){
                 message = me.errorFileSizeExceed;
                 break;
 
+            case Asc.c_oAscError.ID.UpdateVersion:
+                message = me.errorUpdateVersionOnDisconnect;
+                break;
+
             default:
                 message = me.errorDefaultMessage.replace('%1', id);
                 break;
@@ -558,6 +562,7 @@ DE.ApplicationController = new(function(){
         waitText: 'Please, wait...',
         textLoadingDocument: 'Loading document',
         txtClose: 'Close',
-        errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
+        errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
+        errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.'
     }
 })();

apps/documenteditor/embed/locale/en.json

@@ -22,6 +22,7 @@
   "DE.ApplicationController.unknownErrorText": "Unknown error.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
   "DE.ApplicationController.waitText": "Please, wait...",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
   "DE.ApplicationView.txtDownload": "Download",
   "DE.ApplicationView.txtEmbed": "Embed",
   "DE.ApplicationView.txtFullScreen": "Full Screen",

apps/documenteditor/embed/locale/fr.json

@@ -12,6 +12,7 @@
   "DE.ApplicationController.errorAccessDeny": "Vous tentez d'exéсuter une action pour laquelle vous ne disposez pas des droits.<br>Veuillez contacter l'administrateur de Document Server.",
   "DE.ApplicationController.errorDefaultMessage": "Code d'erreur: %1",
   "DE.ApplicationController.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut pas être ouvert.",
+  "DE.ApplicationController.errorFileSizeExceed": "La taille du fichier dépasse les limites établies sur votre serveur.<br>Veuillez contacter votre administrateur de Document Server pour obtenir plus d'information.  ",
   "DE.ApplicationController.errorUserDrop": "Impossible d'accéder au fichier.",
   "DE.ApplicationController.notcriticalErrorTitle": "Avertissement",
   "DE.ApplicationController.scriptLoadError": "La connexion est trop lente, certains  éléments ne peuvent pas être chargés. Veuillez recharger la page.",

apps/documenteditor/embed/locale/it.json

@@ -12,6 +12,7 @@
   "DE.ApplicationController.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.<br>Si prega di contattare l'amministratore del Server dei Documenti.",
   "DE.ApplicationController.errorDefaultMessage": "Codice errore: %1",
   "DE.ApplicationController.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
+  "DE.ApplicationController.errorFileSizeExceed": "La dimensione del file supera la limitazione impostata per il tuo server.<br>Per i dettagli, contatta l'amministratore del Document server.",
   "DE.ApplicationController.errorUserDrop": "Impossibile accedere al file subito.",
   "DE.ApplicationController.notcriticalErrorTitle": "Avviso",
   "DE.ApplicationController.scriptLoadError": "La connessione è troppo lenta, alcuni componenti non possono essere caricati. Si prega di ricaricare la pagina.",

apps/documenteditor/embed/locale/ru.json

@@ -12,6 +12,7 @@
   "DE.ApplicationController.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.ApplicationController.errorDefaultMessage": "Код ошибки: %1",
   "DE.ApplicationController.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
+  "DE.ApplicationController.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.<br>Обратитесь к администратору Сервера документов для получения дополнительной информации.",
   "DE.ApplicationController.errorUserDrop": "В настоящий момент файл недоступен.",
   "DE.ApplicationController.notcriticalErrorTitle": "Внимание",
   "DE.ApplicationController.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.",

apps/documenteditor/main/app/controller/Main.js

@@ -352,6 +352,7 @@ define([
                 this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs;
                 this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage;
                 this.appOptions.canRequestMailMergeRecipients = this.editorConfig.canRequestMailMergeRecipients;
+                this.appOptions.compatibleFeatures = (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compatibleFeatures;
 
                 appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header');
                 appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '')
@@ -365,7 +366,8 @@ define([
 
                 if (!( this.editorConfig.customization && ( this.editorConfig.customization.toolbarNoTabs ||
                     (this.editorConfig.targetApp!=='desktop') && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)))) {
-                    $('#editor_sdk').append('<div class="doc-placeholder">' + '<div class="line"></div>'.repeat(20) + '</div>');
+                    $('#editor-container').css('overflow', 'hidden');
+                    $('#editor-container').append('<div class="doc-placeholder">' + '<div class="line"></div>'.repeat(20) + '</div>');
                 }
 
                 Common.Controllers.Desktop.init(this.appOptions);
@@ -1054,6 +1056,7 @@ define([
                 $(document).on('contextmenu', _.bind(me.onContextMenu, me));
                 Common.Gateway.documentReady();
 
+                $('#editor-container').css('overflow', '');
                 $('.doc-placeholder').remove();
             },
 
@@ -1447,7 +1450,7 @@ define([
                         break;
 
                     case Asc.c_oAscError.ID.Warning:
-                        config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
+                        config.msg = this.errorConnectToServer;
                         config.closable = false;
                         break;
 
@@ -1496,6 +1499,10 @@ define([
                         config.msg = this.errorFileSizeExceed;
                         break;
 
+                   case Asc.c_oAscError.ID.UpdateVersion:
+                        config.msg = this.errorUpdateVersionOnDisconnect;
+                        break;
+
                     default:
                         config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -2217,15 +2224,14 @@ define([
             sendMergeTitle: 'Sending Merge',
             sendMergeText: 'Sending Merge...',
             txtArt: 'Your text here',
-            errorConnectToServer: 'The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>' +
-                                  'Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
+            errorConnectToServer: 'The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.',
             textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the \'Strict mode\' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.',
             textStrict: 'Strict mode',
             txtErrorLoadHistory: 'Loading history failed',
             textBuyNow: 'Visit website',
             textNoLicenseTitle: '%1 connection limitation',
             textContactUs: 'Contact sales',
-            errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.',
+            errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored and page is reloaded.',
             warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
             titleLicenseExp: 'License expired',
             openErrorText: 'An error has occurred while opening the file',
@@ -2473,7 +2479,8 @@ define([
             errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
             txtMainDocOnly: 'Error! Main Document Only.',
             txtNotValidBookmark: 'Error! Not a valid bookmark self-reference.',
-            txtNoText: 'Error! No text of specified style in document.'
+            txtNoText: 'Error! No text of specified style in document.',
+            errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.'
         }
     })(), DE.Controllers.Main || {}))
 });

apps/documenteditor/main/app/controller/Toolbar.js

@@ -47,6 +47,7 @@ define([
     'common/main/lib/view/ImageFromUrlDialog',
     'common/main/lib/view/InsertTableDialog',
     'common/main/lib/view/SelectFileDlg',
+    'common/main/lib/view/SymbolTableDialog',
     'common/main/lib/util/define',
     'documenteditor/main/app/view/Toolbar',
     'documenteditor/main/app/view/DropcapSettingsAdvanced',
@@ -324,6 +325,7 @@ define([
             toolbar.listStyles.on('contextmenu',                        _.bind(this.onListStyleContextMenu, this));
             toolbar.styleMenu.on('hide:before',                         _.bind(this.onListStyleBeforeHide, this));
             toolbar.btnInsertEquation.on('click',                       _.bind(this.onInsertEquationClick, this));
+            toolbar.btnInsertSymbol.on('click',                         _.bind(this.onInsertSymbolClick, this));
             toolbar.mnuNoControlsColor.on('click',                      _.bind(this.onNoControlsColor, this));
             toolbar.mnuControlsColorPicker.on('select',                 _.bind(this.onSelectControlsColor, this));
             Common.Gateway.on('insertimage',                            _.bind(this.insertImage, this));
@@ -653,7 +655,8 @@ define([
             var i = -1, type,
                 paragraph_locked = false,
                 header_locked = false,
-                image_locked = false;
+                image_locked = false,
+                in_image = false;
 
             while (++i < selectedObjects.length) {
                 type = selectedObjects[i].get_ObjectType();
@@ -663,11 +666,15 @@ define([
                 } else if (type === Asc.c_oAscTypeSelectElement.Header) {
                     header_locked = selectedObjects[i].get_ObjectValue().get_Locked();
                 } else if (type === Asc.c_oAscTypeSelectElement.Image) {
+                    in_image = true;
                     image_locked = selectedObjects[i].get_ObjectValue().get_Locked();
                 }
             }
 
             var need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked;
+            if (this.mode.compatibleFeatures) {
+                need_disable = need_disable || in_image;
+            }
             if ( this.btnsComment && this.btnsComment.length > 0 )
                 this.btnsComment.setDisabled(need_disable);
         },
@@ -815,6 +822,8 @@ define([
             need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation || control_plain;
             toolbar.btnInsertEquation.setDisabled(need_disable);
 
+            toolbar.btnInsertSymbol.setDisabled(!in_para || paragraph_locked || header_locked);
+
             need_disable = paragraph_locked || header_locked || in_equation;
             toolbar.btnSuperscript.setDisabled(need_disable);
             toolbar.btnSubscript.setDisabled(need_disable);
@@ -829,6 +838,9 @@ define([
                 toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined);
 
             need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked;
+            if (this.mode.compatibleFeatures) {
+                need_disable = need_disable || in_image;
+            }
             if ( this.btnsComment && this.btnsComment.length > 0 )
                 this.btnsComment.setDisabled(need_disable);
 
@@ -2462,6 +2474,29 @@ define([
             Common.NotificationCenter.trigger('edit:complete', this.toolbar, this.toolbar.btnInsertEquation);
         },
 
+        onInsertSymbolClick: function() {
+            if (this.api) {
+                var me = this,
+                    win = new Common.Views.SymbolTableDialog({
+                        api: me.api,
+                        lang: me.mode.lang,
+                        modal: false,
+                        type: 1,
+                        buttons: [{value: 'ok', caption: this.textInsert}, 'close'],
+                        handler: function(dlg, result, settings) {
+                            if (result == 'ok') {
+                                me.api.pluginMethod_PasteHtml("<span style=\"font-family:'" + settings.font + "'\">" + settings.symbol + "</span>");
+                            } else
+                                Common.NotificationCenter.trigger('edit:complete', me.toolbar);
+                        }
+                    });
+                win.show();
+                win.on('symbol:dblclick', function(cmp, settings) {
+                    me.api.pluginMethod_PasteHtml("<span style=\"font-family:'" + settings.font + "'\">" + settings.symbol + "</span>");
+                });
+            }
+        },
+
         onApiMathTypes: function(equation) {
             this._equationTemp = equation;
             var me = this;
@@ -2827,45 +2862,43 @@ define([
                     compactview = true;
             }
 
-            setTimeout(function () {
-                me.toolbar.render(_.extend({isCompactView: compactview}, config));
+            me.toolbar.render(_.extend({isCompactView: compactview}, config));
 
-                var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
-                var $panel = me.application.getController('Common.Controllers.ReviewChanges').createToolbarPanel();
-                if ( $panel )
-                    me.toolbar.addTab(tab, $panel, 4);
+            var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
+            var $panel = me.application.getController('Common.Controllers.ReviewChanges').createToolbarPanel();
+            if ( $panel )
+                me.toolbar.addTab(tab, $panel, 4);
 
-                if ( config.isEdit ) {
-                    me.toolbar.setMode(config);
+            if ( config.isEdit ) {
+                me.toolbar.setMode(config);
 
-                    me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
+                me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
 
-                    if (!(config.customization && config.customization.compactHeader)) {
-                        // hide 'print' and 'save' buttons group and next separator
-                        me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
+                if (!(config.customization && config.customization.compactHeader)) {
+                    // hide 'print' and 'save' buttons group and next separator
+                    me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
 
-                        // hide 'undo' and 'redo' buttons and retrieve parent container
-                        var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent();
+                    // hide 'undo' and 'redo' buttons and retrieve parent container
+                    var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent();
 
-                        // move 'paste' button to the container instead of 'undo' and 'redo'
-                        me.toolbar.btnPaste.$el.detach().appendTo($box);
-                        me.toolbar.btnCopy.$el.removeClass('split');
-                    }
-
-                    if ( config.isDesktopApp ) {
-                        if ( config.canProtect ) {
-                            tab = {action: 'protect', caption: me.toolbar.textTabProtect};
-                            $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
-
-                            if ($panel) me.toolbar.addTab(tab, $panel, 5);
-                        }
-                    }
-
-                    var links = me.getApplication().getController('Links');
-                    links.setApi(me.api).setConfig({toolbar: me});
-                    Array.prototype.push.apply(me.toolbar.toolbarControls, links.getView('Links').getButtons());
+                    // move 'paste' button to the container instead of 'undo' and 'redo'
+                    me.toolbar.btnPaste.$el.detach().appendTo($box);
+                    me.toolbar.btnCopy.$el.removeClass('split');
                 }
-            }, 0);
+
+                if ( config.isDesktopApp ) {
+                    if ( config.canProtect ) {
+                        tab = {action: 'protect', caption: me.toolbar.textTabProtect};
+                        $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
+
+                        if ($panel) me.toolbar.addTab(tab, $panel, 5);
+                    }
+                }
+
+                var links = me.getApplication().getController('Links');
+                links.setApi(me.api).setConfig({toolbar: me});
+                Array.prototype.push.apply(me.toolbar.toolbarControls, links.getView('Links').getButtons());
+            }
         },
 
         onAppReady: function (config) {
@@ -3262,7 +3295,8 @@ define([
         confirmAddFontName: 'The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the device fonts, the saved font will be used when it is available.<br>Do you want to continue?',
         notcriticalErrorTitle: 'Warning',
         txtMarginsW: 'Left and right margins are too high for a given page wight',
-        txtMarginsH: 'Top and bottom margins are too high for a given page height'
+        txtMarginsH: 'Top and bottom margins are too high for a given page height',
+        textInsert: 'Insert'
 
     }, DE.Controllers.Toolbar || {}));
 });

apps/documenteditor/main/app/template/Toolbar.template

@@ -108,6 +108,7 @@
                 <div class="separator long"></div>
                 <div class="group">
                     <span class="btn-slot text x-huge" id="slot-btn-insequation"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-inssymbol"></span>
                 </div>
                 <div class="separator long"></div>
                 <div class="group">

apps/documenteditor/main/app/template/Viewport.template

@@ -9,7 +9,7 @@
             <div id="viewport-hbox-layout" class="layout-ct hbox">
                 <div id="left-menu" class="layout-item" style="width: 40px;"></div>
                 <div id="about-menu-panel" class="left-menu-full-ct" style="display:none;"></div>
-                <div id="editor_sdk" class="layout-item"></div>
+                <div id="editor-container" class="layout-item"><div id="editor_sdk"></div></div>
                 <div id="right-menu" class="layout-item"></div>
                 <div id="left-panel-history" class="layout-item" />
             </div>

apps/documenteditor/main/app/view/AddNewCaptionLabelDialog.js

@@ -48,8 +48,7 @@ define([
             width: 330,
             header: false,
             cls: 'modal-dlg',
-            buttons: ['ok', 'cancel'],
-            footerCls: 'center'
+            buttons: ['ok', 'cancel']
         },
 
         initialize : function(options) {

apps/documenteditor/main/app/view/BookmarksDialog.js

@@ -110,7 +110,7 @@ define([
                             '</div></div>',
                         '</div>',
                     '</div>',
-                    '<div class="footer right">',
+                    '<div class="footer center">',
                     '<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + me.textClose + '</button>',
                     '</div>'
                 ].join('')

apps/documenteditor/main/app/view/DocumentHolder.js

@@ -1995,10 +1995,13 @@ define([
             this.viewModeMenu = new Common.UI.Menu({
                 initMenu: function (value) {
                     var isInChart = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ChartProperties())),
+                        isInShape = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ShapeProperties())),
                         signGuid = (value.imgProps && value.imgProps.value && me.mode.isSignatureSupport) ? value.imgProps.value.asc_getSignatureId() : undefined,
                         signProps = (signGuid) ? me.api.asc_getSignatureSetup(signGuid) : null,
                         isInSign = !!signProps && me._canProtect,
                         canComment = !isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled;
+                    if (me.mode.compatibleFeatures)
+                        canComment = canComment && !isInShape;
 
                     menuViewUndo.setVisible(me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled);
                     menuViewUndo.setDisabled(!me.api.asc_getCanUndo() && !me._isDisabled);
@@ -3625,8 +3628,11 @@ define([
                         text = me.api.can_AddHyperlink();
                     }
                     /** coauthoring begin **/
-                    menuCommentSeparatorPara.setVisible(!isInChart && me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments);
-                    menuAddCommentPara.setVisible(!isInChart && me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments);
+                    var isVisible = !isInChart && me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments;
+                    if (me.mode.compatibleFeatures)
+                        isVisible = isVisible && !isInShape;
+                    menuCommentSeparatorPara.setVisible(isVisible);
+                    menuAddCommentPara.setVisible(isVisible);
                     menuAddCommentPara.setDisabled(value.paraProps && value.paraProps.locked === true);
                     /** coauthoring end **/
 
@@ -3976,7 +3982,7 @@ define([
         mergeCellsText          : 'Merge Cells',
         splitCellsText          : 'Split Cell...',
         splitCellTitleText      : 'Split Cell',
-        originalSizeText        : 'Default Size',
+        originalSizeText        : 'Actual Size',
         advancedText            : 'Advanced Settings',
         breakBeforeText         : 'Page break before',
         keepLinesText           : 'Keep lines together',

apps/documenteditor/main/app/view/FileMenuPanels.js

@@ -1003,6 +1003,7 @@ define([
                     me.authors.push(item);
                 });
                 this.tblAuthor.find('.close').toggleClass('hidden', !this.mode.isEdit);
+                !this.mode.isEdit && this._ShowHideInfoItem(this.tblAuthor, !!this.authors.length);
             }
             this.SetDisabled();
         },
@@ -1047,6 +1048,12 @@ define([
             this.inputAuthor.setVisible(mode.isEdit);
             this.btnApply.setVisible(mode.isEdit);
             this.tblAuthor.find('.close').toggleClass('hidden', !mode.isEdit);
+            if (!mode.isEdit) {
+                this.inputTitle._input.attr('placeholder', '');
+                this.inputSubject._input.attr('placeholder', '');
+                this.inputComment._input.attr('placeholder', '');
+                this.inputAuthor._input.attr('placeholder', '');
+            }
             this.SetDisabled();
             return this;
         },

apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js

@@ -58,8 +58,7 @@ define([
             width: 350,
             style: 'min-width: 230px;',
             cls: 'modal-dlg',
-            buttons: ['ok', 'cancel'],
-            footerCls: 'right'
+            buttons: ['ok', 'cancel']
         },
 
         initialize : function(options) {

apps/documenteditor/main/app/view/ImageSettings.js

@@ -572,7 +572,7 @@ define([
         textWrap:       'Wraping Style',
         textWidth:      'Width',
         textHeight:     'Height',
-        textOriginalSize: 'Default Size',
+        textOriginalSize: 'Actual Size',
         textInsert:     'Replace Image',
         textFromUrl:    'From URL',
         textFromFile:   'From File',

apps/documenteditor/main/app/view/ImageSettingsAdvanced.js

@@ -2013,7 +2013,7 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
         textLeft:       'Left',
         textBottom:     'Bottom',
         textRight:      'Right',
-        textOriginalSize: 'Default Size',
+        textOriginalSize: 'Actual Size',
         textPosition:   'Position',
         textDistance:   'Distance From Text',
         textSize:       'Size',

apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js

@@ -124,9 +124,9 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             }
 
             this._arrTabAlign = [
-                { value: 1, displayValue: this.textTabLeft },
-                { value: 3, displayValue: this.textTabCenter },
-                { value: 2, displayValue: this.textTabRight }
+                { value: Asc.c_oAscTabType.Left, displayValue: this.textTabLeft },
+                { value: Asc.c_oAscTabType.Center, displayValue: this.textTabCenter },
+                { value: Asc.c_oAscTabType.Right, displayValue: this.textTabRight }
             ];
             this._arrKeyTabAlign = [];
             this._arrTabAlign.forEach(function(item) {
@@ -577,7 +577,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                 cls         : 'input-group-nr',
                 data        : this._arrTabAlign
             });
-            this.cmbAlign.setValue(1);
+            this.cmbAlign.setValue(Asc.c_oAscTabType.Left);
 
             this.cmbLeader = new Common.UI.ComboBox({
                 el          : $('#paraadv-cmb-leader'),

apps/documenteditor/main/app/view/StyleTitleDialog.js

@@ -45,11 +45,9 @@ define([
     DE.Views.StyleTitleDialog = Common.UI.Window.extend(_.extend({
         options: {
             width: 350,
-            height: 200,
             style: 'min-width: 230px;',
             cls: 'modal-dlg',
-            buttons: ['ok', 'cancel'],
-            footerCls: 'right'
+            buttons: ['ok', 'cancel']
         },
 
             initialize : function(options) {

apps/documenteditor/main/app/view/TableFormulaDialog.js

@@ -48,8 +48,7 @@ define([
             width: 300,
             style: 'min-width: 230px;',
             cls: 'modal-dlg',
-            buttons: ['ok', 'cancel'],
-            footerCls: 'right'
+            buttons: ['ok', 'cancel']
         },
 
         initialize : function(options) {

apps/documenteditor/main/app/view/Toolbar.js

@@ -583,6 +583,14 @@ define([
                     });
                     this.paragraphControls.push(this.btnInsertEquation);
 
+                    this.btnInsertSymbol = new Common.UI.Button({
+                        id: 'tlbtn-insertsymbol',
+                        cls: 'btn-toolbar x-huge icon-top',
+                        iconCls: 'btn-symbol',
+                        caption: me.capBtnInsSymbol
+                    });
+                    this.paragraphControls.push(this.btnInsertSymbol);
+
                     this.btnDropCap = new Common.UI.Button({
                         id: 'tlbtn-dropcap',
                         cls: 'btn-toolbar x-huge icon-top',
@@ -1309,6 +1317,7 @@ define([
                 _injectComponent('#slot-btn-blankpage', this.btnBlankPage);
                 _injectComponent('#slot-btn-insshape', this.btnInsertShape);
                 _injectComponent('#slot-btn-insequation', this.btnInsertEquation);
+                _injectComponent('#slot-btn-inssymbol', this.btnInsertSymbol);
                 _injectComponent('#slot-btn-pageorient', this.btnPageOrient);
                 _injectComponent('#slot-btn-pagemargins', this.btnPageMargins);
                 _injectComponent('#slot-btn-pagesize', this.btnPageSize);
@@ -1579,6 +1588,7 @@ define([
                 this.btnBlankPage.updateHint(this.tipBlankPage);
                 this.btnInsertShape.updateHint(this.tipInsertShape);
                 this.btnInsertEquation.updateHint(this.tipInsertEquation);
+                this.btnInsertSymbol.updateHint(this.tipInsertSymbol);
                 this.btnDropCap.updateHint(this.tipDropCap);
                 this.btnContentControls.updateHint(this.tipControls);
                 this.btnColumns.updateHint(this.tipColumns);
@@ -2324,7 +2334,9 @@ define([
             capBtnWatermark: 'Watermark',
             textEditWatermark: 'Custom Watermark',
             textRemWatermark: 'Remove Watermark',
-            tipWatermark: 'Edit watermark'
+            tipWatermark: 'Edit watermark',
+            capBtnInsSymbol: 'Symbol',
+            tipInsertSymbol: 'Insert symbol'
         }
     })(), DE.Views.Toolbar || {}));
 });

apps/documenteditor/main/index.html

@@ -18,7 +18,7 @@
             width: 100%;
             overflow: hidden;
             border: none;
-            background-color: #f4f4f4;
+            background: #f1f1f1;
             z-index: 1001;
         }
 
@@ -31,6 +31,7 @@
         .loadmask > .brendpanel > div {
             display: flex;
             align-items: center;
+            height: 28px;
         }
 
         .loadmask > .brendpanel .spacer {
@@ -50,15 +51,6 @@
             opacity: 0;
         }
 
-        .loadmask > .brendpanel .circle {
-            vertical-align: middle;
-            width: 20px;
-            height: 20px;
-            border-radius: 12px;
-            margin: 4px 10px;
-            background: rgba(255, 255, 255, 0.2);
-        }
-
         .loadmask > .brendpanel .rect {
             vertical-align: middle;
             width: 50px;
@@ -69,8 +61,8 @@
         }
 
         .loadmask > .sktoolbar {
-            background: #fafafa;
-            border-bottom: 1px solid #e2e2e2;
+            background: #f1f1f1;
+            border-bottom: 1px solid #cfcfcf;
             height: 46px;
             padding: 10px 12px;
             box-sizing: content-box;
@@ -130,24 +122,24 @@
         }
 
         @keyframes flickerAnimation {
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-o-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-moz-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-webkit-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
     </style>
 
@@ -217,7 +209,7 @@
 <body>
     <div id="loading-mask" class="loadmask">
         <div class="brendpanel">
-            <div><div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo@2x.png"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div><span class="circle"></span><span class="circle"></span><span class="circle"></span></div></div>
+            <div><div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo@2x.png"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span></div></div>
         <div class="sktoolbar">
             <ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li><li class="fat"></li></ul>
             <ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li></ul>

apps/documenteditor/main/index.html.deploy

@@ -19,19 +19,20 @@
             width: 100%;
             overflow: hidden;
             border: none;
-            background-color: #f4f4f4;
+            background: #f1f1f1;
             z-index: 1001;
         }
 
         .loadmask > .brendpanel {
             width: 100%;
-            height: 56px;
+            min-height: 32px;
             background: #446995;
         }
 
         .loadmask > .brendpanel > div {
             display: flex;
             align-items: center;
+            height: 28px;
         }
 
         .loadmask > .brendpanel .spacer {
@@ -51,15 +52,6 @@
             opacity: 0;
         }
 
-        .loadmask > .brendpanel .circle {
-            vertical-align: middle;
-            width: 20px;
-            height: 20px;
-            border-radius: 12px;
-            margin: 4px 10px;
-            background: rgba(255, 255, 255, 0.2);
-        }
-
         .loadmask > .brendpanel .rect {
             vertical-align: middle;
             width: 50px;
@@ -70,8 +62,8 @@
         }
 
         .loadmask > .sktoolbar {
-            background: #fafafa;
-            border-bottom: 1px solid #e2e2e2;
+            background: #f1f1f1;
+            border-bottom: 1px solid #cfcfcf;
             height: 46px;
             padding: 10px 12px;
             box-sizing: content-box;
@@ -82,11 +74,6 @@
             padding: 0;
             white-space: nowrap;
             position: relative;
-
-            -webkit-animation: flickerAnimation 2s infinite ease-in-out;
-            -moz-animation: flickerAnimation 2s infinite ease-in-out;
-            -o-animation: flickerAnimation 2s infinite ease-in-out;
-            animation: flickerAnimation 2s infinite ease-in-out;
         }
 
         .loadmask > .sktoolbar li {
@@ -136,24 +123,24 @@
         }
 
         @keyframes flickerAnimation {
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-o-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-moz-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-webkit-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
     </style>
 
@@ -217,7 +204,7 @@
     <link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">
 </head>
 <body>
-    <div id="loading-mask" class="loadmask"><div class="brendpanel"><div><div class="loading-logo"><img src="../../../apps/documenteditor/main/resources/img/header/header-logo@2x.png"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div><span class="circle"></span><span class="circle"></span><span class="circle"></span></div></div><div class="sktoolbar"><ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li><li class="fat"></li></ul><ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li></ul></div><div class="placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
+    <div id="loading-mask" class="loadmask"><div class="brendpanel"><div><div class="loading-logo"><img src="../../../apps/documenteditor/main/resources/img/header/header-logo@2x.png"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span></div></div><div class="sktoolbar"><ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li><li class="fat"></li></ul><ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li></ul></div><div class="placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
     <div id="viewport"></div>
 
     <script>

apps/documenteditor/main/locale/bg.json

@@ -321,7 +321,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Опитвате се да извършите действие, за което нямате права. <br> Моля, свържете се с администратора на сървъра за документи.",
   "DE.Controllers.Main.errorBadImageUrl": "URL адресът на изображението е неправилен",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Връзката със сървъра е загубена. Документът не може да бъде редактиран в момента.",
-  "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.<br>Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа. <br><br>Намерете повече информация за свързването на сървър за документи <a href=\"%1\" target=\"_blank\">тук</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.<br>Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа.",
   "DE.Controllers.Main.errorDatabaseConnection": "Външна грешка. <br> Грешка при свързване към база данни. Моля, свържете се с екипа за поддръжка, в случай че грешката продължава.",
   "DE.Controllers.Main.errorDataEncrypted": "Получени са криптирани промени, които не могат да бъдат дешифрирани.",
   "DE.Controllers.Main.errorDataRange": "Неправилен обхват от данни.",
@@ -1982,7 +1982,7 @@
   "DE.Views.Toolbar.capImgForward": "Изведи напред",
   "DE.Views.Toolbar.capImgGroup": "Група",
   "DE.Views.Toolbar.capImgWrapping": "Опаковане",
-  "DE.Views.Toolbar.mniCustomTable": "Вмъкване на персонализирана таблица",
+  "DE.Views.Toolbar.mniCustomTable": "Персонализирана таблица",
   "DE.Views.Toolbar.mniEditControls": "Настройки за управление",
   "DE.Views.Toolbar.mniEditDropCap": "Пуснете настройките на капачката",
   "DE.Views.Toolbar.mniEditFooter": "Редактиране на долен колонтитул",

apps/documenteditor/main/locale/cs.json

@@ -237,7 +237,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.<br>Prosím, kontaktujte administrátora vašeho Dokumentového serveru.",
   "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávná",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Spojení se serverem ztraceno. Dokument nyní nelze upravovat.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.<br> Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.<br><br> Více informací o připojení najdete v Dokumentovém serveru <a href=\"%1\" target=\"_blank\">here</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.<br> Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externí chyba.<br>Chyba spojení s databází. Prosím kontaktujte podporu, pokud chyba přetrvává.",
   "DE.Controllers.Main.errorDataRange": "Nesprávný datový rozsah.",
   "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1",

apps/documenteditor/main/locale/de.json

@@ -321,7 +321,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Sie haben versucht die Änderungen im Dokument, zu dem Sie keine Berechtigungen haben, vorzunehemen.<br>Wenden Sie sich an Ihren Serveradministrator.",
   "DE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Das Dokument kann momentan nicht bearbeitet werden.",
-  "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.<br><br>Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie <a href=\"%1\" target=\"_blank\">hier</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Fehler beim Verbinden zur Datenbank. Bitte wenden Sie sich an den Kundendienst, falls der Fehler bestehen bleibt.",
   "DE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.",
   "DE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",

apps/documenteditor/main/locale/en.json

@@ -299,6 +299,11 @@
   "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line",
   "Common.Views.SignSettingsDialog.textTitle": "Signature Setup",
   "Common.Views.SignSettingsDialog.txtEmpty": "This field is required",
+  "Common.Views.SymbolTableDialog.textTitle": "Symbol",
+  "Common.Views.SymbolTableDialog.textFont": "Font",
+  "Common.Views.SymbolTableDialog.textRange": "Range",
+  "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols",
+  "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value",
   "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document",
   "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
@@ -350,7 +355,7 @@
   "DE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
   "DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.",
   "DE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded",
-  "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.",
+  "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print it until the connection is restored and page is reloaded.",
   "DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click \"Stay on This Page\", then \"Save\" to save them. Click \"Leave This Page\" to discard all the unsaved changes.",
   "DE.Controllers.Main.loadFontsTextText": "Loading data...",
   "DE.Controllers.Main.loadFontsTitleText": "Loading Data",
@@ -422,12 +427,15 @@
   "DE.Controllers.Main.txtHyperlink": "Hyperlink",
   "DE.Controllers.Main.txtIndTooLarge": "Index Too Large",
   "DE.Controllers.Main.txtLines": "Lines",
+  "DE.Controllers.Main.txtMainDocOnly": "Error! Main Document Only.",
   "DE.Controllers.Main.txtMath": "Math",
   "DE.Controllers.Main.txtMissArg": "Missing Argument",
   "DE.Controllers.Main.txtMissOperator": "Missing Operator",
   "DE.Controllers.Main.txtNeedSynchronize": "You have updates",
   "DE.Controllers.Main.txtNoTableOfContents": "No table of contents entries found.",
+  "DE.Controllers.Main.txtNoText": "Error! No text of specified style in document.",
   "DE.Controllers.Main.txtNotInTable": "Is Not In Table",
+  "DE.Controllers.Main.txtNotValidBookmark": "Error! Not a valid bookmark self-reference.",
   "DE.Controllers.Main.txtOddPage": "Odd Page",
   "DE.Controllers.Main.txtOnPage": "on page",
   "DE.Controllers.Main.txtRectangles": "Rectangles",
@@ -647,9 +655,7 @@
   "DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
-  "DE.Controllers.Main.txtMainDocOnly": "Error! Main Document Only.",
-  "DE.Controllers.Main.txtNotValidBookmark": "Error! Not a valid bookmark self-reference.",
-  "DE.Controllers.Main.txtNoText": "Error! No text of specified style in document.",
+  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download as...' option to save the file backup copy to your computer hard drive.",
   "DE.Controllers.Navigation.txtBeginning": "Beginning of document",
   "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
   "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
@@ -991,6 +997,7 @@
   "DE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis",
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
+  "DE.Controllers.Toolbar.textInsert": "Insert",
   "DE.Controllers.Viewport.textFitPage": "Fit to Page",
   "DE.Controllers.Viewport.textFitWidth": "Fit to Width",
   "DE.Views.AddNewCaptionLabelDialog.textLabel": "Label:",
@@ -1008,28 +1015,28 @@
   "DE.Views.BookmarksDialog.textSort": "Sort by",
   "DE.Views.BookmarksDialog.textTitle": "Bookmarks",
   "DE.Views.BookmarksDialog.txtInvalidName": "Bookmark name can only contain letters, digits and underscores, and should begin with the letter",
-  "DE.Views.CaptionDialog.textTitle": "Insert Caption",
+  "DE.Views.CaptionDialog.textAdd": "Add label",
+  "DE.Views.CaptionDialog.textAfter": "After",
+  "DE.Views.CaptionDialog.textBefore": "Before",
   "DE.Views.CaptionDialog.textCaption": "Caption",
+  "DE.Views.CaptionDialog.textChapter": "Chapter starts with style",
+  "DE.Views.CaptionDialog.textChapterInc": "Include chapter number",
+  "DE.Views.CaptionDialog.textColon": "colon",
+  "DE.Views.CaptionDialog.textDash": "dash",
+  "DE.Views.CaptionDialog.textDelete": "Delete label",
+  "DE.Views.CaptionDialog.textEquation": "Equation",
+  "DE.Views.CaptionDialog.textExamples": "Examples: Table 2-A, Image 1.IV",
+  "DE.Views.CaptionDialog.textExclude": "Exclude label from caption",
+  "DE.Views.CaptionDialog.textFigure": "Figure",
+  "DE.Views.CaptionDialog.textHyphen": "hyphen",
   "DE.Views.CaptionDialog.textInsert": "Insert",
   "DE.Views.CaptionDialog.textLabel": "Label",
-  "DE.Views.CaptionDialog.textAdd": "Add label",
-  "DE.Views.CaptionDialog.textDelete": "Delete label",
-  "DE.Views.CaptionDialog.textNumbering": "Numbering",
-  "DE.Views.CaptionDialog.textChapterInc": "Include chapter number",
-  "DE.Views.CaptionDialog.textChapter": "Chapter starts with style",
-  "DE.Views.CaptionDialog.textSeparator": "Use separator",
-  "DE.Views.CaptionDialog.textExamples": "Examples: Table 2-A, Image 1.IV",
-  "DE.Views.CaptionDialog.textBefore": "Before",
-  "DE.Views.CaptionDialog.textAfter": "After",
-  "DE.Views.CaptionDialog.textHyphen": "hyphen",
-  "DE.Views.CaptionDialog.textPeriod": "period",
-  "DE.Views.CaptionDialog.textColon": "colon",
   "DE.Views.CaptionDialog.textLongDash": "long dash",
-  "DE.Views.CaptionDialog.textDash": "dash",
-  "DE.Views.CaptionDialog.textEquation": "Equation",
-  "DE.Views.CaptionDialog.textFigure": "Figure",
+  "DE.Views.CaptionDialog.textNumbering": "Numbering",
+  "DE.Views.CaptionDialog.textPeriod": "period",
+  "DE.Views.CaptionDialog.textSeparator": "Use separator",
   "DE.Views.CaptionDialog.textTable": "Table",
-  "DE.Views.CaptionDialog.textExclude": "Exclude label from caption",
+  "DE.Views.CaptionDialog.textTitle": "Insert Caption",
   "DE.Views.CellsAddDialog.textCol": "Columns",
   "DE.Views.CellsAddDialog.textDown": "Below the cursor",
   "DE.Views.CellsAddDialog.textLeft": "To the left",
@@ -1049,7 +1056,7 @@
   "DE.Views.ChartSettings.textEditData": "Edit Data",
   "DE.Views.ChartSettings.textHeight": "Height",
   "DE.Views.ChartSettings.textLine": "Line",
-  "DE.Views.ChartSettings.textOriginalSize": "Default Size",
+  "DE.Views.ChartSettings.textOriginalSize": "Actual Size",
   "DE.Views.ChartSettings.textPie": "Pie",
   "DE.Views.ChartSettings.textPoint": "XY (Scatter)",
   "DE.Views.ChartSettings.textSize": "Size",
@@ -1131,7 +1138,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Merge Cells",
   "DE.Views.DocumentHolder.moreText": "More variants...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "No variants",
-  "DE.Views.DocumentHolder.originalSizeText": "Default Size",
+  "DE.Views.DocumentHolder.originalSizeText": "Actual Size",
   "DE.Views.DocumentHolder.paragraphText": "Paragraph",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Remove Hyperlink",
   "DE.Views.DocumentHolder.rightText": "Right",
@@ -1258,6 +1265,7 @@
   "DE.Views.DocumentHolder.txtInsertArgAfter": "Insert argument after",
   "DE.Views.DocumentHolder.txtInsertArgBefore": "Insert argument before",
   "DE.Views.DocumentHolder.txtInsertBreak": "Insert manual break",
+  "DE.Views.DocumentHolder.txtInsertCaption": "Insert Caption",
   "DE.Views.DocumentHolder.txtInsertEqAfter": "Insert equation after",
   "DE.Views.DocumentHolder.txtInsertEqBefore": "Insert equation before",
   "DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
@@ -1296,7 +1304,6 @@
   "DE.Views.DocumentHolder.txtUngroup": "Ungroup",
   "DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
   "DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
-  "DE.Views.DocumentHolder.txtInsertCaption": "Insert Caption",
   "DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
   "DE.Views.DropcapSettingsAdvanced.strDropcap": "Drop Cap",
   "DE.Views.DropcapSettingsAdvanced.strMargins": "Margins",
@@ -1491,7 +1498,7 @@
   "DE.Views.ImageSettings.textHintFlipH": "Flip Horizontally",
   "DE.Views.ImageSettings.textHintFlipV": "Flip Vertically",
   "DE.Views.ImageSettings.textInsert": "Replace Image",
-  "DE.Views.ImageSettings.textOriginalSize": "Default Size",
+  "DE.Views.ImageSettings.textOriginalSize": "Actual Size",
   "DE.Views.ImageSettings.textRotate90": "Rotate 90°",
   "DE.Views.ImageSettings.textRotation": "Rotation",
   "DE.Views.ImageSettings.textSize": "Size",
@@ -1543,7 +1550,7 @@
   "DE.Views.ImageSettingsAdvanced.textMiter": "Miter",
   "DE.Views.ImageSettingsAdvanced.textMove": "Move object with text",
   "DE.Views.ImageSettingsAdvanced.textOptions": "Options",
-  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Default Size",
+  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Actual Size",
   "DE.Views.ImageSettingsAdvanced.textOverlap": "Allow overlap",
   "DE.Views.ImageSettingsAdvanced.textPage": "Page",
   "DE.Views.ImageSettingsAdvanced.textParagraph": "Paragraph",
@@ -1948,14 +1955,14 @@
   "DE.Views.TableSettings.tipRight": "Set outer right border only",
   "DE.Views.TableSettings.tipTop": "Set outer top border only",
   "DE.Views.TableSettings.txtNoBorders": "No borders",
-  "DE.Views.TableSettings.txtTable_TableGrid": "Table Grid",
-  "DE.Views.TableSettings.txtTable_PlainTable": "Plain Table",
-  "DE.Views.TableSettings.txtTable_GridTable": "Grid Table",
-  "DE.Views.TableSettings.txtTable_ListTable": "List Table",
-  "DE.Views.TableSettings.txtTable_Light": "Light",
-  "DE.Views.TableSettings.txtTable_Dark": "Dark",
-  "DE.Views.TableSettings.txtTable_Colorful": "Colorful",
   "DE.Views.TableSettings.txtTable_Accent": "Accent",
+  "DE.Views.TableSettings.txtTable_Colorful": "Colorful",
+  "DE.Views.TableSettings.txtTable_Dark": "Dark",
+  "DE.Views.TableSettings.txtTable_GridTable": "Grid Table",
+  "DE.Views.TableSettings.txtTable_Light": "Light",
+  "DE.Views.TableSettings.txtTable_ListTable": "List Table",
+  "DE.Views.TableSettings.txtTable_PlainTable": "Plain Table",
+  "DE.Views.TableSettings.txtTable_TableGrid": "Table Grid",
   "DE.Views.TableSettingsAdvanced.textAlign": "Alignment",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Alignment",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Spacing between cells",
@@ -2238,6 +2245,8 @@
   "DE.Views.Toolbar.txtScheme7": "Equity",
   "DE.Views.Toolbar.txtScheme8": "Flow",
   "DE.Views.Toolbar.txtScheme9": "Foundry",
+  "DE.Views.Toolbar.capBtnInsSymbol": "Symbol",
+  "DE.Views.Toolbar.tipInsertSymbol": "Insert symbol",
   "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
   "DE.Views.WatermarkSettingsDialog.textBold": "Bold",
   "DE.Views.WatermarkSettingsDialog.textColor": "Text color",

apps/documenteditor/main/locale/es.json

@@ -322,7 +322,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Usted no tiene permisos para realizar la acción que está intentando hacer.<br> Por favor, contacte con el Administrador del Servidor de Documentos.",
   "DE.Controllers.Main.errorBadImageUrl": "URL de imagen es incorrecto",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Se ha perdido la conexión con servidor. El documento no puede ser editado ahora.",
-  "DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.<br>Al hacer clic en el botón 'OK' se le solicitará que descargue el documento.<br><br>Encuentre más información acerca de la conexión de Servidor de Documentos <a href=\"%1\" target=\"_blank\">aquí</a>",
+  "DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.<br>Al hacer clic en el botón 'OK' se le solicitará que descargue el documento.",
   "DE.Controllers.Main.errorDatabaseConnection": "Error externo.<br>Error de conexión de base de datos. Por favor póngase en contacto con soporte si el error se mantiene.",
   "DE.Controllers.Main.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.",
   "DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.",

apps/documenteditor/main/locale/fr.json

@@ -322,7 +322,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Vous tentez d'exéсuter une action pour laquelle vous ne disposez pas des droits.<br>Veuillez contacter l'administrateur de Document Server.",
   "DE.Controllers.Main.errorBadImageUrl": "L'URL de l'image est incorrecte",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Connexion au serveur perdue. Le document ne peut être modifié en ce moment.",
-  "DE.Controllers.Main.errorConnectToServer": "Impossible d'enregistrer le document. Veuillez vérifier vos paramètres de connexion ou contactez l'administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.<br><br>Trouvez plus d'informations sur la connexion au Serveur de Documents <a href=\"%1\" target=\"_blank\">ici</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Impossible d'enregistrer le document. Veuillez vérifier vos paramètres de connexion ou contactez l'administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.",
   "DE.Controllers.Main.errorDatabaseConnection": "Erreur externe.<br>Erreur de connexion à la base de données. Si l'erreur persiste veillez contactez l'assistance technique.",
   "DE.Controllers.Main.errorDataEncrypted": "Les modifications chiffrées ont été reçues, elle ne peuvent pas être déchiffrées.",
   "DE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
@@ -331,6 +331,7 @@
   "DE.Controllers.Main.errorEditingSaveas": "Une erreure s'est produite lors du travail avec le document.<br>Utilisez l'option 'Enregistrer comme...' pour enregistrer une copie de sauvegarde  sur le disque dur de votre ordinateur. ",
   "DE.Controllers.Main.errorEmailClient": "Pas de client messagerie trouvé",
   "DE.Controllers.Main.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut être ouvert.",
+  "DE.Controllers.Main.errorFileSizeExceed": "La taille du fichier dépasse les limites établies sur votre serveur.<br>Veuillez contacter votre administrateur de Document Server pour obtenir plus d'information.  ",
   "DE.Controllers.Main.errorForceSave": "Une erreur est survenue lors de l'enregistrement du fichier. Veuillez utiliser l'option «Télécharger en tant que» pour enregistrer le fichier sur le disque dur de votre ordinateur ou réessayer plus tard.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu",
   "DE.Controllers.Main.errorKeyExpire": "Descripteur clé a expiré",
@@ -1000,6 +1001,17 @@
   "DE.Views.BookmarksDialog.textSort": "Trier par",
   "DE.Views.BookmarksDialog.textTitle": "Signets",
   "DE.Views.BookmarksDialog.txtInvalidName": "Nom du signet ne peut pas contenir que des lettres, des  chiffres et des barres de soulignement et doit commencer avec une lettre",
+  "DE.Views.CellsAddDialog.textCol": "Colonnes",
+  "DE.Views.CellsAddDialog.textDown": "Au-dessous du curseur",
+  "DE.Views.CellsAddDialog.textLeft": "Vers la gauche",
+  "DE.Views.CellsAddDialog.textRight": "Vers la droite",
+  "DE.Views.CellsAddDialog.textRow": "Lignes",
+  "DE.Views.CellsAddDialog.textTitle": "Inserer Plusieurs",
+  "DE.Views.CellsAddDialog.textUp": "au-dessus du curseur",
+  "DE.Views.CellsRemoveDialog.textCol": "Supprimer la colonne entière",
+  "DE.Views.CellsRemoveDialog.textLeft": "Décaler les cellules vers la gauche",
+  "DE.Views.CellsRemoveDialog.textRow": "Supprimer la ligne entière",
+  "DE.Views.CellsRemoveDialog.textTitle": "Supprimer les cellules",
   "DE.Views.ChartSettings.textAdvanced": "Afficher les paramètres avancés",
   "DE.Views.ChartSettings.textArea": "En aires",
   "DE.Views.ChartSettings.textBar": "En barre",
@@ -1117,6 +1129,7 @@
   "DE.Views.DocumentHolder.textArrangeBackward": "Reculer",
   "DE.Views.DocumentHolder.textArrangeForward": "Avancer",
   "DE.Views.DocumentHolder.textArrangeFront": "Mettre au premier plan",
+  "DE.Views.DocumentHolder.textCells": "Cellules",
   "DE.Views.DocumentHolder.textContentControls": "Contrôle du contenu",
   "DE.Views.DocumentHolder.textContinueNumbering": "Continuer la numérotation",
   "DE.Views.DocumentHolder.textCopy": "Copier",
@@ -1148,6 +1161,7 @@
   "DE.Views.DocumentHolder.textRotate90": "Faire pivoter à droite de 90°",
   "DE.Views.DocumentHolder.textSeparateList": "Liste séparée",
   "DE.Views.DocumentHolder.textSettings": "Paramètres",
+  "DE.Views.DocumentHolder.textSeveral": "Plusieurs Lignes/Colonnes ",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Aligner en bas",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Aligner au centre",
   "DE.Views.DocumentHolder.textShapeAlignLeft": "Aligner à gauche",
@@ -1164,6 +1178,7 @@
   "DE.Views.DocumentHolder.textUpdateTOC": "Actualiser la table des matières",
   "DE.Views.DocumentHolder.textWrap": "Style d'habillage",
   "DE.Views.DocumentHolder.tipIsLocked": "Cet élément est en cours d'édition par un autre utilisateur.",
+  "DE.Views.DocumentHolder.toDictionaryText": "Ajouter au dictionnaire",
   "DE.Views.DocumentHolder.txtAddBottom": "Ajouter bordure inférieure",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Ajouter barre de fraction",
   "DE.Views.DocumentHolder.txtAddHor": "Ajouter une ligne horizontale",
@@ -1226,6 +1241,7 @@
   "DE.Views.DocumentHolder.txtOverwriteCells": "Remplacer les cellules",
   "DE.Views.DocumentHolder.txtPasteSourceFormat": "Garder la mise en forme source",
   "DE.Views.DocumentHolder.txtPressLink": "Appuyez sur Ctrl et cliquez sur le lien",
+  "DE.Views.DocumentHolder.txtPrintSelection": "Imprimer la sélection",
   "DE.Views.DocumentHolder.txtRemFractionBar": "Supprimer la barre de fraction",
   "DE.Views.DocumentHolder.txtRemLimit": "Supprimer la limite",
   "DE.Views.DocumentHolder.txtRemoveAccentChar": "Supprimer le caractère d'accent",
@@ -1317,6 +1333,7 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Créez un nouveau document texte vierge que vous serez en mesure de styliser et de formater après sa création au cours de la modification. Ou choisissez un des modèles où certains styles sont déjà pré-appliqués pour commencer un document d'un certain type ou objectif.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nouveau document texte ",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Pas de modèles",
+  "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Appliquer",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Ajouter un auteur",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Ajouter du texte",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Application",
@@ -1325,12 +1342,16 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Commentaire",
   "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Créé",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Chargement en cours...",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Dernière modification par",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Dernière modification",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Propriétaire",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Pages",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Paragraphes",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Emplacement",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Personnes qui ont des droits",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Symboles avec des espaces",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistiques",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Sujet",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Symboles",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titre du document",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Chargé",
@@ -1373,6 +1394,7 @@
   "DE.Views.FileMenuPanels.Settings.textAlignGuides": "Guides d'alignement",
   "DE.Views.FileMenuPanels.Settings.textAutoRecover": "Récupération automatique",
   "DE.Views.FileMenuPanels.Settings.textAutoSave": "Enregistrement automatique",
+  "DE.Views.FileMenuPanels.Settings.textCompatible": "Compatibilité",
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Désactivé",
   "DE.Views.FileMenuPanels.Settings.textForceSave": "Enregistrer sur le serveur",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Chaque minute",
@@ -1659,33 +1681,52 @@
   "DE.Views.ParagraphSettingsAdvanced.strBorders": "Bordures et remplissage",
   "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Saut de page avant",
   "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double barré",
+  "DE.Views.ParagraphSettingsAdvanced.strIndent": "Retraits",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "A gauche",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Interligne",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Niveau hiérarchique",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "A droite",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "Après",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Avant",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Spécial",
   "DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Lignes solidaires",
   "DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Paragraphes solidaires",
   "DE.Views.ParagraphSettingsAdvanced.strMargins": "Marges intérieures",
   "DE.Views.ParagraphSettingsAdvanced.strOrphan": "Éviter orphelines",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Police",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Retraits et emplacement",
+  "DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Enchaînements",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Emplacement",
   "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Petites majuscules",
+  "DE.Views.ParagraphSettingsAdvanced.strSomeParagraphSpace": "Ne pas ajouter d'intervalle entre paragraphes du même style",
+  "DE.Views.ParagraphSettingsAdvanced.strSpacing": "Espacement",
   "DE.Views.ParagraphSettingsAdvanced.strStrike": "Barré",
   "DE.Views.ParagraphSettingsAdvanced.strSubscript": "Indice",
   "DE.Views.ParagraphSettingsAdvanced.strSuperscript": "Exposant",
   "DE.Views.ParagraphSettingsAdvanced.strTabs": "Tabulation",
   "DE.Views.ParagraphSettingsAdvanced.textAlign": "Alignement",
+  "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "Au moins ",
+  "DE.Views.ParagraphSettingsAdvanced.textAuto": "Plusieurs",
   "DE.Views.ParagraphSettingsAdvanced.textBackColor": "Couleur d'arrière-plan",
+  "DE.Views.ParagraphSettingsAdvanced.textBodyText": "Texte simple",
   "DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Couleur",
   "DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Cliquez sur le diagramme ou utilisez les boutons pour sélectionner les bordures et appliquez le style choisi",
   "DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Taille de bordure",
   "DE.Views.ParagraphSettingsAdvanced.textBottom": "En bas",
+  "DE.Views.ParagraphSettingsAdvanced.textCentered": "Centré",
   "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Espacement des caractères",
   "DE.Views.ParagraphSettingsAdvanced.textDefault": "Par défaut",
   "DE.Views.ParagraphSettingsAdvanced.textEffects": "Effets",
+  "DE.Views.ParagraphSettingsAdvanced.textExact": "Exactement",
+  "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "Première ligne",
+  "DE.Views.ParagraphSettingsAdvanced.textHanging": "Suspendu",
+  "DE.Views.ParagraphSettingsAdvanced.textJustified": "Justifié",
   "DE.Views.ParagraphSettingsAdvanced.textLeader": "Guide",
   "DE.Views.ParagraphSettingsAdvanced.textLeft": "A gauche",
+  "DE.Views.ParagraphSettingsAdvanced.textLevel": "Niveau",
   "DE.Views.ParagraphSettingsAdvanced.textNewColor": "Couleur personnalisée",
   "DE.Views.ParagraphSettingsAdvanced.textNone": "Aucune",
+  "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(aucun)",
   "DE.Views.ParagraphSettingsAdvanced.textPosition": "Position",
   "DE.Views.ParagraphSettingsAdvanced.textRemove": "Supprimer",
   "DE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Supprimer tout",
@@ -1706,6 +1747,7 @@
   "DE.Views.ParagraphSettingsAdvanced.tipOuter": "Seulement bordure extérieure",
   "DE.Views.ParagraphSettingsAdvanced.tipRight": "Seulement bordure droite",
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Seulement bordure supérieure",
+  "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Pas de bordures",
   "DE.Views.RightMenu.txtChartSettings": "Paramètres du graphique",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Paramètres d'en-têtes et de pieds de page",
@@ -1873,6 +1915,14 @@
   "DE.Views.TableSettings.tipRight": "Seulement bordure extérieure droite",
   "DE.Views.TableSettings.tipTop": "Seulement bordure extérieure supérieure",
   "DE.Views.TableSettings.txtNoBorders": "Pas de bordures",
+  "DE.Views.TableSettings.txtTable_Accent": "Accentuation",
+  "DE.Views.TableSettings.txtTable_Colorful": "En couleurs",
+  "DE.Views.TableSettings.txtTable_Dark": "Foncé",
+  "DE.Views.TableSettings.txtTable_GridTable": "Table Grille",
+  "DE.Views.TableSettings.txtTable_Light": "Clair",
+  "DE.Views.TableSettings.txtTable_ListTable": "Tableau de listes",
+  "DE.Views.TableSettings.txtTable_PlainTable": "Tableau simple",
+  "DE.Views.TableSettings.txtTable_TableGrid": "Grille du tableau",
   "DE.Views.TableSettingsAdvanced.textAlign": "Alignement",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Alignement",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Espacement entre les cellules",
@@ -2046,6 +2096,7 @@
   "DE.Views.Toolbar.textPoint": "Nuages de points (XY)",
   "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRemoveControl": "Supprimer le contrôle du contenu",
+  "DE.Views.Toolbar.textRemWatermark": "Supprimer le filigrane",
   "DE.Views.Toolbar.textRichControl": "Insérer un contrôle de contenu en texte enrichi",
   "DE.Views.Toolbar.textRight": "A droite: ",
   "DE.Views.Toolbar.textStock": "Boursier",
@@ -2127,6 +2178,7 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Caractères non imprimables",
   "DE.Views.Toolbar.tipSynchronize": "Le document a été modifié par un autre utilisateur. Cliquez pour enregistrer vos modifications et recharger des mises à jour.",
   "DE.Views.Toolbar.tipUndo": "Annuler",
+  "DE.Views.Toolbar.tipWatermark": "Modifier le filigrane",
   "DE.Views.Toolbar.txtDistribHor": "Distribuer horizontalement",
   "DE.Views.Toolbar.txtDistribVert": "Distribuer verticalement",
   "DE.Views.Toolbar.txtMarginAlign": "Aligner par rapport à la marge",
@@ -2156,9 +2208,24 @@
   "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
   "DE.Views.WatermarkSettingsDialog.textBold": "Gras",
   "DE.Views.WatermarkSettingsDialog.textColor": "Couleur du texte",
+  "DE.Views.WatermarkSettingsDialog.textDiagonal": "Diagonale",
+  "DE.Views.WatermarkSettingsDialog.textFont": "Police",
+  "DE.Views.WatermarkSettingsDialog.textFromFile": "Depuis un fichier",
+  "DE.Views.WatermarkSettingsDialog.textFromUrl": "D'une URL",
+  "DE.Views.WatermarkSettingsDialog.textHor": "Horizontal",
+  "DE.Views.WatermarkSettingsDialog.textImageW": "Image en filigrane",
+  "DE.Views.WatermarkSettingsDialog.textItalic": "Italique",
+  "DE.Views.WatermarkSettingsDialog.textLanguage": "Langue",
+  "DE.Views.WatermarkSettingsDialog.textLayout": "Mise en page",
   "DE.Views.WatermarkSettingsDialog.textNewColor": "Ajouter une nouvelle couleur personnalisée",
+  "DE.Views.WatermarkSettingsDialog.textNone": "Aucun",
+  "DE.Views.WatermarkSettingsDialog.textScale": "Échelle",
+  "DE.Views.WatermarkSettingsDialog.textStrikeout": "Barré",
   "DE.Views.WatermarkSettingsDialog.textText": "Texte",
   "DE.Views.WatermarkSettingsDialog.textTextW": "Filigrane de texte",
   "DE.Views.WatermarkSettingsDialog.textTitle": "Paramètres de filigrane",
-  "DE.Views.WatermarkSettingsDialog.textUnderline": "Souligné"
+  "DE.Views.WatermarkSettingsDialog.textTransparency": "Semi-transparent",
+  "DE.Views.WatermarkSettingsDialog.textUnderline": "Souligné",
+  "DE.Views.WatermarkSettingsDialog.tipFontName": "Nom de la police",
+  "DE.Views.WatermarkSettingsDialog.tipFontSize": "Taille de police"
 }

apps/documenteditor/main/locale/hu.json

@@ -314,7 +314,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.<br>Vegye fel a kapcsolatot a Document Server adminisztrátorával.",
   "DE.Controllers.Main.errorBadImageUrl": "Hibás kép URL",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Elveszett a kapcsolat a szerverrel. A dokumentum jelenleg nem szerkeszthető.",
-  "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.<br>Ha az 'OK'-ra kattint letöltheti a dokumentumot.<br><br>Bővebb információk a Dokumentum Szerverhez kapcsolódásról <a href=\"%1\" target=\"_blank\">itt</a> találhat.",
+  "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.<br>Ha az 'OK'-ra kattint letöltheti a dokumentumot.",
   "DE.Controllers.Main.errorDatabaseConnection": "Külső hiba.<br>Adatbázis-kapcsolati hiba. Ha a hiba továbbra is fennáll, lépjen kapcsolatba a rendszer támogatással.",
   "DE.Controllers.Main.errorDataEncrypted": "Titkosított változások érkeztek, melyek feloldása sikertelen.",
   "DE.Controllers.Main.errorDataRange": "Hibás adattartomány.",

apps/documenteditor/main/locale/it.json

@@ -324,7 +324,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.<br>Si prega di contattare l'amministratore del Server dei Documenti.",
   "DE.Controllers.Main.errorBadImageUrl": "URL dell'immagine non corretto",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Connessione al server persa. Impossibile modificare il documento.",
-  "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.<br><br>Per maggiori dettagli sulla connessione al Document Server  <a href=\"%1\" target=\"_blank\">clicca qui</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.",
   "DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.",
   "DE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.",
   "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",

apps/documenteditor/main/locale/ja.json

@@ -173,7 +173,7 @@
   "DE.Controllers.Main.downloadTextText": "ドキュメントのダウンロード中...",
   "DE.Controllers.Main.downloadTitleText": "ドキュメントのダウンロード中",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "サーバーとの接続が失われました。今、文書を編集することができません。",
-  "DE.Controllers.Main.errorConnectToServer": "文書を保存できませんでした。接続設定を確認するか、管理者にお問い合わせください。<br>OKボタンをクリックするとドキュメントをダウンロードするように求められます。<br><br>ドキュメントサーバーの接続の詳細情報を見つけます:<a href=\"%1\" target=\"_blank\">ここに</a>",
+  "DE.Controllers.Main.errorConnectToServer": "文書を保存できませんでした。接続設定を確認するか、管理者にお問い合わせください。<br>OKボタンをクリックするとドキュメントをダウンロードするように求められます。",
   "DE.Controllers.Main.errorDatabaseConnection": "外部エラーです。<br>データベース接続エラーです。この問題は解決しない場合は、サポートにお問い合わせください。",
   "DE.Controllers.Main.errorDataRange": "データ範囲が正しくありません",
   "DE.Controllers.Main.errorDefaultMessage": "エラー コード:%1",

apps/documenteditor/main/locale/ko.json

@@ -298,7 +298,7 @@
   "DE.Controllers.Main.errorAccessDeny": "권한이없는 작업을 수행하려고합니다. <br> 문서 관리자에게 문의하십시오.",
   "DE.Controllers.Main.errorBadImageUrl": "이미지 URL이 잘못되었습니다.",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "서버 연결이 끊어졌습니다. 지금 문서를 편집 할 수 없습니다.",
-  "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.<br>'확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.<br ><br>Document Server 연결에 대한 추가 정보 찾기 <a href=\"%1\" target=\"_blank\">여기</a> ",
+  "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.<br>'확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.",
   "DE.Controllers.Main.errorDatabaseConnection": "외부 오류. <br> 데이터베이스 연결 오류입니다. 오류가 계속 발생하면 지원부에 문의하십시오.",
   "DE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.",
   "DE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1",

apps/documenteditor/main/locale/lv.json

@@ -295,7 +295,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Jūs mēģināt veikt darbību, kuru nedrīkstat veikt.<br>Lūdzu, sazinieties ar savu dokumentu servera administratoru.",
   "DE.Controllers.Main.errorBadImageUrl": "Nav pareizs attēla URL",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.<br>Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.<br><br>Uzziniet vairāk par dokumentu servera pieslēgšanu <a href=\"%1\" target=\"_blank\">šeit</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.<br>Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
   "DE.Controllers.Main.errorDataRange": "Incorrect data range.",
   "DE.Controllers.Main.errorDefaultMessage": "Kļūdas kods: %1",

apps/documenteditor/main/locale/nl.json

@@ -317,7 +317,7 @@
   "DE.Controllers.Main.errorAccessDeny": "U probeert een actie uit te voeren waarvoor u geen rechten hebt.<br>Neem contact op met de beheerder van de documentserver.",
   "DE.Controllers.Main.errorBadImageUrl": "URL afbeelding is onjuist",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbinding met server is verbroken. Het document kan op dit moment niet worden bewerkt.",
-  "DE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.<br>Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.<br><br>Meer informatie over verbindingen met de documentserver is <a href=\"%1\" target=\"_blank\">hier</a> te vinden.",
+  "DE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.<br>Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externe fout.<br>Fout in databaseverbinding. Neem contact op met Support als deze fout zich blijft voordoen.",
   "DE.Controllers.Main.errorDataRange": "Onjuist gegevensbereik.",
   "DE.Controllers.Main.errorDefaultMessage": "Foutcode: %1",

apps/documenteditor/main/locale/pl.json

@@ -272,7 +272,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Próbujesz wykonać działanie, na które nie masz uprawnień.<br>Proszę skontaktować się z administratorem serwera dokumentów.",
   "DE.Controllers.Main.errorBadImageUrl": "Adres URL obrazu jest błędny",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Połączenie z serwerem zostało utracone. Nie można teraz edytować dokumentu.",
-  "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.<br>Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.<br><br>Dowiedz się więcej o połączeniu serwera dokumentów <a href=\"%1\" target=\"_blank\">tutaj</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.<br>Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Błąd zewnętrzny.<br>Błąd połączenia z bazą danych. W przypadku wystąpienia błędu należy skontaktować się z pomocą techniczną.",
   "DE.Controllers.Main.errorDataRange": "Błędny zakres danych.",
   "DE.Controllers.Main.errorDefaultMessage": "Kod błędu: %1",

apps/documenteditor/main/locale/pt.json

@@ -274,7 +274,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Você está tentando executar uma ação que você não tem direitos. <br> Contate o administrador do Servidor de Documentos.",
   "DE.Controllers.Main.errorBadImageUrl": "URL de imagem está incorreta",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Conexão com servidor perdida. O documento não pode ser editado neste momento.",
-  "DE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador.<br>Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento. <br><br>Encontre mais informações sobre como conecta ao Document Server <a href=\"%1\" target=\"_blank\">aqui</a>",
+  "DE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador.<br>Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento.",
   "DE.Controllers.Main.errorDatabaseConnection": "Erro externo.<br>Erro de conexão ao banco de dados. Entre em contato com o suporte caso o erro persista.",
   "DE.Controllers.Main.errorDataRange": "Intervalo de dados incorreto.",
   "DE.Controllers.Main.errorDefaultMessage": "Código do erro: %1",

apps/documenteditor/main/locale/ru.json

@@ -299,6 +299,11 @@
   "Common.Views.SignSettingsDialog.textShowDate": "Показывать дату подписи в строке подписи",
   "Common.Views.SignSettingsDialog.textTitle": "Настройка подписи",
   "Common.Views.SignSettingsDialog.txtEmpty": "Это поле необходимо заполнить",
+  "Common.Views.SymbolTableDialog.textTitle": "Symbol",
+  "Common.Views.SymbolTableDialog.textFont": "Шрифт",
+  "Common.Views.SymbolTableDialog.textRange": "Набор",
+  "Common.Views.SymbolTableDialog.textRecent": "Ранее использовавшиеся символы",
+  "Common.Views.SymbolTableDialog.textCode": "Код знака из Юникод (шестн.)",
   "DE.Controllers.LeftMenu.leavePageText": "Все несохраненные изменения в этом документе будут потеряны.<br> Нажмите кнопку \"Отмена\", а затем нажмите кнопку \"Сохранить\", чтобы сохранить их. Нажмите кнопку \"OK\", чтобы сбросить все несохраненные изменения.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Документ без имени",
   "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Внимание",
@@ -324,7 +329,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.Controllers.Main.errorBadImageUrl": "Неправильный URL-адрес изображения",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Потеряно соединение с сервером. В данный момент нельзя отредактировать документ.",
-  "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.<br><br>Дополнительную информацию о подключении Сервера документов можно найти <a href=\"%1\" target=\"_blank\">здесь</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.",
   "DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.",
   "DE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.",
   "DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
@@ -333,6 +338,7 @@
   "DE.Controllers.Main.errorEditingSaveas": "В ходе работы с документом произошла ошибка.<br>Используйте опцию 'Сохранить как...', чтобы сохранить резервную копию файла на жесткий диск компьютера.",
   "DE.Controllers.Main.errorEmailClient": "Не найден почтовый клиент",
   "DE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
+  "DE.Controllers.Main.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.<br>Обратитесь к администратору Сервера документов для получения дополнительной информации.",
   "DE.Controllers.Main.errorForceSave": "При сохранении файла произошла ошибка. Используйте опцию 'Скачать как', чтобы сохранить файл на жестком диске компьютера или повторите попытку позже.",
   "DE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
   "DE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек",
@@ -349,7 +355,7 @@
   "DE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.",
   "DE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.",
   "DE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей, разрешенных согласно тарифному плану",
-  "DE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,<br>но не сможете скачать или напечатать его до восстановления подключения.",
+  "DE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,<br>но не сможете скачать или напечатать его до восстановления подключения и обновления страницы.",
   "DE.Controllers.Main.leavePageText": "Документ содержит несохраненные изменения. Чтобы сохранить их, нажмите \"Остаться на этой странице\", затем \"Сохранить\". Нажмите \"Покинуть эту страницу\", чтобы сбросить все несохраненные изменения.",
   "DE.Controllers.Main.loadFontsTextText": "Загрузка данных...",
   "DE.Controllers.Main.loadFontsTitleText": "Загрузка данных",
@@ -421,12 +427,15 @@
   "DE.Controllers.Main.txtHyperlink": "Гиперссылка",
   "DE.Controllers.Main.txtIndTooLarge": "Индекс слишком большой",
   "DE.Controllers.Main.txtLines": "Линии",
+  "DE.Controllers.Main.txtMainDocOnly": "Ошибка! Только основной документ.",
   "DE.Controllers.Main.txtMath": "Математические знаки",
   "DE.Controllers.Main.txtMissArg": "Отсутствует аргумент",
   "DE.Controllers.Main.txtMissOperator": "Отсутствует оператор",
   "DE.Controllers.Main.txtNeedSynchronize": "Есть обновления",
   "DE.Controllers.Main.txtNoTableOfContents": "Элементов оглавления не найдено.",
+  "DE.Controllers.Main.txtNoText": "Ошибка! В документе отсутствует текст указанного стиля.",
   "DE.Controllers.Main.txtNotInTable": "Не в таблице",
+  "DE.Controllers.Main.txtNotValidBookmark": "Ошибка! Неверная ссылка закладки.",
   "DE.Controllers.Main.txtOddPage": "Нечетная страница",
   "DE.Controllers.Main.txtOnPage": "на странице",
   "DE.Controllers.Main.txtRectangles": "Прямоугольники",
@@ -646,7 +655,6 @@
   "DE.Controllers.Main.warnNoLicense": "Эта версия редакторов %1 имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов %1 имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
-  "DE.Controllers.Main.txtNoText": "Ошибка! Текст указанного стиля в документе отсутствует.",
   "DE.Controllers.Navigation.txtBeginning": "Начало документа",
   "DE.Controllers.Navigation.txtGotoBeginning": "Перейти в начало документа",
   "DE.Controllers.Statusbar.textHasChanges": "Отслежены новые изменения",
@@ -990,6 +998,8 @@
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Дзета",
   "DE.Controllers.Viewport.textFitPage": "По размеру страницы",
   "DE.Controllers.Viewport.textFitWidth": "По ширине",
+  "DE.Views.AddNewCaptionLabelDialog.textLabel": "Подпись:",
+  "DE.Views.AddNewCaptionLabelDialog.textLabelError": "Подпись не должна быть пустой.",
   "DE.Views.BookmarksDialog.textAdd": "Добавить",
   "DE.Views.BookmarksDialog.textBookmarkName": "Имя закладки",
   "DE.Views.BookmarksDialog.textClose": "Закрыть",
@@ -1003,6 +1013,39 @@
   "DE.Views.BookmarksDialog.textSort": "Порядок",
   "DE.Views.BookmarksDialog.textTitle": "Закладки",
   "DE.Views.BookmarksDialog.txtInvalidName": "Имя закладки может содержать только буквы, цифры и знаки подчеркивания и должно начинаться с буквы.",
+  "DE.Views.CaptionDialog.textAdd": "Добавить подпись",
+  "DE.Views.CaptionDialog.textAfter": "После",
+  "DE.Views.CaptionDialog.textBefore": "Перед",
+  "DE.Views.CaptionDialog.textCaption": "Название",
+  "DE.Views.CaptionDialog.textChapter": "Начинается со стиля:",
+  "DE.Views.CaptionDialog.textChapterInc": "Включить номер главы",
+  "DE.Views.CaptionDialog.textColon": "двоеточие",
+  "DE.Views.CaptionDialog.textDash": "тире",
+  "DE.Views.CaptionDialog.textDelete": "Удалить подпись",
+  "DE.Views.CaptionDialog.textEquation": "Уравнение",
+  "DE.Views.CaptionDialog.textExamples": "Примеры: Таблица 2-A, Изображение 1.IV",
+  "DE.Views.CaptionDialog.textExclude": "Исключить подпись из названия",
+  "DE.Views.CaptionDialog.textFigure": "Рисунок",
+  "DE.Views.CaptionDialog.textHyphen": "дефис",
+  "DE.Views.CaptionDialog.textInsert": "Вставить",
+  "DE.Views.CaptionDialog.textLabel": "Подпись",
+  "DE.Views.CaptionDialog.textLongDash": "длинное тире",
+  "DE.Views.CaptionDialog.textNumbering": "Нумерация",
+  "DE.Views.CaptionDialog.textPeriod": "точка",
+  "DE.Views.CaptionDialog.textSeparator": "Использовать разделитель",
+  "DE.Views.CaptionDialog.textTable": "Таблица",
+  "DE.Views.CaptionDialog.textTitle": "Вставить название",
+  "DE.Views.CellsAddDialog.textCol": "Столбцы",
+  "DE.Views.CellsAddDialog.textDown": "Под курсором",
+  "DE.Views.CellsAddDialog.textLeft": "Слева",
+  "DE.Views.CellsAddDialog.textRight": "Справа",
+  "DE.Views.CellsAddDialog.textRow": "Строки",
+  "DE.Views.CellsAddDialog.textTitle": "Вставить несколько",
+  "DE.Views.CellsAddDialog.textUp": "Над курсором",
+  "DE.Views.CellsRemoveDialog.textCol": "Удалить весь столбец",
+  "DE.Views.CellsRemoveDialog.textLeft": "Ячейки со сдвигом влево",
+  "DE.Views.CellsRemoveDialog.textRow": "Удалить всю строку",
+  "DE.Views.CellsRemoveDialog.textTitle": "Удалить ячейки",
   "DE.Views.ChartSettings.textAdvanced": "Дополнительные параметры",
   "DE.Views.ChartSettings.textArea": "С областями",
   "DE.Views.ChartSettings.textBar": "Линейчатая",
@@ -1011,7 +1054,7 @@
   "DE.Views.ChartSettings.textEditData": "Изменить данные",
   "DE.Views.ChartSettings.textHeight": "Высота",
   "DE.Views.ChartSettings.textLine": "График",
-  "DE.Views.ChartSettings.textOriginalSize": "По умолчанию",
+  "DE.Views.ChartSettings.textOriginalSize": "Реальный размер",
   "DE.Views.ChartSettings.textPie": "Круговая",
   "DE.Views.ChartSettings.textPoint": "Точечная",
   "DE.Views.ChartSettings.textSize": "Размер",
@@ -1093,7 +1136,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Объединить ячейки",
   "DE.Views.DocumentHolder.moreText": "Больше вариантов...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "Нет вариантов",
-  "DE.Views.DocumentHolder.originalSizeText": "Размер по умолчанию",
+  "DE.Views.DocumentHolder.originalSizeText": "Реальный размер",
   "DE.Views.DocumentHolder.paragraphText": "Абзац",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку",
   "DE.Views.DocumentHolder.rightText": "По правому краю",
@@ -1120,6 +1163,7 @@
   "DE.Views.DocumentHolder.textArrangeBackward": "Перенести назад",
   "DE.Views.DocumentHolder.textArrangeForward": "Перенести вперед",
   "DE.Views.DocumentHolder.textArrangeFront": "Перенести на передний план",
+  "DE.Views.DocumentHolder.textCells": "Ячейки",
   "DE.Views.DocumentHolder.textContentControls": "Элемент управления содержимым",
   "DE.Views.DocumentHolder.textContinueNumbering": "Продолжить нумерацию",
   "DE.Views.DocumentHolder.textCopy": "Копировать",
@@ -1151,6 +1195,7 @@
   "DE.Views.DocumentHolder.textRotate90": "Повернуть на 90° по часовой стрелке",
   "DE.Views.DocumentHolder.textSeparateList": "Разделить список",
   "DE.Views.DocumentHolder.textSettings": "Настройки",
+  "DE.Views.DocumentHolder.textSeveral": "Несколько строк/столбцов",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Выровнять по нижнему краю",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Выровнять по центру",
   "DE.Views.DocumentHolder.textShapeAlignLeft": "Выровнять по левому краю",
@@ -1218,6 +1263,7 @@
   "DE.Views.DocumentHolder.txtInsertArgAfter": "Вставить аргумент после",
   "DE.Views.DocumentHolder.txtInsertArgBefore": "Вставить аргумент перед",
   "DE.Views.DocumentHolder.txtInsertBreak": "Вставить принудительный разрыв",
+  "DE.Views.DocumentHolder.txtInsertCaption": "Вставить название",
   "DE.Views.DocumentHolder.txtInsertEqAfter": "Вставить уравнение после",
   "DE.Views.DocumentHolder.txtInsertEqBefore": "Вставить уравнение перед",
   "DE.Views.DocumentHolder.txtKeepTextOnly": "Сохранить только текст",
@@ -1322,6 +1368,7 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Создайте новый пустой текстовый документ, к которому Вы сможете применить стили и отформатировать при редактировании после того, как он создан. Или выберите один из шаблонов, чтобы создать документ определенного типа или предназначения, где уже предварительно применены некоторые стили.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Новый текстовый документ",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Шаблоны отсутствуют",
+  "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Применить",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Добавить автора",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Добавить текст",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Приложение",
@@ -1449,7 +1496,7 @@
   "DE.Views.ImageSettings.textHintFlipH": "Отразить слева направо",
   "DE.Views.ImageSettings.textHintFlipV": "Отразить сверху вниз",
   "DE.Views.ImageSettings.textInsert": "Заменить изображение",
-  "DE.Views.ImageSettings.textOriginalSize": "По умолчанию",
+  "DE.Views.ImageSettings.textOriginalSize": "Реальный размер",
   "DE.Views.ImageSettings.textRotate90": "Повернуть на 90°",
   "DE.Views.ImageSettings.textRotation": "Поворот",
   "DE.Views.ImageSettings.textSize": "Размер",
@@ -1501,7 +1548,7 @@
   "DE.Views.ImageSettingsAdvanced.textMiter": "Прямой",
   "DE.Views.ImageSettingsAdvanced.textMove": "Перемещать с текстом",
   "DE.Views.ImageSettingsAdvanced.textOptions": "Параметры",
-  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "По умолчанию",
+  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Реальный размер",
   "DE.Views.ImageSettingsAdvanced.textOverlap": "Разрешить перекрытие",
   "DE.Views.ImageSettingsAdvanced.textPage": "Страницы",
   "DE.Views.ImageSettingsAdvanced.textParagraph": "Абзаца",
@@ -1906,14 +1953,14 @@
   "DE.Views.TableSettings.tipRight": "Задать только внешнюю правую границу",
   "DE.Views.TableSettings.tipTop": "Задать только внешнюю верхнюю границу",
   "DE.Views.TableSettings.txtNoBorders": "Без границ",
-  "DE.Views.TableSettings.txtTable_TableGrid": "Сетка таблицы",
-  "DE.Views.TableSettings.txtTable_PlainTable": "Таблица простая",
-  "DE.Views.TableSettings.txtTable_GridTable": "Таблица-сетка",
-  "DE.Views.TableSettings.txtTable_ListTable": "Список-таблица",
-  "DE.Views.TableSettings.txtTable_Light": "светлая",
-  "DE.Views.TableSettings.txtTable_Dark": "темная",
-  "DE.Views.TableSettings.txtTable_Colorful": "цветная",
   "DE.Views.TableSettings.txtTable_Accent": "акцент",
+  "DE.Views.TableSettings.txtTable_Colorful": "цветная",
+  "DE.Views.TableSettings.txtTable_Dark": "темная",
+  "DE.Views.TableSettings.txtTable_GridTable": "Таблица-сетка",
+  "DE.Views.TableSettings.txtTable_Light": "светлая",
+  "DE.Views.TableSettings.txtTable_ListTable": "Список-таблица",
+  "DE.Views.TableSettings.txtTable_PlainTable": "Таблица простая",
+  "DE.Views.TableSettings.txtTable_TableGrid": "Сетка таблицы",
   "DE.Views.TableSettingsAdvanced.textAlign": "Выравнивание",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Выравнивание",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Интервалы между ячейками",

apps/documenteditor/main/locale/sk.json

@@ -276,7 +276,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Pokúšate sa vykonať akciu, na ktorú nemáte práva.<br>Prosím, kontaktujte svojho správcu dokumentového servera. ",
   "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávna",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Serverové pripojenie sa stratilo. Práve teraz nie je možné dokument upravovať.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.<br>Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.<br><br>Viac informácií o pripojení dokumentového servera nájdete <a href=\"%1\" target=\"_blank\">tu</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.<br>Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externá chyba.<br>Chyba spojenia databázy. Prosím, kontaktujte podporu ak chyba pretrváva. ",
   "DE.Controllers.Main.errorDataRange": "Nesprávny rozsah údajov.",
   "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1",

apps/documenteditor/main/locale/sl.json

@@ -170,7 +170,7 @@
   "DE.Controllers.Main.downloadTextText": "Prenašanje dokumenta...",
   "DE.Controllers.Main.downloadTitleText": "Prenašanje dokumenta",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Povezava s strežnikom izgubljena. Dokument v tem trenutku ne more biti urejen.",
-  "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
+  "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.",
   "DE.Controllers.Main.errorDatabaseConnection": "Zunanja napaka.<br>Napaka povezave baze podatkov. V primeru, da napaka ni odpravljena, prosim kontaktirajte ekipo za pomoč.",
   "DE.Controllers.Main.errorDataRange": "Nepravilen obseg podatkov.",
   "DE.Controllers.Main.errorDefaultMessage": "Koda napake: %1",

apps/documenteditor/main/locale/tr.json

@@ -251,7 +251,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Hakiniz olmayan bir eylem gerçekleştirmeye çalışıyorsunuz. <br> Lütfen Document Server yöneticinize başvurun.",
   "DE.Controllers.Main.errorBadImageUrl": "Resim URL'si yanlış",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Sunucu bağlantısı kesildi. Döküman şu an düzenlenemez.",
-  "DE.Controllers.Main.errorConnectToServer": "Belge kaydedilemedi. Lütfen internet bağlantınızı kontrol edin veya yöneticiniz ile iletişime geçin. <br>'TAMAM' tuşuna tıkladığınızda belgeyi indirebileceksiniz.<br><br>Belge Sunucusuna bağlanma konusunda daha fazla bilgi için <a href=\"%1\" target=\"_blank\">buraya</a> tıklayın",
+  "DE.Controllers.Main.errorConnectToServer": "Belge kaydedilemedi. Lütfen internet bağlantınızı kontrol edin veya yöneticiniz ile iletişime geçin. <br>'TAMAM' tuşuna tıkladığınızda belgeyi indirebileceksiniz.",
   "DE.Controllers.Main.errorDatabaseConnection": "Harci hata. <br>Veri tabanı bağlantı hatası. Hata devam ederse lütfen destek ile iletişime geçin.",
   "DE.Controllers.Main.errorDataRange": "Yanlış veri aralığı.",
   "DE.Controllers.Main.errorDefaultMessage": "Hata kodu: %1",

apps/documenteditor/main/locale/uk.json

@@ -15,7 +15,7 @@
   "Common.Controllers.ReviewChanges.textBaseline": "Базова лінія",
   "Common.Controllers.ReviewChanges.textBold": "Жирний",
   "Common.Controllers.ReviewChanges.textBreakBefore": "розрив сторінки",
-  "Common.Controllers.ReviewChanges.textCaps": "Всі шапки",
+  "Common.Controllers.ReviewChanges.textCaps": "Усі великі",
   "Common.Controllers.ReviewChanges.textCenter": "Вирівняти центр",
   "Common.Controllers.ReviewChanges.textChart": "Діаграма",
   "Common.Controllers.ReviewChanges.textColor": "Колір шрифту",
@@ -53,7 +53,7 @@
   "Common.Controllers.ReviewChanges.textRight": "Вирівняти справа",
   "Common.Controllers.ReviewChanges.textShape": "Форма",
   "Common.Controllers.ReviewChanges.textShd": "Колір фону",
-  "Common.Controllers.ReviewChanges.textSmallCaps": "Малі шапки",
+  "Common.Controllers.ReviewChanges.textSmallCaps": "Зменшені великі",
   "Common.Controllers.ReviewChanges.textSpacing": "інтервал",
   "Common.Controllers.ReviewChanges.textSpacingAfter": "Інтервал після",
   "Common.Controllers.ReviewChanges.textSpacingBefore": "інтервал перед",
@@ -145,6 +145,7 @@
   "Common.Views.Header.tipDownload": "Завантажити файл",
   "Common.Views.Header.tipGoEdit": "Редагувати поточний файл",
   "Common.Views.Header.tipPrint": "Роздрукувати файл",
+  "Common.Views.Header.tipViewSettings": "Налаштування перегляду",
   "Common.Views.Header.tipViewUsers": "Переглядайте користувачів та керуйте правами доступу до документів",
   "Common.Views.Header.txtAccessRights": "Змінити права доступу",
   "Common.Views.Header.txtRename": "Перейменувати",
@@ -192,9 +193,12 @@
   "Common.Views.ReviewChanges.txtClose": "Закрити",
   "Common.Views.ReviewChanges.txtDocLang": "Мова",
   "Common.Views.ReviewChanges.txtFinal": "Усі зміни прийняті (попередній перегляд)",
+  "Common.Views.ReviewChanges.txtFinalCap": "Фінальний",
   "Common.Views.ReviewChanges.txtMarkup": "Усі зміни (редагування)",
+  "Common.Views.ReviewChanges.txtMarkupCap": "Зміни",
   "Common.Views.ReviewChanges.txtNext": "Наступний",
   "Common.Views.ReviewChanges.txtOriginal": "Усі зміни відхилено (попередній перегляд)",
+  "Common.Views.ReviewChanges.txtOriginalCap": "Початковий",
   "Common.Views.ReviewChanges.txtPrev": "Попередній",
   "Common.Views.ReviewChanges.txtReject": "Відхилити",
   "Common.Views.ReviewChanges.txtRejectAll": "Відхилити усі зміни",
@@ -234,7 +238,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Ви намагаєтеся виконати дію, у якої у вас немає прав. <br> Будь ласка, зв'яжіться з адміністратором вашого Сервера документів.",
   "DE.Controllers.Main.errorBadImageUrl": "URL-адреса зображення невірна",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "З'єднання з сервером втрачено. Документ не можна редагувати прямо зараз.",
-  "DE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора.<br>Після натискання кнопки «ОК» вам буде запропоновано завантажити документ. <br><br>Більше інформації про підключення сервера документів <a href=\"%1\" target=\"_blank\">тут</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора.<br>Після натискання кнопки «ОК» вам буде запропоновано завантажити документ.",
   "DE.Controllers.Main.errorDatabaseConnection": "Зовнішня помилка. <br> Помилка підключення до бази даних. Будь ласка, зв'яжіться зі службою підтримки, якщо помилка не зникне.",
   "DE.Controllers.Main.errorDataRange": "Неправильний діапазон даних.",
   "DE.Controllers.Main.errorDefaultMessage": "Код помилки: %1 ",
@@ -692,7 +696,7 @@
   "DE.Views.ChartSettings.textEditData": "Редагувати дату",
   "DE.Views.ChartSettings.textHeight": "Висота",
   "DE.Views.ChartSettings.textLine": "Лінія",
-  "DE.Views.ChartSettings.textOriginalSize": "Розмір за умовчанням",
+  "DE.Views.ChartSettings.textOriginalSize": "За замовчуванням",
   "DE.Views.ChartSettings.textPie": "Пиріг",
   "DE.Views.ChartSettings.textPoint": "XY (розсіювання)",
   "DE.Views.ChartSettings.textSize": "Розмір",
@@ -759,7 +763,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Об'єднати клітинки",
   "DE.Views.DocumentHolder.moreText": "Більше варіантів...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "Немає варіантів",
-  "DE.Views.DocumentHolder.originalSizeText": "Розмір за умовчанням",
+  "DE.Views.DocumentHolder.originalSizeText": "За замовчуванням",
   "DE.Views.DocumentHolder.paragraphText": "Параграф",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Видалити гіперпосилання",
   "DE.Views.DocumentHolder.rightText": "Право",
@@ -944,15 +948,21 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Створіть новий порожній текстовий документ, який ви зможете стильувати та форматувати після його створення під час редагування. Або виберіть один із шаблонів, щоб запустити документ певного типу або мети, де деякі стилі вже були попередньо застосовані.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Новий текстовий документ",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Немає шаблонів",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Додаток",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Змінити права доступу",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Коментар",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Створено",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Завантаження...",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Змінив",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Змінено",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Сторінки",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Параграфи",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Місцезнаходження",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Особи, які мають права",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Символи з пробілами",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Статистика",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Тема",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Символи",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Назва документу",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Слова",
@@ -1029,7 +1039,8 @@
   "DE.Views.ImageSettings.textFromUrl": "З URL",
   "DE.Views.ImageSettings.textHeight": "Висота",
   "DE.Views.ImageSettings.textInsert": "Замінити зображення",
-  "DE.Views.ImageSettings.textOriginalSize": "Розмір за умовчанням",
+  "DE.Views.ImageSettings.textOriginalSize": "За замовчуванням",
+  "DE.Views.ImageSettings.textRotation": "Поворот",
   "DE.Views.ImageSettings.textSize": "Розмір",
   "DE.Views.ImageSettings.textWidth": "Ширина",
   "DE.Views.ImageSettings.textWrap": "Стиль упаковки",
@@ -1047,6 +1058,7 @@
   "DE.Views.ImageSettingsAdvanced.textAltDescription": "Опис",
   "DE.Views.ImageSettingsAdvanced.textAltTip": "Альтернативне текстове представлення інформації про візуальний об'єкт, яке може бути прочитано людям із порушеннями зору або когнітивними дисфункціями, щоб вони могли краще зрозуміти, яка інформація знаходиться в зображенні, автошопі, діаграмі або таблиці.",
   "DE.Views.ImageSettingsAdvanced.textAltTitle": "Назва",
+  "DE.Views.ImageSettingsAdvanced.textAngle": "Нахил",
   "DE.Views.ImageSettingsAdvanced.textArrows": "Стрілки",
   "DE.Views.ImageSettingsAdvanced.textAspectRatio": "Блокування співвідношення сторін",
   "DE.Views.ImageSettingsAdvanced.textBeginSize": "Початковий розмір",
@@ -1064,8 +1076,10 @@
   "DE.Views.ImageSettingsAdvanced.textEndSize": "Кінець розміру",
   "DE.Views.ImageSettingsAdvanced.textEndStyle": "Кінець стилю",
   "DE.Views.ImageSettingsAdvanced.textFlat": "Площина",
+  "DE.Views.ImageSettingsAdvanced.textFlipped": "Віддзеркалено",
   "DE.Views.ImageSettingsAdvanced.textHeight": "Висота",
   "DE.Views.ImageSettingsAdvanced.textHorizontal": "Горізонтальний",
+  "DE.Views.ImageSettingsAdvanced.textHorizontally": "горизонтально",
   "DE.Views.ImageSettingsAdvanced.textJoinType": "Приєднати тип",
   "DE.Views.ImageSettingsAdvanced.textKeepRatio": "Сталі пропорції",
   "DE.Views.ImageSettingsAdvanced.textLeft": "Лівий",
@@ -1076,7 +1090,7 @@
   "DE.Views.ImageSettingsAdvanced.textMiter": "Мітер",
   "DE.Views.ImageSettingsAdvanced.textMove": "Перемістити об'єкт з текстом",
   "DE.Views.ImageSettingsAdvanced.textOptions": "Опції",
-  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Розмір за умовчанням",
+  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "За замовчуванням",
   "DE.Views.ImageSettingsAdvanced.textOverlap": "Дозволити перекриття",
   "DE.Views.ImageSettingsAdvanced.textPage": "Сторінка",
   "DE.Views.ImageSettingsAdvanced.textParagraph": "Параграф",
@@ -1087,6 +1101,7 @@
   "DE.Views.ImageSettingsAdvanced.textRight": "Право",
   "DE.Views.ImageSettingsAdvanced.textRightMargin": "праве поле",
   "DE.Views.ImageSettingsAdvanced.textRightOf": "праворуч від",
+  "DE.Views.ImageSettingsAdvanced.textRotation": "Поворот",
   "DE.Views.ImageSettingsAdvanced.textRound": "Круглий",
   "DE.Views.ImageSettingsAdvanced.textShape": "Параметри форми",
   "DE.Views.ImageSettingsAdvanced.textSize": "Розмір",
@@ -1097,6 +1112,7 @@
   "DE.Views.ImageSettingsAdvanced.textTop": "Верх",
   "DE.Views.ImageSettingsAdvanced.textTopMargin": "Верхнє поле",
   "DE.Views.ImageSettingsAdvanced.textVertical": "Вертикальний",
+  "DE.Views.ImageSettingsAdvanced.textVertically": "вертикально",
   "DE.Views.ImageSettingsAdvanced.textWeightArrows": "Ваги та стрілки",
   "DE.Views.ImageSettingsAdvanced.textWidth": "Ширина",
   "DE.Views.ImageSettingsAdvanced.textWrap": "Стиль упаковки",
@@ -1205,7 +1221,7 @@
   "DE.Views.ParagraphSettings.textNewColor": "Додати новий спеціальний колір",
   "DE.Views.ParagraphSettings.txtAutoText": "Авто",
   "DE.Views.ParagraphSettingsAdvanced.noTabs": "Вказані вкладки з'являться в цьому полі",
-  "DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Всі шапки",
+  "DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Усі великі",
   "DE.Views.ParagraphSettingsAdvanced.strBorders": "Межі та заповнення",
   "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Розрив сторінки перед",
   "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Подвійне перекреслення",
@@ -1218,7 +1234,7 @@
   "DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Шрифт",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Відступи та розміщення",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Розміщення",
-  "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Малі шапки",
+  "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Зменшені великі",
   "DE.Views.ParagraphSettingsAdvanced.strStrike": "Перекреслення",
   "DE.Views.ParagraphSettingsAdvanced.strSubscript": "Підрядковий",
   "DE.Views.ParagraphSettingsAdvanced.strSuperscript": "Надрядковий",
@@ -1288,6 +1304,7 @@
   "DE.Views.ShapeSettings.textNoFill": "Немає заповнення",
   "DE.Views.ShapeSettings.textPatternFill": "Візерунок",
   "DE.Views.ShapeSettings.textRadial": "Радіальний",
+  "DE.Views.ShapeSettings.textRotation": "Поворот",
   "DE.Views.ShapeSettings.textSelectTexture": "Обрати",
   "DE.Views.ShapeSettings.textStretch": "Розтягнути",
   "DE.Views.ShapeSettings.textStyle": "Стиль",
@@ -1544,10 +1561,12 @@
   "DE.Views.Toolbar.textSubscript": "Підрядковий",
   "DE.Views.Toolbar.textSuperscript": "Надрядковий",
   "DE.Views.Toolbar.textSurface": "Поверхня",
+  "DE.Views.Toolbar.textTabCollaboration": "Співпраця",
   "DE.Views.Toolbar.textTabFile": "Файл",
   "DE.Views.Toolbar.textTabHome": "Головна",
   "DE.Views.Toolbar.textTabInsert": "Вставити",
   "DE.Views.Toolbar.textTabLayout": "Макет",
+  "DE.Views.Toolbar.textTabLinks": "Посилання",
   "DE.Views.Toolbar.textTabReview": "Перевірити",
   "DE.Views.Toolbar.textTitleError": "Помилка",
   "DE.Views.Toolbar.textToCurrent": "До поточної позиції",
@@ -1558,6 +1577,7 @@
   "DE.Views.Toolbar.tipAlignLeft": "Вирівняти зліва",
   "DE.Views.Toolbar.tipAlignRight": "Вирівняти справа",
   "DE.Views.Toolbar.tipBack": "Назад",
+  "DE.Views.Toolbar.tipBlankPage": "Вставити чисту сторінку",
   "DE.Views.Toolbar.tipChangeChart": "Змінити тип діаграми",
   "DE.Views.Toolbar.tipClearStyle": "Очистити стиль",
   "DE.Views.Toolbar.tipColorSchemas": "Змінити кольорову схему",
@@ -1567,7 +1587,7 @@
   "DE.Views.Toolbar.tipDecFont": "Зменшення розміру шрифту",
   "DE.Views.Toolbar.tipDecPrLeft": "Зменшити відступ",
   "DE.Views.Toolbar.tipDropCap": "Вставити буквицю",
-  "DE.Views.Toolbar.tipEditHeader": "Редагувати заголовок або нижній колонтитул",
+  "DE.Views.Toolbar.tipEditHeader": "Редагувати верхній або нижній колонтитул",
   "DE.Views.Toolbar.tipFontColor": "Колір шрифту",
   "DE.Views.Toolbar.tipFontName": "Шрифт",
   "DE.Views.Toolbar.tipFontSize": "Розмір шрифта",

apps/documenteditor/main/locale/vi.json

@@ -235,7 +235,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Bạn đang cố gắng thực hiện hành động mà bạn không có quyền.<br>Vui lòng liên hệ với quản trị viên Server Tài liệu của bạn.",
   "DE.Controllers.Main.errorBadImageUrl": "URL hình ảnh không chính xác",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Mất kết nối server. Không thể chỉnh sửa tài liệu ngay lúc này.",
-  "DE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.<br>Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.<br><br>Tìm thêm thông tin về kết nối Server Tài liệu <a href=\"%1\" target=\"_blank\">ở đây</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.<br>Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Lỗi bên ngoài.<br>Lỗi kết nối cơ sở dữ liệu. Vui lòng liên hệ bộ phận hỗ trợ trong trường hợp lỗi vẫn còn.",
   "DE.Controllers.Main.errorDataRange": "Phạm vi dữ liệu không chính xác.",
   "DE.Controllers.Main.errorDefaultMessage": "Mã lỗi: %1",

apps/documenteditor/main/locale/zh.json

@@ -321,7 +321,7 @@
   "DE.Controllers.Main.errorAccessDeny": "您正在尝试执行您没有权限的操作。<br>请联系您的文档服务器管理员.",
   "DE.Controllers.Main.errorBadImageUrl": "图片地址不正确",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "服务器连接丢失。该文档现在无法编辑",
-  "DE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。<br>当你点击“OK”按钮,系统将提示您下载文档。<br><br>找到更多信息连接文件服务器<a href=\"%1\" target=\"平等\">在这里</>",
+  "DE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。<br>当你点击“OK”按钮,系统将提示您下载文档。",
   "DE.Controllers.Main.errorDatabaseConnection": "外部错误。<br>数据库连接错误。如果错误仍然存​​在，请联系支持人员。",
   "DE.Controllers.Main.errorDataEncrypted": "加密更改已收到，无法对其解密。",
   "DE.Controllers.Main.errorDataRange": "数据范围不正确",

apps/documenteditor/main/resources/help/ru/callback.js

@@ -1,35 +1,3 @@
-/*
- *
- * (c) Copyright Ascensio System SIA 2010-2019
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
- * street, Riga, Latvia, EU, LV-1050.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
-*/
 function onhyperlinkclick(element) {
     function _postMessage(msg) {
        if (window.parent && window.JSON) {

apps/documenteditor/main/resources/less/app.less

@@ -118,6 +118,7 @@
 @import "../../../../common/main/resources/less/toolbar.less";
 @import "../../../../common/main/resources/less/language-dialog.less";
 @import "../../../../common/main/resources/less/winxp_fix.less";
+@import "../../../../common/main/resources/less/symboltable.less";
 
 // App
 // --------------------------------------------------
@@ -150,12 +151,17 @@
 
 .doc-placeholder {
     background: #fbfbfb;
-    width: 100%;
-    max-width: 796px;
+    width: 796px;
     margin: 40px auto;
     height: 100%;
     border: 1px solid #dfdfdf;
     padding-top: 50px;
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 1;
 
     -webkit-animation: flickerAnimation 2s infinite ease-in-out;
     -moz-animation: flickerAnimation 2s infinite ease-in-out;

apps/documenteditor/main/resources/less/layout.less

@@ -75,4 +75,9 @@ label {
     width: 300px;
     height: 100%;
     display: none;
+}
+
+#editor_sdk {
+    width: 100%;
+    height: 100%;
 }

apps/documenteditor/mobile/app/controller/Main.js

@@ -221,7 +221,7 @@ define([
                     me.api.asc_setLocale(me.editorConfig.lang);
 
                 if (!me.editorConfig.customization || !(me.editorConfig.customization.loaderName || me.editorConfig.customization.loaderLogo))
-                    $('#editor_sdk').append('<div class="doc-placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div>');
+                    $('#editor-container').append('<div class="doc-placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div>');
 
 //                if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
 //                    Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
@@ -948,7 +948,7 @@ define([
                         break;
 
                     case Asc.c_oAscError.ID.Warning:
-                        config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
+                        config.msg = this.errorConnectToServer;
                         break;
 
                     case Asc.c_oAscError.ID.UplImageUrl:
@@ -971,6 +971,10 @@ define([
                         config.msg = this.errorFileSizeExceed;
                         break;
 
+                    case Asc.c_oAscError.ID.UpdateVersion:
+                        config.msg = this.errorUpdateVersionOnDisconnect;
+                        break;
+
                     default:
                         config.msg = this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -1399,12 +1403,12 @@ define([
             sendMergeTitle: 'Sending Merge',
             sendMergeText: 'Sending Merge...',
             txtArt: 'Your text here',
-            errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
+            errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.',
             textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.',
             textBuyNow: 'Visit website',
             textNoLicenseTitle: '%1 open source version',
             textContactUs: 'Contact sales',
-            errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.',
+            errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored and page is reloaded.',
             warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
             titleLicenseExp: 'License expired',
             openErrorText: 'An error has occurred while opening the file',
@@ -1456,7 +1460,8 @@ define([
             textPaidFeature: 'Paid feature',
             textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.',
             waitText: 'Please, wait...',
-            errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
+            errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
+            errorUpdateVersionOnDisconnect: 'The file version has been changed.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.'
         }
     })(), DE.Controllers.Main || {}))
 });

apps/documenteditor/mobile/app/template/EditChart.template

@@ -371,4 +371,20 @@
             <!--Color palette-->
         </div>
     </div>
+</div>
+
+<!-- Custom color view -->
+<div id="edit-chart-custom-color-view">
+    <div class="navbar">
+        <div class="navbar-inner" data-page="edit-chart-custom-color">
+            <div class="left sliding"><a href="#" class="back link"><i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
+            <div class="center sliding"><%= scope.textCustomColor %></div>
+            <div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
+        </div>
+    </div>
+    <div class="page" data-page="edit-chart-custom-color">
+        <div class="page-content">
+            <!--Color HSB palette-->
+        </div>
+    </div>
 </div>

apps/documenteditor/mobile/app/template/EditParagraph.template

@@ -184,4 +184,20 @@
             </div>
         </div>
     </div>
+</div>
+
+<!-- Custom color view -->
+<div id="edit-paragraph-custom-color-view">
+    <div class="navbar">
+        <div class="navbar-inner" data-page="edit-paragraph-custom-color">
+            <div class="left sliding"><a href="#" class="back link"><i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
+            <div class="center sliding"><%= scope.textCustomColor %></div>
+            <div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
+        </div>
+    </div>
+    <div class="page" data-page="edit-paragraph-custom-color">
+        <div class="page-content">
+            <!--Color HSB palette-->
+        </div>
+    </div>
 </div>

apps/documenteditor/mobile/app/template/EditShape.template

@@ -448,4 +448,20 @@
             <!--Color palette-->
         </div>
     </div>
-</div>
+</div>
+
+<!-- Custom color view -->
+<div id="edit-shape-custom-color-view">
+    <div class="navbar">
+        <div class="navbar-inner" data-page="edit-shape-custom-color">
+            <div class="left sliding back-fill"><a href="#" class="back link"><i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
+            <div class="center sliding"><%= scope.textCustomColor %></div>
+            <div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
+        </div>
+    </div>
+    <div class="page" data-page="edit-shape-custom-color">
+        <div class="page-content">
+            <!--Color HSB palette-->
+        </div>
+    </div>
+</div>

apps/documenteditor/mobile/app/template/EditTable.template

@@ -450,4 +450,20 @@
             <!--Color palette-->
         </div>
     </div>
+</div>
+
+<!-- Custom color view -->
+<div id="edit-table-custom-color-view">
+    <div class="navbar">
+        <div class="navbar-inner" data-page="edit-table-custom-color">
+            <div class="left sliding"><a href="#" class="back link"><i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
+            <div class="center sliding"><%= scope.textCustomColor %></div>
+            <div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
+        </div>
+    </div>
+    <div class="page" data-page="edit-table-custom-color">
+        <div class="page-content">
+            <!--Color HSB palette-->
+        </div>
+    </div>
 </div>

apps/documenteditor/mobile/app/template/EditText.template

@@ -408,3 +408,19 @@
         </div>
     </div>
 </div>
+
+<!-- Custom color view -->
+<div id="edit-text-custom-color-view">
+    <div class="navbar">
+        <div class="navbar-inner" data-page="edit-text-custom-color">
+            <div class="left sliding"><a href="#" class="back link"><i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
+            <div class="center sliding"><%= scope.textCustomColor %></div>
+            <div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
+        </div>
+    </div>
+    <div class="page" data-page="edit-text-custom-color">
+        <div class="page-content">
+            <!--Color HSB palette-->
+        </div>
+    </div>
+</div>

apps/documenteditor/mobile/app/template/Editor.template

@@ -2,7 +2,7 @@
     <div class="view view-main">
         <div class="pages navbar-through">
             <div data-page="index" class="page">
-                <div id="editor_sdk" class="page-content no-fastclick"></div>
+                <div id="editor-container" class="page-content no-fastclick"><div id="editor_sdk" class="no-fastclick"></div></div>
             </div>
         </div>
     </div>

apps/documenteditor/mobile/app/view/edit/EditChart.js

@@ -220,6 +220,24 @@ define([
                     el: $('#tab-chart-fill'),
                     transparent: true
                 });
+                this.paletteFillColor.on('customcolor', function () {
+                    me.showCustomFillColor();
+                });
+                var template = _.template(['<div class="list-block">',
+                    '<ul>',
+                    '<li>',
+                    '<a id="edit-chart-add-custom-color" class="item-link">',
+                    '<div class="item-content">',
+                    '<div class="item-inner">',
+                    '<div class="item-title"><%= scope.textAddCustomColor %></div>',
+                    '</div>',
+                    '</div>',
+                    '</a>',
+                    '</li>',
+                    '</ul>',
+                    '</div>'].join(''));
+                $('#tab-chart-fill').append(template({scope: this}));
+                $('#edit-chart-add-custom-color').single('click', _.bind(this.showCustomFillColor, this));
 
                 
                 this.fireEvent('page:show', [this, selector]);
@@ -236,16 +254,71 @@ define([
             },
 
             showBorderColor: function () {
+                var me = this;
                 var selector = '#edit-chart-border-color-view';
                 this.showPage(selector, true);
 
                 this.paletteBorderColor = new Common.UI.ThemeColorPalette({
                     el: $('.page[data-page=edit-chart-border-color] .page-content')
                 });
+                this.paletteBorderColor.on('customcolor', function () {
+                    me.showCustomBorderColor();
+                });
+                var template = _.template(['<div class="list-block">',
+                    '<ul>',
+                    '<li>',
+                    '<a id="edit-chart-add-custom-border-color" class="item-link">',
+                    '<div class="item-content">',
+                    '<div class="item-inner">',
+                    '<div class="item-title"><%= scope.textAddCustomColor %></div>',
+                    '</div>',
+                    '</div>',
+                    '</a>',
+                    '</li>',
+                    '</ul>',
+                    '</div>'].join(''));
+                $('.page[data-page=edit-chart-border-color] .page-content').append(template({scope: this}));
+                $('#edit-chart-add-custom-border-color').single('click', _.bind(this.showCustomBorderColor, this));
 
                 this.fireEvent('page:show', [this, selector]);
             },
 
+            showCustomFillColor: function() {
+                var me = this,
+                    selector = '#edit-chart-custom-color-view';
+                me.showPage(selector, true);
+
+                me.customColorPicker = new Common.UI.HsbColorPicker({
+                    el: $('.page[data-page=edit-chart-custom-color] .page-content'),
+                    color: me.paletteFillColor.currentColor
+                });
+                me.customColorPicker.on('addcustomcolor', function (colorPicker, color) {
+                    me.paletteFillColor.addNewDynamicColor(colorPicker, color);
+                    DE.getController('EditContainer').rootView.router.back();
+                });
+
+                me.fireEvent('page:show', [me, selector]);
+            },
+
+            showCustomBorderColor: function() {
+                var me = this,
+                    selector = '#edit-chart-custom-color-view';
+                me.showPage(selector, true);
+
+                me.customBorderColorPicker = new Common.UI.HsbColorPicker({
+                    el: $('.page[data-page=edit-chart-custom-color] .page-content'),
+                    color: me.paletteBorderColor.currentColor
+                });
+                me.customBorderColorPicker.on('addcustomcolor', function (colorPicker, color) {
+                    me.paletteBorderColor.addNewDynamicColor(colorPicker, color);
+                    me.paletteFillColor.updateDynamicColors();
+                    me.paletteFillColor.select(me.paletteFillColor.currentColor);
+                    DE.getController('EditContainer').rootView.router.back();
+                });
+
+                me.fireEvent('page:show', [me, selector]);
+            },
+
             textStyle: 'Style',
             textWrap: 'Wrap',
             textReorder: 'Reorder',
@@ -270,7 +343,9 @@ define([
             textFill: 'Fill',
             textBorder: 'Border',
             textSize: 'Size',
-            textColor: 'Color'
+            textColor: 'Color',
+            textAddCustomColor: 'Add Custom Color',
+            textCustomColor: 'Custom Color'
         }
     })(), DE.Views.EditChart || {}))
 });

apps/documenteditor/mobile/app/view/edit/EditImage.js

@@ -159,7 +159,7 @@ define([
             textWrap: 'Wrap',
             textReplace: 'Replace',
             textReorder: 'Reorder',
-            textDefault: 'Default Size',
+            textDefault: 'Actual Size',
             textRemove: 'Remove Image',
             textBack: 'Back',
             textToForeground: 'Bring to Foreground',

apps/documenteditor/mobile/app/view/edit/EditParagraph.js

@@ -150,6 +150,24 @@ define([
                     el: $('.page[data-page=edit-paragraph-color] .page-content'),
                     transparent: true
                 });
+                this.paletteBackgroundColor.on('customcolor', function () {
+                    me.showCustomColor();
+                });
+                var template = _.template(['<div class="list-block">',
+                    '<ul>',
+                    '<li>',
+                    '<a id="edit-paragraph-add-custom-color" class="item-link">',
+                    '<div class="item-content">',
+                    '<div class="item-inner">',
+                    '<div class="item-title"><%= scope.textAddCustomColor %></div>',
+                    '</div>',
+                    '</div>',
+                    '</a>',
+                    '</li>',
+                    '</ul>',
+                    '</div>'].join(''));
+                $('.page[data-page=edit-paragraph-color] .page-content').append(template({scope: this}));
+                $('#edit-paragraph-add-custom-color').single('click', _.bind(this.showCustomColor, this));
 
                 Common.Utils.addScrollIfNeed('.page[data-page=edit-paragraph-color]', '.page[data-page=edit-paragraph-color] .page-content');
                 this.fireEvent('page:show', [this, '#edit-paragraph-color']);
@@ -160,6 +178,23 @@ define([
                 Common.Utils.addScrollIfNeed('.page[data-page=edit-paragraph-advanced]', '.page[data-page=edit-paragraph-advanced] .page-content');
             },
 
+            showCustomColor: function () {
+                var me = this,
+                    selector = '#edit-paragraph-custom-color-view';
+                me.showPage(selector, true);
+
+                me.customColorPicker = new Common.UI.HsbColorPicker({
+                    el: $('.page[data-page=edit-paragraph-custom-color] .page-content'),
+                    color: me.paletteBackgroundColor.currentColor
+                });
+                me.customColorPicker.on('addcustomcolor', function (colorPicker, color) {
+                    me.paletteBackgroundColor.addNewDynamicColor(colorPicker, color);
+                    DE.getController('EditContainer').rootView.router.back();
+                });
+
+                me.fireEvent('page:show', [me, selector]);
+            },
+
             textBackground: 'Background',
             textAdvSettings: 'Advanced settings',
             textPrgStyles: 'Paragraph styles',
@@ -174,7 +209,9 @@ define([
             textPageBreak: 'Page Break Before',
             textOrphan: 'Orphan Control',
             textKeepLines: 'Keep Lines Together',
-            textKeepNext: 'Keep with Next'
+            textKeepNext: 'Keep with Next',
+            textAddCustomColor: 'Add Custom Color',
+            textCustomColor: 'Custom Color'
         }
     })(), DE.Views.EditParagraph || {}))
 });

apps/documenteditor/mobile/app/view/edit/EditShape.js

@@ -44,7 +44,8 @@ define([
     'text!documenteditor/mobile/app/template/EditShape.template',
     'jquery',
     'underscore',
-    'backbone'
+    'backbone',
+    'common/mobile/lib/component/HsbColorPicker'
 ], function (editTemplate, $, _, Backbone) {
     'use strict';
 
@@ -144,6 +145,7 @@ define([
             },
 
             showStyle: function () {
+                var me = this;
                 var selector = this.isShapeCanFill ? '#edit-shape-style' : '#edit-shape-style-nofill';
                 this.showPage(selector, true);
 
@@ -154,8 +156,25 @@ define([
                     el: $('#tab-shape-fill'),
                     transparent: true
                 });
-
-                // Common.Utils.addScrollIfNeed('.page[data-page=edit-text-font-color]', '.page[data-page=edit-text-font-color] .page-content');
+                this.paletteFillColor.on('customcolor', function () {
+                    me.showCustomFillColor();
+                });
+                var template = _.template(['<div class="list-block">',
+                    '<ul>',
+                        '<li>',
+                            '<a id="edit-shape-add-custom-color" class="item-link">',
+                            '<div class="item-content">',
+                            '<div class="item-inner">',
+                                '<div class="item-title"><%= scope.textAddCustomColor %></div>',
+                            '</div>',
+                            '</div>',
+                            '</a>',
+                        '</li>',
+                    '</ul>',
+                    '</div>'].join(''));
+                $('#tab-shape-fill').append(template({scope: this}));
+                $('#edit-shape-add-custom-color').single('click', _.bind(this.showCustomFillColor, this));
+                Common.Utils.addScrollIfNeed('.page.shape-style', '.page.shape-style .page-content');
                 this.fireEvent('page:show', [this, selector]);
             },
 
@@ -181,10 +200,64 @@ define([
                 this.paletteBorderColor = new Common.UI.ThemeColorPalette({
                     el: $('.page[data-page=edit-shape-border-color] .page-content')
                 });
+                this.paletteBorderColor.on('customcolor', function () {
+                    me.showCustomBorderColor();
+                });
+                var template = _.template(['<div class="list-block">',
+                    '<ul>',
+                    '<li>',
+                    '<a id="edit-shape-add-custom-border-color" class="item-link">',
+                    '<div class="item-content">',
+                    '<div class="item-inner">',
+                    '<div class="item-title"><%= scope.textAddCustomColor %></div>',
+                    '</div>',
+                    '</div>',
+                    '</a>',
+                    '</li>',
+                    '</ul>',
+                    '</div>'].join(''));
+                $('.page[data-page=edit-shape-border-color] .page-content').append(template({scope: this}));
+                $('#edit-shape-add-custom-border-color').single('click', _.bind(this.showCustomBorderColor, this));
 
                 this.fireEvent('page:show', [this, selector]);
             },
 
+            showCustomFillColor: function() {
+                var me = this,
+                    selector = '#edit-shape-custom-color-view';
+                me.showPage(selector, true);
+
+                me.customColorPicker = new Common.UI.HsbColorPicker({
+                    el: $('.page[data-page=edit-shape-custom-color] .page-content'),
+                    color: me.paletteFillColor.currentColor
+                });
+                me.customColorPicker.on('addcustomcolor', function (colorPicker, color) {
+                    me.paletteFillColor.addNewDynamicColor(colorPicker, color);
+                    DE.getController('EditContainer').rootView.router.back();
+                });
+
+                me.fireEvent('page:show', [me, selector]);
+            },
+
+            showCustomBorderColor: function() {
+                var me = this,
+                    selector = '#edit-shape-custom-color-view';
+                me.showPage(selector, true);
+
+                me.customBorderColorPicker = new Common.UI.HsbColorPicker({
+                    el: $('.page[data-page=edit-shape-custom-color] .page-content'),
+                    color: me.paletteBorderColor.currentColor
+                });
+                me.customBorderColorPicker.on('addcustomcolor', function (colorPicker, color) {
+                    me.paletteBorderColor.addNewDynamicColor(colorPicker, color);
+                    me.paletteFillColor.updateDynamicColors();
+                    me.paletteFillColor.select(me.paletteFillColor.currentColor);
+                    DE.getController('EditContainer').rootView.router.back();
+                });
+
+                me.fireEvent('page:show', [me, selector]);
+            },
+
             textStyle: 'Style',
             textWrap: 'Wrap',
             textReplace: 'Replace',
@@ -211,7 +284,9 @@ define([
             textEffects: 'Effects',
             textSize: 'Size',
             textColor: 'Color',
-            textOpacity: 'Opacity'
+            textOpacity: 'Opacity',
+            textAddCustomColor: 'Add Custom Color',
+            textCustomColor: 'Custom Color'
         }
     })(), DE.Views.EditShape || {}))
 });

apps/documenteditor/mobile/app/view/edit/EditTable.js

@@ -190,12 +190,31 @@ define([
             },
 
             showTableStyle: function () {
+                var me = this;
                 this.showPage('#edit-table-style', true);
 
                 this.paletteFillColor = new Common.UI.ThemeColorPalette({
                     el: $('#tab-table-fill'),
                     transparent: true
                 });
+                this.paletteFillColor.on('customcolor', function () {
+                    me.showCustomFillColor();
+                });
+                var template = _.template(['<div class="list-block">',
+                    '<ul>',
+                    '<li>',
+                    '<a id="edit-table-add-custom-color" class="item-link">',
+                    '<div class="item-content">',
+                    '<div class="item-inner">',
+                    '<div class="item-title"><%= scope.textAddCustomColor %></div>',
+                    '</div>',
+                    '</div>',
+                    '</a>',
+                    '</li>',
+                    '</ul>',
+                    '</div>'].join(''));
+                $('#tab-table-fill').append(template({scope: this}));
+                $('#edit-table-add-custom-color').single('click', _.bind(this.showCustomFillColor, this));
 
                 this.fireEvent('page:show', [this, '#edit-table-style']);
             },
@@ -206,6 +225,24 @@ define([
                 this.paletteBorderColor = new Common.UI.ThemeColorPalette({
                     el: $('.page[data-page=edit-table-border-color] .page-content')
                 });
+                this.paletteBorderColor.on('customcolor', function () {
+                    me.showCustomBorderColor();
+                });
+                var template = _.template(['<div class="list-block">',
+                    '<ul>',
+                    '<li>',
+                    '<a id="edit-table-add-custom-border-color" class="item-link">',
+                    '<div class="item-content">',
+                    '<div class="item-inner">',
+                    '<div class="item-title"><%= scope.textAddCustomColor %></div>',
+                    '</div>',
+                    '</div>',
+                    '</a>',
+                    '</li>',
+                    '</ul>',
+                    '</div>'].join(''));
+                $('.page[data-page=edit-table-border-color] .page-content').append(template({scope: this}));
+                $('#edit-table-add-custom-border-color').single('click', _.bind(this.showCustomBorderColor, this));
 
                 this.fireEvent('page:show', [this, '#edit-table-border-color-view']);
             },
@@ -218,6 +255,42 @@ define([
                 this.showPage('#edit-table-style-options-view');
             },
 
+            showCustomFillColor: function () {
+                var me = this,
+                    selector = '#edit-table-custom-color-view';
+                me.showPage(selector, true);
+
+                me.customColorPicker = new Common.UI.HsbColorPicker({
+                    el: $('.page[data-page=edit-table-custom-color] .page-content'),
+                    color: me.paletteFillColor.currentColor
+                });
+                me.customColorPicker.on('addcustomcolor', function (colorPicker, color) {
+                    me.paletteFillColor.addNewDynamicColor(colorPicker, color);
+                    DE.getController('EditContainer').rootView.router.back();
+                });
+
+                me.fireEvent('page:show', [me, selector]);
+            },
+
+            showCustomBorderColor: function() {
+                var me = this,
+                    selector = '#edit-table-custom-color-view';
+                me.showPage(selector, true);
+
+                me.customBorderColorPicker = new Common.UI.HsbColorPicker({
+                    el: $('.page[data-page=edit-table-custom-color] .page-content'),
+                    color: me.paletteBorderColor.currentColor
+                });
+                me.customBorderColorPicker.on('addcustomcolor', function (colorPicker, color) {
+                    me.paletteBorderColor.addNewDynamicColor(colorPicker, color);
+                    me.paletteFillColor.updateDynamicColors();
+                    me.paletteFillColor.select(me.paletteFillColor.currentColor);
+                    DE.getController('EditContainer').rootView.router.back();
+                });
+
+                me.fireEvent('page:show', [me, selector]);
+            },
+
             textRemoveTable: 'Remove Table',
             textTableOptions: 'Table Options',
             textStyle: 'Style',
@@ -242,7 +315,9 @@ define([
             textBandedRow: 'Banded Row',
             textFirstColumn: 'First Column',
             textLastColumn: 'Last Column',
-            textBandedColumn: 'Banded Column'
+            textBandedColumn: 'Banded Column',
+            textAddCustomColor: 'Add Custom Color',
+            textCustomColor: 'Custom Color'
         }
     })(), DE.Views.EditTable || {}))
 });

apps/documenteditor/mobile/app/view/edit/EditText.js

@@ -200,11 +200,46 @@ define([
                 this.paletteTextColor = new Common.UI.ThemeColorPalette({
                     el: $('.page[data-page=edit-text-font-color] .page-content')
                 });
+                this.paletteTextColor.on('customcolor', function () {
+                    me.showCustomFontColor();
+                });
+                var template = _.template(['<div class="list-block">',
+                    '<ul>',
+                    '<li>',
+                    '<a id="edit-text-add-custom-color" class="item-link">',
+                    '<div class="item-content">',
+                    '<div class="item-inner">',
+                    '<div class="item-title"><%= scope.textAddCustomColor %></div>',
+                    '</div>',
+                    '</div>',
+                    '</a>',
+                    '</li>',
+                    '</ul>',
+                    '</div>'].join(''));
+                $('.page[data-page=edit-text-font-color] .page-content').append(template({scope: this}));
+                $('#edit-text-add-custom-color').single('click', _.bind(this.showCustomFontColor, this));
 
                 Common.Utils.addScrollIfNeed('.page[data-page=edit-text-font-color]', '.page[data-page=edit-text-font-color] .page-content');
                 this.fireEvent('page:show', [this, '#edit-text-color']);
             },
 
+            showCustomFontColor: function () {
+                var me = this,
+                    selector = '#edit-text-custom-color-view';
+                me.showPage(selector, true);
+
+                me.customColorPicker = new Common.UI.HsbColorPicker({
+                    el: $('.page[data-page=edit-text-custom-color] .page-content'),
+                    color: me.paletteTextColor.currentColor
+                });
+                me.customColorPicker.on('addcustomcolor', function (colorPicker, color) {
+                    me.paletteTextColor.addNewDynamicColor(colorPicker, color);
+                    DE.getController('EditContainer').rootView.router.back();
+                });
+
+                me.fireEvent('page:show', [me, selector]);
+            },
+
             showBackgroundColor: function () {
                 this.showPage('#edit-text-background', true);
 
@@ -212,11 +247,46 @@ define([
                     el: $('.page[data-page=edit-text-font-background] .page-content'),
                     transparent: true
                 });
+                this.paletteBackgroundColor.on('customcolor', function () {
+                    me.showCustomBackgroundColor();
+                });
+                var template = _.template(['<div class="list-block">',
+                    '<ul>',
+                    '<li>',
+                    '<a id="edit-text-add-custom-background-color" class="item-link">',
+                    '<div class="item-content">',
+                    '<div class="item-inner">',
+                    '<div class="item-title"><%= scope.textAddCustomColor %></div>',
+                    '</div>',
+                    '</div>',
+                    '</a>',
+                    '</li>',
+                    '</ul>',
+                    '</div>'].join(''));
+                $('.page[data-page=edit-text-font-background] .page-content').append(template({scope: this}));
+                $('#edit-text-add-custom-background-color').single('click', _.bind(this.showCustomBackgroundColor, this));
 
                 Common.Utils.addScrollIfNeed('.page[data-page=edit-text-font-background]', '.page[data-page=edit-text-font-background] .page-content');
                 this.fireEvent('page:show', [this, '#edit-text-background']);
             },
 
+            showCustomBackgroundColor: function () {
+                var me = this,
+                    selector = '#edit-text-custom-color-view';
+                me.showPage(selector, true);
+
+                me.customBackgroundColorPicker = new Common.UI.HsbColorPicker({
+                    el: $('.page[data-page=edit-text-custom-color] .page-content'),
+                    color: me.paletteBackgroundColor.currentColor
+                });
+                me.customBackgroundColorPicker.on('addcustomcolor', function (colorPicker, color) {
+                    me.paletteBackgroundColor.addNewDynamicColor(colorPicker, color);
+                    DE.getController('EditContainer').rootView.router.back();
+                });
+
+                me.fireEvent('page:show', [me, selector]);
+            },
+
             showAdditional: function () {
                 this.showPage('#edit-text-additional');
                 Common.Utils.addScrollIfNeed('.page[data-page=edit-text-additional]', '.page[data-page=edit-text-additional] .page-content');
@@ -259,7 +329,9 @@ define([
             textCharacterBold: 'B',
             textCharacterItalic: 'I',
             textCharacterUnderline: 'U',
-            textCharacterStrikethrough: 'S'
+            textCharacterStrikethrough: 'S',
+            textAddCustomColor: 'Add Custom Color',
+            textCustomColor: 'Custom Color'
         }
     })(), DE.Views.EditText || {}))
 });

apps/documenteditor/mobile/locale/bg.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Опитвате се да извършите действие, за което нямате права. <br> Моля, свържете се с администратора на сървъра за документи.",
   "DE.Controllers.Main.errorBadImageUrl": "URL адресът на изображението е неправилен",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Връзката със сървъра е загубена. Вече не можете да редактирате.",
-  "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.<br>Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа. <br><br>Намерете повече информация за свързването на сървър за документи <a href=\"%1\" target=\"_blank\">тук</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.<br>Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа.",
   "DE.Controllers.Main.errorDatabaseConnection": "Външна грешка. <br> Грешка при свързване към база данни. Моля, свържете се с екипа за поддръжка.",
   "DE.Controllers.Main.errorDataEncrypted": "Получени са криптирани промени, които не могат да се дефинират.",
   "DE.Controllers.Main.errorDataRange": "Неправилен обхват от данни.",

apps/documenteditor/mobile/locale/cs.json

@@ -56,7 +56,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.<br>Prosím, kontaktujte administrátora vašeho Dokumentového serveru.",
   "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávná",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Serverové připojení bylo ztraceno. Nadále nemůžete editovat.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.<br> Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.<br><br> Více informací o připojení najdete v Dokumentovém serveru <a href=\"%1\" target=\"_blank\">here</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.<br> Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externí chyba.<br>Chyba připojení k databázi. Prosím, kontaktujte podporu.",
   "DE.Controllers.Main.errorDataRange": "Nesprávný datový rozsah.",
   "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1",

apps/documenteditor/mobile/locale/de.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Sie versuchen die Änderungen vorzunehemen, für die Sie keine Berechtigungen haben.<br>Wenden Sie sich an Ihren Document Server Serveradministrator.",
   "DE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Sie können nicht mehr editieren.",
-  "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.<br><br>Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie <a href=\"%1\" target=\"_blank\">hier</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.",
   "DE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.",
   "DE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",

apps/documenteditor/mobile/locale/en.json

@@ -58,6 +58,7 @@
   "Common.Controllers.Collaboration.textTabs": "Change tabs",
   "Common.Controllers.Collaboration.textUnderline": "Underline",
   "Common.Controllers.Collaboration.textWidow": "Widow control",
+  "Common.UI.ThemeColorPalette.textCustomColors": "Custom Colors",
   "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
   "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
   "Common.Utils.Metric.txtCm": "cm",
@@ -140,13 +141,14 @@
   "DE.Controllers.Main.errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
   "DE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. You can't edit anymore.",
-  "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>",
+  "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.",
   "DE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
   "DE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
   "DE.Controllers.Main.errorDataRange": "Incorrect data range.",
   "DE.Controllers.Main.errorDefaultMessage": "Error code: %1",
   "DE.Controllers.Main.errorEditingDownloadas": "An error occurred during the work with the document.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
   "DE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
+  "DE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
   "DE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
   "DE.Controllers.Main.errorKeyExpire": "Key descriptor expired",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Loading failed",
@@ -157,7 +159,7 @@
   "DE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
   "DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.",
   "DE.Controllers.Main.errorUsersExceed": "The number of users was exceeded",
-  "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.",
+  "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download it until the connection is restored and page is reloaded.",
   "DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
   "DE.Controllers.Main.loadFontsTextText": "Loading data...",
   "DE.Controllers.Main.loadFontsTitleText": "Loading Data",
@@ -247,7 +249,7 @@
   "DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
-  "DE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
+  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
   "DE.Controllers.Search.textNoTextFound": "Text not Found",
   "DE.Controllers.Search.textReplaceAll": "Replace All",
   "DE.Controllers.Settings.notcriticalErrorTitle": "Warning",
@@ -293,12 +295,14 @@
   "DE.Views.AddOther.textSectionBreak": "Section Break",
   "DE.Views.AddOther.textStartFrom": "Start At",
   "DE.Views.AddOther.textTip": "Screen Tip",
+  "DE.Views.EditChart.textAddCustomColor": "Add Custom Color",
   "DE.Views.EditChart.textAlign": "Align",
   "DE.Views.EditChart.textBack": "Back",
   "DE.Views.EditChart.textBackward": "Move Backward",
   "DE.Views.EditChart.textBehind": "Behind",
   "DE.Views.EditChart.textBorder": "Border",
   "DE.Views.EditChart.textColor": "Color",
+  "DE.Views.EditChart.textCustomColor": "Custom Color",
   "DE.Views.EditChart.textDistanceText": "Distance from Text",
   "DE.Views.EditChart.textFill": "Fill",
   "DE.Views.EditChart.textForward": "Move Forward",
@@ -334,7 +338,7 @@
   "DE.Views.EditImage.textBack": "Back",
   "DE.Views.EditImage.textBackward": "Move Backward",
   "DE.Views.EditImage.textBehind": "Behind",
-  "DE.Views.EditImage.textDefault": "Default Size",
+  "DE.Views.EditImage.textDefault": "Actual Size",
   "DE.Views.EditImage.textDistanceText": "Distance from Text",
   "DE.Views.EditImage.textForward": "Move Forward",
   "DE.Views.EditImage.textFromLibrary": "Picture from Library",
@@ -356,6 +360,7 @@
   "DE.Views.EditImage.textToForeground": "Bring to Foreground",
   "DE.Views.EditImage.textTopBottom": "Top and Bottom",
   "DE.Views.EditImage.textWrap": "Wrap",
+  "DE.Views.EditParagraph.textAddCustomColor": "Add Custom Color",
   "DE.Views.EditParagraph.textAdvanced": "Advanced",
   "DE.Views.EditParagraph.textAdvSettings": "Advanced settings",
   "DE.Views.EditParagraph.textAfter": "After",
@@ -363,6 +368,7 @@
   "DE.Views.EditParagraph.textBack": "Back",
   "DE.Views.EditParagraph.textBackground": "Background",
   "DE.Views.EditParagraph.textBefore": "Before",
+  "DE.Views.EditParagraph.textCustomColor": "Custom Color",
   "DE.Views.EditParagraph.textFirstLine": "First Line",
   "DE.Views.EditParagraph.textFromText": "Distance from Text",
   "DE.Views.EditParagraph.textKeepLines": "Keep Lines Together",
@@ -371,12 +377,14 @@
   "DE.Views.EditParagraph.textPageBreak": "Page Break Before",
   "DE.Views.EditParagraph.textPrgStyles": "Paragraph styles",
   "DE.Views.EditParagraph.textSpaceBetween": "Space Between Paragraphs",
+  "DE.Views.EditShape.textAddCustomColor": "Add Custom Color",
   "DE.Views.EditShape.textAlign": "Align",
   "DE.Views.EditShape.textBack": "Back",
   "DE.Views.EditShape.textBackward": "Move Backward",
   "DE.Views.EditShape.textBehind": "Behind",
   "DE.Views.EditShape.textBorder": "Border",
   "DE.Views.EditShape.textColor": "Color",
+  "DE.Views.EditShape.textCustomColor": "Custom Color",
   "DE.Views.EditShape.textEffects": "Effects",
   "DE.Views.EditShape.textFill": "Fill",
   "DE.Views.EditShape.textForward": "Move Forward",
@@ -398,6 +406,7 @@
   "DE.Views.EditShape.textTopAndBottom": "Top and Bottom",
   "DE.Views.EditShape.textWithText": "Move with Text",
   "DE.Views.EditShape.textWrap": "Wrap",
+  "DE.Views.EditTable.textAddCustomColor": "Add Custom Color",
   "DE.Views.EditTable.textAlign": "Align",
   "DE.Views.EditTable.textBack": "Back",
   "DE.Views.EditTable.textBandedColumn": "Banded Column",
@@ -405,6 +414,7 @@
   "DE.Views.EditTable.textBorder": "Border",
   "DE.Views.EditTable.textCellMargins": "Cell Margins",
   "DE.Views.EditTable.textColor": "Color",
+  "DE.Views.EditTable.textCustomColor": "Custom Color",
   "DE.Views.EditTable.textFill": "Fill",
   "DE.Views.EditTable.textFirstColumn": "First Column",
   "DE.Views.EditTable.textFlow": "Flow",
@@ -423,6 +433,7 @@
   "DE.Views.EditTable.textTotalRow": "Total Row",
   "DE.Views.EditTable.textWithText": "Move with Text",
   "DE.Views.EditTable.textWrap": "Wrap",
+  "DE.Views.EditText.textAddCustomColor": "Add Custom Color",
   "DE.Views.EditText.textAdditional": "Additional",
   "DE.Views.EditText.textAdditionalFormat": "Additional Formatting",
   "DE.Views.EditText.textAllCaps": "All Caps",
@@ -433,6 +444,7 @@
   "DE.Views.EditText.textCharacterItalic": "I",
   "DE.Views.EditText.textCharacterStrikethrough": "S",
   "DE.Views.EditText.textCharacterUnderline": "U",
+  "DE.Views.EditText.textCustomColor": "Custom Color",
   "DE.Views.EditText.textDblStrikethrough": "Double Strikethrough",
   "DE.Views.EditText.textDblSuperscript": "Superscript",
   "DE.Views.EditText.textFontColor": "Font Color",

apps/documenteditor/mobile/locale/es.json

@@ -139,7 +139,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Usted no tiene permisos para realizar la acción que está intentando hacer.<br> Por favor, contacte con su Administrador del Servidor de Documentos.",
   "DE.Controllers.Main.errorBadImageUrl": "URL de imagen es incorrecto",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "La conexión al servidor se ha perdido. Usted ya no puede editar.",
-  "DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.<br>Al hacer clic en el botón 'OK' se le solicitará que descargue el documento.<br><br>Encuentre más información acerca de la conexión de Servidor de Documentos <a href=\"%1\" target=\"_blank\">aquí</a>",
+  "DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.<br>Al hacer clic en el botón 'OK' se le solicitará que descargue el documento.",
   "DE.Controllers.Main.errorDatabaseConnection": "Error externo.<br>Error de conexión a la base de datos. Por favor, contacte con el equipo de soporte técnico.",
   "DE.Controllers.Main.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.",
   "DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.",

apps/documenteditor/mobile/locale/fr.json

@@ -70,6 +70,7 @@
   "Common.Views.Collaboration.textEditUsers": "Utilisateurs",
   "Common.Views.Collaboration.textFinal": "Final",
   "Common.Views.Collaboration.textMarkup": "Balisage",
+  "Common.Views.Collaboration.textNoComments": "Il n'y a pas de commentaires dans ce document",
   "Common.Views.Collaboration.textOriginal": "Original",
   "Common.Views.Collaboration.textRejectAllChanges": "Refuser toutes les modifications ",
   "Common.Views.Collaboration.textReview": "Suivi des modifications",
@@ -139,13 +140,14 @@
   "DE.Controllers.Main.errorAccessDeny": "Vous tentez d'exéсuter une action pour laquelle vous ne disposez pas des droits.<br>Veuillez contacter l'administrateur de Document Server.",
   "DE.Controllers.Main.errorBadImageUrl": "L'URL de l'image est incorrecte",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "La connexion au serveur perdue. Désolé, vous ne pouvez plus modifier le document.",
-  "DE.Controllers.Main.errorConnectToServer": "Impossible d'enregistrer le document. Veuillez vérifier vos paramètres de connexion ou contactez l'administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.<br><br>Trouvez plus d'informations sur la connexion au Serveur de Documents <a href=\"%1\" target=\"_blank\">ici</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Impossible d'enregistrer le document. Veuillez vérifier vos paramètres de connexion ou contactez l'administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.",
   "DE.Controllers.Main.errorDatabaseConnection": "Erreur externe.<br>Erreur de connexion à la base de données.Contactez le support.",
   "DE.Controllers.Main.errorDataEncrypted": "Les modifications chiffrées ont été reçues, elle ne peuvent pas être déchiffrées.",
   "DE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
   "DE.Controllers.Main.errorDefaultMessage": "Code d'erreur: %1",
   "DE.Controllers.Main.errorEditingDownloadas": "Une erreure s'est produite lors du travail sur le document.<br>Utilisez l'option \"Télécharger\" pour enregistrer la copie de sauvegarde sur le disque dur de votre ordinateur.",
   "DE.Controllers.Main.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut être ouvert.",
+  "DE.Controllers.Main.errorFileSizeExceed": "La taille du fichier dépasse les limites établies sur votre serveur.<br>Veuillez contacter votre administrateur de Document Server pour obtenir plus d'information.  ",
   "DE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu",
   "DE.Controllers.Main.errorKeyExpire": "Descripteur de clés expiré",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Échec du chargement",
@@ -252,6 +254,7 @@
   "DE.Controllers.Settings.txtLoading": "Chargement en cours...",
   "DE.Controllers.Settings.unknownText": "Inconnu",
   "DE.Controllers.Settings.warnDownloadAs": "Si vous continuez à enregistrer dans ce format toutes les fonctions sauf le texte seront perdues.<br>Êtes-vous sûr de vouloir continuer ?",
+  "DE.Controllers.Settings.warnDownloadAsRTF": "Si vous continuer à sauvegarder dans ce format une partie de la mise en forme peut être supprimée <br>Êtes-vous sûr de vouloir continuer?",
   "DE.Controllers.Toolbar.dlgLeaveMsgText": "Vous avez des modifications non enregistrées dans ce document. Cliquez sur 'Rester sur cette Page' pour la sauvegarde automatique du document. Cliquez sur 'Quitter cette Page' pour ignorer toutes les modifications non enregistrées.",
   "DE.Controllers.Toolbar.dlgLeaveTitleText": "Vous quittez l'application",
   "DE.Controllers.Toolbar.leaveButtonText": "Quitter cette page",
@@ -455,14 +458,21 @@
   "DE.Views.Settings.textAbout": "A propos",
   "DE.Views.Settings.textAddress": "adresse",
   "DE.Views.Settings.textAdvancedSettings": "Paramètres de l'application",
+  "DE.Views.Settings.textApplication": "Application",
   "DE.Views.Settings.textAuthor": "Auteur",
   "DE.Views.Settings.textBack": "Retour",
   "DE.Views.Settings.textBottom": "En bas",
   "DE.Views.Settings.textCentimeter": "Centimètre",
+  "DE.Views.Settings.textCollaboration": "Collaboration",
   "DE.Views.Settings.textColorSchemes": "Jeux de couleurs",
+  "DE.Views.Settings.textComment": "Commentaire",
+  "DE.Views.Settings.textCommentingDisplay": "Affichage des commentaires ",
+  "DE.Views.Settings.textCreated": "Créé",
   "DE.Views.Settings.textCreateDate": "Date de création",
   "DE.Views.Settings.textCustom": "Personnalisé",
   "DE.Views.Settings.textCustomSize": "Taille personnalisée",
+  "DE.Views.Settings.textDisplayComments": "Commentaires",
+  "DE.Views.Settings.textDisplayResolvedComments": "Commentaires résolus",
   "DE.Views.Settings.textDocInfo": "Position actuelle",
   "DE.Views.Settings.textDocTitle": "Titre du document",
   "DE.Views.Settings.textDocumentFormats": "Formats de document",
@@ -479,11 +489,15 @@
   "DE.Views.Settings.textHiddenTableBorders": "Bordures du tableau cachées",
   "DE.Views.Settings.textInch": "Pouce",
   "DE.Views.Settings.textLandscape": "Paysage",
+  "DE.Views.Settings.textLastModified": "Date de dernière modification",
+  "DE.Views.Settings.textLastModifiedBy": "Dernière modification par",
   "DE.Views.Settings.textLeft": "A gauche",
   "DE.Views.Settings.textLoading": "Chargement en cours...",
+  "DE.Views.Settings.textLocation": "Emplacement",
   "DE.Views.Settings.textMargins": "Marges",
   "DE.Views.Settings.textNoCharacters": "Caractères non imprimables",
   "DE.Views.Settings.textOrientation": "Orientation",
+  "DE.Views.Settings.textOwner": "Propriétaire",
   "DE.Views.Settings.textPages": "Pages",
   "DE.Views.Settings.textParagraphs": "Paragraphes",
   "DE.Views.Settings.textPoint": "Point",
@@ -497,10 +511,13 @@
   "DE.Views.Settings.textSpaces": "Espaces",
   "DE.Views.Settings.textSpellcheck": "Vérification de l'orthographe",
   "DE.Views.Settings.textStatistic": "Statistique",
+  "DE.Views.Settings.textSubject": "Sujet",
   "DE.Views.Settings.textSymbols": "Symboles",
   "DE.Views.Settings.textTel": "Tél.",
+  "DE.Views.Settings.textTitle": "Titre",
   "DE.Views.Settings.textTop": "En haut",
   "DE.Views.Settings.textUnitOfMeasurement": "Unité de mesure",
+  "DE.Views.Settings.textUploaded": "Chargé",
   "DE.Views.Settings.textVersion": "Version",
   "DE.Views.Settings.textWords": "Mots",
   "DE.Views.Settings.unknownText": "Inconnu",

apps/documenteditor/mobile/locale/hu.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.<br>Vegye fel a kapcsolatot a Document Server adminisztrátorával.",
   "DE.Controllers.Main.errorBadImageUrl": "Hibás kép URL",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "A szerver elveszítette a kapcsolatot. A további szerkesztés nem lehetséges.",
-  "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.<br>Ha az 'OK'-ra kattint letöltheti a dokumentumot.<br><br>Bővebb információk a Dokumentum Szerverhez kapcsolódásról <a href=\"%1\" target=\"_blank\">itt</a> találhat.",
+  "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.<br>Ha az 'OK'-ra kattint letöltheti a dokumentumot.",
   "DE.Controllers.Main.errorDatabaseConnection": "Külső hiba.<br>Adatbázis kapcsolati hiba. Kérem vegye igénybe támogatásunkat.",
   "DE.Controllers.Main.errorDataEncrypted": "Titkosított változások érkeztek, melyek feloldása sikertelen.",
   "DE.Controllers.Main.errorDataRange": "Hibás adattartomány.",

apps/documenteditor/mobile/locale/it.json

@@ -138,13 +138,14 @@
   "DE.Controllers.Main.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.<br>Si prega di contattare l'amministratore del Server dei Documenti.",
   "DE.Controllers.Main.errorBadImageUrl": "URL dell'immagine non corretto",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Scollegato dal server. Non è possibile modificare.",
-  "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.<br><br>Per maggiori dettagli sulla connessione al Document Server  <a href=\"%1\" target=\"_blank\">clicca qui</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.",
   "DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione al database. Si prega di contattare il supporto.",
   "DE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.",
   "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
   "DE.Controllers.Main.errorDefaultMessage": "Codice errore: %1",
   "DE.Controllers.Main.errorEditingDownloadas": "Si è verificato un errore mentre si lavorava sul documento.<br> Utilizzare l'opzione 'Scarica' per salvare la copia di backup del file sul disco rigido del computer.",
   "DE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
+  "DE.Controllers.Main.errorFileSizeExceed": "La dimensione del file supera la limitazione impostata per il tuo server.<br>Per i dettagli, contatta l'amministratore del Document server.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descrittore di chiave sconosciuto",
   "DE.Controllers.Main.errorKeyExpire": "Descrittore di chiave scaduto",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Caricamento non riuscito",

apps/documenteditor/mobile/locale/ko.json

@@ -57,7 +57,7 @@
   "DE.Controllers.Main.downloadTitleText": "문서 다운로드 중",
   "DE.Controllers.Main.errorBadImageUrl": "이미지 URL이 잘못되었습니다.",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "서버 연결이 끊어졌습니다. 더 이상 편집 할 수 없습니다.",
-  "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.<br>'확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.<br ><br>Document Server 연결에 대한 추가 정보 찾기 <a href=\"%1\" target=\"_blank\">여기</a> ",
+  "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.<br>'확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.",
   "DE.Controllers.Main.errorDatabaseConnection": "외부 오류입니다. <br> 데이터베이스 연결 오류입니다. 지원팀에 문의하십시오.",
   "DE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.",
   "DE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1",

apps/documenteditor/mobile/locale/lv.json

@@ -53,7 +53,7 @@
   "DE.Controllers.Main.downloadTitleText": "Dokumenta lejupielāde",
   "DE.Controllers.Main.errorBadImageUrl": "Nav pareizs attēla URL",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Zudis servera savienojums. Jūs vairs nevarat rediģēt.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.<br>Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.<br><br>Uzziniet vairāk par dokumentu servera pieslēgšanu <a href=\"%1\" target=\"_blank\">šeit</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.<br>Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Ārējā kļūda.<br>Datubāzes piekļuves kļūda. Lūdzu, sazinieties ar atbalsta daļu.",
   "DE.Controllers.Main.errorDataRange": "Nepareizs datu diapazons",
   "DE.Controllers.Main.errorDefaultMessage": "Kļūdas kods: %1",

apps/documenteditor/mobile/locale/nl.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorAccessDeny": "U probeert een actie uit te voeren waarvoor u geen rechten hebt.<br>Neem contact op met de beheerder van de documentserver.",
   "DE.Controllers.Main.errorBadImageUrl": "URL afbeelding is onjuist",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbinding met server verbroken. U kunt niet doorgaan met bewerken.",
-  "DE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.<br>Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.<br><br>Meer informatie over verbindingen met de documentserver is <a href=\"%1\" target=\"_blank\">hier</a> te vinden.",
+  "DE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.<br>Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externe fout.<br>Fout in databaseverbinding. Neem contact op met Support.",
   "DE.Controllers.Main.errorDataEncrypted": "Versleutelde wijzigingen zijn ontvangen, deze kunnen niet ontcijferd worden.",
   "DE.Controllers.Main.errorDataRange": "Onjuist gegevensbereik",

apps/documenteditor/mobile/locale/pl.json

@@ -55,7 +55,7 @@
   "DE.Controllers.Main.downloadTitleText": "Pobieranie dokumentu",
   "DE.Controllers.Main.errorBadImageUrl": "Adres URL obrazu jest błędny",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Połączenie z serwerem zostało utracone. Nie możesz już edytować.",
-  "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.<br>Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.<br><br>Dowiedz się więcej o połączeniu serwera dokumentów <a href=\"%1\" target=\"_blank\">tutaj</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.<br>Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Zewnętrzny błąd.<br>Błąd połączenia z bazą danych. Proszę skontaktuj się z administratorem.",
   "DE.Controllers.Main.errorDataRange": "Błędny zakres danych.",
   "DE.Controllers.Main.errorDefaultMessage": "Kod błędu: %1",

apps/documenteditor/mobile/locale/pt.json

@@ -53,7 +53,7 @@
   "DE.Controllers.Main.downloadTitleText": "Baixando Documento",
   "DE.Controllers.Main.errorBadImageUrl": "URL de imagem está incorreta",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Conexão ao servidor perdida. Você não pode mais editar.",
-  "DE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador.<br>Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento. <br><br>Encontre mais informações sobre como conecta ao Document Server <a href=\"%1\" target=\"_blank\">aqui</a>",
+  "DE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador.<br>Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento.",
   "DE.Controllers.Main.errorDatabaseConnection": "Erro externo. <br> Erro de conexão do banco de dados. Entre em contato com o suporte.",
   "DE.Controllers.Main.errorDataRange": "Intervalo de dados incorreto.",
   "DE.Controllers.Main.errorDefaultMessage": "Código do Erro: %1",

apps/documenteditor/mobile/locale/ru.json

@@ -58,6 +58,7 @@
   "Common.Controllers.Collaboration.textTabs": "Изменение табуляции",
   "Common.Controllers.Collaboration.textUnderline": "Подчёркнутый",
   "Common.Controllers.Collaboration.textWidow": "Запрет висячих строк",
+  "Common.UI.ThemeColorPalette.textCustomColors": "Пользовательские цвета",
   "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета",
   "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы",
   "Common.Utils.Metric.txtCm": "см",
@@ -140,13 +141,14 @@
   "DE.Controllers.Main.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.Controllers.Main.errorBadImageUrl": "Неправильный URL-адрес изображения",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Подключение к серверу прервано. Редактирование недоступно.",
-  "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.<br><br>Дополнительную информацию о подключении Сервера документов можно найти <a href=\"%1\" target=\"_blank\">здесь</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.",
   "DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Пожалуйста, обратитесь в службу технической поддержки.",
   "DE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.",
   "DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
   "DE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
   "DE.Controllers.Main.errorEditingDownloadas": "В ходе работы с документом произошла ошибка.<br>Используйте опцию 'Скачать', чтобы сохранить резервную копию файла на жестком диске компьютера.",
   "DE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
+  "DE.Controllers.Main.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.<br>Обратитесь к администратору Сервера документов для получения дополнительной информации.",
   "DE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
   "DE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Сбой при загрузке",
@@ -157,7 +159,7 @@
   "DE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.",
   "DE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.",
   "DE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей",
-  "DE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,<br>но не сможете скачать его до восстановления подключения.",
+  "DE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,<br>но не сможете скачать его до восстановления подключения и обновления страницы.",
   "DE.Controllers.Main.leavePageText": "В документе есть несохраненные изменения. Нажмите 'Остаться на странице', чтобы дождаться автосохранения документа. Нажмите 'Уйти со страницы', чтобы сбросить все несохраненные изменения.",
   "DE.Controllers.Main.loadFontsTextText": "Загрузка данных...",
   "DE.Controllers.Main.loadFontsTitleText": "Загрузка данных",
@@ -292,12 +294,14 @@
   "DE.Views.AddOther.textSectionBreak": "Разрыв раздела",
   "DE.Views.AddOther.textStartFrom": "Начать с",
   "DE.Views.AddOther.textTip": "Подсказка",
+  "DE.Views.EditChart.textAddCustomColor": "Добавить пользовательский цвет",
   "DE.Views.EditChart.textAlign": "Выравнивание",
   "DE.Views.EditChart.textBack": "Назад",
   "DE.Views.EditChart.textBackward": "Перенести назад",
   "DE.Views.EditChart.textBehind": "За текстом",
   "DE.Views.EditChart.textBorder": "Граница",
   "DE.Views.EditChart.textColor": "Цвет",
+  "DE.Views.EditChart.textCustomColor": "Пользовательский цвет",
   "DE.Views.EditChart.textDistanceText": "Расстояние до текста",
   "DE.Views.EditChart.textFill": "Заливка",
   "DE.Views.EditChart.textForward": "Перенести вперед",
@@ -333,7 +337,7 @@
   "DE.Views.EditImage.textBack": "Назад",
   "DE.Views.EditImage.textBackward": "Перенести назад",
   "DE.Views.EditImage.textBehind": "За текстом",
-  "DE.Views.EditImage.textDefault": "Размер по умолчанию",
+  "DE.Views.EditImage.textDefault": "Реальный размер",
   "DE.Views.EditImage.textDistanceText": "Расстояние до текста",
   "DE.Views.EditImage.textForward": "Перенести вперед",
   "DE.Views.EditImage.textFromLibrary": "Изображение из библиотеки",
@@ -355,6 +359,7 @@
   "DE.Views.EditImage.textToForeground": "Перенести на передний план",
   "DE.Views.EditImage.textTopBottom": "Сверху и снизу",
   "DE.Views.EditImage.textWrap": "Стиль обтекания",
+  "DE.Views.EditParagraph.textAddCustomColor": "Добавить пользовательский цвет",
   "DE.Views.EditParagraph.textAdvanced": "Дополнительно",
   "DE.Views.EditParagraph.textAdvSettings": "Дополнительно",
   "DE.Views.EditParagraph.textAfter": "После",
@@ -362,6 +367,7 @@
   "DE.Views.EditParagraph.textBack": "Назад",
   "DE.Views.EditParagraph.textBackground": "Фон",
   "DE.Views.EditParagraph.textBefore": "Перед",
+  "DE.Views.EditParagraph.textCustomColor": "Пользовательский цвет",
   "DE.Views.EditParagraph.textFirstLine": "Первая строка",
   "DE.Views.EditParagraph.textFromText": "Расстояние до текста",
   "DE.Views.EditParagraph.textKeepLines": "Не разрывать абзац",
@@ -370,12 +376,14 @@
   "DE.Views.EditParagraph.textPageBreak": "С новой страницы",
   "DE.Views.EditParagraph.textPrgStyles": "Стили абзаца",
   "DE.Views.EditParagraph.textSpaceBetween": "Интервал между абзацами",
+  "DE.Views.EditShape.textAddCustomColor": "Добавить пользовательский цвет",
   "DE.Views.EditShape.textAlign": "Выравнивание",
   "DE.Views.EditShape.textBack": "Назад",
   "DE.Views.EditShape.textBackward": "Перенести назад",
   "DE.Views.EditShape.textBehind": "За текстом",
   "DE.Views.EditShape.textBorder": "Граница",
   "DE.Views.EditShape.textColor": "Цвет",
+  "DE.Views.EditShape.textCustomColor": "Пользовательский цвет",
   "DE.Views.EditShape.textEffects": "Эффекты",
   "DE.Views.EditShape.textFill": "Заливка",
   "DE.Views.EditShape.textForward": "Перенести вперед",
@@ -397,6 +405,7 @@
   "DE.Views.EditShape.textTopAndBottom": "Сверху и снизу",
   "DE.Views.EditShape.textWithText": "Перемещать с текстом",
   "DE.Views.EditShape.textWrap": "Стиль обтекания",
+  "DE.Views.EditTable.textAddCustomColor": "Добавить пользовательский цвет",
   "DE.Views.EditTable.textAlign": "Выравнивание",
   "DE.Views.EditTable.textBack": "Назад",
   "DE.Views.EditTable.textBandedColumn": "Чередовать столбцы",
@@ -404,6 +413,7 @@
   "DE.Views.EditTable.textBorder": "Граница",
   "DE.Views.EditTable.textCellMargins": "Поля ячейки",
   "DE.Views.EditTable.textColor": "Цвет",
+  "DE.Views.EditTable.textCustomColor": "Пользовательский цвет",
   "DE.Views.EditTable.textFill": "Заливка",
   "DE.Views.EditTable.textFirstColumn": "Первый столбец",
   "DE.Views.EditTable.textFlow": "Плавающая",
@@ -422,6 +432,7 @@
   "DE.Views.EditTable.textTotalRow": "Строка итогов",
   "DE.Views.EditTable.textWithText": "Перемещать с текстом",
   "DE.Views.EditTable.textWrap": "Стиль обтекания",
+  "DE.Views.EditText.textAddCustomColor": "Добавить пользовательский цвет",
   "DE.Views.EditText.textAdditional": "Дополнительно",
   "DE.Views.EditText.textAdditionalFormat": "Дополнительно",
   "DE.Views.EditText.textAllCaps": "Все прописные",
@@ -432,6 +443,7 @@
   "DE.Views.EditText.textCharacterItalic": "К",
   "DE.Views.EditText.textCharacterStrikethrough": "Т",
   "DE.Views.EditText.textCharacterUnderline": "Ч",
+  "DE.Views.EditText.textCustomColor": "Пользовательский цвет",
   "DE.Views.EditText.textDblStrikethrough": "Двойное зачёркивание",
   "DE.Views.EditText.textDblSuperscript": "Надстрочные",
   "DE.Views.EditText.textFontColor": "Цвет шрифта",

apps/documenteditor/mobile/locale/sk.json

@@ -54,7 +54,7 @@
   "DE.Controllers.Main.downloadTitleText": "Sťahovanie dokumentu",
   "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávna",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Spojenie so serverom sa stratilo. Už nemôžete upravovať.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.<br>Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.<br><br>Viac informácií o pripojení dokumentového servera nájdete <a href=\"%1\" target=\"_blank\">tu</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.<br>Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externá chyba.<br>Chyba spojenia databázy. Obráťte sa prosím na podporu.",
   "DE.Controllers.Main.errorDataRange": "Nesprávny rozsah údajov.",
   "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1",

apps/documenteditor/mobile/locale/tr.json

@@ -53,7 +53,7 @@
   "DE.Controllers.Main.downloadTitleText": "Belge indiriliyor",
   "DE.Controllers.Main.errorBadImageUrl": "Resim URL'si yanlış",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Sunucu bağlantısı kayboldu. Artık düzenleyemezsiniz.",
-  "DE.Controllers.Main.errorConnectToServer": "Belge kaydedilemedi. Lütfen internet bağlantınızı kontrol edin veya yöneticiniz ile iletişime geçin. <br>'TAMAM' tuşuna tıkladığınızda belgeyi indirebileceksiniz.<br><br>Belge Sunucusuna bağlanma konusunda daha fazla bilgi için <a href=\"%1\" target=\"_blank\">buraya</a> tıklayın",
+  "DE.Controllers.Main.errorConnectToServer": "Belge kaydedilemedi. Lütfen internet bağlantınızı kontrol edin veya yöneticiniz ile iletişime geçin. <br>'TAMAM' tuşuna tıkladığınızda belgeyi indirebileceksiniz.",
   "DE.Controllers.Main.errorDatabaseConnection": "Dışsal hata.<br>Veritabanı bağlantı hatası. Lütfen destek ile iletişime geçin.",
   "DE.Controllers.Main.errorDataRange": "Yanlış veri aralığı.",
   "DE.Controllers.Main.errorDefaultMessage": "Hata kodu: %1",