Merge branch 'develop' into feature/mobile-comments

Readme.md

@@ -4,7 +4,7 @@
 
 The frontend for [ONLYOFFICE Document Server][2]. Builds the program interface and allows the user create, edit, save and export text, spreadsheet and presentation documents using the common interface of a document editor.
 
-## Previos versions
+## Previous versions
 
 Until 2019-10-23 the repository was called web-apps-pro
 

apps/api/documents/api.js

@@ -132,7 +132,8 @@
                     reviewDisplay: 'original',
                     spellcheck: true,
                     compatibleFeatures: false,
-                    unit: 'cm' // cm, pt, inch
+                    unit: 'cm' // cm, pt, inch,
+                    mentionShare : true // customize tooltip for mention
                 },
                 plugins: {
                     autostart: ['asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}'],
@@ -212,6 +213,7 @@
         _config.editorConfig.canRequestCompareFile = _config.events && !!_config.events.onRequestCompareFile;
         _config.editorConfig.canRequestSharingSettings = _config.events && !!_config.events.onRequestSharingSettings;
         _config.frameEditorId = placeholderId;
+        _config.parentOrigin = window.location.origin;
 
         var onMouseUp = function (evt) {
             _processMouse(evt);
@@ -394,6 +396,10 @@
 
         if (target && _checkConfigParams()) {
             iframe = createIframe(_config);
+            if (iframe.src) {
+                var pathArray = iframe.src.split('/');
+                this.frameOrigin = pathArray[0] + '//' + pathArray[2];
+            }
             target.parentNode && target.parentNode.replaceChild(iframe, target);
             var _msgDispatcher = new MessageDispatcher(_onMessage, this);
         }
@@ -682,7 +688,7 @@
 
         var _onMessage = function(msg) {
             // TODO: check message origin
-            if (msg && window.JSON) {
+            if (msg && window.JSON && _scope.frameOrigin==msg.origin ) {
 
                 try {
                     var msg = window.JSON.parse(msg.data);
@@ -778,7 +784,7 @@
             if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.loaderName) {
                 if (config.editorConfig.customization.loaderName !== 'none') params += "&customer=" + config.editorConfig.customization.loaderName;
             } else
-                params += "&customer=ONLYOFFICE";
+                params += "&customer={{APP_CUSTOMER_NAME}}";
             if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.loaderLogo) {
                 if (config.editorConfig.customization.loaderLogo !== '') params += "&logo=" + config.editorConfig.customization.loaderLogo;
             } else if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.logo) {
@@ -802,6 +808,12 @@
         if (config.editorConfig && config.editorConfig.customization && !!config.editorConfig.customization.compactHeader)
             params += "&compact=true";
 
+        if (config.editorConfig && config.editorConfig.customization && (config.editorConfig.customization.toolbar===false))
+            params += "&toolbar=false";
+
+        if (config.parentOrigin)
+            params += "&parentOrigin=" + config.parentOrigin;
+
         return params;
     }
 

apps/api/documents/cache-scripts.html

@@ -21,7 +21,7 @@
         var editor = new Asc.asc_docs_api({
             'id-view'  : 'editor_sdk'
         });
-        editor.LoadFontsFromServer();
+        editor.asc_loadFontsFromServer();
     </script>
 </body>
 </html>

apps/common/Gateway.js

@@ -135,6 +135,8 @@ if (Common === undefined) {
 
         var _onMessage = function(msg) {
             // TODO: check message origin
+            if (msg.origin !== window.parentOrigin) return;
+
             var data = msg.data;
             if (Object.prototype.toString.apply(data) !== '[object String]' || !window.JSON) {
                 return;

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

@@ -666,4 +666,24 @@ define([
             }
         }
     })());
+
+    Common.UI.ComboBoxCustom = Common.UI.ComboBox.extend(_.extend({
+        itemClicked: function (e) {
+            Common.UI.ComboBox.prototype.itemClicked.call(this, e);
+            if (this.options.updateFormControl)
+                this.options.updateFormControl.call(this, this._selectedItem);
+        },
+
+        setValue: function(value) {
+            Common.UI.ComboBox.prototype.setValue.call(this, value);
+            if (this.options.updateFormControl)
+                this.options.updateFormControl.call(this, this._selectedItem);
+        },
+
+        selectRecord: function(record) {
+            Common.UI.ComboBox.prototype.selectRecord.call(this, record);
+            if (this.options.updateFormControl)
+                this.options.updateFormControl.call(this, this._selectedItem);
+        }
+    }, Common.UI.ComboBoxCustom || {}));
 });

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

@@ -262,10 +262,10 @@ define([
             this.lastValue = this.value;
             if ( typeof value === 'undefined' || value === ''){
                 this.value = '';
-            } else if (this.options.allowAuto && (Math.abs(parseFloat(value)+1.)<0.0001 || value==this.options.autoText)) {
+            } else if (this.options.allowAuto && (Math.abs(Common.Utils.String.parseFloat(value)+1.)<0.0001 || value==this.options.autoText)) {
                 this.value = this.options.autoText;
             } else {
-                var number = this._add(parseFloat(value), 0, (this.options.allowDecimal) ? 3 : 0);
+                var number = this._add(Common.Utils.String.parseFloat(value), 0, (this.options.allowDecimal) ? 3 : 0);
                 if ( typeof value === 'undefined' || isNaN(number)) {
                     number = this.oldValue;
                     showError = true;
@@ -448,12 +448,12 @@ define([
                 var val = me.options.step;
                 if (me._fromKeyDown) {
                     val = this.getRawValue();
-                    val = _.isEmpty(val) ? me.oldValue : parseFloat(val);
+                    val = _.isEmpty(val) ? me.oldValue : Common.Utils.String.parseFloat(val);
                 } else if(me.getValue() !== '') {
                     if (me.options.allowAuto && me.getValue()==me.options.autoText) {
                         val = me.options.minValue-me.options.step;
                     } else
-                        val = parseFloat(me.getValue());
+                        val = Common.Utils.String.parseFloat(me.getValue());
                     if (isNaN(val))
                         val = this.oldValue;
                 } else {
@@ -469,12 +469,12 @@ define([
                 var val = me.options.step;
                 if (me._fromKeyDown) {
                     val = this.getRawValue();
-                    val = _.isEmpty(val) ? me.oldValue : parseFloat(val);
+                    val = _.isEmpty(val) ? me.oldValue : Common.Utils.String.parseFloat(val);
                 } else if(me.getValue() !== '') {
                     if (me.options.allowAuto && me.getValue()==me.options.autoText) {
                         val = me.options.minValue;
                     } else
-                        val = parseFloat(me.getValue());
+                        val = Common.Utils.String.parseFloat(me.getValue());
 
                     if (isNaN(val))
                         val = this.oldValue;

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

@@ -61,7 +61,9 @@ define([
         };
 
         function onTabDblclick(e) {
-            this.fireEvent('change:compact', [$(e.target).data('tab')]);
+            var tab = $(e.target).data('tab');
+            if ( this.dblclick_el == tab )
+                this.fireEvent('change:compact', [tab]);
         }
 
         function onShowFullviewPanel(state) {
@@ -286,6 +288,13 @@ define([
                     if ( $tp.length ) {
                         $tp.addClass('active');
                     }
+
+                    if ( me.dblclick_timer ) clearTimeout(me.dblclick_timer);
+                    me.dblclick_timer = setTimeout(function () {
+                        me.dblclick_el = tab;
+                        delete me.dblclick_timer;
+                    },300);
+
                     this.fireEvent('tab:active', [tab]);
                 }
             },

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

@@ -351,6 +351,7 @@ define([
                     if (me.thumbs.length < 3) {
                         $(document).off('mouseup', me.binding.onMouseUp);
                         $(document).off('mousemove', me.binding.onMouseMove);
+                        me._dragstart = undefined;
                         return;
                     }
                     me.trigger('removethumb', me, _.findIndex(me.thumbs, {index: index}));

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

@@ -51,8 +51,9 @@ define([
         this.active     = false;
         this.label      = 'Tab';
         this.cls        = '';
+        this.index = -1;
         this.template   = _.template(['<li class="<% if(active){ %>active selected<% } %> <% if(cls.length){%><%= cls %><%}%>" data-label="<%= label %>">',
-                                            '<a title="<%= label %>"><%- label %></a>',
+                                            '<span title="<%= label %>" draggable="true" oo_editor_input="true" tabindex="-1" data-index="<%= index %>"><%- label %></span>',
                                         '</li>'].join(''));
 
         this.initialize.call(this, opts);
@@ -124,7 +125,7 @@ define([
         },
 
         setCaption: function(text) {
-            this.$el.find('> a').text(text);
+            this.$el.find('> span').text(text);
         }
     });
 

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

@@ -144,6 +144,7 @@ define([
                             }
 
                             me.drag  = undefined;
+                            me.bar.trigger('tab:drop', this);
                         }
                     }
                     function dragMove (event) {
@@ -187,6 +188,7 @@ define([
                             $(document).off('mouseup.tabbar');
                             $(document).off('mousemove.tabbar', dragMove);
                         });
+                        this.bar.trigger('tab:drag', this.bar.selectTabs);
                     }
                 }
             }
@@ -231,13 +233,67 @@ define([
                 this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab, this.selectTabs);
             }, this.bar),
             mousedown: $.proxy(function (e) {
-                if (this.bar.options.draggable && !_.isUndefined(dragHelper) && (3 !== e.which)) {
+                if ((3 !== e.which) && !e.ctrlKey && !e.metaKey && !e.shiftKey) {
-                    if (!tab.isLockTheDrag) {
+                    var lockDrag = tab.isLockTheDrag;
-                        if (!e.ctrlKey && !e.metaKey && !e.shiftKey)
+                    this.bar.selectTabs.forEach(function (item) {
-                            tab.changeState();
+                        if (item.isLockTheDrag) {
-                        dragHelper.setHookTabs(e, this.bar, this.bar.selectTabs);
+                            lockDrag = true;
+                        }
+                    });
+                    if (this.bar.selectTabs.length === this.bar.tabs.length || this.bar.tabs.length === 1) {
+                        lockDrag = true;
                     }
+                    this.bar.$el.find('ul > li > span').attr('draggable', !lockDrag);
+                    if (!lockDrag)
+                        tab.changeState();
+                } else {
+                    this.bar.$el.find('ul > li > span').attr('draggable', 'false');
                 }
+                this.bar.trigger('tab:drag', this.bar.selectTabs);
+            }, this)
+        });
+        tab.$el.children().on(
+            {dragstart: $.proxy(function (e) {
+                var event = e.originalEvent,
+                    img = document.createElement('div');
+                event.dataTransfer.setDragImage(img, 0, 0);
+                event.dataTransfer.effectAllowed = 'move';
+                this.bar.trigger('tab:dragstart', event.dataTransfer, this.bar.selectTabs);
+            }, this),
+            dragenter: $.proxy(function (e) {
+                this.bar.$el.find('.mousemove').removeClass('mousemove right');
+                $(e.currentTarget).parent().addClass('mousemove');
+                var event = e.originalEvent;
+                var data = event.dataTransfer.getData("onlyoffice");
+                event.dataTransfer.dropEffect = data ? 'move' : 'none';
+            }, this),
+            dragover: $.proxy(function (e) {
+                var event = e.originalEvent;
+                if (event.preventDefault) {
+                    event.preventDefault(); // Necessary. Allows us to drop.
+                }
+                this.bar.$el.find('.mousemove').removeClass('mousemove right');
+                $(e.currentTarget).parent().addClass('mousemove');
+                return false;
+            }, this),
+            dragleave: $.proxy(function (e) {
+                $(e.currentTarget).parent().removeClass('mousemove right');
+            }, this),
+            dragend: $.proxy(function (e) {
+                var event = e.originalEvent;
+                if (event.dataTransfer.dropEffect === 'move') {
+                    this.bar.trigger('tab:dragend', true);
+                } else {
+                    this.bar.trigger('tab:dragend', false);
+                }
+                this.bar.$el.find('.mousemove').removeClass('mousemove right');
+            }, this),
+            drop: $.proxy(function (e) {
+                var event = e.originalEvent,
+                    index = $(event.currentTarget).data('index');
+                this.bar.$el.find('.mousemove').removeClass('mousemove right');
+                this.bar.trigger('tab:drop', event.dataTransfer, index);
+                this.bar.isDrop = true;
             }, this)
         });
     };
@@ -254,7 +310,7 @@ define([
         },
 
         tabs: [],
-        template: _.template('<ul class="nav nav-tabs <%= placement %>" />'),
+        template: _.template('<ul id="statusbar_bottom" class="nav nav-tabs <%= placement %>"/>'),
         selectTabs: [],
 
         initialize : function (options) {
@@ -274,6 +330,34 @@ define([
 
             var eventname=(/Firefox/i.test(navigator.userAgent))? 'DOMMouseScroll' : 'mousewheel';
             addEvent(this.$bar[0], eventname, _.bind(this._onMouseWheel,this));
+            addEvent(this.$bar[0], 'dragstart', _.bind(function (event) {
+                event.dataTransfer.effectAllowed = 'move';
+            }, this));
+            addEvent(this.$bar[0], 'dragenter', _.bind(function (event) {
+                var data = event.dataTransfer.getData("onlyoffice");
+                event.dataTransfer.dropEffect = data ? 'move' : 'none';
+            }, this));
+            addEvent(this.$bar[0], 'dragover', _.bind(function (event) {
+                if (event.preventDefault) {
+                    event.preventDefault(); // Necessary. Allows us to drop.
+                }
+                event.dataTransfer.dropEffect = 'move';
+                this.tabs[this.tabs.length - 1].$el.addClass('mousemove right');
+                return false;
+            }, this));
+            addEvent(this.$bar[0], 'dragleave', _.bind(function (event) {
+                event.dataTransfer.dropEffect = 'none';
+                this.tabs[this.tabs.length - 1].$el.removeClass('mousemove right');
+            }, this));
+            addEvent(this.$bar[0], 'drop', _.bind(function (event) {
+                var index = this.tabs.length;
+                this.$el.find('.mousemove').removeClass('mousemove right');
+                if (this.isDrop === undefined) {
+                    this.trigger('tab:drop', event.dataTransfer, index);
+                } else {
+                    this.isDrop = undefined;
+                }
+            }, this));
 
             this.manager = new StateManager({bar: this});
 

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

@@ -264,6 +264,22 @@ define([
             expandToLevel: function(expandLevel) {
                 this.store.expandToLevel(expandLevel);
                 this.scroller.update({minScrollbarLength: 40, alwaysVisibleY: this.scrollAlwaysVisible});
+            },
+
+            expandRecord: function(record) {
+                if (record) {
+                    record.set('isExpanded', true);
+                    this.store.expandSubItems(record);
+                    this.scroller.update({minScrollbarLength: 40, alwaysVisibleY: this.scrollAlwaysVisible});
+                }
+            },
+
+            collapseRecord: function(record) {
+                if (record) {
+                    record.set('isExpanded', false);
+                    this.store.collapseSubItems(record);
+                    this.scroller.update({minScrollbarLength: 40, alwaysVisibleY: this.scrollAlwaysVisible});
+                }
             }
         }
     })());

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

@@ -493,7 +493,7 @@ define([
                     footer.find('.dlg-btn').on('click', onBtnClick);
                     chDontShow = new Common.UI.CheckBox({
                         el: win.$window.find('.dont-show-checkbox'),
-                        labelText: win.textDontShow
+                        labelText: options.textDontShow || win.textDontShow
                     });
                     autoSize(obj);
                 },
@@ -506,13 +506,14 @@ define([
             });
 
             win.show();
+            return win;
         };
 
         Common.UI.error = function(options) {
             options = options || {};
             !options.title && (options.title = this.Window.prototype.textError);
 
-            Common.UI.alert(
+            return Common.UI.alert(
                 _.extend(options, {
                     iconCls: 'error'
                 })
@@ -523,7 +524,7 @@ define([
             options = options || {};
             !options.title && (options.title = this.Window.prototype.textConfirmation);
 
-            Common.UI.alert(
+            return Common.UI.alert(
                 _.extend(options, {
                     iconCls: 'confirm'
                 })
@@ -534,7 +535,7 @@ define([
             options = options || {};
             !options.title && (options.title = this.Window.prototype.textInformation);
 
-            Common.UI.alert(
+            return Common.UI.alert(
                 _.extend(options, {
                     iconCls: 'info'
                 })
@@ -545,7 +546,7 @@ define([
             options = options || {};
             !options.title && (options.title = this.Window.prototype.textWarning);
 
-            Common.UI.alert(
+            return Common.UI.alert(
                 _.extend(options, {
                     iconCls: 'warn'
                 })

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

@@ -507,7 +507,7 @@ define([
                         ascComment.asc_addReply(addReply);
 
                         me.api.asc_changeComment(id, ascComment);
-                        me.mode && me.mode.canRequestUsers && me.view.pickEMail(ascComment.asc_getGuid(), replyVal);
+                        me.mode && me.mode.canRequestSendNotify && me.view.pickEMail(ascComment.asc_getGuid(), replyVal);
 
                         return true;
                     }
@@ -1142,7 +1142,8 @@ define([
                     commentsStore : this.popoverComments,
                     renderTo : this.sdkViewName,
                     canRequestUsers: (this.mode) ? this.mode.canRequestUsers : undefined,
-                    canRequestSendNotify: (this.mode) ? this.mode.canRequestSendNotify : undefined
+                    canRequestSendNotify: (this.mode) ? this.mode.canRequestSendNotify : undefined,
+                    mentionShare: (this.mode) ? this.mode.mentionShare : true
                 });
                 this.popover.setCommentsStore(this.popoverComments);
             }
@@ -1363,7 +1364,7 @@ define([
 
                     this.api.asc_addComment(comment);
                     this.view.showEditContainer(false);
-                    this.mode && this.mode.canRequestUsers && this.view.pickEMail(comment.asc_getGuid(), commentVal);
+                    this.mode && this.mode.canRequestSendNotify && this.view.pickEMail(comment.asc_getGuid(), commentVal);
                     if (!_.isUndefined(this.api.asc_SetDocumentPlaceChangedEnabled)) {
                         this.api.asc_SetDocumentPlaceChangedEnabled(false);
                     }

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

@@ -118,6 +118,13 @@ define([
                     if ( !!obj.action ) {
                         titlebuttons[obj.action].btn.click();
                     }
+                } else
+                if (/element:show/.test(cmd)) {
+                    var _mr = /title:(?:(true|show)|(false|hide))/.exec(param);
+                    if ( _mr ) {
+                        if (!!_mr[1]) $('#app-title').show();
+                        else if (!!_mr[2]) $('#app-title').hide();
+                    }
                 }
             };
 
@@ -186,23 +193,32 @@ define([
                         }
 
                         var header = webapp.getController('Viewport').getView('Common.Views.Header');
-                        titlebuttons = {
+                        titlebuttons = {};
-                            'save': {btn: header.btnSave, disabled:false},
+                        if ( !!header.btnSave ) {
-                            'print': {btn: header.btnPrint, disabled:false},
+                            titlebuttons['save'] = {btn: header.btnSave, disabled:false};
-                            'undo': {btn: header.btnUndo, disabled:false},
+
-                            'redo': {btn: header.btnRedo,  disabled:false}
+                            var iconname = /\s?([^\s]+)$/.exec(titlebuttons.save.btn.$icon.attr('class'));
-                        };
+                            !!iconname && iconname.length && (titlebuttons.save.icon = btnsave_icons[iconname]);
+                        }
+
+                        if ( !!header.btnPrint )
+                            titlebuttons['print'] = {btn: header.btnPrint, disabled:false};
+
+                        if ( !!header.btnUndo )
+                            titlebuttons['undo'] = {btn: header.btnUndo, disabled:false};
+
+                        if ( !!header.btnRedo )
+                            titlebuttons['redo'] = {btn: header.btnRedo,  disabled:false};
 
                         for (var i in titlebuttons) {
                             titlebuttons[i].btn.options.signals = ['disabled'];
                             titlebuttons[i].btn.on('disabled', _onTitleButtonDisabled.bind(this, i));
                         }
 
-                        header.btnSave.options.signals.push('icon:changed');
+                        if (!!titlebuttons.save) {
-                        header.btnSave.on('icon:changed', _onSaveIconChanged.bind(this));
+                            titlebuttons.save.btn.options.signals.push('icon:changed');
-
+                            titlebuttons.save.btn.on('icon:changed', _onSaveIconChanged.bind(this));
-                        var iconname = /\s?([^\s]+)$/.exec(titlebuttons.save.btn.$icon.attr('class'));
+                        }
-                        !!iconname && iconname.length && (titlebuttons.save.icon = btnsave_icons[iconname]);
 
                         if ( !!config.callback_editorconfig ) {
                             config.callback_editorconfig();

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

@@ -417,9 +417,9 @@ define([
                         if (value.Get_WidowControl())
                             proptext += ((value.Get_WidowControl() ? me.textWidow : me.textNoWidow) + ', ');
                         if (value.Get_Tabs() !== undefined)
-                            proptext += proptext += (me.textTabs + ', ');
+                            proptext += (me.textTabs + ', ');
                         if (value.Get_NumPr() !== undefined)
-                            proptext += proptext += (me.textNum + ', ');
+                            proptext += (me.textNum + ', ');
                         if (value.Get_PStyle() !== undefined) {
                             var style = me.api.asc_GetStyleNameById(value.Get_PStyle());
                             if (!_.isEmpty(style)) proptext += (style + ', ');

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

@@ -585,6 +585,11 @@ Common.Utils.String = new (function() {
             }
 
             return Common.Utils.String.format(template, string);
+        },
+
+        parseFloat: function(string) {
+            (typeof string === 'string') && (string = string.replace(',', '.'));
+            return parseFloat(string)
         }
     }
 })();

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

@@ -166,7 +166,7 @@ define([
                     .removeClass('dropdown-toggle')
                     .menu = false;
 
-                $panelUsers[(!_readonlyRights && appConfig && !appConfig.isReviewOnly && (appConfig.sharingSettingsUrl && appConfig.sharingSettingsUrl.length || appConfig.canRequestSharingSettings)) ? 'show' : 'hide']();
+                $panelUsers[(!_readonlyRights && appConfig && (appConfig.sharingSettingsUrl && appConfig.sharingSettingsUrl.length || appConfig.canRequestSharingSettings)) ? 'show' : 'hide']();
             }
 
             $btnUsers.find('.caption')
@@ -248,8 +248,8 @@ define([
                 Common.NotificationCenter.trigger('collaboration:sharing');
             });
 
-            $labelChangeRights[(!mode.isOffline && !mode.isReviewOnly && (mode.sharingSettingsUrl && mode.sharingSettingsUrl.length || mode.canRequestSharingSettings))?'show':'hide']();
+            $labelChangeRights[(!mode.isOffline && (mode.sharingSettingsUrl && mode.sharingSettingsUrl.length || mode.canRequestSharingSettings))?'show':'hide']();
-            $panelUsers[(editingUsers > 1  || editingUsers > 0 && !appConfig.isEdit && !appConfig.isRestrictedEdit || !mode.isOffline && !mode.isReviewOnly && (mode.sharingSettingsUrl && mode.sharingSettingsUrl.length || mode.canRequestSharingSettings)) ? 'show' : 'hide']();
+            $panelUsers[(editingUsers > 1  || editingUsers > 0 && !appConfig.isEdit && !appConfig.isRestrictedEdit || !mode.isOffline && (mode.sharingSettingsUrl && mode.sharingSettingsUrl.length || mode.canRequestSharingSettings)) ? 'show' : 'hide']();
 
             if ( $saveStatus ) {
                 $saveStatus.attr('data-width', me.textSaveExpander);

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

@@ -95,6 +95,7 @@ define([
                     });
                 });
             }
+            me._isSetEvents = true;
         }
 
         return {
@@ -119,7 +120,7 @@ define([
                 if ( this.appConfig.isPasswordSupport ) {
                     this.btnAddPwd = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
-                        iconCls: 'btn-ic-protect',
+                        iconCls: 'toolbar__icon btn-ic-protect',
                         caption: this.txtEncrypt
                     });
                     this.btnsAddPwd.push(this.btnAddPwd);
@@ -135,7 +136,7 @@ define([
                 if (this.appConfig.isSignatureSupport) {
                     this.btnSignature = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
-                        iconCls: 'btn-ic-signature',
+                        iconCls: 'toolbar__icon btn-ic-signature',
                         caption: this.txtSignature,
                         menu: (this.appPrefix !== 'pe-')
                     });
@@ -221,6 +222,7 @@ define([
             },
 
             getButton: function(type, parent) {
+                var me = this;
                 if ( type == 'signature' ) {
                     var button = new Common.UI.Button({
                         cls: 'btn-text-default',
@@ -229,7 +231,11 @@ define([
                         disabled: this._state.invisibleSignDisabled
                     });
                     this.btnsInvisibleSignature.push(button);
-
+                    if (this._isSetEvents) {
+                        button.on('click', function (b, e) {
+                            me.fireEvent('protect:signature', ['invisible']);
+                        });
+                    }
                     return button;
                 } else if ( type == 'add-password' ) {
                     var button = new Common.UI.Button({
@@ -240,7 +246,11 @@ define([
                         visible: !this._state.hasPassword
                     });
                     this.btnsAddPwd.push(button);
-
+                    if (this._isSetEvents) {
+                        button.on('click', function (b, e) {
+                            me.fireEvent('protect:password', [b, 'add']);
+                        });
+                    }
                     return button;
                 } else if ( type == 'del-password' ) {
                     var button = new Common.UI.Button({
@@ -251,7 +261,11 @@ define([
                         visible: this._state.hasPassword
                     });
                     this.btnsDelPwd.push(button);
-
+                    if (this._isSetEvents) {
+                        button.on('click', function (b, e) {
+                            me.fireEvent('protect:password', [b, 'delete']);
+                        });
+                    }
                     return button;
                 } else if ( type == 'change-password' ) {
                     var button = new Common.UI.Button({
@@ -262,7 +276,11 @@ define([
                         visible: this._state.hasPassword
                     });
                     this.btnsChangePwd.push(button);
-
+                    if (this._isSetEvents) {
+                        button.on('click', function (b, e) {
+                            me.fireEvent('protect:password', [b, 'add']);
+                        });
+                    }
                     return button;
                 }
             },

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

@@ -102,6 +102,7 @@ define([
             this.reviewStore = options.reviewStore;
             this.canRequestUsers = options.canRequestUsers;
             this.canRequestSendNotify = options.canRequestSendNotify;
+            this.mentionShare = options.mentionShare;
             this.externalUsers = [];
             this._state = {commentsVisible: false, reviewVisible: false};
 
@@ -244,7 +245,7 @@ define([
                                 textReply: me.textReply,
                                 textClose: me.textClose,
                                 maxCommLength: Asc.c_oAscMaxCellOrCommentLength,
-                                textMention: me.canRequestSendNotify ? me.textMention : ''
+                                textMention: me.canRequestSendNotify ? (me.mentionShare ? me.textMention : me.textMentionNotify) : ''
                             })
                         )
                     });
@@ -1184,6 +1185,7 @@ define([
         textResolve             : 'Resolve',
         textOpenAgain           : "Open Again",
         textFollowMove          : 'Follow Move',
-        textMention             : '+mention will provide access to the document and send an email'
+        textMention             : '+mention will provide access to the document and send an email',
+        textMentionNotify       : '+mention will notify the user via email'
     }, Common.Views.ReviewPopover || {}))
 });

apps/common/main/resources/less/about.less

@@ -12,6 +12,8 @@
                             (min-resolution: 192dpi)
                 {
                     content: ~"url('@{common-image-const-path}/about/logo@2x.png')";
+                    display: block;
+                    transform: scale(.5);
                 }
             }
         }

apps/common/main/resources/less/asc-mixins.less

@@ -98,7 +98,7 @@
 .button-otherstates-icon(@icon-class, @icon-size) {
     .btn {
         &:active, &.active {
-            &:not(:disabled):not(.disabed) {
+            &:not(:disabled):not(.disabled) {
                 > .@{icon-class} {
                     @iconsize: -1*@icon-size;
 
@@ -210,13 +210,13 @@
     @2ximage: replace(@common-controls, '\.png$', '@2x.png');
 
     @media only screen {
-        @media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
+        //@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
-                (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
+        //        (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
-                (min-resolution: 144dpi) and (max-resolution: 191dpi)
+        //        (min-resolution: 144dpi) and (max-resolution: 191dpi)
-        {
+        //{
-            background-image: ~"url(@{common-image-const-path}/@{1d5ximage})";
+        //    background-image: ~"url(@{common-image-const-path}/@{1d5ximage})";
-            background-size: @common-controls-width auto;
+        //    background-size: @common-controls-width auto;
-        }
+        //}
 
         @media (-webkit-min-device-pixel-ratio: 2),
                     (min-resolution: 2dppx),
@@ -235,13 +235,13 @@
     background-repeat: no-repeat;
 
     @media only screen {
-        @media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
+        //@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
-                (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
+        //        (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
-                (min-resolution: 144dpi) and (max-resolution: 191dpi)
+        //        (min-resolution: 144dpi) and (max-resolution: 191dpi)
-        {
+        //{
-            background-image: ~"url(@{common-image-const-path}/hsbcolorpicker/hsb-colorpicker@1.5x.png)";
+        //    background-image: ~"url(@{common-image-const-path}/hsbcolorpicker/hsb-colorpicker@1.5x.png)";
-            background-size:  @img-colorpicker-width auto;
+        //    background-size:  @img-colorpicker-width auto;
-        }
+        //}
 
         @media (-webkit-min-device-pixel-ratio: 2),
                     (min-resolution: 2dppx),
@@ -263,13 +263,13 @@
     background-repeat: no-repeat;
 
     @media only screen {
-        @media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
+        //@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
-                (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
+        //        (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx),
-                (min-resolution: 144dpi) and (max-resolution: 191dpi)
+        //        (min-resolution: 144dpi) and (max-resolution: 191dpi)
-        {
+        //{
-            background-image: ~"url(@{common-image-const-path}/controls/flags@1.5x.png)";
+        //    background-image: ~"url(@{common-image-const-path}/controls/flags@1.5x.png)";
-            background-size:  @img-flags-width auto;
+        //    background-size:  @img-flags-width auto;
-        }
+        //}
 
         @media (-webkit-min-device-pixel-ratio: 2),
                 (min-resolution: 2dppx),

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

@@ -10,6 +10,9 @@
             height: 100%;
             width: 100%;
             color: #b2b2b2;
+            td {
+                padding: 5px;
+            }
         }
     }
 

apps/common/main/resources/less/input.less

@@ -47,20 +47,20 @@
         position: relative;
     }
 
-    &.error {
-        input {
-            border-color: @brand-danger;
-        }
-
-        .input-error {
-            display: block;
-        }
-    }
-
     &.form-control:focus,
     .form-control:focus {
         border-color: @gray-darker;
     }
+
+    &.error {
+        input:not([disabled]) {
+            border-color: @brand-danger;
+        }
+
+        input:not([disabled]) + .input-error {
+            display: block;
+        }
+    }
 }
 
 input:required:focus:invalid,

apps/common/main/resources/less/listview.less

@@ -13,6 +13,9 @@
         width: 100%;
         height: 100%;
         color: #b2b2b2;
+        td {
+          padding: 5px;
+        }
     }
   }
 
@@ -58,3 +61,8 @@
     }
   }
 }
+
+.no-borders > .listview .item {
+  border-color: transparent;
+  border-top-color: transparent;
+}

apps/common/main/resources/less/tabbar.less

@@ -4,10 +4,10 @@
 
     > li {
         float: none;
-        display: inline;
+        display: inline-block;
 
         &.active {
-            > a, > a:hover, > a:focus {
+            > span, > span:hover, > span:focus {
                 background-color: #fff;
                 color: #000;
                 border-color: #fff;
@@ -19,7 +19,7 @@
             transition: left .2s;
         }
 
-        > a {
+        > span {
             display: inline;
             background-color: #7a7a7a;
             color: #fff;
@@ -50,7 +50,7 @@
         > li {
             vertical-align: middle;
 
-            > a {
+            > span {
                 padding-bottom: 1px;
                 border-radius: 0 0 4px 4px;
             }

apps/common/main/resources/less/treeview.less

@@ -10,6 +10,9 @@
       height: 100%;
       width: 100%;
       color: #b2b2b2;
+      td {
+        padding: 5px;
+      }
     }
   }
 

apps/common/main/resources/less/window.less

@@ -258,7 +258,7 @@
                 line-height: @input-height-base;
             }
 
-            div {
+            & > div {
                 display: inline-block;
             }
         }

apps/common/mobile/lib/controller/Collaboration.js

@@ -370,6 +370,7 @@ define([
                 var goto = false;
                 if(arrChangeReview.length == 0) {
                     $('#current-change').css('display','none');
+                    $('.accept-reject').find('a').addClass('disabled');
                 } else {
                     $('#current-change #date-change').html(arrChangeReview[0].date);
                     $('#current-change #user-name').html(arrChangeReview[0].user);
@@ -444,8 +445,10 @@ define([
                         $('#current-change').hide();
                         $('#btn-goto-change').hide();
                         $('#btn-delete-change').hide();
+                        $('.accept-reject').find('a').addClass('disabled');
                     } else {
                         $('#current-change').show();
+                        $('.accept-reject').find('a').removeClass('disabled');
                         this.initChange();
                     }
                 }
@@ -454,6 +457,11 @@ define([
             changeReview: function (data) {
                 if (data && data.length>0) {
                     var me = this, arr = [];
+                    var c_paragraphLinerule = {
+                        LINERULE_LEAST: 0,
+                        LINERULE_AUTO: 1,
+                        LINERULE_EXACT: 2
+                    };
                     _.each(data, function (item) {
                         var changetext = '', proptext = '',
                             value = item.get_Value(),
@@ -611,9 +619,9 @@ define([
                                 if (value.Get_WidowControl())
                                     proptext += ((value.Get_WidowControl() ? me.textWidow : me.textNoWidow) + ', ');
                                 if (value.Get_Tabs() !== undefined)
-                                    proptext += proptext += (me.textTabs + ', ');
+                                    proptext += (me.textTabs + ', ');
                                 if (value.Get_NumPr() !== undefined)
-                                    proptext += proptext += (me.textNum + ', ');
+                                    proptext += (me.textNum + ', ');
                                 if (value.Get_PStyle() !== undefined) {
                                     var style = me.api.asc_GetStyleNameById(value.Get_PStyle());
                                     if (!_.isEmpty(style)) proptext += (style + ', ');

apps/common/mobile/resources/img/header/logo-android.svg

@@ -0,0 +1,15 @@
+<svg width="100" height="14" viewBox="0 0 100 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.0149 6.48201C19.959 5.79068 20.0611 5.0957 20.3134 4.44954C20.5658 3.80338 20.9618 3.22293 21.4717 2.75199C22.4021 1.92114 23.6137 1.47408 24.8615 1.50116C26.0997 1.47534 27.3009 1.92391 28.2183 2.75479C28.7177 3.23878 29.1043 3.82664 29.3506 4.47661C29.5969 5.12659 29.6969 5.82276 29.6435 6.51568C29.6972 7.20401 29.5972 7.89564 29.3507 8.54068C29.1042 9.18571 28.7175 9.76806 28.2183 10.2457C27.2979 11.0717 26.0988 11.5195 24.8615 11.4993C23.6157 11.5143 22.4085 11.0676 21.4731 10.2457C20.9648 9.76636 20.5701 9.1797 20.3178 8.52855C20.0655 7.8774 19.962 7.17821 20.0149 6.48201ZM22.1052 6.48201C22.0366 7.36424 22.2586 8.2447 22.7374 8.98927C23.0867 9.47357 23.5885 9.82682 24.1626 9.99245C24.2771 10.0259 24.3948 10.0468 24.5138 10.0549C24.6086 10.0549 24.7358 10.0865 24.8306 10.0865C24.9485 10.0904 25.0665 10.0798 25.1818 10.0549C25.3011 10.0496 25.4192 10.0286 25.533 9.99245C26.0978 9.82508 26.589 9.47144 26.9266 8.98927C27.3973 8.25268 27.6189 7.38464 27.5588 6.51288C27.6235 5.64069 27.4016 4.77122 26.9266 4.03648C26.589 3.55431 26.0978 3.20067 25.533 3.0333C25.4186 2.99986 25.3008 2.97892 25.1818 2.97086C25.0554 2.97086 24.9599 2.93929 24.8306 2.93929C24.724 2.93256 24.617 2.94323 24.5138 2.97086C24.3948 2.97892 24.2771 2.99985 24.1626 3.0333C23.5925 3.20713 23.093 3.55868 22.7374 4.03648C22.2389 4.74885 22.0144 5.61693 22.1052 6.48131V6.48201Z" fill="white"/>
+<path d="M30.6865 1.59473H33.2854L36.7055 7.738L37.2119 9.05407H37.2435L37.2119 7.33042V1.59473H39.2068V11.3733H36.6079L33.1878 4.9796L32.6814 3.88241H32.6533L32.6849 5.60606V11.3733H30.6865V1.59473Z" fill="white"/>
+<path d="M41.7406 1.59473H43.767V9.7121H47.6935V11.3733H41.7406V1.59473Z" fill="white"/>
+<path d="M46.6934 1.59473H49.005L51.0315 5.01117L51.3483 5.70077H51.3799L51.7311 5.01117L53.7877 1.59473H55.8781L52.3316 7.39285V11.3733H50.3368V7.36199L46.6934 1.59473Z" fill="white"/>
+<path d="M56.3649 6.48201C56.309 5.79068 56.4111 5.0957 56.6635 4.44954C56.9159 3.80338 57.3119 3.22292 57.8217 2.75199C58.7522 1.92114 59.9638 1.47408 61.2116 1.50116C62.4498 1.47534 63.6509 1.92391 64.5684 2.75479C65.0678 3.23878 65.4543 3.82664 65.7006 4.47661C65.947 5.12659 66.047 5.82276 65.9936 6.51568C66.0472 7.204 65.9472 7.89564 65.7008 8.54068C65.4543 9.18571 65.0675 9.76806 64.5684 10.2457C63.648 11.0717 62.4488 11.5196 61.2116 11.4993C59.9648 11.5197 58.7557 11.0724 57.8231 10.2457C57.3208 9.76193 56.93 9.17457 56.6782 8.52456C56.4264 7.87455 56.3194 7.17751 56.3649 6.48201ZM58.4553 6.48201C58.3867 7.36424 58.6087 8.2447 59.0875 8.98927C59.4305 9.47981 59.9348 9.83478 60.5127 9.99245C60.6271 10.0259 60.7449 10.0468 60.8639 10.0549C60.9587 10.0549 61.0858 10.0865 61.1807 10.0865C61.2986 10.0918 61.4168 10.0812 61.5319 10.0549C61.6512 10.0496 61.7693 10.0286 61.8831 9.99245C62.4478 9.82508 62.9391 9.47144 63.2767 8.98927C63.7473 8.25265 63.9689 7.38464 63.9088 6.51287C63.9736 5.64069 63.7516 4.77122 63.2767 4.03648C62.9391 3.55431 62.4478 3.20067 61.8831 3.0333C61.7686 2.99986 61.6509 2.97892 61.5319 2.97086C61.4054 2.97086 61.3099 2.93929 61.1807 2.93929C61.0741 2.93256 60.9671 2.94322 60.8639 2.97086C60.7449 2.97892 60.6271 2.99985 60.5127 3.0333C59.9425 3.20713 59.4431 3.55868 59.0875 4.03648C58.603 4.75524 58.3799 5.61814 58.4553 6.48131V6.48201Z" fill="white"/>
+<path d="M67.373 1.59473H72.9151V3.22437H69.403V5.60957H72.7598V7.27078H69.403V11.3768H67.373V1.59473Z" fill="white"/>
+<path d="M74.3172 1.59473H79.8592V3.22437H76.3471V5.60957H79.704V7.27078H76.3471V11.3768H74.3172V1.59473Z" fill="white"/>
+<path d="M81.153 11.3733V1.59473H83.1794V11.3733H81.153Z" fill="white"/>
+<path d="M92.8108 1.81254V3.50533C92.4613 3.37879 92.1008 3.28485 91.734 3.22472C91.3256 3.15985 90.9127 3.12841 90.4992 3.13071C90.0507 3.1014 89.6014 3.17354 89.1847 3.34177C88.7681 3.51 88.3948 3.76998 88.0927 4.10233C87.5102 4.76849 87.2044 5.63174 87.2379 6.51558C87.2028 7.36904 87.4839 8.20546 88.0274 8.865C88.3102 9.18731 88.6619 9.44199 89.0566 9.61018C89.4512 9.77836 89.8787 9.85575 90.3074 9.83661C90.6586 9.83661 91.0042 9.80504 91.4158 9.77418C91.8503 9.71406 92.2753 9.59829 92.6802 9.42973L92.8066 11.0909C92.7241 11.1275 92.6394 11.1589 92.553 11.1849C92.4266 11.2165 92.2994 11.2474 92.1414 11.279C91.8878 11.3414 91.571 11.373 91.191 11.4354C90.811 11.467 90.431 11.4978 90.0194 11.4978H89.7026C88.5515 11.4203 87.4543 10.9815 86.5678 10.2442C86.0696 9.78582 85.6824 9.22024 85.4355 8.59028C85.1886 7.96033 85.0884 7.28252 85.1426 6.60818C85.1032 5.92392 85.2068 5.23897 85.4467 4.59683C85.6866 3.95469 86.0576 3.3694 86.5362 2.87816C87.5604 1.96499 88.9039 1.49209 90.2751 1.5621C90.6867 1.5621 91.0667 1.5621 91.3835 1.59367C91.7347 1.62523 92.0487 1.68767 92.3971 1.75011C92.4603 1.78167 92.5551 1.78167 92.6191 1.81254C92.6483 1.79718 92.6808 1.78915 92.7139 1.78915C92.7469 1.78915 92.7795 1.79718 92.8087 1.81254H92.8108Z" fill="white"/>
+<path d="M94.1096 1.59473H100V3.13037H96.1044V5.57519H99.6516V7.07997H96.1044V9.83768H99.9993V11.3733H94.1096V1.59473Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.12556 13.8272L0.367848 10.9422C-0.122616 10.6903 -0.122616 10.3012 0.367848 10.0725L2.37233 9.06696L6.10392 10.9436C6.3808 11.0683 6.67805 11.1325 6.9783 11.1325C7.27856 11.1325 7.5758 11.0683 7.85268 10.9436L11.5849 9.06696L13.5894 10.0739C14.0799 10.3258 14.0799 10.7149 13.5894 10.9436L7.8317 13.8286C7.28337 14.0571 6.6752 14.0571 6.12687 13.8286L6.12556 13.8272Z" fill="white" fill-opacity="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.12556 10.2803L0.367848 7.39525C-0.122616 7.14334 -0.122616 6.75422 0.367848 6.52553L2.32971 5.54041L6.12556 7.44029C6.40244 7.56494 6.69968 7.62914 6.99994 7.62914C7.30019 7.62914 7.59744 7.56494 7.87432 7.44029L11.6702 5.54041L13.632 6.52553C14.1225 6.77744 14.1225 7.16656 13.632 7.39525L7.87432 10.2803C7.59744 10.4049 7.30019 10.4691 6.99994 10.4691C6.69968 10.4691 6.40244 10.4049 6.12556 10.2803Z" fill="white" fill-opacity="0.75"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.12567 6.82577L0.367955 3.94217C-0.122509 3.69026 -0.122509 3.30114 0.367955 3.07245L6.12567 0.188852C6.40255 0.0642006 6.69979 0 7.00005 0C7.3003 0 7.59755 0.0642006 7.87442 0.188852L13.6321 3.07386C14.1226 3.32577 14.1226 3.71489 13.6321 3.94358L7.87442 6.82858C7.31102 7.0575 6.68907 7.0575 6.12567 6.82858V6.82577Z" fill="white"/>
+</svg>

apps/common/mobile/resources/img/header/logo-ios.svg

@@ -0,0 +1,29 @@
+<svg width="100" height="14" viewBox="0 0 100 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.0149 6.48201C19.959 5.79068 20.0611 5.0957 20.3134 4.44954C20.5658 3.80338 20.9618 3.22293 21.4717 2.75199C22.4021 1.92114 23.6137 1.47408 24.8615 1.50116C26.0997 1.47534 27.3009 1.92391 28.2183 2.75479C28.7177 3.23878 29.1043 3.82664 29.3506 4.47661C29.5969 5.12659 29.6969 5.82276 29.6435 6.51568C29.6972 7.20401 29.5972 7.89564 29.3507 8.54068C29.1042 9.18571 28.7175 9.76806 28.2183 10.2457C27.2979 11.0717 26.0988 11.5195 24.8615 11.4993C23.6157 11.5143 22.4085 11.0676 21.4731 10.2457C20.9648 9.76636 20.5701 9.1797 20.3178 8.52855C20.0655 7.8774 19.962 7.17821 20.0149 6.48201ZM22.1052 6.48201C22.0366 7.36424 22.2586 8.2447 22.7374 8.98927C23.0867 9.47357 23.5885 9.82682 24.1626 9.99245C24.2771 10.0259 24.3948 10.0468 24.5138 10.0549C24.6086 10.0549 24.7358 10.0865 24.8306 10.0865C24.9485 10.0904 25.0665 10.0798 25.1818 10.0549C25.3011 10.0496 25.4192 10.0286 25.533 9.99245C26.0978 9.82508 26.589 9.47144 26.9266 8.98927C27.3973 8.25268 27.6189 7.38464 27.5588 6.51288C27.6235 5.64069 27.4016 4.77122 26.9266 4.03648C26.589 3.55431 26.0978 3.20067 25.533 3.0333C25.4186 2.99986 25.3008 2.97892 25.1818 2.97086C25.0554 2.97086 24.9599 2.93929 24.8306 2.93929C24.724 2.93256 24.617 2.94323 24.5138 2.97086C24.3948 2.97892 24.2771 2.99985 24.1626 3.0333C23.5925 3.20713 23.093 3.55868 22.7374 4.03648C22.2389 4.74885 22.0144 5.61693 22.1052 6.48131V6.48201Z" fill="#333333"/>
+<path d="M30.6865 1.59473H33.2855L36.7055 7.738L37.2119 9.05407H37.2436L37.2119 7.33042V1.59473H39.2068V11.3733H36.6079L33.1878 4.9796L32.6814 3.88241H32.6533L32.6849 5.60606V11.3733H30.6865V1.59473Z" fill="#333333"/>
+<path d="M41.7406 1.59473H43.767V9.7121H47.6935V11.3733H41.7406V1.59473Z" fill="#333333"/>
+<path d="M46.6934 1.59473H49.005L51.0315 5.01117L51.3482 5.70077H51.3799L51.7311 5.01117L53.7877 1.59473H55.8781L52.3316 7.39285V11.3733H50.3368V7.36199L46.6934 1.59473Z" fill="#333333"/>
+<path d="M56.3649 6.48201C56.309 5.79068 56.4111 5.0957 56.6635 4.44954C56.9159 3.80338 57.3119 3.22292 57.8217 2.75199C58.7522 1.92114 59.9638 1.47408 61.2116 1.50116C62.4498 1.47534 63.6509 1.92391 64.5684 2.75479C65.0678 3.23878 65.4543 3.82664 65.7006 4.47661C65.947 5.12659 66.047 5.82276 65.9936 6.51568C66.0472 7.204 65.9472 7.89564 65.7008 8.54068C65.4543 9.18571 65.0675 9.76806 64.5684 10.2457C63.648 11.0717 62.4488 11.5196 61.2116 11.4993C59.9648 11.5197 58.7557 11.0724 57.8231 10.2457C57.3208 9.76193 56.93 9.17457 56.6782 8.52456C56.4264 7.87455 56.3194 7.17751 56.3649 6.48201ZM58.4553 6.48201C58.3867 7.36424 58.6087 8.2447 59.0875 8.98927C59.4305 9.47981 59.9348 9.83478 60.5127 9.99245C60.6271 10.0259 60.7449 10.0468 60.8639 10.0549C60.9587 10.0549 61.0858 10.0865 61.1807 10.0865C61.2986 10.0918 61.4168 10.0812 61.5319 10.0549C61.6512 10.0496 61.7693 10.0286 61.8831 9.99245C62.4478 9.82508 62.9391 9.47144 63.2767 8.98927C63.7473 8.25265 63.9689 7.38464 63.9088 6.51287C63.9736 5.64069 63.7516 4.77122 63.2767 4.03648C62.9391 3.55431 62.4478 3.20067 61.8831 3.0333C61.7686 2.99986 61.6509 2.97892 61.5319 2.97086C61.4054 2.97086 61.3099 2.93929 61.1807 2.93929C61.0741 2.93256 60.9671 2.94322 60.8639 2.97086C60.7449 2.97892 60.6271 2.99985 60.5127 3.0333C59.9425 3.20713 59.4431 3.55868 59.0875 4.03648C58.603 4.75524 58.3799 5.61814 58.4553 6.48131V6.48201Z" fill="#333333"/>
+<path d="M67.373 1.59473H72.9151V3.22437H69.403V5.60957H72.7598V7.27078H69.403V11.3768H67.373V1.59473Z" fill="#333333"/>
+<path d="M74.3172 1.59473H79.8592V3.22437H76.3471V5.60957H79.704V7.27078H76.3471V11.3768H74.3172V1.59473Z" fill="#333333"/>
+<path d="M81.153 11.3733V1.59473H83.1794V11.3733H81.153Z" fill="#333333"/>
+<path d="M92.8108 1.81254V3.50533C92.4613 3.37879 92.1008 3.28485 91.734 3.22472C91.3256 3.15985 90.9127 3.12841 90.4992 3.13071C90.0507 3.1014 89.6014 3.17354 89.1847 3.34177C88.7681 3.51 88.3948 3.76998 88.0927 4.10233C87.5102 4.76849 87.2044 5.63174 87.2379 6.51558C87.2028 7.36904 87.4839 8.20546 88.0274 8.865C88.3102 9.18731 88.6619 9.44199 89.0566 9.61018C89.4512 9.77836 89.8787 9.85575 90.3074 9.83661C90.6586 9.83661 91.0042 9.80504 91.4158 9.77418C91.8503 9.71406 92.2753 9.59829 92.6802 9.42973L92.8066 11.0909C92.7241 11.1275 92.6394 11.1589 92.553 11.1849C92.4266 11.2165 92.2994 11.2474 92.1414 11.279C91.8878 11.3414 91.571 11.373 91.191 11.4354C90.811 11.467 90.431 11.4978 90.0194 11.4978H89.7026C88.5515 11.4203 87.4543 10.9815 86.5678 10.2442C86.0696 9.78582 85.6824 9.22024 85.4355 8.59028C85.1886 7.96033 85.0884 7.28252 85.1426 6.60818C85.1032 5.92392 85.2068 5.23897 85.4467 4.59683C85.6866 3.95469 86.0576 3.3694 86.5362 2.87816C87.5604 1.96499 88.9039 1.49209 90.2751 1.5621C90.6867 1.5621 91.0667 1.5621 91.3835 1.59367C91.7347 1.62523 92.0487 1.68767 92.3971 1.75011C92.4603 1.78167 92.5551 1.78167 92.6191 1.81254C92.6483 1.79718 92.6808 1.78915 92.7139 1.78915C92.7469 1.78915 92.7795 1.79718 92.8087 1.81254H92.8108Z" fill="#333333"/>
+<path d="M94.1096 1.59473H100V3.13037H96.1044V5.57519H99.6516V7.07997H96.1044V9.83768H99.9993V11.3733H94.1096V1.59473Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.12556 13.8272L0.367848 10.9422C-0.122616 10.6903 -0.122616 10.3012 0.367848 10.0725L2.37233 9.06696L6.10392 10.9436C6.3808 11.0683 6.67805 11.1325 6.9783 11.1325C7.27856 11.1325 7.5758 11.0683 7.85268 10.9436L11.5849 9.06696L13.5894 10.0739C14.0799 10.3258 14.0799 10.7149 13.5894 10.9436L7.8317 13.8286C7.28337 14.0571 6.6752 14.0571 6.12687 13.8286L6.12556 13.8272Z" fill="url(#paint0_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.12556 10.2803L0.367848 7.39525C-0.122616 7.14334 -0.122616 6.75422 0.367848 6.52553L2.32971 5.54041L6.12556 7.44029C6.40244 7.56494 6.69968 7.62914 6.99994 7.62914C7.30019 7.62914 7.59744 7.56494 7.87432 7.44029L11.6702 5.54041L13.632 6.52553C14.1225 6.77744 14.1225 7.16656 13.632 7.39525L7.87432 10.2803C7.59744 10.4049 7.30019 10.4691 6.99994 10.4691C6.69968 10.4691 6.40244 10.4049 6.12556 10.2803Z" fill="url(#paint1_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.12567 6.82577L0.367955 3.94217C-0.122509 3.69026 -0.122509 3.30114 0.367955 3.07245L6.12567 0.188852C6.40255 0.0642006 6.69979 0 7.00005 0C7.3003 0 7.59755 0.0642006 7.87442 0.188852L13.6321 3.07386C14.1226 3.32577 14.1226 3.71489 13.6321 3.94358L7.87442 6.82858C7.31102 7.0575 6.68907 7.0575 6.12567 6.82858V6.82577Z" fill="url(#paint2_linear)"/>
+<defs>
+<linearGradient id="paint0_linear" x1="6.99259" y1="16.5603" x2="6.99259" y2="6.03313" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FCC2B1"/>
+<stop offset="0.885" stop-color="#D9420B"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="6.99994" y1="12.0019" x2="6.99994" y2="5.07711" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DEEDC9"/>
+<stop offset="0.661" stop-color="#8BBA25"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="7.00005" y1="9.20536" x2="7.00005" y2="-0.224009" gradientUnits="userSpaceOnUse">
+<stop stop-color="#C2EBFA"/>
+<stop offset="1" stop-color="#26A8DE"/>
+</linearGradient>
+</defs>
+</svg>

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

@@ -2,12 +2,8 @@
   cursor: pointer;
   display: block;
   background-color: #fff;
-  .item-content {
-    padding-left: 0;
-  }
   .item-inner {
     justify-content: flex-start;
-    padding-left: 16px;
   }
   .color-schema-block {
     display: flex;

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

@@ -2,12 +2,8 @@
   cursor: pointer;
   display: block;
   background-color: #fff;
-  .item-content {
-    padding-left: 0;
-  }
   .item-inner {
     justify-content: flex-start;
-    padding-left: 16px;
   }
   .color-schema-block {
     display: flex;

apps/common/mobile/resources/less/material/_container.less

@@ -27,8 +27,6 @@
   &.popup,
   &.popover {
     .list-block {
-      margin: 32px 0;
-
       ul {
         border-radius: 0;
         background: #fff;

apps/documenteditor/embed/index.html

@@ -162,6 +162,7 @@
                logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
 
            window.frameEditorId = params["frameEditorId"];
+           window.parentOrigin = params["parentOrigin"];
 
            var elem = document.querySelector('.loading-logo');
            if (elem && logo) {

apps/documenteditor/embed/index.html.deploy

@@ -155,6 +155,7 @@
                            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
 
             window.frameEditorId = params["frameEditorId"];
+            window.parentOrigin = params["parentOrigin"];
             var elem = document.querySelector('.loading-logo');
             if (elem && logo) {
                 elem.style.backgroundImage= 'none';

apps/documenteditor/embed/index_loader.html

@@ -240,6 +240,7 @@
                 logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
             window.frameEditorId = params["frameEditorId"];
+           window.parentOrigin = params["parentOrigin"];
 
            if ( lang == 'de')      loading = 'Ladevorgang...';
            else if ( lang == 'es') loading = 'Cargando...';

apps/documenteditor/embed/index_loader.html.deploy

@@ -232,6 +232,7 @@
                 logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
             window.frameEditorId = params["frameEditorId"];
+            window.parentOrigin = params["parentOrigin"];
 
             if ( lang == 'de')      loading = 'Ladevorgang...';
             else if ( lang == 'es') loading = 'Cargando...';

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

@@ -470,6 +470,10 @@ define([
             this.getApplication().getController('Common.Controllers.ReviewChanges').commentsShowHide(value ? 'show' : 'hide');
             /** coauthoring end **/
 
+            value = Common.localStorage.getBool("de-settings-cachemode", true);
+            Common.Utils.InternalSettings.set("de-settings-cachemode", value);
+            this.api.asc_setDefaultBlitMode(value);
+
             value = Common.localStorage.getItem("de-settings-fontrender");
             Common.Utils.InternalSettings.set("de-settings-fontrender", value);
             switch (value) {

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

@@ -154,10 +154,10 @@ define([
 
             var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
                 control_plain = (control_props) ? (control_props.get_ContentControlType()==Asc.c_oAscSdtLevelType.Inline) : false;
-            var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : true,
+            var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : false,
-                rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : true,
+                rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : false,
-                plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : true,
+                plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : false,
-                plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : true;
+                plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : false;
 
             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);
@@ -251,6 +251,7 @@ define([
                     props.put_Hyperlink(true);
                     props.put_ShowPageNumbers(false);
                     props.put_TabLeader( Asc.c_oAscTabLeader.None);
+                    props.put_StylesType(Asc.c_oAscTOCStylesType.Web);
                     (currentTOC) ? this.api.asc_SetTableOfContentsPr(props) : this.api.asc_AddTableOfContents(null, props);
                     break;
                 case 'settings':

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

@@ -100,7 +100,8 @@ define([
 
                 var me = this,
                     styleNames = ['Normal', 'No Spacing', 'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Heading 5',
-                                  'Heading 6', 'Heading 7', 'Heading 8', 'Heading 9', 'Title', 'Subtitle', 'Quote', 'Intense Quote', 'List Paragraph', 'footnote text'],
+                                  'Heading 6', 'Heading 7', 'Heading 8', 'Heading 9', 'Title', 'Subtitle', 'Quote', 'Intense Quote', 'List Paragraph', 'footnote text',
+                                  'Caption'],
                 translate = {
                     'Series': this.txtSeries,
                     'Diagram Title': this.txtDiagramTitle,
@@ -163,17 +164,21 @@ define([
                     return;
                 }
 
-                var value = Common.localStorage.getItem("de-settings-fontrender");
-                if (value === null)
-                    window.devicePixelRatio > 1 ? value = '1' : '0';
-                Common.Utils.InternalSettings.set("de-settings-fontrender", value);
-
                 // Initialize api
                 window["flat_desine"] = true;
                 this.api = this.getApplication().getController('Viewport').getApi();
 
                 if (this.api){
                     this.api.SetDrawingFreeze(true);
+
+                    var value = Common.localStorage.getBool("de-settings-cachemode", true);
+                    Common.Utils.InternalSettings.set("de-settings-cachemode", value);
+                    this.api.asc_setDefaultBlitMode(!!value);
+
+                    value = Common.localStorage.getItem("de-settings-fontrender");
+                    if (value === null)
+                        value = '0';
+                    Common.Utils.InternalSettings.set("de-settings-fontrender", value);
                     switch (value) {
                         case '0': this.api.SetFontRenderingMode(3); break;
                         case '1': this.api.SetFontRenderingMode(1); break;
@@ -358,6 +363,8 @@ define([
                 this.appOptions.canRequestSharingSettings = this.editorConfig.canRequestSharingSettings;
                 this.appOptions.compatibleFeatures = (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compatibleFeatures;
                 this.appOptions.canFeatureComparison = !!this.api.asc_isSupportFeature("comparison");
+                this.appOptions.canFeatureContentControl = !!this.api.asc_isSupportFeature("content-сontrols");
+                this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false));
 
                 appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header');
                 appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '')
@@ -744,7 +751,8 @@ define([
 
                 if ( type == Asc.c_oAscAsyncActionType.BlockInteraction &&
                     (!this.getApplication().getController('LeftMenu').dlgSearch || !this.getApplication().getController('LeftMenu').dlgSearch.isVisible()) &&
-                    !( id == Asc.c_oAscAsyncAction['ApplyChanges'] && (this.dontCloseDummyComment || this.dontCloseChat || this.isModalShowed || this.inFormControl)) ) {
+                    (!this.getApplication().getController('Toolbar').dlgSymbolTable || !this.getApplication().getController('Toolbar').dlgSymbolTable.isVisible()) &&
+                    !((id == Asc.c_oAscAsyncAction['LoadDocumentFonts'] || id == Asc.c_oAscAsyncAction['ApplyChanges']) && (this.dontCloseDummyComment || this.dontCloseChat || this.isModalShowed || this.inFormControl)) ) {
 //                        this.onEditComplete(this.loadMask); //если делать фокус, то при принятии чужих изменений, заканчивается свой композитный ввод
                         this.api.asc_enableKeyEvents(true);
                 }
@@ -890,6 +898,8 @@ define([
                 me.hidePreloader();
                 me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
 
+                Common.Utils.InternalSettings.set("de-settings-datetime-default", Common.localStorage.getItem("de-settings-datetime-default"));
+
                 /** coauthoring begin **/
                 this.isLiveCommenting = Common.localStorage.getBool("de-settings-livecomment", true);
                 Common.Utils.InternalSettings.set("de-settings-livecomment", this.isLiveCommenting);
@@ -1053,6 +1063,11 @@ define([
                     Common.NotificationCenter.trigger('document:ready', 'main');
                 }
 
+                // TODO bug 43960
+                var dummyClass = ~~(1e6*Math.random());
+                $('.toolbar').prepend(Common.Utils.String.format('<div class="lazy-{0} x-huge"><div class="toolbar__icon" style="position: absolute; width: 1px; height: 1px;"></div>', dummyClass));
+                setTimeout(function() { $(Common.Utils.String.format('.toolbar .lazy-{0}', dummyClass)).remove(); }, 10);
+
                 if (this.appOptions.canAnalytics && false)
                     Common.component.Analytics.initialize('UA-12442749-13', 'Document Editor');
 
@@ -1328,6 +1343,7 @@ define([
                     /** coauthoring begin **/
                     me.api.asc_registerCallback('asc_onCollaborativeChanges',    _.bind(me.onCollaborativeChanges, me));
                     me.api.asc_registerCallback('asc_OnTryUndoInFastCollaborative',_.bind(me.onTryUndoInFastCollaborative, me));
+                    me.api.asc_registerCallback('asc_onConvertEquationToMath',_.bind(me.onConvertEquationToMath, me));
                     /** coauthoring end **/
 
                     if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) {
@@ -1531,6 +1547,14 @@ define([
                         config.maxwidth = 600;
                         break;
 
+                   case Asc.c_oAscError.ID.DirectUrl:
+                        config.msg = this.errorDirectUrl;
+                        break;
+
+                   case Asc.c_oAscError.ID.CannotCompareInCoEditing:
+                        config.msg = this.errorCompare;
+                        break;
+
                     default:
                         config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -2169,6 +2193,30 @@ define([
                 this.appOptions.canUseHistory = false;
             },
 
+            onConvertEquationToMath: function(equation) {
+                var me = this,
+                    win;
+                var msg = this.textConvertEquation + '<br><br><a id="id-equation-convert-help" style="cursor: pointer;">' + this.textLearnMore + '</a>';
+                win = Common.UI.warning({
+                    width: 500,
+                    msg: msg,
+                    buttons: ['yes', 'cancel'],
+                    primary: 'yes',
+                    dontshow: true,
+                    textDontShow: this.textApplyAll,
+                    callback: _.bind(function(btn, dontshow){
+                        if (btn == 'yes') {
+                            this.api.asc_ConvertEquationToMath(equation, dontshow);
+                        }
+                        this.onEditComplete();
+                    }, this)
+                });
+                win.$window.find('#id-equation-convert-help').on('click', function (e) {
+                    win && win.close();
+                    me.getApplication().getController('LeftMenu').getView('LeftMenu').showMenu('file:help', 'UsageInstructions\/InsertEquation.htm');
+                })
+            },
+
             leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' then \'Save\' to save them. Click \'Leave this Page\' to discard all the unsaved changes.',
             criticalErrorTitle: 'Error',
             notcriticalErrorTitle: 'Warning',
@@ -2243,7 +2291,7 @@ define([
             txtXAxis: 'X Axis',
             txtYAxis: 'Y Axis',
             txtSeries: 'Seria',
-            errorMailMergeLoadFile: 'Loading failed',
+            errorMailMergeLoadFile: 'Loading the document failed. Please select a different file.',
             mailMergeLoadFileText: 'Loading Data Source...',
             mailMergeLoadFileTitle: 'Loading Data Source',
             errorMailMergeSaveFile: 'Merge failed.',
@@ -2305,7 +2353,7 @@ define([
             txtOddPage: "Odd Page",
             txtSameAsPrev: "Same as Previous",
             txtCurrentDocument: "Current Document",
-            txtNoTableOfContents: "No table of contents entries found.",
+            txtNoTableOfContents: "There are no headings in the document. Apply a heading style to the text so that it appears in the table of contents.",
             txtTableOfContents: "Table of Contents",
             errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
             warnNoLicense: 'This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
@@ -2512,7 +2560,13 @@ define([
             uploadDocExtMessage: 'Unknown document format.',
             uploadDocFileCountMessage: 'No documents uploaded.',
             errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.',
-            txtChoose: 'Choose an item.'
+            txtChoose: 'Choose an item.',
+            errorDirectUrl: 'Please verify the link to the document.<br>This link must be a direct link to the file for downloading.',
+            txtStyle_Caption: 'Caption',
+            errorCompare: 'The Compare documents feature is not available in the co-editing mode.',
+            textConvertEquation: 'This equation was created with an old version of equation editor which is no longer supported. Converting this equation to Office Math ML format will make it editable.<br>Do you want to convert this equation?',
+            textApplyAll: 'Apply to all equations',
+            textLearnMore: 'Learn More'
         }
     })(), DE.Controllers.Main || {}))
 });

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

@@ -140,10 +140,14 @@ define([
                             item.setDisabled(notflow);
                         });
 
-                        disable.align       = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline;
+                        var control_props = me.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
-                        disable.group       = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline;
+                            lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked,
-                        disable.arrange     = wrapping == Asc.c_oAscWrapStyle2.Inline;
+                            content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked;
-                        disable.wrapping    = islocked || props.get_FromGroup() || (notflow && !me.api.CanChangeWrapPolygon());
+
+                        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 || content_locked;
+                        disable.wrapping    = islocked || props.get_FromGroup() || (notflow && !me.api.CanChangeWrapPolygon()) || content_locked || (!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture);
 
                         if ( !disable.group ) {
                             if (me.api.CanGroup() || me.api.CanUnGroup()) {

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

@@ -126,6 +126,7 @@ define([
             var isChart = false;
             for (i=0; i<SelectedObjects.length; i++)
             {
+                var content_locked = false;
                 var eltype = SelectedObjects[i].get_ObjectType(),
                     settingsType = this.getDocumentSettingsType(eltype);
                 if (eltype === Asc.c_oAscTypeSelectElement.Math)
@@ -136,6 +137,10 @@ define([
 
                 var value = SelectedObjects[i].get_ObjectValue();
                 if (settingsType == Common.Utils.documentSettingsType.Image) {
+                    var control_props = this.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;
+
                     if (value.get_ChartProperties() !== null) {
                         isChart = true;
                         settingsType = Common.Utils.documentSettingsType.Chart;
@@ -145,7 +150,7 @@ define([
                         if (value.get_ShapeProperties().asc_getTextArtProperties()) {
                             this._settings[Common.Utils.documentSettingsType.TextArt].props = value;
                             this._settings[Common.Utils.documentSettingsType.TextArt].hidden = 0;
-                            this._settings[Common.Utils.documentSettingsType.TextArt].locked = value.get_Locked();
+                            this._settings[Common.Utils.documentSettingsType.TextArt].locked = value.get_Locked() || content_locked;
                         }
                     }
                 } else if (settingsType == Common.Utils.documentSettingsType.Paragraph) {
@@ -154,7 +159,7 @@ define([
                 }
                 this._settings[settingsType].props = value;
                 this._settings[settingsType].hidden = 0;
-                this._settings[settingsType].locked = value.get_Locked();
+                this._settings[settingsType].locked = value.get_Locked() || content_locked;
                 if (!this._settings[Common.Utils.documentSettingsType.MailMerge].locked) // lock MailMerge-InsertField, если хотя бы один объект locked
                     this._settings[Common.Utils.documentSettingsType.MailMerge].locked = value.get_Locked();
                 if (!this._settings[Common.Utils.documentSettingsType.Signature].locked) // lock Signature, если хотя бы один объект locked

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

@@ -58,7 +58,9 @@ define([
     'documenteditor/main/app/view/CustomColumnsDialog',
     'documenteditor/main/app/view/ControlSettingsDialog',
     'documenteditor/main/app/view/WatermarkSettingsDialog',
-    'documenteditor/main/app/view/CompareSettingsDialog'
+    'documenteditor/main/app/view/CompareSettingsDialog',
+    'documenteditor/main/app/view/ListSettingsDialog',
+    'documenteditor/main/app/view/DateTimeDialog'
 ], function () {
     'use strict';
 
@@ -285,6 +287,9 @@ define([
             toolbar.mnuMarkersPicker.on('item:click',                   _.bind(this.onSelectBullets, this, toolbar.btnMarkers));
             toolbar.mnuNumbersPicker.on('item:click',                   _.bind(this.onSelectBullets, this, toolbar.btnNumbers));
             toolbar.mnuMultilevelPicker.on('item:click',                _.bind(this.onSelectBullets, this, toolbar.btnMultilevels));
+            toolbar.mnuMarkerSettings.on('click',                       _.bind(this.onMarkerSettingsClick, this, 0));
+            toolbar.mnuNumberSettings.on('click',                       _.bind(this.onMarkerSettingsClick, this, 1));
+            toolbar.mnuMultilevelSettings.on('click',                   _.bind(this.onMarkerSettingsClick, this, 2));
             toolbar.btnHighlightColor.on('click',                       _.bind(this.onBtnHighlightColor, this));
             toolbar.btnFontColor.on('click',                            _.bind(this.onBtnFontColor, this));
             toolbar.btnParagraphColor.on('click',                       _.bind(this.onBtnParagraphColor, this));
@@ -318,6 +323,7 @@ define([
             toolbar.btnMailRecepients.on('click',                       _.bind(this.onSelectRecepientsClick, this));
             toolbar.mnuPageNumberPosPicker.on('item:click',             _.bind(this.onInsertPageNumberClick, this));
             toolbar.btnEditHeader.menu.on('item:click',                 _.bind(this.onEditHeaderFooterClick, this));
+            toolbar.btnInsDateTime.on('click',                          _.bind(this.onInsDateTimeClick, this));
             toolbar.mnuPageNumCurrentPos.on('click',                    _.bind(this.onPageNumCurrentPosClick, this));
             toolbar.mnuInsertPageCount.on('click',                      _.bind(this.onInsertPageCountClick, this));
             toolbar.btnBlankPage.on('click',                            _.bind(this.onBtnBlankPageClick, this));
@@ -493,14 +499,16 @@ define([
                 switch(this._state.bullets.type) {
                     case 0:
                         this.toolbar.btnMarkers.toggle(true, true);
-                        if (this._state.bullets.subtype!==undefined)
+                        if (this._state.bullets.subtype>0)
                             this.toolbar.mnuMarkersPicker.selectByIndex(this._state.bullets.subtype, true);
                         else
                             this.toolbar.mnuMarkersPicker.deselectAll(true);
                         this.toolbar.mnuMultilevelPicker.deselectAll(true);
+                        this.toolbar.mnuMarkerSettings && this.toolbar.mnuMarkerSettings.setDisabled(this._state.bullets.subtype<0);
+                        this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(this._state.bullets.subtype<0);
                         break;
                     case 1:
-                        var idx = 0;
+                        var idx;
                         switch(this._state.bullets.subtype) {
                             case 1:
                                 idx = 4;
@@ -525,11 +533,13 @@ define([
                                 break;
                         }
                         this.toolbar.btnNumbers.toggle(true, true);
-                        if (this._state.bullets.subtype!==undefined)
+                        if (idx!==undefined)
                             this.toolbar.mnuNumbersPicker.selectByIndex(idx, true);
                         else
                             this.toolbar.mnuNumbersPicker.deselectAll(true);
                         this.toolbar.mnuMultilevelPicker.deselectAll(true);
+                        this.toolbar.mnuNumberSettings && this.toolbar.mnuNumberSettings.setDisabled(idx==0);
+                        this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(idx==0);
                         break;
                     case 2:
                         this.toolbar.btnMultilevels.toggle(true, true);
@@ -655,12 +665,14 @@ define([
                 paragraph_locked = false,
                 header_locked = false,
                 image_locked = false,
-                in_image = false;
+                in_image = false,
+                frame_pr = undefined;
 
             while (++i < selectedObjects.length) {
                 type = selectedObjects[i].get_ObjectType();
 
                 if (type === Asc.c_oAscTypeSelectElement.Paragraph) {
+                    frame_pr = selectedObjects[i].get_ObjectValue();
                     paragraph_locked = selectedObjects[i].get_ObjectValue().get_Locked();
                 } else if (type === Asc.c_oAscTypeSelectElement.Header) {
                     header_locked = selectedObjects[i].get_ObjectValue().get_Locked();
@@ -670,10 +682,21 @@ define([
                 }
             }
 
-            var need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked;
+            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 = !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;
             }
+            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;
+            }
             if ( this.btnsComment && this.btnsComment.length > 0 )
                 this.btnsComment.setDisabled(need_disable);
         },
@@ -735,10 +758,10 @@ define([
             if (sh)
                 this.onParagraphColor(sh);
 
-            var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : true,
+            var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : false,
-                rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : true,
+                rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : false,
-                plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : true,
+                plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : false,
-                plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : true;
+                plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : false;
             var need_disable = paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock;
 
             if (this._state.prcontrolsdisable != need_disable) {
@@ -829,6 +852,7 @@ define([
             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);
@@ -836,7 +860,7 @@ define([
 
             toolbar.btnEditHeader.setDisabled(in_equation);
 
-            need_disable = paragraph_locked || header_locked || in_image || control_plain || rich_edit_lock || plain_edit_lock;
+            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);
 
@@ -847,6 +871,11 @@ define([
             if (this.mode.compatibleFeatures) {
                 need_disable = need_disable || in_image;
             }
+            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;
+            }
             if ( this.btnsComment && this.btnsComment.length > 0 )
                 this.btnsComment.setDisabled(need_disable);
 
@@ -896,6 +925,7 @@ define([
             if (this._state.lock_doc!==true) {
                 this.toolbar.btnPageOrient.setDisabled(true);
                 this.toolbar.btnPageSize.setDisabled(true);
+                this.toolbar.btnPageMargins.setDisabled(true);
                 if (this._state.activated) this._state.lock_doc = true;
             }
         },
@@ -904,6 +934,7 @@ define([
             if (this._state.lock_doc!==false) {
                 this.toolbar.btnPageOrient.setDisabled(false);
                 this.toolbar.btnPageSize.setDisabled(false);
+                this.toolbar.btnPageMargins.setDisabled(false);
                 if (this._state.activated) this._state.lock_doc = false;
             }
         },
@@ -1253,7 +1284,7 @@ define([
                 });
 
                 if (!item) {
-                    value = /^\+?(\d*\.?\d+)$|^\+?(\d+\.?\d*)$/.exec(record.value);
+                    value = /^\+?(\d*(\.|,)?\d+)$|^\+?(\d+(\.|,)?\d*)$/.exec(record.value);
 
                     if (!value) {
                         value = this._getApiTextSize();
@@ -1274,7 +1305,7 @@ define([
                     }
                 }
             } else {
-                value = parseFloat(record.value);
+                value = Common.Utils.String.parseFloat(record.value);
                 value = value > 100
                     ? 100
                     : value < 1
@@ -1310,8 +1341,8 @@ define([
                 btn.toggle(rawData.data.subtype > -1, true);
             }
 
-            this._state.bullets.type = rawData.data.type;
+            this._state.bullets.type = undefined;
-            this._state.bullets.subtype = rawData.data.subtype;
+            this._state.bullets.subtype = undefined;
             if (this.api)
                 this.api.put_ListType(rawData.data.type, rawData.data.subtype);
 
@@ -1319,6 +1350,30 @@ define([
             Common.NotificationCenter.trigger('edit:complete', this.toolbar);
         },
 
+        onMarkerSettingsClick: function(type) {
+            var me      = this;
+            var listId = me.api.asc_GetCurrentNumberingId(),
+                level = me.api.asc_GetCurrentNumberingLvl(),
+                props = (listId !== null) ? me.api.asc_GetNumberingPr(listId) : null;
+            if (props) {
+                (new DE.Views.ListSettingsDialog({
+                    api: me.api,
+                    props: props,
+                    level: level,
+                    type: type,
+                    interfaceLang: me.mode.lang,
+                    handler: function(result, value) {
+                        if (result == 'ok') {
+                            if (me.api) {
+                                me.api.asc_ChangeNumberingLvl(listId, value.props, value.num);
+                            }
+                        }
+                        Common.NotificationCenter.trigger('edit:complete', me.toolbar);
+                    }
+                })).show();
+            }
+        },
+
         onLineSpaceToggle: function(menu, item, state, e) {
             if (!!state) {
                 this._state.linespace = undefined;
@@ -1729,6 +1784,8 @@ define([
         },
 
         onControlsSelect: function(menu, item) {
+            if (!(this.mode && this.mode.canFeatureContentControl)) return;
+
             if (item.value == 'settings' || item.value == 'remove') {
                 if (this.api.asc_IsContentControl()) {
                     var props = this.api.asc_GetContentControlProperties();
@@ -2183,6 +2240,9 @@ define([
             this.toolbar.mnuMarkersPicker.selectByIndex(0, true);
             this.toolbar.mnuNumbersPicker.selectByIndex(0, true);
             this.toolbar.mnuMultilevelPicker.selectByIndex(0, true);
+            this.toolbar.mnuMarkerSettings && this.toolbar.mnuMarkerSettings.setDisabled(true);
+            this.toolbar.mnuNumberSettings && this.toolbar.mnuNumberSettings.setDisabled(true);
+            this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(true);
         },
 
         _getApiTextSize: function () {
@@ -2974,6 +3034,23 @@ define([
             this._state.lang = langId;
         },
 
+        onInsDateTimeClick: function() {
+            //insert date time
+            var me = this;
+            (new DE.Views.DateTimeDialog({
+                api: this.api,
+                lang: this._state.lang,
+                handler: function(result, value) {
+                    if (result == 'ok') {
+                        if (me.api) {
+                            me.api.asc_addDateTime(value);
+                        }
+                    }
+                    Common.NotificationCenter.trigger('edit:complete', me.toolbar);
+                }
+            })).show();
+        },
+
         textEmptyImgUrl                            : 'You need to specify image URL.',
         textWarning                                : 'Warning',
         textFontSizeErr                            : 'The entered value is incorrect.<br>Please enter a numeric value between 1 and 100',

apps/documenteditor/main/app/template/ImageSettingsAdvanced.template

@@ -327,7 +327,25 @@
 </div>
 <div id="id-adv-image-margins" class="settings-panel">
     <div class="inner-content">
+        <table cols="1" style="width: 100%;">
+            <tr>
+                <td class="padding-small">
+                    <label class="header"><%= scope.textAutofit %></label>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-large">
+                    <div id="shape-checkbox-autofit"></div>
+                </td>
+            </tr>
+        </table>
+        <div class="separator horizontal padding-large"></div>
         <table cols="2" style="width: 100%;">
+            <tr>
+                <td colspan=2 class="padding-small">
+                    <label class="header"><%= scope.strMargins %></label>
+                </td>
+            </tr>
             <tr>
                 <td class="padding-small" width="125px">
                     <label class="input-label"><%= scope.textTop %></label>

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

@@ -83,7 +83,6 @@
                 <div class="group">
                     <span class="btn-slot text x-huge" id="slot-btn-blankpage"></span>
                     <span class="btn-slot text x-huge btn-pagebreak"></span>
-                    <span class="btn-slot text x-huge" id="slot-btn-editheader"></span>
                 </div>
                 <div class="separator long"></div>
                 <div class="group">
@@ -97,8 +96,13 @@
                 </div>
                 <div class="separator long"></div>
                 <div class="group">
-                    <span class="btn-slot text x-huge slot-inshyperlink"></span>
                     <span class="btn-slot text x-huge slot-comment"></span>
+                    <span class="btn-slot text x-huge slot-inshyperlink"></span>
+                </div>
+                <div class="separator long"></div>
+                <div class="group">
+                    <span class="btn-slot text x-huge" id="slot-btn-editheader"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-datetime"></span>
                 </div>
                 <div class="separator long"></div>
                 <div class="group">

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

@@ -157,7 +157,7 @@ define([
                     { displayValue: this.textAfter,   value: 0 }
                 ]
             });
-            this.cmbPosition.setValue(0);
+            this.cmbPosition.setValue(Common.Utils.InternalSettings.get("de-settings-label-position") || 0);
             this.cmbPosition.on('selected', function(combo, record) {
                 me.props.put_Before(!!record.value);
             });
@@ -257,6 +257,7 @@ define([
                 me.txtCaption.setValue(me.props.get_Name());
                 me.positionCaption = me.txtCaption.getValue().length;
             });
+            this.chExclude.setValue(!!Common.Utils.InternalSettings.get("de-settings-label-exclude"), true);
 
             this.cmbNumbering = new Common.UI.ComboBox({
                 el: $('#caption-combo-numbering'),
@@ -271,7 +272,9 @@ define([
                     { displayValue: 'I, II, III,...',   value: Asc.c_oAscNumberingFormat.UpperRoman, maskExp: /[IVXLCDM]/, defValue: 'I' }
                 ]
             });
-            this.cmbNumbering.setValue(Asc.c_oAscNumberingFormat.Decimal);
+            var numbering = Common.Utils.InternalSettings.get("de-settings-label-numbering");
+            (numbering===undefined || numbering===null) && (numbering = Asc.c_oAscNumberingFormat.Decimal);
+            this.cmbNumbering.setValue(numbering);
             this.cmbNumbering.on('selected', function(combo, record) {
                 me.props.put_Format(record.value);
                 me.props.updateName();
@@ -290,6 +293,7 @@ define([
                 me.cmbChapter.setDisabled(newValue!=='checked');
                 me.cmbSeparator.setDisabled(newValue!=='checked');
             });
+            this.chChapter.setValue(!!Common.Utils.InternalSettings.get("de-settings-label-chapter-include"), true);
 
             var _main = DE.getController('Main');
             this._arrLevel = [];
@@ -304,7 +308,7 @@ define([
                 disabled: true,
                 data: this._arrLevel
             });
-            this.cmbChapter.setValue(0);
+            this.cmbChapter.setValue(Common.Utils.InternalSettings.get("de-settings-label-chapter") || 0);
             this.cmbChapter.on('selected', function(combo, record) {
                 me.props.put_HeadingLvl(record.value);
                 me.props.updateName();
@@ -325,7 +329,7 @@ define([
                     { displayValue: '–    (' + this.textDash + ')',       value: '–' }
                 ]
             });
-            this.cmbSeparator.setValue('-');
+            this.cmbSeparator.setValue(Common.Utils.InternalSettings.get("de-settings-label-separator") || '-');
             this.cmbSeparator.on('selected', function(combo, record) {
                 me.props.put_Separator(record.value);
                 me.props.updateName();
@@ -370,6 +374,8 @@ define([
             this.txtCaption.setValue(this.props.get_Name());
             this.currentLabel = valueLabel;
             this.positionCaption = this.txtCaption.getValue().length;
+            this.cmbChapter.setDisabled(this.chChapter.getValue()!=='checked');
+            this.cmbSeparator.setDisabled(this.chChapter.getValue()!=='checked');
         },
 
         getSettings: function () {
@@ -390,6 +396,12 @@ define([
             this.handler && this.handler.call(this, state,  (state == 'ok') ? this.getSettings() : undefined);
             if (state == 'ok') {
                 Common.Utils.InternalSettings.set("de-settings-current-label", this.cmbLabel.getValue());
+                Common.Utils.InternalSettings.set("de-settings-label-position", this.cmbPosition.getValue());
+                Common.Utils.InternalSettings.set("de-settings-label-exclude", this.chExclude.getValue()=='checked');
+                Common.Utils.InternalSettings.set("de-settings-label-numbering", this.cmbNumbering.getValue());
+                Common.Utils.InternalSettings.set("de-settings-label-chapter-include", this.chChapter.getValue()=='checked');
+                Common.Utils.InternalSettings.set("de-settings-label-chapter", this.cmbChapter.getValue());
+                Common.Utils.InternalSettings.set("de-settings-label-separator", this.cmbSeparator.getValue());
             }
             this.close();
         },

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

@@ -0,0 +1,247 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+/**
+ *  DateTimeDialog.js
+ *
+ *  Created by Julia Radzhabova on 26.06.2019
+ *  Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'common/main/lib/component/Window',
+    'common/main/lib/component/ComboBox',
+    'common/main/lib/component/ListView'
+], function () {
+    'use strict';
+
+    DE.Views.DateTimeDialog = Common.UI.Window.extend(_.extend({
+        options: {
+            width: 350,
+            style: 'min-width: 230px;',
+            cls: 'modal-dlg',
+            buttons: ['ok', 'cancel']
+        },
+
+        initialize : function (options) {
+            var t = this,
+                _options = {};
+
+            _.extend(this.options, {
+                title: this.txtTitle
+            }, options || {});
+
+            this.template = [
+                '<div class="box" style="height: 275px;">',
+                    '<div class="input-row">',
+                        '<label style="font-weight: bold;">' + this.textLang + '</label>',
+                    '</div>',
+                    '<div id="datetime-dlg-lang" class="input-row" style="margin-bottom: 8px;"></div>',
+                    '<div class="input-row">',
+                        '<label style="font-weight: bold;">' + this.textFormat + '</label>',
+                    '</div>',
+                    '<div id="datetime-dlg-format" class="" style="margin-bottom: 10px;width: 100%; height: 165px; overflow: hidden;"></div>',
+                    '<div class="input-row">',
+                        '<div id="datetime-dlg-update" style="margin-top: 3px;"></div>',
+                        '<button type="button" class="btn btn-text-default auto" id="datetime-dlg-default" style="float: right;">' + this.textDefault + '</button>',
+                    '</div>',
+                '</div>'
+            ].join('');
+
+            this.options.tpl = _.template(this.template)(this.options);
+            this.api = this.options.api;
+            this.lang = this.options.lang;
+            this.handler =   this.options.handler;
+
+            Common.UI.Window.prototype.initialize.call(this, this.options);
+        },
+        render: function () {
+            Common.UI.Window.prototype.render.call(this);
+
+            var data = [{ value: 0x042C }, { value: 0x0402 }, { value: 0x0405 }, { value: 0x0407 },  {value: 0x0807}, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A }, { value: 0x080A },
+                { value: 0x040B }, { value: 0x040C }, { value: 0x0410 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
+                { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }];
+            data.forEach(function(item) {
+                var langinfo = Common.util.LanguageInfo.getLocalLanguageName(item.value);
+                item.displayValue = langinfo[1];
+                item.langName = langinfo[0];
+            });
+
+            this.cmbLang = new Common.UI.ComboBox({
+                el          : $('#datetime-dlg-lang'),
+                menuStyle   : 'min-width: 100%; max-height: 185px;',
+                cls         : 'input-group-nr',
+                editable    : false,
+                data        : data
+            });
+            this.cmbLang.setValue(0x0409);
+            this.cmbLang.on('selected', _.bind(function(combo, record) {
+                this.updateFormats(record.value);
+            }, this));
+
+            this.chUpdate = new Common.UI.CheckBox({
+                el: $('#datetime-dlg-update'),
+                labelText: this.textUpdate
+            });
+            this.chUpdate.on('change', _.bind(function(field, newValue, oldValue, eOpts){
+                this.onSelectFormat(this.listFormats, null, this.listFormats.getSelectedRec());
+            }, this));
+
+            this.listFormats = new Common.UI.ListView({
+                el: $('#datetime-dlg-format'),
+                store: new Common.UI.DataViewStore(),
+                scrollAlwaysVisible: true
+            });
+
+            this.listFormats.on('item:select', _.bind(this.onSelectFormat, this));
+            this.listFormats.on('item:dblclick', _.bind(this.onDblClickFormat, this));
+            this.listFormats.on('entervalue', _.bind(this.onPrimary, this));
+            this.listFormats.$el.find('.listview').focus();
+
+            this.btnDefault = new Common.UI.Button({
+                el: $('#datetime-dlg-default')
+            });
+            this.btnDefault.on('click', _.bind(function(btn, e) {
+                var rec = this.listFormats.getSelectedRec();
+                Common.UI.warning({
+                    msg: Common.Utils.String.format(this.confirmDefault, Common.util.LanguageInfo.getLocalLanguageName(this.cmbLang.getValue())[1], rec ? rec.get('value') : ''),
+                    buttons: ['yes', 'no'],
+                    primary: 'yes',
+                    callback: _.bind(function(btn) {
+                        if (btn == 'yes') {
+                            this.defaultFormats[this.cmbLang.getValue()] = rec ? rec.get('format') : '';
+                            // this.api.asc_setDefaultDateTimeFormat(this.defaultFormats);
+                            var arr = [];
+                            for (var name in this.defaultFormats) {
+                                if (name) {
+                                    arr.push({lang: name, format: this.defaultFormats[name]});
+                                }
+                            }
+                            var value = JSON.stringify(arr);
+                            Common.localStorage.setItem("de-settings-datetime-default", value);
+                            Common.Utils.InternalSettings.set("de-settings-datetime-default", value);
+                        }
+                    }, this)
+                });
+            }, this));
+
+            this.$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+            this.afterRender();
+        },
+
+        afterRender: function() {
+            var me = this,
+                value =  Common.Utils.InternalSettings.get("de-settings-datetime-default"),
+                arr = value ? JSON.parse(value) : [];
+            this.defaultFormats = [];
+            arr.forEach(function(item){
+                if (item.lang)
+                    me.defaultFormats[parseInt(item.lang)] = item.format;
+            });
+
+            this._setDefaults();
+        },
+
+        _setDefaults: function () {
+            this.props = new Asc.CAscDateTime();
+            if (this.lang) {
+                var item = this.cmbLang.store.findWhere({value: this.lang});
+                item = item ? item.get('value') : 0x0409;
+                this.cmbLang.setValue(item)
+            }
+            this.updateFormats(this.cmbLang.getValue());
+        },
+
+        getSettings: function () {
+            return this.props;
+        },
+
+        updateFormats: function(lang) {
+            this.props.put_Lang(lang);
+            var formats = this.props.get_FormatsExamples(),
+                arr = [];
+            var store = this.listFormats.store;
+            for (var i = 0, len = formats.length; i < len; i++)
+            {
+                var rec = new Common.UI.DataViewModel();
+                rec.set({
+                    format: formats[i],
+                    value: this.props.get_String(formats[i], undefined, lang)
+                });
+                arr.push(rec);
+            }
+            store.reset(arr);
+            var format = this.defaultFormats[lang];
+            format ? this.listFormats.selectRecord(store.findWhere({format: format})) : this.listFormats.selectByIndex(0);
+            var rec = this.listFormats.getSelectedRec();
+            this.listFormats.scrollToRecord(rec);
+            this.onSelectFormat(this.listFormats, null, rec);
+        },
+
+        onSelectFormat: function(lisvView, itemView, record) {
+            if (!record) return;
+            this.props.put_Format(record.get('format'));
+            this.props.put_Update(this.chUpdate.getValue()=='checked');
+        },
+
+        onBtnClick: function(event) {
+            this._handleInput(event.currentTarget.attributes['result'].value);
+        },
+
+        onDblClickFormat: function () {
+            this._handleInput('ok');
+        },
+
+        onPrimary: function(event) {
+            this._handleInput('ok');
+            return false;
+        },
+
+        _handleInput: function(state) {
+            if (this.options.handler) {
+                this.options.handler.call(this, state, this.getSettings());
+            }
+
+            this.close();
+        },
+
+        //
+        txtTitle: 'Date & Time',
+        textLang: 'Language',
+        textFormat: 'Formats',
+        textUpdate: 'Update automatically',
+        textDefault: 'Set as default',
+        confirmDefault: 'Set default format for {0}: "{1}"'
+
+    }, DE.Views.DateTimeDialog || {}));
+});

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

@@ -85,7 +85,7 @@ define([
             me._currentMathObj = undefined;
             me._currentParaObjDisabled = false;
             me._isDisabled = false;
-
+            me._state = {};
             var showPopupMenu = function(menu, value, event, docElement, eOpts){
                 if (!_.isUndefined(menu)  && menu !== null){
                     Common.UI.Menu.Manager.hideAll();
@@ -433,7 +433,7 @@ define([
             });
 
             var onHyperlinkClick = function(url) {
-                if (url && me.api.asc_getUrlType(url)>0) {
+                if (url /*&& me.api.asc_getUrlType(url)>0*/) {
                     window.open(url);
                 }
             };
@@ -1525,6 +1525,8 @@ define([
                         this.api.asc_registerCallback('asc_onSpellCheckVariantsFound',  _.bind(onSpellCheckVariantsFound, this));
                         this.api.asc_registerCallback('asc_onRulerDblClick',            _.bind(this.onRulerDblClick, this));
                         this.api.asc_registerCallback('asc_ChangeCropState',            _.bind(this.onChangeCropState, this));
+                        this.api.asc_registerCallback('asc_onLockDocumentProps',        _.bind(this.onApiLockDocumentProps, this));
+                        this.api.asc_registerCallback('asc_onUnLockDocumentProps',      _.bind(this.onApiUnLockDocumentProps, this));
                     }
                     this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',        _.bind(onCoAuthoringDisconnect, this));
                     Common.NotificationCenter.on('api:disconnect',                      _.bind(onCoAuthoringDisconnect, this));
@@ -1723,6 +1725,8 @@ define([
         },
 
         onRulerDblClick: function(type) {
+            Common.UI.Menu.Manager.hideAll();
+
             var win, me = this;
             if (type == 'tables') {
                 win = this.advancedTableClick();
@@ -1733,6 +1737,7 @@ define([
                 if (win)
                     win.setActiveCategory(type == 'indents' ? 0 : 3);
             } else if (type == 'margins') {
+                if (me._state.lock_doc) return;
                 win = new DE.Views.PageMarginsDialog({
                     api: me.api,
                     handler: function(dlg, result) {
@@ -2009,9 +2014,18 @@ define([
                         signGuid = (value.imgProps && value.imgProps.value && me.mode.isSignatureSupport) ? value.imgProps.value.asc_getSignatureId() : undefined,
                         signProps = (signGuid) ? me.api.asc_getSignatureSetup(signGuid) : null,
                         isInSign = !!signProps && me._canProtect,
-                        canComment = !isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled;
+                        control_lock = (value.paraProps) ? (!value.paraProps.value.can_DeleteBlockContentControl() || !value.paraProps.value.can_EditBlockContentControl() ||
+                                                            !value.paraProps.value.can_DeleteInlineContentControl() || !value.paraProps.value.can_EditInlineContentControl()) : false,
+                        canComment = !isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled && !control_lock;
+
                     if (me.mode.compatibleFeatures)
                         canComment = canComment && !isInShape;
+                    if (me.api.asc_IsContentControl()) {
+                        var control_props = me.api.asc_GetContentControlProperties(),
+                            spectype = control_props ? control_props.get_SpecificType() : Asc.c_oAscContentControlSpecificType.None;
+                        canComment = canComment && !(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);
+                    }
 
                     menuViewUndo.setVisible(me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled);
                     menuViewUndo.setDisabled(!me.api.asc_getCanUndo() && !me._isDisabled);
@@ -2549,7 +2563,11 @@ define([
 
                     me.menuOriginalSize.setVisible(value.imgProps.isOnlyImg || !value.imgProps.isChart && !value.imgProps.isShape);
 
-                    var islocked = value.imgProps.locked || (value.headerProps!==undefined && value.headerProps.locked);
+                    var control_props = me.api.asc_IsContentControl() ? me.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;
+
+                    var islocked = value.imgProps.locked || (value.headerProps!==undefined && value.headerProps.locked) || content_locked;
                     var pluginGuid = value.imgProps.value.asc_getPluginGuid();
                     menuImgReplace.setVisible(value.imgProps.isOnlyImg && (pluginGuid===null || pluginGuid===undefined));
                     if (menuImgReplace.isVisible())
@@ -2577,7 +2595,7 @@ define([
                         menuImageAlign.menu.items[7].setDisabled(objcount==2 && (!alignto || alignto==3));
                         menuImageAlign.menu.items[8].setDisabled(objcount==2 && (!alignto || alignto==3));
                     }
-                    menuImageArrange.setDisabled( wrapping == Asc.c_oAscWrapStyle2.Inline );
+                    menuImageArrange.setDisabled( wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked);
 
                     if (me.api) {
                         mnuUnGroup.setDisabled(islocked || !me.api.CanUnGroup());
@@ -2585,7 +2603,8 @@ define([
                         menuWrapPolygon.setDisabled(islocked || !me.api.CanChangeWrapPolygon());
                     }
 
-                    me.menuImageWrap.setDisabled(islocked || value.imgProps.value.get_FromGroup() || (notflow && menuWrapPolygon.isDisabled()));
+                    me.menuImageWrap.setDisabled(islocked || value.imgProps.value.get_FromGroup() || (notflow && menuWrapPolygon.isDisabled()) ||
+                                                (!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture));
 
                     var cancopy = me.api && me.api.can_CopyCut();
                     menuImgCopy.setDisabled(!cancopy);
@@ -3077,11 +3096,6 @@ define([
                         menuAddHyperlinkTable.hyperProps.value = new Asc.CHyperlinkProperty();
                         menuAddHyperlinkTable.hyperProps.value.put_Text(text);
                     }
-                    /** coauthoring begin **/
-                        // comments
-                    menuAddCommentTable.setVisible(me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments);
-                    menuAddCommentTable.setDisabled(value.paraProps!==undefined && value.paraProps.locked===true);
-                    /** coauthoring end **/
 
                     // review move
                     var data = me.api.asc_GetRevisionsChangesStack(),
@@ -3132,6 +3146,8 @@ define([
                         me.clearEquationMenu(false, 7);
                     menuEquationSeparatorInTable.setVisible(isEquation && eqlen>0);
 
+                    var control_lock = (value.paraProps) ? (!value.paraProps.value.can_DeleteBlockContentControl() || !value.paraProps.value.can_EditBlockContentControl() ||
+                                                            !value.paraProps.value.can_DeleteInlineContentControl() || !value.paraProps.value.can_EditInlineContentControl()) : false;
                     var in_toc = me.api.asc_GetTableOfContentsPr(true),
                         in_control = !in_toc && me.api.asc_IsContentControl();
                     menuTableControl.setVisible(in_control);
@@ -3140,9 +3156,19 @@ define([
                             lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked;
                         menuTableRemoveControl.setDisabled(lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked);
                         menuTableControlSettings.setVisible(me.mode.canEditContentControl);
+
+                        var spectype = control_props ? control_props.get_SpecificType() : Asc.c_oAscContentControlSpecificType.None;
+                        control_lock = control_lock || 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;
                     }
                     menuTableTOC.setVisible(in_toc);
 
+                    /** coauthoring begin **/
+                        // comments
+                    menuAddCommentTable.setVisible(me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments && !control_lock);
+                    menuAddCommentTable.setDisabled(value.paraProps!==undefined && value.paraProps.locked===true);
+                    /** coauthoring end **/
+
                     var in_field = me.api.asc_GetCurrentComplexField();
                     menuTableRefreshField.setVisible(!!in_field);
                     menuTableRefreshField.setDisabled(disabled);
@@ -3654,15 +3680,6 @@ define([
                     if (me.api) {
                         text = me.api.can_AddHyperlink();
                     }
-                    /** coauthoring begin **/
-                    var isVisible = !isInChart && me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments;
-                    if (me.mode.compatibleFeatures)
-                        isVisible = isVisible && !isInShape;
-                    menuCommentSeparatorPara.setVisible(isVisible);
-                    menuAddCommentPara.setVisible(isVisible);
-                    menuAddCommentPara.setDisabled(value.paraProps && value.paraProps.locked === true);
-                    /** coauthoring end **/
-
                     menuAddHyperlinkPara.setVisible(value.hyperProps===undefined && text!==false);
                     menuHyperlinkPara.setVisible(value.hyperProps!==undefined);
                     menuHyperlinkParaSeparator.setVisible(menuAddHyperlinkPara.isVisible() || menuHyperlinkPara.isVisible());
@@ -3747,6 +3764,9 @@ define([
                         me.menuStyleUpdate.setCaption(me.updateStyleText.replace('%1', DE.getController('Main').translationTable[window.currentStyleName] || window.currentStyleName));
                     }
 
+                    var control_lock = (value.paraProps) ? (!value.paraProps.value.can_DeleteBlockContentControl() || !value.paraProps.value.can_EditBlockContentControl() ||
+                                                            !value.paraProps.value.can_DeleteInlineContentControl() || !value.paraProps.value.can_EditInlineContentControl()) : false;
+
                     var in_toc = me.api.asc_GetTableOfContentsPr(true),
                         in_control = !in_toc && me.api.asc_IsContentControl() ;
                     menuParaRemoveControl.setVisible(in_control);
@@ -3756,11 +3776,24 @@ define([
                         var control_props = me.api.asc_GetContentControlProperties(),
                             lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked;
                         menuParaRemoveControl.setDisabled(lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked);
+
+                        var spectype = control_props ? control_props.get_SpecificType() : Asc.c_oAscContentControlSpecificType.None;
+                        control_lock = control_lock || 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;
                     }
                     menuParaTOCSettings.setVisible(in_toc);
                     menuParaTOCRefresh.setVisible(in_toc);
                     menuParaTOCSeparator.setVisible(in_toc);
 
+                    /** coauthoring begin **/
+                    var isVisible = !isInChart && me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments && !control_lock;
+                    if (me.mode.compatibleFeatures)
+                        isVisible = isVisible && !isInShape;
+                    menuCommentSeparatorPara.setVisible(isVisible);
+                    menuAddCommentPara.setVisible(isVisible);
+                    menuAddCommentPara.setDisabled(value.paraProps && value.paraProps.locked === true);
+                    /** coauthoring end **/
+
                     var in_field = me.api.asc_GetCurrentComplexField();
                     menuParaRefreshField.setVisible(!!in_field);
                     menuParaRefreshField.setDisabled(disabled);
@@ -4025,6 +4058,13 @@ define([
                         me.api.asc_UncheckContentControlButtons();
                     }
                 });
+                $(document).on('mousedown', function(e) {
+                    if (e.target.localName !== 'canvas' && controlsContainer.is(':visible') && controlsContainer.find(e.target).length==0) {
+                        controlsContainer.hide();
+                        me.api.asc_UncheckContentControlButtons();
+                    }
+                });
+
             }
             this.cmpCalendar.setDate(new Date(specProps ? specProps.get_FullDate() : undefined));
 
@@ -4065,6 +4105,7 @@ define([
 
             if (!menu) {
                 this.listControlMenu = menu = new Common.UI.Menu({
+                    maxHeight: 207,
                     menuAlign: 'tr-bl',
                     items: []
                 });
@@ -4122,6 +4163,11 @@ define([
                     this.onShowDateActions(obj, x, y);
                     break;
                 case Asc.c_oAscContentControlSpecificType.Picture:
+                    if (obj.pr && obj.pr.get_Lock) {
+                        var lock = obj.pr.get_Lock();
+                        if (lock == Asc.c_oAscSdtLockType.SdtContentLocked || lock==Asc.c_oAscSdtLockType.ContentLocked)
+                            return;
+                    }
                     this.api.asc_addImage(obj);
                     break;
                 case Asc.c_oAscContentControlSpecificType.DropDownList:
@@ -4131,6 +4177,14 @@ define([
             }
         },
 
+        onApiLockDocumentProps: function() {
+            this._state.lock_doc = true;
+        },
+
+        onApiUnLockDocumentProps: function() {
+            this._state.lock_doc = false;
+        },
+
         focus: function() {
             var me = this;
             _.defer(function(){  me.cmpEl.focus(); }, 50);

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

@@ -572,7 +572,7 @@ define([
             .on('changed:after', _.bind(function(combo, record) {
                 if (me._changedProps) {
                     me._changedProps.put_XAlign(undefined);
-                    me._changedProps.put_X(Common.Utils.Metric.fnRecalcToMM(parseFloat(record.value)));
+                    me._changedProps.put_X(Common.Utils.Metric.fnRecalcToMM(Common.Utils.String.parseFloat(record.value)));
                 }
             }, me))
             .on('selected', _.bind(function(combo, record) {
@@ -615,7 +615,7 @@ define([
             .on('changed:after', _.bind(function(combo, record) {
                 if (me._changedProps) {
                     me._changedProps.put_YAlign(undefined);
-                    me._changedProps.put_Y(Common.Utils.Metric.fnRecalcToMM(parseFloat(record.value)));
+                    me._changedProps.put_Y(Common.Utils.Metric.fnRecalcToMM(Common.Utils.String.parseFloat(record.value)));
                 }
             }, me))
             .on('selected', _.bind(function(combo, record) {

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

@@ -296,7 +296,7 @@ define([
             this.miNew[this.mode.canCreateNew?'show':'hide']();
             this.miNew.$el.find('+.devider')[this.mode.canCreateNew?'show':'hide']();
 
-            this.miAccess[(!this.mode.isOffline && !this.mode.isReviewOnly && this.document&&this.document.info &&
+            this.miAccess[(!this.mode.isOffline && this.document&&this.document.info &&
                           (this.document.info.sharingSettings&&this.document.info.sharingSettings.length>0 ||
                           (this.mode.sharingSettingsUrl&&this.mode.sharingSettingsUrl.length || this.mode.canRequestSharingSettings)))?'show':'hide']();
 
@@ -305,6 +305,10 @@ define([
 
             this.mode.canBack ? this.$el.find('#fm-btn-back').show().prev().show() :
                                     this.$el.find('#fm-btn-back').hide().prev().hide();
+            if (!this.customizationDone) {
+                this.customizationDone = true;
+                Common.Utils.applyCustomization(this.mode.customization, {goback: '#fm-btn-back > a'});
+            }
 
             this.panels['opts'].setMode(this.mode);
             this.panels['info'].setMode(this.mode);

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

@@ -355,17 +355,26 @@ define([
             this.lblCoAuthMode = $markup.findById('#fms-lbl-coauth-mode');
             /** coauthoring end **/
 
+            var itemsTemplate =
+                _.template([
+                    '<% _.each(items, function(item) { %>',
+                    '<li id="<%= item.id %>" data-value="<%= item.value %>" <% if (item.value === "custom") { %> style="border-top: 1px solid #e5e5e5;margin-top: 5px;" <% } %> ><a tabindex="-1" type="menuitem" <% if (typeof(item.checked) !== "undefined" && item.checked) { %> class="checked" <% } %> ><%= scope.getDisplayValue(item) %></a></li>',
+                    '<% }); %>'
+                ].join(''));
             this.cmbFontRender = new Common.UI.ComboBox({
                 el          : $markup.find('#fms-cmb-font-render'),
                 style       : 'width: 160px;',
                 editable    : false,
                 cls         : 'input-group-nr',
+                itemsTemplate: itemsTemplate,
                 data        : [
                     { value: 0, displayValue: this.txtWin },
                     { value: 1, displayValue: this.txtMac },
-                    { value: 2, displayValue: this.txtNative }
+                    { value: 2, displayValue: this.txtNative },
+                    { value: 'custom', displayValue: this.txtCacheMode }
                 ]
             });
+            this.cmbFontRender.on('selected', _.bind(this.onFontRenderSelected, this));
 
             this.cmbUnit = new Common.UI.ComboBox({
                 el          : $markup.findById('#fms-cmb-unit'),
@@ -444,7 +453,13 @@ define([
 
             value = Common.Utils.InternalSettings.get("de-settings-fontrender");
             item = this.cmbFontRender.store.findWhere({value: parseInt(value)});
-            this.cmbFontRender.setValue(item ? item.get('value') : (window.devicePixelRatio > 1 ? 1 : 0));
+            this.cmbFontRender.setValue(item ? item.get('value') : 0);
+            this._fontRender = this.cmbFontRender.getValue();
+
+            value = Common.Utils.InternalSettings.get("de-settings-cachemode");
+            item = this.cmbFontRender.store.findWhere({value: 'custom'});
+            item && value && item.set('checked', !!value);
+            item && value && this.cmbFontRender.cmpEl.find('#' + item.get('id') + ' a').addClass('checked');
 
             value = Common.Utils.InternalSettings.get("de-settings-unit");
             item = this.cmbUnit.store.findWhere({value: value});
@@ -476,6 +491,8 @@ define([
             }
             /** coauthoring end **/
             Common.localStorage.setItem("de-settings-fontrender", this.cmbFontRender.getValue());
+            var item = this.cmbFontRender.store.findWhere({value: 'custom'});
+            Common.localStorage.setItem("de-settings-cachemode", item && !item.get('checked') ? 0 : 1);
             Common.localStorage.setItem("de-settings-unit", this.cmbUnit.getValue());
             Common.localStorage.setItem("de-settings-autosave", this.chAutosave.isChecked() ? 1 : 0);
             if (this.mode.canForcesave)
@@ -508,6 +525,16 @@ define([
             this.cmbShowChanges.setValue((record.value == 1) ? 'none' : 'last');
         },
 
+        onFontRenderSelected: function(combo, record) {
+            if (record.value == 'custom') {
+                var item = combo.store.findWhere({value: 'custom'});
+                item && item.set('checked', !record.checked);
+                combo.cmpEl.find('#' + record.id + ' a').toggleClass('checked', !record.checked);
+                combo.setValue(this._fontRender);
+            }
+            this._fontRender = combo.getValue();
+        },
+
         strLiveComment: 'Turn on option',
         strInputMode:   'Turn on hieroglyphs',
         strZoom: 'Default Zoom Value',
@@ -547,7 +574,8 @@ define([
         strForcesave: 'Always save to server (otherwise save to server on document close)',
         strResolvedComment: 'Turn on display of the resolved comments',
         textCompatible: 'Compatibility',
-        textOldVersions: 'Make the files compatible with older MS Word versions when saved as DOCX'
+        textOldVersions: 'Make the files compatible with older MS Word versions when saved as DOCX',
+        txtCacheMode: 'Default cache mode'
     }, DE.Views.FileMenuPanels.Settings || {}));
 
     DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
@@ -1293,6 +1321,7 @@ define([
 
             this.menu = options.menu;
             this.urlPref = 'resources/help/en/';
+            this.openUrl = null;
 
             this.en_data = [
                 {"src": "ProgramInterface/ProgramInterface.htm", "name": "Introducing Document Editor user interface", "headername": "Program Interface"},
@@ -1419,8 +1448,9 @@ define([
                         }
                     },
                     success: function () {
-                        var rec = store.at(0);
+                        var rec = (me.openUrl) ? store.findWhere({ src: me.openUrl }) || store.at(0) : store.at(0);
                         me.viewHelpPicker.selectRecord(rec);
+                        me.viewHelpPicker.scrollToRecord(rec);
                         me.iFrame.src = me.urlPref + rec.get('src');
                     }
                 };
@@ -1443,7 +1473,8 @@ define([
                 if (rec) {
                     this.viewHelpPicker.selectRecord(rec);
                     this.viewHelpPicker.scrollToRecord(rec);
-                }
+                } else
+                    this.openUrl = url;
             }
         }
     });

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

@@ -67,19 +67,22 @@ define([
             }, options || {});
 
             this.template = [
-                '<div class="box" style="height: 260px;">',
+                '<div class="box" style="height: 319px;">',
                     '<div class="input-row" style="margin-bottom: 10px;">',
                         '<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-external" style="border-top-right-radius: 0;border-bottom-right-radius: 0;">', this.textExternal,'</button>',
                         '<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-internal" style="border-top-left-radius: 0;border-bottom-left-radius: 0;">', this.textInternal,'</button>',
                     '</div>',
                     '<div id="id-external-link">',
                         '<div class="input-row">',
-                            '<label>' + this.textUrl + ' *</label>',
+                            '<label>' + this.textUrl + '</label>',
                         '</div>',
                         '<div id="id-dlg-hyperlink-url" class="input-row" style="margin-bottom: 5px;"></div>',
                     '</div>',
                     '<div id="id-internal-link">',
-                        '<div id="id-dlg-hyperlink-list" style="width:100%; height: 130px;border: 1px solid #cfcfcf;"></div>',
+                        '<div class="input-row">',
+                            '<label>' + this.textUrl + '</label>',
+                        '</div>',
+                        '<div id="id-dlg-hyperlink-list" style="width:100%; height: 171px;border: 1px solid #cfcfcf;"></div>',
                     '</div>',
                     '<div class="input-row">',
                         '<label>' + this.textDisplay + '</label>',
@@ -134,6 +137,16 @@ define([
                     return (urltype>0) ? true : me.txtNotUrl;
                 }
             });
+            me.inputUrl._input.on('input', function (e) {
+                me.isInputFirstChange && me.inputUrl.showError();
+                me.isInputFirstChange = false;
+                var val = $(e.target).val();
+                if (me.isAutoUpdate) {
+                    me.inputDisplay.setValue(val);
+                    me.isTextChanged = true;
+                }
+                me.btnOk.setDisabled($.trim(val)=='');
+            });
 
             me.inputDisplay = new Common.UI.InputField({
                 el          : $('#id-dlg-hyperlink-display'),
@@ -143,6 +156,9 @@ define([
             }).on('changed:after', function() {
                 me.isTextChanged = true;
             });
+            me.inputDisplay._input.on('input', function (e) {
+                me.isAutoUpdate = ($(e.target).val()=='');
+            });
 
             me.inputTip = new Common.UI.InputField({
                 el          : $('#id-dlg-hyperlink-tip'),
@@ -194,6 +210,7 @@ define([
                         hasParent: false,
                         isEmptyItem: false,
                         isNotHeader: false,
+                        type: Asc.c_oAscHyperlinkAnchor.Heading,
                         hasSubItems: false
                     }));
 
@@ -226,6 +243,7 @@ define([
                         hasParent: false,
                         isEmptyItem: false,
                         isNotHeader: false,
+                        type: Asc.c_oAscHyperlinkAnchor.Bookmark,
                         hasSubItems: false
                     }));
 
@@ -247,20 +265,33 @@ define([
                         }
                     }
                     store.reset(arr);
+                    this.internalList.collapseAll();
                 }
                 var rec = this.internalList.getSelectedRec();
                 this.btnOk.setDisabled(!rec || rec.get('level')==0 && rec.get('index')>0);
-
             } else
-                this.btnOk.setDisabled(false);
+                this.btnOk.setDisabled($.trim(this.inputUrl.getValue())=='');
         },
 
         onLinkTypeClick: function(type, btn, event) {
             this.ShowHideElem(type);
+            if (this.isAutoUpdate) {
+                if (type==c_oHyperlinkType.InternalLink) {
+                    var rec = this.internalList.getSelectedRec();
+                    this.inputDisplay.setValue(rec && (rec.get('level') || rec.get('index')==0)? rec.get('name') : '');
+                } else {
+                    this.inputDisplay.setValue(this.inputUrl.getValue());
+                }
+                this.isTextChanged = true;
+            }
         },
 
         onSelectItem: function(picker, item, record, e){
             this.btnOk.setDisabled(record.get('level')==0 && record.get('index')>0);
+            if (this.isAutoUpdate) {
+                this.inputDisplay.setValue((record.get('level') || record.get('index')==0) ? record.get('name') : '');
+                this.isTextChanged = true;
+            }
         },
 
         show: function() {
@@ -277,7 +308,7 @@ define([
                 var me = this;
 
                 var bookmark = props.get_Bookmark(),
-                    type = (bookmark === null || bookmark=='') ? c_oHyperlinkType.WebLink : c_oHyperlinkType.InternalLink;
+                    type = (bookmark === null || bookmark=='') ? ((props.get_Value() || !Common.Utils.InternalSettings.get("de-settings-link-type")) ? c_oHyperlinkType.WebLink : c_oHyperlinkType.InternalLink) : c_oHyperlinkType.InternalLink;
 
                 (type == c_oHyperlinkType.WebLink) ? me.btnExternal.toggle(true) : me.btnInternal.toggle(true);
                 me.ShowHideElem(type);
@@ -288,24 +319,31 @@ define([
                     } else {
                         me.inputUrl.setValue('');
                     }
+                    this.btnOk.setDisabled($.trim(this.inputUrl.getValue())=='');
                 } else {
                     if (props.is_TopOfDocument())
                         this.internalList.selectByIndex(0);
                     else if (props.is_Heading()) {
-                        var heading = props.get_Heading(),
+                        var rec = this.internalList.store.findWhere({type: Asc.c_oAscHyperlinkAnchor.Heading, headingParagraph: props.get_Heading() });
-                            rec = this.internalList.store.findWhere({type: Asc.c_oAscHyperlinkAnchor.Heading, headingParagraph: heading });
+                        if (rec) {
-                        if (rec)
+                            this.internalList.expandRecord(this.internalList.store.at(1));
                             this.internalList.scrollToRecord(this.internalList.selectRecord(rec));
+                        }
                     } else {
                         var rec = this.internalList.store.findWhere({type: Asc.c_oAscHyperlinkAnchor.Bookmark, name: bookmark});
-                        if (rec)
+                        if (rec) {
+                            this.internalList.expandRecord(this.internalList.store.findWhere({type: Asc.c_oAscHyperlinkAnchor.Bookmark, level: 0}));
                             this.internalList.scrollToRecord(this.internalList.selectRecord(rec));
+                        }
                     }
+                    var rec = this.internalList.getSelectedRec();
+                    this.btnOk.setDisabled(!rec || rec.get('level')==0 && rec.get('index')>0);
                 }
 
                 if (props.get_Text() !== null) {
                     me.inputDisplay.setValue(props.get_Text());
                     me.inputDisplay.setDisabled(false);
+                    me.isAutoUpdate = (me.inputDisplay.getValue()=='' || type == c_oHyperlinkType.WebLink && me.inputUrl.getValue()==me.inputDisplay.getValue());
                 } else {
                     me.inputDisplay.setValue(this.textDefault);
                     me.inputDisplay.setDisabled(true);
@@ -321,9 +359,10 @@ define([
         getSettings: function () {
             var me      = this,
                 props   = new Asc.CHyperlinkProperty(),
-                display = '';
+                display = '',
+                type = this.btnExternal.isActive() ? c_oHyperlinkType.WebLink : c_oHyperlinkType.InternalLink;
 
-            if (this.btnExternal.isActive()) {//WebLink
+            if (type==c_oHyperlinkType.WebLink) {//WebLink
                 var url     = $.trim(me.inputUrl.getValue());
 
                 if (! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) )
@@ -346,8 +385,8 @@ define([
                 }
             }
 
-            if (!me.inputDisplay.isDisabled() && ( this.isTextChanged || _.isEmpty(me.inputDisplay.getValue()))) {
+            if (!me.inputDisplay.isDisabled() && ( me.isTextChanged || _.isEmpty(me.inputDisplay.getValue()))) {
-                if (_.isEmpty(me.inputDisplay.getValue()))
+                if (_.isEmpty(me.inputDisplay.getValue()) || type==c_oHyperlinkType.WebLink && me.isAutoUpdate)
                     me.inputDisplay.setValue(display);
                 props.put_Text(me.inputDisplay.getValue());
             } else {
@@ -374,6 +413,7 @@ define([
                 if (state == 'ok') {
                     if (this.btnExternal.isActive()) {//WebLink
                         if (this.inputUrl.checkValidate() !== true)  {
+                            this.isInputFirstChange = true;
                             this.inputUrl.cmpEl.find('input').focus();
                             return;
                         }
@@ -386,6 +426,7 @@ define([
                         this.inputDisplay.cmpEl.find('input').focus();
                         return;
                     }
+                    (!this._originalProps.get_Bookmark() && !this._originalProps.get_Value()) &&  Common.Utils.InternalSettings.set("de-settings-link-type", this.btnInternal.isActive()); // save last added hyperlink
                 }
 
                 this.options.handler.call(this, this, state);

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

@@ -74,7 +74,8 @@ define([
                 FromGroup: false,
                 DisabledControls: false,
                 isOleObject: false,
-                cropMode: false
+                cropMode: false,
+                isPictureControl: false
             };
             this.lockedControls = [];
             this._locked = false;
@@ -308,10 +309,13 @@ define([
 
                 value = props.get_CanBeFlow() && !this._locked;
                 var fromgroup = props.get_FromGroup() || this._locked;
-                if (this._state.CanBeFlow!==value || this._state.FromGroup!==fromgroup) {
+                var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
-                    this.cmbWrapType.setDisabled(!value || fromgroup);
+                    isPictureControl = !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture) || this._locked;
+                if (this._state.CanBeFlow!==value || this._state.FromGroup!==fromgroup || this._state.isPictureControl!==isPictureControl) {
+                    this.cmbWrapType.setDisabled(!value || fromgroup || isPictureControl);
                     this._state.CanBeFlow=value;
                     this._state.FromGroup=fromgroup;
+                    this._state.isPictureControl=isPictureControl;
                 }
 
                 value = props.get_Width();

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

@@ -68,7 +68,7 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
                     {panelId: 'id-adv-image-wrap',       panelCaption: this.textBtnWrap},
                     {panelId: 'id-adv-image-position',   panelCaption: this.textPosition},
                     {panelId: 'id-adv-image-shape',      panelCaption: this.textWeightArrows},
-                    {panelId: 'id-adv-image-margins',    panelCaption: this.strMargins},
+                    {panelId: 'id-adv-image-margins',    panelCaption: this.textTextBox},
                     {panelId: 'id-adv-image-alttext',    panelCaption: this.textAlt}
                 ],
                 contentTemplate: _.template(contentTemplate)({
@@ -914,6 +914,16 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
             }, this));
             this.spinners.push(this.spnMarginRight);
 
+            this.chAutofit = new Common.UI.CheckBox({
+                el: $('#shape-checkbox-autofit'),
+                labelText: this.textResizeFit
+            });
+            this.chAutofit.on('change', _.bind(function(field, newValue, oldValue, eOpts){
+                if (this._changedShapeProps) {
+                    this._changedShapeProps.asc_putTextFitType(field.getValue()=='checked' ? AscFormat.text_fit_Auto : AscFormat.text_fit_No);
+                }
+            }, this));
+
             // Shape
             this._arrCapType = [
                 {displayValue: this.textFlat,   value: Asc.c_oAscLineCapType.Flat},
@@ -1367,6 +1377,8 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
                         this.spnMarginBottom.setValue((null !== val && undefined !== val) ? Common.Utils.Metric.fnRecalcFromMM(val) : '', true);
                     }
 
+                    this.chAutofit.setValue(shapeprops.asc_getTextFitType()==AscFormat.text_fit_Auto);
+
                     this.btnsCategory[6].setDisabled(null === margins);   // Margins
                     this.btnsCategory[5].setDisabled(shapeprops.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_NONE);   // Weights & Arrows
 
@@ -2083,7 +2095,10 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
         textAngle: 'Angle',
         textFlipped: 'Flipped',
         textHorizontally: 'Horizontally',
-        textVertically: 'Vertically'
+        textVertically: 'Vertically',
+        textTextBox: 'Text Box',
+        textAutofit: 'AutoFit',
+        textResizeFit: 'Resize shape to fit text'
 
     }, DE.Views.ImageSettingsAdvanced || {}));
 });

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

@@ -0,0 +1,599 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  ListSettingsDialog.js
+ *
+ *  Created by Julia Radzhabova on 03.12.2019
+ *  Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+if (Common === undefined)
+    var Common = {};
+
+define([
+    'common/main/lib/component/Window',
+    'common/main/lib/component/MetricSpinner',
+    'common/main/lib/component/ThemeColorPalette',
+    'common/main/lib/component/ColorButton',
+    'common/main/lib/component/ComboBox',
+    'common/main/lib/view/SymbolTableDialog'
+], function () { 'use strict';
+
+    DE.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({
+        options: {
+            type: 0, // 0 - markers, 1 - numbers, 2 - multilevel
+            width: 300,
+            height: 422,
+            style: 'min-width: 240px;',
+            cls: 'modal-dlg',
+            split: false,
+            buttons: ['ok', 'cancel']
+        },
+
+        initialize : function(options) {
+            this.type = options.type || 0;
+
+            _.extend(this.options, {
+                title: this.txtTitle,
+                height: (this.type==2) ? 376 : 422,
+                width: (this.type==2) ? 430 : 300
+        }, options || {});
+
+            this.template = [
+                '<div class="box">',
+                '<% if (type == 2) { %>',
+                    '<table cols="4" style="width: 100%;">',
+                        '<tr>',
+                            '<td style="padding-right: 5px;">',
+                                '<label class="input-label">' + this.txtType + '</label>',
+                                '<div id="id-dlg-numbering-format" class="input-group-nr" style="width: 100%;margin-bottom: 10px;"></div>',
+                            '</td>',
+                            '<td style="padding-left: 5px;padding-right: 5px;">',
+                                '<label class="input-label">' + this.txtAlign + '</label>',
+                                '<div id="id-dlg-bullet-align" class="input-group-nr" style="width: 100%;margin-bottom: 10px;"></div>',
+                            '</td>',
+                            '<td style="padding-left: 5px;padding-right: 5px;">',
+                                '<label class="input-label">' + this.txtSize + '</label>',
+                                '<div id="id-dlg-bullet-size" class="input-group-nr" style="width: 100%;margin-bottom: 10px;"></div>',
+                            '</td>',
+                            '<td style="padding-left: 5px;">',
+                                '<label class="input-label">' + this.txtColor + '</label>',
+                                '<div id="id-dlg-bullet-color" style="margin-bottom: 10px;"></div>',
+                            '</td>',
+                        '</tr>',
+                    '</table>',
+                '<% } else {%>',
+                    '<table cols="2" style="width: 100%;">',
+                        '<tr>',
+                            '<td style="padding-right: 5px;">',
+                                '<% if (type == 0) { %>',
+                                '<label class="input-label">' + this.txtBullet + '</label>',
+                                '<button type="button" class="btn btn-text-default" id="id-dlg-bullet-font" style="width: 100%;margin-bottom: 10px;">' + this.txtFont + '</button>',
+                                '<% } else { %>',
+                                '<label class="input-label">' + this.txtType + '</label>',
+                                '<div id="id-dlg-numbering-format" class="input-group-nr" style="width: 100%;margin-bottom: 10px;"></div>',
+                                '<% } %>',
+                            '</td>',
+                            '<td style="padding-left: 5px;">',
+                                '<label class="input-label">' + this.txtAlign + '</label>',
+                                '<div id="id-dlg-bullet-align" class="input-group-nr" style="width: 100%;margin-bottom: 10px;"></div>',
+                            '</td>',
+                        '</tr>',
+                        '<tr>',
+                            '<td style="padding-right: 5px;">',
+                                '<label class="input-label">' + this.txtSize + '</label>',
+                                '<div id="id-dlg-bullet-size" class="input-group-nr" style="width: 100%;margin-bottom: 10px;"></div>',
+                            '</td>',
+                            '<td style="padding-left: 5px;">',
+                                '<label class="input-label">' + this.txtColor + '</label>',
+                                '<div id="id-dlg-bullet-color" style="margin-bottom: 10px;"></div>',
+                            '</td>',
+                        '</tr>',
+                '</table>',
+                '<% } %>',
+                '<table cols="2" style="width: 100%;">',
+                        '<tr>',
+                            '<td class="<% if (type != 2) { %> hidden <% } %>" style="width: 50px; padding-right: 10px;">',
+                                '<label>' + this.textLevel + '</label>',
+                                '<div id="levels-list" class="no-borders" style="width:100%; height:208px;margin-top: 2px; "></div>',
+                            '</td>',
+                            '<td>',
+                                '<label>' + this.textPreview + '</label>',
+                                '<div id="bulleted-list-preview" style="margin-top: 2px; height:208px; width: 100%; border: 1px solid #cfcfcf;"></div>',
+                            '</td>',
+                        '</tr>',
+                    '</table>',
+                '</div>'
+            ].join('');
+
+            this.props = options.props;
+            this.level = options.level || 0;
+            this.api = options.api;
+            this.options.tpl = _.template(this.template)(this.options);
+            this.levels = [];
+
+            Common.UI.Window.prototype.initialize.call(this, this.options);
+        },
+
+        render: function() {
+            Common.UI.Window.prototype.render.call(this);
+
+            var me = this,
+                $window = this.getChild();
+            $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+
+            this.menuAddAlign = function(menuRoot, left, top) {
+                var self = this;
+                if (!$window.hasClass('notransform')) {
+                    $window.addClass('notransform');
+                    menuRoot.addClass('hidden');
+                    setTimeout(function() {
+                        menuRoot.removeClass('hidden');
+                        menuRoot.css({left: left, top: top});
+                        self.options.additionalAlign = null;
+                    }, 300);
+                } else {
+                    menuRoot.css({left: left, top: top});
+                    self.options.additionalAlign = null;
+                }
+            };
+
+            this.btnColor = new Common.UI.ColorButton({
+                style: 'width:45px;',
+                menu        : new Common.UI.Menu({
+                    additionalAlign: this.menuAddAlign,
+                    items: [
+                        {
+                            id: 'id-dlg-bullet-text-color',
+                            caption: this.txtLikeText,
+                            checkable: true,
+                            toggleGroup: 'list-settings-color'
+                        },
+                        {
+                            id: 'id-dlg-bullet-auto-color',
+                            caption: this.textAuto,
+                            checkable: true,
+                            toggleGroup: 'list-settings-color'
+                        },
+                        {caption: '--'},
+                        { template: _.template('<div id="id-dlg-bullet-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
+                        { template: _.template('<a id="id-dlg-bullet-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
+                    ]
+                })
+            });
+            this.btnColor.on('render:after', function(btn) {
+                me.colors = new Common.UI.ThemeColorPalette({
+                    el: $window.find('#id-dlg-bullet-color-menu'),
+                    transparent: false
+                });
+                me.colors.on('select', _.bind(me.onColorsSelect, me));
+            });
+            this.btnColor.render($window.find('#id-dlg-bullet-color'));
+            $window.find('#id-dlg-bullet-color-new').on('click', _.bind(this.addNewColor, this, this.colors));
+            this.btnColor.menu.items[0].on('toggle', _.bind(this.onLikeTextColor, this));
+            this.btnColor.menu.items[1].on('toggle', _.bind(this.onAutoColor, this));
+
+            this.btnEdit = new Common.UI.Button({
+                el: $window.find('#id-dlg-bullet-font')
+            });
+            this.btnEdit.on('click', _.bind(this.onEditBullet, this));
+
+            var itemsTemplate =
+                [
+                    '<% _.each(items, function(item) { %>',
+                    '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">',
+                    '<%= item.displayValue %><% if (item.value === Asc.c_oAscNumberingFormat.Bullet) { %><span style="font-family:<%=item.font%>;"><%=item.symbol%></span><% } %>',
+                    '</a></li>',
+                    '<% }); %>'
+                ];
+            var template = [
+                '<div class="input-group combobox input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
+                '<div class="form-control" style="padding-top:3px; line-height: 14px; cursor: pointer; <%= style %>"></div>',
+                '<div style="display: table-cell;"></div>',
+                '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
+                    '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">'].concat(itemsTemplate).concat([
+                    '</ul>',
+                '</div>'
+            ]);
+            this.cmbFormat = new Common.UI.ComboBoxCustom({
+                el          : $window.find('#id-dlg-numbering-format'),
+                menuStyle   : 'min-width: 100%;max-height: 183px;',
+                style       : this.type==2 ? "width: 107px;" : "width: 129px;",
+                editable    : false,
+                template    : _.template(template.join('')),
+                itemsTemplate: _.template(itemsTemplate.join('')),
+                data        : [
+                    { displayValue: this.txtNone,       value: Asc.c_oAscNumberingFormat.None },
+                    { displayValue: '1, 2, 3,...',      value: Asc.c_oAscNumberingFormat.Decimal },
+                    { displayValue: 'a, b, c,...',      value: Asc.c_oAscNumberingFormat.LowerLetter },
+                    { displayValue: 'A, B, C,...',      value: Asc.c_oAscNumberingFormat.UpperLetter },
+                    { displayValue: 'i, ii, iii,...',   value: Asc.c_oAscNumberingFormat.LowerRoman },
+                    { displayValue: 'I, II, III,...',   value: Asc.c_oAscNumberingFormat.UpperRoman }
+                ],
+                updateFormControl: function(record) {
+                    var formcontrol = $(this.el).find('.form-control');
+                    if (record) {
+                        if (record.get('value')==Asc.c_oAscNumberingFormat.Bullet)
+                            formcontrol[0].innerHTML = record.get('displayValue') + '<span style="font-family:' + (record.get('font') || 'Arial') + '">' + record.get('symbol') + '</span>';
+                        else
+                            formcontrol[0].innerHTML = record.get('displayValue');
+                    } else
+                        formcontrol[0].innerHTML = '';
+                }
+            });
+            this.cmbFormat.on('selected', _.bind(function (combo, record) {
+                if (this._changedProps) {
+                    if (record.value == -1) {
+                        var callback = function(result) {
+                            var format = me._changedProps.get_Format();
+                            if (format == Asc.c_oAscNumberingFormat.Bullet) {
+                                var store = combo.store;
+                                if (!store.findWhere({value: Asc.c_oAscNumberingFormat.Bullet, symbol: me.bulletProps.symbol, font: me.bulletProps.font}))
+                                    store.add({ displayValue: me.txtSymbol + ': ', value: Asc.c_oAscNumberingFormat.Bullet, symbol: me.bulletProps.symbol, font: me.bulletProps.font }, {at: store.length-1});
+                                combo.setData(store.models);
+                                combo.selectRecord(combo.store.findWhere({value: Asc.c_oAscNumberingFormat.Bullet, symbol: me.bulletProps.symbol, font: me.bulletProps.font}));
+                            } else
+                                combo.setValue(format || '');
+                        };
+                        this.addNewBullet(callback);
+                    } else {
+                        var oldformat = this._changedProps.get_Format();
+                        this._changedProps.put_Format(record.value);
+                        if (record.value == Asc.c_oAscNumberingFormat.Bullet) {
+                            this.bulletProps.font = record.font;
+                            this.bulletProps.symbol = record.symbol;
+                            if (!this._changedProps.get_TextPr()) this._changedProps.put_TextPr(new AscCommonWord.CTextPr());
+                            this._changedProps.get_TextPr().put_FontFamily(this.bulletProps.font);
+
+                            this._changedProps.put_Text([new Asc.CAscNumberingLvlText()]);
+                            this._changedProps.get_Text()[0].put_Value(this.bulletProps.symbol);
+                        } else if (record.value == Asc.c_oAscNumberingFormat.None || oldformat == Asc.c_oAscNumberingFormat.Bullet) {
+                            if (!this._changedProps.get_TextPr()) this._changedProps.put_TextPr(new AscCommonWord.CTextPr());
+                            this._changedProps.get_TextPr().put_FontFamily(undefined);
+
+                            this._changedProps.put_Text([new Asc.CAscNumberingLvlText()]);
+                            this._changedProps.get_Text()[0].put_Type(Asc.c_oAscNumberingLvlTextType.Num);
+                            this._changedProps.get_Text()[0].put_Value(this.level);
+                        }
+                    }
+                }
+                if (this.api) {
+                    this.api.SetDrawImagePreviewBullet('bulleted-list-preview', this.props, this.level, this.type==2);
+                }
+            }, this));
+
+            this.cmbAlign = new Common.UI.ComboBox({
+                el          : $window.find('#id-dlg-bullet-align'),
+                menuStyle   : 'min-width: 100%;',
+                editable    : false,
+                cls         : 'input-group-nr',
+                data        : [
+                    { value: AscCommon.align_Left, displayValue: this.textLeft },
+                    { value: AscCommon.align_Center, displayValue: this.textCenter },
+                    { value: AscCommon.align_Right, displayValue: this.textRight }
+                ]
+            });
+            this.cmbAlign.on('selected', _.bind(function (combo, record) {
+                if (this._changedProps)
+                    this._changedProps.put_Align(record.value);
+                if (this.api) {
+                    this.api.SetDrawImagePreviewBullet('bulleted-list-preview', this.props, this.level, this.type==2);
+                }
+            }, this));
+
+            this.cmbSize = new Common.UI.ComboBox({
+                el          : $window.find('#id-dlg-bullet-size'),
+                menuStyle   : 'min-width: 100%;max-height: 183px;',
+                editable    : false,
+                cls         : 'input-group-nr',
+                data        : [
+                    { value: -1, displayValue: this.txtLikeText },
+                    { value: 8, displayValue: "8" },
+                    { value: 9, displayValue: "9" },
+                    { value: 10, displayValue: "10" },
+                    { value: 11, displayValue: "11" },
+                    { value: 12, displayValue: "12" },
+                    { value: 14, displayValue: "14" },
+                    { value: 16, displayValue: "16" },
+                    { value: 18, displayValue: "18" },
+                    { value: 20, displayValue: "20" },
+                    { value: 22, displayValue: "22" },
+                    { value: 24, displayValue: "24" },
+                    { value: 26, displayValue: "26" },
+                    { value: 28, displayValue: "28" },
+                    { value: 36, displayValue: "36" },
+                    { value: 48, displayValue: "48" },
+                    { value: 72, displayValue: "72" },
+                    { value: 96, displayValue: "96" }
+                ]
+            });
+            this.cmbSize.on('selected', _.bind(function (combo, record) {
+                if (this._changedProps) {
+                    if (!this._changedProps.get_TextPr()) this._changedProps.put_TextPr(new AscCommonWord.CTextPr());
+                    this._changedProps.get_TextPr().put_FontSize((record.value>0) ? record.value : undefined);
+                }
+                if (this.api) {
+                    this.api.SetDrawImagePreviewBullet('bulleted-list-preview', this.props, this.level, this.type==2);
+                }
+            }, this));
+
+            var levels = [];
+            for (var i=0; i<9; i++)
+                levels.push({value: i});
+            this.levelsList = new Common.UI.ListView({
+                el: $('#levels-list', this.$window),
+                store: new Common.UI.DataViewStore(levels),
+                itemTemplate: _.template('<div id="<%= id %>" class="list-item" style="pointer-events:none;overflow: hidden; text-overflow: ellipsis;line-height: 15px;"><%= (value+1) %></div>')
+            });
+            this.levelsList.on('item:select', _.bind(this.onSelectLevel, this));
+
+            this.afterRender();
+        },
+
+        afterRender: function() {
+            this.updateThemeColors();
+            this._setDefaults(this.props);
+            var me = this;
+            var onApiLevelChange = function(level) {
+                me.levelsList.selectByIndex(level);
+            };
+            this.api.asc_registerCallback('asc_onPreviewLevelChange', onApiLevelChange);
+            this.on('close', function(obj){
+                me.api.asc_unregisterCallback('asc_onPreviewLevelChange', onApiLevelChange);
+            });
+        },
+
+        updateThemeColors: function() {
+            this.colors.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
+        },
+
+        addNewColor: function(picker, btn) {
+            picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
+        },
+
+        onAutoColor: function(item, state) {
+            if (!!state) {
+                var color = Common.Utils.ThemeColor.getHexColor(0, 0, 0);
+                this.btnColor.setColor(color);
+                this.colors.clearSelection();
+                if (this._changedProps) {
+                    if (!this._changedProps.get_TextPr()) this._changedProps.put_TextPr(new AscCommonWord.CTextPr());
+                    var color = new Asc.asc_CColor();
+                    color.put_auto(true);
+                    this._changedProps.get_TextPr().put_Color(color);
+                }
+                if (this.api) {
+                    this.api.SetDrawImagePreviewBullet('bulleted-list-preview', this.props, this.level, this.type==2);
+                }
+            }
+        },
+
+        onLikeTextColor: function(item, state) {
+            if (!!state) {
+                var color = Common.Utils.ThemeColor.getHexColor(255, 255, 255);
+                this.btnColor.setColor(color);
+                this.colors.clearSelection();
+                if (this._changedProps) {
+                    if (!this._changedProps.get_TextPr()) this._changedProps.put_TextPr(new AscCommonWord.CTextPr());
+                    this._changedProps.get_TextPr().put_Color(undefined);
+                }
+                if (this.api) {
+                    this.api.SetDrawImagePreviewBullet('bulleted-list-preview', this.props, this.level, this.type==2);
+                }
+            }
+        },
+
+        onColorsSelect: function(picker, color) {
+            this.btnColor.setColor(color);
+            if (this._changedProps) {
+                if (!this._changedProps.get_TextPr()) this._changedProps.put_TextPr(new AscCommonWord.CTextPr());
+                this._changedProps.get_TextPr().put_Color(Common.Utils.ThemeColor.getRgbColor(color));
+            }
+            this.btnColor.menu.items[0].setChecked(false, true);
+            this.btnColor.menu.items[1].setChecked(false, true);
+            if (this.api) {
+                this.api.SetDrawImagePreviewBullet('bulleted-list-preview', this.props, this.level, this.type==2);
+            }
+        },
+
+        onEditBullet: function(callback) {
+            this.addNewBullet();
+        },
+
+        addNewBullet: function(callback) {
+            var me = this,
+                props = me.bulletProps,
+                handler = function(dlg, result, settings) {
+                    if (result == 'ok') {
+                        props.changed = true;
+                        props.code = settings.code;
+                        props.font = settings.font;
+                        props.symbol = settings.symbol;
+                        if (me._changedProps) {
+                            me._changedProps.put_Format(Asc.c_oAscNumberingFormat.Bullet);
+                            if (!me._changedProps.get_TextPr()) me._changedProps.put_TextPr(new AscCommonWord.CTextPr());
+                            me._changedProps.get_TextPr().put_FontFamily(props.font);
+
+                            me._changedProps.put_Text([new Asc.CAscNumberingLvlText()]);
+                            me._changedProps.get_Text()[0].put_Value(props.symbol);
+                            if (me.api) {
+                                me.api.SetDrawImagePreviewBullet('bulleted-list-preview', me.props, me.level, me.type==2);
+                            }
+                        }
+                    }
+                    callback && callback.call(me, result);
+                },
+                win = new Common.Views.SymbolTableDialog({
+                    api: me.options.api,
+                    lang: me.options.interfaceLang,
+                    modal: true,
+                    type: 0,
+                    font: props.font,
+                    symbol: props.symbol,
+                    handler: handler
+                });
+            win.show();
+            win.on('symbol:dblclick', handler);
+        },
+
+        _handleInput: function(state) {
+            if (this.options.handler) {
+                var props = [], lvlnum = [];
+                for (var i=0; i<9; i++) {
+                    if (!this.levels[i]) continue;
+                    props.push(this.levels[i]);
+                    lvlnum.push(i);
+                }
+                this.options.handler.call(this, state, {props: (props.length==1) ? props[0] : props, num: (lvlnum.length==1) ? lvlnum[0] : lvlnum});
+            }
+            this.close();
+        },
+
+        onBtnClick: function(event) {
+            this._handleInput(event.currentTarget.attributes['result'].value);
+        },
+
+        onPrimary: function(event) {
+            this._handleInput('ok');
+            return false;
+        },
+
+        _setDefaults: function (props) {
+            this.bulletProps = {};
+            if (props) {
+                var levelProps = props.get_Lvl(this.level);
+                (this.level<0) && (this.level = 0);
+                this.levels[this.level] = levelProps || new Asc.CAscNumberingLvl(this.level);
+
+                if (this.type==2) {
+                    var store = this.cmbFormat.store;
+                    store.push([
+                            { displayValue: this.txtSymbol + ': ', value: Asc.c_oAscNumberingFormat.Bullet, symbol: "·", font: 'Symbol' },
+                            { displayValue: this.txtSymbol + ': ', value: Asc.c_oAscNumberingFormat.Bullet, symbol: "o", font: 'Courier New' },
+                            { displayValue: this.txtSymbol + ': ', value: Asc.c_oAscNumberingFormat.Bullet, symbol: "§", font: 'Wingdings' },
+                            { displayValue: this.txtSymbol + ': ', value: Asc.c_oAscNumberingFormat.Bullet, symbol: "v", font: 'Wingdings' },
+                            { displayValue: this.txtSymbol + ': ', value: Asc.c_oAscNumberingFormat.Bullet, symbol: "Ø", font: 'Wingdings' },
+                            { displayValue: this.txtSymbol + ': ', value: Asc.c_oAscNumberingFormat.Bullet, symbol: "ü", font: 'Wingdings' },
+                            { displayValue: this.txtSymbol + ': ', value: Asc.c_oAscNumberingFormat.Bullet, symbol: "¨", font: 'Symbol' },
+                            { displayValue: this.txtSymbol + ': ', value: Asc.c_oAscNumberingFormat.Bullet, symbol: "–", font: 'Arial' },
+                            { displayValue: this.txtNewBullet, value: -1 }
+                            ]);
+                    this.cmbFormat.setData(store.models);
+                    this.levelsList.selectByIndex(this.level);
+                } else
+                    this.fillLevelProps(this.levels[this.level]);
+            }
+            this._changedProps = this.levels[this.level];
+        },
+
+        onSelectLevel: function(listView, itemView, record) {
+            this.level = record.get('value');
+            if (this.levels[this.level] === undefined)
+                this.levels[this.level] = this.props.get_Lvl(this.level);
+            this.fillLevelProps(this.levels[this.level]);
+            this._changedProps = this.levels[this.level];
+        },
+
+        fillLevelProps: function(levelProps) {
+            if (!levelProps) return;
+
+            this.cmbAlign.setValue((levelProps.get_Align()!==undefined) ? levelProps.get_Align() : '');
+            var format = levelProps.get_Format(),
+                textPr = levelProps.get_TextPr(),
+                text = levelProps.get_Text();
+            if (text && format == Asc.c_oAscNumberingFormat.Bullet) {
+                this.bulletProps.symbol = text[0].get_Value();
+            }
+            if (textPr) {
+                this.cmbSize.setValue(textPr.get_FontSize() || -1);
+                this.bulletProps.font = textPr.get_FontFamily();
+
+                var color = textPr.get_Color();
+                this.btnColor.menu.items[0].setChecked(color===undefined, true);
+                this.btnColor.menu.items[1].setChecked(!!color && color.get_auto(), true);
+                if (color && !color.get_auto()) {
+                    if ( typeof(color) == 'object' ) {
+                        var isselected = false;
+                        for (var i=0; i<10; i++) {
+                            if ( Common.Utils.ThemeColor.ThemeValues[i] == color.effectValue ) {
+                                this.colors.select(color,true);
+                                isselected = true;
+                                break;
+                            }
+                        }
+                        if (!isselected) this.colors.clearSelection();
+                        color = Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b());
+                    } else
+                        this.colors.select(color,true);
+                } else {
+                    this.colors.clearSelection();
+                    color = (color && color.get_auto()) ? '000000' : 'ffffff';
+                }
+                this.btnColor.setColor(color);
+            }
+            if (this.type>0) {
+                if (format == Asc.c_oAscNumberingFormat.Bullet) {
+                    if (!this.cmbFormat.store.findWhere({value: Asc.c_oAscNumberingFormat.Bullet, symbol: this.bulletProps.symbol, font: this.bulletProps.font}))
+                        this.cmbFormat.store.add({ displayValue: this.txtSymbol + ': ', value: Asc.c_oAscNumberingFormat.Bullet, symbol: this.bulletProps.symbol, font: this.bulletProps.font }, {at: this.cmbFormat.store.length-1});
+                    this.cmbFormat.setData(this.cmbFormat.store.models);
+                    this.cmbFormat.selectRecord(this.cmbFormat.store.findWhere({value: Asc.c_oAscNumberingFormat.Bullet, symbol: this.bulletProps.symbol, font: this.bulletProps.font}));
+                } else
+                    this.cmbFormat.setValue((format!==undefined) ? format : '');
+            }
+            if (this.api) {
+                this.api.SetDrawImagePreviewBullet('bulleted-list-preview', this.props, this.level, this.type==2);
+            }
+        },
+
+        txtTitle: 'List Settings',
+        txtSize: 'Size',
+        txtColor: 'Color',
+        textNewColor: 'Add New Custom Color',
+        txtBullet: 'Bullet',
+        txtFont: 'Font and Symbol',
+        txtAlign: 'Alignment',
+        textLeft: 'Left',
+        textCenter: 'Center',
+        textRight: 'Right',
+        textAuto: 'Automatic',
+        textPreview: 'Preview',
+        txtType: 'Type',
+        txtLikeText: 'Like a text',
+        textLevel: 'Level',
+        txtNone: 'None',
+        txtNewBullet: 'New bullet',
+        txtSymbol: 'Symbol'
+    }, DE.Views.ListSettingsDialog || {}))
+});

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

@@ -155,7 +155,7 @@ define([
         txtExpand: 'Expand all',
         txtCollapse: 'Collapse all',
         txtExpandToLevel: 'Expand to level...',
-        txtEmpty: 'This document doesn\'t contain headings',
+        txtEmpty: 'There are no headings in the document.<br>Apply a heading style to the text so that it appears in the table of contents.',
         txtEmptyItem: 'Empty Heading'
 
     }, DE.Views.Navigation || {}));

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

@@ -241,8 +241,32 @@ define([
             this.cmbOrientation.on('selected', _.bind(function (combo, record) {
                 if (this.api) {
                     this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
-                    this.properties.put_Orientation(record.value);
+
-                    this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+                    if (this.properties.get_Orientation() !== record.value) {
+                        this.properties.put_TopMargin(Common.Utils.Metric.fnRecalcToMM(record.value ? this.spnLeft.getNumberValue() : this.spnRight.getNumberValue()));
+                        this.properties.put_BottomMargin(Common.Utils.Metric.fnRecalcToMM(record.value ? this.spnRight.getNumberValue() : this.spnLeft.getNumberValue()));
+                        this.properties.put_LeftMargin(Common.Utils.Metric.fnRecalcToMM(record.value ? this.spnBottom.getNumberValue() : this.spnTop.getNumberValue()));
+                        this.properties.put_RightMargin(Common.Utils.Metric.fnRecalcToMM(record.value ? this.spnTop.getNumberValue() : this.spnBottom.getNumberValue()));
+
+                        var h = this.properties.get_H();
+                        this.properties.put_H(this.properties.get_W());
+                        this.properties.put_W(h);
+                        this.properties.put_Orientation(record.value);
+
+                        this.maxMarginsH = Common.Utils.Metric.fnRecalcFromMM(this.properties.get_H() - 2.6);
+                        this.maxMarginsW = Common.Utils.Metric.fnRecalcFromMM(this.properties.get_W() - 12.7);
+                        this.spnTop.setMaxValue(this.maxMarginsH);
+                        this.spnBottom.setMaxValue(this.maxMarginsH);
+                        this.spnLeft.setMaxValue(this.maxMarginsW);
+                        this.spnRight.setMaxValue(this.maxMarginsW);
+
+                        this.spnTop.setValue(Common.Utils.Metric.fnRecalcFromMM(this.properties.get_TopMargin()), true);
+                        this.spnBottom.setValue(Common.Utils.Metric.fnRecalcFromMM(this.properties.get_BottomMargin()), true);
+                        this.spnLeft.setValue(Common.Utils.Metric.fnRecalcFromMM(this.properties.get_LeftMargin()), true);
+                        this.spnRight.setValue(Common.Utils.Metric.fnRecalcFromMM(this.properties.get_RightMargin()), true);
+
+                        this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+                    }
                 }
             }, this));
 
@@ -356,6 +380,8 @@ define([
             props.put_Gutter(Common.Utils.Metric.fnRecalcToMM(this.spnGutter.getNumberValue()));
             props.put_GutterAtTop(this.cmbGutterPosition.getValue() ? true : false);
             props.put_MirrorMargins(this.cmbMultiplePages.getValue() ? true : false);
+            props.put_H(this.properties.get_H());
+            props.put_W(this.properties.get_W());
             return props;
         },
 

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

@@ -729,7 +729,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             if (this._changedProps.get_Ind()!==null && this._changedProps.get_Ind()!==undefined) {
                 var left = this._changedProps.get_Ind().get_Left(),
                     first = this._changedProps.get_Ind().get_FirstLine();
-                if (first<0 || this.FirstLine<0) {
+                if ((left!==undefined || first!==undefined) && (first<0 || this.FirstLine<0)) {
                     if (first<0 || first===undefined || first===null) {
                         if (first === undefined || first === null)
                             first = this.FirstLine;
@@ -1414,14 +1414,14 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                 if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined)
                     this._changedProps.put_Ind(new Asc.asc_CParagraphInd());
                 var value = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
-                if (this.CurSpecial === c_paragraphSpecial.HANGING) {
+                if (this.CurSpecial === c_paragraphSpecial.NONE_SPECIAL && value > 0 )  {
-                    value = -value;
-                } else if (this.CurSpecial === c_paragraphSpecial.NONE_SPECIAL && value > 0 )  {
                     this.CurSpecial = c_paragraphSpecial.FIRST_LINE;
                     this.cmbSpecial.setValue(c_paragraphSpecial.FIRST_LINE);
                 } else if (value === 0) {
                     this.CurSpecial = c_paragraphSpecial.NONE_SPECIAL;
                     this.cmbSpecial.setValue(c_paragraphSpecial.NONE_SPECIAL);
+                } else if (this.CurSpecial === c_paragraphSpecial.HANGING) {
+                    value = -value;
                 }
                 this._changedProps.get_Ind().put_FirstLine(value);
             }

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

@@ -567,7 +567,7 @@ define([
         },
 
         applyBorderSize: function(value) {
-            value = parseFloat(value);
+            value = Common.Utils.String.parseFloat(value);
             value = isNaN(value) ? 0 : Math.max(0, Math.min(1584, value));
 
             this.BorderSize = value;

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

@@ -259,6 +259,7 @@ define([
                 data: [
                     { displayValue: this.txtCurrent,     value: Asc.c_oAscTOCStylesType.Current },
                     { displayValue: this.txtSimple,     value: Asc.c_oAscTOCStylesType.Simple },
+                    { displayValue: this.txtOnline,     value: Asc.c_oAscTOCStylesType.Web },
                     { displayValue: this.txtStandard,     value: Asc.c_oAscTOCStylesType.Standard },
                     { displayValue: this.txtModern,     value: Asc.c_oAscTOCStylesType.Modern },
                     { displayValue: this.txtClassic,     value: Asc.c_oAscTOCStylesType.Classic }
@@ -649,7 +650,8 @@ define([
         txtSimple: 'Simple',
         txtStandard: 'Standard',
         txtModern: 'Modern',
-        txtClassic: 'Classic'
+        txtClassic: 'Classic',
+        txtOnline: 'Online'
 
     }, DE.Views.TableOfContentsSettings || {}))
 });

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

@@ -436,7 +436,7 @@ define([
         },
 
         applyBorderSize: function(value) {
-            value = parseFloat(value);
+            value = Common.Utils.String.parseFloat(value);
             value = isNaN(value) ? 0 : Math.max(0, Math.min(1584, value));
 
             this.BorderSize = value;

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

@@ -515,6 +515,14 @@ define([
                     this.paragraphControls.push(this.mnuInsertPageCount);
                     this.toolbarControls.push(this.btnEditHeader);
 
+                    this.btnInsDateTime = new Common.UI.Button({
+                        id: 'id-toolbar-btn-datetime',
+                        cls: 'btn-toolbar x-huge icon-top',
+                        iconCls: 'toolbar__icon btn-datetime',
+                        caption: me.capBtnDateTime
+                    });
+                    this.paragraphControls.push(this.btnInsDateTime);
+
                     this.btnBlankPage = new Common.UI.Button({
                         id: 'id-toolbar-btn-blankpage',
                         cls: 'btn-toolbar x-huge icon-top',
@@ -1309,6 +1317,7 @@ define([
                 _injectComponent('#slot-btn-controls', this.btnContentControls);
                 _injectComponent('#slot-btn-columns', this.btnColumns);
                 _injectComponent('#slot-btn-editheader', this.btnEditHeader);
+                _injectComponent('#slot-btn-datetime', this.btnInsDateTime);
                 _injectComponent('#slot-btn-blankpage', this.btnBlankPage);
                 _injectComponent('#slot-btn-insshape', this.btnInsertShape);
                 _injectComponent('#slot-btn-insequation', this.btnInsertEquation);
@@ -1538,6 +1547,10 @@ define([
                     }));
 
                     me.btnWatermark.updateHint(me.tipWatermark);
+
+                    if (!config.canFeatureContentControl && me.btnContentControls.cmpEl) {
+                        me.btnContentControls.cmpEl.parents('.group').hide().prev('.separator').hide();
+                    }
                 });
             },
 
@@ -1585,6 +1598,7 @@ define([
                 this.btnInsertText.updateHint(this.tipInsertText);
                 this.btnInsertTextArt.updateHint(this.tipInsertTextArt);
                 this.btnEditHeader.updateHint(this.tipEditHeader);
+                this.btnInsDateTime.updateHint(this.tipDateTime);
                 this.btnBlankPage.updateHint(this.tipBlankPage);
                 this.btnInsertShape.updateHint(this.tipInsertShape);
                 this.btnInsertEquation.updateHint(this.tipInsertEquation);
@@ -1608,7 +1622,12 @@ define([
                     new Common.UI.Menu({
                         style: 'min-width: 139px',
                         items: [
-                            {template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 139px; margin: 0 5px;"></div>')}
+                            {template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 139px; margin: 0 16px;"></div>')},
+                            this.mnuMarkerSettings = new Common.UI.MenuItem({
+                                caption: this.textListSettings,
+                                disabled: (this.mnuMarkersPicker.conf.index || 0)==0,
+                                value: 'settings'
+                            })
                         ]
                     })
                 );
@@ -1616,7 +1635,12 @@ define([
                 this.btnNumbers.setMenu(
                     new Common.UI.Menu({
                         items: [
-                            {template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 185px; margin: 0 5px;"></div>')}
+                            {template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 185px; margin: 0 16px;"></div>')},
+                            this.mnuNumberSettings = new Common.UI.MenuItem({
+                                caption: this.textListSettings,
+                                disabled: (this.mnuNumbersPicker.conf.index || 0)==0,
+                                value: 'settings'
+                            })
                         ]
                     })
                 );
@@ -1625,7 +1649,12 @@ define([
                     new Common.UI.Menu({
                         style: 'min-width: 90px',
                         items: [
-                            {template: _.template('<div id="id-toolbar-menu-multilevels" class="menu-markers" style="width: 93px; margin: 0 5px;"></div>')}
+                            {template: _.template('<div id="id-toolbar-menu-multilevels" class="menu-markers" style="width: 93px; margin: 0 16px;"></div>')},
+                            this.mnuMultilevelSettings = new Common.UI.MenuItem({
+                                caption: this.textListSettings,
+                                disabled: (this.mnuMultilevelPicker.conf.index || 0)==0,
+                                value: 'settings'
+                            })
                         ]
                     })
                 );
@@ -2289,7 +2318,10 @@ define([
             capBtnInsSymbol: 'Symbol',
             tipInsertSymbol: 'Insert symbol',
             mniDrawTable: 'Draw Table',
-            mniEraseTable: 'Erase Table'
+            mniEraseTable: 'Erase Table',
+            textListSettings: 'List Settings',
+            capBtnDateTime: 'Date & Time',
+            tipDateTime: 'Insert current date and time'
         }
     })(), DE.Views.Toolbar || {}));
 });

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

@@ -284,7 +284,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
 
             this.btnUnderline = new Common.UI.Button({
                 cls         : 'btn-toolbar',
-                iconCls     : 'btn-underline',
+                iconCls     : 'toolbar__icon btn-underline',
                 enableToggle: true,
                 hint: this.textUnderline
             });

apps/documenteditor/main/index.html

@@ -24,7 +24,7 @@
 
         .loadmask > .brendpanel {
             width: 100%;
-            min-height: 32px;
+            min-height: 28px;
             background: #446995;
         }
 
@@ -200,6 +200,7 @@
             logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
 
         window.frameEditorId = params["frameEditorId"];
+        window.parentOrigin = params["parentOrigin"];
     </script>
 
     <!-- debug begin -->
@@ -223,14 +224,23 @@
 
     <script>
         var params = getUrlParams(),
+            notoolbar = params["toolbar"] == 'false',
             compact = params["compact"] == 'true',
             view = params["mode"] == 'view';
 
+        (compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
+
         if (compact || view) {
-            document.querySelector('.brendpanel > :nth-child(2)').remove();
+            if (notoolbar) {
-            document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
+                document.querySelector('.brendpanel > :nth-child(1)').remove();
+                document.querySelector('.brendpanel').remove();
+            } else
+                document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
+        } else if (notoolbar) {
+            document.querySelector('.brendpanel > :nth-child(1)').style.height = '28px';
         }
-        if (view) {
+
+        if (view || notoolbar) {
             document.querySelector('.sktoolbar').remove();
         }
 

apps/documenteditor/main/index.html.deploy

@@ -25,7 +25,7 @@
 
         .loadmask > .brendpanel {
             width: 100%;
-            min-height: 32px;
+            min-height: 28px;
             background: #446995;
         }
 
@@ -199,6 +199,7 @@
             logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
 
         window.frameEditorId = params["frameEditorId"];
+        window.parentOrigin = params["parentOrigin"];
 
         if ( window.AscDesktopEditor ) {
             window.on_native_message = function (cmd, param) {
@@ -216,14 +217,22 @@
 
     <script>
         var params = getUrlParams(),
+            notoolbar = params["toolbar"] == 'false',
             compact = params["compact"] == 'true',
             view = params["mode"] == 'view';
 
+        (compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
+
         if (compact || view) {
-            document.querySelector('.brendpanel > :nth-child(2)').remove();
+            if (notoolbar) {
-            document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
+                document.querySelector('.brendpanel > :nth-child(1)').remove();
+                document.querySelector('.brendpanel').remove();
+            } else
+                document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
+        } else if (notoolbar) {
+            document.querySelector('.brendpanel > :nth-child(1)').style.height = '28px';
         }
-        if (view) {
+        if (view || notoolbar) {
             document.querySelector('.sktoolbar').remove();
         }
 

apps/documenteditor/main/index_loader.html

@@ -212,6 +212,7 @@
             loading = 'Loading...',
             logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
         window.frameEditorId = params["frameEditorId"];
+        window.parentOrigin = params["parentOrigin"];
         if ( lang == 'de')      loading = 'Ladevorgang...';
         else if ( lang == 'es') loading = 'Cargando...';
         else if ( lang == 'fr') loading = 'Chargement en cours...';

apps/documenteditor/main/index_loader.html.deploy

@@ -233,6 +233,7 @@
             logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
 
         window.frameEditorId = params["frameEditorId"];
+        window.parentOrigin = params["parentOrigin"];
 
         if ( lang == 'de')      loading = 'Ladevorgang...';
         else if ( lang == 'es') loading = 'Cargando...';

apps/documenteditor/main/locale/bg.json

@@ -71,13 +71,13 @@
   "Common.Controllers.ReviewChanges.textWidow": "Управление на вдовицата",
   "Common.define.chartData.textArea": "Площ",
   "Common.define.chartData.textBar": "Бар",
+  "Common.define.chartData.textCharts": "Диаграми",
   "Common.define.chartData.textColumn": "Колона",
   "Common.define.chartData.textLine": "Линия",
   "Common.define.chartData.textPie": "Кръгова",
   "Common.define.chartData.textPoint": "XY (точкова)",
   "Common.define.chartData.textStock": "Борсова",
   "Common.define.chartData.textSurface": "Повърхност",
-  "Common.define.chartData.textCharts": "Диаграми",
   "Common.UI.ComboBorderSize.txtNoBorders": "Няма граници",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Няма граници",
   "Common.UI.ComboDataView.emptyComboText": "Няма стилове",
@@ -2075,7 +2075,6 @@
   "DE.Views.Toolbar.tipFontColor": "Цвят на шрифта",
   "DE.Views.Toolbar.tipFontName": "Шрифт",
   "DE.Views.Toolbar.tipFontSize": "Размер на шрифта",
-  "DE.Views.Toolbar.tipHAligh": "Хоризонтално подравняване",
   "DE.Views.Toolbar.tipHighlightColor": "Маркирайте цвета",
   "DE.Views.Toolbar.tipImgAlign": "Подравняване на обекти",
   "DE.Views.Toolbar.tipImgGroup": "Групови обекти",

apps/documenteditor/main/locale/de.json

@@ -78,6 +78,12 @@
   "Common.define.chartData.textPoint": "Punkt (XY)",
   "Common.define.chartData.textStock": "Kurs",
   "Common.define.chartData.textSurface": "Oberfläche",
+  "Common.UI.Calendar.textApril": "April",
+  "Common.UI.Calendar.textAugust": "August",
+  "Common.UI.Calendar.textDecember": "Dezember",
+  "Common.UI.Calendar.textShortApril": "Apr",
+  "Common.UI.Calendar.textShortAugust": "Aug",
+  "Common.UI.Calendar.textShortDecember": "Dez",
   "Common.UI.ComboBorderSize.txtNoBorders": "Keine Rahmen",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Keine Rahmen",
   "Common.UI.ComboDataView.emptyComboText": "Keine Formate",
@@ -223,12 +229,15 @@
   "Common.Views.RenameDialog.txtInvalidName": "Dieser Dateiname darf keines der folgenden Zeichen enthalten:",
   "Common.Views.ReviewChanges.hintNext": "Zur nächsten Änderung",
   "Common.Views.ReviewChanges.hintPrev": "Zur vorherigen Änderung",
+  "Common.Views.ReviewChanges.mniFromFile": "Dokument aus Datei",
+  "Common.Views.ReviewChanges.mniSettings": "Vergleichseinstellungen",
   "Common.Views.ReviewChanges.strFast": "Schnell",
   "Common.Views.ReviewChanges.strFastDesc": "Echtzeit-Zusammenbearbeitung. Alle Änderungen werden automatisch gespeichert.",
   "Common.Views.ReviewChanges.strStrict": "Formal",
   "Common.Views.ReviewChanges.strStrictDesc": "Verwenden Sie die Schaltfläche \"Speichern\", um die von Ihnen und anderen vorgenommenen Änderungen zu synchronisieren.",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "Aktuelle Änderungen annehmen",
   "Common.Views.ReviewChanges.tipCoAuthMode": "Zusammen-Bearbeitungsmodus einstellen",
+  "Common.Views.ReviewChanges.tipCompare": "Das aktuelle Dokument mit einem anderen vergleichen",
   "Common.Views.ReviewChanges.tipHistory": "Versionshistorie anzeigen",
   "Common.Views.ReviewChanges.tipRejectCurrent": "Aktuelle Änderungen ablehnen",
   "Common.Views.ReviewChanges.tipReview": "Nachverfolgen von Änderungen",
@@ -243,6 +252,7 @@
   "Common.Views.ReviewChanges.txtChat": "Chat",
   "Common.Views.ReviewChanges.txtClose": "Schließen",
   "Common.Views.ReviewChanges.txtCoAuthMode": "Modus \"Gemeinsame Bearbeitung\"",
+  "Common.Views.ReviewChanges.txtCompare": "Vergleichen",
   "Common.Views.ReviewChanges.txtDocLang": "Sprache",
   "Common.Views.ReviewChanges.txtFinal": "Alle Änderungen werden übernommen (Vorschau)",
   "Common.Views.ReviewChanges.txtFinalCap": "Endgültig",
@@ -276,6 +286,8 @@
   "Common.Views.ReviewPopover.textClose": "Schließen",
   "Common.Views.ReviewPopover.textEdit": "OK",
   "Common.Views.ReviewPopover.textFollowMove": "Verschieben nachverfolgen",
+  "Common.Views.ReviewPopover.textMention": "+Erwähnung ermöglicht den Zugriff auf das Dokument und das Senden einer E-Mail",
+  "Common.Views.ReviewPopover.textMentionNotify": "+Erwähnung benachrichtigt den Benutzer per E-Mail",
   "Common.Views.ReviewPopover.textOpenAgain": "Erneut öffnen",
   "Common.Views.ReviewPopover.textReply": "Antworten",
   "Common.Views.ReviewPopover.textResolve": "Lösen",
@@ -413,6 +425,7 @@
   "DE.Controllers.Main.txtButtons": "Buttons",
   "DE.Controllers.Main.txtCallouts": "Legenden",
   "DE.Controllers.Main.txtCharts": "Diagramme",
+  "DE.Controllers.Main.txtChoose": "Wählen Sie ein Element aus.",
   "DE.Controllers.Main.txtCurrentDocument": "Aktuelles Dokument",
   "DE.Controllers.Main.txtDiagramTitle": "Diagrammtitel",
   "DE.Controllers.Main.txtEditingMode": "Bearbeitungsmodus festlegen...",
@@ -611,6 +624,7 @@
   "DE.Controllers.Main.txtShape_wedgeRectCallout": "Rechteckige Legende",
   "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Abgerundete rechteckige Legende",
   "DE.Controllers.Main.txtStarsRibbons": "Sterne und Bänder",
+  "DE.Controllers.Main.txtStyle_Caption": "Beschriftung",
   "DE.Controllers.Main.txtStyle_footnote_text": "Fußnotentext",
   "DE.Controllers.Main.txtStyle_Heading_1": "Überschrift 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "Überschrift 2",
@@ -1008,6 +1022,20 @@
   "DE.Views.BookmarksDialog.textSort": "Sortieren nach",
   "DE.Views.BookmarksDialog.textTitle": "Lesezeichen",
   "DE.Views.BookmarksDialog.txtInvalidName": "Der Name des Lesezeichens darf nur Buchstaben, Ziffern und Unterstriche enthalten und sollte mit dem Buchstaben beginnen",
+  "DE.Views.CaptionDialog.textAdd": "Beschriftung hinzufügen",
+  "DE.Views.CaptionDialog.textAfter": "Nach",
+  "DE.Views.CaptionDialog.textBefore": "Vor ",
+  "DE.Views.CaptionDialog.textCaption": "Beschriftung",
+  "DE.Views.CaptionDialog.textChapter": "Kapitel beginnt mit Stil",
+  "DE.Views.CaptionDialog.textColon": "Doppelpunkt",
+  "DE.Views.CaptionDialog.textDash": "Gedankenstrich",
+  "DE.Views.CaptionDialog.textDelete": "Beschriftung löschen",
+  "DE.Views.CellsAddDialog.textCol": "Spalten",
+  "DE.Views.CellsAddDialog.textDown": "Unter dem Cursor",
+  "DE.Views.CellsAddDialog.textUp": "Über dem Cursor",
+  "DE.Views.CellsRemoveDialog.textCol": "Gesamte Spalte löschen",
+  "DE.Views.CellsRemoveDialog.textRow": "Ganze Zeile löschen",
+  "DE.Views.CellsRemoveDialog.textTitle": "Zellen löschen",
   "DE.Views.ChartSettings.textAdvanced": "Erweiterte Einstellungen anzeigen",
   "DE.Views.ChartSettings.textChartType": "Diagrammtyp ändern",
   "DE.Views.ChartSettings.textEditData": "Daten ändern",
@@ -1026,10 +1054,20 @@
   "DE.Views.ChartSettings.txtTight": "Passend",
   "DE.Views.ChartSettings.txtTitle": "Diagramm",
   "DE.Views.ChartSettings.txtTopAndBottom": "Oben und unten",
+  "DE.Views.CompareSettingsDialog.textChar": "Zeichen-Ebene",
+  "DE.Views.CompareSettingsDialog.textTitle": "Vergleichseinstellungen",
+  "DE.Views.ControlSettingsDialog.textAdd": "Hinzufügen",
   "DE.Views.ControlSettingsDialog.textAppearance": "Darstellung",
   "DE.Views.ControlSettingsDialog.textApplyAll": "Auf alle anwenden",
   "DE.Views.ControlSettingsDialog.textBox": "Begrenzungsrahmen",
+  "DE.Views.ControlSettingsDialog.textCheckbox": "Kontrollkästchen",
+  "DE.Views.ControlSettingsDialog.textChecked": "Häkchen-Symbol ",
   "DE.Views.ControlSettingsDialog.textColor": "Farbe",
+  "DE.Views.ControlSettingsDialog.textCombobox": "Kombinationsfeld",
+  "DE.Views.ControlSettingsDialog.textDate": "Datumsformat",
+  "DE.Views.ControlSettingsDialog.textDelete": "Löschen",
+  "DE.Views.ControlSettingsDialog.textDisplayName": "Anzeigename",
+  "DE.Views.ControlSettingsDialog.textFormat": "Datum wie folgt anzeigen",
   "DE.Views.ControlSettingsDialog.textLock": "Sperrung",
   "DE.Views.ControlSettingsDialog.textName": "Titel",
   "DE.Views.ControlSettingsDialog.textNewColor": "Benutzerdefinierte Farbe",
@@ -1038,6 +1076,7 @@
   "DE.Views.ControlSettingsDialog.textSystemColor": "System",
   "DE.Views.ControlSettingsDialog.textTag": "Tag",
   "DE.Views.ControlSettingsDialog.textTitle": "Einstellungen des Inhaltssteuerelements",
+  "DE.Views.ControlSettingsDialog.tipChange": "Symbol ändern",
   "DE.Views.ControlSettingsDialog.txtLockDelete": "Das Inhaltssteuerelement kann nicht gelöscht werden",
   "DE.Views.ControlSettingsDialog.txtLockEdit": "Der Inhalt kann nicht bearbeitet werden",
   "DE.Views.CustomColumnsDialog.textColumns": "Anzahl von Spalten",
@@ -1117,6 +1156,7 @@
   "DE.Views.DocumentHolder.textArrangeBackward": "Eine Ebene nach hinten",
   "DE.Views.DocumentHolder.textArrangeForward": "Eine Ebene nach vorne",
   "DE.Views.DocumentHolder.textArrangeFront": "In den Vordergrund bringen",
+  "DE.Views.DocumentHolder.textCells": "Zellen",
   "DE.Views.DocumentHolder.textContentControls": "Inhaltssteuerelement",
   "DE.Views.DocumentHolder.textContinueNumbering": "Nummerierung fortführen",
   "DE.Views.DocumentHolder.textCopy": "Kopieren",
@@ -1164,6 +1204,7 @@
   "DE.Views.DocumentHolder.textUpdateTOC": "Das Inhaltsverzeichnis aktualisieren",
   "DE.Views.DocumentHolder.textWrap": "Textumbruch",
   "DE.Views.DocumentHolder.tipIsLocked": "Dieses Element wird gerade von einem anderen Benutzer bearbeitet.",
+  "DE.Views.DocumentHolder.toDictionaryText": "Zum Wörterbuch hinzufügen",
   "DE.Views.DocumentHolder.txtAddBottom": "Unterer Rand hinzufügen",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Bruchstrich hinzufügen",
   "DE.Views.DocumentHolder.txtAddHor": "Horizontale Linie einfügen",
@@ -1188,6 +1229,7 @@
   "DE.Views.DocumentHolder.txtDeleteRadical": "Wurzel löschen",
   "DE.Views.DocumentHolder.txtDistribHor": "Horizontal verteilen",
   "DE.Views.DocumentHolder.txtDistribVert": "Vertikal verteilen",
+  "DE.Views.DocumentHolder.txtEmpty": "(Leer)",
   "DE.Views.DocumentHolder.txtFractionLinear": "Zu linearer Bruchrechnung ändern",
   "DE.Views.DocumentHolder.txtFractionSkewed": "Zu verzerrter Bruchrechnung ändern",
   "DE.Views.DocumentHolder.txtFractionStacked": "Zu verzerrter Bruchrechnung ändern",
@@ -1293,6 +1335,9 @@
   "DE.Views.DropcapSettingsAdvanced.textWidth": "Breite",
   "DE.Views.DropcapSettingsAdvanced.tipFontName": "Schriftart",
   "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "Keine Rahmen",
+  "DE.Views.EditListItemDialog.textDisplayName": "Anzeigename",
+  "DE.Views.EditListItemDialog.textNameError": "Der Anzeigename darf nicht leer sein.",
+  "DE.Views.EditListItemDialog.textValueError": "Ein Element mit demselben Wert ist bereits vorhanden.",
   "DE.Views.FileMenu.btnBackCaption": "Dateispeicherort öffnen",
   "DE.Views.FileMenu.btnCloseMenuCaption": "Menü schließen",
   "DE.Views.FileMenu.btnCreateNewCaption": "Neues erstellen",
@@ -1317,9 +1362,14 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Erstellen Sie ein leeres Textdokument, das Sie nach seiner Erstellung bei der Bearbeitung formatieren können. Oder wählen Sie eine der Vorlagen, um ein Dokument eines bestimmten Typs (für einen bestimmten Zweck) zu erstellen, wo einige Stile bereits angewandt sind.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Neues Textdokument",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Es gibt keine Vorlagen",
+  "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Anwenden",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Autor hinzufügen",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Text hinzufügen",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Anwendung",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Verfasser",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Zugriffsrechte ändern",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Kommentar",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Erstellt",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Ladevorgang...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Seiten",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Absätze",
@@ -1368,6 +1418,7 @@
   "DE.Views.FileMenuPanels.Settings.textAlignGuides": "Ausrichtungslinien",
   "DE.Views.FileMenuPanels.Settings.textAutoRecover": "Autowiederherstellen",
   "DE.Views.FileMenuPanels.Settings.textAutoSave": "Automatisch speichern",
+  "DE.Views.FileMenuPanels.Settings.textCompatible": "Kompatibilität",
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Deaktiviert",
   "DE.Views.FileMenuPanels.Settings.textForceSave": "Auf dem Server speichern",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Jede Minute",
@@ -1529,6 +1580,7 @@
   "DE.Views.LeftMenu.txtDeveloper": "ENTWICKLERMODUS",
   "DE.Views.LeftMenu.txtTrial": "Trial-Modus",
   "DE.Views.Links.capBtnBookmarks": "Lesezeichen",
+  "DE.Views.Links.capBtnCaption": "Beschriftung",
   "DE.Views.Links.capBtnContentsUpdate": "Aktualisierung",
   "DE.Views.Links.capBtnInsContents": "Inhaltsverzeichnis",
   "DE.Views.Links.capBtnInsFootnote": "Fußnote",
@@ -1547,6 +1599,12 @@
   "DE.Views.Links.tipContentsUpdate": "Inhaltsverzeichnis aktualisieren",
   "DE.Views.Links.tipInsertHyperlink": "Hyperlink hinzufügen",
   "DE.Views.Links.tipNotes": "Fußnoten einfügen oder bearbeiten",
+  "DE.Views.ListSettingsDialog.textAuto": "Automatisch",
+  "DE.Views.ListSettingsDialog.textCenter": "Zentriert",
+  "DE.Views.ListSettingsDialog.textNewColor": "Neue benutzerdefinierte Farbe hinzufügen",
+  "DE.Views.ListSettingsDialog.txtAlign": "Ausrichtung",
+  "DE.Views.ListSettingsDialog.txtBullet": "Aufzählungszeichen",
+  "DE.Views.ListSettingsDialog.txtColor": "Farbe",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Senden",
   "DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Thema",
@@ -1656,6 +1714,8 @@
   "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Doppeltes Durchstreichen",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Links",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Rechts",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "Nach",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Vor ",
   "DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Absatz zusammenhalten",
   "DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Absätze nicht trennen",
   "DE.Views.ParagraphSettingsAdvanced.strMargins": "Auffüllen",
@@ -1669,11 +1729,14 @@
   "DE.Views.ParagraphSettingsAdvanced.strSuperscript": "Hochgestellt",
   "DE.Views.ParagraphSettingsAdvanced.strTabs": "Tabulator",
   "DE.Views.ParagraphSettingsAdvanced.textAlign": "Ausrichtung",
+  "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "Mindestens",
   "DE.Views.ParagraphSettingsAdvanced.textBackColor": "Hintergrundfarbe",
+  "DE.Views.ParagraphSettingsAdvanced.textBodyText": "Basistext",
   "DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Rahmenfarbe",
   "DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Klicken Sie aufs Diagramm oder nutzen Sie die Buttons, um Umrandungen zu wählen und den gewählten Stil anzuwenden",
   "DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Rahmenstärke",
   "DE.Views.ParagraphSettingsAdvanced.textBottom": "Unten",
+  "DE.Views.ParagraphSettingsAdvanced.textCentered": "Zentriert",
   "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Zeichenabstand",
   "DE.Views.ParagraphSettingsAdvanced.textDefault": "Standardregisterkarte",
   "DE.Views.ParagraphSettingsAdvanced.textEffects": "Effekte",
@@ -1681,6 +1744,7 @@
   "DE.Views.ParagraphSettingsAdvanced.textLeft": "Links",
   "DE.Views.ParagraphSettingsAdvanced.textNewColor": "Benutzerdefinierte Farbe",
   "DE.Views.ParagraphSettingsAdvanced.textNone": "Kein",
+  "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(Keiner)",
   "DE.Views.ParagraphSettingsAdvanced.textPosition": "Position",
   "DE.Views.ParagraphSettingsAdvanced.textRemove": "Löschen",
   "DE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Alle löschen",
@@ -1701,6 +1765,7 @@
   "DE.Views.ParagraphSettingsAdvanced.tipOuter": "Nur äußere Rahmenlinie festlegen",
   "DE.Views.ParagraphSettingsAdvanced.tipRight": "Nur rechte Rahmenlinie festlegen",
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Nur obere Rahmenlinie festlegen",
+  "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Automatisch",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Keine Rahmen",
   "DE.Views.RightMenu.txtChartSettings": "Diagrammeinstellungen",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Kopf- und Fußzeileneinstellungen",
@@ -1868,6 +1933,9 @@
   "DE.Views.TableSettings.tipRight": "Nur äußere rechte Rahmenlinie festlegen",
   "DE.Views.TableSettings.tipTop": "Nur äußere obere Rahmenlinie festlegen",
   "DE.Views.TableSettings.txtNoBorders": "Keine Rahmen",
+  "DE.Views.TableSettings.txtTable_Accent": "Akzent",
+  "DE.Views.TableSettings.txtTable_Colorful": "Farbig",
+  "DE.Views.TableSettings.txtTable_Dark": "Dunkel",
   "DE.Views.TableSettingsAdvanced.textAlign": "Ausrichtung",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Ausrichtung",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Abstand zwischen Zellen zulassen",
@@ -1961,6 +2029,7 @@
   "DE.Views.TextArtSettings.textTemplate": "Vorlage",
   "DE.Views.TextArtSettings.textTransform": "Transformieren",
   "DE.Views.TextArtSettings.txtNoBorders": "Keine Linie",
+  "DE.Views.Toolbar.capBtnAddComment": "Kommentar hinzufügen",
   "DE.Views.Toolbar.capBtnBlankPage": "Leere Seite",
   "DE.Views.Toolbar.capBtnColumns": "Spalten",
   "DE.Views.Toolbar.capBtnComment": "Kommentar",
@@ -1998,13 +2067,17 @@
   "DE.Views.Toolbar.textAutoColor": "Automatisch",
   "DE.Views.Toolbar.textBold": "Fett",
   "DE.Views.Toolbar.textBottom": "Unten: ",
+  "DE.Views.Toolbar.textCheckboxControl": "Kontrollkästchen",
   "DE.Views.Toolbar.textColumnsCustom": "Benutzerdefinierte Spalten",
   "DE.Views.Toolbar.textColumnsLeft": "Links",
   "DE.Views.Toolbar.textColumnsOne": "Ein",
   "DE.Views.Toolbar.textColumnsRight": "Rechts",
   "DE.Views.Toolbar.textColumnsThree": "Drei",
   "DE.Views.Toolbar.textColumnsTwo": "Zwei",
+  "DE.Views.Toolbar.textComboboxControl": "Kombinationsfeld",
   "DE.Views.Toolbar.textContPage": "Fortlaufende Seite",
+  "DE.Views.Toolbar.textDateControl": "Datum",
+  "DE.Views.Toolbar.textEditWatermark": "Benutzerdefiniertes Wasserzeichen",
   "DE.Views.Toolbar.textEvenPage": "Gerade Seite",
   "DE.Views.Toolbar.textInMargin": "Im Rand",
   "DE.Views.Toolbar.textInsColumnBreak": "Spaltenumbruch einfügen",
@@ -2075,7 +2148,6 @@
   "DE.Views.Toolbar.tipFontColor": "Schriftfarbe",
   "DE.Views.Toolbar.tipFontName": "Schriftart",
   "DE.Views.Toolbar.tipFontSize": "Schriftgrad",
-  "DE.Views.Toolbar.tipHAligh": "Horizontale Ausrichtung",
   "DE.Views.Toolbar.tipHighlightColor": "Texthervorhebungsfarbe",
   "DE.Views.Toolbar.tipImgAlign": "Objekte ausrichten",
   "DE.Views.Toolbar.tipImgGroup": "Objekte gruppieren",
@@ -2136,5 +2208,9 @@
   "DE.Views.Toolbar.txtScheme6": "Deimos",
   "DE.Views.Toolbar.txtScheme7": "Dactylos",
   "DE.Views.Toolbar.txtScheme8": "Bewegungsart",
-  "DE.Views.Toolbar.txtScheme9": "Phoebe"
+  "DE.Views.Toolbar.txtScheme9": "Phoebe",
+  "DE.Views.WatermarkSettingsDialog.textAuto": "Automatisch",
+  "DE.Views.WatermarkSettingsDialog.textBold": "Fett",
+  "DE.Views.WatermarkSettingsDialog.textDiagonal": "Diagonal",
+  "DE.Views.WatermarkSettingsDialog.textNewColor": "Neue benutzerdefinierte Farbe hinzufügen"
 }

apps/documenteditor/main/locale/en.json

@@ -10,6 +10,7 @@
   "Common.Controllers.ExternalMergeEditor.warningText": "The object is disabled because it is being edited by another user.",
   "Common.Controllers.ExternalMergeEditor.warningTitle": "Warning",
   "Common.Controllers.History.notcriticalErrorTitle": "Warning",
+  "Common.Controllers.ReviewChanges.textAcceptBeforeCompare": "In order to compare documents all the tracked changes in them will be considered to have been accepted. Do you want to continue?",
   "Common.Controllers.ReviewChanges.textAtLeast": "at least",
   "Common.Controllers.ReviewChanges.textAuto": "auto",
   "Common.Controllers.ReviewChanges.textBaseline": "Baseline",
@@ -68,9 +69,8 @@
   "Common.Controllers.ReviewChanges.textTableRowsDel": "<b>Table Rows Deleted<b/>",
   "Common.Controllers.ReviewChanges.textTabs": "Change tabs",
   "Common.Controllers.ReviewChanges.textUnderline": "Underline",
-  "Common.Controllers.ReviewChanges.textWidow": "Widow control",
   "Common.Controllers.ReviewChanges.textUrl": "Paste a document URL",
-  "Common.Controllers.ReviewChanges.textAcceptBeforeCompare": "In order to compare documents all the tracked changes in them will be considered to have been accepted. Do you want to continue?",
+  "Common.Controllers.ReviewChanges.textWidow": "Widow control",
   "Common.define.chartData.textArea": "Area",
   "Common.define.chartData.textBar": "Bar",
   "Common.define.chartData.textCharts": "Charts",
@@ -80,6 +80,39 @@
   "Common.define.chartData.textPoint": "XY (Scatter)",
   "Common.define.chartData.textStock": "Stock",
   "Common.define.chartData.textSurface": "Surface",
+  "Common.UI.Calendar.textApril": "April",
+  "Common.UI.Calendar.textAugust": "August",
+  "Common.UI.Calendar.textDecember": "December",
+  "Common.UI.Calendar.textFebruary": "February",
+  "Common.UI.Calendar.textJanuary": "January",
+  "Common.UI.Calendar.textJuly": "July",
+  "Common.UI.Calendar.textJune": "June",
+  "Common.UI.Calendar.textMarch": "March",
+  "Common.UI.Calendar.textMay": "May",
+  "Common.UI.Calendar.textMonths": "Months",
+  "Common.UI.Calendar.textNovember": "November",
+  "Common.UI.Calendar.textOctober": "October",
+  "Common.UI.Calendar.textSeptember": "September",
+  "Common.UI.Calendar.textShortApril": "Apr",
+  "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": "Jul",
+  "Common.UI.Calendar.textShortJune": "Jun",
+  "Common.UI.Calendar.textShortMarch": "Mar",
+  "Common.UI.Calendar.textShortMay": "May",
+  "Common.UI.Calendar.textShortMonday": "Mo",
+  "Common.UI.Calendar.textShortNovember": "Nov",
+  "Common.UI.Calendar.textShortOctober": "Oct",
+  "Common.UI.Calendar.textShortSaturday": "Sa",
+  "Common.UI.Calendar.textShortSeptember": "Sep",
+  "Common.UI.Calendar.textShortSunday": "Su",
+  "Common.UI.Calendar.textShortThursday": "Th",
+  "Common.UI.Calendar.textShortTuesday": "Tu",
+  "Common.UI.Calendar.textShortWednesday": "We",
+  "Common.UI.Calendar.textYears": "Years",
   "Common.UI.ComboBorderSize.txtNoBorders": "No borders",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
   "Common.UI.ComboDataView.emptyComboText": "No styles",
@@ -113,39 +146,6 @@
   "Common.UI.Window.textInformation": "Information",
   "Common.UI.Window.textWarning": "Warning",
   "Common.UI.Window.yesButtonText": "Yes",
-  "Common.UI.Calendar.textJanuary": "January",
-  "Common.UI.Calendar.textFebruary": "February",
-  "Common.UI.Calendar.textMarch": "March",
-  "Common.UI.Calendar.textApril": "April",
-  "Common.UI.Calendar.textMay": "May",
-  "Common.UI.Calendar.textJune": "June",
-  "Common.UI.Calendar.textJuly": "July",
-  "Common.UI.Calendar.textAugust": "August",
-  "Common.UI.Calendar.textSeptember": "September",
-  "Common.UI.Calendar.textOctober": "October",
-  "Common.UI.Calendar.textNovember": "November",
-  "Common.UI.Calendar.textDecember": "December",
-  "Common.UI.Calendar.textShortJanuary": "Jan",
-  "Common.UI.Calendar.textShortFebruary": "Feb",
-  "Common.UI.Calendar.textShortMarch": "Mar",
-  "Common.UI.Calendar.textShortApril": "Apr",
-  "Common.UI.Calendar.textShortMay": "May",
-  "Common.UI.Calendar.textShortJune": "Jun",
-  "Common.UI.Calendar.textShortJuly": "Jul",
-  "Common.UI.Calendar.textShortAugust": "Aug",
-  "Common.UI.Calendar.textShortSeptember": "Sep",
-  "Common.UI.Calendar.textShortOctober": "Oct",
-  "Common.UI.Calendar.textShortNovember": "Nov",
-  "Common.UI.Calendar.textShortDecember": "Dec",
-  "Common.UI.Calendar.textShortSunday": "Su",
-  "Common.UI.Calendar.textShortMonday": "Mo",
-  "Common.UI.Calendar.textShortTuesday": "Tu",
-  "Common.UI.Calendar.textShortWednesday": "We",
-  "Common.UI.Calendar.textShortThursday": "Th",
-  "Common.UI.Calendar.textShortFriday": "Fr",
-  "Common.UI.Calendar.textShortSaturday": "Sa",
-  "Common.UI.Calendar.textMonths": "Months",
-  "Common.UI.Calendar.textYears": "Years",
   "Common.Utils.Metric.txtCm": "cm",
   "Common.Utils.Metric.txtPt": "pt",
   "Common.Views.About.txtAddress": "address: ",
@@ -185,7 +185,7 @@
   "Common.Views.ExternalMergeEditor.textClose": "Close",
   "Common.Views.ExternalMergeEditor.textSave": "Save & Exit",
   "Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients",
-  "Common.Views.Header.labelCoUsersDescr": "Document is currently being edited by several users.",
+  "Common.Views.Header.labelCoUsersDescr": "Users who are editing the file:",
   "Common.Views.Header.textAdvSettings": "Advanced settings",
   "Common.Views.Header.textBack": "Open file location",
   "Common.Views.Header.textCompactView": "Hide Toolbar",
@@ -259,6 +259,10 @@
   "Common.Views.RenameDialog.txtInvalidName": "The file name cannot contain any of the following characters: ",
   "Common.Views.ReviewChanges.hintNext": "To next change",
   "Common.Views.ReviewChanges.hintPrev": "To previous change",
+  "Common.Views.ReviewChanges.mniFromFile": "Document from File",
+  "Common.Views.ReviewChanges.mniFromStorage": "Document from Storage",
+  "Common.Views.ReviewChanges.mniFromUrl": "Document from URL",
+  "Common.Views.ReviewChanges.mniSettings": "Comparison Settings",
   "Common.Views.ReviewChanges.strFast": "Fast",
   "Common.Views.ReviewChanges.strFastDesc": "Real-time co-editing. All changes are saved automatically.",
   "Common.Views.ReviewChanges.strStrict": "Strict",
@@ -267,6 +271,7 @@
   "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode",
   "Common.Views.ReviewChanges.tipCommentRem": "Remove comments",
   "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments",
+  "Common.Views.ReviewChanges.tipCompare": "Compare current document with another one",
   "Common.Views.ReviewChanges.tipHistory": "Show version history",
   "Common.Views.ReviewChanges.tipRejectCurrent": "Reject current change",
   "Common.Views.ReviewChanges.tipReview": "Track changes",
@@ -286,6 +291,7 @@
   "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments",
   "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments",
   "Common.Views.ReviewChanges.txtCommentRemove": "Remove",
+  "Common.Views.ReviewChanges.txtCompare": "Compare",
   "Common.Views.ReviewChanges.txtDocLang": "Language",
   "Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)",
   "Common.Views.ReviewChanges.txtFinalCap": "Final",
@@ -304,12 +310,6 @@
   "Common.Views.ReviewChanges.txtSpelling": "Spell Checking",
   "Common.Views.ReviewChanges.txtTurnon": "Track Changes",
   "Common.Views.ReviewChanges.txtView": "Display Mode",
-  "Common.Views.ReviewChanges.txtCompare": "Compare",
-  "Common.Views.ReviewChanges.tipCompare": "Compare current document with another one",
-  "Common.Views.ReviewChanges.mniFromFile": "Document from File",
-  "Common.Views.ReviewChanges.mniFromUrl": "Document from URL",
-  "Common.Views.ReviewChanges.mniFromStorage": "Document from Storage",
-  "Common.Views.ReviewChanges.mniSettings": "Comparison Settings",
   "Common.Views.ReviewChangesDialog.textTitle": "Review Changes",
   "Common.Views.ReviewChangesDialog.txtAccept": "Accept",
   "Common.Views.ReviewChangesDialog.txtAcceptAll": "Accept All Changes",
@@ -326,6 +326,7 @@
   "Common.Views.ReviewPopover.textEdit": "OK",
   "Common.Views.ReviewPopover.textFollowMove": "Follow Move",
   "Common.Views.ReviewPopover.textMention": "+mention will provide access to the document and send an email",
+  "Common.Views.ReviewPopover.textMentionNotify": "+mention will notify the user via email",
   "Common.Views.ReviewPopover.textOpenAgain": "Open Again",
   "Common.Views.ReviewPopover.textReply": "Reply",
   "Common.Views.ReviewPopover.textResolve": "Resolve",
@@ -391,6 +392,7 @@
   "DE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
   "DE.Controllers.Main.errorDataRange": "Incorrect data range.",
   "DE.Controllers.Main.errorDefaultMessage": "Error code: %1",
+  "DE.Controllers.Main.errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
   "DE.Controllers.Main.errorEditingDownloadas": "An error occurred during the work with the document.<br>Use the 'Download as...' option to save the file backup copy to your computer hard drive.",
   "DE.Controllers.Main.errorEditingSaveas": "An error occurred during the work with the document.<br>Use the 'Save as...' option to save the file backup copy to your computer hard drive.",
   "DE.Controllers.Main.errorEmailClient": "No email client could be found.",
@@ -399,7 +401,7 @@
   "DE.Controllers.Main.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
   "DE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
   "DE.Controllers.Main.errorKeyExpire": "Key descriptor expired",
-  "DE.Controllers.Main.errorMailMergeLoadFile": "Loading failed",
+  "DE.Controllers.Main.errorMailMergeLoadFile": "Loading the document failed. Please select a different file.",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Merge failed.",
   "DE.Controllers.Main.errorProcessSaveResult": "Saving failed.",
   "DE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
@@ -414,6 +416,7 @@
   "DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.",
   "DE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded",
   "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print it until the connection is restored and page is reloaded.",
+  "DE.Controllers.Main.errorCompare": "The Compare documents feature is not available in the co-editing mode.",
   "DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click \"Stay on This Page\", then \"Save\" to save them. Click \"Leave This Page\" to discard all the unsaved changes.",
   "DE.Controllers.Main.loadFontsTextText": "Loading data...",
   "DE.Controllers.Main.loadFontsTitleText": "Loading Data",
@@ -471,6 +474,7 @@
   "DE.Controllers.Main.txtButtons": "Buttons",
   "DE.Controllers.Main.txtCallouts": "Callouts",
   "DE.Controllers.Main.txtCharts": "Charts",
+  "DE.Controllers.Main.txtChoose": "Choose an item.",
   "DE.Controllers.Main.txtCurrentDocument": "Current Document",
   "DE.Controllers.Main.txtDiagramTitle": "Chart Title",
   "DE.Controllers.Main.txtEditingMode": "Set editing mode...",
@@ -490,7 +494,7 @@
   "DE.Controllers.Main.txtMissArg": "Missing Argument",
   "DE.Controllers.Main.txtMissOperator": "Missing Operator",
   "DE.Controllers.Main.txtNeedSynchronize": "You have updates",
-  "DE.Controllers.Main.txtNoTableOfContents": "No table of contents entries found.",
+  "DE.Controllers.Main.txtNoTableOfContents": "There are no headings in the document. Apply a heading style to the text so that it appears in the table of contents.",
   "DE.Controllers.Main.txtNoText": "Error! No text of specified style in document.",
   "DE.Controllers.Main.txtNotInTable": "Is Not In Table",
   "DE.Controllers.Main.txtNotValidBookmark": "Error! Not a valid bookmark self-reference.",
@@ -672,6 +676,7 @@
   "DE.Controllers.Main.txtShape_wedgeRectCallout": "Rectangular Callout",
   "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Rounded Rectangular Callout",
   "DE.Controllers.Main.txtStarsRibbons": "Stars & Ribbons",
+  "DE.Controllers.Main.txtStyle_Caption": "Caption",
   "DE.Controllers.Main.txtStyle_footnote_text": "Footnote Text",
   "DE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
@@ -699,9 +704,9 @@
   "DE.Controllers.Main.txtZeroDivide": "Zero Divide",
   "DE.Controllers.Main.unknownErrorText": "Unknown error.",
   "DE.Controllers.Main.unsupportedBrowserErrorText": "Your browser is not supported.",
-  "DE.Controllers.Main.uploadDocSizeMessage": "Maximum document size limit exceeded.",
   "DE.Controllers.Main.uploadDocExtMessage": "Unknown document format.",
   "DE.Controllers.Main.uploadDocFileCountMessage": "No documents uploaded.",
+  "DE.Controllers.Main.uploadDocSizeMessage": "Maximum document size limit exceeded.",
   "DE.Controllers.Main.uploadImageExtMessage": "Unknown image format.",
   "DE.Controllers.Main.uploadImageFileCountMessage": "No images uploaded.",
   "DE.Controllers.Main.uploadImageSizeMessage": "Maximum image size limit exceeded.",
@@ -716,7 +721,9 @@
   "DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
-  "DE.Controllers.Main.txtChoose": "Choose an item.",
+  "DE.Controllers.Main.textConvertEquation": "This equation was created with an old version of equation editor which is no longer supported. Converting this equation to Office Math ML format will make it editable.<br>Do you want to convert this equation?",
+  "DE.Controllers.Main.textApplyAll": "Apply to all equations",
+  "DE.Controllers.Main.textLearnMore": "Learn More",
   "DE.Controllers.Navigation.txtBeginning": "Beginning of document",
   "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
   "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
@@ -1127,14 +1134,27 @@
   "DE.Views.ChartSettings.txtTight": "Tight",
   "DE.Views.ChartSettings.txtTitle": "Chart",
   "DE.Views.ChartSettings.txtTopAndBottom": "Top and bottom",
-  "DE.Views.CompareSettingsDialog.textTitle": "Comparison Settings",
-  "DE.Views.CompareSettingsDialog.textShow": "Show changes at",
   "DE.Views.CompareSettingsDialog.textChar": "Character level",
+  "DE.Views.CompareSettingsDialog.textShow": "Show changes at",
+  "DE.Views.CompareSettingsDialog.textTitle": "Comparison Settings",
   "DE.Views.CompareSettingsDialog.textWord": "Word level",
+  "DE.Views.ControlSettingsDialog.strGeneral": "General",
+  "DE.Views.ControlSettingsDialog.textAdd": "Add",
   "DE.Views.ControlSettingsDialog.textAppearance": "Appearance",
   "DE.Views.ControlSettingsDialog.textApplyAll": "Apply to All",
   "DE.Views.ControlSettingsDialog.textBox": "Bounding box",
+  "DE.Views.ControlSettingsDialog.textChange": "Edit",
+  "DE.Views.ControlSettingsDialog.textCheckbox": "Check box",
+  "DE.Views.ControlSettingsDialog.textChecked": "Checked symbol",
   "DE.Views.ControlSettingsDialog.textColor": "Color",
+  "DE.Views.ControlSettingsDialog.textCombobox": "Combo box",
+  "DE.Views.ControlSettingsDialog.textDate": "Date format",
+  "DE.Views.ControlSettingsDialog.textDelete": "Delete",
+  "DE.Views.ControlSettingsDialog.textDisplayName": "Display name",
+  "DE.Views.ControlSettingsDialog.textDown": "Down",
+  "DE.Views.ControlSettingsDialog.textDropDown": "Drop-down list",
+  "DE.Views.ControlSettingsDialog.textFormat": "Display the date like this",
+  "DE.Views.ControlSettingsDialog.textLang": "Language",
   "DE.Views.ControlSettingsDialog.textLock": "Locking",
   "DE.Views.ControlSettingsDialog.textName": "Title",
   "DE.Views.ControlSettingsDialog.textNewColor": "Add New Custom Color",
@@ -1143,29 +1163,22 @@
   "DE.Views.ControlSettingsDialog.textSystemColor": "System",
   "DE.Views.ControlSettingsDialog.textTag": "Tag",
   "DE.Views.ControlSettingsDialog.textTitle": "Content Control Settings",
+  "DE.Views.ControlSettingsDialog.textUnchecked": "Unchecked symbol",
+  "DE.Views.ControlSettingsDialog.textUp": "Up",
+  "DE.Views.ControlSettingsDialog.textValue": "Value",
+  "DE.Views.ControlSettingsDialog.tipChange": "Change symbol",
   "DE.Views.ControlSettingsDialog.txtLockDelete": "Content control cannot be deleted",
   "DE.Views.ControlSettingsDialog.txtLockEdit": "Contents cannot be edited",
-  "DE.Views.ControlSettingsDialog.strGeneral": "General",
-  "DE.Views.ControlSettingsDialog.textAdd": "Add",
-  "DE.Views.ControlSettingsDialog.textChange": "Edit",
-  "DE.Views.ControlSettingsDialog.textDelete": "Delete",
-  "DE.Views.ControlSettingsDialog.textUp": "Up",
-  "DE.Views.ControlSettingsDialog.textDown": "Down",
-  "DE.Views.ControlSettingsDialog.textCombobox": "Combo box",
-  "DE.Views.ControlSettingsDialog.textDropDown": "Drop-down list",
-  "DE.Views.ControlSettingsDialog.textDisplayName": "Display name",
-  "DE.Views.ControlSettingsDialog.textValue": "Value",
-  "DE.Views.ControlSettingsDialog.textDate": "Date format",
-  "DE.Views.ControlSettingsDialog.textLang": "Language",
-  "DE.Views.ControlSettingsDialog.textFormat": "Display the date like this",
-  "DE.Views.ControlSettingsDialog.textCheckbox": "Check box",
-  "DE.Views.ControlSettingsDialog.textChecked": "Checked symbol",
-  "DE.Views.ControlSettingsDialog.textUnchecked": "Unchecked symbol",
-  "DE.Views.ControlSettingsDialog.tipChange": "Change symbol",
   "DE.Views.CustomColumnsDialog.textColumns": "Number of columns",
   "DE.Views.CustomColumnsDialog.textSeparator": "Column divider",
   "DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns",
   "DE.Views.CustomColumnsDialog.textTitle": "Columns",
+  "DE.Views.DateTimeDialog.confirmDefault": "Set default format for {0}: \"{1}\"",
+  "DE.Views.DateTimeDialog.textDefault": "Set as default",
+  "DE.Views.DateTimeDialog.textFormat": "Formats",
+  "DE.Views.DateTimeDialog.textLang": "Language",
+  "DE.Views.DateTimeDialog.textUpdate": "Update automatically",
+  "DE.Views.DateTimeDialog.txtTitle": "Date & Time",
   "DE.Views.DocumentHolder.aboveText": "Above",
   "DE.Views.DocumentHolder.addCommentText": "Add Comment",
   "DE.Views.DocumentHolder.advancedFrameText": "Frame Advanced Settings",
@@ -1313,6 +1326,7 @@
   "DE.Views.DocumentHolder.txtDeleteRadical": "Delete radical",
   "DE.Views.DocumentHolder.txtDistribHor": "Distribute Horizontally",
   "DE.Views.DocumentHolder.txtDistribVert": "Distribute Vertically",
+  "DE.Views.DocumentHolder.txtEmpty": "(Empty)",
   "DE.Views.DocumentHolder.txtFractionLinear": "Change to linear fraction",
   "DE.Views.DocumentHolder.txtFractionSkewed": "Change to skewed fraction",
   "DE.Views.DocumentHolder.txtFractionStacked": "Change to stacked fraction",
@@ -1378,7 +1392,6 @@
   "DE.Views.DocumentHolder.txtUngroup": "Ungroup",
   "DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
   "DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
-  "DE.Views.DocumentHolder.txtEmpty": "(Empty)",
   "DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
   "DE.Views.DropcapSettingsAdvanced.strDropcap": "Drop Cap",
   "DE.Views.DropcapSettingsAdvanced.strMargins": "Margins",
@@ -1422,8 +1435,8 @@
   "DE.Views.DropcapSettingsAdvanced.tipFontName": "Font",
   "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "No borders",
   "DE.Views.EditListItemDialog.textDisplayName": "Display name",
-  "DE.Views.EditListItemDialog.textValue": "Value",
   "DE.Views.EditListItemDialog.textNameError": "Display name must not be empty.",
+  "DE.Views.EditListItemDialog.textValue": "Value",
   "DE.Views.EditListItemDialog.textValueError": "An item with the same value already exists.",
   "DE.Views.FileMenu.btnBackCaption": "Open file location",
   "DE.Views.FileMenu.btnCloseMenuCaption": "Close Menu",
@@ -1529,6 +1542,7 @@
   "DE.Views.FileMenuPanels.Settings.txtPt": "Point",
   "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spell Checking",
   "DE.Views.FileMenuPanels.Settings.txtWin": "as Windows",
+  "DE.Views.FileMenuPanels.Settings.txtCacheMode": "Default cache mode",
   "DE.Views.HeaderFooterSettings.textBottomCenter": "Bottom center",
   "DE.Views.HeaderFooterSettings.textBottomLeft": "Bottom left",
   "DE.Views.HeaderFooterSettings.textBottomPage": "Bottom of Page",
@@ -1662,6 +1676,9 @@
   "DE.Views.ImageSettingsAdvanced.textWrapThroughTooltip": "Through",
   "DE.Views.ImageSettingsAdvanced.textWrapTightTooltip": "Tight",
   "DE.Views.ImageSettingsAdvanced.textWrapTopbottomTooltip": "Top and bottom",
+  "DE.Views.ImageSettingsAdvanced.textTextBox": "Text Box",
+  "DE.Views.ImageSettingsAdvanced.textAutofit": "AutoFit",
+  "DE.Views.ImageSettingsAdvanced.textResizeFit": "Resize shape to fit text",
   "DE.Views.LeftMenu.tipAbout": "About",
   "DE.Views.LeftMenu.tipChat": "Chat",
   "DE.Views.LeftMenu.tipComments": "Comments",
@@ -1673,6 +1690,7 @@
   "DE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE",
   "DE.Views.LeftMenu.txtTrial": "TRIAL MODE",
   "DE.Views.Links.capBtnBookmarks": "Bookmark",
+  "DE.Views.Links.capBtnCaption": "Caption",
   "DE.Views.Links.capBtnContentsUpdate": "Refresh",
   "DE.Views.Links.capBtnInsContents": "Table of Contents",
   "DE.Views.Links.capBtnInsFootnote": "Footnote",
@@ -1687,10 +1705,29 @@
   "DE.Views.Links.textUpdateAll": "Refresh entire table",
   "DE.Views.Links.textUpdatePages": "Refresh page numbers only",
   "DE.Views.Links.tipBookmarks": "Create a bookmark",
+  "DE.Views.Links.tipCaption": "Insert caption",
   "DE.Views.Links.tipContents": "Insert table of contents",
   "DE.Views.Links.tipContentsUpdate": "Refresh table of contents",
   "DE.Views.Links.tipInsertHyperlink": "Add hyperlink",
   "DE.Views.Links.tipNotes": "Insert or edit footnotes",
+  "DE.Views.ListSettingsDialog.textAuto": "Automatic",
+  "DE.Views.ListSettingsDialog.textCenter": "Center",
+  "DE.Views.ListSettingsDialog.textLeft": "Left",
+  "DE.Views.ListSettingsDialog.textLevel": "Level",
+  "DE.Views.ListSettingsDialog.textNewColor": "Add New Custom Color",
+  "DE.Views.ListSettingsDialog.textPreview": "Preview",
+  "DE.Views.ListSettingsDialog.textRight": "Right",
+  "DE.Views.ListSettingsDialog.txtAlign": "Alignment",
+  "DE.Views.ListSettingsDialog.txtBullet": "Bullet",
+  "DE.Views.ListSettingsDialog.txtColor": "Color",
+  "DE.Views.ListSettingsDialog.txtFont": "Font and Symbol",
+  "DE.Views.ListSettingsDialog.txtLikeText": "Like a text",
+  "DE.Views.ListSettingsDialog.txtNewBullet": "New bullet",
+  "DE.Views.ListSettingsDialog.txtNone": "None",
+  "DE.Views.ListSettingsDialog.txtSize": "Size",
+  "DE.Views.ListSettingsDialog.txtSymbol": "Symbol",
+  "DE.Views.ListSettingsDialog.txtTitle": "List Settings",
+  "DE.Views.ListSettingsDialog.txtType": "Type",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Send",
   "DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Theme",
@@ -1740,7 +1777,7 @@
   "DE.Views.MailMergeSettings.warnProcessMailMerge": "Starting merge failed",
   "DE.Views.Navigation.txtCollapse": "Collapse all",
   "DE.Views.Navigation.txtDemote": "Demote",
-  "DE.Views.Navigation.txtEmpty": "This document doesn't contain headings",
+  "DE.Views.Navigation.txtEmpty": "There are no headings in the document.<br>Apply a heading style to the text so that it appears in the table of contents.",
   "DE.Views.Navigation.txtEmptyItem": "Empty Heading",
   "DE.Views.Navigation.txtExpand": "Expand all",
   "DE.Views.Navigation.txtExpandToLevel": "Expand to level",
@@ -1769,23 +1806,23 @@
   "DE.Views.NoteSettingsDialog.textTitle": "Notes Settings",
   "DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning",
   "DE.Views.PageMarginsDialog.textBottom": "Bottom",
+  "DE.Views.PageMarginsDialog.textGutter": "Gutter",
+  "DE.Views.PageMarginsDialog.textGutterPosition": "Gutter position",
+  "DE.Views.PageMarginsDialog.textInside": "Inside",
+  "DE.Views.PageMarginsDialog.textLandscape": "Landscape",
   "DE.Views.PageMarginsDialog.textLeft": "Left",
+  "DE.Views.PageMarginsDialog.textMirrorMargins": "Mirror margins",
+  "DE.Views.PageMarginsDialog.textMultiplePages": "Multiple pages",
+  "DE.Views.PageMarginsDialog.textNormal": "Normal",
+  "DE.Views.PageMarginsDialog.textOrientation": "Orientation",
+  "DE.Views.PageMarginsDialog.textOutside": "Outside",
+  "DE.Views.PageMarginsDialog.textPortrait": "Portrait",
+  "DE.Views.PageMarginsDialog.textPreview": "Preview",
   "DE.Views.PageMarginsDialog.textRight": "Right",
   "DE.Views.PageMarginsDialog.textTitle": "Margins",
   "DE.Views.PageMarginsDialog.textTop": "Top",
   "DE.Views.PageMarginsDialog.txtMarginsH": "Top and bottom margins are too high for a given page height",
   "DE.Views.PageMarginsDialog.txtMarginsW": "Left and right margins are too wide for a given page width",
-  "DE.Views.PageMarginsDialog.textMultiplePages": "Multiple pages",
-  "DE.Views.PageMarginsDialog.textGutter": "Gutter",
-  "DE.Views.PageMarginsDialog.textGutterPosition": "Gutter position",
-  "DE.Views.PageMarginsDialog.textOrientation": "Orientation",
-  "DE.Views.PageMarginsDialog.textPreview": "Preview",
-  "DE.Views.PageMarginsDialog.textPortrait": "Portrait",
-  "DE.Views.PageMarginsDialog.textLandscape": "Landscape",
-  "DE.Views.PageMarginsDialog.textMirrorMargins": "Mirror margins",
-  "DE.Views.PageMarginsDialog.textNormal": "Normal",
-  "DE.Views.PageMarginsDialog.textInside": "Inside",
-  "DE.Views.PageMarginsDialog.textOutside": "Outside",
   "DE.Views.PageSizeDialog.textHeight": "Height",
   "DE.Views.PageSizeDialog.textPreset": "Preset",
   "DE.Views.PageSizeDialog.textTitle": "Page Size",
@@ -1995,6 +2032,7 @@
   "DE.Views.TableOfContentsSettings.txtClassic": "Classic",
   "DE.Views.TableOfContentsSettings.txtCurrent": "Current",
   "DE.Views.TableOfContentsSettings.txtModern": "Modern",
+  "DE.Views.TableOfContentsSettings.txtOnline": "Online",
   "DE.Views.TableOfContentsSettings.txtSimple": "Simple",
   "DE.Views.TableOfContentsSettings.txtStandard": "Standard",
   "DE.Views.TableSettings.deleteColumnText": "Delete Column",
@@ -2018,7 +2056,7 @@
   "DE.Views.TableSettings.textBanded": "Banded",
   "DE.Views.TableSettings.textBorderColor": "Color",
   "DE.Views.TableSettings.textBorders": "Borders Style",
-  "DE.Views.TableSettings.textCellSize": "Rows & Columns Size",
+  "DE.Views.TableSettings.textCellSize": "Rows & columns size",
   "DE.Views.TableSettings.textColumns": "Columns",
   "DE.Views.TableSettings.textDistributeCols": "Distribute columns",
   "DE.Views.TableSettings.textDistributeRows": "Distribute rows",
@@ -2172,10 +2210,12 @@
   "DE.Views.Toolbar.capImgGroup": "Group",
   "DE.Views.Toolbar.capImgWrapping": "Wrapping",
   "DE.Views.Toolbar.mniCustomTable": "Insert Custom Table",
+  "DE.Views.Toolbar.mniDrawTable": "Draw Table",
   "DE.Views.Toolbar.mniEditControls": "Control Settings",
   "DE.Views.Toolbar.mniEditDropCap": "Drop Cap Settings",
   "DE.Views.Toolbar.mniEditFooter": "Edit Footer",
   "DE.Views.Toolbar.mniEditHeader": "Edit Header",
+  "DE.Views.Toolbar.mniEraseTable": "Erase Table",
   "DE.Views.Toolbar.mniHiddenBorders": "Hidden Table Borders",
   "DE.Views.Toolbar.mniHiddenChars": "Nonprinting Characters",
   "DE.Views.Toolbar.mniHighlightControls": "Highlight Settings",
@@ -2186,13 +2226,17 @@
   "DE.Views.Toolbar.textAutoColor": "Automatic",
   "DE.Views.Toolbar.textBold": "Bold",
   "DE.Views.Toolbar.textBottom": "Bottom: ",
+  "DE.Views.Toolbar.textCheckboxControl": "Check box",
   "DE.Views.Toolbar.textColumnsCustom": "Custom Columns",
   "DE.Views.Toolbar.textColumnsLeft": "Left",
   "DE.Views.Toolbar.textColumnsOne": "One",
   "DE.Views.Toolbar.textColumnsRight": "Right",
   "DE.Views.Toolbar.textColumnsThree": "Three",
   "DE.Views.Toolbar.textColumnsTwo": "Two",
+  "DE.Views.Toolbar.textComboboxControl": "Combo box",
   "DE.Views.Toolbar.textContPage": "Continuous Page",
+  "DE.Views.Toolbar.textDateControl": "Date",
+  "DE.Views.Toolbar.textDropdownControl": "Drop-down list",
   "DE.Views.Toolbar.textEditWatermark": "Custom Watermark",
   "DE.Views.Toolbar.textEvenPage": "Even Page",
   "DE.Views.Toolbar.textInMargin": "In Margin",
@@ -2205,6 +2249,7 @@
   "DE.Views.Toolbar.textItalic": "Italic",
   "DE.Views.Toolbar.textLandscape": "Landscape",
   "DE.Views.Toolbar.textLeft": "Left: ",
+  "DE.Views.Toolbar.textListSettings": "List Settings",
   "DE.Views.Toolbar.textMarginsLast": "Last Custom",
   "DE.Views.Toolbar.textMarginsModerate": "Moderate",
   "DE.Views.Toolbar.textMarginsNarrow": "Narrow",
@@ -2218,6 +2263,7 @@
   "DE.Views.Toolbar.textOddPage": "Odd Page",
   "DE.Views.Toolbar.textPageMarginsCustom": "Custom Margins",
   "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
+  "DE.Views.Toolbar.textPictureControl": "Picture",
   "DE.Views.Toolbar.textPlainControl": "Plain text",
   "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRemoveControl": "Remove Content Control",
@@ -2265,7 +2311,6 @@
   "DE.Views.Toolbar.tipFontColor": "Font color",
   "DE.Views.Toolbar.tipFontName": "Font",
   "DE.Views.Toolbar.tipFontSize": "Font size",
-  "del_DE.Views.Toolbar.tipHAligh": "Horizontal Align",
   "DE.Views.Toolbar.tipHighlightColor": "Highlight color",
   "DE.Views.Toolbar.tipImgAlign": "Align objects",
   "DE.Views.Toolbar.tipImgGroup": "Group objects",
@@ -2329,13 +2374,8 @@
   "DE.Views.Toolbar.txtScheme7": "Equity",
   "DE.Views.Toolbar.txtScheme8": "Flow",
   "DE.Views.Toolbar.txtScheme9": "Foundry",
-  "DE.Views.Toolbar.textPictureControl": "Picture",
+  "DE.Views.Toolbar.capBtnDateTime": "Date & Time",
-  "DE.Views.Toolbar.textComboboxControl": "Combo box",
+  "DE.Views.Toolbar.tipDateTime": "Insert current date and time",
-  "DE.Views.Toolbar.textCheckboxControl": "Check box",
-  "DE.Views.Toolbar.textDropdownControl": "Drop-down list",
-  "DE.Views.Toolbar.textDateControl": "Date",
-  "DE.Views.Toolbar.mniDrawTable": "Draw Table",
-  "DE.Views.Toolbar.mniEraseTable": "Erase Table",
   "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
   "DE.Views.WatermarkSettingsDialog.textBold": "Bold",
   "DE.Views.WatermarkSettingsDialog.textColor": "Text color",

apps/documenteditor/main/locale/es.json

@@ -2087,7 +2087,6 @@
   "DE.Views.Toolbar.tipFontColor": "Color de letra",
   "DE.Views.Toolbar.tipFontName": "Tipo de letra",
   "DE.Views.Toolbar.tipFontSize": "Tamaño de letra",
-  "DE.Views.Toolbar.tipHAligh": "Alineación horizontal",
   "DE.Views.Toolbar.tipHighlightColor": "Color de resaltado",
   "DE.Views.Toolbar.tipImgAlign": "Alinear objetos",
   "DE.Views.Toolbar.tipImgGroup": "Agrupar objetos",

apps/documenteditor/main/locale/fr.json

@@ -10,6 +10,7 @@
   "Common.Controllers.ExternalMergeEditor.warningText": "L'objet est désactivé car il est en cours de modification par un autre utilisateur.",
   "Common.Controllers.ExternalMergeEditor.warningTitle": "Avertissement",
   "Common.Controllers.History.notcriticalErrorTitle": "Avertissement",
+  "Common.Controllers.ReviewChanges.textAcceptBeforeCompare": "Pour comparer les documents, toutes les modifications apportées seront considérées comme acceptées. Voulez-vous continuer ?",
   "Common.Controllers.ReviewChanges.textAtLeast": "au moins ",
   "Common.Controllers.ReviewChanges.textAuto": "auto",
   "Common.Controllers.ReviewChanges.textBaseline": "Ligne de base",
@@ -68,15 +69,50 @@
   "Common.Controllers.ReviewChanges.textTableRowsDel": "<b>Lignes de tableau supprimées<b/>",
   "Common.Controllers.ReviewChanges.textTabs": "Changer les tabulations",
   "Common.Controllers.ReviewChanges.textUnderline": "Souligné",
+  "Common.Controllers.ReviewChanges.textUrl": "Coller l'adresse URL du document",
   "Common.Controllers.ReviewChanges.textWidow": "Contrôle des veuves",
   "Common.define.chartData.textArea": "En aires",
   "Common.define.chartData.textBar": "En barre",
+  "Common.define.chartData.textCharts": "Graphiques",
   "Common.define.chartData.textColumn": "Colonne",
   "Common.define.chartData.textLine": "Graphique en ligne",
   "Common.define.chartData.textPie": "Graphiques à secteurs",
   "Common.define.chartData.textPoint": "Nuages de points (XY)",
   "Common.define.chartData.textStock": "Boursier",
   "Common.define.chartData.textSurface": "Surface",
+  "Common.UI.Calendar.textApril": "avril",
+  "Common.UI.Calendar.textAugust": "août",
+  "Common.UI.Calendar.textDecember": "décembre",
+  "Common.UI.Calendar.textFebruary": "février",
+  "Common.UI.Calendar.textJanuary": "janvier",
+  "Common.UI.Calendar.textJuly": "juillet",
+  "Common.UI.Calendar.textJune": "juin",
+  "Common.UI.Calendar.textMarch": "mars",
+  "Common.UI.Calendar.textMay": "mai",
+  "Common.UI.Calendar.textMonths": "mois",
+  "Common.UI.Calendar.textNovember": "novembre",
+  "Common.UI.Calendar.textOctober": "octobre",
+  "Common.UI.Calendar.textSeptember": "septembre",
+  "Common.UI.Calendar.textShortApril": "Avr.",
+  "Common.UI.Calendar.textShortAugust": "août",
+  "Common.UI.Calendar.textShortDecember": "déc.",
+  "Common.UI.Calendar.textShortFebruary": "févr.",
+  "Common.UI.Calendar.textShortFriday": "ven.",
+  "Common.UI.Calendar.textShortJanuary": "janv.",
+  "Common.UI.Calendar.textShortJuly": "juill.",
+  "Common.UI.Calendar.textShortJune": "juin",
+  "Common.UI.Calendar.textShortMarch": "mars",
+  "Common.UI.Calendar.textShortMay": "mai",
+  "Common.UI.Calendar.textShortMonday": "lun.",
+  "Common.UI.Calendar.textShortNovember": "nov.",
+  "Common.UI.Calendar.textShortOctober": "oct.",
+  "Common.UI.Calendar.textShortSaturday": "sam.",
+  "Common.UI.Calendar.textShortSeptember": "sept.",
+  "Common.UI.Calendar.textShortSunday": "dim.",
+  "Common.UI.Calendar.textShortThursday": "jeu.",
+  "Common.UI.Calendar.textShortTuesday": "mar.",
+  "Common.UI.Calendar.textShortWednesday": "mer.",
+  "Common.UI.Calendar.textYears": "années",
   "Common.UI.ComboBorderSize.txtNoBorders": "Pas de bordures",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Pas de bordures",
   "Common.UI.ComboDataView.emptyComboText": "Aucun style",
@@ -223,12 +259,19 @@
   "Common.Views.RenameDialog.txtInvalidName": "Un nom de fichier ne peut pas contenir les caractères suivants :",
   "Common.Views.ReviewChanges.hintNext": "À la modification suivante",
   "Common.Views.ReviewChanges.hintPrev": "À la modification précédente",
+  "Common.Views.ReviewChanges.mniFromFile": "Document à partir d'un fichier",
+  "Common.Views.ReviewChanges.mniFromStorage": "Document à partir de stockage",
+  "Common.Views.ReviewChanges.mniFromUrl": "Document à partir d'une URL",
+  "Common.Views.ReviewChanges.mniSettings": "Paramètres de comparaison",
   "Common.Views.ReviewChanges.strFast": "Rapide",
   "Common.Views.ReviewChanges.strFastDesc": "Co-édition en temps réel. Tous les changements sont enregistrés automatiquement.",
   "Common.Views.ReviewChanges.strStrict": "Strict",
   "Common.Views.ReviewChanges.strStrictDesc": "Utilisez le bouton \"Enregistrer\" pour synchroniser les modifications que vous et d'autres personnes faites.",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "Accepter la modification actuelle",
   "Common.Views.ReviewChanges.tipCoAuthMode": "Définir le mode de co-édition",
+  "Common.Views.ReviewChanges.tipCommentRem": "Supprimer les commentaires",
+  "Common.Views.ReviewChanges.tipCommentRemCurrent": "Supprimer les commentaires existants",
+  "Common.Views.ReviewChanges.tipCompare": "Comparer le document actif avec un autre document",
   "Common.Views.ReviewChanges.tipHistory": "Afficher versions",
   "Common.Views.ReviewChanges.tipRejectCurrent": "Rejeter cette modification",
   "Common.Views.ReviewChanges.tipReview": "Suivi des modifications",
@@ -243,6 +286,12 @@
   "Common.Views.ReviewChanges.txtChat": "Chat",
   "Common.Views.ReviewChanges.txtClose": "Fermer",
   "Common.Views.ReviewChanges.txtCoAuthMode": "Mode de co-édition ",
+  "Common.Views.ReviewChanges.txtCommentRemAll": "Supprimer tous les commentaires",
+  "Common.Views.ReviewChanges.txtCommentRemCurrent": "Supprimer les commentaires existants",
+  "Common.Views.ReviewChanges.txtCommentRemMy": "Supprimer mes commentaires",
+  "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Supprimer mes commentaires actuels",
+  "Common.Views.ReviewChanges.txtCommentRemove": "Supprimer",
+  "Common.Views.ReviewChanges.txtCompare": "Comparer",
   "Common.Views.ReviewChanges.txtDocLang": "Langue",
   "Common.Views.ReviewChanges.txtFinal": "Toutes les modifications acceptées (aperçu)",
   "Common.Views.ReviewChanges.txtFinalCap": "Final",
@@ -276,6 +325,8 @@
   "Common.Views.ReviewPopover.textClose": "Fermer",
   "Common.Views.ReviewPopover.textEdit": "OK",
   "Common.Views.ReviewPopover.textFollowMove": "Suivre le Mouvement",
+  "Common.Views.ReviewPopover.textMention": "+mention donne l'accès au document et notifie par courriel  ",
+  "Common.Views.ReviewPopover.textMentionNotify": "+mention notifie l'utilisateur par courriel",
   "Common.Views.ReviewPopover.textOpenAgain": "Ouvrir à nouveau",
   "Common.Views.ReviewPopover.textReply": "Répondre",
   "Common.Views.ReviewPopover.textResolve": "Résoudre",
@@ -306,6 +357,11 @@
   "Common.Views.SignSettingsDialog.textShowDate": "Afficher la date de signature à côté de la signature",
   "Common.Views.SignSettingsDialog.textTitle": "Mise en place de la signature",
   "Common.Views.SignSettingsDialog.txtEmpty": "Ce champ est obligatoire.",
+  "Common.Views.SymbolTableDialog.textCode": "Valeur Unicode HEX",
+  "Common.Views.SymbolTableDialog.textFont": "Police",
+  "Common.Views.SymbolTableDialog.textRange": "Plage",
+  "Common.Views.SymbolTableDialog.textRecent": "Caractères spéciaux récemment utilisés",
+  "Common.Views.SymbolTableDialog.textTitle": "Symbole",
   "DE.Controllers.LeftMenu.leavePageText": "Toutes les modifications non enregistrées dans ce document seront perdus.<br> Cliquez sur \"Annuler\", puis \"Enregistrer\" pour les sauver. Cliquez sur \"OK\" pour annuler toutes les modifications non enregistrées.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Document sans nom",
   "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Avertissement",
@@ -314,6 +370,7 @@
   "DE.Controllers.LeftMenu.textNoTextFound": "Votre recherche n'a donné aucun résultat.S'il vous plaît, modifiez vos critères de recherche.",
   "DE.Controllers.LeftMenu.textReplaceSkipped": "Le remplacement est fait. {0} occurrences ont été ignorées.",
   "DE.Controllers.LeftMenu.textReplaceSuccess": "La recherche est effectuée. Occurrences ont été remplacées:{0}",
+  "DE.Controllers.LeftMenu.txtCompatible": "Le fichier sera enregistré au nouveau format. Toutes les fonctionnalités des éditeurs vous seront disponibles, mais cela peut affecter la mise en page du document.<br>Activez l'option \" Compatibilité \" dans les paramètres avancés pour rendre votre fichier compatible avec les anciennes versions de MS Word.   ",
   "DE.Controllers.LeftMenu.txtUntitled": "Sans titre",
   "DE.Controllers.LeftMenu.warnDownloadAs": "Si vous continuez à enregistrer dans ce format toutes les fonctions sauf le texte seront perdues.<br>Êtes-vous sûr de vouloir continuer ?",
   "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Si vous continuer à sauvegarder dans ce format une partie de la mise en forme peut être supprimée <br>Êtes-vous sûr de vouloir continuer?",
@@ -335,6 +392,7 @@
   "DE.Controllers.Main.errorDataEncrypted": "Les modifications chiffrées ont été reçues, elle ne peuvent pas être déchiffrées.",
   "DE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
   "DE.Controllers.Main.errorDefaultMessage": "Code d'erreur: %1",
+  "DE.Controllers.Main.errorDirectUrl": "Vérifiez le lien vers le document.<br>Assurez-vous que c'est un lien de téléchargement direct. ",
   "DE.Controllers.Main.errorEditingDownloadas": "Une erreure s'est produite lors du travail avec le document.<br>Utilisez l'option 'Télécharger comme...' pour enregistrer une copie de sauvegarde du fichier sur le disque dur de votre ordinateur.",
   "DE.Controllers.Main.errorEditingSaveas": "Une erreure s'est produite lors du travail avec le document.<br>Utilisez l'option 'Enregistrer comme...' pour enregistrer une copie de sauvegarde  sur le disque dur de votre ordinateur. ",
   "DE.Controllers.Main.errorEmailClient": "Pas de client messagerie trouvé",
@@ -354,6 +412,7 @@
   "DE.Controllers.Main.errorToken": "Le jeton de sécurité du document n’était pas formé correctement.<br>Veuillez contacter l'administrateur de Document Server.",
   "DE.Controllers.Main.errorTokenExpire": "Le jeton de sécurité du document a expiré.<br>Veuillez contactez l'administrateur de votre Document Server.",
   "DE.Controllers.Main.errorUpdateVersion": "La version du fichier a été changée. La page sera rechargée.",
+  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "La connexion internet a été rétablie, la version du fichier est modifiée.<br>Avant de continuer, téléchargez le fichier ou copiez le contenu pour vous assurer que tous les changements ont été enregistrés, et rechargez la page.",
   "DE.Controllers.Main.errorUserDrop": "Impossible d'accéder au fichier",
   "DE.Controllers.Main.errorUsersExceed": "Le nombre d'utilisateurs autorisés par le plan tarifaire a été dépassé",
   "DE.Controllers.Main.errorViewerDisconnect": "La connexion a été perdue. Vous pouvez toujours afficher le document,<br>mais ne pouvez pas le télécharger ou l'imprimer jusqu'à ce que la connexion soit rétablie.",
@@ -414,6 +473,7 @@
   "DE.Controllers.Main.txtButtons": "Boutons",
   "DE.Controllers.Main.txtCallouts": "Légendes",
   "DE.Controllers.Main.txtCharts": "Graphiques",
+  "DE.Controllers.Main.txtChoose": "Choisir un élément",
   "DE.Controllers.Main.txtCurrentDocument": "Document actuel",
   "DE.Controllers.Main.txtDiagramTitle": "Titre du graphique",
   "DE.Controllers.Main.txtEditingMode": "Définissez le mode d'édition...",
@@ -428,12 +488,15 @@
   "DE.Controllers.Main.txtHyperlink": "Lien hypertexte",
   "DE.Controllers.Main.txtIndTooLarge": "Index trop long",
   "DE.Controllers.Main.txtLines": "Lignes",
+  "DE.Controllers.Main.txtMainDocOnly": "Erreur ! Document principal seulement.",
   "DE.Controllers.Main.txtMath": "Maths",
   "DE.Controllers.Main.txtMissArg": "Argument Manquant",
   "DE.Controllers.Main.txtMissOperator": "Operateur Manquant",
   "DE.Controllers.Main.txtNeedSynchronize": "Vous avez des mises à jour",
   "DE.Controllers.Main.txtNoTableOfContents": "Aucune entrée de table des matières trouvée.",
+  "DE.Controllers.Main.txtNoText": "Erreur ! Il n'y a pas de texte répondant à ce style dans ce document.",
   "DE.Controllers.Main.txtNotInTable": "n'est pas dans le tableau",
+  "DE.Controllers.Main.txtNotValidBookmark": "Erreur ! Référence non valide pour un signet.",
   "DE.Controllers.Main.txtOddPage": "Page impaire",
   "DE.Controllers.Main.txtOnPage": "sur la page",
   "DE.Controllers.Main.txtRectangles": "Rectangles",
@@ -612,6 +675,7 @@
   "DE.Controllers.Main.txtShape_wedgeRectCallout": "Rectangle",
   "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Rectangle à coins arrondis",
   "DE.Controllers.Main.txtStarsRibbons": "Étoiles et rubans",
+  "DE.Controllers.Main.txtStyle_Caption": "Légende",
   "DE.Controllers.Main.txtStyle_footnote_text": "Texte de la note de bas de page",
   "DE.Controllers.Main.txtStyle_Heading_1": "Titre 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "Titre 2",
@@ -639,6 +703,9 @@
   "DE.Controllers.Main.txtZeroDivide": "Division par Zéro",
   "DE.Controllers.Main.unknownErrorText": "Erreur inconnue.",
   "DE.Controllers.Main.unsupportedBrowserErrorText": "Votre navigateur n'est pas pris en charge.",
+  "DE.Controllers.Main.uploadDocExtMessage": "Format de fichier inconnu.",
+  "DE.Controllers.Main.uploadDocFileCountMessage": "Aucun fichier n'a été chargé.",
+  "DE.Controllers.Main.uploadDocSizeMessage": "La taille du fichier dépasse la limite autorisée.",
   "DE.Controllers.Main.uploadImageExtMessage": "Format d'image inconnu.",
   "DE.Controllers.Main.uploadImageFileCountMessage": "Pas d'images chargées.",
   "DE.Controllers.Main.uploadImageSizeMessage": "La taille de l'image dépasse la limite maximale.",
@@ -667,6 +734,7 @@
   "DE.Controllers.Toolbar.textFontSizeErr": "La valeur entrée est incorrecte.<br>Entrez une valeur numérique entre 1 et 100",
   "DE.Controllers.Toolbar.textFraction": "Fractions",
   "DE.Controllers.Toolbar.textFunction": "Fonctions",
+  "DE.Controllers.Toolbar.textInsert": "Insérer",
   "DE.Controllers.Toolbar.textIntegral": "Intégrales",
   "DE.Controllers.Toolbar.textLargeOperator": "Grands opérateurs",
   "DE.Controllers.Toolbar.textLimitAndLog": "Limites et logarithmes ",
@@ -996,6 +1064,8 @@
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zêta",
   "DE.Controllers.Viewport.textFitPage": "Ajuster à la page",
   "DE.Controllers.Viewport.textFitWidth": "Ajuster à la largeur",
+  "DE.Views.AddNewCaptionLabelDialog.textLabel": "Étiquette :",
+  "DE.Views.AddNewCaptionLabelDialog.textLabelError": "Étiquette ne doit pas être vide",
   "DE.Views.BookmarksDialog.textAdd": "Ajouter",
   "DE.Views.BookmarksDialog.textBookmarkName": "Nom du signet",
   "DE.Views.BookmarksDialog.textClose": "Fermer",
@@ -1009,6 +1079,28 @@
   "DE.Views.BookmarksDialog.textSort": "Trier par",
   "DE.Views.BookmarksDialog.textTitle": "Signets",
   "DE.Views.BookmarksDialog.txtInvalidName": "Nom du signet ne peut pas contenir que des lettres, des  chiffres et des barres de soulignement et doit commencer avec une lettre",
+  "DE.Views.CaptionDialog.textAdd": "Ajouter une étiquette",
+  "DE.Views.CaptionDialog.textAfter": "Après",
+  "DE.Views.CaptionDialog.textBefore": "Avant",
+  "DE.Views.CaptionDialog.textCaption": "Légende",
+  "DE.Views.CaptionDialog.textChapter": "Style de début de chapitre",
+  "DE.Views.CaptionDialog.textChapterInc": "Inclure le numéro de chapitre",
+  "DE.Views.CaptionDialog.textColon": "Deux-points",
+  "DE.Views.CaptionDialog.textDash": "tiret",
+  "DE.Views.CaptionDialog.textDelete": "Supprimer une étiquette",
+  "DE.Views.CaptionDialog.textEquation": "Équation",
+  "DE.Views.CaptionDialog.textExamples": "Exemples: Table 2-A, Image 1.IV",
+  "DE.Views.CaptionDialog.textExclude": "Exclure le texte de la légende",
+  "DE.Views.CaptionDialog.textFigure": "Figure",
+  "DE.Views.CaptionDialog.textHyphen": "trait d'union",
+  "DE.Views.CaptionDialog.textInsert": "Insérer",
+  "DE.Views.CaptionDialog.textLabel": "Étiquette",
+  "DE.Views.CaptionDialog.textLongDash": "Tiret long",
+  "DE.Views.CaptionDialog.textNumbering": "Numérotation",
+  "DE.Views.CaptionDialog.textPeriod": "Période",
+  "DE.Views.CaptionDialog.textSeparator": "Séparateur",
+  "DE.Views.CaptionDialog.textTable": "Tableau",
+  "DE.Views.CaptionDialog.textTitle": "Insérer une légende",
   "DE.Views.CellsAddDialog.textCol": "Colonnes",
   "DE.Views.CellsAddDialog.textDown": "Au-dessous du curseur",
   "DE.Views.CellsAddDialog.textLeft": "Vers la gauche",
@@ -1038,10 +1130,27 @@
   "DE.Views.ChartSettings.txtTight": "Rapproché",
   "DE.Views.ChartSettings.txtTitle": "Graphique",
   "DE.Views.ChartSettings.txtTopAndBottom": "Haut et bas",
+  "DE.Views.CompareSettingsDialog.textChar": "Niveau des caractères",
+  "DE.Views.CompareSettingsDialog.textShow": "Afficher les modifications au :",
+  "DE.Views.CompareSettingsDialog.textTitle": "Paramètres de comparaison",
+  "DE.Views.CompareSettingsDialog.textWord": "Niveau des mots",
+  "DE.Views.ControlSettingsDialog.strGeneral": "Général",
+  "DE.Views.ControlSettingsDialog.textAdd": "Ajouter",
   "DE.Views.ControlSettingsDialog.textAppearance": "Apparence",
   "DE.Views.ControlSettingsDialog.textApplyAll": "Appliquer à tous",
   "DE.Views.ControlSettingsDialog.textBox": "Boîte d'encombrement",
+  "DE.Views.ControlSettingsDialog.textChange": "Modifier",
+  "DE.Views.ControlSettingsDialog.textCheckbox": "Case à cocher",
+  "DE.Views.ControlSettingsDialog.textChecked": "Symbole Activé",
   "DE.Views.ControlSettingsDialog.textColor": "Couleur",
+  "DE.Views.ControlSettingsDialog.textCombobox": "Zone de liste déroulante",
+  "DE.Views.ControlSettingsDialog.textDate": "Format de date",
+  "DE.Views.ControlSettingsDialog.textDelete": "Effacer",
+  "DE.Views.ControlSettingsDialog.textDisplayName": "Nom d'affichage",
+  "DE.Views.ControlSettingsDialog.textDown": "Bas",
+  "DE.Views.ControlSettingsDialog.textDropDown": "Liste déroulante",
+  "DE.Views.ControlSettingsDialog.textFormat": "Afficher la date comme suit",
+  "DE.Views.ControlSettingsDialog.textLang": "Langue",
   "DE.Views.ControlSettingsDialog.textLock": "Verrouillage ",
   "DE.Views.ControlSettingsDialog.textName": "Titre",
   "DE.Views.ControlSettingsDialog.textNewColor": "Couleur personnalisée",
@@ -1050,6 +1159,10 @@
   "DE.Views.ControlSettingsDialog.textSystemColor": "Système",
   "DE.Views.ControlSettingsDialog.textTag": "Tag",
   "DE.Views.ControlSettingsDialog.textTitle": "Paramètres de contrôle du contenu",
+  "DE.Views.ControlSettingsDialog.textUnchecked": "Symbole Désactivé",
+  "DE.Views.ControlSettingsDialog.textUp": "En haut",
+  "DE.Views.ControlSettingsDialog.textValue": "Valeur",
+  "DE.Views.ControlSettingsDialog.tipChange": "Modifier le symbole",
   "DE.Views.ControlSettingsDialog.txtLockDelete": "Le contrôle du contenu ne peut pas être supprimé",
   "DE.Views.ControlSettingsDialog.txtLockEdit": "Le contenu ne peut pas être modifié",
   "DE.Views.CustomColumnsDialog.textColumns": "Nombre de colonnes",
@@ -1203,6 +1316,7 @@
   "DE.Views.DocumentHolder.txtDeleteRadical": "Supprimer radical",
   "DE.Views.DocumentHolder.txtDistribHor": "Distribuer horizontalement",
   "DE.Views.DocumentHolder.txtDistribVert": "Distribuer verticalement",
+  "DE.Views.DocumentHolder.txtEmpty": "(Vide)",
   "DE.Views.DocumentHolder.txtFractionLinear": "Modifier à la fraction linéaire",
   "DE.Views.DocumentHolder.txtFractionSkewed": "Modifier à la fraction oblique",
   "DE.Views.DocumentHolder.txtFractionStacked": "Modifier à la fraction empilée",
@@ -1229,6 +1343,7 @@
   "DE.Views.DocumentHolder.txtInsertArgAfter": "Insérez l'argument après",
   "DE.Views.DocumentHolder.txtInsertArgBefore": "Insérez argument devant",
   "DE.Views.DocumentHolder.txtInsertBreak": "Insérer pause manuelle",
+  "DE.Views.DocumentHolder.txtInsertCaption": "Insérer une légende",
   "DE.Views.DocumentHolder.txtInsertEqAfter": "Insérer équation après",
   "DE.Views.DocumentHolder.txtInsertEqBefore": "Insérez l'équation avant",
   "DE.Views.DocumentHolder.txtKeepTextOnly": "Gardez le texte seulement",
@@ -1309,6 +1424,10 @@
   "DE.Views.DropcapSettingsAdvanced.textWidth": "Largeur",
   "DE.Views.DropcapSettingsAdvanced.tipFontName": "Police",
   "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "Pas de bordures",
+  "DE.Views.EditListItemDialog.textDisplayName": "Nom d'affichage",
+  "DE.Views.EditListItemDialog.textNameError": "Veuillez renseigner le nom d'affichage.",
+  "DE.Views.EditListItemDialog.textValue": "Valeur",
+  "DE.Views.EditListItemDialog.textValueError": "Un élément avec la même valeur existe déjà.",
   "DE.Views.FileMenu.btnBackCaption": "Ouvrir l'emplacement du fichier",
   "DE.Views.FileMenu.btnCloseMenuCaption": "Fermer le menu",
   "DE.Views.FileMenu.btnCreateNewCaption": "Nouveau document",
@@ -1398,6 +1517,7 @@
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Désactivé",
   "DE.Views.FileMenuPanels.Settings.textForceSave": "Enregistrer sur le serveur",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Chaque minute",
+  "DE.Views.FileMenuPanels.Settings.textOldVersions": "Rendre les fichiers compatibles avec les anciennes versions de MS Word lorsqu'ils sont enregistrés au format DOCX",
   "DE.Views.FileMenuPanels.Settings.txtAll": "Surligner toutes les modifications",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Centimètre",
   "DE.Views.FileMenuPanels.Settings.txtFitPage": "Ajuster à la page",
@@ -1556,6 +1676,7 @@
   "DE.Views.LeftMenu.txtDeveloper": "MODE DEVELOPPEUR",
   "DE.Views.LeftMenu.txtTrial": "MODE DEMO",
   "DE.Views.Links.capBtnBookmarks": "Signet",
+  "DE.Views.Links.capBtnCaption": "Légende",
   "DE.Views.Links.capBtnContentsUpdate": "Actualiser",
   "DE.Views.Links.capBtnInsContents": "Table des matières",
   "DE.Views.Links.capBtnInsFootnote": "Note de bas de page",
@@ -1570,10 +1691,29 @@
   "DE.Views.Links.textUpdateAll": "Actualiser le tableau entier",
   "DE.Views.Links.textUpdatePages": "Actualiser les numéros de page uniquement",
   "DE.Views.Links.tipBookmarks": "Créer un signet",
+  "DE.Views.Links.tipCaption": "Insérer une légende",
   "DE.Views.Links.tipContents": "Insérer la table des matières",
   "DE.Views.Links.tipContentsUpdate": "Actualiser la table des matières",
   "DE.Views.Links.tipInsertHyperlink": "Ajouter un lien hypertexte",
   "DE.Views.Links.tipNotes": "Insérer ou modifier les notes de bas de page",
+  "DE.Views.ListSettingsDialog.textAuto": "Automatique",
+  "DE.Views.ListSettingsDialog.textCenter": "Au centre",
+  "DE.Views.ListSettingsDialog.textLeft": "A gauche",
+  "DE.Views.ListSettingsDialog.textLevel": "Niveau",
+  "DE.Views.ListSettingsDialog.textNewColor": "Ajouter une nouvelle couleur personnalisée",
+  "DE.Views.ListSettingsDialog.textPreview": "Aperçu",
+  "DE.Views.ListSettingsDialog.textRight": "A droite",
+  "DE.Views.ListSettingsDialog.txtAlign": "Alignement",
+  "DE.Views.ListSettingsDialog.txtBullet": "Puce",
+  "DE.Views.ListSettingsDialog.txtColor": "Couleur",
+  "DE.Views.ListSettingsDialog.txtFont": "Symboles et caractères",
+  "DE.Views.ListSettingsDialog.txtLikeText": "En tant que texte",
+  "DE.Views.ListSettingsDialog.txtNewBullet": "Nouvelle puce",
+  "DE.Views.ListSettingsDialog.txtNone": "Rien",
+  "DE.Views.ListSettingsDialog.txtSize": "Taille",
+  "DE.Views.ListSettingsDialog.txtSymbol": "Symbole",
+  "DE.Views.ListSettingsDialog.txtTitle": "Paramètres de la liste",
+  "DE.Views.ListSettingsDialog.txtType": "Type",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Envoyer",
   "DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Thème",
@@ -1652,7 +1792,18 @@
   "DE.Views.NoteSettingsDialog.textTitle": "Paramètres des notes de bas de page",
   "DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Avertissement",
   "DE.Views.PageMarginsDialog.textBottom": "Bas",
+  "DE.Views.PageMarginsDialog.textGutter": "Reliure",
+  "DE.Views.PageMarginsDialog.textGutterPosition": "Position de la reliure",
+  "DE.Views.PageMarginsDialog.textInside": "À l’intérieur",
+  "DE.Views.PageMarginsDialog.textLandscape": "Paysage",
   "DE.Views.PageMarginsDialog.textLeft": "Gauche",
+  "DE.Views.PageMarginsDialog.textMirrorMargins": "Pages en vis-à-vis",
+  "DE.Views.PageMarginsDialog.textMultiplePages": "Plusieurs pages",
+  "DE.Views.PageMarginsDialog.textNormal": "Normal",
+  "DE.Views.PageMarginsDialog.textOrientation": "Orientation",
+  "DE.Views.PageMarginsDialog.textOutside": "À l’extérieur",
+  "DE.Views.PageMarginsDialog.textPortrait": "Portrait",
+  "DE.Views.PageMarginsDialog.textPreview": "Aperçu",
   "DE.Views.PageMarginsDialog.textRight": "Droite",
   "DE.Views.PageMarginsDialog.textTitle": "Marges",
   "DE.Views.PageMarginsDialog.textTop": "Haut",
@@ -1764,6 +1915,7 @@
   "DE.Views.ShapeSettings.strFill": "Remplissage",
   "DE.Views.ShapeSettings.strForeground": "Couleur de premier plan",
   "DE.Views.ShapeSettings.strPattern": "Modèle",
+  "DE.Views.ShapeSettings.strShadow": "Ajouter une ombre",
   "DE.Views.ShapeSettings.strSize": "Taille",
   "DE.Views.ShapeSettings.strStroke": "Trait",
   "DE.Views.ShapeSettings.strTransparency": "Opacité",
@@ -1844,6 +1996,7 @@
   "DE.Views.StyleTitleDialog.textTitle": "Titre",
   "DE.Views.StyleTitleDialog.txtEmpty": "Ce champ est obligatoire",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "Le champ ne doit pas être vide",
+  "DE.Views.StyleTitleDialog.txtSameAs": "Identique au nouveau style créé",
   "DE.Views.TableFormulaDialog.textBookmark": "Coller Signet ",
   "DE.Views.TableFormulaDialog.textFormat": "Format de nombre",
   "DE.Views.TableFormulaDialog.textFormula": "Formule",
@@ -2016,6 +2169,7 @@
   "DE.Views.TextArtSettings.textTemplate": "Modèle",
   "DE.Views.TextArtSettings.textTransform": "Transformer",
   "DE.Views.TextArtSettings.txtNoBorders": "Pas de ligne",
+  "DE.Views.Toolbar.capBtnAddComment": "Ajouter un commentaire",
   "DE.Views.Toolbar.capBtnBlankPage": "Page Blanche ",
   "DE.Views.Toolbar.capBtnColumns": "Colonnes",
   "DE.Views.Toolbar.capBtnComment": "Commentaire",
@@ -2027,6 +2181,7 @@
   "DE.Views.Toolbar.capBtnInsImage": "Image",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Sauts",
   "DE.Views.Toolbar.capBtnInsShape": "Forme",
+  "DE.Views.Toolbar.capBtnInsSymbol": "Symbole",
   "DE.Views.Toolbar.capBtnInsTable": "Tableau",
   "DE.Views.Toolbar.capBtnInsTextart": "Text Art",
   "DE.Views.Toolbar.capBtnInsTextbox": "Zone de texte",
@@ -2040,10 +2195,12 @@
   "DE.Views.Toolbar.capImgGroup": "Grouper",
   "DE.Views.Toolbar.capImgWrapping": "Retour à la ligne",
   "DE.Views.Toolbar.mniCustomTable": "Inserer un tableau personnalisé",
+  "DE.Views.Toolbar.mniDrawTable": "Dessiner un tableau",
   "DE.Views.Toolbar.mniEditControls": "Paramètres de contrôle",
   "DE.Views.Toolbar.mniEditDropCap": "Paramètres de la lettrine",
   "DE.Views.Toolbar.mniEditFooter": "Modifier le pied de page",
   "DE.Views.Toolbar.mniEditHeader": "Modifier l'en-tête",
+  "DE.Views.Toolbar.mniEraseTable": "Supprimer un tableau",
   "DE.Views.Toolbar.mniHiddenBorders": "Bordures du tableau cachées",
   "DE.Views.Toolbar.mniHiddenChars": "Caractères non imprimables",
   "DE.Views.Toolbar.mniHighlightControls": "Paramètres de surbrillance",
@@ -2054,13 +2211,17 @@
   "DE.Views.Toolbar.textAutoColor": "Automatique",
   "DE.Views.Toolbar.textBold": "Gras",
   "DE.Views.Toolbar.textBottom": "En bas: ",
+  "DE.Views.Toolbar.textCheckboxControl": "Case à cocher",
   "DE.Views.Toolbar.textColumnsCustom": "Colonnes personnalisées",
   "DE.Views.Toolbar.textColumnsLeft": "A gauche",
   "DE.Views.Toolbar.textColumnsOne": "Un",
   "DE.Views.Toolbar.textColumnsRight": "A droite",
   "DE.Views.Toolbar.textColumnsThree": "Trois",
   "DE.Views.Toolbar.textColumnsTwo": "Deux",
+  "DE.Views.Toolbar.textComboboxControl": "Zone de liste déroulante",
   "DE.Views.Toolbar.textContPage": "Page continue",
+  "DE.Views.Toolbar.textDateControl": "Date",
+  "DE.Views.Toolbar.textDropdownControl": "Liste déroulante",
   "DE.Views.Toolbar.textEditWatermark": "Filigrane personnalisé",
   "DE.Views.Toolbar.textEvenPage": "Page paire",
   "DE.Views.Toolbar.textInMargin": "Dans la Marge",
@@ -2073,6 +2234,7 @@
   "DE.Views.Toolbar.textItalic": "Italique",
   "DE.Views.Toolbar.textLandscape": "Paysage",
   "DE.Views.Toolbar.textLeft": "À gauche:",
+  "DE.Views.Toolbar.textListSettings": "Paramètres de la liste",
   "DE.Views.Toolbar.textMarginsLast": "Dernière mesure",
   "DE.Views.Toolbar.textMarginsModerate": "Modérer",
   "DE.Views.Toolbar.textMarginsNarrow": "Étroit",
@@ -2086,6 +2248,7 @@
   "DE.Views.Toolbar.textOddPage": "Page impaire",
   "DE.Views.Toolbar.textPageMarginsCustom": "Marges personnalisées",
   "DE.Views.Toolbar.textPageSizeCustom": "Taille personnalisée",
+  "DE.Views.Toolbar.textPictureControl": "Image",
   "DE.Views.Toolbar.textPlainControl": "Insérer un contrôle de contenu en texte brut",
   "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRemoveControl": "Supprimer le contrôle du contenu",
@@ -2133,7 +2296,6 @@
   "DE.Views.Toolbar.tipFontColor": "Couleur de police",
   "DE.Views.Toolbar.tipFontName": "Police",
   "DE.Views.Toolbar.tipFontSize": "Taille de la police",
-  "DE.Views.Toolbar.tipHAligh": "Alignement horizontal",
   "DE.Views.Toolbar.tipHighlightColor": "Couleur de surlignage",
   "DE.Views.Toolbar.tipImgAlign": "Aligner les objets",
   "DE.Views.Toolbar.tipImgGroup": "Grouper les objets",
@@ -2145,6 +2307,7 @@
   "DE.Views.Toolbar.tipInsertImage": "Insérer une image",
   "DE.Views.Toolbar.tipInsertNum": "Insérer le numéro de page",
   "DE.Views.Toolbar.tipInsertShape": "Insérer une forme automatique",
+  "DE.Views.Toolbar.tipInsertSymbol": "Insérer un symbole",
   "DE.Views.Toolbar.tipInsertTable": "Insérer un tableau",
   "DE.Views.Toolbar.tipInsertText": "Insérez zone de texte",
   "DE.Views.Toolbar.tipInsertTextArt": "Insérer Text Art",

apps/documenteditor/main/locale/hu.json

@@ -1992,7 +1992,6 @@
   "DE.Views.Toolbar.tipFontColor": "Betűszín",
   "DE.Views.Toolbar.tipFontName": "Betűtípus",
   "DE.Views.Toolbar.tipFontSize": "Betűméret",
-  "DE.Views.Toolbar.tipHAligh": "Vízszintes rendezés",
   "DE.Views.Toolbar.tipHighlightColor": "Kiemelő szín",
   "DE.Views.Toolbar.tipImgAlign": "Objektumok rendezése",
   "DE.Views.Toolbar.tipImgGroup": "Objektum csoportok",

apps/documenteditor/main/locale/it.json

@@ -10,6 +10,7 @@
   "Common.Controllers.ExternalMergeEditor.warningText": "L'oggetto è disabilitato perché un altro utente lo sta modificando.",
   "Common.Controllers.ExternalMergeEditor.warningTitle": "Avviso",
   "Common.Controllers.History.notcriticalErrorTitle": "Avviso",
+  "Common.Controllers.ReviewChanges.textAcceptBeforeCompare": "Al fine di confrontare i documenti, tutte le modifiche rilevate verranno considerate accettate. Vuoi continuare?",
   "Common.Controllers.ReviewChanges.textAtLeast": "almeno",
   "Common.Controllers.ReviewChanges.textAuto": "auto",
   "Common.Controllers.ReviewChanges.textBaseline": "Baseline",
@@ -68,15 +69,50 @@
   "Common.Controllers.ReviewChanges.textTableRowsDel": "<b>Righe tabella eliminate</b>",
   "Common.Controllers.ReviewChanges.textTabs": "Modifica Schede",
   "Common.Controllers.ReviewChanges.textUnderline": "Sottolineato",
+  "Common.Controllers.ReviewChanges.textUrl": "Incolla l'URL di un documento",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
   "Common.define.chartData.textArea": "Aerogramma",
   "Common.define.chartData.textBar": "A barre",
+  "Common.define.chartData.textCharts": "Grafici",
   "Common.define.chartData.textColumn": "Istogramma",
   "Common.define.chartData.textLine": "A linee",
   "Common.define.chartData.textPie": "A torta",
   "Common.define.chartData.textPoint": "XY (A dispersione)",
   "Common.define.chartData.textStock": "Azionario",
   "Common.define.chartData.textSurface": "Superficie",
+  "Common.UI.Calendar.textApril": "Aprile",
+  "Common.UI.Calendar.textAugust": "Agosto",
+  "Common.UI.Calendar.textDecember": "Dicembre",
+  "Common.UI.Calendar.textFebruary": "Febbraio",
+  "Common.UI.Calendar.textJanuary": "Gennaio",
+  "Common.UI.Calendar.textJuly": "Luglio",
+  "Common.UI.Calendar.textJune": "Giugno",
+  "Common.UI.Calendar.textMarch": "Marzo",
+  "Common.UI.Calendar.textMay": "Maggio",
+  "Common.UI.Calendar.textMonths": "mesi",
+  "Common.UI.Calendar.textNovember": "Novembre",
+  "Common.UI.Calendar.textOctober": "Ottobre",
+  "Common.UI.Calendar.textSeptember": "Settembre",
+  "Common.UI.Calendar.textShortApril": "Apr",
+  "Common.UI.Calendar.textShortAugust": "Ago",
+  "Common.UI.Calendar.textShortDecember": "Dic",
+  "Common.UI.Calendar.textShortFebruary": "Feb",
+  "Common.UI.Calendar.textShortFriday": "Ven",
+  "Common.UI.Calendar.textShortJanuary": "Gen",
+  "Common.UI.Calendar.textShortJuly": "Giu",
+  "Common.UI.Calendar.textShortJune": "Giu",
+  "Common.UI.Calendar.textShortMarch": "Mar",
+  "Common.UI.Calendar.textShortMay": "Maggio",
+  "Common.UI.Calendar.textShortMonday": "Lun",
+  "Common.UI.Calendar.textShortNovember": "Nov",
+  "Common.UI.Calendar.textShortOctober": "Ott",
+  "Common.UI.Calendar.textShortSaturday": "Sab",
+  "Common.UI.Calendar.textShortSeptember": "Set",
+  "Common.UI.Calendar.textShortSunday": "Dom",
+  "Common.UI.Calendar.textShortThursday": "Gio",
+  "Common.UI.Calendar.textShortTuesday": "Mar",
+  "Common.UI.Calendar.textShortWednesday": "Mer",
+  "Common.UI.Calendar.textYears": "Anni",
   "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo",
   "Common.UI.ComboDataView.emptyComboText": "Nessuno stile",
@@ -223,12 +259,19 @@
   "Common.Views.RenameDialog.txtInvalidName": "Il nome del file non può contenere nessuno dei seguenti caratteri:",
   "Common.Views.ReviewChanges.hintNext": "Alla modifica successiva",
   "Common.Views.ReviewChanges.hintPrev": "Alla modifica precedente",
+  "Common.Views.ReviewChanges.mniFromFile": "Documento da File",
+  "Common.Views.ReviewChanges.mniFromStorage": "Documento da spazio di archiviazione",
+  "Common.Views.ReviewChanges.mniFromUrl": "Documento da URL",
+  "Common.Views.ReviewChanges.mniSettings": "Impostazioni di confronto",
   "Common.Views.ReviewChanges.strFast": "Rapido",
   "Common.Views.ReviewChanges.strFastDesc": "co-editing in teampo reale. Tutte le modifiche vengono salvate automaticamente.",
   "Common.Views.ReviewChanges.strStrict": "Necessita di conferma",
   "Common.Views.ReviewChanges.strStrictDesc": "Usa il pulsante 'Salva' per sincronizzare le tue modifiche con quelle effettuate da altri.",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "Accetta la modifica corrente",
   "Common.Views.ReviewChanges.tipCoAuthMode": "Imposta modalità co-editing",
+  "Common.Views.ReviewChanges.tipCommentRem": "Rimuovi i commenti",
+  "Common.Views.ReviewChanges.tipCommentRemCurrent": "Rimuovi i commenti correnti",
+  "Common.Views.ReviewChanges.tipCompare": "Confronta il documento corrente con un altro",
   "Common.Views.ReviewChanges.tipHistory": "Mostra Cronologia versioni",
   "Common.Views.ReviewChanges.tipRejectCurrent": "Annulla la modifica attuale",
   "Common.Views.ReviewChanges.tipReview": "Traccia cambiamenti",
@@ -243,6 +286,12 @@
   "Common.Views.ReviewChanges.txtChat": "Chat",
   "Common.Views.ReviewChanges.txtClose": "Chiudi",
   "Common.Views.ReviewChanges.txtCoAuthMode": "Modalità di co-editing",
+  "Common.Views.ReviewChanges.txtCommentRemAll": "Rimuovi tutti i commenti",
+  "Common.Views.ReviewChanges.txtCommentRemCurrent": "Rimuovi i commenti correnti",
+  "Common.Views.ReviewChanges.txtCommentRemMy": "Rimuovi i miei commenti",
+  "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Rimuovi i miei commenti attuali",
+  "Common.Views.ReviewChanges.txtCommentRemove": "Elimina",
+  "Common.Views.ReviewChanges.txtCompare": "Confrontare",
   "Common.Views.ReviewChanges.txtDocLang": "Lingua",
   "Common.Views.ReviewChanges.txtFinal": "Tutti i cambiamenti accettati (anteprima)",
   "Common.Views.ReviewChanges.txtFinalCap": "Finale",
@@ -277,6 +326,7 @@
   "Common.Views.ReviewPopover.textEdit": "OK",
   "Common.Views.ReviewPopover.textFollowMove": "Segui mossa",
   "Common.Views.ReviewPopover.textMention": "+mention fornirà l'accesso al documento e invierà un'e-mail",
+  "Common.Views.ReviewPopover.textMentionNotify": "+mention avviserà l'utente via e-mail",
   "Common.Views.ReviewPopover.textOpenAgain": "Apri di nuovo",
   "Common.Views.ReviewPopover.textReply": "Rispondi",
   "Common.Views.ReviewPopover.textResolve": "Risolvere",
@@ -307,11 +357,16 @@
   "Common.Views.SignSettingsDialog.textShowDate": "Mostra la data nella riga di Firma",
   "Common.Views.SignSettingsDialog.textTitle": "Impostazioni firma",
   "Common.Views.SignSettingsDialog.txtEmpty": "Campo obbligatorio",
+  "Common.Views.SymbolTableDialog.textCode": "valore Unicode HEX",
+  "Common.Views.SymbolTableDialog.textFont": "Carattere",
+  "Common.Views.SymbolTableDialog.textRange": "Intervallo",
+  "Common.Views.SymbolTableDialog.textRecent": "Simboli usati di recente",
+  "Common.Views.SymbolTableDialog.textTitle": "Simbolo",
   "DE.Controllers.LeftMenu.leavePageText": "Tutte le modifiche non salvate nel documento verranno perse.<br> Clicca \"Annulla\" e poi \"Salva\" per salvarle. Clicca \"OK\" per annullare tutte le modifiche non salvate.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Documento senza nome",
   "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Avviso",
   "DE.Controllers.LeftMenu.requestEditRightsText": "Richiesta di autorizzazione di modifica...",
-  "DE.Controllers.LeftMenu.textLoadHistory": "Loading version history...",
+  "DE.Controllers.LeftMenu.textLoadHistory": "Caricamento Cronologia....",
   "DE.Controllers.LeftMenu.textNoTextFound": "I dati da cercare non sono stati trovati. Modifica i parametri di ricerca.",
   "DE.Controllers.LeftMenu.textReplaceSkipped": "La sostituzione è stata effettuata. {0} occorrenze sono state saltate.",
   "DE.Controllers.LeftMenu.textReplaceSuccess": "La ricerca è stata effettuata. Occorrenze sostituite: {0}",
@@ -337,10 +392,12 @@
   "DE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.",
   "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
   "DE.Controllers.Main.errorDefaultMessage": "Codice errore: %1",
+  "DE.Controllers.Main.errorDirectUrl": "Verifica il link al documento.<br>Questo link deve essere un link diretto al file per il download.",
   "DE.Controllers.Main.errorEditingDownloadas": "Si è verificato un errore durante il lavoro con il documento.<br>Utilizzare l'opzione 'Scarica come ...' per salvare la copia di backup del file sul disco rigido del computer.",
   "DE.Controllers.Main.errorEditingSaveas": "Si è verificato un errore durante il lavoro con il documento.<br>Utilizzare l'opzione 'Salva come ...' per salvare la copia di backup del file sul disco rigido del computer.",
   "DE.Controllers.Main.errorEmailClient": "Non è stato trovato nessun client di posta elettronica.",
   "DE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
+  "DE.Controllers.Main.errorFileSizeExceed": "La dimensione del file supera la limitazione impostata per il tuo server.<br>Per i dettagli, contatta l'amministratore del Document server.",
   "DE.Controllers.Main.errorForceSave": "Si è verificato un errore durante il salvataggio del file. Utilizzare l'opzione 'Scarica come' per salvare il file sul disco rigido del computer o riprovare più tardi.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descrittore di chiave sconosciuto",
   "DE.Controllers.Main.errorKeyExpire": "Descrittore di chiave scaduto",
@@ -355,6 +412,7 @@
   "DE.Controllers.Main.errorToken": "Il token di sicurezza del documento non è stato creato correttamente.<br>Si prega di contattare l'amministratore del Server dei Documenti.",
   "DE.Controllers.Main.errorTokenExpire": "Il token di sicurezza del documento è scaduto.<br>Si prega di contattare l'amministratore del Server dei Documenti.",
   "DE.Controllers.Main.errorUpdateVersion": "La versione file è stata moificata. La pagina verrà ricaricata.",
+  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "La connessione Internet è stata ripristinata e la versione del file è stata modificata.<br>Prima di poter continuare a lavorare, è necessario scaricare il file o copiarne il contenuto per assicurarsi che non vada perso nulla, successivamente ricaricare questa pagina.",
   "DE.Controllers.Main.errorUserDrop": "Impossibile accedere al file subito.",
   "DE.Controllers.Main.errorUsersExceed": "E' stato superato il numero di utenti consentito dal piano tariffario",
   "DE.Controllers.Main.errorViewerDisconnect": "La connessione è stata persa. Puoi ancora vedere il documento,<br>ma non puoi scaricarlo o stamparlo fino a che la connessione non sarà ripristinata.",
@@ -415,6 +473,7 @@
   "DE.Controllers.Main.txtButtons": "Bottoni",
   "DE.Controllers.Main.txtCallouts": "Callout",
   "DE.Controllers.Main.txtCharts": "Grafici",
+  "DE.Controllers.Main.txtChoose": "Scegli un oggetto.",
   "DE.Controllers.Main.txtCurrentDocument": "Documento Corrente",
   "DE.Controllers.Main.txtDiagramTitle": "Titolo diagramma",
   "DE.Controllers.Main.txtEditingMode": "Impostazione modo di modifica...",
@@ -429,12 +488,15 @@
   "DE.Controllers.Main.txtHyperlink": "Collegamento ipertestuale",
   "DE.Controllers.Main.txtIndTooLarge": "Indice troppo grande",
   "DE.Controllers.Main.txtLines": "Linee",
+  "DE.Controllers.Main.txtMainDocOnly": "Errore! Solo documento principale.",
   "DE.Controllers.Main.txtMath": "Matematica",
   "DE.Controllers.Main.txtMissArg": "Argomento mancante",
   "DE.Controllers.Main.txtMissOperator": "Operatore mancante",
   "DE.Controllers.Main.txtNeedSynchronize": "Ci sono aggiornamenti disponibili",
   "DE.Controllers.Main.txtNoTableOfContents": "Sommario non trovato",
+  "DE.Controllers.Main.txtNoText": "Errore! Nessuno stile specificato per il testo nel documento.",
   "DE.Controllers.Main.txtNotInTable": "Non è in Tabella",
+  "DE.Controllers.Main.txtNotValidBookmark": "Errore! Non è un riferimento personale valido per i segnalibri.",
   "DE.Controllers.Main.txtOddPage": "Pagina dispari",
   "DE.Controllers.Main.txtOnPage": "sulla pagina",
   "DE.Controllers.Main.txtRectangles": "Rettangoli",
@@ -613,6 +675,7 @@
   "DE.Controllers.Main.txtShape_wedgeRectCallout": "Callout Rettangolare",
   "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Callout Rettangolare arrotondato",
   "DE.Controllers.Main.txtStarsRibbons": "Stelle e nastri",
+  "DE.Controllers.Main.txtStyle_Caption": "Didascalia",
   "DE.Controllers.Main.txtStyle_footnote_text": "Nota a piè di pagina",
   "DE.Controllers.Main.txtStyle_Heading_1": "Titolo 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "Titolo 2",
@@ -640,6 +703,9 @@
   "DE.Controllers.Main.txtZeroDivide": "Diviso Zero",
   "DE.Controllers.Main.unknownErrorText": "Errore sconosciuto.",
   "DE.Controllers.Main.unsupportedBrowserErrorText": "Il tuo browser non è supportato.",
+  "DE.Controllers.Main.uploadDocExtMessage": "Formato documento sconosciuto.",
+  "DE.Controllers.Main.uploadDocFileCountMessage": "Nessun documento caricato.",
+  "DE.Controllers.Main.uploadDocSizeMessage": "Il limite massimo delle dimensioni del documento è stato superato.",
   "DE.Controllers.Main.uploadImageExtMessage": "Formato immagine sconosciuto.",
   "DE.Controllers.Main.uploadImageFileCountMessage": "Nessun immagine caricata.",
   "DE.Controllers.Main.uploadImageSizeMessage": "E' stata superata la dimensione massima.",
@@ -668,6 +734,7 @@
   "DE.Controllers.Toolbar.textFontSizeErr": "Il valore inserito non è corretto.<br>Inserisci un valore numerico compreso tra 1 e 100",
   "DE.Controllers.Toolbar.textFraction": "Frazioni",
   "DE.Controllers.Toolbar.textFunction": "Functions",
+  "DE.Controllers.Toolbar.textInsert": "Inserisci",
   "DE.Controllers.Toolbar.textIntegral": "Integrali",
   "DE.Controllers.Toolbar.textLargeOperator": "Large Operators",
   "DE.Controllers.Toolbar.textLimitAndLog": "Limits And Logarithms",
@@ -997,6 +1064,8 @@
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "DE.Controllers.Viewport.textFitPage": "Adatta alla pagina",
   "DE.Controllers.Viewport.textFitWidth": "Adatta alla larghezza",
+  "DE.Views.AddNewCaptionLabelDialog.textLabel": "Etichetta:",
+  "DE.Views.AddNewCaptionLabelDialog.textLabelError": "L'etichetta non deve essere vuota.",
   "DE.Views.BookmarksDialog.textAdd": "Aggiungi",
   "DE.Views.BookmarksDialog.textBookmarkName": "Nome segnalibro",
   "DE.Views.BookmarksDialog.textClose": "Chiudi",
@@ -1010,16 +1079,44 @@
   "DE.Views.BookmarksDialog.textSort": "Ordina per",
   "DE.Views.BookmarksDialog.textTitle": "Segnalibri",
   "DE.Views.BookmarksDialog.txtInvalidName": "il nome del Segnalibro può contenere solo lettere, numeri e underscore, e dovrebbe iniziare con la lettera",
+  "DE.Views.CaptionDialog.textAdd": "Aggiungi",
+  "DE.Views.CaptionDialog.textAfter": "Dopo",
   "DE.Views.CaptionDialog.textBefore": "Prima",
+  "DE.Views.CaptionDialog.textCaption": "Didascalia",
+  "DE.Views.CaptionDialog.textChapter": "Il capitolo inizia con lo stile",
+  "DE.Views.CaptionDialog.textChapterInc": "Includi il numero del capitolo",
   "DE.Views.CaptionDialog.textColon": "due punti",
+  "DE.Views.CaptionDialog.textDash": "trattino",
+  "DE.Views.CaptionDialog.textDelete": "Elimina",
+  "DE.Views.CaptionDialog.textEquation": "Equazione",
+  "DE.Views.CaptionDialog.textExamples": "Esempi: Tabella 2-A, Immagine 1.IV",
+  "DE.Views.CaptionDialog.textExclude": "Escludere l'etichetta dalla didascalia",
+  "DE.Views.CaptionDialog.textFigure": "Figura",
+  "DE.Views.CaptionDialog.textHyphen": "lineetta d'unione",
+  "DE.Views.CaptionDialog.textInsert": "Inserisci",
+  "DE.Views.CaptionDialog.textLabel": "Etichetta",
+  "DE.Views.CaptionDialog.textLongDash": "trattino lungo",
+  "DE.Views.CaptionDialog.textNumbering": "Numerazione",
+  "DE.Views.CaptionDialog.textPeriod": "punto",
   "DE.Views.CaptionDialog.textSeparator": "Usa separatore",
+  "DE.Views.CaptionDialog.textTable": "Tabella",
+  "DE.Views.CaptionDialog.textTitle": "Inserisci didascalia",
   "DE.Views.CellsAddDialog.textCol": "Colonne",
+  "DE.Views.CellsAddDialog.textDown": "Sotto il cursore",
+  "DE.Views.CellsAddDialog.textLeft": "A sinistra",
+  "DE.Views.CellsAddDialog.textRight": "A destra",
+  "DE.Views.CellsAddDialog.textRow": "Righe",
+  "DE.Views.CellsAddDialog.textTitle": "Inserisci alcuni",
+  "DE.Views.CellsAddDialog.textUp": "Sopra il cursore",
+  "DE.Views.CellsRemoveDialog.textCol": "Elimina colonna",
+  "DE.Views.CellsRemoveDialog.textLeft": "Sposta celle a sinistra",
+  "DE.Views.CellsRemoveDialog.textRow": "Elimina riga",
   "DE.Views.CellsRemoveDialog.textTitle": "Elimina celle",
   "DE.Views.ChartSettings.textAdvanced": "Mostra impostazioni avanzate",
   "DE.Views.ChartSettings.textChartType": "Cambia tipo grafico",
   "DE.Views.ChartSettings.textEditData": "Modifica dati",
   "DE.Views.ChartSettings.textHeight": "Altezza",
-  "DE.Views.ChartSettings.textOriginalSize": "Predefinita",
+  "DE.Views.ChartSettings.textOriginalSize": "Dimensione reale",
   "DE.Views.ChartSettings.textSize": "Dimensione",
   "DE.Views.ChartSettings.textStyle": "Stile",
   "DE.Views.ChartSettings.textUndock": "Disancora dal pannello",
@@ -1033,10 +1130,27 @@
   "DE.Views.ChartSettings.txtTight": "Ravvicinato",
   "DE.Views.ChartSettings.txtTitle": "Grafico",
   "DE.Views.ChartSettings.txtTopAndBottom": "Sopra e sotto",
+  "DE.Views.CompareSettingsDialog.textChar": "Livello Carattere",
+  "DE.Views.CompareSettingsDialog.textShow": "Mostra modifiche a",
+  "DE.Views.CompareSettingsDialog.textTitle": "Impostazioni di confronto",
+  "DE.Views.CompareSettingsDialog.textWord": "livello di parola",
+  "DE.Views.ControlSettingsDialog.strGeneral": "Generale",
+  "DE.Views.ControlSettingsDialog.textAdd": "Aggiungi",
   "DE.Views.ControlSettingsDialog.textAppearance": "Aspetto",
   "DE.Views.ControlSettingsDialog.textApplyAll": "Applica a tutti",
   "DE.Views.ControlSettingsDialog.textBox": "Rettangolo di selezione",
+  "DE.Views.ControlSettingsDialog.textChange": "Modifica",
+  "DE.Views.ControlSettingsDialog.textCheckbox": "Casella di controllo",
+  "DE.Views.ControlSettingsDialog.textChecked": "Simbolo Controllato",
   "DE.Views.ControlSettingsDialog.textColor": "Colore",
+  "DE.Views.ControlSettingsDialog.textCombobox": "Casella combinata",
+  "DE.Views.ControlSettingsDialog.textDate": "Formato data",
+  "DE.Views.ControlSettingsDialog.textDelete": "Elimina",
+  "DE.Views.ControlSettingsDialog.textDisplayName": "Visualizza nome",
+  "DE.Views.ControlSettingsDialog.textDown": "Giù",
+  "DE.Views.ControlSettingsDialog.textDropDown": "Elenco a discesa",
+  "DE.Views.ControlSettingsDialog.textFormat": "Visualizza la data in questo modo",
+  "DE.Views.ControlSettingsDialog.textLang": "Lingua",
   "DE.Views.ControlSettingsDialog.textLock": "Blocca",
   "DE.Views.ControlSettingsDialog.textName": "Titolo",
   "DE.Views.ControlSettingsDialog.textNewColor": "Colore personalizzato",
@@ -1045,6 +1159,10 @@
   "DE.Views.ControlSettingsDialog.textSystemColor": "Sistema",
   "DE.Views.ControlSettingsDialog.textTag": "Etichetta",
   "DE.Views.ControlSettingsDialog.textTitle": "Impostazioni di controllo del contenuto",
+  "DE.Views.ControlSettingsDialog.textUnchecked": "simbolo non controllato",
+  "DE.Views.ControlSettingsDialog.textUp": "Verso l'alto",
+  "DE.Views.ControlSettingsDialog.textValue": "Valore",
+  "DE.Views.ControlSettingsDialog.tipChange": "Cambia simbolo",
   "DE.Views.ControlSettingsDialog.txtLockDelete": "Il controllo del contenuto non può essere eliminato",
   "DE.Views.ControlSettingsDialog.txtLockEdit": "I contenuti non possono essere modificati",
   "DE.Views.CustomColumnsDialog.textColumns": "Numero di colonne",
@@ -1097,7 +1215,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Unisci celle",
   "DE.Views.DocumentHolder.moreText": "Più varianti...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "Nessuna variante",
-  "DE.Views.DocumentHolder.originalSizeText": "Dimensione predefinita",
+  "DE.Views.DocumentHolder.originalSizeText": "Dimensione reale",
   "DE.Views.DocumentHolder.paragraphText": "Paragrafo",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Elimina collegamento ipertestuale",
   "DE.Views.DocumentHolder.rightText": "A destra",
@@ -1156,6 +1274,7 @@
   "DE.Views.DocumentHolder.textRotate90": "Ruota 90° a destra",
   "DE.Views.DocumentHolder.textSeparateList": "Elenco separato",
   "DE.Views.DocumentHolder.textSettings": "Impostazioni",
+  "DE.Views.DocumentHolder.textSeveral": "Alcune righe/colonne",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Allinea in basso",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Allinea al centro",
   "DE.Views.DocumentHolder.textShapeAlignLeft": "Allinea a sinistra",
@@ -1197,6 +1316,7 @@
   "DE.Views.DocumentHolder.txtDeleteRadical": "Rimuovi radicale",
   "DE.Views.DocumentHolder.txtDistribHor": "Distribuisci orizzontalmente",
   "DE.Views.DocumentHolder.txtDistribVert": "Distribuisci verticalmente",
+  "DE.Views.DocumentHolder.txtEmpty": "(Vuoto)",
   "DE.Views.DocumentHolder.txtFractionLinear": "Modifica a frazione lineare",
   "DE.Views.DocumentHolder.txtFractionSkewed": "Modifica a frazione obliqua",
   "DE.Views.DocumentHolder.txtFractionStacked": "Modifica a frazione impilata",
@@ -1223,6 +1343,7 @@
   "DE.Views.DocumentHolder.txtInsertArgAfter": "Insert argument after",
   "DE.Views.DocumentHolder.txtInsertArgBefore": "Insert argument before",
   "DE.Views.DocumentHolder.txtInsertBreak": "Insert manual break",
+  "DE.Views.DocumentHolder.txtInsertCaption": "Inserisci didascalia",
   "DE.Views.DocumentHolder.txtInsertEqAfter": "Insert equation after",
   "DE.Views.DocumentHolder.txtInsertEqBefore": "Insert equation before",
   "DE.Views.DocumentHolder.txtKeepTextOnly": "Mantieni solo il testo",
@@ -1303,6 +1424,10 @@
   "DE.Views.DropcapSettingsAdvanced.textWidth": "Larghezza",
   "DE.Views.DropcapSettingsAdvanced.tipFontName": "Tipo di carattere",
   "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "Nessun bordo",
+  "DE.Views.EditListItemDialog.textDisplayName": "Visualizza nome",
+  "DE.Views.EditListItemDialog.textNameError": "Visualizza nome non può essere vuoto.",
+  "DE.Views.EditListItemDialog.textValue": "Valore",
+  "DE.Views.EditListItemDialog.textValueError": "Un elemento con lo stesso valore esiste già.",
   "DE.Views.FileMenu.btnBackCaption": "Apri percorso file",
   "DE.Views.FileMenu.btnCloseMenuCaption": "Chiudi il menù",
   "DE.Views.FileMenu.btnCreateNewCaption": "Crea nuovo oggetto",
@@ -1455,7 +1580,7 @@
   "DE.Views.ImageSettings.textHintFlipH": "Capovolgi orizzontalmente",
   "DE.Views.ImageSettings.textHintFlipV": "Capovolgi verticalmente",
   "DE.Views.ImageSettings.textInsert": "Sostituisci immagine",
-  "DE.Views.ImageSettings.textOriginalSize": "Predefinita",
+  "DE.Views.ImageSettings.textOriginalSize": "Dimensione reale",
   "DE.Views.ImageSettings.textRotate90": "Ruota di 90°",
   "DE.Views.ImageSettings.textRotation": "Rotazione",
   "DE.Views.ImageSettings.textSize": "Dimensione",
@@ -1507,7 +1632,7 @@
   "DE.Views.ImageSettingsAdvanced.textMiter": "Acuto",
   "DE.Views.ImageSettingsAdvanced.textMove": "Sposta oggetto con testo",
   "DE.Views.ImageSettingsAdvanced.textOptions": "Opzioni",
-  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Predefinita",
+  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Dimensione reale",
   "DE.Views.ImageSettingsAdvanced.textOverlap": "Consenti sovrapposizione",
   "DE.Views.ImageSettingsAdvanced.textPage": "Pagina",
   "DE.Views.ImageSettingsAdvanced.textParagraph": "Paragrafo",
@@ -1551,6 +1676,7 @@
   "DE.Views.LeftMenu.txtDeveloper": "MODALITÀ SVILUPPATORE",
   "DE.Views.LeftMenu.txtTrial": "Modalità di prova",
   "DE.Views.Links.capBtnBookmarks": "Segnalibro",
+  "DE.Views.Links.capBtnCaption": "Didascalia",
   "DE.Views.Links.capBtnContentsUpdate": "Aggiorna",
   "DE.Views.Links.capBtnInsContents": "Sommario",
   "DE.Views.Links.capBtnInsFootnote": "Nota a piè di pagina",
@@ -1565,10 +1691,28 @@
   "DE.Views.Links.textUpdateAll": "Aggiorna intera tabella",
   "DE.Views.Links.textUpdatePages": "Aggiorna solo numeri di pagina",
   "DE.Views.Links.tipBookmarks": "Crea un segnalibro",
+  "DE.Views.Links.tipCaption": "Inserisci didascalia",
   "DE.Views.Links.tipContents": "Inserisci Sommario",
   "DE.Views.Links.tipContentsUpdate": "Aggiorna Sommario",
   "DE.Views.Links.tipInsertHyperlink": "Aggiungi collegamento ipertestuale",
   "DE.Views.Links.tipNotes": "Inserisci o modifica Note a piè di pagina",
+  "DE.Views.ListSettingsDialog.textAuto": "Automatico",
+  "DE.Views.ListSettingsDialog.textCenter": "Centrato",
+  "DE.Views.ListSettingsDialog.textLeft": "Sinistra",
+  "DE.Views.ListSettingsDialog.textLevel": "Livello",
+  "DE.Views.ListSettingsDialog.textNewColor": "Aggiungi Colore personalizzato",
+  "DE.Views.ListSettingsDialog.textPreview": "Anteprima",
+  "DE.Views.ListSettingsDialog.textRight": "Destra",
+  "DE.Views.ListSettingsDialog.txtAlign": "Allineamento",
+  "DE.Views.ListSettingsDialog.txtBullet": "Elenco puntato",
+  "DE.Views.ListSettingsDialog.txtColor": "Colore",
+  "DE.Views.ListSettingsDialog.txtFont": "Carattere e simbolo.",
+  "DE.Views.ListSettingsDialog.txtLikeText": "Come un testo",
+  "DE.Views.ListSettingsDialog.txtNone": "Nessuno",
+  "DE.Views.ListSettingsDialog.txtSize": "Dimensioni",
+  "DE.Views.ListSettingsDialog.txtSymbol": "Simbolo",
+  "DE.Views.ListSettingsDialog.txtTitle": "Impostazioni elenco",
+  "DE.Views.ListSettingsDialog.txtType": "Tipo",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Send",
   "DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Tema",
@@ -1647,7 +1791,16 @@
   "DE.Views.NoteSettingsDialog.textTitle": "Impostazioni delle note",
   "DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Avviso",
   "DE.Views.PageMarginsDialog.textBottom": "In basso",
+  "DE.Views.PageMarginsDialog.textInside": "Dentro",
+  "DE.Views.PageMarginsDialog.textLandscape": "Orizzontale",
   "DE.Views.PageMarginsDialog.textLeft": "Left",
+  "DE.Views.PageMarginsDialog.textMirrorMargins": "Margini speculari",
+  "DE.Views.PageMarginsDialog.textMultiplePages": "Più pagine",
+  "DE.Views.PageMarginsDialog.textNormal": "Normale",
+  "DE.Views.PageMarginsDialog.textOrientation": "Orientamento",
+  "DE.Views.PageMarginsDialog.textOutside": "Fuori",
+  "DE.Views.PageMarginsDialog.textPortrait": "Verticale",
+  "DE.Views.PageMarginsDialog.textPreview": "Anteprima",
   "DE.Views.PageMarginsDialog.textRight": "Right",
   "DE.Views.PageMarginsDialog.textTitle": "Margins",
   "DE.Views.PageMarginsDialog.textTop": "Top",
@@ -1840,6 +1993,7 @@
   "DE.Views.StyleTitleDialog.textTitle": "Title",
   "DE.Views.StyleTitleDialog.txtEmpty": "Campo obbligatorio",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty",
+  "DE.Views.StyleTitleDialog.txtSameAs": "Come il nuovo stile creato",
   "DE.Views.TableFormulaDialog.textBookmark": "Incolla il segnalibro",
   "DE.Views.TableFormulaDialog.textFormat": "Formato del numero",
   "DE.Views.TableFormulaDialog.textFormula": "Formula",
@@ -1884,7 +2038,7 @@
   "DE.Views.TableSettings.textBanded": "Altera",
   "DE.Views.TableSettings.textBorderColor": "Colore",
   "DE.Views.TableSettings.textBorders": "Stile bordo",
-  "DE.Views.TableSettings.textCellSize": "Dimensioni cella",
+  "DE.Views.TableSettings.textCellSize": "Dimensioni di righe e colonne",
   "DE.Views.TableSettings.textColumns": "Colonne",
   "DE.Views.TableSettings.textDistributeCols": "Distribuisci colonne",
   "DE.Views.TableSettings.textDistributeRows": "Distribuisci righe",
@@ -1911,6 +2065,14 @@
   "DE.Views.TableSettings.tipRight": "Imposta solo bordo esterno destro",
   "DE.Views.TableSettings.tipTop": "Imposta solo bordo esterno superiore",
   "DE.Views.TableSettings.txtNoBorders": "Nessun bordo",
+  "DE.Views.TableSettings.txtTable_Accent": "Accento",
+  "DE.Views.TableSettings.txtTable_Colorful": "Colorato",
+  "DE.Views.TableSettings.txtTable_Dark": "Scuro",
+  "DE.Views.TableSettings.txtTable_GridTable": "Griglia Tabella",
+  "DE.Views.TableSettings.txtTable_Light": "Chiaro",
+  "DE.Views.TableSettings.txtTable_ListTable": "Elenco Tabella",
+  "DE.Views.TableSettings.txtTable_PlainTable": "Tabella semplice",
+  "DE.Views.TableSettings.txtTable_TableGrid": "Tabella griglia",
   "DE.Views.TableSettingsAdvanced.textAlign": "Allineamento",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Allineamento",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Consenti spaziatura tra celle",
@@ -2004,6 +2166,7 @@
   "DE.Views.TextArtSettings.textTemplate": "Template",
   "DE.Views.TextArtSettings.textTransform": "Transform",
   "DE.Views.TextArtSettings.txtNoBorders": "Nessuna linea",
+  "DE.Views.Toolbar.capBtnAddComment": "Aggiungi commento",
   "DE.Views.Toolbar.capBtnBlankPage": "Pagina Vuota",
   "DE.Views.Toolbar.capBtnColumns": "Colonne",
   "DE.Views.Toolbar.capBtnComment": "Commento",
@@ -2015,6 +2178,7 @@
   "DE.Views.Toolbar.capBtnInsImage": "Foto",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Interruzione di pagina",
   "DE.Views.Toolbar.capBtnInsShape": "Forma",
+  "DE.Views.Toolbar.capBtnInsSymbol": "Simbolo",
   "DE.Views.Toolbar.capBtnInsTable": "Tabella",
   "DE.Views.Toolbar.capBtnInsTextart": "Text Art",
   "DE.Views.Toolbar.capBtnInsTextbox": "Casella di testo",
@@ -2028,10 +2192,12 @@
   "DE.Views.Toolbar.capImgGroup": "Gruppo",
   "DE.Views.Toolbar.capImgWrapping": "Disposizione",
   "DE.Views.Toolbar.mniCustomTable": "Inserisci tabella personalizzata",
+  "DE.Views.Toolbar.mniDrawTable": "Disegna Tabella",
   "DE.Views.Toolbar.mniEditControls": "Impostazioni di controllo",
   "DE.Views.Toolbar.mniEditDropCap": "Impostazioni capolettera",
   "DE.Views.Toolbar.mniEditFooter": "Modifica piè di pagina",
   "DE.Views.Toolbar.mniEditHeader": "Modifica intestazione",
+  "DE.Views.Toolbar.mniEraseTable": "Cancella Tabella",
   "DE.Views.Toolbar.mniHiddenBorders": "Bordi tabella nascosti",
   "DE.Views.Toolbar.mniHiddenChars": "Caratteri non stampabili",
   "DE.Views.Toolbar.mniHighlightControls": "selezionare impostazioni",
@@ -2042,13 +2208,17 @@
   "DE.Views.Toolbar.textAutoColor": "Automatico",
   "DE.Views.Toolbar.textBold": "Grassetto",
   "DE.Views.Toolbar.textBottom": "Bottom: ",
+  "DE.Views.Toolbar.textCheckboxControl": "Casella di controllo",
   "DE.Views.Toolbar.textColumnsCustom": "Colonne personalizzate",
   "DE.Views.Toolbar.textColumnsLeft": "Left",
   "DE.Views.Toolbar.textColumnsOne": "One",
   "DE.Views.Toolbar.textColumnsRight": "Right",
   "DE.Views.Toolbar.textColumnsThree": "Tre",
   "DE.Views.Toolbar.textColumnsTwo": "Two",
+  "DE.Views.Toolbar.textComboboxControl": "Casella combinata",
   "DE.Views.Toolbar.textContPage": "Pagina continua",
+  "DE.Views.Toolbar.textDateControl": "Data",
+  "DE.Views.Toolbar.textDropdownControl": "Elenco a discesa",
   "DE.Views.Toolbar.textEditWatermark": "Filigrana personalizzata",
   "DE.Views.Toolbar.textEvenPage": "Pagina pari",
   "DE.Views.Toolbar.textInMargin": "Nel margine",
@@ -2061,6 +2231,7 @@
   "DE.Views.Toolbar.textItalic": "Corsivo",
   "DE.Views.Toolbar.textLandscape": "Orizzontale",
   "DE.Views.Toolbar.textLeft": "Left: ",
+  "DE.Views.Toolbar.textListSettings": "Impostazioni elenco",
   "DE.Views.Toolbar.textMarginsLast": "Last Custom",
   "DE.Views.Toolbar.textMarginsModerate": "Moderare",
   "DE.Views.Toolbar.textMarginsNarrow": "Narrow",
@@ -2074,11 +2245,12 @@
   "DE.Views.Toolbar.textOddPage": "Pagina dispari",
   "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
   "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
+  "DE.Views.Toolbar.textPictureControl": "Foto",
   "DE.Views.Toolbar.textPlainControl": "Inserisci il controllo del contenuto in testo normale",
   "DE.Views.Toolbar.textPortrait": "Verticale",
   "DE.Views.Toolbar.textRemoveControl": "Rimuovi il controllo del contenuto",
   "DE.Views.Toolbar.textRemWatermark": "Rimuovi filigrana",
-  "DE.Views.Toolbar.textRichControl": "Inserisci il controllo del contenuto RTF",
+  "DE.Views.Toolbar.textRichControl": "RTF",
   "DE.Views.Toolbar.textRight": "Right: ",
   "DE.Views.Toolbar.textStrikeout": "Barrato",
   "DE.Views.Toolbar.textStyleMenuDelete": "Elimina stile",
@@ -2121,7 +2293,6 @@
   "DE.Views.Toolbar.tipFontColor": "Colore caratteri",
   "DE.Views.Toolbar.tipFontName": "Tipo di carattere",
   "DE.Views.Toolbar.tipFontSize": "Dimensione carattere",
-  "DE.Views.Toolbar.tipHAligh": "Allineamento orizzontale",
   "DE.Views.Toolbar.tipHighlightColor": "Colore evidenziatore",
   "DE.Views.Toolbar.tipImgAlign": "Allinea Oggetti",
   "DE.Views.Toolbar.tipImgGroup": "Raggruppa oggetti",
@@ -2133,6 +2304,7 @@
   "DE.Views.Toolbar.tipInsertImage": "Inserisci immagine",
   "DE.Views.Toolbar.tipInsertNum": "Inserisci numero di pagina",
   "DE.Views.Toolbar.tipInsertShape": "Inserisci forma",
+  "DE.Views.Toolbar.tipInsertSymbol": "Inserisci Simbolo",
   "DE.Views.Toolbar.tipInsertTable": "Inserisci tabella",
   "DE.Views.Toolbar.tipInsertText": "Inserisci casella di testo",
   "DE.Views.Toolbar.tipInsertTextArt": "Inserisci Text Art",

apps/documenteditor/main/locale/ja.json

@@ -1388,7 +1388,6 @@
   "DE.Views.Toolbar.tipFontColor": "フォントの色",
   "DE.Views.Toolbar.tipFontName": "フォント名",
   "DE.Views.Toolbar.tipFontSize": "フォントサイズ",
-  "DE.Views.Toolbar.tipHAligh": "左右の整列",
   "DE.Views.Toolbar.tipHighlightColor": "蛍光ペンの色",
   "DE.Views.Toolbar.tipIncFont": "フォントサイズの増分",
   "DE.Views.Toolbar.tipIncPrLeft": "インデントを増やす",

apps/documenteditor/main/locale/ko.json

@@ -1777,7 +1777,6 @@
   "DE.Views.Toolbar.tipFontColor": "글꼴 색",
   "DE.Views.Toolbar.tipFontName": "글꼴",
   "DE.Views.Toolbar.tipFontSize": "글꼴 크기",
-  "DE.Views.Toolbar.tipHAligh": "수평 정렬",
   "DE.Views.Toolbar.tipHighlightColor": "Highlight Color",
   "DE.Views.Toolbar.tipImgAlign": "오브젝트 정렬",
   "DE.Views.Toolbar.tipImgGroup": "그룹 오브젝트",

apps/documenteditor/main/locale/lv.json

@@ -1774,7 +1774,6 @@
   "DE.Views.Toolbar.tipFontColor": "Fonta krāsa",
   "DE.Views.Toolbar.tipFontName": "Fonts",
   "DE.Views.Toolbar.tipFontSize": "Fonta lielums",
-  "DE.Views.Toolbar.tipHAligh": "Horizontal Align",
   "DE.Views.Toolbar.tipHighlightColor": "Izcelt ar krāsu",
   "DE.Views.Toolbar.tipImgAlign": "Līdzināt objektus",
   "DE.Views.Toolbar.tipImgGroup": "Grupas objekti",

apps/documenteditor/main/locale/nl.json

@@ -1923,7 +1923,6 @@
   "DE.Views.Toolbar.tipFontColor": "Tekenkleur",
   "DE.Views.Toolbar.tipFontName": "Lettertype",
   "DE.Views.Toolbar.tipFontSize": "Tekengrootte",
-  "DE.Views.Toolbar.tipHAligh": "Horizontale uitlijning",
   "DE.Views.Toolbar.tipHighlightColor": "Markeringskleur",
   "DE.Views.Toolbar.tipImgAlign": "Objecten uitlijnen",
   "DE.Views.Toolbar.tipImgGroup": "Objecten groeperen",

apps/documenteditor/main/locale/pl.json

@@ -1756,7 +1756,6 @@
   "DE.Views.Toolbar.tipFontColor": "Kolor czcionki",
   "DE.Views.Toolbar.tipFontName": "Czcionka",
   "DE.Views.Toolbar.tipFontSize": "Rozmiar czcionki",
-  "DE.Views.Toolbar.tipHAligh": "Wyrównaj poziomo",
   "DE.Views.Toolbar.tipHighlightColor": "Kolor podświetlenia",
   "DE.Views.Toolbar.tipImgAlign": "Wyrównaj obiekty",
   "DE.Views.Toolbar.tipImgGroup": "Grupuj obiekty",

apps/documenteditor/main/locale/pt.json

@@ -1711,7 +1711,6 @@
   "DE.Views.Toolbar.tipFontColor": "Cor da fonte",
   "DE.Views.Toolbar.tipFontName": "Fonte",
   "DE.Views.Toolbar.tipFontSize": "Tamanho da fonte",
-  "DE.Views.Toolbar.tipHAligh": "Alinhamento horizontal",
   "DE.Views.Toolbar.tipHighlightColor": "Cor de realce",
   "DE.Views.Toolbar.tipImgAlign": "Alinhar objetos",
   "DE.Views.Toolbar.tipImgGroup": "Agrupar objetos",

apps/documenteditor/main/locale/ru.json

@@ -10,6 +10,7 @@
   "Common.Controllers.ExternalMergeEditor.warningText": "Объект недоступен, так как редактируется другим пользователем.",
   "Common.Controllers.ExternalMergeEditor.warningTitle": "Внимание",
   "Common.Controllers.History.notcriticalErrorTitle": "Внимание",
+  "Common.Controllers.ReviewChanges.textAcceptBeforeCompare": "Для сравнения документов все ослеживаемые изменения в них будут считаться принятыми. Вы хотите продолжить?",
   "Common.Controllers.ReviewChanges.textAtLeast": "Минимум",
   "Common.Controllers.ReviewChanges.textAuto": "Авто",
   "Common.Controllers.ReviewChanges.textBaseline": "Базовая линия",
@@ -68,6 +69,7 @@
   "Common.Controllers.ReviewChanges.textTableRowsDel": "<b>Удалены строки таблицы</b>",
   "Common.Controllers.ReviewChanges.textTabs": "Изменение табуляции",
   "Common.Controllers.ReviewChanges.textUnderline": "Подчёркнутый",
+  "Common.Controllers.ReviewChanges.textUrl": "Вставьте URL-адрес документа",
   "Common.Controllers.ReviewChanges.textWidow": "Запрет висячих строк",
   "Common.define.chartData.textArea": "С областями",
   "Common.define.chartData.textBar": "Линейчатая",
@@ -78,6 +80,39 @@
   "Common.define.chartData.textPoint": "Точечная",
   "Common.define.chartData.textStock": "Биржевая",
   "Common.define.chartData.textSurface": "Поверхность",
+  "Common.UI.Calendar.textApril": "Апрель",
+  "Common.UI.Calendar.textAugust": "Август",
+  "Common.UI.Calendar.textDecember": "Декабрь",
+  "Common.UI.Calendar.textFebruary": "Февраль",
+  "Common.UI.Calendar.textJanuary": "Январь",
+  "Common.UI.Calendar.textJuly": "Июль",
+  "Common.UI.Calendar.textJune": "Июнь",
+  "Common.UI.Calendar.textMarch": "Март",
+  "Common.UI.Calendar.textMay": "Май",
+  "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": "Дек",
+  "Common.UI.Calendar.textShortFebruary": "Фев",
+  "Common.UI.Calendar.textShortFriday": "Пт",
+  "Common.UI.Calendar.textShortJanuary": "Янв",
+  "Common.UI.Calendar.textShortJuly": "Июл",
+  "Common.UI.Calendar.textShortJune": "Июн",
+  "Common.UI.Calendar.textShortMarch": "Мар",
+  "Common.UI.Calendar.textShortMay": "Май",
+  "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.ComboBorderSize.txtNoBorders": "Без границ",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ",
   "Common.UI.ComboDataView.emptyComboText": "Без стилей",
@@ -150,7 +185,7 @@
   "Common.Views.ExternalMergeEditor.textClose": "Закрыть",
   "Common.Views.ExternalMergeEditor.textSave": "Сохранить и выйти",
   "Common.Views.ExternalMergeEditor.textTitle": "Получатели слияния",
-  "Common.Views.Header.labelCoUsersDescr": "Документ редактируется несколькими пользователями.",
+  "Common.Views.Header.labelCoUsersDescr": "Пользователи, редактирующие документ:",
   "Common.Views.Header.textAdvSettings": "Дополнительные параметры",
   "Common.Views.Header.textBack": "Открыть расположение файла",
   "Common.Views.Header.textCompactView": "Скрыть панель инструментов",
@@ -224,6 +259,10 @@
   "Common.Views.RenameDialog.txtInvalidName": "Имя файла не должно содержать следующих символов: ",
   "Common.Views.ReviewChanges.hintNext": "К следующему изменению",
   "Common.Views.ReviewChanges.hintPrev": "К предыдущему изменению",
+  "Common.Views.ReviewChanges.mniFromFile": "Документ из файла",
+  "Common.Views.ReviewChanges.mniFromStorage": "Документ из хранилища",
+  "Common.Views.ReviewChanges.mniFromUrl": "Документ с URL-адреса",
+  "Common.Views.ReviewChanges.mniSettings": "Параметры сравнения",
   "Common.Views.ReviewChanges.strFast": "Быстрый",
   "Common.Views.ReviewChanges.strFastDesc": "Совместное редактирование в режиме реального времени. Все изменения сохраняются автоматически.",
   "Common.Views.ReviewChanges.strStrict": "Строгий",
@@ -232,6 +271,7 @@
   "Common.Views.ReviewChanges.tipCoAuthMode": "Задать режим совместного редактирования",
   "Common.Views.ReviewChanges.tipCommentRem": "Удалить комментарии",
   "Common.Views.ReviewChanges.tipCommentRemCurrent": "Удалить текущие комментарии",
+  "Common.Views.ReviewChanges.tipCompare": "Сравнить текущий документ с другим",
   "Common.Views.ReviewChanges.tipHistory": "Показать историю версий",
   "Common.Views.ReviewChanges.tipRejectCurrent": "Отклонить текущее изменение",
   "Common.Views.ReviewChanges.tipReview": "Отслеживать изменения",
@@ -251,6 +291,7 @@
   "Common.Views.ReviewChanges.txtCommentRemMy": "Удалить мои комментарии",
   "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Удалить мои текущие комментарии",
   "Common.Views.ReviewChanges.txtCommentRemove": "Удалить",
+  "Common.Views.ReviewChanges.txtCompare": "Сравнить",
   "Common.Views.ReviewChanges.txtDocLang": "Язык",
   "Common.Views.ReviewChanges.txtFinal": "Все изменения приняты (просмотр)",
   "Common.Views.ReviewChanges.txtFinalCap": "Измененный документ",
@@ -285,6 +326,7 @@
   "Common.Views.ReviewPopover.textEdit": "OK",
   "Common.Views.ReviewPopover.textFollowMove": "Перейти на прежнее место",
   "Common.Views.ReviewPopover.textMention": "+упоминание предоставит доступ к документу и отправит оповещение по почте",
+  "Common.Views.ReviewPopover.textMentionNotify": "+упоминание отправит пользователю оповещение по почте",
   "Common.Views.ReviewPopover.textOpenAgain": "Открыть снова",
   "Common.Views.ReviewPopover.textReply": "Ответить",
   "Common.Views.ReviewPopover.textResolve": "Решить",
@@ -350,6 +392,7 @@
   "DE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.",
   "DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
   "DE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
+  "DE.Controllers.Main.errorDirectUrl": "Проверьте ссылку на документ.<br>Эта ссылка должна быть прямой ссылкой для скачивания файла.",
   "DE.Controllers.Main.errorEditingDownloadas": "В ходе работы с документом произошла ошибка.<br>Используйте опцию 'Скачать как...', чтобы сохранить резервную копию файла на жесткий диск компьютера.",
   "DE.Controllers.Main.errorEditingSaveas": "В ходе работы с документом произошла ошибка.<br>Используйте опцию 'Сохранить как...', чтобы сохранить резервную копию файла на жесткий диск компьютера.",
   "DE.Controllers.Main.errorEmailClient": "Не найден почтовый клиент",
@@ -358,7 +401,7 @@
   "DE.Controllers.Main.errorForceSave": "При сохранении файла произошла ошибка. Используйте опцию 'Скачать как', чтобы сохранить файл на жестком диске компьютера или повторите попытку позже.",
   "DE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
   "DE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек",
-  "DE.Controllers.Main.errorMailMergeLoadFile": "Сбой при загрузке",
+  "DE.Controllers.Main.errorMailMergeLoadFile": "Загрузка документа не удалась. Выберите другой файл.",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Не удалось выполнить слияние.",
   "DE.Controllers.Main.errorProcessSaveResult": "Сбой при сохранении.",
   "DE.Controllers.Main.errorServerVersion": "Версия редактора была обновлена. Страница будет перезагружена, чтобы применить изменения.",
@@ -430,6 +473,7 @@
   "DE.Controllers.Main.txtButtons": "Кнопки",
   "DE.Controllers.Main.txtCallouts": "Выноски",
   "DE.Controllers.Main.txtCharts": "Схемы",
+  "DE.Controllers.Main.txtChoose": "Выберите элемент.",
   "DE.Controllers.Main.txtCurrentDocument": "Текущий документ",
   "DE.Controllers.Main.txtDiagramTitle": "Заголовок диаграммы",
   "DE.Controllers.Main.txtEditingMode": "Установка режима редактирования...",
@@ -449,7 +493,7 @@
   "DE.Controllers.Main.txtMissArg": "Отсутствует аргумент",
   "DE.Controllers.Main.txtMissOperator": "Отсутствует оператор",
   "DE.Controllers.Main.txtNeedSynchronize": "Есть обновления",
-  "DE.Controllers.Main.txtNoTableOfContents": "Элементов оглавления не найдено.",
+  "DE.Controllers.Main.txtNoTableOfContents": "В документе нет заголовков. Примените стиль заголовка к тексту, чтобы он появился в оглавлении.",
   "DE.Controllers.Main.txtNoText": "Ошибка! В документе отсутствует текст указанного стиля.",
   "DE.Controllers.Main.txtNotInTable": "Не в таблице",
   "DE.Controllers.Main.txtNotValidBookmark": "Ошибка! Неверная ссылка закладки.",
@@ -631,6 +675,7 @@
   "DE.Controllers.Main.txtShape_wedgeRectCallout": "Прямоугольная выноска",
   "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Скругленная прямоугольная выноска",
   "DE.Controllers.Main.txtStarsRibbons": "Звезды и ленты",
+  "DE.Controllers.Main.txtStyle_Caption": "Название",
   "DE.Controllers.Main.txtStyle_footnote_text": "Текст сноски",
   "DE.Controllers.Main.txtStyle_Heading_1": "Заголовок 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "Заголовок 2",
@@ -658,6 +703,9 @@
   "DE.Controllers.Main.txtZeroDivide": "Деление на ноль",
   "DE.Controllers.Main.unknownErrorText": "Неизвестная ошибка.",
   "DE.Controllers.Main.unsupportedBrowserErrorText": "Ваш браузер не поддерживается.",
+  "DE.Controllers.Main.uploadDocExtMessage": "Неизвестный формат документа.",
+  "DE.Controllers.Main.uploadDocFileCountMessage": "Ни одного документа не загружено.",
+  "DE.Controllers.Main.uploadDocSizeMessage": "Превышен максимальный размер документа.",
   "DE.Controllers.Main.uploadImageExtMessage": "Неизвестный формат изображения.",
   "DE.Controllers.Main.uploadImageFileCountMessage": "Ни одного изображения не загружено.",
   "DE.Controllers.Main.uploadImageSizeMessage": "Превышен максимальный размер изображения.",
@@ -672,7 +720,6 @@
   "DE.Controllers.Main.warnNoLicense": "Эта версия редакторов %1 имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов %1 имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
-  "DE.Controllers.Main.txtChoose": "Выберите элемент.",
   "DE.Controllers.Navigation.txtBeginning": "Начало документа",
   "DE.Controllers.Navigation.txtGotoBeginning": "Перейти в начало документа",
   "DE.Controllers.Statusbar.textHasChanges": "Отслежены новые изменения",
@@ -1032,7 +1079,7 @@
   "DE.Views.BookmarksDialog.textSort": "Порядок",
   "DE.Views.BookmarksDialog.textTitle": "Закладки",
   "DE.Views.BookmarksDialog.txtInvalidName": "Имя закладки может содержать только буквы, цифры и знаки подчеркивания и должно начинаться с буквы.",
-  "DE.Views.CaptionDialog.textAdd": "Добавить подпись",
+  "DE.Views.CaptionDialog.textAdd": "Добавить",
   "DE.Views.CaptionDialog.textAfter": "После",
   "DE.Views.CaptionDialog.textBefore": "Перед",
   "DE.Views.CaptionDialog.textCaption": "Название",
@@ -1040,7 +1087,7 @@
   "DE.Views.CaptionDialog.textChapterInc": "Включить номер главы",
   "DE.Views.CaptionDialog.textColon": "двоеточие",
   "DE.Views.CaptionDialog.textDash": "тире",
-  "DE.Views.CaptionDialog.textDelete": "Удалить подпись",
+  "DE.Views.CaptionDialog.textDelete": "Удалить",
   "DE.Views.CaptionDialog.textEquation": "Уравнение",
   "DE.Views.CaptionDialog.textExamples": "Примеры: Таблица 2-A, Изображение 1.IV",
   "DE.Views.CaptionDialog.textExclude": "Исключить подпись из названия",
@@ -1083,10 +1130,27 @@
   "DE.Views.ChartSettings.txtTight": "По контуру",
   "DE.Views.ChartSettings.txtTitle": "Диаграмма",
   "DE.Views.ChartSettings.txtTopAndBottom": "Сверху и снизу",
+  "DE.Views.CompareSettingsDialog.textChar": "По знакам",
+  "DE.Views.CompareSettingsDialog.textShow": "Показывать изменения:",
+  "DE.Views.CompareSettingsDialog.textTitle": "Параметры сравнения",
+  "DE.Views.CompareSettingsDialog.textWord": "По словам",
+  "DE.Views.ControlSettingsDialog.strGeneral": "Общие",
+  "DE.Views.ControlSettingsDialog.textAdd": "Добавить",
   "DE.Views.ControlSettingsDialog.textAppearance": "Вид",
   "DE.Views.ControlSettingsDialog.textApplyAll": "Применить ко всем",
   "DE.Views.ControlSettingsDialog.textBox": "С ограничивающей рамкой",
+  "DE.Views.ControlSettingsDialog.textChange": "Редактировать",
+  "DE.Views.ControlSettingsDialog.textCheckbox": "Флажок",
+  "DE.Views.ControlSettingsDialog.textChecked": "Символ установленного флажка",
   "DE.Views.ControlSettingsDialog.textColor": "Цвет",
+  "DE.Views.ControlSettingsDialog.textCombobox": "Поле со списком",
+  "DE.Views.ControlSettingsDialog.textDate": "Формат даты",
+  "DE.Views.ControlSettingsDialog.textDelete": "Удалить",
+  "DE.Views.ControlSettingsDialog.textDisplayName": "Отображаемое имя",
+  "DE.Views.ControlSettingsDialog.textDown": "Вниз",
+  "DE.Views.ControlSettingsDialog.textDropDown": "Выпадающий список",
+  "DE.Views.ControlSettingsDialog.textFormat": "Отображать дату следующим образом",
+  "DE.Views.ControlSettingsDialog.textLang": "Язык",
   "DE.Views.ControlSettingsDialog.textLock": "Блокировка",
   "DE.Views.ControlSettingsDialog.textName": "Заголовок",
   "DE.Views.ControlSettingsDialog.textNewColor": "Пользовательский цвет",
@@ -1095,6 +1159,10 @@
   "DE.Views.ControlSettingsDialog.textSystemColor": "Системный",
   "DE.Views.ControlSettingsDialog.textTag": "Тег",
   "DE.Views.ControlSettingsDialog.textTitle": "Параметры элемента управления содержимым",
+  "DE.Views.ControlSettingsDialog.textUnchecked": "Символ снятого флажка",
+  "DE.Views.ControlSettingsDialog.textUp": "Вверх",
+  "DE.Views.ControlSettingsDialog.textValue": "Значение",
+  "DE.Views.ControlSettingsDialog.tipChange": "Изменить символ",
   "DE.Views.ControlSettingsDialog.txtLockDelete": "Элемент управления содержимым нельзя удалить",
   "DE.Views.ControlSettingsDialog.txtLockEdit": "Содержимое нельзя редактировать",
   "DE.Views.CustomColumnsDialog.textColumns": "Количество колонок",
@@ -1248,6 +1316,7 @@
   "DE.Views.DocumentHolder.txtDeleteRadical": "Удалить радикал",
   "DE.Views.DocumentHolder.txtDistribHor": "Распределить по горизонтали",
   "DE.Views.DocumentHolder.txtDistribVert": "Распределить по вертикали",
+  "DE.Views.DocumentHolder.txtEmpty": "(Пусто)",
   "DE.Views.DocumentHolder.txtFractionLinear": "Изменить на горизонтальную простую дробь",
   "DE.Views.DocumentHolder.txtFractionSkewed": "Изменить на диагональную простую дробь",
   "DE.Views.DocumentHolder.txtFractionStacked": "Изменить на вертикальную простую дробь",
@@ -1355,6 +1424,10 @@
   "DE.Views.DropcapSettingsAdvanced.textWidth": "Ширина",
   "DE.Views.DropcapSettingsAdvanced.tipFontName": "Шрифт",
   "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "Без границ",
+  "DE.Views.EditListItemDialog.textDisplayName": "Отображаемое имя",
+  "DE.Views.EditListItemDialog.textNameError": "Отображаемое имя не должно быть пустым.",
+  "DE.Views.EditListItemDialog.textValue": "Значение",
+  "DE.Views.EditListItemDialog.textValueError": "Элемент с таким значением уже существует.",
   "DE.Views.FileMenu.btnBackCaption": "Открыть расположение файла",
   "DE.Views.FileMenu.btnCloseMenuCaption": "Закрыть меню",
   "DE.Views.FileMenu.btnCreateNewCaption": "Создать новый",
@@ -1459,6 +1532,7 @@
   "DE.Views.FileMenuPanels.Settings.txtPt": "Пункт",
   "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Проверка орфографии",
   "DE.Views.FileMenuPanels.Settings.txtWin": "как Windows",
+  "DE.Views.FileMenuPanels.Settings.txtCacheMode": "Режим кэширования по умолчанию",
   "DE.Views.HeaderFooterSettings.textBottomCenter": "Снизу по центру",
   "DE.Views.HeaderFooterSettings.textBottomLeft": "Снизу слева",
   "DE.Views.HeaderFooterSettings.textBottomPage": "Внизу страницы",
@@ -1603,6 +1677,7 @@
   "DE.Views.LeftMenu.txtDeveloper": "РЕЖИМ РАЗРАБОТЧИКА",
   "DE.Views.LeftMenu.txtTrial": "ПРОБНЫЙ РЕЖИМ",
   "DE.Views.Links.capBtnBookmarks": "Закладка",
+  "DE.Views.Links.capBtnCaption": "Название",
   "DE.Views.Links.capBtnContentsUpdate": "Обновить",
   "DE.Views.Links.capBtnInsContents": "Оглавление",
   "DE.Views.Links.capBtnInsFootnote": "Сноска",
@@ -1617,10 +1692,29 @@
   "DE.Views.Links.textUpdateAll": "Обновить целиком",
   "DE.Views.Links.textUpdatePages": "Обновить только номера страниц",
   "DE.Views.Links.tipBookmarks": "Создать закладку",
+  "DE.Views.Links.tipCaption": "Вставить название",
   "DE.Views.Links.tipContents": "Вставить оглавление",
   "DE.Views.Links.tipContentsUpdate": "Обновить оглавление",
   "DE.Views.Links.tipInsertHyperlink": "Добавить гиперссылку",
   "DE.Views.Links.tipNotes": "Вставить или редактировать сноски",
+  "DE.Views.ListSettingsDialog.textAuto": "Автоматически",
+  "DE.Views.ListSettingsDialog.textCenter": "По центру",
+  "DE.Views.ListSettingsDialog.textLeft": "По левому краю",
+  "DE.Views.ListSettingsDialog.textLevel": "Уровень",
+  "DE.Views.ListSettingsDialog.textNewColor": "Пользовательский цвет",
+  "DE.Views.ListSettingsDialog.textPreview": "Просмотр",
+  "DE.Views.ListSettingsDialog.textRight": "По правому краю",
+  "DE.Views.ListSettingsDialog.txtAlign": "Выравнивание",
+  "DE.Views.ListSettingsDialog.txtBullet": "Маркер",
+  "DE.Views.ListSettingsDialog.txtColor": "Цвет",
+  "DE.Views.ListSettingsDialog.txtFont": "Шрифт и символ",
+  "DE.Views.ListSettingsDialog.txtLikeText": "Как текст",
+  "DE.Views.ListSettingsDialog.txtNewBullet": "Новый маркер",
+  "DE.Views.ListSettingsDialog.txtNone": "Нет",
+  "DE.Views.ListSettingsDialog.txtSize": "Размер",
+  "DE.Views.ListSettingsDialog.txtSymbol": "Символ",
+  "DE.Views.ListSettingsDialog.txtTitle": "Параметры списка",
+  "DE.Views.ListSettingsDialog.txtType": "Тип",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Отправить",
   "DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Тема",
@@ -1670,7 +1764,7 @@
   "DE.Views.MailMergeSettings.warnProcessMailMerge": "Не удалось начать слияние",
   "DE.Views.Navigation.txtCollapse": "Свернуть все",
   "DE.Views.Navigation.txtDemote": "Понизить уровень",
-  "DE.Views.Navigation.txtEmpty": "Этот документ не содержит заголовков",
+  "DE.Views.Navigation.txtEmpty": "В документе нет заголовков.<br>Примените стиль заголовка к тексту, чтобы он появился в оглавлении.",
   "DE.Views.Navigation.txtEmptyItem": "Пустой заголовок",
   "DE.Views.Navigation.txtExpand": "Развернуть все",
   "DE.Views.Navigation.txtExpandToLevel": "Развернуть до уровня",
@@ -1699,7 +1793,18 @@
   "DE.Views.NoteSettingsDialog.textTitle": "Параметры сносок",
   "DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Внимание",
   "DE.Views.PageMarginsDialog.textBottom": "Нижнее",
+  "DE.Views.PageMarginsDialog.textGutter": "Переплет",
+  "DE.Views.PageMarginsDialog.textGutterPosition": "Положение переплета",
+  "DE.Views.PageMarginsDialog.textInside": "Внутреннее",
+  "DE.Views.PageMarginsDialog.textLandscape": "Альбомная",
   "DE.Views.PageMarginsDialog.textLeft": "Левое",
+  "DE.Views.PageMarginsDialog.textMirrorMargins": "Зеркальные поля",
+  "DE.Views.PageMarginsDialog.textMultiplePages": "Несколько страниц",
+  "DE.Views.PageMarginsDialog.textNormal": "Обычные",
+  "DE.Views.PageMarginsDialog.textOrientation": "Ориентация",
+  "DE.Views.PageMarginsDialog.textOutside": "Внешнее",
+  "DE.Views.PageMarginsDialog.textPortrait": "Книжная",
+  "DE.Views.PageMarginsDialog.textPreview": "Просмотр",
   "DE.Views.PageMarginsDialog.textRight": "Правое",
   "DE.Views.PageMarginsDialog.textTitle": "Поля",
   "DE.Views.PageMarginsDialog.textTop": "Верхнее",
@@ -1914,6 +2019,7 @@
   "DE.Views.TableOfContentsSettings.txtClassic": "Классический",
   "DE.Views.TableOfContentsSettings.txtCurrent": "Текущий",
   "DE.Views.TableOfContentsSettings.txtModern": "Современный",
+  "DE.Views.TableOfContentsSettings.txtOnline": "Онлайн",
   "DE.Views.TableOfContentsSettings.txtSimple": "Простой",
   "DE.Views.TableOfContentsSettings.txtStandard": "Стандартный",
   "DE.Views.TableSettings.deleteColumnText": "Удалить столбец",
@@ -1937,7 +2043,7 @@
   "DE.Views.TableSettings.textBanded": "Чередовать",
   "DE.Views.TableSettings.textBorderColor": "Цвет",
   "DE.Views.TableSettings.textBorders": "Стиль границ",
-  "DE.Views.TableSettings.textCellSize": "Размер ячейки",
+  "DE.Views.TableSettings.textCellSize": "Размеры строк и столбцов",
   "DE.Views.TableSettings.textColumns": "Столбцы",
   "DE.Views.TableSettings.textDistributeCols": "Выровнять ширину столбцов",
   "DE.Views.TableSettings.textDistributeRows": "Выровнять высоту строк",
@@ -2091,10 +2197,12 @@
   "DE.Views.Toolbar.capImgGroup": "Группировка",
   "DE.Views.Toolbar.capImgWrapping": "Обтекание",
   "DE.Views.Toolbar.mniCustomTable": "Пользовательская таблица",
+  "DE.Views.Toolbar.mniDrawTable": "Нарисовать таблицу",
   "DE.Views.Toolbar.mniEditControls": "Параметры элемента управления",
   "DE.Views.Toolbar.mniEditDropCap": "Параметры буквицы",
   "DE.Views.Toolbar.mniEditFooter": "Изменить нижний колонтитул",
   "DE.Views.Toolbar.mniEditHeader": "Изменить верхний колонтитул",
+  "DE.Views.Toolbar.mniEraseTable": "Очистить таблицу",
   "DE.Views.Toolbar.mniHiddenBorders": "Скрытые границы таблиц",
   "DE.Views.Toolbar.mniHiddenChars": "Непечатаемые символы",
   "DE.Views.Toolbar.mniHighlightControls": "Цвет подсветки",
@@ -2105,13 +2213,17 @@
   "DE.Views.Toolbar.textAutoColor": "Автоматический",
   "DE.Views.Toolbar.textBold": "Полужирный",
   "DE.Views.Toolbar.textBottom": "Нижнее: ",
+  "DE.Views.Toolbar.textCheckboxControl": "Флажок",
   "DE.Views.Toolbar.textColumnsCustom": "Настраиваемые колонки",
   "DE.Views.Toolbar.textColumnsLeft": "Слева",
   "DE.Views.Toolbar.textColumnsOne": "Одна",
   "DE.Views.Toolbar.textColumnsRight": "Справа",
   "DE.Views.Toolbar.textColumnsThree": "Три",
   "DE.Views.Toolbar.textColumnsTwo": "Две",
+  "DE.Views.Toolbar.textComboboxControl": "Поле со списком",
   "DE.Views.Toolbar.textContPage": "На текущей странице",
+  "DE.Views.Toolbar.textDateControl": "Дата",
+  "DE.Views.Toolbar.textDropdownControl": "Выпадающий список",
   "DE.Views.Toolbar.textEditWatermark": "Настраиваемая подложка",
   "DE.Views.Toolbar.textEvenPage": "С четной страницы",
   "DE.Views.Toolbar.textInMargin": "На поле",
@@ -2124,6 +2236,7 @@
   "DE.Views.Toolbar.textItalic": "Курсив",
   "DE.Views.Toolbar.textLandscape": "Альбомная",
   "DE.Views.Toolbar.textLeft": "Левое: ",
+  "DE.Views.Toolbar.textListSettings": "Параметры списка",
   "DE.Views.Toolbar.textMarginsLast": "Последние настраиваемые",
   "DE.Views.Toolbar.textMarginsModerate": "Средние",
   "DE.Views.Toolbar.textMarginsNarrow": "Узкие",
@@ -2137,11 +2250,12 @@
   "DE.Views.Toolbar.textOddPage": "С нечетной страницы",
   "DE.Views.Toolbar.textPageMarginsCustom": "Настраиваемые поля",
   "DE.Views.Toolbar.textPageSizeCustom": "Особый размер страницы",
-  "DE.Views.Toolbar.textPlainControl": "Вставить элемент управления \"Обычный текст\"",
+  "DE.Views.Toolbar.textPictureControl": "Рисунок",
+  "DE.Views.Toolbar.textPlainControl": "Обычный текст",
   "DE.Views.Toolbar.textPortrait": "Книжная",
   "DE.Views.Toolbar.textRemoveControl": "Удалить элемент управления содержимым",
   "DE.Views.Toolbar.textRemWatermark": "Удалить подложку",
-  "DE.Views.Toolbar.textRichControl": "Вставить элемент управления \"Форматированный текст\"",
+  "DE.Views.Toolbar.textRichControl": "Форматированный текст",
   "DE.Views.Toolbar.textRight": "Правое: ",
   "DE.Views.Toolbar.textStrikeout": "Зачеркнутый",
   "DE.Views.Toolbar.textStyleMenuDelete": "Удалить стиль",
@@ -2184,7 +2298,6 @@
   "DE.Views.Toolbar.tipFontColor": "Цвет шрифта",
   "DE.Views.Toolbar.tipFontName": "Шрифт",
   "DE.Views.Toolbar.tipFontSize": "Размер шрифта",
-  "DE.Views.Toolbar.tipHAligh": "Горизонтальное выравнивание",
   "DE.Views.Toolbar.tipHighlightColor": "Цвет выделения",
   "DE.Views.Toolbar.tipImgAlign": "Выровнять объекты",
   "DE.Views.Toolbar.tipImgGroup": "Сгруппировать объекты",

apps/documenteditor/main/locale/sk.json

@@ -1651,7 +1651,6 @@
   "DE.Views.Toolbar.tipFontColor": "Farba písma",
   "DE.Views.Toolbar.tipFontName": "Písmo",
   "DE.Views.Toolbar.tipFontSize": "Veľkosť písma",
-  "DE.Views.Toolbar.tipHAligh": "Horizontálne zarovnanie",
   "DE.Views.Toolbar.tipHighlightColor": "Farba zvýraznenia",
   "DE.Views.Toolbar.tipImgAlign": "Zoradiť/usporiadať objekty",
   "DE.Views.Toolbar.tipImgGroup": "Skupinové objekty",

apps/documenteditor/main/locale/sl.json

@@ -1364,7 +1364,6 @@
   "DE.Views.Toolbar.tipFontColor": "Barva pisave",
   "DE.Views.Toolbar.tipFontName": "Ime pisave",
   "DE.Views.Toolbar.tipFontSize": "Velikost pisave",
-  "DE.Views.Toolbar.tipHAligh": "Horizontalno poravnano",
   "DE.Views.Toolbar.tipHighlightColor": "Označi barvo",
   "DE.Views.Toolbar.tipIncFont": "Prirastek velikosti pisave",
   "DE.Views.Toolbar.tipIncPrLeft": "Povečajte zamik",

apps/documenteditor/main/locale/tr.json

@@ -1625,7 +1625,6 @@
   "DE.Views.Toolbar.tipFontColor": "Yazı Tipi Rengi",
   "DE.Views.Toolbar.tipFontName": "Yazı Tipi",
   "DE.Views.Toolbar.tipFontSize": "Yazıtipi boyutu",
-  "DE.Views.Toolbar.tipHAligh": "Yatay Hizala",
   "DE.Views.Toolbar.tipHighlightColor": "Vurgu Rengi",
   "DE.Views.Toolbar.tipImgAlign": "Objeleri hizala",
   "DE.Views.Toolbar.tipImgGroup": "Grup objeleri",

apps/documenteditor/main/locale/uk.json

@@ -1582,7 +1582,6 @@
   "DE.Views.Toolbar.tipFontColor": "Колір шрифту",
   "DE.Views.Toolbar.tipFontName": "Шрифт",
   "DE.Views.Toolbar.tipFontSize": "Розмір шрифта",
-  "DE.Views.Toolbar.tipHAligh": "Горизонтальне вирівнювання",
   "DE.Views.Toolbar.tipHighlightColor": "Виділити колір",
   "DE.Views.Toolbar.tipImgAlign": "Вирівняти об'єкти",
   "DE.Views.Toolbar.tipImgGroup": "Група об'єктів",

apps/documenteditor/main/locale/vi.json

@@ -1563,7 +1563,6 @@
   "DE.Views.Toolbar.tipFontColor": "Màu chữ",
   "DE.Views.Toolbar.tipFontName": "Phông chữ",
   "DE.Views.Toolbar.tipFontSize": "Cỡ chữ",
-  "DE.Views.Toolbar.tipHAligh": "Căn chỉnh ngang",
   "DE.Views.Toolbar.tipHighlightColor": "Màu tô sáng",
   "DE.Views.Toolbar.tipImgAlign": "Căn chỉnh đối tượng",
   "DE.Views.Toolbar.tipImgGroup": "Nhóm đối tượng",