merge release 6.4.0 to develop

apps/api/documents/api.js

@@ -136,7 +136,8 @@
                         label: string (default: "Guest") // postfix for user name
                     },
                     review: {
-                        hideReviewDisplay: false // hide button Review mode,
+                        hideReviewDisplay: false, // hide button Review mode
+                        hoverMode: false, // true - show review balloons on mouse move, not on click on text
                         showReviewChanges: false,
                         reviewDisplay: 'original',
                         trackChanges: undefined // true/false - open editor with track changes mode on/off,
@@ -872,8 +873,7 @@
         path += app + "/";
         path += (config.type === "mobile" || isSafari_mobile)
             ? "mobile"
-            : (config.type === "embedded" || (app=='documenteditor') && config.document && config.document.permissions && (config.document.permissions.fillForms===true) &&
+            : (config.type === "embedded")
-                                                                       (config.document.permissions.edit === false) && (config.document.permissions.review !== true) && (config.editorConfig.mode !== 'view'))
                 ? "embed"
                 : "main";
 

apps/api/wopi/editor-wopi.ejs

@@ -308,7 +308,7 @@ div {
                 }
 			};
 
-            postMessageOrigin = fileInfo.PostMessageOrigin;
+            postMessageOrigin = fileInfo.PostMessageOrigin || "*";
             if (postMessageOrigin && (typeof postMessageOrigin === 'string') && postMessageOrigin.charAt(postMessageOrigin.length-1)=='/')
                 postMessageOrigin = postMessageOrigin.substring(0, postMessageOrigin.length - 1);
             lang = config.editorConfig.lang;

apps/common/embed/resources/less/common.less

@@ -225,6 +225,12 @@
     .margin-right-large {
         margin-right: 12px;
     }
+    .margin-left-small {
+        margin-left: 8px;
+    }
+    .margin-left-large {
+        margin-left: 12px;
+    }
 }
 
 // Logo

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

