Merge branch 'develop' into feature/fix-bugs

2022-10-06 17:06:27 +05:00 · 2022-10-06 17:06:27 +05:00 · be5f7b31bf
parent eb6bc50a01 b4950b3681
commit be5f7b31bf
217 changed files with 3124 additions and 413 deletions
--- a/apps/api/documents/api.js
+++ b/apps/api/documents/api.js
@ -974,25 +974,6 @@
        return params;
    }

-    function getFrameTitle(config) {
-        var title = 'Powerful online editor for text documents, spreadsheets, and presentations';
-        var appMap = {
-            'text': 'text documents',
-            'spreadsheet': 'spreadsheets',
-            'presentation': 'presentations',
-            'word': 'text documents',
-            'cell': 'spreadsheets',
-            'slide': 'presentations'
-        };
-
-        if (typeof config.documentType === 'string') {
-            var app = appMap[config.documentType.toLowerCase()];
-            if (app)
-                title = 'Powerful online editor for ' + app;
-        }
-        return title;
-    }
-
    function createIframe(config) {
        var iframe = document.createElement("iframe");

@ -1002,7 +983,7 @@
        iframe.align = "top";
        iframe.frameBorder = 0;
        iframe.name = "frameEditor";
-        iframe.title = getFrameTitle(config);
+        config.title && (typeof config.title === 'string') && (iframe.title = config.title);
        iframe.allowFullscreen = true;
        iframe.setAttribute("allowfullscreen",""); // for IE11
        iframe.setAttribute("onmousewheel",""); // for Safari on Mac
--- a/apps/common/forms/resources/less/common.less
+++ b/apps/common/forms/resources/less/common.less
@ -589,6 +589,7 @@
        height: 100%;

        &.disabled {
+            opacity: @component-disabled-opacity-ie;
            opacity: @component-disabled-opacity;
            cursor: default !important;
        }
--- a/apps/common/main/lib/component/Button.js
+++ b/apps/common/main/lib/component/Button.js
@ -351,22 +351,37 @@ define([
        getCaptionWithBreaks: function (caption) {
            var words = caption.split(' '),
                newCaption = null,
-                maxWidth = 85 - 4;
+                maxWidth = 160 - 4, //85 - 4
+                containAnd = words.indexOf('&');
+            if (containAnd > -1) { // add & to previous word
+                words[containAnd - 1] += ' &';
+                words.splice(containAnd, 1);
+            }
            if (words.length > 1) {
                maxWidth = !!this.menu || this.split === true ? maxWidth - 10 : maxWidth;
                if (words.length < 3) {
+                    words[0] = getShortText(words[0], !!this.menu ? maxWidth + 10 : maxWidth);
                    words[1] = getShortText(words[1], maxWidth);
                    newCaption = words[0] + '<br>' + words[1];
                } else {
+                    var otherWords = '';
                    if (getWidthOfCaption(words[0] + ' ' + words[1]) < maxWidth) { // first and second words in first line
-                        words[2] = getShortText(words[2], maxWidth);
-                        newCaption = words[0] + ' ' + words[1] + '<br>' + words[2];
-                    } else if (getWidthOfCaption(words[1] + ' ' + words[2]) < maxWidth) { // second and third words in second line
-                        words[2] = getShortText(words[2], maxWidth);
-                        newCaption = words[0] + '<br>' + words[1] + ' ' + words[2];
-                    } else {
-                        words[1] = getShortText(words[1] + ' ' + words[2], maxWidth);
-                        newCaption = words[0] + '<br>' + words[1];
+                        for (var i = 2; i < words.length; i++) {
+                            otherWords += words[i] + ' ';
+                        }
+                        if (getWidthOfCaption(otherWords + (!!this.menu ? 10 : 0))*2 < getWidthOfCaption(words[0] + ' ' + words[1])) {
+                            otherWords = getShortText((words[1] + ' ' + otherWords).trim(), maxWidth);
+                            newCaption = words[0] + '<br>' + otherWords;
+                        } else {
+                            otherWords = getShortText(otherWords.trim(), maxWidth);
+                            newCaption = words[0] + ' ' + words[1] + '<br>' + otherWords;
+                        }
+                    } else { // only first word is in first line
+                        for (var j = 1; j < words.length; j++) {
+                            otherWords += words[j] + ' ';
+                        }
+                        otherWords = getShortText(otherWords.trim(), maxWidth);
+                        newCaption = words[0] + '<br>' + otherWords;
                    }
                }
            } else {
--- a/apps/common/main/lib/component/ComboDataView.js
+++ b/apps/common/main/lib/component/ComboDataView.js
@ -56,6 +56,7 @@ define([
            itemWidth           : 80,
            itemHeight          : 40,
            menuMaxHeight       : 300,
+            autoWidth           : false,
            enableKeyEvents     : false,
            beforeOpenHandler   : null,
            additionalMenuItems  : null,
@ -87,11 +88,13 @@ define([
            this.menuMaxHeight = this.options.menuMaxHeight;
            this.beforeOpenHandler = this.options.beforeOpenHandler;
            this.showLast    = this.options.showLast;
+            this.wrapWidth   = 0;
            this.rootWidth   = 0;
            this.rootHeight  = 0;
            this.rendered    = false;
            this.needFillComboView = false;
-            this.minWidth = this.options.minWidth;
+            this.minWidth    = this.options.minWidth;
+            this.autoWidth   = this.initAutoWidth = (Common.Utils.isIE10 || Common.Utils.isIE11) ? false : this.options.autoWidth;
            this.delayRenderTips = this.options.delayRenderTips || false;
            this.itemTemplate   = this.options.itemTemplate || _.template([
                '<div class="style" id="<%= id %>">',
@ -208,10 +211,12 @@ define([
                me.fieldPicker.el.addEventListener('contextmenu', _.bind(me.onPickerComboContextMenu, me), false);
                me.menuPicker.el.addEventListener('contextmenu', _.bind(me.onPickerComboContextMenu, me), false);

+                Common.NotificationCenter.on('more:toggle', _.bind(this.onMoreToggle, this));
+
                me.onResize();

                me.rendered = true;
-
+                
                me.trigger('render:after', me);
            }
            if (this.disabled) {
@ -221,8 +226,26 @@ define([
            return this;
        },

+        onMoreToggle: function(btn, state) {
+            if(state) {
+                this.checkSize();
+            }
+        },
+
        checkSize: function() {
            if (this.cmpEl && this.cmpEl.is(':visible')) {
+                if(this.autoWidth && this.menuPicker.store.length > 0) {
+                    var wrapWidth = this.$el.width();
+                    if(wrapWidth != this.wrapWidth || this.needFillComboView){
+                        this.wrapWidth = wrapWidth;
+                        this.autoChangeWidth();
+
+                        var picker = this.menuPicker;
+                        var record = picker.getSelectedRec();
+                        this.fillComboView(record || picker.store.at(0), !!record, true);                   
+                    }
+                }
+                
                var me = this,
                    width  = this.cmpEl.width(),
                    height = this.cmpEl.height();
@ -265,7 +288,46 @@ define([
            if (!this.isSuspendEvents)
                this.trigger('resize', this);
        },
+    
+        autoChangeWidth: function() {
+            if(this.menuPicker.dataViewItems[0]){
+                var wrapEl = this.$el;
+                var wrapWidth = wrapEl.width();

+                var itemEl = this.menuPicker.dataViewItems[0].$el;
+                var itemWidth = this.itemWidth + parseFloat(itemEl.css('padding-left')) + parseFloat(itemEl.css('padding-right')) + 2 * parseFloat(itemEl.css('border-width'));
+                var itemMargins = parseFloat(itemEl.css('margin-left')) + parseFloat(itemEl.css('margin-right'));
+
+                var fieldPickerEl = this.fieldPicker.$el;
+                var fieldPickerPadding = parseFloat(fieldPickerEl.css('padding-right'));
+                var fieldPickerBorder = parseFloat(fieldPickerEl.css('border-width'));
+                var dataviewPaddings = parseFloat(this.fieldPicker.$el.find('.dataview').css('padding-left')) + parseFloat(this.fieldPicker.$el.find('.dataview').css('padding-right'));
+
+                var cmbDataViewEl = this.cmpEl;
+                var cmbDataViewPaddings = parseFloat(cmbDataViewEl.css('padding-left')) + parseFloat(cmbDataViewEl.css('padding-right'));
+
+                var itemsCount =  Math.floor((wrapWidth - fieldPickerPadding - dataviewPaddings - 2 * fieldPickerBorder - cmbDataViewPaddings) / (itemWidth + itemMargins));
+                if(itemsCount > this.store.length) 
+                    itemsCount = this.store.length;
+
+                var widthCalc = Math.ceil((itemsCount * (itemWidth + itemMargins) + fieldPickerPadding + dataviewPaddings + 2 * fieldPickerBorder + cmbDataViewPaddings) * 10) / 10;
+                
+                var maxWidth = parseFloat(cmbDataViewEl.css('max-width'));
+                if(widthCalc > maxWidth)
+                    widthCalc = maxWidth;
+                    
+                cmbDataViewEl.css('width', widthCalc);
+
+                if(this.initAutoWidth) {
+                    this.initAutoWidth = false;
+                    cmbDataViewEl.css('position', 'absolute');
+                    cmbDataViewEl.css('top', '50%');
+                    cmbDataViewEl.css('bottom', '50%');
+                    cmbDataViewEl.css('margin', 'auto 0');
+                }
+            }
+        },
+        
        onBeforeShowMenu: function(e) {
            var me = this;

--- a/apps/common/main/lib/component/DataView.js
+++ b/apps/common/main/lib/component/DataView.js
@ -328,6 +328,7 @@ define([
                if (this.listenStoreEvents) {
                    this.listenTo(this.store, 'add',    this.onAddItem);
                    this.listenTo(this.store, 'reset',  this.onResetItems);
+                    this.groups && this.listenTo(this.groups, 'add',  this.onAddGroup);
                }
                this.onResetItems();

@ -510,6 +511,35 @@ define([
            }
        },

+        onAddGroup: function(group) {
+            var el = $(_.template([
+                '<% if (group.headername !== undefined) { %>',
+                '<div class="header-name"><%= group.headername %></div>',
+                '<% } %>',
+                '<div class="grouped-data <% if (group.inline) { %> group.inline <% } %> <% if (!_.isEmpty(group.caption)) { %> margin <% } %>" id="<%= group.id %>">',
+                '<% if (!_.isEmpty(group.caption)) { %>',
+                    '<div class="group-description">',
+                        '<span><%= group.caption %></span>',
+                    '</div>',
+                '<% } %>',
+                    '<div class="group-items-container">',
+                    '</div>',
+                '</div>'
+            ].join(''))({
+                group: group.toJSON()
+            }));
+            var innerEl = $(this.el).find('.inner').addBack().filter('.inner');
+            if (innerEl) {
+                var idx = _.indexOf(this.groups.models, group);
+                var innerDivs = innerEl.find('.grouped-data');
+                if (idx > 0)
+                    $(innerDivs.get(idx - 1)).after(el);
+                else {
+                    (innerDivs.length > 0) ? $(innerDivs[idx]).before(el) : innerEl.append(el);
+                }
+            }
+        },
+
        onResetItems: function() {
            _.each(this.dataViewItems, function(item) {
                var tip = item.$el.data('bs.tooltip');
--- a/apps/common/main/lib/component/Mixtbar.js
+++ b/apps/common/main/lib/component/Mixtbar.js
@ -793,7 +793,7 @@ define([

            hideMoreBtns: function() {
                for (var btn in btnsMore) {
-                    btnsMore[btn] && btnsMore[btn].toggle(false);
+                    btnsMore[btn] && btnsMore[btn].isActive() && btnsMore[btn].toggle(false);
                }
            }
        };
--- a/apps/common/main/lib/controller/Desktop.js
+++ b/apps/common/main/lib/controller/Desktop.js
@ -90,11 +90,8 @@ define([
                            $('.asc-window.modal').css('top', obj.skiptoparea);

                        Common.Utils.InternalSettings.set('window-inactive-area-top', obj.skiptoparea);
-                    } else
-                    if ( obj.lockthemes != undefined ) {
-                        // TODO: remove after 7.0.2. depricated. used is_win_xp variable instead
-                        // Common.UI.Themes.setAvailable(!obj.lockthemes);
                    }
+
                    if ( obj.singlewindow !== undefined ) {
                        $('#box-document-title .hedset')[obj.singlewindow ? 'hide' : 'show']();
                        native.features.singlewindow = obj.singlewindow;
--- a/apps/common/main/lib/controller/HintManager.js
+++ b/apps/common/main/lib/controller/HintManager.js
@ -457,6 +457,8 @@ Common.UI.HintManager = new(function() {
    };

    var _init = function(api) {
+        if (Common.Utils.isIE)
+            return;
        _api = api;

        var filter = Common.localStorage.getKeysFilter();
@ -661,6 +663,8 @@ Common.UI.HintManager = new(function() {
    };

    var _clearHints = function (isComplete) {
+        if (Common.Utils.isIE)
+            return;
        _hintVisible && _hideHints();
        if (_currentHints.length > 0) {
            _resetToDefault();
@ -675,7 +679,9 @@ Common.UI.HintManager = new(function() {
            $('.hint-div').remove();
        }
        if ($('iframe').length > 0) {
-            $('iframe').contents().find('.hint-div').remove();
+            try {
+                $('iframe').contents().find('.hint-div').remove();
+            } catch (e) {}
        }
    };

--- a/apps/common/main/lib/controller/ReviewChanges.js
+++ b/apps/common/main/lib/controller/ReviewChanges.js
@ -550,7 +550,7 @@ define([
                    if (item.value === 'all') {
                        this.api.asc_AcceptAllChanges();
                    } else {
-                        this.api.asc_AcceptChanges();
+                        this.api.asc_AcceptChangesBySelection(true); // accept and move to the next change
                    }
                } else {
                    this.api.asc_AcceptChanges(menu);
@ -565,7 +565,7 @@ define([
                    if (item.value === 'all') {
                        this.api.asc_RejectAllChanges();
                    } else {
-                        this.api.asc_RejectChanges();
+                        this.api.asc_RejectChangesBySelection(true); // reject and move to the next change
                    }
                } else {
                    this.api.asc_RejectChanges(menu);
--- a/apps/common/main/lib/util/htmlutils.js
+++ b/apps/common/main/lib/util/htmlutils.js
@ -88,9 +88,11 @@ if ( !!params.uitheme && checkLocalStorage && !localStorage.getItem("ui-theme-id
 }

 var ui_theme_name = checkLocalStorage && localStorage.getItem("ui-theme-id") ? localStorage.getItem("ui-theme-id") : params.uitheme;
+var ui_theme_type;
 if ( !ui_theme_name ) {
    if ( window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ) {
        ui_theme_name = 'theme-dark';
+        ui_theme_type = 'dark';
        checkLocalStorage && localStorage.removeItem("ui-theme");
    }
 }
@ -100,7 +102,7 @@ if ( !!ui_theme_name ) {

 if ( checkLocalStorage ) {
    let current_theme = localStorage.getItem("ui-theme");
-    if ( !!current_theme && /type":\s*"dark/.test(current_theme) ) {
+    if ( !!current_theme && /type":\s*"dark/.test(current_theme) || ui_theme_type == 'dark' ) {
        document.body.classList.add("theme-type-dark");

        let content_theme = localStorage.getItem("content-theme");
--- a/apps/common/main/lib/view/ExternalOleEditor.js
+++ b/apps/common/main/lib/view/ExternalOleEditor.js
@ -51,7 +51,7 @@ define([
                sdkplaceholder: 'id-ole-editor-placeholder',
                initwidth: 900,
                initheight: 700,
-                minwidth: 840,
+                minwidth: 860,
                minheight: 275
            }, options);

--- a/apps/common/main/lib/view/Header.js
+++ b/apps/common/main/lib/view/Header.js
@ -543,7 +543,7 @@ define([
                    if ( !$labelDocName ) {
                        $labelDocName = $html.find('#rib-doc-name');
                        if ( me.documentCaption ) {
-                            me.setDocTitle(me.documentCaption);
+                            setTimeout(function() { me.setDocTitle(me.documentCaption); }, 50);
                        }
                    } else {
                        $html.find('#rib-doc-name').hide();
@ -621,7 +621,7 @@ define([

                    !!$labelDocName && $labelDocName.hide().off();                  // hide document title if it was created in right box
                    $labelDocName = $html.find('#title-doc-name');
-                    me.setDocTitle( me.documentCaption );
+                    setTimeout(function() { me.setDocTitle(me.documentCaption); }, 50);

                    me.options.wopi && $labelDocName.attr('maxlength', me.options.wopi.FileNameMaxLength);

@ -791,12 +791,9 @@ define([
            },

            setDocTitle: function(name){
-                if(name)
-                    $labelDocName.val(name);
-                else
-                    name = $labelDocName.val();
-                var width = this.getTextWidth(name);
+                var width = this.getTextWidth(name || $labelDocName.val());
                (width>=0) && $labelDocName.width(width);
+                name && (width>=0) && $labelDocName.val(name);
                if (this._showImgCrypted && width>=0) {
                    this.imgCrypted.toggleClass('hidden', false);
                    this._showImgCrypted = false;
--- a/apps/common/main/lib/view/ListSettingsDialog.js
+++ b/apps/common/main/lib/view/ListSettingsDialog.js
@ -60,7 +60,7 @@ define([
    Common.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({
        options: {
            type: 0, // 0 - markers, 1 - numbers
-            width: 280,
+            width: 285,
            height: 261,
            style: 'min-width: 240px;',
            cls: 'modal-dlg',
@ -87,9 +87,9 @@ define([
                                '<td style="padding-right: 5px;padding-bottom: 8px;min-width: 50px;">',
                                    '<label class="text">' + this.txtType + '</label>',
                                '</td>',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 100px;">',
-                                    '<div id="id-dlg-list-numbering-format" class="input-group-nr" style="width: 100px;"></div>',
-                                    '<div id="id-dlg-list-bullet-format" class="input-group-nr" style="width: 100px;"></div>',
+                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 105px;">',
+                                    '<div id="id-dlg-list-numbering-format" class="input-group-nr" style="width: 105px;"></div>',
+                                    '<div id="id-dlg-list-bullet-format" class="input-group-nr" style="width: 105px;"></div>',
                                '</td>',
                                '<td style="padding-bottom: 8px;"></td>',
                            '</tr>',
@ -97,8 +97,8 @@ define([
                                '<td style="padding-right: 5px;padding-bottom: 8px;min-width: 50px;">',
                                    '<label class="text">' + this.txtImport + '</label>',
                                '</td>',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 100px;">',
-                                    '<div id="id-dlg-list-image" style="width: 100px;"></div>',
+                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 105px;">',
+                                    '<div id="id-dlg-list-image" style="width: 105px;"></div>',
                                '</td>',
                                '<td style="padding-bottom: 8px;"></td>',
                            '</tr>',
@ -106,7 +106,7 @@ define([
                                '<td style="padding-right: 5px;padding-bottom: 8px;min-width: 50px;">',
                                    '<label class="text">' + this.txtSize + '</label>',
                                '</td>',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 100px;">',
+                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 105px;">',
                                    '<div id="id-dlg-list-size"></div>',
                                '</td>',
                                '<td style="padding-bottom: 8px;">',
@ -117,7 +117,7 @@ define([
                                '<td style="padding-right: 5px;padding-bottom: 8px;min-width: 50px;">',
                                    '<label class="text" style="white-space: nowrap;">' + this.txtStart + '</label>',
                                '</td>',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 100px;">',
+                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 105px;">',
                                    '<div id="id-dlg-list-start"></div>',
                                '</td>',
                                '<td style="padding-bottom: 8px;"></td>',
@ -126,7 +126,7 @@ define([
                                '<td style="padding-right: 5px;padding-bottom: 8px;min-width: 50px;">',
                                    '<label class="text">' + this.txtColor + '</label>',
                                '</td>',
-                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 100px;">',
+                                '<td style="padding-right: 5px;padding-bottom: 8px;width: 105px;">',
                                    '<div id="id-dlg-list-color"></div>',
                                '</td>',
                                '<td style="padding-bottom: 8px;"></td>',
@ -215,7 +215,7 @@ define([
            this.cmbBulletFormat = new Common.UI.ComboBoxCustom({
                el          : $('#id-dlg-list-bullet-format'),
                menuStyle   : 'min-width: 100%;max-height: 183px;',
-                style       : "width: 100px;",
+                style       : "width: 105px;",
                editable    : false,
                takeFocusOnClose: true,
                template    : _.template(template.join('')),
@ -239,7 +239,7 @@ define([
                        if (record.get('value')===_BulletTypes.symbol)
                            formcontrol[0].innerHTML = record.get('displayValue') + '<span style="font-family:' + (record.get('font') || 'Arial') + '">' + record.get('symbol') + '</span>';
                        else if (record.get('value')===_BulletTypes.image) {
-                            formcontrol[0].innerHTML = record.get('displayValue') + '<span id="id-dlg-list-bullet-combo-preview" style="width:12px; height: 12px; margin-left: 4px; margin-bottom: 1px;display: inline-block; vertical-align: middle;"></span>';
+                            formcontrol[0].innerHTML = record.get('displayValue') + '<span id="id-dlg-list-bullet-combo-preview" style="width:12px; height: 12px; margin-left: 2px; margin-bottom: 1px;display: inline-block; vertical-align: middle;"></span>';
                            var bullet = new Asc.asc_CBullet();
                            bullet.asc_fillBulletImage(me.imageProps.id);
                            bullet.drawSquareImage('id-dlg-list-bullet-combo-preview');
@ -278,6 +278,9 @@ define([
                                    idx = store.indexOf(store.findWhere({value: _BulletTypes.newSymbol}));
                                store.add({ displayValue: me.txtSymbol + ': ', value: _BulletTypes.symbol, symbol: props.symbol, font: props.font }, {at: idx});
                            }
+                            if (me.imageProps)
+                                me.imageProps.redraw = true;
+
                            combo.setData(store.models);
                            combo.selectRecord(combo.store.findWhere({value: _BulletTypes.symbol, symbol: props.symbol, font: props.font}));
                        },
@ -316,7 +319,7 @@ define([
            this.spnSize = new Common.UI.MetricSpinner({
                el          : $window.find('#id-dlg-list-size'),
                step        : 1,
-                width       : 100,
+                width       : 105,
                value       : 100,
                defaultUnit : '',
                maxValue    : 400,
@ -342,7 +345,7 @@ define([
            this.spnStart = new Common.UI.MetricSpinner({
                el          : $window.find('#id-dlg-list-start'),
                step        : 1,
-                width       : 100,
+                width       : 105,
                value       : 1,
                defaultUnit : '',
                maxValue    : 32767,
@ -360,7 +363,7 @@ define([
                caption: this.textSelect,
                style: 'width: 100%;',
                menu: new Common.UI.Menu({
-                    style: 'min-width: 100px;',
+                    style: 'min-width: 105px;',
                    maxHeight: 200,
                    additionalAlign: this.menuAddAlign,
                    items: [
--- a/apps/common/main/resources/img/toolbar/1.25x/btn-rotate-down.png
+++ b/apps/common/main/resources/img/toolbar/1.25x/btn-rotate-down.png
--- a/apps/common/main/resources/img/toolbar/1.25x/btn-rotate-up.png
+++ b/apps/common/main/resources/img/toolbar/1.25x/btn-rotate-up.png
--- a/apps/common/main/resources/img/toolbar/1.25x/btn-rotate-y-clockwise.png
+++ b/apps/common/main/resources/img/toolbar/1.25x/btn-rotate-y-clockwise.png
--- a/apps/common/main/resources/img/toolbar/1.25x/btn-rotate-y-counterclockwise.png
+++ b/apps/common/main/resources/img/toolbar/1.25x/btn-rotate-y-counterclockwise.png
--- a/apps/common/main/resources/img/toolbar/1.5x/btn-rotate-down.png
+++ b/apps/common/main/resources/img/toolbar/1.5x/btn-rotate-down.png
--- a/apps/common/main/resources/img/toolbar/1.5x/btn-rotate-up.png
+++ b/apps/common/main/resources/img/toolbar/1.5x/btn-rotate-up.png
--- a/apps/common/main/resources/img/toolbar/1.5x/btn-rotate-y-clockwise.png
+++ b/apps/common/main/resources/img/toolbar/1.5x/btn-rotate-y-clockwise.png
--- a/apps/common/main/resources/img/toolbar/1.5x/btn-rotate-y-counterclockwise.png
+++ b/apps/common/main/resources/img/toolbar/1.5x/btn-rotate-y-counterclockwise.png
--- a/apps/common/main/resources/img/toolbar/1.75x/btn-rotate-down.png
+++ b/apps/common/main/resources/img/toolbar/1.75x/btn-rotate-down.png
--- a/apps/common/main/resources/img/toolbar/1.75x/btn-rotate-up.png
+++ b/apps/common/main/resources/img/toolbar/1.75x/btn-rotate-up.png
--- a/apps/common/main/resources/img/toolbar/1.75x/btn-rotate-y-clockwise.png
+++ b/apps/common/main/resources/img/toolbar/1.75x/btn-rotate-y-clockwise.png
--- a/apps/common/main/resources/img/toolbar/1.75x/btn-rotate-y-counterclockwise.png
+++ b/apps/common/main/resources/img/toolbar/1.75x/btn-rotate-y-counterclockwise.png
--- a/apps/common/main/resources/img/toolbar/1x/btn-mode-dark.png
+++ b/apps/common/main/resources/img/toolbar/1x/btn-mode-dark.png
--- a/apps/common/main/resources/img/toolbar/1x/btn-mode-light.png
+++ b/apps/common/main/resources/img/toolbar/1x/btn-mode-light.png
--- a/apps/common/main/resources/img/toolbar/1x/btn-rotate-down.png
+++ b/apps/common/main/resources/img/toolbar/1x/btn-rotate-down.png
--- a/apps/common/main/resources/img/toolbar/1x/btn-rotate-up.png
+++ b/apps/common/main/resources/img/toolbar/1x/btn-rotate-up.png
--- a/apps/common/main/resources/img/toolbar/1x/btn-rotate-y-clockwise.png
+++ b/apps/common/main/resources/img/toolbar/1x/btn-rotate-y-clockwise.png
--- a/apps/common/main/resources/img/toolbar/1x/btn-rotate-y-counterclockwise.png
+++ b/apps/common/main/resources/img/toolbar/1x/btn-rotate-y-counterclockwise.png
--- a/apps/common/main/resources/img/toolbar/1x/huge/.css.handlebars
+++ b/apps/common/main/resources/img/toolbar/1x/huge/.css.handlebars
@ -1,15 +1,14 @@
 {{#spritesheet}}
 .btn {
    .options__icon.options__icon-huge {
-        background-position-x: -40px;
+        background-position-x: 0;
        background-position-x: var(--button-huge-normal-icon-offset-x,0);
    }

    &.active, &:active {
        &:not(:disabled):not(.disabled) {
            .options__icon.options__icon-huge {
-                @btn-active-icon-offset: -40px;
-                background-position-x: @btn-active-icon-offset;
+                background-position-x: 0;
                background-position-x: var(--button-huge-active-icon-offset-x,0);
            }
        }
--- a/apps/common/main/resources/img/toolbar/2x/btn-rotate-down.png
+++ b/apps/common/main/resources/img/toolbar/2x/btn-rotate-down.png
--- a/apps/common/main/resources/img/toolbar/2x/btn-rotate-up.png
+++ b/apps/common/main/resources/img/toolbar/2x/btn-rotate-up.png
--- a/apps/common/main/resources/img/toolbar/2x/btn-rotate-y-clockwise.png
+++ b/apps/common/main/resources/img/toolbar/2x/btn-rotate-y-clockwise.png
--- a/apps/common/main/resources/img/toolbar/2x/btn-rotate-y-counterclockwise.png
+++ b/apps/common/main/resources/img/toolbar/2x/btn-rotate-y-counterclockwise.png
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@ -39,6 +39,7 @@
    }

    &[disabled], &.disabled {
+        opacity: @component-disabled-opacity-ie;
        opacity: @component-disabled-opacity;
    }
    
@ -245,7 +246,7 @@
            height: 24px;

            .caption {
-                max-width: 85px;
+                max-width: 160px;//85px;
                max-height: 24px;
                text-overflow: ellipsis;

@ -511,6 +512,7 @@
    &[disabled],
    &.disabled {
        //color: #000;  btn-category has no text
+        opacity: @component-disabled-opacity-ie;
        opacity: @component-disabled-opacity;
    }
 }
@ -581,6 +583,7 @@
                    }
                    &[disabled],
                    &.disabled {
+                        opacity: @component-disabled-opacity-ie;
                        opacity: @component-disabled-opacity;
                    }
                }
@ -598,6 +601,7 @@
        .dropdown-menu {
            &.scale-menu {
                li.disabled {
+                    opacity: @component-disabled-opacity-ie;
                    opacity: @component-disabled-opacity;
                }
            }
@ -693,6 +697,7 @@

    &[disabled],
    &.disabled {
+        opacity: @component-disabled-opacity-ie;
        opacity: @component-disabled-opacity;
    }

@ -829,6 +834,7 @@

    &[disabled],
    &.disabled {
+        opacity: @component-disabled-opacity-ie;
        opacity: @component-disabled-opacity;
    }
 }
@ -868,6 +874,7 @@

    &[disabled],
    &.disabled {
+        opacity: @component-disabled-opacity-ie;
        opacity: @component-disabled-opacity;
    }
 }
@ -911,6 +918,7 @@

    &[disabled],
    &.disabled {
+        opacity: @component-disabled-opacity-ie;
        opacity: @component-disabled-opacity;
    }
 }
@ -951,6 +959,7 @@

    &[disabled],
    &.disabled {
+        opacity: @component-disabled-opacity-ie;
        opacity: @component-disabled-opacity;
    }
 }
@ -1039,6 +1048,7 @@

    &[disabled],
    &.disabled {
+        opacity: @component-disabled-opacity-ie;
        opacity: @component-disabled-opacity;
    }

@ -1089,6 +1099,7 @@
    }

    &[disabled] {
+        opacity: @component-disabled-opacity-ie;
        opacity: @component-disabled-opacity;
    }

--- a/apps/common/main/resources/less/combo-dataview.less
+++ b/apps/common/main/resources/less/combo-dataview.less
@ -81,17 +81,17 @@
 }


-.combo-styles {
+.combo-styles(@combo-dataview-height: 46px, @item-height: 46px, @row-count: 1) {
    @combo-dataview-button-width: 30px;
-    @combo-dataview-height: 46px;
-    @combo-dataview-height-calc: calc(40px + 2 * @scaled-two-px-value + 2 * @scaled-one-px-value);
-
+    @item-height-calc: calc(@item-height - 6px + 2 * @scaled-two-px-value + 2 * @scaled-one-px-value);
+    @combo-dataview-height-calc: calc(@combo-dataview-height - ((@row-count - 1) * @scaled-one-px-value) - @row-count * (6px - 2 * @scaled-two-px-value - 2 * @scaled-one-px-value));
+    
    height: @combo-dataview-height;
    height: @combo-dataview-height-calc;

    .view {
        margin-right: -@combo-dataview-button-width;
-        padding-right: @combo-dataview-button-width;
+        padding-right: calc(@combo-dataview-button-width - @scaled-two-px-value);

        .border-left-radius(0);

@ -116,8 +116,8 @@
        @minus-px: calc((-1px / @pixel-ratio-factor));
        margin: 0 @minus-px-ie @minus-px-ie 0;
        margin: 0 @minus-px @minus-px 0;
-        height: @combo-dataview-height;
-        height: @combo-dataview-height-calc;
+        height: @item-height;
+        height: @item-height-calc;
        background-color: @background-normal-ie;
        background-color: @background-normal;
        display: flex;
@ -216,6 +216,14 @@
    }
 }

+.combo-styles {
+    .combo-styles()
+}
+
+.combo-cell-styles {
+    .combo-styles(52px, 26px, 2);
+}
+
 .combo-template(@combo-dataview-height: 64px) {
    @combo-dataview-button-width: 18px;

@ -344,17 +352,42 @@
    .combo-template(60px);

    top: -4px;
-    padding-right: 12px;
    position: absolute;
+    padding-right: 12px;

    .more-container & {
-        padding-right: 0;
        position: static;
    }

    .view .dataview, .dropdown-menu {
        padding: 1px;
    }
+
+    .dataview {
+        .item {
+            &:hover {
+                .box-shadow(0 0 0 2px @border-preview-hover-ie) !important;
+                .box-shadow(0 0 0 @scaled-two-px-value @border-preview-hover) !important;
+            }
+      
+            &.selected {
+                .box-shadow(0 0 0 2px @border-preview-select-ie) !important;
+                .box-shadow(0 0 0 @scaled-two-px-value @border-preview-select) !important;
+            }
+        }
+    }
+
+    .dropdown-menu {
+        padding: 5px 1px 5px 1px;
+
+        .dataview {
+            .group-description {
+                padding: 3px 0 3px 10px;
+                .font-weight-bold();
+            } 
+        }
+    }
+
 }

 .combo-slicer-style {
@ -372,7 +405,7 @@

    .view {
        margin-right: -@combo-dataview-button-width;
-        padding-right: @combo-dataview-button-width;
+        padding-right: calc(@combo-dataview-button-width - @scaled-one-px-value);
    }

    .view .dataview, .dropdown-menu {
--- a/apps/common/main/resources/less/comments.less
+++ b/apps/common/main/resources/less/comments.less
@ -364,6 +364,7 @@
            }

            &.disabled {
+                opacity: @component-disabled-opacity-ie;
                opacity: @component-disabled-opacity;
                cursor: default;
            }
--- a/apps/common/main/resources/less/common.less
+++ b/apps/common/main/resources/less/common.less
@ -23,6 +23,12 @@ label {
        opacity: @component-disabled-opacity-ie;
        opacity: @component-disabled-opacity;
    }
+
+    &.fixed {
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+    }
 }

 .menu-shapes {
@ -211,6 +217,7 @@ label {
        height: 100%;

        &.disabled {
+            opacity: @component-disabled-opacity-ie;
            opacity: @component-disabled-opacity;
            cursor: default !important;
        }
--- a/apps/common/main/resources/less/dataview.less
+++ b/apps/common/main/resources/less/dataview.less
@ -62,6 +62,7 @@
                }

                &.disabled {
+                    opacity: @component-disabled-opacity-ie;
                    opacity: @component-disabled-opacity;
                }

--- a/apps/common/main/resources/less/dropdown-menu.less
+++ b/apps/common/main/resources/less/dropdown-menu.less
@ -119,6 +119,7 @@
            color: @text-normal-ie;
            color: @text-normal;

+            opacity: @component-disabled-opacity-ie;
            opacity: @component-disabled-opacity;

            &:hover, &:focus {
--- a/apps/common/main/resources/less/header.less
+++ b/apps/common/main/resources/less/header.less
@ -236,6 +236,7 @@

    .btn&[disabled],
    &.disabled {
+        opacity: @component-disabled-opacity-ie;
        opacity: @component-disabled-opacity;
    }

@ -289,6 +290,7 @@
        width: 16px;
        text-align: center;
        overflow: hidden;
+        pointer-events: none;
    }

    &:not(:disabled) {
@ -310,6 +312,7 @@
    }

    &.disabled {
+        opacity: @component-disabled-opacity-ie;
        opacity: @component-disabled-opacity;
        pointer-events: none;
    }
--- a/apps/common/main/resources/less/input.less
+++ b/apps/common/main/resources/less/input.less
@ -96,6 +96,7 @@ input.error {
 }

 .disabled .form-control {
+    opacity: @component-disabled-opacity-ie;
    opacity: @component-disabled-opacity;
    cursor: default !important;
 }
--- a/apps/common/main/resources/less/listview.less
+++ b/apps/common/main/resources/less/listview.less
@ -76,6 +76,7 @@
  &.disabled {
    > .item {
      cursor: default;
+      opacity: @component-disabled-opacity-ie;
      opacity: @component-disabled-opacity;
    }
  }
--- a/apps/common/main/resources/less/plugins.less
+++ b/apps/common/main/resources/less/plugins.less
@ -132,7 +132,7 @@
    .x-huge.icon-top {
        .caption {
            text-overflow: ellipsis;
-            max-width: 85px;
+            max-width: 160px;
        }
    }

--- a/apps/common/main/resources/less/slider.less
+++ b/apps/common/main/resources/less/slider.less
@ -81,6 +81,7 @@
    }

    &.disabled {
+        opacity: @component-disabled-opacity-ie;
        opacity: @component-disabled-opacity;
    }
 }
--- a/apps/common/main/resources/less/spinner.less
+++ b/apps/common/main/resources/less/spinner.less
@ -59,6 +59,7 @@

        button {
            &.disabled {
+                opacity: @component-disabled-opacity-ie;
                opacity: @component-disabled-opacity;
            }

--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@ -36,7 +36,6 @@

        display: flex;
        align-items: stretch;
-        border-bottom: @border-toolbar-active-panel-top 1px solid;

        .extra {
            background-color: @header-background-color-ie;
@ -59,7 +58,7 @@
        background-color: @header-background-color-ie;
        background-color: @header-background-color;
        position: relative;
-        overflow: visible;
+        overflow: hidden;
        display: flex;
        flex-shrink: 1;

@ -67,7 +66,7 @@
            padding: 4px 0 0;
            margin: 0;
            white-space: nowrap;
-            overflow: visible;
+            overflow: hidden;
            list-style: none;
            font-size: 0;
        }
@ -76,7 +75,6 @@
            display: inline-flex;
            align-items: center;
            height: 100%;
-            border-top: transparent 2px solid;
            &:hover {
                background-color: @highlight-header-button-hover-ie;
                background-color: @highlight-header-button-hover;
@ -85,9 +83,6 @@
            &.active {
                background-color: @background-toolbar-ie;
                background-color: @background-toolbar;
-                border: @border-toolbar-active-panel-top 1px solid;
-                border-bottom: none;
-                height: 28px;
            }


@ -100,15 +95,12 @@
                text-align: center;
                color: @text-toolbar-header-ie;
                color: @text-toolbar-header;
-                position: relative;
-                top: -1px;
            }

            &.active {
                > a {
                    color: @text-normal-ie;
                    color: @text-normal;
-                    padding: 0 11px;
                }
            }
        }
@ -404,10 +396,6 @@
            box-shadow: inset 0 -1px 0 0 @border-regular-control;
        }

-        .box-tabs {
-           border-bottom: none;
-        }
-
        .tabs {
            ul {
                padding: 0;
@ -415,7 +403,6 @@

            li {
                position: relative;
-                border: none;
                &:after {
                    //transition: opacity .1s;
                    //transition: bottom .1s;
@ -430,9 +417,9 @@

                &.active {
                    background-color: transparent;
-                    > a {
-                        padding: 0 12px;
-                    }
+                    //> a {
+                    //    padding: 0 12px;
+                    //}
                    &:after {
                        opacity: 1;
                        bottom: 0;
@ -440,15 +427,19 @@
                }

                &:hover:not(.active) {
-                    //background-color: rgba(0, 0, 0, .05);
-                    background-color: @highlight-button-hover-ie;
-                    background-color: @highlight-button-hover;
+                    background-color: rgba(0, 0, 0, .05);
+
+                    .theme-type-dark & {
+                        background-color: rgba(255, 255, 255, .05);
+                    }
+
+                    //background-color: @highlight-button-hover-ie;
+                    //background-color: @highlight-button-hover;
                }

                > a {
                    color: @text-normal-ie;
                    color: @text-normal;
-                    top: 0;
                    &::after {
                        display:block;
                        content:attr(data-title);
@ -575,8 +566,8 @@
            color: @text-normal-ie;
            color: @text-normal;
            &:hover:not(:disabled),&:focus {
-                box-shadow: 0 0 0 @scaled-one-px-value-ie @highlight-header-button-hover-ie;
-                box-shadow: 0 0 0 @scaled-one-px-value @highlight-header-button-hover;
+                box-shadow: 0 0 0 @scaled-one-px-value-ie @highlight-button-hover-ie;
+                box-shadow: 0 0 0 @scaled-one-px-value @highlight-button-hover;
            }
        }

--- a/apps/common/main/resources/less/window.less
+++ b/apps/common/main/resources/less/window.less
@ -139,6 +139,7 @@
            }

            &.disabled {
+                opacity: @component-disabled-opacity-ie;
                opacity: @component-disabled-opacity;
                cursor: default;
            }
--- a/apps/common/mobile/lib/component/ThemeColorPalette.jsx
+++ b/apps/common/mobile/lib/component/ThemeColorPalette.jsx
@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
 const ThemeColors = ({ themeColors, onColorClick, curColor, isTypeColors, isTypeCustomColors }) => {
    return (
        <div className='palette'>
-            {themeColors.map((row, rowIndex) => {
+            {themeColors?.length && themeColors.map((row, rowIndex) => {
                return(
                    <div key={`tc-row-${rowIndex}`} className='row'>
                        {row.map((effect, index) => {
@ -27,7 +27,7 @@ const ThemeColors = ({ themeColors, onColorClick, curColor, isTypeColors, isType
 const StandartColors = ({ options, standartColors, onColorClick, curColor }) => {
    return (
        <div className='palette'>
-            {standartColors.map((color, index) => {
+            {standartColors?.length && standartColors.map((color, index) => {
                return(
                    index === 0 && options.transparent ?
                        <a key={`sc-${index}`}
@ -48,6 +48,7 @@ const StandartColors = ({ options, standartColors, onColorClick, curColor }) =>
 const CustomColors = ({ options, customColors, isTypeColors, onColorClick, curColor }) => {
    const colors = customColors.length > 0 ? customColors : [];
    const emptyItems = [];
+
    if (colors.length < options.customcolors) {
        for (let i = colors.length; i < options.customcolors; i++) {
            emptyItems.push(<a className='empty-color'
@ -92,17 +93,22 @@ const ThemeColorPalette = props => {
    const themeColors = [];
    const effectColors = Common.Utils.ThemeColor.getEffectColors();
    let row = -1;
-    effectColors.forEach((effect, index) => {
-        if (0 == index % options.themecolors) {
-            themeColors.push([]);
-            row++;
-        }
-        themeColors[row].push(effect);
-    });
+
+    if(effectColors?.length) {
+        effectColors.forEach((effect, index) => {
+            if (0 == index % options.themecolors) {
+                themeColors.push([]);
+                row++;
+            }
+            themeColors[row].push(effect);
+        });
+    }
+
    const standartColors = Common.Utils.ThemeColor.getStandartColors();
-    let isTypeColors = standartColors.some( value => value === curColor );
+    let isTypeColors = standartColors?.length && standartColors.some( value => value === curColor );
    // custom color
    let customColors = props.customColors;
+
    if (customColors.length < 1) {
        customColors = localStorage.getItem('mobile-custom-colors');
        customColors = customColors ? customColors.toLowerCase().split(',') : [];
@ -142,14 +148,18 @@ const CustomColorPicker = props => {
    };

    let currentColor = props.currentColor;
+
    if (props.autoColor) {
        currentColor = rgb2hex(props.autoColor);
    }
+
    if (currentColor === 'transparent' || !currentColor) {
        currentColor = 'ffffff';
    }
+
    const countDynamicColors = props.countdynamiccolors || 10;
    const [stateColor, setColor] = useState(`#${currentColor}`);
+
    useEffect(() => {
        if (document.getElementsByClassName('color-picker-wheel').length < 1) {
            const colorPicker = f7.colorPicker.create({
@ -165,6 +175,7 @@ const CustomColorPicker = props => {
            });
        }
    });
+
    const addNewColor = (color) => {
        let colors = localStorage.getItem('mobile-custom-colors');
        colors = colors ? colors.split(',') : [];
@ -173,7 +184,8 @@ const CustomColorPicker = props => {
        localStorage.setItem('mobile-custom-colors', colors.join().toLowerCase());
        props.onAddNewColor && props.onAddNewColor(colors, newColor);
    };
-    return(
+
+    return (
        <div id='color-picker'>
            <div className='color-picker-container'></div>
            <div className='right-block'>
--- a/apps/common/mobile/lib/controller/Themes.js
+++ b/apps/common/mobile/lib/controller/Themes.js
@ -12,6 +12,51 @@ class ThemesController {
                id: 'theme-light',
                type: 'light'
            }};
+
+        this.name_colors = [
+            "canvas-background",
+            "canvas-content-background",
+            "canvas-page-border",
+
+            "canvas-ruler-background",
+            "canvas-ruler-border",
+            "canvas-ruler-margins-background",
+            "canvas-ruler-mark",
+            "canvas-ruler-handle-border",
+            "canvas-ruler-handle-border-disabled",
+
+            "canvas-high-contrast",
+            "canvas-high-contrast-disabled",
+
+            "canvas-cell-border",
+            "canvas-cell-title-border",
+            "canvas-cell-title-border-hover",
+            "canvas-cell-title-border-selected",
+            "canvas-cell-title-hover",
+            "canvas-cell-title-selected",
+
+            "canvas-dark-cell-title",
+            "canvas-dark-cell-title-hover",
+            "canvas-dark-cell-title-selected",
+            "canvas-dark-cell-title-border",
+            "canvas-dark-cell-title-border-hover",
+            "canvas-dark-cell-title-border-selected",
+            "canvas-dark-content-background",
+            "canvas-dark-page-border",
+
+            "canvas-scroll-thumb",
+            "canvas-scroll-thumb-hover",
+            "canvas-scroll-thumb-pressed",
+            "canvas-scroll-thumb-border",
+            "canvas-scroll-thumb-border-hover",
+            "canvas-scroll-thumb-border-pressed",
+            "canvas-scroll-arrow",
+            "canvas-scroll-arrow-hover",
+            "canvas-scroll-arrow-pressed",
+            "canvas-scroll-thumb-target",
+            "canvas-scroll-thumb-target-hover",
+            "canvas-scroll-thumb-target-pressed",
+        ];
    }

    init() {
@ -41,6 +86,16 @@ class ThemesController {
        return !!obj ? JSON.parse(obj).type === 'dark' : false;
    }

+    get_current_theme_colors(colors) {
+        let out_object = {};
+        const style = getComputedStyle(document.body);
+        colors.forEach((item, index) => {
+            out_object[item] = style.getPropertyValue('--' + item).trim()
+        })
+
+        return out_object;
+    }
+
    switchDarkTheme(dark) {
        const theme = typeof dark == 'object' ? dark : this.themes_map[dark ? 'dark' : 'light'];
        const refresh_only = !!arguments[1];
@ -53,7 +108,11 @@ class ThemesController {
        $body.addClass(`theme-type-${theme.type}`);

        const on_engine_created = api => {
-            api.asc_setSkin(theme.id);
+            let obj = this.get_current_theme_colors(this.name_colors);
+            obj.type = theme.type;
+            obj.name = theme.id;
+
+            api.asc_setSkin(obj);
        };

        const api = Common.EditorApi ? Common.EditorApi.get() : undefined;
--- a/apps/common/mobile/resources/less/colors-table-dark.less
+++ b/apps/common/mobile/resources/less/colors-table-dark.less
@ -33,12 +33,53 @@

        --image-border-types-filter: invert(100%) brightness(4);

-        --canvas-content-background: #fff;
-        
        --active-opacity-word: fade(#446995, 20%);
        --active-opacity-slide: fade(#AA5252, 20%);
        --active-opacity-cell: fade(#40865C, 20%);

        --image-border-types-filter: invert(100%) brightness(4);
+
+        // Canvas
+
+        --canvas-background: #555;
+        --canvas-content-background: #fff;
+        --canvas-page-border: #555;
+
+        --canvas-ruler-background: #555;
+        --canvas-ruler-border: #2A2A2A;
+        --canvas-ruler-margins-background: #444;
+        --canvas-ruler-mark: #b6b6b6;
+        --canvas-ruler-handle-border: #b6b6b6;
+        --canvas-ruler-handle-border-disabled: #808080;
+
+        --canvas-high-contrast: #fff;
+        --canvas-high-contrast-disabled: #ccc;
+
+        --canvas-cell-border: fade(#000, 10%);
+        --canvas-cell-title-border: #757575;
+        --canvas-cell-title-border-hover: #858585;
+        --canvas-cell-title-border-selected: #9e9e9e;
+        --canvas-cell-title-hover: #787878;
+        --canvas-cell-title-selected: #939393;
+
+        --canvas-dark-cell-title: #111;
+        --canvas-dark-cell-title-hover: #000;
+        --canvas-dark-cell-title-selected: #333;
+        --canvas-dark-cell-title-border: #282828;
+        --canvas-dark-cell-title-border-hover: #191919;
+        --canvas-dark-cell-title-border-selected: #474747;
+
+        --canvas-scroll-thumb: #404040;
+        --canvas-scroll-thumb-hover: #999;
+        --canvas-scroll-thumb-pressed: #adadad;
+        --canvas-scroll-thumb-border: #2a2a2a;
+        --canvas-scroll-thumb-border-hover: #999;
+        --canvas-scroll-thumb-border-pressed: #adadad;
+        --canvas-scroll-arrow: #999;
+        --canvas-scroll-arrow-hover: #404040;
+        --canvas-scroll-arrow-pressed: #404040;
+        --canvas-scroll-thumb-target: #999;
+        --canvas-scroll-thumb-target-hover: #404040;
+        --canvas-scroll-thumb-target-pressed: #404040;
    }
 }
--- a/apps/common/mobile/resources/less/colors-table.less
+++ b/apps/common/mobile/resources/less/colors-table.less
@ -29,13 +29,56 @@

    --component-disabled-opacity: .4;

-    --canvas-content-background: #fff;
-
    --active-opacity-word: fade(#446995, 30%);
    --active-opacity-slide: fade(#AA5252, 30%);
    --active-opacity-cell: fade(#40865C, 30%);

    --image-border-types-filter: none;
+
+    // Canvas
+
+    --canvas-background: #eee;
+    --canvas-content-background: #fff;
+    --canvas-page-border: #ccc;
+
+    --canvas-ruler-background: #fff;
+    --canvas-ruler-border: #cbcbcb;
+    --canvas-ruler-margins-background: #d9d9d9;
+    --canvas-ruler-mark: #555;
+    --canvas-ruler-handle-border: #555;
+    --canvas-ruler-handle-border-disabled: #aaa;
+
+    --canvas-high-contrast: #000;
+    --canvas-high-contrast-disabled: #666;
+
+    --canvas-cell-border: fade(#000, 10%);
+    --canvas-cell-title-hover: #dfdfdf;
+    --canvas-cell-title-selected: #cfcfcf;
+    --canvas-cell-title-border: #d8d8d8;
+    --canvas-cell-title-border-hover: #c9c9c9;
+    --canvas-cell-title-border-selected: #bbb;
+
+    --canvas-dark-cell-title: #444;
+    --canvas-dark-cell-title-hover: #666 ;
+    --canvas-dark-cell-title-selected: #111;
+    --canvas-dark-cell-title-border: #3d3d3d;
+    --canvas-dark-cell-title-border-hover: #5c5c5c;
+    --canvas-dark-cell-title-border-selected: #0f0f0f;
+    --canvas-dark-content-background: #3a3a3a;
+    --canvas-dark-page-border: #2a2a2a;
+
+    --canvas-scroll-thumb: #f7f7f7;
+    --canvas-scroll-thumb-hover: #c0c0c0;
+    --canvas-scroll-thumb-pressed: #adadad;
+    --canvas-scroll-thumb-border: #cbcbcb;
+    --canvas-scroll-thumb-border-hover: #cbcbcb;
+    --canvas-scroll-thumb-border-pressed: #adadad;
+    --canvas-scroll-arrow: #adadad;
+    --canvas-scroll-arrow-hover: #f7f7f7;
+    --canvas-scroll-arrow-pressed: #f7f7f7;
+    --canvas-scroll-thumb-target: #c0c0c0;
+    --canvas-scroll-thumb-target-hover: #f7f7f7;
+    --canvas-scroll-thumb-target-pressed: #f7f7f7;
 }

@brand-word: var(--brand-word);
--- a/apps/common/mobile/resources/less/common.less
+++ b/apps/common/mobile/resources/less/common.less
@ -1089,11 +1089,15 @@ input[type="number"]::-webkit-inner-spin-button {
 }

 // Sharing Settings
-
 .sharing-placeholder {
    height: 100%;
 }

+// Comment List
+.sheet-modal .page-current-comment {
+    padding-bottom: 60px;
+}
+



--- a/apps/documenteditor/embed/js/SearchBar.js
+++ b/apps/documenteditor/embed/js/SearchBar.js
@ -109,7 +109,7 @@
        };

        var onInputSearchChange = function (text) {
-            if (_state.searchText !== text) {
+            if ((text && _state.searchText !== text) || (!text && _state.newSearchText)) {
                _state.newSearchText = text;
                _lastInputChange = (new Date());
                if (_searchTimer === undefined) {
@ -117,7 +117,11 @@
                        if ((new Date()) - _lastInputChange < 400) return;

                        _state.searchText = _state.newSearchText;
-                        (_state.newSearchText !== '') && onQuerySearch();
+                        if (_state.newSearchText !== '') {
+                            onQuerySearch();
+                        } else {
+                            api.asc_endFindText();
+                        }
                        clearInterval(_searchTimer);
                        _searchTimer = undefined;
                    }, 10);
--- a/apps/documenteditor/embed/locale/eu.json
+++ b/apps/documenteditor/embed/locale/eu.json
@ -19,7 +19,7 @@
  "DE.ApplicationController.errorLoadingFont": "Letra-tipoak ez dira kargatu.<br>Jarri zure dokumentu-zerbitzariaren administratzailearekin harremanetan.",
  "DE.ApplicationController.errorSubmit": "Huts egin du bidaltzean.",
  "DE.ApplicationController.errorTokenExpire": "Dokumentuaren segurtasun-tokena iraungi da.<br>Jarri zure dokumentu-zerbitzariaren administratzailearekin harremanetan.",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Interneteko konexioa berrezarri da eta fitxategiaren bertsioa aldatu da.<br>Lanean jarraitu aurretik, beharrezkoa da fitxategia deskargatzea edo edukia kopiatzea, ezer ez dela galduko ziurtatzeko, eta gero orri hau berriro kargatzea.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Konexioa berrezarri da eta fitxategiaren bertsioa aldatu da.<br>Lanean jarraitu aurretik, beharrezkoa da fitxategia deskargatzea edo edukia kopiatzea, ezer ez dela galduko ziurtatzeko, eta gero orri hau berriro kargatzea.",
  "DE.ApplicationController.errorUserDrop": "Ezin da fitxategia atzitu une honetan.",
  "DE.ApplicationController.notcriticalErrorTitle": "Abisua",
  "DE.ApplicationController.openErrorText": "Errore bat gertatu da fitxategia irekitzean.",
--- a/apps/documenteditor/embed/locale/hy.json
+++ b/apps/documenteditor/embed/locale/hy.json
@ -19,7 +19,7 @@
  "DE.ApplicationController.errorLoadingFont": "Տառատեսակները բեռնված չեն:<br>Խնդրում ենք կապվել ձեր փաստաթղթերի սերվերի ադմինիստրատորի հետ:",
  "DE.ApplicationController.errorSubmit": "Չհաջողվեց հաստատել",
  "DE.ApplicationController.errorTokenExpire": "Փաստաթղթի անվտանգության կտրոնի ժամկետն անցել է։<br>Դիմեք փաստաթղթերի սպասարկիչի ձեր վարիչին։",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Համացանցային կապը վերահաստատվել է,և ֆայլի տարբերակը փոխվել է։<br>Նախքան աշխատանքը շարունակելը ներբեռնեք նիշքը կամ պատճենեք դրա պարունակությունը՝ վստահ լինելու, որ ոչինչ չի կորել, և ապա նորից բեռնեք այս էջը։",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Կապը վերահաստատվել է,և ֆայլի տարբերակը փոխվել է։<br>Նախքան աշխատանքը շարունակելը ներբեռնեք ֆայլը կամ պատճենեք դրա պարունակությունը՝ վստահ լինելու, որ ոչինչ չի կորել, և ապա նորից բեռնեք այս էջը։",
  "DE.ApplicationController.errorUserDrop": "Այս պահին ֆայլն անհասանելի է։",
  "DE.ApplicationController.notcriticalErrorTitle": "Զգուշացում",
  "DE.ApplicationController.openErrorText": "Ֆայլը բացելիս սխալ է տեղի ունեցել:",
--- a/apps/documenteditor/embed/locale/ms.json
+++ b/apps/documenteditor/embed/locale/ms.json
@ -19,7 +19,7 @@
  "DE.ApplicationController.errorLoadingFont": "Fon tidak dimuatkan.<br>Sila hubungi pentadbir Pelayan Dokumen anda.",
  "DE.ApplicationController.errorSubmit": "Serahan telah gagal.",
  "DE.ApplicationController.errorTokenExpire": "Dokumen token keselamatan telah tamat tempoh.<br>Sila hubungi pentadbir Pelayan Dokumen.",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Sambungan internet telah dipulihkan, dan versi fail telah berubah.<br>Sebelum anda boleh terus bekerja, anda perlu memuat turun fail atau menyalin kandungannya untuk memastikan tiada ada yang hilang, dan kemudian muat semula halaman ini.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Sambungan telah dipulihkan, dan versi fail telah berubah.<br>Sebelum anda boleh terus bekerja, anda perlu memuat turun fail atau menyalin kandungannya untuk memastikan tiada ada yang hilang, dan kemudian muat semula halaman ini.",
  "DE.ApplicationController.errorUserDrop": "Fail tidak boleh diakses sekarang.",
  "DE.ApplicationController.notcriticalErrorTitle": "Amaran",
  "DE.ApplicationController.openErrorText": "Ralat telah berlaku semasa membuka fail.",
--- a/apps/documenteditor/forms/app/controller/ApplicationController.js
+++ b/apps/documenteditor/forms/app/controller/ApplicationController.js
@ -297,6 +297,10 @@ define([
                    config.msg = (this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.saveErrorTextDesktop : this.saveErrorText;
                    break;

+                case Asc.c_oAscError.ID.TextFormWrongFormat:
+                    config.msg = this.errorTextFormWrongFormat;
+                    break;
+
                default:
                    config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
                    break;
@ -1902,7 +1906,8 @@ define([
        textSaveAs: 'Save as PDF',
        textSaveAsDesktop: 'Save as...',
        warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
-        titleLicenseExp: 'License expired'
+        titleLicenseExp: 'License expired',
+        errorTextFormWrongFormat: 'The value entered does not match the format of the field.'

    }, DE.Controllers.ApplicationController));

--- a/apps/documenteditor/forms/app/controller/SearchBar.js
+++ b/apps/documenteditor/forms/app/controller/SearchBar.js
@ -127,7 +127,7 @@ define([

        onInputSearchChange: function (text) {
            var text = text[0];
-            if (this._state.searchText !== text) {
+            if ((text && this._state.searchText !== text) || (!text && this._state.newSearchText)) {
                this._state.newSearchText = text;
                this._lastInputChange = (new Date());
                if (this._searchTimer === undefined) {
@ -136,7 +136,11 @@ define([
                        if ((new Date()) - me._lastInputChange < 400) return;

                        me._state.searchText = me._state.newSearchText;
-                        (me._state.newSearchText !== '') && me.onQuerySearch();
+                        if (me._state.newSearchText !== '') {
+                            me.onQuerySearch();
+                        } else {
+                            me.api.asc_endFindText();
+                        }
                        clearInterval(me._searchTimer);
                        me._searchTimer = undefined;
                    }, 10);
--- a/apps/documenteditor/forms/locale/ca.json
+++ b/apps/documenteditor/forms/locale/ca.json
@ -37,8 +37,10 @@
  "Common.UI.SearchBar.tipNextResult": "El resultat següent",
  "Common.UI.SearchBar.tipPreviousResult": "El resultat anterior",
  "Common.UI.Themes.txtThemeClassicLight": "Llum clàssica",
+  "Common.UI.Themes.txtThemeContrastDark": "Contrast fosc",
  "Common.UI.Themes.txtThemeDark": "Fosc",
  "Common.UI.Themes.txtThemeLight": "Clar",
+  "Common.UI.Themes.txtThemeSystem": "Igual que el sistema",
  "Common.UI.Window.cancelButtonText": "Cancel·la",
  "Common.UI.Window.closeButtonText": "Tanca",
  "Common.UI.Window.noButtonText": "No",
@ -100,6 +102,7 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "Fa temps que no s'obre el document. Torneu a carregar la pàgina.",
  "DE.Controllers.ApplicationController.errorSessionToken": "S'ha interromput la connexió amb el servidor. Torneu a carregar la pàgina.",
  "DE.Controllers.ApplicationController.errorSubmit": "No s'ha pogut enviar.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "El valor introduït no es correspon amb el format del camp",
  "DE.Controllers.ApplicationController.errorToken": "El testimoni de seguretat del document no s'ha format correctament. <br>Contacteu amb l'administrador del servidor de documents.",
  "DE.Controllers.ApplicationController.errorTokenExpire": "El testimoni de seguretat del document ha caducat. <br>Contacteu amb l'administrador del servidor de documents.",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "S'ha canviat la versió del fitxer. La pàgina es tornarà a carregar.",
--- a/apps/documenteditor/forms/locale/en.json
+++ b/apps/documenteditor/forms/locale/en.json
@ -102,6 +102,7 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "The document has not been edited for quite a long time. Please reload the page.",
  "DE.Controllers.ApplicationController.errorSessionToken": "The connection to the server has been interrupted. Please reload the page.",
  "DE.Controllers.ApplicationController.errorSubmit": "Submit failed.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "The value entered does not match the format of the field.",
  "DE.Controllers.ApplicationController.errorToken": "The document security token is not correctly formed.<br>Please contact your Document Server administrator.",
  "DE.Controllers.ApplicationController.errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator.",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
--- a/apps/documenteditor/forms/locale/es.json
+++ b/apps/documenteditor/forms/locale/es.json
@ -102,6 +102,7 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "El documento no ha sido editado durante bastante tiempo. Por favor, recargue la página.",
  "DE.Controllers.ApplicationController.errorSessionToken": "Se ha interrumpido la conexión con el servidor. Por favor, recargue la página.",
  "DE.Controllers.ApplicationController.errorSubmit": "Error al enviar.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "El valor introducido no se corresponde con el formato del campo",
  "DE.Controllers.ApplicationController.errorToken": "El token de seguridad de documento tiene un formato incorrecto.<br>Por favor, contacte con el Administrador del Servidor de Documentos.",
  "DE.Controllers.ApplicationController.errorTokenExpire": "El token de seguridad del documento ha expirado.<br>Por favor, póngase en contacto con el administrador del Servidor de Documentos.",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "Se ha cambiado la versión del archivo. La página será actualizada.",
--- a/apps/documenteditor/forms/locale/eu.json
+++ b/apps/documenteditor/forms/locale/eu.json
@ -102,10 +102,11 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "Dokumentua ez da editatu denbora luzean. Kargatu orria berriro.",
  "DE.Controllers.ApplicationController.errorSessionToken": "Zerbitzarirako konexioa eten da. Mesedez kargatu berriz orria.",
  "DE.Controllers.ApplicationController.errorSubmit": "Huts egin du bidaltzean.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "Sartutako balioa ez dator bat eremuaren formatuarekin.",
  "DE.Controllers.ApplicationController.errorToken": "Dokumentuaren segurtasun tokena ez dago ondo osatua.<br>Jarri harremanetan zure zerbitzariaren administratzailearekin.",
  "DE.Controllers.ApplicationController.errorTokenExpire": "Dokumentuaren segurtasun-tokena iraungi da.<br>Jarri zure dokumentu-zerbitzariaren administratzailearekin harremanetan.",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "Fitxategiaren bertsioa aldatu da. Orria berriz kargatuko da.",
-  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Interneteko konexioa berrezarri da eta fitxategiaren bertsioa aldatu da.<br>Lanean jarraitu aurretik, beharrezkoa da fitxategia deskargatzea edo edukia kopiatzea, ezer ez dela galduko ziurtatzeko, eta gero orri hau berriro kargatzea.",
+  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Konexioa berrezarri da eta fitxategiaren bertsioa aldatu da.<br>Lanean jarraitu aurretik, beharrezkoa da fitxategia deskargatzea edo edukia kopiatzea, ezer ez dela galduko ziurtatzeko, eta gero orri hau berriro kargatzea.",
  "DE.Controllers.ApplicationController.errorUserDrop": "Ezin da fitxategia atzitu une honetan.",
  "DE.Controllers.ApplicationController.errorViewerDisconnect": "Konexioa galdu da. Dokumentua ikusi dezakezu oraindik,<br>baina ezingo duzu deskargatu edo inprimatu konexioa berrezarri eta orria berriz kargatu arte.",
  "DE.Controllers.ApplicationController.mniImageFromFile": "Irudia fitxategitik",
--- a/apps/documenteditor/forms/locale/fr.json
+++ b/apps/documenteditor/forms/locale/fr.json
@ -102,6 +102,7 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "Le document n'a pas été modifié depuis trop longtemps. Veuillez recharger la page.",
  "DE.Controllers.ApplicationController.errorSessionToken": "La connexion au serveur a été interrompue. Veuillez recharger la page.",
  "DE.Controllers.ApplicationController.errorSubmit": "Échec de soumission",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "La valeur saisie ne correspond pas au format du champ.",
  "DE.Controllers.ApplicationController.errorToken": "Le jeton de sécurité du document n’était pas formé correctement.<br>Veuillez contacter votre administrateur de Document Server.",
  "DE.Controllers.ApplicationController.errorTokenExpire": "Le jeton de sécurité du document a expiré.<br>Veuillez contactez l'administrateur de Document Server.",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "La version du fichier a été changée. La page sera rechargée.",
--- a/apps/documenteditor/forms/locale/hy.json
+++ b/apps/documenteditor/forms/locale/hy.json
@ -37,8 +37,10 @@
  "Common.UI.SearchBar.tipNextResult": "Հաջորդ արդյունքը",
  "Common.UI.SearchBar.tipPreviousResult": "Նախորդ արդյունքը",
  "Common.UI.Themes.txtThemeClassicLight": "Դասական լույս",
+  "Common.UI.Themes.txtThemeContrastDark": "Մութ հակադրություն",
  "Common.UI.Themes.txtThemeDark": "Մուգ",
  "Common.UI.Themes.txtThemeLight": "Լույս",
+  "Common.UI.Themes.txtThemeSystem": "Նույնը, ինչ համակարգը",
  "Common.UI.Window.cancelButtonText": "Չեղարկել",
  "Common.UI.Window.closeButtonText": "Փակել",
  "Common.UI.Window.noButtonText": "Ոչ",
@ -46,7 +48,7 @@
  "Common.UI.Window.textConfirmation": "Հաստատում",
  "Common.UI.Window.textDontShow": "Այս գրությունն այլևս ցույց չտալ",
  "Common.UI.Window.textError": "Սխալ",
-  "Common.UI.Window.textInformation": "Տեղեկատվություն ",
+  "Common.UI.Window.textInformation": "Տեղեկատվություն",
  "Common.UI.Window.textWarning": "Զգուշացում",
  "Common.UI.Window.yesButtonText": "Այո",
  "Common.Views.CopyWarningDialog.textDontShow": "Այս գրությունն այլևս ցույց չտալ",
@ -100,10 +102,11 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "Փաստաթուղթը երկար ժամանակ չի խմբագրվել։ Նորի՛ց բեռնեք էջը։",
  "DE.Controllers.ApplicationController.errorSessionToken": "Սպասարկիչի հետ կապն ընդհատվել է։ Խնդրում ենք վերբեռնել էջը:",
  "DE.Controllers.ApplicationController.errorSubmit": "Չհաջողվեց հաստատել",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "Մուտքագրված արժեքը չի համապատասխանում դաշտի ձևաչափին:",
  "DE.Controllers.ApplicationController.errorToken": "Փաստաթղթի անվտանգության կտրոնը ճիշտ չի ձևակերպված։<br>Դիմեք փաստաթղթերի սպասարկիչի ձեր վարիչին։",
  "DE.Controllers.ApplicationController.errorTokenExpire": "Փաստաթղթի անվտանգության կտրոնի ժամկետն անցել է։<br>Դիմեք փաստաթղթերի սպասարկիչի ձեր վարիչին։",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "Ֆայլի տարբերակը փոխվել է։ Էջը նորից կբեռնվի։",
-  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Համացանցային կապը վերահաստատվել է,և ֆայլի տարբերակը փոխվել է։<br>Նախքան աշխատանքը շարունակելը ներբեռնեք նիշքը կամ պատճենեք դրա պարունակությունը՝ վստահ լինելու, որ ոչինչ չի կորել, և ապա նորից բեռնեք այս էջը։",
+  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Կապը վերահաստատվել է,և ֆայլի տարբերակը փոխվել է։<br>Նախքան աշխատանքը շարունակելը ներբեռնեք ֆայլը կամ պատճենեք դրա պարունակությունը՝ վստահ լինելու, որ ոչինչ չի կորել, և ապա նորից բեռնեք այս էջը։",
  "DE.Controllers.ApplicationController.errorUserDrop": "Այս պահին ֆայլն անհասանելի է։",
  "DE.Controllers.ApplicationController.errorViewerDisconnect": "Միացումն ընդհատվել է։ Դուք կարող եք շարունակել դիտել փաստաթուղթը,<br>բայց չեք կարողանա ներբեռնել կամ տպել, մինչև միացումը չվերականգնվի։",
  "DE.Controllers.ApplicationController.mniImageFromFile": "Նկար նիշքից",
--- a/apps/documenteditor/forms/locale/it.json
+++ b/apps/documenteditor/forms/locale/it.json
@ -102,6 +102,7 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "Il documento non è stato modificato per molto tempo. Ti preghiamo di ricaricare la pagina.",
  "DE.Controllers.ApplicationController.errorSessionToken": "La connessione con il server è stata interrotta, è necessario ricaricare la pagina.",
  "DE.Controllers.ApplicationController.errorSubmit": "Invio fallito.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "Il valore inserito non corrisponde al formato del campo.",
  "DE.Controllers.ApplicationController.errorToken": "Il token di sicurezza del documento non è formato correttamente.<br>Si prega di contattare l'amministratore di Document Server.",
  "DE.Controllers.ApplicationController.errorTokenExpire": "Il token di sicurezza del documento è scaduto.<br>Si prega di contattare l'amministratore di Document Server.",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "La versione del file è stata cambiata. La pagina verrà ricaricata.",
--- a/apps/documenteditor/forms/locale/ja.json
+++ b/apps/documenteditor/forms/locale/ja.json
@ -100,6 +100,7 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "このドキュメントはかなり長い間編集されていませんでした。このページをリロードしてください。",
  "DE.Controllers.ApplicationController.errorSessionToken": "サーバーとの接続が中断されました。このページをリロードしてください。",
  "DE.Controllers.ApplicationController.errorSubmit": "送信に失敗しました。",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "入力された値がフィールドのフォーマットと一致しません。",
  "DE.Controllers.ApplicationController.errorToken": "ドキュメント・セキュリティ・トークンが正しく形成されていません。<br>ドキュメントサーバーの管理者にご連絡ください。",
  "DE.Controllers.ApplicationController.errorTokenExpire": "ドキュメント・セキュリティ・トークンの有効期限が切れています。<br>ドキュメントサーバーの管理者に連絡してください。",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "ファイルが変更されました。ページがリロードされます。",
--- a/apps/documenteditor/forms/locale/ms.json
+++ b/apps/documenteditor/forms/locale/ms.json
@ -105,7 +105,7 @@
  "DE.Controllers.ApplicationController.errorToken": "Dokumen token keselamatan kini tidak dibentuk.<br>Sila hubungi pentadbir Pelayan Dokumen.",
  "DE.Controllers.ApplicationController.errorTokenExpire": "Dokumen token keselamatan telah tamat tempoh.<br>Sila hubungi pentadbir Pelayan Dokumen.",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "Versi fail telah berubah. Halaman akan dimuatkan semula.",
-  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Sambungan internet telah dipulihkan, dan versi fail telah berubah.<br>Sebelum anda boleh terus bekerja, anda perlu memuat turun fail atau menyalin kandungannya untuk memastikan tiada ada yang hilang, dan kemudian muat semula halaman ini.",
+  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Sambungan telah dipulihkan, dan versi fail telah berubah.<br>Sebelum anda boleh terus bekerja, anda perlu memuat turun fail atau menyalin kandungannya untuk memastikan tiada ada yang hilang, dan kemudian muat semula halaman ini.",
  "DE.Controllers.ApplicationController.errorUserDrop": "Fail tidak boleh diakses sekarang.",
  "DE.Controllers.ApplicationController.errorViewerDisconnect": "Sambungan telah hilang. Anda masih boleh melihat dokumen,<br>tetapi tidak dapat muat turun atau cetaknya sehingga sambungan dipulihkan dan halaman dimuat semua.",
  "DE.Controllers.ApplicationController.mniImageFromFile": "Imej daripada Fail",
--- a/apps/documenteditor/forms/locale/pt.json
+++ b/apps/documenteditor/forms/locale/pt.json
@ -102,6 +102,7 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "O documento ficou sem edição por muito tempo. Por favor atualize a página.",
  "DE.Controllers.ApplicationController.errorSessionToken": "A conexão com o servidor foi interrompida. Por favor atualize a página.",
  "DE.Controllers.ApplicationController.errorSubmit": "Falha no envio.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "O valor inserido não corresponde ao formato do campo.",
  "DE.Controllers.ApplicationController.errorToken": "O token de segurança do documento não foi formado corretamente. <br> Entre em contato com o administrador do Document Server.",
  "DE.Controllers.ApplicationController.errorTokenExpire": "O token de segurança do documento expirou. <br> Entre em contato com o administrador do Document Server.",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "A versão do arquivo foi alterada. A página será recarregada.",
--- a/apps/documenteditor/forms/locale/ru.json
+++ b/apps/documenteditor/forms/locale/ru.json
@ -102,6 +102,7 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "Документ долгое время не редактировался. Пожалуйста, обновите страницу.",
  "DE.Controllers.ApplicationController.errorSessionToken": "Подключение к серверу было прервано. Пожалуйста, обновите страницу.",
  "DE.Controllers.ApplicationController.errorSubmit": "Не удалось отправить.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "Введенное значение не соответствует формату поля.",
  "DE.Controllers.ApplicationController.errorToken": "Токен безопасности документа имеет неправильный формат.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
  "DE.Controllers.ApplicationController.errorTokenExpire": "Истек срок действия токена безопасности документа.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.",
--- a/apps/documenteditor/forms/locale/zh.json
+++ b/apps/documenteditor/forms/locale/zh.json
@ -102,6 +102,7 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "该文件没编辑比较长时间。请重新加载页面。",
  "DE.Controllers.ApplicationController.errorSessionToken": "与服务器的连接已中断。请重新加载页面。",
  "DE.Controllers.ApplicationController.errorSubmit": "提交失败",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "输入的值与该字段的格式不一致。",
  "DE.Controllers.ApplicationController.errorToken": "文档安全令牌形成不正确。<br> 请联系文档服务器管理员。",
  "DE.Controllers.ApplicationController.errorTokenExpire": "文档安全令牌已过期。<br> 请联系文档服务器管理员。",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "\n该文件版本已更改。该页面将重新加载。",
--- a/apps/documenteditor/main/app/controller/DocumentHolder.js
+++ b/apps/documenteditor/main/app/controller/DocumentHolder.js
@ -1774,9 +1774,9 @@ define([
        onAcceptRejectChange: function(item, e) {
            if (this.api) {
                if (item.value == 'accept')
-                    this.api.asc_AcceptChanges();
+                    this.api.asc_AcceptChangesBySelection(false);
                else if (item.value == 'reject')
-                    this.api.asc_RejectChanges();
+                    this.api.asc_RejectChangesBySelection(false);
            }
            this.editComplete();
        },
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@ -293,6 +293,9 @@ define([
                    }
                })).show();
                break;
+            case 'help':
+                close_menu = !!isopts;
+                break;
            default: close_menu = false;
            }

--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@ -118,6 +118,29 @@ define([
                this.view : Backbone.Controller.prototype.getView.call(this, name);
        },

+        checkPunctuation: function (text) {
+            if (!!text) {
+                var isPunctuation = false;
+                for (var l = 0; l < text.length; l++) {
+                    var charCode = text.charCodeAt(l),
+                        char = text.charAt(l);
+                    if (AscCommon.g_aPunctuation[charCode] !== undefined || char.trim() === '') {
+                        isPunctuation = true;
+                        break;
+                    }
+                }
+                if (isPunctuation) {
+                    if (this._state.matchWord) {
+                        this.view.chMatchWord.setValue(false, true);
+                        this._state.matchWord = false;
+                    }
+                    this.view.chMatchWord.setDisabled(true);
+                } else if (this.view.chMatchWord.isDisabled()) {
+                    this.view.chMatchWord.setDisabled(false);
+                }
+            }
+        },
+
        onChangeSearchOption: function (option, checked) {
            switch (option) {
                case 'case-sensitive':
@ -138,6 +161,7 @@ define([
        onSearchNext: function (type, text, e) {
            var isReturnKey = type === 'keydown' && e.keyCode === Common.UI.Keys.RETURN;
            if (text && text.length > 0 && (isReturnKey || type !== 'keydown')) {
+                this.checkPunctuation(text);
                this._state.searchText = text;
                this.onQuerySearch(type, !(this.searchTimer || isReturnKey));
            }
@ -145,15 +169,18 @@ define([

        onInputSearchChange: function (text) {
            var me = this;
-            if (this._state.searchText !== text) {
+            if ((text && this._state.searchText !== text) || (!text && this._state.newSearchText)) {
                this._state.newSearchText = text;
                this._lastInputChange = (new Date());
                if (this.searchTimer === undefined) {
                    this.searchTimer = setInterval(function(){
                        if ((new Date()) - me._lastInputChange < 400) return;

+                        me.checkPunctuation(me._state.newSearchText);
                        me._state.searchText = me._state.newSearchText;
                        if (!(me._state.newSearchText !== '' && me.onQuerySearch()) && me._state.newSearchText === '') {
+                            me.api.asc_endFindText();
+                            me.hideResults();
                            me.view.updateResultsNumber('no-results');
                            me.view.disableNavButtons();
                            me.view.disableReplaceButtons(true);
@ -370,6 +397,7 @@ define([

            var selectedText = this.api.asc_GetSelectedText(),
                text = typeof findText === 'string' ? findText : (selectedText && selectedText.trim() || this._state.searchText);
+            this.checkPunctuation(text);
            if (this.resultItems && this.resultItems.length > 0 &&
                (!this._state.matchCase && text && text.toLowerCase() === this.view.inputText.getValue().toLowerCase() ||
                    this._state.matchCase && text === this.view.inputText.getValue())) { // show old results
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@ -740,7 +740,8 @@ define([
                        spectype = control_props ? control_props.get_SpecificType() : Asc.c_oAscContentControlSpecificType.None;
                    this.toolbar.lockToolbar(Common.enumLock.inSpecificForm, spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.Picture ||
                        spectype==Asc.c_oAscContentControlSpecificType.ComboBox || spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.DateTime,   {array: this.btnsComment});
-                }
+                } else
+                    this.toolbar.lockToolbar(Common.enumLock.inSpecificForm, false, {array: this.btnsComment});
                this.toolbar.lockToolbar(Common.enumLock.paragraphLock, paragraph_locked,   {array: this.btnsComment});
                this.toolbar.lockToolbar(Common.enumLock.headerLock,    header_locked,      {array: this.btnsComment});
                this.toolbar.lockToolbar(Common.enumLock.richEditLock,  rich_edit_lock,     {array: this.btnsComment});
@ -907,7 +908,8 @@ define([
                    this.toolbar.lockToolbar(Common.enumLock.inSpecificForm, spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.Picture ||
                        spectype==Asc.c_oAscContentControlSpecificType.ComboBox || spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.DateTime,
                        {array: this.btnsComment});
-                }
+                } else
+                    this.toolbar.lockToolbar(Common.enumLock.inSpecificForm, false, {array: this.btnsComment});
            }
            if (frame_pr) {
                this._state.suppress_num = !!frame_pr.get_SuppressLineNumbers();
--- a/apps/documenteditor/main/app/template/ChartSettings.template
+++ b/apps/documenteditor/main/app/template/ChartSettings.template
@ -57,6 +57,71 @@
            <button type="button" class="btn btn-text-default auto" id="chart-button-edit-data" style="min-width:115px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textEditData %></button>
        </td>
    </tr>
+</table>
+<table cols="1" id="chart-panel-3d-rotate">
+    <tr>
+        <td class="padding-small">
+            <div class="separator horizontal"></div>
+        </td>
+    </tr>
+    <tr>
+        <td class="padding-small">
+            <label class="header"><%= scope.text3dRotation %></label>
+        </td>
+    </tr>
+    <tr>
+        <td class="padding-small">
+            <label class="fixed" style="margin-top: 3px;width: 88px;"><%= scope.textX %></label>
+            <div id="chart-btn-x-right" style="display: inline-block; float:right; margin-left: 4px;"></div>
+            <div id="chart-btn-x-left" style="display: inline-block; float:right; margin-left: 4px;"></div>
+            <div id="chart-spin-x" style="display: inline-block; float:right;"></div>
+        </td>
+    </tr>
+    <tr>
+        <td class="padding-small">
+            <label class="fixed" style="margin-top: 3px;width: 88px;"><%= scope.textY %></label>
+            <div id="chart-btn-y-down" style="display: inline-block; float:right; margin-left: 4px;"></div>
+            <div id="chart-btn-y-up" style="display: inline-block; float:right; margin-left: 4px;"></div>
+            <div id="chart-spin-y" style="display: inline-block; float:right;"></div>
+        </td>
+    </tr>
+    <tr>
+        <td class="padding-small">
+            <label class="fixed" style="margin-top: 3px;width: 88px;"><%= scope.textPerspective %></label>
+            <div id="chart-btn-widen" style="display: inline-block; float:right; margin-left: 4px;"></div>
+            <div id="chart-btn-narrow" style="display: inline-block; float:right; margin-left: 4px;"></div>
+            <div id="chart-spin-persp" style="display: inline-block; float:right;"></div>
+        </td>
+    </tr>
+    <tr>
+        <td class="padding-small">
+            <div id="chart-checkbox-right-angle"></div>
+        </td>
+    </tr>
+    <tr>
+        <td class="padding-small">
+            <div id="chart-checkbox-autoscale"></div>
+        </td>
+    </tr>
+    <tr>
+        <td class="padding-small">
+            <label class="fixed" style="margin-top: 3px;width: 122px;"><%= scope.text3dDepth %></label>
+            <div id="chart-spin-3d-depth" style="display: inline-block; float:right;"></div>
+        </td>
+    </tr>
+    <tr>
+        <td class="padding-small">
+            <label class="fixed" style="margin-top: 3px;width: 122px;"><%= scope.text3dHeight %></label>
+            <div id="chart-spin-3d-height" style="display: inline-block; float:right;"></div>
+        </td>
+    </tr>
+    <tr>
+        <td class="padding-small">
+            <label class="link" id="chart-def-rotate-link" data-hint="1" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.textDefault %></label>
+        </td>
+    </tr>
+</table>
+<table cols="2">
    <tr>
        <td class="padding-small" colspan=2>
            <div class="separator horizontal"></div>
--- a/apps/documenteditor/main/app/template/Toolbar.template
+++ b/apps/documenteditor/main/app/template/Toolbar.template
@ -87,7 +87,7 @@
                    </div>
                </div>
                <div class="separator long invisible"></div>
-                <div class="group small flex field-styles" id="slot-field-styles" style="min-width: 160px;width: 100%; " data-group-width="100%"></div>
+                <div class="group small flex field-styles" id="slot-field-styles" style="min-width: 151px;width: 100%; " data-group-width="100%"></div>
            </section>
            <section class="panel" data-tab="ins">
                <div class="group">
--- a/apps/documenteditor/main/app/view/ChartSettings.js
+++ b/apps/documenteditor/main/app/view/ChartSettings.js
@ -95,6 +95,7 @@ define([
            this.labelWidth = el.find('#chart-label-width');
            this.labelHeight = el.find('#chart-label-height');
            this.NotCombinedSettings = $('.not-combined');
+            this.Chart3DContainer = $('#chart-panel-3d-rotate');
        },

        setApi: function(api) {
@ -191,6 +192,57 @@ define([
                    this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
                    this._state.Height = value;
                }
+
+                var props3d = this.chartProps ? this.chartProps.getView3d() : null;
+                this.ShowHideElem(!!props3d);
+                if (props3d) {
+                    value = props3d.asc_getRotX();
+                    if ((this._state.X===undefined || value===undefined)&&(this._state.X!==value) ||
+                        Math.abs(this._state.X-value)>0.001) {
+                        this.spnX.setValue((value!==null && value !== undefined) ? value : '', true);
+                        this._state.X = value;
+                    }
+
+                    value = props3d.asc_getRotY();
+                    if ( (this._state.Y===undefined || value===undefined)&&(this._state.Y!==value) ||
+                        Math.abs(this._state.Y-value)>0.001) {
+                        this.spnY.setValue((value!==null && value !== undefined) ? value : '', true);
+                        this._state.Y = value;
+                    }
+
+                    value = props3d.asc_getRightAngleAxes();
+                    if ( this._state.RightAngle!==value ) {
+                        this.chRightAngle.setValue((value !== null && value !== undefined) ? value : 'indeterminate', true);
+                        this._state.RightAngle=value;
+                    }
+
+                    value = props3d.asc_getPerspective();
+                    if ( (this._state.Perspective===undefined || value===undefined)&&(this._state.Perspective!==value) ||
+                        Math.abs(this._state.Perspective-value)>0.001) {
+                        this.spnPerspective.setMinValue((value!==null && value !== undefined) ? 0.1 : 0);
+                        this.spnPerspective.setValue((value!==null && value !== undefined) ? value : 0, true);
+                        this._state.Perspective = value;
+                    }
+                    this.spnPerspective.setDisabled(this._locked || !!this._state.RightAngle);
+                    this.btnNarrow.setDisabled(this._locked || !!this._state.RightAngle);
+                    this.btnWiden.setDisabled(this._locked || !!this._state.RightAngle);
+
+                    value = props3d.asc_getDepth();
+                    if ( Math.abs(this._state.Depth-value)>0.001 ||
+                        (this._state.Depth===undefined || value===undefined)&&(this._state.Depth!==value)) {
+                        this.spn3DDepth.setValue((value!==null && value !== undefined) ? value : '', true);
+                        this._state.Depth = value;
+                    }
+
+                    value = props3d.asc_getHeight();
+                    if ( Math.abs(this._state.Height3d-value)>0.001 ||
+                        (this._state.Height3d===undefined || this._state.Height3d===null || value===null)&&(this._state.Height3d!==value)) {
+                        (value!==null) && this.spn3DHeight.setValue(value, true);
+                        this.chAutoscale.setValue(value===null, true);
+                        this._state.Height3d = value;
+                    }
+                    this.spn3DHeight.setDisabled(this._locked || value===null);
+                }
            }
        },

@ -278,6 +330,210 @@ define([
            this.lockedControls.push(this.btnEditData);
            this.btnEditData.on('click', _.bind(this.setEditData, this));

+            // 3d rotation
+            this.spnX = new Common.UI.MetricSpinner({
+                el: $('#chart-spin-x'),
+                step: 10,
+                width: 57,
+                defaultUnit : "°",
+                value: '20 °',
+                maxValue: 359.9,
+                minValue: 0,
+                dataHint: '1',
+                dataHintDirection: 'bottom',
+                dataHintOffset: 'big'
+            });
+            this.lockedControls.push(this.spnX);
+            this.spnX.on('change', _.bind(this.onXRotation, this));
+            this.spnX.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
+
+            this.btnLeft = new Common.UI.Button({
+                parentEl: $('#chart-btn-x-left', me.$el),
+                cls: 'btn-toolbar',
+                iconCls: 'toolbar__icon btn-rotate-270',
+                hint: this.textLeft,
+                dataHint: '1',
+                dataHintDirection: 'top'
+            });
+            this.lockedControls.push(this.btnLeft);
+            this.btnLeft.on('click', _.bind(function() {
+                this.spnX.setValue(this.spnX.getNumberValue() - 10);
+            }, this));
+
+            this.btnRight = new Common.UI.Button({
+                parentEl: $('#chart-btn-x-right', me.$el),
+                cls: 'btn-toolbar',
+                iconCls: 'toolbar__icon btn-rotate-90',
+                hint: this.textRight,
+                dataHint: '1',
+                dataHintDirection: 'top'
+            });
+            this.lockedControls.push(this.btnRight);
+            this.btnRight.on('click', _.bind(function() {
+                this.spnX.setValue(this.spnX.getNumberValue() + 10);
+            }, this));
+
+            this.spnY = new Common.UI.MetricSpinner({
+                el: $('#chart-spin-y'),
+                step: 10,
+                width: 57,
+                defaultUnit : "°",
+                value: '15 °',
+                maxValue: 90,
+                minValue: -90,
+                dataHint: '1',
+                dataHintDirection: 'bottom',
+                dataHintOffset: 'big'
+            });
+            this.lockedControls.push(this.spnY);
+            this.spnY.on('change', _.bind(this.onYRotation, this));
+            this.spnY.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
+
+            this.btnUp = new Common.UI.Button({
+                parentEl: $('#chart-btn-y-up', me.$el),
+                cls: 'btn-toolbar',
+                iconCls: 'toolbar__icon btn-rotate-y-clockwise',
+                hint: this.textUp,
+                dataHint: '1',
+                dataHintDirection: 'top'
+            });
+            this.lockedControls.push(this.btnUp);
+            this.btnUp.on('click', _.bind(function() {
+                this.spnY.setValue(this.spnY.getNumberValue() - 10);
+            }, this));
+
+            this.btnDown= new Common.UI.Button({
+                parentEl: $('#chart-btn-y-down', me.$el),
+                cls: 'btn-toolbar',
+                iconCls: 'toolbar__icon btn-rotate-y-counterclockwise',
+                hint: this.textDown,
+                dataHint: '1',
+                dataHintDirection: 'top'
+            });
+            this.lockedControls.push(this.btnDown);
+            this.btnDown.on('click', _.bind(function() {
+                this.spnY.setValue(this.spnY.getNumberValue() + 10);
+            }, this));
+
+            this.spnPerspective = new Common.UI.MetricSpinner({
+                el: $('#chart-spin-persp'),
+                step: 5,
+                width: 57,
+                defaultUnit : "°",
+                value: '0 °',
+                maxValue: 100,
+                minValue: 0.1,
+                dataHint: '1',
+                dataHintDirection: 'bottom',
+                dataHintOffset: 'big'
+            });
+            this.lockedControls.push(this.spnPerspective);
+            this.spnPerspective.on('change', _.bind(this.onPerspective, this));
+            this.spnPerspective.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
+
+            this.btnNarrow = new Common.UI.Button({
+                parentEl: $('#chart-btn-narrow', me.$el),
+                cls: 'btn-toolbar',
+                iconCls: 'toolbar__icon btn-rotate-up',
+                hint: this.textNarrow,
+                dataHint: '1',
+                dataHintDirection: 'top'
+            });
+            this.lockedControls.push(this.btnNarrow);
+            this.btnNarrow.on('click', _.bind(function() {
+                this.spnPerspective.setValue(this.spnPerspective.getNumberValue() - 5);
+            }, this));
+
+            this.btnWiden= new Common.UI.Button({
+                parentEl: $('#chart-btn-widen', me.$el),
+                cls: 'btn-toolbar',
+                iconCls: 'toolbar__icon btn-rotate-down',
+                hint: this.textWiden,
+                dataHint: '1',
+                dataHintDirection: 'top'
+            });
+            this.lockedControls.push(this.btnWiden);
+            this.btnWiden.on('click', _.bind(function() {
+                this.spnPerspective.setValue(this.spnPerspective.getNumberValue() + 5);
+            }, this));
+
+            this.chRightAngle = new Common.UI.CheckBox({
+                el: $('#chart-checkbox-right-angle'),
+                labelText: this.textRightAngle
+            });
+            this.lockedControls.push(this.chRightAngle);
+            this.chRightAngle.on('change', _.bind(function(field, newValue, oldValue, eOpts) {
+                if (this.api){
+                    if (this._noApply) return;
+
+                    if (this.chartProps) {
+                        var props = new Asc.asc_CImgProperty();
+                        var oView3D = this.chartProps.getView3d();
+                        if (oView3D) {
+                            oView3D.asc_setRightAngleAxes(field.getValue()=='checked');
+                            this.chartProps.putView3d(oView3D);
+                            props.put_ChartProperties(this.chartProps);
+                            this.api.ImgApply(props);
+                        }
+                    }
+                }
+            }, this));
+
+            this.chAutoscale = new Common.UI.CheckBox({
+                el: $('#chart-checkbox-autoscale'),
+                labelText: this.textAutoscale
+            });
+            this.lockedControls.push(this.chAutoscale);
+            this.chAutoscale.on('change', _.bind(function(field, newValue, oldValue, eOpts) {
+                if (this.api){
+                    if (this.chartProps) {
+                        var props = new Asc.asc_CImgProperty();
+                        var oView3D = this.chartProps.getView3d();
+                        if (oView3D) {
+                            oView3D.asc_setHeight(field.getValue()=='checked' ? null : this.spn3DHeight.getNumberValue());
+                            this.chartProps.putView3d(oView3D);
+                            props.put_ChartProperties(this.chartProps);
+                            this.api.ImgApply(props);
+                        }
+                    }
+                }
+            }, this));
+
+            this.spn3DDepth = new Common.UI.MetricSpinner({
+                el: $('#chart-spin-3d-depth'),
+                step: 10,
+                width: 70,
+                defaultUnit : "%",
+                value: '0 %',
+                maxValue: 2000,
+                minValue: 0,
+                dataHint: '1',
+                dataHintDirection: 'bottom',
+                dataHintOffset: 'big'
+            });
+            this.lockedControls.push(this.spn3DDepth);
+            this.spn3DDepth.on('change', _.bind(this.on3DDepth, this));
+            this.spn3DDepth.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
+
+            this.spn3DHeight = new Common.UI.MetricSpinner({
+                el: $('#chart-spin-3d-height'),
+                step: 10,
+                width: 70,
+                defaultUnit : "%",
+                value: '50 %',
+                maxValue: 500,
+                minValue: 5,
+                dataHint: '1',
+                dataHintDirection: 'bottom',
+                dataHintOffset: 'big'
+            });
+            this.lockedControls.push(this.spn3DHeight);
+            this.spn3DHeight.on('change', _.bind(this.on3DHeight, this));
+            this.spn3DHeight.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
+
+            this.linkDefRotation = $('#chart-def-rotate-link');
+            $(this.el).on('click', '#chart-def-rotate-link', _.bind(this.onDefRotation, this));
+
            this.linkAdvanced = $('#chart-advanced-link');
            $(this.el).on('click', '#chart-advanced-link', _.bind(this.openAdvancedSettings, this));
        },
@ -518,6 +774,101 @@ define([
                type==Asc.c_oAscChartTypeSettings.comboAreaBar || type==Asc.c_oAscChartTypeSettings.comboCustom);
        },

+        ShowHideElem: function(is3D) {
+            this.Chart3DContainer.toggleClass('settings-hidden', !is3D);
+        },
+
+        onXRotation: function(field, newValue, oldValue, eOpts){
+            if (this._noApply) return;
+
+            if (this.chartProps) {
+                var props = new Asc.asc_CImgProperty();
+                var oView3D = this.chartProps.getView3d();
+                if (oView3D) {
+                    oView3D.asc_setRotX(field.getNumberValue());
+                    this.chartProps.putView3d(oView3D);
+                    props.put_ChartProperties(this.chartProps);
+                    this.api.ImgApply(props);
+                }
+            }
+        },
+
+        onYRotation: function(field, newValue, oldValue, eOpts){
+            if (this._noApply) return;
+
+            if (this.chartProps) {
+                var props = new Asc.asc_CImgProperty();
+                var oView3D = this.chartProps.getView3d();
+                if (oView3D) {
+                    oView3D.asc_setRotY(field.getNumberValue());
+                    this.chartProps.putView3d(oView3D);
+                    props.put_ChartProperties(this.chartProps);
+                    this.api.ImgApply(props);
+                }
+            }
+        },
+
+        onPerspective: function(field, newValue, oldValue, eOpts){
+            if (this._noApply) return;
+
+            if (this.chartProps) {
+                var props = new Asc.asc_CImgProperty();
+                var oView3D = this.chartProps.getView3d();
+                if (oView3D) {
+                    oView3D.asc_setPerspective(field.getNumberValue());
+                    this.chartProps.putView3d(oView3D);
+                    props.put_ChartProperties(this.chartProps);
+                    this.api.ImgApply(props);
+                }
+            }
+        },
+
+        on3DDepth: function(field, newValue, oldValue, eOpts){
+            if (this._noApply) return;
+
+            if (this.chartProps) {
+                var props = new Asc.asc_CImgProperty();
+                var oView3D = this.chartProps.getView3d();
+                if (oView3D) {
+                    oView3D.asc_setDepth(field.getNumberValue());
+                    this.chartProps.putView3d(oView3D);
+                    props.put_ChartProperties(this.chartProps);
+                    this.api.ImgApply(props);
+                }
+            }
+        },
+
+        on3DHeight: function(field, newValue, oldValue, eOpts){
+            if (this._noApply) return;
+
+            if (this.chartProps) {
+                var props = new Asc.asc_CImgProperty();
+                var oView3D = this.chartProps.getView3d();
+                if (oView3D) {
+                    oView3D.asc_setHeight(field.getNumberValue());
+                    this.chartProps.putView3d(oView3D);
+                    props.put_ChartProperties(this.chartProps);
+                    this.api.ImgApply(props);
+                }
+            }
+        },
+
+        onDefRotation: function() {
+            if (this._noApply) return;
+
+            if (this.chartProps) {
+                var props = new Asc.asc_CImgProperty();
+                var oView3D = this.chartProps.getView3d();
+                if (oView3D) {
+                    oView3D.asc_setRotX(20);
+                    oView3D.asc_setRotY(15);
+                    this.chartProps.putView3d(oView3D);
+                    props.put_ChartProperties(this.chartProps);
+                    this.api.ImgApply(props);
+                }
+            }
+        },
+
        setLocked: function (locked) {
            this._locked = locked;
        },
@ -548,7 +899,22 @@ define([
        txtInFront: 'In front',
        textEditData: 'Edit Data',
        textChartType: 'Change Chart Type',
-        textStyle:          'Style'
+        textStyle:          'Style',
+        text3dRotation: '3D Rotation',
+        textX: 'X rotation',
+        textY: 'Y rotation',
+        textPerspective: 'Perspective',
+        text3dDepth: 'Depth (% of base)',
+        text3dHeight: 'Height (% of base)',
+        textLeft: 'Left',
+        textRight: 'Right',
+        textUp: 'Up',
+        textDown: 'Down',
+        textNarrow: 'Narrow field of view',
+        textWiden: 'Widen field of view',
+        textRightAngle: 'Right Angle Axes',
+        textAutoscale: 'Autoscale',
+        textDefault: 'Default Rotation'

    }, DE.Views.ChartSettings || {}));
 });
--- a/apps/documenteditor/main/app/view/FileMenu.js
+++ b/apps/documenteditor/main/app/view/FileMenu.js
@ -66,6 +66,14 @@ define([
                    var item = _.findWhere(this.items, {el: event.currentTarget});
                    if (item) {
                        var panel = this.panels[item.options.action];
+                        if (item.options.action === 'help') {
+                            if ( panel.usedHelpCenter === true && navigator.onLine ) {
+                                this.fireEvent('item:click', [this, item.options.action, true]);
+                                window.open(panel.urlHelpCenter, '_blank');
+                                return;
+                            }
+                        }
+
                        this.fireEvent('item:click', [this, item.options.action, !!panel]);

                        if (panel) {
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@ -410,6 +410,7 @@ define([
                dataHintDirection: 'left',
                dataHintOffset: 'small'
            });
+            Common.Utils.isIE && this.chUseAltKey.$el.parent().parent().hide();

            /** coauthoring begin **/
            this.chLiveComment = new Common.UI.CheckBox({
@ -1989,6 +1990,7 @@ define([
            this.menu = options.menu;
            this.urlPref = 'resources/help/{{DEFAULT_LANG}}/';
            this.openUrl = null;
+            this.urlHelpCenter = '{{HELP_CENTER_WEB_EDITORS}}';

            this.en_data = [
                {"src": "ProgramInterface/ProgramInterface.htm", "name": "Introducing Document Editor user interface", "headername": "Program Interface"},
@ -2111,11 +2113,12 @@ define([
                            store.fetch(config);
                        } else {
                            if ( Common.Controllers.Desktop.isActive() ) {
-                                if ( store.contentLang === '{{DEFAULT_LANG}}' || !Common.Controllers.Desktop.helpUrl() )
+                                if ( store.contentLang === '{{DEFAULT_LANG}}' || !Common.Controllers.Desktop.helpUrl() ) {
+                                    me.usedHelpCenter = true;
                                    me.iFrame.src = '../../common/main/resources/help/download.html';
-                                else {
+                                } else {
                                    store.contentLang = store.contentLang === lang ? '{{DEFAULT_LANG}}' : lang;
-                                    me.urlPref = Common.Controllers.Desktop.helpUrl() + '/' + lang + '/';
+                                    me.urlPref = Common.Controllers.Desktop.helpUrl() + '/' + store.contentLang + '/';
                                    store.url = me.urlPref + 'Contents.json';
                                    store.fetch(config);
                                }
--- a/apps/documenteditor/main/app/view/FormsTab.js
+++ b/apps/documenteditor/main/app/view/FormsTab.js
@ -49,13 +49,16 @@ define([
    DE.Views.FormsTab = Common.UI.BaseView.extend(_.extend((function(){
        var template =
        '<section class="panel" data-tab="forms">' +
-            '<div class="group" style="display: none;">' +
+            '<div class="group forms-buttons" style="display: none;">' +
                '<span class="btn-slot text x-huge" id="slot-btn-form-field"></span>' +
                '<span class="btn-slot text x-huge" id="slot-btn-form-combobox"></span>' +
                '<span class="btn-slot text x-huge" id="slot-btn-form-dropdown"></span>' +
                '<span class="btn-slot text x-huge" id="slot-btn-form-checkbox"></span>' +
                '<span class="btn-slot text x-huge" id="slot-btn-form-radiobox"></span>' +
                '<span class="btn-slot text x-huge" id="slot-btn-form-image"></span>' +
+            '</div>' +
+            '<div class="separator long forms-buttons" style="display: none;"></div>' +
+            '<div class="group forms-buttons" style="display: none;">' +
                '<span class="btn-slot text x-huge" id="slot-btn-form-email"></span>' +
                '<span class="btn-slot text x-huge" id="slot-btn-form-phone"></span>' +
                '<span class="btn-slot text x-huge" id="slot-btn-form-complex"></span>' +
@ -320,7 +323,7 @@ define([
                    dataHintDirection: 'bottom',
                    dataHintOffset: 'small'
                });
-                this.paragraphControls.push(this.btnPrevForm);
+                !(this.appConfig.isRestrictedEdit && this.appConfig.canFillForms) && this.paragraphControls.push(this.btnPrevForm);

                this.btnNextForm = new Common.UI.Button({
                    cls: 'btn-toolbar x-huge icon-top',
@ -332,7 +335,7 @@ define([
                    dataHintDirection: 'bottom',
                    dataHintOffset: 'small'
                });
-                this.paragraphControls.push(this.btnNextForm);
+                !(this.appConfig.isRestrictedEdit && this.appConfig.canFillForms) && this.paragraphControls.push(this.btnNextForm);

                if (this.appConfig.canSubmitForms) {
                    this.btnSubmit = new Common.UI.Button({
@ -345,7 +348,7 @@ define([
                        dataHintDirection: 'bottom',
                        dataHintOffset: 'small'
                    });
-                    this.paragraphControls.push(this.btnSubmit);
+                    !(this.appConfig.isRestrictedEdit && this.appConfig.canFillForms) && this.paragraphControls.push(this.btnSubmit);
                }
                if (this.appConfig.canDownloadForms) {
                    this.btnSaveForm = new Common.UI.Button({
@ -358,7 +361,7 @@ define([
                        dataHintDirection: 'bottom',
                        dataHintOffset: 'small'
                    });
-                    this.paragraphControls.push(this.btnSaveForm);
+                    !(this.appConfig.isRestrictedEdit && this.appConfig.canFillForms) && this.paragraphControls.push(this.btnSaveForm);
                }
                Common.Utils.lockControls(Common.enumLock.disableOnStart, true, {array: this.paragraphControls});
                this._state = {disabled: false};
@ -433,9 +436,8 @@ define([
                    this.btnPhoneField.render($host.find('#slot-btn-form-phone'));
                    this.btnComplexField.render($host.find('#slot-btn-form-complex'));

-                    var separator_forms = $host.find('.separator.forms');
-                    separator_forms.prev('.group').show();
-                    separator_forms.show().next('.group').show();
+                    $host.find('.forms-buttons').show();
+                    $host.find('.separator.forms').show().next('.group').show();
                    $host.find('.separator.submit').show().next('.group').show();
                }
                this.btnPrevForm.render($host.find('#slot-btn-form-prev'));
--- a/apps/documenteditor/main/app/view/TableSettings.js
+++ b/apps/documenteditor/main/app/view/TableSettings.js
@ -761,6 +761,14 @@ define([
            this._state.beginPreviewStyles = true;
            this._state.currentStyleFound = false;
            this._state.previewStylesCount = count;
+            this._state.groups = {
+                'menu-table-group-custom':              {id: 'menu-table-group-custom',             caption: this.txtGroupTable_Custom,             index: 0,   templateCount: 0},
+                'menu-table-group-plain':               {id: 'menu-table-group-plain',              caption: this.txtGroupTable_Plain,              index: 1,   templateCount: 0},
+                'menu-table-group-grid':                {id: 'menu-table-group-grid',               caption: this.txtGroupTable_Grid,               index: 2,   templateCount: 0},
+                'menu-table-group-list':                {id: 'menu-table-group-list',               caption: this.txtGroupTable_List,               index: 3,   templateCount: 0},
+                'menu-table-group-bordered-and-lined':  {id: 'menu-table-group-bordered-and-lined', caption: this.txtGroupTable_BorderedAndLined,   index: 4,   templateCount: 0},
+                'menu-table-group-no-name':             {id: 'menu-table-group-no-name',            caption: '&nbsp',                               index: 5,   templateCount: 0},
+            };
        },

        onEndTableStylesPreview: function(){
@ -774,29 +782,73 @@ define([

        onAddTableStylesPreview: function(Templates){
            var self = this;
-            var arr = [];
+
            _.each(Templates, function(template){
                var tip = template.asc_getDisplayName();
+                var groupItem = '';
+
                if (template.asc_getType()==0) {
-                    ['Table Grid', 'Plain Table', 'Grid Table', 'List Table', 'Light', 'Dark', 'Colorful', 'Accent'].forEach(function(item){
-                        var str = 'txtTable_' + item.replace(' ', '');
+                    var arr = tip.split(' ');
+                    
+                    if(new RegExp('Table Grid', 'i').test(tip)){
+                        groupItem = 'menu-table-group-plain';
+                    }
+                    else if(new RegExp('Lined|Bordered', 'i').test(tip)) {
+                        groupItem = 'menu-table-group-bordered-and-lined';
+                    }
+                    else{
+                        if(arr[0]){
+                            groupItem = 'menu-table-group-' + arr[0].toLowerCase();
+                        }
+                        if(self._state.groups.hasOwnProperty(groupItem) == false) {
+                            groupItem = 'menu-table-group-no-name';
+                        }
+                        
+                    }
+
+                    ['Table Grid', 'Plain Table', 'Grid Table', 'List Table', 'Light', 'Dark', 'Colorful', 'Accent', 'Bordered & Lined', 'Bordered', 'Lined'].forEach(function(item){
+                        var str = 'txtTable_' + item.replace('&', 'And').replace(new RegExp(' ', 'g'), '');
                        if (self[str])
                            tip = tip.replace(item, self[str]);
                    });

                }
-                arr.push({
+                else {
+                    groupItem = 'menu-table-group-custom'
+                }
+
+                var templateObj = {
                    imageUrl: template.asc_getImage(),
                    id     : Common.UI.getId(),
+                    group : groupItem,
                    templateId: template.asc_getId(),
                    tip    : tip
-                });
+                };
+                var templateIndex = 0;
+
+                for(var group in self._state.groups) {
+                    if(self._state.groups[group].index <= self._state.groups[groupItem].index) {
+                        templateIndex += self._state.groups[group].templateCount;
+                    }
+                }
+
+                if (self._state.beginPreviewStyles) {
+                    self._state.beginPreviewStyles = false;
+                    self.mnuTableTemplatePicker && self.mnuTableTemplatePicker.groups.reset(self._state.groups[groupItem]);
+                    self.mnuTableTemplatePicker && self.mnuTableTemplatePicker.store.reset(templateObj);
+                    self.mnuTableTemplatePicker.groups.comparator = function(item) {
+                        return item.get('index');
+                    };
+                } 
+                else {
+                    if(self._state.groups[groupItem].templateCount == 0) {
+                        self.mnuTableTemplatePicker && self.mnuTableTemplatePicker.groups.add(self._state.groups[groupItem]);
+                    } 
+                    self.mnuTableTemplatePicker && self.mnuTableTemplatePicker.store.add(templateObj, {at: templateIndex});
+                }
+
+                self._state.groups[groupItem].templateCount += 1;
            });
-            if (this._state.beginPreviewStyles) {
-                this._state.beginPreviewStyles = false;
-                self.mnuTableTemplatePicker && self.mnuTableTemplatePicker.store.reset(arr);
-            } else
-                self.mnuTableTemplatePicker && self.mnuTableTemplatePicker.store.add(arr);
            !this._state.currentStyleFound && this.selectCurrentTableStyle();
        },

@ -989,7 +1041,15 @@ define([
        txtTable_Dark: 'Dark',
        txtTable_Colorful: 'Colorful',
        txtTable_Accent: 'Accent',
-        textConvert: 'Convert Table to Text'
+        txtTable_Lined: 'Lined',
+        txtTable_Bordered: 'Bordered',
+        txtTable_BorderedAndLined: 'Bordered & Lined',
+        txtGroupTable_Custom: 'Custom',
+        txtGroupTable_Plain: 'Plain Tables',
+        txtGroupTable_Grid: 'Grid Tables',
+        txtGroupTable_List: 'List Tables',
+        txtGroupTable_BorderedAndLined: 'Bordered & Lined Tables',
+        textConvert: 'Convert Table to Text',

    }, DE.Views.TableSettings || {}));
 });
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@ -1483,7 +1483,7 @@ define([
                            _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                        itemWidth: itemWidth,
                        itemHeight: itemHeight,
-                        style: 'min-width:150px;',
+                        style: 'min-width:139px;',
 //                hint        : this.tipParagraphStyle,
                        dataHint: '1',
                        dataHintDirection: 'bottom',
@ -1491,6 +1491,7 @@ define([
                        enableKeyEvents: true,
                        additionalMenuItems: [this.listStylesAdditionalMenuItem],
                        delayRenderTips: true,
+                        autoWidth:       true,
                        itemTemplate: _.template([
                            '<div class="style" id="<%= id %>">',
                                '<div style="background-image: url(<%= imageUrl %>); width: ' + itemWidth + 'px; height: ' + itemHeight + 'px;"></div>',
@ -2106,7 +2107,7 @@ define([
                        cls: 'shifted-left',
                        style: 'min-width: 177px',
                        items: [
-                            {template: _.template('<div id="id-toolbar-menu-multilevels" class="menu-markers" style="width: 185px; margin: 0 0 0 9px;"></div>')},
+                            {template: _.template('<div id="id-toolbar-menu-multilevels" class="menu-markers" style="width: 362px; margin: 0 0 0 9px;"></div>')},
                            {caption: '--'},
                            this.mnuMultiChangeLevel = new Common.UI.MenuItem({
                                caption: this.textChangeLevel,
@ -2287,7 +2288,11 @@ define([
                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: -1}, skipRenderOnChange: true, tip: this.textNone},
                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 1}, skipRenderOnChange: true, tip: this.tipMultiLevelVarious},
                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 2}, skipRenderOnChange: true, tip: this.tipMultiLevelNumbered},
-                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 3}, skipRenderOnChange: true, tip: this.tipMultiLevelSymbols}
+                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 3}, skipRenderOnChange: true, tip: this.tipMultiLevelSymbols},
+                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 4}, skipRenderOnChange: true, tip: this.tipMultiLevelArticl},
+                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 5}, skipRenderOnChange: true, tip: this.tipMultiLevelChapter},
+                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 6}, skipRenderOnChange: true, tip: this.tipMultiLevelHeadings},
+                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 7}, skipRenderOnChange: true, tip: this.tipMultiLevelHeadVarious}
                    ]),
                    itemTemplate: _.template('<div id="<%= id %>" class="item-multilevellist"></div>')
                });
@ -2884,7 +2889,11 @@ define([
            tipRusUpperPoints: 'А. Б. В.',
            tipRusUpperParentheses: 'А) Б) В)',
            tipRusLowerPoints: 'а. б. в.',
-            tipRusLowerParentheses: 'а) б) в)'
+            tipRusLowerParentheses: 'а) б) в)',
+            tipMultiLevelArticl: '',
+            tipMultiLevelChapter: '',
+            tipMultiLevelHeadings: '',
+            tipMultiLevelHeadVarious: ''
        }
    })(), DE.Views.Toolbar || {}));
 });
--- a/apps/documenteditor/main/locale/ca.json
+++ b/apps/documenteditor/main/locale/ca.json
@ -2875,6 +2875,10 @@
  "DE.Views.Toolbar.tipMarkersFSquare": "Pics quadrats plens",
  "DE.Views.Toolbar.tipMarkersHRound": "Pics rodons buits",
  "DE.Views.Toolbar.tipMarkersStar": "Pics d'estrella",
+  "DE.Views.Toolbar.tipMultiLevelArticl": "Articles enumerats de diversos nivells",
+  "DE.Views.Toolbar.tipMultiLevelChapter": "Capítols enumerats de diversos nivells",
+  "DE.Views.Toolbar.tipMultiLevelHeadings": "Títols enumerats de diversos nivells",
+  "DE.Views.Toolbar.tipMultiLevelHeadVarious": "Títols enumerats de diversos nivells",
  "DE.Views.Toolbar.tipMultiLevelNumbered": "Pics numerats multinivell ",
  "DE.Views.Toolbar.tipMultilevels": "Llista amb diversos nivells",
  "DE.Views.Toolbar.tipMultiLevelSymbols": "Pics de símbols multinivell",
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@ -1358,6 +1358,21 @@
  "DE.Views.ChartSettings.txtTight": "Tight",
  "DE.Views.ChartSettings.txtTitle": "Chart",
  "DE.Views.ChartSettings.txtTopAndBottom": "Top and bottom",
+  "DE.Views.ChartSettings.text3dRotation": "3D Rotation",
+  "DE.Views.ChartSettings.textX": "X rotation",
+  "DE.Views.ChartSettings.textY": "Y rotation",
+  "DE.Views.ChartSettings.textPerspective": "Perspective",
+  "DE.Views.ChartSettings.text3dDepth": "Depth (% of base)",
+  "DE.Views.ChartSettings.text3dHeight": "Height (% of base)",
+  "DE.Views.ChartSettings.textLeft": "Left",
+  "DE.Views.ChartSettings.textRight": "Right",
+  "DE.Views.ChartSettings.textUp": "Up",
+  "DE.Views.ChartSettings.textDown": "Down",
+  "DE.Views.ChartSettings.textNarrow": "Narrow field of view",
+  "DE.Views.ChartSettings.textWiden": "Widen field of view",
+  "DE.Views.ChartSettings.textRightAngle": "Right Angle Axes",
+  "DE.Views.ChartSettings.textAutoscale": "Autoscale",
+  "DE.Views.ChartSettings.textDefault": "Default Rotation",
  "DE.Views.ControlSettingsDialog.strGeneral": "General",
  "DE.Views.ControlSettingsDialog.textAdd": "Add",
  "DE.Views.ControlSettingsDialog.textAppearance": "Appearance",
@ -2089,6 +2104,7 @@
  "DE.Views.LeftMenu.tipSearch": "Search",
  "DE.Views.LeftMenu.tipSupport": "Feedback & Support",
  "DE.Views.LeftMenu.tipTitles": "Titles",
+  "DE.Views.LeftMenu.tipPageThumbnails": "Page Thumbnails",
  "DE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE",
  "DE.Views.LeftMenu.txtEditor": "Document Editor",
  "DE.Views.LeftMenu.txtLimit": "Limit Access",
@ -2585,12 +2601,20 @@
  "DE.Views.TableSettings.txtNoBorders": "No borders",
  "DE.Views.TableSettings.txtTable_Accent": "Accent",
  "DE.Views.TableSettings.txtTable_Colorful": "Colorful",
+  "DE.Views.TableSettings.txtTable_Lined": "Lined",
+  "DE.Views.TableSettings.txtTable_Bordered": "Bordered",
+  "DE.Views.TableSettings.txtTable_BorderedAndLined": "Bordered & Lined",
  "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.TableSettings.txtGroupTable_Custom": "Custom", 
+  "DE.Views.TableSettings.txtGroupTable_Plain": "Plain Tables", 
+  "DE.Views.TableSettings.txtGroupTable_Grid": "Grid Tables", 
+  "DE.Views.TableSettings.txtGroupTable_List": "List Tables", 
+  "DE.Views.TableSettings.txtGroupTable_BorderedAndLined": "Bordered & Lined Tables", 
  "DE.Views.TableSettingsAdvanced.textAlign": "Alignment",
  "DE.Views.TableSettingsAdvanced.textAlignment": "Alignment",
  "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Spacing between cells",
@ -2887,6 +2911,10 @@
  "DE.Views.Toolbar.tipMarkersFSquare": "Filled square bullets",
  "DE.Views.Toolbar.tipMarkersHRound": "Hollow round bullets",
  "DE.Views.Toolbar.tipMarkersStar": "Star bullets",
+  "DE.Views.Toolbar.tipMultiLevelArticl": "Multi-level numbered articles",
+  "DE.Views.Toolbar.tipMultiLevelChapter": "Multi-level numbered chapters",
+  "DE.Views.Toolbar.tipMultiLevelHeadings": "Multi-level numbered headings",
+  "DE.Views.Toolbar.tipMultiLevelHeadVarious": "Multi-level various numbered headings",
  "DE.Views.Toolbar.tipMultiLevelNumbered": "Multi-level numbered bullets",
  "DE.Views.Toolbar.tipMultilevels": "Multilevel list",
  "DE.Views.Toolbar.tipMultiLevelSymbols": "Multi-level symbols bullets",
--- a/apps/documenteditor/main/locale/es.json
+++ b/apps/documenteditor/main/locale/es.json
@ -2875,6 +2875,10 @@
  "DE.Views.Toolbar.tipMarkersFSquare": "Viñetas cuadradas rellenas",
  "DE.Views.Toolbar.tipMarkersHRound": "Viñetas redondas huecas",
  "DE.Views.Toolbar.tipMarkersStar": "Viñetas de estrella",
+  "DE.Views.Toolbar.tipMultiLevelArticl": "Artículos enumerados en varios niveles",
+  "DE.Views.Toolbar.tipMultiLevelChapter": "Capítulos enumerados en varios niveles",
+  "DE.Views.Toolbar.tipMultiLevelHeadings": "Títulos enumerados en varios niveles",
+  "DE.Views.Toolbar.tipMultiLevelHeadVarious": "Títulos enumerados en varios niveles",
  "DE.Views.Toolbar.tipMultiLevelNumbered": "Viñetas numeradas de varios niveles",
  "DE.Views.Toolbar.tipMultilevels": "Esquema",
  "DE.Views.Toolbar.tipMultiLevelSymbols": "Viñetas de símbolos de varios niveles",
--- a/apps/documenteditor/main/locale/eu.json
+++ b/apps/documenteditor/main/locale/eu.json
@ -603,7 +603,7 @@
  "DE.Controllers.Main.errorToken": "Dokumentuaren segurtasun tokena ez dago ondo osatua.<br>Jarri harremanetan zure zerbitzariaren administratzailearekin.",
  "DE.Controllers.Main.errorTokenExpire": "Dokumentuaren segurtasun-tokena iraungi da.<br>Jarri zure dokumentu-zerbitzariaren administratzailearekin harremanetan.",
  "DE.Controllers.Main.errorUpdateVersion": "Fitxategiaren bertsioa aldatu da. Orria berriz kargatuko da.",
-  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Interneteko konexioa berrezarri da eta fitxategiaren bertsioa aldatu da.<br>Lanean jarraitu aurretik, beharrezkoa da fitxategia deskargatzea edo edukia kopiatzea, ezer ez dela galduko ziurtatzeko, eta gero orri hau berriro kargatzea.",
+  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Konexioa berrezarri da eta fitxategiaren bertsioa aldatu da.<br>Lanean jarraitu aurretik, beharrezkoa da fitxategia deskargatzea edo edukia kopiatzea, ezer ez dela galduko ziurtatzeko, eta gero orri hau berriro kargatzea.",
  "DE.Controllers.Main.errorUserDrop": "Ezin da fitxategia atzitu une honetan.",
  "DE.Controllers.Main.errorUsersExceed": "Ordainketa planak onartzen duen erabiltzaile kopurua gainditu da",
  "DE.Controllers.Main.errorViewerDisconnect": "Konexioa galdu da. Dokumentua ikusi dezakezu oraindik,<br>baina ezingo duzu deskargatu edo inprimatu konexioa berrezarri eta orria berriz kargatu arte.",
@ -2875,6 +2875,10 @@
  "DE.Views.Toolbar.tipMarkersFSquare": "Betetako lauki buletak",
  "DE.Views.Toolbar.tipMarkersHRound": "Biribil huts buletak",
  "DE.Views.Toolbar.tipMarkersStar": "Izar-buletak",
+  "DE.Views.Toolbar.tipMultiLevelArticl": "Hainbat mailatan zerrendatutako artikuluak",
+  "DE.Views.Toolbar.tipMultiLevelChapter": "Hainbat mailatan zerrendatutako kapituluak",
+  "DE.Views.Toolbar.tipMultiLevelHeadings": "Hainbat mailatan zerrendatutako tituluak",
+  "DE.Views.Toolbar.tipMultiLevelHeadVarious": "Hainbat mailatan zerrendatutako tituluak",
  "DE.Views.Toolbar.tipMultiLevelNumbered": "Maila anitzeko zenbakitutako buletak",
  "DE.Views.Toolbar.tipMultilevels": "Maila anitzeko zerrenda",
  "DE.Views.Toolbar.tipMultiLevelSymbols": "Maila anitzeko ikur-buletak",
--- a/apps/documenteditor/main/locale/fr.json
+++ b/apps/documenteditor/main/locale/fr.json
@ -599,6 +599,7 @@
  "DE.Controllers.Main.errorSetPassword": "Le mot de passe ne peut pas être configuré",
  "DE.Controllers.Main.errorStockChart": "Ordre lignes incorrect. Pour créer un diagramme boursier, positionnez les données sur la feuille de calcul dans l'ordre suivant :<br>cours à l'ouverture, cours maximal, cours minimal, cours à la clôture.",
  "DE.Controllers.Main.errorSubmit": "Échec de soumission",
+  "DE.Controllers.Main.errorTextFormWrongFormat": "La valeur saisie ne correspond pas au format du champ.",
  "DE.Controllers.Main.errorToken": "Le jeton de sécurité du document n’était pas formé correctement.<br>Veuillez contacter l'administrateur de Document Server.",
  "DE.Controllers.Main.errorTokenExpire": "Le jeton de sécurité du document a expiré.<br>Veuillez contactez l'administrateur de votre Document Server.",
  "DE.Controllers.Main.errorUpdateVersion": "La version du fichier a été changée. La page sera rechargée.",
@ -1846,6 +1847,7 @@
  "DE.Views.FormSettings.textColor": "Couleur de bordure.",
  "DE.Views.FormSettings.textComb": "Peigne de caractères ",
  "DE.Views.FormSettings.textCombobox": "Zone de liste déroulante",
+  "DE.Views.FormSettings.textComplex": "Champ complexe",
  "DE.Views.FormSettings.textConnected": "Champs connectés",
  "DE.Views.FormSettings.textDelete": "Supprimer",
  "DE.Views.FormSettings.textDigits": "Chiffres",
@ -1855,6 +1857,7 @@
  "DE.Views.FormSettings.textField": "Champ texte",
  "DE.Views.FormSettings.textFixed": "Taille de champ fixe",
  "DE.Views.FormSettings.textFormat": "Format",
+  "DE.Views.FormSettings.textFormatSymbols": "Symboles autorisés",
  "DE.Views.FormSettings.textFromFile": "Depuis un fichier",
  "DE.Views.FormSettings.textFromStorage": "A partir de l'espace de stockage",
  "DE.Views.FormSettings.textFromUrl": "A partir d'une URL",
@ -1863,12 +1866,15 @@
  "DE.Views.FormSettings.textKey": "Clé",
  "DE.Views.FormSettings.textLetters": "Lettres",
  "DE.Views.FormSettings.textLock": "Verrou ",
+  "DE.Views.FormSettings.textMask": "Masque arbitraire",
  "DE.Views.FormSettings.textMaxChars": "Limite de caractères",
  "DE.Views.FormSettings.textMulti": "Champ de saisie à plusieurs lignes",
  "DE.Views.FormSettings.textNever": "Jamais",
  "DE.Views.FormSettings.textNoBorder": "Sans bordures",
+  "DE.Views.FormSettings.textNone": "Aucun",
  "DE.Views.FormSettings.textPlaceholder": "Espace réservé",
  "DE.Views.FormSettings.textRadiobox": "Bouton radio",
+  "DE.Views.FormSettings.textReg": "Expression régulière",
  "DE.Views.FormSettings.textRequired": "Requis",
  "DE.Views.FormSettings.textScale": "Mise à l'échelle",
  "DE.Views.FormSettings.textSelectImage": "Sélectionner une image",
@ -1885,6 +1891,7 @@
  "DE.Views.FormSettings.textWidth": "Largeur de cellule",
  "DE.Views.FormsTab.capBtnCheckBox": "Case à cocher",
  "DE.Views.FormsTab.capBtnComboBox": "Zone de liste déroulante",
+  "DE.Views.FormsTab.capBtnComplex": "Champ complexe",
  "DE.Views.FormsTab.capBtnDownloadForm": "Télécharger comme oform",
  "DE.Views.FormsTab.capBtnDropDown": "Déroulant",
  "DE.Views.FormsTab.capBtnEmail": "Adresse E-mail",
@ -1907,10 +1914,13 @@
  "DE.Views.FormsTab.textSubmited": "Formulaire soumis avec succès",
  "DE.Views.FormsTab.tipCheckBox": "Insérer une case à cocher",
  "DE.Views.FormsTab.tipComboBox": "Insérer une zone de liste déroulante",
+  "DE.Views.FormsTab.tipComplexField": "Insérer un champ complexe",
  "DE.Views.FormsTab.tipDownloadForm": "Télécharger un fichier sous forme de document OFORM à remplir",
  "DE.Views.FormsTab.tipDropDown": "Insérer une liste déroulante",
+  "DE.Views.FormsTab.tipEmailField": "Insérer l'adresse e-mail",
  "DE.Views.FormsTab.tipImageField": "Insérer une image",
  "DE.Views.FormsTab.tipNextForm": "Allez au champ suivant",
+  "DE.Views.FormsTab.tipPhoneField": "Insérer le numéro de téléphone",
  "DE.Views.FormsTab.tipPrevForm": "Allez au champs précédent",
  "DE.Views.FormsTab.tipRadioBox": "Insérer bouton radio",
  "DE.Views.FormsTab.tipSaveForm": "Enregistrer un fichier en tant que document OFORM remplissable",
@ -2865,6 +2875,10 @@
  "DE.Views.Toolbar.tipMarkersFSquare": "Puces carrées remplies",
  "DE.Views.Toolbar.tipMarkersHRound": "Puces rondes vides",
  "DE.Views.Toolbar.tipMarkersStar": "Puces en étoile",
+  "DE.Views.Toolbar.tipMultiLevelArticl": "Articles numérotés à plusieurs niveaux",
+  "DE.Views.Toolbar.tipMultiLevelChapter": "Chapitres numérotés à plusieurs niveaux",
+  "DE.Views.Toolbar.tipMultiLevelHeadings": "Titres numérotés à plusieurs niveaux",
+  "DE.Views.Toolbar.tipMultiLevelHeadVarious": "Diverses en-têtes numérotées à plusieurs niveaux",
  "DE.Views.Toolbar.tipMultiLevelNumbered": "Puces numérotées à plusieurs niveaux",
  "DE.Views.Toolbar.tipMultilevels": "Liste multiniveau",
  "DE.Views.Toolbar.tipMultiLevelSymbols": "Puces de symboles à plusieurs niveaux",
--- a/apps/documenteditor/main/locale/hy.json
+++ b/apps/documenteditor/main/locale/hy.json
@ -207,7 +207,7 @@
  "Common.UI.Window.textConfirmation": "Հաստատում",
  "Common.UI.Window.textDontShow": "Այս գրությունն այլևս ցույց չտալ",
  "Common.UI.Window.textError": "Սխալ",
-  "Common.UI.Window.textInformation": "Տեղեկատվություն ",
+  "Common.UI.Window.textInformation": "Տեղեկատվություն",
  "Common.UI.Window.textWarning": "Զգուշացում",
  "Common.UI.Window.yesButtonText": "Այո",
  "Common.Utils.Metric.txtCm": "սմ",
@ -260,7 +260,7 @@
  "Common.Views.Comments.mniPositionAsc": "Վերևում ",
  "Common.Views.Comments.mniPositionDesc": "Ներքևից ",
  "Common.Views.Comments.textAdd": "Հավելել",
-  "Common.Views.Comments.textAddComment": "Ավելացնել մեկնաբանություն",
+  "Common.Views.Comments.textAddComment": "Ավելացնել",
  "Common.Views.Comments.textAddCommentToDoc": "Փաստաթղթում կցել մեկնաբանություն",
  "Common.Views.Comments.textAddReply": "Ավելացնել պատասխան",
  "Common.Views.Comments.textAll": "Բոլորը",
@ -415,7 +415,7 @@
  "Common.Views.ReviewChanges.txtCommentResolveCurrent": "Լուծել ընթացիկ մեկնաբանությունները",
  "Common.Views.ReviewChanges.txtCommentResolveMy": "Լուծել իմ մեկնաբանությունները",
  "Common.Views.ReviewChanges.txtCommentResolveMyCurrent": "Լուծել իմ ընթացիկ մեկնաբանությունները",
-  "Common.Views.ReviewChanges.txtCompare": " Համեմատել",
+  "Common.Views.ReviewChanges.txtCompare": "Համեմատել",
  "Common.Views.ReviewChanges.txtDocLang": "Լեզու",
  "Common.Views.ReviewChanges.txtEditing": "Խմբագրում ",
  "Common.Views.ReviewChanges.txtFinal": "Բոլոր փոփոխումներն ընդունված են {0}",
@ -471,6 +471,7 @@
  "Common.Views.SaveAsDlg.textTitle": "Պահպանման պանակ",
  "Common.Views.SearchPanel.textCaseSensitive": "Դուրճազգայուն",
  "Common.Views.SearchPanel.textCloseSearch": "Փակել որոնումը",
+  "Common.Views.SearchPanel.textContentChanged": "Փաստաթուղթը փոխվել է",
  "Common.Views.SearchPanel.textFind": "Գտնել",
  "Common.Views.SearchPanel.textFindAndReplace": "Գտնել և փոխարինել",
  "Common.Views.SearchPanel.textMatchUsingRegExp": "Համեմատել՝ օգտագործելով կանոնավոր արտահայտություններ",
@ -479,6 +480,7 @@
  "Common.Views.SearchPanel.textReplace": "Փոխարինել",
  "Common.Views.SearchPanel.textReplaceAll": "Փոխարինել բոլորը",
  "Common.Views.SearchPanel.textReplaceWith": "Փոխարինել հետևյալով",
+  "Common.Views.SearchPanel.textSearchAgain": "{0}Կատարել նոր որոնում{1}ճշգրիտ արդյունքների համար:",
  "Common.Views.SearchPanel.textSearchHasStopped": "Որոնումը դադարեցվել է",
  "Common.Views.SearchPanel.textSearchResults": "Որոնման արդյունքներ՝ {0}/{1}",
  "Common.Views.SearchPanel.textTooManyResults": "Այստեղ ցուցադրելու համար չափազանց շատ արդյունքներ կան",
@ -597,10 +599,11 @@
  "DE.Controllers.Main.errorSetPassword": "Գաղտնաբառը չհաջողվեց սահմանել:",
  "DE.Controllers.Main.errorStockChart": "Տողերի սխալ կարգ։ Բորսայի գծապատկեր ստանալու համար տվյալները թերթի վրա դասավորեք հետևյալ կերպ՝<br>բացման գին, առավելագույն գին, նվազագույն գին, փակման գին։ ",
  "DE.Controllers.Main.errorSubmit": "Չհաջողվեց հաստատել",
+  "DE.Controllers.Main.errorTextFormWrongFormat": "Մուտքագրված արժեքը չի համապատասխանում դաշտի ձևաչափին:",
  "DE.Controllers.Main.errorToken": "Փաստաթղթի անվտանգության կտրոնը ճիշտ չի ձևակերպված։<br>Դիմեք փաստաթղթերի սպասարկիչի ձեր վարիչին։",
  "DE.Controllers.Main.errorTokenExpire": "Փաստաթղթի անվտանգության կտրոնի ժամկետն անցել է։<br>Դիմեք փաստաթղթերի սպասարկիչի ձեր վարիչին։",
  "DE.Controllers.Main.errorUpdateVersion": "Ֆայլի տարբերակը փոխվել է։ Էջը նորից կբեռնվի։",
-  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Համացանցային կապը վերահաստատվել է,և ֆայլի տարբերակը փոխվել է։<br>Նախքան աշխատանքը շարունակելը ներբեռնեք նիշքը կամ պատճենեք դրա պարունակությունը՝ վստահ լինելու, որ ոչինչ չի կորել, և ապա նորից բեռնեք այս էջը։",
+  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Կապը վերահաստատվել է,և ֆայլի տարբերակը փոխվել է։<br>Նախքան աշխատանքը շարունակելը ներբեռնեք ֆայլը կամ պատճենեք դրա պարունակությունը՝ վստահ լինելու, որ ոչինչ չի կորել, և ապա նորից բեռնեք այս էջը։",
  "DE.Controllers.Main.errorUserDrop": "Այս պահին ֆայլն անհասանելի է։",
  "DE.Controllers.Main.errorUsersExceed": "Օգտատերերի՝ սակագնային պլանով թույլատրված քանակը գերազանցվել է։",
  "DE.Controllers.Main.errorViewerDisconnect": "Միացումը ընդհատվել է։ Դուք կարող եք շարունակել դիտել փաստաթուղթը,<br>բայց չեք կարողանա ներբեռնել կամ տպել, մինչև կապը վերականգնվի և էջը վերաբեռնվի:",
@ -1844,26 +1847,34 @@
  "DE.Views.FormSettings.textColor": "Եզրագծի գույն",
  "DE.Views.FormSettings.textComb": "Սյուների ձուլում",
  "DE.Views.FormSettings.textCombobox": "Համակցված տուփ",
+  "DE.Views.FormSettings.textComplex": "Համալիր դաշտ",
  "DE.Views.FormSettings.textConnected": "Դաշտերը միացված են",
  "DE.Views.FormSettings.textDelete": "Ջնջել",
+  "DE.Views.FormSettings.textDigits": "Թվանիշեր",
  "DE.Views.FormSettings.textDisconnect": "Անջատել",
  "DE.Views.FormSettings.textDropDown": "Բացվող",
  "DE.Views.FormSettings.textExact": "ճշգրիտ",
  "DE.Views.FormSettings.textField": "Տեքստի դաշտ",
  "DE.Views.FormSettings.textFixed": "ֆիքսված չափի դաշտ",
+  "DE.Views.FormSettings.textFormat": "Ձևաչափ",
+  "DE.Views.FormSettings.textFormatSymbols": "Թույլատրված նշաններ",
  "DE.Views.FormSettings.textFromFile": "Ֆայլից",
  "DE.Views.FormSettings.textFromStorage": "Պահպանումից",
  "DE.Views.FormSettings.textFromUrl": "URL-ից",
  "DE.Views.FormSettings.textGroupKey": "Խմբի բանալի",
  "DE.Views.FormSettings.textImage": "Նկար",
  "DE.Views.FormSettings.textKey": "Բանալի ",
+  "DE.Views.FormSettings.textLetters": "Նամակներ",
  "DE.Views.FormSettings.textLock": "Արգելափակել ",
+  "DE.Views.FormSettings.textMask": "Կամայական դիմակ",
  "DE.Views.FormSettings.textMaxChars": "Նիշերի սահման",
  "DE.Views.FormSettings.textMulti": "Բազմագիծ դաշտ",
  "DE.Views.FormSettings.textNever": "Երբեք",
  "DE.Views.FormSettings.textNoBorder": "Առանց եզրագծի",
+  "DE.Views.FormSettings.textNone": "Ոչ մեկը",
  "DE.Views.FormSettings.textPlaceholder": "Տեղապահ ",
  "DE.Views.FormSettings.textRadiobox": "Ընտրանքի կոճակ ",
+  "DE.Views.FormSettings.textReg": "Կանոնավոր արտահայտություն",
  "DE.Views.FormSettings.textRequired": "Պարտադիր",
  "DE.Views.FormSettings.textScale": "Երբ սանդղել",
  "DE.Views.FormSettings.textSelectImage": "Ընտրել պատկեր",
@ -1880,10 +1891,13 @@
  "DE.Views.FormSettings.textWidth": "Վանդակի լայնությունը",
  "DE.Views.FormsTab.capBtnCheckBox": "Ստուգանիշ",
  "DE.Views.FormsTab.capBtnComboBox": "Համակցված տուփ",
+  "DE.Views.FormsTab.capBtnComplex": "Համալիր դաշտ",
  "DE.Views.FormsTab.capBtnDownloadForm": "Ներբեռնել որպես oform",
  "DE.Views.FormsTab.capBtnDropDown": "Բացվող",
+  "DE.Views.FormsTab.capBtnEmail": "էլ. հասցե",
  "DE.Views.FormsTab.capBtnImage": "Նկար",
  "DE.Views.FormsTab.capBtnNext": "Հաջորդ դաշտ",
+  "DE.Views.FormsTab.capBtnPhone": "Հեռախոսահամար",
  "DE.Views.FormsTab.capBtnPrev": "Նախորդ դաշտ",
  "DE.Views.FormsTab.capBtnRadioBox": "Ընտրանքի կոճակ ",
  "DE.Views.FormsTab.capBtnSaveForm": "Պահպանել, ինչպես oform",
@ -1900,10 +1914,13 @@
  "DE.Views.FormsTab.textSubmited": "Ձևը հաջողությամբ ներկայացված է",
  "DE.Views.FormsTab.tipCheckBox": "Տեղադրել ստուգանիշ ",
  "DE.Views.FormsTab.tipComboBox": "Տեղադրել համակցված տուփ ",
+  "DE.Views.FormsTab.tipComplexField": "Զետեղել բարդ դաշտ",
  "DE.Views.FormsTab.tipDownloadForm": "Ներբեռնել ֆայլը որպես լրացվող OFORM փաստաթուղթ",
  "DE.Views.FormsTab.tipDropDown": "Տեղադրել բացվող ցուցակ",
+  "DE.Views.FormsTab.tipEmailField": "Զետեղել էլ. հասցե",
  "DE.Views.FormsTab.tipImageField": "Զետեղել նկար",
  "DE.Views.FormsTab.tipNextForm": "Գնալ հաջորդ դաշտ",
+  "DE.Views.FormsTab.tipPhoneField": "Զետեղել հեռախոսահամար",
  "DE.Views.FormsTab.tipPrevForm": "Գնալ նախորդ դաշտ",
  "DE.Views.FormsTab.tipRadioBox": "Տեղադրել ընտրանքի կոճակ ",
  "DE.Views.FormsTab.tipSaveForm": "Պահպանել ֆայլը, որպես լրացվող OFORM փաստաթուղթ",
@ -2858,6 +2875,10 @@
  "DE.Views.Toolbar.tipMarkersFSquare": "Լցված քառակուսի պարբերակներ",
  "DE.Views.Toolbar.tipMarkersHRound": "Դատարկ կլոր պարբերակներ",
  "DE.Views.Toolbar.tipMarkersStar": "Աստղաձև պարբերակներ",
+  "DE.Views.Toolbar.tipMultiLevelArticl": "Բազմամակարդակ համարակալված հոդվածներ ",
+  "DE.Views.Toolbar.tipMultiLevelChapter": "Բազմամակարդակ համարակալված գլուխներ",
+  "DE.Views.Toolbar.tipMultiLevelHeadings": "Բազմամակարդակ համարակալված վերնագրեր",
+  "DE.Views.Toolbar.tipMultiLevelHeadVarious": "Բազմամակարդակ համարակալված բազմազան վերնագրեր",
  "DE.Views.Toolbar.tipMultiLevelNumbered": "Բազմաստիճան համարակալված պարբերակներ",
  "DE.Views.Toolbar.tipMultilevels": "Բազմամակարդակ ցուցակ",
  "DE.Views.Toolbar.tipMultiLevelSymbols": "Բազմաստիճան նիշերի պարբերակներ",
@ -2918,6 +2939,11 @@
  "DE.Views.ViewTab.textRulers": "Քանոններ",
  "DE.Views.ViewTab.textStatusBar": "Վիճակագոտի",
  "DE.Views.ViewTab.textZoom": "Խոշորացնել",
+  "DE.Views.ViewTab.tipDarkDocument": "Մուգ փաստաթուղթ",
+  "DE.Views.ViewTab.tipFitToPage": "Հարմարեցնել էջին",
+  "DE.Views.ViewTab.tipFitToWidth": "Հարմարեցնել լայնությանը",
+  "DE.Views.ViewTab.tipHeadings": "Վերնագրեր",
+  "DE.Views.ViewTab.tipInterfaceTheme": "Ինտերֆեյսի ոճ",
  "DE.Views.WatermarkSettingsDialog.textAuto": "Ինքնաշխատ",
  "DE.Views.WatermarkSettingsDialog.textBold": "Թավ",
  "DE.Views.WatermarkSettingsDialog.textColor": "Տեքստի գույն",
--- a/apps/documenteditor/main/locale/it.json
+++ b/apps/documenteditor/main/locale/it.json
@ -479,6 +479,7 @@
  "Common.Views.SearchPanel.textReplace": "Sostituisci",
  "Common.Views.SearchPanel.textReplaceAll": "Sostituisci tutto",
  "Common.Views.SearchPanel.textReplaceWith": "Sostituire con",
+  "Common.Views.SearchPanel.textSearchAgain": "{0}Esegui una nuova ricerca{1} per ottenere risultati accurati.",
  "Common.Views.SearchPanel.textSearchHasStopped": "La ricerca è stata interrotta",
  "Common.Views.SearchPanel.textSearchResults": "Risultati della ricerca: {0}/{1}",
  "Common.Views.SearchPanel.textTooManyResults": "Ci sono troppi risultati per essere mostrati qui",
@ -1852,6 +1853,7 @@
  "DE.Views.FormSettings.textField": "‎Campo di testo‎",
  "DE.Views.FormSettings.textFixed": "Dimensione di campo fissa",
  "DE.Views.FormSettings.textFormat": "Formato",
+  "DE.Views.FormSettings.textFormatSymbols": "Simboli consentiti",
  "DE.Views.FormSettings.textFromFile": "Da file",
  "DE.Views.FormSettings.textFromStorage": "Da spazio di archiviazione",
  "DE.Views.FormSettings.textFromUrl": "Da URL",
--- a/apps/documenteditor/main/locale/ms.json
+++ b/apps/documenteditor/main/locale/ms.json
@ -600,7 +600,7 @@
  "DE.Controllers.Main.errorToken": "Dokumen token keselamatan kini tidak dibentuk.<br>Sila hubungi pentadbir Pelayan Dokumen.",
  "DE.Controllers.Main.errorTokenExpire": "Dokumen token keselamatan telah tamat tempoh.<br>Sila hubungi pentadbir Pelayan Dokumen.",
  "DE.Controllers.Main.errorUpdateVersion": "Versi fail telah berubah. Halaman akan dimuatkan semula.",
-  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Sambungan internet telah dipulihkan, dan versi fail telah berubah.<br>Sebelum anda boleh terus bekerja, anda perlu memuat turun fail atau menyalin kandungannya untuk memastikan tiada ada yang hilang, dan kemudian muat semula halaman ini.",
+  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Sambungan telah dipulihkan, dan versi fail telah berubah.<br>Sebelum anda boleh terus bekerja, anda perlu memuat turun fail atau menyalin kandungannya untuk memastikan tiada ada yang hilang, dan kemudian muat semula halaman ini.",
  "DE.Controllers.Main.errorUserDrop": "Fail tidak boleh diakses sekarang.",
  "DE.Controllers.Main.errorUsersExceed": "Bilangan pengguna yang didizinkan mengikut pelan pembayaran telah lebih",
  "DE.Controllers.Main.errorViewerDisconnect": "Sambungan telah hilang. Anda masih boleh melihat dokumen,<br>tetapi tidak dapat muat turun atau cetaknya sehingga sambungan dipulihkan dan halaman dimuat semua.",
@ -1846,22 +1846,26 @@
  "DE.Views.FormSettings.textCombobox": "Kotak kombo",
  "DE.Views.FormSettings.textConnected": "Medan disambungkan",
  "DE.Views.FormSettings.textDelete": "Padam",
+  "DE.Views.FormSettings.textDigits": "Digit",
  "DE.Views.FormSettings.textDisconnect": "Nyahsambungan",
  "DE.Views.FormSettings.textDropDown": "Juntai bawah",
  "DE.Views.FormSettings.textExact": "tepat sekali",
  "DE.Views.FormSettings.textField": "Medan Teks",
  "DE.Views.FormSettings.textFixed": "Tetapkan saiz medan",
+  "DE.Views.FormSettings.textFormat": "Format",
  "DE.Views.FormSettings.textFromFile": "Dari Fail",
  "DE.Views.FormSettings.textFromStorage": "Dari Simpanan",
  "DE.Views.FormSettings.textFromUrl": "Dari URL",
  "DE.Views.FormSettings.textGroupKey": "Kumpulan kunci",
  "DE.Views.FormSettings.textImage": "Imej",
  "DE.Views.FormSettings.textKey": "Kunci",
+  "DE.Views.FormSettings.textLetters": "Surat",
  "DE.Views.FormSettings.textLock": "Kunci",
  "DE.Views.FormSettings.textMaxChars": "Had aksara",
  "DE.Views.FormSettings.textMulti": "Medan pelbagai garis",
  "DE.Views.FormSettings.textNever": "Tidak pernah",
  "DE.Views.FormSettings.textNoBorder": "Tiada Sempadan",
+  "DE.Views.FormSettings.textNone": "Tiada",
  "DE.Views.FormSettings.textPlaceholder": "Pemegang tempat",
  "DE.Views.FormSettings.textRadiobox": "Butang Radio",
  "DE.Views.FormSettings.textRequired": "Memerlukan",
@ -1882,8 +1886,10 @@
  "DE.Views.FormsTab.capBtnComboBox": "Kotak kombo",
  "DE.Views.FormsTab.capBtnDownloadForm": "Muat turun sebagai oform",
  "DE.Views.FormsTab.capBtnDropDown": "Juntai bawah",
+  "DE.Views.FormsTab.capBtnEmail": "Alamat e-mel",
  "DE.Views.FormsTab.capBtnImage": "Imej",
  "DE.Views.FormsTab.capBtnNext": "Medan seterusnya",
+  "DE.Views.FormsTab.capBtnPhone": "Nombor telefon",
  "DE.Views.FormsTab.capBtnPrev": "Medan Sebelumnya",
  "DE.Views.FormsTab.capBtnRadioBox": "Butang Radio",
  "DE.Views.FormsTab.capBtnSaveForm": "Simpan sebagai oform",
@ -2918,6 +2924,11 @@
  "DE.Views.ViewTab.textRulers": "Pembaris",
  "DE.Views.ViewTab.textStatusBar": "Bar Status",
  "DE.Views.ViewTab.textZoom": "Zum",
+  "DE.Views.ViewTab.tipDarkDocument": "Dokumen gelap",
+  "DE.Views.ViewTab.tipFitToPage": "Muat kepada Halaman",
+  "DE.Views.ViewTab.tipFitToWidth": "Muat kepada Kelebaran",
+  "DE.Views.ViewTab.tipHeadings": "Pengepala",
+  "DE.Views.ViewTab.tipInterfaceTheme": "Tema antara muka",
  "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
  "DE.Views.WatermarkSettingsDialog.textBold": "Tebal",
  "DE.Views.WatermarkSettingsDialog.textColor": "Warna teks",
--- a/apps/documenteditor/main/locale/pt-pt.json
+++ b/apps/documenteditor/main/locale/pt-pt.json
@ -425,14 +425,14 @@
  "Common.Views.ReviewChanges.txtMarkupCap": "Marcação e balões",
  "Common.Views.ReviewChanges.txtMarkupSimple": "Todas as alterações {0}<br>Não há balões",
  "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Apenas marcação",
-  "Common.Views.ReviewChanges.txtNext": "To Next Change",
+  "Common.Views.ReviewChanges.txtNext": "Para a próxima alteração",
  "Common.Views.ReviewChanges.txtOff": "Desligado pra mim",
  "Common.Views.ReviewChanges.txtOffGlobal": "Desligado pra mim e para todos",
  "Common.Views.ReviewChanges.txtOn": "Ligado para mim",
  "Common.Views.ReviewChanges.txtOnGlobal": "Ligado para mim e para todos",
  "Common.Views.ReviewChanges.txtOriginal": "Todas as alterações recusadas {0}",
  "Common.Views.ReviewChanges.txtOriginalCap": "Original",
-  "Common.Views.ReviewChanges.txtPrev": "To Previous Change",
+  "Common.Views.ReviewChanges.txtPrev": "Para a alteração anterior",
  "Common.Views.ReviewChanges.txtPreview": "Pré-visualizar",
  "Common.Views.ReviewChanges.txtReject": "Rejeitar",
  "Common.Views.ReviewChanges.txtRejectAll": "Rejeitar todas as alterações",
--- a/apps/documenteditor/main/locale/pt.json
+++ b/apps/documenteditor/main/locale/pt.json
@ -5,83 +5,83 @@
  "Common.Controllers.ExternalDiagramEditor.textClose": "Fechar",
  "Common.Controllers.ExternalDiagramEditor.warningText": "O objeto está desabilitado por que está sendo editado por outro usuário.",
  "Common.Controllers.ExternalDiagramEditor.warningTitle": "Aviso",
-  "Common.Controllers.ExternalMergeEditor.textAnonymous": "Anonymous",
-  "Common.Controllers.ExternalMergeEditor.textClose": "Close",
-  "Common.Controllers.ExternalMergeEditor.warningText": "The object is disabled because it is being edited by another user.",
-  "Common.Controllers.ExternalMergeEditor.warningTitle": "Warning",
+  "Common.Controllers.ExternalMergeEditor.textAnonymous": "Anônimo",
+  "Common.Controllers.ExternalMergeEditor.textClose": "Fechar",
+  "Common.Controllers.ExternalMergeEditor.warningText": "O objeto está desabilitado por que está sendo editado por outro usuário.",
+  "Common.Controllers.ExternalMergeEditor.warningTitle": "Aviso",
  "Common.Controllers.ExternalOleEditor.textAnonymous": "Anônimo",
  "Common.Controllers.ExternalOleEditor.textClose": "Fechar",
  "Common.Controllers.ExternalOleEditor.warningText": "O objeto está desabilitado por que está sendo editado por outro usuário.",
  "Common.Controllers.ExternalOleEditor.warningTitle": "Aviso",
-  "Common.Controllers.History.notcriticalErrorTitle": "Warning",
+  "Common.Controllers.History.notcriticalErrorTitle": "Aviso",
  "Common.Controllers.ReviewChanges.textAcceptBeforeCompare": "Para comparar os documentos, todas as alterações neles serão consideradas aceitas. Deseja continuar?",
-  "Common.Controllers.ReviewChanges.textAtLeast": "at least",
+  "Common.Controllers.ReviewChanges.textAtLeast": "pelo menos",
  "Common.Controllers.ReviewChanges.textAuto": "auto",
-  "Common.Controllers.ReviewChanges.textBaseline": "Baseline",
-  "Common.Controllers.ReviewChanges.textBold": "Bold",
-  "Common.Controllers.ReviewChanges.textBreakBefore": "Page break before",
-  "Common.Controllers.ReviewChanges.textCaps": "All caps",
+  "Common.Controllers.ReviewChanges.textBaseline": "Linha de base",
+  "Common.Controllers.ReviewChanges.textBold": "Negrito",
+  "Common.Controllers.ReviewChanges.textBreakBefore": "Quebra de página antes",
+  "Common.Controllers.ReviewChanges.textCaps": "Todas maiúsculas",
  "Common.Controllers.ReviewChanges.textCenter": "Alinhar ao centro",
  "Common.Controllers.ReviewChanges.textChar": "Nivel de caracter",
-  "Common.Controllers.ReviewChanges.textChart": "Chart",
-  "Common.Controllers.ReviewChanges.textColor": "Font color",
-  "Common.Controllers.ReviewChanges.textContextual": "Don't add interval between paragraphs of the same style",
+  "Common.Controllers.ReviewChanges.textChart": "Gráfico",
+  "Common.Controllers.ReviewChanges.textColor": "Cor da fonte",
+  "Common.Controllers.ReviewChanges.textContextual": "Não adicionar intervalo entre parágrafos do mesmo estilo",
  "Common.Controllers.ReviewChanges.textDeleted": "<b>Excluído:</b>",
  "Common.Controllers.ReviewChanges.textDStrikeout": "Tachado duplo",
  "Common.Controllers.ReviewChanges.textEquation": "Equação",
-  "Common.Controllers.ReviewChanges.textExact": "exactly",
-  "Common.Controllers.ReviewChanges.textFirstLine": "First line",
-  "Common.Controllers.ReviewChanges.textFontSize": "Font size",
+  "Common.Controllers.ReviewChanges.textExact": "exatamente",
+  "Common.Controllers.ReviewChanges.textFirstLine": "Primeira linha",
+  "Common.Controllers.ReviewChanges.textFontSize": "Tamanho da fonte",
  "Common.Controllers.ReviewChanges.textFormatted": "Formatado",
-  "Common.Controllers.ReviewChanges.textHighlight": "Highlight color",
-  "Common.Controllers.ReviewChanges.textImage": "Image",
-  "Common.Controllers.ReviewChanges.textIndentLeft": "Indent left",
-  "Common.Controllers.ReviewChanges.textIndentRight": "Indent right",
-  "Common.Controllers.ReviewChanges.textInserted": "<b>Inserted:</b>",
-  "Common.Controllers.ReviewChanges.textItalic": "Italic",
+  "Common.Controllers.ReviewChanges.textHighlight": "Cor de realce",
+  "Common.Controllers.ReviewChanges.textImage": "Imagem",
+  "Common.Controllers.ReviewChanges.textIndentLeft": "Recuo à esquerda",
+  "Common.Controllers.ReviewChanges.textIndentRight": "Recuo à direita",
+  "Common.Controllers.ReviewChanges.textInserted": "<b>Inserido:</b>",
+  "Common.Controllers.ReviewChanges.textItalic": "Itálico",
  "Common.Controllers.ReviewChanges.textJustify": "Alinhamento justificado",
-  "Common.Controllers.ReviewChanges.textKeepLines": "Keep lines together",
-  "Common.Controllers.ReviewChanges.textKeepNext": "Keep with next",
+  "Common.Controllers.ReviewChanges.textKeepLines": "Manter as linhas juntas",
+  "Common.Controllers.ReviewChanges.textKeepNext": "Manter com o próximo",
  "Common.Controllers.ReviewChanges.textLeft": "Alinhar à esquerda",
-  "Common.Controllers.ReviewChanges.textLineSpacing": "Line Spacing: ",
-  "Common.Controllers.ReviewChanges.textMultiple": "multiple",
-  "Common.Controllers.ReviewChanges.textNoBreakBefore": "No page break before",
+  "Common.Controllers.ReviewChanges.textLineSpacing": "Espaçamento de linha:",
+  "Common.Controllers.ReviewChanges.textMultiple": "múltiplo",
+  "Common.Controllers.ReviewChanges.textNoBreakBefore": "Sem quebra de página antes",
  "Common.Controllers.ReviewChanges.textNoContextual": "Adicionar intervalo entre parágrafos do mesmo estilo",
-  "Common.Controllers.ReviewChanges.textNoKeepLines": "Don't keep lines together",
-  "Common.Controllers.ReviewChanges.textNoKeepNext": "Don't keep with next",
-  "Common.Controllers.ReviewChanges.textNot": "Not ",
-  "Common.Controllers.ReviewChanges.textNoWidow": "No widow control",
-  "Common.Controllers.ReviewChanges.textNum": "Change numbering",
+  "Common.Controllers.ReviewChanges.textNoKeepLines": "Não mantenha linhas juntas",
+  "Common.Controllers.ReviewChanges.textNoKeepNext": "Não mantenha com o próximo",
+  "Common.Controllers.ReviewChanges.textNot": "Não",
+  "Common.Controllers.ReviewChanges.textNoWidow": "Sem controle de linhas órfãs/viúvas",
+  "Common.Controllers.ReviewChanges.textNum": "Alterar numeração",
  "Common.Controllers.ReviewChanges.textOff": "{0} não está mais usando o controle de alterações.",
  "Common.Controllers.ReviewChanges.textOffGlobal": "{0} Rastreamento de alterações desabilitado para todos. ",
  "Common.Controllers.ReviewChanges.textOn": "{0} usando controle de alterações. ",
  "Common.Controllers.ReviewChanges.textOnGlobal": "{0} Rastreamento de alterações habilitado para todos. ",
  "Common.Controllers.ReviewChanges.textParaDeleted": "<b>Parágrafo apagado</b>",
-  "Common.Controllers.ReviewChanges.textParaFormatted": "Paragraph Formatted",
+  "Common.Controllers.ReviewChanges.textParaFormatted": "Parágrafo formatado",
  "Common.Controllers.ReviewChanges.textParaInserted": "<b>Parágrafo Inserido</b>",
  "Common.Controllers.ReviewChanges.textParaMoveFromDown": "<b>Movido Para Baixo:</b>",
  "Common.Controllers.ReviewChanges.textParaMoveFromUp": "<b>Movido Para Cima:</b>",
  "Common.Controllers.ReviewChanges.textParaMoveTo": "<b>Movido:</b>",
-  "Common.Controllers.ReviewChanges.textPosition": "Position",
+  "Common.Controllers.ReviewChanges.textPosition": "Posição",
  "Common.Controllers.ReviewChanges.textRight": "Alinhar à direita",
-  "Common.Controllers.ReviewChanges.textShape": "Shape",
-  "Common.Controllers.ReviewChanges.textShd": "Background color",
+  "Common.Controllers.ReviewChanges.textShape": "Forma",
+  "Common.Controllers.ReviewChanges.textShd": "Cor do plano de fundo",
  "Common.Controllers.ReviewChanges.textShow": "Mostrar mudanças em",
-  "Common.Controllers.ReviewChanges.textSmallCaps": "Small caps",
-  "Common.Controllers.ReviewChanges.textSpacing": "Spacing",
-  "Common.Controllers.ReviewChanges.textSpacingAfter": "Spacing after",
-  "Common.Controllers.ReviewChanges.textSpacingBefore": "Spacing before",
+  "Common.Controllers.ReviewChanges.textSmallCaps": "Versalete",
+  "Common.Controllers.ReviewChanges.textSpacing": "Espaçamento",
+  "Common.Controllers.ReviewChanges.textSpacingAfter": "Espaçamento depois",
+  "Common.Controllers.ReviewChanges.textSpacingBefore": "Espaçamento antes",
  "Common.Controllers.ReviewChanges.textStrikeout": "Taxado",
-  "Common.Controllers.ReviewChanges.textSubScript": "Subscript",
-  "Common.Controllers.ReviewChanges.textSuperScript": "Superscript",
+  "Common.Controllers.ReviewChanges.textSubScript": "Subscrito",
+  "Common.Controllers.ReviewChanges.textSuperScript": "Sobrescrito",
  "Common.Controllers.ReviewChanges.textTableChanged": "<b>Configurações da Tabela Alteradas</b>",
  "Common.Controllers.ReviewChanges.textTableRowsAdd": "<b>Linhas da Tabela Incluídas</b>",
  "Common.Controllers.ReviewChanges.textTableRowsDel": "<b>Linhas da Tabela Excluídas</b>",
-  "Common.Controllers.ReviewChanges.textTabs": "Change tabs",
+  "Common.Controllers.ReviewChanges.textTabs": "Alterar guias",
  "Common.Controllers.ReviewChanges.textTitleComparison": "Configurações de Comparação",
-  "Common.Controllers.ReviewChanges.textUnderline": "Underline",
+  "Common.Controllers.ReviewChanges.textUnderline": "Sublinhado",
  "Common.Controllers.ReviewChanges.textUrl": "Colar um arquivo URL",
-  "Common.Controllers.ReviewChanges.textWidow": "Widow control",
+  "Common.Controllers.ReviewChanges.textWidow": "Controle de linhas órfãs/viúvas",
  "Common.Controllers.ReviewChanges.textWord": "Nível de palavra",
  "Common.define.chartData.textArea": "Área",
  "Common.define.chartData.textAreaStacked": "Área empilhada",
@ -290,7 +290,7 @@
  "Common.Views.ExternalDiagramEditor.textClose": "Fechar",
  "Common.Views.ExternalDiagramEditor.textSave": "Salvar e Sair",
  "Common.Views.ExternalDiagramEditor.textTitle": "Editor de gráfico",
-  "Common.Views.ExternalMergeEditor.textClose": "Close",
+  "Common.Views.ExternalMergeEditor.textClose": "Fechar",
  "Common.Views.ExternalMergeEditor.textSave": "Save & Exit",
  "Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recepients",
  "Common.Views.ExternalOleEditor.textClose": "Fechar",
@ -305,7 +305,7 @@
  "Common.Views.Header.textHideStatusBar": "Ocultar Barra de Status",
  "Common.Views.Header.textRemoveFavorite": "Remover dos Favoritos",
  "Common.Views.Header.textShare": "Compartilhar",
-  "Common.Views.Header.textZoom": "Zoom",
+  "Common.Views.Header.textZoom": "Ampliação",
  "Common.Views.Header.tipAccessRights": "Gerenciar direitos de acesso ao documento",
  "Common.Views.Header.tipDownload": "Baixar arquivo",
  "Common.Views.Header.tipGoEdit": "Editar arquivo atual",
@ -403,7 +403,7 @@
  "Common.Views.ReviewChanges.txtAcceptChanges": "Aceitar as alterações",
  "Common.Views.ReviewChanges.txtAcceptCurrent": "Aceitar alterações atuais",
  "Common.Views.ReviewChanges.txtChat": "Chat",
-  "Common.Views.ReviewChanges.txtClose": "Close",
+  "Common.Views.ReviewChanges.txtClose": "Fechar",
  "Common.Views.ReviewChanges.txtCoAuthMode": "Modo de Coedição",
  "Common.Views.ReviewChanges.txtCommentRemAll": "Excluir Todos os Comentários",
  "Common.Views.ReviewChanges.txtCommentRemCurrent": "Excluir comentários atuais",
@ -425,14 +425,14 @@
  "Common.Views.ReviewChanges.txtMarkupCap": "Marcação",
  "Common.Views.ReviewChanges.txtMarkupSimple": "Todas as mudanças {0}<br>Não há balões",
  "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Somente marcação",
-  "Common.Views.ReviewChanges.txtNext": "To Next Change",
+  "Common.Views.ReviewChanges.txtNext": "Para a próxima alteração",
  "Common.Views.ReviewChanges.txtOff": "Desligado pra mim",
  "Common.Views.ReviewChanges.txtOffGlobal": "Desligado pra mim e para todos",
  "Common.Views.ReviewChanges.txtOn": "Ligado pra mim",
  "Common.Views.ReviewChanges.txtOnGlobal": "Ligado para mim e para todos",
  "Common.Views.ReviewChanges.txtOriginal": "Todas as alterações rejeitadas {0}",
  "Common.Views.ReviewChanges.txtOriginalCap": "Original",
-  "Common.Views.ReviewChanges.txtPrev": "To Previous Change",
+  "Common.Views.ReviewChanges.txtPrev": "Para a alteração anterior",
  "Common.Views.ReviewChanges.txtPreview": "Pré-visualizar",
  "Common.Views.ReviewChanges.txtReject": "Rejeitar",
  "Common.Views.ReviewChanges.txtRejectAll": "Rejeitar todas as alterações",
@ -471,6 +471,7 @@
  "Common.Views.SaveAsDlg.textTitle": "Pasta para salvar",
  "Common.Views.SearchPanel.textCaseSensitive": "Maiúsculas e Minúsculas",
  "Common.Views.SearchPanel.textCloseSearch": "Fechar pesquisa",
+  "Common.Views.SearchPanel.textContentChanged": "Documento alterado.",
  "Common.Views.SearchPanel.textFind": "Localizar",
  "Common.Views.SearchPanel.textFindAndReplace": "Localizar e substituir",
  "Common.Views.SearchPanel.textMatchUsingRegExp": "Corresponder usando expressões regulares",
@ -479,6 +480,7 @@
  "Common.Views.SearchPanel.textReplace": "Substituir",
  "Common.Views.SearchPanel.textReplaceAll": "Substituir tudo",
  "Common.Views.SearchPanel.textReplaceWith": "Substituir com",
+  "Common.Views.SearchPanel.textSearchAgain": "{0}Realize uma nova pesquisa{1} para obter resultados precisos.",
  "Common.Views.SearchPanel.textSearchHasStopped": "A pesquisa parou",
  "Common.Views.SearchPanel.textSearchResults": "Resultados da pesquisa: {0}/{1}",
  "Common.Views.SearchPanel.textTooManyResults": "Há muitos resultados para mostrar aqui",
@ -541,9 +543,9 @@
  "Common.Views.UserNameDialog.textDontShow": "Não perguntar novamente",
  "Common.Views.UserNameDialog.textLabel": "Rótulo:",
  "Common.Views.UserNameDialog.textLabelError": "O rótulo não pode estar vazio.",
-  "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.leavePageText": "Todas as alterações não salvas neste documento serão perdidas.<br> Clique em \"Cancelar\" e depois em \"Salvar\" para salvá-las. Clique em \"OK\" para descartar todas as alterações não salvas.",
  "DE.Controllers.LeftMenu.newDocumentTitle": "Documento sem nome",
-  "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
+  "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Aviso",
  "DE.Controllers.LeftMenu.requestEditRightsText": "Solicitando direitos de edição...",
  "DE.Controllers.LeftMenu.textLoadHistory": "Carregando o histórico de versões...",
  "DE.Controllers.LeftMenu.textNoTextFound": "Os dados que você tem estado procurando não podem ser encontrados. Ajuste suas opções de pesquisa.",
@ -551,7 +553,7 @@
  "DE.Controllers.LeftMenu.textReplaceSuccess": "A pesquisa foi realizada. Ocorrências substituídas: {0}",
  "DE.Controllers.LeftMenu.txtCompatible": "O documento será salvo em novo formato. Isto permitirá usar todos os recursos de editor, mas pode afetar o layout do documento. <br> Use a opção de 'Compatibilidade' para configurações avançadas se deseja tornar o arquivo compatível com versões antigas do MS Word.",
  "DE.Controllers.LeftMenu.txtUntitled": "Sem título",
-  "DE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?",
+  "DE.Controllers.LeftMenu.warnDownloadAs": "Se você continuar salvando neste formato algumas formatações podem ser perdidas.<br>Você tem certeza que deseja continuar?",
  "DE.Controllers.LeftMenu.warnDownloadAsPdf": "O documento resultante será otimizado para permitir que você edite o texto, portanto, não gráficos exatamente iguais ao original, se o arquivo original contiver muitos gráficos.",
  "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Se você continuar salvando neste formato algumas formatações podem ser perdidas.<br>Você tem certeza que deseja continuar?",
  "DE.Controllers.LeftMenu.warnReplaceString": "{0} não é um caractere especial válido para o campo de substituição.",
@ -597,6 +599,7 @@
  "DE.Controllers.Main.errorSetPassword": "Não foi possível definir a senha.",
  "DE.Controllers.Main.errorStockChart": "Ordem da linha incorreta. Para criar um gráfico de ações coloque os dados na planilha na seguinte ordem:<br>preço de abertura, preço máx., preço mín., preço de fechamento.",
  "DE.Controllers.Main.errorSubmit": "Falha no envio.",
+  "DE.Controllers.Main.errorTextFormWrongFormat": "O valor inserido não corresponde ao formato do campo.",
  "DE.Controllers.Main.errorToken": "O token de segurança do documento não foi formado corretamente. <br> Entre em contato com o administrador do Document Server.",
  "DE.Controllers.Main.errorTokenExpire": "O token de segurança do documento expirou. <br> Entre em contato com o administrador do Document Server.",
  "DE.Controllers.Main.errorUpdateVersion": "A versão do arquivo foi alterada. A página será recarregada.",
@ -944,8 +947,8 @@
  "DE.Controllers.Statusbar.textSetTrackChanges": "Você está em modo de rastreamento de alterações",
  "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
  "DE.Controllers.Statusbar.tipReview": "Rastrear alterações",
-  "DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
-  "DE.Controllers.Toolbar.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?",
+  "DE.Controllers.Statusbar.zoomText": "Ampliação {0}%",
+  "DE.Controllers.Toolbar.confirmAddFontName": "A fonte que você vai salvar não está disponível no dispositivo atual.<br>O estilo de texto será exibido usando uma das fontes do sistema, a fonte salva será usada quando ela estiver disponível.<br>Você deseja continuar?",
  "DE.Controllers.Toolbar.dataUrl": "Colar uma URL de dados",
  "DE.Controllers.Toolbar.notcriticalErrorTitle": "Aviso",
  "DE.Controllers.Toolbar.textAccent": "Destaques",
@ -1712,7 +1715,7 @@
  "DE.Views.FileMenu.btnCloseMenuCaption": "Fechar menu",
  "DE.Views.FileMenu.btnCreateNewCaption": "Criar novo",
  "DE.Views.FileMenu.btnDownloadCaption": "Baixar como",
-  "DE.Views.FileMenu.btnExitCaption": "Encerrar",
+  "DE.Views.FileMenu.btnExitCaption": "Fechar",
  "DE.Views.FileMenu.btnFileOpenCaption": "Abrir",
  "DE.Views.FileMenu.btnHelpCaption": "Ajuda",
  "DE.Views.FileMenu.btnHistoryCaption": "Histórico de Versão",
@ -1844,6 +1847,7 @@
  "DE.Views.FormSettings.textColor": "Cor da borda",
  "DE.Views.FormSettings.textComb": "Conjunto de Caracteres",
  "DE.Views.FormSettings.textCombobox": "Caixa de combinação",
+  "DE.Views.FormSettings.textComplex": "Campo complexo",
  "DE.Views.FormSettings.textConnected": "Campos conectados",
  "DE.Views.FormSettings.textDelete": "Excluir",
  "DE.Views.FormSettings.textDigits": "Dígitos",
@ -1852,13 +1856,17 @@
  "DE.Views.FormSettings.textExact": "Exatamente",
  "DE.Views.FormSettings.textField": "Campo de texto",
  "DE.Views.FormSettings.textFixed": "Campo de tamanho fixo",
+  "DE.Views.FormSettings.textFormat": "Formato",
+  "DE.Views.FormSettings.textFormatSymbols": "Símbolos permitidos",
  "DE.Views.FormSettings.textFromFile": "Do Arquivo",
  "DE.Views.FormSettings.textFromStorage": "De armazenamento",
  "DE.Views.FormSettings.textFromUrl": "Da URL",
  "DE.Views.FormSettings.textGroupKey": "Chave de grupo",
  "DE.Views.FormSettings.textImage": "Imagem",
  "DE.Views.FormSettings.textKey": "Chave",
+  "DE.Views.FormSettings.textLetters": "Cartas",
  "DE.Views.FormSettings.textLock": "Bloquear",
+  "DE.Views.FormSettings.textMask": "Máscara arbitrária",
  "DE.Views.FormSettings.textMaxChars": "Limite de caracteres",
  "DE.Views.FormSettings.textMulti": "Campo multilinha",
  "DE.Views.FormSettings.textNever": "Nunca",
@ -1866,6 +1874,7 @@
  "DE.Views.FormSettings.textNone": "Nenhum",
  "DE.Views.FormSettings.textPlaceholder": "Marcador de posição",
  "DE.Views.FormSettings.textRadiobox": "Botao de radio",
+  "DE.Views.FormSettings.textReg": "Expressão regular",
  "DE.Views.FormSettings.textRequired": "Necessário",
  "DE.Views.FormSettings.textScale": "Quando escalar",
  "DE.Views.FormSettings.textSelectImage": "Selecionar Imagem",
@ -1882,6 +1891,7 @@
  "DE.Views.FormSettings.textWidth": "Largura da célula",
  "DE.Views.FormsTab.capBtnCheckBox": "Caixa de seleção",
  "DE.Views.FormsTab.capBtnComboBox": "Caixa de combinação",
+  "DE.Views.FormsTab.capBtnComplex": "Campo complexo",
  "DE.Views.FormsTab.capBtnDownloadForm": "Baixe como oform",
  "DE.Views.FormsTab.capBtnDropDown": "Suspenso",
  "DE.Views.FormsTab.capBtnEmail": "Endereço de e-mail",
@ -1904,10 +1914,13 @@
  "DE.Views.FormsTab.textSubmited": "Formulário enviado com sucesso",
  "DE.Views.FormsTab.tipCheckBox": "Inserir caixa de seleção",
  "DE.Views.FormsTab.tipComboBox": "Inserir caixa de combinação",
+  "DE.Views.FormsTab.tipComplexField": "Inserir campo complexo",
  "DE.Views.FormsTab.tipDownloadForm": "Baixar um arquivo como um documento FORM preenchível",
  "DE.Views.FormsTab.tipDropDown": "Inserir lista suspensa",
+  "DE.Views.FormsTab.tipEmailField": "Inserir endereço de e-mail",
  "DE.Views.FormsTab.tipImageField": "Inserir imagem",
  "DE.Views.FormsTab.tipNextForm": "Ir para o próximo campo",
+  "DE.Views.FormsTab.tipPhoneField": "Inserir número de telefone",
  "DE.Views.FormsTab.tipPrevForm": "Ir para o campo anterior",
  "DE.Views.FormsTab.tipRadioBox": "Inserir botão de rádio",
  "DE.Views.FormsTab.tipSaveForm": "Salvar um arquivo como um documento OFORM preenchível",
@ -2082,7 +2095,7 @@
  "DE.Views.LineNumbersDialog.textSection": "Seção atual",
  "DE.Views.LineNumbersDialog.textStartAt": "Começar em",
  "DE.Views.LineNumbersDialog.textTitle": "Números de Linhas",
-  "DE.Views.LineNumbersDialog.txtAutoText": "Auto",
+  "DE.Views.LineNumbersDialog.txtAutoText": "Automático",
  "DE.Views.Links.capBtnAddText": "Adicionar Texto",
  "DE.Views.Links.capBtnBookmarks": "Favorito",
  "DE.Views.Links.capBtnCaption": "Legenda",
@ -2151,11 +2164,11 @@
  "DE.Views.MailMergeEmailDlg.textSubject": "Subject Line",
  "DE.Views.MailMergeEmailDlg.textTitle": "Send to Email",
  "DE.Views.MailMergeEmailDlg.textTo": "To",
-  "DE.Views.MailMergeEmailDlg.textWarning": "Warning!",
+  "DE.Views.MailMergeEmailDlg.textWarning": "Aviso!",
  "DE.Views.MailMergeEmailDlg.textWarningMsg": "Por favor, observe que o envio não poderá ser parado após clicar o botão 'Enviar'.",
  "DE.Views.MailMergeSettings.downloadMergeTitle": "Merging",
  "DE.Views.MailMergeSettings.errorMailMergeSaveFile": "Merge failed.",
-  "DE.Views.MailMergeSettings.notcriticalErrorTitle": "Warning",
+  "DE.Views.MailMergeSettings.notcriticalErrorTitle": "Aviso",
  "DE.Views.MailMergeSettings.textAddRecipients": "Add some recipients to the list first",
  "DE.Views.MailMergeSettings.textAll": "Todos os registros",
  "DE.Views.MailMergeSettings.textCurrent": "Registro atual",
@ -2464,7 +2477,7 @@
  "DE.Views.Statusbar.tipHandTool": "Ferramenta de mão",
  "DE.Views.Statusbar.tipSelectTool": "Selecionar ferramenta",
  "DE.Views.Statusbar.tipSetLang": "Definir idioma do texto",
-  "DE.Views.Statusbar.tipZoomFactor": "Zoom",
+  "DE.Views.Statusbar.tipZoomFactor": "Ampliação",
  "DE.Views.Statusbar.tipZoomIn": "Ampliar",
  "DE.Views.Statusbar.tipZoomOut": "Reduzir",
  "DE.Views.Statusbar.txtPageNumInvalid": "Número da página inválido",
@ -2653,22 +2666,22 @@
  "DE.Views.TextArtSettings.strTransparency": "Opacity",
  "DE.Views.TextArtSettings.strType": "Tipo",
  "DE.Views.TextArtSettings.textAngle": "Ângulo",
-  "DE.Views.TextArtSettings.textBorderSizeErr": "The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.",
-  "DE.Views.TextArtSettings.textColor": "Color Fill",
-  "DE.Views.TextArtSettings.textDirection": "Direction",
+  "DE.Views.TextArtSettings.textBorderSizeErr": "O valor inserido está incorreto.<br>Insira um valor entre 0 pt e 1.584 pt.",
+  "DE.Views.TextArtSettings.textColor": "Preenchimento de cor",
+  "DE.Views.TextArtSettings.textDirection": "Direção",
  "DE.Views.TextArtSettings.textGradient": "Pontos de gradiente",
-  "DE.Views.TextArtSettings.textGradientFill": "Gradient Fill",
+  "DE.Views.TextArtSettings.textGradientFill": "Preenchimento gradiente",
  "DE.Views.TextArtSettings.textLinear": "Linear",
  "DE.Views.TextArtSettings.textNoFill": "No Fill",
  "DE.Views.TextArtSettings.textPosition": "Posição",
  "DE.Views.TextArtSettings.textRadial": "Radial",
-  "DE.Views.TextArtSettings.textSelectTexture": "Select",
-  "DE.Views.TextArtSettings.textStyle": "Style",
-  "DE.Views.TextArtSettings.textTemplate": "Template",
+  "DE.Views.TextArtSettings.textSelectTexture": "Selecionar",
+  "DE.Views.TextArtSettings.textStyle": "Estilo",
+  "DE.Views.TextArtSettings.textTemplate": "Modelo",
  "DE.Views.TextArtSettings.textTransform": "Transform",
  "DE.Views.TextArtSettings.tipAddGradientPoint": "Adicionar ponto de gradiente",
  "DE.Views.TextArtSettings.tipRemoveGradientPoint": "Remover ponto de gradiente",
-  "DE.Views.TextArtSettings.txtNoBorders": "No Line",
+  "DE.Views.TextArtSettings.txtNoBorders": "Sem linha",
  "DE.Views.TextToTableDialog.textAutofit": "Comportamento de Auto-ajuste",
  "DE.Views.TextToTableDialog.textColumns": "Colunas",
  "DE.Views.TextToTableDialog.textContents": "Adaptação automática ao conteúdo",
@ -2793,7 +2806,7 @@
  "DE.Views.Toolbar.textStyleMenuDelete": "Excluir estilo",
  "DE.Views.Toolbar.textStyleMenuDeleteAll": "Excluir todos os estilos personalizados",
  "DE.Views.Toolbar.textStyleMenuNew": "New style from selection",
-  "DE.Views.Toolbar.textStyleMenuRestore": "Restore to default",
+  "DE.Views.Toolbar.textStyleMenuRestore": "Restaurar padrão",
  "DE.Views.Toolbar.textStyleMenuRestoreAll": "Restore all to default styles",
  "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection",
  "DE.Views.Toolbar.textSubscript": "Subscrito",
@ -2862,6 +2875,10 @@
  "DE.Views.Toolbar.tipMarkersFSquare": "Balas quadradas cheias",
  "DE.Views.Toolbar.tipMarkersHRound": "Balas redondas ocas",
  "DE.Views.Toolbar.tipMarkersStar": "Balas de estrelas",
+  "DE.Views.Toolbar.tipMultiLevelArticl": "Artigos numerados em vários níveis",
+  "DE.Views.Toolbar.tipMultiLevelChapter": "Capítulos numerados em vários níveis",
+  "DE.Views.Toolbar.tipMultiLevelHeadings": "Títulos numerados em vários níveis",
+  "DE.Views.Toolbar.tipMultiLevelHeadVarious": "Vários títulos numerados de vários níveis",
  "DE.Views.Toolbar.tipMultiLevelNumbered": "Marcadores numerados de vários níveis",
  "DE.Views.Toolbar.tipMultilevels": "Contorno",
  "DE.Views.Toolbar.tipMultiLevelSymbols": "Marcadores de símbolos de vários níveis",
@ -2921,7 +2938,7 @@
  "DE.Views.ViewTab.textOutline": "Cabeçalhos",
  "DE.Views.ViewTab.textRulers": "Regras",
  "DE.Views.ViewTab.textStatusBar": "Barra de status",
-  "DE.Views.ViewTab.textZoom": "Zoom",
+  "DE.Views.ViewTab.textZoom": "Ampliação",
  "DE.Views.ViewTab.tipDarkDocument": "Documento escuro",
  "DE.Views.ViewTab.tipFitToPage": "Ajustar a página",
  "DE.Views.ViewTab.tipFitToWidth": "Ajustar largura",
--- a/apps/documenteditor/main/locale/ru.json
+++ b/apps/documenteditor/main/locale/ru.json
@ -2579,6 +2579,14 @@
  "DE.Views.TableSettings.txtTable_ListTable": "Список-таблица",
  "DE.Views.TableSettings.txtTable_PlainTable": "Таблица простая",
  "DE.Views.TableSettings.txtTable_TableGrid": "Сетка таблицы",
+  "DE.Views.TableSettings.txtTable_Lined": "C подкладкой",
+  "DE.Views.TableSettings.txtTable_Bordered": "C границей",
+  "DE.Views.TableSettings.txtTable_BorderedAndLined": "C границей и подкладкой",
+  "DE.Views.TableSettings.txtGroupTable_Custom": "Пользовательский", 
+  "DE.Views.TableSettings.txtGroupTable_Plain": "Таблицы простые", 
+  "DE.Views.TableSettings.txtGroupTable_Grid": "Таблицы сеткой", 
+  "DE.Views.TableSettings.txtGroupTable_List": "Таблицы списком", 
+  "DE.Views.TableSettings.txtGroupTable_BorderedAndLined": "Таблицы с границей и подкладкой", 
  "DE.Views.TableSettingsAdvanced.textAlign": "Выравнивание",
  "DE.Views.TableSettingsAdvanced.textAlignment": "Выравнивание",
  "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Интервалы между ячейками",
@ -2875,9 +2883,13 @@
  "DE.Views.Toolbar.tipMarkersFSquare": "Заполненные квадратные маркеры",
  "DE.Views.Toolbar.tipMarkersHRound": "Пустые круглые маркеры",
  "DE.Views.Toolbar.tipMarkersStar": "Маркеры-звездочки",
+  "DE.Views.Toolbar.tipMultiLevelArticl": "Многоуровневые нумерованные статьи",
+  "DE.Views.Toolbar.tipMultiLevelChapter": "Многоуровневые нумерованные главы",
+  "DE.Views.Toolbar.tipMultiLevelHeadings": "Многоуровневые нумерованные заголовки",
+  "DE.Views.Toolbar.tipMultiLevelHeadVarious": "Многоуровневые разные нумерованные заголовки",
  "DE.Views.Toolbar.tipMultiLevelNumbered": "Многоуровневые нумерованные маркеры",
  "DE.Views.Toolbar.tipMultilevels": "Многоуровневый список",
-  "DE.Views.Toolbar.tipMultiLevelSymbols": "Многоуровневые маркеры-сивволы",
+  "DE.Views.Toolbar.tipMultiLevelSymbols": "Многоуровневые маркеры-символы",
  "DE.Views.Toolbar.tipMultiLevelVarious": "Многоуровневые разные нумерованные маркеры",
  "DE.Views.Toolbar.tipNumbers": "Нумерованный список",
  "DE.Views.Toolbar.tipPageBreak": "Вставить разрыв страницы или раздела",
--- a/apps/documenteditor/main/locale/zh-tw.json
+++ b/apps/documenteditor/main/locale/zh-tw.json
@ -2924,6 +2924,8 @@
  "DE.Views.ViewTab.textStatusBar": "狀態欄",
  "DE.Views.ViewTab.textZoom": "放大",
  "DE.Views.ViewTab.tipDarkDocument": "夜間模式文件",
+  "DE.Views.ViewTab.tipFitToPage": "配合紙張大小",
+  "DE.Views.ViewTab.tipFitToWidth": "配合寬度",
  "DE.Views.ViewTab.tipHeadings": "標題",
  "DE.Views.ViewTab.tipInterfaceTheme": "介面主題",
  "DE.Views.WatermarkSettingsDialog.textAuto": "自動",
--- a/apps/documenteditor/main/locale/zh.json
+++ b/apps/documenteditor/main/locale/zh.json
@ -599,6 +599,7 @@
  "DE.Controllers.Main.errorSetPassword": "未能成功设置密码",
  "DE.Controllers.Main.errorStockChart": "行顺序不正确。建立股票图表将数据按照以下顺序放置在表格上：<br>开盘价，最高价格，最低价格，收盘价。",
  "DE.Controllers.Main.errorSubmit": "提交失败",
+  "DE.Controllers.Main.errorTextFormWrongFormat": "输入的值与该字段的格式不一致。",
  "DE.Controllers.Main.errorToken": "文档安全令牌未正确形成。<br>请与您的文件服务器管理员联系。",
  "DE.Controllers.Main.errorTokenExpire": "文档安全令牌已过期。<br>请与您的文档服务器管理员联系。",
  "DE.Controllers.Main.errorUpdateVersion": "该文件版本已经改变了。该页面将被重新加载。",
@ -1846,6 +1847,7 @@
  "DE.Views.FormSettings.textColor": "边框颜色",
  "DE.Views.FormSettings.textComb": "字符组合",
  "DE.Views.FormSettings.textCombobox": "\n组合框",
+  "DE.Views.FormSettings.textComplex": "复合字段",
  "DE.Views.FormSettings.textConnected": "关联字段",
  "DE.Views.FormSettings.textDelete": "删除",
  "DE.Views.FormSettings.textDigits": "数字",
@ -1855,19 +1857,24 @@
  "DE.Views.FormSettings.textField": "文字字段",
  "DE.Views.FormSettings.textFixed": "固定填充框大小",
  "DE.Views.FormSettings.textFormat": "格式",
+  "DE.Views.FormSettings.textFormatSymbols": "可用符号",
  "DE.Views.FormSettings.textFromFile": "从文件导入",
  "DE.Views.FormSettings.textFromStorage": "来自存储设备",
  "DE.Views.FormSettings.textFromUrl": "从URL",
  "DE.Views.FormSettings.textGroupKey": "群组密钥",
  "DE.Views.FormSettings.textImage": "图片",
  "DE.Views.FormSettings.textKey": "密钥",
+  "DE.Views.FormSettings.textLetters": "文字",
  "DE.Views.FormSettings.textLock": "锁定",
+  "DE.Views.FormSettings.textMask": "任意掩码",
  "DE.Views.FormSettings.textMaxChars": "字数限制",
  "DE.Views.FormSettings.textMulti": "多行填充框",
  "DE.Views.FormSettings.textNever": "从不",
  "DE.Views.FormSettings.textNoBorder": "无边框",
+  "DE.Views.FormSettings.textNone": "无",
  "DE.Views.FormSettings.textPlaceholder": "占位符",
  "DE.Views.FormSettings.textRadiobox": "单选框",
+  "DE.Views.FormSettings.textReg": "正则表达式",
  "DE.Views.FormSettings.textRequired": "必填",
  "DE.Views.FormSettings.textScale": "何时按倍缩放？",
  "DE.Views.FormSettings.textSelectImage": "选择图像",
@ -1884,11 +1891,13 @@
  "DE.Views.FormSettings.textWidth": "单元格宽度",
  "DE.Views.FormsTab.capBtnCheckBox": "多选框",
  "DE.Views.FormsTab.capBtnComboBox": "组合框",
+  "DE.Views.FormsTab.capBtnComplex": "复合字段",
  "DE.Views.FormsTab.capBtnDownloadForm": "下载为oform",
  "DE.Views.FormsTab.capBtnDropDown": "候选列表",
  "DE.Views.FormsTab.capBtnEmail": "Email地址",
  "DE.Views.FormsTab.capBtnImage": "图片",
  "DE.Views.FormsTab.capBtnNext": "下一填充框",
+  "DE.Views.FormsTab.capBtnPhone": "电话号码",
  "DE.Views.FormsTab.capBtnPrev": "上一填充框",
  "DE.Views.FormsTab.capBtnRadioBox": "单选框",
  "DE.Views.FormsTab.capBtnSaveForm": "另存为oform",
@ -1905,10 +1914,13 @@
  "DE.Views.FormsTab.textSubmited": "成功提交表单",
  "DE.Views.FormsTab.tipCheckBox": "插入多选框",
  "DE.Views.FormsTab.tipComboBox": "插入组合框",
+  "DE.Views.FormsTab.tipComplexField": "插入复合字段",
  "DE.Views.FormsTab.tipDownloadForm": "下载一个文件填写",
  "DE.Views.FormsTab.tipDropDown": "插入候选列表",
+  "DE.Views.FormsTab.tipEmailField": "插入电邮地址",
  "DE.Views.FormsTab.tipImageField": "插入图片",
  "DE.Views.FormsTab.tipNextForm": "前往下一填充框",
+  "DE.Views.FormsTab.tipPhoneField": "插入电话号码",
  "DE.Views.FormsTab.tipPrevForm": "回到上一填充框",
  "DE.Views.FormsTab.tipRadioBox": "添加单选框",
  "DE.Views.FormsTab.tipSaveForm": "将文件保存为可填充的OFORM文件",
@ -2863,6 +2875,10 @@
  "DE.Views.Toolbar.tipMarkersFSquare": "实心方形项目符号",
  "DE.Views.Toolbar.tipMarkersHRound": "空心圆形项目符号",
  "DE.Views.Toolbar.tipMarkersStar": "星形项目符号",
+  "DE.Views.Toolbar.tipMultiLevelArticl": "多层次编号的文章",
+  "DE.Views.Toolbar.tipMultiLevelChapter": "多层次编号的章节",
+  "DE.Views.Toolbar.tipMultiLevelHeadings": "多层次编号的标题",
+  "DE.Views.Toolbar.tipMultiLevelHeadVarious": "多层次各种编号的标题",
  "DE.Views.Toolbar.tipMultiLevelNumbered": "多级编号",
  "DE.Views.Toolbar.tipMultilevels": "多级列表",
  "DE.Views.Toolbar.tipMultiLevelSymbols": "多级项目符号",
--- a/apps/documenteditor/main/resources/less/rightmenu.less
+++ b/apps/documenteditor/main/resources/less/rightmenu.less
@ -168,3 +168,25 @@
        margin-top: 4px;
    }
 }
+
+#id-table-menu-template {
+    .group-description {
+        padding: 3px 0 3px 10px;
+        .font-weight-bold();
+        
+    } 
+
+    .group-items-container {
+        .item {
+            &:hover {
+                .box-shadow(0 0 0 2px @border-preview-hover-ie) !important;
+                .box-shadow(0 0 0 @scaled-two-px-value @border-preview-hover) !important;
+            }
+      
+            &.selected {
+                .box-shadow(0 0 0 2px @border-preview-select-ie) !important;
+                .box-shadow(0 0 0 @scaled-two-px-value @border-preview-select) !important;
+            }
+        }
+    }
+}
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@ -83,6 +83,7 @@
        &.disabled {
            > .item {
                cursor: default;
+                opacity: @component-disabled-opacity-ie;
                opacity: @component-disabled-opacity;

                &:hover {
--- a/Show more
+++ b/Show more