Merge branch 'release/v8.1.0' into feature/slide-master

apps/api/documents/api.js

@@ -58,7 +58,8 @@
                          remove: ["Group1", ""] // current user can remove comments made by users from Group1 and users without a group.
                     },
                     userInfoGroups: ["Group1", ""], // show tooltips/cursors/info in header only for users in userInfoGroups groups. [""] - means users without group, [] - don't show any users, null/undefined/"" - show all users
-                    protect: <can protect document> // default = true. show/hide protect tab or protect buttons
+                    protect: <can protect document> // default = true. show/hide protect tab or protect buttons,
+                    chat: <true>
                 }
             },
             editorConfig: {
@@ -181,6 +182,7 @@
                         header: {
                             users: false/true // users list button
                             save: false/true // save button
+                            editMode: false/true // change mode button
                         },
                         leftMenu: {
                             navigation: false/true,
@@ -201,12 +203,13 @@
                             mode: false/true // init value in de/pe
                             change: false/true // hide/show feature in de/pe/sse
                         } / false / true // if false/true - use as init value in de/pe. use instead of customization.spellcheck parameter
+                        roles: false/true // hide/show Roles manager, roles settings in right panel and roles in View form button in de
                     },
                     font: {
                         name: "Arial",
                         size: "11px";
                     },
-                    chat: true,
+                    chat: true, // deprecated 7.1, use permissions.chat
                     comments: true,
                     zoom: 100,
                     compactToolbar: false,
@@ -289,6 +292,7 @@
                 'onRequestReferenceSource': <try to change source for external link>, // used for external links in sse. must call setReferenceSource method,
                 'onSaveDocument': 'save document from binary',
                 'onRequestStartFilling': <try to start filling forms> // used in pdf-form edit mode. must call startFilling method
+                'onSubmit': <filled form is submitted> // send when filled form is submitted successfully
             }
         }
 
@@ -995,7 +999,7 @@
             isForm = false;
         if (config.document) {
             if (typeof config.document.fileType === 'string')
-                type = /^(?:(pdf)|(djvu|xps|oxps)|(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots|xlsb)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp))$/
+                type = /^(?:(pdf)|(djvu|xps|oxps)|(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots|xlsb)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp)|(oform|docxf))$/
                     .exec(config.document.fileType);
 
             if (config.document.permissions)
@@ -1010,6 +1014,8 @@
                 appType = fillForms && isForm===undefined ? 'common' : 'word';
             else if (config.type !== 'mobile')
                 appType = isForm===undefined ? 'common' : isForm ? 'word' : 'pdf';