@@ -49,24 +49,28 @@ define([
     'use strict';
 
     Common.UI.ComboBoxFonts = Common.UI.ComboBox.extend((function() {
-        var iconWidth       = 302,
+        var iconWidth       = 300,
-            iconHeight      = Asc.FONT_THUMBNAIL_HEIGHT || 26,
+            iconHeight      = Asc.FONT_THUMBNAIL_HEIGHT || 28,
             thumbCanvas     = document.createElement('canvas'),
             thumbContext    = thumbCanvas.getContext('2d'),
             thumbs       = [
                 {ratio: 1,      path: '../../../../sdkjs/common/Images/fonts_thumbnail.png', width: iconWidth, height: iconHeight},
+                {ratio: 1.25,   path: '../../../../sdkjs/common/Images/fonts_thumbnail@1.25x.png', width: iconWidth * 1.25, height: iconHeight * 1.25},
                 {ratio: 1.5,    path: '../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: iconWidth * 1.5, height: iconHeight * 1.5},
+                {ratio: 1.75,   path: '../../../../sdkjs/common/Images/fonts_thumbnail@1.75x.png', width: iconWidth * 1.75, height: iconHeight * 1.75},
                 {ratio: 2,      path: '../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: iconWidth * 2, height: iconHeight * 2}
             ],
             thumbIdx = 0,
-            listItemHeight  = 26,
+            listItemHeight  = 28,
             spriteCols     = 1,
             applicationPixelRatio = Common.Utils.applicationPixelRatio();
 
         if (typeof window['AscDesktopEditor'] === 'object') {
             thumbs[0].path     = window['AscDesktopEditor'].getFontsSprite('');
-            thumbs[1].path     = window['AscDesktopEditor'].getFontsSprite('@1.5x');
+            thumbs[1].path     = window['AscDesktopEditor'].getFontsSprite('@1.25x');
-            thumbs[2].path     = window['AscDesktopEditor'].getFontsSprite('@2x');
+            thumbs[2].path     = window['AscDesktopEditor'].getFontsSprite('@1.5x');
+            thumbs[3].path     = window['AscDesktopEditor'].getFontsSprite('@1.75x');
+            thumbs[4].path     = window['AscDesktopEditor'].getFontsSprite('@2x');
         }
 
         var bestDistance = Math.abs(applicationPixelRatio-thumbs[0].ratio);

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

@@ -244,9 +244,10 @@ define([
         onResize: function() {
             if (this.openButton) {
                 var button = $('button', this.openButton.cmpEl);
-                button && button.css({
+                var cntButton = $('.button', this.cmpEl);
-                    width : $('.button', this.cmpEl).width(),
+                button && cntButton.width() > 0 && button.css({
-                    height: $('.button', this.cmpEl).height()
+                    width : cntButton.width(),
+                    height: cntButton.height()
                 });
 
                 this.openButton.menu.hide();

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

@@ -104,22 +104,29 @@ define([
                 return this;
             },
 
-            internalShow: function() {
+            internalShowLoader: function() {
-                this.ownerEl.append(this.maskeEl);
                 this.ownerEl.append(this.loaderEl);
-
                 this.loaderEl.css('min-width', $('.asc-loadmask-title', this.loaderEl).width() + 105);
 
                 if (this.ownerEl && this.ownerEl.closest('.asc-window.modal').length==0)
                     Common.util.Shortcuts.suspendEvents();
             },
 
-            show: function(immediately){
+            internalShowMask: function() {
-                // The owner is already masked
+                if (!!this.ownerEl.ismasked) return;
-                if (!!this.ownerEl.ismasked)
-                    return this;
 
                 this.ownerEl.ismasked = true;
+                this.ownerEl.append(this.maskeEl);
+            },
+
+            show: function(immediately){
+                this.internalShowMask();
+
+                // The owner is already masked
+                if (!!this.ownerEl.hasloader)
+                    return this;
+
+                this.ownerEl.hasloader = true;
 
                 var me = this;
                 if (me.title != me.options.title) {
@@ -128,11 +135,11 @@ define([
                 }
 
                 if (immediately) {
-                    me.internalShow();
+                    me.internalShowLoader();
                 } else if (!me.timerId) {
                     // show mask after 500 ms if it wont be hided
                     me.timerId = setTimeout(function () {
-                        me.internalShow();
+                        me.internalShowLoader();
                     },500);
                 }
 
@@ -145,20 +152,23 @@ define([
                     clearTimeout(this.timerId);
                     this.timerId = 0;
                 }
-                if (ownerEl && ownerEl.ismasked) {
+
+                ownerEl && ownerEl.ismasked && this.maskeEl && this.maskeEl.remove();
+                delete ownerEl.ismasked;
+
+                if (ownerEl && ownerEl.hasloader) {
                     if (ownerEl.closest('.asc-window.modal').length==0 && !Common.Utils.ModalWindow.isVisible())
                         Common.util.Shortcuts.resumeEvents();
 
-                    this.maskeEl     && this.maskeEl.remove();
                     this.loaderEl    && this.loaderEl.remove();
                 }
-                delete ownerEl.ismasked;
+                delete ownerEl.hasloader;
             },
 
             setTitle: function(title) {
                 this.title = title;
 
-                if (this.ownerEl && this.ownerEl.ismasked && this.loaderEl){
+                if (this.ownerEl && this.ownerEl.hasloader && this.loaderEl){
                     var el = $('.asc-loadmask-title', this.loaderEl);
                     el.html(title);
                     this.loaderEl.css('min-width', el.width() + 105);
@@ -172,7 +182,7 @@ define([
             updatePosition: function() {
                 var ownerEl = this.ownerEl,
                     loaderEl = this.loaderEl;
-                if (ownerEl && ownerEl.ismasked && loaderEl){
+                if (ownerEl && ownerEl.hasloader && loaderEl){
                     loaderEl.css({
                         top : Math.round(ownerEl.height() / 2 - (loaderEl.height() + parseInt(loaderEl.css('padding-top'))  + parseInt(loaderEl.css('padding-bottom'))) / 2) + 'px',
                         left: Math.round(ownerEl.width()  / 2 - (loaderEl.width()  + parseInt(loaderEl.css('padding-left')) + parseInt(loaderEl.css('padding-right')))  / 2) + 'px'

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

@@ -588,7 +588,7 @@ define([
                 if (this.options.additionalAlign)
                     this.options.additionalAlign.call(this, menuRoot, left, top);
                 else {
-                    var _css = {left: Math.ceil(left), top: Math.ceil(top)};
+                    var _css = {left: left, top: top};
                     if (!(menuH < docH)) _css['margin-top'] = 0;
 
                     menuRoot.css(_css);

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

@@ -1222,7 +1222,8 @@ define([
                     renderTo : this.sdkViewName,
                     canRequestUsers: (this.mode) ? this.mode.canRequestUsers : undefined,
                     canRequestSendNotify: (this.mode) ? this.mode.canRequestSendNotify : undefined,
-                    mentionShare: (this.mode) ? this.mode.mentionShare : true
+                    mentionShare: (this.mode) ? this.mode.mentionShare : true,
+                    api: this.api
                 });
                 this.popover.setCommentsStore(this.popoverComments);
             }

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

@@ -132,8 +132,7 @@ define([
                     this.api.asc_registerCallback('asc_onUpdateRevisionsChangesPosition', _.bind(this.onApiUpdateChangePosition, this));
                     this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this));
                     this.api.asc_registerCallback('asc_onParticipantsChanged',     _.bind(this.onAuthParticipantsChanged, this));
-                    this.api.asc_registerCallback('asc_onBeginViewModeInReview',   _.bind(this.onBeginViewModeInReview, this));
+                    this.api.asc_registerCallback('asc_onChangeDisplayModeInReview',   _.bind(this.onChangeDisplayModeInReview, this));
-                    this.api.asc_registerCallback('asc_onEndViewModeInReview',     _.bind(this.onEndViewModeInReview, this));
                 }
                 if (this.appConfig.canReview)
                     this.api.asc_registerCallback('asc_onOnTrackRevisionsChange', _.bind(this.onApiTrackRevisionsChange, this));
@@ -182,7 +181,7 @@ define([
 
         onApiShowChange: function (sdkchange) {
             if (this.getPopover()) {
-                if (sdkchange && sdkchange.length>0) {
+                if (!this.appConfig.reviewHoverMode && sdkchange && sdkchange.length>0) {
                     var i = 0,
                         changes = this.readSDKChange(sdkchange),
                         posX = sdkchange[0].get_X(),
@@ -257,7 +256,8 @@ define([
             if ((this.appConfig.canReview || this.appConfig.canViewReview) && _.isUndefined(this.popover)) {
                 this.popover = Common.Views.ReviewPopover.prototype.getPopover({
                     reviewStore : this.popoverChanges,
-                    renderTo : this.sdkViewName
+                    renderTo : this.sdkViewName,
+                    api: this.api
                 });
                 this.popover.setReviewStore(this.popoverChanges);
             }
@@ -596,7 +596,10 @@ define([
 
         onReviewViewClick: function(menu, item, e) {
             this.turnDisplayMode(item.value);
-            !this.appConfig.canReview && Common.localStorage.setItem(this.view.appPrefix + "review-mode", item.value);
+            if (!this.appConfig.isEdit && !this.appConfig.isRestrictedEdit)
+                Common.localStorage.setItem(this.view.appPrefix + "review-mode", item.value); // for viewer
+            else if (item.value=='markup' || item.value=='simple')
+                Common.localStorage.setItem(this.view.appPrefix + "review-mode-editor", item.value); // for editor save only markup modes
             Common.NotificationCenter.trigger('edit:complete', this.view);
         },
 
@@ -686,27 +689,40 @@ define([
 
         turnDisplayMode: function(mode) {
             if (this.api) {
-                if (mode === 'final')
+                var type = Asc.c_oAscDisplayModeInReview.Edit;
-                    this.api.asc_BeginViewModeInReview(true);
+                switch (mode) {
-                else if (mode === 'original')
+                    case 'final':
-                    this.api.asc_BeginViewModeInReview(false);
+                        type = Asc.c_oAscDisplayModeInReview.Final;
-                else
+                        break;
-                    this.api.asc_EndViewModeInReview();
+                    case 'original':
+                        type = Asc.c_oAscDisplayModeInReview.Original;
+                        break;
+                    case 'simple':
+                        type = Asc.c_oAscDisplayModeInReview.Simple;
+                        break;
+                }
+                this.api.asc_SetDisplayModeInReview(type);
             }
             this.disableEditing(mode == 'final' || mode == 'original');
             this._state.previewMode = (mode == 'final' || mode == 'original');
         },
 
-        onBeginViewModeInReview: function(mode) {
+        onChangeDisplayModeInReview: function(type) {
-            this.disableEditing(true);
+            this.disableEditing(type===Asc.c_oAscDisplayModeInReview.Final || type===Asc.c_oAscDisplayModeInReview.Original);
-            this.view && this.view.turnDisplayMode(mode ? 'final' : 'original');
+            var mode = 'markup';
-            this._state.previewMode = true;
+            switch (type) {
-        },
+                case Asc.c_oAscDisplayModeInReview.Final:
-
+                    mode = 'final';
-        onEndViewModeInReview: function() {
+                    break;
-            this.disableEditing(false);
+                case Asc.c_oAscDisplayModeInReview.Original:
-            this.view && this.view.turnDisplayMode('markup');
+                    mode = 'original';
-            this._state.previewMode = false;
+                    break;
+                case Asc.c_oAscDisplayModeInReview.Simple:
+                    mode = 'simple';
+                    break;
+            }
+            this.view && this.view.turnDisplayMode(mode);
+            this._state.previewMode = (type===Asc.c_oAscDisplayModeInReview.Final || type===Asc.c_oAscDisplayModeInReview.Original);
         },
 
         isPreviewChangesMode: function() {
@@ -808,7 +824,11 @@ define([
                         me.onApiTrackRevisionsChange(me.api.asc_GetLocalTrackRevisions(), me.api.asc_GetGlobalTrackRevisions());
                     me.api.asc_HaveRevisionsChanges() && me.view.markChanges(true);
 
-                    // _setReviewStatus(state, global);
+                    var val = Common.localStorage.getItem(me.view.appPrefix + "review-mode-editor");
+                    if (val===null)
+                        val = me.appConfig.customization && /^(original|final|markup|simple)$/i.test(me.appConfig.customization.reviewDisplay) ? me.appConfig.customization.reviewDisplay.toLocaleLowerCase() : 'markup';
+                    me.turnDisplayMode(val); // load display mode for all modes (viewer or editor)
+                    me.view.turnDisplayMode(val);
 
                     if ( typeof (me.appConfig.customization) == 'object' && (me.appConfig.customization.review && me.appConfig.customization.review.showReviewChanges==true ||
                         (!me.appConfig.customization.review || me.appConfig.customization.review.showReviewChanges===undefined) && me.appConfig.customization.showReviewChanges==true) ) {
@@ -824,14 +844,12 @@ define([
             } else if (config.canViewReview) {
                 config.canViewReview = (config.isEdit || me.api.asc_HaveRevisionsChanges(true)); // check revisions from all users
                 if (config.canViewReview) {
-                    var val = Common.localStorage.getItem(me.view.appPrefix + "review-mode");
+                    var val = Common.localStorage.getItem(me.view.appPrefix + (config.isEdit || config.isRestrictedEdit ? "review-mode-editor" : "review-mode"));
                     if (val===null) {
                         val = me.appConfig.customization && me.appConfig.customization.review ? me.appConfig.customization.review.reviewDisplay : undefined;
                         !val && (val = me.appConfig.customization ? me.appConfig.customization.reviewDisplay : undefined);
                         val = /^(original|final|markup)$/i.test(val) ? val.toLocaleLowerCase() : 'original';
                     }
-                    me.turnDisplayMode((config.isEdit || config.isRestrictedEdit) ? 'markup' : val); // load display mode only in viewer
-                    me.view.turnDisplayMode((config.isEdit || config.isRestrictedEdit) ? 'markup' : val);
                 }
             }
 
@@ -846,6 +864,14 @@ define([
                 me.view.btnCommentRemove && me.view.btnCommentRemove.setDisabled(!Common.localStorage.getBool(me.view.appPrefix + "settings-livecomment", true) || !!this._state.wsProps['Objects']);
                 me.view.btnCommentResolve && me.view.btnCommentResolve.setDisabled(!Common.localStorage.getBool(me.view.appPrefix + "settings-livecomment", true) || !!this._state.wsProps['Objects']);
             }
+
+            var val = Common.localStorage.getItem(me.view.appPrefix + "settings-review-hover-mode");
+            if (val === null) {
+                val = me.appConfig.customization && me.appConfig.customization.review ? !!me.appConfig.customization.review.hoverMode : false;
+            } else
+                val = !!parseInt(val);
+            Common.Utils.InternalSettings.set(me.view.appPrefix + "settings-review-hover-mode", val);
+            me.appConfig.reviewHoverMode = val;
         },
 
         showTips: function(strings) {

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

@@ -245,6 +245,16 @@ define([
 
                 this.api = api;
                 var theme_name = get_ui_theme_name(Common.localStorage.getItem('ui-theme'));
+                if ( !theme_name ) {
+                    if ( !(Common.Utils.isIE10 || Common.Utils.isIE11) )
+                        for (var i of document.body.classList.entries()) {
+                            if ( i[1].startsWith('theme-') && !i[1].startsWith('theme-type-') ) {
+                                theme_name = i[1];
+                                break;
+                            }
+                        }
+                }
+
                 if ( !themes_map[theme_name] )
                     theme_name = id_default_light_theme;
 

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

@@ -42,7 +42,17 @@ var params = (function() {
     return urlParams;
 })();
 
-if ( !!params.uitheme && !localStorage.getItem("ui-theme-id") ) {
+var checkLocalStorage = (function () {
+    try {
+        var storage = window['localStorage'];
+        return true;
+    }
+    catch(e) {
+        return false;
+    }
+})();
+
+if ( !!params.uitheme && checkLocalStorage && !localStorage.getItem("ui-theme-id") ) {
     // const _t = params.uitheme.match(/([\w-]+)/g);
 
     if ( params.uitheme == 'default-dark' )
@@ -54,11 +64,11 @@ if ( !!params.uitheme && !localStorage.getItem("ui-theme-id") ) {
     localStorage.setItem("ui-theme-id", params.uitheme);
 }
 
-var ui_theme_name = localStorage.getItem("ui-theme-id");
+var ui_theme_name = checkLocalStorage ? localStorage.getItem("ui-theme-id") : undefined;
 if ( !ui_theme_name ) {
     if ( window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ) {
         ui_theme_name = 'theme-dark';
-        localStorage.setItem("ui-theme-id", ui_theme_name);
+        checkLocalStorage && localStorage.setItem("ui-theme-id", ui_theme_name);
     }
 }
 if ( !!ui_theme_name ) {

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

@@ -162,10 +162,10 @@ define([
                 '<div class="footer center">',
                     '<button class="btn normal dlg-btn primary" result="ok">' + t.okButtonText + '</button>',
                     '<% if (closeFile) { %>',
-                    '<button class="btn normal dlg-btn" result="cancel" style="margin-left:10px;">' + t.closeButtonText + '</button>',
+                    '<button class="btn normal dlg-btn custom" result="cancel" style="margin-left:10px;">' + t.closeButtonText + '</button>',
                     '<% } %>',
                     '<% if (closable) { %>',
-                    '<button class="btn normal dlg-btn" result="cancel" style="margin-left:10px;">' + t.cancelButtonText + '</button>',
+                    '<button class="btn normal dlg-btn custom" result="cancel" style="margin-left:10px;">' + t.cancelButtonText + '</button>',
                     '<% } %>',
                 '</div>'
             ].join('');

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

@@ -316,6 +316,15 @@ define([
                                         template: menuTemplate,
                                         description: this.txtMarkup
                                     },
+                                    {
+                                        caption: this.txtMarkupSimpleCap,
+                                        checkable: true,
+                                        toggleGroup: 'menuReviewView',
+                                        checked: false,
+                                        value: 'simple',
+                                        template: menuTemplate,
+                                        description: this.txtMarkupSimple
+                                    },
                                     {
                                         caption: this.txtFinalCap,
                                         checkable: true,
@@ -798,8 +807,9 @@ define([
             turnDisplayMode: function(mode) {
                 if (this.btnReviewView) {
                     this.btnReviewView.menu.items[0].setChecked(mode=='markup', true);
-                    this.btnReviewView.menu.items[1].setChecked(mode=='final', true);
+                    this.btnReviewView.menu.items[1].setChecked(mode=='simple', true);
-                    this.btnReviewView.menu.items[2].setChecked(mode=='original', true);
+                    this.btnReviewView.menu.items[2].setChecked(mode=='final', true);
+                    this.btnReviewView.menu.items[3].setChecked(mode=='original', true);
                 }
             },
 
@@ -898,7 +908,9 @@ define([
             txtOff: 'OFF for me',
             textWarnTrackChangesTitle: 'Enable Track Changes for everyone?',
             textWarnTrackChanges: 'Track Changes will be switched ON for all users with full access. The next time anyone opens the doc, Track Changes will remain enabled.',
-            textEnable: 'Enable'
+            textEnable: 'Enable',
+            txtMarkupSimpleCap: 'Simple Markup',
+            txtMarkupSimple: 'All changes (Editing)<br>Turn off balloons'
         }
     }()), Common.Views.ReviewChanges || {}));
 

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

@@ -103,6 +103,7 @@ define([
             this.canRequestUsers = options.canRequestUsers;
             this.canRequestSendNotify = options.canRequestSendNotify;
             this.mentionShare = options.mentionShare;
+            this.api = options.api;
             this.externalUsers = [];
             this._state = {commentsVisible: false, reviewVisible: false};
 
@@ -784,7 +785,7 @@ define([
                     }
                 }
             }
-            if (!retainContent)
+            if (!retainContent || this.isOverCursor())
                 this.calculateSizeOfContent();
         },
         calculateSizeOfContent: function (testVisible) {
@@ -839,7 +840,34 @@ define([
 
                             outerHeight = Math.max(commentsView.outerHeight(), this.$window.outerHeight());
 
-                            if (sdkBoundsHeight <= outerHeight) {
+                            var movePos = this.isOverCursor();
+                            if (movePos) {
+                                var newTopDown = movePos[1] + sdkPanelHeight,// try move down
+                                    newTopUp = movePos[0] + sdkPanelHeight; // try move up
+                                if (newTopDown + outerHeight>sdkBoundsTop + sdkBoundsHeight) {
+                                    var diffDown = sdkBoundsTop + sdkBoundsHeight - newTopDown;
+                                    if (newTopUp - outerHeight<sdkBoundsTop) {
+                                        var diffUp = newTopUp - sdkBoundsTop;
+                                        if (diffDown < diffUp * 0.9) {// magic)
+                                            this.$window.css({
+                                                maxHeight: diffUp + 'px',
+                                                top: sdkBoundsTop + 'px'
+                                            });
+                                            commentsView.css({height: diffUp - 3 + 'px'});
+                                        } else {
+                                            this.$window.css({
+                                                maxHeight: diffDown + 'px',
+                                                top: newTopDown + 'px'
+                                            });
+                                            commentsView.css({height: diffDown - 3 + 'px'});
+                                        }
+                                    } else
+                                        this.$window.css('top', newTopUp - outerHeight + 'px'); // move up
+                                } else
+                                    this.$window.css('top', newTopDown + 'px'); // move down
+                                arrowView.addClass('hidden');
+
+                            } else if (sdkBoundsHeight <= outerHeight) {
                                 this.$window.css({
                                     maxHeight: sdkBoundsHeight - sdkPanelHeight + 'px',
                                     top: sdkBoundsTop + sdkPanelHeight + 'px'
@@ -851,6 +879,7 @@ define([
                                 arrowPosY = Math.min(arrowPosY, sdkBoundsHeight - (sdkPanelHeight + this.arrow.margin + this.arrow.height));
 
                                 arrowView.css({top: arrowPosY + 'px'});
+                                arrowView.removeClass('hidden');
                                 this.scroller.scrollTop(scrollPos);
                             } else {
 
@@ -869,6 +898,7 @@ define([
                                 arrowPosY = Math.min(arrowPosY, outerHeight - this.arrow.margin - this.arrow.height);
 
                                 arrowView.css({top: arrowPosY + 'px'});
+                                arrowView.removeClass('hidden');
                             }
                         }
                     }
@@ -880,6 +910,23 @@ define([
                 this.scroller.update({minScrollbarLength: 40, alwaysVisibleY: true});
             }
         },
+
+        isOverCursor: function() {
+            if (!this.api.asc_GetSelectionBounds) return;
+            
+            var p = this.api.asc_GetSelectionBounds(),
+                isCursor = Math.abs(p[0][0] - p[1][0])<0.1 && Math.abs(p[0][1] - p[1][1])<0.1 && Math.abs(p[2][0] - p[3][0])<0.1 && Math.abs(p[2][1] - p[3][1])<0.1;
+            var x0 = p[0][0], y0 = p[0][1],
+                x1 = p[isCursor ? 2 : 1][0], y1 = p[isCursor ? 2 : 1][1];
+            var leftPos = parseInt(this.$window.css('left'))-25,
+                windowWidth = this.$window.outerWidth();
+            if (x0>leftPos && x0<leftPos+windowWidth || x1>leftPos && x1<leftPos+windowWidth) {
+                var newTopDown = Math.max(y0, y1),// try move down
+                    newTopUp = Math.min(y0, y1); // try move up
+                return [newTopUp, newTopDown];
+            }
+        },
+
         saveText: function (clear) {
             if (this.commentsView && this.commentsView.cmpEl.find('.lock-area').length < 1) {
                 this.textVal = undefined;

apps/common/main/resources/img/toolbar/1.25x/big/.css.handlebars

@@ -4,7 +4,7 @@
             (min-resolution: 1.25dppx) and (max-resolution: 1.4dppx),
                 (min-resolution: 120dpi) and (max-resolution: 143dpi)
     {
-        .x-huge .toolbar__icon {
+        .x-huge .toolbar__icon, .toolbar__icon.toolbar__icon-big {
             background-image: url(resources/{{{escaped_image}}});
             background-size: {{scaled width 1.25}}px auto;
         }

apps/common/main/resources/img/toolbar/1.25x/huge/.css.handlebars

@@ -1,6 +1,9 @@
 {{#spritesheet}}
-.options__icon.options__icon-huge {
+.pixel-ratio__1_25 {
-    background-size: 80px auto;
+    .options__icon.options__icon-huge {
-    background-size: var(--huge-icon-background-image-width) auto;
+        background-image: url(resources/{{{escaped_image}}});
+        background-size: 80px auto;
+        background-size: var(--huge-icon-background-image-width) auto;
+    }
 }
 {{/spritesheet}}

apps/common/main/resources/img/toolbar/1.75x/big/.css.handlebars

@@ -4,7 +4,7 @@
             (min-resolution: 1.75dppx) and (max-resolution: 1.9dppx),
                 (min-resolution: 168dpi) and (max-resolution: 191dpi)
     {
-        .x-huge .toolbar__icon {
+        .x-huge .toolbar__icon, .toolbar__icon.toolbar__icon-big {
             background-image: url(resources/{{{escaped_image}}});
             background-size: {{scaled width 1.75}}px auto;
         }

apps/common/main/resources/img/toolbar/1.75x/huge/.css.handlebars

@@ -1,6 +1,9 @@
 {{#spritesheet}}
-.options__icon.options__icon-huge {
+.pixel-ratio__1_75 {
-    background-size: 80px auto;
+    .options__icon.options__icon-huge {
-    background-size: var(--huge-icon-background-image-width) auto;
+        background-image: url(resources/{{{escaped_image}}});
+        background-size: 80px auto;
+        background-size: var(--huge-icon-background-image-width) auto;
+    }
 }
 {{/spritesheet}}

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

@@ -100,6 +100,26 @@
 
     .pixel-ratio__2 {
     }
+
+    .pixel-ratio__1_25 {
+        @ratio: 1.25;
+        @one-px: 1px / @ratio;
+        @two-px: 2px / @ratio;
+
+        --pixel-ratio-factor: @ratio;
+        --scaled-one-pixel: @one-px;
+        --scaled-two-pixel: @two-px;
+    }
+
+    .pixel-ratio__1_75 {
+        @ratio: 1.75;
+        @one-px: 1px / @ratio;
+        @two-px: 2px / @ratio;
+
+        --pixel-ratio-factor: @ratio;
+        --scaled-one-pixel: @one-px;
+        --scaled-two-pixel: @two-px;
+    }
 }
 
 .button-normal-icon(@icon-class, @index, @icon-size, @normal-h-offset: 0px) {
@@ -211,6 +231,53 @@
     }
 }
 
+.background-ximage-all(@image, @w: auto, @h: auto, @repeat: no-repeat, @commonimage: true) {
+    .choose-image-path(@commonimage);
+    @imagepath: '@{path}/@{image}';
+
+    background-image: if(@icon-src-base64, data-uri(%("%s", '@{imagepath}')), ~"url(@{imagepath})");
+    background-repeat: @repeat;
+
+    @1d5ximage: replace(@imagepath, '\.png$', '@1.5x.png');
+    @1d75ximage: replace(@imagepath, '\.png$', '@1.75x.png');
+    @1d25ximage: replace(@imagepath, '\.png$', '@1.25x.png');
+    @2ximage: replace(@imagepath, '\.png$', '@2x.png');
+
+    @media only screen {
+        @media (-webkit-min-device-pixel-ratio: 1.25) and (-webkit-max-device-pixel-ratio: 1.49),
+        (min-resolution: 1.25dppx) and (max-resolution: 1.49dppx),
+        (min-resolution: 120dpi) and (max-resolution: 143dpi)
+        {
+            background-image: ~"url(@{1d25ximage})";
+            background-size: @w @h;
+        }
+
+        @media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.74),
+        (min-resolution: 1.5dppx) and (max-resolution: 1.74dppx),
+        (min-resolution: 144dpi) and (max-resolution: 167dpi)
+        {
+            background-image: ~"url(@{1d5ximage})";
+            background-size: @w @h;
+        }
+
+        @media (-webkit-min-device-pixel-ratio: 1.75) and (-webkit-max-device-pixel-ratio: 1.9),
+        (min-resolution: 1.75dppx) and (max-resolution: 1.9dppx),
+        (min-resolution: 168dpi) and (max-resolution: 191dpi)
+        {
+            background-image: ~"url(@{1d75ximage})";
+            background-size: @w @h;
+        }
+
+        @media (-webkit-min-device-pixel-ratio: 2),
+        (min-resolution: 2dppx),
+        (min-resolution: 192dpi)
+        {
+            background-image: ~"url(@{2ximage})";
+            background-size: @w @h;
+        }
+    }
+}
+
 .img-commonctrl {
     &.img-colored {
         filter: none;
@@ -226,7 +293,9 @@
     background-repeat: no-repeat;
     filter: @component-normal-icon-filter;
 
+    @1d25ximage: replace(@common-controls, '\.png$', '@1.25x.png');
     @1d5ximage: replace(@common-controls, '\.png$', '@1.5x.png');
+    @1d75ximage: replace(@common-controls, '\.png$', '@1.75x.png');
     @2ximage: replace(@common-controls, '\.png$', '@2x.png');
 
     @media only screen {
@@ -246,6 +315,16 @@
             background-size: @common-controls-width auto;
         }
     }
+
+    .pixel-ratio__1_25 & {
+        background-image: ~"url(@{common-image-const-path}/@{1d25ximage})";
+        background-size: @common-controls-width auto;
+    }
+
+    .pixel-ratio__1_75 & {
+        background-image: ~"url(@{common-image-const-path}/@{1d75ximage})";
+        background-size: @common-controls-width auto;
+    }
 }
 
 @img-colorpicker-width: 205px;

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

@@ -694,8 +694,8 @@
     li > a.selected,
     li > a:hover {
         span.color-auto {
-            outline: @scaled-one-px-value-ie solid @border-regular-control-ie;
+            outline: @scaled-one-px-value-ie solid @icon-normal-ie;
-            outline: @scaled-one-px-value solid @border-regular-control;
+            outline: @scaled-one-px-value solid @icon-normal;
             border: @scaled-one-px-value-ie solid @background-normal-ie;
             border: @scaled-one-px-value solid @background-normal;
         }

apps/common/main/resources/less/combo-border-size.less

@@ -27,6 +27,7 @@
             width:60px;
             height:20px;
             background-color: transparent;
+            image-rendering: pixelated;
         }
     }
 
@@ -37,16 +38,25 @@
         display: inline-block;
         background-color: transparent;
         margin: 0 0 0 -3px;
+        image-rendering: pixelated;
     }
 
     img, .image {
         background: ~"url(@{common-image-const-path}/combo-border-size/BorderSize.png) no-repeat 0 0";
         background-size: 60px auto;
 
+        .pixel-ratio__1_25 & {
+            background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@1.25x.png)";
+        }
+
         .pixel-ratio__1_5 & {
             background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@1.5x.png)";
         }
 
+        .pixel-ratio__1_75 & {
+            background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@1.75x.png)";
+        }
+
         .pixel-ratio__2 & {
             background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@2x.png)";
         }

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

@@ -99,7 +99,7 @@
     }
 
     .item {
-        padding: 3px;
+        padding: 2px;
         border: @scaled-one-px-value-ie solid @border-regular-control-ie;
         border: @scaled-one-px-value solid @border-regular-control;
         .box-shadow(none);
@@ -164,6 +164,11 @@
         width: @combo-dataview-button-width;
         height: @combo-dataview-height;
 
+        .btn-group, button {
+            width: 100%;
+            height: 100%;
+        }
+
         button {
             &.dropdown-toggle {
                 padding: 0;

apps/common/main/resources/less/combobox.less

@@ -38,6 +38,8 @@
 
     .btn {
         border-left: 0;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
         border-color: @border-regular-control-ie;
         border-color: @border-regular-control;
         background-color: transparent;

apps/common/main/resources/less/dimension-picker.less

@@ -21,13 +21,13 @@
 
 .dimension-picker-unhighlighted {
     //background: transparent repeat scroll 0 0;
-    .background-ximage-v2('dimension-picker/dimension-unhighlighted.png', 18px);
+    .background-ximage-all('dimension-picker/dimension-unhighlighted.png', 18px);
     background-repeat: repeat;
 }
 
 .dimension-picker div.dimension-picker-highlighted {
     //background: transparent repeat scroll 0 0;
-    .background-ximage-v2('dimension-picker/dimension-highlighted.png', 18px);
+    .background-ximage-all('dimension-picker/dimension-highlighted.png', 18px);
     background-repeat: repeat;
 }
 

apps/common/main/resources/less/slider.less

@@ -11,6 +11,8 @@
             border: @track-height / 2 solid @border-regular-control-ie;
             border: @track-height / 2 solid @border-regular-control;
             border-radius: @track-height / 2;
+            background-color: @border-regular-control-ie;
+            background-color: @border-regular-control;
             width: calc(100% + @track-height);
             margin-left: -@track-height / 2;
         }

apps/common/main/resources/less/spinner.less

@@ -39,7 +39,7 @@
     .spinner-buttons {
         position: absolute;
         top: 0;
-        right: 1px;
+        right: @scaled-one-px-value;
         border-top: @scaled-one-px-value-ie solid transparent;
         border-top: @scaled-one-px-value solid transparent;
         border-bottom: @scaled-one-px-value-ie solid transparent;

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

@@ -551,6 +551,12 @@
         .icon {
             width: 22px;
             height: 22px;
+
+            .pixel-ratio__1_25 &,
+            .pixel-ratio__1_75 & {
+                width: 20px;
+                height: 20px;
+            }
         }
     }
 }
@@ -584,7 +590,7 @@
     border: @scaled-one-px-value solid @border-regular-control;
 
     .equation-icon {
-        .background-ximage-v2('toolbar/math.png', 1500px, @commonimage: true);
+        .background-ximage-all('toolbar/math.png', 1500px, @commonimage: true);
         opacity: @component-normal-icon-opacity;
 
         .theme-dark & {

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

@@ -11,7 +11,7 @@ const ThemeColors = ({ themeColors, onColorClick, curColor }) => {
                         {row.map((effect, index) => {
                             return(
                                 <a key={`tc-${rowIndex}-${index}`}
-                                   className={(curColor && curColor.color === effect.color && curColor.effectValue === effect.effectValue) ? 'active' : ''}
+                                   className={(curColor && ((curColor.color === effect.color && curColor.effectValue === effect.effectValue) || (curColor === effect.color))) ? 'active' : ''}
                                    style={{ background: `#${effect.color}`}}
                                    onClick={() => {onColorClick(effect.color, effect.effectId, effect.effectValue)}}
                                 ></a>

apps/common/mobile/lib/controller/ContextMenu.jsx

@@ -150,8 +150,8 @@ class ContextMenuController extends Component {
         this.setState({openedMore: false});
     }
 
-    onMenuItemClick(action) {
+    async onMenuItemClick(action) {
-        this.onApiHideContextMenu();
+        await this.onApiHideContextMenu();
 
         if (action === 'showActionSheet') {
             this.setState({openedMore: true});

apps/common/mobile/lib/controller/collaboration/Comments.jsx

@@ -564,25 +564,37 @@ class ViewCommentsController extends Component {
                 this.onResolveComment(comment);
                 break;
             case 'deleteComment':
-                f7.dialog.confirm(
+                f7.dialog.create({
-                    _t.textMessageDeleteComment,
+                    title: _t.textDeleteComment,
-                    _t.textDeleteComment,
+                    text: _t.textMessageDeleteComment,
-                    () => {
+                    buttons: [
-                        this.deleteComment(comment);
+                        {
-                    }
+                            text: _t.textCancel
-                );
+                        },
+                        {
+                            text: _t.textOk,
+                            onClick: () => this.deleteComment(comment)
+                        }
+                    ]
+                }).open();
                 break;
             case 'editReply':
                 this.props.storeComments.openEditReply(true, comment, reply);
                 break;
             case 'deleteReply':
-                f7.dialog.confirm(
+                f7.dialog.create({
-                    _t.textMessageDeleteReply,
+                    title: _t.textDeleteReply,
-                    _t.textDeleteReply,
+                    text: _t.textMessageDeleteReply,
-                    () => {
+                    buttons: [
-                        this.deleteReply(comment, reply);
+                        {
-                    }
+                            text: _t.textCancel
-                );
+                        },
+                        {
+                            text: _t.textOk,
+                            onClick: () => this.deleteReply(comment, reply)
+                        }
+                    ]
+                }).open();
                 break;
             case 'addReply':
                 this.props.storeComments.openAddReply(true, comment);

apps/common/mobile/lib/controller/collaboration/Review.jsx

@@ -25,27 +25,26 @@ class InitReview extends Component {
 
             api.asc_SetTrackRevisions(trackChanges);
             // Init display mode
-            if (!appOptions.canReview) {
+
-                const canViewReview = appOptions.isEdit || api.asc_HaveRevisionsChanges(true);
+            const canViewReview = appOptions.canReview || appOptions.isEdit || api.asc_HaveRevisionsChanges(true);
+            if (!appOptions.canReview)
                 appOptions.setCanViewReview(canViewReview);
-                if (canViewReview) {
+            if (canViewReview) {
-                    let viewReviewMode = LocalStorage.getItem("de-view-review-mode");
+                let viewReviewMode = (appOptions.isEdit || appOptions.isRestrictedEdit) ? null : LocalStorage.getItem("de-view-review-mode");
-                    if (viewReviewMode === null) {
+                if (viewReviewMode === null)
-                        viewReviewMode = appOptions.customization && appOptions.customization.review ? appOptions.customization.review.reviewDisplay : undefined;
+                    viewReviewMode = appOptions.customization && /^(original|final|markup|simple)$/i.test(appOptions.customization.reviewDisplay) ? appOptions.customization.reviewDisplay.toLocaleLowerCase() : ( appOptions.isEdit || appOptions.isRestrictedEdit ? 'markup' : 'original');
-                        !viewReviewMode && (viewReviewMode = appOptions.customization ? appOptions.customization.reviewDisplay : undefined);
+                let displayMode = viewReviewMode.toLocaleLowerCase();
-                        viewReviewMode = /^(original|final|markup)$/i.test(viewReviewMode) ? viewReviewMode.toLocaleLowerCase() : 'original';
+                let type = Asc.c_oAscDisplayModeInReview.Edit;
-                    }
+                switch (displayMode) {
-                    viewReviewMode = (appOptions.isEdit || appOptions.isRestrictedEdit) ? 'markup' : viewReviewMode;
+                    case 'final':
-                    const displayMode = viewReviewMode.toLocaleLowerCase();
+                        type = Asc.c_oAscDisplayModeInReview.Final;
-                    if (displayMode === 'final') {
+                        break;
-                        api.asc_BeginViewModeInReview(true);
+                    case 'original':
-                    } else if (displayMode === 'original') {
+                        type = Asc.c_oAscDisplayModeInReview.Original;
-                        api.asc_BeginViewModeInReview(false);
+                        break;
-                    } else {
-                        api.asc_EndViewModeInReview();
-                    }
-                    props.storeReview.changeDisplayMode(displayMode);
                 }
+                api.asc_SetDisplayModeInReview(type);
+                props.storeReview.changeDisplayMode(displayMode);
             }
         });
     }
@@ -102,14 +101,17 @@ class Review extends Component {
 
     onDisplayMode (mode) {
         const api = Common.EditorApi.get();
-        if (mode === 'final') {
+        let type = Asc.c_oAscDisplayModeInReview.Edit;
-            api.asc_BeginViewModeInReview(true);
+        switch (mode) {
-        } else if (mode === 'original') {
+            case 'final':
-            api.asc_BeginViewModeInReview(false);
+                type = Asc.c_oAscDisplayModeInReview.Final;
-        } else {
+                break;
-            api.asc_EndViewModeInReview();
+            case 'original':
+                type = Asc.c_oAscDisplayModeInReview.Original;
+                break;
         }
-        !this.appConfig.canReview && LocalStorage.setItem("de-view-review-mode", mode);
+        api.asc_SetDisplayModeInReview(type);
+        !this.appConfig.isEdit && !this.appConfig.isRestrictedEdit && LocalStorage.setItem("de-view-review-mode", mode);
         this.props.storeReview.changeDisplayMode(mode);
     }
 

apps/common/mobile/lib/view/collaboration/Collaboration.jsx

@@ -85,7 +85,7 @@ const routes = [
     }
 ];
 
-const PageCollaboration = inject('storeAppOptions')(observer(props => {
+const PageCollaboration = inject('storeAppOptions', 'users')(observer(props => {
     const { t } = useTranslation();
     const _t = t('Common.Collaboration', {returnObjects: true});
     const appOptions = props.storeAppOptions;
@@ -102,9 +102,11 @@ const PageCollaboration = inject('storeAppOptions')(observer(props => {
                     }
                 </Navbar>
                 <List>
-                    <ListItem link={'/users/'} title={_t.textUsers}>
+                    {props.users.editUsers.length > 0 &&
-                        <Icon slot="media" icon="icon-users"></Icon>
+                        <ListItem link={'/users/'} title={_t.textUsers}>
-                    </ListItem>
+                            <Icon slot="media" icon="icon-users"></Icon>
+                        </ListItem>
+                    }
                     {appOptions.canViewComments &&
                         <ListItem link='/comments/' title={_t.textComments}>
                             <Icon slot="media" icon="icon-insert-comment"></Icon>

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

@@ -48,6 +48,11 @@
             display: flex;
             justify-content: center;
         }
+        &-inner {
+            background: var(--f7-navbar-bg-color);
+            background-image: var(--f7-navbar-bg-image, var(--f7-bars-bg-image));
+            background-color: var(--f7-navbar-bg-color, var(--f7-bars-bg-color));
+        }
     }
 
     .page.page-with-subnavbar.page-with-logo {
@@ -62,8 +67,13 @@
                 margin-bottom: 0;
                 margin-top: 8px;
             }
+            .add-image {
+                ul:before, :after{
+                    display: none;
+                }
+            }
             .inputs-list {
-                ul:after, :before{
+                ul:after {
                     display: none;
                 }
             }

apps/common/mobile/resources/less/common.less

@@ -257,6 +257,8 @@
         margin-top: 14px;
         background-image: url(../img/themes/themes.png);
         display: block;
+        background-repeat: no-repeat;
+        background-size: cover;
     }
     .item-theme.active:before {
         content: '';
@@ -531,28 +533,44 @@
         padding-left: 5px;
         padding-right: 5px;
         padding-top: 5px;
-    }
+        li.item-theme {
-    li {
+            border: 0.5px solid #c8c7cc;
-        border: 0.5px solid #c8c7cc;
+            padding: 2px;
-        padding: 2px;
+            background-repeat: no-repeat;
-        background-repeat: no-repeat;
+            width: 106px;
-        width: 106px;
+            height: 56px;
-        height: 56px;
+            margin-bottom: 10px;
-        margin-bottom: 10px;
+            background-position: center;
-        background-position: center;
+            .item-content {
-    }
+                width: 100%;
-    .item-inner:after {
+                height: 100%;
-        display: none;
+                padding: 0;
-    }
+                .item-inner {
-    .item-theme.active:before {
+                    width: 100%;
-        content: '';
+                    height: 100%;
-        position: absolute;
+                    padding: 0;
-        width: 22px;
+                    &:after {
-        height: 22px;
+                        display: none;
-        right: 2px;
+                    }
-        bottom: 2px;
+                    .thumb {
-        z-index: 1;
+                        width: 100%;
-        .encoded-svg-background('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 22 22" fill="#40865c"><g><circle fill="#fff" cx="11" cy="11" r="11"/><path d="M11,21A10,10,0,1,1,21,11,10,10,0,0,1,11,21h0ZM17.4,7.32L17.06,7a0.48,0.48,0,0,0-.67,0l-7,6.84L6.95,11.24a0.51,0.51,0,0,0-.59.08L6,11.66a0.58,0.58,0,0,0,0,.65l3.19,3.35a0.38,0.38,0,0,0,.39,0L17.4,8a0.48,0.48,0,0,0,0-.67h0Z"/></g></svg>');
+                        height: 100%;
+                        padding: 0;
+                        background-size: contain;
+                    }
+                }
+            }
+            &.active:before {
+                content: '';
+                position: absolute;
+                width: 22px;
+                height: 22px;
+                right: 2px;
+                bottom: 2px;
+                z-index: 1;
+                .encoded-svg-background('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 22 22" fill="#40865c"><g><circle fill="#fff" cx="11" cy="11" r="11"/><path d="M11,21A10,10,0,1,1,21,11,10,10,0,0,1,11,21h0ZM17.4,7.32L17.06,7a0.48,0.48,0,0,0-.67,0l-7,6.84L6.95,11.24a0.51,0.51,0,0,0-.59.08L6,11.66a0.58,0.58,0,0,0,0,.65l3.19,3.35a0.38,0.38,0,0,0,.39,0L17.4,8a0.48,0.48,0,0,0,0-.67h0Z"/></g></svg>');
+            }
+        }
     }
 }
 

apps/documenteditor/embed/index.html

@@ -197,8 +197,8 @@
               <span id="title-doc-name"></span>
           </div>
           <div class="group right">
-              <div id="id-submit-group" style="display: inline-block;"><button id="id-btn-submit" class="control-btn has-caption margin-right-small colored"><span class="caption"></span></button></div>
+              <div id="id-pages" class="item margin-right-small" style="vertical-align: middle;"><input id="page-number" class="form-control input-xs masked" type="text" value="0"><span class="text" id="pages" tabindex="-1">of 0</span></div>
-              <div id="id-pages" class="item margin-right-small"><input id="page-number" class="form-control input-xs masked" type="text" value="0"><span class="text" id="pages" tabindex="-1">of 0</span></div>
+              <div id="id-submit-group" style="display: inline-block;"><button id="id-btn-submit" class="control-btn has-caption margin-left-small margin-right-small colored"><span class="caption"></span></button></div>
               <div id="box-tools" class="dropdown">
                   <button class="control-btn svg-icon more-vertical"></button>
               </div>

apps/documenteditor/embed/index.html.deploy

@@ -189,8 +189,8 @@
               <span id="title-doc-name"></span>
           </div>
           <div class="group right">
-              <div id="id-submit-group" style="display: inline-block;"><button id="id-btn-submit" class="control-btn has-caption margin-right-small colored"><span class="caption"></span></button></div>
+              <div id="id-pages" class="item margin-right-small" style="vertical-align: middle;"><input id="page-number" class="form-control input-xs masked" type="text" value="0"><span class="text" id="pages" tabindex="-1">of 0</span></div>
-              <div id="id-pages" class="item margin-right-small"><input id="page-number" class="form-control input-xs masked" type="text" value="0"><span class="text" id="pages" tabindex="-1">of 0</span></div>
+              <div id="id-submit-group" style="display: inline-block;"><button id="id-btn-submit" class="control-btn has-caption margin-right-small margin-left-small colored"><span class="caption"></span></button></div>
               <div id="box-tools" class="dropdown">
                   <button class="control-btn svg-icon more-vertical"></button>
               </div>

apps/documenteditor/embed/index_loader.html

@@ -298,8 +298,8 @@
               <span id="title-doc-name"></span>
           </div>
           <div class="group right">
-              <div id="id-submit-group" style="display: inline-block;"><button id="id-btn-submit" class="control-btn has-caption margin-right-small colored"><span class="caption"></span></button></div>
+              <div id="id-pages" class="item margin-right-small" style="vertical-align: middle;"><input id="page-number" class="form-control input-xs masked" type="text" value="0"><span class="text" id="pages" tabindex="-1">of 0</span></div>
-              <div id="id-pages" class="item margin-right-small"><input id="page-number" class="form-control input-xs masked" type="text" value="0"><span class="text" id="pages" tabindex="-1">of 0</span></div>
+              <div id="id-submit-group" style="display: inline-block;"><button id="id-btn-submit" class="control-btn has-caption margin-right-small margin-left-small colored"><span class="caption"></span></button></div>
               <div id="box-tools" class="dropdown">
                   <button class="control-btn svg-icon more-vertical"></button>
               </div>

apps/documenteditor/embed/index_loader.html.deploy

@@ -290,8 +290,8 @@
               <span id="title-doc-name"></span>
           </div>
           <div class="group right">
-              <div id="id-submit-group" style="display: inline-block;"><button id="id-btn-submit" class="control-btn has-caption margin-right-small colored"><span class="caption"></span></button></div>
+              <div id="id-pages" class="item margin-right-small" style="vertical-align: middle;"><input id="page-number" class="form-control input-xs masked" type="text" value="0"><span class="text" id="pages" tabindex="-1">of 0</span></div>
-              <div id="id-pages" class="item margin-right-small"><input id="page-number" class="form-control input-xs masked" type="text" value="0"><span class="text" id="pages" tabindex="-1">of 0</span></div>
+              <div id="id-submit-group" style="display: inline-block;"><button id="id-btn-submit" class="control-btn has-caption margin-right-small margin-left-small colored"><span class="caption"></span></button></div>
               <div id="box-tools" class="dropdown">
                   <button class="control-btn svg-icon more-vertical"></button>
               </div>

apps/documenteditor/embed/js/ApplicationController.js

@@ -627,7 +627,6 @@ DE.ApplicationController = new(function(){
             $('#id-btn-clear-fields').hide();
             btnSubmit.hide();
         } else {
-            $('#id-pages').hide();
             $('#id-btn-next-field .caption').text(me.textNext);
             $('#id-btn-clear-fields .caption').text(me.textClear);
 
@@ -743,6 +742,10 @@ DE.ApplicationController = new(function(){
                 message = me.errorForceSave;
                 break;
 
+            case Asc.c_oAscError.ID.LoadingFontError:
+                message = me.errorLoadingFont;
+                break;
+
             default:
                 message = me.errorDefaultMessage.replace('%1', id);
                 break;
@@ -928,6 +931,7 @@ DE.ApplicationController = new(function(){
         textGotIt: 'Got it',
         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.",
         txtEmpty: '(Empty)',
-        txtPressLink: 'Press Ctrl and click link'
+        txtPressLink: 'Press Ctrl and click link',
+        errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.'
     }
 })();

apps/documenteditor/embed/locale/ca.json

@@ -1,44 +1,47 @@
 {
-  "common.view.modals.txtCopy": "Copiat al porta-retalls",
+  "common.view.modals.txtCopy": "Copia al porta-retalls",
-  "common.view.modals.txtEmbed": "Incrustar",
+  "common.view.modals.txtEmbed": "Incrusta",
   "common.view.modals.txtHeight": "Alçada",
-  "common.view.modals.txtShare": "Compartir Enllaç",
+  "common.view.modals.txtShare": "Comparteix l'enllaç",
   "common.view.modals.txtWidth": "Amplada",
-  "DE.ApplicationController.convertationErrorText": "Conversió Fallida",
+  "DE.ApplicationController.convertationErrorText": "No s'ha pogut convertir",
-  "DE.ApplicationController.convertationTimeoutText": "Conversió fora de temps",
+  "DE.ApplicationController.convertationTimeoutText": "S'ha superat el temps de conversió.",
   "DE.ApplicationController.criticalErrorTitle": "Error",
-  "DE.ApplicationController.downloadErrorText": "Descàrrega fallida.",
+  "DE.ApplicationController.downloadErrorText": "S'ha produït un error en la baixada",
-  "DE.ApplicationController.downloadTextText": "Descarregant document...",
+  "DE.ApplicationController.downloadTextText": "S'està baixant el document...",
-  "DE.ApplicationController.errorAccessDeny": "Intenteu realitzar una acció per la qual no teniu drets.<br>Poseu-vos en contacte amb l'administrador del servidor de documents.",
+  "DE.ApplicationController.errorAccessDeny": "No teniu permisos per realitzar aquesta acció.<br>Contacteu amb el vostre administrador del servidor de documents.",
   "DE.ApplicationController.errorDefaultMessage": "Codi d'error:%1",
-  "DE.ApplicationController.errorEditingDownloadas": "S'ha produït un error durant el treball amb el document.<br>Utilitzeu l'opció \"Desar com a ...\" per desar la còpia de seguretat del fitxer al disc dur del vostre ordinador.",
+  "DE.ApplicationController.errorEditingDownloadas": "S'ha produït un error mentre es treballava amb el document.<br>Utilitzeu l'opció \"Baixa-ho com a ...\" per desar la còpia de seguretat del fitxer al disc dur del vostre ordinador.",
   "DE.ApplicationController.errorFilePassProtect": "El fitxer està protegit amb contrasenya i no es pot obrir.",
-  "DE.ApplicationController.errorFileSizeExceed": "La mida del fitxer excedeix la limitació establerta per al vostre servidor. Podeu contactar amb l'administrador del Document Server per obtenir més detalls.",
+  "DE.ApplicationController.errorFileSizeExceed": "La mida del fitxer supera el límit establert pel vostre servidor. Contacteu amb el vostre administrador del servidor de documents per obtenir més informació.",
-  "DE.ApplicationController.errorSubmit": "Error en enviar",
+  "DE.ApplicationController.errorForceSave": "S'ha produït un error en desar el fitxer. Utilitzeu l'opció \"Baixa-ho com a\" per desar el fitxer al disc dur de l’ordinador o torneu-ho a provar més endavant.",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La connexió a Internet s'ha restaurat i la versió del fitxer s'ha canviat. <br> Abans de continuar treballant, heu de descarregar el fitxer o copiar-ne el contingut per assegurar-vos que no es perdi res i, després, tornar a carregar aquesta pàgina.",
+  "DE.ApplicationController.errorSubmit": "No s'ha pogut enviar.",
-  "DE.ApplicationController.errorUserDrop": "Ara no es pot accedir al fitxer.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "S'ha restaurat la connexió a internet i la versió del fitxer ha canviat. <br> Abans de continuar treballant, heu de baixar el fitxer o copiar-ne el contingut per assegurar-vos que no es perdi res i, després, torneu a carregar aquesta pàgina.",
-  "DE.ApplicationController.notcriticalErrorTitle": "Avis",
+  "DE.ApplicationController.errorUserDrop": "Ara mateix no es pot accedir al fitxer.",
+  "DE.ApplicationController.notcriticalErrorTitle": "Advertiment",
   "DE.ApplicationController.scriptLoadError": "La connexió és massa lenta, alguns dels components no s’han pogut carregar. Torneu a carregar la pàgina.",
   "DE.ApplicationController.textAnonymous": "Anònim",
-  "DE.ApplicationController.textClear": "Esborrar tots els camps",
+  "DE.ApplicationController.textClear": "Esborra tots els camps",
   "DE.ApplicationController.textGotIt": "Ho tinc",
   "DE.ApplicationController.textGuest": "Convidat",
-  "DE.ApplicationController.textLoadingDocument": "Carregant document",
+  "DE.ApplicationController.textLoadingDocument": "S'està carregant el document",
-  "DE.ApplicationController.textNext": "Següent camp",
+  "DE.ApplicationController.textNext": "Camp següent",
   "DE.ApplicationController.textOf": "de",
-  "DE.ApplicationController.textRequired": "Ompli tots els camps requerits per enviar el formulari.",
+  "DE.ApplicationController.textRequired": "Emplena tots els camps necessaris per enviar el formulari.",
-  "DE.ApplicationController.textSubmit": "Enviar",
+  "DE.ApplicationController.textSubmit": "Envia",
-  "DE.ApplicationController.textSubmited": "<b>Formulari enviat amb èxit</b><br>Faci clic per a tancar el consell",
+  "DE.ApplicationController.textSubmited": "<b>El formulari s'ha enviat amb èxit</b><br>Cliqueu per a tancar el consell",
-  "DE.ApplicationController.txtClose": "Tancar",
+  "DE.ApplicationController.txtClose": "Tanca",
-  "DE.ApplicationController.unknownErrorText": "Error Desconegut.",
+  "DE.ApplicationController.txtEmpty": "(Buit)",
+  "DE.ApplicationController.txtPressLink": "Prem CTRL i clica a l'enllaç",
+  "DE.ApplicationController.unknownErrorText": "Error desconegut.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "El vostre navegador no és compatible.",
-  "DE.ApplicationController.waitText": "Si us plau, esperi...",
+  "DE.ApplicationController.waitText": "Espereu...",
-  "DE.ApplicationView.txtDownload": "\nDescarregar",
+  "DE.ApplicationView.txtDownload": "Baixa",
-  "DE.ApplicationView.txtDownloadDocx": "Desar com a .docx",
+  "DE.ApplicationView.txtDownloadDocx": "Baixa-ho com a .docx",
-  "DE.ApplicationView.txtDownloadPdf": "Desar com a pdf",
+  "DE.ApplicationView.txtDownloadPdf": "Baixa-ho com a pdf",
-  "DE.ApplicationView.txtEmbed": "Incrustar",
+  "DE.ApplicationView.txtEmbed": "Incrusta",
-  "DE.ApplicationView.txtFileLocation": "Obrir ubicació del fitxer",
+  "DE.ApplicationView.txtFileLocation": "Obre la ubicació del fitxer",
-  "DE.ApplicationView.txtFullScreen": "Pantalla Completa",
+  "DE.ApplicationView.txtFullScreen": "Pantalla sencera",
-  "DE.ApplicationView.txtPrint": "Imprimir",
+  "DE.ApplicationView.txtPrint": "Imprimeix",
-  "DE.ApplicationView.txtShare": "Compartir"
+  "DE.ApplicationView.txtShare": "Comparteix"
 }

apps/documenteditor/embed/locale/de.json

@@ -14,6 +14,8 @@
   "DE.ApplicationController.errorEditingDownloadas": "Fehler bei der Bearbeitung.<br>Speichern Sie eine Kopie dieser Datei auf Ihrem Computer, indem Sie auf \"Herunterladen als...\" klicken.",
   "DE.ApplicationController.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.",
   "DE.ApplicationController.errorFileSizeExceed": "Die Dateigröße überschreitet die für Ihren Server festgelegte Einschränkung.<br>Weitere Informationen können Sie von Ihrem Document Server-Administrator erhalten.",
+  "DE.ApplicationController.errorForceSave": "Beim Speichern der Datei ist ein Fehler aufgetreten. Verwenden Sie die Option \"Herunterladen als\", um die Datei auf Ihrer Computerfestplatte zu speichern oder versuchen Sie es später erneut.",
+  "DE.ApplicationController.errorLoadingFont": "Schriftarten nicht hochgeladen.<br>Bitte wenden Sie sich an Administratoren von Ihrem Document Server.",
   "DE.ApplicationController.errorSubmit": "Fehler beim Senden.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Die Internetverbindung wurde wiederhergestellt und die Dateiversion wurde geändert.<br>Bevor Sie weiterarbeiten können, müssen Sie die Datei herunterladen oder den Inhalt kopieren, um sicherzustellen, dass nichts verloren geht, und diese Seite anschließend neu laden.",
   "DE.ApplicationController.errorUserDrop": "Der Zugriff auf diese Datei ist nicht möglich.",
@@ -30,6 +32,8 @@
   "DE.ApplicationController.textSubmit": "Senden",
   "DE.ApplicationController.textSubmited": "<b>Das Formular wurde erfolgreich abgesendet</b><br>Klicken Sie hier, um den Tipp auszublenden",
   "DE.ApplicationController.txtClose": "Schließen",
+  "DE.ApplicationController.txtEmpty": "(Leer)",
+  "DE.ApplicationController.txtPressLink": "Drücken Sie STRG und klicken Sie auf den Link",
   "DE.ApplicationController.unknownErrorText": "Unbekannter Fehler.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Ihr Webbrowser wird nicht unterstützt.",
   "DE.ApplicationController.waitText": "Bitte warten...",

apps/documenteditor/embed/locale/en.json

@@ -15,6 +15,7 @@
   "DE.ApplicationController.errorFilePassProtect": "The file is password protected and cannot be opened.",
   "DE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
   "DE.ApplicationController.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.ApplicationController.errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",
   "DE.ApplicationController.errorSubmit": "Submit failed.",
   "DE.ApplicationController.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.",
   "DE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",

apps/documenteditor/embed/locale/es.json

@@ -14,6 +14,8 @@
   "DE.ApplicationController.errorEditingDownloadas": "Se produjo un error durante el trabajo con el documento.<br>Use la opción 'Descargar como...' para guardar la copia de seguridad de este archivo en el disco duro de su ordenador.",
   "DE.ApplicationController.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.",
   "DE.ApplicationController.errorFileSizeExceed": "El tamaño del archivo excede el límite establecido para su servidor. Por favor póngase en contacto con el administrador del Servidor de Documentos para obtener más información.",
+  "DE.ApplicationController.errorForceSave": "Ha ocurrido un error al guardar el archivo. Por favor, use la opción \"Descargar como\" para guardar el archivo en el disco duro de su ordenador o inténtelo de nuevo más tarde.",
+  "DE.ApplicationController.errorLoadingFont": "Las fuentes no están cargadas.<br>Por favor, póngase en contacto con el administrador del Document Server.",
   "DE.ApplicationController.errorSubmit": "Error al enviar.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La conexión a Internet ha sido restaurada, y la versión del archivo ha sido cambiada. Antes de poder seguir trabajando, es necesario descargar el archivo o copiar su contenido para asegurarse de que no se pierda nada, y luego recargar esta página.",
   "DE.ApplicationController.errorUserDrop": "No se puede acceder al archivo en este momento.",
@@ -30,6 +32,8 @@
   "DE.ApplicationController.textSubmit": "Enviar",
   "DE.ApplicationController.textSubmited": "<b>Formulario enviado con éxito</b><br>Haga clic para cerrar el consejo",
   "DE.ApplicationController.txtClose": "Cerrar",
+  "DE.ApplicationController.txtEmpty": "(Vacío)",
+  "DE.ApplicationController.txtPressLink": "Pulse CTRL y haga clic en el enlace",
   "DE.ApplicationController.unknownErrorText": "Error desconocido.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Su navegador no es compatible.",
   "DE.ApplicationController.waitText": "Por favor, espere...",

apps/documenteditor/embed/locale/fr.json

@@ -14,6 +14,8 @@
   "DE.ApplicationController.errorEditingDownloadas": "Une erreur 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.ApplicationController.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut pas être ouvert.",
   "DE.ApplicationController.errorFileSizeExceed": "La taille du fichier dépasse les limites établies sur votre serveur.<br>Veuillez contacter votre administrateur de Document Server pour obtenir plus d'informations.  ",
+  "DE.ApplicationController.errorForceSave": "Une erreur est survenue lors de l'enregistrement du fichier. Veuillez utiliser l'option «Télécharger en tant que» pour enregistrer le fichier sur le disque dur de votre ordinateur ou réessayer plus tard.",
+  "DE.ApplicationController.errorLoadingFont": "Les polices ne sont pas téléchargées.<br>Veuillez contacter l'administrateur de Document Server.",
   "DE.ApplicationController.errorSubmit": "Échec de soumission",
   "DE.ApplicationController.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.ApplicationController.errorUserDrop": "Impossible d'accéder au fichier.",
@@ -30,6 +32,8 @@
   "DE.ApplicationController.textSubmit": "Soumettre ",
   "DE.ApplicationController.textSubmited": "<b>Le formulaire a été soumis avec succès</b><br>Cliquez ici pour fermer l'astuce",
   "DE.ApplicationController.txtClose": "Fermer",
+  "DE.ApplicationController.txtEmpty": "(Vide)",
+  "DE.ApplicationController.txtPressLink": "Appuyez sur Ctrl et cliquez sur le lien",
   "DE.ApplicationController.unknownErrorText": "Erreur inconnue.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Votre navigateur n'est pas pris en charge.",
   "DE.ApplicationController.waitText": "Veuillez patienter...",

apps/documenteditor/embed/locale/it.json

@@ -14,6 +14,8 @@
   "DE.ApplicationController.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.ApplicationController.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
   "DE.ApplicationController.errorFileSizeExceed": "La dimensione del file supera la limitazione impostata per il tuo server.<br>Per i dettagli, contatta l'amministratore del Document server.",
+  "DE.ApplicationController.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.ApplicationController.errorLoadingFont": "I caratteri non sono caricati.<br>Si prega di contattare il tuo amministratore di Document Server.",
   "DE.ApplicationController.errorSubmit": "Invio fallito.",
   "DE.ApplicationController.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.ApplicationController.errorUserDrop": "Impossibile accedere al file subito.",
@@ -30,6 +32,8 @@
   "DE.ApplicationController.textSubmit": "‎Invia‎",
   "DE.ApplicationController.textSubmited": "<b>Modulo inviato con successo</b><br>Fare click per chiudere la notifica</br>",
   "DE.ApplicationController.txtClose": "Chiudi",
+  "DE.ApplicationController.txtEmpty": "(Vuoto)",
+  "DE.ApplicationController.txtPressLink": "Premi CTRL e clicca sul collegamento",
   "DE.ApplicationController.unknownErrorText": "Errore sconosciuto.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Il tuo browser non è supportato.",
   "DE.ApplicationController.waitText": "Per favore, attendi...",

apps/documenteditor/embed/locale/ro.json

@@ -14,6 +14,8 @@
   "DE.ApplicationController.errorEditingDownloadas": "S-a produs o eroare în timpul editării documentului.<br>Pentru copierea de rezervă pe PC utilizați opțiunea Descărcare ca...",
   "DE.ApplicationController.errorFilePassProtect": "Fișierul este protejat cu parolă și deaceea nu poate fi deschis.",
   "DE.ApplicationController.errorFileSizeExceed": "Dimensiunea fișierului depășește limita permisă de serverul Dvs.<br>Pentru detalii, contactați administratorul dumneavoastră de Server Documente.",
+  "DE.ApplicationController.errorForceSave": "S-a produs o eroare în timpul salvării fișierului. Pentru copierea de rezervă pe PC utilizați opțiunea Descărcare ca... sau încercați din nou mai târziu.",
+  "DE.ApplicationController.errorLoadingFont": "Fonturile nu sunt încărcate.<br>Contactați administratorul dvs de Server Documente.",
   "DE.ApplicationController.errorSubmit": "Remiterea eșuată.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Conexiunea la Internet s-a restabilit și versiunea fișierului s-a schimbat.<br>Înainte de a continua, fișierul trebuie descărcat sau conținutul fișierului copiat ca să vă asigurați că nimic nu e pierdut, apoi reîmprospătați această pagină.",
   "DE.ApplicationController.errorUserDrop": "Fișierul nu poate fi accesat deocamdată.",
@@ -30,6 +32,8 @@
   "DE.ApplicationController.textSubmit": "Remitere",
   "DE.ApplicationController.textSubmited": "<b>Formularul a fost remis cu succes</b><br>Faceţi clic pentru a închide sfatul",
   "DE.ApplicationController.txtClose": "Închidere",
+  "DE.ApplicationController.txtEmpty": "(Gol)",
+  "DE.ApplicationController.txtPressLink": "Apăsați Ctrl și faceți clic pe linkul",
   "DE.ApplicationController.unknownErrorText": "Eroare necunoscută.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Browserul nu este compatibil.",
   "DE.ApplicationController.waitText": "Vă rugăm să așteptați...",

apps/documenteditor/embed/locale/ru.json

@@ -14,6 +14,8 @@
   "DE.ApplicationController.errorEditingDownloadas": "В ходе работы с документом произошла ошибка.<br>Используйте опцию 'Скачать как...', чтобы сохранить резервную копию файла на жесткий диск компьютера.",
   "DE.ApplicationController.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
   "DE.ApplicationController.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.<br>Обратитесь к администратору Сервера документов для получения дополнительной информации.",
+  "DE.ApplicationController.errorForceSave": "При сохранении файла произошла ошибка. Используйте опцию 'Скачать как', чтобы сохранить файл на жестком диске компьютера или повторите попытку позже.",
+  "DE.ApplicationController.errorLoadingFont": "Шрифты не загружены.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.ApplicationController.errorSubmit": "Не удалось отправить.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.<br>Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.",
   "DE.ApplicationController.errorUserDrop": "В настоящий момент файл недоступен.",
@@ -30,7 +32,8 @@
   "DE.ApplicationController.textSubmit": "Отправить",
   "DE.ApplicationController.textSubmited": "<b>Форма успешно отправлена</b><br>Нажмите, чтобы закрыть подсказку",
   "DE.ApplicationController.txtClose": "Закрыть",
-  "DE.ApplicationController.txtPressLink": "Нажмите Ctrl и щелкните по ссылке",
+  "DE.ApplicationController.txtEmpty": "(Пусто)",
+  "DE.ApplicationController.txtPressLink": "Нажмите CTRL и щелкните по ссылке",
   "DE.ApplicationController.unknownErrorText": "Неизвестная ошибка.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Ваш браузер не поддерживается.",
   "DE.ApplicationController.waitText": "Пожалуйста, подождите...",

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

@@ -402,7 +402,7 @@ define([
                 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-controls");
-                this.appOptions.canFeatureForms = true;
+                this.appOptions.canFeatureForms = false;
                 this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false));
 
                 this.appOptions.user.guest && this.appOptions.canRenameAnonymous && Common.NotificationCenter.on('user:rename', _.bind(this.showRenameUserDialog, this));
@@ -1830,6 +1830,10 @@ define([
                         config.msg = this.errorSubmit;
                         break;
 
+                    case Asc.c_oAscError.ID.LoadingFontError:
+                        config.msg = this.errorLoadingFont;
+                        break;
+
                     default:
                         config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -3026,7 +3030,8 @@ define([
             txtStyle_endnote_text: 'Endnote Text',
             txtTOCHeading: 'TOC Heading',
             textDisconnect: 'Connection is lost',
-            errorLang: 'The interface language is not loaded.<br>Please contact your Document Server administrator.'
+            errorLang: 'The interface language is not loaded.<br>Please contact your Document Server administrator.',
+            errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.'
         }
     })(), DE.Controllers.Main || {}))
 });

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

@@ -494,7 +494,8 @@ define([
                     var showPoint, ToolTip,
                         type = moveData.get_Type();
 
-                    if (type==Asc.c_oAscMouseMoveDataTypes.Hyperlink || type==Asc.c_oAscMouseMoveDataTypes.Footnote || type==Asc.c_oAscMouseMoveDataTypes.Form) { // 1 - hyperlink, 3 - footnote
+                    if (type==Asc.c_oAscMouseMoveDataTypes.Hyperlink || type==Asc.c_oAscMouseMoveDataTypes.Footnote || type==Asc.c_oAscMouseMoveDataTypes.Form ||
+                        type==Asc.c_oAscMouseMoveDataTypes.Review && me.mode.reviewHoverMode) {
                         if (isTooltipHiding) {
                             mouseMoveData = moveData;
                             return;
@@ -514,12 +515,22 @@ define([
                             ToolTip = moveData.get_FormHelpText();
                             if (ToolTip.length>1000)
                                 ToolTip = ToolTip.substr(0, 1000) + '...';
+                        } else if (type==Asc.c_oAscMouseMoveDataTypes.Review && moveData.get_ReviewChange()) {
+                            var changes = DE.getController("Common.Controllers.ReviewChanges").readSDKChange([moveData.get_ReviewChange()]);
+                            if (changes && changes.length>0)
+                                changes = changes[0];
+                            if (changes) {
+                                ToolTip = '<b>'+ Common.Utils.String.htmlEncode(AscCommon.UserInfoParser.getParsedName(changes.get('username'))) +'  </b>';
+                                ToolTip += '<span style="font-size:10px; opacity: 0.7;">'+ changes.get('date') +'</span><br>';
+                                ToolTip += changes.get('changetext');
+                            }
                         }
 
                         var recalc = false;
                         screenTip.isHidden = false;
 
-                        ToolTip = Common.Utils.String.htmlEncode(ToolTip);
+                        if (type!==Asc.c_oAscMouseMoveDataTypes.Review)
+                            ToolTip = Common.Utils.String.htmlEncode(ToolTip);
 
                         if (screenTip.tipType !== type || screenTip.tipLength !== ToolTip.length || screenTip.strTip.indexOf(ToolTip)<0 ) {
                             screenTip.toolTip.setTitle((type==Asc.c_oAscMouseMoveDataTypes.Hyperlink) ? (ToolTip + '<br><b>' + me.txtPressLink + '</b>') : ToolTip);
@@ -4149,7 +4160,18 @@ define([
                     Common.NotificationCenter.trigger('protect:signature', 'visible', this._isDisabled, datavalue);//guid, can edit settings for requested signature
                     break;
                 case 3:
-                    this.api.asc_RemoveSignature(datavalue); //guid
+                    var me = this;
+                    Common.UI.warning({
+                        title: this.notcriticalErrorTitle,
+                        msg: this.txtRemoveWarning,
+                        buttons: ['ok', 'cancel'],
+                        primary: 'ok',
+                        callback: function(btn) {
+                            if (btn == 'ok') {
+                                me.api.asc_RemoveSignature(datavalue);
+                            }
+                        }
+                    });
                     break;
             }
         },
@@ -4636,6 +4658,9 @@ define([
         textRemComboBox: 'Remove Combo Box',
         textRemDropdown: 'Remove Dropdown',
         textRemPicture: 'Remove Image',
-        textRemField: 'Remove Text Field'
+        textRemField: 'Remove Text Field',
+        txtRemoveWarning: 'Do you want to remove this signature?<br>It can\'t be undone.',
+        notcriticalErrorTitle: 'Warning'
+
 }, DE.Views.DocumentHolder || {}));
 });

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

@@ -831,9 +831,9 @@ define([
                             rec = (this._state.listValue!==undefined) ? this.list.store.findWhere({value: this._state.listValue}) : this.list.store.at(this._state.listIndex);
                         }
                         if (rec) {
-                            this.list.selectRecord(rec);
+                            this.list.selectRecord(rec, this.txtNewValue._input.is(':focus'));
                             this.list.scrollToRecord(rec);
-                        } else {
+                        } else if (!this.txtNewValue._input.is(':focus')) {
                             this.txtNewValue.setValue('');
                             this._state.listValue = this._state.listIndex = undefined;
                         }

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

@@ -522,7 +522,7 @@ define([
                     this.mnuTableTemplatePicker.selectRecord(rec, true);
                     this.btnTableTemplate.resumeEvents();
 
-                    this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '72px', 'background-position': 'center', 'background-size': 'auto 50px'});
+                    this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '72px', 'background-position': 'center', 'background-size': 'auto 52px'});
 
                     this._state.TemplateId = value;
                 }
@@ -737,7 +737,7 @@ define([
                     cls         : 'btn-large-dataview template-table',
                     iconCls     : 'icon-template-table',
                     menu        : new Common.UI.Menu({
-                        style: 'width: 575px;',
+                        style: 'width: 588px;',
                         items: [
                             { template: _.template('<div id="id-table-menu-template" class="menu-table-template"  style="margin: 5px 5px 5px 10px;"></div>') }
                         ]
@@ -753,7 +753,7 @@ define([
                         restoreHeight: 350,
                         groups: new Common.UI.DataViewGroupStore(),
                         store: new Common.UI.DataViewStore(),
-                        itemTemplate: _.template('<div id="<%= id %>" class="item"><img src="<%= imageUrl %>" height="50" width="70"></div>'),
+                        itemTemplate: _.template('<div id="<%= id %>" class="item"><img src="<%= imageUrl %>" height="52" width="72"></div>'),
                         style: 'max-height: 350px;'
                     });
                 });

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

@@ -46,7 +46,7 @@ define([
 
     DE.Views.TableToTextDialog = Common.UI.Window.extend(_.extend({
         options: {
-            width: 240,
+            width: 300,
             height: 254,
             header: true,
             style: 'min-width: 240px;',

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

@@ -1285,7 +1285,7 @@ define([
                     this.listStyles = new Common.UI.ComboDataView({
                         cls: 'combo-styles',
                         itemWidth: 104,
-                        itemHeight: 38,
+                        itemHeight: 40,
 //                hint        : this.tipParagraphStyle,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -1833,9 +1833,9 @@ define([
                 this.btnMarkers.setMenu(
                     new Common.UI.Menu({
                         cls: 'shifted-left',
-                        style: 'min-width: 139px',
+                        style: 'min-width: 145px',
                         items: [
-                            {template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 139px; margin: 0 9px;"></div>')},
+                            {template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 145px; margin: 0 9px;"></div>')},
                             {caption: '--'},
                             this.mnuMarkerChangeLevel = new Common.UI.MenuItem({
                                 caption: this.textChangeLevel,

apps/documenteditor/main/locale/de.json

@@ -206,7 +206,7 @@
   "Common.Views.About.txtVersion": "Version ",
   "Common.Views.AutoCorrectDialog.textAdd": "Hinzufügen",
   "Common.Views.AutoCorrectDialog.textApplyText": "Bei der Eingabe anwenden",
-  "Common.Views.AutoCorrectDialog.textAutoCorrect": "Autokorrektur",
+  "Common.Views.AutoCorrectDialog.textAutoCorrect": "Autokorrektur für Text",
   "Common.Views.AutoCorrectDialog.textAutoFormat": "AutoFormat während der Eingabe",
   "Common.Views.AutoCorrectDialog.textBulleted": "Automatische Aufzählungen",
   "Common.Views.AutoCorrectDialog.textBy": "Nach",
@@ -382,6 +382,8 @@
   "Common.Views.ReviewChanges.txtHistory": "Versionshistorie",
   "Common.Views.ReviewChanges.txtMarkup": "Alle Änderungen (Bearbeitung)",
   "Common.Views.ReviewChanges.txtMarkupCap": "Markup",
+  "Common.Views.ReviewChanges.txtMarkupSimple": "Alle Änderungen (Bearbeitung)<br>Sprechblasen ausblenden",
+  "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Einfaches Markup",
   "Common.Views.ReviewChanges.txtNext": "Zur nächsten Änderung",
   "Common.Views.ReviewChanges.txtOff": "DEAKTIVIERT für mich",
   "Common.Views.ReviewChanges.txtOffGlobal": "DEAKTIVIERT für alle",
@@ -517,6 +519,7 @@
   "DE.Controllers.Main.errorForceSave": "Beim Speichern der Datei ist ein Fehler aufgetreten. Verwenden Sie die Option \"Herunterladen als\", um die Datei auf Ihrer Computerfestplatte zu speichern oder versuchen Sie es später erneut.",
   "DE.Controllers.Main.errorKeyEncrypt": "Unbekannter Schlüsseldeskriptor",
   "DE.Controllers.Main.errorKeyExpire": "Der Schlüsseldeskriptor ist abgelaufen",
+  "DE.Controllers.Main.errorLoadingFont": "Schriftarten nicht hochgeladen.<br>Bitte wenden Sie sich an Administratoren von Ihrem Document Server.",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Fehler beim Laden des Dokuments. Bitte wählen Sie eine andere Datei.",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Merge ist fehlgeschlagen.",
   "DE.Controllers.Main.errorProcessSaveResult": "Speichern ist fehlgeschlagen.",
@@ -1397,6 +1400,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Zellen verbinden",
   "DE.Views.DocumentHolder.moreText": "Mehr Varianten...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "Keine Varianten",
+  "DE.Views.DocumentHolder.notcriticalErrorTitle": "Warnung",
   "DE.Views.DocumentHolder.originalSizeText": "Tatsächliche Größe",
   "DE.Views.DocumentHolder.paragraphText": "Absatz",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Hyperlink entfernen",
@@ -1554,6 +1558,7 @@
   "DE.Views.DocumentHolder.txtRemLimit": "Grenzwert entfernen",
   "DE.Views.DocumentHolder.txtRemoveAccentChar": "Akzentzeichen entfernen",
   "DE.Views.DocumentHolder.txtRemoveBar": "Leiste entfernen",
+  "DE.Views.DocumentHolder.txtRemoveWarning": "Möchten Sie diese Signatur wirklich entfernen?<br>Dies kann nicht rückgängig gemacht werden.",
   "DE.Views.DocumentHolder.txtRemScripts": "Skripts entfernen",
   "DE.Views.DocumentHolder.txtRemSubscript": "Tiefstellung entfernen",
   "DE.Views.DocumentHolder.txtRemSuperscript": "Hochstellung entfernen",

apps/documenteditor/main/locale/en.json

@@ -208,7 +208,7 @@
   "Common.Views.About.txtVersion": "Version ",
   "Common.Views.AutoCorrectDialog.textAdd": "Add",
   "Common.Views.AutoCorrectDialog.textApplyText": "Apply As You Type",
-  "Common.Views.AutoCorrectDialog.textAutoCorrect": "AutoCorrect",
+  "Common.Views.AutoCorrectDialog.textAutoCorrect": "Text AutoCorrect",
   "Common.Views.AutoCorrectDialog.textAutoFormat": "AutoFormat As You Type",
   "Common.Views.AutoCorrectDialog.textBulleted": "Automatic bulleted lists",
   "Common.Views.AutoCorrectDialog.textBy": "By",
@@ -392,6 +392,8 @@
   "Common.Views.ReviewChanges.txtHistory": "Version History",
   "Common.Views.ReviewChanges.txtMarkup": "All changes (Editing)",
   "Common.Views.ReviewChanges.txtMarkupCap": "Markup",
+  "Common.Views.ReviewChanges.txtMarkupSimple": "All changes (Editing)<br>Turn off balloons",
+  "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Simple Markup",
   "Common.Views.ReviewChanges.txtNext": "Next",
   "Common.Views.ReviewChanges.txtOff": "OFF for me",
   "Common.Views.ReviewChanges.txtOffGlobal": "OFF for me and everyone",
@@ -527,6 +529,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.errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",
   "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.",
@@ -1408,6 +1411,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Merge Cells",
   "DE.Views.DocumentHolder.moreText": "More variants...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "No variants",
+  "DE.Views.DocumentHolder.notcriticalErrorTitle": "Warning",
   "DE.Views.DocumentHolder.originalSizeText": "Actual Size",
   "DE.Views.DocumentHolder.paragraphText": "Paragraph",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Remove Hyperlink",
@@ -1565,6 +1569,7 @@
   "DE.Views.DocumentHolder.txtRemLimit": "Remove limit",
   "DE.Views.DocumentHolder.txtRemoveAccentChar": "Remove accent character",
   "DE.Views.DocumentHolder.txtRemoveBar": "Remove bar",
+  "DE.Views.DocumentHolder.txtRemoveWarning": "Do you want to remove this signature?<br>It can't be undone.",
   "DE.Views.DocumentHolder.txtRemScripts": "Remove scripts",
   "DE.Views.DocumentHolder.txtRemSubscript": "Remove subscript",
   "DE.Views.DocumentHolder.txtRemSuperscript": "Remove superscript",

apps/documenteditor/main/locale/es.json

@@ -206,7 +206,7 @@
   "Common.Views.About.txtVersion": "Versión ",
   "Common.Views.AutoCorrectDialog.textAdd": "Añadir",
   "Common.Views.AutoCorrectDialog.textApplyText": "Aplicar mientras escribe",
-  "Common.Views.AutoCorrectDialog.textAutoCorrect": "Autocorrección",
+  "Common.Views.AutoCorrectDialog.textAutoCorrect": "Autocorrección de texto",
   "Common.Views.AutoCorrectDialog.textAutoFormat": "Autoformato mientras escribe",
   "Common.Views.AutoCorrectDialog.textBulleted": "Listas con viñetas automáticas",
   "Common.Views.AutoCorrectDialog.textBy": "Por",
@@ -382,6 +382,8 @@
   "Common.Views.ReviewChanges.txtHistory": "Historial de versiones",
   "Common.Views.ReviewChanges.txtMarkup": "Todos los cambios (Edición)",
   "Common.Views.ReviewChanges.txtMarkupCap": "Margen",
+  "Common.Views.ReviewChanges.txtMarkupSimple": "Todos los cambios (Edición)<br>Desactivar los globos",
+  "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Revisiones simples",
   "Common.Views.ReviewChanges.txtNext": "Al siguiente cambio",
   "Common.Views.ReviewChanges.txtOff": "Desactivar para mí",
   "Common.Views.ReviewChanges.txtOffGlobal": "Desactivar para mí y para todos",
@@ -517,6 +519,7 @@
   "DE.Controllers.Main.errorForceSave": "Ha ocurrido un error mientras",
   "DE.Controllers.Main.errorKeyEncrypt": "Descriptor de clave desconocido",
   "DE.Controllers.Main.errorKeyExpire": "Descriptor de clave ha expirado",
+  "DE.Controllers.Main.errorLoadingFont": "Las fuentes no están cargadas.<br>Por favor, póngase en contacto con el administrador del Document Server.",
   "DE.Controllers.Main.errorMailMergeLoadFile": "La carga del documento ha fallado. Por favor, seleccione un archivo diferente.",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Error de fusión.",
   "DE.Controllers.Main.errorProcessSaveResult": "Problemas al guardar",
@@ -1397,6 +1400,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Unir celdas",
   "DE.Views.DocumentHolder.moreText": "Más variantes...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "Sin variantes ",
+  "DE.Views.DocumentHolder.notcriticalErrorTitle": "Advertencia",
   "DE.Views.DocumentHolder.originalSizeText": "Tamaño actual",
   "DE.Views.DocumentHolder.paragraphText": "Párrafo",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Eliminar hiperenlace",
@@ -1554,6 +1558,7 @@
   "DE.Views.DocumentHolder.txtRemLimit": "Eliminar límite",
   "DE.Views.DocumentHolder.txtRemoveAccentChar": "Quitar carácter de acento",
   "DE.Views.DocumentHolder.txtRemoveBar": "Eliminar barra",
+  "DE.Views.DocumentHolder.txtRemoveWarning": "¿Desea eliminar esta firma?<br>No se puede deshacer.",
   "DE.Views.DocumentHolder.txtRemScripts": "Eliminar texto",
   "DE.Views.DocumentHolder.txtRemSubscript": "Eliminar subíndice",
   "DE.Views.DocumentHolder.txtRemSuperscript": "Eliminar subíndice",

apps/documenteditor/main/locale/fr.json

@@ -49,9 +49,9 @@
   "Common.Controllers.ReviewChanges.textNoWidow": "Pas de contrôle des veuves",
   "Common.Controllers.ReviewChanges.textNum": "Changer la numérotation",
   "Common.Controllers.ReviewChanges.textOff": "{0} n'utilise plus le suivi des modifications. ",
-  "Common.Controllers.ReviewChanges.textOffGlobal": "{0}Désactiver le suivi des modifications pour tout le monde.",
+  "Common.Controllers.ReviewChanges.textOffGlobal": "{0} a désactivé le suivi des modifications pour tout le monde.",
   "Common.Controllers.ReviewChanges.textOn": "{0} utilise désormais le suivi des modifications.",
-  "Common.Controllers.ReviewChanges.textOnGlobal": "{0} Activer le suivi des modifications pour tout le monde.",
+  "Common.Controllers.ReviewChanges.textOnGlobal": "{0} a activé le suivi des modifications pour tout le monde.",
   "Common.Controllers.ReviewChanges.textParaDeleted": "<b>Paragraphe supprimé</b> ",
   "Common.Controllers.ReviewChanges.textParaFormatted": "Paragraphe formaté",
   "Common.Controllers.ReviewChanges.textParaInserted": "<b>Paragraphe inséré</b>",
@@ -206,7 +206,7 @@
   "Common.Views.About.txtVersion": "Version ",
   "Common.Views.AutoCorrectDialog.textAdd": "Ajouter",
   "Common.Views.AutoCorrectDialog.textApplyText": "Appliquer pendant la frappe",
-  "Common.Views.AutoCorrectDialog.textAutoCorrect": "Correction automatique",
+  "Common.Views.AutoCorrectDialog.textAutoCorrect": "Correction automatique de texte",
   "Common.Views.AutoCorrectDialog.textAutoFormat": "Mise en forme automatique au cours de la frappe",
   "Common.Views.AutoCorrectDialog.textBulleted": "Listes à puces automatiques",
   "Common.Views.AutoCorrectDialog.textBy": "Par",
@@ -377,11 +377,13 @@
   "Common.Views.ReviewChanges.txtCommentResolveMyCurrent": "Marquer mes commentaires comme résolus",
   "Common.Views.ReviewChanges.txtCompare": "Comparer",
   "Common.Views.ReviewChanges.txtDocLang": "Langue",
-  "Common.Views.ReviewChanges.txtFinal": "Toutes les modifications acceptées (aperçu)",
+  "Common.Views.ReviewChanges.txtFinal": "Toutes les modifications acceptées (Aperçu)",
   "Common.Views.ReviewChanges.txtFinalCap": "Final",
   "Common.Views.ReviewChanges.txtHistory": "Historique des versions",
-  "Common.Views.ReviewChanges.txtMarkup": "Toutes les modifications (édition)",
+  "Common.Views.ReviewChanges.txtMarkup": "Toutes les modifications (Édition)",
   "Common.Views.ReviewChanges.txtMarkupCap": "Balisage",
+  "Common.Views.ReviewChanges.txtMarkupSimple": "Toutes les modifications(Éditions)<br>Désactiver les bulles",
+  "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Marques simples",
   "Common.Views.ReviewChanges.txtNext": "À la modification suivante",
   "Common.Views.ReviewChanges.txtOff": "OFF pour moi ",
   "Common.Views.ReviewChanges.txtOffGlobal": "OFF pour moi et tout le monde",
@@ -517,6 +519,7 @@
   "DE.Controllers.Main.errorForceSave": "Une erreur est survenue lors de l'enregistrement du fichier. Veuillez utiliser l'option «Télécharger en tant que» pour enregistrer le fichier sur le disque dur de votre ordinateur ou réessayer plus tard.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu",
   "DE.Controllers.Main.errorKeyExpire": "Descripteur de clés expiré",
+  "DE.Controllers.Main.errorLoadingFont": "Les polices ne sont pas téléchargées.<br>Veuillez contacter l'administrateur de Document Server.",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Échec de chargement du document. Merci de choisir un autre fichier.",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Fusion a échoué.",
   "DE.Controllers.Main.errorProcessSaveResult": "Échec de l'enregistrement",
@@ -1397,6 +1400,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Fusionner les cellules",
   "DE.Views.DocumentHolder.moreText": "Plus de variantes...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "Pas de variantes",
+  "DE.Views.DocumentHolder.notcriticalErrorTitle": "Attention",
   "DE.Views.DocumentHolder.originalSizeText": "Taille actuelle",
   "DE.Views.DocumentHolder.paragraphText": "Paragraphe",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Supprimer le lien hypertexte",
@@ -1554,6 +1558,7 @@
   "DE.Views.DocumentHolder.txtRemLimit": "Supprimer la limite",
   "DE.Views.DocumentHolder.txtRemoveAccentChar": "Supprimer le caractère d'accent",
   "DE.Views.DocumentHolder.txtRemoveBar": "Supprimer la barre",
+  "DE.Views.DocumentHolder.txtRemoveWarning": "Voulez-vous supprimer cette signature?<br>Cette action ne peut pas être annulée.",
   "DE.Views.DocumentHolder.txtRemScripts": "Supprimer les scripts",
   "DE.Views.DocumentHolder.txtRemSubscript": "Supprimer la souscription",
   "DE.Views.DocumentHolder.txtRemSuperscript": "Supprimer la suscription",
@@ -2059,7 +2064,7 @@
   "DE.Views.MailMergeSettings.textSendMsg": "Tous les messages sont prêts et seront envoyés dans un certain temps.<br>La vitesse de diffusion dépendent de vos services de messagerie.<br>Vous pouvez continuer à travailler avec le document ou le fermer.Lorsque l'opération est terminée la notification sera envoyé à votre adresse email d'inscription.",
   "DE.Views.MailMergeSettings.textTo": "à",
   "DE.Views.MailMergeSettings.txtFirst": "Au premier enregistrement",
-  "DE.Views.MailMergeSettings.txtFromToError": "La valeur de \"De\" doit être inférieure à la valeur de \"A\"",
+  "DE.Views.MailMergeSettings.txtFromToError": "La valeur de \"De\" doit être inférieure à la valeur de \"À\"",
   "DE.Views.MailMergeSettings.txtLast": "Au dernier enregistrement",
   "DE.Views.MailMergeSettings.txtNext": "A l'enregistrement suivant",
   "DE.Views.MailMergeSettings.txtPrev": "A l'enregistrement précédent",

apps/documenteditor/main/locale/it.json

@@ -206,7 +206,7 @@
   "Common.Views.About.txtVersion": "Versione ",
   "Common.Views.AutoCorrectDialog.textAdd": "Aggiungi",
   "Common.Views.AutoCorrectDialog.textApplyText": "Applica durante la digitazione",
-  "Common.Views.AutoCorrectDialog.textAutoCorrect": "Correzione automatica",
+  "Common.Views.AutoCorrectDialog.textAutoCorrect": "Correzione automatica di testo",
   "Common.Views.AutoCorrectDialog.textAutoFormat": "Formattazione automatica durante la scrittura",
   "Common.Views.AutoCorrectDialog.textBulleted": "Elenchi puntati automatici",
   "Common.Views.AutoCorrectDialog.textBy": "Di",
@@ -382,6 +382,8 @@
   "Common.Views.ReviewChanges.txtHistory": "Cronologia delle versioni",
   "Common.Views.ReviewChanges.txtMarkup": "Tutte le modifiche (Modifica)",
   "Common.Views.ReviewChanges.txtMarkupCap": "Marcatura",
+  "Common.Views.ReviewChanges.txtMarkupSimple": "Tutti cambiamenti (Modifiche)<br>Disattivare le notifiche balloons",
+  "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Markup semplici",
   "Common.Views.ReviewChanges.txtNext": "Successivo",
   "Common.Views.ReviewChanges.txtOff": "Disattiva per me",
   "Common.Views.ReviewChanges.txtOffGlobal": "Disattiva per me e per tutti",
@@ -517,6 +519,7 @@
   "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",
+  "DE.Controllers.Main.errorLoadingFont": "I caratteri non sono caricati.<br>Si prega di contattare il tuo amministratore di Document Server.",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Caricamento del documento non riuscito. Si prega di selezionare un altro file.",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Unione non riuscita",
   "DE.Controllers.Main.errorProcessSaveResult": "Salvataggio non riuscito",
@@ -1397,6 +1400,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Unisci celle",
   "DE.Views.DocumentHolder.moreText": "Più varianti...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "Nessuna variante",
+  "DE.Views.DocumentHolder.notcriticalErrorTitle": "Avvertimento",
   "DE.Views.DocumentHolder.originalSizeText": "Dimensione reale",
   "DE.Views.DocumentHolder.paragraphText": "Paragrafo",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Elimina collegamento ipertestuale",
@@ -1554,6 +1558,7 @@
   "DE.Views.DocumentHolder.txtRemLimit": "Rimuovi limite",
   "DE.Views.DocumentHolder.txtRemoveAccentChar": "Rimuovi accento carattere",
   "DE.Views.DocumentHolder.txtRemoveBar": "Elimina barra",
+  "DE.Views.DocumentHolder.txtRemoveWarning": "Vuoi rimuovere questa firma?<br>Non può essere annullata.",
   "DE.Views.DocumentHolder.txtRemScripts": "Rimuovi gli script",
   "DE.Views.DocumentHolder.txtRemSubscript": "Elimina pedice",
   "DE.Views.DocumentHolder.txtRemSuperscript": "Elimina apice",

apps/documenteditor/main/locale/ja.json

@@ -1389,6 +1389,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "セルの結合",
   "DE.Views.DocumentHolder.moreText": "以上のバリエーション...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "バリエーションなし",
+  "DE.Views.DocumentHolder.notcriticalErrorTitle": "警告",
   "DE.Views.DocumentHolder.originalSizeText": "実際のサイズ",
   "DE.Views.DocumentHolder.paragraphText": "段落",
   "DE.Views.DocumentHolder.removeHyperlinkText": "ハイパーリンクの削除",
@@ -1673,23 +1674,23 @@
   "DE.Views.FileMenuPanels.ProtectDoc.txtSignedInvalid": "文書のデジタル署名の一部が無効であるか、検証できませんでした。 文書は編集できないように保護されています。",
   "DE.Views.FileMenuPanels.ProtectDoc.txtView": "署名の表示",
   "DE.Views.FileMenuPanels.Settings.okButtonText": "適用",
-  "DE.Views.FileMenuPanels.Settings.strAlignGuides": "配置ガイドターンにします。",
+  "DE.Views.FileMenuPanels.Settings.strAlignGuides": "配置ガイドをオンにします。",
-  "DE.Views.FileMenuPanels.Settings.strAutoRecover": "自動バックアップをターンにします。",
+  "DE.Views.FileMenuPanels.Settings.strAutoRecover": "自動バックアップをオンにします。",
-  "DE.Views.FileMenuPanels.Settings.strAutosave": "自動保存をターンにします。",
+  "DE.Views.FileMenuPanels.Settings.strAutosave": "自動保存をオンにします。",
   "DE.Views.FileMenuPanels.Settings.strCoAuthMode": "共同編集のモード",
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "他のユーザーにすぐに変更が表示されます",
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "変更を見れる前に、変更を受け入れる必要があります。",
   "DE.Views.FileMenuPanels.Settings.strFast": "ファスト",
   "DE.Views.FileMenuPanels.Settings.strFontRender": "フォントのヒント",
   "DE.Views.FileMenuPanels.Settings.strForcesave": "保存またはCtrl + Sを押した後、バージョンをサーバーに保存する。",
-  "DE.Views.FileMenuPanels.Settings.strInputMode": "漢字をターンにします。",
+  "DE.Views.FileMenuPanels.Settings.strInputMode": "漢字をオンにします。",
-  "DE.Views.FileMenuPanels.Settings.strLiveComment": "テキストコメントの表示をターンにします。",
+  "DE.Views.FileMenuPanels.Settings.strLiveComment": "テキストコメントの表示をオンにします。",
   "DE.Views.FileMenuPanels.Settings.strMacrosSettings": "マクロの設定",
   "DE.Views.FileMenuPanels.Settings.strPaste": "切り取り、コピー、貼り付け",
   "DE.Views.FileMenuPanels.Settings.strPasteButton": "貼り付けるときに[貼り付けオプション]ボタンを表示する",
   "DE.Views.FileMenuPanels.Settings.strResolvedComment": "解決されたコメントの表示をオンにする",
   "DE.Views.FileMenuPanels.Settings.strShowChanges": "リアルタイム共同編集の変更を表示します。",
-  "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "スペル チェックの機能をターンにします。",
+  "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "スペル・チェックの機能を有効にする",
   "DE.Views.FileMenuPanels.Settings.strStrict": "高レベル",
   "DE.Views.FileMenuPanels.Settings.strTheme": "テーマ",
   "DE.Views.FileMenuPanels.Settings.strUnit": "測定単位",

apps/documenteditor/main/locale/ro.json

@@ -382,6 +382,8 @@
   "Common.Views.ReviewChanges.txtHistory": "Istoricul versiune",
   "Common.Views.ReviewChanges.txtMarkup": "Toate modificările (Editare)",
   "Common.Views.ReviewChanges.txtMarkupCap": "Marcaj",
+  "Common.Views.ReviewChanges.txtMarkupSimple": "Toate modificările (Editare)<br>Dezactivare baloane",
+  "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Marcare simplă",
   "Common.Views.ReviewChanges.txtNext": "Următorul",
   "Common.Views.ReviewChanges.txtOff": "Dezactivează pentru mine",
   "Common.Views.ReviewChanges.txtOffGlobal": "Dezactivează tuturor",
@@ -517,6 +519,7 @@
   "DE.Controllers.Main.errorForceSave": "S-a produs o eroare în timpul salvării fișierului. Pentru copierea de rezervă pe PC utilizați opțiunea Descărcare ca... sau încercați din nou mai târziu.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descriptor cheie nerecunoscut",
   "DE.Controllers.Main.errorKeyExpire": "Descriptor cheie a expirat",
+  "DE.Controllers.Main.errorLoadingFont": "Fonturile nu sunt încărcate.<br>Contactați administratorul dvs de Server Documente.",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Încărcarea fișierului eșuată. Selectați un alt fișier.",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Îmbinarea eșuată.",
   "DE.Controllers.Main.errorProcessSaveResult": "Salvarea nu a reușit.",
@@ -1397,6 +1400,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Îmbinare celule",
   "DE.Views.DocumentHolder.moreText": "Mai multe variante...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "Fără variante",
+  "DE.Views.DocumentHolder.notcriticalErrorTitle": "Avertisment",
   "DE.Views.DocumentHolder.originalSizeText": "Dimensiunea reală",
   "DE.Views.DocumentHolder.paragraphText": "Paragraf",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Eliminare hyperlink",
@@ -1554,6 +1558,7 @@
   "DE.Views.DocumentHolder.txtRemLimit": "Eliminare limită",
   "DE.Views.DocumentHolder.txtRemoveAccentChar": "Eliminare caracter cu accent",
   "DE.Views.DocumentHolder.txtRemoveBar": "Eliminare bară",
+  "DE.Views.DocumentHolder.txtRemoveWarning": "Doriți să eliminați aceasta semnătura?<br>Va fi imposibil să anulați acțiunea.",
   "DE.Views.DocumentHolder.txtRemScripts": "Eliminare scripturi",
   "DE.Views.DocumentHolder.txtRemSubscript": "Eliminare indice",
   "DE.Views.DocumentHolder.txtRemSuperscript": "Eliminare exponent",

apps/documenteditor/main/locale/ru.json

@@ -206,7 +206,7 @@
   "Common.Views.About.txtVersion": "Версия ",
   "Common.Views.AutoCorrectDialog.textAdd": "Добавить",
   "Common.Views.AutoCorrectDialog.textApplyText": "Применять при вводе",
-  "Common.Views.AutoCorrectDialog.textAutoCorrect": "Автозамена",
+  "Common.Views.AutoCorrectDialog.textAutoCorrect": "Автозамена текста",
   "Common.Views.AutoCorrectDialog.textAutoFormat": "Автоформат при вводе",
   "Common.Views.AutoCorrectDialog.textBulleted": "Стили маркированных списков",
   "Common.Views.AutoCorrectDialog.textBy": "На",
@@ -381,7 +381,9 @@
   "Common.Views.ReviewChanges.txtFinalCap": "Измененный документ",
   "Common.Views.ReviewChanges.txtHistory": "История версий",
   "Common.Views.ReviewChanges.txtMarkup": "Все изменения (редактирование)",
-  "Common.Views.ReviewChanges.txtMarkupCap": "Изменения",
+  "Common.Views.ReviewChanges.txtMarkupCap": "Все исправления",
+  "Common.Views.ReviewChanges.txtMarkupSimple": "Все изменения (редактирование)<br>Отключить выноски",
+  "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Исправления",
   "Common.Views.ReviewChanges.txtNext": "К следующему",
   "Common.Views.ReviewChanges.txtOff": "ОТКЛ. для меня",
   "Common.Views.ReviewChanges.txtOffGlobal": "ОТКЛ. для меня и для всех",
@@ -517,6 +519,7 @@
   "DE.Controllers.Main.errorForceSave": "При сохранении файла произошла ошибка. Используйте опцию 'Скачать как', чтобы сохранить файл на жестком диске компьютера или повторите попытку позже.",
   "DE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
   "DE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек",
+  "DE.Controllers.Main.errorLoadingFont": "Шрифты не загружены.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Загрузка документа не удалась. Выберите другой файл.",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Не удалось выполнить слияние.",
   "DE.Controllers.Main.errorProcessSaveResult": "Сбой при сохранении.",
@@ -1397,6 +1400,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Объединить ячейки",
   "DE.Views.DocumentHolder.moreText": "Больше вариантов...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "Нет вариантов",
+  "DE.Views.DocumentHolder.notcriticalErrorTitle": "Внимание",
   "DE.Views.DocumentHolder.originalSizeText": "Реальный размер",
   "DE.Views.DocumentHolder.paragraphText": "Абзац",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку",
@@ -1554,6 +1558,7 @@
   "DE.Views.DocumentHolder.txtRemLimit": "Удалить предел",
   "DE.Views.DocumentHolder.txtRemoveAccentChar": "Удалить диакритический знак",
   "DE.Views.DocumentHolder.txtRemoveBar": "Удалить черту",
+  "DE.Views.DocumentHolder.txtRemoveWarning": "Вы хотите удалить эту подпись?<br>Это нельзя отменить.",
   "DE.Views.DocumentHolder.txtRemScripts": "Удалить индексы",
   "DE.Views.DocumentHolder.txtRemSubscript": "Удалить нижний индекс",
   "DE.Views.DocumentHolder.txtRemSuperscript": "Удалить верхний индекс",

apps/documenteditor/main/locale/zh.json

@@ -1988,7 +1988,7 @@
   "DE.Views.PageMarginsDialog.textNormal": "正常",
   "DE.Views.PageMarginsDialog.textOrientation": "方向",
   "DE.Views.PageMarginsDialog.textOutside": "外面",
-  "DE.Views.PageMarginsDialog.textPortrait": "肖像",
+  "DE.Views.PageMarginsDialog.textPortrait": "纵向",
   "DE.Views.PageMarginsDialog.textPreview": "预览",
   "DE.Views.PageMarginsDialog.textRight": "右",
   "DE.Views.PageMarginsDialog.textTitle": "边距",
@@ -2458,7 +2458,7 @@
   "DE.Views.Toolbar.textPageSizeCustom": "自定义页面大小",
   "DE.Views.Toolbar.textPictureControl": "图片",
   "DE.Views.Toolbar.textPlainControl": "插入纯文本内容控件",
-  "DE.Views.Toolbar.textPortrait": "肖像",
+  "DE.Views.Toolbar.textPortrait": "纵向",
   "DE.Views.Toolbar.textRemoveControl": "删除内容控件",
   "DE.Views.Toolbar.textRemWatermark": "删除水印",
   "DE.Views.Toolbar.textRichControl": "插入多信息文本内容控件",

apps/documenteditor/main/resources/less/rightmenu.less

@@ -21,7 +21,7 @@
 }
 
 .combo-pattern-item {
-    .background-ximage-v2('right-panels/patterns.png', 112px);
+    .background-ximage-all('right-panels/patterns.png', 112px);
 }
 
 .combo-dataview-menu {
@@ -39,7 +39,7 @@
 }
 
 .item-gradient {
-    .background-ximage-v2('right-panels/gradients.png', 150px);
+    .background-ximage-all('right-panels/gradients.png', 150px);
 
     width:50px;
     height:50px;

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

@@ -33,8 +33,8 @@
 }
 
 .item-markerlist {
-    width: 38px;
+    width: 40px;
-    height: 38px;
+    height: 40px;
 }
 
 .item-multilevellist {