Merge branch 'develop' into feature/add-tab-color

apps/api/documents/api.js

@@ -165,7 +165,7 @@
                                 navigation: false/true // navigation button in de
                             } / false / true, // view tab
                             save: false/true // save button on toolbar in 
-                        },
+                        } / false / true, // use instead of customization.toolbar,
                         header: {
                             users: false/true // users list button
                             save: false/true // save button
@@ -179,7 +179,7 @@
                             textLang: false/true // text language button in de/pe
                             docLang: false/true // document language button in de/pe
                             actionStatus: false/true // status of operation
-                        }
+                        } / false / true, // use instead of customization.statusBar
                     },
                     features: { // disable feature
                         spellcheck: {
@@ -194,8 +194,8 @@
                     leftMenu: true, // must be deprecated. use layout.leftMenu instead
                     rightMenu: true, // must be deprecated. use layout.rightMenu instead
                     hideRightMenu: false, // hide or show right panel on first loading
-                    toolbar: true,
-                    statusBar: true,
+                    toolbar: true, // must be deprecated. use layout.toolbar instead
+                    statusBar: true, // must be deprecated. use layout.statusBar instead
                     autosave: true,
                     forcesave: false,
                     commentAuthorOnly: false, // must be deprecated. use permissions.editCommentAuthorOnly and permissions.deleteCommentAuthorOnly instead

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

@@ -210,8 +210,10 @@ define([
                     templateBtnIcon +
                 '</div>' +
                 '<div class="inner-box-caption">' +
-                    '<span class="caption"><%= caption %></span>' +
-                    '<i class="caret"></i>' +
+                    '<span class="caption"><%= caption %>' +
+                        '<i class="caret"></i>' +
+                    '</span>' +
+                    '<i class="caret compact-caret"></i>' +
                 '</div>' +
             '</button>' +
         '</div>';
@@ -225,12 +227,38 @@ define([
             '</button>' +
             '<button type="button" class="btn <%= cls %> inner-box-caption dropdown-toggle" data-toggle="dropdown" data-hint="<%= dataHint %>" data-hint-direction="<%= dataHintDirection %>" data-hint-offset="<%= dataHintOffset %>" <% if (dataHintTitle) { %> data-hint-title="<%= dataHintTitle %>" <% } %>>' +
                 '<span class="btn-fixflex-vcenter">' +
-                    '<span class="caption"><%= caption %></span>' +
-                    '<i class="caret"></i>' +
+                    '<span class="caption"><%= caption %>' +
+                        '<i class="caret"></i>' +
+                    '</span>' +
+                    '<i class="caret compact-caret"></i>' +
                 '</span>' +
             '</button>' +
         '</div>';
 
+    var getWidthOfCaption = function (txt) {
+        var el = document.createElement('span');
+        el.style.fontSize = '11px';
+        el.style.fontFamily = 'Arial, Helvetica, "Helvetica Neue", sans-serif';
+        el.style.position = "absolute";
+        el.style.top = '-1000px';
+        el.style.left = '-1000px';
+        el.innerHTML = txt;
+        document.body.appendChild(el);
+        var result = el.offsetWidth;
+        document.body.removeChild(el);
+        return result;
+    };
+
+    var getShortText = function (txt, max) {
+        var lastIndex = txt.length - 1,
+            word = txt;
+        while (getWidthOfCaption(word) > max) {
+            word = txt.slice(0, lastIndex).trim() + '...';
+            lastIndex--;
+        }
+        return word;
+    };
+
     Common.UI.Button = Common.UI.BaseView.extend({
         options : {
             id              : null,
@@ -320,6 +348,37 @@ define([
                 me.render(me.options.parentEl);
         },
 
+        getCaptionWithBreaks: function (caption) {
+            var words = caption.split(' '),
+                newCaption = null,
+                maxWidth = 85 - 4;
+            if (words.length > 1) {
+                maxWidth = !!this.menu || this.split === true ? maxWidth - 10 : maxWidth;
+                if (words.length < 3) {
+                    words[1] = getShortText(words[1], maxWidth);
+                    newCaption = words[0] + '<br>' + words[1];
+                } else {
+                    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];
+                    }
+                }
+            } else {
+                var width = getWidthOfCaption(caption);
+                newCaption = width < maxWidth ? caption : getShortText(caption, maxWidth);
+                if (!!this.menu || this.split === true) {
+                    newCaption += '<br>';
+                }
+            }
+            return newCaption;
+        },
+
         render: function(parentEl) {
             var me = this;
 
@@ -341,6 +400,10 @@ define([
                         } else {
                             this.template = _.template(templateHugeCaption);
                         }
+                        var newCaption = this.getCaptionWithBreaks(this.caption);
+                        if (newCaption) {
+                            me.caption = newCaption;
+                        }
                     }
 
                     me.cmpEl = $(this.template({
@@ -748,15 +811,19 @@ define([
 
         setCaption: function(caption) {
             if (this.caption != caption) {
-                this.caption = caption;
+                if ( /icon-top/.test(this.cls) && !!this.caption && /huge/.test(this.cls) ) {
+                    var newCaption = this.getCaptionWithBreaks(caption);
+                    this.caption = newCaption || caption;
+                } else
+                    this.caption = caption;
 
                 if (this.rendered) {
                     var captionNode = this.cmpEl.find('.caption');
 
                     if (captionNode.length > 0) {
-                        captionNode.text(caption);
+                        captionNode.html(this.caption);
                     } else {
-                        this.cmpEl.find('button:first').addBack().filter('button').text(caption);
+                        this.cmpEl.find('button:first').addBack().filter('button').html(this.caption);
                     }
                 }
             }

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

@@ -255,6 +255,7 @@ define([
                 var picker = this.menuPicker;
                 if (picker) {
                     var record = picker.getSelectedRec();
+                    this.itemMarginLeft = undefined;
                     this.fillComboView(record || picker.store.at(0), !!record, true);
 
                     picker.onResize();

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

@@ -52,6 +52,7 @@ define([
         var $scrollL;
         var optsFold = {timeout: 2000};
         var config = {};
+        var btnsMore = [];
 
         var onScrollTabs = function(opts, e) {
             var sv = $boxTabs.scrollLeft();
@@ -126,7 +127,9 @@ define([
 
                 $boxTabs = me.$('.tabs > ul');
                 me.$tabs = $boxTabs.find('> li');
-                me.$panels = me.$('.box-panels > .panel');
+                me.$boxpanels = me.$('.box-panels');
+                me.$panels = me.$boxpanels.find('> .panel');
+
                 optsFold.$bar = me.$('.toolbar');
                 var $scrollR = me.$('.tabs .scroll.right');
                 $scrollL = me.$('.tabs .scroll.left');
@@ -234,7 +237,7 @@ define([
                 if ( $boxTabs.parent().hasClass('short') ) {
                     $boxTabs.parent().removeClass('short');
                 }
-
+                this.hideMoreBtns();
                 this.processPanelVisible();
             },
 
@@ -261,7 +264,7 @@ define([
                             me._timerSetTab = false;
                         }, 500);
                         me.setTab(tab);
-                        me.processPanelVisible(null, true);
+                        // me.processPanelVisible(null, true);
                         if ( !me.isFolded ) {
                             if ( me.dblclick_timer ) clearTimeout(me.dblclick_timer);
                             me.dblclick_timer = setTimeout(function () {
@@ -286,11 +289,14 @@ define([
                 if ( tab ) {
                     me.$tabs.removeClass('active');
                     me.$panels.removeClass('active');
+                    me.hideMoreBtns();
 
                     var panel = this.$panels.filter('[data-tab=' + tab + ']');
                     if ( panel.length ) {
                         this.lastPanel = tab;
                         panel.addClass('active');
+                        me.setMoreButton(tab, panel);
+                        me.processPanelVisible(null, true, true);
                     }
 
                     if ( panel.length ) {
@@ -375,7 +381,7 @@ define([
              * hide button's caption to decrease panel width
              * ##adopt-panel-width
             **/
-            processPanelVisible: function(panel, now) {
+            processPanelVisible: function(panel, now, force) {
                 var me = this;
                 if ( me._timer_id ) clearTimeout(me._timer_id);
 
@@ -387,6 +393,7 @@ define([
                             _rightedge = data.rightedge,
                             _btns = data.buttons,
                             _flex = data.flex;
+                        var more_section = $active.find('.more-box');
 
                         if ( !_rightedge ) {
                             _rightedge = $active.get(0).getBoundingClientRect().right;
@@ -407,44 +414,53 @@ define([
                             data.flex = _flex;
                         }
 
-                        if ( _rightedge > _maxright) {
-                            if (_flex.length>0) {
-                                for (var i=0; i<_flex.length; i++) {
-                                    var item = _flex[i].el;
-                                    if (item.outerWidth() > parseInt(item.css('min-width')))
-                                        return;
-                                    else
-                                        item.css('width', item.css('min-width'));
-                                }
-                            }
-                            for (var i=_btns.length-1; i>=0; i--) {
-                                var btn = _btns[i];
-                                if ( !btn.hasClass('compactwidth') ) {
-                                    btn.addClass('compactwidth');
-                                    _rightedge = $active.get(0).getBoundingClientRect().right;
-                                    if (_rightedge <= _maxright)
-                                        break;
-                                }
-                            }
-                            data.rightedge = _rightedge;
-                        } else {
-                            for (var i=0; i<_btns.length; i++) {
-                                var btn = _btns[i];
-                                if ( btn.hasClass('compactwidth') ) {
-                                    btn.removeClass('compactwidth');
-                                    _rightedge = $active.get(0).getBoundingClientRect().right;
-                                    if ( _rightedge > _maxright) {
-                                        btn.addClass('compactwidth');
+                        if ( (_rightedge > _maxright)) {
+                            if (!more_section.is(':visible') ) {
+                                if (_flex.length>0) {
+                                    for (var i=0; i<_flex.length; i++) {
+                                        var item = _flex[i].el;
                                         _rightedge = $active.get(0).getBoundingClientRect().right;
-                                        break;
+                                        if (item.outerWidth() > parseInt(item.css('min-width'))) {
+                                            data.rightedge = _rightedge;
+                                            return;
+                                        } else
+                                            item.css('width', item.css('min-width'));
                                     }
                                 }
+                                for (var i=_btns.length-1; i>=0; i--) {
+                                    var btn = _btns[i];
+                                    if ( !btn.hasClass('compactwidth') && !btn.hasClass('slot-btn-more')) {
+                                        btn.addClass('compactwidth');
+                                        _rightedge = $active.get(0).getBoundingClientRect().right;
+                                        if (_rightedge <= _maxright)
+                                            break;
+                                    }
+                                }
+                                data.rightedge = _rightedge;
                             }
-                            data.rightedge = _rightedge;
-                            if (_flex.length>0 && $active.find('.btn-slot.compactwidth').length<1) {
-                                for (var i=0; i<_flex.length; i++) {
-                                    var item = _flex[i];
-                                    item.el.css('width', item.width);
+                            me.resizeToolbar(force);
+                        } else {
+                            more_section.is(':visible') && me.resizeToolbar(force);
+                            if (!more_section.is(':visible')) {
+                                for (var i=0; i<_btns.length; i++) {
+                                    var btn = _btns[i];
+                                    if ( btn.hasClass('compactwidth') ) {
+                                        btn.removeClass('compactwidth');
+                                        _rightedge = $active.get(0).getBoundingClientRect().right;
+                                        if ( _rightedge > _maxright) {
+                                            btn.addClass('compactwidth');
+                                            _rightedge = $active.get(0).getBoundingClientRect().right;
+                                            break;
+                                        }
+                                    }
+                                }
+                                data.rightedge = _rightedge;
+                                if (_flex.length>0 && $active.find('.btn-slot.compactwidth').length<1) {
+                                    for (var i=0; i<_flex.length; i++) {
+                                        var item = _flex[i];
+                                        item.el.css('width', item.width);
+                                        data.rightedge = $active.get(0).getBoundingClientRect().right;
+                                    }
                                 }
                             }
                         }
@@ -477,6 +493,295 @@ define([
                     this.$tabs.find('> a[data-tab=' + tab + ']').parent().css('display', visible ? '' : 'none');
                     this.onResize();
                 }
+            },
+
+            setMoreButton: function(tab, panel) {
+                var me = this;
+                if (!btnsMore[tab]) {
+                    var box = $('<div class="more-box" style="position: absolute;right: 0; padding-left: 12px;padding-right: 6px;display: none;">' +
+                        '<div class="separator long" style="position: relative;display: table-cell;"></div>' +
+                        '<div class="group" style=""><span class="btn-slot text x-huge slot-btn-more"></span></div>' +
+                        '</div>');
+                    panel.append(box);
+                    btnsMore[tab] = new Common.UI.Button({
+                        cls: 'btn-toolbar x-huge icon-top dropdown-manual',
+                        caption: Common.Locale.get("textMoreButton",{name:"Common.Translation", default: "More"}),
+                        iconCls: 'toolbar__icon btn-more',
+                        enableToggle: true
+                    });
+                    btnsMore[tab].render(box.find('.slot-btn-more'));
+                    btnsMore[tab].on('toggle', function(btn, state, e) {
+                        (state) ? me.onMoreShow(btn, e) : me.onMoreHide(btn, e);
+                        Common.NotificationCenter.trigger('more:toggle', btn, state);
+                    });
+                    var moreContainer = $('<div class="dropdown-menu more-container" data-tab="' + tab + '"><div style="display: inline;"></div></div>');
+                    optsFold.$bar.append(moreContainer);
+                    btnsMore[tab].panel = moreContainer.find('div');
+                }
+                this.$moreBar = btnsMore[tab].panel;
+            },
+
+            resizeToolbar: function(reset) {
+                var $active = this.$panels.filter('.active'),
+                    more_section = $active.find('.more-box'),
+                    more_section_width = parseInt(more_section.css('width')) || 0,
+                    box_controls_width = $active.parents('.box-controls').width(),
+                    _maxright = box_controls_width,
+                    _rightedge = $active.get(0).getBoundingClientRect().right,
+                    delta = (this._prevBoxWidth) ? (_maxright - this._prevBoxWidth) : -1,
+                    hideAllMenus = false;
+                this._prevBoxWidth = _maxright;
+                more_section.is(':visible') && (_maxright -= more_section_width);
+
+                if (this.$moreBar && this.$moreBar.parent().is(':visible')) {
+                    this.$moreBar.parent().css('max-width', Common.Utils.innerWidth());
+                }
+
+                if ( (reset || delta<0) && (_rightedge > _maxright)) { // from toolbar to more section
+                    if (!more_section.is(':visible') ) {
+                        more_section.css('display', "");
+                        _maxright -= parseInt(more_section.css('width'));
+                    }
+                    var last_separator = null,
+                        last_group = null,
+                        prevchild = this.$moreBar.children().filter("[data-hidden-tb-item!=true]");
+                    if (prevchild.length>0) {
+                        prevchild = $(prevchild[0]);
+                        if (prevchild.hasClass('separator'))
+                            last_separator = prevchild;
+                        if (prevchild.hasClass('group') && prevchild.attr('group-state') == 'open')
+                            last_group = prevchild;
+                    }
+                    var items = $active.find('> div:not(.more-box)');
+                    var need_break = false;
+                    for (var i=items.length-1; i>=0; i--) {
+                        var item = $(items[i]);
+                        if (!item.is(':visible')) { // move invisible items as is and set special attr
+                            item.attr('data-hidden-tb-item', true);
+                            this.$moreBar.prepend(item);
+                            hideAllMenus = true;
+                        } else if (item.hasClass('group')) {
+                            _rightedge = $active.get(0).getBoundingClientRect().right;
+                            if (_rightedge <= _maxright) // stop moving items
+                                break;
+
+                            var offset = item.offset(),
+                                item_width = item.outerWidth(),
+                                children = item.children();
+                            if (!item.attr('inner-width') && item.attr('group-state') !== 'open') {
+                                item.attr('inner-width', item_width);
+                                for (var j=children.length-1; j>=0; j--) {
+                                    var child = $(children[j]);
+                                    child.attr('inner-width', child.outerWidth());
+                                }
+                            }
+                            if ((offset.left > _maxright || children.length==1) && item.attr('group-state') != 'open') {
+                                // move group
+                                this.$moreBar.prepend(item);
+                                if (last_separator) {
+                                    last_separator.css('display', '');
+                                }
+                                hideAllMenus = true;
+                            } else if ( offset.left+item_width > _maxright ) {
+                                // move buttons from group
+                                for (var j=children.length-1; j>=0; j--) {
+                                    var child = $(children[j]);
+                                    if (child.hasClass('elset')) {
+                                        this.$moreBar.prepend(item);
+                                        if (last_separator) {
+                                            last_separator.css('display', '');
+                                        }
+                                        hideAllMenus = true;
+                                        break;
+                                    } else {
+                                        var child_offset = child.offset(),
+                                            child_width = child.outerWidth();
+                                        if (child_offset.left+child_width>_maxright) {
+                                            if (!last_group) {
+                                                last_group = $('<div></div>');
+                                                last_group.addClass(items[i].className);
+                                                var attrs = items[i].attributes;
+                                                for (var k = 0; k < attrs.length; k++) {
+                                                    last_group.attr(attrs[k].name, attrs[k].value);
+                                                }
+                                                this.$moreBar.prepend(last_group);
+                                                if (last_separator) {
+                                                    last_separator.css('display', '');
+                                                }
+                                            }
+                                            last_group.prepend(child);
+                                            hideAllMenus = true;
+                                        } else {
+                                            need_break = true;
+                                            break;
+                                        }
+                                    }
+                                }
+                                if (item.children().length<1) { // all buttons are moved
+                                    item.remove();
+                                    last_group && last_group.removeAttr('group-state').attr('inner-width', item.attr('inner-width'));
+                                    last_group = null;
+                                } else {
+                                    last_group && last_group.attr('group-state', 'open') && item.attr('group-state', 'open');
+                                }
+                                if (need_break)
+                                    break;
+                            } else {
+                                break;
+                            }
+                            last_separator = null;
+                        } else if (item.hasClass('separator')) {
+                            this.$moreBar.prepend(item);
+                            item.css('display', 'none');
+                            last_separator = item;
+                            hideAllMenus = true;
+                        }
+                    }
+                } else if ((reset || delta>0) && more_section.is(':visible')) {
+                    var last_separator = null,
+                        last_group = null,
+                        prevchild = $active.find('> div:not(.more-box)');
+                    var last_width = 0;
+                    if (prevchild.length>0) {
+                        prevchild = $(prevchild[prevchild.length-1]);
+                        if (prevchild.hasClass('separator')) {
+                            last_separator = prevchild;
+                            last_width = parseInt(last_separator.css('margin-left')) + parseInt(last_separator.css('margin-right')) + 1;
+                        }
+                        if (prevchild.hasClass('group') && prevchild.attr('group-state') == 'open')
+                            last_group = prevchild;
+                    }
+
+                    var items = this.$moreBar.children();
+                    if (items.length>0) {
+                        // from more panel to toolbar
+                        for (var i=0; i<items.length; i++) {
+                            var item = $(items[i]);
+                            _rightedge = $active.get(0).getBoundingClientRect().right;
+                            if (!item.is(':visible') && item.attr('data-hidden-tb-item')) { // move invisible items as is
+                                item.removeAttr('data-hidden-tb-item');
+                                more_section.before(item);
+                                if (this.$moreBar.children().filter('.group').length == 0) {
+                                    this.hideMoreBtns();
+                                    more_section.css('display', "none");
+                                }
+                            } else if (item.hasClass('group')) {
+                                var islast = false;
+                                if (this.$moreBar.children().filter('.group').length == 1) {
+                                    _maxright = box_controls_width; // try to move last group
+                                    islast = true;
+                                }
+
+                                var item_width = parseInt(item.attr('inner-width') || 0);
+                                if (_rightedge + last_width + item_width < _maxright && item.attr('group-state') != 'open') {
+                                    // move group
+                                    more_section.before(item);
+                                    if (last_separator) {
+                                        last_separator.css('display', '');
+                                    }
+                                    if (this.$moreBar.children().filter('.group').length == 0) {
+                                        this.hideMoreBtns();
+                                        more_section.css('display', "none");
+                                    }
+                                    hideAllMenus = true;
+                                } else if ( _rightedge + last_width < _maxright) {
+                                    // move buttons from group
+                                    var children = item.children();
+                                    _maxright = box_controls_width - more_section_width;
+                                    for (var j=0; j<children.length; j++) {
+                                        if (islast && j==children.length-1)
+                                             _maxright = box_controls_width; // try to move last item from last group
+                                        _rightedge = $active.get(0).getBoundingClientRect().right;
+                                        var child = $(children[j]);
+                                        if (child.hasClass('elset')) { // don't add group - no enough space
+                                            need_break = true;
+                                            break;
+                                        } else {
+                                            var child_width = parseInt(child.attr('inner-width') || 0) + (!last_group ? parseInt(item.css('padding-left')) : 0); // if new group is started add left-padding
+                                            if (_rightedge+last_width+child_width < _maxright) {
+                                                if (!last_group) {
+                                                    last_group = $('<div></div>');
+                                                    last_group.addClass(items[i].className);
+                                                    var attrs = items[i].attributes;
+                                                    for (var k = 0; k < attrs.length; k++) {
+                                                        last_group.attr(attrs[k].name, attrs[k].value);
+                                                    }
+                                                    if (last_group.hasClass('flex')) { // need to update flex groups list
+                                                        $active.data().flex = null;
+                                                    }
+                                                    more_section.before(last_group);
+                                                    if (last_separator) {
+                                                        last_separator.css('display', '');
+                                                    }
+                                                }
+                                                last_group.append(child);
+                                                hideAllMenus = true;
+                                            } else {
+                                                need_break = true;
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    if (item.children().length<1) { // all buttons are moved
+                                        item.remove();
+                                        last_group && last_group.removeAttr('group-state').attr('inner-width', item.attr('inner-width'));
+                                        last_group = null;
+                                        if (this.$moreBar.children().filter('.group').length == 0) {
+                                            this.hideMoreBtns();
+                                            more_section.css('display', "none");
+                                        }
+                                    } else {
+                                        last_group && last_group.attr('group-state', 'open') && item.attr('group-state', 'open');
+                                    }
+                                    if (need_break)
+                                        break;
+                                } else {
+                                    break;
+                                }
+                                last_separator = null; last_width = 0;
+                            } else if (item.hasClass('separator')) {
+                                more_section.before(item);
+                                item.css('display', 'none');
+                                last_separator = item;
+                                last_width = parseInt(last_separator.css('margin-left')) + parseInt(last_separator.css('margin-right')) + 1;
+                                hideAllMenus = true;
+                            }
+                        }
+                    } else {
+                        this.hideMoreBtns();
+                        more_section.css('display', "none");
+                    }
+                }
+                hideAllMenus && Common.UI.Menu.Manager.hideAll();
+            },
+
+            onMoreHide: function(btn, e) {
+                var moreContainer = btn.panel.parent();
+                if (btn.pressed) {
+                    btn.toggle(false, true);
+                }
+                if (moreContainer.is(':visible')) {
+                    moreContainer.hide();
+                    Common.NotificationCenter.trigger('edit:complete', this.toolbar, btn);
+                }
+            },
+
+            onMoreShow: function(btn, e) {
+                var moreContainer = btn.panel.parent(),
+                    parentxy = moreContainer.parent().offset(),
+                    target = btn.$el,
+                    showxy = target.offset(),
+                    right = Common.Utils.innerWidth() - (showxy.left - parentxy.left + target.width()),
+                    top = showxy.top - parentxy.top + target.height() + 10;
+
+                moreContainer.css({right: right, left: 'auto', top : top});
+                moreContainer.show();
+            },
+
+            hideMoreBtns: function() {
+                for (var btn in btnsMore) {
+                    btnsMore[btn] && btnsMore[btn].toggle(false);
+                }
             }
         };
     }()));

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

@@ -326,7 +326,7 @@ Common.UI.HintManager = new(function() {
             if (!_isItemDisabled(item)) {
                 var leftBorder = 0,
                     rightBorder = docW;
-                if (!_isEditDiagram && $(_currentSection).prop('id') === 'toolbar' && ($(_currentSection).find('.toolbar-mask').length > 0 || item.closest('.group').find('.toolbar-group-mask').length > 0)
+                if (!_isEditDiagram && $(_currentSection).prop('id') === 'toolbar' && ($(_currentSection).find('.toolbar-mask').length > 0)
                     || ($('#about-menu-panel').is(':visible') && item.closest('.hint-section').prop('id') === 'right-menu')) { // don't show right menu hints when about is visible
                     return;
                 }
@@ -535,7 +535,7 @@ Common.UI.HintManager = new(function() {
                             } else {
                                 _isComplete = false;
                                 _hideHints();
-                                if (!_isEditDiagram && $(_currentSection).prop('id') === 'toolbar' && ($(_currentSection).find('.toolbar-mask').length > 0 || curr.closest('.group').find('.toolbar-group-mask').length > 0)) {
+                                if (!_isEditDiagram && $(_currentSection).prop('id') === 'toolbar' && ($(_currentSection).find('.toolbar-mask').length > 0)) {
                                     _resetToDefault();
                                     return;
                                 }

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

@@ -100,6 +100,7 @@ define([
         onLaunch: function () {
             this.collection     =   this.getApplication().getCollection('Common.Collections.ReviewChanges');
             this.userCollection =   this.getApplication().getCollection('Common.Collections.Users');
+            this.viewmode = false;
 
             this._state = {posx: -1000, posy: -1000, popoverVisible: false, previewMode: false, compareSettings: null, wsLock: false, wsProps: []};
 
@@ -160,13 +161,23 @@ define([
             this.document = data.doc;
         },
 
-        SetDisabled: function(state) {
+        SetDisabled: function(state, reviewMode, fillFormMode) {
             if (this.dlgChanges)
                 this.dlgChanges.close();
-            this.view && this.view.SetDisabled(state, this.langs, {comments: !!this._state.wsProps['Objects']});
+            if (reviewMode)
+                this.lockToolbar(Common.enumLock.previewReviewMode, state);
+            else if (fillFormMode)
+                this.lockToolbar(Common.enumLock.viewFormMode, state);
+            else
+                this.lockToolbar(Common.enumLock.viewMode, state);
+
             this.setPreviewMode(state);
         },
 
+        lockToolbar: function (causes, lock, opts) {
+            Common.Utils.lockControls(causes, lock, opts, this.view.getButtons());
+        },
+
         setPreviewMode: function(mode) { //disable accept/reject in popover
             if (this.viewmode === mode) return;
             this.viewmode = mode;
@@ -203,8 +214,7 @@ define([
 
                     var btnlock = lock || !editable;
                     if (this.appConfig.canReview && !this.appConfig.isReviewOnly && this._state.lock !== btnlock) {
-                        this.view.btnAccept.setDisabled(btnlock);
-                        this.view.btnReject.setDisabled(btnlock);
+                        Common.Utils.lockControls(Common.enumLock.reviewChangelock, btnlock, {array: [this.view.btnAccept, this.view.btnReject]});
                         if (this.dlgChanges) {
                             this.dlgChanges.btnAccept.setDisabled(btnlock);
                             this.dlgChanges.btnReject.setDisabled(btnlock);
@@ -765,7 +775,7 @@ define([
             Common.NotificationCenter.trigger('editing:disable', disable, {
                 viewMode: false,
                 reviewMode: true,
-                fillFormwMode: false,
+                fillFormMode: false,
                 allowMerge: false,
                 allowSignature: false,
                 allowProtect: false,
@@ -776,22 +786,13 @@ define([
                 navigation: {disable: false, previewMode: true},
                 comments: {disable: false, previewMode: true},
                 chat: false,
-                review: false,
+                review: true,
                 viewport: false,
                 documentHolder: true,
                 toolbar: true,
-                plugins: true
+                plugins: true,
+                protect: true
             }, 'review');
-
-            if (this.view) {
-                this.view.$el.find('.no-group-mask.review').css('opacity', 1);
-
-                this.view.btnsDocLang && this.view.btnsDocLang.forEach(function(button) {
-                    if ( button ) {
-                        button.setDisabled(disable || !this.langs || this.langs.length<1);
-                    }
-                }, this);
-            }
         },
 
         createToolbarPanel: function() {
@@ -867,8 +868,8 @@ define([
             }
             me.onChangeProtectSheet();
             if (me.view) {
-                me.view.btnCommentRemove && me.view.btnCommentRemove.setDisabled(!Common.localStorage.getBool(me.view.appPrefix + "settings-livecomment", true) || !!this._state.wsProps['Objects']);
-                me.view.btnCommentResolve && me.view.btnCommentResolve.setDisabled(!Common.localStorage.getBool(me.view.appPrefix + "settings-livecomment", true) || !!this._state.wsProps['Objects']);
+                me.lockToolbar(Common.enumLock.hideComments, !Common.localStorage.getBool(me.view.appPrefix + "settings-livecomment", true), {array: [me.view.btnCommentRemove, me.view.btnCommentResolve]});
+                me.lockToolbar(Common.enumLock['Objects'], !!this._state.wsProps['Objects'], {array: [me.view.btnCommentRemove, me.view.btnCommentResolve]});
             }
 
             var val = Common.localStorage.getItem(me.view.appPrefix + "settings-review-hover-mode");
@@ -930,11 +931,7 @@ define([
 
         setLanguages: function (array) {
             this.langs = array;
-            this.view && this.view.btnsDocLang && this.view.btnsDocLang.forEach(function(button) {
-                if ( button ) {
-                    button.setDisabled(this.langs.length<1);
-                }
-            }, this);
+            this.lockToolbar(Common.enumLock.noSpellcheckLangs, this.langs.length<1, {array: this.view.btnsDocLang});
         },
 
         onDocLanguage: function() {
@@ -954,6 +951,7 @@ define([
         onLostEditRights: function() {
             this._readonlyRights = true;
             this.view && this.view.onLostEditRights();
+            this.view && this.lockToolbar(Common.enumLock.cantShare, true, {array: [this.view.btnSharing]});
         },
 
         changeAccessRights: function(btn,event,opts) {
@@ -985,7 +983,7 @@ define([
         },
 
         onCoAuthoringDisconnect: function() {
-            this.SetDisabled(true);
+            this.lockToolbar(Common.enumLock.lostConnect, true)
         },
 
         onUpdateUsers: function() {
@@ -1003,15 +1001,14 @@ define([
                     if (!item.asc_getView())
                         length++;
                 });
-                this.view.btnCompare.setDisabled(length>1 || this.viewmode);
+                Common.Utils.lockControls(Common.enumLock.hasCoeditingUsers, length>1, {array: [this.view.btnCompare]});
             }
         },
 
         commentsShowHide: function(mode) {
             if (!this.view) return;
             var value = Common.Utils.InternalSettings.get(this.view.appPrefix + "settings-livecomment");
-            (value!==undefined) && this.view.btnCommentRemove && this.view.btnCommentRemove.setDisabled(mode != 'show' && !value || !!this._state.wsProps['Objects']);
-            (value!==undefined) && this.view.btnCommentResolve && this.view.btnCommentResolve.setDisabled(mode != 'show' && !value || !!this._state.wsProps['Objects']);
+            (value!==undefined) && this.lockToolbar(Common.enumLock.hideComments, mode != 'show' && !value, {array: [this.view.btnCommentRemove, this.view.btnCommentResolve]});
         },
 
         onChangeProtectSheet: function(props) {
@@ -1023,11 +1020,7 @@ define([
             this._state.wsLock = props ? props.wsLock : false;
 
             if (!this.view) return;
-            var leftmenu = this.getApplication().getController('LeftMenu'),
-                isCommentsVisible = leftmenu && leftmenu.isCommentsVisible();
-            var value = Common.Utils.InternalSettings.get(this.view.appPrefix + "settings-livecomment");
-            (value!==undefined) && this.view.btnCommentRemove && this.view.btnCommentRemove.setDisabled(!isCommentsVisible && !value || !!this._state.wsProps['Objects']);
-            (value!==undefined) && this.view.btnCommentResolve && this.view.btnCommentResolve.setDisabled(!isCommentsVisible && !value || !!this._state.wsProps['Objects']);
+            this.lockToolbar(Common.enumLock['Objects'], !!this._state.wsProps['Objects'], {array: [this.view.btnCommentRemove, this.view.btnCommentResolve]});
         },
 
         textInserted: '<b>Inserted:</b>',

apps/common/main/lib/util/utils.js

@@ -881,7 +881,7 @@ Common.Utils.lockControls = function(causes, lock, opts, defControls) {
     opts.merge && (controls = _.union(defControls,controls));
 
     function doLock(cmp, cause) {
-        if ( cmp && _.contains(cmp.options.lock, cause) ) {
+        if ( cmp && cmp.options && _.contains(cmp.options.lock, cause) ) {
             var index = cmp.keepState.indexOf(cause);
             if (lock) {
                 if (index < 0) {

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

@@ -124,7 +124,8 @@ define([
                                     '<div class="btn-slot" id="slot-btn-dt-redo"></div>' +
                                 '</div>' +
                                 '<div class="lr-separator" id="id-box-doc-name">' +
-                                    '<label id="title-doc-name" />' +
+                                    // '<label id="title-doc-name" /></label>' +
+                                    '<input id="title-doc-name" autofill="off" autocomplete="off"/></input>' +
                                 '</div>' +
                                 '<label id="title-user-name"></label>' +
                             '</section>';
@@ -214,12 +215,15 @@ define([
         }
 
         function onAppShowed(config) {
+            //config.isCrypted =true; //delete fore merge!
             if ( this.labelDocName ) {
                 if ( config.isCrypted ) {
+                    this.labelDocName.attr({'style':'text-align: left;'});
                     this.labelDocName.before(
                         '<div class="inner-box-icon crypted">' +
                             '<svg class="icon"><use xlink:href="#svg-icon-crypted"></use></svg>' +
                         '</div>');
+                    this.imgCrypted = this.labelDocName.parent().find('.crypted');
                 }
 
                 if (!config.isEdit || !config.customization || !config.customization.compactHeader) {
@@ -353,13 +357,26 @@ define([
                 me.btnOptions.updateHint(me.tipViewSettings);
         }
 
+        function onFocusDocName(e){
+            var me = this;
+            me.imgCrypted && me.imgCrypted.attr('hidden', true);
+            me.isSaveDocName =false;
+            if(me.withoutExt) return;
+            var name = me.cutDocName(me.labelDocName.val());
+            _.delay(function(){
+                me.labelDocName.val(name);
+            },100);
+            me.withoutExt = true;
+        }
+
         function onDocNameKeyDown(e) {
             var me = this;
 
             var name = me.labelDocName.val();
             if ( e.keyCode == Common.UI.Keys.RETURN ) {
                 name = name.trim();
-                if ( !_.isEmpty(name) && me.documentCaption !== name ) {
+                me.isSaveDocName =true;
+                if ( !_.isEmpty(name) && me.cutDocName(me.documentCaption) !== name ) {
                     if ( /[\t*\+:\"<>?|\\\\/]/gim.test(name) ) {
                         _.defer(function() {
                             Common.UI.error({
@@ -367,23 +384,31 @@ define([
                                 , callback: function() {
                                     _.delay(function() {
                                         me.labelDocName.focus();
+                                        me.isSaveDocName =true;
                                     }, 50);
                                 }
                             });
-
-                            me.labelDocName.blur();
+                            //me.labelDocName.blur();
                         })
-                    } else {
-                        Common.Gateway.requestRename(name);
+                    } else
+                    if(me.withoutExt) {
+                        name = me.cutDocName(name);
+                        me.options.wopi ? me.api.asc_wopi_renameFile(name) : Common.Gateway.requestRename(name);
+                        name += me.fileExtention;
+                        me.labelDocName.val(name);
+                        me.withoutExt = false;
                         Common.NotificationCenter.trigger('edit:complete', me);
                     }
+
+                } else {
+
+                    Common.NotificationCenter.trigger('edit:complete', me);
                 }
             } else
             if ( e.keyCode == Common.UI.Keys.ESC ) {
-                me.labelDocName.val(me.documentCaption);
                 Common.NotificationCenter.trigger('edit:complete', this);
             } else {
-                me.labelDocName.attr('size', name.length > 10 ? name.length : 10);
+                me.labelDocName.attr('size', name.length + me.fileExtention.length > 10  ? name.length + me.fileExtention.length : 10);
             }
         }
 
@@ -504,7 +529,7 @@ define([
                     if ( !me.labelDocName ) {
                         me.labelDocName = $html.find('#rib-doc-name');
                         if ( me.documentCaption ) {
-                            me.labelDocName.text(me.documentCaption);
+                            me.labelDocName.val(me.documentCaption);
                         }
                     } else {
                         $html.find('#rib-doc-name').hide();
@@ -562,7 +587,8 @@ define([
 
                     !!me.labelDocName && me.labelDocName.hide().off();                  // hide document title if it was created in right box
                     me.labelDocName = $html.find('#title-doc-name');
-                    me.labelDocName.text( me.documentCaption );
+                    me.labelDocName.val( me.documentCaption );
+                    me.options.wopi && me.labelDocName.attr('maxlength', me.options.wopi.FileNameMaxLength);
 
                     me.labelUserName = $('> #title-user-name', $html);
                     me.setUserName(me.options.userName);
@@ -628,14 +654,17 @@ define([
                 !value && (value = '');
 
                 this.documentCaption = value;
+                var idx = this.documentCaption.lastIndexOf('.');
+                if (idx>0)
+                    this.fileExtention = this.documentCaption.substring(idx);
                 this.isModified && (value += '*');
                 if ( this.labelDocName ) {
-                    this.labelDocName.text( value );
+                    this.labelDocName.val( value );
                     // this.labelDocName.attr('size', value.length);
+                    this.setCanRename(this.options.canRename);
 
-                    this.setCanRename(true);
+                    //this.setCanRename(true);
                 }
-
                 return value;
             },
 
@@ -649,7 +678,7 @@ define([
                 var _name = this.documentCaption;
                 changed && (_name += '*');
 
-                this.labelDocName.text(_name);
+                this.labelDocName.val(_name);
             },
 
             setCanBack: function (value, text) {
@@ -679,7 +708,7 @@ define([
             },
 
             setCanRename: function (rename) {
-                rename = false;
+               // rename = true;      //for merge rename = false; ??
 
                 var me = this;
                 me.options.canRename = rename;
@@ -693,8 +722,20 @@ define([
 
                         label.on({
                             'keydown': onDocNameKeyDown.bind(this),
+                            'focus': onFocusDocName.bind(this),
                             'blur': function (e) {
-
+                                me.imgCrypted && me.imgCrypted.attr('hidden', false);
+                                if(!me.isSaveDocName) {
+                                    me.labelDocName.val(me.documentCaption);
+                                    me.withoutExt = false;
+                                }
+                            },
+                            'paste': function (e) {
+                                setTimeout(function() {
+                                    var name = me.cutDocName(me.labelDocName.val());
+                                    me.labelDocName.val(name);
+                                    me.labelDocName.attr('size', name.length + me.fileExtention.length > 10  ? name.length + me.fileExtention.length : 10);
+                                });
                             }
                         });
 
@@ -711,6 +752,13 @@ define([
                 }
             },
 
+            cutDocName: function(name) {
+                if(name.length <= this.fileExtention.length) return;
+                var idx =name.length - this.fileExtention.length;
+
+                return (name.substring(idx) == this.fileExtention) ? name.substring(0, idx) : name ;
+            },
+
             setUserName: function(name) {
                 if ( !!this.labelUserName ) {
                     if ( !!name ) {

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

@@ -54,6 +54,26 @@ define([
 ], function () {
     'use strict';
 
+    if (!Common.enumLock)
+        Common.enumLock = {};
+
+    var enumLock = {
+        noSpellcheckLangs: 'no-spellcheck-langs',
+        isReviewOnly:   'review-only',
+        reviewChangelock: 'review-change-lock',
+        hasCoeditingUsers: 'has-coediting-users',
+        previewReviewMode: 'preview-review-mode', // display mode on Collaboration tab
+        viewFormMode:   'view-form-mode', // view form mode on Forms tab
+        viewMode:       'view-mode', // view mode on disconnect, version history etc (used for locking buttons not in toolbar)
+        hideComments:   'hide-comments', // no live comments and left panel is closed
+        cantShare: 'cant-share'
+    };
+    for (var key in enumLock) {
+        if (enumLock.hasOwnProperty(key)) {
+            Common.enumLock[key] = enumLock[key];
+        }
+    }
+
     Common.Views.ReviewChanges = Common.UI.BaseView.extend(_.extend((function(){
         var template =
             '<section id="review-changes-panel" class="panel" data-tab="review">' +
@@ -229,44 +249,52 @@ define([
                 Common.UI.BaseView.prototype.initialize.call(this, options);
 
                 this.appConfig = options.mode;
+                this.lockedControls = [];
                 var filter = Common.localStorage.getKeysFilter();
                 this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
-
+                var _set = Common.enumLock;
                 if ( this.appConfig.canReview ) {
                     this.btnAccept = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         caption: this.txtAccept,
                         split: !this.appConfig.canUseReviewPermissions,
                         iconCls: 'toolbar__icon btn-review-save',
+                        lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
                     });
+                    this.lockedControls.push(this.btnAccept);
 
                     this.btnReject = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         caption: this.txtReject,
                         split: !this.appConfig.canUseReviewPermissions,
                         iconCls: 'toolbar__icon btn-review-deny',
+                        lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
                     });
+                    this.lockedControls.push(this.btnReject);
 
-                    if (this.appConfig.canFeatureComparison)
+                    if (this.appConfig.canFeatureComparison) {
                         this.btnCompare = new Common.UI.Button({
-                            cls         : 'btn-toolbar  x-huge icon-top',
-                            caption     : this.txtCompare,
-                            split       : true,
+                            cls: 'btn-toolbar  x-huge icon-top',
+                            caption: this.txtCompare,
+                            split: true,
                             iconCls: 'toolbar__icon btn-compare',
+                            lock: [_set.hasCoeditingUsers, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
                             dataHint: '1',
                             dataHintDirection: 'bottom',
                             dataHintOffset: 'small'
                         });
-
+                        this.lockedControls.push(this.btnCompare);
+                    }
                     this.btnTurnOn = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-ic-review',
+                        lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
                         caption: this.txtTurnon,
                         split: !this.appConfig.isReviewOnly,
                         enableToggle: true,
@@ -275,25 +303,30 @@ define([
                         dataHintOffset: 'small'
                     });
                     this.btnsTurnReview = [this.btnTurnOn];
+                    this.lockedControls.push(this.btnTurnOn);
                 }
                 if (this.appConfig.canViewReview) {
                     this.btnPrev = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-review-prev',
+                        lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
                         caption: this.txtPrev,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
                     });
+                    this.lockedControls.push(this.btnPrev);
 
                     this.btnNext = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-review-next',
+                        lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect],
                         caption: this.txtNext,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
                     });
+                    this.lockedControls.push(this.btnNext);
 
                     if (!this.appConfig.isRestrictedEdit && !(this.appConfig.customization && this.appConfig.customization.review && this.appConfig.customization.review.hideReviewDisplay)) {// hide Display mode option for fillForms and commenting mode
                         var menuTemplate = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem"><div><%= caption %></div>' +
@@ -303,6 +336,7 @@ define([
                         this.btnReviewView = new Common.UI.Button({
                             cls: 'btn-toolbar x-huge icon-top',
                             iconCls: 'toolbar__icon btn-ic-reviewview',
+                            lock: [_set.viewFormMode, _set.lostConnect],
                             caption: this.txtView,
                             menu: new Common.UI.Menu({
                                 cls: 'ppm-toolbar',
@@ -349,6 +383,7 @@ define([
                             dataHintDirection: 'bottom',
                             dataHintOffset: 'small'
                         });
+                        this.lockedControls.push(this.btnReviewView);
                     }
                 }
 
@@ -356,23 +391,27 @@ define([
                     this.btnSharing = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-ic-sharing',
+                        lock: [_set.viewFormMode, _set.cantShare, _set.lostConnect],
                         caption: this.txtSharing,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
                     });
+                    this.lockedControls.push(this.btnSharing);
                 }
 
                 if (this.appConfig.isEdit && !this.appConfig.isOffline && this.appConfig.canCoAuthoring && this.appConfig.canChangeCoAuthoring) {
                     this.btnCoAuthMode = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-ic-coedit',
+                        lock: [_set.viewFormMode, _set.lostConnect],
                         caption: this.txtCoAuthMode,
                         menu: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
                     });
+                    this.lockedControls.push(this.btnCoAuthMode);
                 }
 
                 this.btnsSpelling = [];
@@ -382,23 +421,27 @@ define([
                     this.btnHistory = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-ic-history',
+                        lock: [_set.lostConnect],
                         caption: this.txtHistory,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
                     });
+                    this.lockedControls.push(this.btnHistory);
                 }
 
                 if (this.appConfig.canCoAuthoring && this.appConfig.canChat) {
                     this.btnChat = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-ic-chat',
+                        lock: [_set.lostConnect],
                         caption: this.txtChat,
                         enableToggle: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
                     });
+                    this.lockedControls.push(this.btnChat);
                 }
 
                 if ( this.appConfig.canCoAuthoring && this.appConfig.canComments ) {
@@ -407,19 +450,23 @@ define([
                         caption: this.txtCommentRemove,
                         split: true,
                         iconCls: 'toolbar__icon btn-rem-comment',
+                        lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect],
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
                     });
+                    this.lockedControls.push(this.btnCommentRemove);
                     this.btnCommentResolve = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         caption: this.txtCommentResolve,
                         split: true,
                         iconCls: 'toolbar__icon btn-resolve-all',
+                        lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect],
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
                     });
+                    this.lockedControls.push(this.btnCommentResolve);
                 }
 
                 Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
@@ -524,8 +571,7 @@ define([
                             me.btnCompare.updateHint(me.tipCompare);
                         }
 
-                        config.isReviewOnly && me.btnAccept.setDisabled(true);
-                        config.isReviewOnly && me.btnReject.setDisabled(true);
+                        Common.Utils.lockControls(Common.enumLock.isReviewOnly, config.isReviewOnly, {array: [me.btnAccept, me.btnReject]});
                     }
                     if (me.appConfig.canViewReview) {
                         me.btnPrev.updateHint(me.hintPrev);
@@ -685,6 +731,7 @@ define([
                     var button = new Common.UI.Button({
                         cls         : 'btn-toolbar',
                         iconCls     : 'toolbar__icon btn-ic-review',
+                        lock: [Common.enumLock.viewMode, Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.lostConnect],
                         hintAnchor  : 'top',
                         hint        : this.tipReview,
                         split       : !this.appConfig.isReviewOnly,
@@ -724,13 +771,14 @@ define([
                     });
 
                     this.btnsTurnReview.push(button);
-
+                    this.lockedControls.push(button);
                     return button;
                 } else
                 if ( type == 'spelling' ) {
                     button = new Common.UI.Button({
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-ic-docspell',
+                        lock: [Common.enumLock.viewMode,  Common.enumLock.viewFormMode, Common.enumLock.previewReviewMode],
                         hintAnchor  : 'top',
                         hint: this.tipSetSpelling,
                         enableToggle: true,
@@ -740,25 +788,30 @@ define([
                         visible:  Common.UI.FeaturesManager.canChange('spellcheck')
                     });
                     this.btnsSpelling.push(button);
-
+                    this.lockedControls.push(button);
                     return button;
                 } else if (type == 'doclang' && parent == 'statusbar' ) {
                     button = new Common.UI.Button({
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-ic-doclang',
+                        lock: [Common.enumLock.viewMode, Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.noSpellcheckLangs, Common.enumLock.lostConnect],
                         hintAnchor  : 'top',
                         hint: this.tipSetDocLang,
-                        disabled: true,
                         dataHint: '0',
                         dataHintDirection: 'top',
                         dataHintOffset: 'small'
                     });
                     this.btnsDocLang.push(button);
-
+                    this.lockedControls.push(button);
+                    Common.Utils.lockControls(Common.enumLock.noSpellcheckLangs, true, {array: [button]});
                     return button;
                 }
             },
 
+            getButtons: function() {
+                return this.lockedControls;
+            },
+
             getUserName: function (username) {
                 return Common.Utils.String.htmlEncode(AscCommon.UserInfoParser.getParsedName(username));
             },
@@ -814,34 +867,8 @@ define([
                 }
             },
 
-            SetDisabled: function (state, langs, protectProps) {
-                this.btnsSpelling && this.btnsSpelling.forEach(function(button) {
-                    if ( button ) {
-                        button.setDisabled(state);
-                    }
-                }, this);
-                this.btnsDocLang && this.btnsDocLang.forEach(function(button) {
-                    if ( button ) {
-                        button.setDisabled(state || langs && langs.length<1);
-                    }
-                }, this);
-                this.btnsTurnReview && this.btnsTurnReview.forEach(function(button) {
-                    if ( button ) {
-                        button.setDisabled(state);
-                    }
-                }, this);
-                // this.btnChat && this.btnChat.setDisabled(state);
-
-                this.btnCommentRemove && this.btnCommentRemove.setDisabled(state || !Common.Utils.InternalSettings.get(this.appPrefix + "settings-livecomment") || protectProps && protectProps.comments);
-                this.btnCommentResolve && this.btnCommentResolve.setDisabled(state || !Common.Utils.InternalSettings.get(this.appPrefix + "settings-livecomment") || protectProps && protectProps.comments);
-            },
-
             onLostEditRights: function() {
                 this._readonlyRights = true;
-                if (!this.rendered)
-                    return;
-
-                 this.btnSharing && this.btnSharing.setDisabled(true);
             },
 
             txtAccept: 'Accept',

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

@@ -1,4 +1,4 @@
-@x-huge-btn-height: 46px;
+@x-huge-btn-height: 52px;
 @x-huge-btn-icon-size: 28px;
 
 .btn {
@@ -70,6 +70,9 @@
 
         transition: transform 0.2s ease;
         transform: rotate(-135deg) translate(1px,1px);
+        &.compact-caret {
+            display: none;
+        }
     }
 
     //&:active,
@@ -229,14 +232,24 @@
 
         .inner-box-caption {
             line-height: 18px;
-            padding: 0 2px;
+            padding: 1px 3px;
             display: flex;
-            align-items: center;
+            //align-items: center;
+            align-items: start;
+            height: 24px;
 
             .caption {
-                max-width: 107px;
+                max-width: 85px;
+                max-height: 24px;
                 text-overflow: ellipsis;
-                overflow: hidden;
+
+                white-space: pre;
+                line-height: 11px;
+                padding: 0 2px;
+
+                .caret {
+                    margin: 0 1px 0 4px;
+                }
             }
         }
 
@@ -267,9 +280,10 @@
 
         &.dropdown-toggle {
             .caption {
-                max-width: 100px;
+                //max-width: 100px;
             }
         }
+
     }
 
     .inner-box-icon {
@@ -295,7 +309,7 @@
 
     .inner-box-caption {
         margin: 0;
-        height: 18px;
+        height: 20px;
     }
 
     div.inner-box-icon {

apps/common/main/resources/less/combo-dataview.less

@@ -341,10 +341,15 @@
 .combo-pivot-template {
     .combo-template(60px);
 
-    top: -7px;
-    padding-right: 24px;
+    top: -4px;
+    padding-right: 12px;
     position: absolute;
 
+    .more-container & {
+        padding-right: 0;
+        position: static;
+    }
+
     .view .dataview, .dropdown-menu {
         padding: 1px;
     }
@@ -378,10 +383,20 @@
         height: @combo-dataview-height-calc;
     }
 
-    .item {
+    .item, .menu-picker-container .dataview .group-items-container .item {
         padding: 0px;
-        margin: @combo-dataview-item-margins 0 0 @combo-dataview-item-margins;
+        margin: @combo-dataview-item-margins;
         .box-shadow(none);
+
+        &:hover {
+            .box-shadow(0 0 0 2px @border-preview-hover-ie);
+            .box-shadow(0 0 0 @scaled-two-px-value @border-preview-hover);
+        }
+
+        &.selected {
+            .box-shadow(0 0 0 2px @border-preview-select-ie);
+            .box-shadow(0 0 0 @scaled-two-px-value @border-preview-select);
+        }
     }
 
     .menu-picker-container {
@@ -391,8 +406,6 @@
         }
 
         .group-items-container .item {
-            box-shadow: none;
-            margin: @scaled-two-px-value 0 0 @scaled-two-px-value;
             &:last-child {
                 margin-bottom: @combo-dataview-item-margins;
             }
@@ -424,11 +437,10 @@
             width: @x-huge-btn-icon-size;
             height: @x-huge-btn-icon-size;
             min-width: 0;
-            margin-top: -2px;
         }
 
         .caption{
-            line-height: 18px;
+            line-height: 12px;
             font-size: 11px;
             text-overflow: ellipsis;
             overflow: hidden;

apps/common/main/resources/less/plugins.less

@@ -131,8 +131,7 @@
     .x-huge.icon-top {
         .caption {
             text-overflow: ellipsis;
-            max-width: 60px;
-            overflow: hidden;
+            max-width: 85px;
         }
     }
 

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

@@ -162,7 +162,7 @@
 
     .box-controls {
         //height: @height-controls;         // button has strange offset in IE when odd height
-        padding: 10px 0;
+        padding: 7px 0;
         display: flex;
 
         //background-color: #F2CBBF;
@@ -177,13 +177,14 @@
     .box-panels {
         flex-grow: 1;
         -ms-flex: 1;
+        padding-right: 6px;
 
         .panel:not(.active) {
             display: none;
         }
 
         /* ##adopt-panel-width */
-        .panel:not(#plugns-panel) .compactwidth {
+        .panel .compactwidth {
             .btn-group, .btn-toolbar {
                 &.x-huge {
                     .caption {
@@ -192,6 +193,11 @@
 
                     .inner-box-caption {
                         justify-content: center;
+                        align-items: center;
+                    }
+
+                    .compact-caret {
+                        display: block;
                     }
                 }
             }
@@ -199,6 +205,40 @@
         /**/
     }
 
+    .more-container {
+        background-color: @background-toolbar-ie;
+        background-color: @background-toolbar;
+        min-width:auto;
+        padding: 12px 10px 7px 0;
+        border-radius: 0;
+        z-index:999;
+        .compactwidth {
+            .btn-group, .btn-toolbar {
+                &.x-huge {
+                    .caption {
+                        display: none;
+                    }
+
+                    .inner-box-caption {
+                        justify-content: center;
+                        align-items: center;
+                    }
+                    .compact-caret {
+                        display: block;
+                    }
+                }
+            }
+        }
+        &[data-tab=pivot] {
+            padding: 5px 10px 0 0;
+        }
+    }
+
+    .more-box {
+        background-color: @background-toolbar-ie;
+        background-color: @background-toolbar;
+    }
+
     background-color: @background-toolbar-ie;
     background-color: @background-toolbar;
     @minus-px: calc(-1 * @scaled-one-px-value);
@@ -213,10 +253,6 @@
         padding-left: 6px;
         font-size: 0;
 
-        &:last-child {
-            padding-right: 6px;
-        }
-
         &.small {
             padding-left: 10px;
 
@@ -225,11 +261,11 @@
             }
         }
 
-        &.no-group-mask {
-            .elset {
-                position: relative;
-            }
-        }
+        //&.no-group-mask {
+        //    .elset {
+        //        position: relative;
+        //    }
+        //}
     }
 
     .elset {
@@ -237,7 +273,7 @@
         font-size: 0;
 
         &:not(:first-child) {
-            margin-top: 6px;
+            margin-top: 8px;
         }
 
         &.font-normal {
@@ -253,7 +289,7 @@
         }
 
         &.long {
-            height: 46px;
+            height: 52px;
         }
 
         &.short {
@@ -764,3 +800,6 @@
     min-width: 46px;
 }
 
+section .field-styles {
+    width: 100%;
+}

apps/common/mobile/lib/view/Search.jsx

@@ -263,7 +263,7 @@ class SearchView extends Component {
                     <div className="searchbar-inner__center">
                         <div className="searchbar-input-wrap">
                             <input className="searchbar-input" value={searchQuery} placeholder={_t.textSearch} type="search" maxLength="255"
-                                onChange={e => {this.changeSearchQuery(e.target.value)}} autoFocus/>
+                                onChange={e => {this.changeSearchQuery(e.target.value)}} />
                             {isIos ? <i className="searchbar-icon" /> : null}
                             <span className="input-clear-button" onClick={() => this.changeSearchQuery('')} />
                         </div>

apps/documenteditor/embed/locale/hu.json

@@ -11,20 +11,39 @@
   "DE.ApplicationController.downloadTextText": "Dokumentum letöltése...",
   "DE.ApplicationController.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.<br>Vegye fel a kapcsolatot a Document Server adminisztrátorával.",
   "DE.ApplicationController.errorDefaultMessage": "Hibakód: %1",
+  "DE.ApplicationController.errorEditingDownloadas": "Hiba történt a dokumentummal végzett munka során.<br>Használja a 'Letöltés másként...' opciót, hogy mentse a fájl biztonsági másolatát a számítógép merevlemezére.",
   "DE.ApplicationController.errorFilePassProtect": "A dokumentum jelszóval védett, és nem nyitható meg.",
   "DE.ApplicationController.errorFileSizeExceed": "A fájlméret meghaladja a szerverre beállított korlátozást.<br>Kérjük, forduljon a Document Server rendszergazdájához a részletekért.",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Az internet kapcsolat helyreállt, és a fájl verziója megváltozott.<br>Mielőtt folytatná a munkát, töltse le a fájlt, vagy másolja vágólapra annak tartalmát, hogy megbizonyosodjon arról, hogy semmi nem veszik el, majd töltse újra az oldalt.",
+  "DE.ApplicationController.errorForceSave": "Hiba történt a fájl mentése közben. Kérjük, használja a 'Letöltés másként' opciót, hogy a fájlt a számítógépére mentse, vagy próbálkozzon később.",
+  "DE.ApplicationController.errorLoadingFont": "A betűtípusok nincsenek betöltve.<br>Kérjük forduljon a dokumentumszerver rendszergazdájához.",
+  "DE.ApplicationController.errorSubmit": "A beküldés nem sikerült.",
+  "DE.ApplicationController.errorTokenExpire": "A dokumentum biztonsági tokenje lejárt.<br>Kérjük, lépjen kapcsolatba a dokumentumszerver rendszergazdájával.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Az internetkapcsolat helyreállt és a fájl verziója megváltozott.<br>Mielőtt folytatná a munkát, töltse le a fájlt vagy másolja át annak tartalmát megbizonyosodva arról, hogy semmi sem veszett el, végül töltse újra ezt az oldalt.",
   "DE.ApplicationController.errorUserDrop": "A dokumentum jelenleg nem elérhető.",
   "DE.ApplicationController.notcriticalErrorTitle": "Figyelmeztetés",
+  "DE.ApplicationController.openErrorText": "Hiba történt a fájl megnyitásakor",
   "DE.ApplicationController.scriptLoadError": "A kapcsolat túl lassú, néhány komponens nem töltődött be. Frissítse az oldalt.",
+  "DE.ApplicationController.textAnonymous": "Névtelen",
+  "DE.ApplicationController.textClear": "Az összes mező törlése",
+  "DE.ApplicationController.textGotIt": "OK",
+  "DE.ApplicationController.textGuest": "Vendég",
   "DE.ApplicationController.textLoadingDocument": "Dokumentum betöltése",
+  "DE.ApplicationController.textNext": "Következő mező",
   "DE.ApplicationController.textOf": "of",
+  "DE.ApplicationController.textRequired": "Töltse ki az összes szükséges mezőt az űrlap elküldéséhez.",
+  "DE.ApplicationController.textSubmit": "Beküldés",
+  "DE.ApplicationController.textSubmited": "<b>Az űrlap sikeresen elküldve</b><br>Kattintson a tipp bezárásához",
   "DE.ApplicationController.txtClose": "Bezárás",
+  "DE.ApplicationController.txtEmpty": "(Üres)",
+  "DE.ApplicationController.txtPressLink": "Nyomja meg a CTRL billentyűt és kattintson a hivatkozásra",
   "DE.ApplicationController.unknownErrorText": "Ismeretlen hiba.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "A böngészője nem támogatott.",
   "DE.ApplicationController.waitText": "Kérjük, várjon...",
   "DE.ApplicationView.txtDownload": "Letöltés",
+  "DE.ApplicationView.txtDownloadDocx": "Letöltés DOCX-ként",
+  "DE.ApplicationView.txtDownloadPdf": "Letöltés PDF-ként",
   "DE.ApplicationView.txtEmbed": "Beágyazás",
+  "DE.ApplicationView.txtFileLocation": "Fájl helyének megnyitása",
   "DE.ApplicationView.txtFullScreen": "Teljes képernyő",
   "DE.ApplicationView.txtPrint": "Nyomtatás",
   "DE.ApplicationView.txtShare": "Megosztás"

apps/documenteditor/forms/app/controller/ApplicationController.js

@@ -787,7 +787,7 @@ define([
                             }
                         } else {
                             Common.Gateway.requestClose();
-                            Common.Controllers.Desktop.requestClose();
+                            DE.Controllers.Desktop.requestClose();
                         }
                         me._openDlg = null;
                     }

apps/documenteditor/forms/locale/el.json

@@ -11,6 +11,7 @@
   "Common.UI.Calendar.textMonths": "Μήνες",
   "Common.UI.Calendar.textNovember": "Νοέμβριος",
   "Common.UI.Calendar.textOctober": "Οκτώβριος",
+  "Common.UI.Calendar.textSeptember": "Σεπτέμβριος",
   "Common.UI.Calendar.textShortApril": "Απρ",
   "Common.UI.Calendar.textShortAugust": "Αυγ",
   "Common.UI.Calendar.textShortDecember": "Δεκ",
@@ -24,16 +25,26 @@
   "Common.UI.Calendar.textShortMonday": "Δευ",
   "Common.UI.Calendar.textShortNovember": "Νοέ",
   "Common.UI.Calendar.textShortOctober": "Οκτ",
+  "Common.UI.Calendar.textShortSaturday": "Σαβ",
+  "Common.UI.Calendar.textShortSeptember": "Σεπτ",
+  "Common.UI.Calendar.textShortSunday": "Κυρ",
+  "Common.UI.Calendar.textShortThursday": "Πεμ",
+  "Common.UI.Calendar.textShortTuesday": "Τρι",
+  "Common.UI.Calendar.textShortWednesday": "Τετ",
+  "Common.UI.Calendar.textYears": "Έτη",
   "Common.UI.Themes.txtThemeClassicLight": "Κλασικό Ανοιχτό",
   "Common.UI.Themes.txtThemeDark": "Σκούρο",
   "Common.UI.Themes.txtThemeLight": "Ανοιχτό",
   "Common.UI.Window.cancelButtonText": "Ακύρωση",
   "Common.UI.Window.closeButtonText": "Κλείσιμο",
   "Common.UI.Window.noButtonText": "Όχι",
+  "Common.UI.Window.okButtonText": "Εντάξει",
   "Common.UI.Window.textConfirmation": "Επιβεβαίωση",
   "Common.UI.Window.textDontShow": "Να μην εμφανιστεί ξανά αυτό το μήνυμα",
   "Common.UI.Window.textError": "Σφάλμα",
   "Common.UI.Window.textInformation": "Πληροφορίες",
+  "Common.UI.Window.textWarning": "Προειδοποίηση",
+  "Common.UI.Window.yesButtonText": "Ναι",
   "Common.Views.CopyWarningDialog.textDontShow": "Να μην εμφανιστεί ξανά αυτό το μήνυμα",
   "Common.Views.CopyWarningDialog.textMsg": "Ενέργειες αντιγραφής, αποκοπής και επικόλλησης με χρήση ενεργειών μενού θα γίνονται εντός της παρούσας καρτέλας συντάκτη μόνο.<br><br>Για αντιγραφή ή επικόλληση σε ή από εφαρμογές εκτός της καρτέλας συντάκτη χρησιμοποιήστε τους ακόλουθους συνδυασμούς πλήκτρων:",
   "Common.Views.CopyWarningDialog.textTitle": "Ενέργειες Αντιγραφής, Αποκοπής και Επικόλλησης",
@@ -42,15 +53,26 @@
   "Common.Views.CopyWarningDialog.textToPaste": "για Επικόλληση",
   "Common.Views.EmbedDialog.textHeight": "Ύψος",
   "Common.Views.EmbedDialog.textTitle": "Ενσωμάτωση",
+  "Common.Views.EmbedDialog.textWidth": "Πλάτος",
   "Common.Views.EmbedDialog.txtCopy": "Αντιγραφή στο πρόχειρο",
   "Common.Views.EmbedDialog.warnCopy": "Σφάλμα φυλλομετρητή! Χρησιμοποιείστε τη συντόμευση [Ctrl]+[C]",
+  "Common.Views.ImageFromUrlDialog.textUrl": "Επικόλληση URL εικόνας:",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "Αυτό το πεδίο είναι υποχρεωτικό",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Αυτό το πεδίο πρέπει να είναι διεύθυνση URL με τη μορφή «http://www.example.com»",
   "Common.Views.OpenDialog.closeButtonText": "Κλείσιμο Αρχείου",
   "Common.Views.OpenDialog.txtEncoding": "Κωδικοποίηση",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "Το συνθηματικό είναι εσφαλμένο.",
   "Common.Views.OpenDialog.txtOpenFile": "Εισάγετε συνθηματικό για να ανοίξετε το αρχείο",
+  "Common.Views.OpenDialog.txtPassword": "Συνθηματικό",
+  "Common.Views.OpenDialog.txtPreview": "Προεπισκόπηση",
+  "Common.Views.OpenDialog.txtProtected": "Μόλις βάλετε το συνθηματικό και ανοίξετε το αρχείο, το τρέχον συνθηματικό αρχείου θα αρχικοποιηθεί.",
   "Common.Views.OpenDialog.txtTitle": "Διαλέξτε %1 επιλογές",
+  "Common.Views.OpenDialog.txtTitleProtected": "Προστατευμένο Αρχείο",
   "Common.Views.SaveAsDlg.textLoading": "Γίνεται φόρτωση",
   "Common.Views.SaveAsDlg.textTitle": "Φάκελος για αποθήκευση",
   "Common.Views.SelectFileDlg.textLoading": "Γίνεται φόρτωση",
+  "Common.Views.SelectFileDlg.textTitle": "Επιλογή Πηγής Δεδομένων",
+  "Common.Views.ShareDialog.textTitle": "Διαμοιρασμός Συνδέσμου",
   "Common.Views.ShareDialog.txtCopy": "Αντιγραφή στο πρόχειρο",
   "Common.Views.ShareDialog.warnCopy": "Σφάλμα φυλλομετρητή! Χρησιμοποιείστε τη συντόμευση [Ctrl]+[C]",
   "DE.Controllers.ApplicationController.convertationErrorText": "Αποτυχία μετατροπής.",
@@ -60,6 +82,7 @@
   "DE.Controllers.ApplicationController.downloadTextText": "Γίνεται λήψη εγγράφου...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "Προσπαθείτε να εκτελέσετε μια ενέργεια για την οποία δεν έχετε δικαιώματα.<br>Παρακαλούμε να επικοινωνήστε με τον διαχειριστή του διακομιστή εγγράφων.",
   "DE.Controllers.ApplicationController.errorBadImageUrl": "Εσφαλμένη διεύθυνση URL εικόνας",
+  "DE.Controllers.ApplicationController.errorConnectToServer": "Δεν ήταν δυνατή η αποθήκευση του εγγράφου. Ελέγξτε τις ρυθμίσεις σύνδεσης ή επικοινωνήστε με τον διαχειριστή σας.<br>Όταν πατήσετε 'Εντάξει', θα μπορέσετε να κατεβάσετε το έγγραφο.",
   "DE.Controllers.ApplicationController.errorDataEncrypted": "Ελήφθησαν κρυπτογραφημένες αλλαγές, δεν μπορούν να αποκρυπτογραφηθούν.",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "Κωδικός σφάλματος: %1",
   "DE.Controllers.ApplicationController.errorEditingDownloadas": "Παρουσιάστηκε σφάλμα κατά την εργασία με το έγγραφο.<br>Χρησιμοποιήστε την επιλογή «Λήψη ως...» για να αποθηκεύσετε το αντίγραφο ασφαλείας στον σκληρό δίσκο του υπολογιστή σας.",
@@ -68,7 +91,14 @@
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "Το μέγεθος του αρχείου υπερβαίνει το όριο που έχει οριστεί για τον διακομιστή σας.<br>Παρακαλούμε επικοινωνήστε με τον διαχειριστή του διακομιστή εγγράφων για λεπτομέρειες.",
   "DE.Controllers.ApplicationController.errorForceSave": "Παρουσιάστηκε σφάλμα κατά την αποθήκευση του αρχείου. Χρησιμοποιήστε την επιλογή «Λήψη ως» για να αποθηκεύσετε το αρχείο στον σκληρό δίσκο του υπολογιστή σας ή δοκιμάστε ξανά αργότερα.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Οι γραμματοσειρές δεν έχουν φορτωθεί.<br>Παρακαλούμε επικοινωνήστε με τον διαχειριστή του Εξυπηρετητή Εγγράφων σας.",
+  "DE.Controllers.ApplicationController.errorServerVersion": "Αναβαθμίστηκε η έκδοση του συντάκτη. Η σελίδα θα φορτωθεί ξανά για να εφαρμοστούν οι αλλαγές.",
+  "DE.Controllers.ApplicationController.errorSessionAbsolute": "Η σύνοδος επεξεργασίας του εγγράφου έληξε. Παρακαλούμε φορτώστε ξανά τη σελίδα.",
+  "DE.Controllers.ApplicationController.errorSessionIdle": "Το έγγραφο δεν έχει επεξεργαστεί εδώ και πολύ ώρα. Παρακαλούμε φορτώστε ξανά τη σελίδα.",
+  "DE.Controllers.ApplicationController.errorSessionToken": "Η σύνδεση με το διακομιστή έχει διακοπεί. Παρακαλούμε φορτώστε ξανά τη σελίδα.",
   "DE.Controllers.ApplicationController.errorSubmit": "Η υποβολή απέτυχε.",
+  "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>αλλά δεν θα μπορείτε να το λάβετε ή να το εκτυπώσετε έως ότου αποκατασταθεί η σύνδεση και ανανεωθεί η σελίδα.",
@@ -78,8 +108,10 @@
   "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.scriptLoadError": "Η σύνδεση είναι πολύ αργή, δεν ήταν δυνατή η φόρτωση ορισμένων στοιχείων. Φορτώστε ξανά τη σελίδα.",
   "DE.Controllers.ApplicationController.textAnonymous": "Ανώνυμος",
+  "DE.Controllers.ApplicationController.textBuyNow": "Επισκεφθείτε την ιστοσελίδα",
   "DE.Controllers.ApplicationController.textCloseTip": "Κάντε κλικ να κλείσετε τη συμβουλή.",
   "DE.Controllers.ApplicationController.textContactUs": "Επικοινωνήστε με το τμήμα πωλήσεων",
   "DE.Controllers.ApplicationController.textGotIt": "Ελήφθη",
@@ -88,23 +120,39 @@
   "DE.Controllers.ApplicationController.textNoLicenseTitle": "Το όριο της άδειας προσεγγίσθηκε",
   "DE.Controllers.ApplicationController.textOf": "του",
   "DE.Controllers.ApplicationController.textRequired": "Συμπληρώστε όλα τα απαιτούμενα πεδία για την αποστολή της φόρμας.",
+  "DE.Controllers.ApplicationController.textSaveAs": "Αποθήκευση ως PDF",
+  "DE.Controllers.ApplicationController.textSaveAsDesktop": "Αποθήκευση ως...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Η φόρμα υποβλήθηκε με επιτυχία</b><br>Κάντε κλικ για να κλείσετε τη συμβουλή ",
   "DE.Controllers.ApplicationController.titleServerVersion": "Ο συντάκτης ενημερώθηκε",
+  "DE.Controllers.ApplicationController.titleUpdateVersion": "Η έκδοση άλλαξε",
+  "DE.Controllers.ApplicationController.txtArt": "Το κείμενό σας εδώ",
   "DE.Controllers.ApplicationController.txtChoose": "Επιλέξτε ένα αντικείμενο",
   "DE.Controllers.ApplicationController.txtClickToLoad": "Κάντε κλικ για φόρτωση εικόνας",
   "DE.Controllers.ApplicationController.txtClose": "Κλείσιμο",
   "DE.Controllers.ApplicationController.txtEmpty": "(Κενό)",
   "DE.Controllers.ApplicationController.txtEnterDate": "Εισάγετε μια ημερομηνία",
   "DE.Controllers.ApplicationController.txtPressLink": "Πατήστε Ctrl και κάντε κλικ στο σύνδεσμο",
+  "DE.Controllers.ApplicationController.txtUntitled": "Άτιτλο",
   "DE.Controllers.ApplicationController.unknownErrorText": "Άγνωστο σφάλμα.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "Ο περιηγητής σας δεν υποστηρίζεται.",
+  "DE.Controllers.ApplicationController.uploadImageExtMessage": "Άγνωστη μορφή εικόνας.",
+  "DE.Controllers.ApplicationController.uploadImageSizeMessage": "Η εικόνα είναι πολύ μεγάλη. Το μέγιστο μέγεθος είναι 25MB.",
   "DE.Controllers.ApplicationController.waitText": "Παρακαλούμε, περιμένετε...",
+  "DE.Controllers.ApplicationController.warnLicenseExceeded": "Έχετε φτάσει το όριο για ταυτόχρονες συνδέσεις με συντάκτες %1. Αυτό το έγγραφο θα ανοιχτεί μόνο για προβολή.​​<br>Παρακαλούμε επικοινωνήστε με τον διαχειριστή σας για περισσότερες πληροφορίες.",
   "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "Η άδεια έληξε.<br>Δεν έχετε πρόσβαση στη δυνατότητα επεξεργασίας εγγράφων.<br>Επικοινωνήστε με τον διαχειριστή σας.",
   "DE.Controllers.ApplicationController.warnLicenseLimitedRenewed": "Η άδεια πρέπει να ανανεωθεί.<br>Έχετε περιορισμένη πρόσβαση στη λειτουργία επεξεργασίας εγγράφων.<br>Επικοινωνήστε με τον διαχειριστή σας για πλήρη πρόσβαση",
+  "DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "Έχετε φτάσει το όριο χρήστη για συντάκτες %1.<br>Επικοινωνήστε με τον διαχειριστή σας για περισσότερες πληροφορίες.",
+  "DE.Controllers.ApplicationController.warnNoLicense": "Έχετε φτάσει το όριο για ταυτόχρονες συνδέσεις με συντάκτες %1. Αυτό το έγγραφο θα ανοιχτεί μόνο για προβολή.​​<br>Επικοινωνήστε με την ομάδα πωλήσεων %1 για προσωπικούς όρους αναβάθμισης.",
+  "DE.Controllers.ApplicationController.warnNoLicenseUsers": "Έχετε φτάσει το όριο χρήστη για συντάκτες %1.<br>Επικοινωνήστε με την ομάδα πωλήσεων %1 για προσωπικούς όρους αναβάθμισης.",
   "DE.Views.ApplicationView.textClear": "Εκκαθάριση Όλων των Πεδίων",
   "DE.Views.ApplicationView.textCopy": "Αντιγραφή",
   "DE.Views.ApplicationView.textCut": "Αποκοπή",
   "DE.Views.ApplicationView.textNext": "Επόμενο Πεδίο",
+  "DE.Views.ApplicationView.textPaste": "Επικόλληση",
+  "DE.Views.ApplicationView.textPrintSel": "Εκτύπωση Επιλογής",
+  "DE.Views.ApplicationView.textRedo": "Επανάληψη",
+  "DE.Views.ApplicationView.textSubmit": "Υποβολή",
+  "DE.Views.ApplicationView.textUndo": "Αναίρεση",
   "DE.Views.ApplicationView.txtDarkMode": "Σκούρο θέμα",
   "DE.Views.ApplicationView.txtDownload": "Λήψη",
   "DE.Views.ApplicationView.txtDownloadDocx": "Λήψη ως docx",

apps/documenteditor/forms/locale/hu.json

@@ -1,26 +1,166 @@
 {
+  "Common.UI.Calendar.textApril": "április",
+  "Common.UI.Calendar.textAugust": "augusztus",
+  "Common.UI.Calendar.textDecember": "December",
+  "Common.UI.Calendar.textFebruary": "február",
+  "Common.UI.Calendar.textJanuary": "Január ",
+  "Common.UI.Calendar.textJuly": "Július ",
+  "Common.UI.Calendar.textJune": "Június",
+  "Common.UI.Calendar.textMarch": "Március",
+  "Common.UI.Calendar.textMay": "Máj",
+  "Common.UI.Calendar.textMonths": "hónapok",
+  "Common.UI.Calendar.textNovember": "November",
+  "Common.UI.Calendar.textOctober": "Október",
+  "Common.UI.Calendar.textSeptember": "szeptember",
+  "Common.UI.Calendar.textShortApril": "Ápr",
+  "Common.UI.Calendar.textShortAugust": "Aug",
+  "Common.UI.Calendar.textShortDecember": "Dec",
+  "Common.UI.Calendar.textShortFebruary": "Feb",
+  "Common.UI.Calendar.textShortFriday": "Fr",
+  "Common.UI.Calendar.textShortJanuary": "Jan",
+  "Common.UI.Calendar.textShortJuly": "Júl",
+  "Common.UI.Calendar.textShortJune": "Jún",
+  "Common.UI.Calendar.textShortMarch": "Márc",
+  "Common.UI.Calendar.textShortMay": "Május",
+  "Common.UI.Calendar.textShortMonday": "Hó",
+  "Common.UI.Calendar.textShortNovember": "Nov",
+  "Common.UI.Calendar.textShortOctober": "Okt",
+  "Common.UI.Calendar.textShortSaturday": "Szo",
+  "Common.UI.Calendar.textShortSeptember": "Szept",
+  "Common.UI.Calendar.textShortSunday": "Vas",
+  "Common.UI.Calendar.textShortThursday": "Csüt",
+  "Common.UI.Calendar.textShortTuesday": "Ke",
+  "Common.UI.Calendar.textShortWednesday": "Sze",
+  "Common.UI.Calendar.textYears": "Évek",
+  "Common.UI.Themes.txtThemeClassicLight": "Klasszikus Világos",
+  "Common.UI.Themes.txtThemeDark": "Sötét",
+  "Common.UI.Themes.txtThemeLight": "Világos",
+  "Common.UI.Window.cancelButtonText": "Mégse",
+  "Common.UI.Window.closeButtonText": "Bezár",
+  "Common.UI.Window.noButtonText": "Nem",
+  "Common.UI.Window.okButtonText": "OK",
+  "Common.UI.Window.textConfirmation": "Megerősítés",
+  "Common.UI.Window.textDontShow": "Ne mutassa újra ezt az üzenetet",
+  "Common.UI.Window.textError": "Hiba",
+  "Common.UI.Window.textInformation": "Információ",
+  "Common.UI.Window.textWarning": "Figyelmeztetés",
+  "Common.UI.Window.yesButtonText": "Igen",
+  "Common.Views.CopyWarningDialog.textDontShow": "Ne mutassa újra ezt az üzenetet",
+  "Common.Views.CopyWarningDialog.textMsg": "A helyi menüvel végzett másolási, kivágási és beillesztési műveletek csak ezen a szerkesztőlapon hajthatók végre.<br><br>A szerkesztő lapon kívüli alkalmazásokba vagy alkalmazásokból történő másoláshoz vagy beillesztéshez használja a következő billentyűkombinációkat:",
+  "Common.Views.CopyWarningDialog.textTitle": "Másolás, kivágás és beillesztés",
+  "Common.Views.CopyWarningDialog.textToCopy": "Másolásra",
+  "Common.Views.CopyWarningDialog.textToCut": "Kivágásra",
+  "Common.Views.CopyWarningDialog.textToPaste": "Beillesztésre",
+  "Common.Views.EmbedDialog.textHeight": "Magasság",
+  "Common.Views.EmbedDialog.textTitle": "Beágyazás",
+  "Common.Views.EmbedDialog.textWidth": "Szélesség",
+  "Common.Views.EmbedDialog.txtCopy": "Másolás vágólapra",
+  "Common.Views.EmbedDialog.warnCopy": "Böngésző hiba! Használja a [Ctrl] + [C] billentyűparancsot",
+  "Common.Views.ImageFromUrlDialog.textUrl": "Illesszen be egy kép hivatkozást:",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "Ez egy szükséges mező",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Ennek a mezőnek URL formátumúnak kell lennie, pl.: „http://www.pelda.hu”",
+  "Common.Views.OpenDialog.closeButtonText": "Fájl bezárása",
+  "Common.Views.OpenDialog.txtEncoding": "Kódolás",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "Hibás jelszó.",
+  "Common.Views.OpenDialog.txtOpenFile": "Írja be a megnyitáshoz szükséges jelszót",
+  "Common.Views.OpenDialog.txtPassword": "Jelszó",
+  "Common.Views.OpenDialog.txtPreview": "Előnézet",
+  "Common.Views.OpenDialog.txtProtected": "Miután megadta a jelszót és megnyitotta a fájlt, annak jelenlegi jelszava visszaállítódik.",
+  "Common.Views.OpenDialog.txtTitle": "Válassza a %1 opciót",
+  "Common.Views.OpenDialog.txtTitleProtected": "Védett fájl",
+  "Common.Views.SaveAsDlg.textLoading": "Betöltés",
+  "Common.Views.SaveAsDlg.textTitle": "Mentési mappa",
+  "Common.Views.SelectFileDlg.textLoading": "Betöltés",
+  "Common.Views.SelectFileDlg.textTitle": "Adatforrás kiválasztása",
+  "Common.Views.ShareDialog.textTitle": "Hivatkozás megosztása",
+  "Common.Views.ShareDialog.txtCopy": "Másolás vágólapra",
+  "Common.Views.ShareDialog.warnCopy": "Böngésző hiba! Használja a [Ctrl] + [C] billentyűparancsot",
   "DE.Controllers.ApplicationController.convertationErrorText": "Az átalakítás nem sikerült.",
   "DE.Controllers.ApplicationController.convertationTimeoutText": "Időtúllépés az átalakítás során.",
   "DE.Controllers.ApplicationController.criticalErrorTitle": "Hiba",
   "DE.Controllers.ApplicationController.downloadErrorText": "Sikertelen letöltés.",
   "DE.Controllers.ApplicationController.downloadTextText": "Dokumentum letöltése...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.<br>Vegye fel a kapcsolatot a Document Server adminisztrátorával.",
+  "DE.Controllers.ApplicationController.errorBadImageUrl": "Hibás kép URL",
+  "DE.Controllers.ApplicationController.errorConnectToServer": "A dokumentumot nem sikerült menteni. Kérjük, ellenőrizze a csatlakozási beállításokat, vagy lépjen kapcsolatba a rendszergazdával.<br>Amikor az 'OK' gombra kattint, a rendszer kéri a dokumentum letöltését.",
+  "DE.Controllers.ApplicationController.errorDataEncrypted": "Titkosított változások érkeztek, melyek feloldása sikertelen.",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "Hibakód: %1",
+  "DE.Controllers.ApplicationController.errorEditingDownloadas": "Hiba történt a dokumentummal végzett munka során.<br>Használja a 'Letöltés másként...' opciót, hogy mentse a fájl biztonsági másolatát a számítógép merevlemezére.",
+  "DE.Controllers.ApplicationController.errorEditingSaveas": "Hiba történt a dokumentummal végzett munka során.<br>Használja a 'Mentés másként...' opciót, hogy mentse a fájl biztonsági másolatát a számítógép merevlemezére.",
   "DE.Controllers.ApplicationController.errorFilePassProtect": "A dokumentum jelszóval védett, és nem nyitható meg.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "A fájlméret meghaladja a szerverre beállított korlátozást.<br>Kérjük, forduljon a Document Server rendszergazdájához a részletekért.",
+  "DE.Controllers.ApplicationController.errorForceSave": "Hiba történt a fájl mentése közben. Kérjük, használja a 'Letöltés másként' opciót, hogy a fájlt a számítógépére mentse, vagy próbálkozzon később.",
+  "DE.Controllers.ApplicationController.errorLoadingFont": "A betűtípusok nincsenek betöltve.<br>Kérjük forduljon a dokumentumszerver rendszergazdájához.",
+  "DE.Controllers.ApplicationController.errorServerVersion": "A szerkesztő verziója frissült. Az oldal újratöltésre kerül a módosítások alkalmazásához.",
+  "DE.Controllers.ApplicationController.errorSessionAbsolute": "A dokumentumszerkesztési munkamenet lejárt. Kérjük, töltse újra az oldalt.",
+  "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.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.",
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Az internet kapcsolat helyreállt, és a fájl verziója megváltozott.<br>Mielőtt folytatná a munkát, töltse le a fájlt, vagy másolja vágólapra annak tartalmát, hogy megbizonyosodjon arról, hogy semmi nem veszik el, majd töltse újra az oldalt.",
   "DE.Controllers.ApplicationController.errorUserDrop": "A dokumentum jelenleg nem elérhető.",
+  "DE.Controllers.ApplicationController.errorViewerDisconnect": "A kapcsolat megszakadt. Továbbra is megtekinthető a dokumentum,<br>de a kapcsolat helyreálltáig és az oldal újratöltéséig nem lehet letölteni.",
+  "DE.Controllers.ApplicationController.mniImageFromFile": "Kép fájlból",
+  "DE.Controllers.ApplicationController.mniImageFromStorage": "Kép a tárolóból",
+  "DE.Controllers.ApplicationController.mniImageFromUrl": "Kép hivatkozásból",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Figyelmeztetés",
+  "DE.Controllers.ApplicationController.openErrorText": "Hiba történt a fájl megnyitásakor.",
+  "DE.Controllers.ApplicationController.saveErrorText": "Hiba történt a fájl mentése során.",
+  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "Ezt a fájlt nem lehet menteni vagy létrehozni.<br>Lehetséges okok:<br>1. A fájl csak olvasható.<br>2. A fájlt más felhasználók szerkesztik.<br>3. A lemez megtelt vagy sérült.",
   "DE.Controllers.ApplicationController.scriptLoadError": "A kapcsolat túl lassú, néhány komponens nem töltődött be. Frissítse az oldalt.",
+  "DE.Controllers.ApplicationController.textAnonymous": "Névtelen",
+  "DE.Controllers.ApplicationController.textBuyNow": "Weboldal megnyitása",
+  "DE.Controllers.ApplicationController.textCloseTip": "Kattintson a tipp bezáráshoz.",
+  "DE.Controllers.ApplicationController.textContactUs": "Kapcsolatba lépés az értékesítéssel",
+  "DE.Controllers.ApplicationController.textGotIt": "OK",
+  "DE.Controllers.ApplicationController.textGuest": "Vendég",
   "DE.Controllers.ApplicationController.textLoadingDocument": "Dokumentum betöltése",
+  "DE.Controllers.ApplicationController.textNoLicenseTitle": "Elérte a licenckorlátot",
   "DE.Controllers.ApplicationController.textOf": "of",
+  "DE.Controllers.ApplicationController.textRequired": "Töltse ki az összes szükséges mezőt az űrlap elküldéséhez.",
+  "DE.Controllers.ApplicationController.textSaveAs": "Mentés PDF-ként",
+  "DE.Controllers.ApplicationController.textSaveAsDesktop": "Mentés másként...",
+  "DE.Controllers.ApplicationController.textSubmited": "<b>Az űrlap sikeresen elküldve</b><br>Kattintson a tipp bezárásához",
+  "DE.Controllers.ApplicationController.titleServerVersion": "Szerkesztő frissítve",
+  "DE.Controllers.ApplicationController.titleUpdateVersion": "A verzió megváltozott",
+  "DE.Controllers.ApplicationController.txtArt": "Írja a szöveget ide",
+  "DE.Controllers.ApplicationController.txtChoose": "Válassz egy elemet",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "Kattintson a kép betöltéséhez",
   "DE.Controllers.ApplicationController.txtClose": "Bezárás",
+  "DE.Controllers.ApplicationController.txtEmpty": "(Üres)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "Adjon meg egy dátumot",
+  "DE.Controllers.ApplicationController.txtPressLink": "Nyomja meg a CTRL billentyűt és kattintson a hivatkozásra",
+  "DE.Controllers.ApplicationController.txtUntitled": "Névtelen",
   "DE.Controllers.ApplicationController.unknownErrorText": "Ismeretlen hiba.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "A böngészője nem támogatott.",
+  "DE.Controllers.ApplicationController.uploadImageExtMessage": "Ismeretlen képformátum.",
+  "DE.Controllers.ApplicationController.uploadImageSizeMessage": "A kép túl nagy. A maximális méret 25 MB.",
   "DE.Controllers.ApplicationController.waitText": "Kérjük, várjon...",
+  "DE.Controllers.ApplicationController.warnLicenseExceeded": "Elérte a(z) %1 szerkesztőhöz tartozó egyidejű csatlakozás korlátját. Ez a dokumentum csak megtekintésre nyílik meg.<br>További információért forduljon rendszergazdájához.",
+  "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "A licenc lejárt.<br>Nincs hozzáférése a dokumentumszerkesztő funkciókhoz.<br>Kérjük, lépjen kapcsolatba a rendszergazdával.",
+  "DE.Controllers.ApplicationController.warnLicenseLimitedRenewed": "A licencet meg kell újítani.<br>Korlátozott hozzáférése van a dokumentumszerkesztési funkciókhoz.<br>A teljes hozzáférésért forduljon rendszergazdájához",
+  "DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "Elérte a(z) %1 szerkesztőhöz tartozó felhasználói korlátját. További információért forduljon rendszergazdájához.",
+  "DE.Controllers.ApplicationController.warnNoLicense": "Elérte a(z) %1 szerkesztőhöz tartozó egyidejű csatlakozás korlátját. Ez a dokumentum csak megtekintésre nyílik meg.<br>Vegye fel a kapcsolatot a(z) %1 értékesítési csapattal a személyes frissítési feltételekért.",
+  "DE.Controllers.ApplicationController.warnNoLicenseUsers": "Elérte a(z) %1 szerkesztőhöz tartozó felhasználói korlátját. Vegye fel a kapcsolatot a(z) %1 értékesítési csapattal a személyes frissítési feltételekért.",
+  "DE.Views.ApplicationView.textClear": "Az összes mező törlése",
+  "DE.Views.ApplicationView.textCopy": "Másol",
+  "DE.Views.ApplicationView.textCut": "Kivág",
+  "DE.Views.ApplicationView.textNext": "Következő mező",
+  "DE.Views.ApplicationView.textPaste": "Beillesztés",
+  "DE.Views.ApplicationView.textPrintSel": "Nyomtató kiválasztás",
+  "DE.Views.ApplicationView.textRedo": "Újra",
+  "DE.Views.ApplicationView.textSubmit": "Beküldés",
+  "DE.Views.ApplicationView.textUndo": "Vissza",
+  "DE.Views.ApplicationView.txtDarkMode": "Sötét mód",
   "DE.Views.ApplicationView.txtDownload": "Letöltés",
+  "DE.Views.ApplicationView.txtDownloadDocx": "Letöltés DOCX-ként",
+  "DE.Views.ApplicationView.txtDownloadPdf": "Letöltés PDF-ként",
   "DE.Views.ApplicationView.txtEmbed": "Beágyazás",
+  "DE.Views.ApplicationView.txtFileLocation": "Fájl helyének megnyitása",
   "DE.Views.ApplicationView.txtFullScreen": "Teljes képernyő",
   "DE.Views.ApplicationView.txtPrint": "Nyomtatás",
-  "DE.Views.ApplicationView.txtShare": "Megosztás"
+  "DE.Views.ApplicationView.txtShare": "Megosztás",
+  "DE.Views.ApplicationView.txtTheme": "Felhasználói felület témája"
 }

apps/documenteditor/forms/locale/nl.json

@@ -57,6 +57,8 @@
   "Common.Views.EmbedDialog.txtCopy": "Kopieer naar klembord",
   "Common.Views.EmbedDialog.warnCopy": "Browserfout! Gebruik de sneltoets [Ctrl] + [C]. ",
   "Common.Views.ImageFromUrlDialog.textUrl": "URL van een afbeelding plakken:",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "Dit veld is vereist",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Dit veld moet een URL in de notatie \"http://www.voorbeeld.com\" bevatten",
   "Common.Views.OpenDialog.closeButtonText": "Bestand sluiten",
   "Common.Views.OpenDialog.txtEncoding": "Codering",
   "Common.Views.OpenDialog.txtIncorrectPwd": "Wachtwoord is onjuist.",
@@ -69,6 +71,7 @@
   "Common.Views.SaveAsDlg.textLoading": "Laden",
   "Common.Views.SaveAsDlg.textTitle": "Map voor opslaan",
   "Common.Views.SelectFileDlg.textLoading": "Laden",
+  "Common.Views.SelectFileDlg.textTitle": "Gegevensbron selecteren",
   "Common.Views.ShareDialog.textTitle": "Link delen",
   "Common.Views.ShareDialog.txtCopy": "Kopieer naar klembord",
   "Common.Views.ShareDialog.warnCopy": "Browserfout! Gebruik de sneltoets [Ctrl] + [C]. ",
@@ -89,7 +92,11 @@
   "DE.Controllers.ApplicationController.errorForceSave": "Er is een fout opgetreden bij het opslaan van het bestand. Gebruik de 'Download als' knop om het bestand op te slaan op uw computer of probeer het later nog eens.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Lettertypes zijn niet geladen.\nNeem alstublieft contact op met de beheerder van de documentserver.",
   "DE.Controllers.ApplicationController.errorServerVersion": "De versie van de editor is bijgewerkt. De pagina wordt opnieuw geladen om de wijzigingen toe te passen.",
+  "DE.Controllers.ApplicationController.errorSessionAbsolute": "De bewerksessie voor het document is verlopen. Laad de pagina opnieuw.",
+  "DE.Controllers.ApplicationController.errorSessionIdle": "Het document is al lang niet meer bewerkt. Laad de pagina opnieuw.",
+  "DE.Controllers.ApplicationController.errorSessionToken": "De verbinding met de server is onderbroken. Laad de pagina opnieuw.",
   "DE.Controllers.ApplicationController.errorSubmit": "Verzenden mislukt. ",
+  "DE.Controllers.ApplicationController.errorToken": "Het token voor de documentbeveiliging heeft niet de juiste indeling.<br>Neem alstublieft contact op met de beheerder van de documentserver.",
   "DE.Controllers.ApplicationController.errorTokenExpire": "Het token voor de documentbeveiliging is vervallen.<br>Neem alstublieft contact op met de beheerder van de documentserver.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "De bestandsversie is gewijzigd. De pagina wordt opnieuw geladen.",
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "De internetverbinding is hersteld en de bestandsversie is gewijzigd. <br>Voordat u verder kunt werken, moet u het bestand downloaden of de inhoud kopiëren om er zeker van te zijn dat er niets verloren gaat, en deze pagina vervolgens opnieuw laden.",
@@ -101,6 +108,7 @@
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Waarschuwing",
   "DE.Controllers.ApplicationController.openErrorText": "Er is een fout opgetreden bij het openen van het bestand",
   "DE.Controllers.ApplicationController.saveErrorText": "Er is een fout opgetreden bij het opslaan van het bestand",
+  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "Dit bestand kan niet worden opgeslagen of gemaakt. <br> Mogelijke redenen zijn: <br> 1. Het bestand is alleen-lezen. <br> 2. Het bestand wordt bewerkt door andere gebruikers. <br> 3. De schijf is vol of beschadigd.",
   "DE.Controllers.ApplicationController.scriptLoadError": "De verbinding is te langzaam, sommige componenten konden niet geladen worden. Laad de pagina opnieuw.",
   "DE.Controllers.ApplicationController.textAnonymous": "Anoniem",
   "DE.Controllers.ApplicationController.textBuyNow": "Website bezoeken",
@@ -112,6 +120,8 @@
   "DE.Controllers.ApplicationController.textNoLicenseTitle": "Licentielimiet bereikt",
   "DE.Controllers.ApplicationController.textOf": "van",
   "DE.Controllers.ApplicationController.textRequired": "Vul alle verplichte velden in om het formulier te verzenden.",
+  "DE.Controllers.ApplicationController.textSaveAs": "Opslaan als PDF",
+  "DE.Controllers.ApplicationController.textSaveAsDesktop": "Opslaan als...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Formulier succesvol ingediend</b><br>Klik om de tip te sluiten",
   "DE.Controllers.ApplicationController.titleServerVersion": "Editor bijgewerkt",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "Versie gewijzigd",
@@ -122,6 +132,7 @@
   "DE.Controllers.ApplicationController.txtEmpty": "(Leeg)",
   "DE.Controllers.ApplicationController.txtEnterDate": "Vul een datum in",
   "DE.Controllers.ApplicationController.txtPressLink": "Druk op Ctrl en klik op koppeling",
+  "DE.Controllers.ApplicationController.txtUntitled": "Naamloos",
   "DE.Controllers.ApplicationController.unknownErrorText": "Onbekende fout.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "Uw browser wordt niet ondersteund.",
   "DE.Controllers.ApplicationController.uploadImageExtMessage": "Onbekende afbeeldingsindeling.",
@@ -139,7 +150,9 @@
   "DE.Views.ApplicationView.textNext": "Volgende veld ",
   "DE.Views.ApplicationView.textPaste": "Plakken",
   "DE.Views.ApplicationView.textPrintSel": "Selectie afdrukken",
+  "DE.Views.ApplicationView.textRedo": "Opnieuw",
   "DE.Views.ApplicationView.textSubmit": "Indienen",
+  "DE.Views.ApplicationView.textUndo": "Ongedaan maken",
   "DE.Views.ApplicationView.txtDarkMode": "Donkere modus",
   "DE.Views.ApplicationView.txtDownload": "Downloaden",
   "DE.Views.ApplicationView.txtDownloadDocx": "Downloaden als docx",

apps/documenteditor/forms/locale/pt.json

@@ -147,12 +147,15 @@
   "DE.Views.ApplicationView.textClear": "Limpar todos os campos",
   "DE.Views.ApplicationView.textCopy": "Copiar",
   "DE.Views.ApplicationView.textCut": "Cortar",
+  "DE.Views.ApplicationView.textFitToPage": "Ajustar a página",
+  "DE.Views.ApplicationView.textFitToWidth": "Ajustar largura",
   "DE.Views.ApplicationView.textNext": "Próximo campo",
   "DE.Views.ApplicationView.textPaste": "Colar",
   "DE.Views.ApplicationView.textPrintSel": "Imprimir seleção",
   "DE.Views.ApplicationView.textRedo": "Refazer",
   "DE.Views.ApplicationView.textSubmit": "Enviar",
   "DE.Views.ApplicationView.textUndo": "Desfazer",
+  "DE.Views.ApplicationView.textZoom": "Zoom",
   "DE.Views.ApplicationView.txtDarkMode": "Modo escuro",
   "DE.Views.ApplicationView.txtDownload": "Download",
   "DE.Views.ApplicationView.txtDownloadDocx": "Baixar como docx",

apps/documenteditor/forms/locale/ru.json

@@ -147,6 +147,8 @@
   "DE.Views.ApplicationView.textClear": "Очистить все поля",
   "DE.Views.ApplicationView.textCopy": "Копировать",
   "DE.Views.ApplicationView.textCut": "Вырезать",
+  "DE.Views.ApplicationView.textFitToPage": "По размеру страницы",
+  "DE.Views.ApplicationView.textFitToWidth": "По ширине",
   "DE.Views.ApplicationView.textNext": "Следующее поле",
   "DE.Views.ApplicationView.textPaste": "Вставить",
   "DE.Views.ApplicationView.textPrintSel": "Напечатать выделенное",

apps/documenteditor/forms/locale/tr.json

@@ -57,8 +57,11 @@
   "Common.Views.EmbedDialog.txtCopy": "Panoya kopyala",
   "Common.Views.EmbedDialog.warnCopy": "Tarayıcı hatası! [Ctrl] + [C] klavye kısayolunu kullanın",
   "Common.Views.OpenDialog.closeButtonText": "Dosyayı Kapat",
+  "Common.Views.OpenDialog.txtEncoding": "Kodlama",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "Şifre hatalı.",
   "Common.Views.OpenDialog.txtOpenFile": "Dosyayı Açmak için Parola Girin",
   "Common.Views.OpenDialog.txtPassword": "Şifre",
+  "Common.Views.OpenDialog.txtProtected": "Şifreyi girip dosyayı açtığınızda, dosyanın mevcut şifresi sıfırlanacaktır.",
   "Common.Views.OpenDialog.txtTitle": "%1 seçenekleri seçin",
   "Common.Views.SaveAsDlg.textLoading": "Yükleniyor",
   "Common.Views.SaveAsDlg.textTitle": "Kaydetmek için klasör",
@@ -72,6 +75,7 @@
   "DE.Controllers.ApplicationController.downloadErrorText": "Yükleme başarısız oldu.",
   "DE.Controllers.ApplicationController.downloadTextText": "Döküman yükleniyor...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "Hakkınız olmayan bir eylem gerçekleştirmeye çalışıyorsunuz.<br>Lütfen Belge Sunucu yöneticinize başvurun.",
+  "DE.Controllers.ApplicationController.errorBadImageUrl": "Resim URL'si yanlış",
   "DE.Controllers.ApplicationController.errorConnectToServer": "Belge kaydedilemedi. Lütfen internet bağlantınızı kontrol edin veya yöneticiniz ile iletişime geçin. <br>'TAMAM' tuşuna tıkladığınızda belgeyi indirebileceksiniz.",
   "DE.Controllers.ApplicationController.errorDataEncrypted": "Şifreli değişiklikler alındı, deşifre edilemezler.",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "Hata kodu: %1",
@@ -89,6 +93,8 @@
   "DE.Controllers.ApplicationController.errorUserDrop": "Belgeye şu an erişilemiyor.",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "Bağlantı kayboldu. Belgeyi yine de görüntüleyebilirsiniz,<br>ancak bağlantı yeniden kurulana ve sayfa yeniden yüklenene kadar indiremez veya yazdıramazsınız.",
   "DE.Controllers.ApplicationController.mniImageFromFile": "Dosyadan resim",
+  "DE.Controllers.ApplicationController.mniImageFromStorage": "Depolamadan Resim",
+  "DE.Controllers.ApplicationController.mniImageFromUrl": "URL'den resim",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Uyarı",
   "DE.Controllers.ApplicationController.openErrorText": "Dosya açılırken bir hata oluştu.",
   "DE.Controllers.ApplicationController.saveErrorText": "Dosya kaydedilirken bir hata oluştu",
@@ -128,6 +134,8 @@
   "DE.Views.ApplicationView.textClear": "Tüm alanları temizle",
   "DE.Views.ApplicationView.textCopy": "Kopyala",
   "DE.Views.ApplicationView.textCut": "Kes",
+  "DE.Views.ApplicationView.textFitToPage": "Sayfaya Sığdır",
+  "DE.Views.ApplicationView.textFitToWidth": "Genişliğe Sığdır",
   "DE.Views.ApplicationView.textNext": "Sonraki alan",
   "DE.Views.ApplicationView.textPaste": "Yapıştır",
   "DE.Views.ApplicationView.textPrintSel": "Seçimi Yazdır",

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

@@ -57,9 +57,7 @@ define([
         initialize: function () {
         },
         onLaunch: function () {
-            this._state = {
-                prcontrolsdisable:undefined
-            };
+            this._state = {};
         },
 
         setApi: function (api) {
@@ -145,17 +143,12 @@ define([
                 control_plain = (in_control&&control_props) ? (control_props.get_ContentControlType()==Asc.c_oAscSdtLevelType.Inline) : false;
             (lock_type===undefined) && (lock_type = Asc.c_oAscSdtLockType.Unlocked);
             var content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked;
-            var need_disable = (paragraph_locked || header_locked || control_plain || content_locked);
-            if (this._state.prcontrolsdisable !== need_disable) {
-                this.view.btnTextField.setDisabled(need_disable);
-                this.view.btnComboBox.setDisabled(need_disable);
-                this.view.btnDropDown.setDisabled(need_disable);
-                this.view.btnCheckBox.setDisabled(need_disable);
-                this.view.btnRadioBox.setDisabled(need_disable);
-                this.view.btnImageField.setDisabled(need_disable);
-                this.view.btnTextField.setDisabled(need_disable);
-                this._state.prcontrolsdisable = need_disable;
-            }
+            var arr = [ this.view.btnTextField, this.view.btnComboBox, this.view.btnDropDown, this.view.btnCheckBox,
+                        this.view.btnRadioBox, this.view.btnImageField ];
+            Common.Utils.lockControls(Common.enumLock.paragraphLock, paragraph_locked,   {array: arr});
+            Common.Utils.lockControls(Common.enumLock.headerLock,    header_locked,      {array: arr});
+            Common.Utils.lockControls(Common.enumLock.controlPlain,  control_plain,      {array: arr});
+            Common.Utils.lockControls(Common.enumLock.contentLock,   content_locked,     {array: arr});
         },
 
         onChangeSpecialFormsGlobalSettings: function() {
@@ -302,7 +295,7 @@ define([
                 Common.NotificationCenter.trigger('editing:disable', disable, {
                     viewMode: false,
                     reviewMode: false,
-                    fillFormwMode: true,
+                    fillFormMode: true,
                     allowMerge: false,
                     allowSignature: false,
                     allowProtect: false,
@@ -317,10 +310,11 @@ define([
                     viewport: false,
                     documentHolder: true,
                     toolbar: true,
-                    plugins: false
+                    plugins: true,
+                    protect: true
                 }, 'forms');
-                if (this.view)
-                    this.view.$el.find('.no-group-mask.form-view').css('opacity', 1);
+                // if (this.view)
+                //     this.view.$el.find('.no-group-mask.form-view').css('opacity', 1);
             }
         },
 

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

@@ -87,7 +87,6 @@ define([
         },
         onLaunch: function () {
             this._state = {
-                prcontrolsdisable:undefined,
                 in_object: undefined
             };
             Common.Gateway.on('setactionlink', function (url) {
@@ -164,7 +163,6 @@ define([
                     object_type = type;
                 }
             }
-            this._state.prcontrolsdisable = paragraph_locked || header_locked;
             this._state.in_object = object_type;
 
             var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
@@ -176,28 +174,31 @@ define([
                 plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : false,
                 plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : false;
 
+            this.lockToolbar(Common.enumLock.paragraphLock, paragraph_locked,   {array: this.view.btnsNotes.concat(this.view.btnsHyperlink).concat([this.view.btnBookmarks, this.view.btnTableFiguresUpdate, this.view.btnCrossRef])});
+            this.lockToolbar(Common.enumLock.inHeader,      in_header,          {array: this.view.btnsNotes.concat(this.view.btnsContents).concat([this.view.btnBookmarks, this.view.btnTableFigures,
+                                                                                            this.view.btnTableFiguresUpdate, this.view.btnCaption])});
+            this.lockToolbar(Common.enumLock.controlPlain,  control_plain,      {array: this.view.btnsNotes.concat([this.view.btnBookmarks, this.view.btnCrossRef])});
+            this.lockToolbar(Common.enumLock.richEditLock,  rich_edit_lock,     {array: this.view.btnsNotes.concat(this.view.btnsContents).concat([this.view.btnTableFigures, this.view.btnTableFiguresUpdate,
+                                                                                            this.view.btnCrossRef])});
+            this.lockToolbar(Common.enumLock.plainEditLock, plain_edit_lock,    {array: this.view.btnsNotes.concat(this.view.btnsContents).concat([this.view.btnTableFigures, this.view.btnTableFiguresUpdate,
+                                                                                            this.view.btnCrossRef])});
+            this.lockToolbar(Common.enumLock.headerLock,    header_locked,      {array: this.view.btnsHyperlink.concat([this.view.btnBookmarks, this.view.btnCrossRef])});
+            this.lockToolbar(Common.enumLock.inEquation,    in_equation,        {array: this.view.btnsNotes});
+            this.lockToolbar(Common.enumLock.inImage,       in_image,           {array: this.view.btnsNotes});
+            this.lockToolbar(Common.enumLock.richDelLock,   rich_del_lock,      {array: this.view.btnsContents.concat([this.view.btnTableFigures, this.view.btnTableFiguresUpdate])});
+            this.lockToolbar(Common.enumLock.plainDelLock,  plain_del_lock,     {array: this.view.btnsContents.concat([this.view.btnTableFigures, this.view.btnTableFiguresUpdate])});
+            this.lockToolbar(Common.enumLock.contentLock,   content_locked,     {array: [this.view.btnCrossRef]});
+            this.lockToolbar(Common.enumLock.cantUpdateTOF, !this.api.asc_CanUpdateTablesOfFigures(),   {array: [this.view.btnTableFiguresUpdate]});
 
-            var need_disable = paragraph_locked || in_equation || in_image || in_header || control_plain || rich_edit_lock || plain_edit_lock;
-            this.view.btnsNotes.setDisabled(need_disable);
+            this.dlgCrossRefDialog && this.dlgCrossRefDialog.isVisible() && this.dlgCrossRefDialog.setLocked(this.view.btnCrossRef.isDisabled());
+        },
 
-            need_disable = paragraph_locked || header_locked || in_header || control_plain;
-            this.view.btnBookmarks.setDisabled(need_disable);
-
-            need_disable = in_header || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock;
-            this.view.btnsContents.setDisabled(need_disable);
-            this.view.btnTableFigures.setDisabled(need_disable);
-            this.view.btnTableFiguresUpdate.setDisabled(need_disable || paragraph_locked || !this.api.asc_CanUpdateTablesOfFigures());
-
-            need_disable = in_header;
-            this.view.btnCaption.setDisabled(need_disable);
-
-            need_disable = paragraph_locked || header_locked || control_plain || rich_edit_lock || plain_edit_lock || content_locked;
-            this.view.btnCrossRef.setDisabled(need_disable);
-            this.dlgCrossRefDialog && this.dlgCrossRefDialog.isVisible() && this.dlgCrossRefDialog.setLocked(need_disable);
+        lockToolbar: function (causes, lock, opts) {
+            Common.Utils.lockControls(causes, lock, opts, this.view.getButtons());
         },
 
         onApiCanAddHyperlink: function(value) {
-            this.toolbar.editMode && this.view.btnsHyperlink.setDisabled(!value || this._state.prcontrolsdisable);
+            this.toolbar.editMode && this.lockToolbar(Common.enumLock.hyperlinkLock, !value, {array: this.view.btnsHyperlink});
         },
 
         onHyperlinkClick: function(btn) {

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

@@ -736,7 +736,7 @@ define([
                 Common.NotificationCenter.trigger('editing:disable', disable, {
                     viewMode: disable,
                     reviewMode: false,
-                    fillFormwMode: false,
+                    fillFormMode: false,
                     allowMerge: false,
                     allowSignature: false,
                     allowProtect: false,
@@ -751,7 +751,8 @@ define([
                     viewport: true,
                     documentHolder: true,
                     toolbar: true,
-                    plugins: false
+                    plugins: false,
+                    protect: false
                 }, temp ? 'reconnect' : 'disconnect');
             },
 
@@ -772,16 +773,16 @@ define([
                     app.getController('Statusbar').getView('Statusbar').SetDisabled(disable);
                 }
                 if (options.review) {
-                    app.getController('Common.Controllers.ReviewChanges').SetDisabled(disable);
+                    app.getController('Common.Controllers.ReviewChanges').SetDisabled(disable, options.reviewMode, options.fillFormMode);
                 }
                 if (options.viewport) {
                     app.getController('Viewport').SetDisabled(disable);
                 }
                 if (options.toolbar) {
-                    app.getController('Toolbar').DisableToolbar(disable, options.viewMode, options.reviewMode, options.fillFormwMode);
+                    app.getController('Toolbar').DisableToolbar(disable, options.viewMode, options.reviewMode, options.fillFormMode);
                 }
                 if (options.documentHolder) {
-                    app.getController('DocumentHolder').getView().SetDisabled(disable, options.allowProtect, options.fillFormwMode);
+                    app.getController('DocumentHolder').getView().SetDisabled(disable, options.allowProtect, options.fillFormMode);
                 }
                 if (options.leftMenu) {
                     if (options.leftMenu.disable)
@@ -805,6 +806,9 @@ define([
                 if (options.plugins) {
                     app.getController('Common.Controllers.Plugins').getView('Common.Views.Plugins').disableControls(disable);
                 }
+                if (options.protect) {
+                    app.getController('Common.Controllers.Protection').SetDisabled(disable, false);
+                }
 
                 if (prev_options) {
                     this.onEditingDisable(prev_options.disable, prev_options.options, prev_options.type);
@@ -2084,6 +2088,10 @@ define([
                                 console.log("Obsolete: The 'leftMenu' parameter of the 'customization' section is deprecated. Please use 'leftMenu' parameter in the 'customization.layout' section instead.");
                             if (this.appOptions.customization.rightMenu!==undefined)
                                 console.log("Obsolete: The 'rightMenu' parameter of the 'customization' section is deprecated. Please use 'rightMenu' parameter in the 'customization.layout' section instead.");
+                            if (this.appOptions.customization.statusBar!==undefined)
+                                console.log("Obsolete: The 'statusBar' parameter of the 'customization' section is deprecated. Please use 'statusBar' parameter in the 'customization.layout' section instead.");
+                            if (this.appOptions.customization.toolbar!==undefined)
+                                console.log("Obsolete: The 'toolbar' parameter of the 'customization' section is deprecated. Please use 'toolbar' parameter in the 'customization.layout' section instead.");
                         }
                         promise = this.getApplication().getController('Common.Controllers.Plugins').applyUICustomization();
                     }

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

@@ -107,12 +107,12 @@ define([
 
                 switch ( type ) {
                 case Asc.c_oAscWrapStyle2.Inline:       menu.items[0].setChecked(true); break;
-                case Asc.c_oAscWrapStyle2.Square:       menu.items[1].setChecked(true); break;
-                case Asc.c_oAscWrapStyle2.Tight:        menu.items[2].setChecked(true); break;
-                case Asc.c_oAscWrapStyle2.Through:      menu.items[3].setChecked(true); break;
-                case Asc.c_oAscWrapStyle2.TopAndBottom: menu.items[4].setChecked(true); break;
-                case Asc.c_oAscWrapStyle2.Behind:       menu.items[6].setChecked(true); break;
-                case Asc.c_oAscWrapStyle2.InFront:      menu.items[5].setChecked(true); break;
+                case Asc.c_oAscWrapStyle2.Square:       menu.items[2].setChecked(true); break;
+                case Asc.c_oAscWrapStyle2.Tight:        menu.items[3].setChecked(true); break;
+                case Asc.c_oAscWrapStyle2.Through:      menu.items[4].setChecked(true); break;
+                case Asc.c_oAscWrapStyle2.TopAndBottom: menu.items[5].setChecked(true); break;
+                case Asc.c_oAscWrapStyle2.Behind:       menu.items[8].setChecked(true); break;
+                case Asc.c_oAscWrapStyle2.InFront:      menu.items[7].setChecked(true); break;
                 default:
                     for (var i in menu.items) {
                         menu.items[i].setChecked( false );
@@ -124,66 +124,60 @@ define([
                 if (!this.editMode) return;
 
                 var me = this;
-                var disable = [], type;
+                var disable = {}, type,
+                    islocked = false,
+                    shapeProps,
+                    canGroupUngroup = false,
+                    wrapping,
+                    content_locked = false,
+                    no_object = true;
 
                 for (var i in objects) {
                     type = objects[i].get_ObjectType();
                     if ( type === Asc.c_oAscTypeSelectElement.Image ) {
                         var props = objects[i].get_ObjectValue(),
-                            shapeProps = props.get_ShapeProperties();
-                        var islocked = props.get_Locked();
-                        var notflow = !props.get_CanBeFlow();
-
-                        var wrapping = props.get_WrappingStyle();
+                            notflow = !props.get_CanBeFlow();
+                        shapeProps = props.get_ShapeProperties();
+                        islocked = props.get_Locked();
+                        wrapping = props.get_WrappingStyle();
+                        no_object = false;
                         me.onApiWrappingStyleChanged(notflow ? -1 : wrapping);
 
                         _.each(me.toolbar.btnImgWrapping.menu.items, function(item) {
                             item.setDisabled(notflow);
                         });
-                        me.toolbar.btnImgWrapping.menu.items[8].setDisabled(!me.api.CanChangeWrapPolygon());
+                        me.toolbar.btnImgWrapping.menu.items[10].setDisabled(!me.api.CanChangeWrapPolygon());
 
                         var control_props = me.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
-                            lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked,
-                            content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked;
+                            lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked;
 
-                        disable.align       = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked;
-                        disable.group       = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked;
-                        disable.arrange     = (wrapping == Asc.c_oAscWrapStyle2.Inline) && !props.get_FromGroup() || shapeProps && shapeProps.asc_getFromSmartArtInternal() || content_locked;
-                        disable.wrapping    = islocked || props.get_FromGroup() || (notflow && !me.api.CanChangeWrapPolygon()) || content_locked ||
+                        content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked;
+                        disable.arrange     = (wrapping == Asc.c_oAscWrapStyle2.Inline) && !props.get_FromGroup();
+                        disable.wrapping    = props.get_FromGroup() || (notflow && !me.api.CanChangeWrapPolygon()) ||
                                             (!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture && !control_props.get_FormPr());
-
-                        if ( !disable.group ) {
-                            if (me.api.CanGroup() || me.api.CanUnGroup()) {
-                                var mnuGroup = me.toolbar.btnImgGroup.menu.items[0],
-                                    mnuUnGroup = me.toolbar.btnImgGroup.menu.items[1];
-
-                                mnuGroup.setDisabled(!me.api.CanGroup());
-                                mnuUnGroup.setDisabled(!me.api.CanUnGroup());
-                            } else
-                                disable.group = true;
+                        disable.group   = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked;
+                        canGroupUngroup = me.api.CanGroup() || me.api.CanUnGroup();
+                        if (!disable.group && canGroupUngroup) {
+                            me.toolbar.btnImgGroup.menu.items[0].setDisabled(!me.api.CanGroup());
+                            me.toolbar.btnImgGroup.menu.items[1].setDisabled(!me.api.CanUnGroup());
                         }
 
                         _imgOriginalProps = props;
                         break;
                     }
                 }
-
-                me.toolbar.btnImgAlign.setDisabled(disable.align !== false);
-                me.toolbar.btnImgGroup.setDisabled(disable.group !== false);
-                me.toolbar.btnImgForward.setDisabled(disable.arrange !== false);
-                me.toolbar.btnImgBackward.setDisabled(disable.arrange !== false);
-                me.toolbar.btnImgWrapping.setDisabled(disable.wrapping !== false);
+                me.toolbar.lockToolbar(Common.enumLock.noObjectSelected, no_object, {array: [me.toolbar.btnImgAlign, me.toolbar.btnImgGroup, me.toolbar.btnImgWrapping, me.toolbar.btnImgForward, me.toolbar.btnImgBackward]});
+                me.toolbar.lockToolbar(Common.enumLock.imageLock, islocked, {array: [me.toolbar.btnImgAlign, me.toolbar.btnImgGroup, me.toolbar.btnImgWrapping]});
+                me.toolbar.lockToolbar(Common.enumLock.contentLock, content_locked, {array: [me.toolbar.btnImgAlign, me.toolbar.btnImgGroup, me.toolbar.btnImgWrapping, me.toolbar.btnImgForward, me.toolbar.btnImgBackward]});
+                me.toolbar.lockToolbar(Common.enumLock.inImageInline, wrapping == Asc.c_oAscWrapStyle2.Inline, {array: [me.toolbar.btnImgAlign, me.toolbar.btnImgGroup]});
+                me.toolbar.lockToolbar(Common.enumLock.inSmartartInternal, shapeProps && shapeProps.asc_getFromSmartArtInternal(), {array: [me.toolbar.btnImgForward, me.toolbar.btnImgBackward]});
+                me.toolbar.lockToolbar(Common.enumLock.cantGroup, !canGroupUngroup, {array: [me.toolbar.btnImgGroup]});
+                me.toolbar.lockToolbar(Common.enumLock.cantWrap, disable.wrapping, {array: [me.toolbar.btnImgWrapping]});
+                me.toolbar.lockToolbar(Common.enumLock.cantArrange, disable.arrange, {array: [me.toolbar.btnImgForward, me.toolbar.btnImgBackward]});
             },
 
             onApiCoAuthoringDisconnect: function() {
-                var me = this;
-                me.editMode = false;
-
-                me.toolbar.btnImgAlign.setDisabled(true);
-                me.toolbar.btnImgGroup.setDisabled(true);
-                me.toolbar.btnImgForward.setDisabled(true);
-                me.toolbar.btnImgBackward.setDisabled(true);
-                me.toolbar.btnImgWrapping.setDisabled(true);
+                this.editMode = false;
             },
 
             onBeforeShapeAlign: function() {

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

@@ -503,12 +503,12 @@ define([
         onApiCanRevert: function(which, can) {
             if (which=='undo') {
                 if (this._state.can_undo !== can) {
-                    this.toolbar.btnUndo.setDisabled(!can);
+                    this.toolbar.lockToolbar(Common.enumLock.undoLock, !can, {array: [this.toolbar.btnUndo]});
                     this._state.can_undo = can;
                 }
             } else {
                 if (this._state.can_redo !== can) {
-                    this.toolbar.btnRedo.setDisabled(!can);
+                    this.toolbar.lockToolbar(Common.enumLock.redoLock, !can, {array: [this.toolbar.btnRedo]});
                     this._state.can_redo = can;
                 }
             }
@@ -516,7 +516,7 @@ define([
 
         onApiCanCopyCut: function(can) {
             if (this._state.can_copycut !== can) {
-                this.toolbar.btnCopy.setDisabled(!can);
+                this.toolbar.lockToolbar(Common.enumLock.copyLock, !can, {array: [this.toolbar.btnCopy]});
                 this._state.can_copycut = can;
             }
         },
@@ -725,18 +725,21 @@ define([
                 plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : false,
                 plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : false;
 
-            var need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked || rich_del_lock || rich_edit_lock || plain_del_lock || plain_edit_lock;
-            if (this.mode.compatibleFeatures) {
-                need_disable = need_disable || in_image;
-            }
+            this.toolbar.lockToolbar(Common.enumLock.cantAddQuotedComment, !this.api.can_AddQuotedComment(), {array: this.btnsComment});
+            this.toolbar.lockToolbar(Common.enumLock.imageLock, image_locked, {array: this.btnsComment});
+            this.mode.compatibleFeatures && this.toolbar.lockToolbar(Common.enumLock.inImage, in_image,      {array: this.btnsComment});
             if (this.api.asc_IsContentControl()) {
                 var control_props = this.api.asc_GetContentControlProperties(),
                     spectype = control_props ? control_props.get_SpecificType() : Asc.c_oAscContentControlSpecificType.None;
-                need_disable = need_disable || 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;
+                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});
             }
-            if ( this.btnsComment && this.btnsComment.length > 0 )
-                this.btnsComment.setDisabled(need_disable);
+            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});
+            this.toolbar.lockToolbar(Common.enumLock.plainEditLock, plain_edit_lock,    {array: this.btnsComment});
+            this.toolbar.lockToolbar(Common.enumLock.richDelLock, rich_del_lock,        {array: this.btnsComment});
+            this.toolbar.lockToolbar(Common.enumLock.plainDelLock, plain_del_lock,      {array: this.btnsComment});
         },
 
         onApiFocusObject: function(selectedObjects) {
@@ -759,7 +762,8 @@ define([
                 btn_eq_state = false,
                 in_image = false,
                 in_control = false,
-                in_para = false;
+                in_para = false,
+                in_footnote = this.api.asc_IsCursorInFootnote() || this.api.asc_IsCursorInEndnote();
 
             while (++i < selectedObjects.length) {
                 type = selectedObjects[i].get_ObjectType();
@@ -802,17 +806,25 @@ define([
             var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : false,
                 rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : false,
                 plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : false,
-                plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : false;
-            var need_disable = paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock;
+                plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : false,
+                in_smart_art = shape_pr && shape_pr.asc_getFromSmartArt(),
+                in_smart_art_internal = shape_pr && shape_pr.asc_getFromSmartArtInternal();
 
-            if (this._state.prcontrolsdisable != need_disable) {
-                if (this._state.activated) this._state.prcontrolsdisable = need_disable;
-                _.each (toolbar.paragraphControls, function(item){
-                    item.setDisabled(need_disable);
-                }, this);
-            }
-            toolbar.btnDecLeftOffset.setDisabled(need_disable || shape_pr && shape_pr.asc_getFromSmartArtInternal());
-            toolbar.btnIncLeftOffset.setDisabled(need_disable || shape_pr && shape_pr.asc_getFromSmartArtInternal());
+            this.toolbar.lockToolbar(Common.enumLock.paragraphLock, paragraph_locked,   {array: this.toolbar.paragraphControls.concat([toolbar.btnContentControls, toolbar.btnClearStyle])});
+            this.toolbar.lockToolbar(Common.enumLock.headerLock,    header_locked,      {array: this.toolbar.paragraphControls.concat([toolbar.btnContentControls, toolbar.btnClearStyle, toolbar.btnWatermark])});
+            this.toolbar.lockToolbar(Common.enumLock.richEditLock,  rich_edit_lock,     {array: this.toolbar.paragraphControls.concat([toolbar.btnClearStyle])});
+            this.toolbar.lockToolbar(Common.enumLock.plainEditLock, plain_edit_lock,    {array: this.toolbar.paragraphControls.concat([toolbar.btnClearStyle])});
+
+            this.toolbar.lockToolbar(Common.enumLock.richDelLock, rich_del_lock,        {array: this.btnsComment.concat(toolbar.btnsPageBreak).concat([toolbar.btnInsertTable, toolbar.btnInsertImage, toolbar.btnInsertChart, toolbar.btnInsertTextArt,
+                                                                                    toolbar.btnInsDateTime, toolbar.btnBlankPage, toolbar.btnInsertEquation, toolbar.btnInsertSymbol ])});
+            this.toolbar.lockToolbar(Common.enumLock.plainDelLock, plain_del_lock,      {array: this.btnsComment.concat(toolbar.btnsPageBreak).concat([toolbar.btnInsertTable, toolbar.btnInsertImage, toolbar.btnInsertChart, toolbar.btnInsertTextArt,
+                                                                                    toolbar.btnInsDateTime, toolbar.btnBlankPage, toolbar.btnInsertEquation, toolbar.btnInsertSymbol ])});
+
+            this.toolbar.lockToolbar(Common.enumLock.inChart,       in_chart,           {array: toolbar.textOnlyControls.concat([toolbar.btnClearStyle, toolbar.btnInsertEquation])});
+            this.toolbar.lockToolbar(Common.enumLock.inSmartart,    in_smart_art,       {array: toolbar.textOnlyControls.concat([toolbar.btnClearStyle])});
+            this.toolbar.lockToolbar(Common.enumLock.inSmartartInternal, in_smart_art_internal,    {array: toolbar.textOnlyControls.concat([toolbar.btnClearStyle, toolbar.btnDecLeftOffset, toolbar.btnIncLeftOffset])});
+            this.toolbar.lockToolbar(Common.enumLock.inEquation,    in_equation,        {array: toolbar.btnsPageBreak.concat([toolbar.btnDropCap, toolbar.btnInsertTable, toolbar.btnBlankPage, toolbar.btnInsertShape,
+                    toolbar.btnInsertText, toolbar.btnInsertTextArt, toolbar.btnInsertImage, toolbar.btnSuperscript, toolbar.btnSubscript, toolbar.btnEditHeader])});
 
             in_control = this.api.asc_IsContentControl();
             var control_props = in_control ? this.api.asc_GetContentControlProperties() : null,
@@ -821,8 +833,7 @@ define([
             (lock_type===undefined) && (lock_type = Asc.c_oAscSdtLockType.Unlocked);
             var content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked;
 
-            toolbar.btnContentControls.setDisabled(paragraph_locked || header_locked);
-            if (!(paragraph_locked || header_locked)) {
+            if (!toolbar.btnContentControls.isDisabled()) {
                 var control_disable = control_plain || content_locked,
                     if_form = control_props && control_props.get_FormPr();
                 for (var i=0; i<7; i++)
@@ -831,18 +842,8 @@ define([
                 toolbar.btnContentControls.menu.items[10].setDisabled(!in_control || if_form);
             }
 
-            var need_text_disable = paragraph_locked || header_locked || in_chart || rich_edit_lock || plain_edit_lock || shape_pr && (shape_pr.asc_getFromSmartArt() || shape_pr.asc_getFromSmartArtInternal());
-            if (this._state.textonlycontrolsdisable != need_text_disable) {
-                if (this._state.activated) this._state.textonlycontrolsdisable = need_text_disable;
-                if (!need_disable) {
-                    _.each (toolbar.textOnlyControls, function(item){
-                        item.setDisabled(need_text_disable);
-                    }, this);
-                }
-                // toolbar.btnCopyStyle.setDisabled(need_text_disable);
-                toolbar.btnClearStyle.setDisabled(need_text_disable);
-            }
-
+            this.toolbar.lockToolbar(Common.enumLock.controlPlain, control_plain, {array: [toolbar.btnInsertTable, toolbar.btnInsertImage,  toolbar.btnInsertChart,  toolbar.btnInsertText, toolbar.btnInsertTextArt,
+                                                                                toolbar.btnInsertShape, toolbar.btnInsertEquation, toolbar.btnDropCap, toolbar.btnColumns, toolbar.mnuInsertPageNum ]});
             if (enable_dropcap && frame_pr) {
                 var value = frame_pr.get_FramePr(),
                     drop_value = Asc.c_oAscDropCap.None;
@@ -858,79 +859,49 @@ define([
                 if (enable_dropcap)
                     this.onDropCap(drop_value);
             }
-
-            need_disable = need_disable || !enable_dropcap || in_equation || control_plain;
-            toolbar.btnDropCap.setDisabled(need_disable);
-
+            this.toolbar.lockToolbar(Common.enumLock.dropcapLock, !enable_dropcap, {array: [toolbar.btnDropCap]});
             if ( !toolbar.btnDropCap.isDisabled() )
                 toolbar.mnuDropCapAdvanced.setDisabled(disable_dropcapadv);
 
-            need_disable = !can_add_table || header_locked || in_equation || control_plain || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock;
-            toolbar.btnInsertTable.setDisabled(need_disable);
-
-            need_disable = toolbar.mnuPageNumCurrentPos.isDisabled() && toolbar.mnuPageNumberPosPicker.isDisabled() || control_plain;
-            toolbar.mnuInsertPageNum.setDisabled(need_disable);
-
-            var in_footnote = this.api.asc_IsCursorInFootnote() || this.api.asc_IsCursorInEndnote();
-            need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock;
-            toolbar.btnsPageBreak.setDisabled(need_disable);
-            toolbar.btnBlankPage.setDisabled(need_disable);
-
-            need_disable = paragraph_locked || header_locked || in_equation || control_plain || content_locked || in_footnote;
-            toolbar.btnInsertShape.setDisabled(need_disable);
-            toolbar.btnInsertText.setDisabled(need_disable);
-
-            need_disable = paragraph_locked || header_locked  || in_para && !can_add_image || in_equation || control_plain || rich_del_lock || plain_del_lock || content_locked;
-            toolbar.btnInsertImage.setDisabled(need_disable);
-            toolbar.btnInsertTextArt.setDisabled(need_disable || in_footnote);
+            this.toolbar.lockToolbar(Common.enumLock.cantAddTable, !can_add_table, {array: [toolbar.btnInsertTable]});
+            this.toolbar.lockToolbar(Common.enumLock.cantAddPageNum, toolbar.mnuPageNumCurrentPos.isDisabled() && toolbar.mnuPageNumberPosPicker.isDisabled(), {array: [toolbar.mnuInsertPageNum]});
+            this.toolbar.lockToolbar(Common.enumLock.inHeader, in_header, {array: toolbar.btnsPageBreak.concat([toolbar.btnBlankPage])});
+            this.toolbar.lockToolbar(Common.enumLock.inControl, in_control, {array: toolbar.btnsPageBreak.concat([toolbar.btnBlankPage])});
+            this.toolbar.lockToolbar(Common.enumLock.cantPageBreak, in_image && !btn_eq_state, {array: toolbar.btnsPageBreak.concat([toolbar.btnBlankPage])});
+            this.toolbar.lockToolbar(Common.enumLock.contentLock, content_locked, {array: [toolbar.btnInsertShape, toolbar.btnInsertText, toolbar.btnInsertImage, toolbar.btnInsertTextArt, toolbar.btnInsertChart ]});
+            this.toolbar.lockToolbar(Common.enumLock.inFootnote, in_footnote, {array: toolbar.btnsPageBreak.concat([toolbar.btnBlankPage, toolbar.btnInsertShape, toolbar.btnInsertText, toolbar.btnInsertTextArt ])});
+            this.toolbar.lockToolbar(Common.enumLock.cantAddImagePara, in_para && !can_add_image, {array: [toolbar.btnInsertImage, toolbar.btnInsertTextArt]});
 
             if (in_chart !== this._state.in_chart) {
                 toolbar.btnInsertChart.updateHint(in_chart ? toolbar.tipChangeChart : toolbar.tipInsertChart);
                 this._state.in_chart = in_chart;
             }
+            var need_disable = paragraph_locked || header_locked || in_equation || control_plain || rich_del_lock || plain_del_lock  || content_locked || in_para && !can_add_image;
+            need_disable = !in_chart && need_disable;
+            this.toolbar.lockToolbar(Common.enumLock.cantAddChart, need_disable, {array: [toolbar.btnInsertChart]});
+            this.toolbar.lockToolbar(Common.enumLock.chartLock, in_chart && image_locked, {array: [toolbar.btnInsertChart]});
 
-            need_disable = in_chart && image_locked || !in_chart && need_disable || control_plain || rich_del_lock || plain_del_lock || content_locked;
-            toolbar.btnInsertChart.setDisabled(need_disable);
-
-            need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation || control_plain || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock;
-            toolbar.btnInsertEquation.setDisabled(need_disable);
-
-            toolbar.btnInsertSymbol.setDisabled(!in_para || paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock);
-            toolbar.btnInsDateTime.setDisabled(!in_para || paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock);
-
-            need_disable = paragraph_locked || header_locked || in_equation || rich_edit_lock || plain_edit_lock;
-            toolbar.btnSuperscript.setDisabled(need_disable);
-            toolbar.btnSubscript.setDisabled(need_disable);
-
-            toolbar.btnEditHeader.setDisabled(in_equation);
-
-            need_disable = paragraph_locked || header_locked || in_image || control_plain || rich_edit_lock || plain_edit_lock || this._state.lock_doc;
-            if (need_disable != toolbar.btnColumns.isDisabled())
-                toolbar.btnColumns.setDisabled(need_disable);
-
-            toolbar.btnLineNumbers.setDisabled(in_image && in_para || this._state.lock_doc);
+            this.toolbar.lockToolbar(Common.enumLock.cantAddEquation, !can_add_image&&!in_equation, {array: [toolbar.btnInsertEquation]});
+            this.toolbar.lockToolbar(Common.enumLock.noParagraphSelected, !in_para, {array: [toolbar.btnInsertSymbol, toolbar.btnInsDateTime]});
+            this.toolbar.lockToolbar(Common.enumLock.inImage, in_image, {array: [toolbar.btnColumns]});
+            this.toolbar.lockToolbar(Common.enumLock.inImagePara, in_image && in_para, {array: [toolbar.btnLineNumbers]});
 
             if (toolbar.listStylesAdditionalMenuItem && (frame_pr===undefined) !== toolbar.listStylesAdditionalMenuItem.isDisabled())
                 toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined);
 
-            need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked || rich_del_lock || rich_edit_lock || plain_del_lock || plain_edit_lock;
-            if (this.mode.compatibleFeatures) {
-                need_disable = need_disable || in_image;
-            }
+            // comments
+            this.toolbar.lockToolbar(Common.enumLock.cantAddQuotedComment, !this.api.can_AddQuotedComment(), {array: this.btnsComment});
+            this.toolbar.lockToolbar(Common.enumLock.imageLock, image_locked, {array: this.btnsComment});
+            this.mode.compatibleFeatures && this.toolbar.lockToolbar(Common.enumLock.inImage, in_image,      {array: this.btnsComment});
             if (control_props) {
                 var spectype = control_props.get_SpecificType();
-                need_disable = need_disable || 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;
+                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});
             }
-            if ( this.btnsComment && this.btnsComment.length > 0 )
-                this.btnsComment.setDisabled(need_disable);
-
-            toolbar.btnWatermark.setDisabled(header_locked);
-
             if (frame_pr) {
                 this._state.suppress_num = !!frame_pr.get_SuppressLineNumbers();
             }
-
             this._state.in_equation = in_equation;
         },
 
@@ -973,38 +944,34 @@ define([
 
         onApiLockDocumentProps: function() {
             if (this._state.lock_doc!==true) {
-                this.toolbar.btnPageOrient.setDisabled(true);
-                this.toolbar.btnPageSize.setDisabled(true);
-                this.toolbar.btnPageMargins.setDisabled(true);
+                this.toolbar.lockToolbar(Common.enumLock.docPropsLock, true, {array: [this.toolbar.btnPageOrient, this.toolbar.btnPageSize, this.toolbar.btnPageMargins, this.toolbar.btnColumns, this.toolbar.btnLineNumbers]});
                 if (this._state.activated) this._state.lock_doc = true;
             }
         },
 
         onApiUnLockDocumentProps: function() {
             if (this._state.lock_doc!==false) {
-                this.toolbar.btnPageOrient.setDisabled(false);
-                this.toolbar.btnPageSize.setDisabled(false);
-                this.toolbar.btnPageMargins.setDisabled(false);
+                this.toolbar.lockToolbar(Common.enumLock.docPropsLock, false, {array: [this.toolbar.btnPageOrient, this.toolbar.btnPageSize, this.toolbar.btnPageMargins, this.toolbar.btnColumns, this.toolbar.btnLineNumbers]});
                 if (this._state.activated) this._state.lock_doc = false;
             }
         },
 
         onApiLockDocumentSchema: function() {
-            this.toolbar.btnColorSchemas.setDisabled(true);
+            this.toolbar.lockToolbar(Common.enumLock.docSchemaLock, true, {array: [this.toolbar.btnColorSchemas]});
         },
 
         onApiUnLockDocumentSchema: function() {
-            this.toolbar.btnColorSchemas.setDisabled(false);
+            this.toolbar.lockToolbar(Common.enumLock.docSchemaLock, false, {array: [this.toolbar.btnColorSchemas]});
         },
 
         onApiLockHeaderFooters: function() {
-            this.toolbar.mnuPageNumberPosPicker.setDisabled(true);
-            this.toolbar.mnuInsertPageNum.setDisabled(this.toolbar.mnuPageNumCurrentPos.isDisabled());
+            this.toolbar.lockToolbar(Common.enumLock.headerFooterLock, true, {array: [this.toolbar.mnuPageNumberPosPicker]});
+            this.toolbar.lockToolbar(Common.enumLock.cantAddPageNum, this.toolbar.mnuPageNumCurrentPos.isDisabled(), {array: [this.toolbar.mnuInsertPageNum]});
         },
 
         onApiUnLockHeaderFooters: function() {
-            this.toolbar.mnuPageNumberPosPicker.setDisabled(false);
-            this.toolbar.mnuInsertPageNum.setDisabled(false);
+            this.toolbar.lockToolbar(Common.enumLock.headerFooterLock, false, {array: [this.toolbar.mnuPageNumberPosPicker]});
+            this.toolbar.lockToolbar(Common.enumLock.cantAddPageNum, false, {array: [this.toolbar.mnuInsertPageNum]});
         },
 
         onApiZoomChange: function(percent, type) {},
@@ -2903,15 +2870,12 @@ define([
         },
 
         activateControls: function() {
-            _.each(this.toolbar.toolbarControls, function(item){
-                item.setDisabled(false);
-            }, this);
-            this.toolbar.btnUndo.setDisabled(this._state.can_undo!==true);
-            this.toolbar.btnRedo.setDisabled(this._state.can_redo!==true);
-            this.toolbar.btnCopy.setDisabled(this._state.can_copycut!==true);
-            this.toolbar.btnPrint.setDisabled(!this.toolbar.mode.canPrint);
+            this.toolbar.lockToolbar(Common.enumLock.disableOnStart, false);
+            this.toolbar.lockToolbar(Common.enumLock.undoLock, this._state.can_undo!==true, {array: [this.toolbar.btnUndo]});
+            this.toolbar.lockToolbar(Common.enumLock.redoLock, this._state.can_redo!==true, {array: [this.toolbar.btnRedo]});
+            this.toolbar.lockToolbar(Common.enumLock.copyLock, this._state.can_copycut!==true, {array: [this.toolbar.btnCopy]});
+            this.toolbar.lockToolbar(Common.enumLock.mmergeLock, !!this._state.mmdisable, {array: [this.toolbar.btnMailRecepients]});
             if (!this._state.mmdisable) {
-                this.toolbar.btnMailRecepients.setDisabled(false);
                 this.toolbar.mnuMailRecepients.items[2].setVisible(this.toolbar.mode.fileChoiceUrl || this.toolbar.mode.canRequestMailMergeRecipients);
             }
             this._state.activated = true;
@@ -2922,7 +2886,7 @@ define([
 
         DisableMailMerge: function() {
             this._state.mmdisable = true;
-            this.toolbar && this.toolbar.btnMailRecepients && this.toolbar.btnMailRecepients.setDisabled(true);
+            this.toolbar && this.toolbar.btnMailRecepients && this.toolbar.lockToolbar(Common.enumLock.mmergeLock, true, {array: [this.toolbar.btnMailRecepients]});
         },
 
         updateThemeColors: function() {
@@ -3082,38 +3046,22 @@ define([
             if (disable && mask.length>0 || !disable && mask.length==0) return;
 
             var toolbar = this.toolbar;
+            toolbar.hideMoreBtns();
+            if (reviewmode)
+                toolbar.lockToolbar(Common.enumLock.previewReviewMode, disable);
+            else if (fillformmode)
+                toolbar.lockToolbar(Common.enumLock.viewFormMode, disable);
+
             if(disable) {
-                if (reviewmode) {
-                    mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group:not(.no-mask):not(.no-group-mask.review):not(.no-group-mask.inner-elset)'));
-                    mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group.no-group-mask.inner-elset .elset'));
-                } else if (fillformmode) {
-                    mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group:not(.no-mask):not(.no-group-mask.form-view):not(.no-group-mask.inner-elset)'));
-                    mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar section.panel .group.no-group-mask.inner-elset .elset:not(.no-group-mask.form-view)'));
-                } else
+                if (reviewmode || fillformmode)
+                    mask = $("<div class='toolbar-group-mask'>").appendTo(toolbar.$el.find('.toolbar'));
+                else
                     mask = $("<div class='toolbar-mask'>").appendTo(toolbar.$el.find('.toolbar'));
             } else {
                 mask.remove();
             }
-            $('.no-group-mask').each(function(index, item){
-                var $el = $(item);
-                if ($el.find('> .toolbar-group-mask').length>0)
-                    $el.css('opacity', 0.4);
-                else {
-                    $el.css('opacity', reviewmode || fillformmode || !disable ? 1 : 0.4);
-                    $el.find('.elset').each(function(index, elitem){
-                        var $elset = $(elitem);
-                        if ($elset.find('> .toolbar-group-mask').length>0) {
-                            $elset.css('opacity', 0.4);
-                        } else {
-                            $elset.css('opacity', reviewmode || fillformmode || !disable ? 1 : 0.4);
-                        }
-                        $el.css('opacity', 1);
-                    });
-                }
-            });
-
+            toolbar.$el.find('.toolbar').toggleClass('masked', $('.toolbar-mask').length>0);
             disable = disable || ((reviewmode || fillformmode) ? toolbar_mask.length>0 : group_mask.length>0);
-            toolbar.$el.find('.toolbar').toggleClass('masked', disable);
             if ( toolbar.synchTooltip )
                 toolbar.synchTooltip.hide();
 
@@ -3235,11 +3183,11 @@ define([
 
                 var links = me.getApplication().getController('Links');
                 links.setApi(me.api).setConfig({toolbar: me});
-                Array.prototype.push.apply(me.toolbar.toolbarControls, links.getView('Links').getButtons());
+                Array.prototype.push.apply(me.toolbar.lockControls, links.getView('Links').getButtons());
 
                 var viewtab = me.getApplication().getController('ViewTab');
                 viewtab.setApi(me.api).setConfig({toolbar: me, mode: config});
-                Array.prototype.push.apply(me.toolbar.toolbarControls, viewtab.getView('ViewTab').getButtons());
+                Array.prototype.push.apply(me.toolbar.lockControls, viewtab.getView('ViewTab').getButtons());
             }
             if ( config.isEdit && config.canFeatureContentControl && config.canFeatureForms || config.isRestrictedEdit && config.canFillForms ) {
                 if (config.isFormCreator) {
@@ -3250,7 +3198,7 @@ define([
                     if ($panel) {
                         me.toolbar.addTab(tab, $panel, 4);
                         me.toolbar.setVisible('forms', true);
-                        config.isEdit && config.canFeatureContentControl && config.canFeatureForms && Array.prototype.push.apply(me.toolbar.toolbarControls, forms.getView('FormsTab').getButtons());
+                        config.isEdit && config.canFeatureContentControl && config.canFeatureForms && Array.prototype.push.apply(me.toolbar.lockControls, forms.getView('FormsTab').getButtons());
                         !compactview && (config.isFormCreator || config.isRestrictedEdit && config.canFillForms) && me.toolbar.setTab('forms');
                     }
                 }
@@ -3263,7 +3211,11 @@ define([
             me.appOptions = config;
 
             if ( config.canCoAuthoring && config.canComments ) {
-                this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-menu-comments', this.toolbar.capBtnComment, undefined, undefined, undefined, undefined, '1', 'bottom');
+                this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-menu-comments', this.toolbar.capBtnComment,
+                            [  Common.enumLock.paragraphLock, Common.enumLock.headerLock, Common.enumLock.richEditLock, Common.enumLock.plainEditLock, Common.enumLock.richDelLock, Common.enumLock.plainDelLock,
+                                    Common.enumLock.cantAddQuotedComment, Common.enumLock.imageLock, Common.enumLock.inSpecificForm, Common.enumLock.inImage, Common.enumLock.lostConnect, Common.enumLock.disableOnStart,
+                                    Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode ],
+                                 undefined, undefined, undefined, '1', 'bottom');
                 if ( this.btnsComment.length ) {
                     var _comments = DE.getController('Common.Controllers.Comments').getView();
                     this.btnsComment.forEach(function (btn) {
@@ -3275,6 +3227,8 @@ define([
                             btn.setCaption(me.toolbar.capBtnAddComment);
                     }, this);
                 }
+                Array.prototype.push.apply(this.toolbar.paragraphControls, this.btnsComment);
+                Array.prototype.push.apply(this.toolbar.lockControls, this.btnsComment);
             }
 
             (new Promise(function(accept) {

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

@@ -72,12 +72,22 @@ define([
         },
 
         setConfig: function(config) {
+            var mode = config.mode;
             this.toolbar = config.toolbar;
             this.view = this.createView('ViewTab', {
                 toolbar: this.toolbar.toolbar,
-                mode: config.mode,
+                mode: mode,
                 compactToolbar: this.toolbar.toolbar.isCompactView
             });
+            if (mode.canBrandingExt && mode.customization && mode.customization.statusBar === false || !Common.UI.LayoutManager.isElementVisible('statusBar')) {
+                this.view.chStatusbar.$el.remove();
+                var slotChkRulers = this.view.chRulers.$el,
+                    groupRulers = slotChkRulers.closest('.group'),
+                    groupToolbar = this.view.chToolbar.$el.closest('.group');
+                groupToolbar.find('.elset')[1].append(slotChkRulers[0]);
+                groupRulers.remove();
+                this.view.cmpEl.find('.separator-rulers').remove();
+            }
             this.addListeners({
                 'ViewTab': {
                     'zoom:topage': _.bind(this.onBtnZoomTo, this, 'topage'),
@@ -151,12 +161,12 @@ define([
                         me.view.btnInterfaceTheme.menu.on('item:click', _.bind(function (menu, item) {
                             var value = item.value;
                             Common.UI.Themes.setTheme(value);
-                            me.view.btnDarkDocument.setDisabled(!Common.UI.Themes.isDarkTheme());
+                            Common.Utils.lockControls(Common.enumLock.inLightTheme, !Common.UI.Themes.isDarkTheme(), {array: [me.view.btnDarkDocument]});
                         }, me));
 
                         setTimeout(function () {
                             me.onContentThemeChangedToDark(Common.UI.Themes.isContentThemeDark());
-                            me.view.btnDarkDocument.setDisabled(!Common.UI.Themes.isDarkTheme());
+                            Common.Utils.lockControls(Common.enumLock.inLightTheme, !Common.UI.Themes.isDarkTheme(), {array: [me.view.btnDarkDocument]});
                         }, 0);
                     }
                 });
@@ -216,9 +226,9 @@ define([
         },
 
         onChangeRulers: function (btn, checked) {
-            this.api.asc_SetViewRulers(checked);
             Common.localStorage.setBool('de-hidden-rulers', !checked);
             Common.Utils.InternalSettings.set("de-hidden-rulers", !checked);
+            this.api.asc_SetViewRulers(checked);
             this.view.fireEvent('rulers:hide', [!checked]);
             Common.NotificationCenter.trigger('layout:changed', 'rulers');
             Common.NotificationCenter.trigger('edit:complete', this.view);
@@ -238,7 +248,7 @@ define([
                     menu_item = _.findWhere(this.view.btnInterfaceTheme.menu.items, {value: current_theme});
                 this.view.btnInterfaceTheme.menu.clearAll();
                 menu_item.setChecked(true, true);
-                this.view.btnDarkDocument.setDisabled(!Common.UI.Themes.isDarkTheme());
+                Common.Utils.lockControls(Common.enumLock.inLightTheme, !Common.UI.Themes.isDarkTheme(), {array: [this.view.btnDarkDocument]});
             }
         },
 

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

@@ -171,7 +171,7 @@ define([
 
             var _intvars = Common.Utils.InternalSettings;
             var $filemenu = $('.toolbar-fullview-panel');
-            $filemenu.css('top', _intvars.get('toolbar-height-tabs'));
+            $filemenu.css('top', Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs') : 0);
 
             me.viewport.$el.attr('applang', me.appConfig.lang.split(/[\-_]/)[0]);
 
@@ -205,7 +205,7 @@ define([
                 _intvars.set('toolbar-height-compact', _tabs_new_height);
                 _intvars.set('toolbar-height-normal', _tabs_new_height + _intvars.get('toolbar-height-controls'));
 
-                $filemenu.css('top', _tabs_new_height + _intvars.get('document-title-height'));
+                $filemenu.css('top', (Common.UI.LayoutManager.isElementVisible('toolbar') ? _tabs_new_height : 0) + _intvars.get('document-title-height'));
 
                 toolbar = me.getApplication().getController('Toolbar').getView();
                 toolbar.btnCollabChanges = me.header.btnSave;
@@ -246,7 +246,7 @@ define([
                     value: 'statusbar'
                 });
 
-                if ( config.canBrandingExt && config.customization && config.customization.statusBar === false )
+                if ( config.canBrandingExt && config.customization && config.customization.statusBar === false || !Common.UI.LayoutManager.isElementVisible('statusBar'))
                     me.header.mnuitemHideStatusBar.hide();
 
                 me.header.mnuitemHideRulers = new Common.UI.MenuItem({
@@ -424,9 +424,9 @@ define([
             case 'toolbar': me.header.fireEvent('toolbar:setcompact', [menu, item.isChecked()]); break;
             case 'statusbar': me.header.fireEvent('statusbar:hide', [item, item.isChecked()]); break;
             case 'rulers':
-                me.api.asc_SetViewRulers(!item.isChecked());
                 Common.localStorage.setBool('de-hidden-rulers', item.isChecked());
                 Common.Utils.InternalSettings.set("de-hidden-rulers", item.isChecked());
+                me.api.asc_SetViewRulers(!item.isChecked());
                 Common.NotificationCenter.trigger('layout:changed', 'rulers');
                 Common.NotificationCenter.trigger('edit:complete', me.header);
                 me.header.fireEvent('rulers:hide', [item.isChecked()]);

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

@@ -78,7 +78,7 @@
                         <span class="btn-slot" id="slot-btn-mailrecepients" data-layout-name="toolbar-home-mailmerge"></span>
                     </div>
                 </div>
-                <div class="group small" id="slot-field-styles"></div>
+                <div class="group small flex field-styles" id="slot-field-styles" style="min-width: 160px;width: 100%; " data-group-width="100%"></div>
             </section>
             <section class="panel" data-tab="ins">
                 <div class="group">
@@ -202,14 +202,14 @@
                 </div>
                 <div class="separator long"></div>
                 <div class="group small">
-                    <div class="elset">
-                        <span class="btn-slot text" id="slot-chk-statusbar"></span>
-                    </div>
                     <div class="elset">
                         <span class="btn-slot text" id="slot-chk-toolbar"></span>
                     </div>
+                    <div class="elset">
+                        <span class="btn-slot text" id="slot-chk-statusbar"></span>
+                    </div>
                 </div>
-                <div class="separator long"></div>
+                <div class="separator long separator-rulers"></div>
                 <div class="group small">
                     <div class="elset">
                         <span class="btn-slot text" id="slot-chk-rulers"></span>

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

@@ -4,7 +4,7 @@
             <div id="file-menu-panel" class="toolbar-fullview-panel hint-section" style="display:none;"></div>
         </section>
         <section id="app-title" class="layout-item"></section>
-        <div id="toolbar" class="layout-item hint-section"></div>
+        <div id="toolbar" class="layout-item hint-section" data-layout-name="toolbar"></div>
         <div class="layout-item middle">
             <div id="viewport-hbox-layout" class="layout-ct hbox">
                 <div id="left-menu" class="layout-item hint-section" data-layout-name="leftMenu" style="width: 40px;"></div>
@@ -14,6 +14,6 @@
                 <div id="left-panel-history" class="layout-item"></div>
             </div>
         </div>
-        <div id="statusbar" class="layout-item"></div>
+        <div id="statusbar" class="layout-item" data-layout-name="statusBar"></div>
     </div>
 </div>

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

@@ -683,7 +683,7 @@ define([
                     me._arrSpecialPaste[Asc.c_oSpecialPasteProps.overwriteCells] = me.txtOverwriteCells;
 
                     pasteContainer = $('<div id="special-paste-container" style="position: absolute;"><div id="id-document-holder-btn-special-paste"></div></div>');
-                    me.cmpEl.append(pasteContainer);
+                    me.cmpEl.find('#id_main_view').append(pasteContainer);
 
                     me.btnSpecialPaste = new Common.UI.Button({
                         parentEl: $('#id-document-holder-btn-special-paste'),
@@ -719,6 +719,9 @@ define([
                     if (pasteContainer.is(':visible')) pasteContainer.hide();
                 } else {
                     var showPoint = [coord.asc_getX() + coord.asc_getWidth() + 3, coord.asc_getY() + coord.asc_getHeight() + 3];
+                    if (!Common.Utils.InternalSettings.get("de-hidden-rulers")) {
+                        showPoint = [showPoint[0] - 19, showPoint[1] - 26];
+                    }
                     pasteContainer.css({left: showPoint[0], top : showPoint[1]});
                     pasteContainer.show();
                 }
@@ -1616,7 +1619,7 @@ define([
                     : Common.util.Shortcuts.resumeEvents(hkComments);
                 /** coauthoring end **/
                 this.editorConfig = {user: m.user};
-                this._fillFormwMode = !this.mode.isEdit && this.mode.canFillForms;
+                this._fillFormMode = !this.mode.isEdit && this.mode.canFillForms;
             };
 
             me.on('render:after', onAfterRender, me);
@@ -1637,22 +1640,22 @@ define([
                     this.menuImageWrap.menu.items[0].setChecked(true);
                     break;
                 case Asc.c_oAscWrapStyle2.Square:
-                    this.menuImageWrap.menu.items[1].setChecked(true);
-                    break;
-                case Asc.c_oAscWrapStyle2.Tight:
                     this.menuImageWrap.menu.items[2].setChecked(true);
                     break;
-                case Asc.c_oAscWrapStyle2.Through:
+                case Asc.c_oAscWrapStyle2.Tight:
                     this.menuImageWrap.menu.items[3].setChecked(true);
                     break;
-                case Asc.c_oAscWrapStyle2.TopAndBottom:
+                case Asc.c_oAscWrapStyle2.Through:
                     this.menuImageWrap.menu.items[4].setChecked(true);
                     break;
+                case Asc.c_oAscWrapStyle2.TopAndBottom:
+                    this.menuImageWrap.menu.items[5].setChecked(true);
+                    break;
                 case Asc.c_oAscWrapStyle2.Behind:
-                    this.menuImageWrap.menu.items[6].setChecked(true);
+                    this.menuImageWrap.menu.items[8].setChecked(true);
                     break;
                 case Asc.c_oAscWrapStyle2.InFront:
-                    this.menuImageWrap.menu.items[5].setChecked(true);
+                    this.menuImageWrap.menu.items[7].setChecked(true);
                     break;
             }
         },
@@ -2095,9 +2098,9 @@ define([
                     var disabled = value.paraProps && value.paraProps.locked === true;
                     var cancopy = me.api && me.api.can_CopyCut();
                     menuViewCopy.setDisabled(!cancopy);
-                    menuViewCut.setVisible(me._fillFormwMode && canEditControl);
+                    menuViewCut.setVisible(me._fillFormMode && canEditControl);
                     menuViewCut.setDisabled(disabled || !cancopy);
-                    menuViewPaste.setVisible(me._fillFormwMode && canEditControl);
+                    menuViewPaste.setVisible(me._fillFormMode && canEditControl);
                     menuViewPaste.setDisabled(disabled);
                     menuViewPrint.setVisible(me.mode.canPrint);
                     menuViewPrint.setDisabled(!cancopy);
@@ -2329,6 +2332,7 @@ define([
                                 checkmark   : false,
                                 checkable   : true
                             }).on('click', onItemClick),
+                            { caption: '--' },
                             new Common.UI.MenuItem({
                                 caption     : me.txtSquare,
                                 iconCls     : 'menu__icon wrap-square',
@@ -2361,6 +2365,7 @@ define([
                                 checkmark   : false,
                                 checkable   : true
                             }).on('click', onItemClick),
+                            { caption: '--' },
                             new Common.UI.MenuItem({
                                 caption     : me.txtInFront,
                                 iconCls     : 'menu__icon wrap-infront',
@@ -2616,7 +2621,7 @@ define([
 
                     var cls = 'menu__icon ';
                     if (notflow) {
-                        for (var i = 0; i < 6; i++) {
+                        for (var i = 0; i < 8; i++) {
                             me.menuImageWrap.menu.items[i].setChecked(false);
                         }
                         cls += 'wrap-inline';
@@ -2627,31 +2632,31 @@ define([
                                 cls += 'wrap-inline';
                                 break;
                             case Asc.c_oAscWrapStyle2.Square:
-                                me.menuImageWrap.menu.items[1].setChecked(true);
+                                me.menuImageWrap.menu.items[2].setChecked(true);
                                 cls += 'wrap-square';
                                 break;
                             case Asc.c_oAscWrapStyle2.Tight:
-                                me.menuImageWrap.menu.items[2].setChecked(true);
+                                me.menuImageWrap.menu.items[3].setChecked(true);
                                 cls += 'wrap-tight';
                                 break;
                             case Asc.c_oAscWrapStyle2.Through:
-                                me.menuImageWrap.menu.items[3].setChecked(true);
+                                me.menuImageWrap.menu.items[4].setChecked(true);
                                 cls += 'wrap-through';
                                 break;
                             case Asc.c_oAscWrapStyle2.TopAndBottom:
-                                me.menuImageWrap.menu.items[4].setChecked(true);
+                                me.menuImageWrap.menu.items[5].setChecked(true);
                                 cls += 'wrap-topandbottom';
                                 break;
                             case Asc.c_oAscWrapStyle2.Behind:
-                                me.menuImageWrap.menu.items[6].setChecked(true);
+                                me.menuImageWrap.menu.items[8].setChecked(true);
                                 cls += 'wrap-behind';
                                 break;
                             case Asc.c_oAscWrapStyle2.InFront:
-                                me.menuImageWrap.menu.items[5].setChecked(true);
+                                me.menuImageWrap.menu.items[7].setChecked(true);
                                 cls += 'wrap-infront';
                                 break;
                             default:
-                                for (var i = 0; i < 6; i++) {
+                                for (var i = 0; i < 8; i++) {
                                     me.menuImageWrap.menu.items[i].setChecked(false);
                                 }
                                 cls += 'wrap-infront';
@@ -4505,10 +4510,10 @@ define([
             _.defer(function(){  me.cmpEl.focus(); }, 50);
         },
 
-        SetDisabled: function(state, canProtect, fillFormwMode) {
+        SetDisabled: function(state, canProtect, fillFormMode) {
             this._isDisabled = state;
             this._canProtect = canProtect;
-            this._fillFormwMode = state ? fillFormwMode : false;
+            this._fillFormMode = state ? fillFormMode : false;
         },
 
         alignmentText           : 'Alignment',

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

@@ -142,6 +142,7 @@ define([
                 this.paragraphControls = [];
 
                 var me = this;
+                var _set = Common.enumLock;
 
                 if (this.appConfig.isRestrictedEdit && this.appConfig.canFillForms) {
                     this.btnClear = new Common.UI.Button({
@@ -153,8 +154,8 @@ define([
                     this.btnTextField = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-text-field',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: this.capBtnText,
-                        disabled: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
@@ -164,8 +165,8 @@ define([
                     this.btnComboBox = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-combo-box',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: this.capBtnComboBox,
-                        disabled: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
@@ -175,8 +176,8 @@ define([
                     this.btnDropDown = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-dropdown',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: this.capBtnDropDown,
-                        disabled: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
@@ -186,8 +187,8 @@ define([
                     this.btnCheckBox = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-checkbox',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: this.capBtnCheckBox,
-                        disabled: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
@@ -197,8 +198,8 @@ define([
                     this.btnRadioBox = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-radio-button',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: this.capBtnRadioBox,
-                        disabled: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
@@ -208,8 +209,8 @@ define([
                     this.btnImageField = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-insertimage',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: this.capBtnImage,
-                        disabled: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
@@ -219,9 +220,9 @@ define([
                     this.btnViewForm = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-sheet-view',
+                        lock: [ _set.previewReviewMode, _set.lostConnect, _set.disableOnStart],
                         caption: this.capBtnView,
                         enableToggle: true,
-                        disabled: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
@@ -231,8 +232,8 @@ define([
                     this.btnClearFields = new Common.UI.Button({
                         cls         : 'btn-toolbar',
                         iconCls     : 'toolbar__icon btn-clearstyle',
+                        lock: [ _set.previewReviewMode, _set.lostConnect, _set.disableOnStart],
                         caption     : this.textClearFields,
-                        disabled: true,
                         dataHint    : '1',
                         dataHintDirection: 'left',
                         dataHintOffset: 'small'
@@ -242,9 +243,9 @@ define([
                     this.btnHighlight = new Common.UI.ButtonColored({
                         cls         : 'btn-toolbar',
                         iconCls     : 'toolbar__icon btn-highlight',
+                        lock: [ _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption     : this.textHighlight,
                         menu        : true,
-                        disabled: true,
                         additionalItems: [ this.mnuNoFormsColor = new Common.UI.MenuItem({
                                               id: 'id-toolbar-menu-no-highlight-form',
                                               caption: this.textNoHighlight,
@@ -268,8 +269,9 @@ define([
                 this.btnPrevForm = new Common.UI.Button({
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon previous-field',
+                    lock: [ _set.previewReviewMode, _set.lostConnect, _set.disableOnStart],
                     caption: this.capBtnPrev,
-                    disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode
+                    // disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -279,8 +281,9 @@ define([
                 this.btnNextForm = new Common.UI.Button({
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon next-field',
+                    lock: [ _set.previewReviewMode, _set.lostConnect, _set.disableOnStart],
                     caption: this.capBtnNext,
-                    disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode,
+                    // disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode,
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -291,8 +294,9 @@ define([
                     this.btnSubmit = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon submit-form',
+                        lock: [_set.lostConnect, _set.disableOnStart],
                         caption: this.capBtnSubmit,
-                        disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode,
+                        // disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
@@ -302,16 +306,17 @@ define([
                 if (this.appConfig.canDownloadForms) {
                     this.btnSaveForm = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
+                        lock: [_set.lostConnect, _set.disableOnStart],
                         iconCls: 'toolbar__icon save-form',
                         caption: this.capBtnSaveForm,
-                        disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode,
+                        // disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
                     });
                     this.paragraphControls.push(this.btnSaveForm);
                 }
-
+                Common.Utils.lockControls(Common.enumLock.disableOnStart, true, {array: this.paragraphControls});
                 this._state = {disabled: false};
                 Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
             },

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

@@ -157,23 +157,29 @@ define([
                 this.btnsPrevEndNote = [];
                 this.btnsNextEndNote = [];
                 this.paragraphControls = [];
-
+                var _set = Common.enumLock;
                 var me = this,
                     $host = me.toolbar.$el;
 
-                this.btnsContents = Common.Utils.injectButtons($host.find('.btn-slot.btn-contents'), '', 'toolbar__icon btn-contents', me.capBtnInsContents, undefined, true, true, undefined, '1', 'bottom', 'small');
-                this.btnsNotes = Common.Utils.injectButtons($host.find('.btn-slot.slot-notes'), '', 'toolbar__icon btn-notes', me.capBtnInsFootnote, undefined, true, true, undefined, '1', 'bottom', 'small');
-                this.btnsHyperlink = Common.Utils.injectButtons($host.find('.btn-slot.slot-inshyperlink'), '', 'toolbar__icon btn-inserthyperlink', me.capBtnInsLink, undefined, undefined, undefined, undefined, '1', 'bottom', 'small');
+                this.btnsContents = Common.Utils.injectButtons($host.find('.btn-slot.btn-contents'), '', 'toolbar__icon btn-contents', me.capBtnInsContents,
+                    [_set.inHeader, _set.richEditLock, _set.plainEditLock, _set.richDelLock, _set.plainDelLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
+                    true, true, undefined, '1', 'bottom', 'small');
+                this.btnsNotes = Common.Utils.injectButtons($host.find('.btn-slot.slot-notes'), '', 'toolbar__icon btn-notes', me.capBtnInsFootnote,
+                    [_set.paragraphLock, _set.inEquation, _set.inImage, _set.inHeader, _set.controlPlain, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
+                    true, true, undefined, '1', 'bottom', 'small');
+                this.btnsHyperlink = Common.Utils.injectButtons($host.find('.btn-slot.slot-inshyperlink'), '', 'toolbar__icon btn-inserthyperlink', me.capBtnInsLink,
+                    [_set.paragraphLock, _set.headerLock, _set.hyperlinkLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
+                    undefined, undefined, undefined, '1', 'bottom', 'small');
                 Array.prototype.push.apply(this.paragraphControls, this.btnsContents.concat(this.btnsNotes, this.btnsHyperlink));
 
                 this.btnContentsUpdate = new Common.UI.Button({
                     parentEl: $host.find('#slot-btn-contents-update'),
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-update',
+                    lock: [ _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                     caption: this.capBtnContentsUpdate,
                     split: true,
                     menu: true,
-                    disabled: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -184,8 +190,8 @@ define([
                     parentEl: $host.find('#slot-btn-bookmarks'),
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-bookmarks',
+                    lock: [_set.paragraphLock, _set.inHeader, _set.headerLock, _set.controlPlain, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                     caption: this.capBtnBookmarks,
-                    disabled: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -196,8 +202,8 @@ define([
                     parentEl: $host.find('#slot-btn-caption'),
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-caption',
+                    lock: [_set.inHeader, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                     caption: this.capBtnCaption,
-                    disabled: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -208,8 +214,8 @@ define([
                     parentEl: $host.find('#slot-btn-crossref'),
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-cross-reference',
+                    lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.richEditLock, _set.plainEditLock, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                     caption: this.capBtnCrossRef,
-                    disabled: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -220,8 +226,8 @@ define([
                     parentEl: $host.find('#slot-btn-tof'),
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-contents',
+                    lock: [_set.inHeader, _set.richEditLock, _set.plainEditLock, _set.richDelLock, _set.plainDelLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                     caption: this.capBtnTOF,
-                    disabled: true,
                     dataHint: '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'medium'
@@ -232,14 +238,14 @@ define([
                     parentEl: $host.find('#slot-btn-tof-update'),
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-update',
+                    lock: [_set.paragraphLock, _set.inHeader, _set.richEditLock, _set.plainEditLock, _set.richDelLock, _set.plainDelLock, _set.cantUpdateTOF, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                     caption: this.capBtnContentsUpdate,
-                    disabled: true,
                     dataHint: '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'medium'
                 });
                 this.paragraphControls.push(this.btnTableFiguresUpdate);
-
+                Common.Utils.lockControls(Common.enumLock.disableOnStart, true, {array: this.paragraphControls});
                 this._state = {disabled: false};
                 Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
             },

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

@@ -840,7 +840,7 @@ define([
             Common.NotificationCenter.trigger('editing:disable', disable, {
                 viewMode: disable,
                 reviewMode: false,
-                fillFormwMode: false,
+                fillFormMode: false,
                 allowMerge: true,
                 allowSignature: false,
                 allowProtect: false,
@@ -855,7 +855,8 @@ define([
                 viewport: false,
                 documentHolder: true,
                 toolbar: true,
-                plugins: false
+                plugins: false,
+                protect: false
             }, 'mailmerge');
 
             this.lockControls(DE.enumLockMM.preview, disable, {array: [this.btnInsField, this.btnEditData]});

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

@@ -396,7 +396,7 @@ define([
                 Common.NotificationCenter.trigger('editing:disable', disable, {
                     viewMode: disable,
                     reviewMode: false,
-                    fillFormwMode: false,
+                    fillFormMode: false,
                     allowMerge: false,
                     allowSignature: true,
                     allowProtect: true,
@@ -411,7 +411,8 @@ define([
                     viewport: false,
                     documentHolder: true,
                     toolbar: true,
-                    plugins: false
+                    plugins: false,
+                    protect: false
                 }, 'signature');
             }
         },

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

@@ -39,6 +39,8 @@
  *  Copyright (c) 2018 Ascensio System SIA. All rights reserved.
  *
  */
+if (Common === undefined)
+    var Common = {};
 
 define([
     'jquery',
@@ -62,6 +64,64 @@ define([
 ], function ($, _, Backbone, template, template_view) {
     'use strict';
 
+    if (!Common.enumLock)
+        Common.enumLock = {};
+
+    var enumLock = {
+        undoLock:       'can-undo',
+        redoLock:       'can-redo',
+        copyLock:       'can-copy',
+        paragraphLock:  'para-lock',
+        headerLock:     'header-lock',
+        headerFooterLock: 'header-footer-lock',
+        chartLock:      'chart-lock',
+        imageLock:      'image-lock',
+        richEditLock:   'rich-edit-lock',
+        plainEditLock:  'plain-edit-lock',
+        richDelLock:    'rich-del-lock',
+        plainDelLock:   'plain-del-lock',
+        contentLock:    'content-lock',
+        mmergeLock:     'mmerge-lock',
+        dropcapLock:    'dropcap-lock',
+        docPropsLock:   'doc-props-lock',
+        docSchemaLock:  'doc-schema-lock',
+        hyperlinkLock:  'can-hyperlink',
+        inSmartart:     'in-smartart',
+        inSmartartInternal: 'in-smartart-internal',
+        inSpecificForm: 'in-specific-form',
+        inChart:        'in-chart',
+        inEquation:     'in-equation',
+        inHeader:       'in-header',
+        inImage:        'in-image',
+        inImagePara:    'in-image-para',
+        inImageInline:  'in-image-inline',
+        inFootnote:     'in-footnote',
+        inControl:      'in-control',
+        inLightTheme:   'light-theme',
+        controlPlain:   'control-plain',
+        noParagraphSelected:  'no-paragraph',
+        cantAddTable:   'cant-add-table',
+        cantAddQuotedComment: 'cant-add-quoted-comment',
+        cantPrint:      'cant-print',
+        cantAddImagePara: 'cant-add-image-para',
+        cantAddEquation: 'cant-add-equation',
+        cantAddChart:   'cant-add-chart',
+        cantAddPageNum: 'cant-add-page-num',
+        cantPageBreak:  'cant-page-break',
+        cantUpdateTOF:  'cant-update-tof',
+        cantGroup:      'cant-group',
+        cantWrap:       'cant-wrap',
+        cantArrange:    'cant-arrange',
+        noObjectSelected:  'no-object',
+        lostConnect:    'disconnect',
+        disableOnStart: 'on-start'
+    };
+    for (var key in enumLock) {
+        if (enumLock.hasOwnProperty(key)) {
+            Common.enumLock[key] = enumLock[key];
+        }
+    }
+
     DE.Views.Toolbar =  Common.UI.Mixtbar.extend(_.extend((function(){
 
         return {
@@ -104,7 +164,8 @@ define([
 
             applyLayout: function (config) {
                 var me = this;
-
+                me.lockControls = [];
+                var _set = Common.enumLock;
                 if ( config.isEdit ) {
                     Common.UI.Mixtbar.prototype.initialize.call(this, {
                             template: _.template(template),
@@ -127,6 +188,7 @@ define([
                         id: 'id-toolbar-btn-print',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-print no-mask',
+                        lock: [_set.cantPrint, _set.disableOnStart],
                         signals: ['disabled'],
                         dataHint: '1',
                         dataHintDirection: 'top',
@@ -138,6 +200,7 @@ define([
                         id: 'id-toolbar-btn-save',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon no-mask ' + this.btnSaveCls,
+                        lock: [_set.lostConnect, _set.disableOnStart],
                         signals: ['disabled'],
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -150,6 +213,7 @@ define([
                         id: 'id-toolbar-btn-undo',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-undo',
+                        lock: [_set.undoLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart],
                         signals: ['disabled'],
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -161,6 +225,7 @@ define([
                         id: 'id-toolbar-btn-redo',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-redo',
+                        lock: [_set.redoLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart],
                         signals: ['disabled'],
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -172,6 +237,7 @@ define([
                         id: 'id-toolbar-btn-copy',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-copy',
+                        lock: [_set.copyLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         dataHint: '1',
                         dataHintDirection: 'top',
                         dataHintTitle: 'C'
@@ -182,6 +248,7 @@ define([
                         id: 'id-toolbar-btn-paste',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-paste',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         dataHint: '1',
                         dataHintDirection: 'top',
                         dataHintTitle: 'V'
@@ -192,6 +259,7 @@ define([
                         id: 'id-toolbar-btn-incfont',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-incfont',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         dataHint: '1',
                         dataHintDirection: 'top'
                     });
@@ -201,6 +269,7 @@ define([
                         id: 'id-toolbar-btn-decfont',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-decfont',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         dataHint: '1',
                         dataHintDirection: 'top'
                     });
@@ -210,6 +279,7 @@ define([
                         id: 'id-toolbar-btn-bold',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-bold',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom'
@@ -220,6 +290,7 @@ define([
                         id: 'id-toolbar-btn-italic',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-italic',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom'
@@ -230,6 +301,7 @@ define([
                         id: 'id-toolbar-btn-underline',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-underline',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom'
@@ -240,6 +312,7 @@ define([
                         id: 'id-toolbar-btn-strikeout',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-strikeout',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom'
@@ -250,6 +323,7 @@ define([
                         id: 'id-toolbar-btn-superscript',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-superscript',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inEquation, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         toggleGroup: 'superscriptGroup',
                         dataHint: '1',
@@ -261,6 +335,7 @@ define([
                         id: 'id-toolbar-btn-subscript',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-subscript',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inEquation, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         toggleGroup: 'superscriptGroup',
                         dataHint: '1',
@@ -272,6 +347,8 @@ define([
                         id: 'id-toolbar-btn-highlight',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-highlight',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode,
+                                _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         allowDepress: true,
                         split: true,
@@ -297,6 +374,7 @@ define([
                         id: 'id-toolbar-btn-fontcolor',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-fontcolor',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         split: true,
                         menu: true,
                         auto: true,
@@ -310,6 +388,8 @@ define([
                         id: 'id-toolbar-btn-paracolor',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-paracolor',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode,
+                                _set.lostConnect, _set.disableOnStart],
                         split: true,
                         transparent: true,
                         menu: true,
@@ -324,6 +404,7 @@ define([
                         id: 'id-toolbar-btn-case',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-change-case',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         menu: new Common.UI.Menu({
                             items: [
                                 {caption: this.mniSentenceCase, value: Asc.c_oAscChangeTextCaseType.SentenceCase},
@@ -342,6 +423,7 @@ define([
                         id: 'id-toolbar-btn-align-left',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-align-left',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         toggleGroup: 'alignGroup',
                         dataHint: '1',
@@ -353,6 +435,7 @@ define([
                         id: 'id-toolbar-btn-align-center',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-align-center',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         toggleGroup: 'alignGroup',
                         dataHint: '1',
@@ -364,6 +447,7 @@ define([
                         id: 'id-toolbar-btn-align-right',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-align-right',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         toggleGroup: 'alignGroup',
                         dataHint: '1',
@@ -375,6 +459,7 @@ define([
                         id: 'id-toolbar-btn-align-just',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-align-just',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         toggleGroup: 'alignGroup',
                         dataHint: '1',
@@ -386,6 +471,7 @@ define([
                         id: 'id-toolbar-btn-decoffset',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-decoffset',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         dataHint: '1',
                         dataHintDirection: 'top'
                     });
@@ -395,6 +481,7 @@ define([
                         id: 'id-toolbar-btn-incoffset',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-incoffset',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         dataHint: '1',
                         dataHintDirection: 'top'
                     });
@@ -404,6 +491,7 @@ define([
                         id: 'id-toolbar-btn-linespace',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-linespace',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         menu: new Common.UI.Menu({
                             style: 'min-width: 60px;',
                             items: [
@@ -425,6 +513,7 @@ define([
                         id: 'id-toolbar-btn-hidenchars',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-paragraph',
+                        lock: [ _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         split: true,
                         menu: new Common.UI.Menu({
@@ -444,6 +533,8 @@ define([
                         id: 'id-toolbar-btn-markers',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-setmarkers',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode,
+                            _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         toggleGroup: 'markersGroup',
                         split: true,
@@ -459,6 +550,8 @@ define([
                         id: 'id-toolbar-btn-numbering',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-numbering',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal,  _set.previewReviewMode, _set.viewFormMode,
+                            _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         toggleGroup: 'markersGroup',
                         split: true,
@@ -474,6 +567,8 @@ define([
                         id: 'id-toolbar-btn-multilevels',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-multilevels',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode,
+                                _set.lostConnect, _set.disableOnStart],
                         menu: true,
                         dataHint: '1',
                         dataHintDirection: 'top',
@@ -505,6 +600,8 @@ define([
                         id: 'tlbtn-inserttable',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-inserttable',
+                        lock: [_set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inEquation, _set.controlPlain, _set.richDelLock, _set.plainDelLock, _set.cantAddTable, _set.previewReviewMode,
+                            _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnInsTable,
                         menu: new Common.UI.Menu({
                             items: [
@@ -525,6 +622,8 @@ define([
                         id: 'tlbtn-insertimage',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-insertimage',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain, _set.richDelLock, _set.plainDelLock,  _set.contentLock,  _set.cantAddImagePara,
+                                _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnInsImage,
                         menu: new Common.UI.Menu({
                             items: [
@@ -544,6 +643,8 @@ define([
                         cls: 'btn-toolbar x-huge icon-top',
                         caption: me.capBtnInsChart,
                         iconCls: 'toolbar__icon btn-insertchart',
+                        lock: [ _set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.controlPlain, _set.richDelLock, _set.plainDelLock, _set.contentLock,
+                                _set.chartLock, _set.cantAddChart, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         menu: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -555,6 +656,8 @@ define([
                         id: 'tlbtn-inserttext',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-text',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain, _set.contentLock, _set.inFootnote, _set.previewReviewMode, _set.viewFormMode,
+                            _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnInsTextbox,
                         enableToggle: true,
                         dataHint: '1',
@@ -562,10 +665,13 @@ define([
                         dataHintOffset: 'small'
                     });
                     this.paragraphControls.push(this.btnInsertText);
+
                     this.btnInsertTextArt = new Common.UI.Button({
                         id: 'tlbtn-inserttextart',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-textart',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain, _set.richDelLock, _set.plainDelLock, _set.contentLock, _set.inFootnote, _set.cantAddImagePara,
+                            _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnInsTextart,
                         menu: new Common.UI.Menu({
                             cls: 'menu-shapes',
@@ -583,12 +689,15 @@ define([
                         id: 'id-toolbar-btn-editheader',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-editheader',
+                        lock: [ _set.previewReviewMode, _set.viewFormMode, _set.inEquation, _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnInsHeader,
                         menu: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
                     });
+                    this.toolbarControls.push(this.btnEditHeader);
+
                     this.mnuPageNumberPosPicker = {
                         conf: {disabled: false},
                         isDisabled: function () {
@@ -596,19 +705,25 @@ define([
                         },
                         setDisabled: function (val) {
                             this.conf.disabled = val;
-                        }
+                        },
+                        options: {}
                     };
                     this.mnuPageNumCurrentPos = clone(this.mnuPageNumberPosPicker);
-                    this.mnuInsertPageNum = clone(this.mnuPageNumberPosPicker);
-                    this.mnuInsertPageCount = clone(this.mnuPageNumberPosPicker);
+                    this.mnuPageNumCurrentPos.options.lock = [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock];
                     this.paragraphControls.push(this.mnuPageNumCurrentPos);
+                    this.mnuInsertPageCount = clone(this.mnuPageNumberPosPicker);
+                    this.mnuInsertPageCount.options.lock = [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock];
                     this.paragraphControls.push(this.mnuInsertPageCount);
-                    this.toolbarControls.push(this.btnEditHeader);
+                    this.mnuInsertPageNum = clone(this.mnuPageNumberPosPicker);
+                    this.mnuInsertPageNum.options.lock = [_set.cantAddPageNum, _set.controlPlain];
+                    this.mnuPageNumberPosPicker.options.lock = [_set.headerFooterLock];
 
                     this.btnInsDateTime = new Common.UI.Button({
                         id: 'id-toolbar-btn-datetime',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-datetime',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.richDelLock, _set.plainDelLock, _set.noParagraphSelected, _set.previewReviewMode,
+                            _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnDateTime,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -620,6 +735,8 @@ define([
                         id: 'id-toolbar-btn-blankpage',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-blankpage',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inEquation, _set.richDelLock, _set.plainDelLock, _set.inHeader,  _set.inFootnote,  _set.inControl,
+                            _set.cantPageBreak, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnBlankPage,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -631,6 +748,8 @@ define([
                         id: 'tlbtn-insertshape',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-insertshape',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain,  _set.contentLock,  _set.inFootnote, _set.previewReviewMode, _set.viewFormMode,
+                                _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnInsShape,
                         enableToggle: true,
                         menu: new Common.UI.Menu({cls: 'menu-shapes menu-insert-shape'}),
@@ -644,6 +763,8 @@ define([
                         id: 'tlbtn-insertequation',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-insertequation',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.controlPlain, _set.richDelLock, _set.plainDelLock, _set.cantAddEquation,
+                            _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnInsEquation,
                         split: true,
                         menu: new Common.UI.Menu({cls: 'menu-shapes'}),
@@ -657,6 +778,8 @@ define([
                         id: 'tlbtn-insertsymbol',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-symbol',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.richDelLock, _set.plainDelLock, _set.noParagraphSelected, _set.previewReviewMode,
+                            _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnInsSymbol,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -668,6 +791,8 @@ define([
                         id: 'tlbtn-dropcap',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-dropcap',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inEquation, _set.controlPlain, _set.dropcapLock, _set.previewReviewMode, _set.viewFormMode,
+                            _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnInsDropcap,
                         menu: new Common.UI.Menu({
                             cls: 'ppm-toolbar shifted-right',
@@ -711,6 +836,7 @@ define([
                         id: 'tlbtn-controls',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-controls',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnInsControls,
                         menu: new Common.UI.Menu({
                             cls: 'ppm-toolbar shifted-right',
@@ -787,12 +913,15 @@ define([
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
                     });
+                    this.toolbarControls.push(this.btnContentControls);
                     // this.paragraphControls.push(this.btnContentControls);
 
                     this.btnColumns = new Common.UI.Button({
                         id: 'tlbtn-columns',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-columns',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.controlPlain, _set.inImage, _set.docPropsLock, _set.previewReviewMode, _set.viewFormMode,
+                            _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnColumns,
                         menu: new Common.UI.Menu({
                             cls: 'ppm-toolbar shifted-right',
@@ -851,6 +980,7 @@ define([
                         id: 'tlbtn-pageorient',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-pageorient',
+                        lock: [_set.docPropsLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnPageOrient,
                         menu: new Common.UI.Menu({
                             cls: 'ppm-toolbar',
@@ -892,6 +1022,7 @@ define([
                         id: 'tlbtn-pagemargins',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-pagemargins',
+                        lock: [_set.docPropsLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnMargins,
                         menu: new Common.UI.Menu({
                             items: [
@@ -954,6 +1085,7 @@ define([
                         id: 'tlbtn-pagesize',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-pagesize',
+                        lock: [_set.docPropsLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnPageSize,
                         menu: new Common.UI.Menu({
                             restoreHeight: true,
@@ -1077,6 +1209,7 @@ define([
                         id: 'tlbtn-line-numbers',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-line-numbering',
+                        lock: [_set.docPropsLock, _set.inImagePara, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnLineNumbers,
                         menu: new Common.UI.Menu({
                             cls: 'ppm-toolbar',
@@ -1128,6 +1261,8 @@ define([
                         id: 'id-toolbar-btn-clearstyle',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-clearstyle',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode,
+                            _set.lostConnect, _set.disableOnStart],
                         dataHint: '1',
                         dataHintDirection: 'top'
                     });
@@ -1137,6 +1272,7 @@ define([
                         id: 'id-toolbar-btn-copystyle',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-copystyle',
+                        lock: [ _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         enableToggle: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom'
@@ -1147,6 +1283,7 @@ define([
                         id: 'id-toolbar-btn-colorschemas',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-colorschemas',
+                        lock: [_set.docSchemaLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         menu: new Common.UI.Menu({
                             cls: 'shifted-left',
                             items: [],
@@ -1162,6 +1299,7 @@ define([
                         id: 'id-toolbar-btn-mailrecepients',
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-mailmerge',
+                        lock: [_set.mmergeLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         menu: new Common.UI.Menu({
@@ -1172,10 +1310,12 @@ define([
                             ]
                         })
                     });
+                    this.toolbarControls.push(this.btnMailRecepients);
 
                     me.btnImgAlign = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-img-align',
+                        lock: [_set.imageLock, _set.contentLock, _set.inImageInline, _set.noObjectSelected, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: me.capImgAlign,
                         menu: true,
                         dataHint: '1',
@@ -1186,6 +1326,7 @@ define([
                     me.btnImgGroup = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-img-group',
+                        lock: [_set.imageLock, _set.contentLock, _set.inImageInline, _set.noObjectSelected, _set.cantGroup, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: me.capImgGroup,
                         menu: true,
                         dataHint: '1',
@@ -1195,6 +1336,7 @@ define([
                     me.btnImgForward = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-img-frwd',
+                        lock: [_set.cantArrange, _set.lostConnect, _set.contentLock, _set.noObjectSelected, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, _set.disableOnStart],
                         caption: me.capImgForward,
                         split: true,
                         menu: true,
@@ -1205,6 +1347,7 @@ define([
                     me.btnImgBackward = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-img-bkwd',
+                        lock: [_set.cantArrange, _set.lostConnect, _set.contentLock, _set.noObjectSelected, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, _set.disableOnStart],
                         caption: me.capImgBackward,
                         split: true,
                         menu: true,
@@ -1215,6 +1358,7 @@ define([
                     me.btnImgWrapping = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-img-wrap',
+                        lock: [_set.cantWrap, _set.imageLock, _set.contentLock, _set.noObjectSelected, _set.lostConnect, _set.previewReviewMode, _set.viewFormMode, _set.disableOnStart],
                         caption: me.capImgWrapping,
                         menu: true,
                         dataHint: '1',
@@ -1225,6 +1369,7 @@ define([
                     me.btnWatermark = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-watermark',
+                        lock: [_set.headerLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         caption: me.capBtnWatermark,
                         menu: new Common.UI.Menu({
                             cls: 'ppm-toolbar',
@@ -1263,6 +1408,7 @@ define([
                     this.cmbFontSize = new Common.UI.ComboBox({
                         cls: 'input-group-nr',
                         menuStyle: 'min-width: 55px;',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         hint: this.tipFontSize,
                         data: [
                             {value: 8, displayValue: "8"},
@@ -1292,6 +1438,7 @@ define([
                         cls: 'input-group-nr',
                         menuCls: 'scrollable-menu',
                         menuStyle: 'min-width: 325px;',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         hint: this.tipFontName,
                         store: new Common.Collections.Fonts(),
                         dataHint: '1',
@@ -1309,8 +1456,11 @@ define([
                         itemHeight = 40;
                     this.listStyles = new Common.UI.ComboDataView({
                         cls: 'combo-styles',
+                        lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode,
+                            _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
                         itemWidth: itemWidth,
                         itemHeight: itemHeight,
+                        style: 'min-width:150px;',
 //                hint        : this.tipParagraphStyle,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -1366,11 +1516,8 @@ define([
                     this.textOnlyControls.push(this.listStyles);
 
                     // Disable all components before load document
-                    _.each(this.toolbarControls.concat(this.paragraphControls), function (cmp) {
-                        if (_.isFunction(cmp.setDisabled))
-                            cmp.setDisabled(true);
-                    });
-                    this.btnMailRecepients.setDisabled(true);
+                    this.lockControls = me.toolbarControls.concat(me.paragraphControls);
+                    this.lockToolbar(Common.enumLock.disableOnStart, true, {array: this.lockControls});
 
                     var editStyleMenuUpdate = new Common.UI.MenuItem({
                         caption: me.textStyleMenuUpdate
@@ -1403,7 +1550,6 @@ define([
                             ]
                         });
                     }
-
                     this.on('render:after', _.bind(this.onToolbarAfterRender, this));
                 } else {
                     Common.UI.Mixtbar.prototype.initialize.call(this, {
@@ -1557,8 +1703,13 @@ define([
                 _injectComponent('#slot-img-wrapping', this.btnImgWrapping);
                 _injectComponent('#slot-btn-watermark', this.btnWatermark);
 
-                this.btnsPageBreak = Common.Utils.injectButtons($host.find('.btn-slot.btn-pagebreak'), '', 'toolbar__icon btn-pagebreak', this.capBtnInsPagebreak, undefined, true, true, undefined, '1', 'bottom', 'small');
+                this.btnsPageBreak = Common.Utils.injectButtons($host.find('.btn-slot.btn-pagebreak'), '', 'toolbar__icon btn-pagebreak', this.capBtnInsPagebreak,
+                    [Common.enumLock.paragraphLock, Common.enumLock.headerLock, Common.enumLock.richEditLock, Common.enumLock.plainEditLock, Common.enumLock.inEquation, Common.enumLock.richDelLock,
+                        Common.enumLock.plainDelLock, Common.enumLock.inHeader, Common.enumLock.inFootnote, Common.enumLock.inControl, Common.enumLock.cantPageBreak, Common.enumLock.previewReviewMode,
+                        Common.enumLock.viewFormMode, Common.enumLock.lostConnect, Common.enumLock.disableOnStart],
+                        true, true, undefined, '1', 'bottom', 'small');
                 Array.prototype.push.apply(this.paragraphControls, this.btnsPageBreak);
+                Array.prototype.push.apply(this.lockControls, this.btnsPageBreak);
 
                 return $host;
             },
@@ -1720,7 +1871,9 @@ define([
                                 wrapType    : Asc.c_oAscWrapStyle2.Inline,
                                 checkmark   : false,
                                 checkable   : true
-                            }, {
+                            },
+                            { caption: '--' },
+                            {
                                 caption     : _holder_view.txtSquare,
                                 iconCls     : 'menu__icon wrap-square',
                                 toggleGroup : 'imgwrapping',
@@ -1748,7 +1901,9 @@ define([
                                 wrapType    : Asc.c_oAscWrapStyle2.TopAndBottom,
                                 checkmark   : false,
                                 checkable   : true
-                            }, {
+                            },
+                            { caption: '--' },
+                            {
                                 caption     : _holder_view.txtInFront,
                                 iconCls     : 'menu__icon wrap-infront',
                                 toggleGroup : 'imgwrapping',
@@ -1939,6 +2094,9 @@ define([
                     })
                 );
 
+                var keepStateCurr = this.mnuPageNumCurrentPos.keepState,
+                    keepStateCount = this.mnuInsertPageCount.keepState,
+                    keepStateNum = this.mnuInsertPageNum.keepState;
                 this.btnEditHeader.setMenu(
                     new Common.UI.Menu({
                         items: [
@@ -1947,6 +2105,7 @@ define([
                             {caption: '--'},
                             this.mnuInsertPageNum = new Common.UI.MenuItem({
                                 caption: this.textInsertPageNumber,
+                                lock: this.mnuInsertPageNum.options.lock,
                                 disabled: this.mnuInsertPageNum.isDisabled(),
                                 menu: new Common.UI.Menu({
                                     cls: 'shifted-left',
@@ -1956,6 +2115,7 @@ define([
                                         {template: _.template('<div id="id-toolbar-menu-pageposition" class="menu-pageposition"></div>')},
                                         this.mnuPageNumCurrentPos = new Common.UI.MenuItem({
                                             caption: this.textToCurrent,
+                                            lock: this.mnuPageNumCurrentPos.options.lock,
                                             disabled: this.mnuPageNumCurrentPos.isDisabled(),
                                             value: 'current'
                                         })
@@ -1964,13 +2124,19 @@ define([
                             }),
                             this.mnuInsertPageCount = new Common.UI.MenuItem({
                                 caption: this.textInsertPageCount,
+                                    lock: this.mnuInsertPageCount.options.lock,
                                 disabled: this.mnuInsertPageCount.isDisabled()
                             })
                         ]
                     })
                 );
+                this.mnuInsertPageNum.keepState = keepStateNum;
+                this.mnuPageNumCurrentPos.keepState = keepStateCurr;
                 this.paragraphControls.push(this.mnuPageNumCurrentPos);
+                this.lockControls.push(this.mnuPageNumCurrentPos);
+                this.mnuInsertPageCount.keepState = keepStateCount;
                 this.paragraphControls.push(this.mnuInsertPageCount);
+                this.lockControls.push(this.mnuInsertPageCount);
 
                 this.btnInsertChart.setMenu( new Common.UI.Menu({
                     style: 'width: 364px;padding-top: 12px;',
@@ -2086,8 +2252,10 @@ define([
                 _conf && this.mnuMultilevelPicker.selectByIndex(_conf.index, true);
 
                 _conf = this.mnuPageNumberPosPicker ? this.mnuPageNumberPosPicker.conf : undefined;
+                var keepState = this.mnuPageNumberPosPicker ? this.mnuPageNumberPosPicker.keepState : undefined;
                 this.mnuPageNumberPosPicker = new Common.UI.DataView({
                     el: $('#id-toolbar-menu-pageposition'),
+                    lock: this.mnuPageNumberPosPicker.options.lock,
                     allowScrollbar: false,
                     parentMenu:  this.mnuInsertPageNum.menu,
                     outerMenu:  {menu: this.mnuInsertPageNum.menu, index: 0},
@@ -2138,6 +2306,7 @@ define([
                     ]),
                     itemTemplate: _.template('<div id="<%= id %>" class="item-pagenumber options__icon options__icon-huge <%= iconname %>"></div>')
                 });
+                this.mnuPageNumberPosPicker.keepState = keepState;
                 _conf && this.mnuPageNumberPosPicker.setDisabled(_conf.disabled);
                 this.mnuInsertPageNum.menu.setInnerMenu([{menu: this.mnuPageNumberPosPicker, index: 0}]);
 
@@ -2236,14 +2405,13 @@ define([
 
             setMode: function (mode) {
                 if (mode.isDisconnected) {
-                    this.btnSave.setDisabled(true);
-                    this.btnUndo.setDisabled(true);
-                    this.btnRedo.setDisabled(true);
+                    this.lockToolbar(Common.enumLock.lostConnect, true);
                     if ( this.synchTooltip )
                         this.synchTooltip.hide();
                     if (!mode.enableDownload)
-                        this.btnPrint.setDisabled(true);
-                }
+                        this.lockToolbar(Common.enumLock.cantPrint, true, {array: [this.btnPrint]});
+                } else
+                    this.lockToolbar(Common.enumLock.cantPrint, !mode.canPrint, {array: [this.btnPrint]});
 
                 this.mode = mode;
 
@@ -2424,6 +2592,10 @@ define([
                     this.api.asc_RemoveAllCustomStyles();
             },
 
+            lockToolbar: function (causes, lock, opts) {
+                Common.Utils.lockControls(causes, lock, opts, this.lockControls);
+            },
+
             textBold: 'Bold',
             textItalic: 'Italic',
             textUnderline: 'Underline',

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

@@ -85,14 +85,15 @@ define([
 
                 var me = this,
                     $host = me.toolbar.$el;
+                var _set = Common.enumLock;
 
                 this.btnNavigation = new Common.UI.Button({
                     parentEl: $host.find('#slot-btn-navigation'),
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-menu-navigation',
+                    lock: [_set.lostConnect, _set.disableOnStart],
                     caption: this.textNavigation,
                     enableToggle: true,
-                    disabled: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -102,9 +103,9 @@ define([
                 this.cmbZoom = new Common.UI.ComboBox({
                     el: $host.find('#slot-field-zoom'),
                     cls: 'input-group-nr',
+                    lock: [_set.lostConnect, _set.disableOnStart],
                     menuStyle: 'min-width: 55px;',
                     editable: true,
-                    disabled: true,
                     data: [
                         { displayValue: "50%", value: 50 },
                         { displayValue: "75%", value: 75 },
@@ -130,10 +131,10 @@ define([
                     parentEl: $host.find('#slot-btn-ftp'),
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-ic-zoomtopage',
+                    lock: [_set.lostConnect, _set.disableOnStart],
                     caption: this.textFitToPage,
                     toggleGroup: 'view-zoom',
                     enableToggle: true,
-                    disabled: true,
                     dataHint: '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'medium'
@@ -144,10 +145,10 @@ define([
                     parentEl: $host.find('#slot-btn-ftw'),
                     cls: 'btn-toolbar',
                     iconCls: 'toolbar__icon btn-ic-zoomtowidth',
+                    lock: [_set.lostConnect, _set.disableOnStart],
                     caption: this.textFitToWidth,
                     toggleGroup: 'view-zoom',
                     enableToggle: true,
-                    disabled: true,
                     dataHint: '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'medium'
@@ -158,9 +159,9 @@ define([
                     parentEl: $host.find('#slot-btn-interface-theme'),
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon day',
+                    lock: [_set.lostConnect, _set.disableOnStart],
                     caption: this.textInterfaceTheme,
                     menu: true,
-                    disabled: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -171,9 +172,9 @@ define([
                     parentEl: $host.find('#slot-btn-dark-document'),
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon dark-mode',
+                    lock: [_set.inLightTheme, _set.lostConnect, _set.disableOnStart],
                     caption: this.textDarkDocument,
                     enableToggle: true,
-                    disabled: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -182,9 +183,9 @@ define([
 
                 this.chStatusbar = new Common.UI.CheckBox({
                     el: $host.findById('#slot-chk-statusbar'),
+                    lock: [_set.lostConnect, _set.disableOnStart],
                     labelText: this.textStatusBar,
                     value: !Common.localStorage.getBool("de-hidden-status"),
-                    disabled: true,
                     dataHint: '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'small'
@@ -193,9 +194,9 @@ define([
 
                 this.chToolbar = new Common.UI.CheckBox({
                     el: $host.findById('#slot-chk-toolbar'),
+                    lock: [_set.lostConnect, _set.disableOnStart],
                     labelText: this.textAlwaysShowToolbar,
                     value: !options.compactToolbar,
-                    disabled: true,
                     dataHint    : '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'small'
@@ -204,14 +205,17 @@ define([
 
                 this.chRulers = new Common.UI.CheckBox({
                     el: $host.findById('#slot-chk-rulers'),
+                    lock: [_set.lostConnect, _set.disableOnStart],
                     labelText: this.textRulers,
                     value: !Common.Utils.InternalSettings.get("de-hidden-rulers"),
-                    disabled: true,
                     dataHint: '1',
                     dataHintDirection: 'left',
                     dataHintOffset: 'small'
                 });
                 this.lockedControls.push(this.chRulers);
+
+                this.cmpEl = $host;
+                Common.Utils.lockControls(_set.disableOnStart, true, {array: this.lockedControls});
             },
 
             render: function (el) {

apps/documenteditor/main/locale/ca.json

@@ -1,6 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Advertiment",
-  "Common.Controllers.Chat.textEnterMessage": "Introdueix el teu missatge aquí",
+  "Common.Controllers.Chat.textEnterMessage": "Introduïu el missatge aquí",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anònim",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Tanca",
   "Common.Controllers.ExternalDiagramEditor.warningText": "L’objecte s'ha desactivat perquè un altre usuari ja el té obert.",
@@ -164,14 +164,16 @@
   "Common.UI.ComboDataView.emptyComboText": "Sense estils",
   "Common.UI.ExtendedColorDialog.addButtonText": "Afegeix",
   "Common.UI.ExtendedColorDialog.textCurrent": "Actual",
-  "Common.UI.ExtendedColorDialog.textHexErr": "El valor introduït no és correcte. <br>Introdueix un valor entre 000000 i FFFFFF.",
+  "Common.UI.ExtendedColorDialog.textHexErr": "El valor introduït no és correcte.<br>Introduïu un valor entre 000000 i FFFFFF.",
   "Common.UI.ExtendedColorDialog.textNew": "Crea",
-  "Common.UI.ExtendedColorDialog.textRGBErr": "El valor introduït no és correcte. <br>Introdueix un valor numèric entre 0 i 255.",
+  "Common.UI.ExtendedColorDialog.textRGBErr": "El valor introduït no és correcte.<br>Introduïu un valor numèric entre 0 i 255.",
   "Common.UI.HSBColorPicker.textNoColor": "Sense color",
+  "Common.UI.InputFieldBtnPassword.textHintHidePwd": "Amaga la contrasenya",
+  "Common.UI.InputFieldBtnPassword.textHintShowPwd": "Mostra la contrasenya",
   "Common.UI.SearchDialog.textHighlight": "Ressalta els resultats",
   "Common.UI.SearchDialog.textMatchCase": "Sensible a majúscules i minúscules",
-  "Common.UI.SearchDialog.textReplaceDef": "Introdueix el text de substitució",
-  "Common.UI.SearchDialog.textSearchStart": "Introdueix el teu text aquí",
+  "Common.UI.SearchDialog.textReplaceDef": "Introduïu el text de substitució",
+  "Common.UI.SearchDialog.textSearchStart": "Introduïu el text aquí",
   "Common.UI.SearchDialog.textTitle": "Cerca i substitueix",
   "Common.UI.SearchDialog.textTitle2": "Cerca",
   "Common.UI.SearchDialog.textWholeWords": "Només paraules senceres",
@@ -179,7 +181,7 @@
   "Common.UI.SearchDialog.txtBtnReplace": "Substitueix",
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Substitueix-ho tot ",
   "Common.UI.SynchronizeTip.textDontShow": "No tornis a mostrar aquest missatge",
-  "Common.UI.SynchronizeTip.textSynchronize": "Un altre usuari ha canviat el document. <br>Fes clic per desar els canvis i carregar les actualitzacions.",
+  "Common.UI.SynchronizeTip.textSynchronize": "Un altre usuari ha canviat el document. <br>Feu clic per desar els canvis i tornar a carregar les actualitzacions.",
   "Common.UI.ThemeColorPalette.textStandartColors": "Colors estàndard",
   "Common.UI.ThemeColorPalette.textThemeColors": "Colors del tema",
   "Common.UI.Themes.txtThemeClassicLight": "Llum clàssica",
@@ -211,6 +213,7 @@
   "Common.Views.AutoCorrectDialog.textBulleted": "Llistes automàtiques de pics",
   "Common.Views.AutoCorrectDialog.textBy": "Per",
   "Common.Views.AutoCorrectDialog.textDelete": "Suprimeix",
+  "Common.Views.AutoCorrectDialog.textFLCells": "Posa en majúscula la primera lletra de les cel·les de la taula",
   "Common.Views.AutoCorrectDialog.textFLSentence": "Escriu en majúscules la primera lletra de les frases",
   "Common.Views.AutoCorrectDialog.textHyperlink": "Camins de xarxa i d'Internet per enllaços",
   "Common.Views.AutoCorrectDialog.textHyphens": "Guionets (--) per guió llarg (—)",
@@ -227,36 +230,39 @@
   "Common.Views.AutoCorrectDialog.textRestore": "Restaura",
   "Common.Views.AutoCorrectDialog.textTitle": "Correcció automàtica",
   "Common.Views.AutoCorrectDialog.textWarnAddRec": "Les funcions reconegudes han de contenir només les lletres de la A a la Z, en majúscules o en minúscules.",
-  "Common.Views.AutoCorrectDialog.textWarnResetRec": "Qualsevol expressió que hagis afegit se suprimirà i es restabliran les eliminades. Vols continuar?",
+  "Common.Views.AutoCorrectDialog.textWarnResetRec": "Qualsevol expressió que hàgiu afegit se suprimirà i es restabliran les eliminades. Voleu continuar?",
   "Common.Views.AutoCorrectDialog.warnReplace": "L'entrada de correcció automàtica de %1 ja existeix. La vols substituir?",
-  "Common.Views.AutoCorrectDialog.warnReset": "Qualsevol autocorrecció que hagis afegit se suprimirà i les modificades recuperaran els seus valors originals. Vols continuar?",
+  "Common.Views.AutoCorrectDialog.warnReset": "Qualsevol autocorrecció que hàgiu afegit se suprimirà i les modificades es restauraran als seus valors originals. Voleu continuar?",
   "Common.Views.AutoCorrectDialog.warnRestore": "L'entrada de correcció automàtica de %1 es restablirà al seu valor original. Vols continuar?",
   "Common.Views.Chat.textSend": "Envia",
   "Common.Views.Comments.mniAuthorAsc": "Autor de la A a la Z",
   "Common.Views.Comments.mniAuthorDesc": "Autor de la Z a la A",
   "Common.Views.Comments.mniDateAsc": "Més antic",
   "Common.Views.Comments.mniDateDesc": "Més recent",
+  "Common.Views.Comments.mniFilterGroups": "Filtra per grup",
   "Common.Views.Comments.mniPositionAsc": "Des de dalt",
   "Common.Views.Comments.mniPositionDesc": "Des de baix",
   "Common.Views.Comments.textAdd": "Afegeix",
   "Common.Views.Comments.textAddComment": "Afegeix un comentari",
   "Common.Views.Comments.textAddCommentToDoc": "Afegeix un comentari al document",
   "Common.Views.Comments.textAddReply": "Afegeix una resposta",
+  "Common.Views.Comments.textAll": "Tot",
   "Common.Views.Comments.textAnonym": "Convidat",
   "Common.Views.Comments.textCancel": "Cancel·la",
   "Common.Views.Comments.textClose": "Tanca",
-  "Common.Views.Comments.textClosePanel": "Tanca els comentaris",
+  "Common.Views.Comments.textClosePanel": "Tanqueu els comentaris",
   "Common.Views.Comments.textComments": "Comentaris",
   "Common.Views.Comments.textEdit": "D'acord",
-  "Common.Views.Comments.textEnterCommentHint": "Introdueix el teu comentari aquí",
+  "Common.Views.Comments.textEnterCommentHint": "Introduïu el comentari aquí",
   "Common.Views.Comments.textHintAddComment": "Afegeix un comentari",
   "Common.Views.Comments.textOpenAgain": "Torna-ho a obrir",
   "Common.Views.Comments.textReply": "Respon",
   "Common.Views.Comments.textResolve": "Resol",
   "Common.Views.Comments.textResolved": "S'ha resolt",
   "Common.Views.Comments.textSort": "Ordena els comentaris",
+  "Common.Views.Comments.textViewResolved": "No teniu permís per tornar a obrir el comentari",
   "Common.Views.CopyWarningDialog.textDontShow": "No tornis a mostrar aquest missatge",
-  "Common.Views.CopyWarningDialog.textMsg": "Les accions de copia, talla i enganxa mitjançant els botons de la barra d’eines de l’editor i les accions del menú contextual només es realitzaran dins d’aquesta pestanya editor. <br><br>Per copiar o enganxar a o des d’aplicacions fora de la pestanya de l'editor, utilitza les combinacions de teclat següents:",
+  "Common.Views.CopyWarningDialog.textMsg": "Les accions de copia, talla i enganxa mitjançant els botons de la barra d’eines de l’editor i les accions del menú contextual només es realitzaran dins d’aquesta pestanya editor. <br><br>Per copiar o enganxar a o des d’aplicacions fora de la pestanya de l'editor, utilitzeu les combinacions de teclat següents:",
   "Common.Views.CopyWarningDialog.textTitle": "Accions de copia, talla i enganxa ",
   "Common.Views.CopyWarningDialog.textToCopy": "Per copiar",
   "Common.Views.CopyWarningDialog.textToCut": "Per tallar",
@@ -310,10 +316,10 @@
   "Common.Views.OpenDialog.closeButtonText": "Tanca el fitxer",
   "Common.Views.OpenDialog.txtEncoding": "Codificació",
   "Common.Views.OpenDialog.txtIncorrectPwd": "La contrasenya no és correcta.",
-  "Common.Views.OpenDialog.txtOpenFile": "Introdueix una contrasenya per obrir el fitxer",
+  "Common.Views.OpenDialog.txtOpenFile": "Introduïu una contrasenya per obrir el fitxer",
   "Common.Views.OpenDialog.txtPassword": "Contrasenya",
   "Common.Views.OpenDialog.txtPreview": "Visualització prèvia",
-  "Common.Views.OpenDialog.txtProtected": "Un cop introdueixis la contrasenya i obris el fitxer, es restablirà la contrasenya actual del fitxer.",
+  "Common.Views.OpenDialog.txtProtected": "Un cop introduïu la contrasenya i obriu el fitxer, es restablirà la contrasenya actual del fitxer.",
   "Common.Views.OpenDialog.txtTitle": "Tria les opcions %1",
   "Common.Views.OpenDialog.txtTitleProtected": "El fitxer està protegit",
   "Common.Views.PasswordDialog.txtDescription": "Estableix una contrasenya per protegir aquest document",
@@ -352,7 +358,7 @@
   "Common.Views.ReviewChanges.strStrictDesc": "Fes servir el botó \"Desar\" per sincronitzar els canvis que tu i els altres feu.",
   "Common.Views.ReviewChanges.textEnable": "Habilita",
   "Common.Views.ReviewChanges.textWarnTrackChanges": "S'activarà el control de canvis per a tots els usuaris amb accés total. La pròxima vegada que algú obri el document, el control de canvis seguirà activat.",
-  "Common.Views.ReviewChanges.textWarnTrackChangesTitle": "Vols habilitar el control de canvis per a tothom?",
+  "Common.Views.ReviewChanges.textWarnTrackChangesTitle": "Voleu habilitar el control de canvis per a tothom?",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "Accepta el canvi actual",
   "Common.Views.ReviewChanges.tipCoAuthMode": "Estableix el mode de coedició",
   "Common.Views.ReviewChanges.tipCommentRem": "Suprimeix els comentaris",
@@ -431,6 +437,7 @@
   "Common.Views.ReviewPopover.textOpenAgain": "Torna-ho a obrir",
   "Common.Views.ReviewPopover.textReply": "Respon",
   "Common.Views.ReviewPopover.textResolve": "Resol",
+  "Common.Views.ReviewPopover.textViewResolved": "No teniu permís per tornar a obrir el comentari",
   "Common.Views.ReviewPopover.txtAccept": "Accepta ",
   "Common.Views.ReviewPopover.txtDeleteTip": "Suprimeix",
   "Common.Views.ReviewPopover.txtEditTip": "Edita",
@@ -498,17 +505,17 @@
   "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Advertiment",
   "DE.Controllers.LeftMenu.requestEditRightsText": "S'estan sol·licitant drets d’edició ...",
   "DE.Controllers.LeftMenu.textLoadHistory": "S'està carregant l'historial de versions...",
-  "DE.Controllers.LeftMenu.textNoTextFound": "No s'han trobat les dades que heu cercat. Ajusta les opcions de cerca.",
+  "DE.Controllers.LeftMenu.textNoTextFound": "No s'han trobat les dades que heu cercat. Ajusteu les opcions de cerca.",
   "DE.Controllers.LeftMenu.textReplaceSkipped": "S'ha realitzat la substitució. S'han omès {0} ocurrències.",
   "DE.Controllers.LeftMenu.textReplaceSuccess": "S'ha fet la cerca. S'han substituït les coincidències: {0}",
-  "DE.Controllers.LeftMenu.txtCompatible": "El document es desarà amb el format nou. Podràs utilitzar totes les funcions de l'editor, però podria afectar la disposició del document. <br>Usa l'opció 'Compatibilitat' de la configuració avançada si vols que els fitxers siguin compatibles amb versions anteriors de MS Word.",
+  "DE.Controllers.LeftMenu.txtCompatible": "El document es desarà amb el format nou. Podreu utilitzar totes les funcions de l'editor, però podria afectar la disposició del document. <br>Useu l'opció 'Compatibilitat' de la configuració avançada si voleu que els fitxers siguin compatibles amb versions anteriors de MS Word.",
   "DE.Controllers.LeftMenu.txtUntitled": "Sense títol",
-  "DE.Controllers.LeftMenu.warnDownloadAs": "Si continues i deses en aquest format, es perdran totes les característiques, excepte el text. <br>Vols continuar?",
-  "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Si continues i deses en aquest format, es pot perdre part del format. <br>Vols continuar?",
+  "DE.Controllers.LeftMenu.warnDownloadAs": "Si continueu i deseu en aquest format, es perdran totes les característiques, excepte el text. <br>Voleu continuar?",
+  "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Si continueu i deseu en aquest format, es pot perdre part del format. <br>Voleu continuar?",
   "DE.Controllers.Main.applyChangesTextText": "S'estan carregant els canvis...",
   "DE.Controllers.Main.applyChangesTitleText": "S'estan carregant els canvis",
   "DE.Controllers.Main.convertationTimeoutText": "S'ha superat el temps de conversió.",
-  "DE.Controllers.Main.criticalErrorExtText": "Prem \"Acceptar\" per tornar a la llista de documents.",
+  "DE.Controllers.Main.criticalErrorExtText": "Premeu \"Acceptar\" per tornar a la llista de documents.",
   "DE.Controllers.Main.criticalErrorTitle": "Error",
   "DE.Controllers.Main.downloadErrorText": "S'ha produït un error en la baixada",
   "DE.Controllers.Main.downloadMergeText": "S'està baixant...",
@@ -520,18 +527,18 @@
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "S'ha perdut la connexió amb el servidor. Ara no es pot editar el document.",
   "DE.Controllers.Main.errorComboSeries": "Per crear un diagrama combinat, selecciona com a mínim dues sèries de dades.",
   "DE.Controllers.Main.errorCompare": "La funció de comparació de documents no està disponible durant la coedició.",
-  "DE.Controllers.Main.errorConnectToServer": "No s'ha pogut desar el document. Comprova la configuració de la connexió o contacta amb el teu administrador. <br>Quan facis clic en e botó \"D'acord\", et demanarà que descarreguis el document.",
-  "DE.Controllers.Main.errorDatabaseConnection": "Error extern. <br>Error de connexió amb la base de dades. Contacta amb l'assistència tècnica en cas que l'error continuï.",
+  "DE.Controllers.Main.errorConnectToServer": "No s'ha pogut desar el document. Comproveu la configuració de la connexió o contacteu amb l'administrador.<br>Quan feu clic al botó \"D'acord\", se us demanarà que descarregueu el document.",
+  "DE.Controllers.Main.errorDatabaseConnection": "Error extern.<br>Error de connexió amb la base de dades. Contacteu amb l'assistència tècnica en cas que l'error continuï.",
   "DE.Controllers.Main.errorDataEncrypted": "S'han rebut canvis xifrats, que no es poden desxifrar.",
   "DE.Controllers.Main.errorDataRange": "L'interval de dades no és correcte.",
   "DE.Controllers.Main.errorDefaultMessage": "Codi d'error:%1",
-  "DE.Controllers.Main.errorDirectUrl": "Verifica l'enllaç al document. <br>Aquest enllaç ha de ser un enllaç directe al fitxer per baixar-lo.",
-  "DE.Controllers.Main.errorEditingDownloadas": "S'ha produït un error mentre es treballava amb el document. <br>Utilitza l'opció \"Baixa-ho com a ...\" per desar la còpia de seguretat del fitxer al disc dur de l'ordinador.",
-  "DE.Controllers.Main.errorEditingSaveas": "S'ha produït un error mentre es treballava amb el document. <br>Utilitza l'opció \"Desa com a ...\" per desar la còpia de seguretat del fitxer al disc dur de l’ordinador.",
+  "DE.Controllers.Main.errorDirectUrl": "Verifiqueu l'enllaç al document. <br>Aquest enllaç ha de ser un enllaç directe al fitxer per baixar-lo.",
+  "DE.Controllers.Main.errorEditingDownloadas": "S'ha produït un error mentre es treballava amb el document. <br>Utilitzeu l'opció \"Baixa-ho com a ...\" per desar la còpia de seguretat del fitxer al disc dur de l'ordinador.",
+  "DE.Controllers.Main.errorEditingSaveas": "S'ha produït un error mentre es treballava amb el document.<br>Utilitzeu l'opció \"Desar com a ...\" per desar la còpia de seguretat del fitxer al disc dur de l’ordinador.",
   "DE.Controllers.Main.errorEmailClient": "No s'ha trobat cap client de correu electrònic",
   "DE.Controllers.Main.errorFilePassProtect": "El fitxer està protegit amb contrasenya i no es pot obrir.",
   "DE.Controllers.Main.errorFileSizeExceed": "La mida del fitxer supera el límit establert pel teu servidor. Contacta amb el teu administrador del servidor de documents per obtenir més informació.",
-  "DE.Controllers.Main.errorForceSave": "S'ha produït un error en desar el fitxer. Utilitza l'opció \"Baixa-ho com a\" per desar el fitxer al disc dur de l’ordinador o torna-ho a provar més endavant.",
+  "DE.Controllers.Main.errorForceSave": "S'ha produït un error en desar el fitxer. Utilitzeu l'opció \"Baixa-ho com a\" per desar el fitxer al disc dur de l’ordinador o torneu-ho a provar més endavant.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descriptor de claus desconegut",
   "DE.Controllers.Main.errorKeyExpire": "El descriptor de claus ha caducat",
   "DE.Controllers.Main.errorLoadingFont": "No s'han carregat els tipus de lletra.<br> Contacta amb l'administrador del Servidor de Documents.",
@@ -539,19 +546,19 @@
   "DE.Controllers.Main.errorMailMergeSaveFile": "No s'ha pogut combinar.",
   "DE.Controllers.Main.errorProcessSaveResult": "S'ha produït un error en desar.",
   "DE.Controllers.Main.errorServerVersion": "S'ha actualitzat la versió de l'editor. Es tornarà a carregar la pàgina per aplicar els canvis.",
-  "DE.Controllers.Main.errorSessionAbsolute": "La sessió d’edició del document ha caducat. Torna a carregar la pàgina.",
-  "DE.Controllers.Main.errorSessionIdle": "Fa temps que no s'obre el document. Torna a carregar la pàgina.",
-  "DE.Controllers.Main.errorSessionToken": "S'ha interromput la connexió amb el servidor. Torna a carregar la pàgina.",
+  "DE.Controllers.Main.errorSessionAbsolute": "La sessió d’edició del document ha caducat. Torneu a carregar la pàgina.",
+  "DE.Controllers.Main.errorSessionIdle": "Fa temps que no s'obre el document. Torneu a carregar la pàgina.",
+  "DE.Controllers.Main.errorSessionToken": "S'ha interromput la connexió amb el servidor. Torneu a carregar la pàgina.",
   "DE.Controllers.Main.errorSetPassword": "No s'ha pogut establir la contrasenya.",
-  "DE.Controllers.Main.errorStockChart": "L'ordre de fila no és correcte. Per crear un gràfic de valors, col·loca les dades del full en l’ordre següent: <br>preu d’obertura, preu màxim, preu mínim, preu de tancament.",
+  "DE.Controllers.Main.errorStockChart": "L'ordre de fila no és correcte. Per crear un gràfic de valors, col·loqueu les dades del full en l’ordre següent: <br>preu d’obertura, preu màxim, preu mínim, preu de tancament.",
   "DE.Controllers.Main.errorSubmit": "No s'ha pogut enviar.",
-  "DE.Controllers.Main.errorToken": "El testimoni de seguretat del document no s'ha format correctament. <br>Contacta amb el teu administrador del servidor de documents.",
-  "DE.Controllers.Main.errorTokenExpire": "El testimoni de seguretat del document ha caducat. <br>Contacta amb l'administrador del servidor de documents.",
+  "DE.Controllers.Main.errorToken": "El testimoni de seguretat del document no s'ha format correctament. <br>Contacteu amb el vostre administrador del servidor de documents.",
+  "DE.Controllers.Main.errorTokenExpire": "El testimoni de seguretat del document ha caducat. <br>Contacteu amb l'administrador del servidor de documents.",
   "DE.Controllers.Main.errorUpdateVersion": "S'ha canviat la versió del fitxer. La pàgina es tornarà a carregar.",
   "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "S'ha restaurat la connexió a internet i la versió del fitxer ha canviat. <br> Abans de continuar treballant, has de baixar el fitxer o copiar-ne el contingut per assegurar-te que no es perdi res i, després, torna a carregar aquesta pàgina.",
   "DE.Controllers.Main.errorUserDrop": "Ara no es pot accedir al fitxer.",
   "DE.Controllers.Main.errorUsersExceed": "S'ha superat el nombre d’usuaris que permet el teu pla",
-  "DE.Controllers.Main.errorViewerDisconnect": "S'ha perdut la connexió. Encara pots visualitzar el document, <br>però no el podràs baixar ni imprimir fins que no es restableixi la connexió i es torni a carregar la pàgina.",
+  "DE.Controllers.Main.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.Main.leavePageText": "Has fet canvis en aquest document que no s'han desat. Fes clic a \"Queda't en aquesta pàgina\" i, a continuació, \"Desar\" per desar-les. Fes clic a \"Deixar aquesta pàgina\" per descartar tots els canvis que no s'hagin desat.",
   "DE.Controllers.Main.leavePageTextOnClose": "Els canvis d'aquest document que no s'hagin desat es perdran. <br>Fes clic a \"Cancel·lar\" i, a continuació, \"Desar\" per desar-los. Fes clic a \"D'acord\" per descartar tots els canvis que no s'hagin desat.",
   "DE.Controllers.Main.loadFontsTextText": "S'estan carregant les dades...",
@@ -573,13 +580,13 @@
   "DE.Controllers.Main.printTextText": "S'està imprimint el document...",
   "DE.Controllers.Main.printTitleText": "S'està imprimint el document",
   "DE.Controllers.Main.reloadButtonText": "Torna a carregar la pàgina",
-  "DE.Controllers.Main.requestEditFailedMessageText": "Algú té obert ara aquest document. Intenta-ho més tard.",
+  "DE.Controllers.Main.requestEditFailedMessageText": "Algú té obert aquest document. Intenteu-ho més tard.",
   "DE.Controllers.Main.requestEditFailedTitleText": "Accés denegat",
   "DE.Controllers.Main.saveErrorText": "S'ha produït un error en desar el fitxer.",
   "DE.Controllers.Main.saveErrorTextDesktop": "Aquest fitxer no es pot desar o crear. <br>Les possibles raons són: <br>1. El fitxer és només de lectura. <br>2. El fitxer és en aquests moments obert per altres usuaris. <br>3. El disc és ple o s'ha fet malbé.",
   "DE.Controllers.Main.saveTextText": "S'està desant el document...",
   "DE.Controllers.Main.saveTitleText": "S'està desant el document",
-  "DE.Controllers.Main.scriptLoadError": "La connexió és massa lenta, alguns dels components no s’han pogut carregar. Torna a carregar la pàgina.",
+  "DE.Controllers.Main.scriptLoadError": "La connexió és massa lenta, alguns dels components no s’han pogut carregar. Torneu a carregar la pàgina.",
   "DE.Controllers.Main.sendMergeText": "S'està enviant la combinació...",
   "DE.Controllers.Main.sendMergeTitle": "S'està enviant la combinació",
   "DE.Controllers.Main.splitDividerErrorText": "El nombre de files ha de ser un divisor de %1.",
@@ -590,21 +597,22 @@
   "DE.Controllers.Main.textBuyNow": "Visitar el lloc web",
   "DE.Controllers.Main.textChangesSaved": "S'han desat tots els canvis",
   "DE.Controllers.Main.textClose": "Tanca",
-  "DE.Controllers.Main.textCloseTip": "Fes clic per tancar el consell",
+  "DE.Controllers.Main.textCloseTip": "Feu clic per tancar el consell",
   "DE.Controllers.Main.textContactUs": "Contacta amb vendes",
   "DE.Controllers.Main.textConvertEquation": "Aquesta equació es va crear amb una versió antiga de l'editor d'equacions que ja no és compatible. Per editar-la, converteix l’equació al format d’Office Math ML. <br>Vols convertir-ho ara?",
-  "DE.Controllers.Main.textCustomLoader": "Tingues en compte que, segons els termes de la llicència, no tens dret a canviar el carregador. <br>Contacta amb el nostre departament de vendes per obtenir un pressupost.",
+  "DE.Controllers.Main.textCustomLoader": "Tingueu en compte que, segons els termes de la llicència, no teniu dret a canviar el carregador. <br>Contacteu amb el nostre departament de vendes per obtenir un pressupost.",
   "DE.Controllers.Main.textDisconnect": "S'ha perdut la connexió",
   "DE.Controllers.Main.textGuest": "Convidat",
   "DE.Controllers.Main.textHasMacros": "El fitxer conté macros automàtiques. <br>Les vols executar?",
   "DE.Controllers.Main.textLearnMore": "Més informació",
   "DE.Controllers.Main.textLoadingDocument": "S'està carregant el document",
-  "DE.Controllers.Main.textLongName": "Introdueix un nom que tingui menys de 128 caràcters.",
+  "DE.Controllers.Main.textLongName": "Introduïu un nom que tingui menys de 128 caràcters.",
   "DE.Controllers.Main.textNoLicenseTitle": "S'ha assolit el límit de llicència",
   "DE.Controllers.Main.textPaidFeature": "Funció de pagament",
+  "DE.Controllers.Main.textReconnect": "S'ha restablert la connexió",
   "DE.Controllers.Main.textRemember": "Recorda la meva elecció per a tots els fitxers",
   "DE.Controllers.Main.textRenameError": "El nom d'usuari no pot estar buit.",
-  "DE.Controllers.Main.textRenameLabel": "Introdueix un nom que s'utilitzarà per a la col·laboració",
+  "DE.Controllers.Main.textRenameLabel": "Introduïu un nom que s'utilitzarà per a la col·laboració",
   "DE.Controllers.Main.textShape": "Forma",
   "DE.Controllers.Main.textStrict": "Mode estricte",
   "DE.Controllers.Main.textTryUndoRedo": "S'han desactivat les funcions desfés/refés per al mode de coedició ràpida. Fes clic al botó \"Mode estricte\" per canviar al mode de coedició estricte i editar el fitxer sense que hi hagi interferències d'altres usuaris i enviar els vostres canvis un cop els hagis desat. Pots canviar entre els modes de coedició mitjançant l'editor \"Paràmetres avançats\".",
@@ -621,7 +629,7 @@
   "DE.Controllers.Main.txtCallouts": "Crides",
   "DE.Controllers.Main.txtCharts": "Gràfics",
   "DE.Controllers.Main.txtChoose": "Tria un element",
-  "DE.Controllers.Main.txtClickToLoad": "Fes clic per carregar la imatge",
+  "DE.Controllers.Main.txtClickToLoad": "Feu clic per carregar la imatge",
   "DE.Controllers.Main.txtCurrentDocument": "Document actual",
   "DE.Controllers.Main.txtDiagramTitle": "Títol del gràfic",
   "DE.Controllers.Main.txtEditingMode": "Estableix el mode d'edició ...",
@@ -866,19 +874,20 @@
   "DE.Controllers.Main.uploadImageSizeMessage": "La imatge és massa gran. La mida màxima és de 25 MB.",
   "DE.Controllers.Main.uploadImageTextText": "S'està carregant la imatge...",
   "DE.Controllers.Main.uploadImageTitleText": "S'està carregant la imatge",
-  "DE.Controllers.Main.waitText": "Espera...",
+  "DE.Controllers.Main.waitText": "Espereu...",
   "DE.Controllers.Main.warnBrowserIE9": "L’aplicació té poca capacitat en IE9. Utilitza IE10 o superior",
   "DE.Controllers.Main.warnBrowserZoom": "La configuració de zoom actual del navegador no és compatible del tot. Restableix el zoom per defecte tot prement Ctrl+0.",
   "DE.Controllers.Main.warnLicenseExceeded": "Has arribat al límit de connexions simultànies amb %1 editors. Aquest document només s'obrirà en mode lectura. <br> Contacta amb el teu administrador per obtenir més informació.",
   "DE.Controllers.Main.warnLicenseExp": "La teva llicència ha caducat. <br>Actualitza la llicència i torna a carregar la pàgina.",
-  "DE.Controllers.Main.warnLicenseLimitedNoAccess": "La llicència ha caducat. <br>No tens accés a la funció d'edició de documents. <br>Contacta amb el teu administrador.",
-  "DE.Controllers.Main.warnLicenseLimitedRenewed": "Cal renovar la llicència. <br>Tens un accés limitat a la funció d'edició de documents. <br>Contacta amb el teu administrador per obtenir accés total",
+  "DE.Controllers.Main.warnLicenseLimitedNoAccess": "La llicència ha caducat. <br>No teniu accés a la funció d'edició de documents. <br>Contacteu amb l'administrador.",
+  "DE.Controllers.Main.warnLicenseLimitedRenewed": "Cal renovar la llicència. <br>Teniu accés limitat a la funció d'edició de documents. <br>Contacteu amb l'administrador per obtenir accés total",
   "DE.Controllers.Main.warnLicenseUsersExceeded": "Has arribat al límit d'usuari per a %1 editors. Contacta amb el teu administrador per a més informació.",
   "DE.Controllers.Main.warnNoLicense": "Has arribat al límit de connexions simultànies per als editors %1. Aquest document s'obrirà al mode de només lectura. Contacta l'equip de vendes %1 per a les condicions personals de millora del servei.",
   "DE.Controllers.Main.warnNoLicenseUsers": "Has arribat al límit d'usuaris per a %1 editors. Contacta amb l'equip de vendes de %1 per obtenir les condicions de millora personals dels teus serveis.",
   "DE.Controllers.Main.warnProcessRightsChange": "No tens permís per editar el fitxer.",
   "DE.Controllers.Navigation.txtBeginning": "Inici del document",
   "DE.Controllers.Navigation.txtGotoBeginning": "Ves al començament del document",
+  "DE.Controllers.Statusbar.textDisconnect": "S'ha perdut la connexió. S'està intentat connectar. Comproveu la configuració de connexió",
   "DE.Controllers.Statusbar.textHasChanges": "S'ha fet un seguiment dels canvis nous",
   "DE.Controllers.Statusbar.textSetTrackChanges": "Ets en mode de control de canvis",
   "DE.Controllers.Statusbar.textTrackChanges": "El document s'ha obert amb el mode de seguiment de canvis activat",
@@ -891,7 +900,7 @@
   "DE.Controllers.Toolbar.textBracket": "Claudàtors",
   "DE.Controllers.Toolbar.textEmptyImgUrl": "Cal especificar l'URL de la imatge.",
   "DE.Controllers.Toolbar.textEmptyMMergeUrl": "Cal especificar l’URL.",
-  "DE.Controllers.Toolbar.textFontSizeErr": "El valor introduït no és correcte. <br>Introdueix un valor numèric entre 1 i 300.",
+  "DE.Controllers.Toolbar.textFontSizeErr": "El valor introduït no és correcte.<br>Introduïu un valor numèric entre 1 i 300.",
   "DE.Controllers.Toolbar.textFraction": "Fraccions",
   "DE.Controllers.Toolbar.textFunction": "Funcions",
   "DE.Controllers.Toolbar.textGroup": "Agrupa",
@@ -902,10 +911,22 @@
   "DE.Controllers.Toolbar.textMatrix": "Matrius",
   "DE.Controllers.Toolbar.textOperator": "Operadors",
   "DE.Controllers.Toolbar.textRadical": "Radicals",
+  "DE.Controllers.Toolbar.textRecentlyUsed": "S'ha utilitzat recentment",
   "DE.Controllers.Toolbar.textScript": "Scripts",
   "DE.Controllers.Toolbar.textSymbols": "Símbols",
   "DE.Controllers.Toolbar.textTabForms": "Formularis",
   "DE.Controllers.Toolbar.textWarning": "Advertiment",
+  "DE.Controllers.Toolbar.tipMarkersArrow": "Pics de fletxa",
+  "DE.Controllers.Toolbar.tipMarkersCheckmark": "Pics de marca de selecció",
+  "DE.Controllers.Toolbar.tipMarkersDash": "Pics de guió",
+  "DE.Controllers.Toolbar.tipMarkersFRhombus": "Pics de rombes plens",
+  "DE.Controllers.Toolbar.tipMarkersFRound": "Pics rodons plens",
+  "DE.Controllers.Toolbar.tipMarkersFSquare": "Pics quadrats plens",
+  "DE.Controllers.Toolbar.tipMarkersHRound": "Pics rodons buits",
+  "DE.Controllers.Toolbar.tipMarkersStar": "Pics d'estrella",
+  "DE.Controllers.Toolbar.tipMultiLevelNumbered": "Pics numerats multinivell ",
+  "DE.Controllers.Toolbar.tipMultiLevelSymbols": "Pics de símbols multinivell",
+  "DE.Controllers.Toolbar.tipMultiLevelVarious": "Pics numerats de diferents nivells",
   "DE.Controllers.Toolbar.txtAccent_Accent": "Agut",
   "DE.Controllers.Toolbar.txtAccent_ArrowD": "Fletxa dreta-esquerra superior",
   "DE.Controllers.Toolbar.txtAccent_ArrowL": "Fletxa esquerra a sobre",
@@ -1224,7 +1245,7 @@
   "DE.Controllers.Toolbar.txtSymbol_vdots": "El·lipsi vertical",
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Ksi",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
-  "DE.Controllers.Viewport.textFitPage": "Ajusta a la pàgina",
+  "DE.Controllers.Viewport.textFitPage": "Ajusta-ho a la pàgina",
   "DE.Controllers.Viewport.textFitWidth": "Ajusta-ho a l'amplària",
   "DE.Controllers.Viewport.txtDarkMode": "Mode fosc",
   "DE.Views.AddNewCaptionLabelDialog.textLabel": "Etiqueta:",
@@ -1281,9 +1302,9 @@
   "DE.Views.ChartSettings.textUndock": "Desacobla del tauler",
   "DE.Views.ChartSettings.textWidth": "Amplada",
   "DE.Views.ChartSettings.textWrap": "Estil d'ajustament",
-  "DE.Views.ChartSettings.txtBehind": "Darrere",
-  "DE.Views.ChartSettings.txtInFront": "Davant",
-  "DE.Views.ChartSettings.txtInline": "En línia",
+  "DE.Views.ChartSettings.txtBehind": "Darrere el text",
+  "DE.Views.ChartSettings.txtInFront": "Davant del text",
+  "DE.Views.ChartSettings.txtInline": "En línia amb el text",
   "DE.Views.ChartSettings.txtSquare": "Quadrat",
   "DE.Views.ChartSettings.txtThrough": "A través",
   "DE.Views.ChartSettings.txtTight": "Estret",
@@ -1457,6 +1478,7 @@
   "DE.Views.DocumentHolder.textDistributeCols": "Distribueix les columnes",
   "DE.Views.DocumentHolder.textDistributeRows": "Distribueix les files",
   "DE.Views.DocumentHolder.textEditControls": "Configuració del control de contingut",
+  "DE.Views.DocumentHolder.textEditPoints": "Edita els punts",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Edita el límit de l’ajustament",
   "DE.Views.DocumentHolder.textFlipH": "Capgira horitzontalment",
   "DE.Views.DocumentHolder.textFlipV": "Capgira verticalment",
@@ -1505,6 +1527,14 @@
   "DE.Views.DocumentHolder.textUpdateTOC": "Actualitza la taula de continguts",
   "DE.Views.DocumentHolder.textWrap": "Estil d'ajustament",
   "DE.Views.DocumentHolder.tipIsLocked": "Un altre usuari té obert ara aquest element.",
+  "DE.Views.DocumentHolder.tipMarkersArrow": "Pics de fletxa",
+  "DE.Views.DocumentHolder.tipMarkersCheckmark": "Pics de marca de selecció",
+  "DE.Views.DocumentHolder.tipMarkersDash": "Pics de guió",
+  "DE.Views.DocumentHolder.tipMarkersFRhombus": "Pics de rombes plens",
+  "DE.Views.DocumentHolder.tipMarkersFRound": "Pics rodons plens",
+  "DE.Views.DocumentHolder.tipMarkersFSquare": "Pics quadrats plens",
+  "DE.Views.DocumentHolder.tipMarkersHRound": "Pics rodons buits",
+  "DE.Views.DocumentHolder.tipMarkersStar": "Pics d'estrella",
   "DE.Views.DocumentHolder.toDictionaryText": "Afegeix al diccionari",
   "DE.Views.DocumentHolder.txtAddBottom": "Afegeix una línia inferior",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Afegeix una barra de fracció",
@@ -1516,7 +1546,7 @@
   "DE.Views.DocumentHolder.txtAddTop": "Afegeix una vora superior",
   "DE.Views.DocumentHolder.txtAddVer": "Afegeix una línia vertical",
   "DE.Views.DocumentHolder.txtAlignToChar": "Alineació al caràcter",
-  "DE.Views.DocumentHolder.txtBehind": "Darrere",
+  "DE.Views.DocumentHolder.txtBehind": "Darrere el text",
   "DE.Views.DocumentHolder.txtBorderProps": "Propietats de la vora",
   "DE.Views.DocumentHolder.txtBottom": "Part inferior",
   "DE.Views.DocumentHolder.txtColumnAlign": "Alineació de la columna",
@@ -1552,8 +1582,8 @@
   "DE.Views.DocumentHolder.txtHideTopLimit": "Amaga el límit superior",
   "DE.Views.DocumentHolder.txtHideVer": "Amaga la línia vertical",
   "DE.Views.DocumentHolder.txtIncreaseArg": "Augmenta la mida de l'argument",
-  "DE.Views.DocumentHolder.txtInFront": "Davant",
-  "DE.Views.DocumentHolder.txtInline": "En línia",
+  "DE.Views.DocumentHolder.txtInFront": "Davant del text",
+  "DE.Views.DocumentHolder.txtInline": "En línia amb el text",
   "DE.Views.DocumentHolder.txtInsertArgAfter": "Insereix un argument després",
   "DE.Views.DocumentHolder.txtInsertArgBefore": "Insereix un argument abans",
   "DE.Views.DocumentHolder.txtInsertBreak": "Insereix un salt manual",
@@ -1569,13 +1599,13 @@
   "DE.Views.DocumentHolder.txtOverbar": "Barra sobre el text",
   "DE.Views.DocumentHolder.txtOverwriteCells": "Sobreescriu les cel·les",
   "DE.Views.DocumentHolder.txtPasteSourceFormat": "Conserva el format original",
-  "DE.Views.DocumentHolder.txtPressLink": "Prem CTRL i fes clic a l'enllaç",
+  "DE.Views.DocumentHolder.txtPressLink": "Premeu CTRL i feu clic a l'enllaç",
   "DE.Views.DocumentHolder.txtPrintSelection": "Imprimeix la selecció",
   "DE.Views.DocumentHolder.txtRemFractionBar": "Suprimeix la barra de fracció",
   "DE.Views.DocumentHolder.txtRemLimit": "Suprimeix el límit",
   "DE.Views.DocumentHolder.txtRemoveAccentChar": "Suprimeix el caràcter d'accent",
   "DE.Views.DocumentHolder.txtRemoveBar": "Suprimeix la barra",
-  "DE.Views.DocumentHolder.txtRemoveWarning": "Vols eliminar aquesta signatura? <br>No es podrà desfer.",
+  "DE.Views.DocumentHolder.txtRemoveWarning": "Voleu eliminar aquesta signatura?<br>No es podrà desfer.",
   "DE.Views.DocumentHolder.txtRemScripts": "Suprimeix els scripts",
   "DE.Views.DocumentHolder.txtRemSubscript": "Suprimeix el subíndex",
   "DE.Views.DocumentHolder.txtRemSuperscript": "Suprimeix el superíndex",
@@ -1595,7 +1625,7 @@
   "DE.Views.DocumentHolder.txtTopAndBottom": "Superior i inferior",
   "DE.Views.DocumentHolder.txtUnderbar": "Barra sota el text",
   "DE.Views.DocumentHolder.txtUngroup": "Desagrupa",
-  "DE.Views.DocumentHolder.txtWarnUrl": "Si fas clic en aquest enllaç, pots perjudicar el dispositiu i les dades. <br>Segur que vols continuar?",
+  "DE.Views.DocumentHolder.txtWarnUrl": "Si feu clic en aquest enllaç podeu perjudicar el dispositiu i les dades. <br> Segur que voleu continuar?",
   "DE.Views.DocumentHolder.updateStyleText": "Actualitzar estil %1",
   "DE.Views.DocumentHolder.vertAlignText": "Alineació vertical",
   "DE.Views.DropcapSettingsAdvanced.strBorders": "Vores i emplenament",
@@ -1606,7 +1636,7 @@
   "DE.Views.DropcapSettingsAdvanced.textAuto": "Automàtic",
   "DE.Views.DropcapSettingsAdvanced.textBackColor": "Color de fons",
   "DE.Views.DropcapSettingsAdvanced.textBorderColor": "Color de la vora",
-  "DE.Views.DropcapSettingsAdvanced.textBorderDesc": "Fes clic en el diagrama o utilitza els botons per seleccionar les vores",
+  "DE.Views.DropcapSettingsAdvanced.textBorderDesc": "Feu clic en el diagrama o utilitzeu els botons per seleccionar les vores",
   "DE.Views.DropcapSettingsAdvanced.textBorderWidth": "Mida de la vora",
   "DE.Views.DropcapSettingsAdvanced.textBottom": "Part inferior",
   "DE.Views.DropcapSettingsAdvanced.textCenter": "Centra",
@@ -1696,7 +1726,7 @@
   "DE.Views.FileMenuPanels.ProtectDoc.strProtect": "Protegeix el document",
   "DE.Views.FileMenuPanels.ProtectDoc.strSignature": "Amb signatura",
   "DE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Edita el document",
-  "DE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "L’edició eliminarà les signatures del document. <br>Segur que vols continuar?",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "L’edició eliminarà les signatures del document. <br>Voleu continuar?",
   "DE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "Aquest document està protegit amb contrasenya",
   "DE.Views.FileMenuPanels.ProtectDoc.txtRequestedSignatures": "Aquest document s'ha de signar.",
   "DE.Views.FileMenuPanels.ProtectDoc.txtSigned": "S'han afegit signatures vàlides al document. El document està protegit contra l'edició.",
@@ -1744,7 +1774,7 @@
   "DE.Views.FileMenuPanels.Settings.txtChangesTip": "Mostra en passar el cursor per damunt dels indicadors de funció",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Centímetre",
   "DE.Views.FileMenuPanels.Settings.txtDarkMode": "Activa el mode fosc del document",
-  "DE.Views.FileMenuPanels.Settings.txtFitPage": "Ajusta a la pàgina",
+  "DE.Views.FileMenuPanels.Settings.txtFitPage": "Ajusta-ho a la pàgina",
   "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Ajusta-ho a l'amplària",
   "DE.Views.FileMenuPanels.Settings.txtInch": "Polzada",
   "DE.Views.FileMenuPanels.Settings.txtInput": "Entrada alternativa",
@@ -1820,7 +1850,7 @@
   "DE.Views.FormsTab.textGotIt": "Ho tinc",
   "DE.Views.FormsTab.textHighlight": "Ressalta la configuració",
   "DE.Views.FormsTab.textNoHighlight": "Sense ressaltar",
-  "DE.Views.FormsTab.textRequired": "Emplena tots els camps necessaris per enviar el formulari.",
+  "DE.Views.FormsTab.textRequired": "Empleneu tots els camps necessaris per enviar el formulari.",
   "DE.Views.FormsTab.textSubmited": "El formulari s'ha enviat correctament",
   "DE.Views.FormsTab.tipCheckBox": "Insereix una casella de selecció",
   "DE.Views.FormsTab.tipComboBox": "Insereix un quadre combinat",
@@ -1871,9 +1901,10 @@
   "DE.Views.ImageSettings.textCrop": "Retalla",
   "DE.Views.ImageSettings.textCropFill": "Emplena",
   "DE.Views.ImageSettings.textCropFit": "Ajusta",
+  "DE.Views.ImageSettings.textCropToShape": "Escapça per donar forma",
   "DE.Views.ImageSettings.textEdit": "Edita",
   "DE.Views.ImageSettings.textEditObject": "Edita l'objecte",
-  "DE.Views.ImageSettings.textFitMargins": "Ajusta al marge",
+  "DE.Views.ImageSettings.textFitMargins": "Ajusta-ho al marge",
   "DE.Views.ImageSettings.textFlip": "Capgira",
   "DE.Views.ImageSettings.textFromFile": "Des d'un fitxer",
   "DE.Views.ImageSettings.textFromStorage": "Des de l’emmagatzematge",
@@ -1885,14 +1916,15 @@
   "DE.Views.ImageSettings.textHintFlipV": "Capgira verticalment",
   "DE.Views.ImageSettings.textInsert": "Substitueix la imatge",
   "DE.Views.ImageSettings.textOriginalSize": "Mida real",
+  "DE.Views.ImageSettings.textRecentlyUsed": "S'ha utilitzat recentment",
   "DE.Views.ImageSettings.textRotate90": "Gira 90°",
   "DE.Views.ImageSettings.textRotation": "Rotació",
   "DE.Views.ImageSettings.textSize": "Mida",
   "DE.Views.ImageSettings.textWidth": "Amplada",
   "DE.Views.ImageSettings.textWrap": "Estil d'ajustament",
-  "DE.Views.ImageSettings.txtBehind": "Darrere",
-  "DE.Views.ImageSettings.txtInFront": "Davant",
-  "DE.Views.ImageSettings.txtInline": "En línia",
+  "DE.Views.ImageSettings.txtBehind": "Darrere el text",
+  "DE.Views.ImageSettings.txtInFront": "Davant del text",
+  "DE.Views.ImageSettings.txtInline": "En línia amb el text",
   "DE.Views.ImageSettings.txtSquare": "Quadrat",
   "DE.Views.ImageSettings.txtThrough": "A través",
   "DE.Views.ImageSettings.txtTight": "Estret",
@@ -1965,9 +1997,9 @@
   "DE.Views.ImageSettingsAdvanced.textWeightArrows": "Pesos i fletxes",
   "DE.Views.ImageSettingsAdvanced.textWidth": "Amplada",
   "DE.Views.ImageSettingsAdvanced.textWrap": "Estil d'ajustament",
-  "DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "Darrere",
-  "DE.Views.ImageSettingsAdvanced.textWrapInFrontTooltip": "Davant",
-  "DE.Views.ImageSettingsAdvanced.textWrapInlineTooltip": "En línia",
+  "DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "Darrere el text",
+  "DE.Views.ImageSettingsAdvanced.textWrapInFrontTooltip": "Davant del text",
+  "DE.Views.ImageSettingsAdvanced.textWrapInlineTooltip": "En línia amb el text",
   "DE.Views.ImageSettingsAdvanced.textWrapSquareTooltip": "Quadrat",
   "DE.Views.ImageSettingsAdvanced.textWrapThroughTooltip": "A través",
   "DE.Views.ImageSettingsAdvanced.textWrapTightTooltip": "Estret",
@@ -2006,8 +2038,8 @@
   "DE.Views.Links.capBtnInsFootnote": "Nota al peu de pàgina",
   "DE.Views.Links.capBtnInsLink": "Enllaç",
   "DE.Views.Links.capBtnTOF": "Índex d'il·lustracions",
-  "DE.Views.Links.confirmDeleteFootnotes": "Vols suprimir totes les notes al peu de pàgina?",
-  "DE.Views.Links.confirmReplaceTOF": "Vols substituir la taula de figures seleccionada?",
+  "DE.Views.Links.confirmDeleteFootnotes": "Voleu suprimir totes les notes al peu de pàgina?",
+  "DE.Views.Links.confirmReplaceTOF": "Voleu substituir la taula de figures seleccionada?",
   "DE.Views.Links.mniConvertNote": "Converteix totes les notes",
   "DE.Views.Links.mniDelFootnote": "Suprimeix totes les notes",
   "DE.Views.Links.mniInsEndnote": "Insereix una nota al final",
@@ -2063,7 +2095,7 @@
   "DE.Views.MailMergeEmailDlg.textTitle": "Envia per correu electrònic",
   "DE.Views.MailMergeEmailDlg.textTo": "Per a",
   "DE.Views.MailMergeEmailDlg.textWarning": "Advertiment!",
-  "DE.Views.MailMergeEmailDlg.textWarningMsg": "Tingues en compte que el correu no es podrà aturar un cop hagis fet clic en el botó \"Envia\".",
+  "DE.Views.MailMergeEmailDlg.textWarningMsg": "Tingueu en compte que el correu no es podrà aturar un cop hàgiu fet clic en el botó \"Envia\".",
   "DE.Views.MailMergeSettings.downloadMergeTitle": "S'està combinant",
   "DE.Views.MailMergeSettings.errorMailMergeSaveFile": "No s'ha pogut combinar.",
   "DE.Views.MailMergeSettings.notcriticalErrorTitle": "Advertiment",
@@ -2087,7 +2119,7 @@
   "DE.Views.MailMergeSettings.textPortal": "Desa",
   "DE.Views.MailMergeSettings.textPreview": "Visualització prèvia dels resultats",
   "DE.Views.MailMergeSettings.textReadMore": "Més informació",
-  "DE.Views.MailMergeSettings.textSendMsg": "Tots els missatges de correu electrònic són a punt i s'enviaran aviat. <br>La velocitat de l'enviament dependrà del servei de correu. <br>Pots continuar treballant amb el document o tancar-lo. Un cop finalitzada l’operació, es trametrà la notificació a la teva adreça de correu electrònic de registre.",
+  "DE.Views.MailMergeSettings.textSendMsg": "Tots els missatges de correu electrònic són a punt i s'enviaran aviat. <br>La velocitat de l'enviament dependrà del servei de correu. <br>Podeu continuar treballant amb el document o tancar-lo. Un cop finalitzada l’operació, es trametrà la notificació a la vostra adreça de correu electrònic.",
   "DE.Views.MailMergeSettings.textTo": "Per a",
   "DE.Views.MailMergeSettings.txtFirst": "Al primer registre",
   "DE.Views.MailMergeSettings.txtFromToError": "El valor «De» ha de ser més petit que el valor «Fins a»",
@@ -2155,6 +2187,11 @@
   "DE.Views.PageSizeDialog.textTitle": "Mida de la pàgina",
   "DE.Views.PageSizeDialog.textWidth": "Amplada",
   "DE.Views.PageSizeDialog.txtCustom": "Personalitzat",
+  "DE.Views.PageThumbnails.textClosePanel": "Tanca les presentacions de miniatures de la pàgina",
+  "DE.Views.PageThumbnails.textHighlightVisiblePart": "Ressalta la part visible de la pàgina",
+  "DE.Views.PageThumbnails.textPageThumbnails": "Miniatures de la pàgina",
+  "DE.Views.PageThumbnails.textThumbnailsSettings": "Configuració de les miniatures",
+  "DE.Views.PageThumbnails.textThumbnailsSize": "Mida de les miniatures",
   "DE.Views.ParagraphSettings.strIndent": "Sagnats",
   "DE.Views.ParagraphSettings.strIndentsLeftText": "Esquerra",
   "DE.Views.ParagraphSettings.strIndentsRightText": "Dreta",
@@ -2209,7 +2246,7 @@
   "DE.Views.ParagraphSettingsAdvanced.textBackColor": "Color de fons",
   "DE.Views.ParagraphSettingsAdvanced.textBodyText": "Text bàsic",
   "DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Color de la vora",
-  "DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Fes clic en el diagrama o utilitza els botons per seleccionar les vores i aplica-ho l'estil escollit",
+  "DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Feu clic en el diagrama o utilitzeu els botons per seleccionar les vores i apliqueu-ho l'estil escollit",
   "DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Mida de la vora",
   "DE.Views.ParagraphSettingsAdvanced.textBottom": "Part inferior",
   "DE.Views.ParagraphSettingsAdvanced.textCentered": "Centrat",
@@ -2270,7 +2307,7 @@
   "DE.Views.ShapeSettings.strType": "Tipus",
   "DE.Views.ShapeSettings.textAdvanced": "Mostra la configuració avançada",
   "DE.Views.ShapeSettings.textAngle": "Angle",
-  "DE.Views.ShapeSettings.textBorderSizeErr": "El valor introduït no és correcte. <br>Introdueix un valor entre 0 pt i 1584 pt.",
+  "DE.Views.ShapeSettings.textBorderSizeErr": "El valor introduït no és correcte.<br>Introduïu un valor entre 0 pt i 1584 pt.",
   "DE.Views.ShapeSettings.textColor": "Color d'emplenament",
   "DE.Views.ShapeSettings.textDirection": "Direcció",
   "DE.Views.ShapeSettings.textEmptyPattern": "Sense patró",
@@ -2282,7 +2319,7 @@
   "DE.Views.ShapeSettings.textGradientFill": "Emplenament de gradient",
   "DE.Views.ShapeSettings.textHint270": "Gira 90° a l'esquerra",
   "DE.Views.ShapeSettings.textHint90": "Gira 90° a la dreta",
-  "DE.Views.ShapeSettings.textHintFlipH": "Capgirar horitzontalment",
+  "DE.Views.ShapeSettings.textHintFlipH": "Capgira horitzontalment",
   "DE.Views.ShapeSettings.textHintFlipV": "Capgira verticalment",
   "DE.Views.ShapeSettings.textImageTexture": "Imatge o textura",
   "DE.Views.ShapeSettings.textLinear": "Lineal",
@@ -2290,6 +2327,7 @@
   "DE.Views.ShapeSettings.textPatternFill": "Patró",
   "DE.Views.ShapeSettings.textPosition": "Posició",
   "DE.Views.ShapeSettings.textRadial": "Radial",
+  "DE.Views.ShapeSettings.textRecentlyUsed": "S'ha utilitzat recentment",
   "DE.Views.ShapeSettings.textRotate90": "Gira 90°",
   "DE.Views.ShapeSettings.textRotation": "Rotació",
   "DE.Views.ShapeSettings.textSelectImage": "Selecciona una imatge",
@@ -2301,7 +2339,7 @@
   "DE.Views.ShapeSettings.textWrap": "Estil d'ajustament",
   "DE.Views.ShapeSettings.tipAddGradientPoint": "Afegeix un punt de degradat",
   "DE.Views.ShapeSettings.tipRemoveGradientPoint": "Suprimeix el punt de degradat",
-  "DE.Views.ShapeSettings.txtBehind": "Darrere",
+  "DE.Views.ShapeSettings.txtBehind": "Darrere el text",
   "DE.Views.ShapeSettings.txtBrownPaper": "Paper marró",
   "DE.Views.ShapeSettings.txtCanvas": "Llenç",
   "DE.Views.ShapeSettings.txtCarton": "Cartró",
@@ -2309,8 +2347,8 @@
   "DE.Views.ShapeSettings.txtGrain": "Gra",
   "DE.Views.ShapeSettings.txtGranite": "Granit",
   "DE.Views.ShapeSettings.txtGreyPaper": "Paper gris",
-  "DE.Views.ShapeSettings.txtInFront": "Davant",
-  "DE.Views.ShapeSettings.txtInline": "En línia",
+  "DE.Views.ShapeSettings.txtInFront": "Davant del text",
+  "DE.Views.ShapeSettings.txtInline": "En línia amb el text",
   "DE.Views.ShapeSettings.txtKnit": "Teixit",
   "DE.Views.ShapeSettings.txtLeather": "Pell",
   "DE.Views.ShapeSettings.txtNoBorders": "Sense línia",
@@ -2331,14 +2369,14 @@
   "DE.Views.SignatureSettings.strSigner": "Signant",
   "DE.Views.SignatureSettings.strValid": "Signatures vàlides",
   "DE.Views.SignatureSettings.txtContinueEditing": "Edita de totes maneres",
-  "DE.Views.SignatureSettings.txtEditWarning": "L’edició eliminarà les signatures del document. <br>Segur que vols continuar?",
-  "DE.Views.SignatureSettings.txtRemoveWarning": "Vols eliminar aquesta signatura? <br>No es podrà desfer.",
+  "DE.Views.SignatureSettings.txtEditWarning": "L’edició eliminarà les signatures del document. <br>Voleu continuar?",
+  "DE.Views.SignatureSettings.txtRemoveWarning": "Voleu eliminar aquesta signatura?<br>No es podrà desfer.",
   "DE.Views.SignatureSettings.txtRequestedSignatures": "Aquest document s'ha de signar.",
   "DE.Views.SignatureSettings.txtSigned": "S'han afegit signatures vàlides al document. El document està protegit contra l'edició.",
   "DE.Views.SignatureSettings.txtSignedInvalid": "Algunes de les signatures digitals del document no són vàlides o no s’han pogut verificar. El document està protegit contra l'edició.",
   "DE.Views.Statusbar.goToPageText": "Ves a la pàgina",
   "DE.Views.Statusbar.pageIndexText": "Pàgina {0} de {1}",
-  "DE.Views.Statusbar.tipFitPage": "Ajusta a la pàgina",
+  "DE.Views.Statusbar.tipFitPage": "Ajusta-ho a la pàgina",
   "DE.Views.Statusbar.tipFitWidth": "Ajusta-ho a l'amplària",
   "DE.Views.Statusbar.tipSetLang": "Estableix l'idioma del text",
   "DE.Views.Statusbar.tipZoomFactor": "Zoom",
@@ -2455,7 +2493,7 @@
   "DE.Views.TableSettingsAdvanced.textBackColor": "Fons de la cel·la",
   "DE.Views.TableSettingsAdvanced.textBelow": "més avall",
   "DE.Views.TableSettingsAdvanced.textBorderColor": "Color de la vora",
-  "DE.Views.TableSettingsAdvanced.textBorderDesc": "Fes clic en el diagrama o utilitza els botons per seleccionar les vores i aplica-ho l'estil escollit",
+  "DE.Views.TableSettingsAdvanced.textBorderDesc": "Feu clic en el diagrama o utilitzeu els botons per seleccionar les vores i apliqueu-ho l'estil escollit",
   "DE.Views.TableSettingsAdvanced.textBordersBackgroung": "Vores i fons",
   "DE.Views.TableSettingsAdvanced.textBorderWidth": "Mida de la vora",
   "DE.Views.TableSettingsAdvanced.textBottom": "Part inferior",
@@ -2530,7 +2568,7 @@
   "DE.Views.TextArtSettings.strTransparency": "Opacitat",
   "DE.Views.TextArtSettings.strType": "Tipus",
   "DE.Views.TextArtSettings.textAngle": "Angle",
-  "DE.Views.TextArtSettings.textBorderSizeErr": "El valor introduït no és correcte. <br>Introdueix un valor entre 0 pt i 1584 pt.",
+  "DE.Views.TextArtSettings.textBorderSizeErr": "El valor introduït no és correcte.<br>Introduïu un valor entre 0 pt i 1584 pt.",
   "DE.Views.TextArtSettings.textColor": "Color d'emplenament",
   "DE.Views.TextArtSettings.textDirection": "Direcció",
   "DE.Views.TextArtSettings.textGradient": "Degradat",
@@ -2681,6 +2719,7 @@
   "DE.Views.Toolbar.textTabLinks": "Referències",
   "DE.Views.Toolbar.textTabProtect": "Protecció",
   "DE.Views.Toolbar.textTabReview": "Revisió",
+  "DE.Views.Toolbar.textTabView": "Visualització",
   "DE.Views.Toolbar.textTitleError": "Error",
   "DE.Views.Toolbar.textToCurrent": "A la posició actual",
   "DE.Views.Toolbar.textTop": "Superior:",
@@ -2742,7 +2781,7 @@
   "DE.Views.Toolbar.tipSendBackward": "Envia cap enrere",
   "DE.Views.Toolbar.tipSendForward": "Porta endavant",
   "DE.Views.Toolbar.tipShowHiddenChars": "Caràcters que no es poden imprimir",
-  "DE.Views.Toolbar.tipSynchronize": "Un altre usuari ha canviat el document. Fes clic per desar els canvis i carregar les actualitzacions.",
+  "DE.Views.Toolbar.tipSynchronize": "Un altre usuari ha canviat el document. Feu clic per desar els canvis i carregar les actualitzacions.",
   "DE.Views.Toolbar.tipUndo": "Desfer",
   "DE.Views.Toolbar.tipWatermark": "Edita la filigrana",
   "DE.Views.Toolbar.txtDistribHor": "Distribueix horitzontalment",
@@ -2772,6 +2811,15 @@
   "DE.Views.Toolbar.txtScheme7": "Equitat",
   "DE.Views.Toolbar.txtScheme8": "Flux",
   "DE.Views.Toolbar.txtScheme9": "Foneria",
+  "DE.Views.ViewTab.textAlwaysShowToolbar": "Mostra sempre la barra",
+  "DE.Views.ViewTab.textDarkDocument": "Document fosc",
+  "DE.Views.ViewTab.textFitToPage": "Ajusta-ho a la pàgina",
+  "DE.Views.ViewTab.textFitToWidth": "Ajusta-ho a l'amplària",
+  "DE.Views.ViewTab.textInterfaceTheme": "Tema de la interfície",
+  "DE.Views.ViewTab.textNavigation": "Navegació",
+  "DE.Views.ViewTab.textRulers": "Regles",
+  "DE.Views.ViewTab.textStatusBar": "Barra d'estat",
+  "DE.Views.ViewTab.textZoom": "Zoom",
   "DE.Views.WatermarkSettingsDialog.textAuto": "Automàtic",
   "DE.Views.WatermarkSettingsDialog.textBold": "Negreta",
   "DE.Views.WatermarkSettingsDialog.textColor": "Color del text",

apps/documenteditor/main/locale/cs.json

@@ -1743,6 +1743,7 @@
   "DE.Views.FileMenuPanels.Settings.txtChangesBalloons": "Zobrazit kliknutím do bublin",
   "DE.Views.FileMenuPanels.Settings.txtChangesTip": "Zobrazit najetím na popisky",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Centimetr",
+  "DE.Views.FileMenuPanels.Settings.txtDarkMode": "Zapnout pro dokument tmavý režim",
   "DE.Views.FileMenuPanels.Settings.txtFitPage": "Přizpůsobit stránce",
   "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Přizpůsobit šířce",
   "DE.Views.FileMenuPanels.Settings.txtInch": "Palce",
@@ -1809,7 +1810,7 @@
   "DE.Views.FormsTab.capBtnNext": "Následující pole",
   "DE.Views.FormsTab.capBtnPrev": "Předchozí pole",
   "DE.Views.FormsTab.capBtnRadioBox": "Přepínač",
-  "DE.Views.FormsTab.capBtnSaveForm": "Uložit jako formulář",
+  "DE.Views.FormsTab.capBtnSaveForm": "Uložit jako oform",
   "DE.Views.FormsTab.capBtnSubmit": "Potvrdit",
   "DE.Views.FormsTab.capBtnText": "Textové pole",
   "DE.Views.FormsTab.capBtnView": "Zobrazit formulář",

apps/documenteditor/main/locale/en.json

@@ -121,6 +121,7 @@
   "Common.define.chartData.textScatterSmoothMarker": "Scatter with smooth lines and markers",
   "Common.define.chartData.textStock": "Stock",
   "Common.define.chartData.textSurface": "Surface",
+  "Common.Translation.textMoreButton": "More",
   "Common.Translation.warnFileLocked": "You can't edit this file because it's being edited in another app.",
   "Common.Translation.warnFileLockedBtnEdit": "Create a copy",
   "Common.Translation.warnFileLockedBtnView": "Open for viewing",
@@ -1302,9 +1303,9 @@
   "DE.Views.ChartSettings.textUndock": "Undock from panel",
   "DE.Views.ChartSettings.textWidth": "Width",
   "DE.Views.ChartSettings.textWrap": "Wrapping Style",
-  "DE.Views.ChartSettings.txtBehind": "Behind",
-  "DE.Views.ChartSettings.txtInFront": "In front",
-  "DE.Views.ChartSettings.txtInline": "Inline",
+  "DE.Views.ChartSettings.txtBehind": "Behind Text",
+  "DE.Views.ChartSettings.txtInFront": "In Front of Text",
+  "DE.Views.ChartSettings.txtInline": "In Line with Text",
   "DE.Views.ChartSettings.txtSquare": "Square",
   "DE.Views.ChartSettings.txtThrough": "Through",
   "DE.Views.ChartSettings.txtTight": "Tight",
@@ -1546,7 +1547,7 @@
   "DE.Views.DocumentHolder.txtAddTop": "Add top border",
   "DE.Views.DocumentHolder.txtAddVer": "Add vertical line",
   "DE.Views.DocumentHolder.txtAlignToChar": "Align to character",
-  "DE.Views.DocumentHolder.txtBehind": "Behind",
+  "DE.Views.DocumentHolder.txtBehind": "Behind Text",
   "DE.Views.DocumentHolder.txtBorderProps": "Border properties",
   "DE.Views.DocumentHolder.txtBottom": "Bottom",
   "DE.Views.DocumentHolder.txtColumnAlign": "Column alignment",
@@ -1582,8 +1583,8 @@
   "DE.Views.DocumentHolder.txtHideTopLimit": "Hide top limit",
   "DE.Views.DocumentHolder.txtHideVer": "Hide vertical line",
   "DE.Views.DocumentHolder.txtIncreaseArg": "Increase argument size",
-  "DE.Views.DocumentHolder.txtInFront": "In front",
-  "DE.Views.DocumentHolder.txtInline": "Inline",
+  "DE.Views.DocumentHolder.txtInFront": "In Front of Text",
+  "DE.Views.DocumentHolder.txtInline": "In Line with Text",
   "DE.Views.DocumentHolder.txtInsertArgAfter": "Insert argument after",
   "DE.Views.DocumentHolder.txtInsertArgBefore": "Insert argument before",
   "DE.Views.DocumentHolder.txtInsertBreak": "Insert manual break",
@@ -1922,9 +1923,9 @@
   "DE.Views.ImageSettings.textSize": "Size",
   "DE.Views.ImageSettings.textWidth": "Width",
   "DE.Views.ImageSettings.textWrap": "Wrapping Style",
-  "DE.Views.ImageSettings.txtBehind": "Behind",
-  "DE.Views.ImageSettings.txtInFront": "In front",
-  "DE.Views.ImageSettings.txtInline": "Inline",
+  "DE.Views.ImageSettings.txtBehind": "Behind Text",
+  "DE.Views.ImageSettings.txtInFront": "In Front of Text",
+  "DE.Views.ImageSettings.txtInline": "In Line with Text",
   "DE.Views.ImageSettings.txtSquare": "Square",
   "DE.Views.ImageSettings.txtThrough": "Through",
   "DE.Views.ImageSettings.txtTight": "Tight",
@@ -1997,9 +1998,9 @@
   "DE.Views.ImageSettingsAdvanced.textWeightArrows": "Weights & Arrows",
   "DE.Views.ImageSettingsAdvanced.textWidth": "Width",
   "DE.Views.ImageSettingsAdvanced.textWrap": "Wrapping Style",
-  "DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "Behind",
-  "DE.Views.ImageSettingsAdvanced.textWrapInFrontTooltip": "In front",
-  "DE.Views.ImageSettingsAdvanced.textWrapInlineTooltip": "Inline",
+  "DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "Behind Text",
+  "DE.Views.ImageSettingsAdvanced.textWrapInFrontTooltip": "In Front of Text",
+  "DE.Views.ImageSettingsAdvanced.textWrapInlineTooltip": "In Line with Text",
   "DE.Views.ImageSettingsAdvanced.textWrapSquareTooltip": "Square",
   "DE.Views.ImageSettingsAdvanced.textWrapThroughTooltip": "Through",
   "DE.Views.ImageSettingsAdvanced.textWrapTightTooltip": "Tight",
@@ -2339,7 +2340,7 @@
   "DE.Views.ShapeSettings.textWrap": "Wrapping Style",
   "DE.Views.ShapeSettings.tipAddGradientPoint": "Add gradient point",
   "DE.Views.ShapeSettings.tipRemoveGradientPoint": "Remove gradient point",
-  "DE.Views.ShapeSettings.txtBehind": "Behind",
+  "DE.Views.ShapeSettings.txtBehind": "Behind Text",
   "DE.Views.ShapeSettings.txtBrownPaper": "Brown Paper",
   "DE.Views.ShapeSettings.txtCanvas": "Canvas",
   "DE.Views.ShapeSettings.txtCarton": "Carton",
@@ -2347,8 +2348,8 @@
   "DE.Views.ShapeSettings.txtGrain": "Grain",
   "DE.Views.ShapeSettings.txtGranite": "Granite",
   "DE.Views.ShapeSettings.txtGreyPaper": "Gray Paper",
-  "DE.Views.ShapeSettings.txtInFront": "In front",
-  "DE.Views.ShapeSettings.txtInline": "Inline",
+  "DE.Views.ShapeSettings.txtInFront": "In Front of Text",
+  "DE.Views.ShapeSettings.txtInline": "In Line with Text",
   "DE.Views.ShapeSettings.txtKnit": "Knit",
   "DE.Views.ShapeSettings.txtLeather": "Leather",
   "DE.Views.ShapeSettings.txtNoBorders": "No Line",
@@ -2608,7 +2609,7 @@
   "DE.Views.Toolbar.capBtnInsControls": "Content Controls",
   "DE.Views.Toolbar.capBtnInsDropcap": "Drop Cap",
   "DE.Views.Toolbar.capBtnInsEquation": "Equation",
-  "DE.Views.Toolbar.capBtnInsHeader": "Header/Footer",
+  "DE.Views.Toolbar.capBtnInsHeader": "Header & Footer",
   "DE.Views.Toolbar.capBtnInsImage": "Image",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Breaks",
   "DE.Views.Toolbar.capBtnInsShape": "Shape",

apps/documenteditor/main/locale/es.json

@@ -52,9 +52,9 @@
   "Common.Controllers.ReviewChanges.textOffGlobal": "{0} ha deshabilitado el seguimiento de cambios para todos.",
   "Common.Controllers.ReviewChanges.textOn": "{0} está usando ahora el seguimiento de cambios.",
   "Common.Controllers.ReviewChanges.textOnGlobal": "{0} ha habilitado el seguimiento de cambios para todos.",
-  "Common.Controllers.ReviewChanges.textParaDeleted": "<b>Párrafo Eliminado</b>",
+  "Common.Controllers.ReviewChanges.textParaDeleted": "<b>Párrafo eliminado</b>",
   "Common.Controllers.ReviewChanges.textParaFormatted": "Paragraph Formatted",
-  "Common.Controllers.ReviewChanges.textParaInserted": "<b>Párrafo Insertado</b>",
+  "Common.Controllers.ReviewChanges.textParaInserted": "<b>Párrafo insertado</b>",
   "Common.Controllers.ReviewChanges.textParaMoveFromDown": "<b>Bajado:</b>",
   "Common.Controllers.ReviewChanges.textParaMoveFromUp": "<b>Subido:</b>",
   "Common.Controllers.ReviewChanges.textParaMoveTo": "<b>Movido:</b>",
@@ -70,9 +70,9 @@
   "Common.Controllers.ReviewChanges.textStrikeout": "Tachado",
   "Common.Controllers.ReviewChanges.textSubScript": "Subíndice",
   "Common.Controllers.ReviewChanges.textSuperScript": "Sobreíndice",
-  "Common.Controllers.ReviewChanges.textTableChanged": "<b>Se cambió configuración de la tabla</b>",
-  "Common.Controllers.ReviewChanges.textTableRowsAdd": "<b>Se añadieron filas de la tabla</b>",
-  "Common.Controllers.ReviewChanges.textTableRowsDel": "<b>Se eliminaron filas de la tabla</b>",
+  "Common.Controllers.ReviewChanges.textTableChanged": "<b>Se ha cambiado la configuración de la tabla</b>",
+  "Common.Controllers.ReviewChanges.textTableRowsAdd": "<b>Se han añadido filas a la tabla</b>",
+  "Common.Controllers.ReviewChanges.textTableRowsDel": "<b>Se han eliminado filas de la tabla</b>",
   "Common.Controllers.ReviewChanges.textTabs": "Cambiar tabuladores",
   "Common.Controllers.ReviewChanges.textTitleComparison": "Ajustes de comparación",
   "Common.Controllers.ReviewChanges.textUnderline": "Subrayado",
@@ -239,8 +239,8 @@
   "Common.Views.Comments.mniPositionAsc": "Desde arriba",
   "Common.Views.Comments.mniPositionDesc": "Desde abajo",
   "Common.Views.Comments.textAdd": "Añadir",
-  "Common.Views.Comments.textAddComment": "Añadir",
-  "Common.Views.Comments.textAddCommentToDoc": "Añadir comentario a documento",
+  "Common.Views.Comments.textAddComment": "Añadir comentario",
+  "Common.Views.Comments.textAddCommentToDoc": "Añadir comentario al documento",
   "Common.Views.Comments.textAddReply": "Añadir respuesta",
   "Common.Views.Comments.textAnonym": "Visitante",
   "Common.Views.Comments.textCancel": "Cancelar",
@@ -271,7 +271,7 @@
   "Common.Views.ExternalMergeEditor.textTitle": "Receptores de Fusión de Correo",
   "Common.Views.Header.labelCoUsersDescr": "Usuarios que están editando el archivo:",
   "Common.Views.Header.textAddFavorite": "Marcar como favorito",
-  "Common.Views.Header.textAdvSettings": "Ajustes avanzados",
+  "Common.Views.Header.textAdvSettings": "Configuración avanzada",
   "Common.Views.Header.textBack": "Abrir ubicación del archivo",
   "Common.Views.Header.textCompactView": "Esconder barra de herramientas",
   "Common.Views.Header.textHideLines": "Ocultar reglas",
@@ -330,7 +330,7 @@
   "Common.Views.Plugins.textStop": "Detener",
   "Common.Views.Protection.hintAddPwd": "Encriptar con contraseña",
   "Common.Views.Protection.hintPwd": "Cambie o elimine la contraseña",
-  "Common.Views.Protection.hintSignature": "Añadir firma digital o",
+  "Common.Views.Protection.hintSignature": "Añadir firma digital o línea de firma",
   "Common.Views.Protection.txtAddPwd": "Añadir contraseña",
   "Common.Views.Protection.txtChangePwd": "Cambie la contraseña",
   "Common.Views.Protection.txtDeletePwd": "Eliminar contraseña",
@@ -368,9 +368,9 @@
   "Common.Views.ReviewChanges.tipSetSpelling": "Сorrección ortográfica",
   "Common.Views.ReviewChanges.tipSharing": "Gestionar derechos de acceso al documento",
   "Common.Views.ReviewChanges.txtAccept": "Aceptar",
-  "Common.Views.ReviewChanges.txtAcceptAll": "Aceptar Todos los Cambios",
+  "Common.Views.ReviewChanges.txtAcceptAll": "Aceptar todos los cambios",
   "Common.Views.ReviewChanges.txtAcceptChanges": "Aceptar cambios",
-  "Common.Views.ReviewChanges.txtAcceptCurrent": "Aceptar Cambios Actuales",
+  "Common.Views.ReviewChanges.txtAcceptCurrent": "Aceptar cambio actual",
   "Common.Views.ReviewChanges.txtChat": "Chat",
   "Common.Views.ReviewChanges.txtClose": "Cerrar",
   "Common.Views.ReviewChanges.txtCoAuthMode": "Modo de co-edición",
@@ -413,8 +413,8 @@
   "Common.Views.ReviewChanges.txtView": "Modo de visualización",
   "Common.Views.ReviewChangesDialog.textTitle": "Revisar cambios",
   "Common.Views.ReviewChangesDialog.txtAccept": "Aceptar",
-  "Common.Views.ReviewChangesDialog.txtAcceptAll": "Aceptar Todos los Cambios",
-  "Common.Views.ReviewChangesDialog.txtAcceptCurrent": "Aceptar Cambio Actual",
+  "Common.Views.ReviewChangesDialog.txtAcceptAll": "Aceptar todos los cambios",
+  "Common.Views.ReviewChangesDialog.txtAcceptCurrent": "Aceptar cambio actual",
   "Common.Views.ReviewChangesDialog.txtNext": "Al siguiente cambio",
   "Common.Views.ReviewChangesDialog.txtPrev": "Al cambio anterior",
   "Common.Views.ReviewChangesDialog.txtReject": "Rechazar",
@@ -427,7 +427,7 @@
   "Common.Views.ReviewPopover.textEdit": "OK",
   "Common.Views.ReviewPopover.textFollowMove": "Seguir movimiento",
   "Common.Views.ReviewPopover.textMention": "+mención proporcionará acceso al documento y enviará un correo electrónico",
-  "Common.Views.ReviewPopover.textMentionNotify": "+mention notificará al usuario por correo electrónico",
+  "Common.Views.ReviewPopover.textMentionNotify": "+mención notificará al usuario por correo electrónico",
   "Common.Views.ReviewPopover.textOpenAgain": "Abrir de nuevo",
   "Common.Views.ReviewPopover.textReply": "Responder",
   "Common.Views.ReviewPopover.textResolve": "Resolver",
@@ -574,7 +574,7 @@
   "DE.Controllers.Main.printTitleText": "Imprimiendo documento",
   "DE.Controllers.Main.reloadButtonText": "Recargar página",
   "DE.Controllers.Main.requestEditFailedMessageText": "Alguien está editando este documento en este momento. Por favor, inténtelo de nuevo más tarde.",
-  "DE.Controllers.Main.requestEditFailedTitleText": "Acceso negado",
+  "DE.Controllers.Main.requestEditFailedTitleText": "Acceso denegado",
   "DE.Controllers.Main.saveErrorText": "Ha ocurrido un error al guardar el archivo. ",
   "DE.Controllers.Main.saveErrorTextDesktop": "Este archivo no se puede guardar o crear.<br>Las razones posibles son: <br>1. El archivo es sólo para leer. <br>2. El archivo está siendo editado por otros usuarios. <br>3. El disco está lleno o corrupto.",
   "DE.Controllers.Main.saveTextText": "Guardando documento...",
@@ -770,7 +770,7 @@
   "DE.Controllers.Main.txtShape_mathNotEqual": "No igual",
   "DE.Controllers.Main.txtShape_mathPlus": "Más",
   "DE.Controllers.Main.txtShape_moon": "Luna",
-  "DE.Controllers.Main.txtShape_noSmoking": "Señal de prohibición",
+  "DE.Controllers.Main.txtShape_noSmoking": "Señal de prohibido",
   "DE.Controllers.Main.txtShape_notchedRightArrow": "Flecha a la derecha con muesca",
   "DE.Controllers.Main.txtShape_octagon": "Octágono",
   "DE.Controllers.Main.txtShape_parallelogram": "Paralelogramo",
@@ -906,7 +906,7 @@
   "DE.Controllers.Toolbar.textSymbols": "Símbolos",
   "DE.Controllers.Toolbar.textTabForms": "Formularios",
   "DE.Controllers.Toolbar.textWarning": "Aviso",
-  "DE.Controllers.Toolbar.txtAccent_Accent": "Agudo",
+  "DE.Controllers.Toolbar.txtAccent_Accent": "Acento agudo",
   "DE.Controllers.Toolbar.txtAccent_ArrowD": "Flecha derecha-izquierda superior",
   "DE.Controllers.Toolbar.txtAccent_ArrowL": "Flecha superior hacia izquierda",
   "DE.Controllers.Toolbar.txtAccent_ArrowR": "Flecha superior hacia derecha",
@@ -1242,7 +1242,7 @@
   "DE.Views.BookmarksDialog.textSort": "Ordenar por",
   "DE.Views.BookmarksDialog.textTitle": "Marcadores",
   "DE.Views.BookmarksDialog.txtInvalidName": "Nombre de marcador sólo puede contener letras, dígitos y barras bajas y debe comenzar con la letra",
-  "DE.Views.CaptionDialog.textAdd": "Añadir",
+  "DE.Views.CaptionDialog.textAdd": "Añadir etiqueta",
   "DE.Views.CaptionDialog.textAfter": "Después",
   "DE.Views.CaptionDialog.textBefore": "Antes",
   "DE.Views.CaptionDialog.textCaption": "Leyenda",
@@ -1275,7 +1275,7 @@
   "DE.Views.ChartSettings.textChartType": "Cambiar tipo de gráfico",
   "DE.Views.ChartSettings.textEditData": "Editar datos",
   "DE.Views.ChartSettings.textHeight": "Altura",
-  "DE.Views.ChartSettings.textOriginalSize": "Tamaño actual",
+  "DE.Views.ChartSettings.textOriginalSize": "Tamaño real",
   "DE.Views.ChartSettings.textSize": "Tamaño",
   "DE.Views.ChartSettings.textStyle": "Estilo",
   "DE.Views.ChartSettings.textUndock": "Desacoplar de panel",
@@ -1370,13 +1370,13 @@
   "DE.Views.DateTimeDialog.textLang": "Idioma",
   "DE.Views.DateTimeDialog.textUpdate": "Actualizar automáticamente",
   "DE.Views.DateTimeDialog.txtTitle": "Fecha y hora",
-  "DE.Views.DocumentHolder.aboveText": "Arriba",
+  "DE.Views.DocumentHolder.aboveText": "Encima",
   "DE.Views.DocumentHolder.addCommentText": "Añadir comentario",
   "DE.Views.DocumentHolder.advancedDropCapText": "Configuración de Capitalización",
   "DE.Views.DocumentHolder.advancedFrameText": "Ajustes avanzados de marco",
   "DE.Views.DocumentHolder.advancedParagraphText": "Ajustes avanzados de párrafo",
   "DE.Views.DocumentHolder.advancedTableText": "Ajustes avanzados de tabla",
-  "DE.Views.DocumentHolder.advancedText": "Ajustes avanzados",
+  "DE.Views.DocumentHolder.advancedText": "Configuración avanzada",
   "DE.Views.DocumentHolder.alignmentText": "Alineación",
   "DE.Views.DocumentHolder.belowText": "Abajo",
   "DE.Views.DocumentHolder.breakBeforeText": "Salto de página antes",
@@ -1418,7 +1418,7 @@
   "DE.Views.DocumentHolder.moreText": "Más variantes...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "Sin variantes ",
   "DE.Views.DocumentHolder.notcriticalErrorTitle": "Advertencia",
-  "DE.Views.DocumentHolder.originalSizeText": "Tamaño actual",
+  "DE.Views.DocumentHolder.originalSizeText": "Tamaño real",
   "DE.Views.DocumentHolder.paragraphText": "Párrafo",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Eliminar hiperenlace",
   "DE.Views.DocumentHolder.rightText": "Derecho",
@@ -1505,8 +1505,8 @@
   "DE.Views.DocumentHolder.textUpdateTOC": "Actualize la tabla de contenidos",
   "DE.Views.DocumentHolder.textWrap": "Ajuste de texto",
   "DE.Views.DocumentHolder.tipIsLocked": "Otro usuario está editando este elemento ahora.",
-  "DE.Views.DocumentHolder.toDictionaryText": "Añadir a Diccionario",
-  "DE.Views.DocumentHolder.txtAddBottom": "Add bottom border",
+  "DE.Views.DocumentHolder.toDictionaryText": "Añadir al diccionario",
+  "DE.Views.DocumentHolder.txtAddBottom": "Añadir borde inferior",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Añadir barra de fracción",
   "DE.Views.DocumentHolder.txtAddHor": "Añadir línea horizontal",
   "DE.Views.DocumentHolder.txtAddLB": "Añadir línea inferior izquierda",
@@ -1661,7 +1661,7 @@
   "DE.Views.FileMenu.btnSaveAsCaption": "Guardar como",
   "DE.Views.FileMenu.btnSaveCaption": "Guardar",
   "DE.Views.FileMenu.btnSaveCopyAsCaption": "Guardar Copia como...",
-  "DE.Views.FileMenu.btnSettingsCaption": "Ajustes avanzados...",
+  "DE.Views.FileMenu.btnSettingsCaption": "Configuración avanzada...",
   "DE.Views.FileMenu.btnToEditCaption": "Editar documento",
   "DE.Views.FileMenu.textDownload": "Descargar",
   "DE.Views.FileMenuPanels.CreateNew.txtBlank": "Documento en blanco",
@@ -1794,7 +1794,7 @@
   "DE.Views.FormSettings.textScale": "Cuándo escalar",
   "DE.Views.FormSettings.textSelectImage": "Seleccionar Imagen",
   "DE.Views.FormSettings.textTip": "Sugerencia",
-  "DE.Views.FormSettings.textTipAdd": "Agregar nuevo valor",
+  "DE.Views.FormSettings.textTipAdd": "Añadir valor nuevo",
   "DE.Views.FormSettings.textTipDelete": "Eliminar valor",
   "DE.Views.FormSettings.textTipDown": "Mover hacia abajo",
   "DE.Views.FormSettings.textTipUp": "Mover hacia arriba",
@@ -1884,7 +1884,7 @@
   "DE.Views.ImageSettings.textHintFlipH": "Volteo Horizontal",
   "DE.Views.ImageSettings.textHintFlipV": "Volteo Vertical",
   "DE.Views.ImageSettings.textInsert": "Reemplazar imagen",
-  "DE.Views.ImageSettings.textOriginalSize": "Tamaño actual",
+  "DE.Views.ImageSettings.textOriginalSize": "Tamaño real",
   "DE.Views.ImageSettings.textRotate90": "Girar 90°",
   "DE.Views.ImageSettings.textRotation": "Rotación",
   "DE.Views.ImageSettings.textSize": "Tamaño",
@@ -1937,7 +1937,7 @@
   "DE.Views.ImageSettingsAdvanced.textMiter": "Ángulo",
   "DE.Views.ImageSettingsAdvanced.textMove": "Desplazar objeto con texto",
   "DE.Views.ImageSettingsAdvanced.textOptions": "Opciones",
-  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Tamaño actual",
+  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Tamaño real",
   "DE.Views.ImageSettingsAdvanced.textOverlap": "Superposición",
   "DE.Views.ImageSettingsAdvanced.textPage": "Página",
   "DE.Views.ImageSettingsAdvanced.textParagraph": "Párrafo",
@@ -1972,7 +1972,7 @@
   "DE.Views.ImageSettingsAdvanced.textWrapThroughTooltip": "A través",
   "DE.Views.ImageSettingsAdvanced.textWrapTightTooltip": "Estrecho",
   "DE.Views.ImageSettingsAdvanced.textWrapTopbottomTooltip": "Superior e inferior",
-  "DE.Views.LeftMenu.tipAbout": "Acerca de programa",
+  "DE.Views.LeftMenu.tipAbout": "Acerca de",
   "DE.Views.LeftMenu.tipChat": "Chat",
   "DE.Views.LeftMenu.tipComments": "Comentarios",
   "DE.Views.LeftMenu.tipNavigation": "Navegación",
@@ -2027,7 +2027,7 @@
   "DE.Views.Links.tipContents": "Introducir tabla de contenidos",
   "DE.Views.Links.tipContentsUpdate": "Actualize la tabla de contenidos",
   "DE.Views.Links.tipCrossRef": "Insertar referencia cruzada",
-  "DE.Views.Links.tipInsertHyperlink": "Añadir hiperenlace",
+  "DE.Views.Links.tipInsertHyperlink": "Añadir hipervínculo",
   "DE.Views.Links.tipNotes": "Introducir o editar notas a pie de página",
   "DE.Views.Links.tipTableFigures": "Insertar tabla de ilustraciones",
   "DE.Views.Links.tipTableFiguresUpdate": "Actualizar tabla de ilustraciones",
@@ -2067,7 +2067,7 @@
   "DE.Views.MailMergeSettings.downloadMergeTitle": "Fusión",
   "DE.Views.MailMergeSettings.errorMailMergeSaveFile": "Error de fusión.",
   "DE.Views.MailMergeSettings.notcriticalErrorTitle": "Aviso",
-  "DE.Views.MailMergeSettings.textAddRecipients": "Primero añadir unos destinatarios a la lista ",
+  "DE.Views.MailMergeSettings.textAddRecipients": "Primero añadir algunos destinatarios a la lista ",
   "DE.Views.MailMergeSettings.textAll": "Todos registros",
   "DE.Views.MailMergeSettings.textCurrent": "Registro actual",
   "DE.Views.MailMergeSettings.textDataSource": "Fuente de datos",
@@ -2435,7 +2435,7 @@
   "DE.Views.TableSettings.tipRight": "Fijar sólo borde exterior derecho",
   "DE.Views.TableSettings.tipTop": "Fijar sólo borde exterior superior",
   "DE.Views.TableSettings.txtNoBorders": "Sin bordes",
-  "DE.Views.TableSettings.txtTable_Accent": "Acentuación",
+  "DE.Views.TableSettings.txtTable_Accent": "Acento",
   "DE.Views.TableSettings.txtTable_Colorful": "Colorido",
   "DE.Views.TableSettings.txtTable_Dark": "Oscuro",
   "DE.Views.TableSettings.txtTable_GridTable": "Tabla de rejilla",
@@ -2647,7 +2647,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Normal",
   "DE.Views.Toolbar.textMarginsUsNormal": "US Normal",
   "DE.Views.Toolbar.textMarginsWide": "Amplio",
-  "DE.Views.Toolbar.textNewColor": "Color personalizado",
+  "DE.Views.Toolbar.textNewColor": "Añadir nuevo color personalizado",
   "DE.Views.Toolbar.textNextPage": "Página siguiente",
   "DE.Views.Toolbar.textNoHighlight": "No resaltar",
   "DE.Views.Toolbar.textNone": "Ningún",

apps/documenteditor/main/locale/hu.json

@@ -15,7 +15,7 @@
   "Common.Controllers.ReviewChanges.textAuto": "Auto",
   "Common.Controllers.ReviewChanges.textBaseline": "Alapvonal",
   "Common.Controllers.ReviewChanges.textBold": "Félkövér",
-  "Common.Controllers.ReviewChanges.textBreakBefore": "Oldaltörés elötte",
+  "Common.Controllers.ReviewChanges.textBreakBefore": "Oldaltörés előtte",
   "Common.Controllers.ReviewChanges.textCaps": "Minden nagybetű",
   "Common.Controllers.ReviewChanges.textCenter": "Középre rendez",
   "Common.Controllers.ReviewChanges.textChar": "Karakter szint",
@@ -35,7 +35,7 @@
   "Common.Controllers.ReviewChanges.textIndentRight": "Francia bekezdés jobb",
   "Common.Controllers.ReviewChanges.textInserted": "<b>Beillesztve:</b>",
   "Common.Controllers.ReviewChanges.textItalic": "Dőlt",
-  "Common.Controllers.ReviewChanges.textJustify": "Sorkizáart",
+  "Common.Controllers.ReviewChanges.textJustify": "Igazítás sorkizártra",
   "Common.Controllers.ReviewChanges.textKeepLines": "Sorok egyben tartása",
   "Common.Controllers.ReviewChanges.textKeepNext": "Következővel együtt tartás",
   "Common.Controllers.ReviewChanges.textLeft": "Balra rendez",
@@ -124,6 +124,8 @@
   "Common.Translation.warnFileLocked": "Nem szerkesztheti ezt a fájlt, mert egy másik alkalmazásban szerkesztik.",
   "Common.Translation.warnFileLockedBtnEdit": "Másolat létrehozása",
   "Common.Translation.warnFileLockedBtnView": "Megnyitva megtekintésre",
+  "Common.UI.ButtonColored.textAutoColor": "Automatikus",
+  "Common.UI.ButtonColored.textNewColor": "Új egyéni szín hozzáadása",
   "Common.UI.Calendar.textApril": "Április",
   "Common.UI.Calendar.textAugust": "Augusztus",
   "Common.UI.Calendar.textDecember": "December",
@@ -180,6 +182,9 @@
   "Common.UI.SynchronizeTip.textSynchronize": "A dokumentumot egy másik felhasználó módosította.<br>Kattintson a gombra a módosítások mentéséhez és a frissítések újratöltéséhez.",
   "Common.UI.ThemeColorPalette.textStandartColors": "Alapértelmezett színek",
   "Common.UI.ThemeColorPalette.textThemeColors": "Téma színek",
+  "Common.UI.Themes.txtThemeClassicLight": "Klasszikus Világos",
+  "Common.UI.Themes.txtThemeDark": "Sötét",
+  "Common.UI.Themes.txtThemeLight": "Világos",
   "Common.UI.Window.cancelButtonText": "Mégsem",
   "Common.UI.Window.closeButtonText": "Bezár",
   "Common.UI.Window.noButtonText": "Nem",
@@ -195,16 +200,19 @@
   "Common.Views.About.txtAddress": "Cím:",
   "Common.Views.About.txtLicensee": "LICENC VÁSÁRLÓ",
   "Common.Views.About.txtLicensor": "LICENCTULAJDONOS",
-  "Common.Views.About.txtMail": "email:",
+  "Common.Views.About.txtMail": "e-mail:",
   "Common.Views.About.txtPoweredBy": "Powered by",
   "Common.Views.About.txtTel": "Tel.: ",
   "Common.Views.About.txtVersion": "Verzió",
   "Common.Views.AutoCorrectDialog.textAdd": "Hozzáadás",
   "Common.Views.AutoCorrectDialog.textApplyText": "Alkalmazás gépelés közben",
+  "Common.Views.AutoCorrectDialog.textAutoCorrect": "Szöveg automatikus javítása",
   "Common.Views.AutoCorrectDialog.textAutoFormat": "Automatikus formázás gépelés közben",
   "Common.Views.AutoCorrectDialog.textBulleted": "Automatikus felsorolásos listák",
   "Common.Views.AutoCorrectDialog.textBy": "Által",
   "Common.Views.AutoCorrectDialog.textDelete": "Törlés",
+  "Common.Views.AutoCorrectDialog.textFLSentence": "A mondatok nagy betűvel kezdődjenek",
+  "Common.Views.AutoCorrectDialog.textHyperlink": "Internet és hálózati utak hiperhivatkozásokkal",
   "Common.Views.AutoCorrectDialog.textHyphens": "Kötőjelek (--) gondolatjellel (—)",
   "Common.Views.AutoCorrectDialog.textMathCorrect": "Matematikai automatikus javítás",
   "Common.Views.AutoCorrectDialog.textNumbered": "Automatikus számozott listák",
@@ -224,21 +232,29 @@
   "Common.Views.AutoCorrectDialog.warnReset": "Minden hozzáadott automatikus javítást eltávolítunk, és a megváltozottakat visszaállítjuk eredeti értékükre. Folytassuk?",
   "Common.Views.AutoCorrectDialog.warnRestore": "%1 automatikus javítása visszaáll az eredeti értékére. Folytassuk?",
   "Common.Views.Chat.textSend": "Küldés",
+  "Common.Views.Comments.mniAuthorAsc": "Szerző (A-Z)",
+  "Common.Views.Comments.mniAuthorDesc": "Szerző (Z-A)",
+  "Common.Views.Comments.mniDateAsc": "Legöregebb először",
+  "Common.Views.Comments.mniDateDesc": "Legújabb először",
+  "Common.Views.Comments.mniPositionAsc": "Felülről",
+  "Common.Views.Comments.mniPositionDesc": "Alulról",
   "Common.Views.Comments.textAdd": "Hozzáad",
-  "Common.Views.Comments.textAddComment": "Hozzászólás hozzáadása",
-  "Common.Views.Comments.textAddCommentToDoc": "Hozzászólás hozzáadása a dokumentumhoz",
+  "Common.Views.Comments.textAddComment": "Megjegyzés hozzáadása",
+  "Common.Views.Comments.textAddCommentToDoc": "Megyjegyzés hozzáadása a dokumentumhoz",
   "Common.Views.Comments.textAddReply": "Válasz hozzáadása",
   "Common.Views.Comments.textAnonym": "Vendég",
   "Common.Views.Comments.textCancel": "Mégsem",
   "Common.Views.Comments.textClose": "Bezár",
-  "Common.Views.Comments.textComments": "Hozzászólások",
+  "Common.Views.Comments.textClosePanel": "Megjegyzések bezárása",
+  "Common.Views.Comments.textComments": "Megjegyzések",
   "Common.Views.Comments.textEdit": "OK",
-  "Common.Views.Comments.textEnterCommentHint": "Írjon hozzászólást",
-  "Common.Views.Comments.textHintAddComment": "Hozzászólás hozzáadása",
+  "Common.Views.Comments.textEnterCommentHint": "Megjegyzés beírása itt",
+  "Common.Views.Comments.textHintAddComment": "Megjegyzés hozzáadása",
   "Common.Views.Comments.textOpenAgain": "Ismét megnyit",
   "Common.Views.Comments.textReply": "Ismétel",
   "Common.Views.Comments.textResolve": "Felold",
   "Common.Views.Comments.textResolved": "Feloldott",
+  "Common.Views.Comments.textSort": "Megjegyzések rendezése",
   "Common.Views.CopyWarningDialog.textDontShow": "Ne mutassa újra ezt az üzenetet",
   "Common.Views.CopyWarningDialog.textMsg": "A szerkesztés eszköztár gombjaival és a helyi menüvel végzett másolás, kivágás és beillesztés műveletek csak a szerkesztő oldalon használhatóak.<br><br>A szerkesztő lapon kívüli alkalmazásokba való másoláshoz vagy beillesztéshez az alábbi billentyűzetkombinációkat használja:",
   "Common.Views.CopyWarningDialog.textTitle": "Másolás, kivágás és beillesztés",
@@ -297,7 +313,7 @@
   "Common.Views.OpenDialog.txtOpenFile": "Írja be a megnyitáshoz szükséges jelszót",
   "Common.Views.OpenDialog.txtPassword": "Jelszó",
   "Common.Views.OpenDialog.txtPreview": "Előnézet",
-  "Common.Views.OpenDialog.txtProtected": "Miután megadta a jelszót és megnyitotta a fájlt, az aktuális jelszó visszaáll.",
+  "Common.Views.OpenDialog.txtProtected": "Miután megadta a jelszót és megnyitotta a fájlt, annak jelenlegi jelszava visszaállítódik.",
   "Common.Views.OpenDialog.txtTitle": "Válassza a %1 opciót",
   "Common.Views.OpenDialog.txtTitleProtected": "Védett fájl",
   "Common.Views.PasswordDialog.txtDescription": "Állítson be jelszót a dokumentum védelmére",
@@ -339,8 +355,10 @@
   "Common.Views.ReviewChanges.textWarnTrackChangesTitle": "Engedélyezzük a változások követését mindenki számára?",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "Utolsó változás elfogadása",
   "Common.Views.ReviewChanges.tipCoAuthMode": "Együttes szerkesztés beállítása",
-  "Common.Views.ReviewChanges.tipCommentRem": "Hozzászólások eltávolítása",
-  "Common.Views.ReviewChanges.tipCommentRemCurrent": "Jelenlegi hosszászólások eltávolítása",
+  "Common.Views.ReviewChanges.tipCommentRem": "Megjegyzések eltávolítása",
+  "Common.Views.ReviewChanges.tipCommentRemCurrent": "Jelenlegi megjegyzések eltávolítása",
+  "Common.Views.ReviewChanges.tipCommentResolve": "Megjegyzések megoldása",
+  "Common.Views.ReviewChanges.tipCommentResolveCurrent": "Aktuális megjegyzések megoldása",
   "Common.Views.ReviewChanges.tipCompare": "A jelenlegi dokumentum összehasonlítása egy másikkal",
   "Common.Views.ReviewChanges.tipHistory": "Verziótörténet mutatása",
   "Common.Views.ReviewChanges.tipRejectCurrent": "Az aktuális változás elutasítása",
@@ -356,11 +374,16 @@
   "Common.Views.ReviewChanges.txtChat": "Chat",
   "Common.Views.ReviewChanges.txtClose": "Bezár",
   "Common.Views.ReviewChanges.txtCoAuthMode": "Együttes szerkesztési mód",
-  "Common.Views.ReviewChanges.txtCommentRemAll": "Minden hozzászólás eltávolítása",
-  "Common.Views.ReviewChanges.txtCommentRemCurrent": "Jelenlegi hosszászólások eltávolítása",
-  "Common.Views.ReviewChanges.txtCommentRemMy": "Hozzászólásaim eltávolítása",
-  "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Jelenlegi hozzászólásaim eltávolítása",
+  "Common.Views.ReviewChanges.txtCommentRemAll": "Minden megjegyzés eltávolítása",
+  "Common.Views.ReviewChanges.txtCommentRemCurrent": "Jelenlegi megjegyzések eltávolítása",
+  "Common.Views.ReviewChanges.txtCommentRemMy": "Megjegyzéseim eltávolítása",
+  "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Jelenlegi megjegyzéseim eltávolítása",
   "Common.Views.ReviewChanges.txtCommentRemove": "Eltávolítás",
+  "Common.Views.ReviewChanges.txtCommentResolve": "Megold",
+  "Common.Views.ReviewChanges.txtCommentResolveAll": "Összes megjegyzés megoldása",
+  "Common.Views.ReviewChanges.txtCommentResolveCurrent": "Aktuális Megjegyzések Megoldása",
+  "Common.Views.ReviewChanges.txtCommentResolveMy": "Saját Megjegyzések Megoldása",
+  "Common.Views.ReviewChanges.txtCommentResolveMyCurrent": "Aktuális Megjegyzéseim Megoldása",
   "Common.Views.ReviewChanges.txtCompare": "Összehasonlítás",
   "Common.Views.ReviewChanges.txtDocLang": "Nyelv",
   "Common.Views.ReviewChanges.txtEditing": "szerkesztés",
@@ -368,7 +391,9 @@
   "Common.Views.ReviewChanges.txtFinalCap": "Végső",
   "Common.Views.ReviewChanges.txtHistory": "Verziótörténet",
   "Common.Views.ReviewChanges.txtMarkup": "Minden módosítás {0}",
-  "Common.Views.ReviewChanges.txtMarkupCap": "Haszonkulcs",
+  "Common.Views.ReviewChanges.txtMarkupCap": "Jelölések és szövegbuborékok",
+  "Common.Views.ReviewChanges.txtMarkupSimple": "Minden változtatás {0}<br>Szövegbuborékok eltűntetése",
+  "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Csak jelölés",
   "Common.Views.ReviewChanges.txtNext": "Következő",
   "Common.Views.ReviewChanges.txtOff": "Kikapcsolva nekem",
   "Common.Views.ReviewChanges.txtOffGlobal": "Kikapcsolva nekem és mindenkinek",
@@ -379,7 +404,7 @@
   "Common.Views.ReviewChanges.txtPrev": "Előző",
   "Common.Views.ReviewChanges.txtPreview": "Előnézet",
   "Common.Views.ReviewChanges.txtReject": "Elutasít",
-  "Common.Views.ReviewChanges.txtRejectAll": "Elutasít minden módosítást",
+  "Common.Views.ReviewChanges.txtRejectAll": "Minden módosítást elvetése",
   "Common.Views.ReviewChanges.txtRejectChanges": "Elutasítja a módosításokat",
   "Common.Views.ReviewChanges.txtRejectCurrent": "Az aktuális változás elutasítása",
   "Common.Views.ReviewChanges.txtSharing": "Megosztás",
@@ -393,7 +418,7 @@
   "Common.Views.ReviewChangesDialog.txtNext": "A következő változáshoz",
   "Common.Views.ReviewChangesDialog.txtPrev": "A korábbi változáshoz",
   "Common.Views.ReviewChangesDialog.txtReject": "Elutasít",
-  "Common.Views.ReviewChangesDialog.txtRejectAll": "Elutasít minden módosítást",
+  "Common.Views.ReviewChangesDialog.txtRejectAll": "Minden módosítást elvetése",
   "Common.Views.ReviewChangesDialog.txtRejectCurrent": "Az aktuális változás elutasítása",
   "Common.Views.ReviewPopover.textAdd": "Hozzáad",
   "Common.Views.ReviewPopover.textAddReply": "Válasz hozzáadása",
@@ -401,11 +426,15 @@
   "Common.Views.ReviewPopover.textClose": "Bezár",
   "Common.Views.ReviewPopover.textEdit": "OK",
   "Common.Views.ReviewPopover.textFollowMove": "Mozgás követése",
-  "Common.Views.ReviewPopover.textMention": "+megemlítés hozzáférést ad a dokumentumhoz, és emailt küld",
-  "Common.Views.ReviewPopover.textMentionNotify": "+megemlítés értesíti a felhasználót emailben",
+  "Common.Views.ReviewPopover.textMention": "+megemlítés hozzáférést ad a dokumentumhoz, és e-mailt küld",
+  "Common.Views.ReviewPopover.textMentionNotify": "+megemlítés értesíti a felhasználót e-mailben",
   "Common.Views.ReviewPopover.textOpenAgain": "Ismét megnyit",
   "Common.Views.ReviewPopover.textReply": "Ismétel",
   "Common.Views.ReviewPopover.textResolve": "Resolve",
+  "Common.Views.ReviewPopover.txtAccept": "Elfogad",
+  "Common.Views.ReviewPopover.txtDeleteTip": "Törlés",
+  "Common.Views.ReviewPopover.txtEditTip": "Szerkesztés",
+  "Common.Views.ReviewPopover.txtReject": "Elvetés",
   "Common.Views.SaveAsDlg.textLoading": "Betöltés",
   "Common.Views.SaveAsDlg.textTitle": "Mentési mappa",
   "Common.Views.SelectFileDlg.textLoading": "Betöltés",
@@ -425,7 +454,7 @@
   "Common.Views.SignDialog.textValid": "Érvényes %1 és %2 között",
   "Common.Views.SignDialog.tipFontName": "Betűtípus neve",
   "Common.Views.SignDialog.tipFontSize": "Betűméret",
-  "Common.Views.SignSettingsDialog.textAllowComment": "Engedélyezi az aláírónak hozzászólás hozzáadását az aláírási párbeszédablakban",
+  "Common.Views.SignSettingsDialog.textAllowComment": "Engedélyezi az aláírónak megjegyzés hozzáadását az aláírási párbeszédablakban",
   "Common.Views.SignSettingsDialog.textInfo": "Aláíró infó",
   "Common.Views.SignSettingsDialog.textInfoEmail": "E-mail",
   "Common.Views.SignSettingsDialog.textInfoName": "Név",
@@ -497,14 +526,15 @@
   "DE.Controllers.Main.errorDataRange": "Hibás adattartomány.",
   "DE.Controllers.Main.errorDefaultMessage": "Hibakód: %1",
   "DE.Controllers.Main.errorDirectUrl": "Kérjük, ellenőrizze a dokumentumra mutató hivatkozást.<br>Ennek a hivatkozásnak a letöltéshez közvetlen hivatkozásnak kell lennie.",
-  "DE.Controllers.Main.errorEditingDownloadas": "Hiba történt a dokumentummal végzett munka során.<br>Használja a 'Letöltés mint...' opciót, hogy mentse a fájl biztonsági másolatát a számítógép merevlemezére.",
+  "DE.Controllers.Main.errorEditingDownloadas": "Hiba történt a dokumentummal végzett munka során.<br>Használja a 'Letöltés másként...' opciót, hogy mentse a fájl biztonsági másolatát a számítógép merevlemezére.",
   "DE.Controllers.Main.errorEditingSaveas": "Hiba történt a dokumentummal végzett munka során.<br>Használja a 'Mentés másként...' opciót, hogy mentse a fájl biztonsági másolatát a számítógép merevlemezére.",
-  "DE.Controllers.Main.errorEmailClient": "Nem található email kliens.",
+  "DE.Controllers.Main.errorEmailClient": "Nem található e-mail kliens.",
   "DE.Controllers.Main.errorFilePassProtect": "A dokumentum jelszóval védett, és nem nyitható meg.",
   "DE.Controllers.Main.errorFileSizeExceed": "A fájlméret meghaladja a szerverre beállított korlátozást.<br>Kérjük, forduljon a Document Server rendszergazdájához a részletekért.",
-  "DE.Controllers.Main.errorForceSave": "Hiba történt a fájl mentése közben. Kérjük, használja a 'Letöltés mint' opciót, hogy a fájlt a számítógépére mentse, vagy próbálkozzon később.",
+  "DE.Controllers.Main.errorForceSave": "Hiba történt a fájl mentése közben. Kérjük, használja a 'Letöltés másként' opciót, hogy a fájlt a számítógépére mentse, vagy próbálkozzon később.",
   "DE.Controllers.Main.errorKeyEncrypt": "Ismeretlen kulcsleíró",
   "DE.Controllers.Main.errorKeyExpire": "Lejárt kulcsleíró",
+  "DE.Controllers.Main.errorLoadingFont": "A betűtípusok nincsenek betöltve.<br>Kérjük forduljon a dokumentumszerver rendszergazdájához.",
   "DE.Controllers.Main.errorMailMergeLoadFile": "A dokumentum megnyitása sikertelen. Kérjük, válasszon egy másik fájlt.",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Sikertelen összevonás.",
   "DE.Controllers.Main.errorProcessSaveResult": "Sikertelen mentés.",
@@ -518,11 +548,12 @@
   "DE.Controllers.Main.errorToken": "A dokumentum biztonsági tokenje nem megfelelő.<br>Kérjük, lépjen kapcsolatba a Dokumentumszerver rendszergazdájával.",
   "DE.Controllers.Main.errorTokenExpire": "A dokumentum biztonsági tokenje lejárt.<br>Kérjük, lépjen kapcsolatba a dokumentumszerver rendszergazdájával.",
   "DE.Controllers.Main.errorUpdateVersion": "A dokumentum verziója megváltozott. Az oldal újratöltődik.",
-  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Az internet kapcsolat helyreállt, és a fájl verziója megváltozott.<br>Mielőtt folytatná a munkát, töltse le a fájlt, vagy másolja vágólapra annak tartalmát, hogy megbizonyosodjon arról, hogy semmi nem veszik el, majd töltse újra az oldalt.",
+  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Az internetkapcsolat helyreállt és a fájl verziója megváltozott.<br>Mielőtt folytatná a munkát, töltse le a fájlt vagy másolja át annak tartalmát megbizonyosodva arról, hogy semmi sem veszett el, végül töltse újra ezt az oldalt.",
   "DE.Controllers.Main.errorUserDrop": "A dokumentum jelenleg nem elérhető",
   "DE.Controllers.Main.errorUsersExceed": "Túllépte a csomagja által engedélyezett felhasználók számát",
   "DE.Controllers.Main.errorViewerDisconnect": "A kapcsolat megszakadt. Továbbra is megtekinthető a dokumentum,<br>de a kapcsolat helyreálltáig és az oldal újratöltéséig nem lehet letölteni.",
   "DE.Controllers.Main.leavePageText": "El nem mentett változtatások vannak a dokumentumban. Kattintson a \"Maradás az oldalon\"-ra majd a \"Mentés\"-re hogy elmentse azokat. Kattintson a \"Az oldal elhagyása\"-ra a változások elvetéséhez.",
+  "DE.Controllers.Main.leavePageTextOnClose": "A dokumentumban lévő összes nem mentett módosítás elveszik.<br> Kattintson a \"Mégse\", majd a \"Mentés\" gombra a mentésükhöz. Kattintson az „OK” gombra az összes nem mentett módosítás elvetéséhez.",
   "DE.Controllers.Main.loadFontsTextText": "Adatok betöltése...",
   "DE.Controllers.Main.loadFontsTitleText": "Adatok betöltése",
   "DE.Controllers.Main.loadFontTextText": "Adatok betöltése...",
@@ -549,20 +580,21 @@
   "DE.Controllers.Main.saveTextText": "Dokumentum mentése...",
   "DE.Controllers.Main.saveTitleText": "Dokumentum mentése",
   "DE.Controllers.Main.scriptLoadError": "A kapcsolat túl lassú, néhány komponens nem töltődött be. Frissítse az oldalt.",
-  "DE.Controllers.Main.sendMergeText": "Összevont küldés...",
-  "DE.Controllers.Main.sendMergeTitle": "Összevont küldés",
+  "DE.Controllers.Main.sendMergeText": "Összevonás küldése...",
+  "DE.Controllers.Main.sendMergeTitle": "Összevonás küldése",
   "DE.Controllers.Main.splitDividerErrorText": "A sorok számának oszthatónak kell lennie az alábbi értékkel: %1.",
   "DE.Controllers.Main.splitMaxColsErrorText": "Hasábok száma kevesebb lehet mint %1.",
   "DE.Controllers.Main.splitMaxRowsErrorText": "A sorok száma kevesebb kell legyen, mint %1.",
   "DE.Controllers.Main.textAnonymous": "Névtelen",
   "DE.Controllers.Main.textApplyAll": "Alkalmazza az összes egyenletre",
-  "DE.Controllers.Main.textBuyNow": "Weboldalt meglátogat",
+  "DE.Controllers.Main.textBuyNow": "Weboldal megnyitása",
   "DE.Controllers.Main.textChangesSaved": "Minden módosítás elmentve",
   "DE.Controllers.Main.textClose": "Bezár",
   "DE.Controllers.Main.textCloseTip": "Kattintson, a tippek bezárásához",
   "DE.Controllers.Main.textContactUs": "Értékesítés elérhetősége",
   "DE.Controllers.Main.textConvertEquation": "Ez az egyenlet az egyenletszerkesztő régi verziójával lett létrehozva, amely már nem támogatott. A szerkesztéshez alakítsa az egyenletet Office Math ML formátumra.<br>Konvertáljuk most?",
-  "DE.Controllers.Main.textCustomLoader": "Kérjük, vegye figyelembe, hogy az engedély feltételei szerint nem jogosult a betöltő cseréjére.<br>Kérjük, forduljon értékesítési osztályunkhoz, hogy árajánlatot kapjon.",
+  "DE.Controllers.Main.textCustomLoader": "Kérjük, vegye figyelembe, hogy a licence feltételei szerint nem jogosult a betöltő cseréjére.<br>Kérjük, forduljon értékesítési osztályunkhoz, hogy árajánlatot kapjon.",
+  "DE.Controllers.Main.textDisconnect": "A kapcsolat megszakadt",
   "DE.Controllers.Main.textGuest": "Vendég",
   "DE.Controllers.Main.textHasMacros": "A fájl automatikus makrókat tartalmaz.<br>Szeretne makrókat futtatni?",
   "DE.Controllers.Main.textLearnMore": "Tudjon meg többet",
@@ -576,6 +608,7 @@
   "DE.Controllers.Main.textShape": "Alakzat",
   "DE.Controllers.Main.textStrict": "Biztonságos mód",
   "DE.Controllers.Main.textTryUndoRedo": "A Visszavonás / Újra funkciók le vannak tiltva a Gyors együttes szerkesztés módban.<br>A \"Biztonságos mód\" gombra kattintva válthat a Biztonságos együttes szerkesztés módra, hogy a dokumentumot más felhasználókkal való interferencia nélkül tudja szerkeszteni, mentés után küldve el a módosításokat. A szerkesztési módok között a Speciális beállítások segítségével válthat.",
+  "DE.Controllers.Main.textTryUndoRedoWarn": "A Visszavonás/Újra funkciók le vannak tiltva a Gyors társszerkesztés módban.",
   "DE.Controllers.Main.titleLicenseExp": "Lejárt licenc",
   "DE.Controllers.Main.titleServerVersion": "Szerkesztő frissítve",
   "DE.Controllers.Main.titleUpdateVersion": "A verzió megváltozott",
@@ -588,17 +621,18 @@
   "DE.Controllers.Main.txtCallouts": "Feliratok",
   "DE.Controllers.Main.txtCharts": "Bonyolult alakzatok",
   "DE.Controllers.Main.txtChoose": "Válassz egy elemet",
+  "DE.Controllers.Main.txtClickToLoad": "Kattintson a kép betöltéséhez",
   "DE.Controllers.Main.txtCurrentDocument": "Aktuális dokumentum",
   "DE.Controllers.Main.txtDiagramTitle": "Diagram címe",
   "DE.Controllers.Main.txtEditingMode": "Szerkesztési mód beállítása...",
-  "DE.Controllers.Main.txtEndOfFormula": "Váratlan képlet vég",
+  "DE.Controllers.Main.txtEndOfFormula": "Váratlan függvény vég",
   "DE.Controllers.Main.txtEnterDate": "Adjon meg egy dátumot",
   "DE.Controllers.Main.txtErrorLoadHistory": "Napló betöltése sikertelen",
   "DE.Controllers.Main.txtEvenPage": "Páros oldal",
   "DE.Controllers.Main.txtFiguredArrows": "Nyíl formák",
   "DE.Controllers.Main.txtFirstPage": "Első oldal",
   "DE.Controllers.Main.txtFooter": "Lábléc",
-  "DE.Controllers.Main.txtFormulaNotInTable": "A képlet nincs a táblázatban",
+  "DE.Controllers.Main.txtFormulaNotInTable": "A függvény nincs a táblázatban",
   "DE.Controllers.Main.txtHeader": "Fejléc",
   "DE.Controllers.Main.txtHyperlink": "Hivatkozás",
   "DE.Controllers.Main.txtIndTooLarge": "Az index túl nagy",
@@ -607,8 +641,10 @@
   "DE.Controllers.Main.txtMath": "Matematika",
   "DE.Controllers.Main.txtMissArg": "Hiányzó paraméter",
   "DE.Controllers.Main.txtMissOperator": "Hiányzó operátor",
-  "DE.Controllers.Main.txtNeedSynchronize": "Frissítés elérhető",
+  "DE.Controllers.Main.txtNeedSynchronize": "Frissítések érhetőek el",
+  "DE.Controllers.Main.txtNone": "Egyik sem",
   "DE.Controllers.Main.txtNoTableOfContents": "Nincsenek címsorok a dokumentumban. Vigyen fel egy fejlécstílust a szövegre, hogy az megjelenjen a tartalomjegyzékben.",
+  "DE.Controllers.Main.txtNoTableOfFigures": "Nem található bejegyzéseket tartalmazó táblázat.",
   "DE.Controllers.Main.txtNoText": "Hiba! Nincs a megadott stílusnak megfelelő szöveg a dokumentumban.",
   "DE.Controllers.Main.txtNotInTable": "nincs benne a táblázatban",
   "DE.Controllers.Main.txtNotValidBookmark": "Hiba! Nem valós könyvjező referencia.",
@@ -791,6 +827,7 @@
   "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Lekerekített téglalap alakú szövegbuborék",
   "DE.Controllers.Main.txtStarsRibbons": "Csillagok és szalagok",
   "DE.Controllers.Main.txtStyle_Caption": "Felirat",
+  "DE.Controllers.Main.txtStyle_endnote_text": "Végjegyzet szövege",
   "DE.Controllers.Main.txtStyle_footnote_text": "Lábjegyzet szövege",
   "DE.Controllers.Main.txtStyle_Heading_1": "Címsor 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "Címsor 2",
@@ -808,9 +845,11 @@
   "DE.Controllers.Main.txtStyle_Quote": "Idézet",
   "DE.Controllers.Main.txtStyle_Subtitle": "Alcím",
   "DE.Controllers.Main.txtStyle_Title": "Cím",
-  "DE.Controllers.Main.txtSyntaxError": "Szintakszis hiba",
+  "DE.Controllers.Main.txtSyntaxError": "Szintaktikai hiba",
   "DE.Controllers.Main.txtTableInd": "Táblázat index nem lehet nulla",
   "DE.Controllers.Main.txtTableOfContents": "Tartalomjegyzék",
+  "DE.Controllers.Main.txtTableOfFigures": "Ábrajegyzék",
+  "DE.Controllers.Main.txtTOCHeading": "Tartalomjegyzék címsor",
   "DE.Controllers.Main.txtTooLarge": "Túl nagy szám a formázáshoz",
   "DE.Controllers.Main.txtTypeEquation": "Írjon be ide egy egyenletet.",
   "DE.Controllers.Main.txtUndefBookmark": "Ismeretlen könyvjelző",
@@ -824,7 +863,7 @@
   "DE.Controllers.Main.uploadDocSizeMessage": "A maximális dokumentum méret elérve.",
   "DE.Controllers.Main.uploadImageExtMessage": "Ismeretlen képformátum.",
   "DE.Controllers.Main.uploadImageFileCountMessage": "Nincs kép feltöltve.",
-  "DE.Controllers.Main.uploadImageSizeMessage": "A maximális képmérethatár túllépve.",
+  "DE.Controllers.Main.uploadImageSizeMessage": "A kép túl nagy. A maximális méret 25 MB.",
   "DE.Controllers.Main.uploadImageTextText": "Kép feltöltése...",
   "DE.Controllers.Main.uploadImageTitleText": "Kép feltöltése",
   "DE.Controllers.Main.waitText": "Kérjük, várjon...",
@@ -846,13 +885,16 @@
   "DE.Controllers.Statusbar.tipReview": "Módosítások követése",
   "DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
   "DE.Controllers.Toolbar.confirmAddFontName": "A menteni kívánt betűkészlet nem érhető el az aktuális eszközön.<br>A szövegstílus a rendszer egyik betűkészletével jelenik meg, a mentett betűtípust akkor használja, ha elérhető.<br>Folytatni szeretné?",
+  "DE.Controllers.Toolbar.dataUrl": "Illesszen be egy adat URL-t",
   "DE.Controllers.Toolbar.notcriticalErrorTitle": "Figyelmeztetés",
   "DE.Controllers.Toolbar.textAccent": "Accents",
   "DE.Controllers.Toolbar.textBracket": "Zárójelben",
   "DE.Controllers.Toolbar.textEmptyImgUrl": "Meg kell adni a kép URL linkjét.",
+  "DE.Controllers.Toolbar.textEmptyMMergeUrl": "Meg kell adni az URL-t.",
   "DE.Controllers.Toolbar.textFontSizeErr": "A megadott érték helytelen.<br>Kérjük, adjon meg egy számértéket 1 és 300 között",
   "DE.Controllers.Toolbar.textFraction": "Törtek",
   "DE.Controllers.Toolbar.textFunction": "Függévenyek",
+  "DE.Controllers.Toolbar.textGroup": "Csoport",
   "DE.Controllers.Toolbar.textInsert": "Beszúrás",
   "DE.Controllers.Toolbar.textIntegral": "Integrálok",
   "DE.Controllers.Toolbar.textLargeOperator": "Nagy operátorok",
@@ -871,8 +913,8 @@
   "DE.Controllers.Toolbar.txtAccent_Bar": "Sáv",
   "DE.Controllers.Toolbar.txtAccent_BarBot": "Aláhúzás",
   "DE.Controllers.Toolbar.txtAccent_BarTop": "Felső sáv",
-  "DE.Controllers.Toolbar.txtAccent_BorderBox": "Dobozos képlet (pozicionálóval)",
-  "DE.Controllers.Toolbar.txtAccent_BorderBoxCustom": "Dobozos képlet (példa)",
+  "DE.Controllers.Toolbar.txtAccent_BorderBox": "Dobozos függvény (pozicionálóval)",
+  "DE.Controllers.Toolbar.txtAccent_BorderBoxCustom": "Dobozos függvény (példa)",
   "DE.Controllers.Toolbar.txtAccent_Check": "Ellenőriz",
   "DE.Controllers.Toolbar.txtAccent_CurveBracketBot": "Alsó zárójel",
   "DE.Controllers.Toolbar.txtAccent_CurveBracketTop": "Felső összekötő",
@@ -961,7 +1003,7 @@
   "DE.Controllers.Toolbar.txtFunction_Csch": "Hiperbolikus koszekáns függvény",
   "DE.Controllers.Toolbar.txtFunction_Custom_1": "Szinusz théta",
   "DE.Controllers.Toolbar.txtFunction_Custom_2": "Cos 2x",
-  "DE.Controllers.Toolbar.txtFunction_Custom_3": "Tangens képlet",
+  "DE.Controllers.Toolbar.txtFunction_Custom_3": "Tangens függvény",
   "DE.Controllers.Toolbar.txtFunction_Sec": "Szekáns függvény",
   "DE.Controllers.Toolbar.txtFunction_Sech": "Hiperbolikus szekáns függvény",
   "DE.Controllers.Toolbar.txtFunction_Sin": "Szinusz függvény",
@@ -1184,6 +1226,7 @@
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Dzéta",
   "DE.Controllers.Viewport.textFitPage": "Oldalhoz igazít",
   "DE.Controllers.Viewport.textFitWidth": "Szélességhez igazít",
+  "DE.Controllers.Viewport.txtDarkMode": "Sötét mód",
   "DE.Views.AddNewCaptionLabelDialog.textLabel": "Címke:",
   "DE.Views.AddNewCaptionLabelDialog.textLabelError": "A címke nem lehet üres.",
   "DE.Views.BookmarksDialog.textAdd": "Hozzáad",
@@ -1328,15 +1371,15 @@
   "DE.Views.DateTimeDialog.textUpdate": "Automatikus frissítés",
   "DE.Views.DateTimeDialog.txtTitle": "Dátum és idő",
   "DE.Views.DocumentHolder.aboveText": "Felett",
-  "DE.Views.DocumentHolder.addCommentText": "Hozzászólás hozzáadása",
+  "DE.Views.DocumentHolder.addCommentText": "Megjegyzés hozzáadása",
   "DE.Views.DocumentHolder.advancedDropCapText": "Iniciálé beállításai",
   "DE.Views.DocumentHolder.advancedFrameText": "Speciális keret beállítások",
-  "DE.Views.DocumentHolder.advancedParagraphText": "Bekezdés haladó beállítások",
+  "DE.Views.DocumentHolder.advancedParagraphText": "Haladó bekezdés beállítások",
   "DE.Views.DocumentHolder.advancedTableText": "Haladó táblázatbeállítások",
   "DE.Views.DocumentHolder.advancedText": "Haladó beállítások",
   "DE.Views.DocumentHolder.alignmentText": "Elrendezés",
   "DE.Views.DocumentHolder.belowText": "Alatt",
-  "DE.Views.DocumentHolder.breakBeforeText": "Oldaltörés elötte",
+  "DE.Views.DocumentHolder.breakBeforeText": "Oldaltörés előtte",
   "DE.Views.DocumentHolder.bulletsText": "Felsorolás és számozás",
   "DE.Views.DocumentHolder.cellAlignText": "Cella vízszintes elrendezése",
   "DE.Views.DocumentHolder.cellText": "Cella",
@@ -1374,6 +1417,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Cellák összevonása",
   "DE.Views.DocumentHolder.moreText": "Több változat...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "Nincsenek változatok",
+  "DE.Views.DocumentHolder.notcriticalErrorTitle": "Figyelmeztetés",
   "DE.Views.DocumentHolder.originalSizeText": "Valódi méret",
   "DE.Views.DocumentHolder.paragraphText": "Bekezdés",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Hivatkozás eltávolítása",
@@ -1441,7 +1485,7 @@
   "DE.Views.DocumentHolder.textRotate270": "Elforgat balra 90 fokkal",
   "DE.Views.DocumentHolder.textRotate90": "Elforgat jobbra 90 fokkal",
   "DE.Views.DocumentHolder.textRow": "Teljes sor törlése",
-  "DE.Views.DocumentHolder.textSeparateList": "Szeparált lista",
+  "DE.Views.DocumentHolder.textSeparateList": "Külön lista",
   "DE.Views.DocumentHolder.textSettings": "Beállítások",
   "DE.Views.DocumentHolder.textSeveral": "Több sor/oszlop",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Alulra rendez",
@@ -1531,6 +1575,7 @@
   "DE.Views.DocumentHolder.txtRemLimit": "Limit eltávolítása",
   "DE.Views.DocumentHolder.txtRemoveAccentChar": "Ékezet eltávolítása",
   "DE.Views.DocumentHolder.txtRemoveBar": "Sáv eltávolítása",
+  "DE.Views.DocumentHolder.txtRemoveWarning": "El szeretné távolítani ezt az aláírást?<br>Nem lehet visszavonni.",
   "DE.Views.DocumentHolder.txtRemScripts": "Szkriptek eltávolítása",
   "DE.Views.DocumentHolder.txtRemSubscript": "Alsó index eltávolítása",
   "DE.Views.DocumentHolder.txtRemSuperscript": "Felső index eltávolítása",
@@ -1550,6 +1595,7 @@
   "DE.Views.DocumentHolder.txtTopAndBottom": "Felül - alul",
   "DE.Views.DocumentHolder.txtUnderbar": "Sáv a szöveg alatt",
   "DE.Views.DocumentHolder.txtUngroup": "Csoport szétválasztása",
+  "DE.Views.DocumentHolder.txtWarnUrl": "A link megnyitása káros lehet az eszközére és adataira.<br>Biztosan folytatja?",
   "DE.Views.DocumentHolder.updateStyleText": "%1 stílust frissít",
   "DE.Views.DocumentHolder.vertAlignText": "Függőleges rendezés",
   "DE.Views.DropcapSettingsAdvanced.strBorders": "Szegélyek és kitöltés",
@@ -1600,7 +1646,9 @@
   "DE.Views.FileMenu.btnBackCaption": "Fájl helyének megnyitása",
   "DE.Views.FileMenu.btnCloseMenuCaption": "Menü bezárása",
   "DE.Views.FileMenu.btnCreateNewCaption": "Új létrehozása",
-  "DE.Views.FileMenu.btnDownloadCaption": "Letöltés mint...",
+  "DE.Views.FileMenu.btnDownloadCaption": "Letöltés másként...",
+  "DE.Views.FileMenu.btnExitCaption": "Kilépés",
+  "DE.Views.FileMenu.btnFileOpenCaption": "Megnyitás...",
   "DE.Views.FileMenu.btnHelpCaption": "Súgó...",
   "DE.Views.FileMenu.btnHistoryCaption": "Verziótörténet",
   "DE.Views.FileMenu.btnInfoCaption": "Dokumentum infó...",
@@ -1616,13 +1664,15 @@
   "DE.Views.FileMenu.btnSettingsCaption": "Haladó beállítások...",
   "DE.Views.FileMenu.btnToEditCaption": "Dokumentum szerkesztése",
   "DE.Views.FileMenu.textDownload": "Letöltés",
+  "DE.Views.FileMenuPanels.CreateNew.txtBlank": "Üres Dokumentum",
+  "DE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Új létrehozása",
   "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Alkalmaz",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Szerző hozzáadása",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Szöveg hozzáadása",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Applikáció",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Szerző",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Hozzáférési jogok módosítása",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Hozzászólás",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Megjegyzés",
   "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Létrehozva",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Betöltés...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Utoljára módosította",
@@ -1661,17 +1711,18 @@
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "El kell fogadnia a módosításokat mielőtt meg tudná nézni",
   "DE.Views.FileMenuPanels.Settings.strFast": "Gyors",
   "DE.Views.FileMenuPanels.Settings.strFontRender": "Betűtípus ajánlás",
-  "DE.Views.FileMenuPanels.Settings.strForcesave": "Mindig mentse a szerverre (egyébként mentse a szerverre a dokumentum bezárásakor)",
+  "DE.Views.FileMenuPanels.Settings.strForcesave": "A Mentés vagy a Ctrl+S gomb megnyomása után adja hozzá a verziót a tárhelyhez",
   "DE.Views.FileMenuPanels.Settings.strInputMode": "Hieroglifák bekapcsolása",
-  "DE.Views.FileMenuPanels.Settings.strLiveComment": "Kapcsolja be a hozzászólások megjelenítését",
+  "DE.Views.FileMenuPanels.Settings.strLiveComment": "Kapcsolja be a megjegyzések megjelenítését",
   "DE.Views.FileMenuPanels.Settings.strMacrosSettings": "Makró beállítások",
   "DE.Views.FileMenuPanels.Settings.strPaste": "Kivágás, másolás és beillesztés",
   "DE.Views.FileMenuPanels.Settings.strPasteButton": "A tartalom beillesztésekor jelenítse meg a beillesztési beállítások gombot",
-  "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Kapcsolja be a megoldott hozzászólások megjelenítését",
+  "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Kapcsolja be a megoldott megjegyzések megjelenítését",
+  "DE.Views.FileMenuPanels.Settings.strReviewHover": "Változások követésének megjelenése",
   "DE.Views.FileMenuPanels.Settings.strShowChanges": "Valós idejű együttműködés módosításai",
   "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Helyesírás-ellenőrzés bekapcsolása",
   "DE.Views.FileMenuPanels.Settings.strStrict": "Biztonságos",
-  "DE.Views.FileMenuPanels.Settings.strTheme": "Téma",
+  "DE.Views.FileMenuPanels.Settings.strTheme": "Felhasználói felület témája",
   "DE.Views.FileMenuPanels.Settings.strUnit": "Mérési egység",
   "DE.Views.FileMenuPanels.Settings.strZoom": "Alapértelmezett zoom érték",
   "DE.Views.FileMenuPanels.Settings.text10Minutes": "10 percenként",
@@ -1683,19 +1734,22 @@
   "DE.Views.FileMenuPanels.Settings.textAutoSave": "Automatikus mentés",
   "DE.Views.FileMenuPanels.Settings.textCompatible": "Kompatibilitás",
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Letiltott",
-  "DE.Views.FileMenuPanels.Settings.textForceSave": "Mentés a szerverre",
+  "DE.Views.FileMenuPanels.Settings.textForceSave": "Köztes verziók mentése",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Minden perc",
   "DE.Views.FileMenuPanels.Settings.textOldVersions": "A fájlok legyenek kompatibilisek a régebbi MS Word verziókkal, amikor DOCX fájlként menti őket",
   "DE.Views.FileMenuPanels.Settings.txtAll": "Mindent mutat",
   "DE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Automatikus javítás beállításai...",
   "DE.Views.FileMenuPanels.Settings.txtCacheMode": "Alapértelmezett cache mód",
+  "DE.Views.FileMenuPanels.Settings.txtChangesBalloons": "Megjelenítés a szövegbuborékokba kattintáskor",
+  "DE.Views.FileMenuPanels.Settings.txtChangesTip": "Megjelenítés az eszköztippekben ha az egér rámutat",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Centiméter",
+  "DE.Views.FileMenuPanels.Settings.txtDarkMode": "Kapcsolja be a dokumentum sötét módot",
   "DE.Views.FileMenuPanels.Settings.txtFitPage": "Oldalhoz igazít",
   "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Szélességhez igazít",
   "DE.Views.FileMenuPanels.Settings.txtInch": "Hüvelyk",
   "DE.Views.FileMenuPanels.Settings.txtInput": "Alternatív bemenet",
   "DE.Views.FileMenuPanels.Settings.txtLast": "Az utolsót mutat",
-  "DE.Views.FileMenuPanels.Settings.txtLiveComment": "Hozzászólások megjelenítése",
+  "DE.Views.FileMenuPanels.Settings.txtLiveComment": "Megjegyzések megjelenítése",
   "DE.Views.FileMenuPanels.Settings.txtMac": "OS X-ként",
   "DE.Views.FileMenuPanels.Settings.txtNative": "Natív",
   "DE.Views.FileMenuPanels.Settings.txtNone": "Semmit nem mutat",
@@ -1706,9 +1760,13 @@
   "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Helyesírás-ellenőrzés",
   "DE.Views.FileMenuPanels.Settings.txtStopMacros": "Összes letiltása",
   "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Minden értesítés nélküli makró letiltása",
-  "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Értesítés mutatása",
+  "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Értesítés megjelenítése",
   "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Minden értesítéssel rendelkező makró letiltása",
   "DE.Views.FileMenuPanels.Settings.txtWin": "Windows-ként",
+  "DE.Views.FormSettings.textAlways": "Mindig",
+  "DE.Views.FormSettings.textAspect": "Képarány zárolása",
+  "DE.Views.FormSettings.textAutofit": "Automatikus igazítás",
+  "DE.Views.FormSettings.textBackgroundColor": "Háttérszín",
   "DE.Views.FormSettings.textCheckbox": "Jelölőnégyzet",
   "DE.Views.FormSettings.textColor": "Szegély színe",
   "DE.Views.FormSettings.textComb": "Karakterfésű",
@@ -1718,6 +1776,7 @@
   "DE.Views.FormSettings.textDisconnect": "Kapcsolat bontása",
   "DE.Views.FormSettings.textDropDown": "Legördülő",
   "DE.Views.FormSettings.textField": "Szövegmező",
+  "DE.Views.FormSettings.textFixed": "Fix méretű mező",
   "DE.Views.FormSettings.textFromFile": "Fájlból",
   "DE.Views.FormSettings.textFromStorage": "Tárolóból",
   "DE.Views.FormSettings.textFromUrl": "Hivatkozásból",
@@ -1726,15 +1785,21 @@
   "DE.Views.FormSettings.textKey": "Kulcs",
   "DE.Views.FormSettings.textLock": "Lezárás",
   "DE.Views.FormSettings.textMaxChars": "Karakter limit",
+  "DE.Views.FormSettings.textMulti": "Többsoros mező",
+  "DE.Views.FormSettings.textNever": "Újabb",
   "DE.Views.FormSettings.textNoBorder": "Nincs szegély",
   "DE.Views.FormSettings.textPlaceholder": "Helyőrző",
   "DE.Views.FormSettings.textRadiobox": "Rádiógomb",
+  "DE.Views.FormSettings.textRequired": "Kötelező",
+  "DE.Views.FormSettings.textScale": "Mikor méretezze át",
   "DE.Views.FormSettings.textSelectImage": "Kép kiválasztása",
   "DE.Views.FormSettings.textTip": "Tipp",
   "DE.Views.FormSettings.textTipAdd": "Új érték hozzáadása",
   "DE.Views.FormSettings.textTipDelete": "Érték törlése",
   "DE.Views.FormSettings.textTipDown": "Lefelé mozgat",
   "DE.Views.FormSettings.textTipUp": "Felfelé mozgat",
+  "DE.Views.FormSettings.textTooBig": "A kép túl nagy",
+  "DE.Views.FormSettings.textTooSmall": "A kép túl kicsi",
   "DE.Views.FormSettings.textUnlock": "Kinyitás",
   "DE.Views.FormSettings.textValue": "Értékopciók",
   "DE.Views.FormSettings.textWidth": "Cella szélesség",
@@ -1745,13 +1810,17 @@
   "DE.Views.FormsTab.capBtnNext": "Következő mező",
   "DE.Views.FormsTab.capBtnPrev": "Előző mező",
   "DE.Views.FormsTab.capBtnRadioBox": "Rádiógomb",
+  "DE.Views.FormsTab.capBtnSaveForm": "Mentés OFORM-ként",
   "DE.Views.FormsTab.capBtnSubmit": "Beküldés",
   "DE.Views.FormsTab.capBtnText": "Szövegmező",
   "DE.Views.FormsTab.capBtnView": "Űrlap megtekintése",
   "DE.Views.FormsTab.textClear": "Mezők törlése",
   "DE.Views.FormsTab.textClearFields": "Az összes mező törlése",
+  "DE.Views.FormsTab.textCreateForm": "Mezők hozzáadása és kitölthető OFORM dokumentumot létrehozása",
+  "DE.Views.FormsTab.textGotIt": "OK",
   "DE.Views.FormsTab.textHighlight": "Kiemelés beállításai",
   "DE.Views.FormsTab.textNoHighlight": "Nincs kiemelés",
+  "DE.Views.FormsTab.textRequired": "Töltse ki az összes szükséges mezőt az űrlap elküldéséhez.",
   "DE.Views.FormsTab.textSubmited": "Az űrlap sikeresen elküldve",
   "DE.Views.FormsTab.tipCheckBox": "Jelölőnégyzet beszúrása",
   "DE.Views.FormsTab.tipComboBox": "Legördülő beszúrása",
@@ -1760,9 +1829,11 @@
   "DE.Views.FormsTab.tipNextForm": "Ugrás a következő mezőre",
   "DE.Views.FormsTab.tipPrevForm": "Ugrás az előző mezőre",
   "DE.Views.FormsTab.tipRadioBox": "Rádiógomb beszúrása",
+  "DE.Views.FormsTab.tipSaveForm": "Fájl mentése kitölthető OFORM dokumentumként",
   "DE.Views.FormsTab.tipSubmit": "Űrlap beküldése",
   "DE.Views.FormsTab.tipTextField": "Szövegmező beszúrása",
-  "DE.Views.FormsTab.tipViewForm": "Űrlap kitöltési mód",
+  "DE.Views.FormsTab.tipViewForm": "Űrlap megtekintése",
+  "DE.Views.FormsTab.txtUntitled": "Névtelen",
   "DE.Views.HeaderFooterSettings.textBottomCenter": "Alul középen",
   "DE.Views.HeaderFooterSettings.textBottomLeft": "Bal alsó",
   "DE.Views.HeaderFooterSettings.textBottomPage": "Az oldal alja",
@@ -1789,12 +1860,13 @@
   "DE.Views.HyperlinkSettingsDialog.textInternal": "Helyezze a dokumentumba",
   "DE.Views.HyperlinkSettingsDialog.textTitle": "Hivatkozás beállítások",
   "DE.Views.HyperlinkSettingsDialog.textTooltip": "Gyorstipp szöveg",
-  "DE.Views.HyperlinkSettingsDialog.textUrl": "Hivatkozás",
+  "DE.Views.HyperlinkSettingsDialog.textUrl": "Hivatkozás erre",
   "DE.Views.HyperlinkSettingsDialog.txtBeginning": "Dokumentum eleje",
   "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Könyvjelzők",
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Ez egy szükséges mező",
   "DE.Views.HyperlinkSettingsDialog.txtHeadings": "Címsorok",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Ennek a mezőnek hivatkozásnak kell lennie a \"http://www.example.com\" formátumban",
+  "DE.Views.HyperlinkSettingsDialog.txtSizeLimit": "Ez a mező legfeljebb 2083 karakterből állhat",
   "DE.Views.ImageSettings.textAdvanced": "Speciális beállítások megjelenítése",
   "DE.Views.ImageSettings.textCrop": "Levág",
   "DE.Views.ImageSettings.textCropFill": "Kitölt",
@@ -1835,7 +1907,7 @@
   "DE.Views.ImageSettingsAdvanced.textAngle": "Szög",
   "DE.Views.ImageSettingsAdvanced.textArrows": "Nyilak",
   "DE.Views.ImageSettingsAdvanced.textAspectRatio": "Méretarány rögzítése",
-  "DE.Views.ImageSettingsAdvanced.textAutofit": "Automatikus helykitöltés",
+  "DE.Views.ImageSettingsAdvanced.textAutofit": "Automatikus igazítás",
   "DE.Views.ImageSettingsAdvanced.textBeginSize": "Kezdő méret",
   "DE.Views.ImageSettingsAdvanced.textBeginStyle": "Kezdő stílus",
   "DE.Views.ImageSettingsAdvanced.textBelow": "alatt",
@@ -1902,7 +1974,7 @@
   "DE.Views.ImageSettingsAdvanced.textWrapTopbottomTooltip": "Teteje és alja",
   "DE.Views.LeftMenu.tipAbout": "Névjegy",
   "DE.Views.LeftMenu.tipChat": "Chat",
-  "DE.Views.LeftMenu.tipComments": "Hozzászólások",
+  "DE.Views.LeftMenu.tipComments": "Megjegyzések",
   "DE.Views.LeftMenu.tipNavigation": "Navigáció",
   "DE.Views.LeftMenu.tipPlugins": "Kiegészítők",
   "DE.Views.LeftMenu.tipSearch": "Keresés",
@@ -2002,7 +2074,7 @@
   "DE.Views.MailMergeSettings.textDocx": "Docx",
   "DE.Views.MailMergeSettings.textDownload": "Letöltés",
   "DE.Views.MailMergeSettings.textEditData": "Címzettek szerkesztése",
-  "DE.Views.MailMergeSettings.textEmail": "Email",
+  "DE.Views.MailMergeSettings.textEmail": "E-mail",
   "DE.Views.MailMergeSettings.textFrom": "Tól",
   "DE.Views.MailMergeSettings.textGoToMail": "Ugorj a levelezésre",
   "DE.Views.MailMergeSettings.textHighlight": "Egyesítési mezők kiemelése",
@@ -2018,7 +2090,7 @@
   "DE.Views.MailMergeSettings.textSendMsg": "Az összes e-mail üzenet készen áll, és hamarosan elküldésre kerül.<br>A küldés sebessége az Ön e-mail szolgáltatásától függ.<br>Folytathatja a munkát a dokumentummal vagy be is zárhatja. Miután a művelet befejeződött, értesítést küldünk a regisztráció során használt e-mail címére.",
   "DE.Views.MailMergeSettings.textTo": "ig",
   "DE.Views.MailMergeSettings.txtFirst": "Első rekord",
-  "DE.Views.MailMergeSettings.txtFromToError": "A \"tól\" értéke kevesebb kell, hogy legyen, mint az \"ig\" értéke",
+  "DE.Views.MailMergeSettings.txtFromToError": "A \"-tól\" értéke kevesebb kell, hogy legyen, mint az \"-ig\" értéke",
   "DE.Views.MailMergeSettings.txtLast": "Utolsó rekord",
   "DE.Views.MailMergeSettings.txtNext": "A következő rekordhoz",
   "DE.Views.MailMergeSettings.txtPrev": "A korábbi rekordhoz",
@@ -2105,7 +2177,7 @@
   "DE.Views.ParagraphSettingsAdvanced.noTabs": "A megadott lapok ezen a területen jelennek meg.",
   "DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Minden nagybetű",
   "DE.Views.ParagraphSettingsAdvanced.strBorders": "Szegélyek és kitöltés",
-  "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Oldaltörés elötte",
+  "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Oldaltörés előtte",
   "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Duplán áthúzott",
   "DE.Views.ParagraphSettingsAdvanced.strIndent": "Behúzások",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Bal",
@@ -2193,7 +2265,7 @@
   "DE.Views.ShapeSettings.strPattern": "Minta",
   "DE.Views.ShapeSettings.strShadow": "Árnyék mutatása",
   "DE.Views.ShapeSettings.strSize": "Méret",
-  "DE.Views.ShapeSettings.strStroke": "Körvonal",
+  "DE.Views.ShapeSettings.strStroke": "Vonal",
   "DE.Views.ShapeSettings.strTransparency": "Átlátszóság",
   "DE.Views.ShapeSettings.strType": "Típus",
   "DE.Views.ShapeSettings.textAdvanced": "Speciális beállítások megjelenítése",
@@ -2269,9 +2341,9 @@
   "DE.Views.Statusbar.tipFitPage": "Oldalhoz igazít",
   "DE.Views.Statusbar.tipFitWidth": "Szélességhez igazít",
   "DE.Views.Statusbar.tipSetLang": "Szöveg nyelvének beállítása",
-  "DE.Views.Statusbar.tipZoomFactor": "Zoom",
-  "DE.Views.Statusbar.tipZoomIn": "Zoom be",
-  "DE.Views.Statusbar.tipZoomOut": "Zoom ki",
+  "DE.Views.Statusbar.tipZoomFactor": "Nagyítás",
+  "DE.Views.Statusbar.tipZoomIn": "Nagyítás",
+  "DE.Views.Statusbar.tipZoomOut": "Kicsinyítés",
   "DE.Views.Statusbar.txtPageNumInvalid": "Hibás oldalszám",
   "DE.Views.StyleTitleDialog.textHeader": "Új stílus létrehozása",
   "DE.Views.StyleTitleDialog.textNextStyle": "Következő bekezdésstílus",
@@ -2330,7 +2402,7 @@
   "DE.Views.TableSettings.splitCellsText": "Cella felosztása...",
   "DE.Views.TableSettings.splitCellTitleText": "Cella felosztása",
   "DE.Views.TableSettings.strRepeatRow": "Ismételje fejléc-sorként az egyes oldalak tetején",
-  "DE.Views.TableSettings.textAddFormula": "Képlet hozzáadása",
+  "DE.Views.TableSettings.textAddFormula": "Függvény hozzáadása",
   "DE.Views.TableSettings.textAdvanced": "Speciális beállítások megjelenítése",
   "DE.Views.TableSettings.textBackColor": "Háttérszín",
   "DE.Views.TableSettings.textBanded": "Csíkos",
@@ -2338,6 +2410,7 @@
   "DE.Views.TableSettings.textBorders": "Szegély stílus",
   "DE.Views.TableSettings.textCellSize": "Sorok és cellák mérete",
   "DE.Views.TableSettings.textColumns": "Oszlopok",
+  "DE.Views.TableSettings.textConvert": "Táblázat konvertálása szövegbe",
   "DE.Views.TableSettings.textDistributeCols": "Oszlopok elosztása",
   "DE.Views.TableSettings.textDistributeRows": "Sorok elosztása",
   "DE.Views.TableSettings.textEdit": "Sorok és oszlopok",
@@ -2442,10 +2515,18 @@
   "DE.Views.TableSettingsAdvanced.txtNoBorders": "Nincsenek szegélyek",
   "DE.Views.TableSettingsAdvanced.txtPercent": "Százalék",
   "DE.Views.TableSettingsAdvanced.txtPt": "Pont",
+  "DE.Views.TableToTextDialog.textEmpty": "Be kell írnia egy karaktert az egyéni elválasztóhoz.",
+  "DE.Views.TableToTextDialog.textNested": "Beágyazott táblázatok konvertálása",
+  "DE.Views.TableToTextDialog.textOther": "Egyéb",
+  "DE.Views.TableToTextDialog.textPara": "Bekezdésjelek",
+  "DE.Views.TableToTextDialog.textSemicolon": "Pontosvesszők",
+  "DE.Views.TableToTextDialog.textSeparator": "Szöveg elválasztása ezzel:",
+  "DE.Views.TableToTextDialog.textTab": "Lapok",
+  "DE.Views.TableToTextDialog.textTitle": "Táblázat konvertálása szövegbe",
   "DE.Views.TextArtSettings.strColor": "Szín",
   "DE.Views.TextArtSettings.strFill": "Kitölt",
   "DE.Views.TextArtSettings.strSize": "Méret",
-  "DE.Views.TextArtSettings.strStroke": "Körvonal",
+  "DE.Views.TextArtSettings.strStroke": "Vonal",
   "DE.Views.TextArtSettings.strTransparency": "Átlátszóság",
   "DE.Views.TextArtSettings.strType": "Típus",
   "DE.Views.TextArtSettings.textAngle": "Szög",
@@ -2465,10 +2546,25 @@
   "DE.Views.TextArtSettings.tipAddGradientPoint": "Színátmenet pont hozzáadása",
   "DE.Views.TextArtSettings.tipRemoveGradientPoint": "Színátmenet pont eltávolítása",
   "DE.Views.TextArtSettings.txtNoBorders": "Nincs vonal",
-  "DE.Views.Toolbar.capBtnAddComment": "Hozzászólás írása",
+  "DE.Views.TextToTableDialog.textAutofit": "Automatikus igazítás beállításai",
+  "DE.Views.TextToTableDialog.textColumns": "Oszlopok",
+  "DE.Views.TextToTableDialog.textContents": "Automatikus igazítás a tartalomhoz",
+  "DE.Views.TextToTableDialog.textEmpty": "Be kell írnia egy karaktert az egyéni elválasztóhoz.",
+  "DE.Views.TextToTableDialog.textFixed": "Rögzített oszlopszélesség",
+  "DE.Views.TextToTableDialog.textOther": "Egyéb",
+  "DE.Views.TextToTableDialog.textPara": "Bekezdések",
+  "DE.Views.TextToTableDialog.textRows": "Sorok",
+  "DE.Views.TextToTableDialog.textSemicolon": "Pontosvesszők",
+  "DE.Views.TextToTableDialog.textSeparator": "Szöveg elválasztása ennél:",
+  "DE.Views.TextToTableDialog.textTab": "Lapok",
+  "DE.Views.TextToTableDialog.textTableSize": "Táblázat mérete",
+  "DE.Views.TextToTableDialog.textTitle": "Szöveg konvertálása táblázatba",
+  "DE.Views.TextToTableDialog.textWindow": "Automatikus igazítás az ablakhoz",
+  "DE.Views.TextToTableDialog.txtAutoText": "Automatikus",
+  "DE.Views.Toolbar.capBtnAddComment": "Megjegyzés hozzáadása",
   "DE.Views.Toolbar.capBtnBlankPage": "Üres oldal",
   "DE.Views.Toolbar.capBtnColumns": "Hasábok",
-  "DE.Views.Toolbar.capBtnComment": "Hozzászólás",
+  "DE.Views.Toolbar.capBtnComment": "Megjegyzés",
   "DE.Views.Toolbar.capBtnDateTime": "Dátum és idő",
   "DE.Views.Toolbar.capBtnInsChart": "Diagram",
   "DE.Views.Toolbar.capBtnInsControls": "Tartalomkezelők",
@@ -2500,6 +2596,9 @@
   "DE.Views.Toolbar.mniEditFooter": "Lábléc szerkesztése",
   "DE.Views.Toolbar.mniEditHeader": "Fejléc szerkesztése",
   "DE.Views.Toolbar.mniEraseTable": "Táblázat törlése",
+  "DE.Views.Toolbar.mniFromFile": "Fájlból",
+  "DE.Views.Toolbar.mniFromStorage": "Tárolóból",
+  "DE.Views.Toolbar.mniFromUrl": "URL-ből",
   "DE.Views.Toolbar.mniHiddenBorders": "Rejtett táblázat szegélyek",
   "DE.Views.Toolbar.mniHiddenChars": "Tabulátorok",
   "DE.Views.Toolbar.mniHighlightControls": "Kiemelés beállításai",
@@ -2508,6 +2607,7 @@
   "DE.Views.Toolbar.mniImageFromUrl": "Kép hivatkozásból",
   "DE.Views.Toolbar.mniLowerCase": "kisbetűs",
   "DE.Views.Toolbar.mniSentenceCase": "Mondatkezdő.",
+  "DE.Views.Toolbar.mniTextToTable": "Szöveg konvertálása táblázatba",
   "DE.Views.Toolbar.mniToggleCase": "kIS- éS nAGYBETŰ vÁLTÁSA",
   "DE.Views.Toolbar.mniUpperCase": "NAGYBETŰS",
   "DE.Views.Toolbar.strMenuNoFill": "Nincs kitöltés",
@@ -2655,7 +2755,7 @@
   "DE.Views.Toolbar.txtScheme11": "Metro",
   "DE.Views.Toolbar.txtScheme12": "Modul",
   "DE.Views.Toolbar.txtScheme13": "Gazdag",
-  "DE.Views.Toolbar.txtScheme14": "Oriel",
+  "DE.Views.Toolbar.txtScheme14": "Ablakfülke",
   "DE.Views.Toolbar.txtScheme15": "Eredet",
   "DE.Views.Toolbar.txtScheme16": "Papír",
   "DE.Views.Toolbar.txtScheme17": "Napforduló",
@@ -2664,6 +2764,7 @@
   "DE.Views.Toolbar.txtScheme2": "Szürkeárnyalatos",
   "DE.Views.Toolbar.txtScheme20": "Városi",
   "DE.Views.Toolbar.txtScheme21": "Lelkesedés",
+  "DE.Views.Toolbar.txtScheme22": "Új Office",
   "DE.Views.Toolbar.txtScheme3": "Apex",
   "DE.Views.Toolbar.txtScheme4": "Nézőpont",
   "DE.Views.Toolbar.txtScheme5": "Polgári",

apps/documenteditor/main/locale/ja.json

@@ -434,6 +434,7 @@
   "Common.Views.ReviewPopover.txtAccept": "同意する",
   "Common.Views.ReviewPopover.txtDeleteTip": "削除",
   "Common.Views.ReviewPopover.txtEditTip": "編集",
+  "Common.Views.ReviewPopover.txtReject": "拒否する",
   "Common.Views.SaveAsDlg.textLoading": "読み込み中",
   "Common.Views.SaveAsDlg.textTitle": "保存先のフォルダ",
   "Common.Views.SelectFileDlg.textLoading": "読み込み中",
@@ -1742,6 +1743,7 @@
   "DE.Views.FileMenuPanels.Settings.txtChangesBalloons": "バルーンをクリックで表示する",
   "DE.Views.FileMenuPanels.Settings.txtChangesTip": "ヒントをクリックで表示する",
   "DE.Views.FileMenuPanels.Settings.txtCm": "センチ",
+  "DE.Views.FileMenuPanels.Settings.txtDarkMode": "ドキュメントをダークモードに変更",
   "DE.Views.FileMenuPanels.Settings.txtFitPage": "ページに合わせる",
   "DE.Views.FileMenuPanels.Settings.txtFitWidth": "幅を合わせる",
   "DE.Views.FileMenuPanels.Settings.txtInch": "インチ",
@@ -1808,7 +1810,7 @@
   "DE.Views.FormsTab.capBtnNext": "新しいフィールド",
   "DE.Views.FormsTab.capBtnPrev": "前のフィールド",
   "DE.Views.FormsTab.capBtnRadioBox": "ラジオボタン",
-  "DE.Views.FormsTab.capBtnSaveForm": "フォームとして保存",
+  "DE.Views.FormsTab.capBtnSaveForm": "オリジナルフォームとして保存",
   "DE.Views.FormsTab.capBtnSubmit": "送信",
   "DE.Views.FormsTab.capBtnText": "テキストフィールド",
   "DE.Views.FormsTab.capBtnView": "フォームを表示する",

apps/documenteditor/main/locale/nl.json

@@ -1743,6 +1743,7 @@
   "DE.Views.FileMenuPanels.Settings.txtChangesBalloons": "Geef weer door klik in ballons",
   "DE.Views.FileMenuPanels.Settings.txtChangesTip": "Geef weer in tooltips door cursor over item te bewegen.",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Centimeter",
+  "DE.Views.FileMenuPanels.Settings.txtDarkMode": "Donkere modus voor document inschakelen",
   "DE.Views.FileMenuPanels.Settings.txtFitPage": "Aan pagina aanpassen",
   "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Aan breedte aanpassen",
   "DE.Views.FileMenuPanels.Settings.txtInch": "Inch",
@@ -1809,7 +1810,7 @@
   "DE.Views.FormsTab.capBtnNext": "Volgend veld ",
   "DE.Views.FormsTab.capBtnPrev": "Vorig veld",
   "DE.Views.FormsTab.capBtnRadioBox": "Radial knop",
-  "DE.Views.FormsTab.capBtnSaveForm": "Opslaan als formulier",
+  "DE.Views.FormsTab.capBtnSaveForm": "Opslaan als OFORM",
   "DE.Views.FormsTab.capBtnSubmit": "Verzenden ",
   "DE.Views.FormsTab.capBtnText": "Tekstvak",
   "DE.Views.FormsTab.capBtnView": "Bekijk formulier",

apps/documenteditor/main/locale/pl.json

@@ -1743,6 +1743,7 @@
   "DE.Views.FileMenuPanels.Settings.txtChangesBalloons": "Pokaż po kliknięciu w objaśnieniach",
   "DE.Views.FileMenuPanels.Settings.txtChangesTip": "Pokaż po najechaniu na podpowiedzi",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Centymetr",
+  "DE.Views.FileMenuPanels.Settings.txtDarkMode": "Włącz tryb ciemny dla dokumentu",
   "DE.Views.FileMenuPanels.Settings.txtFitPage": "Dopasuj do strony",
   "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Dopasuj do szerokości",
   "DE.Views.FileMenuPanels.Settings.txtInch": "Cale",

apps/documenteditor/main/locale/pt.json

@@ -168,6 +168,8 @@
   "Common.UI.ExtendedColorDialog.textNew": "Novo",
   "Common.UI.ExtendedColorDialog.textRGBErr": "O valor inserido está incorreto.<br>Insira um valor numérico entre 0 e 255.",
   "Common.UI.HSBColorPicker.textNoColor": "Sem cor",
+  "Common.UI.InputFieldBtnPassword.textHintHidePwd": "Ocultar palavra-chave",
+  "Common.UI.InputFieldBtnPassword.textHintShowPwd": "Mostrar senha",
   "Common.UI.SearchDialog.textHighlight": "Destacar resultados",
   "Common.UI.SearchDialog.textMatchCase": "Diferenciar maiúsculas de minúsculas",
   "Common.UI.SearchDialog.textReplaceDef": "Inserir o texto de substituição",
@@ -211,6 +213,7 @@
   "Common.Views.AutoCorrectDialog.textBulleted": "Listas com marcadores automáticas",
   "Common.Views.AutoCorrectDialog.textBy": "Por",
   "Common.Views.AutoCorrectDialog.textDelete": "Excluir",
+  "Common.Views.AutoCorrectDialog.textFLCells": "Capitalizar a primeira letra das células da tabela",
   "Common.Views.AutoCorrectDialog.textFLSentence": "Capitalizar a primeira carta de sentenças",
   "Common.Views.AutoCorrectDialog.textHyperlink": "Internet e caminhos de rede com hyperlinks",
   "Common.Views.AutoCorrectDialog.textHyphens": "Hífens (--) com traço (-)",
@@ -236,12 +239,14 @@
   "Common.Views.Comments.mniAuthorDesc": "Autor Z a A",
   "Common.Views.Comments.mniDateAsc": "Mais antigo",
   "Common.Views.Comments.mniDateDesc": "Novidades",
+  "Common.Views.Comments.mniFilterGroups": "Filtrar por grupo",
   "Common.Views.Comments.mniPositionAsc": "De cima",
   "Common.Views.Comments.mniPositionDesc": "Do fundo",
   "Common.Views.Comments.textAdd": "Incluir",
   "Common.Views.Comments.textAddComment": "Adicionar",
   "Common.Views.Comments.textAddCommentToDoc": "Adicionar comentário ao documento",
   "Common.Views.Comments.textAddReply": "Adicionar resposta",
+  "Common.Views.Comments.textAll": "Todos",
   "Common.Views.Comments.textAnonym": "Visitante",
   "Common.Views.Comments.textCancel": "Cancelar",
   "Common.Views.Comments.textClose": "Fechar",
@@ -255,6 +260,7 @@
   "Common.Views.Comments.textResolve": "Resolver",
   "Common.Views.Comments.textResolved": "Resolvido",
   "Common.Views.Comments.textSort": "Ordenar comentários",
+  "Common.Views.Comments.textViewResolved": "Não tem permissão para reabrir comentários",
   "Common.Views.CopyWarningDialog.textDontShow": "Não exibir esta mensagem novamente",
   "Common.Views.CopyWarningDialog.textMsg": "As ações copiar, cortar e colar usando os botões da barra de ferramentas do editor e as ações de menu de contexto serão realizadas apenas nesta aba do editor.<br><br>Para copiar ou colar para ou de aplicativos externos a aba do editor, use as seguintes combinações do teclado:",
   "Common.Views.CopyWarningDialog.textTitle": "Ações copiar, cortar e colar",
@@ -431,6 +437,7 @@
   "Common.Views.ReviewPopover.textOpenAgain": "Abrir Novamente",
   "Common.Views.ReviewPopover.textReply": "Responder",
   "Common.Views.ReviewPopover.textResolve": "Resolver",
+  "Common.Views.ReviewPopover.textViewResolved": "Não tem permissão para reabrir comentários",
   "Common.Views.ReviewPopover.txtAccept": "Aceitar",
   "Common.Views.ReviewPopover.txtDeleteTip": "Excluir",
   "Common.Views.ReviewPopover.txtEditTip": "Editar",
@@ -602,6 +609,7 @@
   "DE.Controllers.Main.textLongName": "Insira um nome com menos de 128 caracteres.",
   "DE.Controllers.Main.textNoLicenseTitle": "Limite de licença atingido",
   "DE.Controllers.Main.textPaidFeature": "Recurso pago",
+  "DE.Controllers.Main.textReconnect": "A conexão é restaurada",
   "DE.Controllers.Main.textRemember": "Lembrar da minha escolha para todos os arquivos. ",
   "DE.Controllers.Main.textRenameError": "O nome de usuário não pode estar vazio.",
   "DE.Controllers.Main.textRenameLabel": "Insira um nome a ser usado para colaboração",
@@ -879,6 +887,7 @@
   "DE.Controllers.Main.warnProcessRightsChange": "Foi negado a você o direito de editar o arquivo.",
   "DE.Controllers.Navigation.txtBeginning": "Início do documento",
   "DE.Controllers.Navigation.txtGotoBeginning": "Ir para o início do documento",
+  "DE.Controllers.Statusbar.textDisconnect": "<b>A conexão foi perdida</b><br>Tentando conectar. Verifique as configurações de conexão.",
   "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
   "DE.Controllers.Statusbar.textSetTrackChanges": "Você está em modo de rastreamento de alterações",
   "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
@@ -902,6 +911,7 @@
   "DE.Controllers.Toolbar.textMatrix": "Matrizes",
   "DE.Controllers.Toolbar.textOperator": "Operadores",
   "DE.Controllers.Toolbar.textRadical": "Radicais",
+  "DE.Controllers.Toolbar.textRecentlyUsed": "Usado recentemente",
   "DE.Controllers.Toolbar.textScript": "Scripts",
   "DE.Controllers.Toolbar.textSymbols": "Símbolos",
   "DE.Controllers.Toolbar.textTabForms": "Formulários",
@@ -1457,6 +1467,7 @@
   "DE.Views.DocumentHolder.textDistributeCols": "Distribuir colunas",
   "DE.Views.DocumentHolder.textDistributeRows": "Distribuir linhas",
   "DE.Views.DocumentHolder.textEditControls": "Propriedades do controle de conteúdo",
+  "DE.Views.DocumentHolder.textEditPoints": "Editar Pontos",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Editar limite de disposição",
   "DE.Views.DocumentHolder.textFlipH": "Virar horizontalmente",
   "DE.Views.DocumentHolder.textFlipV": "Virar verticalmente",
@@ -1871,6 +1882,7 @@
   "DE.Views.ImageSettings.textCrop": "Cortar",
   "DE.Views.ImageSettings.textCropFill": "Preencher",
   "DE.Views.ImageSettings.textCropFit": "Ajustar",
+  "DE.Views.ImageSettings.textCropToShape": "Cortar para dar forma",
   "DE.Views.ImageSettings.textEdit": "Editar",
   "DE.Views.ImageSettings.textEditObject": "Editar objeto",
   "DE.Views.ImageSettings.textFitMargins": "Ajustar à margem",
@@ -1885,6 +1897,7 @@
   "DE.Views.ImageSettings.textHintFlipV": "Virar verticalmente",
   "DE.Views.ImageSettings.textInsert": "Substituir imagem",
   "DE.Views.ImageSettings.textOriginalSize": "Tamanho padrão",
+  "DE.Views.ImageSettings.textRecentlyUsed": "Usado recentemente",
   "DE.Views.ImageSettings.textRotate90": "Girar 90º",
   "DE.Views.ImageSettings.textRotation": "Rotação",
   "DE.Views.ImageSettings.textSize": "Tamanho",
@@ -2155,6 +2168,11 @@
   "DE.Views.PageSizeDialog.textTitle": "Tamanho da página",
   "DE.Views.PageSizeDialog.textWidth": "Largura",
   "DE.Views.PageSizeDialog.txtCustom": "Personalizar",
+  "DE.Views.PageThumbnails.textClosePanel": "Fechar miniaturas de página",
+  "DE.Views.PageThumbnails.textHighlightVisiblePart": "Realçar parte visível da página",
+  "DE.Views.PageThumbnails.textPageThumbnails": "Miniaturas de página",
+  "DE.Views.PageThumbnails.textThumbnailsSettings": "Configurações de miniaturas",
+  "DE.Views.PageThumbnails.textThumbnailsSize": "Tamanho das miniaturas",
   "DE.Views.ParagraphSettings.strIndent": "Recuos",
   "DE.Views.ParagraphSettings.strIndentsLeftText": "Esquerda",
   "DE.Views.ParagraphSettings.strIndentsRightText": "Direita",
@@ -2290,6 +2308,7 @@
   "DE.Views.ShapeSettings.textPatternFill": "Padrão",
   "DE.Views.ShapeSettings.textPosition": "Posição",
   "DE.Views.ShapeSettings.textRadial": "Radial",
+  "DE.Views.ShapeSettings.textRecentlyUsed": "Usado recentemente",
   "DE.Views.ShapeSettings.textRotate90": "Girar 90º",
   "DE.Views.ShapeSettings.textRotation": "Rotação",
   "DE.Views.ShapeSettings.textSelectImage": "Selecionar imagem",
@@ -2681,6 +2700,7 @@
   "DE.Views.Toolbar.textTabLinks": "Referências",
   "DE.Views.Toolbar.textTabProtect": "Proteção",
   "DE.Views.Toolbar.textTabReview": "Revisar",
+  "DE.Views.Toolbar.textTabView": "Ver",
   "DE.Views.Toolbar.textTitleError": "Erro",
   "DE.Views.Toolbar.textToCurrent": "Para posição atual",
   "DE.Views.Toolbar.textTop": "Parte superior: ",
@@ -2772,6 +2792,15 @@
   "DE.Views.Toolbar.txtScheme7": "Patrimônio Líquido",
   "DE.Views.Toolbar.txtScheme8": "Fluxo",
   "DE.Views.Toolbar.txtScheme9": "Fundição",
+  "DE.Views.ViewTab.textAlwaysShowToolbar": "Sempre mostrar a barra de ferramentas",
+  "DE.Views.ViewTab.textDarkDocument": "Documento escuro",
+  "DE.Views.ViewTab.textFitToPage": "Ajustar a página",
+  "DE.Views.ViewTab.textFitToWidth": "Ajustar largura",
+  "DE.Views.ViewTab.textInterfaceTheme": "Tema de interface",
+  "DE.Views.ViewTab.textNavigation": "Navegação",
+  "DE.Views.ViewTab.textRulers": "Regras",
+  "DE.Views.ViewTab.textStatusBar": "Barra de status",
+  "DE.Views.ViewTab.textZoom": "Zoom",
   "DE.Views.WatermarkSettingsDialog.textAuto": "Automático",
   "DE.Views.WatermarkSettingsDialog.textBold": "Negrito",
   "DE.Views.WatermarkSettingsDialog.textColor": "Cor do texto",

apps/documenteditor/main/locale/ru.json

@@ -121,6 +121,7 @@
   "Common.define.chartData.textScatterSmoothMarker": "Точечная с гладкими кривыми и маркерами",
   "Common.define.chartData.textStock": "Биржевая",
   "Common.define.chartData.textSurface": "Поверхность",
+  "Common.Translation.textMoreButton": "Больше",
   "Common.Translation.warnFileLocked": "Вы не можете редактировать этот файл, потому что он уже редактируется в другом приложении.",
   "Common.Translation.warnFileLockedBtnEdit": "Создать копию",
   "Common.Translation.warnFileLockedBtnView": "Открыть на просмотр",

apps/documenteditor/main/locale/tr.json

@@ -168,6 +168,8 @@
   "Common.UI.ExtendedColorDialog.textNew": "Yeni",
   "Common.UI.ExtendedColorDialog.textRGBErr": "Girilen değer yanlış. <br> Lütfen 0 ile 255 arasında sayısal değer giriniz.",
   "Common.UI.HSBColorPicker.textNoColor": "Renk yok",
+  "Common.UI.InputFieldBtnPassword.textHintHidePwd": "Parolayı gizle",
+  "Common.UI.InputFieldBtnPassword.textHintShowPwd": "Parolayı göster",
   "Common.UI.SearchDialog.textHighlight": "Vurgu sonuçları",
   "Common.UI.SearchDialog.textMatchCase": "Büyük küçük harfe duyarlı",
   "Common.UI.SearchDialog.textReplaceDef": "Yerine geçecek metini giriniz",
@@ -211,6 +213,7 @@
   "Common.Views.AutoCorrectDialog.textBulleted": "Otomatik madde listesi",
   "Common.Views.AutoCorrectDialog.textBy": "Tarafından",
   "Common.Views.AutoCorrectDialog.textDelete": "Sil",
+  "Common.Views.AutoCorrectDialog.textFLCells": "Tablo hücrelerinin ilk harfini büyük harf yap",
   "Common.Views.AutoCorrectDialog.textFLSentence": "Cümlelerin ilk harfini büyük yaz",
   "Common.Views.AutoCorrectDialog.textHyperlink": "Köprülü internet ve ağ yolları",
   "Common.Views.AutoCorrectDialog.textHyphens": "Kısa çizgi (--) ve tire (—) ",
@@ -236,12 +239,14 @@
   "Common.Views.Comments.mniAuthorDesc": "Yazar Z'den A'ya",
   "Common.Views.Comments.mniDateAsc": "En eski",
   "Common.Views.Comments.mniDateDesc": "En yeni",
+  "Common.Views.Comments.mniFilterGroups": "Gruba göre Filtrele",
   "Common.Views.Comments.mniPositionAsc": "Üstten",
   "Common.Views.Comments.mniPositionDesc": "Alttan",
   "Common.Views.Comments.textAdd": "Ekle",
   "Common.Views.Comments.textAddComment": "Yorum Ekle",
   "Common.Views.Comments.textAddCommentToDoc": "Dökümana yorum ekle",
   "Common.Views.Comments.textAddReply": "Cevap ekle",
+  "Common.Views.Comments.textAll": "Tümü",
   "Common.Views.Comments.textAnonym": "Misafir",
   "Common.Views.Comments.textCancel": "İptal Et",
   "Common.Views.Comments.textClose": "Kapat",
@@ -255,6 +260,7 @@
   "Common.Views.Comments.textResolve": "Çöz",
   "Common.Views.Comments.textResolved": "Çözüldü",
   "Common.Views.Comments.textSort": "Yorumları sırala",
+  "Common.Views.Comments.textViewResolved": "Yorumu yeniden açma izniniz yok",
   "Common.Views.CopyWarningDialog.textDontShow": "Bu mesajı bir daha gösterme",
   "Common.Views.CopyWarningDialog.textMsg": "Editör araç çubuğu tuşlarını kullanarak eylemleri kopyala,kes ve yapıştır ve içerik menüsü eylemleri sadece bu editör sekmesiyle yapılabilir. <br><br>Editör sekmesi dışındaki uygulamalara/dan kopyalamak yada yapıştırmak için şu klavye kombinasyonlarını kullanınız:",
   "Common.Views.CopyWarningDialog.textTitle": "Eylemler Kopyala,Kes ve Yapıştır",
@@ -431,6 +437,7 @@
   "Common.Views.ReviewPopover.textOpenAgain": "Tekrar Aç",
   "Common.Views.ReviewPopover.textReply": "Yanıtla",
   "Common.Views.ReviewPopover.textResolve": "Çöz",
+  "Common.Views.ReviewPopover.textViewResolved": "Yorumu yeniden açma izniniz yok",
   "Common.Views.ReviewPopover.txtAccept": "Kabul Et",
   "Common.Views.ReviewPopover.txtDeleteTip": "Sil",
   "Common.Views.ReviewPopover.txtEditTip": "Düzenle",
@@ -601,6 +608,7 @@
   "DE.Controllers.Main.textLongName": "128 Karakterden kısa bir ad girin.",
   "DE.Controllers.Main.textNoLicenseTitle": "Lisans limitine ulaşıldı.",
   "DE.Controllers.Main.textPaidFeature": "Ücretli Özellik",
+  "DE.Controllers.Main.textReconnect": "Yeniden bağlanıldı",
   "DE.Controllers.Main.textRemember": "Seçimimi tüm dosyalar için hatırla",
   "DE.Controllers.Main.textRenameError": "Kullanıcı adı boş bırakılmamalıdır.",
   "DE.Controllers.Main.textRenameLabel": "İşbirliği için kullanılacak bir ad girin",
@@ -878,6 +886,7 @@
   "DE.Controllers.Main.warnProcessRightsChange": "Dosyayı düzenleme hakkınız reddedildi",
   "DE.Controllers.Navigation.txtBeginning": "Belge başlangıcı",
   "DE.Controllers.Navigation.txtGotoBeginning": "Belgenin başlangıcına git",
+  "DE.Controllers.Statusbar.textDisconnect": "<b>Bağlantı kesildi</b><br>Bağlanmayı deneyin. Lütfen bağlantı ayarlarını kontrol edin.",
   "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
   "DE.Controllers.Statusbar.textSetTrackChanges": "Değişiklikleri İzle modundasınız",
   "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
@@ -901,10 +910,22 @@
   "DE.Controllers.Toolbar.textMatrix": "Matris",
   "DE.Controllers.Toolbar.textOperator": "İşleç",
   "DE.Controllers.Toolbar.textRadical": "Kök",
+  "DE.Controllers.Toolbar.textRecentlyUsed": "Son Kullanılanlar",
   "DE.Controllers.Toolbar.textScript": "Simge",
   "DE.Controllers.Toolbar.textSymbols": "Simgeler",
   "DE.Controllers.Toolbar.textTabForms": "Formlar",
   "DE.Controllers.Toolbar.textWarning": "Dikkat",
+  "DE.Controllers.Toolbar.tipMarkersArrow": "Ok işaretleri",
+  "DE.Controllers.Toolbar.tipMarkersCheckmark": "Onay işaretleri",
+  "DE.Controllers.Toolbar.tipMarkersDash": "Çizgi işaretleri",
+  "DE.Controllers.Toolbar.tipMarkersFRhombus": "Dolu eşkenar dörtgen işaretler",
+  "DE.Controllers.Toolbar.tipMarkersFRound": "Dolu yuvarlak işaretler",
+  "DE.Controllers.Toolbar.tipMarkersFSquare": "Dolu kare işaretler",
+  "DE.Controllers.Toolbar.tipMarkersHRound": "İçi boş daire işaretler",
+  "DE.Controllers.Toolbar.tipMarkersStar": "Yıldız işaretleri",
+  "DE.Controllers.Toolbar.tipMultiLevelNumbered": "Çok düzeyli numaralı işaretler",
+  "DE.Controllers.Toolbar.tipMultiLevelSymbols": "Çok düzeyli sembol işaretleri",
+  "DE.Controllers.Toolbar.tipMultiLevelVarious": "Çok düzeyli çeşitli numaralı işaretler",
   "DE.Controllers.Toolbar.txtAccent_Accent": "Akut",
   "DE.Controllers.Toolbar.txtAccent_ArrowD": "Right-Left Arrow Above",
   "DE.Controllers.Toolbar.txtAccent_ArrowL": "Leftwards Arrow Above",
@@ -1281,8 +1302,8 @@
   "DE.Views.ChartSettings.textWidth": "Genişlik",
   "DE.Views.ChartSettings.textWrap": "Kaydırma Stili",
   "DE.Views.ChartSettings.txtBehind": "Arkada",
-  "DE.Views.ChartSettings.txtInFront": "Önde",
-  "DE.Views.ChartSettings.txtInline": "Satıriçi",
+  "DE.Views.ChartSettings.txtInFront": "Yazının Önünde",
+  "DE.Views.ChartSettings.txtInline": "Satıriçi Yazı",
   "DE.Views.ChartSettings.txtSquare": "Kare",
   "DE.Views.ChartSettings.txtThrough": "Sonu",
   "DE.Views.ChartSettings.txtTight": "Sıkı",
@@ -1456,6 +1477,7 @@
   "DE.Views.DocumentHolder.textDistributeCols": "Sütunları dağıt",
   "DE.Views.DocumentHolder.textDistributeRows": "Satırları dağıt",
   "DE.Views.DocumentHolder.textEditControls": "İçerik kontrol ayarları",
+  "DE.Views.DocumentHolder.textEditPoints": "Noktaları Düzenle",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Sargı Sınırı Düzenle",
   "DE.Views.DocumentHolder.textFlipH": "Yatay olarak çevir",
   "DE.Views.DocumentHolder.textFlipV": "Dikey Çevir",
@@ -1504,6 +1526,14 @@
   "DE.Views.DocumentHolder.textUpdateTOC": "İçindekiler tablosunu yenile",
   "DE.Views.DocumentHolder.textWrap": "Kaydırma Stili",
   "DE.Views.DocumentHolder.tipIsLocked": "Bu element şu an başka bir kullanıcı tarafından düzenleniyor.",
+  "DE.Views.DocumentHolder.tipMarkersArrow": "Ok işaretleri",
+  "DE.Views.DocumentHolder.tipMarkersCheckmark": "Onay işaretleri",
+  "DE.Views.DocumentHolder.tipMarkersDash": "Çizgi işaretleri",
+  "DE.Views.DocumentHolder.tipMarkersFRhombus": "Dolu eşkenar dörtgen işaretler",
+  "DE.Views.DocumentHolder.tipMarkersFRound": "Dolu yuvarlak işaretler",
+  "DE.Views.DocumentHolder.tipMarkersFSquare": "Dolu kare işaretler",
+  "DE.Views.DocumentHolder.tipMarkersHRound": "İçi boş daire işaretler",
+  "DE.Views.DocumentHolder.tipMarkersStar": "Yıldız işaretleri",
   "DE.Views.DocumentHolder.toDictionaryText": "Sözlüğe ekle",
   "DE.Views.DocumentHolder.txtAddBottom": "Alt kenarlık ekle",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Kesir çubuğu ekle",
@@ -1515,7 +1545,7 @@
   "DE.Views.DocumentHolder.txtAddTop": "Üst kenarlık ekle",
   "DE.Views.DocumentHolder.txtAddVer": "Dikey çizgi ekle",
   "DE.Views.DocumentHolder.txtAlignToChar": "Karaktere uyarla",
-  "DE.Views.DocumentHolder.txtBehind": "Arkada",
+  "DE.Views.DocumentHolder.txtBehind": "Yazının Arkasında",
   "DE.Views.DocumentHolder.txtBorderProps": "Kenarlık özellikleri",
   "DE.Views.DocumentHolder.txtBottom": "Alt",
   "DE.Views.DocumentHolder.txtColumnAlign": "Sütun hizalama",
@@ -1551,8 +1581,8 @@
   "DE.Views.DocumentHolder.txtHideTopLimit": "Hide top limit",
   "DE.Views.DocumentHolder.txtHideVer": "Hide vertical line",
   "DE.Views.DocumentHolder.txtIncreaseArg": "Increase argument size",
-  "DE.Views.DocumentHolder.txtInFront": "Önde",
-  "DE.Views.DocumentHolder.txtInline": "Satıriçi",
+  "DE.Views.DocumentHolder.txtInFront": "Yazının Önünde",
+  "DE.Views.DocumentHolder.txtInline": "Satıriçi Yazı",
   "DE.Views.DocumentHolder.txtInsertArgAfter": "Insert argument after",
   "DE.Views.DocumentHolder.txtInsertArgBefore": "Insert argument before",
   "DE.Views.DocumentHolder.txtInsertBreak": "Insert manual break",
@@ -1870,6 +1900,7 @@
   "DE.Views.ImageSettings.textCrop": "Kırpmak",
   "DE.Views.ImageSettings.textCropFill": "Doldur",
   "DE.Views.ImageSettings.textCropFit": "Sığdır",
+  "DE.Views.ImageSettings.textCropToShape": "Şekillendirmek için kırp",
   "DE.Views.ImageSettings.textEdit": "Düzenle",
   "DE.Views.ImageSettings.textEditObject": "Nesneyi düzenle",
   "DE.Views.ImageSettings.textFitMargins": "Kenarlara Sığdır",
@@ -1884,14 +1915,15 @@
   "DE.Views.ImageSettings.textHintFlipV": "Dikey Çevir",
   "DE.Views.ImageSettings.textInsert": "Resimi Değiştir",
   "DE.Views.ImageSettings.textOriginalSize": "Gerçek Boyut",
+  "DE.Views.ImageSettings.textRecentlyUsed": "Son Kullanılanlar",
   "DE.Views.ImageSettings.textRotate90": "Döndür 90°",
   "DE.Views.ImageSettings.textRotation": "Döndürme",
   "DE.Views.ImageSettings.textSize": "Boyut",
   "DE.Views.ImageSettings.textWidth": "Genişlik",
   "DE.Views.ImageSettings.textWrap": "Kaydırma Stili",
-  "DE.Views.ImageSettings.txtBehind": "Arkada",
-  "DE.Views.ImageSettings.txtInFront": "Önde",
-  "DE.Views.ImageSettings.txtInline": "Satıriçi",
+  "DE.Views.ImageSettings.txtBehind": "Yazının Arkasında",
+  "DE.Views.ImageSettings.txtInFront": "Yazının Önünde",
+  "DE.Views.ImageSettings.txtInline": "Satıriçi Yazı",
   "DE.Views.ImageSettings.txtSquare": "Kare",
   "DE.Views.ImageSettings.txtThrough": "Sonu",
   "DE.Views.ImageSettings.txtTight": "Sıkı",
@@ -1964,9 +1996,9 @@
   "DE.Views.ImageSettingsAdvanced.textWeightArrows": "Ağırlık & Oklar",
   "DE.Views.ImageSettingsAdvanced.textWidth": "Genişlik",
   "DE.Views.ImageSettingsAdvanced.textWrap": "Kaydırma Stili",
-  "DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "Arkada",
-  "DE.Views.ImageSettingsAdvanced.textWrapInFrontTooltip": "Önde",
-  "DE.Views.ImageSettingsAdvanced.textWrapInlineTooltip": "Satıriçi",
+  "DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "Yazının Arkasında",
+  "DE.Views.ImageSettingsAdvanced.textWrapInFrontTooltip": "Yazının Önünde",
+  "DE.Views.ImageSettingsAdvanced.textWrapInlineTooltip": "Satıriçi Yazı",
   "DE.Views.ImageSettingsAdvanced.textWrapSquareTooltip": "Kare",
   "DE.Views.ImageSettingsAdvanced.textWrapThroughTooltip": "Sonu",
   "DE.Views.ImageSettingsAdvanced.textWrapTightTooltip": "Sıkı",
@@ -2154,6 +2186,11 @@
   "DE.Views.PageSizeDialog.textTitle": "Page Size",
   "DE.Views.PageSizeDialog.textWidth": "Width",
   "DE.Views.PageSizeDialog.txtCustom": "Özel",
+  "DE.Views.PageThumbnails.textClosePanel": "Sayfa küçük resimlerini kapat",
+  "DE.Views.PageThumbnails.textHighlightVisiblePart": "Sayfanın görünen kısmını vurgula",
+  "DE.Views.PageThumbnails.textPageThumbnails": "Sayfa Küçük Resimleri",
+  "DE.Views.PageThumbnails.textThumbnailsSettings": "Küçük resim ayarları",
+  "DE.Views.PageThumbnails.textThumbnailsSize": "Küçük resim boyutu",
   "DE.Views.ParagraphSettings.strIndent": "Girintiler",
   "DE.Views.ParagraphSettings.strIndentsLeftText": "Sol",
   "DE.Views.ParagraphSettings.strIndentsRightText": "Sağ",
@@ -2289,6 +2326,7 @@
   "DE.Views.ShapeSettings.textPatternFill": "Desen",
   "DE.Views.ShapeSettings.textPosition": "Pozisyon",
   "DE.Views.ShapeSettings.textRadial": "Radyal",
+  "DE.Views.ShapeSettings.textRecentlyUsed": "Son Kullanılanlar",
   "DE.Views.ShapeSettings.textRotate90": "Döndür 90°",
   "DE.Views.ShapeSettings.textRotation": "Döndürme",
   "DE.Views.ShapeSettings.textSelectImage": "Resim Seç",
@@ -2300,7 +2338,7 @@
   "DE.Views.ShapeSettings.textWrap": "Kaydırma Stili",
   "DE.Views.ShapeSettings.tipAddGradientPoint": "Gradyan noktası ekle",
   "DE.Views.ShapeSettings.tipRemoveGradientPoint": "Gradyan noktasını kaldır",
-  "DE.Views.ShapeSettings.txtBehind": "Arkada",
+  "DE.Views.ShapeSettings.txtBehind": "Yazının Arkasında",
   "DE.Views.ShapeSettings.txtBrownPaper": "Kahverengi Kağıt",
   "DE.Views.ShapeSettings.txtCanvas": "Tuval",
   "DE.Views.ShapeSettings.txtCarton": "Karton",
@@ -2308,8 +2346,8 @@
   "DE.Views.ShapeSettings.txtGrain": "Tane",
   "DE.Views.ShapeSettings.txtGranite": "Granit",
   "DE.Views.ShapeSettings.txtGreyPaper": "Gri Kağıt",
-  "DE.Views.ShapeSettings.txtInFront": "Önde",
-  "DE.Views.ShapeSettings.txtInline": "Satıriçi",
+  "DE.Views.ShapeSettings.txtInFront": "Yazının Önünde",
+  "DE.Views.ShapeSettings.txtInline": "Satıriçi Yazı",
   "DE.Views.ShapeSettings.txtKnit": "Birleştir",
   "DE.Views.ShapeSettings.txtLeather": "Deri",
   "DE.Views.ShapeSettings.txtNoBorders": "Çizgi yok",
@@ -2680,6 +2718,7 @@
   "DE.Views.Toolbar.textTabLinks": "Başvurular",
   "DE.Views.Toolbar.textTabProtect": "Koruma",
   "DE.Views.Toolbar.textTabReview": "İnceleme",
+  "DE.Views.Toolbar.textTabView": "Görüntüle",
   "DE.Views.Toolbar.textTitleError": "Hata",
   "DE.Views.Toolbar.textToCurrent": "Mevcut pozisyona",
   "DE.Views.Toolbar.textTop": "Top: ",
@@ -2771,6 +2810,15 @@
   "DE.Views.Toolbar.txtScheme7": "Net Değer",
   "DE.Views.Toolbar.txtScheme8": "Yayılma",
   "DE.Views.Toolbar.txtScheme9": "Döküm",
+  "DE.Views.ViewTab.textAlwaysShowToolbar": "Her zaman araç çubuğunu göster",
+  "DE.Views.ViewTab.textDarkDocument": "Koyu belge",
+  "DE.Views.ViewTab.textFitToPage": "Sayfaya Sığdır",
+  "DE.Views.ViewTab.textFitToWidth": "Genişliğe Sığdır",
+  "DE.Views.ViewTab.textInterfaceTheme": "Arayüz teması",
+  "DE.Views.ViewTab.textNavigation": "Gezinti",
+  "DE.Views.ViewTab.textRulers": "Cetveller",
+  "DE.Views.ViewTab.textStatusBar": "Durum Çubuğu",
+  "DE.Views.ViewTab.textZoom": "Yakınlaştırma",
   "DE.Views.WatermarkSettingsDialog.textAuto": "Otomatik",
   "DE.Views.WatermarkSettingsDialog.textBold": "Kalın",
   "DE.Views.WatermarkSettingsDialog.textColor": "Renk",

apps/documenteditor/main/locale/zh.json

@@ -380,7 +380,7 @@
   "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "移除我的当前批注",
   "Common.Views.ReviewChanges.txtCommentRemove": "删除",
   "Common.Views.ReviewChanges.txtCommentResolve": "解决",
-  "Common.Views.ReviewChanges.txtCommentResolveAll": "解决全体评论",
+  "Common.Views.ReviewChanges.txtCommentResolveAll": "解决所有评论",
   "Common.Views.ReviewChanges.txtCommentResolveCurrent": "解决该评论",
   "Common.Views.ReviewChanges.txtCommentResolveMy": "解决我的评论",
   "Common.Views.ReviewChanges.txtCommentResolveMyCurrent": "解决我当前的评论",

apps/documenteditor/main/resources/help/en/Contents.json

@@ -53,7 +53,7 @@
     { "src": "UsageInstructions/CreateTableOfContents.htm", "name": "Create table of contents" },
     {"src": "UsageInstructions/AddTableofFigures.htm", "name": "Add and Format a Table of Figures" },
     { "src": "UsageInstructions/CreateFillableForms.htm", "name": "Create fillable forms", "headername": "Fillable forms" },
-    { "src": "UsageInstructions/FillingOutForm.htm", "headername": "Filling Out a Form" },
+    { "src": "UsageInstructions/FillingOutForm.htm", "name": "Filling Out a Form" },
     {"src": "UsageInstructions/UseMailMerge.htm", "name": "Use mail merge", "headername": "Mail Merge"},
     { "src": "UsageInstructions/InsertEquation.htm", "name": "Insert equations", "headername": "Math equations" },
     {"src": "HelpfulHints/CollaborativeEditing.htm", "name": "Collaborative document editing", "headername": "Document co-editing"},

apps/documenteditor/main/resources/less/toolbar.less

@@ -24,12 +24,9 @@
     position: absolute;
     top: 0;
     left: 0;
-    right: 0;
-    bottom: 0;
-    opacity: 0;
-    background-color: @background-toolbar-ie;
-    background-color: @background-toolbar;
-    z-index: @zindex-tooltip + 1;
+    width: 0;
+    height: 0;
+    background-color: transparent;
 }
 
 .item-markerlist {
@@ -165,11 +162,6 @@
     margin-left: 2px;
 }
 
-#slot-field-styles {
-    width: 100%;
-    min-width: 160px;
-}
-
 #special-paste-container {
     position: absolute;
     z-index: @zindex-dropdown - 20;

apps/documenteditor/mobile/locale/az.json

@@ -56,7 +56,8 @@
     "textStartAt": "Başlayın",
     "textTable": "Cədvəl",
     "textTableSize": "Cədvəl Ölçüsü",
-    "txtNotUrl": "Bu sahədə \"http://www.example.com\" formatında URL olmalıdır"
+    "txtNotUrl": "Bu sahədə \"http://www.example.com\" formatında URL olmalıdır",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -308,27 +309,28 @@
     "textTotalRow": "Yekun Sətir",
     "textType": "Növ",
     "textWrap": "Keçirin",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textFr": "Fr",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
+    "textNovember": "November",
+    "textOctober": "October",
+    "textOk": "Ok",
+    "textSa": "Sa",
+    "textSeptember": "September",
+    "textSu": "Su",
+    "textTh": "Th",
+    "textTu": "Tu",
+    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "Çevrilmə vaxtı maksimumu keçdi.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "1% redaktor üçün istifadəçi limitinə çatdınız. Ətraflı öyrənmək üçün inzibatçınızla əlaqə saxlayın.",
     "warnNoLicense": "Siz 1% redaktorlarına eyni vaxtda qoşulma limitinə çatdınız. Bu sənəd yalnız baxmaq üçün açılacaq. Şəxsi təkmilləşdirmə şərtləri üçün 1% satış komandası ilə əlaqə saxlayın.",
     "warnNoLicenseUsers": "1% redaktor üçün istifadəçi limitinə çatdınız. Şəxsi təkmilləşdirmə şərtləri üçün 1% satış komandası ilə əlaqə saxlayın.",
-    "warnProcessRightsChange": "Bu faylı redaktə etmək icazəniz yoxdur."
+    "warnProcessRightsChange": "Bu faylı redaktə etmək icazəniz yoxdur.",
+    "textNoTextFound": "Text not found",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "Qorunan Fayl",

apps/documenteditor/mobile/locale/be.json

@@ -56,7 +56,8 @@
     "textStartAt": "Start At",
     "textTable": "Table",
     "textTableSize": "Table Size",
-    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\""
+    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -328,7 +329,8 @@
     "textOctober": "October",
     "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textEmpty": "Empty",
+    "textOk": "Ok"
   },
   "Error": {
     "convertationTimeoutText": "Conversion timeout exceeded.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
     "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
     "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
-    "warnProcessRightsChange": "You don't have permission to edit this file."
+    "warnProcessRightsChange": "You don't have permission to edit this file.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textNoTextFound": "Text not found"
   },
   "Settings": {
     "advDRMOptions": "Protected File",

apps/documenteditor/mobile/locale/bg.json

@@ -56,7 +56,8 @@
     "textStartAt": "Start At",
     "textTable": "Table",
     "textTableSize": "Table Size",
-    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\""
+    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -328,7 +329,8 @@
     "textOctober": "October",
     "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textEmpty": "Empty",
+    "textOk": "Ok"
   },
   "Error": {
     "convertationTimeoutText": "Conversion timeout exceeded.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
     "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
     "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
-    "warnProcessRightsChange": "You don't have permission to edit this file."
+    "warnProcessRightsChange": "You don't have permission to edit this file.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textNoTextFound": "Text not found"
   },
   "Settings": {
     "advDRMOptions": "Protected File",

apps/documenteditor/mobile/locale/ca.json

@@ -56,7 +56,8 @@
     "textStartAt": "Comença a",
     "textTable": "Taula",
     "textTableSize": "Mida de la taula",
-    "txtNotUrl": "Aquest camp hauria de ser un URL amb el format \"http://www.exemple.com\""
+    "txtNotUrl": "Aquest camp hauria de ser un URL amb el format \"http://www.exemple.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -308,27 +309,28 @@
     "textTotalRow": "Fila de total",
     "textType": "Tipus",
     "textWrap": "Ajustament",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textFr": "Fr",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
+    "textNovember": "November",
+    "textOctober": "October",
+    "textOk": "Ok",
+    "textSa": "Sa",
+    "textSeptember": "September",
+    "textSu": "Su",
+    "textTh": "Th",
+    "textTu": "Tu",
+    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "S'ha superat el temps de conversió.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "Has arribat al límit d'usuari per a %1 editors. Contacta amb el teu administrador per a més informació.",
     "warnNoLicense": "Has arribat al límit de connexions simultànies a %1 editors. Aquest document només s'obrirà en mode lectura. Contacta amb l'equip de vendes %1 per a les condicions d'una actualització personal.",
     "warnNoLicenseUsers": "Has arribat al límit d'usuaris per a %1 editors. Contacta amb l'equip de vendes de %1 per obtenir les condicions de millora personals dels teus serveis.",
-    "warnProcessRightsChange": "No tens permís per editar aquest fitxer."
+    "warnProcessRightsChange": "No tens permís per editar aquest fitxer.",
+    "textNoTextFound": "Text not found",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "El fitxer està protegit",

apps/documenteditor/mobile/locale/cs.json

@@ -56,7 +56,8 @@
     "textStartAt": "Začít na",
     "textTable": "Tabulka",
     "textTableSize": "Velikost tabulky",
-    "txtNotUrl": "Toto pole by mělo obsahovat adresu URL ve formátu \"http://www.example.com\""
+    "txtNotUrl": "Toto pole by mělo obsahovat adresu URL ve formátu \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -308,27 +309,28 @@
     "textTotalRow": "Součtový řádek",
     "textType": "Typ",
     "textWrap": "Obtékání",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textFr": "Fr",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
+    "textNovember": "November",
+    "textOctober": "October",
+    "textOk": "Ok",
+    "textSa": "Sa",
+    "textSeptember": "September",
+    "textSu": "Su",
+    "textTh": "Th",
+    "textTu": "Tu",
+    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "Vypršel čas konverze.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "Došlo dosažení limitu %1 editorů v režimu spolupráce na úpravách. Ohledně podrobností se obraťte na svého správce.",
     "warnNoLicense": "Došlo k dosažení limitu souběžného připojení %1 editorů. Tento dokument bude otevřen pouze pro náhled. Pro rozšíření funkcí kontaktujte %1 obchodní oddělení.",
     "warnNoLicenseUsers": "Došlo k dosažení limitu %1 editorů. Pro rozšíření funkcí kontaktujte %1 obchodní oddělení.",
-    "warnProcessRightsChange": "Nemáte oprávnění pro úpravu tohoto dokumentu."
+    "warnProcessRightsChange": "Nemáte oprávnění pro úpravu tohoto dokumentu.",
+    "textNoTextFound": "Text not found",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "Zabezpečený soubor",

apps/documenteditor/mobile/locale/da.json

@@ -56,7 +56,8 @@
     "textStartAt": "Start At",
     "textTable": "Table",
     "textTableSize": "Table Size",
-    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\""
+    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -328,7 +329,8 @@
     "textOctober": "October",
     "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textEmpty": "Empty",
+    "textOk": "Ok"
   },
   "Error": {
     "convertationTimeoutText": "Conversion timeout exceeded.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
     "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
     "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
-    "warnProcessRightsChange": "You don't have permission to edit this file."
+    "warnProcessRightsChange": "You don't have permission to edit this file.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textNoTextFound": "Text not found"
   },
   "Settings": {
     "advDRMOptions": "Protected File",

apps/documenteditor/mobile/locale/de.json

@@ -56,7 +56,8 @@
     "textStartAt": "Beginnen mit",
     "textTable": "Tabelle",
     "textTableSize": "Tabellengröße",
-    "txtNotUrl": "Dieser Bereich soll eine URL im Format \"http://www.example.com\" sein."
+    "txtNotUrl": "Dieser Bereich soll eine URL im Format \"http://www.example.com\" sein.",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -308,27 +309,28 @@
     "textTotalRow": "Ergebniszeile",
     "textType": "Typ",
     "textWrap": "Umbrechen",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textFr": "Fr",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
+    "textNovember": "November",
+    "textOctober": "October",
+    "textOk": "Ok",
+    "textSa": "Sa",
+    "textSeptember": "September",
+    "textSu": "Su",
+    "textTh": "Th",
+    "textTu": "Tu",
+    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "Zeitüberschreitung bei der Konvertierung.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "Sie haben das Benutzerlimit für %1-Editoren erreicht. Bitte wenden Sie sich an Ihren Administrator, um weitere Informationen zu erhalten.",
     "warnNoLicense": "Sie haben die maximale Anzahl von gleichzeitigen Verbindungen in %1-Editoren erreicht. Die Bearbeitung ist jetzt in diesem Dokument nicht verfügbar. Bitte kontaktieren Sie unser Verkaufsteam, um persönliche Upgrade-Bedingungen zu erhalten.",
     "warnNoLicenseUsers": "Sie haben das Benutzerlimit für %1-Editoren erreicht. Bitte kontaktieren Sie unser Verkaufsteam, um persönliche Upgrade-Bedingungen zu erhalten.",
-    "warnProcessRightsChange": "Sie können diese Datei nicht bearbeiten."
+    "warnProcessRightsChange": "Sie können diese Datei nicht bearbeiten.",
+    "textNoTextFound": "Text not found",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "Geschützte Datei",

apps/documenteditor/mobile/locale/el.json

@@ -56,7 +56,8 @@
     "textStartAt": "Έναρξη Από",
     "textTable": "Πίνακας",
     "textTableSize": "Μέγεθος Πίνακα",
-    "txtNotUrl": "Αυτό το πεδίο πρέπει να είναι μια διεύθυνση URL με τη μορφή «http://www.example.com»"
+    "txtNotUrl": "Αυτό το πεδίο πρέπει να είναι μια διεύθυνση URL με τη μορφή «http://www.example.com»",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -279,7 +280,7 @@
     "textRemoveLink": "Αφαίρεση Συνδέσμου",
     "textRemoveShape": "Αφαίρεση Σχήματος",
     "textRemoveTable": "Αφαίρεση Πίνακα",
-    "textReorder": "Επανατακτοποίηση",
+    "textReorder": "Αναδιάταξη",
     "textRepeatAsHeaderRow": "Επανάληψη ως Σειράς Κεφαλίδας",
     "textReplace": "Αντικατάσταση",
     "textReplaceImage": "Αντικατάσταση Εικόνας",
@@ -308,27 +309,28 @@
     "textTotalRow": "Συνολική Γραμμή",
     "textType": "Τύπος",
     "textWrap": "Αναδίπλωση",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textFr": "Fr",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
+    "textNovember": "November",
+    "textOctober": "October",
+    "textOk": "Ok",
+    "textSa": "Sa",
+    "textSeptember": "September",
+    "textSu": "Su",
+    "textTh": "Th",
+    "textTu": "Tu",
+    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "Υπέρβαση χρονικού ορίου μετατροπής.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "Έχετε φτάσει το όριο χρήστη για συντάκτες %1.<br>Επικοινωνήστε με τον διαχειριστή σας για περισσότερες πληροφορίες.",
     "warnNoLicense": "Φτάσατε το όριο ταυτόχρονων συνδέσεων σε %1 συντάκτες. Το έγγραφο θα ανοίξει μόνο για ανάγνωση. Επικοινωνήστε με την ομάδα πωλήσεων %1 για τους όρους αναβάθμισης.",
     "warnNoLicenseUsers": "Έχετε φτάσει το όριο χρήστη για συντάκτες %1.<br>Επικοινωνήστε με την ομάδα πωλήσεων %1 για προσωπικούς όρους αναβάθμισης.",
-    "warnProcessRightsChange": "Δεν έχετε δικαίωμα επεξεργασίας αυτού του αρχείου."
+    "warnProcessRightsChange": "Δεν έχετε δικαίωμα επεξεργασίας αυτού του αρχείου.",
+    "textNoTextFound": "Text not found",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "Προστατευμένο Αρχείο",
@@ -588,7 +593,7 @@
     "txtDownloadTxt": "Λήψη TXT",
     "txtIncorrectPwd": "Το συνθηματικό είναι εσφαλμένο",
     "txtOk": "Εντάξει",
-    "txtProtected": "Μόλις εισάγετε το συνθηματικό κι ανοίξετε το αρχείο, το τρέχον συνθηματικό θα επαναφερθεί.",
+    "txtProtected": "Μόλις βάλετε το συνθηματικό κι ανοίξετε το αρχείο, θα γίνει επαναφορά του τρέχοντος συνθηματικού.",
     "txtScheme1": "Γραφείο",
     "txtScheme10": "Διάμεσο",
     "txtScheme11": "Μετρό",

apps/documenteditor/mobile/locale/en.json

@@ -41,6 +41,7 @@
     "textLocation": "Location",
     "textNextPage": "Next Page",
     "textOddPage": "Odd Page",
+    "textOk": "Ok",
     "textOther": "Other",
     "textPageBreak": "Page Break",
     "textPageNumber": "Page Number",
@@ -157,13 +158,13 @@
       "textUsers": "Users",
       "textWidow": "Widow control"
     },
+    "HighlightColorPalette": {
+      "textNoFill": "No Fill"
+    },
     "ThemeColorPalette": {
       "textCustomColors": "Custom Colors",
       "textStandartColors": "Standard Colors",
       "textThemeColors": "Theme Colors"
-    },
-    "HighlightColorPalette": {
-      "textNoFill": "No Fill"
     }
   },
   "ContextMenu": {
@@ -207,6 +208,8 @@
     "textAlign": "Align",
     "textAllCaps": "All caps",
     "textAllowOverlap": "Allow overlap",
+    "textApril": "April",
+    "textAugust": "August",
     "textAuto": "Auto",
     "textAutomatic": "Automatic",
     "textBack": "Back",
@@ -214,7 +217,7 @@
     "textBandedColumn": "Banded column",
     "textBandedRow": "Banded row",
     "textBefore": "Before",
-    "textBehind": "Behind",
+    "textBehind": "Behind Text",
     "textBorder": "Border",
     "textBringToForeground": "Bring to foreground",
     "textBullets": "Bullets",
@@ -225,6 +228,8 @@
     "textColor": "Color",
     "textContinueFromPreviousSection": "Continue from previous section",
     "textCustomColor": "Custom Color",
+    "textDecember": "December",
+    "textDesign": "Design",
     "textDifferentFirstPage": "Different first page",
     "textDifferentOddAndEvenPages": "Different odd and even pages",
     "textDisplay": "Display",
@@ -232,8 +237,9 @@
     "textDoubleStrikethrough": "Double Strikethrough",
     "textEditLink": "Edit Link",
     "textEffects": "Effects",
+    "textEmpty": "Empty",
     "textEmptyImgUrl": "You need to specify image URL.",
-    "textDesign": "Design",
+    "textFebruary": "February",
     "textFill": "Fill",
     "textFirstColumn": "First Column",
     "textFirstLine": "FirstLine",
@@ -242,14 +248,18 @@
     "textFontColors": "Font Colors",
     "textFonts": "Fonts",
     "textFooter": "Footer",
+    "textFr": "Fr",
     "textHeader": "Header",
     "textHeaderRow": "Header Row",
     "textHighlightColor": "Highlight Color",
     "textHyperlink": "Hyperlink",
     "textImage": "Image",
     "textImageURL": "Image URL",
-    "textInFront": "In Front",
-    "textInline": "Inline",
+    "textInFront": "In Front of Text",
+    "textInline": "In Line with Text",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
     "textKeepLinesTogether": "Keep Lines Together",
     "textKeepWithNext": "Keep with Next",
     "textLastColumn": "Last Column",
@@ -258,13 +268,19 @@
     "textLink": "Link",
     "textLinkSettings": "Link Settings",
     "textLinkToPrevious": "Link to Previous",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
     "textMoveBackward": "Move Backward",
     "textMoveForward": "Move Forward",
     "textMoveWithText": "Move with Text",
     "textNone": "None",
     "textNoStyles": "No styles for this type of charts.",
     "textNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textNovember": "November",
     "textNumbers": "Numbers",
+    "textOctober": "October",
+    "textOk": "Ok",
     "textOpacity": "Opacity",
     "textOptions": "Options",
     "textOrphanControl": "Orphan Control",
@@ -285,9 +301,11 @@
     "textReplace": "Replace",
     "textReplaceImage": "Replace Image",
     "textResizeToFitContent": "Resize to Fit Content",
+    "textSa": "Sa",
     "textScreenTip": "Screen Tip",
     "textSelectObjectToEdit": "Select object to edit",
     "textSendToBackground": "Send to Background",
+    "textSeptember": "September",
     "textSettings": "Settings",
     "textShape": "Shape",
     "textSize": "Size",
@@ -298,37 +316,21 @@
     "textStrikethrough": "Strikethrough",
     "textStyle": "Style",
     "textStyleOptions": "Style Options",
+    "textSu": "Su",
     "textSubscript": "Subscript",
     "textSuperscript": "Superscript",
     "textTable": "Table",
     "textTableOptions": "Table Options",
     "textText": "Text",
+    "textTh": "Th",
     "textThrough": "Through",
     "textTight": "Tight",
     "textTopAndBottom": "Top and Bottom",
     "textTotalRow": "Total Row",
-    "textType": "Type",
-    "textWrap": "Wrap",
-    "textSu": "Su",
-    "textMo": "Mo",
     "textTu": "Tu",
+    "textType": "Type",
     "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
-    "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
-    "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
-    "textDecember": "December",
-    "textEmpty": "Empty"
+    "textWrap": "Wrap"
   },
   "Error": {
     "convertationTimeoutText": "Conversion timeout exceeded.",
@@ -485,8 +487,11 @@
     "textHasMacros": "The file contains automatic macros.<br>Do you want to run macros?",
     "textNo": "No",
     "textNoLicenseTitle": "License limit reached",
+    "textNoTextFound": "Text not found",
     "textPaidFeature": "Paid feature",
     "textRemember": "Remember my choice",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
     "textYes": "Yes",
     "titleLicenseExp": "License expired",
     "titleServerVersion": "Editor updated",

apps/documenteditor/mobile/locale/es.json

@@ -56,7 +56,8 @@
     "textStartAt": "Empezar con",
     "textTable": "Tabla",
     "textTableSize": "Tamaño de tabla",
-    "txtNotUrl": "Este campo debe ser una dirección URL en el formato \"http://www.example.com\""
+    "txtNotUrl": "Este campo debe ser una dirección URL en el formato \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -308,27 +309,28 @@
     "textTotalRow": "Fila total",
     "textType": "Tipo",
     "textWrap": "Ajuste",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textFr": "Fr",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
+    "textNovember": "November",
+    "textOctober": "October",
+    "textOk": "Ok",
+    "textSa": "Sa",
+    "textSeptember": "September",
+    "textSu": "Su",
+    "textTh": "Th",
+    "textTu": "Tu",
+    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "Tiempo de conversión está superado.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "Ha alcanzado el límite de usuarios para %1 editores. Póngase en contacto con su administrador para saber más.",
     "warnNoLicense": "Ha alcanzado el límite de conexiones simultáneas con %1 editores. Este documento se abrirá sólo para su visualización. Póngase en contacto con el equipo de ventas de %1 para conocer las condiciones de actualización personal.",
     "warnNoLicenseUsers": "Ha alcanzado el límite de usuarios para %1 editores. Póngase en contacto con el equipo de ventas de %1 para conocer las condiciones de actualización personal.",
-    "warnProcessRightsChange": "No tiene permiso para editar este archivo."
+    "warnProcessRightsChange": "No tiene permiso para editar este archivo.",
+    "textNoTextFound": "Text not found",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "Archivo protegido",

apps/documenteditor/mobile/locale/fi.json

@@ -56,7 +56,8 @@
     "textStartAt": "Start At",
     "textTable": "Table",
     "textTableSize": "Table Size",
-    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\""
+    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -328,7 +329,8 @@
     "textOctober": "October",
     "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textEmpty": "Empty",
+    "textOk": "Ok"
   },
   "Error": {
     "convertationTimeoutText": "Conversion timeout exceeded.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
     "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
     "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
-    "warnProcessRightsChange": "You don't have permission to edit this file."
+    "warnProcessRightsChange": "You don't have permission to edit this file.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textNoTextFound": "Text not found"
   },
   "Settings": {
     "advDRMOptions": "Protected File",

apps/documenteditor/mobile/locale/fr.json

@@ -56,7 +56,8 @@
     "textStartAt": "Commencer par",
     "textTable": "Tableau",
     "textTableSize": "Taille du tableau",
-    "txtNotUrl": "Ce champ doit contenir une URL au format \"http://www.example.com\""
+    "txtNotUrl": "Ce champ doit contenir une URL au format \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -308,27 +309,28 @@
     "textTotalRow": "Ligne de total",
     "textType": "Type",
     "textWrap": "Renvoi à la ligne",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textFr": "Fr",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
+    "textNovember": "November",
+    "textOctober": "October",
+    "textOk": "Ok",
+    "textSa": "Sa",
+    "textSeptember": "September",
+    "textSu": "Su",
+    "textTh": "Th",
+    "textTu": "Tu",
+    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "Délai de conversion expiré.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "Vous avez dépassé le nombre maximal d’utilisateurs des éditeurs %1. Pour en savoir plus, contactez votre administrateur.",
     "warnNoLicense": "Vous avez dépassé le nombre maximal de connexions simultanées aux éditeurs %1. Ce document sera ouvert en lecture seule. Contactez l’équipe des ventes %1 pour mettre à jour les termes de la licence.",
     "warnNoLicenseUsers": "Vous avez dépassé le nombre maximal d’utilisateurs des éditeurs %1. Contactez l’équipe des ventes %1 pour mettre à jour les termes de la licence.",
-    "warnProcessRightsChange": "Vous n'avez pas la permission de modifier ce fichier."
+    "warnProcessRightsChange": "Vous n'avez pas la permission de modifier ce fichier.",
+    "textNoTextFound": "Text not found",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "Fichier protégé",

apps/documenteditor/mobile/locale/gl.json

@@ -56,7 +56,8 @@
     "textStartAt": "Comezar en",
     "textTable": "Táboa",
     "textTableSize": "Tamaño da táboa",
-    "txtNotUrl": "Este campo debe ser unha URL no formato \"http://www.example.com\""
+    "txtNotUrl": "Este campo debe ser unha URL no formato \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -308,27 +309,28 @@
     "textTotalRow": "Fila total",
     "textType": "Tipo",
     "textWrap": "Axuste",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textFr": "Fr",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
+    "textNovember": "November",
+    "textOctober": "October",
+    "textOk": "Ok",
+    "textSa": "Sa",
+    "textSeptember": "September",
+    "textSu": "Su",
+    "textTh": "Th",
+    "textTu": "Tu",
+    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "Excedeu o tempo límite de conversión.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "Alcanzou o límite de usuarios para os editores de %1. Por favor, contacte co se uadministrador para recibir máis información.",
     "warnNoLicense": "Alcanzou o límite de conexións simultáneas con %1 editores. Este documento abrirase para as úa visualización. Póñase en contacto co equipo de vendas de %1 para coñecer as condicións de actualización persoal.",
     "warnNoLicenseUsers": "Alcanzou o límite de usuarios para os editores de %1.<br>Contacte co equipo de vendas de %1 para coñecer os termos de actualización persoal.",
-    "warnProcessRightsChange": "Non ten permiso para editar este ficheiro."
+    "warnProcessRightsChange": "Non ten permiso para editar este ficheiro.",
+    "textNoTextFound": "Text not found",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "Ficheiro protexido",

apps/documenteditor/mobile/locale/it.json

@@ -56,7 +56,8 @@
     "textStartAt": "Iniziare da",
     "textTable": "Tabella",
     "textTableSize": "Dimensione di tabella",
-    "txtNotUrl": "Questo campo deve essere un URL nel formato \"http://www.example.com\""
+    "txtNotUrl": "Questo campo deve essere un URL nel formato \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -308,27 +309,28 @@
     "textTotalRow": "Riga totale",
     "textType": "Tipo",
     "textWrap": "Avvolgere",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textFr": "Fr",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
+    "textNovember": "November",
+    "textOctober": "October",
+    "textOk": "Ok",
+    "textSa": "Sa",
+    "textSeptember": "September",
+    "textSu": "Su",
+    "textTh": "Th",
+    "textTu": "Tu",
+    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "È stato superato il tempo massimo della conversione.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "Hai raggiunto il limite degli utenti per gli editor %1. Ti preghiamo di contattare il tuo amministratore per maggior informazioni.",
     "warnNoLicense": "Hai raggiunto il limite delle connessioni simultanee agli editor %1. Questo documento sarà aperto solo in modalità di visualizzazione.  Ti preghiamo di contattare il team di vendite di %1 per i termini di aggiornamento personali.",
     "warnNoLicenseUsers": "Hai raggiunto il limite degli utenti per gli editor %1. Ti preghiamo di contattare il team di vendite di %1 per i termini di aggiornamento personali.",
-    "warnProcessRightsChange": "Non hai il permesso di modificare questo file."
+    "warnProcessRightsChange": "Non hai il permesso di modificare questo file.",
+    "textNoTextFound": "Text not found",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "File protetto",

apps/documenteditor/mobile/locale/ja.json

@@ -56,7 +56,8 @@
     "textStartAt": "から始まる",
     "textTable": "表",
     "textTableSize": "表のサイズ",
-    "txtNotUrl": "このフィールドは、「http://www.example.com」の形式のURLである必要があります。"
+    "txtNotUrl": "このフィールドは、「http://www.example.com」の形式のURLである必要があります。",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -308,27 +309,28 @@
     "textTotalRow": "合計行",
     "textType": "タイプ",
     "textWrap": "折り返す",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textFr": "Fr",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
+    "textNovember": "November",
+    "textOctober": "October",
+    "textOk": "Ok",
+    "textSa": "Sa",
+    "textSeptember": "September",
+    "textSu": "Su",
+    "textTh": "Th",
+    "textTu": "Tu",
+    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "変換のタイムアウトを超過しました。",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "％1エディターのユーザー制限に達しました。 詳細についてはアドミニストレータを連絡してください。",
     "warnNoLicense": "％１エディター　時接続数の制限に達しました。この文書が見るだけのために開かれる。個人的なアップグレード条件については、％1営業チームを連絡してください。",
     "warnNoLicenseUsers": "％1エディターのユーザー制限に達しました。 個人的なアップグレード条件については、％1営業チームを連絡してください。",
-    "warnProcessRightsChange": "ファイルを編集する権限がありません！"
+    "warnProcessRightsChange": "ファイルを編集する権限がありません！",
+    "textNoTextFound": "Text not found",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "保護されたファイル",

apps/documenteditor/mobile/locale/ko.json

@@ -56,7 +56,8 @@
     "textStartAt": "시작",
     "textTable": "표",
     "textTableSize": "표 크기",
-    "txtNotUrl": "이 필드는 \"http://www.example.com\"형식의 URL이어야합니다."
+    "txtNotUrl": "이 필드는 \"http://www.example.com\"형식의 URL이어야합니다.",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -308,27 +309,28 @@
     "textTotalRow": "합계",
     "textType": "유형",
     "textWrap": "줄 바꾸기",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textFr": "Fr",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
+    "textNovember": "November",
+    "textOctober": "October",
+    "textOk": "Ok",
+    "textSa": "Sa",
+    "textSeptember": "September",
+    "textSu": "Su",
+    "textTh": "Th",
+    "textTu": "Tu",
+    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "변환 시간을 초과했습니다.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "편집자 사용자 한도인 %1명에 도달했습니다. 자세한 내용은 관리자에게 문의하십시오.",
     "warnNoLicense": "% 1 편집 연결 수 제한에 도달했습니다. 이 문서는 보기 모드로 열립니다. 개인적인 업그레이드 사항은 % 1 영업팀에 연락하십시오.",
     "warnNoLicenseUsers": "ONLYOFFICE 편집자의이 버전은 동시 사용자에게 일정한 제한이 있습니다. <br> 더 필요한 것이 있으면 현재 라이센스를 업그레이드하거나 상용 라이센스를 구입하십시오.",
-    "warnProcessRightsChange": "파일을 편집 할 권한이 없습니다."
+    "warnProcessRightsChange": "파일을 편집 할 권한이 없습니다.",
+    "textNoTextFound": "Text not found",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "보호 된 파일",

apps/documenteditor/mobile/locale/lo.json

@@ -56,7 +56,8 @@
     "textStartAt": "Start At",
     "textTable": "Table",
     "textTableSize": "Table Size",
-    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\""
+    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -328,7 +329,8 @@
     "textOctober": "October",
     "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textEmpty": "Empty",
+    "textOk": "Ok"
   },
   "Error": {
     "convertationTimeoutText": "Conversion timeout exceeded.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
     "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
     "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
-    "warnProcessRightsChange": "You don't have permission to edit this file."
+    "warnProcessRightsChange": "You don't have permission to edit this file.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textNoTextFound": "Text not found"
   },
   "Settings": {
     "advDRMOptions": "Protected File",

apps/documenteditor/mobile/locale/lv.json

@@ -56,7 +56,8 @@
     "textStartAt": "Start At",
     "textTable": "Table",
     "textTableSize": "Table Size",
-    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\""
+    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -328,7 +329,8 @@
     "textOctober": "October",
     "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textEmpty": "Empty",
+    "textOk": "Ok"
   },
   "Error": {
     "convertationTimeoutText": "Conversion timeout exceeded.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
     "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
     "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
-    "warnProcessRightsChange": "You don't have permission to edit this file."
+    "warnProcessRightsChange": "You don't have permission to edit this file.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textNoTextFound": "Text not found"
   },
   "Settings": {
     "advDRMOptions": "Protected File",

apps/documenteditor/mobile/locale/nb.json

@@ -56,7 +56,8 @@
     "textStartAt": "Start At",
     "textTable": "Table",
     "textTableSize": "Table Size",
-    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\""
+    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -328,7 +329,8 @@
     "textOctober": "October",
     "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textEmpty": "Empty",
+    "textOk": "Ok"
   },
   "Error": {
     "convertationTimeoutText": "Conversion timeout exceeded.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
     "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
     "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
-    "warnProcessRightsChange": "You don't have permission to edit this file."
+    "warnProcessRightsChange": "You don't have permission to edit this file.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textNoTextFound": "Text not found"
   },
   "Settings": {
     "advDRMOptions": "Protected File",

apps/documenteditor/mobile/locale/nl.json

@@ -56,7 +56,8 @@
     "textStartAt": "Beginnen bij",
     "textTable": "Tabel",
     "textTableSize": "Tabelgrootte",
-    "txtNotUrl": "Dit veld moet een URL bevatten in de notatie \"http://www.internet.nl\""
+    "txtNotUrl": "Dit veld moet een URL bevatten in de notatie \"http://www.internet.nl\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -308,27 +309,28 @@
     "textTotalRow": "Totaalrij",
     "textType": "Type",
     "textWrap": "Wikkel",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textFr": "Fr",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
+    "textNovember": "November",
+    "textOctober": "October",
+    "textOk": "Ok",
+    "textSa": "Sa",
+    "textSeptember": "September",
+    "textSu": "Su",
+    "textTh": "Th",
+    "textTu": "Tu",
+    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "Time-out voor conversie overschreden.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "U heeft de gebruikerslimiet voor %1 gelijktijdige gebruikers bereikt. Neem contact op met uw beheerder voor meer informatie.",
     "warnNoLicense": "U hebt de limiet bereikt voor gelijktijdige verbindingen met %1 gelijktijdige gebruikers. Dit document wordt alleen geopend om te bekijken. Neem contact op met %1 verkoopteam voor persoonlijke upgradevoorwaarden.",
     "warnNoLicenseUsers": "U heeft de gebruikerslimiet voor %1 gelijktijdige gebruikers bereikt. Neem contact op met de verkoopafdeling voor persoonlijke upgradevoorwaarden.",
-    "warnProcessRightsChange": "Je hebt geen toestemming om dit bestand te bewerken."
+    "warnProcessRightsChange": "Je hebt geen toestemming om dit bestand te bewerken.",
+    "textNoTextFound": "Text not found",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "Beveiligd bestand",

apps/documenteditor/mobile/locale/pl.json

@@ -56,7 +56,8 @@
     "textStartAt": "Start At",
     "textTable": "Table",
     "textTableSize": "Table Size",
-    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\""
+    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -328,7 +329,8 @@
     "textOctober": "October",
     "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textEmpty": "Empty",
+    "textOk": "Ok"
   },
   "Error": {
     "convertationTimeoutText": "Conversion timeout exceeded.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
     "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
     "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
-    "warnProcessRightsChange": "You don't have permission to edit this file."
+    "warnProcessRightsChange": "You don't have permission to edit this file.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textNoTextFound": "Text not found"
   },
   "Settings": {
     "advDRMOptions": "Protected File",

apps/documenteditor/mobile/locale/pt.json

@@ -41,6 +41,7 @@
     "textLocation": "Localização",
     "textNextPage": "Próxima página",
     "textOddPage": "Página ímpar",
+    "textOk": "OK",
     "textOther": "Outro",
     "textPageBreak": "Quebra de página",
     "textPageNumber": "Número da página",
@@ -157,13 +158,13 @@
       "textUsers": "Usuários",
       "textWidow": "Controle de linhas órfãs/viúvas."
     },
+    "HighlightColorPalette": {
+      "textNoFill": "Sem preenchimento"
+    },
     "ThemeColorPalette": {
       "textCustomColors": "Cores personalizadas",
       "textStandartColors": "Cores padrão",
       "textThemeColors": "Cores de tema"
-    },
-    "HighlightColorPalette": {
-      "textNoFill": "No Fill"
     }
   },
   "ContextMenu": {
@@ -207,6 +208,8 @@
     "textAlign": "Alinhar",
     "textAllCaps": "Todas maiúsculas",
     "textAllowOverlap": "Permitir sobreposição",
+    "textApril": "Abril",
+    "textAugust": "Agosto",
     "textAuto": "Automático",
     "textAutomatic": "Automático",
     "textBack": "Voltar",
@@ -225,6 +228,8 @@
     "textColor": "Cor",
     "textContinueFromPreviousSection": "Continuar da seção anterior",
     "textCustomColor": "Cor personalizada",
+    "textDecember": "Dezembro",
+    "textDesign": "Design",
     "textDifferentFirstPage": "Primeira página diferente",
     "textDifferentOddAndEvenPages": "Páginas pares e ímpares diferentes",
     "textDisplay": "Exibir",
@@ -232,7 +237,9 @@
     "textDoubleStrikethrough": "Tachado duplo",
     "textEditLink": "Editar Link",
     "textEffects": "Efeitos",
+    "textEmpty": "Vazio",
     "textEmptyImgUrl": "Você precisa especificar uma URL de imagem.",
+    "textFebruary": "Fevereiro",
     "textFill": "Preencher",
     "textFirstColumn": "Primeira Coluna",
     "textFirstLine": "Primeira linha",
@@ -241,6 +248,7 @@
     "textFontColors": "Cor da Fonte",
     "textFonts": "Fontes",
     "textFooter": "Rodapé",
+    "textFr": "Fr",
     "textHeader": "Cabeçalho",
     "textHeaderRow": "Linha de Cabeçalho",
     "textHighlightColor": "Cor de realce",
@@ -249,6 +257,9 @@
     "textImageURL": "Imagem URL",
     "textInFront": "Em frente",
     "textInline": "Em linha",
+    "textJanuary": "Janeiro",
+    "textJuly": "Julho",
+    "textJune": "Junho",
     "textKeepLinesTogether": "Manter as linhas juntas",
     "textKeepWithNext": "Manter com o próximo",
     "textLastColumn": "Última coluna",
@@ -257,13 +268,19 @@
     "textLink": "Link",
     "textLinkSettings": "Configurações de link",
     "textLinkToPrevious": "Vincular a Anterior",
+    "textMarch": "Março",
+    "textMay": "Maio",
+    "textMo": "Seg.",
     "textMoveBackward": "Mover para trás",
     "textMoveForward": "Mover para frente",
     "textMoveWithText": "Mover com texto",
     "textNone": "Nenhum",
     "textNoStyles": "Não há estilos para este tipo de gráfico.",
     "textNotUrl": "Este campo deve ser uma URL no formato \"http://www.example.com\"",
+    "textNovember": "Novembro",
     "textNumbers": "Números",
+    "textOctober": "Outubro",
+    "textOk": "OK",
     "textOpacity": "Opacidade",
     "textOptions": "Opções",
     "textOrphanControl": "Controle de órfão",
@@ -284,9 +301,11 @@
     "textReplace": "Substituir",
     "textReplaceImage": "Substituir imagem",
     "textResizeToFitContent": "Redimensionar para ajustar o conteúdo",
+    "textSa": "Sáb",
     "textScreenTip": "Dica de tela",
     "textSelectObjectToEdit": "Selecione o objeto para editar",
     "textSendToBackground": "Enviar para plano de fundo",
+    "textSeptember": "Setembro",
     "textSettings": "Configurações",
     "textShape": "Forma",
     "textSize": "Tamanho",
@@ -297,38 +316,21 @@
     "textStrikethrough": "Tachado",
     "textStyle": "Estilo",
     "textStyleOptions": "Opções de estilo",
+    "textSu": "Dom",
     "textSubscript": "Subscrito",
     "textSuperscript": "Sobrescrito",
     "textTable": "Tabela",
     "textTableOptions": "Opções de tabela",
     "textText": "Тexto",
+    "textTh": "Qui.",
     "textThrough": "Através",
     "textTight": "Justo",
     "textTopAndBottom": "Parte superior e inferior",
     "textTotalRow": "Total de linhas",
+    "textTu": "Ter",
     "textType": "Tipo",
-    "textWrap": "Encapsulamento",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
-    "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
-    "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
-    "textDecember": "December",
-    "textEmpty": "Empty"
+    "textWe": "Qua",
+    "textWrap": "Encapsulamento"
   },
   "Error": {
     "convertationTimeoutText": "Tempo limite de conversão excedido.",
@@ -485,8 +487,11 @@
     "textHasMacros": "O arquivo contém macros automáticas.<br> Você quer executar macros?",
     "textNo": "Não",
     "textNoLicenseTitle": "Limite de licença atingido",
+    "textNoTextFound": "Texto não encontrado",
     "textPaidFeature": "Recurso pago",
     "textRemember": "Lembrar minha escolha",
+    "textReplaceSkipped": "A substituição foi realizada. {0} ocorrências foram ignoradas.",
+    "textReplaceSuccess": "A pesquisa foi realizada. Ocorrências substituídas: {0}",
     "textYes": "Sim",
     "titleLicenseExp": "A licença expirou",
     "titleServerVersion": "Editor atualizado",

apps/documenteditor/mobile/locale/ro.json

@@ -56,7 +56,8 @@
     "textStartAt": "Pornire de la",
     "textTable": "Tabel",
     "textTableSize": "Dimensiune tabel",
-    "txtNotUrl": "Câmpul trebuie să conțină adresa URL in format \"http://www.example.com\""
+    "txtNotUrl": "Câmpul trebuie să conțină adresa URL in format \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -308,27 +309,28 @@
     "textTotalRow": "Rând total",
     "textType": "Tip",
     "textWrap": "Încadrare",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textFr": "Fr",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
+    "textNovember": "November",
+    "textOctober": "October",
+    "textOk": "Ok",
+    "textSa": "Sa",
+    "textSeptember": "September",
+    "textSu": "Su",
+    "textTh": "Th",
+    "textTu": "Tu",
+    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "Timpul de așteptare pentru conversie a expirat.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "Ați atins numărul maxim de utilizatori ai %1 editoare. Pentru detalii, contactați administratorul dvs.",
     "warnNoLicense": "Ați atins numărul maxim de conexiuni simultane la %1 de editoare. Documentul este disponibil numai pentru vizualizare. Contactați %1 Departamentul de Vânzări pentru acordarea condițiilor personale de actualizare.",
     "warnNoLicenseUsers": "Ați atins numărul maxim de utilizatori ai %1 editoare. Contactați Grup Vânzări %1 pentru acordarea condițiilor personale de licențiere.",
-    "warnProcessRightsChange": "Nu aveți permisiunea de editare pentru fișier."
+    "warnProcessRightsChange": "Nu aveți permisiunea de editare pentru fișier.",
+    "textNoTextFound": "Text not found",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "Fișierul protejat",

apps/documenteditor/mobile/locale/ru.json

@@ -56,7 +56,8 @@
     "textStartAt": "Начать с",
     "textTable": "Таблица",
     "textTableSize": "Размер таблицы",
-    "txtNotUrl": "Это поле должно быть URL-адресом в формате \"http://www.example.com\""
+    "txtNotUrl": "Это поле должно быть URL-адресом в формате \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -157,13 +158,13 @@
       "textUsers": "Пользователи",
       "textWidow": "Запрет висячих строк"
     },
+    "HighlightColorPalette": {
+      "textNoFill": "Без заливки"
+    },
     "ThemeColorPalette": {
       "textCustomColors": "Пользовательские цвета",
       "textStandartColors": "Стандартные цвета",
       "textThemeColors": "Цвета темы"
-    },
-    "HighlightColorPalette": {
-      "textNoFill": "No Fill"
     }
   },
   "ContextMenu": {
@@ -216,7 +217,6 @@
     "textBefore": "Перед",
     "textBehind": "За текстом",
     "textBorder": "Граница",
-    "textDesign": "Вид",
     "textBringToForeground": "Перенести на передний план",
     "textBullets": "Маркеры",
     "textBulletsAndNumbers": "Маркеры и нумерация",
@@ -242,6 +242,7 @@
     "textFontColors": "Цвета шрифта",
     "textFonts": "Шрифты",
     "textFooter": "Колонтитул",
+    "textFr": "Пт",
     "textHeader": "Колонтитул",
     "textHeaderRow": "Строка заголовка",
     "textHighlightColor": "Цвет выделения",
@@ -258,6 +259,7 @@
     "textLink": "Ссылка",
     "textLinkSettings": "Настройки ссылки",
     "textLinkToPrevious": "Связать с предыдущим",
+    "textMo": "Пн",
     "textMoveBackward": "Перенести назад",
     "textMoveForward": "Перенести вперед",
     "textMoveWithText": "Перемещать с текстом",
@@ -285,6 +287,7 @@
     "textReplace": "Заменить",
     "textReplaceImage": "Заменить рисунок",
     "textResizeToFitContent": "По размеру содержимого",
+    "textSa": "Сб",
     "textScreenTip": "Подсказка",
     "textSelectObjectToEdit": "Выберите объект для редактирования",
     "textSendToBackground": "Перенести на задний план",
@@ -298,37 +301,36 @@
     "textStrikethrough": "Зачёркивание",
     "textStyle": "Стиль",
     "textStyleOptions": "Настройки стиля",
+    "textSu": "Вс",
     "textSubscript": "Подстрочные",
     "textSuperscript": "Надстрочные",
     "textTable": "Таблица",
     "textTableOptions": "Настройки таблицы",
     "textText": "Текст",
+    "textTh": "Чт",
     "textThrough": "Сквозное",
     "textTight": "По контуру",
     "textTopAndBottom": "Сверху и снизу",
     "textTotalRow": "Строка итогов",
+    "textTu": "Вт",
     "textType": "Тип",
+    "textWe": "Ср",
     "textWrap": "Стиль обтекания",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textNovember": "November",
+    "textOctober": "October",
+    "textOk": "Ok",
+    "textSeptember": "September"
   },
   "Error": {
     "convertationTimeoutText": "Превышено время ожидания конвертации.",
@@ -485,8 +487,11 @@
     "textHasMacros": "Файл содержит автозапускаемые макросы.<br>Хотите запустить макросы?",
     "textNo": "Нет",
     "textNoLicenseTitle": "Лицензионное ограничение",
+    "textNoTextFound": "Текст не найден",
     "textPaidFeature": "Платная функция",
     "textRemember": "Запомнить мой выбор",
+    "textReplaceSkipped": "Замена выполнена. Пропущено вхождений - {0}.",
+    "textReplaceSuccess": "Поиск выполнен. Заменено вхождений: {0}",
     "textYes": "Да",
     "titleLicenseExp": "Истек срок действия лицензии",
     "titleServerVersion": "Редактор обновлен",

apps/documenteditor/mobile/locale/sk.json

@@ -56,7 +56,8 @@
     "textStartAt": "Start At",
     "textTable": "Table",
     "textTableSize": "Table Size",
-    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\""
+    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -328,7 +329,8 @@
     "textOctober": "October",
     "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textEmpty": "Empty",
+    "textOk": "Ok"
   },
   "Error": {
     "convertationTimeoutText": "Conversion timeout exceeded.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
     "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
     "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
-    "warnProcessRightsChange": "You don't have permission to edit this file."
+    "warnProcessRightsChange": "You don't have permission to edit this file.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textNoTextFound": "Text not found"
   },
   "Settings": {
     "advDRMOptions": "Protected File",

apps/documenteditor/mobile/locale/sl.json

@@ -56,7 +56,8 @@
     "textStartAt": "Start At",
     "textTable": "Table",
     "textTableSize": "Table Size",
-    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\""
+    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -328,7 +329,8 @@
     "textOctober": "October",
     "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textEmpty": "Empty",
+    "textOk": "Ok"
   },
   "Error": {
     "convertationTimeoutText": "Conversion timeout exceeded.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
     "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
     "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
-    "warnProcessRightsChange": "You don't have permission to edit this file."
+    "warnProcessRightsChange": "You don't have permission to edit this file.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textNoTextFound": "Text not found"
   },
   "Settings": {
     "advDRMOptions": "Protected File",

apps/documenteditor/mobile/locale/sv.json

@@ -56,7 +56,8 @@
     "textStartAt": "Start At",
     "textTable": "Table",
     "textTableSize": "Table Size",
-    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\""
+    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -328,7 +329,8 @@
     "textOctober": "October",
     "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textEmpty": "Empty",
+    "textOk": "Ok"
   },
   "Error": {
     "convertationTimeoutText": "Conversion timeout exceeded.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
     "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
     "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
-    "warnProcessRightsChange": "You don't have permission to edit this file."
+    "warnProcessRightsChange": "You don't have permission to edit this file.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textNoTextFound": "Text not found"
   },
   "Settings": {
     "advDRMOptions": "Protected File",

apps/documenteditor/mobile/locale/tr.json

@@ -56,7 +56,8 @@
     "textStartAt": "Başlangıç",
     "textTable": "Tablo",
     "textTableSize": "Tablo Boyutu",
-    "txtNotUrl": "Bu alan \"http://www.example.com\" formatında bir URL olmak zorundadır"
+    "txtNotUrl": "Bu alan \"http://www.example.com\" formatında bir URL olmak zorundadır",
+    "textOk": "Tamam"
   },
   "Common": {
     "Collaboration": {
@@ -308,27 +309,28 @@
     "textTotalRow": "Toplam Satır",
     "textType": "Tip",
     "textWrap": "Metni Kaydır",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textFr": "Fr",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
+    "textNovember": "November",
+    "textOk": "Tamam",
+    "textOctober": "October",
+    "textSa": "Sa",
+    "textSeptember": "September",
+    "textSu": "Su",
+    "textTh": "Th",
+    "textTu": "Tu",
+    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "Değişim süresi aşıldı.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "%1 düzenleyici için kullanıcı sınırına ulaştınız. Daha fazla bilgi edinmek için yöneticinizle iletişime geçin.",
     "warnNoLicense": "%1 düzenleyiciye eşzamanlı bağlantı sınırına ulaştınız. Bu belge yalnızca görüntüleme için açılacaktır. Kişisel yükseltme koşulları için %1 satış ekibiyle iletişime geçin.",
     "warnNoLicenseUsers": "%1 düzenleyici için kullanıcı sınırına ulaştınız. Kişisel yükseltme koşulları için %1 satış ekibiyle iletişime geçin.",
-    "warnProcessRightsChange": "Bu dosyayı düzenleme izniniz yok."
+    "warnProcessRightsChange": "Bu dosyayı düzenleme izniniz yok.",
+    "textNoTextFound": "Text not found",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "Korumalı dosya",

apps/documenteditor/mobile/locale/uk.json

@@ -56,7 +56,8 @@
     "textStartAt": "Start At",
     "textTable": "Table",
     "textTableSize": "Table Size",
-    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\""
+    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -328,7 +329,8 @@
     "textOctober": "October",
     "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textEmpty": "Empty",
+    "textOk": "Ok"
   },
   "Error": {
     "convertationTimeoutText": "Conversion timeout exceeded.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
     "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
     "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
-    "warnProcessRightsChange": "You don't have permission to edit this file."
+    "warnProcessRightsChange": "You don't have permission to edit this file.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textNoTextFound": "Text not found"
   },
   "Settings": {
     "advDRMOptions": "Protected File",

apps/documenteditor/mobile/locale/vi.json

@@ -56,7 +56,8 @@
     "textStartAt": "Start At",
     "textTable": "Table",
     "textTableSize": "Table Size",
-    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\""
+    "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -328,7 +329,8 @@
     "textOctober": "October",
     "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textEmpty": "Empty",
+    "textOk": "Ok"
   },
   "Error": {
     "convertationTimeoutText": "Conversion timeout exceeded.",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
     "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
     "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
-    "warnProcessRightsChange": "You don't have permission to edit this file."
+    "warnProcessRightsChange": "You don't have permission to edit this file.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textNoTextFound": "Text not found"
   },
   "Settings": {
     "advDRMOptions": "Protected File",

apps/documenteditor/mobile/locale/zh.json

@@ -56,7 +56,8 @@
     "textStartAt": "始于",
     "textTable": "表格",
     "textTableSize": "表格大小",
-    "txtNotUrl": "该字段应为“http://www.example.com”格式的URL"
+    "txtNotUrl": "该字段应为“http://www.example.com”格式的URL",
+    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -308,27 +309,28 @@
     "textTotalRow": "总行",
     "textType": "类型",
     "textWrap": "包裹",
-    "textDesign": "Design",
-    "textSu": "Su",
-    "textMo": "Mo",
-    "textTu": "Tu",
-    "textWe": "We",
-    "textTh": "Th",
-    "textFr": "Fr",
-    "textSa": "Sa",
-    "textJanuary": "January",
-    "textFebruary": "February",
-    "textMarch": "March",
     "textApril": "April",
-    "textMay": "May",
-    "textJune": "June",
-    "textJuly": "July",
     "textAugust": "August",
-    "textSeptember": "September",
-    "textOctober": "October",
-    "textNovember": "November",
     "textDecember": "December",
-    "textEmpty": "Empty"
+    "textDesign": "Design",
+    "textEmpty": "Empty",
+    "textFebruary": "February",
+    "textFr": "Fr",
+    "textJanuary": "January",
+    "textJuly": "July",
+    "textJune": "June",
+    "textMarch": "March",
+    "textMay": "May",
+    "textMo": "Mo",
+    "textNovember": "November",
+    "textOctober": "October",
+    "textOk": "Ok",
+    "textSa": "Sa",
+    "textSeptember": "September",
+    "textSu": "Su",
+    "textTh": "Th",
+    "textTu": "Tu",
+    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "转换超时",
@@ -498,7 +500,10 @@
     "warnLicenseUsersExceeded": "你触发了 %1 编辑器的同时在线数限制。可联系管理员来了解更多信息。",
     "warnNoLicense": "你已经触发了 %1 编辑器的同时在线数限制. 该文档打开后，你将只能查看。请联系 %1 的销售团队，获取个人升级条款。",
     "warnNoLicenseUsers": "你触发了 %1 编辑器的同时在线数限制。请与  %1  的销售团队联系，以获取个人升级条款。",
-    "warnProcessRightsChange": "你没有编辑这个文件的权限。"
+    "warnProcessRightsChange": "你没有编辑这个文件的权限。",
+    "textNoTextFound": "Text not found",
+    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
+    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "受保护的文件",

apps/documenteditor/mobile/src/controller/Error.jsx

@@ -4,20 +4,25 @@ import { f7 } from 'framework7-react';
 import { useTranslation } from 'react-i18next';
 
 const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocument}) => {
-    const {t} = useTranslation();
-    const _t = t("Error", { returnObjects: true });
-
     useEffect(() => {
-        Common.Notifications.on('engineCreated', (api) => {
-            api.asc_registerCallback('asc_onError', onError);
-        });
+        const on_engine_created = k => { k.asc_registerCallback('asc_onError', onError); };
+
+        const api = Common.EditorApi.get();
+        if ( !api ) Common.Notifications.on('engineCreated', on_engine_created);
+        else on_engine_created(api);
+
         return () => {
             const api = Common.EditorApi.get();
             if ( api ) api.asc_unregisterCallback('asc_onError', onError);
+
+            Common.Notifications.off('engineCreated', on_engine_created);
         }
     });
 
     const onError = (id, level, errData) => {
+        const {t} = useTranslation();
+        const _t = t("Error", { returnObjects: true });
+
         if (id === Asc.c_oAscError.ID.LoadingScriptError) {
             f7.notification.create({
                 title: _t.criticalErrorTitle,

apps/documenteditor/mobile/src/controller/Main.jsx

@@ -689,6 +689,18 @@ class MainController extends Component {
             if (this.props.users.isDisconnected) return;
             storeToolbarSettings.setCanRedo(can);
         });
+
+        this.api.asc_registerCallback('asc_onReplaceAll', this.onApiTextReplaced.bind(this));
+    }
+
+    onApiTextReplaced(found, replaced) {
+        const { t } = this.props;
+
+        if (found) { 
+            f7.dialog.alert(null, !(found - replaced > 0) ? t('Main.textReplaceSuccess').replace(/\{0\}/, `${replaced}`) : t('Main.textReplaceSkipped').replace(/\{0\}/, `${found - replaced}`));
+        } else {
+            f7.dialog.alert(null, t('Main.textNoTextFound'));
+        }
     }
 
     onShowDateActions(obj, x, y) {

apps/documenteditor/mobile/src/controller/add/AddLink.jsx

@@ -34,7 +34,15 @@ class AddLinkController extends Component {
         const isEmail = (urltype == 2);
 
         if (urltype < 1) {
-            f7.dialog.alert(_t.txtNotUrl, _t.notcriticalErrorTitle);
+            f7.dialog.create({
+                title: _t.notcriticalErrorTitle,
+                text: _t.txtNotUrl,
+                buttons: [
+                    {
+                        text: t('Add.textOk')
+                    }
+                ]
+            }).open();
             return;
         }
 

apps/documenteditor/mobile/src/controller/edit/EditHyperlink.jsx

@@ -28,7 +28,17 @@ class EditHyperlinkController extends Component {
             const isEmail = (urltype == 2);
             if (urltype < 1) {
                 const { t } = this.props;
-                f7.dialog.alert(t('Edit.textNotUrl'), t('Edit.notcriticalErrorTitle'));
+    
+                f7.dialog.create({
+                    title: t('Edit.notcriticalErrorTitle'),
+                    text: t('Edit.textNotUrl'),
+                    buttons: [
+                        {
+                            text: t('Edit.textOk')
+                        }
+                    ]
+                }).open();
+                
                 return;
             }
             let url = link.replace(/^\s+|\s+$/g,'');

apps/documenteditor/mobile/src/view/edit/EditShape.jsx

@@ -516,15 +516,18 @@ const EditShape = props => {
     || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5'
     || shapeType=='straightConnector1';
 
-    let controlProps = api && api.asc_IsContentControl() ? api.asc_GetContentControlProperties() : null,
-        fixedSize = false;
+    const inControl = api.asc_IsContentControl();
+    const controlProps = (api && inControl) ? api.asc_GetContentControlProperties() : null;
+    const lockType = controlProps ? controlProps.get_Lock() : Asc.c_oAscSdtLockType.Unlocked;
+
+    let fixedSize = false;
 
     if (controlProps) {
         let spectype = controlProps.get_SpecificType();
         fixedSize = (spectype == Asc.c_oAscContentControlSpecificType.CheckBox || spectype == Asc. c_oAscContentControlSpecificType.ComboBox || spectype == Asc.c_oAscContentControlSpecificType.DropDownList || spectype == Asc.c_oAscContentControlSpecificType.None || spectype == Asc.c_oAscContentControlSpecificType.Picture) && controlProps.get_FormPr() && controlProps.get_FormPr().get_Fixed();
     }
 
-    let disableRemove = !!props.storeFocusObjects.paragraphObject;
+    let disableRemove = !!props.storeFocusObjects.paragraphObject || (lockType == Asc.c_oAscSdtLockType.SdtContentLocked || lockType == Asc.c_oAscSdtLockType.SdtLocked);
 
     return (
         <Fragment>

apps/presentationeditor/embed/locale/hu.json

@@ -13,10 +13,16 @@
   "PE.ApplicationController.errorDefaultMessage": "Hibakód: %1",
   "PE.ApplicationController.errorFilePassProtect": "A dokumentum jelszóval védett, és nem nyitható meg.",
   "PE.ApplicationController.errorFileSizeExceed": "A fájlméret meghaladja a szerverre beállított korlátozást.<br>Kérjük, forduljon a Document Server rendszergazdájához a részletekért.",
-  "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Az internet kapcsolat helyreállt, és a fájl verziója megváltozott.<br>Mielőtt folytatná a munkát, töltse le a fájlt, vagy másolja vágólapra annak tartalmát, hogy megbizonyosodjon arról, hogy semmi nem veszik el, majd töltse újra az oldalt.",
+  "PE.ApplicationController.errorForceSave": "Hiba történt a fájl mentése közben. Kérjük, használja a 'Letöltés másként' opciót, hogy a fájlt a számítógépére mentse, vagy próbálkozzon később.",
+  "PE.ApplicationController.errorLoadingFont": "A betűtípusok nincsenek betöltve.<br>Kérjük forduljon a dokumentumszerver rendszergazdájához.",
+  "PE.ApplicationController.errorTokenExpire": "A dokumentum biztonsági tokenje lejárt.<br>Kérjük, lépjen kapcsolatba a dokumentumszerver rendszergazdájával.",
+  "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Az internetkapcsolat helyreállt és a fájl verziója megváltozott.<br>Mielőtt folytatná a munkát, töltse le a fájlt vagy másolja át annak tartalmát megbizonyosodva arról, hogy semmi sem veszett el, végül töltse újra ezt az oldalt.",
   "PE.ApplicationController.errorUserDrop": "A dokumentum jelenleg nem elérhető",
   "PE.ApplicationController.notcriticalErrorTitle": "Figyelmeztetés",
+  "PE.ApplicationController.openErrorText": "Hiba történt a fájl megnyitásakor",
   "PE.ApplicationController.scriptLoadError": "A kapcsolat túl lassú, néhány komponens nem töltődött be. Frissítse az oldalt.",
+  "PE.ApplicationController.textAnonymous": "Névtelen",
+  "PE.ApplicationController.textGuest": "Vendég",
   "PE.ApplicationController.textLoadingDocument": "Prezentáció betöltése",
   "PE.ApplicationController.textOf": "of",
   "PE.ApplicationController.txtClose": "Bezárás",
@@ -25,6 +31,7 @@
   "PE.ApplicationController.waitText": "Kérjük várjon...",
   "PE.ApplicationView.txtDownload": "Letöltés",
   "PE.ApplicationView.txtEmbed": "Beágyazás",
+  "PE.ApplicationView.txtFileLocation": "Fájl helyének megnyitása",
   "PE.ApplicationView.txtFullScreen": "Teljes képernyő",
   "PE.ApplicationView.txtPrint": "Nyomtatás",
   "PE.ApplicationView.txtShare": "Megosztás"

apps/presentationeditor/main/app/controller/Animation.js

@@ -83,7 +83,6 @@ define([
                     'tab:active':               _.bind(this.onActiveTab, this)
                 }
             });
-            this.EffectGroups = Common.define.effectData.getEffectGroupData();
         },
 
         onLaunch: function () {
@@ -92,6 +91,7 @@ define([
 
         setConfig: function (config) {
             this.appConfig = config.mode;
+            this.EffectGroups = Common.define.effectData.getEffectGroupData();
             this.view = this.createView('PE.Views.Animation', {
                 toolbar : config.toolbar,
                 mode    : config.mode
@@ -112,7 +112,7 @@ define([
         onApiCountPages: function (count) {
             if (this._state.no_slides !== (count<=0)) {
                 this._state.no_slides = (count<=0);
-                this.lockToolbar(PE.enumLock.noSlides, this._state.no_slides);
+                this.lockToolbar(Common.enumLock.noSlides, this._state.no_slides);
             }
         },
 
@@ -413,19 +413,19 @@ define([
 
         setLocked: function() {
             if (this._state.noGraphic != undefined)
-                this.lockToolbar(PE.enumLock.noGraphic, this._state.noGraphic);
+                this.lockToolbar(Common.enumLock.noGraphic, this._state.noGraphic);
             if (this._state.noAnimation != undefined)
-                this.lockToolbar(PE.enumLock.noAnimation, this._state.noAnimation);
+                this.lockToolbar(Common.enumLock.noAnimation, this._state.noAnimation);
             if (this._state.noAnimationParam != undefined)
-                this.lockToolbar(PE.enumLock.noAnimationParam, this._state.noAnimationParam);
+                this.lockToolbar(Common.enumLock.noAnimationParam, this._state.noAnimationParam);
             if (this._state.noTriggerObjects != undefined)
-                this.lockToolbar(PE.enumLock.noTriggerObjects, this._state.noTriggerObjects);
+                this.lockToolbar(Common.enumLock.noTriggerObjects, this._state.noTriggerObjects);
             if (this._state.noMoveAnimationLater != undefined)
-                this.lockToolbar(PE.enumLock.noMoveAnimationLater, this._state.noMoveAnimationLater);
+                this.lockToolbar(Common.enumLock.noMoveAnimationLater, this._state.noMoveAnimationLater);
             if (this._state.noMoveAnimationEarlier != undefined)
-                this.lockToolbar(PE.enumLock.noMoveAnimationEarlier, this._state.noMoveAnimationEarlier);
-            if (PE.enumLock.noAnimationPreview != undefined)
-                this.lockToolbar(PE.enumLock.noAnimationPreview, this._state.noAnimationPreview);
+                this.lockToolbar(Common.enumLock.noMoveAnimationEarlier, this._state.noMoveAnimationEarlier);
+            if (Common.enumLock.noAnimationPreview != undefined)
+                this.lockToolbar(Common.enumLock.noAnimationPreview, this._state.noAnimationPreview);
 
         }
 

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

@@ -1720,6 +1720,10 @@ define([
                                 console.log("Obsolete: The 'leftMenu' parameter of the 'customization' section is deprecated. Please use 'leftMenu' parameter in the 'customization.layout' section instead.");
                             if (this.appOptions.customization.rightMenu!==undefined)
                                 console.log("Obsolete: The 'rightMenu' parameter of the 'customization' section is deprecated. Please use 'rightMenu' parameter in the 'customization.layout' section instead.");
+                            if (this.appOptions.customization.statusBar!==undefined)
+                                console.log("Obsolete: The 'statusBar' parameter of the 'customization' section is deprecated. Please use 'statusBar' parameter in the 'customization.layout' section instead.");
+                            if (this.appOptions.customization.toolbar!==undefined)
+                                console.log("Obsolete: The 'toolbar' parameter of the 'customization' section is deprecated. Please use 'toolbar' parameter in the 'customization.layout' section instead.");
                         }
                         promise = this.getApplication().getController('Common.Controllers.Plugins').applyUICustomization();
                     }

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

@@ -479,12 +479,12 @@ define([
         onApiCanRevert: function(which, can) {
             if (which=='undo') {
                 if (this._state.can_undo !== can) {
-                    this.toolbar.lockToolbar(PE.enumLock.undoLock, !can, {array: [this.toolbar.btnUndo]});
+                    this.toolbar.lockToolbar(Common.enumLock.undoLock, !can, {array: [this.toolbar.btnUndo]});
                     if (this._state.activated) this._state.can_undo = can;
                 }
             } else {
                 if (this._state.can_redo !== can) {
-                    this.toolbar.lockToolbar(PE.enumLock.redoLock, !can, {array: [this.toolbar.btnRedo]});
+                    this.toolbar.lockToolbar(Common.enumLock.redoLock, !can, {array: [this.toolbar.btnRedo]});
                     if (this._state.activated) this._state.can_redo = can;
                 }
             }
@@ -492,14 +492,14 @@ define([
 
         onApiCanIncreaseIndent: function(value) {
             if (this._state.can_increase !== value) {
-                this.toolbar.lockToolbar(PE.enumLock.incIndentLock, !value, {array: [this.toolbar.btnIncLeftOffset]});
+                this.toolbar.lockToolbar(Common.enumLock.incIndentLock, !value, {array: [this.toolbar.btnIncLeftOffset]});
                 if (this._state.activated) this._state.can_increase = value;
             }
         },
 
         onApiCanDecreaseIndent: function(value) {
             if (this._state.can_decrease !== value) {
-                this.toolbar.lockToolbar(PE.enumLock.decIndentLock, !value, {array: [this.toolbar.btnDecLeftOffset]});
+                this.toolbar.lockToolbar(Common.enumLock.decIndentLock, !value, {array: [this.toolbar.btnDecLeftOffset]});
                 if (this._state.activated) this._state.can_decrease = value;
             }
         },
@@ -636,7 +636,7 @@ define([
 
         onApiCanAddHyperlink: function(value) {
             if (this._state.can_hyper !== value && this.editMode) {
-                this.toolbar.lockToolbar(PE.enumLock.hyperlinkLock, !value, {array: [this.toolbar.btnInsertHyperlink]});
+                this.toolbar.lockToolbar(Common.enumLock.hyperlinkLock, !value, {array: [this.toolbar.btnInsertHyperlink]});
                 if (this._state.activated) this._state.can_hyper = value;
             }
         },
@@ -666,17 +666,17 @@ define([
         onApiCountPages: function(count) {
             if (this._state.no_slides !== (count<=0)) {
                 this._state.no_slides = (count<=0);
-                this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, {array: this.toolbar.paragraphControls});
-                this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, {array: [
+                this.toolbar.lockToolbar(Common.enumLock.noSlides, this._state.no_slides, {array: this.toolbar.paragraphControls});
+                this.toolbar.lockToolbar(Common.enumLock.noSlides, this._state.no_slides, {array: [
                     this.toolbar.btnChangeSlide, this.toolbar.btnPreview, this.toolbar.btnPrint, this.toolbar.btnCopy, this.toolbar.btnPaste,
                     this.toolbar.btnCopyStyle, this.toolbar.btnInsertTable, this.toolbar.btnInsertChart,
                     this.toolbar.btnColorSchemas, this.toolbar.btnShapeAlign,
                     this.toolbar.btnShapeArrange, this.toolbar.btnSlideSize,  this.toolbar.listTheme, this.toolbar.btnEditHeader, this.toolbar.btnInsDateTime, this.toolbar.btnInsSlideNum
                 ]});
-                this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides,
+                this.toolbar.lockToolbar(Common.enumLock.noSlides, this._state.no_slides,
                     { array:  this.toolbar.btnsInsertImage.concat(this.toolbar.btnsInsertText, this.toolbar.btnsInsertShape, this.toolbar.btnInsertEquation, this.toolbar.btnInsertTextArt, this.toolbar.btnInsAudio, this.toolbar.btnInsVideo) });
                 if (this.btnsComment)
-                    this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, { array:  this.btnsComment });
+                    this.toolbar.lockToolbar(Common.enumLock.noSlides, this._state.no_slides, { array:  this.btnsComment });
             }
         },
 
@@ -684,7 +684,7 @@ define([
             if (this._state.no_slides !== (count<=0)) {
                 this._state.no_slides = (count<=0);
                 if (this.btnsComment)
-                    this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, { array:  this.btnsComment });
+                    this.toolbar.lockToolbar(Common.enumLock.noSlides, this._state.no_slides, { array:  this.btnsComment });
             }
         },
 
@@ -760,49 +760,49 @@ define([
             if (this._state.prcontrolsdisable !== paragraph_locked) {
                 if (this._state.activated) this._state.prcontrolsdisable = paragraph_locked;
                 if (paragraph_locked!==undefined)
-                    this.toolbar.lockToolbar(PE.enumLock.paragraphLock, paragraph_locked, {array: me.toolbar.paragraphControls});
-                this.toolbar.lockToolbar(PE.enumLock.paragraphLock, paragraph_locked===true, {array: [me.toolbar.btnInsDateTime, me.toolbar.btnInsSlideNum]});
+                    this.toolbar.lockToolbar(Common.enumLock.paragraphLock, paragraph_locked, {array: me.toolbar.paragraphControls});
+                this.toolbar.lockToolbar(Common.enumLock.paragraphLock, paragraph_locked===true, {array: [me.toolbar.btnInsDateTime, me.toolbar.btnInsSlideNum]});
             }
 
             if (this._state.no_paragraph !== no_paragraph) {
                 if (this._state.activated) this._state.no_paragraph = no_paragraph;
-                this.toolbar.lockToolbar(PE.enumLock.noParagraphSelected, no_paragraph, {array: me.toolbar.paragraphControls});
-                this.toolbar.lockToolbar(PE.enumLock.noParagraphSelected, no_paragraph, {array: [me.toolbar.btnCopyStyle]});
+                this.toolbar.lockToolbar(Common.enumLock.noParagraphSelected, no_paragraph, {array: me.toolbar.paragraphControls});
+                this.toolbar.lockToolbar(Common.enumLock.noParagraphSelected, no_paragraph, {array: [me.toolbar.btnCopyStyle]});
             }
 
             if (this._state.no_text !== no_text) {
                 if (this._state.activated) this._state.no_text = no_text;
-                this.toolbar.lockToolbar(PE.enumLock.noTextSelected, no_text, {array: me.toolbar.paragraphControls});
+                this.toolbar.lockToolbar(Common.enumLock.noTextSelected, no_text, {array: me.toolbar.paragraphControls});
             }
 
             if (shape_locked!==undefined && this._state.shapecontrolsdisable !== shape_locked) {
                 if (this._state.activated) this._state.shapecontrolsdisable = shape_locked;
-                this.toolbar.lockToolbar(PE.enumLock.shapeLock, shape_locked, {array: me.toolbar.shapeControls.concat(me.toolbar.paragraphControls)});
+                this.toolbar.lockToolbar(Common.enumLock.shapeLock, shape_locked, {array: me.toolbar.shapeControls.concat(me.toolbar.paragraphControls)});
             }
 
             if (this._state.no_object !== no_object ) {
                 if (this._state.activated) this._state.no_object = no_object;
-                this.toolbar.lockToolbar(PE.enumLock.noObjectSelected, no_object, {array: [me.toolbar.btnShapeAlign, me.toolbar.btnShapeArrange, me.toolbar.btnVerticalAlign ]});
+                this.toolbar.lockToolbar(Common.enumLock.noObjectSelected, no_object, {array: [me.toolbar.btnShapeAlign, me.toolbar.btnShapeArrange, me.toolbar.btnVerticalAlign ]});
             }
 
             if (slide_layout_lock !== undefined && this._state.slidelayoutdisable !== slide_layout_lock ) {
                 if (this._state.activated) this._state.slidelayoutdisable = slide_layout_lock;
-                this.toolbar.lockToolbar(PE.enumLock.slideLock, slide_layout_lock, {array: [me.toolbar.btnChangeSlide]});
+                this.toolbar.lockToolbar(Common.enumLock.slideLock, slide_layout_lock, {array: [me.toolbar.btnChangeSlide]});
             }
 
             if (slide_deleted !== undefined && this._state.slidecontrolsdisable !== slide_deleted) {
                 if (this._state.activated) this._state.slidecontrolsdisable = slide_deleted;
-                this.toolbar.lockToolbar(PE.enumLock.slideDeleted, slide_deleted, {array: me.toolbar.slideOnlyControls.concat(me.toolbar.paragraphControls)});
+                this.toolbar.lockToolbar(Common.enumLock.slideDeleted, slide_deleted, {array: me.toolbar.slideOnlyControls.concat(me.toolbar.paragraphControls)});
             }
 
             if (this._state.in_equation !== in_equation) {
                 if (this._state.activated) this._state.in_equation = in_equation;
-                this.toolbar.lockToolbar(PE.enumLock.inEquation, in_equation, {array: [me.toolbar.btnSuperscript, me.toolbar.btnSubscript]});
+                this.toolbar.lockToolbar(Common.enumLock.inEquation, in_equation, {array: [me.toolbar.btnSuperscript, me.toolbar.btnSubscript]});
             }
 
             if (this._state.no_columns !== no_columns) {
                 if (this._state.activated) this._state.no_columns = no_columns;
-                this.toolbar.lockToolbar(PE.enumLock.noColumns, no_columns, {array: [me.toolbar.btnColumns]});
+                this.toolbar.lockToolbar(Common.enumLock.noColumns, no_columns, {array: [me.toolbar.btnColumns]});
             }
 
             if (this.toolbar.btnChangeSlide) {
@@ -813,12 +813,12 @@ define([
             }
 
             if (this._state.in_smartart !== in_smartart) {
-                this.toolbar.lockToolbar(PE.enumLock.inSmartart, in_smartart, {array: me.toolbar.paragraphControls});
+                this.toolbar.lockToolbar(Common.enumLock.inSmartart, in_smartart, {array: me.toolbar.paragraphControls});
                 this._state.in_smartart = in_smartart;
             }
 
             if (this._state.in_smartart_internal !== in_smartart_internal) {
-                this.toolbar.lockToolbar(PE.enumLock.inSmartartInternal, in_smartart_internal, {array: me.toolbar.paragraphControls});
+                this.toolbar.lockToolbar(Common.enumLock.inSmartartInternal, in_smartart_internal, {array: me.toolbar.paragraphControls});
                 this._state.in_smartart_internal = in_smartart_internal;
 
                 this.toolbar.mnuArrangeFront.setDisabled(in_smartart_internal);
@@ -868,24 +868,24 @@ define([
 
         onApiLockDocumentProps: function() {
             if (this._state.lock_doc!==true) {
-                this.toolbar.lockToolbar(PE.enumLock.docPropsLock, true, {array: [this.toolbar.btnSlideSize]});
+                this.toolbar.lockToolbar(Common.enumLock.docPropsLock, true, {array: [this.toolbar.btnSlideSize]});
                 if (this._state.activated) this._state.lock_doc = true;
             }
         },
 
         onApiUnLockDocumentProps: function() {
             if (this._state.lock_doc!==false) {
-                this.toolbar.lockToolbar(PE.enumLock.docPropsLock, false, {array: [this.toolbar.btnSlideSize]});
+                this.toolbar.lockToolbar(Common.enumLock.docPropsLock, false, {array: [this.toolbar.btnSlideSize]});
                 if (this._state.activated) this._state.lock_doc = false;
             }
         },
 
         onApiLockDocumentTheme: function() {
-            this.toolbar.lockToolbar(PE.enumLock.themeLock, true, {array: [this.toolbar.btnColorSchemas, this.toolbar.listTheme]});
+            this.toolbar.lockToolbar(Common.enumLock.themeLock, true, {array: [this.toolbar.btnColorSchemas, this.toolbar.listTheme]});
         },
 
         onApiUnLockDocumentTheme: function() {
-            this.toolbar.lockToolbar(PE.enumLock.themeLock, false, {array: [this.toolbar.btnColorSchemas, this.toolbar.listTheme]});
+            this.toolbar.lockToolbar(Common.enumLock.themeLock, false, {array: [this.toolbar.btnColorSchemas, this.toolbar.listTheme]});
         },
 
         onApiCoAuthoringDisconnect: function(enableDownload) {
@@ -2442,7 +2442,7 @@ define([
 
         activateControls: function() {
             this.onApiPageSize(this.api.get_PresentationWidth(), this.api.get_PresentationHeight());
-            this.toolbar.lockToolbar(PE.enumLock.disableOnStart, false, {array: this.toolbar.slideOnlyControls.concat(this.toolbar.shapeControls)});
+            this.toolbar.lockToolbar(Common.enumLock.disableOnStart, false, {array: this.toolbar.slideOnlyControls.concat(this.toolbar.shapeControls)});
             this._state.activated = true;
         },
 
@@ -2454,10 +2454,11 @@ define([
             if (disable && mask.length>0 || !disable && mask.length==0) return;
 
             var toolbar = this.toolbar;
+            toolbar.hideMoreBtns();
             toolbar.$el.find('.toolbar').toggleClass('masked', disable);
 
             if (toolbar.btnsAddSlide) // toolbar buttons are rendered
-                this.toolbar.lockToolbar(PE.enumLock.menuFileOpen, disable, {array: toolbar.btnsAddSlide.concat(toolbar.btnChangeSlide, toolbar.btnPreview)});
+                this.toolbar.lockToolbar(Common.enumLock.menuFileOpen, disable, {array: toolbar.btnsAddSlide.concat(toolbar.btnChangeSlide, toolbar.btnPreview)});
             if(disable) {
                 mask = $("<div class='toolbar-mask'>").appendTo(toolbar.$el.find('.toolbar'));
                 Common.util.Shortcuts.suspendEvents('command+k, ctrl+k, alt+h, command+f5, ctrl+f5');
@@ -2540,7 +2541,7 @@ define([
 
             this.btnsComment = [];
             if ( config.canCoAuthoring && config.canComments ) {
-                var _set = PE.enumLock;
+                var _set = Common.enumLock;
                 this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-menu-comments', me.toolbar.capBtnComment, [_set.lostConnect, _set.noSlides], undefined, undefined, undefined, '1', 'bottom', 'small');
 
                 if ( this.btnsComment.length ) {
@@ -2555,7 +2556,7 @@ define([
                             btn.setCaption(me.toolbar.capBtnAddComment);
                     }, this);
 
-                    this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, { array: this.btnsComment });
+                    this.toolbar.lockToolbar(Common.enumLock.noSlides, this._state.no_slides, { array: this.btnsComment });
                 }
             }
         },

apps/presentationeditor/main/app/controller/Transitions.js

@@ -102,7 +102,7 @@ define([
         onApiCountPages: function (count) {
             if (this._state.no_slides !== (count<=0)) {
                 this._state.no_slides = (count<=0);
-                this.lockToolbar(PE.enumLock.noSlides, this._state.no_slides);
+                this.lockToolbar(Common.enumLock.noSlides, this._state.no_slides);
             }
         },
 
@@ -259,7 +259,7 @@ define([
 
         setLocked: function() {
             if (this._state.lockedtransition != undefined)
-                this.lockToolbar(PE.enumLock.transitLock, this._state.lockedtransition);
+                this.lockToolbar(Common.enumLock.transitLock, this._state.lockedtransition);
         },
 
         setSettings: function () {