+        } else if (type && typeof type[5] === 'string') { // oform|docxf
+            appType = 'word';
         } else {
             if (typeof config.documentType === 'string')
                 appType = config.documentType.toLowerCase();
@@ -1076,15 +1082,18 @@
         if (config.frameEditorId)
             params += "&frameEditorId=" + config.frameEditorId;
 
-        var type = config.document ? /^(?:(pdf))$/.exec(config.document.fileType) : null;
-        if (!(type && typeof type[1] === 'string') && (config.editorConfig && config.editorConfig.mode == 'view' ||
+        var type = config.document ? /^(?:(pdf)|(oform|docxf))$/.exec(config.document.fileType) : null,
+            isPdf = type && typeof type[1] === 'string',
+            oldForm = type && typeof type[2] === 'string';
+
+        if (!(isPdf || oldForm) && (config.editorConfig && config.editorConfig.mode == 'view' ||
             config.document && config.document.permissions && (config.document.permissions.edit === false && !config.document.permissions.review )))
             params += "&mode=view";
-        if (type && typeof type[1] === 'string' && (config.document && config.document.permissions && config.document.permissions.edit === false || config.editorConfig && config.editorConfig.mode == 'view'))
+        if ((isPdf || oldForm) && (config.document && config.document.permissions && config.document.permissions.edit === false || config.editorConfig && config.editorConfig.mode == 'view'))
             params += "&mode=fillforms";
 
         if (config.document) {
-            config.document.isForm = (type && typeof type[1] === 'string') ? config.document.isForm : false;
+            config.document.isForm = isPdf ? config.document.isForm : !!oldForm;
             (config.document.isForm===true || config.document.isForm===false) && (params += "&isForm=" + config.document.isForm);
         }
 

apps/api/wopi/editor-wopi.ejs

@@ -285,8 +285,11 @@ div {
 			var fileType = fileInfo.BaseFileName ? fileInfo.BaseFileName.substr(fileInfo.BaseFileName.lastIndexOf('.') + 1) : "";
 			fileType = fileInfo.FileExtension ? fileInfo.FileExtension.substr(1) : fileType;
 			fileType = fileType.toLowerCase();
-			let permissionsEdit = !fileInfo.ReadOnly && fileInfo.UserCanWrite && queryParams.formsubmit !== "1";
-			let permissionsFillForm = permissionsEdit || queryParams.formsubmit === "1";
+			let customizationClose = !!(fileInfo.ClosePostMessage || fileInfo.CloseUrl);
+			let customizationSaveAs = fileInfo.SupportsUpdate && !fileInfo.UserCanNotWriteRelative;
+			let customizationFormSubmit = queryParams.formsubmit === "1";
+			let permissionsEdit = !fileInfo.ReadOnly && fileInfo.UserCanWrite && !customizationFormSubmit;
+			let permissionsFillForm = permissionsEdit || customizationFormSubmit;
 			var config = {
 				"width": "100%",
 				"height": "100%",
@@ -306,6 +309,7 @@ div {
                         "review": (fileInfo.SupportsReviewing===false) ? false : (fileInfo.UserCanReview===false ? false : fileInfo.UserCanReview),
                         "copy": fileInfo.CopyPasteRestrictions!=="CurrentDocumentOnly" && fileInfo.CopyPasteRestrictions!=="BlockAll",
                         "print": !fileInfo.DisablePrint && !fileInfo.HidePrintOption,
+                        "chat": queryParams.dchat!=="1",
                         "fillForms": permissionsFillForm
 					},
 					"options": {
@@ -323,6 +327,9 @@ div {
 					},
 					"customization": {
 						"about": true,
+						"close": {
+							"visible": customizationClose
+						},
 						"goback": {
 							"url": fileInfo.BreadcrumbFolderUrl
 						},
@@ -330,7 +337,7 @@ div {
                             "name": fileInfo.BreadcrumbBrandName,
                             "www": fileInfo.BreadcrumbBrandUrl
                         },
-                        "chat": queryParams.dchat!=="1",
+                        "submitForm": customizationFormSubmit && customizationSaveAs,
                         "uiTheme": queryParams.thm==="1" ? "default-light" : (queryParams.thm==="2" ? "default-dark" : undefined)
 					},
                     "coEditing": {
@@ -338,16 +345,17 @@ div {
                         "change": false
                     },
                     "wopi": {
-                        "FileNameMaxLength": fileInfo.FileNameMaxLength && fileInfo.FileNameMaxLength>0 ? fileInfo.FileNameMaxLength : 250
+                        "FileNameMaxLength": fileInfo.FileNameMaxLength && fileInfo.FileNameMaxLength>0 ? fileInfo.FileNameMaxLength : 250,
+                        "WOPISrc": userAuth.wopiSrc
                     }
 				},
 				"events": {
                     "onAppReady": onAppReady,
                     "onDocumentStateChange": fileInfo.EditNotificationPostMessage ? onDocumentStateChange : undefined,
                     'onRequestEditRights': fileInfo.EditModePostMessage || fileInfo.HostEditUrl ? onRequestEditRights : undefined,
-                    'onRequestSaveAs': fileInfo.SupportsUpdate && !fileInfo.UserCanNotWriteRelative ? onRequestSaveAs : undefined,
+                    'onRequestSaveAs': customizationSaveAs ? onRequestSaveAs : undefined,
                     "onError": onError,
-                    "onRequestClose": fileInfo.ClosePostMessage || fileInfo.CloseUrl ? onRequestClose : undefined,
+                    "onRequestClose": customizationClose ? onRequestClose : undefined,
                     "onRequestRename": fileInfo.SupportsRename && fileInfo.UserCanRename ? onRequestRename : undefined,
                     "onRequestSharingSettings": fileInfo.FileSharingPostMessage || fileInfo.FileSharingUrl ? onRequestSharingSettings : undefined,
                     "onRequestHistory": fileInfo.FileVersionUrl || fileInfo.FileVersionPostMessage ? onRequestHistory : undefined,

apps/common/Gateway.js

@@ -413,6 +413,10 @@ if (window.Common === undefined) {
                 }, data.buffer);
             },
 
+            submitForm: function() {
+                _postMessage({event: 'onSubmit'});
+            },
+
             on: function(event, handler){
                 var localHandler = function(event, data){
                     handler.call(me, data)

apps/common/locale.js

@@ -40,7 +40,7 @@ Common.Locale = new(function() {
         apply = false,
         defLang = '{{DEFAULT_LANG}}',
         currentLang = defLang,
-        _4letterLangs = ['pt-pt', 'zh-tw'];
+        _4letterLangs = ['pt-pt', 'zh-tw', 'sr-cyrl'];
 
     var _applyLocalization = function(callback) {
         try {
@@ -104,9 +104,10 @@ Common.Locale = new(function() {
 
     var _requireLang = function (l) {
         typeof l != 'string' && (l = null);
-        var lang = (l || _getUrlParameterByName('lang') || defLang);
-        var idx4Letters = _4letterLangs.indexOf(lang.replace('_', '-').toLowerCase()); // try to load 4 letters language
-        lang = (idx4Letters<0) ? lang.split(/[\-_]/)[0] : _4letterLangs[idx4Letters];
+        var lang = (l || _getUrlParameterByName('lang') || defLang).toLowerCase().split(/[\-_]/);
+        lang = lang[0] + (lang.length>1 ? '-' + lang[1] : '');
+        var idx4Letters = _4letterLangs.indexOf(lang); // try to load 4 letters language
+        lang = (idx4Letters<0) ? lang.split(/[\-]/)[0] : _4letterLangs[idx4Letters];
         currentLang = lang;
         fetch('locale/' + lang + '.json')
             .then(function(response) {

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

@@ -196,7 +196,7 @@ define([
         '<i class="caret"></i>';
 
     var templateHugeCaption =
-            '<button type="button" class="btn <%= cls %>" id="<%= id %>" data-hint="<%= dataHint %>" data-hint-direction="<%= dataHintDirection %>" data-hint-offset="<%= dataHintOffset %>" <% if (dataHintTitle) { %> data-hint-title="<%= dataHintTitle %>" <% } %>> ' +
+            '<button type="button" class="btn <%= cls %>" id="<%= id %>" style="<%= style %>" data-hint="<%= dataHint %>" data-hint-direction="<%= dataHintDirection %>" data-hint-offset="<%= dataHintOffset %>" <% if (dataHintTitle) { %> data-hint-title="<%= dataHintTitle %>" <% } %>> ' +
                 '<div class="inner-box-icon">' +
                     templateBtnIcon +
                 '</div>' +
@@ -737,9 +737,9 @@ define([
         },
 
         setIconCls: function(cls) {
-            var btnIconEl = $(this.el).find('.icon'),
+            var btnIconEl = $(this.el).find('i.icon'),
                 oldCls = this.iconCls,
-                svgIcon = btnIconEl.find('use.zoom-int');
+                svgIcon = $(this.el).find('.icon use.zoom-int');
 
             this.iconCls = cls;
             if (/svgicon/.test(this.iconCls)) {
@@ -760,12 +760,18 @@ define([
 
         changeIcon: function(opts) {
             var me = this,
-                btnIconEl = $(this.el).find('.icon');
+                btnIconEl = $(this.el).find('i.icon');
             if (btnIconEl.length > 1) btnIconEl = $(btnIconEl[0]);
             if (opts && (opts.curr || opts.next) && btnIconEl) {
-                var svgIcon = btnIconEl.find('use.zoom-int');
-                !!opts.curr && (btnIconEl.removeClass(opts.curr));
-                !!opts.next && !btnIconEl.hasClass(opts.next) && (btnIconEl.addClass(opts.next));
+                var svgIcon = $(this.el).find('.icon use.zoom-int');
+                if (opts.curr) {
+                    btnIconEl.removeClass(opts.curr);
+                    me.iconCls = me.iconCls.replace(opts.curr, '').trim();
+                }
+                if (opts.next) {
+                    !btnIconEl.hasClass(opts.next) && (btnIconEl.addClass(opts.next));
+                    (me.iconCls.indexOf(opts.next)<0) && (me.iconCls += ' ' + opts.next);
+                }
                 svgIcon.length && !!opts.next && svgIcon.attr('href', '#' + opts.next);
 
                 if ( !!me.options.signals ) {
@@ -955,14 +961,14 @@ define([
                 me.options.scaling = ratio;
 
                 if (ratio > 2) {
-                    if (!me.$el.find('svg.icon').length) {
-                        const iconCls = me.iconCls || me.$el.find('i.icon').attr('class');
+                    const $el = me.$el.is('button') ? me.$el : me.$el.find('button:first');
+                    if (!$el.find('svg.icon').length) {
+                        const iconCls = me.iconCls || $el.find('i.icon').attr('class');
                         const re_icon_name = /btn-[^\s]+/.exec(iconCls);
                         const icon_name = re_icon_name ? re_icon_name[0] : "null";
                         const rtlCls = (iconCls ? iconCls.indexOf('icon-rtl') : -1) > -1 ? 'icon-rtl' : '';
                         const svg_icon = '<svg class="icon %rtlCls"><use class="zoom-int" href="#%iconname"></use></svg>'.replace('%iconname', icon_name).replace('%rtlCls', rtlCls);
-
-                        me.$el.find('i.icon').after(svg_icon);
+                        $el.find('i.icon').after(svg_icon);
                     }
                 } else {
                     if (!me.$el.find('i.icon')) {

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

@@ -42,11 +42,11 @@ define([
         render: function(parentEl) {
             Common.UI.Button.prototype.render.call(this, parentEl);
 
-            if (/huge/.test(this.options.cls) &&  this.options.split === true ) {
+            if (/huge/.test(this.options.cls) &&  this.options.split === true && !this.options.hideColorLine) {
                 var btnEl = $('button', this.cmpEl),
                     btnMenuEl = $(btnEl[1]);
                 btnMenuEl && btnMenuEl.append( $('<div class="btn-color-value-line"></div>'));
-            } else
+            } else if (!this.options.hideColorLine)
                 $('button:first-child', this.cmpEl).append( $('<div class="btn-color-value-line"></div>'));
             this.colorEl = this.cmpEl.find('.btn-color-value-line');
 

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

@@ -82,6 +82,7 @@ define([
                 disabled    : false,
                 menuCls     : '',
                 menuStyle   : '',
+                menuAlignEl : null,
                 restoreMenuHeight: true,
                 displayField: 'displayValue',
                 valueField  : 'value',
@@ -130,7 +131,6 @@ define([
                 this.search         = me.options.search;
                 this.scrollAlwaysVisible = me.options.scrollAlwaysVisible;
                 this.focusWhenNoSelection = (me.options.focusWhenNoSelection!==false);
-
                 this.restoreMenuHeight = me.options.restoreMenuHeight;
 
                 me.rendered         = me.options.rendered || false;
@@ -319,16 +319,31 @@ define([
                     }
                 }
 
-                var $list = this.cmpEl.find('ul');
-                if ($list.hasClass('menu-absolute')) {
-                    var offset = this.cmpEl.offset();
-                    var left = offset.left;
-                    if (left + $list.outerWidth()>Common.Utils.innerWidth())
-                        left += (this.cmpEl.outerWidth() - $list.outerWidth());
-                    $list.css({left: left, top: offset.top + this.cmpEl.outerHeight() + 2});
-                } else if ($list.hasClass('menu-aligned')) {
-                    var offset = this.cmpEl.offset();
-                    $list.toggleClass('show-top', offset.top + this.cmpEl.outerHeight() + $list.outerHeight() > Common.Utils.innerHeight());
+                var $list = this.cmpEl.find('ul'),
+                    isMenuAbsolute = $list.hasClass('menu-absolute');
+                if (this.options.restoreMenuHeightAndTop || isMenuAbsolute) {
+                    var offset = this.cmpEl.offset(),
+                        parentTop = this.options.menuAlignEl ? this.options.menuAlignEl.offset().top : 0,
+                        marginTop = parseInt($list.css('margin-top')),
+                        menuTop = offset.top - parentTop + this.cmpEl.outerHeight() + marginTop,
+                        menuLeft = offset.left;
+
+                    if (this.options.restoreMenuHeightAndTop) { // show menu at top
+                        var parentHeight = this.options.menuAlignEl ? this.options.menuAlignEl.outerHeight() : Common.Utils.innerHeight() - 10,
+                            diff = typeof this.options.restoreMenuHeightAndTop === "number" ? this.options.restoreMenuHeightAndTop : 100000;
+
+                        var showAtTop = (menuTop + $list.outerHeight() > parentHeight) && (menuTop + diff > parentHeight) && ((offset.top - parentTop)*0.9 > parentHeight - menuTop);
+                        // if menu height less than restoreMenuHeightAndTop - show menu at top, if greater - try to change menu height + compare available space at top and bottom of combobox
+                        if (!isMenuAbsolute)
+                            $list.toggleClass('show-top', showAtTop);
+                        else if (showAtTop)
+                            menuTop = offset.top - parentTop - $list.outerHeight();
+                    }
+                    if (isMenuAbsolute) {
+                        if (menuLeft + $list.outerWidth()>Common.Utils.innerWidth())
+                            menuLeft += (this.cmpEl.outerWidth() - $list.outerWidth());
+                        $list.css({left: menuLeft, top: menuTop + parentTop});
+                    }
                 }
             },
 
@@ -372,7 +387,8 @@ define([
                         }
                     }
                     var cg = Common.Utils.croppedGeometry(),
-                        docH = cg.height - 10,
+                        parentTop = this.options.menuAlignEl ? this.options.menuAlignEl.offset().top : cg.top,
+                        parentHeight = this.options.menuAlignEl ? this.options.menuAlignEl.outerHeight() : cg.height - 10,
                         menuH = $list.outerHeight(),
                         menuTop = $list.get(0).getBoundingClientRect().top,
                         newH = menuH;
@@ -380,11 +396,19 @@ define([
                     if (menuH < this.restoreMenuHeight)
                         newH = this.restoreMenuHeight;
 
-                    if (menuTop + newH > docH)
-                        newH = docH - menuTop;
+                    var offset = this.cmpEl.offset();
+                    if (menuTop<offset.top) { // menu is shown at top
+                        if (offset.top - parentTop < newH)
+                            newH = offset.top - parentTop;
+                    } else {
+                        if (menuTop + newH > parentHeight + parentTop)
+                            newH = parentHeight + parentTop - menuTop;
+                    }
 
-                    if (newH !== menuH)
+                    if (newH !== menuH) {
                         $list.css('max-height', newH + 'px');
+                        $list.hasClass('menu-absolute') && (menuTop<offset.top) && $list.css({top: offset.top - $list.outerHeight()});
+                    }
                 }
             },
 

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

@@ -59,6 +59,7 @@ define([
             enableKeyEvents     : false,
             beforeOpenHandler   : null,
             additionalMenuItems  : null,
+            fillOnChangeVisibility: false,
             showLast: true,
             minWidth: -1,
             dataHint: '',
@@ -95,6 +96,7 @@ define([
             this.minWidth    = this.options.minWidth;
             this.autoWidth   = this.initAutoWidth = (Common.Utils.isIE10 || Common.Utils.isIE11) ? false : this.options.autoWidth;
             this.delayRenderTips = this.options.delayRenderTips || false;
+            this.fillOnChangeVisibility = this.options.fillOnChangeVisibility || false;
             this.itemTemplate   = this.options.itemTemplate || _.template([
                 '<div class="style" id="<%= id %>">',
                     '<img src="<%= imageUrl %>" width="' + this.itemWidth + '" height="' + this.itemHeight + '" + <% if(typeof imageUrl === "undefined" || imageUrl===null || imageUrl==="") { %> style="visibility: hidden;" <% } %>/>',
@@ -235,6 +237,20 @@ define([
             this.startCheckSize();
         },
 
+        checkVisibility: function() {
+            var me = this;
+            if (!me._timer_visibility) {
+                me._timer_visibility =  setInterval(function() {
+                    if (me.isVisible()) {
+                        clearInterval(me._timer_visibility);
+                        delete me._timer_visibility;
+                        var record = me.menuPicker.getSelectedRec();
+                        record && me.fillComboView(record, !!record, true);
+                    }
+                }, 500);
+            }
+        },
+
         startCheckSize: function() {
             var me = this;
             me.checkSize();
@@ -562,6 +578,7 @@ define([
                             me.resumeEvents();
                         }
                     }
+                    me.fillOnChangeVisibility && !me.isVisible() && me.checkVisibility();
                     return me.fieldPicker.store.models; // return list of visible items
                 }
             }

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

@@ -685,12 +685,12 @@ define([
                     menuRoot.css('max-height', 'none');
                     menuH = menuRoot.outerHeight();
                     if (top + menuH > docH + cg.top) {
-                        top = docH - menuH;
+                        top = docH - menuH + cg.top;
                     }
                     if (top < cg.top)
                         top = cg.top;
                     if (top + menuH > docH + cg.top) {
-                        menuRoot.css('max-height', (docH - top) + 'px');
+                        menuRoot.css('max-height', (docH - top + cg.top) + 'px');
                         (!this.scroller) && (this.scroller = new Common.UI.Scroller({
                             el: this.$el.find('> .dropdown-menu '),
                             minScrollbarLength: 30,
@@ -724,7 +724,7 @@ define([
                             m = fixedAlign.match(/^([a-z]+)-([a-z]+)/);
                             top  = offset.top  - posMenu[m[1]][1] + posParent[m[2]][1] + this.offset[1] + (fixedOffset || 0);
                         } else
-                            top = docH - menuH;
+                            top = docH - menuH + cg.top;
                     }
 
 

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

@@ -47,8 +47,8 @@ define([
 
         options : {
             hint: false,
-            width: 25,
-            thumbWidth: 13,
+            width: 30,
+            thumbWidth: 12,
             value: false
         },
 
@@ -56,8 +56,6 @@ define([
 
         template    : _.template([
             '<div class="switcher">',
-                '<div class="sw-left"></div>',
-                '<div class="sw-right"></div>',
                 '<div class="thumb"></div>',
             '</div>'
         ].join('')),
@@ -108,8 +106,6 @@ define([
 
             this.cmpEl.width(me.width);
             this.thumb.width(me.thumbWidth);
-            this.cmpEl.find('.sw-left').width(me.width/2);
-            this.cmpEl.find('.sw-right').width(me.width/2);
 
             var onMouseUp = function (e) {
                 if ( me.disabled ) return;
@@ -140,9 +136,9 @@ define([
 
                 var pos = Math.round((e.pageX*Common.Utils.zoom() - me._dragstart));
                 if (me.value) {
-                    me.thumb.css({right: (pos<1) ? Math.min(me.width-me.thumbWidth - 2, -pos) : 0, left: 'auto'});
+                    me.thumb.css({right: (pos<1) ? Math.min(me.width-me.thumbWidth - 4, -pos) : 0, left: 'auto'});
                 } else {
-                    me.thumb.css({left: (pos>-1) ? Math.min(me.width-me.thumbWidth - 2, pos) : 0, right: 'auto'});
+                    me.thumb.css({left: (pos>-1) ? Math.min(me.width-me.thumbWidth - 4, pos) : 0, right: 'auto'});
                 }
                 if (!me._isMouseMove) me._isMouseMove = Math.abs(pos)>0;
             };

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

@@ -1722,7 +1722,7 @@ define([
 
             var lang = (this.mode ? this.mode.lang || 'en' : 'en').replace('_', '-').toLowerCase();
             try {
-                if ( lang == 'ar-SA' ) lang = lang + '-u-nu-latn-ca-gregory';    // TODO: check Intl.Locale to support suitable options
+                if ( lang == 'ar-SA'.toLowerCase() ) lang = lang + '-u-nu-latn-ca-gregory';    // TODO: check Intl.Locale to support suitable options
                 return date.toLocaleString(lang, {dateStyle: 'short', timeStyle: 'short'});
             } catch (e) {
                 lang = 'en';

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

@@ -121,6 +121,12 @@ define([
                             if ( !$.isEmptyObject(titlebuttons) ) {
                                 var header = webapp.getController('Viewport').getView('Common.Views.Header');
                                 if (header) {
+                                    if ( native.getViewportSettings ) {
+                                        const viewport = native.getViewportSettings();
+                                        if ( viewport.widgetType == 'window' && titlebuttons.home )
+                                            titlebuttons.home.btn.setVisible(true);
+                                    }
+
                                     for (var i in titlebuttons) {
                                         opts.title.buttons.push(_serializeHeaderButton(i, titlebuttons[i]));
                                     }
@@ -225,7 +231,7 @@ define([
                 icon: config.icon || undefined,
                 hint: config.btn.options.hint,
                 disabled: config.btn.isDisabled(),
-                visible: config.visible,
+                visible: config.btn.isVisible(),
             };
         };
 
@@ -259,11 +265,11 @@ define([
 
             if ( !!titlebuttons ) {
                 info.hints = {};
-                !!titlebuttons['print'] && (info.hints['print'] = titlebuttons['print'].btn.btnEl.attr('data-hint-title'));
-                !!titlebuttons['quickprint'] && (info.hints['quickprint'] = titlebuttons['quickprint'].btn.btnEl.attr('data-hint-title'));
-                !!titlebuttons['undo'] && (info.hints['undo'] = titlebuttons['undo'].btn.btnEl.attr('data-hint-title'));
-                !!titlebuttons['redo'] && (info.hints['redo'] = titlebuttons['redo'].btn.btnEl.attr('data-hint-title'));
-                !!titlebuttons['save'] && (info.hints['save'] = titlebuttons['save'].btn.btnEl.attr('data-hint-title'));
+                !!titlebuttons['print'] && (info.hints['print'] = titlebuttons['print'].btn.btnEl.attr('data-hint-title-lang'));
+                !!titlebuttons['quickprint'] && (info.hints['quickprint'] = titlebuttons['quickprint'].btn.btnEl.attr('data-hint-title-lang'));
+                !!titlebuttons['undo'] && (info.hints['undo'] = titlebuttons['undo'].btn.btnEl.attr('data-hint-title-lang'));
+                !!titlebuttons['redo'] && (info.hints['redo'] = titlebuttons['redo'].btn.btnEl.attr('data-hint-title-lang'));
+                !!titlebuttons['save'] && (info.hints['save'] = titlebuttons['save'].btn.btnEl.attr('data-hint-title-lang'));
             }
 
             native.execCommand('althints:show', JSON.stringify(info));
@@ -408,10 +414,15 @@ define([
                 var header = webapp.getController('Viewport').getView('Common.Views.Header');
 
                 {
+                    let viewport;
+                    if ( native.getViewportSettings ) {
+                        viewport = native.getViewportSettings();
+                    }
+
                     header.btnHome = (new Common.UI.Button({
                         cls: 'btn-header',
                         iconCls: 'toolbar__icon icon--inverse btn-home',
-                        visible: false,
+                        visible: viewport && viewport.widgetType == 'window',
                         hint: Common.Locale.get('hintBtnHome', {name:"Common.Controllers.Desktop", default: 'Show Main window'}),
                         dataHint:'0',
                         dataHintDirection: 'right',
@@ -463,6 +474,9 @@ define([
                 if (!!header.btnRedo)
                     titlebuttons['redo'] = {btn: header.btnRedo};
 
+                if (!!header.btnQuickAccess)
+                    titlebuttons['quickaccess'] = {btn: header.btnQuickAccess};
+
                 for (var i in titlebuttons) {
                     titlebuttons[i].btn.options.signals = ['disabled'];
                     titlebuttons[i].btn.on('disabled', _onTitleButtonDisabled.bind(this, i));
@@ -519,6 +533,10 @@ define([
             console.log('open recent');
         }
 
+        const _onChangeQuickAccess = function (props) {
+            native.execCommand("quickaccess:changed", JSON.stringify(props));
+        }
+
         const _extend_menu_file = function (args) {
             console.log('extend menu file')
 
@@ -576,6 +594,7 @@ define([
                             }
                         },
                         'hints:show': _onHintsShow.bind(this),
+                        'quickaccess:changed': _onChangeQuickAccess.bind(this),
                     });
 
                     webapp.addListeners({
@@ -745,6 +764,7 @@ define([
         FILE_DOCUMENT_DOC_FLAT: FILE_DOCUMENT + 0x0010,
         FILE_DOCUMENT_OFORM: FILE_DOCUMENT + 0x0015,
         FILE_DOCUMENT_DOCXF: FILE_DOCUMENT + 0x0016,
+        FILE_DOCUMENT_OFORM_PDF: FILE_DOCUMENT + 0x0017,
         FILE_DOCUMENT_XML: FILE_DOCUMENT + 0x0030,
 
         FILE_PRESENTATION:      FILE_PRESENTATION,
@@ -794,6 +814,7 @@ define([
             case utils.defines.FileFormat.FILE_DOCUMENT_DOTX:       return 'dotx';
             case utils.defines.FileFormat.FILE_DOCUMENT_OTT:        return 'ott';
             case utils.defines.FileFormat.FILE_DOCUMENT_OFORM:      return 'oform';
+            case utils.defines.FileFormat.FILE_DOCUMENT_OFORM_PDF:  return 'pdf';
             case utils.defines.FileFormat.FILE_DOCUMENT_DOCXF:      return 'docxf';
             case utils.defines.FileFormat.FILE_DOCUMENT_ODT_FLAT:   return 'fodt';
             case utils.defines.FileFormat.FILE_DOCUMENT_DOTM:       return 'dotm';

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

@@ -214,20 +214,25 @@ Common.UI.HintManager = new(function() {
         var arr = _arrAlphabet.slice(),
             firstFreeLetter,
             ind;
-        for (var i = 0; i < _arrAlphabet.length, !firstFreeLetter; i++) {
+        for (var i = 0; i < _arrAlphabet.length; i++) {
             if (_usedTitles.indexOf(_arrAlphabet[i]) === -1) {
                 firstFreeLetter = _arrAlphabet[i];
                 ind = i;
             }
+            if (firstFreeLetter)
+                break;
         }
-        arr[ind] = firstFreeLetter + _arrAlphabet[0];
-        for (var i = 0; arr.length < countButtons; i++) {
-            var addTip = firstFreeLetter + _arrAlphabet[i];
-            if (addTip !== arr[ind]) {
-                arr.push(firstFreeLetter + _arrAlphabet[i]);
+        if (firstFreeLetter) {
+            arr[ind] = firstFreeLetter + _arrAlphabet[0];
+            for (var i = 0; arr.length < countButtons; i++) {
+                var addTip = firstFreeLetter + _arrAlphabet[i];
+                if (addTip !== arr[ind]) {
+                    arr.push(firstFreeLetter + _arrAlphabet[i]);
+                }
             }
+            return arr;
         }
-        return arr;
+        return false;
     };
 
     var _getLetterInUILanguage = function (letter) {
@@ -247,42 +252,35 @@ Common.UI.HintManager = new(function() {
         _currentControls = [];
         _usedTitles = [];
         var arr = [],
-            arrItemsWithTitle = [];
+            itemsWithTitle = [],
+            itemsWithStaticTitle = [];
         if (_.isArray(_currentSection)) {
             _currentSection.forEach(function (section) {
                 arr = arr.concat($(section).find('[data-hint=' + (_currentLevel) + ']').toArray());
-                arrItemsWithTitle = arrItemsWithTitle.concat($(section).find('[data-hint-title][data-hint=' + (_currentLevel) + ']').toArray());
+                itemsWithStaticTitle = itemsWithStaticTitle.concat($(section).find('[data-hint-title][data-hint=' + (_currentLevel) + ']').toArray());
+                itemsWithTitle = itemsWithTitle.concat($(section).find('[data-hint-title-lang][data-hint=' + (_currentLevel) + ']').toArray());
             });
         } else {
             arr = $(_currentSection).find('[data-hint=' + (_currentLevel) + ']').toArray();
-            arrItemsWithTitle = $(_currentSection).find('[data-hint-title][data-hint=' + (_currentLevel) + ']').toArray();
+            itemsWithStaticTitle = $(_currentSection).find('[data-hint-title][data-hint=' + (_currentLevel) + ']').toArray();
+            itemsWithTitle = $(_currentSection).find('[data-hint-title-lang][data-hint=' + (_currentLevel) + ']').toArray();
         }
         var visibleItems = arr.filter(function (item) {
             return $(item).is(':visible');
         });
-        var visibleItemsWithTitle = arrItemsWithTitle.filter(function (item) {
+        var visibleItemsWithTitle = itemsWithTitle.filter(function (item) {
             return $(item).is(':visible');
         });
-        if (visibleItems.length === visibleItemsWithTitle.length) { // all buttons have data-hint-title
+        var visibleItemsWithStaticTitle = itemsWithStaticTitle.filter(function (item) {
+            return $(item).is(':visible');
+        });
+        if (visibleItems.length === visibleItemsWithTitle.length) { // all buttons have data-hint-title-lang
             visibleItems.forEach(function (item) {
-                var el = $(item);
-                if (_lang !== 'en') {
-                    var title = el.attr('data-hint-title').toLowerCase(),
-                        firstLetter = title.charAt(0);
-                    if (_arrAlphabet.indexOf(firstLetter) === -1) { // tip is in English
-                        var newTip = '';
-                        for (var i = 0; i < title.length; i++) {
-                            var letter = title.charAt(i);
-                            newTip += _getLetterInUILanguage(letter);
-                        }
-                        el.attr('data-hint-title', newTip.toUpperCase());
-                    }
-
-                }
-                _currentControls.push(el);
+                _currentControls.push($(item));
             });
             return;
         }
+        // create letter combinations
         var _arrLetters = [],
             _usedLetters = [];
         if (_currentLevel === 0) {
@@ -296,7 +294,7 @@ Common.UI.HintManager = new(function() {
             }
         }
         if (visibleItems.length + (_currentLevel === 0 ? _.size(_staticHints) : 0) > _arrAlphabet.length) {
-            visibleItemsWithTitle.forEach(function (item) {
+            visibleItemsWithStaticTitle.forEach(function (item) {
                 var t = $(item).data('hint-title').charAt(0).toLowerCase();
                 t = _getLetterInUILanguage(t);
                 if (_usedTitles.indexOf(t) < 0) {
@@ -307,35 +305,29 @@ Common.UI.HintManager = new(function() {
         } else {
             _arrLetters = _arrAlphabet.slice();
         }
-        if (arrItemsWithTitle.length > 0) {
-            visibleItems.forEach(function (item) {
-                var el = $(item),
-                    title = el.attr('data-hint-title');
-                if (title) {
-                    title = title.toLowerCase();
-                    var firstLetter = title.charAt(0),
-                        ind = _arrEnAlphabet.indexOf(firstLetter),
-                        i;
-                    if (ind === -1) { // we have already changed
-                        i = _arrAlphabet.indexOf(firstLetter);
-                        if (_usedLetters.indexOf(i) < 0) {
-                            _usedLetters.push(i);
-                        }
-                    } else {
-                        if (_usedLetters.indexOf(ind) < 0) {
-                            _usedLetters.push(ind);
-                        }
-                        if (_lang !== 'en') {
-                            var newTitle = '';
-                            for (i = 0; i < title.length; i++) {
-                                newTitle += _getLetterInUILanguage(title.charAt(i));
-                            }
-                            el.attr('data-hint-title', newTitle.toUpperCase());
-                        }
+        if (!_arrLetters.length) return;
+        // add attrs
+        visibleItemsWithStaticTitle.forEach(function (item) {
+            var el = $(item),
+                title = el.attr('data-hint-title');
+            if (title) {
+                title = title.toLowerCase();
+                var firstLetter = title.charAt(0),
+                    ind = _arrEnAlphabet.indexOf(firstLetter),
+                    i;
+                if (_usedLetters.indexOf(ind) < 0)
+                    _usedLetters.push(ind);
+                if (_lang === 'en') {
+                    el.attr('data-hint-title-lang', title.toUpperCase());
+                } else {
+                    var newTitle = '';
+                    for (i = 0; i < title.length; i++) {
+                        newTitle += _getLetterInUILanguage(title.charAt(i));
                     }
+                    el.attr('data-hint-title-lang', newTitle.toUpperCase());
                 }
-            });
-        }
+            }
+        });
         var index = 0;
         visibleItems.forEach(function (item) {
             var el = $(item);
@@ -344,7 +336,7 @@ Common.UI.HintManager = new(function() {
             }
             var title = el.attr('data-hint-title');
             if (!title && !(index > _arrLetters.length)) {
-                el.attr('data-hint-title', _arrLetters[index].toUpperCase());
+                el.attr('data-hint-title-lang', _arrLetters[index].toUpperCase());
                 index++;
             }
             _currentControls.push(el);
@@ -386,7 +378,7 @@ Common.UI.HintManager = new(function() {
                         rightBorder -= 20;
                     }
                 }
-                var hint = $('<div style="" class="hint-div">' + item.attr('data-hint-title') + '</div>');
+                var hint = $('<div style="" class="hint-div">' + item.attr('data-hint-title-lang') + '</div>');
                 var direction = item.attr('data-hint-direction');
                 // exceptions
                 if (window.SSE && !_isEditDiagram && _currentSection.nodeType !== 9 &&
@@ -555,7 +547,7 @@ Common.UI.HintManager = new(function() {
                         for (var i = 0; i < _currentControls.length; i++) {
                             var item = _currentControls[i];
                             if (!_isItemDisabled(item)) {
-                                var title = item.attr('data-hint-title'),
+                                var title = item.attr('data-hint-title-lang'),
                                     regExp = new RegExp('^' + _inputLetters + '');
                                 if (regExp.test(title)) {
                                     match = true;

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

@@ -345,9 +345,16 @@ Common.UI.FeaturesManager = new(function() {
         }
     };
 
+    var _isFeatureEnabled = function(name, force) {
+        if (!(_licensed || force) || !_config) return true;
+
+        return _config[name]!==false;
+    };
+
     return {
         init: _init,
         canChange: _canChange,
-        getInitValue: _getInitValue
+        getInitValue: _getInitValue,
+        isFeatureEnabled: _isFeatureEnabled
     }
 })();

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

@@ -70,7 +70,8 @@ define([
                             me.toolbar = toolbar;
                             toolbar.addTab(tab, me.$toolbarPanelPlugins, Common.UI.LayoutManager.lastTabIdx);     // TODO: clear plugins list in left panel
                         }
-                    }
+                    },
+                    'tab:active': this.onActiveTab
                 },
                 'Common.Views.Plugins': {
                     'plugin:select': function(guid, type, isRun, closePanel) {
@@ -116,12 +117,15 @@ define([
             this.autostart = [];
             this.customPluginsDlg = [];
 
+            this.newInstalledBackgroundPlugins = [];
+
             Common.Gateway.on('init', this.loadConfig.bind(this));
             Common.NotificationCenter.on('app:face', this.onAppShowed.bind(this));
             Common.NotificationCenter.on('uitheme:changed', this.updatePluginsButtons.bind(this));
             Common.NotificationCenter.on('window:resize', this.updatePluginsButtons.bind(this));
             Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
             Common.NotificationCenter.on('doc:mode-changed', this.onChangeDocMode.bind(this));
+            Common.NotificationCenter.on('modal:close', this.onModalClose.bind(this));
         },
 
         loadConfig: function(data) {
@@ -776,9 +780,9 @@ define([
                 Common.NotificationCenter.trigger('frame:mousemove', { pageX: x*Common.Utils.zoom()+this._moveOffset.x, pageY: y*Common.Utils.zoom()+this._moveOffset.y });
         },
 
-        onPluginsInit: function(pluginsdata) {
+        onPluginsInit: function(pluginsdata, fromManager) {
             !(pluginsdata instanceof Array) && (pluginsdata = pluginsdata["pluginsData"]);
-            this.parsePlugins(pluginsdata, false, true)
+            this.parsePlugins(pluginsdata, false, true, fromManager);
         },
 
         onPluginShowButton: function(id, toRight) {
@@ -816,7 +820,8 @@ define([
             });
         },
 
-        parsePlugins: function(pluginsdata, uiCustomize, forceUpdate) {
+        parsePlugins: function(pluginsdata, uiCustomize, forceUpdate, fromManager) {
+            this.newInstalledBackgroundPlugins.length = 0;
             var me = this;
             var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'),
                 isEdit = me.appOptions.isEdit && !me.isPDFEditor,
@@ -848,7 +853,8 @@ define([
                         isBackgroundPlugin = false,
                         isSystem;
                     item.variations.forEach(function(itemVar, itemInd){
-                        isSystem = (true === itemVar.isSystem) || (Asc.PluginType.System === itemVar.type);
+                        var variationType = Asc.PluginType.getType(itemVar.type);
+                        isSystem = (true === itemVar.isSystem) || (Asc.PluginType.System === variationType);
                         var visible = (isEdit || itemVar.isViewer && (itemVar.isDisplayedInViewer!==false)) && _.contains(itemVar.EditorsSupport, editor) && !isSystem;
                         if ( visible ) pluginVisible = true;
                         if (itemVar.isViewer && (itemVar.isDisplayedInViewer!==false))
@@ -885,7 +891,7 @@ define([
 
                             variationsArr.push(model);
                             if (itemInd === 0) {
-                                isBackgroundPlugin = itemVar.type ? itemVar.type === Asc.PluginType.Background : false;
+                                isBackgroundPlugin = itemVar.type ? variationType === Asc.PluginType.Background : false;
                             }
                         }
                     });
@@ -915,6 +921,12 @@ define([
                             tab: item.tab ? {action: item.tab.id, caption: ((typeof item.tab.text == 'object') ? item.tab.text[lang] || item.tab.text['en'] : item.tab.text) || ''} : undefined
                         };
                         updatedItem ? updatedItem.set(props) : arr.push(new Common.Models.Plugin(props));
+                        if (fromManager && !updatedItem && props.isBackgroundPlugin) {
+                            me.newInstalledBackgroundPlugins.push({
+                                name: name,
+                                guid: item.guid
+                            });
+                        }
                     }
                 });
 
@@ -1089,9 +1101,10 @@ define([
                 if (this.customPluginsDlg[frameId] || this.viewPlugins.customPluginPanels[frameId]) return;
 
                 var lang = this.appOptions && this.appOptions.lang ? this.appOptions.lang.split(/[\-_]/)[0] : 'en';
+                var variationType = Asc.PluginType.getType(variation.type);
                 var url = variation.url, // full url
-                    isSystem = (true === variation.isSystem) || (Asc.PluginType.System === variation.type),
-                    isPanel = variation.type === 'panel' || variation.type === 'panelRight';
+                    isSystem = (true === variation.isSystem) || (Asc.PluginType.System === variationType),
+                    isPanel = variationType === Asc.PluginType.Panel || variationType === Asc.PluginType.PanelRight;
                 var visible = (this.appOptions.isEdit || variation.isViewer && (variation.isDisplayedInViewer!==false)) && _.contains(variation.EditorsSupport, this.editor) && !isSystem;
                 if (visible && isPanel) {
                     this.onPluginPanelShow(frameId, variation, lang);
@@ -1257,7 +1270,50 @@ define([
 
             if (!this.viewPlugins.customPluginPanels[frameId].openInsideMode(description, variation.url, frameId, guid))
                 this.api.asc_pluginButtonClick(-1, guid, frameId);
-        }
+        },
+
+        onModalClose: function () {
+            var plugins = this.newInstalledBackgroundPlugins;
+            if (plugins && plugins.length > 0) {
+                var text = plugins.length > 1 ? this.textPluginsSuccessfullyInstalled :
+                    Common.Utils.String.format(this.textPluginSuccessfullyInstalled, plugins[0].name);
+                this.backgroundPluginsTip = new Common.UI.SynchronizeTip({
+                    extCls: 'colored',
+                    placement: 'bottom',
+                    target: this.viewPlugins.backgroundBtn.$el,
+                    text: text,
+                    showLink: true,
+                    textLink: plugins.length > 1 ? this.textRunInstalledPlugins : this.textRunPlugin
+                });
+                this.backgroundPluginsTip.on('dontshowclick', function() {
+                    this.backgroundPluginsTip.close();
+                    this.backgroundPluginsTip = undefined;
+                    this.newInstalledBackgroundPlugins.forEach(_.bind(function (item) {
+                        this.api.asc_pluginRun(item.guid, 0, '');
+                    }, this));
+                    this.newInstalledBackgroundPlugins.length = 0;
+                }, this);
+                this.backgroundPluginsTip.on('closeclick', function () {
+                    this.backgroundPluginsTip.close();
+                    this.backgroundPluginsTip = undefined;
+                    this.newInstalledBackgroundPlugins.length = 0;
+                }, this);
+                this.backgroundPluginsTip.show();
+            }
+        },
+
+        onActiveTab: function (tab) {
+            if (tab !== 'plugins' && this.backgroundPluginsTip) {
+                this.backgroundPluginsTip.close();
+                this.backgroundPluginsTip = undefined;
+                this.newInstalledBackgroundPlugins.length = 0;
+            }
+        },
+
+        textRunPlugin: 'Run plugin',
+        textRunInstalledPlugins: 'Run installed plugins',
+        textPluginSuccessfullyInstalled: '<b>{0}</b> is successfully installed. You can access all background plugins here.',
+        textPluginsSuccessfullyInstalled: 'Plugins are successfully installed. You can access all background plugins here.'
 
     }, Common.Controllers.Plugins || {}));
 });

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

@@ -574,6 +574,7 @@ define([
 
             var lang = (this.appConfig ? this.appConfig.lang || 'en' : 'en').replace('_', '-').toLowerCase();
             try {
+                if ( lang == 'ar-SA'.toLowerCase() ) lang = lang + '-u-nu-latn-ca-gregory';
                 return date.toLocaleString(lang, {dateStyle: 'short', timeStyle: 'short'});
             } catch (e) {
                 lang = 'en';

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

@@ -408,7 +408,7 @@ define([
                         }
                     } else
                     if ( e.key == 'content-theme' ) {
-                        this.setContentTheme(e.originalEvent.newValue, true);
+                        this.setContentTheme(e.originalEvent.newValue, true, false);
                     }
                 }.bind(this))
 
@@ -479,14 +479,15 @@ define([
                 return window.uitheme.iscontentdark;
             },
 
-            setContentTheme: function (mode, force) {
+            setContentTheme: function (mode, force, keep) {
                 var set_dark = mode == 'dark';
                 if ( set_dark != window.uitheme.iscontentdark || force ) {
+                    window.uitheme.iscontentdark = set_dark;
+
                     if ( this.isDarkTheme() )
                         this.api.asc_setContentDarkMode(set_dark);
 
-                    window.uitheme.iscontentdark = mode;
-                    if ( Common.localStorage.getItem('content-theme') != mode )
+                    if ( !(keep === false) && Common.localStorage.getItem('content-theme') != mode )
                         Common.localStorage.setItem('content-theme', mode);
 
                     Common.NotificationCenter.trigger('contenttheme:dark', set_dark);

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

@@ -47,25 +47,25 @@ if (!window.lang) {
 }
 window.lang && (window.lang = window.lang.split(/[\-\_]/)[0].toLowerCase());
 
+var isLangRtl = function (lang) {
+    return lang.lastIndexOf('ar', 0) === 0;
+}
+
 var ui_rtl = false;
 if ( window.nativeprocvars && window.nativeprocvars.rtl !== undefined ) {
     ui_rtl = window.nativeprocvars.rtl;
 } else {
-    if ( checkLocalStorage && localStorage.getItem("ui-rtl") !== null )
-        ui_rtl = localStorage.getItem("ui-rtl") === '1';
-    else ui_rtl = lang === 'ar';
+    if ( isLangRtl(lang) )
+        if ( checkLocalStorage && localStorage.getItem("ui-rtl") !== null )
+            ui_rtl = localStorage.getItem("ui-rtl") === '1';
+        else ui_rtl = true;
 }
 
 if ( ui_rtl && !isIE ) {
     document.body.setAttribute('dir', 'rtl');
     document.body.classList.add('rtl');
 }
-
-var isLangRtl = function (lang) {
-    return lang.lastIndexOf('ar', 0) === 0;
-}
-
-if ( isLangRtl(window.lang || lang) ) {
+if ( isLangRtl(lang) ) {
     document.body.classList.add('rtl-font');
 }
 

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

@@ -1049,6 +1049,32 @@ Common.Utils.injectComponent = function ($slot, cmp) {
     }
 };
 
+Common.Utils.startFullscreenForElement = function (element) {
+    if (element) {
+        if(element.requestFullscreen) {
+            element.requestFullscreen();
+        } else if(element.webkitRequestFullscreen) {
+            element.webkitRequestFullscreen();
+        } else if(element.mozRequestFullScreen) {
+            element.mozRequestFullScreen();
+        } else if(element.msRequestFullscreen) {
+            element.msRequestFullscreen();
+        }
+    }
+}
+
+Common.Utils.cancelFullscreen = function () {
+    if(document.cancelFullScreen) {
+        document.cancelFullScreen();
+    } else if(document.webkitCancelFullScreen ) {
+        document.webkitCancelFullScreen();
+    } else if(document.mozCancelFullScreen) {
+        document.mozCancelFullScreen();
+    } else if(document.msExitFullscreen) {
+        document.msExitFullscreen();
+    }
+}
+
 Common.Utils.warningDocumentIsLocked = function (opts) {
     if ( opts.disablefunc )
         opts.disablefunc(true);

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

@@ -346,7 +346,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
                     menuStyle   : 'min-width:100%;',
                     editable    : false,
                     takeFocusOnClose : true,
-                    menuCls     : 'menu-aligned',
+                    restoreMenuHeightAndTop: true,
                     cls         : 'input-group-nr',
                     dataHintDirection: 'bottom',
                     data        : _exciptionsLangs.map(function(lang){

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

@@ -0,0 +1,158 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2023
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+/**
+ *  CustomizeQuickAccessDialog.js
+ *
+ *  Created by Julia Svinareva on 9/04/24
+ *  Copyright (c) 2018 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+if (Common === undefined)
+    var Common = {};
+
+define([
+    'common/main/lib/component/Window'
+], function () { 'use strict';
+
+    Common.Views.CustomizeQuickAccessDialog = Common.UI.Window.extend(_.extend({
+        options: {
+            width: 296,
+            style: 'min-width: 296px;',
+            cls: 'modal-dlg quick-access-dlg',
+            buttons: ['ok', 'cancel']
+        },
+
+        initialize : function(options) {
+            _.extend(this.options, {
+                title: this.textTitle
+            }, options || {});
+
+            this.template = [
+                '<div class="box">',
+                    '<label class="padding-medium">' + this.textMsg + '</label>',
+                    '<div class="padding-small" id="quick-access-chb-save"></div>',
+                    '<div class="padding-small" id="quick-access-chb-print"></div>',
+                    '<div class="padding-small" id="quick-access-chb-quick-print" style="display:none;"></div>',
+                    '<div class="padding-small" id="quick-access-chb-undo"></div>',
+                    '<div class="padding-small" id="quick-access-chb-redo"></div>',
+                '</div>'
+            ].join('');
+
+            this.options.tpl = _.template(this.template)(this.options);
+
+            this.props = this.options.props;
+
+            Common.UI.Window.prototype.initialize.call(this, this.options);
+        },
+
+        render: function() {
+            Common.UI.Window.prototype.render.call(this);
+            this.focusedComponents = [];
+
+            var $window = this.getChild();
+            $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+
+            if (this.options.showSave) {
+                this.chSave = new Common.UI.CheckBox({
+                    el: $('#quick-access-chb-save'),
+                    labelText: this.textSave,
+                    value: this.props.save
+                });
+                this.focusedComponents.push(this.chSave);
+            }
+
+            if (this.options.showPrint) {
+                this.chPrint = new Common.UI.CheckBox({
+                    el: $('#quick-access-chb-print'),
+                    labelText: this.textPrint,
+                    value: this.props.print
+                });
+                this.focusedComponents.push(this.chPrint);
+            }
+
+            if (this.options.showQuickPrint) {
+                this.chQuickPrint = new Common.UI.CheckBox({
+                    el: $('#quick-access-chb-quick-print'),
+                    labelText: this.textQuickPrint,
+                    value: this.props.quickPrint
+                });
+                this.focusedComponents.push(this.chQuickPrint);
+                this.chQuickPrint.show();
+            }
+
+            this.chUndo = new Common.UI.CheckBox({
+                el: $('#quick-access-chb-undo'),
+                labelText: this.textUndo,
+                value: this.props.undo
+            });
+            this.focusedComponents.push(this.chUndo);
+
+            this.chRedo = new Common.UI.CheckBox({
+                el: $('#quick-access-chb-redo'),
+                labelText: this.textRedo,
+                value: this.props.redo
+            });
+            this.focusedComponents.push(this.chRedo);
+        },
+
+        getFocusedComponents: function() {
+            return this.focusedComponents.concat(this.getFooterButtons());
+        },
+
+        getDefaultFocusableComponent: function () {
+            return this.focusedComponents[0];
+        },
+
+        onBtnClick: function(event) {
+            if (event.currentTarget.attributes['result'].value == 'ok') {
+                Common.NotificationCenter.trigger('quickaccess:changed', {
+                    save: this.chSave.getValue() == 'checked',
+                    print: this.chPrint.getValue() == 'checked',
+                    quickPrint: this.chQuickPrint ? this.chQuickPrint.getValue() == 'checked' : undefined,
+                    undo: this.chUndo.getValue() == 'checked',
+                    redo: this.chRedo.getValue() == 'checked'
+                });
+            }
+
+            this.close();
+        },
+
+        textTitle: 'Customize quick access',
+        textMsg: 'Check the commands that will be displayed on the Quick Access Toolbar',
+        textSave: 'Save',
+        textPrint: 'Print',
+        textQuickPrint: 'Quick Print',
+        textUndo: 'Undo',
+        textRedo: 'Redo'
+    }, Common.Views.CustomizeQuickAccessDialog || {}))
+});

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

@@ -95,7 +95,7 @@ define([
                                     '<div class="btn-slot" id="slot-hbtn-print-quick"></div>' +
                                     '<div class="btn-slot" id="slot-hbtn-download"></div>' +
                                 '</div>' +
-                                '<div class="hedset">' +
+                                '<div class="hedset" data-layout-name="header-editMode">' +
                                     '<div class="btn-slot" id="slot-btn-edit-mode"></div>' +
                                 '</div>' +
                                 '<div class="hedset" data-layout-name="header-users">' +
@@ -149,6 +149,7 @@ define([
                                     '<div class="btn-slot" id="slot-btn-dt-print-quick"></div>' +
                                     '<div class="btn-slot" id="slot-btn-dt-undo"></div>' +
                                     '<div class="btn-slot" id="slot-btn-dt-redo"></div>' +
+                                    '<div class="btn-slot" id="slot-btn-dt-quick-access"></div>' +
                                 '</div>' +
                                 '<div class="lr-separator" id="id-box-doc-name">' +
                                     // '<label id="title-doc-name" /></label>' +
@@ -264,9 +265,17 @@ define([
             var me = this;
             config = config || appConfig;
             if (!me.btnPDFMode || !config) return;
-            me.btnPDFMode.setIconCls('toolbar__icon icon--inverse ' + (config.isPDFEdit ? 'btn-edit' : (config.isPDFAnnotate && config.canCoEditing ? 'btn-menu-comments' : 'btn-sheet-view')));
-            me.btnPDFMode.setCaption(config.isPDFEdit ? me.textEdit : (config.isPDFAnnotate && config.canCoEditing ? me.textComment : me.textView));
-            me.btnPDFMode.updateHint(config.isPDFEdit ? me.tipEdit : (config.isPDFAnnotate && config.canCoEditing ? me.tipComment : me.tipView));
+            var type = config.isPDFEdit ? 'edit' : (config.isPDFAnnotate && config.canCoEditing ? 'comment' : 'view'),
+                isEdit = config.isPDFEdit,
+                isComment = !isEdit && config.isPDFAnnotate && config.canCoEditing;
+            me.btnPDFMode.setIconCls('toolbar__icon icon--inverse ' + (isEdit ? 'btn-edit' : (isComment ? 'btn-menu-comments' : 'btn-sheet-view')));
+            me.btnPDFMode.setCaption(isEdit ? me.textEdit : (isComment ? me.textComment : me.textView));
+            me.btnPDFMode.updateHint(isEdit ? me.tipEdit : (isComment ? me.tipComment : me.tipView));
+            me.btnPDFMode.options.value = type;
+            if (me.btnPDFMode.menu && typeof me.btnPDFMode.menu === 'object') {
+                var item = _.find(me.btnPDFMode.menu.items, function(item) { return item.value == type; });
+                (item) ? item.setChecked(true) : this.btnPDFMode.menu.clearAll();
+            }
         }
 
         function changeDocMode(type, lockEditing) {
@@ -278,15 +287,27 @@ define([
             }
 
             var show = type!==undefined;
-            if (type===undefined)
-                type = appConfig.isReviewOnly ? 'review' : 'edit';
+            if (type===undefined) {
+                if (appConfig.isReviewOnly)
+                    type = 'review';
+                else {
+                    var review = Common.Utils.InternalSettings.get(this.appPrefix + "track-changes");
+                    type = (review===0 || review===2) ? 'review' : 'edit';
+                }
+            }
 
             var isEdit = type==='edit',
-                isReview = type==='review';
+                isReview = type==='review',
+                isViewForm = type==='view-form';
             this.btnDocMode.setIconCls('toolbar__icon icon--inverse ' + (isEdit ? 'btn-edit' : (isReview ? 'btn-ic-review' : 'btn-sheet-view')));
-            this.btnDocMode.setCaption(isEdit ? this.textEdit : (isReview ? this.textReview : this.textView));
-            this.btnDocMode.updateHint(isEdit ? this.tipDocEdit : (isReview ? this.tipReview : this.tipDocView));
+            this.btnDocMode.setCaption(isEdit ? this.textEdit : isReview ? this.textReview : isViewForm ? this.textViewForm : this.textView);
+            this.btnDocMode.updateHint(isEdit ? this.tipDocEdit : isReview ? this.tipReview : isViewForm ? this.tipDocViewForm : this.tipDocView);
+            this.btnDocMode.options.value = type;
             show && !this.btnDocMode.isVisible() && this.btnDocMode.setVisible(true);
+            if (this.btnDocMode.menu && typeof this.btnDocMode.menu === 'object') {
+                var item = _.find(this.btnDocMode.menu.items, function(item) { return item.value == type; });
+                (item) ? item.setChecked(true) : this.btnDocMode.menu.clearAll();
+            }
         }
 
         function onResize() {
@@ -310,6 +331,34 @@ define([
             }
         }
 
+        function onChangeQuickAccess(caller, props) {
+            if (props.save !== undefined) {
+                this.btnSave[props.save ? 'show' : 'hide']();
+                Common.localStorage.setBool(this.appPrefix + 'quick-access-save', props.save);
+            }
+            if (props.print !== undefined) {
+                this.btnPrint[props.print ? 'show' : 'hide']();
+                Common.localStorage.setBool(this.appPrefix + 'quick-access-print', props.print);
+            }
+            if (props.quickPrint !== undefined) {
+                this.btnPrintQuick[props.quickPrint ? 'show' : 'hide']();
+                Common.localStorage.setBool(this.appPrefix + 'quick-access-quick-print', props.quickPrint);
+            }
+            if (props.undo !== undefined) {
+                this.btnUndo[props.undo ? 'show' : 'hide']();
+                Common.localStorage.setBool(this.appPrefix + 'quick-access-undo', props.undo);
+            }
+            if (props.redo !== undefined) {
+                this.btnRedo[props.redo ? 'show' : 'hide']();
+                Common.localStorage.setBool(this.appPrefix + 'quick-access-redo', props.redo);
+            }
+            Common.NotificationCenter.trigger('edit:complete');
+
+            if ( caller && caller == 'header' )
+                Common.NotificationCenter.trigger('quickaccess:changed', props);
+            updateDocNamePosition();
+        }
+
         function onAppReady(mode) {
             appConfig = mode;
 
@@ -427,6 +476,89 @@ define([
                 });
             }
 
+            if (me.btnQuickAccess) {
+                me.btnQuickAccess.updateHint(me.tipCustomizeQuickAccessToolbar);
+                var arr = [];
+                if (me.btnSave) {
+                    arr.push({
+                        caption: me.tipSave,
+                        value: 'save',
+                        checkable: true
+                    });
+                }
+                if (me.btnPrint) {
+                    arr.push({
+                        caption: me.textPrint,
+                        value: 'print',
+                        checkable: true
+                    });
+                }
+                if (me.btnPrintQuick) {
+                    arr.push({
+                        caption: me.tipPrintQuick,
+                        value: 'quick-print',
+                        checkable: true
+                    });
+                }
+                if (me.btnUndo) {
+                    arr.push({
+                        caption: me.tipUndo,
+                        value: 'undo',
+                        checkable: true
+                    });
+                }
+                if (me.btnRedo) {
+                    arr.push({
+                        caption: me.tipRedo,
+                        value: 'redo',
+                        checkable: true
+                    });
+                }
+                me.btnQuickAccess.setMenu(new Common.UI.Menu({
+                    cls: 'ppm-toolbar',
+                    style: 'min-width: 110px;',
+                    menuAlign: 'tl-bl',
+                    items: arr
+                }));
+                me.btnQuickAccess.menu.on('show:before', function (menu) {
+                    menu.items.forEach(function (item) {
+                        if (item.value === 'save') {
+                            item.setChecked(Common.localStorage.getBool(me.appPrefix + 'quick-access-save', true), true);
+                        } else if (item.value === 'print') {
+                            item.setChecked(Common.localStorage.getBool(me.appPrefix + 'quick-access-print', true), true);
+                        } else if (item.value === 'quick-print') {
+                            item.setChecked(Common.localStorage.getBool(me.appPrefix + 'quick-access-quick-print', true), true);
+                        } else if (item.value === 'undo') {
+                            item.setChecked(Common.localStorage.getBool(me.appPrefix + 'quick-access-undo', true), true);
+                        } else if (item.value === 'redo') {
+                            item.setChecked(Common.localStorage.getBool(me.appPrefix + 'quick-access-redo', true), true);
+                        }
+                    });
+                });
+                me.btnQuickAccess.menu.on('item:click', function (menu, item) {
+                    var props = {};
+                    switch (item.value) {
+                        case 'save':
+                            props.save = item.checked;
+                            break;
+                        case 'print':
+                            props.print = item.checked;
+                            break;
+                        case 'quick-print':
+                            props.quickPrint = item.checked;
+                            break;
+                        case 'undo':
+                            props.undo = item.checked;
+                            break;
+                        case 'redo':
+                            props.redo = item.checked;
+                            break;
+                    }
+                    onChangeQuickAccess.call(me, 'header', props);
+                });
+                Common.NotificationCenter.on('quickaccess:changed', onChangeQuickAccess.bind(me, 'settings'));
+            }
+
             if ( !appConfig.twoLevelHeader ) {
                 if ( me.btnDownload ) {
                     me.btnDownload.updateHint(me.tipDownload);
@@ -454,63 +586,87 @@ define([
                                             '<% if (options.description !== null) { %><label class="margin-left-10 description"><%= options.description %></label>' +
                                             '<% } %></a>');
             if (me.btnPDFMode) {
-                var arr = [];
+                var arr = [],
+                    type = me.btnPDFMode.options.value;
                 appConfig.canPDFEdit && arr.push({
                     caption: me.textEdit,
                     iconCls : 'menu__icon btn-edit',
                     template: menuTemplate,
                     description: appConfig.canCoEditing ? me.textEditDesc : me.textEditDescNoCoedit,
-                    value: 'edit'
+                    value: 'edit',
+                    checkable: true,
+                    toggleGroup: 'docmode'
                 });
                 arr.push({
                     caption: appConfig.canCoEditing ? me.textComment : me.textView,
                     iconCls : 'menu__icon ' + (appConfig.canCoEditing ? 'btn-menu-comments' : 'btn-sheet-view'),
                     template: menuTemplate,
                     description: appConfig.canCoEditing ? me.textCommentDesc : me.textViewDescNoCoedit,
-                    value: 'comment',
-                    disabled: !appConfig.canPDFAnnotate
+                    value: appConfig.canCoEditing ? 'comment' : 'view',
+                    disabled: !appConfig.canPDFAnnotate,
+                    checkable: true,
+                    toggleGroup: 'docmode'
                 });
                 appConfig.canCoEditing && arr.push({
                     caption: me.textView,
                     iconCls : 'menu__icon btn-sheet-view',
                     template: menuTemplate,
                     description: me.textViewDesc,
-                    value: 'view'
+                    value: 'view',
+                    checkable: true,
+                    toggleGroup: 'docmode'
                 });
                 me.btnPDFMode.setMenu(new Common.UI.Menu({
-                    cls: 'ppm-toolbar',
+                    cls: 'ppm-toolbar select-checked-items',
                     style: 'width: 220px;',
                     menuAlign: 'tr-br',
                     items: arr
                 }));
                 me.btnPDFMode.menu.on('item:click', function (menu, item) {
-                    Common.NotificationCenter.trigger('pdf:mode', item.value, _.bind(changePDFMode, me));
+                    Common.NotificationCenter.trigger('pdf:mode-apply', item.value);
                 });
+                var item = _.find(me.btnPDFMode.menu.items, function(item) { return item.value == type; });
+                item && item.setChecked(true);
             } else if (me.btnDocMode) {
-                var arr = [];
+                var arr = [],
+                    type = me.btnDocMode.options.value;
                 !appConfig.isReviewOnly && arr.push({
                     caption: me.textEdit,
                     iconCls : 'menu__icon btn-edit',
                     template: menuTemplate,
                     description: me.textDocEditDesc,
-                    value: 'edit'
+                    value: 'edit',
+                    checkable: true,
+                    toggleGroup: 'docmode'
                 });
                 appConfig.canReview && arr.push({
                     caption: me.textReview,
                     iconCls : 'menu__icon btn-ic-review',
                     template: menuTemplate,
                     description: me.textReviewDesc,
-                    value: 'review'
+                    value: 'review',
+                    checkable: true,
+                    toggleGroup: 'docmode'
                 });
-                arr.push({
+                appConfig.isPDFForm && appConfig.isFormCreator ? arr.push({
+                    caption: me.textViewForm,
+                    iconCls : 'menu__icon btn-sheet-view',
+                    template: menuTemplate,
+                    description: me.textDocViewFormDesc,
+                    value: 'view-form',
+                    checkable: true,
+                    toggleGroup: 'docmode'
+                }) : arr.push({
                     caption: me.textView,
                     iconCls : 'menu__icon btn-sheet-view',
                     template: menuTemplate,
                     description: me.textDocViewDesc,
-                    value: 'view'
+                    value: 'view',
+                    checkable: true,
+                    toggleGroup: 'docmode'
                 });
                 me.btnDocMode.setMenu(new Common.UI.Menu({
-                    cls: 'ppm-toolbar',
+                    cls: 'ppm-toolbar select-checked-items',
                     style: 'width: 220px;',
                     menuAlign: 'tr-br',
                     items: arr
@@ -518,6 +674,8 @@ define([
                 me.btnDocMode.menu.on('item:click', function (menu, item) {
                     Common.NotificationCenter.trigger('doc:mode-apply', item.value, true);
                 });
+                var item = _.find(me.btnDocMode.menu.items, function(item) { return item.value == type; });
+                item && item.setChecked(true);
             }
             if (appConfig.twoLevelHeader && !appConfig.compactHeader)
                 Common.NotificationCenter.on('window:resize', onResize);
@@ -606,6 +764,9 @@ define([
                 this.branding = this.options.customization;
                 this.isModified = false;
 
+                var filter = Common.localStorage.getKeysFilter();
+                this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
+
                 me.btnGoBack = new Common.UI.Button({
                     id: 'btn-go-back',
                     cls: 'btn-header',
@@ -777,12 +938,14 @@ define([
                             iconCls: 'toolbar__icon icon--inverse btn-sheet-view',
                             caption: me.textView,
                             menu: true,
+                            value: 'view',
                             dataHint: '0',
                             dataHintDirection: 'bottom',
                             dataHintOffset: 'big'
                         });
                         me.btnPDFMode.render($html.find('#slot-btn-edit-mode'));
                         changePDFMode.call(me, config);
+                        Common.NotificationCenter.on('pdf:mode-changed', _.bind(changePDFMode, me));
                     } else if (isDocEditor && config.isEdit && config.canSwitchMode) {
                         me.btnDocMode = new Common.UI.Button({
                             cls: 'btn-header btn-header-pdf-mode ',
@@ -790,7 +953,8 @@ define([
                             caption: config.isReviewOnly ? me.textReview : me.textEdit,
                             menu: true,
                             visible: config.isReviewOnly || !config.canReview,
-                            lock: [Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.lostConnect, Common.enumLock.disableOnStart, Common.enumLock.docLockView, Common.enumLock.docLockComments, Common.enumLock.docLockForms, Common.enumLock.fileMenuOpened, Common.enumLock.changeModeLock],
+                            lock: [Common.enumLock.previewReviewMode, Common.enumLock.lostConnect, Common.enumLock.disableOnStart, Common.enumLock.docLockView, Common.enumLock.docLockComments, Common.enumLock.docLockForms, Common.enumLock.fileMenuOpened, Common.enumLock.changeModeLock],
+                            value: config.isReviewOnly ? 'review' : 'edit',
                             dataHint: '0',
                             dataHintDirection: 'bottom',
                             dataHintOffset: 'big'
@@ -852,16 +1016,31 @@ define([
 
                     if ( config.canPrint && config.twoLevelHeader ) {
                         me.btnPrint = createTitleButton('toolbar__icon icon--inverse btn-print', $html.findById('#slot-btn-dt-print'), true, undefined, undefined, 'P');
+                        !Common.localStorage.getBool(me.appPrefix + 'quick-access-print', true) && me.btnPrint.hide();
                     }
-                    if ( config.canQuickPrint && config.twoLevelHeader )
+                    if ( config.canQuickPrint && config.twoLevelHeader ) {
                         me.btnPrintQuick = createTitleButton('toolbar__icon icon--inverse btn-quick-print', $html.findById('#slot-btn-dt-print-quick'), true, undefined, undefined, 'Q');
-
-                    if (config.showSaveButton)
+                        !Common.localStorage.getBool(me.appPrefix + 'quick-access-quick-print', true) && me.btnPrintQuick.hide();
+                    }
+                    if (config.showSaveButton) {
                         me.btnSave = createTitleButton('toolbar__icon icon--inverse btn-save', $html.findById('#slot-btn-dt-save'), true, undefined, undefined, 'S');
+                        !Common.localStorage.getBool(me.appPrefix + 'quick-access-save', true) && me.btnSave.hide();
+                    }
                     me.btnUndo = createTitleButton('toolbar__icon icon--inverse btn-undo', $html.findById('#slot-btn-dt-undo'), true, undefined, undefined, 'Z',
                                                     [Common.enumLock.undoLock, Common.enumLock.fileMenuOpened]);
+                    !Common.localStorage.getBool(me.appPrefix + 'quick-access-undo', true) && me.btnUndo.hide();
                     me.btnRedo = createTitleButton('toolbar__icon icon--inverse btn-redo', $html.findById('#slot-btn-dt-redo'), true, undefined, undefined, 'Y',
                                                     [Common.enumLock.redoLock, Common.enumLock.fileMenuOpened]);
+                    !Common.localStorage.getBool(me.appPrefix + 'quick-access-redo', true) && me.btnRedo.hide();
+                    me.btnQuickAccess = new Common.UI.Button({
+                        cls: 'btn-header no-caret',
+                        iconCls: 'toolbar__icon icon--inverse btn-more',
+                        menu: true,
+                        dataHint:'0',
+                        dataHintDirection: config.isDesktopApp ? 'right' : 'left',
+                        dataHintOffset: config.isDesktopApp ? '10, -18' : '10, 10'
+                    });
+                    me.btnQuickAccess.render($html.find('#slot-btn-dt-quick-access'));
 
                     return $html;
                 }
@@ -1159,7 +1338,12 @@ define([
             textReviewDesc: 'Suggest changes',
             tipReview: 'Reviewing',
             textClose: 'Close file',
-            textStartFill: 'Start filling'
+            textStartFill: 'Start filling',
+            tipCustomizeQuickAccessToolbar: 'Customize Quick Access Toolbar',
+            textPrint: 'Print',
+            textViewForm: 'Viewing form',
+            tipDocViewForm: 'Viewing form',
+            textDocViewFormDesc: 'See how the form will look like when filling out'
         }
     }(), Common.Views.Header || {}))
 });

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

@@ -677,6 +677,10 @@
     .margin-left(12px);
 }
 
+.margin-left-13 {
+    .margin-left(13px);
+}
+
 .margin-left-15 {
     .margin-left(15px);
 }

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

@@ -115,29 +115,17 @@
 
     &.notify {
         .icon {
-            &::after {
-                content: ' ';
-                position: absolute;
-                border: 1px solid @icon-notification-badge-ie;
-                border: 1px solid @icon-notification-badge;
-                border-left: 0 none;
-                border-right: 0 none;
-                width: 6px;
-                height: 3px;
-                bottom: 4px;
-                right: 2px;
-            }
-
             &::before {
                 content: ' ';
                 position: absolute;
-                width: 10px;
+                width: 7px;
                 height: 7px;
-                bottom: 2px;
+                bottom: 1px;
+                right: 1px;
                 background-color: @background-notification-badge-ie;
                 background-color: @background-notification-badge;
-                border-radius: 2px;
-                right: 0;
+                border-radius: 4px;
+                border: solid 1px rgba(122, 99, 0, 0.5)
             }
         }
     }
@@ -325,6 +313,7 @@
 
             .pixel-ratio__2_5 & {
                 width: 100%;
+                justify-content: center;
             }
 
             .rtl & {
@@ -1098,6 +1087,48 @@
             background-color: @highlight-fill-button-pressed !important;
         }
     }
+    &.back-color {
+        .font-weight-bold();
+        border: 1px solid @text-toolbar-header-ie;
+        border: 1px solid @text-toolbar-header;
+        color: @text-toolbar-header-ie;
+        color: @text-toolbar-header;
+        background-color: transparent;
+
+        .style-off-tabs & {
+            border: 1px solid @text-normal-ie;
+            border: 1px solid @text-normal;
+            color: @text-normal-ie;
+            color: @text-normal;
+        }
+
+        &:not(:disabled) {
+            opacity: @header-component-normal-icon-opacity;
+        }
+
+        &:hover:not(.disabled),
+        .over:not(.disabled) {
+            background-color: @highlight-header-button-hover-ie  !important;
+            background-color: @highlight-header-button-hover  !important;
+
+            .style-off-tabs & {
+                background-color: @highlight-button-hover-ie  !important;
+                background-color: @highlight-button-hover  !important;
+            }
+        }
+
+        &:active:not(.disabled),
+        &.active:not(.disabled) {
+            background-color: @highlight-header-button-pressed-ie !important;
+            background-color: @highlight-header-button-pressed !important;
+
+            .style-off-tabs & {
+                background-color: @highlight-button-pressed-ie !important;
+                background-color: @highlight-button-pressed !important;
+            }
+        }
+
+    }
 }
 
 .btn-text-menu-default {

apps/common/main/resources/less/colors-table-classic.less

@@ -123,7 +123,7 @@
 
         --canvas-freeze-line-1px: #818181;
         --canvas-freeze-line-2px: #aaaaaa;
-        --canvas-select-all-icon: #82872f;
+        --canvas-select-all-icon: #82878f;
 
         // Others
 

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

@@ -153,7 +153,7 @@ label {
     overflow: hidden;
     border-left: @scaled-one-px-value-ie solid @border-toolbar-ie;
     border-left: @scaled-one-px-value solid @border-toolbar;
-    line-height: 15px;
+    //line-height: 15px;
 
     .rtl & {
         border-right: @scaled-one-px-value solid @border-toolbar;
@@ -290,6 +290,15 @@ label {
     }
 }
 
+.quick-access-dlg {
+    .padding-small {
+        padding-bottom: 8px;
+    }
+    .padding-medium {
+        padding-bottom: 12px;
+    }
+}
+
 .plugin-panel {
     display: none;
     &.active {

apps/common/main/resources/less/header.less

@@ -269,7 +269,7 @@
         }
     }
 
-    &:active {
+    &:active, &.active {
         &:not(.disabled) {
             background-color: @highlight-header-button-pressed-ie;
             background-color: @highlight-header-button-pressed;
@@ -540,7 +540,7 @@
     color: @text-toolbar-header-ie;
     color: @text-toolbar-header;
     position: relative;
-    z-index: 1;
+    z-index: @zindex-navbar + 3;
 
     .btn-slot {
         display: inline-block;

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

@@ -110,9 +110,16 @@
     top: @scaled-one-px-value;
     width: calc(100% - 2px);
     width: calc(100% - @scaled-two-px-value);
+    border-top-left-radius: 1px;
+    border-top-right-radius: 1px;
     display: flex;
     align-items: center;
-  
+
+    .pixel-ratio__2_5 & {
+      left: calc(@scaled-one-px-value + 0.05px);
+      top: calc(@scaled-one-px-value + 0.05px);
+    }
+
     label {
       overflow: hidden;
       text-overflow: ellipsis;

apps/common/main/resources/less/switcher.less

@@ -1,42 +1,27 @@
 .switcher {
     position: relative;
-    width: 25px;
-    height: 15px;
-    background-color: transparent;
+    width: 30px;
+    height: 16px;
+    background-color: @border-preview-hover-ie;
+    background-color: @border-preview-hover;
+    border-radius: 11px;
     cursor: pointer;
 
-    .sw-left {
-        display: inline-block;
-        height: 100%;
-        background-color: @highlight-button-pressed-ie;
-        background-color: @highlight-button-pressed;
-        border-top-left-radius: 2px;
-        border-bottom-left-radius: 2px;
-    }
-
-    .sw-right {
-        display: inline-block;
-        height: 100%;
-        background-color: @border-regular-control-ie;
-        background-color: @border-regular-control;
-        border-top-right-radius: 2px;
-        border-bottom-right-radius: 2px;
-    }
-
     .thumb {
         position: absolute;
         left: 0;
         right: auto;
         top: 0;
-        height: 100%;
+        height: 12px;
+        border-radius: 12px;
         background-color: @background-normal-ie;
         background-color: @background-normal;
-        border: 1px solid @highlight-button-pressed-ie;
-        border: 1px solid @highlight-button-pressed;
-        border-radius: 3px;
+        margin: 2px;
     }
 
     &.on {
+        background-color: @background-primary-dialog-button-ie;
+        background-color: @background-primary-dialog-button;
         .thumb {
             right: 0;
             left: auto;
@@ -47,15 +32,5 @@
         cursor: default;
         opacity: @component-disabled-opacity-ie;
         opacity: @component-disabled-opacity;
-
-        .sw-left {
-            background-color: @border-regular-control-ie;
-            background-color: @border-regular-control;
-        }
-
-        .thumb {
-            border-color: @border-regular-control-ie;
-            border-color: @border-regular-control;
-        }
     }
 }

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

@@ -936,6 +936,35 @@
     }
 }
 
+.dropdown-menu {
+    &.select-checked-items {
+        .menu-item.checked {
+            &:before {
+                display: none !important;
+            }
+            &, &:hover, &:focus {
+                background-color: @highlight-button-pressed-ie;
+                background-color: @highlight-button-pressed;
+                color: @text-normal-pressed-ie;
+                color: @text-normal-pressed;
+                label {
+                    color: @text-normal-pressed-ie;
+                    color: @text-normal-pressed;
+                }
+            }
+            .menu-item-icon {
+                background-position-x: -20px;
+                background-position-x: @button-small-active-icon-offset-x;
+            }
+
+            svg.menu-item-icon {
+                fill: @icon-normal-pressed-ie;
+                fill: @icon-normal-pressed;
+            }
+        }
+    }
+}
+
 .item-databar {
     .icon {
         width: 25px;
@@ -1056,13 +1085,13 @@ section .field-styles {
                 align-items: center;
             }
             .plugin-settings {
-                width: 20px;
-                height: 20px;
-                .margin-left-8();
                 .btn-toolbar.dropdown-toggle {
                     min-width: 20px;
                 }
                 .btn-group {
+                    width: 20px;
+                    height: 20px;
+                    .margin-left-8();
                     &:active, &.active {
                         &:not(.disabled) .icon {
                             background-position-x: @button-small-active-icon-offset-x !important;

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

@@ -108,6 +108,11 @@ class SearchView extends Component {
                     },
                     searchbarEnable: (sb) => {
                         this.refSearchbarInput.focus();
+
+                        if(this.state.searchQuery.length > 0) {
+                            const searchInput = document.querySelector('.searchbar-input');
+                            searchInput.classList.add('input-with-value');
+                        }
                     }
                 }
             });
@@ -285,7 +290,7 @@ class SearchView extends Component {
                     </div>
                     <div className="searchbar-inner__center">
                         <div className="searchbar-input-wrap">
-                            <input className="searchbar-input" value={searchQuery} placeholder={_t.textSearch} type="search" maxLength="255"
+                            <input className={`searchbar-input ${searchQuery.length > 0 ? 'input-with-value' : ''}`} value={searchQuery} placeholder={_t.textSearch} type="search" maxLength="255"
                                 onKeyDown={e => this.onSearchKeyDown(e)}
                                 onInput={e => this.onSearchInput(e)}
                                 onChange={e => {this.changeSearchQuery(e.target.value)}} ref={el => this.refSearchbarInput = el} />

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

@@ -1,15 +1,15 @@
-<svg width="100" height="14" viewBox="0 0 100 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M20.0149 6.48201C19.959 5.79068 20.0611 5.0957 20.3134 4.44954C20.5658 3.80338 20.9618 3.22293 21.4717 2.75199C22.4021 1.92114 23.6137 1.47408 24.8615 1.50116C26.0997 1.47534 27.3009 1.92391 28.2183 2.75479C28.7177 3.23878 29.1043 3.82664 29.3506 4.47661C29.5969 5.12659 29.6969 5.82276 29.6435 6.51568C29.6972 7.20401 29.5972 7.89564 29.3507 8.54068C29.1042 9.18571 28.7175 9.76806 28.2183 10.2457C27.2979 11.0717 26.0988 11.5195 24.8615 11.4993C23.6157 11.5143 22.4085 11.0676 21.4731 10.2457C20.9648 9.76636 20.5701 9.1797 20.3178 8.52855C20.0655 7.8774 19.962 7.17821 20.0149 6.48201ZM22.1052 6.48201C22.0366 7.36424 22.2586 8.2447 22.7374 8.98927C23.0867 9.47357 23.5885 9.82682 24.1626 9.99245C24.2771 10.0259 24.3948 10.0468 24.5138 10.0549C24.6086 10.0549 24.7358 10.0865 24.8306 10.0865C24.9485 10.0904 25.0665 10.0798 25.1818 10.0549C25.3011 10.0496 25.4192 10.0286 25.533 9.99245C26.0978 9.82508 26.589 9.47144 26.9266 8.98927C27.3973 8.25268 27.6189 7.38464 27.5588 6.51288C27.6235 5.64069 27.4016 4.77122 26.9266 4.03648C26.589 3.55431 26.0978 3.20067 25.533 3.0333C25.4186 2.99986 25.3008 2.97892 25.1818 2.97086C25.0554 2.97086 24.9599 2.93929 24.8306 2.93929C24.724 2.93256 24.617 2.94323 24.5138 2.97086C24.3948 2.97892 24.2771 2.99985 24.1626 3.0333C23.5925 3.20713 23.093 3.55868 22.7374 4.03648C22.2389 4.74885 22.0144 5.61693 22.1052 6.48131V6.48201Z" fill="white"/>
-<path d="M30.6865 1.59473H33.2854L36.7055 7.738L37.2119 9.05407H37.2435L37.2119 7.33042V1.59473H39.2068V11.3733H36.6079L33.1878 4.9796L32.6814 3.88241H32.6533L32.6849 5.60606V11.3733H30.6865V1.59473Z" fill="white"/>
-<path d="M41.7406 1.59473H43.767V9.7121H47.6935V11.3733H41.7406V1.59473Z" fill="white"/>
-<path d="M46.6934 1.59473H49.005L51.0315 5.01117L51.3483 5.70077H51.3799L51.7311 5.01117L53.7877 1.59473H55.8781L52.3316 7.39285V11.3733H50.3368V7.36199L46.6934 1.59473Z" fill="white"/>
-<path d="M56.3649 6.48201C56.309 5.79068 56.4111 5.0957 56.6635 4.44954C56.9159 3.80338 57.3119 3.22292 57.8217 2.75199C58.7522 1.92114 59.9638 1.47408 61.2116 1.50116C62.4498 1.47534 63.6509 1.92391 64.5684 2.75479C65.0678 3.23878 65.4543 3.82664 65.7006 4.47661C65.947 5.12659 66.047 5.82276 65.9936 6.51568C66.0472 7.204 65.9472 7.89564 65.7008 8.54068C65.4543 9.18571 65.0675 9.76806 64.5684 10.2457C63.648 11.0717 62.4488 11.5196 61.2116 11.4993C59.9648 11.5197 58.7557 11.0724 57.8231 10.2457C57.3208 9.76193 56.93 9.17457 56.6782 8.52456C56.4264 7.87455 56.3194 7.17751 56.3649 6.48201ZM58.4553 6.48201C58.3867 7.36424 58.6087 8.2447 59.0875 8.98927C59.4305 9.47981 59.9348 9.83478 60.5127 9.99245C60.6271 10.0259 60.7449 10.0468 60.8639 10.0549C60.9587 10.0549 61.0858 10.0865 61.1807 10.0865C61.2986 10.0918 61.4168 10.0812 61.5319 10.0549C61.6512 10.0496 61.7693 10.0286 61.8831 9.99245C62.4478 9.82508 62.9391 9.47144 63.2767 8.98927C63.7473 8.25265 63.9689 7.38464 63.9088 6.51287C63.9736 5.64069 63.7516 4.77122 63.2767 4.03648C62.9391 3.55431 62.4478 3.20067 61.8831 3.0333C61.7686 2.99986 61.6509 2.97892 61.5319 2.97086C61.4054 2.97086 61.3099 2.93929 61.1807 2.93929C61.0741 2.93256 60.9671 2.94322 60.8639 2.97086C60.7449 2.97892 60.6271 2.99985 60.5127 3.0333C59.9425 3.20713 59.4431 3.55868 59.0875 4.03648C58.603 4.75524 58.3799 5.61814 58.4553 6.48131V6.48201Z" fill="white"/>
-<path d="M67.373 1.59473H72.9151V3.22437H69.403V5.60957H72.7598V7.27078H69.403V11.3768H67.373V1.59473Z" fill="white"/>
-<path d="M74.3172 1.59473H79.8592V3.22437H76.3471V5.60957H79.704V7.27078H76.3471V11.3768H74.3172V1.59473Z" fill="white"/>
-<path d="M81.153 11.3733V1.59473H83.1794V11.3733H81.153Z" fill="white"/>
-<path d="M92.8108 1.81254V3.50533C92.4613 3.37879 92.1008 3.28485 91.734 3.22472C91.3256 3.15985 90.9127 3.12841 90.4992 3.13071C90.0507 3.1014 89.6014 3.17354 89.1847 3.34177C88.7681 3.51 88.3948 3.76998 88.0927 4.10233C87.5102 4.76849 87.2044 5.63174 87.2379 6.51558C87.2028 7.36904 87.4839 8.20546 88.0274 8.865C88.3102 9.18731 88.6619 9.44199 89.0566 9.61018C89.4512 9.77836 89.8787 9.85575 90.3074 9.83661C90.6586 9.83661 91.0042 9.80504 91.4158 9.77418C91.8503 9.71406 92.2753 9.59829 92.6802 9.42973L92.8066 11.0909C92.7241 11.1275 92.6394 11.1589 92.553 11.1849C92.4266 11.2165 92.2994 11.2474 92.1414 11.279C91.8878 11.3414 91.571 11.373 91.191 11.4354C90.811 11.467 90.431 11.4978 90.0194 11.4978H89.7026C88.5515 11.4203 87.4543 10.9815 86.5678 10.2442C86.0696 9.78582 85.6824 9.22024 85.4355 8.59028C85.1886 7.96033 85.0884 7.28252 85.1426 6.60818C85.1032 5.92392 85.2068 5.23897 85.4467 4.59683C85.6866 3.95469 86.0576 3.3694 86.5362 2.87816C87.5604 1.96499 88.9039 1.49209 90.2751 1.5621C90.6867 1.5621 91.0667 1.5621 91.3835 1.59367C91.7347 1.62523 92.0487 1.68767 92.3971 1.75011C92.4603 1.78167 92.5551 1.78167 92.6191 1.81254C92.6483 1.79718 92.6808 1.78915 92.7139 1.78915C92.7469 1.78915 92.7795 1.79718 92.8087 1.81254H92.8108Z" fill="white"/>
-<path d="M94.1096 1.59473H100V3.13037H96.1044V5.57519H99.6516V7.07997H96.1044V9.83768H99.9993V11.3733H94.1096V1.59473Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.12556 13.8272L0.367848 10.9422C-0.122616 10.6903 -0.122616 10.3012 0.367848 10.0725L2.37233 9.06696L6.10392 10.9436C6.3808 11.0683 6.67805 11.1325 6.9783 11.1325C7.27856 11.1325 7.5758 11.0683 7.85268 10.9436L11.5849 9.06696L13.5894 10.0739C14.0799 10.3258 14.0799 10.7149 13.5894 10.9436L7.8317 13.8286C7.28337 14.0571 6.6752 14.0571 6.12687 13.8286L6.12556 13.8272Z" fill="white" fill-opacity="0.5"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.12556 10.2803L0.367848 7.39525C-0.122616 7.14334 -0.122616 6.75422 0.367848 6.52553L2.32971 5.54041L6.12556 7.44029C6.40244 7.56494 6.69968 7.62914 6.99994 7.62914C7.30019 7.62914 7.59744 7.56494 7.87432 7.44029L11.6702 5.54041L13.632 6.52553C14.1225 6.77744 14.1225 7.16656 13.632 7.39525L7.87432 10.2803C7.59744 10.4049 7.30019 10.4691 6.99994 10.4691C6.69968 10.4691 6.40244 10.4049 6.12556 10.2803Z" fill="white" fill-opacity="0.75"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.12567 6.82577L0.367955 3.94217C-0.122509 3.69026 -0.122509 3.30114 0.367955 3.07245L6.12567 0.188852C6.40255 0.0642006 6.69979 0 7.00005 0C7.3003 0 7.59755 0.0642006 7.87442 0.188852L13.6321 3.07386C14.1226 3.32577 14.1226 3.71489 13.6321 3.94358L7.87442 6.82858C7.31102 7.0575 6.68907 7.0575 6.12567 6.82858V6.82577Z" fill="white"/>
+<svg width="109" height="20" viewBox="0 0 109 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M31.6635 4.75171C29.1195 4.75171 26.6197 6.2365 26.6197 9.86282C26.6197 13.4891 29.1195 14.9739 31.6635 14.9739C34.2075 14.9739 36.7073 13.4891 36.7073 9.86282C36.7073 6.2365 34.2075 4.75171 31.6635 4.75171ZM31.6635 6.17939C32.4429 6.17939 34.5016 6.47921 34.5016 9.86282C34.5016 13.2464 32.4429 13.5462 31.6635 13.5462C30.8841 13.5462 28.8254 13.2464 28.8254 9.86282C28.8254 6.47921 30.8841 6.17939 31.6635 6.17939Z" fill="white"/>
+<path d="M38.4038 4.86592V14.8597H40.4919V8.97766L40.4478 7.20733H40.4919L41.0066 8.32092L44.5946 14.8597H47.3004V4.86592H45.2122V10.748L45.2564 12.5183H45.2122L44.6682 11.162L41.1095 4.86592H38.4038Z" fill="white"/>
+<path d="M49.3608 4.86592V14.8597H55.5369V13.175H51.4489V4.86592H49.3608Z" fill="white"/>
+<path d="M53.7723 4.86592L57.5662 10.7765V14.8597H59.6543V10.8051L63.36 4.86592H61.1542L59.022 8.37803L58.6691 9.06332H58.625L58.3015 8.37803L56.1839 4.86592H53.7723Z" fill="white"/>
+<path d="M68.2251 4.75171C65.6811 4.75171 63.1812 6.2365 63.1812 9.86282C63.1812 13.4891 65.6811 14.9739 68.2251 14.9739C70.769 14.9739 73.2689 13.4891 73.2689 9.86282C73.2689 6.2365 70.769 4.75171 68.2251 4.75171ZM68.2251 6.17939C69.0044 6.17939 71.0631 6.47921 71.0631 9.86282C71.0631 13.2464 69.0044 13.5462 68.2251 13.5462C67.4457 13.5462 65.387 13.2464 65.387 9.86282C65.387 6.47921 67.4457 6.17939 68.2251 6.17939Z" fill="white"/>
+<path d="M74.9654 4.86592V14.8597H77.0535V10.6195H80.5533V8.97766H77.0535V6.55059H80.7298V4.86592H74.9654Z" fill="white"/>
+<path d="M82.203 4.86592V14.8597H84.2911V10.6195H87.7909V8.97766H84.2911V6.55059H87.9674V4.86592H82.203Z" fill="white"/>
+<path d="M89.4407 14.8597H91.5288V4.86592H89.4407V14.8597Z" fill="white"/>
+<path d="M101.105 12.8467C100.59 13.0751 99.8699 13.2893 98.9582 13.2893C97.1053 13.2893 95.429 12.3042 95.429 9.89137C95.429 7.84978 96.7965 6.43638 99.1052 6.43638C99.8846 6.43638 100.546 6.57914 101.149 6.80757L101.237 5.09435C100.458 4.85165 99.7669 4.75171 98.9582 4.75171C95.7231 4.75171 93.2232 6.47921 93.2232 9.91993C93.2232 13.5605 96.0172 14.9739 98.5758 14.9739C99.3993 14.9739 100.326 14.8454 101.237 14.5456L101.105 12.8467Z" fill="white"/>
+<path d="M102.853 4.86592V14.8597H109V13.0894H104.941V10.5338H108.632V8.89199H104.941V6.63625H109V4.86592H102.853Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M9.38088 19.7549L0.563343 15.6374C-0.187781 15.2779 -0.187781 14.7224 0.563343 14.3956L3.63315 12.9578L9.34822 15.6374C10.0993 15.9969 11.3077 15.9969 12.0261 15.6374L17.7412 12.9578L20.811 14.3956C21.5621 14.7551 21.5621 15.3106 20.811 15.6374L11.9935 19.7549C11.3077 20.0817 10.0993 20.0817 9.38088 19.7549Z" fill="white"/>
+<path opacity="0.75" fill-rule="evenodd" clip-rule="evenodd" d="M9.3523 14.6595L0.561626 10.5373C-0.187209 10.1774 -0.187209 9.62119 0.561626 9.29402L3.55697 7.88721L9.3523 10.6027C10.1011 10.9626 11.3058 10.9626 12.0221 10.6027L17.8174 7.88721L20.8127 9.29402C21.5616 9.6539 21.5616 10.2101 20.8127 10.5373L12.0221 14.6595C11.2732 15.0194 10.0686 15.0194 9.3523 14.6595Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.3523 9.61731L0.561626 5.55434C-0.187209 5.19964 -0.187209 4.65146 0.561626 4.329L9.3523 0.266028C10.1011 -0.088676 11.3058 -0.088676 12.0221 0.266028L20.8127 4.329C21.5616 4.6837 21.5616 5.23188 20.8127 5.55434L12.0221 9.61731C11.2732 9.93977 10.0686 9.93977 9.3523 9.61731Z" fill="white"/>
 </svg>

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

@@ -1,6 +1,15 @@
-<svg width="100" height="14" viewBox="0 0 100 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M20.313 4.45a4.574 4.574 0 0 0-.298 2.032 4.682 4.682 0 0 0 1.458 3.764 5.042 5.042 0 0 0 3.389 1.253 4.906 4.906 0 0 0 3.356-1.253 4.664 4.664 0 0 0 1.425-3.73 4.729 4.729 0 0 0-1.425-3.761A4.85 4.85 0 0 0 24.861 1.5a4.929 4.929 0 0 0-3.39 1.251 4.578 4.578 0 0 0-1.158 1.698Zm2.424 4.54a4.054 4.054 0 0 1-.632-2.508 3.609 3.609 0 0 1 .632-2.446 2.8 2.8 0 0 1 1.426-1.003 1.65 1.65 0 0 1 .35-.062.985.985 0 0 1 .318-.032 1.2 1.2 0 0 1 .177.016c.056.008.11.016.174.016.119.008.237.029.351.062a2.604 2.604 0 0 1 1.394 1.003c.475.735.697 1.605.632 2.477a4.08 4.08 0 0 1-.632 2.476 2.604 2.604 0 0 1-1.394 1.003 1.36 1.36 0 0 1-.351.063 1.439 1.439 0 0 1-.51.016 1.196 1.196 0 0 0-.158-.016 1.652 1.652 0 0 1-.351-.063 2.67 2.67 0 0 1-1.426-1.003Zm10.548-7.395h-2.598v9.778h1.998V5.606l-.032-1.724h.028l.507 1.098 3.42 6.393h2.599V1.595h-1.995V7.33l.032 1.724h-.032l-.507-1.316-3.42-6.143Zm8.455 0h2.027v8.117h3.926v1.661H41.74V1.595Zm7.265 0h-2.312l3.644 5.767v4.011h1.995v-3.98l3.546-5.798h-2.09L51.73 5.01l-.351.69h-.032l-.316-.69-2.027-3.416Zm7.359 4.887a4.573 4.573 0 0 1 1.457-3.73 4.93 4.93 0 0 1 3.39-1.25 4.85 4.85 0 0 1 3.357 1.253 4.734 4.734 0 0 1 1.425 3.76 4.66 4.66 0 0 1-1.425 3.73 4.906 4.906 0 0 1-3.357 1.254 4.985 4.985 0 0 1-3.388-1.253 4.794 4.794 0 0 1-1.459-3.764Zm2.09 0a4.054 4.054 0 0 0 .633 2.507c.343.49.847.846 1.425 1.003.115.034.233.055.352.063.047 0 .102.008.158.016a1.312 1.312 0 0 0 .51-.016 1.36 1.36 0 0 0 .35-.063 2.605 2.605 0 0 0 1.394-1.003 4.08 4.08 0 0 0 .632-2.476 4.014 4.014 0 0 0-.632-2.477 2.605 2.605 0 0 0-1.393-1.003 1.65 1.65 0 0 0-.352-.062 1.17 1.17 0 0 1-.173-.016 1.22 1.22 0 0 0-.178-.016.985.985 0 0 0-.316.032 1.649 1.649 0 0 0-.352.062 2.79 2.79 0 0 0-1.425 1.003 3.787 3.787 0 0 0-.632 2.446Zm14.461-4.887h-5.542v9.782h2.03V7.27h3.357V5.61h-3.357V3.224h3.512v-1.63Zm1.402 0h5.542v1.63h-3.512V5.61h3.357v1.66h-3.357v4.107h-2.03V1.595Zm6.836 0v9.778h2.027V1.595h-2.027Zm11.657.218v1.692c-.35-.126-.71-.22-1.076-.28a7.601 7.601 0 0 0-1.235-.094 2.99 2.99 0 0 0-2.407.971 3.467 3.467 0 0 0-.855 2.414 3.47 3.47 0 0 0 .79 2.349 2.861 2.861 0 0 0 2.28.972c.297 0 .59-.023.923-.049l.185-.014c.435-.06.86-.176 1.265-.344l.126 1.66a2.16 2.16 0 0 1-.253.095 8.414 8.414 0 0 1-.412.094c-.164.04-.355.068-.572.1-.118.016-.245.034-.378.056-.38.032-.76.063-1.172.063h-.317a5.478 5.478 0 0 1-3.135-1.254 4.458 4.458 0 0 1-1.425-3.636 4.936 4.936 0 0 1 1.394-3.73 5.219 5.219 0 0 1 3.739-1.316c.411 0 .791 0 1.108.032.301.027.575.077.867.13l.147.026c.032.016.072.024.112.032.039.008.078.015.11.03a.204.204 0 0 1 .19 0h.001Zm7.19-.218h-5.89v9.778H100V9.838h-3.896V7.08h3.547V5.575h-3.547V3.13H100V1.595Z" fill="#333"/>
-    <path d="M6.126 13.827.368 10.942c-.49-.252-.49-.64 0-.87l2.004-1.005 3.732 1.877a2.127 2.127 0 0 0 1.749 0l3.732-1.877 2.004 1.007c.49.252.49.64 0 .87l-5.757 2.885a2.206 2.206 0 0 1-1.705 0l-.001-.002Z" fill="#FF6F3D"/>
-    <path d="M6.126 10.28.368 7.395c-.49-.252-.49-.64 0-.87L2.33 5.54l3.796 1.9a2.128 2.128 0 0 0 1.748 0l3.796-1.9 1.962.986c.49.251.49.64 0 .87L7.874 10.28a2.129 2.129 0 0 1-1.748 0Z" fill="#95C038"/>
-    <path d="M6.126 6.826.368 3.942c-.49-.252-.49-.64 0-.87L6.126.19a2.128 2.128 0 0 1 1.748 0l5.758 2.885c.49.252.49.64 0 .87L7.874 6.829a2.312 2.312 0 0 1-1.748 0v-.003Z" fill="#5DC0E8"/>
+<svg width="109" height="20" viewBox="0 0 109 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.33433 19.7549L0.560547 15.6374C-0.186849 15.2779 -0.186849 14.7224 0.560547 14.3956L3.61512 12.9578L9.30183 15.6374C10.0492 15.9969 11.2516 15.9969 11.9665 15.6374L17.6532 12.9578L20.7077 14.3956C21.4551 14.7551 21.4551 15.3106 20.7077 15.6374L11.934 19.7549C11.2516 20.0817 10.0492 20.0817 9.33433 19.7549Z" fill="#FF6F3D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.30589 14.6595L0.558839 10.5372C-0.18628 10.1774 -0.18628 9.62118 0.558839 9.29402L3.53932 7.88721L9.30589 10.6027C10.051 10.9626 11.2497 10.9626 11.9624 10.6027L17.729 7.88721L20.7095 9.29402C21.4546 9.6539 21.4546 10.2101 20.7095 10.5372L11.9624 14.6595C11.2173 15.0194 10.0186 15.0194 9.30589 14.6595Z" fill="#95C038"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.30589 9.6173L0.558839 5.55433C-0.18628 5.19963 -0.18628 4.65145 0.558839 4.32899L9.30589 0.266028C10.051 -0.0886759 11.2497 -0.0886759 11.9624 0.266028L20.7095 4.32899C21.4546 4.6837 21.4546 5.23188 20.7095 5.55433L11.9624 9.6173C11.2173 9.93976 10.0186 9.93976 9.30589 9.6173Z" fill="#5DC0E8"/>
+<path d="M31.6042 4.88892C29.0728 4.88892 26.5854 6.37371 26.5854 10C26.5854 13.6263 29.0728 15.1111 31.6042 15.1111C34.1355 15.1111 36.623 13.6263 36.623 10C36.623 6.37371 34.1355 4.88892 31.6042 4.88892ZM31.6042 6.3166C32.3797 6.3166 34.4282 6.61641 34.4282 10C34.4282 13.3836 32.3797 13.6834 31.6042 13.6834C30.8287 13.6834 28.7802 13.3836 28.7802 10C28.7802 6.61641 30.8287 6.3166 31.6042 6.3166Z" fill="#333333"/>
+<path d="M38.311 5.00313V14.9969H40.3888V9.11486L40.3449 7.34453H40.3888L40.9009 8.45812L44.4711 14.9969H47.1634V5.00313H45.0857V10.8852L45.1296 12.6555H45.0857L44.5443 11.2992L41.0033 5.00313H38.311Z" fill="#333333"/>
+<path d="M49.2136 5.00313V14.9969H55.3591V13.3122H51.2914V5.00313H49.2136Z" fill="#333333"/>
+<path d="M53.6033 5.00313L57.3783 10.9137V14.9969H59.4561V10.9423L63.1434 5.00313H60.9486L58.8269 8.51523L58.4757 9.20052H58.4319L58.1099 8.51523L56.0029 5.00313H53.6033Z" fill="#333333"/>
+<path d="M67.9843 4.88892C65.453 4.88892 62.9655 6.37371 62.9655 10C62.9655 13.6263 65.453 15.1111 67.9843 15.1111C70.5157 15.1111 73.0031 13.6263 73.0031 10C73.0031 6.37371 70.5157 4.88892 67.9843 4.88892ZM67.9843 6.3166C68.7598 6.3166 70.8083 6.61641 70.8083 10C70.8083 13.3836 68.7598 13.6834 67.9843 13.6834C67.2088 13.6834 65.1603 13.3836 65.1603 10C65.1603 6.61641 67.2088 6.3166 67.9843 6.3166Z" fill="#333333"/>
+<path d="M74.6912 5.00313V14.9969H76.7689V10.7567H80.2514V9.11486H76.7689V6.6878H80.427V5.00313H74.6912Z" fill="#333333"/>
+<path d="M81.8929 5.00313V14.9969H83.9707V10.7567H87.4531V9.11486H83.9707V6.6878H87.6287V5.00313H81.8929Z" fill="#333333"/>
+<path d="M89.0946 14.9969H91.1724V5.00313H89.0946V14.9969Z" fill="#333333"/>
+<path d="M100.701 12.9839C100.189 13.2123 99.4721 13.4265 98.5649 13.4265C96.7213 13.4265 95.0532 12.4414 95.0532 10.0286C95.0532 7.98699 96.414 6.57358 98.7112 6.57358C99.4867 6.57358 100.145 6.71635 100.745 6.94478L100.833 5.23156C100.057 4.98885 99.3697 4.88892 98.5649 4.88892C95.3458 4.88892 92.8584 6.61641 92.8584 10.0571C92.8584 13.6977 95.6385 15.1111 98.1845 15.1111C99.0039 15.1111 99.9257 14.9826 100.833 14.6828L100.701 12.9839Z" fill="#333333"/>
+<path d="M102.441 5.00313V14.9969H108.557V13.2266H104.518V10.671H108.191V9.0292H104.518V6.77346H108.557V5.00313H102.441Z" fill="#333333"/>
 </svg>

apps/common/mobile/resources/less/colors-table-dark.less

@@ -57,12 +57,12 @@
         //--canvas-high-contrast-disabled: #000;
 
         --canvas-cell-border: fade(#000, 10%);
-        --canvas-cell-title-border: #d5d5d5;
+        --canvas-cell-title-border: #757575;
         --canvas-cell-title-border-hover: #858585;
-        --canvas-cell-title-border-selected: #afafaf;
-        --canvas-cell-title-text: #d9d9d9;
-        --canvas-cell-title-background: #000;
-        --canvas-cell-title-background-selected: #939393;
+        --canvas-cell-title-border-selected: #999;
+        --canvas-cell-title-text: fade(#fff, 80%);
+        --canvas-cell-title-background: #555;
+        --canvas-cell-title-background-selected: #3d3d3d;
 
         //--canvas-scroll-thumb: #404040;
         //--canvas-scroll-thumb-hover: #999;

apps/common/mobile/resources/less/colors-table.less

@@ -52,12 +52,12 @@
     --canvas-high-contrast: #000;
     //--canvas-high-contrast-disabled: #666;
 
-    --canvas-cell-border: fade(#000, 10%);
-    --canvas-cell-title-text: #444;
+    --canvas-cell-border: #999;
+    --canvas-cell-title-text: fade(#000, 80%);
     --canvas-cell-title-background: #f7f7f7;
     --canvas-cell-title-background-selected: #cfcfcf;
     --canvas-cell-title-border: #d8d8d8;
-    --canvas-cell-title-border-selected: #bbb;
+    --canvas-cell-title-border-selected: #c9c9c9;
 
     //--canvas-scroll-thumb: #f7f7f7;
     //--canvas-scroll-thumb-hover: #c0c0c0;

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

@@ -749,4 +749,14 @@
         background-color: @brand-secondary;
         margin-left: 8px;
     }
+
+    .dropdown-list {
+        .icon-radio {
+            display: none;
+        }
+
+        input[type="radio"]:checked + .icon-radio {
+            display: inline-block;
+        }
+    }
 }

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

@@ -204,8 +204,9 @@
         margin-right: 20px;
     }
 
-    .list li.no-indicator .item-link .item-inner {
+    .view .list li.no-indicator .item-link .item-inner {
         padding-right: 0;
+        padding-left: 15px;
     }
 
     // Dialog with password

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

@@ -22,14 +22,17 @@
 
 .navbar.main-navbar {
     height: 0;
+
     &.navbar-with-logo {
         height: 26px;
     }
+
     .navbar-inner {
         display: flex;
         justify-content: center;
-        padding-top: 7px;
+        padding: 0;
     }
+
     .navbar-bg {
         &:before, &:after {
             content: none;
@@ -55,9 +58,10 @@
     display: flex;
     justify-content: center;
     align-items: center;
+    height: 100%;
 
     .custom-logo-image {
-        max-height: 14px;
+        max-height: 20px;
         height: auto;
         width: auto;
     }
@@ -1068,6 +1072,12 @@ input[type="number"]::-webkit-inner-spin-button {
     height: 100%;
 }
 
+.dropdown-list-popup {
+    height: 260px;
+    bottom: 0;
+    top: auto;
+}
+
 .dropdown-list {
     &__placeholder  {
         opacity: 0.6;

apps/common/mobile/resources/less/ios/icons.less

@@ -5,6 +5,7 @@
         i.icon {
             &.icon-logo {
                 background: ~"url(@{common-image-path}/header/logo-android.svg)" no-repeat center;
+                background-size: contain;
             }
         }
     }
@@ -14,8 +15,9 @@
         }
         &.icon-logo {
             width: 100px;
-            height: 14px;
+            height: 20px;
             background: ~"url(@{common-image-path}/header/logo-ios.svg)" no-repeat center;
+            background-size: contain;
         }
         &.icon-prev {
             width: 22px;

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

@@ -7,8 +7,9 @@
         }
         &.icon-logo {
             width: 100px;
-            height: 14px;
+            height: 20px;
             background: ~"url(@{common-image-path}/header/logo-android.svg) no-repeat center";
+            background-size: contain;
         }
         &.icon-prev {
             width: 20px;
@@ -37,6 +38,15 @@
             .encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M11.8827 9.00494H12.0235C12.8365 9.00494 13.5402 9.30206 14.1343 9.8963C14.7285 10.4905 15.0256 11.1942 15.0256 12.0074V12.1951L11.8827 9.00494ZM7.56716 9.80247C7.1919 10.5531 7.00426 11.2881 7.00426 12.0074C7.00426 13.3835 7.48898 14.572 8.45842 15.5728C9.45913 16.5424 10.6475 17.0272 12.0235 17.0272C12.7427 17.0272 13.4776 16.8395 14.2281 16.4642L12.6802 14.916C12.43 14.9786 12.2111 15.0099 12.0235 15.0099C11.2104 15.0099 10.5068 14.7128 9.91258 14.1185C9.31841 13.5243 9.02132 12.8206 9.02132 12.0074C9.02132 11.8198 9.05259 11.6008 9.11514 11.3506L7.56716 9.80247ZM2.03198 4.26667L3.29851 3L21.0299 20.7333L19.7633 22C19.607 21.8436 19.1066 21.3588 18.2623 20.5457C17.4492 19.7325 16.8237 19.107 16.3859 18.6691C15.0412 19.2321 13.5871 19.5136 12.0235 19.5136C9.55295 19.5136 7.31699 18.8255 5.31557 17.4494C3.31414 16.0733 1.87562 14.2593 1 12.0074C1.78181 10.0683 3.03269 8.4107 4.75267 7.03457C4.3774 6.65926 3.84577 6.12757 3.15778 5.43951C2.50107 4.75144 2.1258 4.36049 2.03198 4.26667ZM12.0235 6.98765C11.398 6.98765 10.7882 7.11276 10.194 7.36296L8.03625 5.20494C9.25586 4.7358 10.5849 4.50123 12.0235 4.50123C14.494 4.50123 16.7143 5.1893 18.6844 6.56543C20.6859 7.94156 22.1244 9.75556 23 12.0074C22.2495 13.8527 21.108 15.4321 19.5757 16.7457L16.6674 13.837C16.9176 13.2428 17.0426 12.6329 17.0426 12.0074C17.0426 10.6313 16.5423 9.45844 15.5416 8.48889C14.5721 7.48807 13.3994 6.98765 12.0235 6.98765Z"/></svg>', @text-secondary);
         }
     }
+    .dropdown-list {
+        i.icon {
+            &.icon-radio {
+                width: 24px;
+                height: 24px;
+                .encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M9 16L4 11L3 12L9 18L20 7L19 6L9 16Z" /></svg>', @brandColor);
+            }
+        }
+    }
     .navbar {
         i.icon {
             &.icon-collaboration {

apps/common/mobile/utils/htmlutils.js

@@ -24,15 +24,25 @@ function isLocalStorageAvailable() {
     }
 }
 
-if(isLocalStorageAvailable()) {
-    if(localStorage.getItem('mobile-mode-direction') === 'rtl') {
+{
+    let lang = (/(?:&|^)lang=([^&]+)&?/i).exec(window.location.search.substring(1));
+    lang = ((lang && lang[1]) || window.Common.Locale.defaultLang).split(/[\-\_]/)[0];
+    Common.Locale.currentLang = lang;
+    Common.Locale.isCurrentLangRtl = lang.lastIndexOf('ar', 0) === 0;
+}
+
+{
+    let modeDirection = 'ltr';
+    if ( Common.Locale.isCurrentLangRtl ) {
+            modeDirection = (isLocalStorageAvailable() && localStorage.getItem('mobile-mode-direction')) || 'rtl';
+    }
+
+    if(modeDirection === 'rtl') {
         load_stylesheet('./css/framework7-rtl.css');
         document.body.classList.add('rtl');
     } else {
         load_stylesheet('./css/framework7.css')
     }
-} else {
-    load_stylesheet('./css/framework7.css')
 }
 
 let obj = !isLocalStorageAvailable() ? {id: 'theme-light', type: 'light'} : JSON.parse(localStorage.getItem("mobile-ui-theme"));

apps/documenteditor/embed/index.html

@@ -251,6 +251,9 @@
           <div class="modal-dialog">
               <div class="modal-content">
                   <div class="modal-header">
+                      <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                      </button>
                       <h4 id="id-critical-error-title"></h4>
                   </div>
                   <div class="modal-body">

apps/documenteditor/embed/index.html.deploy

@@ -242,6 +242,9 @@
           <div class="modal-dialog">
               <div class="modal-content">
                   <div class="modal-header">
+                      <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                      </button>
                       <h4 id="id-critical-error-title"></h4>
                   </div>
                   <div class="modal-body">

apps/documenteditor/embed/index_loader.html

@@ -312,6 +312,9 @@
           <div class="modal-dialog">
               <div class="modal-content">
                   <div class="modal-header">
+                      <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                      </button>
                       <h4 id="id-critical-error-title"></h4>
                   </div>
                   <div class="modal-body">

apps/documenteditor/embed/index_loader.html.deploy

@@ -304,6 +304,9 @@
           <div class="modal-dialog">
               <div class="modal-content">
                   <div class="modal-header">
+                      <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                      </button>
                       <h4 id="id-critical-error-title"></h4>
                   </div>
                   <div class="modal-body">

apps/documenteditor/embed/js/ApplicationController.js

@@ -89,6 +89,7 @@ DE.ApplicationController = new(function(){
             ttOffset[1] = 40;
         }
 
+        config.mode = 'view'; // always view for embedded
         config.canCloseEditor = false;
         var _canback = false;
         if (typeof config.customization === 'object') {
@@ -424,8 +425,12 @@ DE.ApplicationController = new(function(){
 
         if ( !appOptions.canFillForms || permissions.download === false) {
             $('#idt-download-docx').hide();
+            itemsCount --;
+        }
+
+        if ( !appOptions.canFillForms && !appOptions.isOForm || permissions.download === false) {
             $('#idt-download-pdf').hide();
-            itemsCount -= 2;
+            itemsCount --;
         }
 
         if ( !embedConfig.shareUrl || appOptions.canFillForms) {
@@ -627,6 +632,17 @@ DE.ApplicationController = new(function(){
                 }, 2000);
             }
         });
+
+        if (appOptions.isOForm && permissions.download!==false) {
+            $('#id-critical-error-title').text(me.notcriticalErrorTitle);
+            $('#id-critical-error-message').html(me.textConvertFormDownload);
+            $('#id-critical-error-close').text(me.textDownloadPdf).off().on('click', function(){
+                downloadAs(Asc.c_oAscFileType.PDF);
+                $('#id-critical-error-dialog').modal('hide');
+            });
+            $('#id-critical-error-dialog').modal('show');
+        }
+
         Common.Gateway.documentReady();
         Common.Analytics.trackEvent('Load', 'Complete');
     }
@@ -638,6 +654,7 @@ DE.ApplicationController = new(function(){
             $('#id-critical-error-title').text(Asc.c_oLicenseResult.NotBefore === licType ? me.titleLicenseNotActive : me.titleLicenseExp);
             $('#id-critical-error-message').html(Asc.c_oLicenseResult.NotBefore === licType ? me.warnLicenseBefore : me.warnLicenseExp);
             $('#id-critical-error-close').parent().remove();
+            $('#id-critical-error-dialog button.close').remove();
             $('#id-critical-error-dialog').css('z-index', 20002).modal({backdrop: 'static', keyboard: false, show: true});
             return;
         }
@@ -648,6 +665,9 @@ DE.ApplicationController = new(function(){
         appOptions.canBranding  = params.asc_getCustomization();
         appOptions.canBranding && setBranding(config.customization);
 
+        var type = /^(?:(docxf|oform))$/.exec(docConfig.fileType);
+        appOptions.isOForm = !!(type && typeof type[1] === 'string'); // oform and docxf
+
         api.asc_setViewMode(!appOptions.canFillForms);
 
         btnSubmit = $('#id-btn-submit');
@@ -736,6 +756,7 @@ DE.ApplicationController = new(function(){
             $('#id-critical-error-close').text(me.txtClose).off().on('click', function(){
                 window.location.reload();
             });
+            $('#id-critical-error-dialog button.close').remove();
             $('#id-critical-error-dialog').css('z-index', 20002).modal('show');
             return;
         }
@@ -827,8 +848,9 @@ DE.ApplicationController = new(function(){
                 return;
 
             default:
-                message = me.errorDefaultMessage.replace('%1', id);
-                break;
+                // message = me.errorDefaultMessage.replace('%1', id);
+                // break;
+                return;
         }
 
         if (level == Asc.c_oAscError.Level.Critical) {
@@ -841,6 +863,7 @@ DE.ApplicationController = new(function(){
             $('#id-critical-error-close').text(me.txtClose).off().on('click', function(){
                 window.location.reload();
             });
+            $('#id-critical-error-dialog button.close').remove();
         }
         else {
             Common.Gateway.reportWarning(id, message);
@@ -1060,6 +1083,8 @@ DE.ApplicationController = new(function(){
         titleLicenseExp: 'License expired',
         titleLicenseNotActive: 'License not active',
         warnLicenseBefore: 'License not active. Please contact your administrator.',
-        warnLicenseExp: 'Your license has expired. Please update your license and refresh the page.'
+        warnLicenseExp: 'Your license has expired. Please update your license and refresh the page.',
+        textConvertFormDownload: 'Download file as a fillable PDF form to be able to fill it out.',
+        textDownloadPdf: 'Download pdf'
     }
 })();

apps/documenteditor/embed/locale/de.json

@@ -34,7 +34,9 @@
   "DE.ApplicationController.scriptLoadError": "Die Verbindung ist zu langsam, einige der Komponenten konnten nicht geladen werden. Bitte laden Sie die Seite erneut.",
   "DE.ApplicationController.textAnonymous": "Anonym",
   "DE.ApplicationController.textClear": "Alle Felder löschen",
+  "DE.ApplicationController.textConvertFormDownload": "Laden Sie die Datei als ausfüllbares PDF-Formular herunter, um sie ausfüllen zu können.",
   "DE.ApplicationController.textCtrl": "Strg",
+  "DE.ApplicationController.textDownloadPdf": "PDF herunterladen",
   "DE.ApplicationController.textGotIt": "OK",
   "DE.ApplicationController.textGuest": "Gast",
   "DE.ApplicationController.textLoadingDocument": "Dokument wird geladen...",

apps/documenteditor/embed/locale/el.json

@@ -34,7 +34,9 @@
   "DE.ApplicationController.scriptLoadError": "Η σύνδεση είναι πολύ αργή, δεν ήταν δυνατή η φόρτωση ορισμένων στοιχείων. Φορτώστε ξανά τη σελίδα.",
   "DE.ApplicationController.textAnonymous": "Ανώνυμος",
   "DE.ApplicationController.textClear": "Εκκαθάριση όλων των πεδίων",
+  "DE.ApplicationController.textConvertFormDownload": "Κατεβάστε το αρχείο ως συμπληρώσιμο PDF για να μπορείτε να το συμπληρώσετε.",
   "DE.ApplicationController.textCtrl": "Ctrl",
+  "DE.ApplicationController.textDownloadPdf": "Λήψη PDF",
   "DE.ApplicationController.textGotIt": "Ελήφθη",
   "DE.ApplicationController.textGuest": "Επισκέπτης",
   "DE.ApplicationController.textLoadingDocument": "Φόρτωση εγγράφου",
@@ -60,6 +62,6 @@
   "DE.ApplicationView.txtFileLocation": "Άνοιγμα θέσης αρχείου",
   "DE.ApplicationView.txtFullScreen": "Πλήρης οθόνη",
   "DE.ApplicationView.txtPrint": "Εκτύπωση",
-  "DE.ApplicationView.txtSearch": "Αναζήτηση",
+  "DE.ApplicationView.txtSearch": "Εύρεση",
   "DE.ApplicationView.txtShare": "Διαμοιρασμός"
 }

apps/documenteditor/embed/locale/en.json

@@ -34,7 +34,9 @@
   "DE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
   "DE.ApplicationController.textAnonymous": "Anonymous",
   "DE.ApplicationController.textClear": "Clear all fields",
+  "DE.ApplicationController.textConvertFormDownload": "Download file as a fillable PDF form to be able to fill it out.",
   "DE.ApplicationController.textCtrl": "Ctrl",
+  "DE.ApplicationController.textDownloadPdf": "Download PDF",
   "DE.ApplicationController.textGotIt": "Got it",
   "DE.ApplicationController.textGuest": "Guest",
   "DE.ApplicationController.textLoadingDocument": "Loading document",

apps/documenteditor/embed/locale/fr.json

@@ -34,7 +34,9 @@
   "DE.ApplicationController.scriptLoadError": "La connexion est trop lente, certains  éléments ne peuvent pas être chargés. Veuillez recharger la page.",
   "DE.ApplicationController.textAnonymous": "Anonyme",
   "DE.ApplicationController.textClear": "Effacer tous les champs",
+  "DE.ApplicationController.textConvertFormDownload": "Téléchargez le fichier au format PDF remplissable pour pouvoir le remplir.",
   "DE.ApplicationController.textCtrl": "Ctrl",
+  "DE.ApplicationController.textDownloadPdf": "Télécharger PDF",
   "DE.ApplicationController.textGotIt": "C'est compris",
   "DE.ApplicationController.textGuest": "Invité",
   "DE.ApplicationController.textLoadingDocument": "Chargement du document",

apps/documenteditor/embed/locale/pt.json

@@ -34,7 +34,9 @@
   "DE.ApplicationController.scriptLoadError": "A conexão está muito lenta, e alguns dos componentes não puderam ser carregados. Por favor, recarregue a página.",
   "DE.ApplicationController.textAnonymous": "Anônimo",
   "DE.ApplicationController.textClear": "Limpar todos os campos",
+  "DE.ApplicationController.textConvertFormDownload": "Baixe o arquivo como um formulário PDF preenchível para poder preenchê-lo.",
   "DE.ApplicationController.textCtrl": "Ctrl",
+  "DE.ApplicationController.textDownloadPdf": "Baixar PDF",
   "DE.ApplicationController.textGotIt": "Entendi",
   "DE.ApplicationController.textGuest": "Convidado(a)",
   "DE.ApplicationController.textLoadingDocument": "Carregando documento",

apps/documenteditor/embed/locale/ro.json

@@ -34,7 +34,9 @@
   "DE.ApplicationController.scriptLoadError": "Conexeunea e prea lentă și unele elemente nu se încarcă. Încercați să reîmprospătati pagina.",
   "DE.ApplicationController.textAnonymous": "Anonim",
   "DE.ApplicationController.textClear": "Goleşte toate câmpurile",
+  "DE.ApplicationController.textConvertFormDownload": "Descărcați fișierul ca un formular PDF completabil pentru a putea completa acest formular.",
   "DE.ApplicationController.textCtrl": "Ctrl",
+  "DE.ApplicationController.textDownloadPdf": "Descărcare PDF",
   "DE.ApplicationController.textGotIt": "Am înțeles",
   "DE.ApplicationController.textGuest": "Invitat",
   "DE.ApplicationController.textLoadingDocument": "Încărcare document",

apps/documenteditor/embed/locale/ru.json

@@ -34,7 +34,9 @@
   "DE.ApplicationController.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.",
   "DE.ApplicationController.textAnonymous": "Анонимный пользователь",
   "DE.ApplicationController.textClear": "Очистить все поля",
+  "DE.ApplicationController.textConvertFormDownload": "Скачайте файл как заполняемую PDF-форму, чтобы иметь возможность ее заполнить.",
   "DE.ApplicationController.textCtrl": "Ctrl",
+  "DE.ApplicationController.textDownloadPdf": "Скачать PDF",
   "DE.ApplicationController.textGotIt": "ОК",
   "DE.ApplicationController.textGuest": "Гость",
   "DE.ApplicationController.textLoadingDocument": "Загрузка документа",

apps/documenteditor/embed/locale/si.json

@@ -34,7 +34,9 @@
   "DE.ApplicationController.scriptLoadError": "සම්බන්ධතාවය ඉතා මන්දගාමීය, සමහර සංරචක පූරණය නොවිණි. පිටුව නැවත පූරණය කරන්න.",
   "DE.ApplicationController.textAnonymous": "නිර්නාමික",
   "DE.ApplicationController.textClear": "සියළු ක්‍ෂේත්‍ර හිස්කරන්න",
+  "DE.ApplicationController.textConvertFormDownload": "ගොනුව පිරවිය හැකි පීඩීඑෆ් ආකෘතිපත්‍රයක් ලෙස බාගන්න.",
   "DE.ApplicationController.textCtrl": "Ctrl",
+  "DE.ApplicationController.textDownloadPdf": "පීඩීඑෆ් බාගන්න",
   "DE.ApplicationController.textGotIt": "තේරුණා",
   "DE.ApplicationController.textGuest": "අමුත්තා",
   "DE.ApplicationController.textLoadingDocument": "ලේඛනය පූරණය වෙමින්",

apps/documenteditor/embed/locale/sl.json

@@ -34,7 +34,9 @@
   "DE.ApplicationController.scriptLoadError": "Povezava je prepočasna, nekatere komponente niso pravilno naložene.Ponovno naložite stran.",
   "DE.ApplicationController.textAnonymous": "Anonimno",
   "DE.ApplicationController.textClear": "Počisti vsa polja",
+  "DE.ApplicationController.textConvertFormDownload": "Prenesi datoteko kot PDF formular, ki ga je mogoče izpolniti.",
   "DE.ApplicationController.textCtrl": "Ctrl",
+  "DE.ApplicationController.textDownloadPdf": "Prenesi PDF",
   "DE.ApplicationController.textGotIt": "Razumem",
   "DE.ApplicationController.textGuest": "Gost",
   "DE.ApplicationController.textLoadingDocument": "Nalaganje dokumenta",

apps/documenteditor/embed/locale/sr-cyrl.json

@@ -0,0 +1,67 @@
+{
+  "common.view.modals.txtCopy": "Копирај на клипборд",
+  "common.view.modals.txtEmbed": "Угради",
+  "common.view.modals.txtHeight": "Висина",
+  "common.view.modals.txtIncorrectPwd": "Лозинка је нетачна",
+  "common.view.modals.txtOpenFile": "Унеси лозинку да отвориш фајл",
+  "common.view.modals.txtShare": "Подели линк",
+  "common.view.modals.txtTitleProtected": "Заштићен фајл",
+  "common.view.modals.txtWidth": "Ширина",
+  "common.view.SearchBar.textFind": "Пронађи",
+  "DE.ApplicationController.convertationErrorText": "Преобраћање неуспешно.",
+  "DE.ApplicationController.convertationTimeoutText": "Временско ограничење преобраћања прекорачено.",
+  "DE.ApplicationController.criticalErrorTitle": "Грешка",
+  "DE.ApplicationController.downloadErrorText": "Преузимање неуспешно.",
+  "DE.ApplicationController.downloadTextText": "Преузимање документа...",
+  "DE.ApplicationController.errorAccessDeny": "Покушавате да изведете акцију на коју немате права.<br>Молимо контактирајте свог Документ Сервер администратора.",
+  "DE.ApplicationController.errorDefaultMessage": "Грешка код: %1",
+  "DE.ApplicationController.errorEditingDownloadas": "Појавила се грешка у току рада са документом.<br>Користите \"Преузми као...\" опцију да сачувате резервну копију фајла на хард драјв вашег компјутера.",
+  "DE.ApplicationController.errorFilePassProtect": "Фајл је заштићен лозинком и не може бити отворен.",
+  "DE.ApplicationController.errorFileSizeExceed": "Величина фајла превазилази границе постављене за ваш сервер.<br>Молимо вас контактирајте вашег Документ Сервер администратора за детаље.",
+  "DE.ApplicationController.errorForceSave": "Грешка се појавила у току чувања фајла. Молимо користите \"Преузми као\" опцију да сачувате фајл на хард драјв вашег компјутера или покушајте поново касније.",
+  "DE.ApplicationController.errorInconsistentExt": "Грешка се појавила у току отварања фајла.<br>Садржај фајла се не поклапа са фајл екстензијом.",
+  "DE.ApplicationController.errorInconsistentExtDocx": "Грешка се појавила приликом отварања фајла.<br>Садржај фајла одговара текстуалним документима (нпр docx), али фајл има недоследну екстензију: %1.",
+  "DE.ApplicationController.errorInconsistentExtPdf": "Појавила се грешка при отварању фајла.<br>Садржај фајла одговара једном од следећих формата: pdf/djvu/xps/oxps, али фајл има недоследну екстензију: %1.",
+  "DE.ApplicationController.errorInconsistentExtPptx": "Грешка се појавила приликом отварања фајла.<br>Садржај фајла одговара презентацијама (нпр pptx), али фајл има недоследну екстензију: %1.",
+  "DE.ApplicationController.errorInconsistentExtXlsx": "Грешка се појавила приликом отварања фајла.<br>Садржај фајла одговара прорачунским табелама (нпр xlsx), али фајл има недоследну екстензију: %1.",
+  "DE.ApplicationController.errorLoadingFont": "Фонтови нису учитани.<br>Молимо контактирајте свог Документ Сервер администратора.",
+  "DE.ApplicationController.errorSubmit": "Подношење неуспешно.",
+  "DE.ApplicationController.errorTokenExpire": "Сигурносни токен документа је истекао.<br>Молимо контактирајте вашег Документ Сервер администратора.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Конекција је обновљена, и верзија фајла је промењена.<br>Пре него што наставите да радите, морате преузети фајл или копирате његов садржај да се уверите да ништа није изгубљено, и онда поново учитате ову страницу.",
+  "DE.ApplicationController.errorUserDrop": "Фајл не може бити приступљен сада.",
+  "DE.ApplicationController.notcriticalErrorTitle": "Упозорење",
+  "DE.ApplicationController.openErrorText": "Грешка се појавила у току отварања фајла.",
+  "DE.ApplicationController.scriptLoadError": "Конекција је превише спора, неке од компонената не могу бити учитане. Молимо поново учитајте страницу.",
+  "DE.ApplicationController.textAnonymous": "Анонимно",
+  "DE.ApplicationController.textClear": "Уклони сва поља",
+  "DE.ApplicationController.textConvertFormDownload": "Преузмите датотеку као PDF образац који се попуњава да бисте могли да га попуните.",
+  "DE.ApplicationController.textCtrl": "Ctrl",
+  "DE.ApplicationController.textDownloadPdf": "Преузми PDF",
+  "DE.ApplicationController.textGotIt": "Разумем",
+  "DE.ApplicationController.textGuest": "Гост",
+  "DE.ApplicationController.textLoadingDocument": "Учитавање документа",
+  "DE.ApplicationController.textNext": "Следеће поље",
+  "DE.ApplicationController.textOf": "од",
+  "DE.ApplicationController.textRequired": "Попуни сва потребна поља за слање обрасца.",
+  "DE.ApplicationController.textSubmit": "Поднеси",
+  "DE.ApplicationController.textSubmited": "<b>Форма достављена успешно.</b><br>Кликните да затворите савет",
+  "DE.ApplicationController.titleLicenseExp": "Лиценца истекла",
+  "DE.ApplicationController.titleLicenseNotActive": "Лиценца није активна",
+  "DE.ApplicationController.txtClose": "Затвори",
+  "DE.ApplicationController.txtEmpty": "(Празно)",
+  "DE.ApplicationController.txtPressLink": "Притисни %1 и кликни линк",
+  "DE.ApplicationController.unknownErrorText": "Непозната грешка.",
+  "DE.ApplicationController.unsupportedBrowserErrorText": "Ваш прегледач није подржан.",
+  "DE.ApplicationController.waitText": "Молимо, сачекајте...",
+  "DE.ApplicationController.warnLicenseBefore": "Лиценца није активна. Молимо контактирајте свог администратора.",
+  "DE.ApplicationController.warnLicenseExp": "Ваша лиценца је истекла. Молимо ажурирајте своју лиценцу и освежите страницу.",
+  "DE.ApplicationView.txtDownload": "Преузми",
+  "DE.ApplicationView.txtDownloadDocx": "Преузми као DOCX",
+  "DE.ApplicationView.txtDownloadPdf": "Преузми као PDF",
+  "DE.ApplicationView.txtEmbed": "Угради",
+  "DE.ApplicationView.txtFileLocation": "Отвори фајл локацију",
+  "DE.ApplicationView.txtFullScreen": "Приказ целог екрана",
+  "DE.ApplicationView.txtPrint": "Штампај",
+  "DE.ApplicationView.txtSearch": "Претрага",
+  "DE.ApplicationView.txtShare": "Подели"
+}

apps/documenteditor/embed/locale/sr.json

@@ -20,7 +20,7 @@
   "DE.ApplicationController.errorFileSizeExceed": "Veličina fajla prevazilazi granice postavljene za vaš server.<br>Molimo vas kontaktirajte vašeg Dokument Server administratora za detalje.",
   "DE.ApplicationController.errorForceSave": "Greška se pojavila u toku čuvanja fajla. Molimo koristite \"Preuzmi kao\" opciju da sačuvate fajl na hard drajv vašeg kompjutera ili pokušajte ponovo kasnije.",
   "DE.ApplicationController.errorInconsistentExt": "Greška se pojavila u toku otvaranja fajla.<br>Sadržaj fajla se ne poklapa sa fajl ekstenzijom.",
-  "DE.ApplicationController.errorInconsistentExtDocx": "Greška se pojavila prilikom otvaranja fajla.<br>Sadržaj fajla odgovara proračunskim tabelama (npr docx), ali fajl ima nedoslednu ekstenziju: %1.",
+  "DE.ApplicationController.errorInconsistentExtDocx": "Greška se pojavila prilikom otvaranja fajla.<br>Sadržaj fajla odgovara tekstualnim dokumentima (npr docx), ali fajl ima nedoslednu ekstenziju: %1.",
   "DE.ApplicationController.errorInconsistentExtPdf": "Pojavila se greška pri otvaranju fajla.<br>Sadržaj fajla odgovara jednom od sledećih formata: pdf/djvu/xps/oxps, ali fajl ima nedoslednu ekstenziju: %1",
   "DE.ApplicationController.errorInconsistentExtPptx": "Greška se pojavila prilikom otvaranja fajla.<br>Sadržaj fajla odgovara prezentacijama (npr pptx), ali fajl ima nedoslednu ekstenziju: %1",
   "DE.ApplicationController.errorInconsistentExtXlsx": "Greška se pojavila prilikom otvaranja fajla.<br>Sadržaj fajla odgovara proračunskim tabelama (npr xlsx), ali fajl ima nedoslednu ekstenziju: %1.",
@@ -34,7 +34,9 @@
   "DE.ApplicationController.scriptLoadError": "Konekcija je previše spora, neke od komponenata ne mogu biti učitane. Molimo ponovo učitajte stranicu.",
   "DE.ApplicationController.textAnonymous": "Anonimno",
   "DE.ApplicationController.textClear": "Ukloni Sva Polja",
+  "DE.ApplicationController.textConvertFormDownload": "Preuzmite datoteku kao PDF obrazac koji se popunjava da biste mogli da ga popunite.",
   "DE.ApplicationController.textCtrl": "Ctrl",
+  "DE.ApplicationController.textDownloadPdf": "Preuzmi PDF",
   "DE.ApplicationController.textGotIt": "Razumem",
   "DE.ApplicationController.textGuest": "Gost",
   "DE.ApplicationController.textLoadingDocument": "Učitavanje dokumenta ",

apps/documenteditor/embed/locale/tr.json

@@ -34,7 +34,9 @@
   "DE.ApplicationController.scriptLoadError": "Bağlantı çok yavaş, bileşenlerin bazıları yüklenemedi. Lütfen sayfayı yenileyin.",
   "DE.ApplicationController.textAnonymous": "Anonim",
   "DE.ApplicationController.textClear": "Tüm alanları temizle",
+  "DE.ApplicationController.textConvertFormDownload": "Doldurabilmek için dosyayı doldurulabilir bir PDF formu olarak indirin.",
   "DE.ApplicationController.textCtrl": "Kontrol",
+  "DE.ApplicationController.textDownloadPdf": "PDF indir",
   "DE.ApplicationController.textGotIt": "Anladım",
   "DE.ApplicationController.textGuest": "Misafir",
   "DE.ApplicationController.textLoadingDocument": "Döküman yükleniyor",
@@ -54,8 +56,8 @@
   "DE.ApplicationController.warnLicenseBefore": "Lisans aktif değil. Lütfen yöneticinizle iletişime geçin.",
   "DE.ApplicationController.warnLicenseExp": "Lisansınız sona erdi. Lütfen lisansınızı güncelleyin ve sayfayı yenileyin.",
   "DE.ApplicationView.txtDownload": "İndir",
-  "DE.ApplicationView.txtDownloadDocx": "docx olarak indir",
-  "DE.ApplicationView.txtDownloadPdf": "Pdf olarak indir",
+  "DE.ApplicationView.txtDownloadDocx": "DOCX olarak indir",
+  "DE.ApplicationView.txtDownloadPdf": "PDF olarak indir",
   "DE.ApplicationView.txtEmbed": "Gömülü",
   "DE.ApplicationView.txtFileLocation": "Dosya konumunu aç",
   "DE.ApplicationView.txtFullScreen": "Tam Ekran",

apps/documenteditor/embed/locale/zh.json

@@ -1,65 +1,67 @@
 {
-  "common.view.modals.txtCopy": "复制到剪切板",
+  "common.view.modals.txtCopy": "复制到剪贴板",
   "common.view.modals.txtEmbed": "嵌入",
   "common.view.modals.txtHeight": "高度",
-  "common.view.modals.txtIncorrectPwd": "密码有误",
-  "common.view.modals.txtOpenFile": "输入密码来打开文件",
+  "common.view.modals.txtIncorrectPwd": "密码错误",
+  "common.view.modals.txtOpenFile": "输入密码以打开文件",
   "common.view.modals.txtShare": "分享链接",
   "common.view.modals.txtTitleProtected": "受保护的文档",
   "common.view.modals.txtWidth": "宽度",
   "common.view.SearchBar.textFind": "查找",
-  "DE.ApplicationController.convertationErrorText": "转换失败",
-  "DE.ApplicationController.convertationTimeoutText": "转换超时",
+  "DE.ApplicationController.convertationErrorText": "转换失败。",
+  "DE.ApplicationController.convertationTimeoutText": "转换超时。",
   "DE.ApplicationController.criticalErrorTitle": "错误",
-  "DE.ApplicationController.downloadErrorText": "下载失败",
+  "DE.ApplicationController.downloadErrorText": "下载失败。",
   "DE.ApplicationController.downloadTextText": "正在下载文件...",
-  "DE.ApplicationController.errorAccessDeny": "您正在尝试执行您没有权限的操作。<br>请联系您的文档服务器管理员.",
+  "DE.ApplicationController.errorAccessDeny": "您正在尝试进行您没有权限的操作。<br>请联系您的文档服务器管理员。",
   "DE.ApplicationController.errorDefaultMessage": "错误代码：%1",
-  "DE.ApplicationController.errorEditingDownloadas": "在处理文档期间发生错误。<br>使用“下载为…”选项将文件备份复制到您的计算机硬盘中。",
-  "DE.ApplicationController.errorFilePassProtect": "该文档受密码保护，无法被打开。",
-  "DE.ApplicationController.errorFileSizeExceed": "文件大小超出了为服务器设置的限制.<br>有关详细信息，请与文档服务器管理员联系。",
-  "DE.ApplicationController.errorForceSave": "保存文件时出错。请使用“下载为”选项将文件保存到计算机硬盘驱动器，或稍后再试。",
-  "DE.ApplicationController.errorInconsistentExt": "打开文件时出错<br>文件内容与文件扩展名不匹配。",
-  "DE.ApplicationController.errorInconsistentExtDocx": "打开文件时出错<br>文件内容对应于文本文档（例如docx），但文件的扩展名不一致：%1。",
-  "DE.ApplicationController.errorInconsistentExtPdf": "在打開檔案時發生錯誤。檔案內容對應以下格式之一：pdf/djvu/xps/oxps，但檔案的副檔名矛盾：%1。",
-  "DE.ApplicationController.errorInconsistentExtPptx": "打开文件时出错<br>文件内容对应于演示文稿（例如pptx），但文件的扩展名不一致：%1。",
-  "DE.ApplicationController.errorInconsistentExtXlsx": "打开文件时出错<br>文件内容对应于电子表格（例如xlsx），但文件的扩展名不一致：%1。",
-  "DE.ApplicationController.errorLoadingFont": "字体未加载<br>请与您的文档服务器管理员联系。",
-  "DE.ApplicationController.errorSubmit": "提交失败",
-  "DE.ApplicationController.errorTokenExpire": "文档安全令牌已过期。<br>请与您的文档服务器管理员联系。",
+  "DE.ApplicationController.errorEditingDownloadas": "文档在处理时发生错误。<br>请使用“下载为...”选项保存文件的备份副本到您的计算机硬盘中。",
+  "DE.ApplicationController.errorFilePassProtect": "该文档受密码保护，无法打开。",
+  "DE.ApplicationController.errorFileSizeExceed": "文件大小超出了服务器设置的限制。<br>请联系您的文档服务器管理员了解详情。",
+  "DE.ApplicationController.errorForceSave": "保存文件时发生错误。请使用“下载为”选项将文件保存到计算机硬盘中或者稍后重试。",
+  "DE.ApplicationController.errorInconsistentExt": "打开文件时发生错误。<br>文件内容与文件扩展名不匹配。",
+  "DE.ApplicationController.errorInconsistentExtDocx": "打开文件时发生错误。<br>文件内容对应的是文本文档 (例如 DOCX)，但文件的扩展名不一致：%1。",
+  "DE.ApplicationController.errorInconsistentExtPdf": "打开文件时发生错误。<br>文件内容对应的是以下格式之一：PDF/DJVU/XPS/OXFS，但文件的扩展名不一致：%1。",
+  "DE.ApplicationController.errorInconsistentExtPptx": "打开文件时发生错误。<br>文件内容对应的是演示文稿 (例如 PPTX)，但文件的扩展名不一致：%1。",
+  "DE.ApplicationController.errorInconsistentExtXlsx": "打开文件时发生错误。<br>文件内容对应的是电子表格 (例如 XLSX)，但文件的扩展名不一致：%1。",
+  "DE.ApplicationController.errorLoadingFont": "字体没有加载。<br>请联系您的文档服务器管理员。",
+  "DE.ApplicationController.errorSubmit": "提交失败。",
+  "DE.ApplicationController.errorTokenExpire": "文档安全令牌已过期。<br>请联系您的文档服务器管理员。",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "网络连接已恢复，文件版本已更改<br>在继续工作之前，您需要下载文件或复制其内容以确保不会丢失任何内容，然后重新加载此页面。",
-  "DE.ApplicationController.errorUserDrop": "该文件现在无法访问。",
+  "DE.ApplicationController.errorUserDrop": "该文件目前无法访问。",
   "DE.ApplicationController.notcriticalErrorTitle": "警告",
-  "DE.ApplicationController.openErrorText": "打開檔案時發生錯誤。",
-  "DE.ApplicationController.scriptLoadError": "连接速度过慢，部分组件无法被加载。请重新加载页面。",
+  "DE.ApplicationController.openErrorText": "打开文件时发生错误。",
+  "DE.ApplicationController.scriptLoadError": "连接速度太慢，部分组件无法加载。请重新加载页面。",
   "DE.ApplicationController.textAnonymous": "匿名",
   "DE.ApplicationController.textClear": "清除所有字段",
+  "DE.ApplicationController.textConvertFormDownload": "下载文件为可填写的 PDF 表单以便进行填写。",
   "DE.ApplicationController.textCtrl": "Ctrl",
-  "DE.ApplicationController.textGotIt": "知道了",
+  "DE.ApplicationController.textDownloadPdf": "下载 PDF",
+  "DE.ApplicationController.textGotIt": "明白",
   "DE.ApplicationController.textGuest": "访客",
-  "DE.ApplicationController.textLoadingDocument": "文件加载中…",
+  "DE.ApplicationController.textLoadingDocument": "正在加载文档",
   "DE.ApplicationController.textNext": "下一个字段",
   "DE.ApplicationController.textOf": "的",
   "DE.ApplicationController.textRequired": "要发送表单，请填写所有必填项目。",
   "DE.ApplicationController.textSubmit": "提交",
   "DE.ApplicationController.textSubmited": "<b>表单提交成功</b><br>点击以关闭提示",
-  "DE.ApplicationController.titleLicenseExp": "许可证过期",
+  "DE.ApplicationController.titleLicenseExp": "许可证已过期",
   "DE.ApplicationController.titleLicenseNotActive": "授权证书未激活",
   "DE.ApplicationController.txtClose": "关闭",
-  "DE.ApplicationController.txtEmpty": "(空白)",
-  "DE.ApplicationController.txtPressLink": "按%1并单击链接",
+  "DE.ApplicationController.txtEmpty": "(空)",
+  "DE.ApplicationController.txtPressLink": "按 %1 并点击链接",
   "DE.ApplicationController.unknownErrorText": "未知错误。",
-  "DE.ApplicationController.unsupportedBrowserErrorText": "您的浏览器不受支持",
+  "DE.ApplicationController.unsupportedBrowserErrorText": "您的浏览器不受支持。",
   "DE.ApplicationController.waitText": "请稍候...",
-  "DE.ApplicationController.warnLicenseBefore": "授权证书未激活。请联系您的管理员。",
+  "DE.ApplicationController.warnLicenseBefore": "许可证未激活。请联系您的管理员。",
   "DE.ApplicationController.warnLicenseExp": "您的许可证已过期。请更新许可证并刷新页面。",
   "DE.ApplicationView.txtDownload": "下载",
-  "DE.ApplicationView.txtDownloadDocx": "导出成docx",
-  "DE.ApplicationView.txtDownloadPdf": "导出成PDF",
+  "DE.ApplicationView.txtDownloadDocx": "下载为 DOCX",
+  "DE.ApplicationView.txtDownloadPdf": "下载为 PDF",
   "DE.ApplicationView.txtEmbed": "嵌入",
   "DE.ApplicationView.txtFileLocation": "打开文件所在位置",
   "DE.ApplicationView.txtFullScreen": "全屏",
   "DE.ApplicationView.txtPrint": "打印",
-  "DE.ApplicationView.txtSearch": "搜索",
+  "DE.ApplicationView.txtSearch": "查找",
   "DE.ApplicationView.txtShare": "分享"
 }

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

@@ -432,6 +432,7 @@ define([
             if (this._state.isDocModified !== isModified) {
                 this._isDocReady && Common.Gateway.setDocumentModified(this.api.isDocumentModified());
             }
+            this.appOptions.canFillForms && this.api.isDocumentModified() && this.requiredTooltip && this.requiredTooltip.hide();
 
             this.updateWindowTitle();
         },
@@ -666,6 +667,31 @@ define([
                     me.api.asc_ClearAllSpecialForms();
                 });
                 me.view.btnSubmit.on('click', function(){
+                    if (!me.api.asc_IsAllRequiredFormsFilled()) {
+                        me.api.asc_MoveToFillingForm(true, true, true);
+                        if (!me.requiredTooltip) {
+                            me.requiredTooltip = new Common.UI.SynchronizeTip({
+                                extCls: 'colored',
+                                placement: 'bottom-left',
+                                target: me.view.btnSubmit.$el,
+                                text: me.textRequired,
+                                showLink: false,
+                                closable: true
+                            });
+                            me.requiredTooltip.on('closeclick', function () {
+                                me.requiredTooltip.hide();
+                            });
+                        }
+                        !me.requiredTooltip.isVisible() && me.requiredTooltip.show();
+
+                        // Common.UI.warning({
+                        //     msg: me.textRequired,
+                        //     callback: function() {
+                        //         me.api.asc_MoveToFillingForm(true, true, true);
+                        //     }
+                        // });
+                        return;
+                    }
                     me.api.asc_SendForm();
                 });
                 me.view.btnDownload.on('click', function(){
@@ -878,8 +904,9 @@ define([
                  this.view.btnSubmit.setDisabled(!_submitFail);
                  this.view.btnSubmit.cmpEl.css("pointer-events", "auto");
                 if (!_submitFail) {
+                    Common.Gateway.submitForm();
                     this.view.btnSubmit.setCaption(this.textFilled);
-                    this.view.btnSubmit.cmpEl.addClass('gray');
+                    this.view.btnSubmit.cmpEl.removeClass('yellow').removeClass('back-color').addClass('gray');
                     if (!this.submitedTooltip) {
                         this.submitedTooltip = new Common.UI.SynchronizeTip({
                             text: this.textSubmitOk,
@@ -1088,8 +1115,10 @@ define([
         },
 
         onFillRequiredFields: function(isFilled) {
-            this.view.btnSubmit.setDisabled(!isFilled);
-            this.view.btnSubmit.cmpEl.css("pointer-events", isFilled ? "auto" : "none");
+            // this.view.btnSubmit.setDisabled(!isFilled);
+            // this.view.btnSubmit.cmpEl.css("pointer-events", isFilled ? "auto" : "none");
+            this.view.btnSubmit.cmpEl.removeClass(isFilled ? 'back-color' : 'yellow').addClass(isFilled ? 'yellow' : 'back-color');
+            isFilled && this.requiredTooltip && this.requiredTooltip.hide();
         },
 
         onProcessMouse: function(data) {
@@ -1783,43 +1812,13 @@ define([
 
             // TODO: add asc_hasRequiredFields to sdk
 
-            if (this.appOptions.canSubmitForms && !this.api.asc_IsAllRequiredFormsFilled()) {
-                this.view.btnSubmit.setDisabled(true);
-                this.view.btnSubmit.cmpEl.css("pointer-events", "none");
-                var sgroup = $('#id-submit-group');
-                if (!Common.localStorage.getItem("de-embed-hide-submittip")) {
-                    var requiredTooltip = new Common.UI.SynchronizeTip({
-                        extCls: 'colored',
-                        placement: 'bottom-left',
-                        target: this.view.btnSubmit.$el,
-                        text: this.textRequired,
-                        showLink: false,
-                        closable: false,
-                        showButton: true,
-                        textButton: this.textGotIt
-                    });
-                    var onclose = function () {
-                        requiredTooltip.hide();
-                        me.api.asc_MoveToFillingForm(true, true, true);
-                        sgroup.attr('data-toggle', 'tooltip');
-                        sgroup.tooltip({
-                            title       : me.textRequired,
-                            placement   : 'bottom'
-                        });
-                    };
-                    requiredTooltip.on('buttonclick', function () {
-                        onclose();
-                        Common.localStorage.setItem("de-embed-hide-submittip", 1);
-                    });
-                    requiredTooltip.on('closeclick', onclose);
-                    requiredTooltip.show();
-                } else {
-                    sgroup.attr('data-toggle', 'tooltip');
-                    sgroup.tooltip({
-                        title       : me.textRequired,
-                        placement   : 'bottom'
-                    });
-                }
+            if (this.appOptions.canSubmitForms) {
+                if (this.api.asc_IsAllRequiredFormsFilled())
+                    this.view.btnSubmit.cmpEl.removeClass('back-color').addClass('yellow');
+                // else {
+                    // this.view.btnSubmit.setDisabled(true);
+                    // this.view.btnSubmit.cmpEl.css("pointer-events", "none");
+                // }
             }
 
             var documentMoveTimer;

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

@@ -281,7 +281,7 @@ define([
                     var variationsArr = [],
                         pluginVisible = false;
                     item.variations.forEach(function(itemVar){
-                        var isSystem = (true === itemVar.isSystem) || (Asc.PluginType.System === itemVar.type);
+                        var isSystem = (true === itemVar.isSystem) || (Asc.PluginType.System === Asc.PluginType.getType(itemVar.type));
                         var visible = (isEdit || itemVar.isViewer && (itemVar.isDisplayedInViewer!==false)) && _.contains(itemVar.EditorsSupport, editor) && !isSystem;
                         if ( visible ) pluginVisible = true;
 

apps/documenteditor/forms/app/view/ApplicationView.js

@@ -148,8 +148,9 @@ define([
             this.btnRedo.render($('#id-btn-redo'));
 
             this.btnSubmit = new Common.UI.Button({
-                cls: 'btn-text-default auto colored yellow margin-left-small margin-right-small',
-                caption: this.textSubmit
+                cls: 'btn-text-default auto colored back-color margin-left-small margin-right-small',
+                caption: this.textSubmit,
+                hint: this.tipSubmit
             });
             this.btnSubmit.render($('#id-submit-group'));
 
@@ -223,7 +224,8 @@ define([
         tipUndo: 'Undo',
         tipRedo: 'Redo',
         textClearField: 'Clear field',
-        textClose: 'Close file'
+        textClose: 'Close file',
+        tipSubmit: 'Submit form'
 
     }, DE.Views.ApplicationView || {}));
 });

apps/documenteditor/forms/index.html

@@ -263,7 +263,7 @@
           </ul>
       </div>
 
-      <div class="toolbar" id="toolbar">
+      <div class="toolbar style-off-tabs" id="toolbar">
           <div class="group left">
               <div class="margin-right-large"><a id="header-logo" class="brand-logo" href="http://www.onlyoffice.com/" target="_blank"></a></div>
               <span id="id-btn-undo" class="margin-right-small big-resolution"></span>

apps/documenteditor/forms/index.html.deploy

@@ -244,7 +244,7 @@
           </ul>
       </div>
 
-      <div class="toolbar" id="toolbar">
+      <div class="toolbar style-off-tabs" id="toolbar">
           <div class="group left">
               <div class="margin-right-large"><a id="header-logo" class="brand-logo" href="http://www.onlyoffice.com/" target="_blank"></a></div>
               <span id="id-btn-undo" class="margin-right-small big-resolution"></span>

apps/documenteditor/forms/locale/de.json

@@ -126,15 +126,17 @@
   "DE.Controllers.ApplicationController.textBuyNow": "Webseite besuchen",
   "DE.Controllers.ApplicationController.textCloseTip": "Klicken Sie hier, um den Tipp zu schließen.",
   "DE.Controllers.ApplicationController.textContactUs": "Verkaufsteam kontaktieren",
+  "DE.Controllers.ApplicationController.textFilled": "Ausgefüllt",
   "DE.Controllers.ApplicationController.textGotIt": "OK",
   "DE.Controllers.ApplicationController.textGuest": "Gast",
   "DE.Controllers.ApplicationController.textLoadingDocument": "Dokument wird geladen...",
   "DE.Controllers.ApplicationController.textNoLicenseTitle": "Lizenzlimit erreicht",
   "DE.Controllers.ApplicationController.textOf": "von",
-  "DE.Controllers.ApplicationController.textRequired": "Füllen Sie alle erforderlichen Felder aus, um das Formular zu senden.",
+  "DE.Controllers.ApplicationController.textRequired": "Füllen Sie alle erforderlichen Felder aus, um das Formular abzusenden.",
   "DE.Controllers.ApplicationController.textSaveAs": "Als PDF speichern",
   "DE.Controllers.ApplicationController.textSaveAsDesktop": "Speichern als...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Das Formular wurde erfolgreich abgesendet</b><br>Klicken Sie hier, um den Tipp auszublenden",
+  "DE.Controllers.ApplicationController.textSubmitOk": "Ihr PDF-Formular wurde im Abschnitt \"Fertiggestellt\" gespeichert.",
   "DE.Controllers.ApplicationController.titleLicenseExp": "Lizenz ist abgelaufen",
   "DE.Controllers.ApplicationController.titleLicenseNotActive": "Lizenz nicht aktiv",
   "DE.Controllers.ApplicationController.titleServerVersion": "Editor wurde aktualisiert",
@@ -163,6 +165,7 @@
   "DE.Controllers.ApplicationController.warnNoLicenseUsers": "Sie haben das Benutzerlimit für %1-Editoren erreicht. Bitte kontaktieren Sie unser Verkaufsteam, um persönliche Upgrade-Bedingungen zu erhalten.",
   "DE.Views.ApplicationView.textClear": "Alle Felder leeren",
   "DE.Views.ApplicationView.textClearField": "Feld leeren",
+  "DE.Views.ApplicationView.textClose": "Datei schließen",
   "DE.Views.ApplicationView.textCopy": "Kopieren",
   "DE.Views.ApplicationView.textCut": "Ausschneiden",
   "DE.Views.ApplicationView.textFitToPage": "Seite anpassen",
@@ -171,7 +174,7 @@
   "DE.Views.ApplicationView.textPaste": "Einfügen",
   "DE.Views.ApplicationView.textPrintSel": "Auswahl drucken",
   "DE.Views.ApplicationView.textRedo": "Wiederholen",
-  "DE.Views.ApplicationView.textSubmit": "Senden",
+  "DE.Views.ApplicationView.textSubmit": "Ausfüllen & Absenden",
   "DE.Views.ApplicationView.textUndo": "Rückgängig machen",
   "DE.Views.ApplicationView.textZoom": "Zoom",
   "DE.Views.ApplicationView.tipRedo": "Wiederholen",

apps/documenteditor/forms/locale/el.json

@@ -126,6 +126,7 @@
   "DE.Controllers.ApplicationController.textBuyNow": "Επισκεφθείτε την ιστοσελίδα",
   "DE.Controllers.ApplicationController.textCloseTip": "Κάντε κλικ να κλείσετε τη συμβουλή.",
   "DE.Controllers.ApplicationController.textContactUs": "Επικοινωνήστε με το τμήμα πωλήσεων",
+  "DE.Controllers.ApplicationController.textFilled": "Συμπληρωμένο",
   "DE.Controllers.ApplicationController.textGotIt": "Ελήφθη",
   "DE.Controllers.ApplicationController.textGuest": "Επισκέπτης",
   "DE.Controllers.ApplicationController.textLoadingDocument": "Φόρτωση εγγράφου",
@@ -135,6 +136,7 @@
   "DE.Controllers.ApplicationController.textSaveAs": "Αποθήκευση ως PDF",
   "DE.Controllers.ApplicationController.textSaveAsDesktop": "Αποθήκευση ως...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Η φόρμα υποβλήθηκε με επιτυχία</b><br>Κάντε κλικ για να κλείσετε τη συμβουλή ",
+  "DE.Controllers.ApplicationController.textSubmitOk": "Η φόρμα PDF έχει αποθηκευτεί στην ενότητα Ολοκληρωμένα.",
   "DE.Controllers.ApplicationController.titleLicenseExp": "Η άδεια έχει λήξει",
   "DE.Controllers.ApplicationController.titleLicenseNotActive": "Η άδεια δεν είναι ενεργή",
   "DE.Controllers.ApplicationController.titleServerVersion": "Ο συντάκτης ενημερώθηκε",
@@ -163,6 +165,7 @@
   "DE.Controllers.ApplicationController.warnNoLicenseUsers": "Έχετε φτάσει το όριο χρήστη για συντάκτες %1.<br>Επικοινωνήστε με την ομάδα πωλήσεων %1 για προσωπικούς όρους αναβάθμισης.",
   "DE.Views.ApplicationView.textClear": "Εκκαθάριση όλων των πεδίων",
   "DE.Views.ApplicationView.textClearField": "Καθαρίστε το πεδίο",
+  "DE.Views.ApplicationView.textClose": "Κλείσιμο αρχείου",
   "DE.Views.ApplicationView.textCopy": "Αντιγραφή",
   "DE.Views.ApplicationView.textCut": "Αποκοπή",
   "DE.Views.ApplicationView.textFitToPage": "Προσαρμογή στη σελίδα",
@@ -184,7 +187,7 @@
   "DE.Views.ApplicationView.txtFileLocation": "Άνοιγμα θέσης αρχείου",
   "DE.Views.ApplicationView.txtFullScreen": "Πλήρης οθόνη",
   "DE.Views.ApplicationView.txtPrint": "Εκτύπωση",
-  "DE.Views.ApplicationView.txtSearch": "Αναζήτηση",
+  "DE.Views.ApplicationView.txtSearch": "Εύρεση",
   "DE.Views.ApplicationView.txtShare": "Διαμοιρασμός",
   "DE.Views.ApplicationView.txtTheme": "Θέμα διεπαφής"
 }

apps/documenteditor/forms/locale/en.json

@@ -33,7 +33,7 @@
   "Common.UI.Calendar.textShortWednesday": "We",
   "Common.UI.Calendar.textYears": "Years",
   "Common.UI.SearchBar.textFind": "Find",
-  "Common.UI.SearchBar.tipCloseSearch": "Close search",
+  "Common.UI.SearchBar.tipCloseSearch": "Close find",
   "Common.UI.SearchBar.tipNextResult": "Next result",
   "Common.UI.SearchBar.tipPreviousResult": "Previous result",
   "Common.UI.Themes.txtThemeClassicLight": "Classic light",
@@ -132,11 +132,11 @@
   "DE.Controllers.ApplicationController.textLoadingDocument": "Loading document",
   "DE.Controllers.ApplicationController.textNoLicenseTitle": "License limit reached",
   "DE.Controllers.ApplicationController.textOf": "of",
-  "DE.Controllers.ApplicationController.textRequired": "Fill all required fields to send form.",
+  "DE.Controllers.ApplicationController.textRequired": "To submit the form, you must fill in all required fields",
   "DE.Controllers.ApplicationController.textSaveAs": "Save as PDF",
   "DE.Controllers.ApplicationController.textSaveAsDesktop": "Save as...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Form submitted successfully</b><br>Click to close the tip",
-  "DE.Controllers.ApplicationController.textSubmitOk": "Your PDF form has been saved in the Complete section. You can fill out this form again and send another result.",
+  "DE.Controllers.ApplicationController.textSubmitOk": "Your PDF form has been saved in the Complete section.",
   "DE.Controllers.ApplicationController.titleLicenseExp": "License expired",
   "DE.Controllers.ApplicationController.titleLicenseNotActive": "License not active",
   "DE.Controllers.ApplicationController.titleServerVersion": "Editor updated",
@@ -174,10 +174,11 @@
   "DE.Views.ApplicationView.textPaste": "Paste",
   "DE.Views.ApplicationView.textPrintSel": "Print selection",
   "DE.Views.ApplicationView.textRedo": "Redo",
-  "DE.Views.ApplicationView.textSubmit": "Submit",
+  "DE.Views.ApplicationView.textSubmit": "Complete & Submit",
   "DE.Views.ApplicationView.textUndo": "Undo",
   "DE.Views.ApplicationView.textZoom": "Zoom",
   "DE.Views.ApplicationView.tipRedo": "Redo",
+  "DE.Views.ApplicationView.tipSubmit": "Submit form",
   "DE.Views.ApplicationView.tipUndo": "Undo",
   "DE.Views.ApplicationView.txtDarkMode": "Dark mode",
   "DE.Views.ApplicationView.txtDownload": "Download",

apps/documenteditor/forms/locale/fr.json

@@ -136,7 +136,7 @@
   "DE.Controllers.ApplicationController.textSaveAs": "Enregistrer comme PDF",
   "DE.Controllers.ApplicationController.textSaveAsDesktop": "Enregistrer sous...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Le formulaire a été soumis avec succès</b><br>Cliquez ici pour fermer l'astuce",
-  "DE.Controllers.ApplicationController.textSubmitOk": "Votre formulaire PDF a été sauvegardé dans la section Terminés. Vous pouvez remplir à nouveau ce formulaire et envoyer un autre formulaire résultant.",
+  "DE.Controllers.ApplicationController.textSubmitOk": "Votre formulaire PDF a été sauvegardé dans la section Terminés.",
   "DE.Controllers.ApplicationController.titleLicenseExp": "Licence expirée",
   "DE.Controllers.ApplicationController.titleLicenseNotActive": "Licence non active",
   "DE.Controllers.ApplicationController.titleServerVersion": "L'éditeur est mis à jour",

apps/documenteditor/forms/locale/ja.json

@@ -136,7 +136,7 @@
   "DE.Controllers.ApplicationController.textSaveAs": "PDFとして保存",
   "DE.Controllers.ApplicationController.textSaveAsDesktop": "名前を付けて保存",
   "DE.Controllers.ApplicationController.textSubmited": "<b>フォームが正常に送信されました。</b><br>クリックしてヒントを閉じます。",
-  "DE.Controllers.ApplicationController.textSubmitOk": "PDFフォームが「完成」セクションに保存されました。このフォームに再度記入して、別の結果を送信することができます。",
+  "DE.Controllers.ApplicationController.textSubmitOk": "PDFフォームが「完成」セクションに保存されました。",
   "DE.Controllers.ApplicationController.titleLicenseExp": "ライセンスの有効期限が切れています",
   "DE.Controllers.ApplicationController.titleLicenseNotActive": "ライセンスが無効になっています",
   "DE.Controllers.ApplicationController.titleServerVersion": "編集者が更新されました",

apps/documenteditor/forms/locale/ko.json

@@ -113,7 +113,7 @@
   "DE.Controllers.ApplicationController.errorUpdateVersion": "파일 버전이 변경되었습니다. 페이지가 다시로드됩니다.",
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "네트워크 연결이 복원되었으며 파일 버전이 변경되었습니다. <br>계속 작업하기 전에 데이터 손실을 방지하기 위해 파일을 다운로드하거나 내용을 복사한 다음 이 페이지를 새로 고쳐야 합니다.",
   "DE.Controllers.ApplicationController.errorUserDrop": "파일에 지금 액세스 할 수 없습니다.",
-  "DE.Controllers.ApplicationController.errorViewerDisconnect": "연결이 끊어졌습니다. 문서를 볼 수는 <br> <br>하지만 연결이 복원 될 때까지 다운로드하거나 인쇄 할 수 없습니다.",
+  "DE.Controllers.ApplicationController.errorViewerDisconnect": "연결이 끊어졌습니다. 문서를 계속 볼 수 있지만,<br>연결이 복원되고 페이지가 다시 로드 될 때까지 문서를 다운로드하거나 인쇄할 수 없습니다.",
   "DE.Controllers.ApplicationController.mniImageFromFile": "그림 파일에서",
   "DE.Controllers.ApplicationController.mniImageFromStorage": "스토리지에서 불러오기",
   "DE.Controllers.ApplicationController.mniImageFromUrl": "URL에서 불러오기",

apps/documenteditor/forms/locale/pt.json

@@ -136,7 +136,7 @@
   "DE.Controllers.ApplicationController.textSaveAs": "Salvar como PDF",
   "DE.Controllers.ApplicationController.textSaveAsDesktop": "Salvar como...",
   "DE.Controllers.ApplicationController.textSubmited": "<b> Formulário enviado com sucesso </b> <br> Clique para fechar a dica",
-  "DE.Controllers.ApplicationController.textSubmitOk": "Seu formulário PDF foi salvo na seção Completo. Você pode preencher este formulário novamente e enviar outro resultado.",
+  "DE.Controllers.ApplicationController.textSubmitOk": "Seu formulário PDF foi salvo na seção Completo.",
   "DE.Controllers.ApplicationController.titleLicenseExp": "A licença expirou",
   "DE.Controllers.ApplicationController.titleLicenseNotActive": "Licença inativa",
   "DE.Controllers.ApplicationController.titleServerVersion": "Editor atualizado",

apps/documenteditor/forms/locale/ro.json

@@ -136,7 +136,7 @@
   "DE.Controllers.ApplicationController.textSaveAs": "Salvare ca PDF",
   "DE.Controllers.ApplicationController.textSaveAsDesktop": "Salvare ca...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Formularul a fost trimis cu succes</b><br>Faceţi clic pentru a închide sfatul",
-  "DE.Controllers.ApplicationController.textSubmitOk": "Formularul dvs. PDF a fost salvat în secțiunea Finalizate. Puteți completa acest formular din nou și îl puteți trimite ca un alt rezultat.",
+  "DE.Controllers.ApplicationController.textSubmitOk": "Formularul dvs. PDF a fost salvat în secțiunea Finalizate.",
   "DE.Controllers.ApplicationController.titleLicenseExp": "Licența a expirat",
   "DE.Controllers.ApplicationController.titleLicenseNotActive": "Licența nu este activă",
   "DE.Controllers.ApplicationController.titleServerVersion": "Editorul a fost actualizat",

apps/documenteditor/forms/locale/ru.json

@@ -132,11 +132,11 @@
   "DE.Controllers.ApplicationController.textLoadingDocument": "Загрузка документа",
   "DE.Controllers.ApplicationController.textNoLicenseTitle": "Лицензионное ограничение",
   "DE.Controllers.ApplicationController.textOf": "из",
-  "DE.Controllers.ApplicationController.textRequired": "Заполните все обязательные поля для отправки формы.",
+  "DE.Controllers.ApplicationController.textRequired": "Чтобы отправить форму, заполните все обязательные поля",
   "DE.Controllers.ApplicationController.textSaveAs": "Сохранить как PDF",
   "DE.Controllers.ApplicationController.textSaveAsDesktop": "Сохранить как...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Форма успешно отправлена</b><br>Нажмите, чтобы закрыть подсказку",
-  "DE.Controllers.ApplicationController.textSubmitOk": "Ваша PDF-форма сохранена в разделе \"Завершено\". Вы можете заполнить эту форму еще раз и отправить другой результат.",
+  "DE.Controllers.ApplicationController.textSubmitOk": "Ваша PDF-форма сохранена в разделе \"Завершено\".",
   "DE.Controllers.ApplicationController.titleLicenseExp": "Истек срок действия лицензии",
   "DE.Controllers.ApplicationController.titleLicenseNotActive": "Лицензия неактивна",
   "DE.Controllers.ApplicationController.titleServerVersion": "Редактор обновлен",
@@ -174,7 +174,7 @@
   "DE.Views.ApplicationView.textPaste": "Вставить",
   "DE.Views.ApplicationView.textPrintSel": "Напечатать выделенное",
   "DE.Views.ApplicationView.textRedo": "Повторить",
-  "DE.Views.ApplicationView.textSubmit": "Отправить",
+  "DE.Views.ApplicationView.textSubmit": "Заполнить и отправить",
   "DE.Views.ApplicationView.textUndo": "Отменить",
   "DE.Views.ApplicationView.textZoom": "Масштаб",
   "DE.Views.ApplicationView.tipRedo": "Повторить",

apps/documenteditor/forms/locale/si.json

@@ -126,6 +126,7 @@
   "DE.Controllers.ApplicationController.textBuyNow": "අඩවියට ගොඩවෙන්න",
   "DE.Controllers.ApplicationController.textCloseTip": "ඉඟිය වැසීමට ඔබන්න.",
   "DE.Controllers.ApplicationController.textContactUs": "අලෙවිය අමතන්න",
+  "DE.Controllers.ApplicationController.textFilled": "පුරවා ඇත",
   "DE.Controllers.ApplicationController.textGotIt": "තේරුණා",
   "DE.Controllers.ApplicationController.textGuest": "අමුත්තා",
   "DE.Controllers.ApplicationController.textLoadingDocument": "ලේඛනය පූරණය වෙමින්",
@@ -135,6 +136,7 @@
   "DE.Controllers.ApplicationController.textSaveAs": "පීඩීඑෆ් ලෙස සුරකින්න",
   "DE.Controllers.ApplicationController.textSaveAsDesktop": "මෙලෙස සුරකින්න",
   "DE.Controllers.ApplicationController.textSubmited": "<b>ආකෘතිපත්‍රය සාර්ථකව යොමු කෙරිණි</b><br>ඉඟිය වැසීමට ඔබන්න",
+  "DE.Controllers.ApplicationController.textSubmitOk": "සම්පූර්ණ කොටසේ ඔබගේ පීඩීඑෆ් ආකෘතිපත්‍රය සුරැකී ඇත.",
   "DE.Controllers.ApplicationController.titleLicenseExp": "බලපත්‍රය කල් ඉකුත්ය",
   "DE.Controllers.ApplicationController.titleLicenseNotActive": "බලපත්‍රය සක්‍රිය නැත",
   "DE.Controllers.ApplicationController.titleServerVersion": "සංස්කරකය යාවත්කාල විය",
@@ -163,6 +165,7 @@
   "DE.Controllers.ApplicationController.warnNoLicenseUsers": "ඔබ %1 සංස්කරකවල පරිශ්‍රීලක සීමාවට ළඟා වී ඇත. පුද්ගලික උත්ශ්‍රේණි නියම සඳහා %1 අලෙවි කණ්ඩායම අමතන්න.",
   "DE.Views.ApplicationView.textClear": "සියළු ක්‍ෂේත්‍ර හිස්කරන්න",
   "DE.Views.ApplicationView.textClearField": "ක්‍ෂේත්‍රය මකන්න",
+  "DE.Views.ApplicationView.textClose": "ගොනුව වසන්න",
   "DE.Views.ApplicationView.textCopy": "පිටපතක්",
   "DE.Views.ApplicationView.textCut": "කපන්න",
   "DE.Views.ApplicationView.textFitToPage": "පිටුවට ගළපන්න",

apps/documenteditor/forms/locale/sl.json

@@ -8,6 +8,7 @@
   "Common.UI.Calendar.textJune": "junij",
   "Common.UI.Calendar.textMarch": "marec",
   "Common.UI.Calendar.textMay": "maj",
+  "Common.UI.Calendar.textMonths": "meseci",
   "Common.UI.Calendar.textNovember": "november",
   "Common.UI.Calendar.textOctober": "Oktober",
   "Common.UI.Calendar.textSeptember": "september",
@@ -15,29 +16,69 @@
   "Common.UI.Calendar.textShortAugust": "avg",
   "Common.UI.Calendar.textShortDecember": "dec",
   "Common.UI.Calendar.textShortFebruary": "feb",
+  "Common.UI.Calendar.textShortFriday": "Pe",
   "Common.UI.Calendar.textShortJanuary": "jan",
   "Common.UI.Calendar.textShortJuly": "jul",
   "Common.UI.Calendar.textShortJune": "jun",
   "Common.UI.Calendar.textShortMarch": "mar",
   "Common.UI.Calendar.textShortMay": "maj",
+  "Common.UI.Calendar.textShortMonday": "Po",
   "Common.UI.Calendar.textShortNovember": "nov",
   "Common.UI.Calendar.textShortOctober": "okt",
+  "Common.UI.Calendar.textShortSaturday": "So",
   "Common.UI.Calendar.textShortSeptember": "sep",
+  "Common.UI.Calendar.textShortSunday": "Ne",
+  "Common.UI.Calendar.textShortThursday": "Če",
+  "Common.UI.Calendar.textShortTuesday": "To",
+  "Common.UI.Calendar.textShortWednesday": "Sr",
+  "Common.UI.Calendar.textYears": "leta",
+  "Common.UI.SearchBar.textFind": "Iskanje",
   "Common.UI.SearchBar.tipCloseSearch": "Zapri iskanje",
+  "Common.UI.SearchBar.tipNextResult": "Naslednji rezultat",
+  "Common.UI.SearchBar.tipPreviousResult": "Prejšnji rezultat",
   "Common.UI.Themes.txtThemeClassicLight": "Klasično svetlo",
   "Common.UI.Themes.txtThemeContrastDark": "Kontrastno temno",
   "Common.UI.Themes.txtThemeDark": "Temno",
+  "Common.UI.Themes.txtThemeLight": "Svetlo",
+  "Common.UI.Themes.txtThemeSystem": "Enako kot sistem",
   "Common.UI.Window.cancelButtonText": "Prekini",
   "Common.UI.Window.closeButtonText": "Zapri",
+  "Common.UI.Window.noButtonText": "Ne",
+  "Common.UI.Window.okButtonText": "V redu",
   "Common.UI.Window.textConfirmation": "Potrditev",
   "Common.UI.Window.textDontShow": "Tega sporočila ne prikaži več",
+  "Common.UI.Window.textError": "Napaka",
+  "Common.UI.Window.textInformation": "Podatki",
+  "Common.UI.Window.textWarning": "Opozorilo",
+  "Common.UI.Window.yesButtonText": "Da",
   "Common.Views.CopyWarningDialog.textDontShow": "Tega sporočila ne prikaži več",
   "Common.Views.CopyWarningDialog.textMsg": "Dejanja kopiranja, izrezovanja in lepljenja izbrana iz kontekstualnega menija bodo uporabljena le na tem zavihku urejevalnika.<br><br>Za kopiranje ali lepljenje v ali iz programov zunaj zavihka urejevalnika uporabite naslednje kombinacije tipk:",
   "Common.Views.CopyWarningDialog.textTitle": "Dejanja kopiranja, izrezovanja in lepljenja",
+  "Common.Views.CopyWarningDialog.textToCopy": "za kopiranje",
+  "Common.Views.CopyWarningDialog.textToCut": "za izrez",
+  "Common.Views.CopyWarningDialog.textToPaste": "za lepljenje",
+  "Common.Views.EmbedDialog.textHeight": "Višina",
+  "Common.Views.EmbedDialog.textTitle": "Vdelaj",
+  "Common.Views.EmbedDialog.textWidth": "Širina",
   "Common.Views.EmbedDialog.txtCopy": "Kopiraj v odložišče",
   "Common.Views.EmbedDialog.warnCopy": "Napaka brskalnika! Uporabite kombinacijo tipk [ctrl]+[C]",
+  "Common.Views.ImageFromUrlDialog.textUrl": "Prilepi URL slike:",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "To polje je obvezno",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "To polje mora biti URL naslov oblike \"http://www.example.com\"",
   "Common.Views.OpenDialog.closeButtonText": "Zapri datoteko",
+  "Common.Views.OpenDialog.txtEncoding": "Kodiranje",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "Nepravilno geslo",
+  "Common.Views.OpenDialog.txtOpenFile": "Vnesite geslo za odpiranje datoteke",
+  "Common.Views.OpenDialog.txtPassword": "Geslo",
+  "Common.Views.OpenDialog.txtPreview": "Predogled",
+  "Common.Views.OpenDialog.txtProtected": "Ko vnesete geslo",
   "Common.Views.OpenDialog.txtTitle": "Izberite %1 možnosti",
+  "Common.Views.OpenDialog.txtTitleProtected": "Zaščitena datoteka",
+  "Common.Views.SaveAsDlg.textLoading": "Nalaganje",
+  "Common.Views.SaveAsDlg.textTitle": "Mapa za shranjevanje",
+  "Common.Views.SelectFileDlg.textLoading": "Nalaganje",
+  "Common.Views.SelectFileDlg.textTitle": "Izberite vir podatkov",
+  "Common.Views.ShareDialog.textTitle": "Deli povezavo",
   "Common.Views.ShareDialog.txtCopy": "Kopiraj v odložišče",
   "Common.Views.ShareDialog.warnCopy": "Napaka brskalnika! Uporabite kombinacijo tipk [ctrl]+[C]",
   "DE.Controllers.ApplicationController.convertationErrorText": "Pogovor ni uspel.",
@@ -46,6 +87,9 @@
   "DE.Controllers.ApplicationController.downloadErrorText": "Prenos ni uspel.",
   "DE.Controllers.ApplicationController.downloadTextText": "Prenašanje dokumenta ...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "Poskušate izvesti dejanje, za katerega nimate pravic. <br> Obrnite se na skrbnika strežnika dokumentov.",
+  "DE.Controllers.ApplicationController.errorBadImageUrl": "Napačen naslov slike",
+  "DE.Controllers.ApplicationController.errorConnectToServer": "Dokumenta ni bilo mogoče shraniti. Preverite nastavitve povezave ali se obrnite na skrbnika. <br> Ko kliknete na gumb »V redu«, boste pozvani k prenosu dokumenta.",
+  "DE.Controllers.ApplicationController.errorDataEncrypted": "Prejete spremembe so šifrirane in jih ni mogoče dešifrirati.",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "Koda napake: %1",
   "DE.Controllers.ApplicationController.errorEditingDownloadas": "Med delom z dokumentom je prišlo do napake.<br>S funkcijo »Prenesi kot ...« shranite varnostno kopijo datoteke na trdi disk računalnika.",
   "DE.Controllers.ApplicationController.errorEditingSaveas": "Pri delu z dokumentom je prišlo do napake.<br>Uporabite možnost 'Shrani kot...', da shranite varnostno kopijo datoteke na disk računalnika.",
@@ -57,36 +101,84 @@
   "DE.Controllers.ApplicationController.errorInconsistentExtPdf": "Med odpiranjem datoteke je prišlo do napake.<br>Vsebina datoteke ustreza enemu od naslednjih formatov: pdf/djvu/xps/oxps, vendar ima datoteka nedosledno končnico: %1.",
   "DE.Controllers.ApplicationController.errorInconsistentExtPptx": "Med odpiranjem datoteke je prišlo do napake.<br>Vsebina datoteke ustreza predstavitvam (npr. pptx), vendar ima datoteka nedosledno končnico: %1.",
   "DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "Med odpiranjem datoteke je prišlo do napake.<br>Vsebina datoteke ustreza preglednicam (npr. xlsx), vendar ima datoteka nedosledno končnico: %1.",
+  "DE.Controllers.ApplicationController.errorLoadingFont": "Pisave niso naložene.<br>Obrnite se na skrbnika strežnika dokumentov.",
+  "DE.Controllers.ApplicationController.errorServerVersion": "Različica urejevalnika je bila posodobljena. Stran bo ponovno naložena, da se bodo spremembe uveljavile.",
+  "DE.Controllers.ApplicationController.errorSessionAbsolute": "Seja urejanja dokumenta je potekla. Ponovno naložite stran.",
+  "DE.Controllers.ApplicationController.errorSessionIdle": "Dokumenta se že dolgo ni urejalo. Ponovno naložite stran.",
+  "DE.Controllers.ApplicationController.errorSessionToken": "Povezava s strežnikom je bila prekinjena. Ponovno naložite stran.",
   "DE.Controllers.ApplicationController.errorSubmit": "Pošiljanje je spodletelo",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "Vnesena vrednost ne ustreza formatu polja.",
+  "DE.Controllers.ApplicationController.errorToken": "Varnostni žeton dokumenta nima pravilne oblike.<br>Obrnite se na skrbnika strežnika dokumentov.",
+  "DE.Controllers.ApplicationController.errorTokenExpire": "Varnostni žeton dokumenta je potekel.<br>Obrnite se na skrbnika strežnika dokumentov.",
+  "DE.Controllers.ApplicationController.errorUpdateVersion": "Različica datoteke je bila spremenjena. Stran bo osvežena.",
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Povezava s spletom je bila obnovljena in spremenjena je različica datoteke. <br> Preden nadaljujete z delom, morate datoteko prenesti ali kopirati njeno vsebino, da se prepričate, da se nič ne izgubi, in nato znova naložite to stran.",
   "DE.Controllers.ApplicationController.errorUserDrop": "Do datoteke v tem trenutku ni možno dostopati.",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "Povezava je prekinjena. Dokument lahko še vedno pregledujete.<br>Do ponovne vzpostavitve povezave ga ni mogoče preneseti ali natisniti. ",
+  "DE.Controllers.ApplicationController.mniImageFromFile": "Slika iz datoteke",
+  "DE.Controllers.ApplicationController.mniImageFromStorage": "Slika iz shrambe",
+  "DE.Controllers.ApplicationController.mniImageFromUrl": "Slika z URL naslova",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Opozorilo",
   "DE.Controllers.ApplicationController.openErrorText": "Prišlo je do težave med odpiranjem datoteke.",
   "DE.Controllers.ApplicationController.saveErrorText": "Prišlo je do težave med shranjevanjem datoteke.",
+  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "Datoteke ni mogoče shraniti ali ustvariti.<br>Možni razlogi so: <br>1. Datoteka je zgolj bralna. <br>2. Datoteko ureja drug uporabnik. <br>3. Disk je poln ali okvarjen.",
   "DE.Controllers.ApplicationController.scriptLoadError": "Povezava je počasna, nekatere komponente niso pravilno naložene.Prosimo osvežite stran.",
   "DE.Controllers.ApplicationController.textAnonymous": "Anonimno",
+  "DE.Controllers.ApplicationController.textBuyNow": "Obišči spletno stran",
   "DE.Controllers.ApplicationController.textCloseTip": "Kliknite za zaprtje namiga.",
   "DE.Controllers.ApplicationController.textContactUs": "Stopite v stik s prodajo",
+  "DE.Controllers.ApplicationController.textFilled": "Izpolnjeno",
+  "DE.Controllers.ApplicationController.textGotIt": "Razumem",
+  "DE.Controllers.ApplicationController.textGuest": "Gost",
   "DE.Controllers.ApplicationController.textLoadingDocument": "Nalaganje dokumenta",
+  "DE.Controllers.ApplicationController.textNoLicenseTitle": "Omejitev licenc je bila dosežena",
   "DE.Controllers.ApplicationController.textOf": "od",
+  "DE.Controllers.ApplicationController.textRequired": "Za pošiljanje obrazca izpolnite vsa potrebna polja.",
   "DE.Controllers.ApplicationController.textSaveAs": "Shrani kot PDF",
+  "DE.Controllers.ApplicationController.textSaveAsDesktop": "Shrani kot...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Obrazec poslan uspešno</b><br>Pritisnite tukaj za zaprtje obvestila",
+  "DE.Controllers.ApplicationController.textSubmitOk": "PDF obrazec je bil shranjen v razdelek Dokončano.",
+  "DE.Controllers.ApplicationController.titleLicenseExp": "Licenca je potekla",
+  "DE.Controllers.ApplicationController.titleLicenseNotActive": "Licenca ni aktivna",
   "DE.Controllers.ApplicationController.titleServerVersion": "Urejevalnik je bil posodobljen",
+  "DE.Controllers.ApplicationController.titleUpdateVersion": "Spremenjena različica",
+  "DE.Controllers.ApplicationController.txtArt": "Vaše besedilo",
   "DE.Controllers.ApplicationController.txtChoose": "Izberite predmet",
   "DE.Controllers.ApplicationController.txtClickToLoad": "Kliknite za nalaganje slike",
   "DE.Controllers.ApplicationController.txtClose": "Zapri",
   "DE.Controllers.ApplicationController.txtEmpty": "(Prazno)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "Vnesite datum",
+  "DE.Controllers.ApplicationController.txtPressLink": "Pritisnite CTRL in kliknite na povezavo",
+  "DE.Controllers.ApplicationController.txtUntitled": "Neimenovano",
   "DE.Controllers.ApplicationController.unknownErrorText": "Neznana napaka.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "Vaš brskalnik ni podprt.",
+  "DE.Controllers.ApplicationController.uploadImageExtMessage": "Neznani format slike.",
+  "DE.Controllers.ApplicationController.uploadImageSizeMessage": "Slika je prevelika. Omejitev velikosti je 25 MB.",
   "DE.Controllers.ApplicationController.waitText": "Prosimo počakajte ...",
   "DE.Controllers.ApplicationController.warnLicenseAnonymous": "Dostop je onemogočen za anonimne uporabnike.<br>Ta dokument se bo odprl zgolj za pregled.",
+  "DE.Controllers.ApplicationController.warnLicenseBefore": "Licenca ni aktivna.<br>Obrnite se na skrbnika.",
+  "DE.Controllers.ApplicationController.warnLicenseExceeded": "Dosegli ste omejitev hkratnih povezav z urejevalniki (%1 povezav). Ta dokument bo na voljo samo za ogled. <br> Za več podatkov se obrnite na skrbnika.",
+  "DE.Controllers.ApplicationController.warnLicenseExp": "Licenca je potekla.<br>Posodobite jo in osvežite stran.",
+  "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "Licenca j epotekla.<br>Nmate dostopa do funkciji urejanja dokumenta.<br>Obrnite se na skrbnika.",
+  "DE.Controllers.ApplicationController.warnLicenseLimitedRenewed": "Licenco je potrebno obnoviti.<br>Vaš dostop do funkciji urejanja je omejen.<br>Obrnite se na skrbnika za polni dostop",
+  "DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "Dosegli ste omejitev uporabnikov za urejevalnike (%1 uporabnikov). Za več podatkov se obrnite na skrbnika.",
+  "DE.Controllers.ApplicationController.warnNoLicense": "Dosegli ste omejitev hkratnih povezav z urejevalniki (%1 povezav). Ta dokument bo na voljo samo za ogled. <br> Za možnosti osebne nadgradnje se obrnite na prodajno ekipo %1.",
+  "DE.Controllers.ApplicationController.warnNoLicenseUsers": "Dosegli ste omejitev uporabnikov za urejevalnike (%1 uporabnikov). Za možnosti osebne nadgradnje se obrnite na prodajno ekipo %1.",
   "DE.Views.ApplicationView.textClear": "Počisti vsa polja",
   "DE.Views.ApplicationView.textClearField": "Počisti polje",
   "DE.Views.ApplicationView.textClose": "Zapri datoteko",
   "DE.Views.ApplicationView.textCopy": "Kopiraj",
   "DE.Views.ApplicationView.textCut": "Izreži",
+  "DE.Views.ApplicationView.textFitToPage": "Prilagodi strani",
+  "DE.Views.ApplicationView.textFitToWidth": "Prilagodi širini",
   "DE.Views.ApplicationView.textNext": "Naslednje polje",
+  "DE.Views.ApplicationView.textPaste": "Prilepi",
+  "DE.Views.ApplicationView.textPrintSel": "Nastisni izbor",
+  "DE.Views.ApplicationView.textRedo": "Uveljavi",
+  "DE.Views.ApplicationView.textSubmit": "Posreduj",
+  "DE.Views.ApplicationView.textUndo": "Razveljavi",
+  "DE.Views.ApplicationView.textZoom": "Povečava",
+  "DE.Views.ApplicationView.tipRedo": "Uveljavi",
+  "DE.Views.ApplicationView.tipUndo": "Razveljavi",
   "DE.Views.ApplicationView.txtDarkMode": "Temni način",
   "DE.Views.ApplicationView.txtDownload": "Prenesi",
   "DE.Views.ApplicationView.txtDownloadDocx": "Prenesi kot DOCX",
@@ -95,5 +187,7 @@
   "DE.Views.ApplicationView.txtFileLocation": "Odpri lokacijo dokumenta",
   "DE.Views.ApplicationView.txtFullScreen": "Celozaslonski",
   "DE.Views.ApplicationView.txtPrint": "Natisni",
-  "DE.Views.ApplicationView.txtShare": "Deli"
+  "DE.Views.ApplicationView.txtSearch": "Iskanje",
+  "DE.Views.ApplicationView.txtShare": "Deli",
+  "DE.Views.ApplicationView.txtTheme": "Tema vmesnika"
 }

apps/documenteditor/forms/locale/sr-cyrl.json

@@ -0,0 +1,193 @@
+{
+  "Common.UI.Calendar.textApril": "Април",
+  "Common.UI.Calendar.textAugust": "Август",
+  "Common.UI.Calendar.textDecember": "Децембар",
+  "Common.UI.Calendar.textFebruary": "Фебруар",
+  "Common.UI.Calendar.textJanuary": "Јануар",
+  "Common.UI.Calendar.textJuly": "Јул",
+  "Common.UI.Calendar.textJune": "Јун",
+  "Common.UI.Calendar.textMarch": "Март",
+  "Common.UI.Calendar.textMay": "Мај",
+  "Common.UI.Calendar.textMonths": "Месеци",
+  "Common.UI.Calendar.textNovember": "Новембар",
+  "Common.UI.Calendar.textOctober": "Октобар",
+  "Common.UI.Calendar.textSeptember": "Септембар",
+  "Common.UI.Calendar.textShortApril": "Апр",
+  "Common.UI.Calendar.textShortAugust": "Авг",
+  "Common.UI.Calendar.textShortDecember": "Дец",
+  "Common.UI.Calendar.textShortFebruary": "Феб",
+  "Common.UI.Calendar.textShortFriday": "Пе",
+  "Common.UI.Calendar.textShortJanuary": "Јан",
+  "Common.UI.Calendar.textShortJuly": "Јул",
+  "Common.UI.Calendar.textShortJune": "Јун",
+  "Common.UI.Calendar.textShortMarch": "Мар",
+  "Common.UI.Calendar.textShortMay": "Мај",
+  "Common.UI.Calendar.textShortMonday": "По",
+  "Common.UI.Calendar.textShortNovember": "Нов",
+  "Common.UI.Calendar.textShortOctober": "Окт",
+  "Common.UI.Calendar.textShortSaturday": "Су",
+  "Common.UI.Calendar.textShortSeptember": "Сеп",
+  "Common.UI.Calendar.textShortSunday": "Не",
+  "Common.UI.Calendar.textShortThursday": "Че",
+  "Common.UI.Calendar.textShortTuesday": "Ут",
+  "Common.UI.Calendar.textShortWednesday": "Ср",
+  "Common.UI.Calendar.textYears": "Године",
+  "Common.UI.SearchBar.textFind": "Пронађи",
+  "Common.UI.SearchBar.tipCloseSearch": "Затвори претрагу",
+  "Common.UI.SearchBar.tipNextResult": "Следећи резултат",
+  "Common.UI.SearchBar.tipPreviousResult": "Претходни резултат",
+  "Common.UI.Themes.txtThemeClassicLight": "Класично светло",
+  "Common.UI.Themes.txtThemeContrastDark": "Контраст тамно",
+  "Common.UI.Themes.txtThemeDark": "Тамно",
+  "Common.UI.Themes.txtThemeLight": "Светло",
+  "Common.UI.Themes.txtThemeSystem": "Исто као систем",
+  "Common.UI.Window.cancelButtonText": "Откажи",
+  "Common.UI.Window.closeButtonText": "Затвори",
+  "Common.UI.Window.noButtonText": "Не",
+  "Common.UI.Window.okButtonText": "OK",
+  "Common.UI.Window.textConfirmation": "Потврда",
+  "Common.UI.Window.textDontShow": "Не показуј ову поруку поново",
+  "Common.UI.Window.textError": "Грешка",
+  "Common.UI.Window.textInformation": "Информација",
+  "Common.UI.Window.textWarning": "Упозорење",
+  "Common.UI.Window.yesButtonText": "Да",
+  "Common.Views.CopyWarningDialog.textDontShow": "Не показуј ову поруку поново",
+  "Common.Views.CopyWarningDialog.textMsg": "Копирање, сечење и лепљење акције коришћењем акција контекстног менија обављаће се само унутар ове картице уређивача.<br><br>За копирање или лепљење у или из других апликација изван картице уређивача, користите следеће комбинације тастатуре:",
+  "Common.Views.CopyWarningDialog.textTitle": "Копирај, исеци и налепи акције",
+  "Common.Views.CopyWarningDialog.textToCopy": "за копирање",
+  "Common.Views.CopyWarningDialog.textToCut": "за исецање",
+  "Common.Views.CopyWarningDialog.textToPaste": "за лепљење",
+  "Common.Views.EmbedDialog.textHeight": "Висина",
+  "Common.Views.EmbedDialog.textTitle": "Угради",
+  "Common.Views.EmbedDialog.textWidth": "Ширина",
+  "Common.Views.EmbedDialog.txtCopy": "Копирај на клипборд",
+  "Common.Views.EmbedDialog.warnCopy": "Грешка прегледача! Користите пречицу тастатуре [Ctrl] + [C]",
+  "Common.Views.ImageFromUrlDialog.textUrl": "Налепи URL слике:",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "Ово поље је неопходно",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Ово поље би требало да буде URL у \"http://www.example.com\" формату",
+  "Common.Views.OpenDialog.closeButtonText": "Затвори фајл",
+  "Common.Views.OpenDialog.txtEncoding": "Енкодирање ",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "Лозинка је нетачна.",
+  "Common.Views.OpenDialog.txtOpenFile": "Унеси лозинку да отвориш фајл",
+  "Common.Views.OpenDialog.txtPassword": "Лозинка",
+  "Common.Views.OpenDialog.txtPreview": "Преглед",
+  "Common.Views.OpenDialog.txtProtected": "Када унесете лозинку и отворите фајл, тренутна лозинка која води до фајла ће бити ресетована.",
+  "Common.Views.OpenDialog.txtTitle": "Изабери %1 опције",
+  "Common.Views.OpenDialog.txtTitleProtected": "Заштићен фајл",
+  "Common.Views.SaveAsDlg.textLoading": "Учитавање",
+  "Common.Views.SaveAsDlg.textTitle": "Фолдер за чување",
+  "Common.Views.SelectFileDlg.textLoading": "Учитавање",
+  "Common.Views.SelectFileDlg.textTitle": "Одабери извор података",
+  "Common.Views.ShareDialog.textTitle": "Подели линк",
+  "Common.Views.ShareDialog.txtCopy": "Копирај на клипборд",
+  "Common.Views.ShareDialog.warnCopy": "Грешка прегледача! Користите пречицу тастатуре [Ctrl] + [C]",
+  "DE.Controllers.ApplicationController.convertationErrorText": "Преобраћање неуспешно.",
+  "DE.Controllers.ApplicationController.convertationTimeoutText": "Временско ограничење преобраћања прекорачено.",
+  "DE.Controllers.ApplicationController.criticalErrorTitle": "Грешка",
+  "DE.Controllers.ApplicationController.downloadErrorText": "Преузимање неуспешно.",
+  "DE.Controllers.ApplicationController.downloadTextText": "Преузимање документа...",
+  "DE.Controllers.ApplicationController.errorAccessDeny": "Покушавате да изведете акцију на коју немате права.<br>Молимо контактирајте свог Документ Сервер администратора.",
+  "DE.Controllers.ApplicationController.errorBadImageUrl": "URL слике је нетачан",
+  "DE.Controllers.ApplicationController.errorConnectToServer": "Документ није могао бити сачуван. Молимо проверите подешавања конекције или контактирајте свог администратора.<br>Када кликнете на \"ОК\" дугме, бићете подстакнути да преузмете документ.",
+  "DE.Controllers.ApplicationController.errorDataEncrypted": "Енкриптоване промене су примљене,оне не могу бити дешифроване.",
+  "DE.Controllers.ApplicationController.errorDefaultMessage": "Грешка код: %1",
+  "DE.Controllers.ApplicationController.errorEditingDownloadas": "Појавила се грешка у току рада са документом.<br>Користите \"Преузми као...\" опцију да сачувате резервну копију фајла на хард драјв вашег компјутера.",
+  "DE.Controllers.ApplicationController.errorEditingSaveas": "Грешка се појавила у току рада са документом.<br>Користите \"Сачувај као...\" опцију да сачувате резервну копију фајла на хард драјв вашег компјутера.",
+  "DE.Controllers.ApplicationController.errorFilePassProtect": "Фајл је заштићен лозинком и не може бити отворен.",
+  "DE.Controllers.ApplicationController.errorFileSizeExceed": "Величина фајла превазилази границе постављене за ваш сервер.<br>Молимо вас контактирајте вашег Документ Сервер администратора за детаље.",
+  "DE.Controllers.ApplicationController.errorForceSave": "Грешка се појавила у току чувања фајла. Молимо користите \"Преузми као\" опцију да сачувате фајл на хард драјв вашег компјутера или покушајте поново касније.",
+  "DE.Controllers.ApplicationController.errorInconsistentExt": "Грешка се појавила у току отварања фајла.<br>Садржај фајла се не поклапа са фајл екстензијом.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "Грешка се појавила приликом отварања фајла.<br>Садржај фајла одговара текстуалним документима (нпр docx), али фајл има недоследну екстензију: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPdf": "Појавила се грешка при отварању фајла.<br>Садржај фајла одговара једном од следећих формата: pdf/djvu/xps/oxps, али фајл има недоследну екстензију: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPptx": "Грешка се појавила приликом отварања фајла.<br>Садржај фајла одговара презентацијама (нпр pptx), али фајл има недоследну екстензију: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "Грешка се појавила приликом отварања фајла.<br>Садржај фајла одговара прорачунским табелама (нпр xlsx), али фајл има недоследну екстензију: %1.",
+  "DE.Controllers.ApplicationController.errorLoadingFont": "Фонтови нису учитани.<br>Молимо контактирајте свог Документ Сервер администратора.",
+  "DE.Controllers.ApplicationController.errorServerVersion": "Верзија уређивача је ажурирана. Страница ће бити поново учитана да се примене промене.",
+  "DE.Controllers.ApplicationController.errorSessionAbsolute": "Фаза уређивања документа је истекла. Молимо поново учитајте страницу.",
+  "DE.Controllers.ApplicationController.errorSessionIdle": "Документ се није уређивао већ дуже време. Молимо поново учитајте страницу.",
+  "DE.Controllers.ApplicationController.errorSessionToken": "Веза са сервером је прекинута. Молимо поново учитајте страницу.",
+  "DE.Controllers.ApplicationController.errorSubmit": "Подношење неуспешно.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "Унета вредност се не поклапа са форматом поља.",
+  "DE.Controllers.ApplicationController.errorToken": "Сигурносни токен документа није исправно формиран.<br>Молимо контактирајте вашег Документ Сервер администратора.",
+  "DE.Controllers.ApplicationController.errorTokenExpire": "Сигурносни токен документа је истекао.<br>Молимо контактирајте вашег Документ Сервер администратора.",
+  "DE.Controllers.ApplicationController.errorUpdateVersion": "Верзија фајла је промењена. Страница ће бити поново учитана.",
+  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Конекција је обновљена, и верзија фајла је промењена.<br>Пре него што наставите да радите, морате преузети фајл или копирате његов садржај да се уверите да ништа није изгубљено, и онда поново учитате ову страницу.",
+  "DE.Controllers.ApplicationController.errorUserDrop": "Фајл не може бити приступљен сада.",
+  "DE.Controllers.ApplicationController.errorViewerDisconnect": "Конекција је изгубљена. Можете и даље видети документ,<br>али нећете моћи да преузмете или штампате док се конекција не успостави и страница поново учита.",
+  "DE.Controllers.ApplicationController.mniImageFromFile": "Слика из фајла",
+  "DE.Controllers.ApplicationController.mniImageFromStorage": "Слика из складишта",
+  "DE.Controllers.ApplicationController.mniImageFromUrl": "Слика из URL",
+  "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Упозорење",
+  "DE.Controllers.ApplicationController.openErrorText": "Грешка се појавила у току отварања фајла.",
+  "DE.Controllers.ApplicationController.saveErrorText": "Грешка се појавила у току чувања фајла.",
+  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "Овај фајл не може бити сачуван или направљен.<br>Могући разлози су: <br>1. Фајл је само за читање. <br>2. Фајл се уређује од стране других корисника. <br>3. Диск је пун или оштећен.",
+  "DE.Controllers.ApplicationController.scriptLoadError": "Конекција је превише спора, неке од компонената не могу бити учитане. Молимо поново учитајте страницу.",
+  "DE.Controllers.ApplicationController.textAnonymous": "Анонимно",
+  "DE.Controllers.ApplicationController.textBuyNow": "Посети веб сајт",
+  "DE.Controllers.ApplicationController.textCloseTip": "Кликни да затвориш савет.",
+  "DE.Controllers.ApplicationController.textContactUs": "Контакт продаје",
+  "DE.Controllers.ApplicationController.textFilled": "Попуњено",
+  "DE.Controllers.ApplicationController.textGotIt": "Разумем",
+  "DE.Controllers.ApplicationController.textGuest": "Гост",
+  "DE.Controllers.ApplicationController.textLoadingDocument": "Учитавање документа",
+  "DE.Controllers.ApplicationController.textNoLicenseTitle": "Лимит лиценце достигнут",
+  "DE.Controllers.ApplicationController.textOf": "од",
+  "DE.Controllers.ApplicationController.textRequired": "Попуни сва потребна поља за слање обрасца.",
+  "DE.Controllers.ApplicationController.textSaveAs": "Сачувај као PDF",
+  "DE.Controllers.ApplicationController.textSaveAsDesktop": "Сачувај као...",
+  "DE.Controllers.ApplicationController.textSubmited": "<b>Форма достављена успешно.</b><br>Кликните да затворите савет",
+  "DE.Controllers.ApplicationController.textSubmitOk": "Ваш PDF образац је сачуван у Завршено секцији.",
+  "DE.Controllers.ApplicationController.titleLicenseExp": "Лиценца истекла",
+  "DE.Controllers.ApplicationController.titleLicenseNotActive": "Лиценца није активна",
+  "DE.Controllers.ApplicationController.titleServerVersion": "Уређивач ажуриран",
+  "DE.Controllers.ApplicationController.titleUpdateVersion": "Верзија промењена",
+  "DE.Controllers.ApplicationController.txtArt": "Ваш текст овде",
+  "DE.Controllers.ApplicationController.txtChoose": "Изабери ставку",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "Кликни да учиташ слику",
+  "DE.Controllers.ApplicationController.txtClose": "Затвори",
+  "DE.Controllers.ApplicationController.txtEmpty": "(Празно)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "Унеси датум",
+  "DE.Controllers.ApplicationController.txtPressLink": "Притисни Ctrl и кликни линк",
+  "DE.Controllers.ApplicationController.txtUntitled": "Без наслова",
+  "DE.Controllers.ApplicationController.unknownErrorText": "Непозната грешка.",
+  "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "Ваш прегледач није подржан.",
+  "DE.Controllers.ApplicationController.uploadImageExtMessage": "Непознати формат слике.",
+  "DE.Controllers.ApplicationController.uploadImageSizeMessage": "Слика је превелика. Максимум величина је 25 МБ.",
+  "DE.Controllers.ApplicationController.waitText": "Молимо, сачекајте...",
+  "DE.Controllers.ApplicationController.warnLicenseAnonymous": "Приступ одбијен за анонимне кориснике.<br>Овај документ ће бити отворен само за приказ.",
+  "DE.Controllers.ApplicationController.warnLicenseBefore": "Лиценца није активна.<br>Молимо контактирајте вашег администратора.",
+  "DE.Controllers.ApplicationController.warnLicenseExceeded": "Достигли сте лимит за истовремене конекције за %1 уреднике. Овај документ ће бити отворен само за приказ.<br>Контактирајте вашег администратора да сазнате више.",
+  "DE.Controllers.ApplicationController.warnLicenseExp": "Ваша лиценца је истекла.<br>Молимо ажурирајте вашу лиценцу и освежите страницу.",
+  "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "Лиценца истекла.<br>Немате приступ функционалности уређивања документа.<br>Молимо контактирајте вашег администратора.",
+  "DE.Controllers.ApplicationController.warnLicenseLimitedRenewed": "Лиценца треба да буде обновљена.<br>Имате ограничен приступ функционалности уређивања документа.<br>Молимо контактирајте вашег администратора да добијете потпуни приступ",
+  "DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "Достигли сте кориснички лимит за %1 уреднике. Контактирајте свог администратора да сазнате више.",
+  "DE.Controllers.ApplicationController.warnNoLicense": "Достигли сте лимит за истовремене конекције за %1 уреднике. Овај документ ће бити отворен само за приказ.<br>Контактирајте %1 тим за продају за личне услове надоградње.",
+  "DE.Controllers.ApplicationController.warnNoLicenseUsers": "Достигли сте кориснички лимит за %1 уреднике. Контактирајте %1 тим за продају за личне услове надоградње.",
+  "DE.Views.ApplicationView.textClear": "Уклони сва поља",
+  "DE.Views.ApplicationView.textClearField": "Уклони поље",
+  "DE.Views.ApplicationView.textClose": "Затвори фајл",
+  "DE.Views.ApplicationView.textCopy": "Копирај",
+  "DE.Views.ApplicationView.textCut": "Исеци",
+  "DE.Views.ApplicationView.textFitToPage": "Прилагоди страници",
+  "DE.Views.ApplicationView.textFitToWidth": "Прилагоди ширини",
+  "DE.Views.ApplicationView.textNext": "Следеће поље",
+  "DE.Views.ApplicationView.textPaste": "Налепи",
+  "DE.Views.ApplicationView.textPrintSel": "Штампај селекцију",
+  "DE.Views.ApplicationView.textRedo": "Уради поново",
+  "DE.Views.ApplicationView.textSubmit": "Поднеси",
+  "DE.Views.ApplicationView.textUndo": "Поништи",
+  "DE.Views.ApplicationView.textZoom": "Зумирај",
+  "DE.Views.ApplicationView.tipRedo": "Уради поново",
+  "DE.Views.ApplicationView.tipUndo": "Поништи",
+  "DE.Views.ApplicationView.txtDarkMode": "Тамни режим",
+  "DE.Views.ApplicationView.txtDownload": "Преузми",
+  "DE.Views.ApplicationView.txtDownloadDocx": "Преузми као DOCX",
+  "DE.Views.ApplicationView.txtDownloadPdf": "Преузми као PDF",
+  "DE.Views.ApplicationView.txtEmbed": "Угради",
+  "DE.Views.ApplicationView.txtFileLocation": "Отвори фајл локацију",
+  "DE.Views.ApplicationView.txtFullScreen": "Приказ целог екрана",
+  "DE.Views.ApplicationView.txtPrint": "Штампај",
+  "DE.Views.ApplicationView.txtSearch": "Претрага",
+  "DE.Views.ApplicationView.txtShare": "Подели",
+  "DE.Views.ApplicationView.txtTheme": "Тема интерфејса"
+}

apps/documenteditor/forms/locale/sr.json

@@ -97,7 +97,7 @@
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "Veličina fajla prevazilazi granice postavljene za vaš server.<br>Molimo kontaktirajte vašeg Dokument Server administratora za detalje.",
   "DE.Controllers.ApplicationController.errorForceSave": "Greška se pojavila u toku čuvanja fajla. Molimo koristite \"Preuzmi kao\" opciju da sačuvate fajl na hard drajv vašeg kompjutera ili pokušajte ponovo kasnije.",
   "DE.Controllers.ApplicationController.errorInconsistentExt": "Greška se pojavila u toku otvaranja fajla.<br>Sadržaj fajla se ne poklapa sa fajl ekstenzijom.",
-  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "Greška se pojavila prilikom otvaranja fajla.<br>Sadržaj fajla odgovara proračunskim tabelama (npr docx), ali fajl ima nedoslednu ekstenziju: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "Greška se pojavila prilikom otvaranja fajla.<br>Sadržaj fajla odgovara tekstualnim dokumentima (npr docx), ali fajl ima nedoslednu ekstenziju: %1.",
   "DE.Controllers.ApplicationController.errorInconsistentExtPdf": "Pojavila se greška pri otvaranju fajla.<br>Sadržaj fajla odgovara jednom od sledećih formata: pdf/djvu/xps/oxps, ali fajl ima nedoslednu ekstenziju: %1",
   "DE.Controllers.ApplicationController.errorInconsistentExtPptx": "Greška se pojavila prilikom otvaranja fajla.<br>Sadržaj fajla odgovara prezentacijama (npr pptx), ali fajl ima nedoslednu ekstenziju: %1",
   "DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "Greška se pojavila prilikom otvaranja fajla.<br>Sadržaj fajla odgovara proračunskim tabelama (npr xlsx), ali fajl ima nedoslednu ekstenziju: %1.",
@@ -126,6 +126,7 @@
   "DE.Controllers.ApplicationController.textBuyNow": "Poseti veb sajt",
   "DE.Controllers.ApplicationController.textCloseTip": "Klikni da zatvoriš savet.",
   "DE.Controllers.ApplicationController.textContactUs": "Kontakt prodaje",
+  "DE.Controllers.ApplicationController.textFilled": "Popunjeno",
   "DE.Controllers.ApplicationController.textGotIt": "Razumem",
   "DE.Controllers.ApplicationController.textGuest": "Gost",
   "DE.Controllers.ApplicationController.textLoadingDocument": "Učitavanje dokumenta ",
@@ -135,6 +136,7 @@
   "DE.Controllers.ApplicationController.textSaveAs": "Sačuvaj kao PDF",
   "DE.Controllers.ApplicationController.textSaveAsDesktop": "Sačuvaj kao...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Forma dostavljena uspešno.</b><br>Kliknite da zatvorite savet",
+  "DE.Controllers.ApplicationController.textSubmitOk": "Vaš PDF obrazac je sačuvan u Završeno sekciji.",
   "DE.Controllers.ApplicationController.titleLicenseExp": "Licenca istekla",
   "DE.Controllers.ApplicationController.titleLicenseNotActive": "Licenca nije aktivna",
   "DE.Controllers.ApplicationController.titleServerVersion": "Uređivač ažuriran",

apps/documenteditor/forms/locale/tr.json

@@ -36,7 +36,7 @@
   "Common.UI.SearchBar.tipCloseSearch": "Aramayı kapat",
   "Common.UI.SearchBar.tipNextResult": "Sonraki sonuç",
   "Common.UI.SearchBar.tipPreviousResult": "Önceki sonuç",
-  "Common.UI.Themes.txtThemeClassicLight": "Açık mod",
+  "Common.UI.Themes.txtThemeClassicLight": "Klasik Aydınlık",
   "Common.UI.Themes.txtThemeContrastDark": "Zıt koyu",
   "Common.UI.Themes.txtThemeDark": "Karanlık",
   "Common.UI.Themes.txtThemeLight": "Açık",
@@ -163,6 +163,7 @@
   "DE.Controllers.ApplicationController.warnNoLicenseUsers": "%1 düzenleyici için kullanıcı sınırına ulaştınız. Kişisel yükseltme koşulları için %1 satış ekibiyle iletişime geçin.",
   "DE.Views.ApplicationView.textClear": "Tüm alanları temizle",
   "DE.Views.ApplicationView.textClearField": "Alanı temizle",
+  "DE.Views.ApplicationView.textClose": "Dosyayı Kapat",
   "DE.Views.ApplicationView.textCopy": "Kopyala",
   "DE.Views.ApplicationView.textCut": "Kes",
   "DE.Views.ApplicationView.textFitToPage": "Sayfaya Sığdır",
@@ -184,7 +185,7 @@
   "DE.Views.ApplicationView.txtFileLocation": "Dosya konumunu aç",
   "DE.Views.ApplicationView.txtFullScreen": "Tam Ekran",
   "DE.Views.ApplicationView.txtPrint": "Yazdır",
-  "DE.Views.ApplicationView.txtSearch": "Arama",
+  "DE.Views.ApplicationView.txtSearch": "Bul",
   "DE.Views.ApplicationView.txtShare": "Paylaş",
   "DE.Views.ApplicationView.txtTheme": "Arayüz teması"
 }

apps/documenteditor/forms/locale/zh.json

@@ -33,13 +33,13 @@
   "Common.UI.Calendar.textShortWednesday": "周三",
   "Common.UI.Calendar.textYears": "年",
   "Common.UI.SearchBar.textFind": "查找",
-  "Common.UI.SearchBar.tipCloseSearch": "关闭搜索",
+  "Common.UI.SearchBar.tipCloseSearch": "关闭查找",
   "Common.UI.SearchBar.tipNextResult": "下一个结果",
   "Common.UI.SearchBar.tipPreviousResult": "上一个结果",
-  "Common.UI.Themes.txtThemeClassicLight": "经典亮色",
-  "Common.UI.Themes.txtThemeContrastDark": "暗色对比",
-  "Common.UI.Themes.txtThemeDark": "暗色主题",
-  "Common.UI.Themes.txtThemeLight": "亮色主题",
+  "Common.UI.Themes.txtThemeClassicLight": "经典浅色",
+  "Common.UI.Themes.txtThemeContrastDark": "高对比度深色",
+  "Common.UI.Themes.txtThemeDark": "深色",
+  "Common.UI.Themes.txtThemeLight": "浅色",
   "Common.UI.Themes.txtThemeSystem": "和系統一致",
   "Common.UI.Window.cancelButtonText": "取消",
   "Common.UI.Window.closeButtonText": "关闭",
@@ -53,7 +53,7 @@
   "Common.UI.Window.yesButtonText": "是",
   "Common.Views.CopyWarningDialog.textDontShow": "不要再显示此消息",
   "Common.Views.CopyWarningDialog.textMsg": "使用右键快捷菜单操作的复制、剪切和粘贴操作将仅在此编辑器选项卡中执行<br><br>要在编辑器选项卡之外的应用程序中复制或粘贴，请使用以下键盘组合：",
-  "Common.Views.CopyWarningDialog.textTitle": "拷贝，剪切和粘贴操作",
+  "Common.Views.CopyWarningDialog.textTitle": "复制、剪切和粘贴操作",
   "Common.Views.CopyWarningDialog.textToCopy": "复制",
   "Common.Views.CopyWarningDialog.textToCut": "剪切",
   "Common.Views.CopyWarningDialog.textToPaste": "粘贴",
@@ -61,7 +61,7 @@
   "Common.Views.EmbedDialog.textTitle": "嵌入",
   "Common.Views.EmbedDialog.textWidth": "宽度",
   "Common.Views.EmbedDialog.txtCopy": "复制到剪切板",
-  "Common.Views.EmbedDialog.warnCopy": "浏览器错误！使用键盘快捷键[Ctrl]+[C]",
+  "Common.Views.EmbedDialog.warnCopy": "浏览器错误！使用键盘快捷键 [Ctrl] + [C]",
   "Common.Views.ImageFromUrlDialog.textUrl": "粘贴图片URL网址：",
   "Common.Views.ImageFromUrlDialog.txtEmpty": "这是必填栏",
   "Common.Views.ImageFromUrlDialog.txtNotUrl": "该字段应该是“http://www.example.com”格式的URL",
@@ -72,7 +72,7 @@
   "Common.Views.OpenDialog.txtPassword": "密码",
   "Common.Views.OpenDialog.txtPreview": "预览",
   "Common.Views.OpenDialog.txtProtected": "输入密码并打开文件后，将重置文件的当前密码。",
-  "Common.Views.OpenDialog.txtTitle": "选择%1选项",
+  "Common.Views.OpenDialog.txtTitle": "选择 %1 个选项",
   "Common.Views.OpenDialog.txtTitleProtected": "受保护的文件",
   "Common.Views.SaveAsDlg.textLoading": "载入中",
   "Common.Views.SaveAsDlg.textTitle": "要保存的文件夹",
@@ -80,7 +80,7 @@
   "Common.Views.SelectFileDlg.textTitle": "选择数据源",
   "Common.Views.ShareDialog.textTitle": "分享链接",
   "Common.Views.ShareDialog.txtCopy": "复制到剪切板",
-  "Common.Views.ShareDialog.warnCopy": "浏览器错误！使用键盘快捷键[Ctrl]+[C]",
+  "Common.Views.ShareDialog.warnCopy": "浏览器错误！使用键盘快捷键 [Ctrl] + [C]",
   "DE.Controllers.ApplicationController.convertationErrorText": "转换失败",
   "DE.Controllers.ApplicationController.convertationTimeoutText": "转换超时",
   "DE.Controllers.ApplicationController.criticalErrorTitle": "错误",
@@ -91,16 +91,16 @@
   "DE.Controllers.ApplicationController.errorConnectToServer": "无法保存文档。请检查连接设置或与管理员联系<br>单击“确定”按钮时，系统将提示您下载文档。",
   "DE.Controllers.ApplicationController.errorDataEncrypted": "加密更改已收到，无法对其解密。",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "错误代码：%1",
-  "DE.Controllers.ApplicationController.errorEditingDownloadas": "在处理文档期间发生错误。<br>使用“下载为…”选项将文件备份复制到您的计算机硬盘中。",
-  "DE.Controllers.ApplicationController.errorEditingSaveas": "使用文档时出错<br>使用“另存为…”选项将文件备份副本保存到计算机硬盘。",
+  "DE.Controllers.ApplicationController.errorEditingDownloadas": "文档在处理时发生错误。<br>请使用“下载为...”选项保存文件的备份副本到您的计算机硬盘中。",
+  "DE.Controllers.ApplicationController.errorEditingSaveas": "文档在处理时发生错误。<br>请使用“另存为...”保存文件的备份副本到计算机硬盘中。",
   "DE.Controllers.ApplicationController.errorFilePassProtect": "该文档受密码保护，无法被打开。",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "文件大小超出了为服务器设置的限制.<br>有关详细信息，请与文档服务器管理员联系。",
-  "DE.Controllers.ApplicationController.errorForceSave": "保存文件时出错。请使用“下载为”选项将文件保存到计算机硬盘驱动器，或稍后再试。",
-  "DE.Controllers.ApplicationController.errorInconsistentExt": "打开文件时出错<br>文件内容与文件扩展名不匹配。",
-  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "打开文件时出错<br>文件内容对应于文本文档（例如docx），但文件的扩展名不一致：%1。",
-  "DE.Controllers.ApplicationController.errorInconsistentExtPdf": "打开文件时出错<br>文件内容对应于以下格式之一：pdf/djvu/xps/oxfs，但文件的扩展名不一致：%1。",
-  "DE.Controllers.ApplicationController.errorInconsistentExtPptx": "打开文件时出错<br>文件内容对应于演示文稿（例如pptx），但文件的扩展名不一致：%1。",
-  "DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "打开文件时出错<br>文件内容对应于电子表格（例如xlsx），但文件的扩展名不一致：%1。",
+  "DE.Controllers.ApplicationController.errorForceSave": "保存文件时发生错误。请使用“下载为”选项将文件保存到计算机硬盘中或者稍后重试。",
+  "DE.Controllers.ApplicationController.errorInconsistentExt": "打开文件时发生错误。<br>文件内容与文件扩展名不匹配。",
+  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "打开文件时发生错误。<br>文件内容对应的是文本文档 (例如 DOCX)，但文件的扩展名不一致：%1。",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPdf": "打开文件时发生错误。<br>文件内容对应的是以下格式之一：PDF/DJVU/XPS/OXFS，但文件的扩展名不一致：%1。",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPptx": "打开文件时发生错误。<br>文件内容对应的是演示文稿 (例如 PPTX)，但文件的扩展名不一致：%1。",
+  "DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "打开文件时发生错误。<br>文件内容对应的是电子表格 (例如 XLSX)，但文件的扩展名不一致：%1。",
   "DE.Controllers.ApplicationController.errorLoadingFont": "字体未加载<br>请与您的文档服务器管理员联系。",
   "DE.Controllers.ApplicationController.errorServerVersion": "编辑器版本已经更新。该页面将被重新加载以应用更改。",
   "DE.Controllers.ApplicationController.errorSessionAbsolute": "文档编辑会话已过期。请重新加载页面。",
@@ -114,18 +114,19 @@
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "网络连接已恢复，文件版本已更改<br>在继续工作之前，您需要下载文件或复制其内容以确保不会丢失任何内容，然后重新加载此页面。",
   "DE.Controllers.ApplicationController.errorUserDrop": "该文件现在无法访问。",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "连接失败。您仍然可以查看文档<br>，但在连接恢复之前无法下载或打印。",
-  "DE.Controllers.ApplicationController.mniImageFromFile": "图片文件",
-  "DE.Controllers.ApplicationController.mniImageFromStorage": "内存中的图像",
+  "DE.Controllers.ApplicationController.mniImageFromFile": "图像文件",
+  "DE.Controllers.ApplicationController.mniImageFromStorage": "存储设备中的图像",
   "DE.Controllers.ApplicationController.mniImageFromUrl": "来自URL地址的图片",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "警告",
-  "DE.Controllers.ApplicationController.openErrorText": "打开文件时发生错误",
-  "DE.Controllers.ApplicationController.saveErrorText": "保存文件时发生错误",
+  "DE.Controllers.ApplicationController.openErrorText": "打开文件时发生错误。",
+  "DE.Controllers.ApplicationController.saveErrorText": "保存文件时发生错误。",
   "DE.Controllers.ApplicationController.saveErrorTextDesktop": "无法保存或创建此文件<br>可能的原因有：<br>1.该文件是只读的<br>2.其他用户正在编辑该文件<br>3.磁盘已满或已损坏。",
   "DE.Controllers.ApplicationController.scriptLoadError": "连接速度过慢，部分组件无法被加载。请重新加载页面。",
   "DE.Controllers.ApplicationController.textAnonymous": "匿名",
   "DE.Controllers.ApplicationController.textBuyNow": "访问网站",
-  "DE.Controllers.ApplicationController.textCloseTip": "点按以关闭提示。",
+  "DE.Controllers.ApplicationController.textCloseTip": "点击以关闭提示。",
   "DE.Controllers.ApplicationController.textContactUs": "联系销售人员",
+  "DE.Controllers.ApplicationController.textFilled": "已填写",
   "DE.Controllers.ApplicationController.textGotIt": "明白",
   "DE.Controllers.ApplicationController.textGuest": "访客",
   "DE.Controllers.ApplicationController.textLoadingDocument": "文件加载中…",
@@ -135,15 +136,16 @@
   "DE.Controllers.ApplicationController.textSaveAs": "另存为PDF",
   "DE.Controllers.ApplicationController.textSaveAsDesktop": "另存为...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>表单提交成功</b><br>点击以关闭提示",
+  "DE.Controllers.ApplicationController.textSubmitOk": "您的 PDF 表单已保存，可在“完成”模块访问。",
   "DE.Controllers.ApplicationController.titleLicenseExp": "许可证过期",
   "DE.Controllers.ApplicationController.titleLicenseNotActive": "授权证书未激活",
   "DE.Controllers.ApplicationController.titleServerVersion": "编辑器已更新",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "版本已变化",
   "DE.Controllers.ApplicationController.txtArt": "在这输入文字",
   "DE.Controllers.ApplicationController.txtChoose": "选择一项",
-  "DE.Controllers.ApplicationController.txtClickToLoad": "单击以加载图像",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "点击加载图像",
   "DE.Controllers.ApplicationController.txtClose": "关闭",
-  "DE.Controllers.ApplicationController.txtEmpty": "（空）",
+  "DE.Controllers.ApplicationController.txtEmpty": "(空)",
   "DE.Controllers.ApplicationController.txtEnterDate": "输入日期",
   "DE.Controllers.ApplicationController.txtPressLink": "按CTRL并单击链接",
   "DE.Controllers.ApplicationController.txtUntitled": "无标题",
@@ -152,17 +154,18 @@
   "DE.Controllers.ApplicationController.uploadImageExtMessage": "未知图像格式。",
   "DE.Controllers.ApplicationController.uploadImageSizeMessage": "图像太大。最大大小为25 MB。",
   "DE.Controllers.ApplicationController.waitText": "请稍候...",
-  "DE.Controllers.ApplicationController.warnLicenseAnonymous": "匿名用户的访问被拒绝<br>此文档将仅打开以供查看。",
+  "DE.Controllers.ApplicationController.warnLicenseAnonymous": "匿名用户的访问被拒绝。<br>此文档将以只读模式打开。",
   "DE.Controllers.ApplicationController.warnLicenseBefore": "许可证未激活<br>请与管理员联系。",
   "DE.Controllers.ApplicationController.warnLicenseExceeded": "您已达到同时连接到%1编辑器的限制。此文档将仅打开以供查看<br>请与管理员联系以了解更多信息。",
   "DE.Controllers.ApplicationController.warnLicenseExp": "您的许可证已过期。<br>请更新您的许可证并刷新页面。",
-  "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "许可证已过期<br>您无权访问文档编辑功能<br>请与管理员联系。",
-  "DE.Controllers.ApplicationController.warnLicenseLimitedRenewed": "授权需更新<br>您只有文件编辑功能的部分权限<br>请联系管理员以取得完整权限。",
+  "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "许可证已过期。<br>您现在不能使用文档编辑功能。<br>请联系您的管理员。",
+  "DE.Controllers.ApplicationController.warnLicenseLimitedRenewed": "许可证需要更新。<br>您现在只能使用受限的文档编辑功能。<br>请联系您的管理员以获取完整权限",
   "DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "您已达到%1编辑器的用户限制。请与管理员联系以了解更多信息。",
   "DE.Controllers.ApplicationController.warnNoLicense": "您已达到同时连接到%1编辑器的限制。此文档将仅打开以供查看<br>有关个人升级条款，请与%1销售团队联系。",
   "DE.Controllers.ApplicationController.warnNoLicenseUsers": "您已达到%1编辑器的用户限制。有关个人升级条款，请与%1销售团队联系。",
   "DE.Views.ApplicationView.textClear": "清除所有字段",
   "DE.Views.ApplicationView.textClearField": "清除字段",
+  "DE.Views.ApplicationView.textClose": "关闭文件",
   "DE.Views.ApplicationView.textCopy": "复制",
   "DE.Views.ApplicationView.textCut": "剪切",
   "DE.Views.ApplicationView.textFitToPage": "适合页面",
@@ -178,13 +181,13 @@
   "DE.Views.ApplicationView.tipUndo": "撤消",
   "DE.Views.ApplicationView.txtDarkMode": "深色模式",
   "DE.Views.ApplicationView.txtDownload": "下载",
-  "DE.Views.ApplicationView.txtDownloadDocx": "导出成docx",
-  "DE.Views.ApplicationView.txtDownloadPdf": "导出为PDF",
+  "DE.Views.ApplicationView.txtDownloadDocx": "下载为 DOCX",
+  "DE.Views.ApplicationView.txtDownloadPdf": "下载为 PDF",
   "DE.Views.ApplicationView.txtEmbed": "嵌入",
   "DE.Views.ApplicationView.txtFileLocation": "打开文件所在位置",
   "DE.Views.ApplicationView.txtFullScreen": "全屏",
   "DE.Views.ApplicationView.txtPrint": "打印",
-  "DE.Views.ApplicationView.txtSearch": "搜索",
+  "DE.Views.ApplicationView.txtSearch": "查找",
   "DE.Views.ApplicationView.txtShare": "分享",
   "DE.Views.ApplicationView.txtTheme": "界面主题"
 }

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

@@ -104,17 +104,18 @@ define([
                 dirLeft = Common.UI.isRTL() ? 'right' : 'left',
                 me = this;
             this._helpTips = {
-                'create': {name: 'de-form-tip-create', placement: 'bottom-' + dirRight, text: this.view.tipCreateField, link: false, target: '#slot-btn-form-field'},
-                'key': {name: 'de-form-tip-settings-key', placement: dirLeft + '-bottom', text: this.view.tipFormKey, link: {text: this.view.tipFieldsLink, src: 'UsageInstructions\/CreateFillableForms.htm'}, target:  '#form-combo-key'},
-                'group-key': {name: 'de-form-tip-settings-group', placement: dirLeft + '-bottom', text: this.view.tipFormGroupKey, link: false, target:  '#form-combo-group-key'},
-                'settings': {name: 'de-form-tip-settings', placement: dirLeft + '-top', text: this.view.tipFieldSettings, link: {text: this.view.tipFieldsLink, src: 'UsageInstructions\/CreateFillableForms.htm'}, target:  '#id-right-menu-form'},
+                'create': {name: 'de-form-tip-create', placement: 'bottom-' + dirRight, text: this.view.tipCreateField, link: false, target: '#slot-btn-form-field', showButton: true},
+                'key': {name: 'de-form-tip-settings-key', placement: dirLeft + '-bottom', text: this.view.tipFormKey, link: {text: this.view.tipFieldsLink, src: 'UsageInstructions\/CreateFillableForms.htm'}, target:  '#form-combo-key', showButton: true},
+                'group-key': {name: 'de-form-tip-settings-group', placement: dirLeft + '-bottom', text: this.view.tipFormGroupKey, link: false, target:  '#form-combo-group-key', showButton: true},
+                'settings': {name: 'de-form-tip-settings', placement: dirLeft + '-top', text: this.view.tipFieldSettings, link: {text: this.view.tipFieldsLink, src: 'UsageInstructions\/CreateFillableForms.htm'}, target:  '#id-right-menu-form', showButton: true},
                 // 'roles': {name: 'de-form-tip-roles', placement: 'bottom-' + dirLeft, text: this.view.tipHelpRoles, link: {text: this.view.tipRolesLink, src: 'UsageInstructions\/CreateFillableForms.htm#managing_roles'}, target: '#slot-btn-manager'},
-                'save': this.appConfig.canDownloadForms ? {name: 'de-form-tip-save', placement: 'bottom-' + dirLeft, text: this.view.tipSaveFile, link: false, target: '#slot-btn-form-save'} : undefined,
+                'save': this.appConfig.canDownloadForms ? {name: 'de-form-tip-save', placement: 'bottom-' + dirLeft, text: this.view.tipSaveFile, link: false, target: '#slot-btn-form-save', showButton: true} : undefined,
                 'submit': this.appConfig.isRestrictedEdit ? {name: 'de-form-tip-submit', placement: 'bottom-' + dirLeft, text: this.view.textRequired, link: false, target: '#slot-btn-header-form-submit',
                                                             callback: function() {
                                                                 me.api.asc_MoveToFillingForm(true, true, true);
                                                                 me.view.btnSubmit.updateHint(me.view.textRequired);
-                                                            }} : undefined
+                                                            }, showButton: true} : undefined,
+                'submit-required': this.appConfig.isRestrictedEdit ? {placement: 'bottom-' + dirLeft, text: this.view.textRequired, link: false, target: '#slot-btn-header-form-submit', closable: true} : undefined
             };
             !Common.localStorage.getItem(this._helpTips['key'].name) && this.addListeners({'RightMenu': {'rightmenuclick': this.onRightMenuClick}});
             this.addListeners({
@@ -134,6 +135,7 @@ define([
                     'tab:active': this.onActiveTab
                 }
             });
+            this.appConfig.isRestrictedEdit && this.api && this.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(this.onDocumentModifiedChanged, this));
         },
 
         SetDisabled: function(state) {
@@ -304,6 +306,7 @@ define([
                 this.toolbar.toolbar.clearActiveData();
                 this.toolbar.toolbar.processPanelVisible(null, true);
             }
+            Common.NotificationCenter.trigger('doc:mode-changed', state ? 'view-form' : undefined);
             Common.NotificationCenter.trigger('edit:complete', this.toolbar);
         },
 
@@ -345,14 +348,17 @@ define([
 
         onSubmitClick: function() {
             if (!this.api.asc_IsAllRequiredFormsFilled()) {
-                var me = this;
-                Common.UI.warning({
-                    msg: this.view.textRequired,
-                    callback: function() {
-                        me.api.asc_MoveToFillingForm(true, true, true);
-                        Common.NotificationCenter.trigger('edit:complete', me.toolbar);
-                    }
-                });
+                this.showHelpTip('submit-required');
+                this.api.asc_MoveToFillingForm(true, true, true);
+                Common.NotificationCenter.trigger('edit:complete', this.toolbar);
+                // var me = this;
+                // Common.UI.warning({
+                //     msg: this.view.textRequired,
+                //     callback: function() {
+                //         me.api.asc_MoveToFillingForm(true, true, true);
+                //         Common.NotificationCenter.trigger('edit:complete', me.toolbar);
+                //     }
+                // });
                 return;
             }
 
@@ -438,7 +444,7 @@ define([
                     toolbar: true,
                     plugins: true,
                     protect: true,
-                    header: {docmode: true}
+                    header: {docmode: false}
                 }, 'forms');
                 // if (this.view)
                 //     this.view.$el.find('.no-group-mask.form-view').css('opacity', 1);
@@ -457,8 +463,8 @@ define([
             if (id==Asc.c_oAscAsyncAction['Submit'] && this.view.btnSubmit) {
                 Common.Utils.lockControls(Common.enumLock.submit, !this._submitFail, {array: [this.view.btnSubmit]})
                 if (!this._submitFail) {
+                    Common.Gateway.submitForm();
                     this.view.btnSubmit.setCaption(this.view.textFilled);
-                    this.view.btnSubmit.cmpEl.addClass('gray');
                     if (!this.submitedTooltip) {
                         this.submitedTooltip = new Common.UI.SynchronizeTip({
                             text: this.view.textSubmitOk,
@@ -496,9 +502,13 @@ define([
                 // }
 
                 config.isEdit && config.canFeatureContentControl && config.isFormCreator && !config.isOForm && me.showHelpTip('create'); // show tip only when create form in docxf
-                if (config.isRestrictedEdit && me.view && me.view.btnSubmit && me.api && !me.api.asc_IsAllRequiredFormsFilled()) {
-                    Common.Utils.lockControls(Common.enumLock.requiredNotFilled, true, {array: [me.view.btnSubmit]});
-                    me.showHelpTip('submit');
+                if (config.isRestrictedEdit && me.view && me.view.btnSubmit && me.api) {
+                    if (me.api.asc_IsAllRequiredFormsFilled())
+                        me.view.btnSubmit.cmpEl.removeClass('back-color').addClass('yellow');
+                    // else {
+                        // Common.Utils.lockControls(Common.enumLock.requiredNotFilled, true, {array: [me.view.btnSubmit]});
+                        // me.showHelpTip('submit');
+                    // }
                 }
                 me.onRefreshRolesList();
                 me.onChangeProtectDocument();
@@ -510,13 +520,13 @@ define([
             if (props) {
                 props.tip && props.tip.close();
                 props.tip = undefined;
-                force && Common.localStorage.setItem(props.name, 1);
+                force && props.name && Common.localStorage.setItem(props.name, 1);
             }
         },
 
         showHelpTip: function(step) {
             if (!this._helpTips[step]) return;
-            if (!Common.localStorage.getItem(this._helpTips[step].name)) {
+            if (!(this._helpTips[step].name && Common.localStorage.getItem(this._helpTips[step].name))) {
                 var props = this._helpTips[step],
                     target = props.target;
 
@@ -535,8 +545,8 @@ define([
                     text: props.text,
                     showLink: !!props.link,
                     textLink: props.link ? props.link.text : '',
-                    closable: false,
-                    showButton: true,
+                    closable: !!props.closable,
+                    showButton: !!props.showButton,
                     textButton: this.view.textGotIt
                 });
                 props.tip.on({
@@ -548,8 +558,12 @@ define([
                         Common.NotificationCenter.trigger('file:help', props.link.src);
                     },
                     'close': function() {
-                        Common.localStorage.setItem(props.name, 1);
+                        props.name && Common.localStorage.setItem(props.name, 1);
                         props.callback && props.callback();
+                    },
+                    'closeclick': function() {
+                        props.tip && props.tip.close();
+                        props.tip = undefined;
                     }
                 });
                 props.tip.show();
@@ -558,6 +572,8 @@ define([
         },
 
         onRefreshRolesList: function(roles) {
+            if (!Common.UI.FeaturesManager.isFeatureEnabled('roles', true)) return;
+
             if (!roles) {
                 var oform = this.api.asc_GetOForm();
                 oform && (roles = oform.asc_getAllRoles());
@@ -581,6 +597,11 @@ define([
         },
 
         showRolesList: function(callback) {
+            if (!Common.UI.FeaturesManager.isFeatureEnabled('roles', true)) {
+                callback.call(this);
+                return;
+            }
+
             var me = this,
                 oform = this.api.asc_GetOForm();
             oform && (new DE.Views.SaveFormDlg({
@@ -632,7 +653,15 @@ define([
         },
 
         onFillRequiredFields: function(isFilled) {
-            this.appConfig.isRestrictedEdit && this.appConfig.canFillForms && this.view.btnSubmit && Common.Utils.lockControls(Common.enumLock.requiredNotFilled, !isFilled, {array: [this.view.btnSubmit]});
+            // this.appConfig.isRestrictedEdit && this.appConfig.canFillForms && this.view.btnSubmit && Common.Utils.lockControls(Common.enumLock.requiredNotFilled, !isFilled, {array: [this.view.btnSubmit]});
+            if (this.appConfig.isRestrictedEdit && this.appConfig.canFillForms && this.view.btnSubmit) {
+                this.view.btnSubmit.cmpEl.removeClass(isFilled ? 'back-color' : 'yellow').addClass(isFilled ? 'yellow' : 'back-color');
+                isFilled && this.closeHelpTip('submit-required');
+            }
+        },
+
+        onDocumentModifiedChanged: function() {
+            this.api.isDocumentModified() && this.closeHelpTip('submit-required');
         },
 
         onCountPages: function(count) {

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

@@ -230,11 +230,6 @@ define([
         },
 
         enablePlugins: function() {
-            if (this.mode.canPlugins) {
-                // this.leftMenu.btnPlugins.show();
-                this.leftMenu.setOptionsPanel('plugins', this.getApplication().getController('Common.Controllers.Plugins').getView('Common.Views.Plugins'));
-            } else
-                this.leftMenu.btnPlugins.hide();
             (this.mode.trialMode || this.mode.isBeta) && this.leftMenu.setDeveloperMode(this.mode.trialMode, this.mode.isBeta, this.mode.buildVersion);
         },
 

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

@@ -105,7 +105,10 @@ define([
                 var me = this,
                     styleNames = ['Normal', 'No Spacing', 'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Heading 5',
                                   'Heading 6', 'Heading 7', 'Heading 8', 'Heading 9', 'Title', 'Subtitle', 'Quote', 'Intense Quote', 'List Paragraph', 'footnote text',
-                                  'Caption', 'endnote text'],
+                                  'Caption', 'endnote text', 'Default Paragraph Font', 'No List', 'Intense Emphasis', 'Intense Reference',  'Subtle Emphasis', 'Emphasis',
+                                  'Strong', 'Subtle Reference', 'Book Title',  'footnote reference', 'endnote reference'],
+                    schemeNames = ['Aspect', 'Blue Green', 'Blue II', 'Blue Warm', 'Blue', 'Grayscale', 'Green Yellow', 'Green', 'Marquee', 'Median', 'Office 2007 - 2010', 'Office 2013 - 2022', 'Office',
+                                   'Orange Red', 'Orange', 'Paper', 'Red Orange', 'Red Violet', 'Red', 'Slipstream', 'Violet II', 'Violet', 'Yellow Orange', 'Yellow'],
                 translate = {
                     'Series': this.txtSeries,
                     'Diagram Title': this.txtDiagramTitle,
@@ -155,6 +158,9 @@ define([
                 styleNames.forEach(function(item){
                     translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
                 });
+                schemeNames.forEach(function(item){
+                    translate[item] = me['txtScheme_' + item.replace(/[ -]/g, '_')] || item;
+                });
                 me.translationTable = translate;
             },
 
@@ -461,7 +467,7 @@ define([
                 this.appOptions.canFeatureContentControl = true;
                 this.appOptions.canFeatureForms = !!this.api.asc_isSupportFeature("forms");
                 this.appOptions.isPDFForm = !!window.isPDFForm;
-                this.appOptions.uiRtl = !(Common.Controllers.Desktop.isActive() && Common.Controllers.Desktop.uiRtlSupported()) && !Common.Utils.isIE;
+                this.appOptions.uiRtl = Common.Locale.isCurrentLanguageRtl() && !(Common.Controllers.Desktop.isActive() && Common.Controllers.Desktop.uiRtlSupported()) && !Common.Utils.isIE;
                 this.appOptions.disableNetworkFunctionality = !!(window["AscDesktopEditor"] && window["AscDesktopEditor"]["isSupportNetworkFunctionality"] && false === window["AscDesktopEditor"]["isSupportNetworkFunctionality"]());
                 this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false));
                 this.appOptions.canSaveDocumentToBinary = this.editorConfig.canSaveDocumentToBinary;
@@ -573,9 +579,7 @@ define([
 
                 var type = data.doc ? /^(?:(docxf|oform)|(pdf))$/.exec(data.doc.fileType) : false;
                 this.appOptions.isFormCreator = !!(type && (typeof type[1] === 'string' || typeof type[2] === 'string' && this.appOptions.isPDFForm)) && this.appOptions.canFeatureForms; // show forms only for docxf or oform
-
-                type = data.doc ? /^(?:(oform))$/.exec(data.doc.fileType) : false;
-                this.appOptions.isOForm = !!(type && typeof type[1] === 'string');
+                this.appOptions.isOForm = !!(type && typeof type[1] === 'string'); // oform and docxf
 
                 this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this));
                 this.api.asc_registerCallback('asc_onLicenseChanged',       _.bind(this.onLicenseChanged, this));
@@ -1661,6 +1665,8 @@ define([
                 this.appOptions.showSaveButton = this.appOptions.isEdit || !this.appOptions.isRestrictedEdit && this.appOptions.isPDFForm; // save to file or save to file copy (for pdf-form viewer)
 
                 if (this.appOptions.isPDFForm && !this.appOptions.isEdit) {
+                    if (!this.appOptions.isRestrictedEdit && !this.appOptions.canEdit)
+                        this.appOptions.canRequestEditRights = false; // if open form in viewer - check permissions.edit option
                     this.appOptions.canFillForms = this.appOptions.isRestrictedEdit = true; // can fill forms in viewer!
                 }
 
@@ -1829,12 +1835,17 @@ define([
                         header: {docmode: !!disableModeButton}
                     }, 'view');
 
+                    if (mode==='view-form' || !!this.stackDisableActions.get({type: 'forms'})) {
+                        var forms = this.getApplication().getController('FormsTab');
+                        forms && forms.changeViewFormMode(mode==='view-form');
+                    }
+
                     if (mode==='edit') {
                         Common.NotificationCenter.trigger('reviewchanges:turn', false);
                     } else if (mode==='review') {
                         Common.NotificationCenter.trigger('reviewchanges:turn', true);
                     }
-                    this.api.asc_setRestriction(mode==='view' ? Asc.c_oAscRestrictionType.View : Asc.c_oAscRestrictionType.None);
+                    this.api.asc_setRestriction(mode==='view' ? Asc.c_oAscRestrictionType.View : mode==='view-form' ? Asc.c_oAscRestrictionType.OnlyForms : Asc.c_oAscRestrictionType.None);
                 }
                 (!inViewMode || force) && Common.NotificationCenter.trigger('doc:mode-changed', mode);
             },
@@ -3595,7 +3606,42 @@ define([
             textText: 'Text',
             warnLicenseBefore: 'License not active.<br>Please contact your administrator.',
             titleLicenseNotActive: 'License not active',
-            warnLicenseAnonymous: 'Access denied for anonymous users. This document will be opened for viewing only.'
+            warnLicenseAnonymous: 'Access denied for anonymous users. This document will be opened for viewing only.',
+            txtStyle_Default_Paragraph_Font: 'Default paragraph font',
+            txtStyle_No_List: 'No list',
+            txtStyle_Intense_Emphasis: 'Intense emphasis',
+            txtStyle_Intense_Reference: 'Intense reference',
+            txtStyle_Subtle_Emphasis: 'Subtle emphasis',
+            txtStyle_Emphasis: 'Emphasis',
+            txtStyle_Strong: 'Strong',
+            txtStyle_Subtle_Reference: 'Subtle reference',
+            txtStyle_Book_Title: 'Book Title',
+            txtStyle_footnote_reference: 'Footnote reference',
+            txtStyle_endnote_reference: 'Endnote reference',
+            txtScheme_Aspect: 'Aspect',
+            txtScheme_Blue_Green: 'Blue Green',
+            txtScheme_Blue_II: 'Blue II',
+            txtScheme_Blue_Warm: 'Blue Warm',
+            txtScheme_Blue: 'Blue',
+            txtScheme_Grayscale: 'Grayscale',
+            txtScheme_Green_Yellow: 'Green Yellow',
+            txtScheme_Green: 'Green',
+            txtScheme_Marquee: 'Marquee',
+            txtScheme_Median: 'Median',
+            txtScheme_Office_2007___2010: 'Office 2007 - 2010',
+            txtScheme_Office_2013___2022: 'Office 2013 - 2022',
+            txtScheme_Office: 'Office',
+            txtScheme_Orange_Red: 'Orange Red',
+            txtScheme_Orange: 'Orange',
+            txtScheme_Paper: 'Paper',
+            txtScheme_Red_Orange: 'Red Orange',
+            txtScheme_Red_Violet: 'Red Violet',
+            txtScheme_Red: 'Red',
+            txtScheme_Slipstream: 'Slipstream',
+            txtScheme_Violet_II: 'Violet II',
+            txtScheme_Violet: 'Violet',
+            txtScheme_Yellow_Orange: 'Yellow Orange',
+            txtScheme_Yellow: 'Yellow'
         }
     })(), DE.Controllers.Main || {}))
 });