Merge branch 'develop' into feature/bug-43143

2022-10-11 12:06:26 +03:00 · 2022-10-11 12:06:26 +03:00 · 2353327dd9
parent de8b8159cd 520762cc68
commit 2353327dd9
1429 changed files with 21554 additions and 13107 deletions
--- a/apps/api/documents/api.js
+++ b/apps/api/documents/api.js
@ -23,6 +23,7 @@
                options: <advanced options>,
                key: 'key',
                vkey: 'vkey',
+                referenceData: 'data for external paste',
                info: {
                    owner: 'owner name',
                    folder: 'path to document',
@ -263,6 +264,7 @@
                'onRequestCompareFile': <request file to compare>,// must call setRevisedFile method
                'onRequestSharingSettings': <request sharing settings>,// must call setSharingSettings method
                'onRequestCreateNew': <try to create document>,
+                'onRequestReferenceData': <try to refresh external data>,
            }
        }

@ -326,6 +328,7 @@
        _config.editorConfig.canRequestCompareFile = _config.events && !!_config.events.onRequestCompareFile;
        _config.editorConfig.canRequestSharingSettings = _config.events && !!_config.events.onRequestSharingSettings;
        _config.editorConfig.canRequestCreateNew = _config.events && !!_config.events.onRequestCreateNew;
+        _config.editorConfig.canRequestReferenceData = _config.events && !!_config.events.onRequestReferenceData;
        _config.frameEditorId = placeholderId;
        _config.parentOrigin = window.location.origin;

@ -732,6 +735,13 @@
            });
        };

+        var _setReferenceData = function(data) {
+            _sendCommand({
+                command: 'setReferenceData',
+                data: data
+            });
+        };
+
        var _serviceCommand = function(command, data) {
            _sendCommand({
                command: 'internalCommand',
@ -766,7 +776,8 @@
            setFavorite         : _setFavorite,
            requestClose        : _requestClose,
            grabFocus           : _grabFocus,
-            blurFocus           : _blurFocus
+            blurFocus           : _blurFocus,
+            setReferenceData    : _setReferenceData
        }
    };

--- a/apps/common/Gateway.js
+++ b/apps/common/Gateway.js
@ -138,6 +138,10 @@ if (window.Common === undefined) {

            'grabFocus': function(data) {
                $me.trigger('grabfocus', data);
+            },
+
+            'setReferenceData': function(data) {
+                $me.trigger('setreferencedata', data);
            }
        };

@ -347,6 +351,10 @@ if (window.Common === undefined) {
                _postMessage({event:'onRequestCreateNew'});
            },

+            requestReferenceData:  function (data) {
+                _postMessage({event:'onRequestReferenceData', data: data});
+            },
+
            pluginsReady: function() {
                _postMessage({ event: 'onPluginsReady' });
            },
--- 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/ExternalDiagramEditor.js
+++ b/apps/common/main/lib/controller/ExternalDiagramEditor.js
@ -144,6 +144,7 @@ define([
            setApi: function(api) {
                this.api = api;
                this.api.asc_registerCallback('asc_onCloseChartEditor', _.bind(this.onDiagrammEditingDisabled, this));
+                this.api.asc_registerCallback('asc_sendFromGeneralToFrameEditor', _.bind(this.onSendFromGeneralToFrameEditor, this));
                return this;
            },

@ -187,7 +188,7 @@ define([
                    iconCls: 'warn',
                    buttons: ['ok'],
                    callback: _.bind(function(btn){
-                        this.setControlsDisabled(false);
+                        this.diagramEditorView.setControlsDisabled(false);
                        this.diagramEditorView.hide();
                    }, this)
                });
@ -242,6 +243,9 @@ define([
                            h = eventData.data.height;
                        if (w>0 && h>0)
                            this.diagramEditorView.setInnerSize(w, h);
+                    } else
+                    if (eventData.type == "frameToGeneralData") {
+                        this.api && this.api.asc_getInformationBetweenFrameAndGeneralEditor(eventData.data);
                    } else
                        this.diagramEditorView.fireEvent('internalmessage', this.diagramEditorView, eventData);
                }
@ -253,6 +257,10 @@ define([
                }
            },

+            onSendFromGeneralToFrameEditor: function(data) {
+                externalEditor && externalEditor.serviceCommand('generalToFrameData', data);
+            },
+
            warningTitle: 'Warning',
            warningText: 'The object is disabled because of editing by another user.',
            textClose: 'Close',
--- a/apps/common/main/lib/controller/ExternalMergeEditor.js
+++ b/apps/common/main/lib/controller/ExternalMergeEditor.js
@ -142,6 +142,7 @@ define([
            setApi: function(api) {
                this.api = api;
                this.api.asc_registerCallback('asc_onCloseMergeEditor', _.bind(this.onMergeEditingDisabled, this));
+                this.api.asc_registerCallback('asc_sendFromGeneralToFrameEditor', _.bind(this.onSendFromGeneralToFrameEditor, this));
                return this;
            },

@ -186,7 +187,7 @@ define([
                    iconCls: 'warn',
                    buttons: ['ok'],
                    callback: _.bind(function(btn){
-                        this.setControlsDisabled(false);
+                        this.mergeEditorView.setControlsDisabled(false);
                        this.mergeEditorView.hide();
                    }, this)
                });
@ -242,6 +243,9 @@ define([
                            h = eventData.data.height;
                        if (w>0 && h>0)
                            this.mergeEditorView.setInnerSize(w, h);
+                    } else
+                    if (eventData.type == "frameToGeneralData") {
+                        this.api && this.api.asc_getInformationBetweenFrameAndGeneralEditor(eventData.data);
                    } else
                        this.mergeEditorView.fireEvent('internalmessage', this.mergeEditorView, eventData);
                }
@ -253,6 +257,10 @@ define([
                }
            },

+            onSendFromGeneralToFrameEditor: function(data) {
+                externalEditor && externalEditor.serviceCommand('generalToFrameData', data);
+            },
+
            warningTitle: 'Warning',
            warningText: 'The object is disabled because of editing by another user.',
            textClose: 'Close',
--- a/apps/common/main/lib/controller/ExternalOleEditor.js
+++ b/apps/common/main/lib/controller/ExternalOleEditor.js
@ -142,6 +142,7 @@ define([
            setApi: function(api) {
                this.api = api;
                this.api.asc_registerCallback('asc_onCloseOleEditor', _.bind(this.onOleEditingDisabled, this));
+                this.api.asc_registerCallback('asc_sendFromGeneralToFrameEditor', _.bind(this.onSendFromGeneralToFrameEditor, this));
                return this;
            },

@ -185,7 +186,7 @@ define([
                    iconCls: 'warn',
                    buttons: ['ok'],
                    callback: _.bind(function(btn){
-                        this.setControlsDisabled(false);
+                        this.oleEditorView.setControlsDisabled(false);
                        this.oleEditorView.hide();
                    }, this)
                });
@ -241,6 +242,9 @@ define([
                            h = eventData.data.height;
                        if (w>0 && h>0)
                            this.oleEditorView.setInnerSize(w, h);
+                    } else
+                    if (eventData.type == "frameToGeneralData") {
+                        this.api && this.api.asc_getInformationBetweenFrameAndGeneralEditor(eventData.data);
                    } else
                        this.oleEditorView.fireEvent('internalmessage', this.oleEditorView, eventData);
                }
@ -252,6 +256,10 @@ define([
                }
            },

+            onSendFromGeneralToFrameEditor: function(data) {
+                externalEditor && externalEditor.serviceCommand('generalToFrameData', data);
+            },
+
            warningTitle: 'Warning',
            warningText: 'The object is disabled because of editing by another user.',
            textClose: 'Close',
--- 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();
@ -620,10 +622,10 @@ Common.UI.HintManager = new(function() {
                }
            }

-            _needShow = (Common.Utils.InternalSettings.get(_appPrefix + "settings-use-alt-key") && !e.shiftKey && e.keyCode == Common.UI.Keys.ALT &&
+            _needShow = (Common.Utils.InternalSettings.get(_appPrefix + "settings-show-alt-hints") && !e.shiftKey && e.keyCode == Common.UI.Keys.ALT &&
                !Common.Utils.ModalWindow.isVisible() && _isDocReady && _arrAlphabet.length > 0 &&
                !(window.PE && $('#pe-preview').is(':visible')));
-            if (e.altKey && e.keyCode !== 115) {
+            if (Common.Utils.InternalSettings.get(_appPrefix + "settings-show-alt-hints") && e.altKey && e.keyCode !== 115) {
                e.preventDefault();
            }
        });
@ -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/help/de/images/find_small.png
+++ b/apps/common/main/resources/help/de/images/find_small.png
--- a/apps/common/main/resources/help/de/images/ole_table.png
+++ b/apps/common/main/resources/help/de/images/ole_table.png
--- a/apps/common/main/resources/help/en/images/find_small.png
+++ b/apps/common/main/resources/help/en/images/find_small.png
--- a/apps/common/main/resources/help/en/images/ole_table.png
+++ b/apps/common/main/resources/help/en/images/ole_table.png
--- a/apps/common/main/resources/help/fr/images/find_small.png
+++ b/apps/common/main/resources/help/fr/images/find_small.png
--- a/apps/common/main/resources/help/fr/images/ole_table.png
+++ b/apps/common/main/resources/help/fr/images/ole_table.png
--- a/apps/common/main/resources/help/ru/images/find_small.png
+++ b/apps/common/main/resources/help/ru/images/find_small.png
--- a/apps/common/main/resources/help/ru/images/ole_table.png
+++ b/apps/common/main/resources/help/ru/images/ole_table.png
--- a/apps/common/main/resources/img/toolbar/1.25x/big/btn-text-vertical.png
+++ b/apps/common/main/resources/img/toolbar/1.25x/big/btn-text-vertical.png
--- a/apps/common/main/resources/img/toolbar/1.25x/big/btn-text.png
+++ b/apps/common/main/resources/img/toolbar/1.25x/big/btn-text.png
--- a/apps/common/main/resources/img/toolbar/1.25x/btn-text-vertical.png
+++ b/apps/common/main/resources/img/toolbar/1.25x/btn-text-vertical.png
--- a/apps/common/main/resources/img/toolbar/1.25x/btn-text.png
+++ b/apps/common/main/resources/img/toolbar/1.25x/btn-text.png
--- a/apps/common/main/resources/img/toolbar/1.5x/big/btn-text-vertical.png
+++ b/apps/common/main/resources/img/toolbar/1.5x/big/btn-text-vertical.png
--- a/apps/common/main/resources/img/toolbar/1.5x/big/btn-text.png
+++ b/apps/common/main/resources/img/toolbar/1.5x/big/btn-text.png
--- a/apps/common/main/resources/img/toolbar/1.5x/btn-text-vertical.png
+++ b/apps/common/main/resources/img/toolbar/1.5x/btn-text-vertical.png
--- a/apps/common/main/resources/img/toolbar/1.5x/btn-text.png
+++ b/apps/common/main/resources/img/toolbar/1.5x/btn-text.png
--- a/apps/common/main/resources/img/toolbar/1.75x/big/btn-text-vertical.png
+++ b/apps/common/main/resources/img/toolbar/1.75x/big/btn-text-vertical.png
--- a/apps/common/main/resources/img/toolbar/1.75x/big/btn-text.png
+++ b/apps/common/main/resources/img/toolbar/1.75x/big/btn-text.png
--- a/apps/common/main/resources/img/toolbar/1.75x/btn-text-vertical.png
+++ b/apps/common/main/resources/img/toolbar/1.75x/btn-text-vertical.png
--- a/apps/common/main/resources/img/toolbar/1.75x/btn-text.png
+++ b/apps/common/main/resources/img/toolbar/1.75x/btn-text.png
--- a/apps/common/main/resources/img/toolbar/1x/big/btn-text-vertical.png
+++ b/apps/common/main/resources/img/toolbar/1x/big/btn-text-vertical.png
--- a/apps/common/main/resources/img/toolbar/1x/big/btn-text.png
+++ b/apps/common/main/resources/img/toolbar/1x/big/btn-text.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-text-vertical.png
+++ b/apps/common/main/resources/img/toolbar/1x/btn-text-vertical.png
--- a/apps/common/main/resources/img/toolbar/1x/btn-text.png
+++ b/apps/common/main/resources/img/toolbar/1x/btn-text.png
--- a/apps/common/main/resources/img/toolbar/1x/text-box-horizontal.png
+++ b/apps/common/main/resources/img/toolbar/1x/text-box-horizontal.png
--- a/apps/common/main/resources/img/toolbar/1x/text-box-vertical.png
+++ b/apps/common/main/resources/img/toolbar/1x/text-box-vertical.png
--- a/apps/common/main/resources/img/toolbar/2x/big/btn-text-vertical.png
+++ b/apps/common/main/resources/img/toolbar/2x/big/btn-text-vertical.png
--- a/apps/common/main/resources/img/toolbar/2x/big/btn-text.png
+++ b/apps/common/main/resources/img/toolbar/2x/big/btn-text.png
--- a/apps/common/main/resources/img/toolbar/2x/btn-text-vertical.png
+++ b/apps/common/main/resources/img/toolbar/2x/btn-text-vertical.png
--- a/apps/common/main/resources/img/toolbar/2x/btn-text.png
+++ b/apps/common/main/resources/img/toolbar/2x/btn-text.png
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@ -246,7 +246,7 @@
            height: 24px;

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

--- a/apps/common/main/resources/less/colors-table-dark.less
+++ b/apps/common/main/resources/less/colors-table-dark.less
@ -131,7 +131,7 @@
        --component-hover-icon-opacity: .8;
        --component-active-icon-opacity: 1;
        --component-active-hover-icon-opacity: 1;
-        --component-disabled-opacity: .6;
+        --component-disabled-opacity: .4;

        --header-component-normal-icon-opacity: .8;
        --header-component-hover-icon-opacity: .8;
--- 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/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/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@ -40,6 +40,8 @@
        .extra {
            background-color: @header-background-color-ie;
            background-color: @header-background-color;
+
+            box-shadow: inset 0 @minus-px 0 0 @border-toolbar-active-panel-top;
        }

    //&::after {
@ -62,6 +64,8 @@
        display: flex;
        flex-shrink: 1;

+        box-shadow: inset 0 @minus-px 0 0 @border-toolbar-active-panel-top;
+
        > ul {
            padding: 4px 0 0;
            margin: 0;
@ -75,14 +79,19 @@
            display: inline-flex;
            align-items: center;
            height: 100%;
+            position: relative;
            &:hover {
                background-color: @highlight-header-button-hover-ie;
                background-color: @highlight-header-button-hover;
+
+                box-shadow: inset 0 @minus-px 0 0 @border-toolbar-active-panel-top;
            }

            &.active {
                background-color: @background-toolbar-ie;
                background-color: @background-toolbar;
+
+                box-shadow: inset @minus-px 0px 0 0 @border-toolbar-active-panel-top, inset @scaled-one-px-value @scaled-one-px-value 0 0 @border-toolbar-active-panel-top;
            }


@ -111,6 +120,29 @@
            }
        }

+        &:not(.style-off-tabs *) {
+            &.short {
+                li {
+                    &:after {
+                        content: '';
+                        position: absolute;
+                        background: @border-toolbar-active-panel-top;
+                        height: @scaled-one-px-value;
+                        bottom: 0;
+                        left: 1px;
+                        right: 1px;
+                        z-index: 2;
+                    }
+
+                    &.active {
+                        &:after {
+                            background: @background-toolbar;
+                        }
+                    }
+                }
+            }
+        }
+
        .scroll {
            line-height: @height-tabs;
            min-width: 20px;
@ -132,7 +164,7 @@

            &.left{
                box-shadow: 5px 0 20px 5px @header-background-color-ie;
-                box-shadow: 5px 0 20px 5px @header-background-color;
+                box-shadow: 18px calc(38px - @scaled-one-px-value) 0 10px @border-toolbar-active-panel-top, 5px 0 20px 5px @header-background-color;

                &:after {
                    transform: rotate(135deg);
@ -141,7 +173,7 @@
            }
            &.right{
                box-shadow: -5px 0 20px 5px @header-background-color-ie;
-                box-shadow: -5px 0 20px 5px @header-background-color;
+                box-shadow: -10px calc(38px - @scaled-one-px-value) 0 10px @border-toolbar-active-panel-top, -5px 0 20px 5px @header-background-color;

                &:after {
                    transform: rotate(-45deg);
@ -403,6 +435,7 @@

            li {
                position: relative;
+
                &:after {
                    //transition: opacity .1s;
                    //transition: bottom .1s;
@ -417,6 +450,7 @@

                &.active {
                    background-color: transparent;
+                    box-shadow: none;
                    //> a {
                    //    padding: 0 12px;
                    //}
@ -428,6 +462,7 @@

                &:hover:not(.active) {
                    background-color: rgba(0, 0, 0, .05);
+                    box-shadow: none;

                    .theme-type-dark & {
                        background-color: rgba(255, 255, 255, .05);
--- 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'
@ -61,15 +62,15 @@ const CustomColors = ({ options, customColors, isTypeColors, onColorClick, curCo
    
    return (
        <div className='palette'>
-            {colors && colors.length > 0 && colors.map((color, index) => {
-                return(
+            {colors && colors.length > 0 ? colors.map((color, index) => {
+                return (
                    <a key={`dc-${index}`}
                       className={curColor && curColor === color && index === indexCurColor && !isTypeColors ? 'active' : ''}
                       style={{background: `#${color}`}}
                       onClick={() => {onColorClick(color)}}
                    ></a>
                )
-            })}
+            }) : null}
            {emptyItems.length > 0 && emptyItems}
        </div>
    )
@ -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/lib/view/Search.jsx
+++ b/apps/common/mobile/lib/view/Search.jsx
@ -116,7 +116,12 @@ class SearchView extends Component {
                expandable: true,
                backdrop: false,
                on: {
-                    search: (bar, curval, prevval) => {
+                    search: (sb, query, previousQuery) => {
+                        const api = Common.EditorApi.get();
+
+                        if(!query) {
+                            api.asc_selectSearchingResults(false);
+                        }
                    },
                }
            });
--- 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-ios.less
+++ b/apps/common/mobile/resources/less/common-ios.less
@ -552,6 +552,15 @@
    .toggle-icon {
        background: transparent;
    }
+
+    // Edit Comment Popup
+
+    .edit-comment-popup {
+        .navbar .title {
+            line-height: normal;
+        }
+    }
+
 }


--- a/apps/common/mobile/resources/less/common.less
+++ b/apps/common/mobile/resources/less/common.less
@ -1088,22 +1088,16 @@ input[type="number"]::-webkit-inner-spin-button {
    border: 0.5px solid @background-menu-divider;
 }

-// Navigation list 
-
-.list.navigation-list {
-    overflow-y: auto;
-    height: 265px;
-    .item-title {
-        color: @text-normal;
-    }
-}
-
 // 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/be.json
+++ b/apps/documenteditor/embed/locale/be.json
@ -4,6 +4,7 @@
  "common.view.modals.txtHeight": "Вышыня",
  "common.view.modals.txtShare": "Падзяліцца спасылкай",
  "common.view.modals.txtWidth": "Шырыня",
+  "common.view.SearchBar.textFind": "Пошук",
  "DE.ApplicationController.convertationErrorText": "Пераўтварыць не атрымалася.",
  "DE.ApplicationController.convertationTimeoutText": "Час чакання пераўтварэння сышоў.",
  "DE.ApplicationController.criticalErrorTitle": "Памылка",
@ -25,6 +26,7 @@
  "DE.ApplicationController.scriptLoadError": "Занадта павольнае злучэнне, не ўсе кампаненты атрымалася загрузіць. Калі ласка, абнавіце старонку.",
  "DE.ApplicationController.textAnonymous": "Ананімны карыстальнік",
  "DE.ApplicationController.textClear": "Ачысціць усе палі",
+  "DE.ApplicationController.textCtrl": "Ctrl",
  "DE.ApplicationController.textGotIt": "Добра",
  "DE.ApplicationController.textGuest": "Госць",
  "DE.ApplicationController.textLoadingDocument": "Загрузка дакумента",
@ -45,6 +47,7 @@
  "DE.ApplicationView.txtEmbed": "Убудаваць",
  "DE.ApplicationView.txtFileLocation": "Перайсці да дакументаў",
  "DE.ApplicationView.txtFullScreen": "Поўнаэкранны рэжым",
-  "DE.ApplicationView.txtPrint": "Друк",
+  "DE.ApplicationView.txtPrint": "Друкаванне",
+  "DE.ApplicationView.txtSearch": "Пошук",
  "DE.ApplicationView.txtShare": "Падзяліцца"
 }
--- a/apps/documenteditor/embed/locale/da.json
+++ b/apps/documenteditor/embed/locale/da.json
@ -4,6 +4,7 @@
  "common.view.modals.txtHeight": "Højde",
  "common.view.modals.txtShare": "Del link",
  "common.view.modals.txtWidth": "Bredde",
+  "common.view.SearchBar.textFind": "Find",
  "DE.ApplicationController.convertationErrorText": "Konvertering fejlede.",
  "DE.ApplicationController.convertationTimeoutText": "Konverteringstidsfrist er overskredet",
  "DE.ApplicationController.criticalErrorTitle": "Fejl",
@ -18,13 +19,14 @@
  "DE.ApplicationController.errorLoadingFont": "Skrifttyper er ikke indlæst.<br>Kontakt din dokument server administrator.",
  "DE.ApplicationController.errorSubmit": "Send mislykkedes.",
  "DE.ApplicationController.errorTokenExpire": "Dokumentets sikkerhedstoken er udløbet.<br>Kontakt venligst din Document Server administrator. ",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internetforbindelsen er blevet genoprettet, og filversionen er blevet ændret.<br>Før du kan fortsætte arbejdet, skal du hente filen eller kopiere indholdet for at sikre, at intet vil blive tabt - og derefter genindlæse denne side.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internetforbindelsen er blevet genoprettet og filversionen er blevet ændret.<br>Før du kan fortsætte arbejdet, skal du hente filen eller kopiere indholdet for at sikre, at intet vil blive tabt - og derefter genindlæse denne side.",
  "DE.ApplicationController.errorUserDrop": "Der kan ikke opnås adgang til filen lige nu. ",
  "DE.ApplicationController.notcriticalErrorTitle": "Advarsel",
  "DE.ApplicationController.openErrorText": "Der skete en fejl under åbningen af filen",
  "DE.ApplicationController.scriptLoadError": "Forbindelsen er for langsom, og nogle komponenter kunne ikke indlæses. Indlæs siden igen.",
  "DE.ApplicationController.textAnonymous": "Anonym",
  "DE.ApplicationController.textClear": "Ryd alle felter",
+  "DE.ApplicationController.textCtrl": "Ctrl",
  "DE.ApplicationController.textGotIt": "Forstået",
  "DE.ApplicationController.textGuest": "Gæst",
  "DE.ApplicationController.textLoadingDocument": "Indlæser dokument",
@ -46,5 +48,6 @@
  "DE.ApplicationView.txtFileLocation": "Åben filplacering",
  "DE.ApplicationView.txtFullScreen": "Fuld skærm",
  "DE.ApplicationView.txtPrint": "Udskriv",
+  "DE.ApplicationView.txtSearch": "Søg",
  "DE.ApplicationView.txtShare": "Del"
 }
--- 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/id.json
+++ b/apps/documenteditor/embed/locale/id.json
@ -4,6 +4,7 @@
  "common.view.modals.txtHeight": "Tinggi",
  "common.view.modals.txtShare": "Bagi tautan",
  "common.view.modals.txtWidth": "Lebar",
+  "common.view.SearchBar.textFind": "Temukan",
  "DE.ApplicationController.convertationErrorText": "Konversi gagal.",
  "DE.ApplicationController.convertationTimeoutText": "Waktu konversi habis.",
  "DE.ApplicationController.criticalErrorTitle": "Kesalahan",
@ -18,13 +19,14 @@
  "DE.ApplicationController.errorLoadingFont": "Font tidak bisa dimuat.<br>Silakan kontak admin Server Dokumen Anda.",
  "DE.ApplicationController.errorSubmit": "Submit gagal.",
  "DE.ApplicationController.errorTokenExpire": "Token keamanan dokumen sudah kadaluwarsa.<br>Silakan hubungi admin Server Dokumen Anda.",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Koneksi internet sudah kembali dan versi file sudah diganti.<br>Sebelum Anda bisa melanjutkan kerja, Anda perlu download file atau copy konten untuk memastikan tidak ada yang hilang, dan muat ulang halaman ini.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Koneksi internet sudah kembali dan versi file sudah diganti.<br>Sebelum Anda bisa melanjutkan kerja, Anda perlu mengunduh file atau salin konten untuk memastikan tidak ada yang hilang, lalu muat ulang halaman ini.",
  "DE.ApplicationController.errorUserDrop": "File tidak dapat di akses",
  "DE.ApplicationController.notcriticalErrorTitle": "Peringatan",
  "DE.ApplicationController.openErrorText": "Eror ketika membuka file.",
  "DE.ApplicationController.scriptLoadError": "Koneksi terlalu lambat dan beberapa komponen tidak bisa dibuka. Silakan muat ulang halaman.",
  "DE.ApplicationController.textAnonymous": "Anonim",
  "DE.ApplicationController.textClear": "Bersihkan Semua Area",
+  "DE.ApplicationController.textCtrl": "Ctrl",
  "DE.ApplicationController.textGotIt": "Mengerti",
  "DE.ApplicationController.textGuest": "Tamu",
  "DE.ApplicationController.textLoadingDocument": "Memuat dokumen",
@ -46,5 +48,6 @@
  "DE.ApplicationView.txtFileLocation": "Buka Dokumen",
  "DE.ApplicationView.txtFullScreen": "Layar penuh",
  "DE.ApplicationView.txtPrint": "Cetak",
+  "DE.ApplicationView.txtSearch": "Cari",
  "DE.ApplicationView.txtShare": "Bagikan"
 }
--- 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/embed/locale/sv.json
+++ b/apps/documenteditor/embed/locale/sv.json
@ -4,6 +4,7 @@
  "common.view.modals.txtHeight": "Höjd",
  "common.view.modals.txtShare": "Dela länk",
  "common.view.modals.txtWidth": "Bredd",
+  "common.view.SearchBar.textFind": "Sök",
  "DE.ApplicationController.convertationErrorText": "Fel vid konvertering",
  "DE.ApplicationController.convertationTimeoutText": "Konverteringstiden har överskridits.",
  "DE.ApplicationController.criticalErrorTitle": "Fel",
@ -25,6 +26,7 @@
  "DE.ApplicationController.scriptLoadError": "Anslutningen är för långsam, vissa av komponenterna kunde inte laddas. Vänligen ladda om sidan.",
  "DE.ApplicationController.textAnonymous": "Anonym",
  "DE.ApplicationController.textClear": "Rensa alla fält",
+  "DE.ApplicationController.textCtrl": "Ctrl",
  "DE.ApplicationController.textGotIt": "Uppfattat",
  "DE.ApplicationController.textGuest": "Gäst",
  "DE.ApplicationController.textLoadingDocument": "Laddar dokument",
@ -46,5 +48,6 @@
  "DE.ApplicationView.txtFileLocation": "Öppna filens plats",
  "DE.ApplicationView.txtFullScreen": "Helskärm",
  "DE.ApplicationView.txtPrint": "Skriv ut",
+  "DE.ApplicationView.txtSearch": "Sök",
  "DE.ApplicationView.txtShare": "Dela"
 }
--- 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,13 +102,13 @@
  "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.",
  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "La connexió a internet s'ha restaurat i la versió del fitxer s'ha canviat. <br>Abans de continuar treballant, heu de descarregar el fitxer o copiar-ne el contingut per assegurar-vos que no es perdi res i, després, tornar a carregar aquesta pàgina.",
  "DE.Controllers.ApplicationController.errorUserDrop": "No es pot accedir al fitxer.",
  "DE.Controllers.ApplicationController.errorViewerDisconnect": "S'ha perdut la connexió. Encara podeu visualitzar el document, <br>però no el podreu baixar ni imprimir fins que no es restableixi la connexió i es torni a carregar la pàgina.",
-  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "El valor introduït no es correspon amb el format del camp",
  "DE.Controllers.ApplicationController.mniImageFromFile": "Imatge del fitxer",
  "DE.Controllers.ApplicationController.mniImageFromStorage": "Imatge de l'emmagatzematge",
  "DE.Controllers.ApplicationController.mniImageFromUrl": "Imatge d'URL",
--- a/apps/documenteditor/forms/locale/da.json
+++ b/apps/documenteditor/forms/locale/da.json
@ -32,9 +32,15 @@
  "Common.UI.Calendar.textShortTuesday": "Ti",
  "Common.UI.Calendar.textShortWednesday": "Ons",
  "Common.UI.Calendar.textYears": "år",
+  "Common.UI.SearchBar.textFind": "Find",
+  "Common.UI.SearchBar.tipCloseSearch": "Luk søgning",
+  "Common.UI.SearchBar.tipNextResult": "Næste resultat",
+  "Common.UI.SearchBar.tipPreviousResult": "Forrige resultat",
  "Common.UI.Themes.txtThemeClassicLight": "Klassisk lys",
+  "Common.UI.Themes.txtThemeContrastDark": "Mørk kontrast",
  "Common.UI.Themes.txtThemeDark": "Mørk",
  "Common.UI.Themes.txtThemeLight": "Lys",
+  "Common.UI.Themes.txtThemeSystem": "Samme som system",
  "Common.UI.Window.cancelButtonText": "Annuller",
  "Common.UI.Window.closeButtonText": "Luk",
  "Common.UI.Window.noButtonText": "Nej",
@ -96,10 +102,11 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "Dokumentet er ikke blevet redigeret i et stykke tid. Genindlæs venligst siden.",
  "DE.Controllers.ApplicationController.errorSessionToken": "Forbindelsen til serveren er blevet afbrudt. Venligst genindlæs siden.",
  "DE.Controllers.ApplicationController.errorSubmit": "Send mislykkedes.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "Den indtastede værdi stemmer ikke overens med feltets format.",
  "DE.Controllers.ApplicationController.errorToken": "Dokumentets sikkerhedstoken er ikke oprettet korrekt.<br> Kontakt venligst din administrator for Document Server.",
  "DE.Controllers.ApplicationController.errorTokenExpire": "Dokumentets sikkerhedstoken er udløbet.<br>Kontakt venligst din Document Server administrator. ",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "Filversionen er blevet ændret. Siden genindlæses.",
-  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Internetforbindelsen er blevet genoprettet, og filversionen er blevet ændret.<br>Før du kan fortsætte arbejdet, skal du hente filen eller kopiere indholdet for at sikre, at intet vil blive tabt - og derefter genindlæse denne side.",
+  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Internetforbindelsen er blevet genoprettet og filversionen er blevet ændret.<br>Før du kan fortsætte arbejdet, skal du hente filen eller kopiere indholdet for at sikre, at intet vil blive tabt - og derefter genindlæse denne side.",
  "DE.Controllers.ApplicationController.errorUserDrop": "Der kan ikke opnås adgang til filen lige nu. ",
  "DE.Controllers.ApplicationController.errorViewerDisconnect": "Forbindesen er tabt. Du kan stadig se dokumentet, <br> men du vil ikke være i stand til at hente eller udskrive det, før forbindelsen er genetableret. ",
  "DE.Controllers.ApplicationController.mniImageFromFile": "Billede fra fil",
@ -123,6 +130,7 @@
  "DE.Controllers.ApplicationController.textSaveAs": "Gem som PDF",
  "DE.Controllers.ApplicationController.textSaveAsDesktop": "Gem som...",
  "DE.Controllers.ApplicationController.textSubmited": "<b>Formularen blev indsendt</b><br>Klik for at lukke tippet",
+  "DE.Controllers.ApplicationController.titleLicenseExp": "Licens er udløbet",
  "DE.Controllers.ApplicationController.titleServerVersion": "Redigeringsværktøj opdateret",
  "DE.Controllers.ApplicationController.titleUpdateVersion": "Version ændret",
  "DE.Controllers.ApplicationController.txtArt": "Din tekst her",
@ -139,6 +147,7 @@
  "DE.Controllers.ApplicationController.uploadImageSizeMessage": "Billedet er for stort. Den maksimale størrelse er 25 MB.",
  "DE.Controllers.ApplicationController.waitText": "Vent venligst...",
  "DE.Controllers.ApplicationController.warnLicenseExceeded": "Antallet af samtidige forbindelser til serveren overstiger det tilladte antal, og dokumentet åbnes i visningstilstand.<br>Kontakt venligst din administrator for mere information.",
+  "DE.Controllers.ApplicationController.warnLicenseExp": "Din licens er udløbet<br>Venligst opdatér din licens og genindlæs siden.",
  "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "Licens udløbet. <br>Du har ikke adgang til at redigere. <br>Kontakt venligst din administrator.",
  "DE.Controllers.ApplicationController.warnLicenseLimitedRenewed": "Licens skal fornyes.<br>Du har begrænset adgang til at redigere dokumenter.<br>Kontakt venligst din administrator for at få fuld adgang.",
  "DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "Det tilladte antal af samtidige brugere er oversteget, og dokumentet vil blive åbnet i visningstilstand.<br>Kontakt venligst din administrator for mere information. ",
@ -164,6 +173,7 @@
  "DE.Views.ApplicationView.txtFileLocation": "Åben filplacering",
  "DE.Views.ApplicationView.txtFullScreen": "Fuld skærm",
  "DE.Views.ApplicationView.txtPrint": "Udskriv",
+  "DE.Views.ApplicationView.txtSearch": "Søg",
  "DE.Views.ApplicationView.txtShare": "Del",
  "DE.Views.ApplicationView.txtTheme": "Tema"
 }
--- a/apps/documenteditor/forms/locale/de.json
+++ b/apps/documenteditor/forms/locale/de.json
@ -102,6 +102,7 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "Das Dokument wurde lange nicht bearbeitet. Laden Sie die Seite neu.",
  "DE.Controllers.ApplicationController.errorSessionToken": "Die Verbindung zum Server wurde unterbrochen. Laden Sie die Seite neu.",
  "DE.Controllers.ApplicationController.errorSubmit": "Fehler beim Senden.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "Der eingegebene Wert stimmt nicht mit dem Format des Feldes überein.",
  "DE.Controllers.ApplicationController.errorToken": "Sicherheitstoken des Dokuments ist nicht korrekt.<br>Wenden Sie sich an Ihren Serveradministrator.",
  "DE.Controllers.ApplicationController.errorTokenExpire": "Sicherheitstoken des Dokuments ist abgelaufen.<br>Wenden Sie sich an Ihren Serveradministrator.",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "Die Dateiversion wurde geändert. Die Seite wird neu geladen.",
--- a/apps/documenteditor/forms/locale/el.json
+++ b/apps/documenteditor/forms/locale/el.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": "Όχι",
@ -100,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/en.json
+++ b/apps/documenteditor/forms/locale/en.json
@ -102,13 +102,13 @@
  "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.",
  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
  "DE.Controllers.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",
  "DE.Controllers.ApplicationController.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print it until the connection is restored and page is reloaded.",
-  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "The value entered does not match the format of the field.",
  "DE.Controllers.ApplicationController.mniImageFromFile": "Image from File",
  "DE.Controllers.ApplicationController.mniImageFromStorage": "Image from Storage",
  "DE.Controllers.ApplicationController.mniImageFromUrl": "Image from URL",
--- a/apps/documenteditor/forms/locale/es.json
+++ b/apps/documenteditor/forms/locale/es.json
@ -102,13 +102,13 @@
  "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.",
  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Se ha restablecido la conexión a Internet y se ha cambiado la versión del archivo.<br>Para poder seguir trabajando, es necesario descargar el archivo o copiar su contenido para asegurarse de que no se ha perdido nada, y luego volver a cargar esta página.",
  "DE.Controllers.ApplicationController.errorUserDrop": "No se puede acceder al archivo en este momento.",
  "DE.Controllers.ApplicationController.errorViewerDisconnect": "Se ha perdido la conexión. Usted todavía puede visualizar el documento,<br>pero no puede descargar o imprimirlo hasta que la conexión sea restaurada y la página esté recargada.",
-  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "El valor introducido no se corresponde con el formato del campo",
  "DE.Controllers.ApplicationController.mniImageFromFile": "Imagen desde archivo",
  "DE.Controllers.ApplicationController.mniImageFromStorage": "Imagen de Almacenamiento",
  "DE.Controllers.ApplicationController.mniImageFromUrl": "Imagen de URL",
--- a/apps/documenteditor/forms/locale/eu.json
+++ b/apps/documenteditor/forms/locale/eu.json
@ -102,13 +102,13 @@
  "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.errorTextFormWrongFormat": "Sartutako balioa ez dator bat eremuaren formatuarekin.",
  "DE.Controllers.ApplicationController.mniImageFromFile": "Irudia fitxategitik",
  "DE.Controllers.ApplicationController.mniImageFromStorage": "Irudia biltegitik",
  "DE.Controllers.ApplicationController.mniImageFromUrl": "Irudia URLtik",
--- 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/hu.json
+++ b/apps/documenteditor/forms/locale/hu.json
@ -37,8 +37,10 @@
  "Common.UI.SearchBar.tipNextResult": "Következő eredmény",
  "Common.UI.SearchBar.tipPreviousResult": "Előző eredmény",
  "Common.UI.Themes.txtThemeClassicLight": "Klasszikus Világos",
+  "Common.UI.Themes.txtThemeContrastDark": "Sötét kontraszt",
  "Common.UI.Themes.txtThemeDark": "Sötét",
  "Common.UI.Themes.txtThemeLight": "Világos",
+  "Common.UI.Themes.txtThemeSystem": "A rendszerrel megegyező",
  "Common.UI.Window.cancelButtonText": "Mégse",
  "Common.UI.Window.closeButtonText": "Bezár",
  "Common.UI.Window.noButtonText": "Nem",
@ -100,6 +102,7 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "A dokumentumot sokáig nem szerkesztették. Kérjük, töltse újra az oldalt.",
  "DE.Controllers.ApplicationController.errorSessionToken": "A szerverrel való kapcsolat megszakadt. Töltse újra az oldalt.",
  "DE.Controllers.ApplicationController.errorSubmit": "A beküldés nem sikerült.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "A megadott érték nem felel meg a mező formátumának.",
  "DE.Controllers.ApplicationController.errorToken": "A dokumentum biztonsági tokenje nem megfelelő.<br>Kérjük, lépjen kapcsolatba a Dokumentumszerver rendszergazdájával.",
  "DE.Controllers.ApplicationController.errorTokenExpire": "A dokumentum biztonsági tokenje lejárt.<br>Kérjük, lépjen kapcsolatba a dokumentumszerver rendszergazdájával.",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "A dokumentum verziója megváltozott. Az oldal újratöltődik.",
--- 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": "Ոչ",
@ -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/id.json
+++ b/apps/documenteditor/forms/locale/id.json
@ -32,9 +32,15 @@
  "Common.UI.Calendar.textShortTuesday": "Sel",
  "Common.UI.Calendar.textShortWednesday": "Rab",
  "Common.UI.Calendar.textYears": "tahun",
+  "Common.UI.SearchBar.textFind": "Temukan",
+  "Common.UI.SearchBar.tipCloseSearch": "Tutup pencarian",
+  "Common.UI.SearchBar.tipNextResult": "Hasil selanjutnya",
+  "Common.UI.SearchBar.tipPreviousResult": "Hasil sebelumnya",
  "Common.UI.Themes.txtThemeClassicLight": "Terang Klasik",
+  "Common.UI.Themes.txtThemeContrastDark": "Gelap Kontras",
  "Common.UI.Themes.txtThemeDark": "Gelap",
  "Common.UI.Themes.txtThemeLight": "Cerah",
+  "Common.UI.Themes.txtThemeSystem": "Sama seperti sistem",
  "Common.UI.Window.cancelButtonText": "Batalkan",
  "Common.UI.Window.closeButtonText": "Tutup",
  "Common.UI.Window.noButtonText": "Tidak",
@ -96,10 +102,11 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "Dokumen sudah lama tidak diedit. Silakan muat ulang halaman.",
  "DE.Controllers.ApplicationController.errorSessionToken": "Koneksi ke server terganggu. Silakan muat ulang halaman.",
  "DE.Controllers.ApplicationController.errorSubmit": "Submit gagal.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "Nilai yang dimasukkan tidak cocok dengan format bidang.",
  "DE.Controllers.ApplicationController.errorToken": "Token keamanan dokumen tidak dibentuk dengan tepat.<br>Silakan hubungi admin Server Dokumen Anda.",
  "DE.Controllers.ApplicationController.errorTokenExpire": "Token keamanan dokumen sudah kadaluwarsa.<br>Silakan hubungi admin Server Dokumen Anda.",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "Versi file telah diubah. Halaman tidak akan dimuat ulang.",
-  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Koneksi internet sudah kembali dan versi file sudah diganti.<br>Sebelum Anda bisa melanjutkan kerja, Anda perlu download file atau copy konten untuk memastikan tidak ada yang hilang, dan muat ulang halaman ini.",
+  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Koneksi internet sudah kembali dan versi file sudah diganti.<br>Sebelum Anda bisa melanjutkan kerja, Anda perlu mengunduh file atau salin konten untuk memastikan tidak ada yang hilang, lalu muat ulang halaman ini.",
  "DE.Controllers.ApplicationController.errorUserDrop": "File tidak dapat di akses.",
  "DE.Controllers.ApplicationController.errorViewerDisconnect": "Koneksi terputus. Anda tetap bisa melihat dokumen,<br>tapi tidak bisa download atau print sampai koneksi terhubung dan halaman dimuat ulang.",
  "DE.Controllers.ApplicationController.mniImageFromFile": "Gambar dari File",
@ -166,6 +173,7 @@
  "DE.Views.ApplicationView.txtFileLocation": "Buka Dokumen",
  "DE.Views.ApplicationView.txtFullScreen": "Layar penuh",
  "DE.Views.ApplicationView.txtPrint": "Cetak",
+  "DE.Views.ApplicationView.txtSearch": "Cari",
  "DE.Views.ApplicationView.txtShare": "Bagikan",
  "DE.Views.ApplicationView.txtTheme": "Tema interface"
 }
--- 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
@ -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": "いいえ",
@ -100,20 +102,20 @@
  "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.errorUserDrop": "今、ファイルにアクセスすることはできません。",
  "DE.Controllers.ApplicationController.errorViewerDisconnect": "接続が失われました。文書の表示は可能ですが、<br>再度接続されてページが再ロードされるまで、ダウンロードまたは印刷することはできません。",
-  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "入力された値がフィールドのフォーマットと一致しません。",
  "DE.Controllers.ApplicationController.mniImageFromFile": "ファイルからの画像",
  "DE.Controllers.ApplicationController.mniImageFromStorage": "ストレージから画像を読み込む",
  "DE.Controllers.ApplicationController.mniImageFromUrl": "URLから画像を読み込む",
  "DE.Controllers.ApplicationController.notcriticalErrorTitle": "警告",
  "DE.Controllers.ApplicationController.openErrorText": "ファイルの読み込み中にエラーが発生しました",
  "DE.Controllers.ApplicationController.saveErrorText": "ファイルの保存中にエラーが発生しました。",
-  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "このファイルは作成または保存できません。<br>考えられる理由は次のとおりです：<br>1. ファイルが読み取り専用です。<br>2. ファイルが他のユーザーによって編集されています。<br>3. ディスクに空きスペースがないか破損しています。",
+  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "このファイルは作成または保存できません。<br>考えられる理由は次のとおりです：<br>1. 閲覧のみのファイルです。<br>2. ファイルが他のユーザーによって編集されています。<br>3. ディスクが満杯か破損しています。",
  "DE.Controllers.ApplicationController.scriptLoadError": "接続が非常に遅いため、いくつかのコンポーネントはロードされませんでした。ページを再読み込みしてください。",
  "DE.Controllers.ApplicationController.textAnonymous": "匿名",
  "DE.Controllers.ApplicationController.textBuyNow": "ウェブサイトを訪問する",
--- 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-pt.json
+++ b/apps/documenteditor/forms/locale/pt-pt.json
@ -102,6 +102,7 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "Este documento não foi editado durante muito tempo. Tente recarregar a página.",
  "DE.Controllers.ApplicationController.errorSessionToken": "A ligação ao servidor foi interrompida. Tente recarregar a página.",
  "DE.Controllers.ApplicationController.errorSubmit": "Falha ao submeter.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "O valor introduzido não corresponde ao formato do campo.",
  "DE.Controllers.ApplicationController.errorToken": "O 'token' de segurança do documento não foi formatado corretamente.<br>Entre em contato com o administrador do servidor de documentos.",
  "DE.Controllers.ApplicationController.errorTokenExpire": "O 'token' de segurança do documento expirou.<br>Entre em contacto com o administrador do servidor de documentos.",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "A versão do ficheiro foi alterada. A página será recarregada.",
--- 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,13 +102,13 @@
  "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.errorUserDrop": "В настоящий момент файл недоступен.",
  "DE.Controllers.ApplicationController.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,<br>но не сможете скачать или напечатать его до восстановления подключения и обновления страницы.",
-  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "Введенное значение не соответствует формату поля.",
  "DE.Controllers.ApplicationController.mniImageFromFile": "Изображение из файла",
  "DE.Controllers.ApplicationController.mniImageFromStorage": "Изображение из хранилища",
  "DE.Controllers.ApplicationController.mniImageFromUrl": "Изображение по URL",
--- a/apps/documenteditor/forms/locale/sv.json
+++ b/apps/documenteditor/forms/locale/sv.json
@ -32,9 +32,15 @@
  "Common.UI.Calendar.textShortTuesday": "Tis",
  "Common.UI.Calendar.textShortWednesday": "Ons",
  "Common.UI.Calendar.textYears": "år",
+  "Common.UI.SearchBar.textFind": "Sök",
+  "Common.UI.SearchBar.tipCloseSearch": "Stäng sökning",
+  "Common.UI.SearchBar.tipNextResult": "Nästa resultat",
+  "Common.UI.SearchBar.tipPreviousResult": "Föregående resultat",
  "Common.UI.Themes.txtThemeClassicLight": "Classic Light",
+  "Common.UI.Themes.txtThemeContrastDark": "Mörk kontrast",
  "Common.UI.Themes.txtThemeDark": "Mörk",
  "Common.UI.Themes.txtThemeLight": "Ljus",
+  "Common.UI.Themes.txtThemeSystem": "Samma som systemet",
  "Common.UI.Window.cancelButtonText": "Avbryt",
  "Common.UI.Window.closeButtonText": "Stäng",
  "Common.UI.Window.noButtonText": "Nov",
@ -96,6 +102,7 @@
  "DE.Controllers.ApplicationController.errorSessionIdle": "Dokumentet har inte redigerats under en längre tid. Vänligen att ladda om sidan.",
  "DE.Controllers.ApplicationController.errorSessionToken": "Anslutningen till servern har avbrutits. Vänligen ladda om sidan.",
  "DE.Controllers.ApplicationController.errorSubmit": "Gick ej att verkställa.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "Det angivna värdet stämmer inte överens med fältets format.",
  "DE.Controllers.ApplicationController.errorToken": "Dokumentets säkerhetstoken är inte korrekt.<br>Vänligen kontakta din dokumentservers administratör.",
  "DE.Controllers.ApplicationController.errorTokenExpire": "Dokumentets säkerhetstoken har upphört att gälla.<br>Vänligen kontakta dokumentserverns administratör.",
  "DE.Controllers.ApplicationController.errorUpdateVersion": "Denna version av filen har ändrats. Sidan kommer att laddas om.",
@ -166,6 +173,7 @@
  "DE.Views.ApplicationView.txtFileLocation": "Gå till filens plats",
  "DE.Views.ApplicationView.txtFullScreen": "Fullskärm",
  "DE.Views.ApplicationView.txtPrint": "Skriva ut",
+  "DE.Views.ApplicationView.txtSearch": "Sök",
  "DE.Views.ApplicationView.txtShare": "Dela",
  "DE.Views.ApplicationView.txtTheme": "Gränssnittstema"
 }
--- 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 'external-help':
+                close_menu = !!isopts;
+                break;
            default: close_menu = false;
            }

--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@ -1227,8 +1227,8 @@ define([
                Common.Utils.InternalSettings.set("de-settings-inputmode", value);
                me.api.SetTextBoxInputMode(value);

-                value = Common.localStorage.getBool("de-settings-use-alt-key", true);
-                Common.Utils.InternalSettings.set("de-settings-use-alt-key", value);
+                value = Common.localStorage.getBool("de-settings-show-alt-hints", Common.Utils.isMac ? false : true);
+                Common.Utils.InternalSettings.set("de-settings-show-alt-hints", value);

                /** coauthoring begin **/
                me._state.fastCoauth = Common.Utils.InternalSettings.get("de-settings-coauthmode");
--- a/apps/documenteditor/main/app/controller/Search.js
+++ b/apps/documenteditor/main/app/controller/Search.js
@ -169,7 +169,7 @@ 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) {
@ -179,6 +179,8 @@ define([
                        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);
--- 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/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/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, 'external-help', 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({
@ -790,7 +791,7 @@ define([
        updateSettings: function() {
            this.chInputMode.setValue(Common.Utils.InternalSettings.get("de-settings-inputmode"));

-            this.chUseAltKey.setValue(Common.Utils.InternalSettings.get("de-settings-use-alt-key"));
+            this.chUseAltKey.setValue(Common.Utils.InternalSettings.get("de-settings-show-alt-hints"));

            var value = Common.Utils.InternalSettings.get("de-settings-zoom");
            value = (value!==null) ? parseInt(value) : (this.mode.customization && this.mode.customization.zoom ? parseInt(this.mode.customization.zoom) : 100);
@ -874,8 +875,8 @@ define([
            if (!this.chDarkMode.isDisabled() && (this.chDarkMode.isChecked() !== Common.UI.Themes.isContentThemeDark()))
                Common.UI.Themes.toggleContentTheme();
            Common.localStorage.setItem("de-settings-inputmode", this.chInputMode.isChecked() ? 1 : 0);
-            Common.localStorage.setItem("de-settings-use-alt-key", this.chUseAltKey.isChecked() ? 1 : 0);
-            Common.Utils.InternalSettings.set("de-settings-use-alt-key", Common.localStorage.getBool("de-settings-use-alt-key"));
+            Common.localStorage.setItem("de-settings-show-alt-hints", this.chUseAltKey.isChecked() ? 1 : 0);
+            Common.Utils.InternalSettings.set("de-settings-show-alt-hints", Common.localStorage.getBool("de-settings-show-alt-hints"));
            Common.localStorage.setItem("de-settings-zoom", this.cmbZoom.getValue());
            Common.Utils.InternalSettings.set("de-settings-zoom", Common.localStorage.getItem("de-settings-zoom"));

@ -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/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,
@ -2298,6 +2299,15 @@ define([
                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 1}, drawdata: {type: Asc.asc_PreviewBulletType.multiLevel, numberingType: Asc.c_oAscMultiLevelNumbering.MultiLevel1}, skipRenderOnChange: true, tip: this.tipMultiLevelVarious},
                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 2}, drawdata: {type: Asc.asc_PreviewBulletType.multiLevel, numberingType: Asc.c_oAscMultiLevelNumbering.MultiLevel2}, skipRenderOnChange: true, tip: this.tipMultiLevelNumbered},
                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 3}, drawdata: {type: Asc.asc_PreviewBulletType.multiLevel, numberingType: Asc.c_oAscMultiLevelNumbering.MultiLevel3}, skipRenderOnChange: true, tip: this.tipMultiLevelSymbols}
+
+                        // {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: 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>')
                });
@ -2894,7 +2904,11 @@ define([
            tipRusUpperPoints: 'А. Б. В.',
            tipRusUpperParentheses: 'А) Б) В)',
            tipRusLowerPoints: 'а. б. в.',
-            tipRusLowerParentheses: 'а) б) в)'
+            tipRusLowerParentheses: 'а) б) в)',
+            tipMultiLevelArticl: '',
+            tipMultiLevelChapter: '',
+            tipMultiLevelHeadings: '',
+            tipMultiLevelHeadVarious: ''
        }
    })(), DE.Views.Toolbar || {}));
 });
--- a/apps/documenteditor/main/locale/az.json
+++ b/apps/documenteditor/main/locale/az.json
@ -263,11 +263,7 @@
  "Common.Views.CopyWarningDialog.textToPaste": "Yerləşdirmək üçün",
  "Common.Views.DocumentAccessDialog.textLoading": "Yüklənir...",
  "Common.Views.DocumentAccessDialog.textTitle": "Paylaşım Parametrləri",
-  "Common.Views.ExternalDiagramEditor.textClose": "Bağla",
-  "Common.Views.ExternalDiagramEditor.textSave": "Yadda Saxla və Çıx",
  "Common.Views.ExternalDiagramEditor.textTitle": "Diaqram Redaktoru",
-  "Common.Views.ExternalMergeEditor.textClose": "Bağla",
-  "Common.Views.ExternalMergeEditor.textSave": "Yadda Saxla və Çıx",
  "Common.Views.ExternalMergeEditor.textTitle": "Poçt Birləşməsi Alıcıları",
  "Common.Views.Header.labelCoUsersDescr": "Faylı redaktə edən istifadəçilər:",
  "Common.Views.Header.textAddFavorite": "Sevimli kimi işarələ",
@ -455,7 +451,6 @@
  "Common.Views.SignDialog.tipFontName": "Şrift Adı",
  "Common.Views.SignDialog.tipFontSize": "Şrift Ölçüsü",
  "Common.Views.SignSettingsDialog.textAllowComment": "İmzalayana imza dialoq qutusuna şərh əlavə etmək icazəsi verin",
-  "Common.Views.SignSettingsDialog.textInfo": "İmzalayan haqqında məlumat",
  "Common.Views.SignSettingsDialog.textInfoEmail": "E-poçt",
  "Common.Views.SignSettingsDialog.textInfoName": "Ad",
  "Common.Views.SignSettingsDialog.textInfoTitle": "İmzalayanın Adı",
--- a/apps/documenteditor/main/locale/be.json
+++ b/apps/documenteditor/main/locale/be.json
@ -9,6 +9,8 @@
  "Common.Controllers.ExternalMergeEditor.textClose": "Закрыць",
  "Common.Controllers.ExternalMergeEditor.warningText": "Аб’ект недаступны, бо рэдагуецца іншым карыстальнікам.",
  "Common.Controllers.ExternalMergeEditor.warningTitle": "Увага",
+  "Common.Controllers.ExternalOleEditor.textAnonymous": "Ананімны карыстальнік",
+  "Common.Controllers.ExternalOleEditor.textClose": "Закрыць",
  "Common.Controllers.History.notcriticalErrorTitle": "Увага",
  "Common.Controllers.ReviewChanges.textAcceptBeforeCompare": "Для параўнання дакументаў усе адсочваемыя змены будуць лічыцца ўхваленымі. Працягнуць?",
  "Common.Controllers.ReviewChanges.textAtLeast": "мінімум",
@ -79,21 +81,34 @@
  "Common.Controllers.ReviewChanges.textUrl": "Устаўце URL-адрас дакумента",
  "Common.Controllers.ReviewChanges.textWidow": "Кіраванне акном",
  "Common.define.chartData.textArea": "Вобласць",
+  "Common.define.chartData.textAreaStacked": "Вобласці са зводкай",
  "Common.define.chartData.textAreaStackedPer": "100% з абласцямі і зводкай",
  "Common.define.chartData.textBar": "Лінія",
+  "Common.define.chartData.textBarNormal": "Слупкі з групаваннем",
  "Common.define.chartData.textBarNormal3d": "Трохвымерная гістаграма з групаваннем",
  "Common.define.chartData.textBarNormal3dPerspective": "Трохвымерная гістаграма",
+  "Common.define.chartData.textBarStacked": "Слупкі са зводкай",
  "Common.define.chartData.textBarStacked3d": "Трохвымерная састаўная гістаграма",
  "Common.define.chartData.textBarStackedPer": "100% слупкі са зводкай",
  "Common.define.chartData.textBarStackedPer3d": "Трохвымерная састаўная гістаграма 100%",
  "Common.define.chartData.textCharts": "Дыяграмы",
  "Common.define.chartData.textColumn": "Гістаграма",
+  "Common.define.chartData.textCombo": "Камбінаваныя",
+  "Common.define.chartData.textComboAreaBar": "Вобласці са зводкай і слупкі з групаваннем",
+  "Common.define.chartData.textComboBarLine": "Слупкі з групаваннем і лініі",
+  "Common.define.chartData.textComboBarLineSecondary": "Слупкі з групаваннем і лініі на другаснай восі",
+  "Common.define.chartData.textComboCustom": "Адвольная камбінацыя",
+  "Common.define.chartData.textDoughnut": "Дыяграма ў выглядзе кола",
+  "Common.define.chartData.textHBarNormal": "Лініі з групаваннем",
  "Common.define.chartData.textHBarNormal3d": "Трохвымерная лінейная з групаваннем",
+  "Common.define.chartData.textHBarStacked": "Лініі са зводкай",
  "Common.define.chartData.textHBarStacked3d": "3-D лініі са зводкай",
  "Common.define.chartData.textHBarStackedPer": "100% лініі са зводкай",
  "Common.define.chartData.textHBarStackedPer3d": "3-D 100% лініі са зводкай",
  "Common.define.chartData.textLine": "Графік",
  "Common.define.chartData.textLine3d": "3-D лініі",
+  "Common.define.chartData.textLineStacked": "Лініі са зводкай",
+  "Common.define.chartData.textLineStackedMarker": "Лініі са зводкай і адзнакамі",
  "Common.define.chartData.textLineStackedPer": "100% лініі са зводкай",
  "Common.define.chartData.textLineStackedPerMarker": "100% лініі са зводкай і адзнакамі",
  "Common.define.chartData.textPie": "Па крузе",
@ -102,6 +117,7 @@
  "Common.define.chartData.textStock": "Біржа",
  "Common.define.chartData.textSurface": "Паверхня",
  "Common.Translation.warnFileLocked": "Дакумент зараз выкарыстоўваецца іншай праграмай.",
+  "Common.Translation.warnFileLockedBtnEdit": "Стварыць копію",
  "Common.UI.ButtonColored.textAutoColor": "Аўтаматычна",
  "Common.UI.ButtonColored.textNewColor": "Адвольны колер",
  "Common.UI.Calendar.textApril": "Красавік",
@ -146,6 +162,8 @@
  "Common.UI.ExtendedColorDialog.textNew": "Новы",
  "Common.UI.ExtendedColorDialog.textRGBErr": "Уведзена хібнае значэнне.<br>Калі ласка, ўвядзіце лік ад 0 да 255.",
  "Common.UI.HSBColorPicker.textNoColor": "Без колеру",
+  "Common.UI.SearchBar.textFind": "Пошук",
+  "Common.UI.SearchBar.tipCloseSearch": "Закрыць пошук",
  "Common.UI.SearchDialog.textHighlight": "Падсвятліць вынікі",
  "Common.UI.SearchDialog.textMatchCase": "Улічваць рэгістр",
  "Common.UI.SearchDialog.textReplaceDef": "Увядзіце тэкст для замены",
@ -160,6 +178,8 @@
  "Common.UI.SynchronizeTip.textSynchronize": "Дакумент быў зменены іншым карыстальнікам.<br>Націсніце, каб захаваць свае змены і загрузіць абнаўленні.",
  "Common.UI.ThemeColorPalette.textStandartColors": "Стандартныя колеры",
  "Common.UI.ThemeColorPalette.textThemeColors": "Колеры тэмы",
+  "Common.UI.Themes.txtThemeClassicLight": "Класічная светлая",
+  "Common.UI.Themes.txtThemeContrastDark": "Кантрасная цёмная",
  "Common.UI.Themes.txtThemeDark": "Цёмная",
  "Common.UI.Themes.txtThemeLight": "Светлая",
  "Common.UI.Window.cancelButtonText": "Скасаваць",
@ -174,6 +194,8 @@
  "Common.UI.Window.yesButtonText": "Так",
  "Common.Utils.Metric.txtCm": "см",
  "Common.Utils.Metric.txtPt": "пт",
+  "Common.Utils.String.textAlt": "Alt",
+  "Common.Utils.String.textCtrl": "Ctrl",
  "Common.Views.About.txtAddress": "адрас:",
  "Common.Views.About.txtLicensee": "ЛІЦЭНЗІЯТ",
  "Common.Views.About.txtLicensor": "ЛІЦЭНЗІЯР",
@ -187,6 +209,7 @@
  "Common.Views.AutoCorrectDialog.textBulleted": "Спісы з адзнакамі",
  "Common.Views.AutoCorrectDialog.textBy": "На",
  "Common.Views.AutoCorrectDialog.textDelete": "Выдаліць",
+  "Common.Views.AutoCorrectDialog.textDoubleSpaces": "Дадаваць кропку падвойным націсканнем прагалу",
  "Common.Views.AutoCorrectDialog.textFLCells": "Першыя словы ў ячэйках табліцы з вялікай літары",
  "Common.Views.AutoCorrectDialog.textFLSentence": "Сказы з вялікай літары",
  "Common.Views.AutoCorrectDialog.textHyphens": "Злучкі (--) на працяжнік (—)",
@ -210,6 +233,7 @@
  "Common.Views.Chat.textSend": "Адправіць",
  "Common.Views.Comments.mniAuthorAsc": "Аўтары ад А да Я",
  "Common.Views.Comments.mniAuthorDesc": "Аўтары ад Я да А",
+  "Common.Views.Comments.mniFilterGroups": "Фільтраваць па групе",
  "Common.Views.Comments.textAdd": "Дадаць",
  "Common.Views.Comments.textAddComment": "Дадаць каментар",
  "Common.Views.Comments.textAddCommentToDoc": "Дадаць каментар да дакумента",
@ -218,6 +242,7 @@
  "Common.Views.Comments.textAnonym": "Госць",
  "Common.Views.Comments.textCancel": "Скасаваць",
  "Common.Views.Comments.textClose": "Закрыць",
+  "Common.Views.Comments.textClosePanel": "Закрыць каментары",
  "Common.Views.Comments.textComments": "Каментары",
  "Common.Views.Comments.textEdit": "Добра",
  "Common.Views.Comments.textEnterCommentHint": "Увядзіце сюды свой каментар",
@ -234,11 +259,7 @@
  "Common.Views.CopyWarningDialog.textToPaste": "для ўстаўкі",
  "Common.Views.DocumentAccessDialog.textLoading": "Загрузка…",
  "Common.Views.DocumentAccessDialog.textTitle": "Налады супольнага доступу",
-  "Common.Views.ExternalDiagramEditor.textClose": "Закрыць",
-  "Common.Views.ExternalDiagramEditor.textSave": "Захаваць і выйсці",
  "Common.Views.ExternalDiagramEditor.textTitle": "Рэдактар дыяграм",
-  "Common.Views.ExternalMergeEditor.textClose": "Закрыць",
-  "Common.Views.ExternalMergeEditor.textSave": "Захаваць і выйсці",
  "Common.Views.ExternalMergeEditor.textTitle": "Атрымальнікі",
  "Common.Views.Header.labelCoUsersDescr": "Дакумент рэдагуецца карыстальнікамі:",
  "Common.Views.Header.textAdvSettings": "Дадатковыя налады",
@ -294,6 +315,7 @@
  "Common.Views.PluginDlg.textLoading": "Загрузка",
  "Common.Views.Plugins.groupCaption": "Убудовы",
  "Common.Views.Plugins.strPlugins": "Убудовы",
+  "Common.Views.Plugins.textClosePanel": "Закрыць убудову",
  "Common.Views.Plugins.textLoading": "Загрузка",
  "Common.Views.Plugins.textStart": "Запуск",
  "Common.Views.Plugins.textStop": "Спыніць",
@ -320,6 +342,7 @@
  "Common.Views.ReviewChanges.strStrict": "Строгі",
  "Common.Views.ReviewChanges.strStrictDesc": "Выкарыстоўвайце кнопку \"Захаваць\" для сінхранізацыі вашых змен і змен іншых карыстальнікаў.",
  "Common.Views.ReviewChanges.textEnable": "Уключыць",
+  "Common.Views.ReviewChanges.textWarnTrackChangesTitle": "Уключыць адсочванне зменаў для ўсіх? ",
  "Common.Views.ReviewChanges.tipAcceptCurrent": "Ухваліць бягучыя змены",
  "Common.Views.ReviewChanges.tipCoAuthMode": "Уключыць рэжым сумеснага рэдагавання",
  "Common.Views.ReviewChanges.tipCommentRem": "Выдаліць каментары",
@ -393,6 +416,12 @@
  "Common.Views.ReviewPopover.txtReject": "Адхіліць",
  "Common.Views.SaveAsDlg.textLoading": "Загрузка",
  "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.textSearchAgain": "{0}Выканаць новы пошук{1}, каб атрымаць дакладныя вынікі.",
  "Common.Views.SelectFileDlg.textLoading": "Загрузка",
  "Common.Views.SelectFileDlg.textTitle": "Абраць крыніцу даных",
  "Common.Views.SignDialog.textBold": "Тоўсты",
@ -410,13 +439,12 @@
  "Common.Views.SignDialog.tipFontName": "Назва шрыфту",
  "Common.Views.SignDialog.tipFontSize": "Памер шрыфту",
  "Common.Views.SignSettingsDialog.textAllowComment": "Дазволіць падпісальніку дадаваць каментары ў дыялогу подпісу",
-  "Common.Views.SignSettingsDialog.textInfo": "Звесткі аб падпісальніку",
  "Common.Views.SignSettingsDialog.textInfoEmail": "Адрас электроннай пошты",
  "Common.Views.SignSettingsDialog.textInfoName": "Імя",
  "Common.Views.SignSettingsDialog.textInfoTitle": "Пасада падпісальніка",
  "Common.Views.SignSettingsDialog.textInstructions": "Інструкцыі для падпісальніка",
  "Common.Views.SignSettingsDialog.textShowDate": "Паказваць дату подпісу ў радку подпісу",
-  "Common.Views.SignSettingsDialog.textTitle": "Наладка подпісу",
+  "Common.Views.SignSettingsDialog.textTitle": "Наладжванне подпісу",
  "Common.Views.SignSettingsDialog.txtEmpty": "Гэтае поле неабходна запоўніць",
  "Common.Views.SymbolTableDialog.textCharacter": "Знак",
  "Common.Views.SymbolTableDialog.textCode": "Шаснаццатковы код Юнікод",
@ -445,6 +473,7 @@
  "Common.Views.SymbolTableDialog.textSymbols": "Сімвалы",
  "Common.Views.SymbolTableDialog.textTitle": "Сімвал",
  "Common.Views.SymbolTableDialog.textTradeMark": "Сімвал таварнага знака",
+  "Common.Views.UserNameDialog.textDontShow": "Больш не пытацца",
  "Common.Views.UserNameDialog.textLabel": "Адмеціна:",
  "Common.Views.UserNameDialog.textLabelError": "Адмеціна не можа быць пустой",
  "DE.Controllers.LeftMenu.leavePageText": "Усе незахаваныя змены ў гэтым дакуменце страцяцца.<br> Націсніце \"Скасаваць\" і \"Захаваць\", каб захаваць іх. Націсніце \"Добра\", каб адкінуць незахаваныя змены.",
@ -459,6 +488,7 @@
  "DE.Controllers.LeftMenu.txtUntitled": "Без назвы",
  "DE.Controllers.LeftMenu.warnDownloadAs": "Калі вы працягнеце захаванне ў гэты фармат, усе функцыі, апроч тэксту страцяцца.<br>Сапраўды хочаце працягнуць?",
  "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Калі вы працягнеце захаванне ў гэты фармат, то частка фарматавання страціцца.<br>Сапраўды працягнуць?",
+  "DE.Controllers.LeftMenu.warnReplaceString": "{0} не пасуе ў якасці адмысловага сімвала ў поле замены.",
  "DE.Controllers.Main.applyChangesTextText": "Загрузка змен...",
  "DE.Controllers.Main.applyChangesTitleText": "Загрузка змен",
  "DE.Controllers.Main.convertationTimeoutText": "Час чакання пераўтварэння сышоў.",
@ -548,9 +578,13 @@
  "DE.Controllers.Main.textHasMacros": "Файл змяшчае макрасы з аўтазапускам.<br>Хочаце запусціць макрасы?",
  "DE.Controllers.Main.textLearnMore": "Падрабязней",
  "DE.Controllers.Main.textLoadingDocument": "Загрузка дакумента",
+  "DE.Controllers.Main.textLongName": "Увядзіце назву карацейшую за 128 сімвалаў.",
  "DE.Controllers.Main.textNoLicenseTitle": "Ліцэнзійнае абмежаванне",
  "DE.Controllers.Main.textPaidFeature": "Платная функцыя",
+  "DE.Controllers.Main.textReconnect": "Злучэнне адноўлена",
  "DE.Controllers.Main.textRemember": "Запомніць мой выбар для ўсіх файлаў",
+  "DE.Controllers.Main.textRenameLabel": "Увядзіце назву, якая будзе выкарыстоўвацца для сумеснай працы.",
+  "DE.Controllers.Main.textRequestMacros": "Макрас робіць запыт да URL. Хочаце дазволіць запыт да %1?",
  "DE.Controllers.Main.textShape": "Фігура",
  "DE.Controllers.Main.textStrict": "Строгі рэжым",
  "DE.Controllers.Main.textTryUndoRedo": "Функцыі скасавання і паўтору дзеянняў выключаныя ў хуткім рэжыме сумеснага рэдагавання.<br>Націсніце кнопку \"Строгі рэжым\", каб пераключыцца ў строгі рэжым сумеснага рэдагавання, каб рэдагаваць файл без іншых карыстальнікаў і адпраўляць змены толькі пасля іх захавання. Пераключацца паміж рэжымамі сумеснага рэдагавання можна з дапамогай дадатковых налад рэдактара.",
@ -567,6 +601,7 @@
  "DE.Controllers.Main.txtCallouts": "Удакладненні",
  "DE.Controllers.Main.txtCharts": "Схемы",
  "DE.Controllers.Main.txtChoose": "Абярыце элемент",
+  "DE.Controllers.Main.txtClickToLoad": "Націсніце, каб загрузіць выяву",
  "DE.Controllers.Main.txtCurrentDocument": "Бягучы дакумент",
  "DE.Controllers.Main.txtDiagramTitle": "Загаловак дыяграмы",
  "DE.Controllers.Main.txtEditingMode": "Актывацыя рэжыму рэдагавання…",
@ -771,6 +806,7 @@
  "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Скругленая прамавугольная зноска",
  "DE.Controllers.Main.txtStarsRibbons": "Зоркі і стужкі",
  "DE.Controllers.Main.txtStyle_Caption": "Назва",
+  "DE.Controllers.Main.txtStyle_endnote_text": "Тэкст канцавой зноскі",
  "DE.Controllers.Main.txtStyle_footnote_text": "Тэкст зноскі",
  "DE.Controllers.Main.txtStyle_Heading_1": "Загаловак 1",
  "DE.Controllers.Main.txtStyle_Heading_2": "Загаловак 2",
@ -820,6 +856,7 @@
  "DE.Controllers.Main.warnProcessRightsChange": "Вам адмоўлена ў правах на рэдагаванне гэтага файла.",
  "DE.Controllers.Navigation.txtBeginning": "Пачатак дакумента",
  "DE.Controllers.Navigation.txtGotoBeginning": "Перайсці да пачатку дакумента",
+  "DE.Controllers.Search.warnReplaceString": "{0} не пасуе ў якасці адмысловага сімвала для поля \"Замяніць на\".",
  "DE.Controllers.Statusbar.textDisconnect": "<b>Злучэнне страчана</b><br>Выконваецца спроба падлучэння. Праверце налады.",
  "DE.Controllers.Statusbar.textHasChanges": "Адсочаны новыя змены",
  "DE.Controllers.Statusbar.textTrackChanges": "Дакумент адкрыты з уключаным рэжымам адсочвання зменаў.",
@ -1162,8 +1199,9 @@
  "DE.Controllers.Toolbar.txtSymbol_vdots": "Вертыкальнае шматкроп’е",
  "DE.Controllers.Toolbar.txtSymbol_xsi": "Ксі",
  "DE.Controllers.Toolbar.txtSymbol_zeta": "Дзэта",
-  "DE.Controllers.Viewport.textFitPage": "Па памерах старонкі",
+  "DE.Controllers.Viewport.textFitPage": "Па памеры старонкі",
  "DE.Controllers.Viewport.textFitWidth": "Па шырыні",
+  "DE.Controllers.Viewport.txtDarkMode": "Цёмны рэжым",
  "DE.Views.AddNewCaptionLabelDialog.textLabel": "Адмеціна:",
  "DE.Views.AddNewCaptionLabelDialog.textLabelError": "Адмеціна не можа быць пустой",
  "DE.Views.BookmarksDialog.textAdd": "Дадаць",
@ -1372,10 +1410,11 @@
  "DE.Views.DocumentHolder.splitCellTitleText": "Падзяліць ячэйку",
  "DE.Views.DocumentHolder.strDelete": "Выдаліць подпіс",
  "DE.Views.DocumentHolder.strDetails": "Падрабязнасці подпісу",
-  "DE.Views.DocumentHolder.strSetup": "Наладка подпісу",
+  "DE.Views.DocumentHolder.strSetup": "Наладжванне подпісу",
  "DE.Views.DocumentHolder.strSign": "Падпісаць",
  "DE.Views.DocumentHolder.styleText": "Фарматаванне як стыль",
  "DE.Views.DocumentHolder.tableText": "Табліца",
+  "DE.Views.DocumentHolder.textAccept": "Ужыць змены",
  "DE.Views.DocumentHolder.textAlign": "Выраўноўванне",
  "DE.Views.DocumentHolder.textArrange": "Парадак",
  "DE.Views.DocumentHolder.textArrangeBack": "Перамясціць у фон",
@ -1394,6 +1433,7 @@
  "DE.Views.DocumentHolder.textDistributeCols": "Наладзіць слупкі",
  "DE.Views.DocumentHolder.textDistributeRows": "Наладзіць радкі",
  "DE.Views.DocumentHolder.textEditControls": "Налады элемента кіравання змесцівам",
+  "DE.Views.DocumentHolder.textEditPoints": "Рэдагаваць кропкі",
  "DE.Views.DocumentHolder.textEditWrapBoundary": "Рэдагаваць мяжу абцякання",
  "DE.Views.DocumentHolder.textFlipH": "Адлюстраваць па гарызанталі",
  "DE.Views.DocumentHolder.textFlipV": "Адлюстраваць па вертыкалі",
@ -1507,6 +1547,7 @@
  "DE.Views.DocumentHolder.txtRemLimit": "Выдаліць ліміт",
  "DE.Views.DocumentHolder.txtRemoveAccentChar": "Выдаліць дыякрытычны знак",
  "DE.Views.DocumentHolder.txtRemoveBar": "Выдаліць лінію",
+  "DE.Views.DocumentHolder.txtRemoveWarning": "Хочаце выдаліць гэты подпіс?<br>Гэтае дзеянне нельга скасаваць.",
  "DE.Views.DocumentHolder.txtRemScripts": "Выдаліць індэксы",
  "DE.Views.DocumentHolder.txtRemSubscript": "Выдаліць ніжні індэкс",
  "DE.Views.DocumentHolder.txtRemSuperscript": "Выдаліць верхні індэкс",
@ -1526,6 +1567,7 @@
  "DE.Views.DocumentHolder.txtTopAndBottom": "Уверсе і ўнізе",
  "DE.Views.DocumentHolder.txtUnderbar": "Лінія пад тэкстам",
  "DE.Views.DocumentHolder.txtUngroup": "Разгрупаваць",
+  "DE.Views.DocumentHolder.txtWarnUrl": "Пераход па гэтай спасылцы можа прывесці да пашкоджання прылады і даных.<br>Сапраўды хочаце працягнуць?",
  "DE.Views.DocumentHolder.updateStyleText": "Абнавіць стыль %1",
  "DE.Views.DocumentHolder.vertAlignText": "Вертыкальнае выраўноўванне",
  "DE.Views.DropcapSettingsAdvanced.strBorders": "Межы і заліўка",
@ -1575,12 +1617,13 @@
  "DE.Views.EditListItemDialog.textValueError": "Элемент з такой назвай ужо існуе.",
  "DE.Views.FileMenu.btnBackCaption": "Перайсці да дакументаў",
  "DE.Views.FileMenu.btnCloseMenuCaption": "Закрыць меню",
-  "DE.Views.FileMenu.btnCreateNewCaption": "Стварыць новы",
+  "DE.Views.FileMenu.btnCreateNewCaption": "Стварыць",
  "DE.Views.FileMenu.btnDownloadCaption": "Спампаваць як",
+  "DE.Views.FileMenu.btnExitCaption": "Закрыць",
  "DE.Views.FileMenu.btnHelpCaption": "Даведка",
  "DE.Views.FileMenu.btnHistoryCaption": "Гісторыя версій",
  "DE.Views.FileMenu.btnInfoCaption": "Інфармацыя пра дакумент",
-  "DE.Views.FileMenu.btnPrintCaption": "Друк",
+  "DE.Views.FileMenu.btnPrintCaption": "Друкаванне",
  "DE.Views.FileMenu.btnProtectCaption": "Абараніць",
  "DE.Views.FileMenu.btnRecentFilesCaption": "Адкрыць апошнія",
  "DE.Views.FileMenu.btnRenameCaption": "Змяніць назву",
@ -1593,7 +1636,7 @@
  "DE.Views.FileMenu.btnToEditCaption": "Рэдагаваць дакумент",
  "DE.Views.FileMenu.textDownload": "Спампаваць",
  "DE.Views.FileMenuPanels.CreateNew.txtBlank": "Пусты дакумент",
-  "DE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Стварыць новы",
+  "DE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Стварыць",
  "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Ужыць",
  "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Дадаць аўтара",
  "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Дадаць тэкст",
@ -1602,6 +1645,7 @@
  "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Змяніць правы на доступ",
  "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Каментар",
  "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Створаны",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtFastWV": "Хуткі сеціўны прагляд",
  "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Загрузка…",
  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Аўтар апошняй змены",
  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Апошняя змена",
@ -1655,7 +1699,9 @@
  "DE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Параметры аўтазамены…",
  "DE.Views.FileMenuPanels.Settings.txtCacheMode": "Прадвызначаны рэжым кэшу",
  "DE.Views.FileMenuPanels.Settings.txtCm": "Сантыметр",
-  "DE.Views.FileMenuPanels.Settings.txtFitPage": "Па памерах старонкі",
+  "DE.Views.FileMenuPanels.Settings.txtCollaboration": "Сумесная праца",
+  "DE.Views.FileMenuPanels.Settings.txtEditingSaving": "Рэдагаванне і захаванне",
+  "DE.Views.FileMenuPanels.Settings.txtFitPage": "Па памеры старонкі",
  "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Па шырыні",
  "DE.Views.FileMenuPanels.Settings.txtInch": "Цаля",
  "DE.Views.FileMenuPanels.Settings.txtLast": "Праглядзець апошнія",
@ -1674,26 +1720,49 @@
  "DE.Views.FileMenuPanels.Settings.txtWin": "як Windows",
  "DE.Views.FormSettings.textAlways": "Заўсёды",
  "DE.Views.FormSettings.textAspect": "Захоўваць прапорцыі",
+  "DE.Views.FormSettings.textAtLeast": "Мінімум",
+  "DE.Views.FormSettings.textAuto": "Аўта",
  "DE.Views.FormSettings.textAutofit": "Аўтазапаўненне",
  "DE.Views.FormSettings.textBackgroundColor": "Колер фону",
+  "DE.Views.FormSettings.textCheckbox": "Адзнака",
  "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.textFormatSymbols": "Дазволеныя сімвалы",
  "DE.Views.FormSettings.textFromFile": "З файла",
  "DE.Views.FormSettings.textFromStorage": "Са сховішча",
  "DE.Views.FormSettings.textFromUrl": "Па URL",
+  "DE.Views.FormSettings.textMask": "Адвольная маска",
+  "DE.Views.FormSettings.textMaxChars": "Ліміт знакаў",
  "DE.Views.FormSettings.textNever": "Ніколі",
  "DE.Views.FormSettings.textNoBorder": "Без межаў",
  "DE.Views.FormSettings.textPlaceholder": "Запаўняльнік",
  "DE.Views.FormSettings.textRequired": "Патрабуецца",
  "DE.Views.FormSettings.textSelectImage": "Абраць выяву",
  "DE.Views.FormSettings.textTipAdd": "Дадаць новае значэнне",
+  "DE.Views.FormSettings.textTipDelete": "Выдаліць значэнне",
  "DE.Views.FormSettings.textTipDown": "Перамясціць уніз",
  "DE.Views.FormSettings.textTipUp": "Перамясціць уверх",
  "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.textClear": "Ачысціць палі",
+  "DE.Views.FormsTab.textClearFields": "Ачысціць усе палі",
  "DE.Views.FormsTab.textCreateForm": "Дадайце палі і стварыце запаўняльны дакумент OFORM",
  "DE.Views.FormsTab.textNoHighlight": "Без падсвятлення",
+  "DE.Views.FormsTab.textRequired": "Запоўніце ўсе абавязковыя палі, патрэбныя для адпраўлення формы. ",
+  "DE.Views.FormsTab.tipDownloadForm": "Спампаваць файл як дакумент OFORM",
  "DE.Views.FormsTab.tipImageField": "Уставіць выяву",
  "DE.Views.FormsTab.txtUntitled": "Без назвы",
  "DE.Views.HeaderFooterSettings.textBottomCenter": "Знізу па цэнтры",
@ -1732,6 +1801,7 @@
  "DE.Views.ImageSettings.textCrop": "Абрэзаць",
  "DE.Views.ImageSettings.textCropFill": "Заліўка",
  "DE.Views.ImageSettings.textCropFit": "Умясціць",
+  "DE.Views.ImageSettings.textCropToShape": "Абрэзаць па фігуры",
  "DE.Views.ImageSettings.textEdit": "Рэдагаваць",
  "DE.Views.ImageSettings.textEditObject": "Рэдагаваць аб’ект",
  "DE.Views.ImageSettings.textFitMargins": "Упісаць",
@ -1843,6 +1913,7 @@
  "DE.Views.LeftMenu.tipSupport": "Зваротная сувязь і падтрымка",
  "DE.Views.LeftMenu.tipTitles": "Загалоўкі",
  "DE.Views.LeftMenu.txtDeveloper": "РЭЖЫМ РАСПРАЦОЎШЧЫКА",
+  "DE.Views.LeftMenu.txtEditor": "Рэдактар дакументаў",
  "DE.Views.LeftMenu.txtTrial": "ПРОБНЫ РЭЖЫМ",
  "DE.Views.LineNumbersDialog.textAddLineNumbering": "Дадаць нумарацыю радкоў",
  "DE.Views.LineNumbersDialog.textApplyTo": "Ужыць змены",
@ -1858,6 +1929,7 @@
  "DE.Views.LineNumbersDialog.textStartAt": "Пачаць з",
  "DE.Views.LineNumbersDialog.textTitle": "Нумарацыя радкоў",
  "DE.Views.LineNumbersDialog.txtAutoText": "Аўта",
+  "DE.Views.Links.capBtnAddText": "Дадаць тэкст",
  "DE.Views.Links.capBtnBookmarks": "Закладка",
  "DE.Views.Links.capBtnCaption": "Назва",
  "DE.Views.Links.capBtnContentsUpdate": "Абнавіць табліцу",
@ -1866,6 +1938,7 @@
  "DE.Views.Links.capBtnInsFootnote": "Зноска",
  "DE.Views.Links.capBtnInsLink": "Гіперспасылка",
  "DE.Views.Links.confirmDeleteFootnotes": "Хочаце выдаліць усе зноскі?",
+  "DE.Views.Links.confirmReplaceTOF": "Хочаце замяніць абраную табліцу фігур?",
  "DE.Views.Links.mniConvertNote": "Пераўтварыць усе зноскі",
  "DE.Views.Links.mniDelFootnote": "Выдаліць усе зноскі",
  "DE.Views.Links.mniInsEndnote": "Уставіць канцавую зноску",
@ -1887,6 +1960,7 @@
  "DE.Views.Links.tipCrossRef": "Уставіць скрыжаваную спасылку",
  "DE.Views.Links.tipInsertHyperlink": "Дадаць гіперспасылку",
  "DE.Views.Links.tipNotes": "Уставіць альбо рэдагаваць зноскі",
+  "DE.Views.Links.txtDontShowTof": "Не ўключаць у змест",
  "DE.Views.ListSettingsDialog.textAuto": "Аўтаматычна",
  "DE.Views.ListSettingsDialog.textCenter": "Па цэнтры",
  "DE.Views.ListSettingsDialog.textLeft": "Па леваму краю",
@ -1951,6 +2025,7 @@
  "DE.Views.MailMergeSettings.txtPrev": "Папярэдні запіс",
  "DE.Views.MailMergeSettings.txtUntitled": "Без назвы",
  "DE.Views.MailMergeSettings.warnProcessMailMerge": "Не атрымалася распачаць аб’яднанне",
+  "DE.Views.Navigation.txtClosePanel": "Закрыць загалоўкі",
  "DE.Views.Navigation.txtCollapse": "Згарнуць усе",
  "DE.Views.Navigation.txtDemote": "Панізіць узровень",
  "DE.Views.Navigation.txtEmpty": "У гэтага дакумента няма загалоўка<br>Выкарыстайце стыль загалоўка да тэксту, каб ён з’явіўся ў змесце.",
@ -1967,6 +2042,7 @@
  "DE.Views.NoteSettingsDialog.textApplyTo": "Ужыць змены",
  "DE.Views.NoteSettingsDialog.textContinue": "Бесперапынная",
  "DE.Views.NoteSettingsDialog.textCustom": "Адвольная адзнака",
+  "DE.Views.NoteSettingsDialog.textDocEnd": "У канцы дакумента",
  "DE.Views.NoteSettingsDialog.textDocument": "Да ўсяго дакумента",
  "DE.Views.NoteSettingsDialog.textEachPage": "На кожнай старонцы",
  "DE.Views.NoteSettingsDialog.textEachSection": "У кожным раздзеле",
@ -2006,10 +2082,11 @@
  "DE.Views.PageMarginsDialog.txtMarginsH": "Верхняе і ніжняе палі занадта высокія для вызначанай вышыні старонкі",
  "DE.Views.PageMarginsDialog.txtMarginsW": "Левае і правае поле занадта шырокія для гэтай шырыні старонкі",
  "DE.Views.PageSizeDialog.textHeight": "Вышыня",
-  "DE.Views.PageSizeDialog.textPreset": "Перадналадка",
+  "DE.Views.PageSizeDialog.textPreset": "Папярэдняе наладжванне",
  "DE.Views.PageSizeDialog.textTitle": "Памер старонкі",
  "DE.Views.PageSizeDialog.textWidth": "Шырыня",
  "DE.Views.PageSizeDialog.txtCustom": "Адвольны",
+  "DE.Views.PageThumbnails.textClosePanel": "Закрыць мініяцюры старонак",
  "DE.Views.ParagraphSettings.strIndent": "Водступы",
  "DE.Views.ParagraphSettings.strIndentsLeftText": "Злева",
  "DE.Views.ParagraphSettings.strIndentsRightText": "Справа",
@ -2058,6 +2135,7 @@
  "DE.Views.ParagraphSettingsAdvanced.strSuppressLineNumbers": "Забараніць нумарацыю радкоў",
  "DE.Views.ParagraphSettingsAdvanced.strTabs": "Табуляцыя",
  "DE.Views.ParagraphSettingsAdvanced.textAlign": "Выраўноўванне",
+  "DE.Views.ParagraphSettingsAdvanced.textAll": "Усе",
  "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "Мінімум",
  "DE.Views.ParagraphSettingsAdvanced.textAuto": "Множнік",
  "DE.Views.ParagraphSettingsAdvanced.textBackColor": "Колер фону",
@ -2068,7 +2146,12 @@
  "DE.Views.ParagraphSettingsAdvanced.textBottom": "Знізу",
  "DE.Views.ParagraphSettingsAdvanced.textCentered": "Па цэнтры",
  "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Прамежак паміж знакамі",
+  "DE.Views.ParagraphSettingsAdvanced.textContext": "Кантэкстныя",
+  "DE.Views.ParagraphSettingsAdvanced.textContextDiscret": "Кантэкстныя і дыскрэцыйныя",
+  "DE.Views.ParagraphSettingsAdvanced.textContextHistDiscret": "Кантэкстныя, гістарычныя і дыскрэцыйныя",
+  "DE.Views.ParagraphSettingsAdvanced.textContextHistorical": "Кантэкстныя і гістарычныя",
  "DE.Views.ParagraphSettingsAdvanced.textDefault": "Прадвызначана",
+  "DE.Views.ParagraphSettingsAdvanced.textDiscret": "Дыскрэцыйныя",
  "DE.Views.ParagraphSettingsAdvanced.textEffects": "Эфекты",
  "DE.Views.ParagraphSettingsAdvanced.textExact": "Дакладна",
  "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "Першы радок",
@ -2179,19 +2262,20 @@
  "DE.Views.SignatureSettings.strDetails": "Падрабязнасці подпісу",
  "DE.Views.SignatureSettings.strInvalid": "Хібныя подпісы",
  "DE.Views.SignatureSettings.strRequested": "Запытаныя подпісы",
-  "DE.Views.SignatureSettings.strSetup": "Наладка подпісу",
+  "DE.Views.SignatureSettings.strSetup": "Наладжванне подпісу",
  "DE.Views.SignatureSettings.strSign": "Падпісаць",
  "DE.Views.SignatureSettings.strSignature": "Подпіс",
  "DE.Views.SignatureSettings.strSigner": "Падпісальнік",
  "DE.Views.SignatureSettings.strValid": "Дзейныя подпісы",
  "DE.Views.SignatureSettings.txtContinueEditing": "Рэдагаваць усё роўна",
  "DE.Views.SignatureSettings.txtEditWarning": "Падчас рэдагавання з дакумента выдаляцца подпісы.<br>Сапраўды хочаце працягнуць?",
+  "DE.Views.SignatureSettings.txtRemoveWarning": "Хочаце выдаліць гэты подпіс?<br>Гэтае дзеянне нельга скасаваць.",
  "DE.Views.SignatureSettings.txtRequestedSignatures": "Гэты дакумент неабходна падпісаць.",
  "DE.Views.SignatureSettings.txtSigned": "У дакумент дададзеныя дзейныя подпісы. Дакумент абаронены ад рэдагавання.",
  "DE.Views.SignatureSettings.txtSignedInvalid": "Некаторыя з лічбавых подпісаў у дакуменце хібныя альбо іх немагчыма праверыць. Дакумент абаронены ад рэдагавання.",
  "DE.Views.Statusbar.goToPageText": "Перайсці да старонкі",
  "DE.Views.Statusbar.pageIndexText": "Старонка {0} з {1}",
-  "DE.Views.Statusbar.tipFitPage": "Па памерах старонкі",
+  "DE.Views.Statusbar.tipFitPage": "Па памеры старонкі",
  "DE.Views.Statusbar.tipFitWidth": "Па шырыні",
  "DE.Views.Statusbar.tipSetLang": "Абраць мову тэксту",
  "DE.Views.Statusbar.tipZoomFactor": "Маштаб",
@ -2230,6 +2314,7 @@
  "DE.Views.TableOfContentsSettings.txtCentered": "Па цэнтры",
  "DE.Views.TableOfContentsSettings.txtClassic": "Класічны",
  "DE.Views.TableOfContentsSettings.txtCurrent": "Бягучы",
+  "DE.Views.TableOfContentsSettings.txtDistinctive": "Адметны",
  "DE.Views.TableOfContentsSettings.txtModern": "Сучасны",
  "DE.Views.TableOfContentsSettings.txtOnline": "Анлайн",
  "DE.Views.TableOfContentsSettings.txtSimple": "Просты",
@ -2257,6 +2342,7 @@
  "DE.Views.TableSettings.textBorders": "Стыль межаў",
  "DE.Views.TableSettings.textCellSize": "Памеры ячэек і слупкоў",
  "DE.Views.TableSettings.textColumns": "Слупкі",
+  "DE.Views.TableSettings.textConvert": "Пераўтварыць табліцу ў тэкст",
  "DE.Views.TableSettings.textDistributeCols": "Наладзіць слупкі",
  "DE.Views.TableSettings.textDistributeRows": "Наладзіць радкі",
  "DE.Views.TableSettings.textEdit": "Радкі і слупкі",
@ -2361,7 +2447,9 @@
  "DE.Views.TableSettingsAdvanced.txtNoBorders": "Без межаў",
  "DE.Views.TableSettingsAdvanced.txtPercent": "Адсотак",
  "DE.Views.TableSettingsAdvanced.txtPt": "Пункт",
+  "DE.Views.TableToTextDialog.textNested": "Пераўтварэнне ўкладзеных табліц",
  "DE.Views.TableToTextDialog.textOther": "Іншае",
+  "DE.Views.TableToTextDialog.textTitle": "Пераўтварыць табліцу ў тэкст",
  "DE.Views.TextArtSettings.strColor": "Колер",
  "DE.Views.TextArtSettings.strFill": "Заліўка",
  "DE.Views.TextArtSettings.strSize": "Памер",
@ -2391,6 +2479,7 @@
  "DE.Views.TextToTableDialog.textOther": "Іншае",
  "DE.Views.TextToTableDialog.textPara": "Абзацы",
  "DE.Views.TextToTableDialog.textTableSize": "Памеры табліцы",
+  "DE.Views.TextToTableDialog.textTitle": "Пераўтварыць тэкст у табліцу",
  "DE.Views.TextToTableDialog.textWindow": "Аўтазапаўненне па шырыні акна",
  "DE.Views.TextToTableDialog.txtAutoText": "Аўта",
  "DE.Views.Toolbar.capBtnAddComment": "Дадаць каментар",
@ -2432,15 +2521,17 @@
  "DE.Views.Toolbar.mniFromStorage": "Са сховішча",
  "DE.Views.Toolbar.mniFromUrl": "Па URL",
  "DE.Views.Toolbar.mniHiddenBorders": "Схаваныя межы табліц",
-  "DE.Views.Toolbar.mniHiddenChars": "Недрукуемыя сімвалы",
+  "DE.Views.Toolbar.mniHiddenChars": "Сімвалы, якія не друкуюцца",
  "DE.Views.Toolbar.mniHighlightControls": "Налады падсвятлення",
  "DE.Views.Toolbar.mniImageFromFile": "Выява з файла",
  "DE.Views.Toolbar.mniImageFromStorage": "Выява са сховішча",
  "DE.Views.Toolbar.mniImageFromUrl": "Выява па URL",
+  "DE.Views.Toolbar.mniTextToTable": "Пераўтварыць тэкст у табліцу",
  "DE.Views.Toolbar.strMenuNoFill": "Без заліўкі",
  "DE.Views.Toolbar.textAutoColor": "Аўтаматычна",
  "DE.Views.Toolbar.textBold": "Тоўсты",
  "DE.Views.Toolbar.textBottom": "Ніжняе:",
+  "DE.Views.Toolbar.textChangeLevel": "Змяніць узровень спіса",
  "DE.Views.Toolbar.textCheckboxControl": "Адзнака",
  "DE.Views.Toolbar.textColumnsCustom": "Адвольныя слупкі",
  "DE.Views.Toolbar.textColumnsLeft": "Злева",
@ -2526,6 +2617,7 @@
  "DE.Views.Toolbar.tipControls": "Уставіць элемент кіравання змесцівам",
  "DE.Views.Toolbar.tipCopy": "Капіяваць",
  "DE.Views.Toolbar.tipCopyStyle": "Скапіяваць стыль",
+  "DE.Views.Toolbar.tipCut": "Выразаць",
  "DE.Views.Toolbar.tipDateTime": "Уставіць быгучую назву і час",
  "DE.Views.Toolbar.tipDecFont": "Паменшыць памер шрыфту",
  "DE.Views.Toolbar.tipDecPrLeft": "Паменшыць водступ",
@ -2554,6 +2646,11 @@
  "DE.Views.Toolbar.tipMailRecepients": "Аб’яднанне",
  "DE.Views.Toolbar.tipMarkers": "Спіс з адзнакамі",
  "DE.Views.Toolbar.tipMarkersArrow": "Маркеры-стрэлкі",
+  "DE.Views.Toolbar.tipMarkersCheckmark": "Адзнакі",
+  "DE.Views.Toolbar.tipMarkersDash": "Адзнакі-працяжнікі",
+  "DE.Views.Toolbar.tipMarkersFRhombus": "Адзнакі ў выглядзе запоўненых ромбаў",
+  "DE.Views.Toolbar.tipMarkersFRound": "Адзнакі ў выглядзе запоўненых колаў",
+  "DE.Views.Toolbar.tipMarkersFSquare": "Адзнакі ў выглядзе запоўненых квадратаў",
  "DE.Views.Toolbar.tipMultilevels": "Шматузроўневы спіс",
  "DE.Views.Toolbar.tipNumbers": "Пранумараваны спіс",
  "DE.Views.Toolbar.tipPageBreak": "Уставіць разрыў старонкі альбо раздзела",
@ -2563,13 +2660,13 @@
  "DE.Views.Toolbar.tipParagraphStyle": "Стыль абзаца",
  "DE.Views.Toolbar.tipPaste": "Уставіць",
  "DE.Views.Toolbar.tipPrColor": "Колер фону абзаца",
-  "DE.Views.Toolbar.tipPrint": "Друк",
+  "DE.Views.Toolbar.tipPrint": "Друкаванне",
  "DE.Views.Toolbar.tipRedo": "Паўтарыць",
  "DE.Views.Toolbar.tipSave": "Захаваць",
  "DE.Views.Toolbar.tipSaveCoauth": "Захаваць свае змены, каб іншыя карыстальнікі іх убачылі.",
  "DE.Views.Toolbar.tipSendBackward": "Адправіць назад",
  "DE.Views.Toolbar.tipSendForward": "Перамясціць уперад",
-  "DE.Views.Toolbar.tipShowHiddenChars": "Недрукуемыя сімвалы",
+  "DE.Views.Toolbar.tipShowHiddenChars": "Сімвалы, якія не друкуюцца",
  "DE.Views.Toolbar.tipSynchronize": "Дакумент быў зменены іншым карыстальнікам. Націсніце, каб захаваць свае змены і загрузіць абнаўленні.",
  "DE.Views.Toolbar.tipUndo": "Адрабіць",
  "DE.Views.Toolbar.tipWatermark": "Рэдагаваць падкладку",
@ -2600,8 +2697,14 @@
  "DE.Views.Toolbar.txtScheme8": "Плаваючая",
  "DE.Views.Toolbar.txtScheme9": "Ліцейня",
  "DE.Views.ViewTab.textAlwaysShowToolbar": "Заўсёды паказваць панэль інструментаў",
+  "DE.Views.ViewTab.textDarkDocument": "Цёмны дакумент",
+  "DE.Views.ViewTab.textFitToPage": "Па памеры старонкі",
+  "DE.Views.ViewTab.textFitToWidth": "Па шырыні",
  "DE.Views.ViewTab.textNavigation": "Навігацыя",
  "DE.Views.ViewTab.textZoom": "Маштаб",
+  "DE.Views.ViewTab.tipDarkDocument": "Цёмны дакумент",
+  "DE.Views.ViewTab.tipFitToPage": "Па памеры старонкі",
+  "DE.Views.ViewTab.tipFitToWidth": "Па шырыні",
  "DE.Views.WatermarkSettingsDialog.textAuto": "Аўта",
  "DE.Views.WatermarkSettingsDialog.textBold": "Тоўсты",
  "DE.Views.WatermarkSettingsDialog.textColor": "Колер тэксту",
--- a/Show more
+++ b/Show more