Merge branch 'release/v7.0.0' into develop

apps/api/documents/api.js

@@ -929,18 +929,10 @@
             path_type;
 
         path += app + "/";
-        if (config.document && typeof config.document.fileType === 'string' && config.document.fileType.toLowerCase() === 'oform') {
+        path_type = (config.type === "mobile" || isSafari_mobile)
-            var canFillForms =  !config.document.permissions
+                    ? "mobile" : (config.type === "embedded")
-                                ? true : (config.document.permissions.fillForms===undefined)
+                    ? "embed" : (config.document && typeof config.document.fileType === 'string' && config.document.fileType.toLowerCase() === 'oform')
-                                ? (config.document.permissions.edit !== false) : config.document.permissions.fillForms;
+                    ? "forms" : "main";
-            path_type = (config.type === "mobile" || isSafari_mobile)
-                        ? "mobile" : (config.type === "embedded" || !canFillForms || config.editorConfig.mode === 'view')
-                        ? "embed" : "forms";
-        } else {
-            path_type = (config.type === "mobile" || isSafari_mobile)
-                        ? "mobile" : (config.type === "embedded")
-                        ? "embed" : "main";
-        }
 
         path += path_type;
         var index = "/index.html";

apps/common/forms/resources/img/icon-menu-sprite.svg

@@ -1,4 +1,4 @@
-<svg width="440" height="40" viewBox="0 0 440 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="480" height="40" viewBox="0 0 480 40" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g id="icon-menu-sprite Embedded Viewer">
 <g id="view-settings">
 <path id="Vector" d="M17 26H3V27H17V26Z" fill="white"/>
@@ -172,5 +172,17 @@
 <g id="paste_2">
     <path id="Union_30" fill-rule="evenodd" clip-rule="evenodd" d="M426 23H432V24H434C434.552 24 435 24.4477 435 25V27H434V25H432V26H426V25H424V32H426V33H424C423.448 33 423 32.5523 423 32V25C423 24.4477 423.448 24 424 24H426V23ZM436 36V29H428V36H436ZM428 28C427.448 28 427 28.4477 427 29V36C427 36.5523 427.448 37 428 37H436C436.552 37 437 36.5523 437 36V29C437 28.4477 436.552 28 436 28H428ZM429 31V30H435V31H429ZM435 32H429V33H435V32ZM429 35V34H435V35H429Z" fill="white"/>
 </g>
+<g id="redo">
+<path id="Vector" d="M469.1 7C471.1 7 473.2 8.3 474.5 9.5L477 7V14H470L472.5 11.5C471.7 10.2 469.9 9.1 468.2 9.1C465.7 9.1 462.8 10.8 462.5 13.2C462.9 9.7 465.5 7 469.1 7Z" fill="black"/>
+</g>
+<g id="redo_2">
+<path id="Vector_2" d="M469.1 27C471.1 27 473.2 28.3 474.5 29.5L477 27V34H470L472.5 31.5C471.7 30.2 469.9 29.1 468.2 29.1C465.7 29.1 462.8 30.8 462.5 33.2C462.9 29.7 465.5 27 469.1 27Z" fill="white"/>
+</g>
+<g id="undo">
+<path id="Vector_3" d="M450.9 7C448.9 7 446.8 8.3 445.5 9.5L443 7V14H450L447.5 11.5C448.3 10.2 450.1 9.1 451.8 9.1C454.3 9.1 457.2 10.8 457.5 13.2C457.1 9.7 454.5 7 450.9 7Z" fill="black"/>
+</g>
+<g id="undo_2">
+<path id="Vector_4" d="M450.9 27C448.9 27 446.8 28.3 445.5 29.5L443 27V34H450L447.5 31.5C448.3 30.2 450.1 29.1 451.8 29.1C454.3 29.1 457.2 30.8 457.5 33.2C457.1 29.7 454.5 27 450.9 27Z" fill="white"/>
+</g>
 </g>
 </svg>

apps/common/forms/resources/less/common.less

@@ -67,6 +67,7 @@
 @import "../../../../common/main/resources/less/dropdown-submenu.less";
 @import "../../../../common/main/resources/less/separator.less";
 @import "../../../../common/main/resources/less/input.less";
+@import "../../../../common/main/resources/less/combobox.less";
 @import "../../../../common/main/resources/less/window.less";
 @import "../../../../common/main/resources/less/loadmask.less";
 @import "../../../../common/main/resources/less/dataview.less";
@@ -78,6 +79,7 @@
 @import "../../../../common/main/resources/less/calendar.less";
 @import "../../../../common/main/resources/less/spinner.less";
 @import "../../../../common/main/resources/less/checkbox.less";
+@import "../../../../common/main/resources/less/opendialog.less";
 
 @toolbarBorderColor:            @border-toolbar-ie;
 @toolbarBorderColor:            @border-toolbar;
@@ -436,7 +438,7 @@
 
 .svg-icon {
     background: data-uri('../../../../common/forms/resources/img/icon-menu-sprite.svg') no-repeat;
-    background-size: @icon-width*22 @icon-height*2;
+    background-size: @icon-width*24 @icon-height*2;
 
     &.download {
         background-position: -@icon-width 0;
@@ -512,6 +514,14 @@
         background-position: -@icon-width*21 0;
         background-position: -@icon-width*21 @icon-normal-top;
     }
+    &.undo {
+        background-position: -@icon-width*22 0;
+        background-position: -@icon-width*22 @icon-normal-top;
+    }
+    &.redo {
+        background-position: -@icon-width*23 0;
+        background-position: -@icon-width*23 @icon-normal-top;
+    }
 }
 
 .btn {
@@ -590,11 +600,13 @@
     display: inline-block;
     line-height: 22px;
     padding: 0 0 0 3px;
+    vertical-align: middle;
 }
 
 #page-number {
     .masked {
         cursor: pointer;
+        line-height: 22px;
     }
 }
 

apps/common/locale.js

@@ -99,6 +99,7 @@ Common.Locale = new(function() {
     };
 
     var _requireLang = function (l) {
+        typeof l != 'string' && (l = null);
         var lang = (l || _getUrlParameterByName('lang') || defLang).split(/[\-_]/)[0];
         currentLang = lang;
         fetch('locale/' + lang + '.json')

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

@@ -229,8 +229,10 @@ define([
                         me.onAfterHideMenu(e);
                     }, 10);
                 } else if (e.keyCode != Common.UI.Keys.RETURN && e.keyCode != Common.UI.Keys.CTRL && e.keyCode != Common.UI.Keys.SHIFT && e.keyCode != Common.UI.Keys.ALT && e.keyCode != Common.UI.Keys.TAB){
-                    if (!this.isMenuOpen() && !e.ctrlKey)
+                    if (!this.isMenuOpen() && !e.ctrlKey) {
                         this.openMenu();
+                        (this.recent > 0) && this.flushVisibleFontsTiles();
+                    }
 
                     if (e.keyCode == Common.UI.Keys.UP || e.keyCode == Common.UI.Keys.DOWN) {
                         _.delay(function() {

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

@@ -154,8 +154,14 @@ define([
                     }
                     top = (top!==undefined) ? (top + 'px') : 'auto';
                     bottom = (bottom!==undefined) ? (bottom + 'px') : 'auto';
-                    left = (left!==undefined) ? (left + 'px') : 'auto';
                     right = (right!==undefined) ? (right + 'px') : 'auto';
+                    if (left!==undefined) {
+                        var width = this.cmpEl.width();
+                        if (left+width>Common.Utils.innerWidth())
+                            left = Common.Utils.innerWidth() - width - 10;
+                        left = (left + 'px');
+                    } else
+                        left = 'auto';
                     this.cmpEl.css({top : top, left: left, right: right, bottom: bottom});
                 }
             },

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

@@ -177,11 +177,11 @@ define([
                             lockDrag = true;
                         }
                     });
-                    if (((this.bar.selectTabs.length === this.bar.tabs.length || this.bar.tabs.length === 1) && !(e.ctrlKey || e.metaKey)) || this.bar.isEditFormula) {
+                    if (((this.bar.selectTabs.length === this.bar.tabs.length || this.bar.tabs.length === 1) && !(e.ctrlKey || (Common.Utils.isMac && e.altKey))) || this.bar.isEditFormula) {
                         lockDrag = true;
                     }
                     // move last selected sheet if all sheets are selected
-                    if (this.bar.selectTabs.length === this.bar.tabs.length && this.bar.tabs.length > 1 && !e.ctrlKey && !e.metaKey) {
+                    if (this.bar.selectTabs.length === this.bar.tabs.length && this.bar.tabs.length > 1 && !e.ctrlKey && !(Common.Utils.isMac && e.altKey)) {
                         lockDrag = false;
                         this.bar.$el.find('ul > li.selected').removeClass('selected');
                     }
@@ -221,7 +221,7 @@ define([
                 if (!this.bar.isEditFormula) {
                     this.bar.$el.find('.mousemove').removeClass('mousemove right');
                     $(e.currentTarget).parent().addClass('mousemove');
-                    event.dataTransfer.dropEffect = event.metaKey || event.ctrlKey ? 'copy' : 'move';
+                    event.dataTransfer.dropEffect = (event.ctrlKey || Common.Utils.isMac && event.altKey) ? 'copy' : 'move';
                 } else {
                     event.dataTransfer.dropEffect = 'none';
                 }
@@ -234,7 +234,7 @@ define([
                 if (!this.bar.isEditFormula) {
                     this.bar.$el.find('.mousemove').removeClass('mousemove right');
                     $(e.currentTarget).parent().addClass('mousemove');
-                    event.dataTransfer.dropEffect = event.metaKey || event.ctrlKey ? 'copy' : 'move';
+                    event.dataTransfer.dropEffect = (event.ctrlKey || Common.Utils.isMac && event.altKey) ? 'copy' : 'move';
                 } else {
                     event.dataTransfer.dropEffect = 'none';
                 }
@@ -244,6 +244,9 @@ define([
                 $(e.currentTarget).parent().removeClass('mousemove right');
             }, this),
             dragend: $.proxy(function (e) {
+                if (Common.Utils.isMac && e.altKey) { // don't show alt hints after copy by drag and drop
+                    this.bar.isDragDrop = true;
+                }
                 var event = e.originalEvent;
                 if (event.dataTransfer.dropEffect === 'move' && !event.dataTransfer.mozUserCancelled) {
                     this.bar.trigger('tab:dragend', true);
@@ -253,10 +256,13 @@ define([
                 this.bar.$el.find('.mousemove').removeClass('mousemove right');
             }, this),
             drop: $.proxy(function (e) {
+                if (Common.Utils.isMac && e.altKey) { // don't show alt hints after copy by drag and drop
+                    this.bar.isDragDrop = true;
+                }
                 var event = e.originalEvent,
                     index = $(event.currentTarget).data('index');
                 this.bar.$el.find('.mousemove').removeClass('mousemove right');
-                this.bar.trigger('tab:drop', event.dataTransfer, index, event.ctrlKey || event.metaKey);
+                this.bar.trigger('tab:drop', event.dataTransfer, index, (event.ctrlKey || Common.Utils.isMac && event.altKey));
                 this.bar.isDrop = true;
             }, this)
         });
@@ -299,7 +305,7 @@ define([
             }, this));
             addEvent(this.$bar[0], 'dragenter', _.bind(function (event) {
                 if (!this.isEditFormula) {
-                    event.dataTransfer.dropEffect = event.metaKey || event.ctrlKey ? 'copy' : 'move';
+                    event.dataTransfer.dropEffect = (event.ctrlKey || Common.Utils.isMac && event.altKey) ? 'copy' : 'move';
                 } else {
                     event.dataTransfer.dropEffect = 'none';
                 }
@@ -308,7 +314,7 @@ define([
                 if (event.preventDefault) {
                     event.preventDefault(); // Necessary. Allows us to drop.
                 }
-                event.dataTransfer.dropEffect = !this.isEditFormula ? (event.metaKey || event.ctrlKey ? 'copy' : 'move') : 'none';
+                event.dataTransfer.dropEffect = !this.isEditFormula ? ((event.ctrlKey || Common.Utils.isMac && event.altKey) ? 'copy' : 'move') : 'none';
                 !this.isEditFormula && this.tabs[this.tabs.length - 1].$el.addClass('mousemove right');
                 return false;
             }, this));
@@ -319,7 +325,10 @@ define([
             addEvent(this.$bar[0], 'drop', _.bind(function (event) {
                 this.$el.find('.mousemove').removeClass('mousemove right');
                 if (this.isDrop === undefined) {
-                    this.trigger('tab:drop', event.dataTransfer, 'last', event.ctrlKey || event.metaKey);
+                    if (Common.Utils.isMac && event.altKey) { // don't show alt hints after copy by drag and drop
+                        this.isDragDrop = true;
+                    }
+                    this.trigger('tab:drop', event.dataTransfer, 'last', (event.ctrlKey || Common.Utils.isMac && event.altKey));
                 } else {
                     this.isDrop = undefined;
                 }

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

@@ -60,8 +60,10 @@ define([
             'btn-save-coauth': 'coauth',
             'btn-synch': 'synch' };
 
+        var is_win_xp = window.RendererProcessVariable && window.RendererProcessVariable.os === 'winxp';
 
         if ( !!native ) {
+            native.features = {};
             window.on_native_message = function (cmd, param) {
                 if (/^style:change/.test(cmd)) {
                     var obj = JSON.parse(param);
@@ -88,7 +90,12 @@ define([
                         Common.Utils.InternalSettings.set('window-inactive-area-top', obj.skiptoparea);
                     } else
                     if ( obj.lockthemes != undefined ) {
-                        Common.UI.Themes.setAvailable(!obj.lockthemes);
+                        // TODO: remove after 7.0.2. depricated. used is_win_xp variable instead
+                        // Common.UI.Themes.setAvailable(!obj.lockthemes);
+                    } else
+                    if ( obj.singlewindow !== undefined ) {
+                        $('#box-document-title .hedset')[obj.singlewindow ? 'hide' : 'show']();
+                        native.features.singlewindow = obj.singlewindow;
                     }
                 } else
                 if (/editor:config/.test(cmd)) {
@@ -185,6 +192,7 @@ define([
                 _.extend(config, opts);
 
                 if ( config.isDesktopApp ) {
+                    Common.UI.Themes.setAvailable(!is_win_xp);
                     Common.NotificationCenter.on('app:ready', function (opts) {
                         _.extend(config, opts);
                         !!native && native.execCommand('doc:onready', '');
@@ -240,6 +248,10 @@ define([
                             config.callback_editorconfig();
                             delete config.callback_editorconfig;
                         }
+
+                        if ( native.features.singlewindow !== undefined ) {
+                            $('#box-document-title .hedset')[native.features.singlewindow ? 'hide' : 'show']();
+                        }
                     });
 
                     Common.NotificationCenter.on({
@@ -255,8 +267,12 @@ define([
                     webapp.addListeners({
                         'FileMenu': {
                             'item:click': function (menu, action, isopts) {
-                                if ( action == 'app:exit' ) {
+                                if ( action == 'file:exit' ) {
-                                    native.execCommand('editor:event', JSON.stringify({action: 'close'}));
+                                    native.execCommand('editor:event', JSON.stringify({action: 'file:close'}));
+                                    menu.hide();
+                                } else
+                                if ( action == 'file:open' ) {
+                                    native.execCommand('editor:event', JSON.stringify({action: 'file:open'}));
                                     menu.hide();
                                 }
                             },
@@ -287,7 +303,7 @@ define([
             },
             requestClose: function () {
                 if ( config.isDesktopApp && !!native ) {
-                    native.execCommand('editor:event', JSON.stringify({action:'close', url: config.customization.goback.url}));
+                    native.execCommand('editor:event', JSON.stringify({action:'file:close', url: config.customization.goback.url}));
                 }
             },
             isActive: function () {

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

@@ -115,18 +115,25 @@ Common.UI.HintManager = new(function() {
         _isComplete = false,
         _isLockedKeyEvents = false,
         _inputTimer,
-        _isDocReady = false;
+        _isDocReady = false,
+        _isEditDiagram = false;
 
     var _api;
 
-    var _setCurrentSection = function (btn) {
+    var _setCurrentSection = function (btn, section) {
+        if (section) {
+            _currentSection = section;
+            return;
+        }
         if (btn === 'esc') {
             if (_currentLevel === 0) {
                 _currentSection = document;
             }
             return;
         }
-        if ($('#file-menu-panel').is(':visible')) {
+        if (_isEditDiagram) {
+            _currentSection = [$(window.parent.document).find('.advanced-settings-dlg')[0], window.document];
+        } else if ($('#file-menu-panel').is(':visible')) {
             _currentSection = $('#file-menu-panel');
         } else {
             _currentSection = (btn && btn.closest('.hint-section')) || document;
@@ -142,7 +149,7 @@ Common.UI.HintManager = new(function() {
 
     var _showHints = function () {
         _inputLetters = '';
-        if (_currentHints.length === 0 || ($('#file-menu-panel').is(':visible') && _currentLevel === 1)) {
+        if (_currentHints.length === 0 || ($('#file-menu-panel').is(':visible' || _isEditDiagram) && _currentLevel === 1)) {
             _getHints();
         }
         if (_currentHints.length > 0) {
@@ -164,16 +171,20 @@ Common.UI.HintManager = new(function() {
     var _hideHints = function() {
         _hintVisible = false;
         _currentHints && _currentHints.forEach(function(item) {
-            item.hide()
+            item.remove()
         });
         clearInterval(_inputTimer);
     };
 
-    var _nextLevel = function() {
+    var _nextLevel = function(level) {
         _removeHints();
         _currentHints.length = 0;
         _currentControls.length = 0;
-        _currentLevel++;
+        if (level !== undefined) {
+            _currentLevel = level;
+        } else {
+            _currentLevel++;
+        }
     };
 
     var _prevLevel = function() {
@@ -198,16 +209,40 @@ Common.UI.HintManager = new(function() {
 
     var _getControls = function() {
         _currentControls = [];
-        var arr = $(_currentSection).find('[data-hint=' + (_currentLevel) + ']').toArray();
+        var arr = [],
+            arrItemsWithTitle = [];
+        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());
+            });
+        } else {
+            arr = $(_currentSection).find('[data-hint=' + (_currentLevel) + ']').toArray();
+            arrItemsWithTitle = $(_currentSection).find('[data-hint-title][data-hint=' + (_currentLevel) + ']').toArray();
+        }
         var visibleItems = arr.filter(function (item) {
             return $(item).is(':visible');
         });
-        var visibleItemsWithTitle = $(_currentSection).find('[data-hint-title][data-hint=' + (_currentLevel) + ']').toArray().filter(function (item) {
+        var visibleItemsWithTitle = arrItemsWithTitle.filter(function (item) {
             return $(item).is(':visible');
         });
         if (visibleItems.length === visibleItemsWithTitle.length) { // all buttons have data-hint-title
             visibleItems.forEach(function (item) {
                 var el = $(item);
+                if (_lang !== 'en') {
+                    var title = el.attr('data-hint-title').toLowerCase(),
+                        firstLetter = title.substr(0, 1);
+                    if (_arrAlphabet.indexOf(firstLetter) === -1) { // tip is in English
+                        var newTip = '';
+                        for (var i = 0; i < title.length; i++) {
+                            var letter = title.substr(i, 1),
+                                ind = _arrEnAlphabet.indexOf(letter);
+                            newTip = newTip + _arrAlphabet[ind].toUpperCase();
+                        }
+                        el.attr('data-hint-title', newTip);
+                    }
+
+                }
                 _currentControls.push(el);
             });
             return;
@@ -219,7 +254,7 @@ Common.UI.HintManager = new(function() {
             _arrLetters = _arrAlphabet.slice();
         }
         var usedLetters = [];
-        if ($(_currentSection).find('[data-hint-title]').length > 0) {
+        if (arrItemsWithTitle.length > 0) {
             visibleItems.forEach(function (item) {
                 var el = $(item);
                 var title = el.attr('data-hint-title');
@@ -252,10 +287,11 @@ Common.UI.HintManager = new(function() {
     };
 
     var _getHints = function() {
-        var docH = Common.Utils.innerHeight() - 20,
+        var docH = _isEditDiagram ? (window.parent.innerHeight * Common.Utils.zoom()) : (Common.Utils.innerHeight() - 20),
-            docW = Common.Utils.innerWidth(),
+            docW = _isEditDiagram ? (window.parent.innerWidth * Common.Utils.zoom()) : (Common.Utils.innerWidth()),
-            topSection = _currentLevel !== 0 && $(_currentSection).length > 0 ? $(_currentSection).offset().top : 0,
+            section = _isEditDiagram ? _currentSection[0] : _currentSection,
-            bottomSection = _currentLevel !== 0 && $(_currentSection).length > 0 ? topSection + $(_currentSection).height() : docH;
+            topSection = _currentLevel !== 0 && $(section).length > 0 && !_isEditDiagram ? $(section).offset().top : 0,
+            bottomSection = _currentLevel !== 0 && $(section).length > 0 && !_isEditDiagram ? topSection + $(section).height() : docH;
 
         if (_currentControls.length === 0)
             _getControls();
@@ -263,7 +299,8 @@ Common.UI.HintManager = new(function() {
             if (!_isItemDisabled(item)) {
                 var leftBorder = 0,
                     rightBorder = docW;
-                if ($(_currentSection).prop('id') === 'toolbar' && ($(_currentSection).find('.toolbar-mask').length > 0 || item.closest('.group').find('.toolbar-group-mask').length > 0)) {
+                if (!_isEditDiagram && $(_currentSection).prop('id') === 'toolbar' && ($(_currentSection).find('.toolbar-mask').length > 0 || item.closest('.group').find('.toolbar-group-mask').length > 0)
+                    || ($('#about-menu-panel').is(':visible') && item.closest('.hint-section').prop('id') === 'right-menu')) { // don't show right menu hints when about is visible
                     return;
                 }
                 if (window.SSE && item.parent().prop('id') === 'statusbar_bottom') {
@@ -284,7 +321,7 @@ Common.UI.HintManager = new(function() {
                 var hint = $('<div style="" class="hint-div">' + item.attr('data-hint-title') + '</div>');
                 var direction = item.attr('data-hint-direction');
                 // exceptions
-                if (window.SSE && _currentSection.nodeType !== 9 &&
+                if (window.SSE && !_isEditDiagram && _currentSection.nodeType !== 9 &&
                     _currentSection.prop('id') === 'toolbar' && item.closest('.panel').attr('data-tab') === 'data') {
                     if (item.parent().hasClass('slot-sortdesc') || item.parent().hasClass('slot-btn-setfilter')) {
                         direction = 'top';
@@ -344,7 +381,12 @@ Common.UI.HintManager = new(function() {
                         top: top,
                         left: left
                     });
-                    $(document.body).append(hint);
+                    if (_isEditDiagram && index < 2) {
+                        hint.css('z-index', '1060');
+                        $(window.parent.document.body).append(hint);
+                    } else {
+                        $(document.body).append(hint);
+                    }
                 }
 
                 _currentHints.push(hint);
@@ -359,7 +401,7 @@ Common.UI.HintManager = new(function() {
     };
 
     var _resetToDefault = function() {
-        _currentLevel = $('#file-menu-panel').is(':visible') ? 1 : 0;
+        _currentLevel = ($('#file-menu-panel').is(':visible') || _isEditDiagram) ? 1 : 0;
         _setCurrentSection();
         _currentHints.length = 0;
         _currentControls.length = 0;
@@ -383,11 +425,11 @@ Common.UI.HintManager = new(function() {
             _clearHints();
         });
         $(document).on('keyup', function(e) {
-            if (e.keyCode == Common.UI.Keys.ALT && _needShow) {
+            if (e.keyCode == Common.UI.Keys.ALT && _needShow && !(window.SSE && window.SSE.getController('Statusbar').getIsDragDrop())) {
                 e.preventDefault();
                 if (!_hintVisible) {
                     $('input:focus').blur(); // to change value in inputField
-                    _currentLevel = $('#file-menu-panel').is(':visible') ? 1 : 0;
+                    _currentLevel = ($('#file-menu-panel').is(':visible') || _isEditDiagram) ? 1 : 0;
                     _setCurrentSection();
                     _showHints();
                 } else {
@@ -407,16 +449,19 @@ Common.UI.HintManager = new(function() {
             if (_hintVisible) {
                 e.preventDefault();
                 if (e.keyCode == Common.UI.Keys.ESC ) {
-                    if (_currentLevel === 0) {
+                    setTimeout(function () {
-                        _hideHints();
+                        if (_currentLevel === 0) {
-                        _lockedKeyEvents(false);
+                            _hideHints();
-                    } else {
+                            _lockedKeyEvents(false);
-                        _prevLevel();
+                        } else {
-                        _setCurrentSection('esc');
+                            _prevLevel();
-                        _showHints();
+                            _setCurrentSection('esc');
-                    }
+                            _showHints();
+                        }
+                    }, 10);
                 } else {
-                    var curLetter = null;
+                    var curLetter = null,
+                        match = false;
                     var keyCode = e.keyCode;
                     if (keyCode !== 16 && keyCode !== 17 && keyCode !== 18 && keyCode !== 91) {
                         curLetter = _lang === 'en' ? ((keyCode > 47 && keyCode < 58 || keyCode > 64 && keyCode < 91) ? String.fromCharCode(e.keyCode) : null) : e.key;
@@ -432,9 +477,16 @@ Common.UI.HintManager = new(function() {
                         _inputLetters = _inputLetters + curLetter.toUpperCase();
                         for (var i = 0; i < _currentControls.length; i++) {
                             var item = _currentControls[i];
-                            if (!_isItemDisabled(item) && item.attr('data-hint-title') === _inputLetters) {
+                            if (!_isItemDisabled(item)) {
-                                curr = item;
+                                var title = item.attr('data-hint-title'),
-                                break;
+                                    regExp = new RegExp('^' + _inputLetters + '');
+                                if (regExp.test(title)) {
+                                    match = true;
+                                }
+                                if (title === _inputLetters) {
+                                    curr = item;
+                                    break;
+                                }
                             }
                         }
                         if (curr) {
@@ -451,12 +503,13 @@ Common.UI.HintManager = new(function() {
                             } else {
                                 _isComplete = false;
                                 _hideHints();
-                                if ($(_currentSection).prop('id') === 'toolbar' && ($(_currentSection).find('.toolbar-mask').length > 0 || curr.closest('.group').find('.toolbar-group-mask').length > 0)) {
+                                if (!_isEditDiagram && $(_currentSection).prop('id') === 'toolbar' && ($(_currentSection).find('.toolbar-mask').length > 0 || curr.closest('.group').find('.toolbar-group-mask').length > 0)) {
                                     _resetToDefault();
                                     return;
                                 }
-                                var needOpenPanel = (curr.attr('content-target') && !$('#' + curr.attr('content-target')).is(':visible'));
+                                var needOpenPanel = (curr.attr('content-target') && !$('#' + curr.attr('content-target')).is(':visible') ||
-                                if (!curr.attr('content-target') || needOpenPanel) { // need to open panel
+                                    (curr.parent().prop('id') === 'slot-btn-chat' && !$('#left-panel-chat').is(':visible')));
+                                if ((!curr.attr('content-target') && curr.parent().prop('id') !== 'slot-btn-chat') || needOpenPanel) { // need to open panel
                                     if (!($('#file-menu-panel').is(':visible') && (curr.parent().prop('id') === 'fm-btn-info' && $('#panel-info').is(':visible') ||
                                         curr.parent().prop('id') === 'fm-btn-settings' && $('#panel-settings').is(':visible')))) {
                                         if (curr.attr('for')) { // to trigger event in checkbox
@@ -470,7 +523,8 @@ Common.UI.HintManager = new(function() {
                                 }
                                 if (curr.prop('id') === 'btn-goback' || curr.closest('.btn-slot').prop('id') === 'slot-btn-options' ||
                                     curr.closest('.btn-slot').prop('id') === 'slot-btn-mode' || curr.prop('id') === 'btn-favorite' || curr.parent().prop('id') === 'tlb-box-users' ||
-                                    curr.prop('id') === 'left-btn-thumbs' || curr.hasClass('scroll')) {
+                                    curr.prop('id') === 'left-btn-thumbs' || curr.hasClass('scroll') || curr.prop('id') === 'left-btn-about' ||
+                                    curr.prop('id') === 'left-btn-support') {
                                     _resetToDefault();
                                     return;
                                 }
@@ -482,20 +536,34 @@ Common.UI.HintManager = new(function() {
                                     return;
                                 }
                                 if (!_isComplete) {
-                                    _nextLevel();
+                                    if (curr.parent().prop('id') === 'slot-btn-chat') {
-                                    _setCurrentSection(curr);
+                                        _nextLevel(1);
+                                        _setCurrentSection(undefined, $('#left-menu.hint-section'));
+                                    } else if (curr.prop('id') === 'id-right-menu-signature') {
+                                        _nextLevel(2);
+                                        _setCurrentSection(curr);
+                                    } else {
+                                        _nextLevel();
+                                        _setCurrentSection(curr);
+                                    }
                                     _showHints();
                                     if (_currentHints.length < 1) {
                                         _resetToDefault();
                                     }
                                 }
                             }
+                        } else if (!match) {
+                            _inputLetters = '';
                         }
                     }
                 }
             }
 
-            _needShow = (e.keyCode == Common.UI.Keys.ALT && !Common.Utils.ModalWindow.isVisible() && _isDocReady);
+            var isAlt = e.keyCode == Common.UI.Keys.ALT;
+            _needShow = (isAlt && !Common.Utils.ModalWindow.isVisible() && _isDocReady && _arrAlphabet.length > 0);
+            if (isAlt) {
+                e.preventDefault();
+            }
         });
     };
 
@@ -531,14 +599,26 @@ Common.UI.HintManager = new(function() {
         if (isComplete) {
             _isComplete = true;
         }
+
+        if ($('.hint-div').length > 0) {
+            $('.hint-div').remove();
+        }
+        if ($('iframe').length > 0) {
+            $('iframe').contents().find('.hint-div').remove();
+        }
     };
 
     var _isHintVisible = function () {
         return _hintVisible;
     };
 
+    var _setMode = function (mode) {
+        _isEditDiagram = mode.isEditDiagram;
+    };
+
     return {
         init: _init,
+        setMode: _setMode,
         clearHints: _clearHints,
         needCloseFileMenu: _needCloseFileMenu,
         isHintVisible: _isHintVisible

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

@@ -917,6 +917,8 @@ define([
         applySettings: function(menu) {
             this.view && this.view.turnSpelling( Common.localStorage.getBool(this.view.appPrefix + "settings-spellcheck", true) );
             this.view && this.view.turnCoAuthMode( Common.localStorage.getBool(this.view.appPrefix + "settings-coauthmode", true) );
+            if ((this.appConfig.canReview || this.appConfig.canViewReview) && this.appConfig.reviewHoverMode)
+                this.onApiShowChange();
         },
 
         synchronizeChanges: function() {

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

@@ -34,6 +34,7 @@ define([
             window.currentLoaderTheme = undefined;
         }
 
+        var is_dark_mode_allowed = true;
         var id_default_light_theme = 'theme-classic-light',
             id_default_dark_theme = 'theme-dark';
 
@@ -53,6 +54,7 @@ define([
             "background-loader",
             "background-accent-button",
             "background-contrast-popover",
+            "shadow-contrast-popover",
 
             "highlight-button-hover",
             "highlight-button-pressed",
@@ -174,10 +176,13 @@ define([
         }
 
         var parse_themes_object = function (obj) {
+            var curr_lang = Common.Locale.getCurrentLanguage(),
+                theme_label;
             if ( !!obj.themes && obj.themes instanceof Array ) {
                 obj.themes.forEach(function (item) {
                     if ( !!item.id ) {
-                        themes_map[item.id] = {text: item.name, type: item.type};
+                        theme_label = !item.l10n || !item.l10n[curr_lang] ? item.name : item.l10n[curr_lang];
+                        themes_map[item.id] = {text: theme_label, type: item.type};
                         write_theme_css(create_colors_css(item.id, item.colors));
                     } else
                     if ( typeof item == 'string' ) {
@@ -186,7 +191,8 @@ define([
                 });
             } else
             if ( obj.id ) {
-                themes_map[obj.id] = {text: obj.name, type: obj.type};
+                theme_label = !obj.l10n || !obj.l10n[curr_lang] ? obj.name : obj.l10n[curr_lang];
+                themes_map[obj.id] = {text: theme_label, type: obj.type};
                 write_theme_css( create_colors_css(obj.id, obj.colors) );
             }
         }
@@ -244,13 +250,30 @@ define([
             return objtheme;
         }
 
+        var on_document_open = function (data) {
+            var document = data.doc;
+            is_dark_mode_allowed = !/^pdf|djvu|xps|oxps$/.test(document.fileType);
+            if ( is_dark_mode_allowed ) {
+                if ( !!this.api.asc_setContentDarkMode && this.isDarkTheme() ) {
+                    this.api.asc_setContentDarkMode(this.isContentThemeDark());
+                }
+            }
+        };
+
         return {
             init: function (api) {
                 var me = this;
 
+                Common.Gateway.on('opendocument', on_document_open.bind(this));
                 $(window).on('storage', function (e) {
                     if ( e.key == 'ui-theme' || e.key == 'ui-theme-id' ) {
-                        me.setTheme(e.originalEvent.newValue, true);
+                        if ( !!e.originalEvent.newValue ) {
+                            me.setTheme(e.originalEvent.newValue, true);
+                        }
+                    } else
+                    if ( e.key == 'content-theme' ) {
+                        me.setContentTheme(e.originalEvent.newValue, true);
+                        console.log('changed content', e.originalEvent.newValue);
                     }
                 })
 
@@ -289,10 +312,6 @@ define([
                 obj.name = theme_name;
                 api.asc_setSkin(obj);
 
-                if ( !!this.api.asc_setContentDarkMode && this.isDarkTheme() ) {
-                    this.api.asc_setContentDarkMode(this.isContentThemeDark());
-                }
-
                 Common.NotificationCenter.on('document:ready', on_document_ready.bind(this));
             },
 
@@ -334,6 +353,22 @@ define([
                 return Common.localStorage.getItem("content-theme") == 'dark';
             },
 
+            setContentTheme: function (mode, force) {
+                var set_dark = mode == 'dark';
+                if ( set_dark && !this.isDarkTheme() )
+                    return;
+
+                if ( set_dark != this.isContentThemeDark() || force ) {
+                    if ( this.api.asc_setContentDarkMode )
+                        this.api.asc_setContentDarkMode(set_dark);
+
+                    if ( Common.localStorage.getItem('content-theme') != mode )
+                        Common.localStorage.setItem('content-theme', mode);
+
+                    Common.NotificationCenter.trigger('contenttheme:dark', set_dark);
+                }
+            },
+
             toggleContentTheme: function () {
                 var is_current_dark = this.isContentThemeDark();
                 is_current_dark ? Common.localStorage.setItem('content-theme', 'light') : Common.localStorage.setItem('content-theme', 'dark');
@@ -345,13 +380,15 @@ define([
             },
 
             setTheme: function (obj, force) {
+                if ( !obj ) return;
+
                 var id = get_ui_theme_name(obj);
                 if ( (this.currentThemeId() != id || force) && !!themes_map[id] ) {
                     document.body.className = document.body.className.replace(/theme-[\w-]+\s?/gi, '').trim();
                     document.body.classList.add(id, 'theme-type-' + themes_map[id].type);
 
                     if ( this.api ) {
-                        if ( this.api.asc_setContentDarkMode )
+                        if ( this.api.asc_setContentDarkMode && is_dark_mode_allowed )
                             if ( themes_map[id].type == 'light' ) {
                                 this.api.asc_setContentDarkMode(false);
                             } else {

apps/common/main/lib/template/CommentsPanel.template

@@ -7,8 +7,8 @@
         <div class="inner-ct">
             <textarea id="comment-msg-new" class="user-select textarea-control" placeholder="<%=textEnterCommentHint%>" maxlength="<%=maxCommLength%>" data-hint="1" data-hint-direction="left-top"></textarea>
         </div>
-        <button class="btn add normal dlg-btn primary" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%=textAddComment%></button>
+        <button class="btn add normal dlg-btn primary" data-hint="1" data-hint-direction="bottom" data-hint-offset="big" style="width: auto;min-width: 86px;"><%=textAddComment%></button>
-        <button class="btn cancel normal dlg-btn" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%=textCancel%></button>
+        <button class="btn cancel normal dlg-btn" data-hint="1" data-hint-direction="bottom" data-hint-offset="big" style="width: auto;min-width: 86px;"><%=textCancel%></button>
     </div>
     <div id="comments-header" class="">
         <label><%=textComments%></label>

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

@@ -52,6 +52,9 @@ var checkLocalStorage = (function () {
     }
 })();
 
+!window.desktop && !!window.AscDesktopEditor &&
+    (window.desktop = window.AscDesktopEditor);
+
 if ( window.desktop && !!window.RendererProcessVariable ) {
     var theme = window.RendererProcessVariable.theme
 

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

@@ -62,8 +62,8 @@ define([
                 '</div>',
                 '<div class="separator horizontal"></div>',
                 '<div class="footer" style="text-align: center;">',
-                    '<button id="id-btn-diagram-editor-apply" class="btn normal dlg-btn primary custom" result="ok">' + this.textSave + '</button>',
+                    '<button id="id-btn-diagram-editor-apply" class="btn normal dlg-btn primary custom" result="ok" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textSave + '</button>',
-                    '<button id="id-btn-diagram-editor-cancel" class="btn normal dlg-btn" result="cancel">' + this.textClose + '</button>',
+                    '<button id="id-btn-diagram-editor-cancel" class="btn normal dlg-btn" result="cancel" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textClose + '</button>',
                 '</div>'
             ].join('');
 

apps/common/main/resources/alphabetletters/alphabetletters.json

@@ -1,4 +1,4 @@
 {
   "en": ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"],
-  "ru": ["а", "б", "в", "г", "д", "е", "ё", "ж", "з", "и", "й", "к", "л", "м", "н", "о", "п", "р", "с", "т", "у", "ф", "х", "ц", "ч", "ш", "щ", "э", "ю", "я"]
+  "ru": ["а", "б", "в", "г", "д", "е", "ж", "з", "и", "й", "к", "л", "м", "н", "о", "п", "р", "с", "т", "у", "ф", "х", "ц", "ч", "ш", "щ", "э", "ю", "я"]
 }

apps/common/main/resources/alphabetletters/qwertyletters.json

@@ -1,5 +1,5 @@
 {
-  "en": ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "z", "x", "c", "v",	"b", "n", "m"],
+  "en": ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "z", "x", "c", "v",	"b", "n", "m", ",", "."],
   "ru": ["й", "ц", "у", "к", "е", "н", "г",	"ш", "щ", "з", "х",	"ъ", "ф", "ы", "в",	"а", "п", "р", "о",	"л", "д", "ж", "э",	"я", "ч", "с", "м",	"и", "т", "ь", "б",	"ю"],
   "de": ["q", "w", "e",	"r", "t", "z", "u",	"i", "o", "p", "ü",	"a", "s", "d", "f",	"g", "h", "j", "k",	"l", "ö", "ä", "z", "x", "c", "v", "b",	"n", "m"],
   "fr": ["a", "z", "e",	"r", "t", "y", "u",	"i", "o", "p", "q",	"s", "d", "f", "g",	"h", "j", "k", "l",	"m", "w", "x", "c",	"v", "b", "n"]

apps/common/main/resources/img/doc-formats/blank.svg

@@ -1,12 +1,5 @@
 <svg fill="none" height="96" viewBox="0 0 96 96" width="96" xmlns="http://www.w3.org/2000/svg">
   <symbol id="svg-format-blank">
-    <g clip-path="url(#clip0)">
+    <path d="M94 9.5C94.8284 9.5 95.5 10.1716 95.5 11L95.5 85C95.5 85.8284 94.8284 86.5 94 86.5L2 86.5C1.17157 86.5 0.499997 85.8284 0.499997 85L0.5 11C0.5 10.1716 1.17158 9.5 2 9.5L94 9.5Z" fill="white" stroke="#BFBFBF"/>
-      <path d="M94 9.5C94.8284 9.5 95.5 10.1716 95.5 11L95.5 85C95.5 85.8284 94.8284 86.5 94 86.5L2 86.5C1.17157 86.5 0.499997 85.8284 0.499997 85L0.5 11C0.5 10.1716 1.17158 9.5 2 9.5L94 9.5Z" fill="white" stroke="#BFBFBF"/>
-    </g>
-    <defs>
-      <clipPath id="clip0">
-        <rect width="96" height="96" fill="white"/>
-      </clipPath>
-    </defs>
   </symbol>
 </svg>

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

@@ -449,6 +449,10 @@
             display: none;
         }
     }
+
+    &.align-left {
+        text-align: left;
+    }
 }
 
 .btn-category {

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

@@ -9,17 +9,20 @@
         --background-toolbar: #f1f1f1;
         --background-toolbar-additional: #f1f1f1;
         --background-primary-dialog-button: #7d858c;
+        --background-accent-button: #446995;
         --background-tab-underline: #444;
         --background-notification-popover: #fcfed7;
         --background-notification-badge: #ffd112;
         --background-scrim: fade(#000, 20%);
         --background-loader: fade(#000, 65%);
-        --background-contrast-popover: #444444;
+        --background-contrast-popover: #fff;
 
         --highlight-button-hover: #d8dadc;
         --highlight-button-pressed: #7d858c;
         --highlight-button-pressed-hover: #7d858c;
         --highlight-primary-dialog-button-hover: #666d73;
+        --highlight-accent-button-hover: #375478;
+        --highlight-accent-button-pressed: #293f59;
         --highlight-header-button-hover: fade(#fff, 20%);
         --highlight-header-button-pressed: fade(#000, 20%);
         --highlight-toolbar-tab-underline: #444;
@@ -34,7 +37,7 @@
         --border-control-focus: #848484;
         --border-color-shading: fade(#000, 20%);
         --border-error: #d9534f;
-        --border-contrast-popover: #444444;
+        --border-contrast-popover: #fff;
 
         --text-normal: #444;
         --text-normal-pressed: #fff;
@@ -123,8 +126,8 @@
         --component-active-hover-icon-opacity: 1;
         --component-disabled-opacity: .4;
 
-        --header-component-normal-icon-opacity: 1;
+        --header-component-normal-icon-opacity: .8;
-        --header-component-hover-icon-opacity: 1;
+        --header-component-hover-icon-opacity: .8;
         --header-component-active-icon-opacity: 1;
         --header-component-active-hover-icon-opacity: 1;
 

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

@@ -9,9 +9,10 @@
         --background-toolbar: #404040;
         --background-toolbar-additional: #505050;
         --background-primary-dialog-button: #ddd;
+        --background-accent-button: #486F9E;
         --background-tab-underline: #ddd;
         --background-notification-popover: #3e5968;
-        --background-notification-badge: #ffd114;
+        --background-notification-badge: #ffd112;
         --background-scrim: fade(black, 60%);
         --background-loader: fade(#181818, 90%);
         --background-alt-key-hint: #FFD938;
@@ -21,6 +22,8 @@
         --highlight-button-pressed: #707070;
         --highlight-button-pressed-hover: #808080;
         --highlight-primary-dialog-button-hover: #fcfcfc;
+        --highlight-accent-button-hover: #75a2d6;
+        --highlight-accent-button-pressed: #89afdc;
         --highlight-header-button-hover: fade(#fff, 5%);
         --highlight-header-button-pressed: fade(#fff, 15%);
         --highlight-toolbar-tab-underline: #ddd;

apps/common/main/resources/less/colors-table-ie-fix.less

@@ -14,7 +14,8 @@
 @background-loader-ie: fade(#000, 65%);
 @background-alt-key-hint-ie: #FFD938;
 @background-accent-button-ie: #446995;
-@background-contrast-popover-ie: #444444;
+@background-contrast-popover-ie: #fff;
+@shadow-contrast-popover-ie: rgba(0, 0, 0, 0.3);
 
 @highlight-button-hover-ie: #d8dadc;
 @highlight-button-pressed-ie: #7d858c;
@@ -36,7 +37,7 @@
 @border-control-focus-ie: #848484;
 @border-color-shading-ie: fade(#000, 20%);
 @border-error-ie: #d9534f;
-@border-contrast-popover-ie: #444444;
+@border-contrast-popover-ie: #fff;
 
 @text-normal-ie: #444;
 @text-normal-pressed-ie: #fff;

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

@@ -19,25 +19,26 @@
     --background-toolbar: #f7f7f7;
     --background-toolbar-additional: #efefef;
     --background-primary-dialog-button: #444;
+    --background-accent-button: #446995;
     --background-tab-underline: #444;
     --background-notification-popover: #fcfed7;
     --background-notification-badge: #ffd112;
     --background-scrim: fade(#000, 20%);
     --background-loader: fade(#181818, 90%);
     --background-alt-key-hint: #FFD938;
-    --background-accent-button: #446995;
+    --background-contrast-popover: #fff;
-    --background-contrast-popover: #444444;
+    --shadow-contrast-popover: rgba(0, 0, 0, 0.3);
 
     --highlight-button-hover: #e0e0e0;
     --highlight-button-pressed: #cbcbcb;
     --highlight-button-pressed-hover: #bababa;
     --highlight-primary-dialog-button-hover: #1c1c1c;
+    --highlight-accent-button-hover: #375478;
+    --highlight-accent-button-pressed: #293f59;
     --highlight-header-button-hover: fade(#fff, 15%);
     --highlight-header-button-pressed: fade(#fff, 25%);
     --highlight-toolbar-tab-underline: #444;
     --highlight-text-select: #3494fb;
-    --highlight-accent-button-hover: #375478;
-    --highlight-accent-button-pressed: #293F59;
 
     --border-toolbar: #cbcbcb;
     --border-divider: #dfdfdf;
@@ -48,7 +49,7 @@
     --border-control-focus: #848484;
     --border-color-shading: fade(#000, 15%);
     --border-error: #f62211;
-    --border-contrast-popover: #444444;
+    --border-contrast-popover: #fff;
 
     --text-normal: fade(#000, 80%);
     --text-normal-pressed: fade(#000, 80%);
@@ -140,8 +141,8 @@
     --component-active-hover-icon-opacity: 1;
     --component-disabled-opacity: .4;
 
-    --header-component-normal-icon-opacity: 1;
+    --header-component-normal-icon-opacity: .8;
-    --header-component-hover-icon-opacity: 1;
+    --header-component-hover-icon-opacity: .8;
     --header-component-active-icon-opacity: 1;
     --header-component-active-hover-icon-opacity: 1;
     //--button-icon-opacity: 1;
@@ -161,6 +162,7 @@
 @background-alt-key-hint: var(--background-alt-key-hint);
 @background-accent-button: var(--background-accent-button);
 @background-contrast-popover: var(--background-contrast-popover);
+@shadow-contrast-popover: var(--shadow-contrast-popover);
 
 // Highlight
 // -------------------------

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

@@ -352,4 +352,50 @@
 
 .combo-slicer-style {
     .combo-textart(60px, 4px);
+}
+
+.combo-transitions {
+    @combo-dataview-height: 46px;
+    @combo-dataview-height-calc: calc(40px + 2 * @scaled-two-px-value + 2 * @scaled-one-px-value);
+    @combo-dataview-item-margins: @scaled-two-px-value;
+    @combo-dataview-button-width: 15px;
+
+    height: @combo-dataview-height;
+    height: @combo-dataview-height-calc;
+
+    .view {
+        margin-right: -@combo-dataview-button-width;
+        padding-right: @combo-dataview-button-width;
+    }
+
+    .view .dataview, .dropdown-menu {
+        padding: 0;
+    }
+
+    .button {
+        width: @combo-dataview-button-width;
+        height: @combo-dataview-height;
+        height: @combo-dataview-height-calc;
+    }
+
+    .item {
+        padding: 0px;
+        margin: @combo-dataview-item-margins 0 0 @combo-dataview-item-margins;
+        .box-shadow(none);
+    }
+
+    .menu-picker-container {
+        .last-item {
+            margin-bottom: @combo-dataview-item-margins;
+        }
+    }
+
+    &.disabled {
+        .item {
+            &:hover:not(.selected) {
+                .box-shadow(none);
+            }
+        }
+    }
+
 }

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

@@ -23,7 +23,7 @@
     }
   }
 
-  &:not(.no-focus):focus {
+  &:not(.no-focus):focus:not(.disabled) {
     border-color: @border-control-focus-ie;
     border-color: @border-control-focus;
   }

apps/common/main/resources/less/synchronize-tip.less

@@ -1,5 +1,5 @@
 .synch-tip-root {
-    position: absolute;
+    position: fixed;
     z-index: @zindex-navbar + 2;
     @tip-width: 300px;
 
@@ -93,16 +93,18 @@
         .asc-synchronizetip {
             background-color: @background-contrast-popover-ie;
             background-color: @background-contrast-popover;
-            color: @text-contrast-background-ie;
+            color: @text-normal-ie;
-            color: @text-contrast-background;
+            color: @text-normal;
             border-color: @border-contrast-popover-ie;
             border-color: @border-contrast-popover;
             .close {
                 &:before, &:after {
-                    background-color: @text-contrast-background-ie;
+                    background-color: @text-normal-ie;
-                    background-color: @text-contrast-background;
+                    background-color: @text-normal;
                 }
             }
+            .box-shadow(0 0 40px 0 @shadow-contrast-popover-ie);
+            .box-shadow(0 0 40px 0 @shadow-contrast-popover);
         }
 
         .tip-arrow:before {
@@ -124,31 +126,33 @@
             padding: 3px 12px;
             margin-top: 10px;
             &:hover {
-                background-color: @highlight-header-button-hover-ie;
+                background-color: @highlight-button-hover-ie;
-                background-color: @highlight-header-button-hover;
+                background-color: @highlight-button-hover;
             }
 
             &:active {
-                background-color: @highlight-header-button-pressed-ie;
+                background-color: @highlight-button-pressed-ie;
-                background-color: @highlight-header-button-pressed;
+                background-color: @highlight-button-pressed;
+                color: @text-normal-pressed-ie;
+                color: @text-normal-pressed;
             }
         }
 
         .show-link label {
-            border-bottom: @scaled-one-px-value-ie dotted @text-contrast-background-ie;
+            border-bottom: @scaled-one-px-value-ie dotted @text-normal-ie;
-            border-bottom: @scaled-one-px-value dotted @text-contrast-background;
+            border-bottom: @scaled-one-px-value dotted @text-normal;
-            color: @text-contrast-background-ie;
+            color: @text-normal-ie;
-            color: @text-contrast-background;
+            color: @text-normal;
             cursor: pointer;
 
             &:hover:not(:disabled) {
-                color: @text-contrast-background;
+                color: @text-normal;
-                border-bottom-color: dotted @text-contrast-background;
+                border-bottom-color: dotted @text-normal;
             }
 
             &:active {
-                color: @text-contrast-background;
+                color: @text-normal;
-                border-bottom-color: dotted @text-contrast-background;
+                border-bottom-color: dotted @text-normal;
             }
         }
     }

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

@@ -242,7 +242,7 @@
 
 @zindex-navbar:            1000;
 @zindex-dropdown:          1000;
-@zindex-popover:           1010;
+@zindex-popover:           1002;
 @zindex-tooltip:           1030;
 @zindex-navbar-fixed:      1030;
 @zindex-modal-background:  1040;

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

@@ -111,6 +111,8 @@ class ContextMenuController extends Component {
             });
 
             if ( this.state.items.length > 0 ) {
+                const api = Common.EditorApi.get();
+
                 this.$targetEl.css({left: `${x}px`, top: `${y}px`});
                 const popover = f7.popover.open(idContextMenuElement, idCntextMenuTargetElement);
 
@@ -120,6 +122,8 @@ class ContextMenuController extends Component {
                 this.setState(state => {
                     return {opened: true}
                 });
+
+                api.asc_enableKeyEvents(true);
             }
         }
     }

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

@@ -261,7 +261,7 @@ class SearchView extends Component {
                     </div>
                     <div className="searchbar-inner__center">
                         <div className="searchbar-input-wrap">
-                            <input value={searchQuery} placeholder={_t.textSearch} type="search" maxLength="255"
+                            <input className="searchbar-input" value={searchQuery} placeholder={_t.textSearch} type="search" maxLength="255"
                                 onChange={e => {this.changeSearchQuery(e.target.value)}} />
                             {isIos ? <i className="searchbar-icon" /> : null}
                             <span className="input-clear-button" onClick={() => this.changeSearchQuery('')} />
@@ -302,5 +302,6 @@ class SearchView extends Component {
 }
 
 const SearchViewWithObserver = observer(SearchView);
+const SearchSettingsViewWithObserver =  observer(SearchSettingsView);
 
-export {SearchViewWithObserver as SearchView, SearchSettingsView};
+export {SearchViewWithObserver as SearchView, SearchSettingsViewWithObserver as SearchSettingsView};

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

@@ -23,6 +23,7 @@ const AddCommentPopup = inject("storeComments")(observer(props => {
     const _t = t('Common.Collaboration', {returnObjects: true});
     useEffect(() => {
         f7.popup.open('.add-comment-popup');
+        if(!Device.android) f7.input.focus('.input-comment');
     });
     const userInfo = props.userInfo;
     const [stateText, setText] = useState('');
@@ -59,7 +60,7 @@ const AddCommentPopup = inject("storeComments")(observer(props => {
                     <div className='name'>{userInfo.name}</div>
                 </div>
                 <div className='wrap-textarea'>
-                    <Input type='textarea' placeholder={_t.textAddComment} autofocus value={stateText} onChange={(event) => {setText(event.target.value);}}></Input>
+                    <Input className="input-comment" type='textarea' placeholder={_t.textAddComment} value={stateText} onChange={(event) => {setText(event.target.value);}}></Input>
                 </div>
             </div>
         </Popup>
@@ -94,12 +95,13 @@ const AddCommentDialog = inject("storeComments")(observer(props => {
                         <div class='name'>${userInfo.name}</div>
                     </div>
                     <div class='wrap-textarea'>
-                        <textarea id='comment-text' placeholder='${_t.textAddComment}' autofocus></textarea>
+                        <textarea id='comment-text' placeholder='${_t.textAddComment}'></textarea>
                     </div>
                 </div>`,
             on: {
                 opened: () => {
                     const cancel = document.getElementById('comment-cancel');
+                    if(!Device.android) $$('#comment-text').focus();
                     cancel.addEventListener('click', () => {
                         f7.dialog.close();
                         props.closeAddComment();

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

@@ -18,6 +18,15 @@
         }
     }
 
+    .settings-about-logo {
+        display: flex;
+        justify-content: center;
+        img {
+            max-width: 100%;
+            height: auto;
+        }
+    }
+
     h3 {
         font-weight: normal;
         margin: 0;

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

@@ -237,47 +237,6 @@
     }
 }
 
-// Theme 
-
-.slide-theme {
-    &__list {
-        margin: auto;
-        ul {
-            display: flex;
-            justify-content: space-between;
-            flex-wrap: wrap;
-            padding-left: 18px;
-            padding-right: 18px;
-            padding-bottom: 14px;
-        }
-    }
-    .item-inner:after {
-        display: none;
-    }
-    .item-theme {
-        position: relative;
-        margin: 0;
-        box-shadow: 0 0 0 1px rgba(0,0,0,.15);
-        width: 88px;
-        height: 40px;
-        margin-top: 14px;
-        background-image: url(../img/themes/themes.png);
-        display: block;
-        background-repeat: no-repeat;
-        background-size: cover;
-    }
-    .item-theme.active:before {
-        content: '';
-        position: absolute;
-        width: 22px;
-        height: 22px;
-        right: -5px;
-        bottom: -5px;
-        z-index: 1;
-        .encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 22 22" fill="@{brandColor}"><g><circle fill="transparent" cx="11" cy="11" r="11"/><path d="M11,21A10,10,0,1,1,21,11,10,10,0,0,1,11,21h0ZM17.4,7.32L17.06,7a0.48,0.48,0,0,0-.67,0l-7,6.84L6.95,11.24a0.51,0.51,0,0,0-.59.08L6,11.66a0.58,0.58,0,0,0,0,.65l3.19,3.35a0.38,0.38,0,0,0,.39,0L17.4,8a0.48,0.48,0,0,0,0-.67h0Z"/></g></svg>');
-    }
-}
-
 // Transition 
 
 .slide-transition {

apps/documenteditor/embed/js/ApplicationController.js

@@ -121,6 +121,7 @@ DE.ApplicationController = new(function(){
             docInfo.put_Format(docConfig.fileType);
             docInfo.put_VKey(docConfig.vkey);
             docInfo.put_UserInfo(_user);
+            docInfo.put_CallbackUrl(config.callbackUrl);
             docInfo.put_Token(docConfig.token);
             docInfo.put_Permissions(_permissions);
             docInfo.put_EncryptedInfo(config.encryptionKeys);
@@ -494,8 +495,13 @@ DE.ApplicationController = new(function(){
             if (config.customization && config.customization.goback) {
                 if (config.customization.goback.requestClose && config.canRequestClose)
                     Common.Gateway.requestClose();
-                else if (config.customization.goback.url)
+                else if (config.customization.goback.url) {
-                    window.parent.location.href = config.customization.goback.url;
+                    if (config.customization.goback.blank!==false) {
+                        window.open(config.customization.goback.url, "_blank");
+                    } else {
+                        window.parent.location.href = config.customization.goback.url;
+                    }
+                }
             }
         });
 
@@ -690,6 +696,10 @@ DE.ApplicationController = new(function(){
                 message = me.convertationErrorText;
                 break;
 
+            case Asc.c_oAscError.ID.ConvertationOpenError:
+                message = me.openErrorText;
+                break;
+
             case Asc.c_oAscError.ID.DownloadError:
                 message = me.downloadErrorText;
                 break;
@@ -942,6 +952,7 @@ DE.ApplicationController = new(function(){
         txtEmpty: '(Empty)',
         txtPressLink: 'Press Ctrl and click link',
         errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.',
-        errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.'
+        errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.',
+        openErrorText: 'An error has occurred while opening the file'
     }
 })();

apps/documenteditor/embed/locale/cs.json

@@ -12,19 +12,21 @@
   "DE.ApplicationController.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.<br>Obraťte se na správce vámi využívaného dokumentového serveru.",
   "DE.ApplicationController.errorDefaultMessage": "Kód chyby: %1",
   "DE.ApplicationController.errorEditingDownloadas": "Při práci s dokumentem došlo k chybě.<br>Použijte volbu „Stáhnout jako…“ a uložte si do souboru jako záložní kopii na svůj počítač.",
-  "DE.ApplicationController.errorFilePassProtect": "Soubor je chráněn heslem a bez něj ho nelze otevřít.",
+  "DE.ApplicationController.errorFilePassProtect": "Soubor je zabezpečen heslem, bez kterého ho nelze otevřít.",
   "DE.ApplicationController.errorFileSizeExceed": "Velikost souboru překračuje omezení nastavená na serveru, který využíváte.<br>Ohledně podrobností se obraťte na správce dokumentového serveru.",
   "DE.ApplicationController.errorForceSave": "Při ukládání souboru došlo k chybě. Prosím použijte „Stáhnout jako“ a uložte si soubor k sobě na počítač nebo původní volbu zkuste znovu později.",
   "DE.ApplicationController.errorLoadingFont": "Písma nejsou načtená.<br>Obraťte se na správce vámi využívaného dokumentového serveru.",
   "DE.ApplicationController.errorSubmit": "Odeslání se nezdařilo.",
+  "DE.ApplicationController.errorTokenExpire": "Platnost tokenu zabezpečení dokumentu skončila.<br>Obraťte se na správce vámi využívaného dokumentového serveru.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Připojení k Internetu bylo obnoveno a verze souboru byla změněna.<br>Než budete moci pokračovat v práci, bude třeba si soubor stáhnout nebo si zkopírovat jeho obsah, abyste si zajistili, že se nic neztratí a až poté tuto stránku znovu načtěte.",
   "DE.ApplicationController.errorUserDrop": "Tento soubor nyní není přístupný.",
   "DE.ApplicationController.notcriticalErrorTitle": "Varování",
+  "DE.ApplicationController.openErrorText": "Při otevírání souboru došlo k chybě.",
   "DE.ApplicationController.scriptLoadError": "Připojení je příliš pomalé, některé součásti se nepodařilo načíst. Načtěte stránku znovu.",
   "DE.ApplicationController.textAnonymous": "Anonymní",
   "DE.ApplicationController.textClear": "Odstranit všechny kolonky",
   "DE.ApplicationController.textGotIt": "Rozumím",
-  "DE.ApplicationController.textGuest": "Host",
+  "DE.ApplicationController.textGuest": "Návštěvník",
   "DE.ApplicationController.textLoadingDocument": "Načítání dokumentu",
   "DE.ApplicationController.textNext": "Následující kolonka",
   "DE.ApplicationController.textOf": "z",

apps/documenteditor/embed/locale/en.json

@@ -21,6 +21,7 @@
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
   "DE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",
   "DE.ApplicationController.notcriticalErrorTitle": "Warning",
+  "DE.ApplicationController.openErrorText": "An error has occurred while opening the file.",
   "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",

apps/documenteditor/embed/locale/es.json

@@ -21,6 +21,7 @@
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La conexión a Internet ha sido restaurada, y la versión del archivo ha sido cambiada. Antes de poder seguir trabajando, es necesario descargar el archivo o copiar su contenido para asegurarse de que no se pierda nada, y luego recargar esta página.",
   "DE.ApplicationController.errorUserDrop": "No se puede acceder al archivo en este momento.",
   "DE.ApplicationController.notcriticalErrorTitle": "Aviso",
+  "DE.ApplicationController.openErrorText": "Se ha producido un error al abrir el archivo. ",
   "DE.ApplicationController.scriptLoadError": "La conexión a Internet es demasiado lenta, algunos de los componentes no se han podido cargar. Por favor, recargue la página.",
   "DE.ApplicationController.textAnonymous": "Anónimo",
   "DE.ApplicationController.textClear": "Borrar todos los campos",

apps/documenteditor/embed/locale/fr.json

@@ -21,6 +21,7 @@
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La connexion internet a été rétablie, la version du fichier est modifiée.<br>Avant de continuer, téléchargez le fichier ou copiez le contenu pour vous assurer que tous les changements ont été enregistrés, et rechargez la page.",
   "DE.ApplicationController.errorUserDrop": "Impossible d'accéder au fichier.",
   "DE.ApplicationController.notcriticalErrorTitle": "Avertissement",
+  "DE.ApplicationController.openErrorText": "Une erreur s’est produite lors de l’ouverture du fichier",
   "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",

apps/documenteditor/embed/locale/nl.json

@@ -21,6 +21,7 @@
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "De internetverbinding is hersteld en de bestandsversie is gewijzigd. <br>Voordat u verder kunt werken, moet u het bestand downloaden of de inhoud kopiëren om er zeker van te zijn dat er niets verloren gaat, en deze pagina vervolgens opnieuw laden.",
   "DE.ApplicationController.errorUserDrop": "Toegang tot het bestand is op dit moment niet mogelijk.",
   "DE.ApplicationController.notcriticalErrorTitle": "Waarschuwing",
+  "DE.ApplicationController.openErrorText": "Er is een fout opgetreden bij het openen van het bestand.",
   "DE.ApplicationController.scriptLoadError": "De verbinding is te langzaam, sommige componenten konden niet geladen worden. Laad de pagina opnieuw.",
   "DE.ApplicationController.textAnonymous": "Anoniem",
   "DE.ApplicationController.textClear": "Wis Alle Velden",

apps/documenteditor/embed/locale/pt.json

@@ -21,6 +21,7 @@
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "A conexão à internet foi restabelecida, e a versão do arquivo foi alterada. <br> Antes de continuar seu trabalho, transfira o arquivo ou copie seu conteúdo para assegurar que nada seja perdido, e então, recarregue esta página.",
   "DE.ApplicationController.errorUserDrop": "O arquivo não pode ser acessado agora.",
   "DE.ApplicationController.notcriticalErrorTitle": "Aviso",
+  "DE.ApplicationController.openErrorText": "Ocorreu um erro ao abrir o arquivo",
   "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",

apps/documenteditor/embed/locale/ro.json

@@ -21,6 +21,7 @@
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Conexiunea la Internet s-a restabilit și versiunea fișierului s-a schimbat.<br>Înainte de a continua, fișierul trebuie descărcat sau conținutul fișierului copiat ca să vă asigurați că nimic nu e pierdut, apoi reîmprospătați această pagină.",
   "DE.ApplicationController.errorUserDrop": "Fișierul nu poate fi accesat deocamdată.",
   "DE.ApplicationController.notcriticalErrorTitle": "Avertisment",
+  "DE.ApplicationController.openErrorText": "Eroare la deschiderea fișierului.",
   "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",

apps/documenteditor/embed/locale/ru.json

@@ -21,6 +21,7 @@
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.<br>Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.",
   "DE.ApplicationController.errorUserDrop": "В настоящий момент файл недоступен.",
   "DE.ApplicationController.notcriticalErrorTitle": "Внимание",
+  "DE.ApplicationController.openErrorText": "При открытии файла произошла ошибка.",
   "DE.ApplicationController.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.",
   "DE.ApplicationController.textAnonymous": "Анонимный пользователь",
   "DE.ApplicationController.textClear": "Очистить все поля",

apps/documenteditor/embed/locale/tr.json

@@ -21,6 +21,7 @@
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "İnternet bağlantısı tekrar sağlandı, ve dosya versiyon değişti.<br>Çalışmanıza devam etmeden önce, veri kaybını önlemeniz için dosyasının bir kopyasını indirmeniz ya da dosya içeriğini kopyalamanız ve sonrasında sayfayı yenilemeniz gerekmektedir.",
   "DE.ApplicationController.errorUserDrop": "Belgeye şu an erişilemiyor.",
   "DE.ApplicationController.notcriticalErrorTitle": "Uyarı",
+  "DE.ApplicationController.openErrorText": "Dosya açılırken bir hata oluştu.",
   "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",

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

@@ -11,6 +11,10 @@ define([
     'common/main/lib/util/LocalStorage',
     'common/main/lib/util/Shortcuts',
     'common/main/lib/view/CopyWarningDialog',
+    'common/main/lib/view/ImageFromUrlDialog',
+    'common/main/lib/view/SelectFileDlg',
+    'common/main/lib/view/SaveAsDlg',
+    'common/main/lib/view/OpenDialog',
     'common/forms/lib/view/modals',
     'documenteditor/forms/app/view/ApplicationView'
 ], function (Viewport) {
@@ -49,14 +53,21 @@ define([
                 weakCompare     : function(obj1, obj2){return obj1.type === obj2.type;}
             });
 
-            this._state = {isDisconnected: false, licenseType: false};
+            this._state = {isDisconnected: false, licenseType: false, isDocModified: false};
 
             this.view = this.createView('ApplicationView').render();
 
             window["flat_desine"] = true;
+            var translationTable = {
+                'Your text here': this.txtArt,
+                "Choose an item": this.txtChoose,
+                "Enter a date": this.txtEnterDate,
+                "Click to load image": this.txtClickToLoad
+            }
             this.api = new Asc.asc_docs_api({
                 'id-view'  : 'editor_sdk',
-                'embedded' : true
+                'embedded' : true,
+                'translate': translationTable
             });
 
             Common.UI.Themes.init(this.api);
@@ -80,6 +91,7 @@ define([
             this.editorConfig = {};
             this.embedConfig = {};
             this.appOptions = {};
+            this.internalFormObj = null;
 
             if (this.api){
                 this.api.asc_registerCallback('asc_onError',                 this.onError.bind(this));
@@ -87,9 +99,10 @@ define([
                 this.api.asc_registerCallback('asc_onOpenDocumentProgress',  this.onOpenDocument.bind(this));
                 this.api.asc_registerCallback('asc_onDocumentUpdateVersion', this.onUpdateVersion.bind(this));
                 this.api.asc_registerCallback('asc_onServerVersion',         this.onServerVersion.bind(this));
-
+                this.api.asc_registerCallback('asc_onAdvancedOptions',       this.onAdvancedOptions.bind(this));
                 this.api.asc_registerCallback('asc_onCountPages',            this.onCountPages.bind(this));
                 this.api.asc_registerCallback('asc_onCurrentPage',           this.onCurrentPage.bind(this));
+                this.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(this.onDocumentModifiedChanged, this));
 
                 // Initialize api gateway
                 Common.Gateway.on('init',               this.loadConfig.bind(this));
@@ -182,6 +195,10 @@ define([
                     config.msg = this.convertationErrorText;
                     break;
 
+                case Asc.c_oAscError.ID.ConvertationOpenError:
+                    config.msg = this.openErrorText;
+                    break;
+
                 case Asc.c_oAscError.ID.DownloadError:
                     config.msg = this.downloadErrorText;
                     break;
@@ -221,7 +238,7 @@ define([
                     break;
 
                 case Asc.c_oAscError.ID.EditingError:
-                    config.msg = this.errorEditingDownloadas;
+                    config.msg = (this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.errorEditingSaveas : this.errorEditingDownloadas;
                     break;
 
                 case Asc.c_oAscError.ID.ForceSaveButton:
@@ -238,6 +255,10 @@ define([
                     config.closable = false;
                     break;
 
+                case Asc.c_oAscError.ID.VKeyEncrypt:
+                    config.msg = this.errorToken;
+                    break;
+
                 case Asc.c_oAscError.ID.KeyExpire:
                     config.msg = this.errorTokenExpire;
                     break;
@@ -246,6 +267,30 @@ define([
                     config.msg = this.errorViewerDisconnect;
                     break;
 
+                case Asc.c_oAscError.ID.SessionAbsolute:
+                    config.msg = this.errorSessionAbsolute;
+                    break;
+
+                case Asc.c_oAscError.ID.SessionIdle:
+                    config.msg = this.errorSessionIdle;
+                    break;
+
+                case Asc.c_oAscError.ID.SessionToken:
+                    config.msg = this.errorSessionToken;
+                    break;
+
+                case Asc.c_oAscError.ID.UplImageUrl:
+                    config.msg = this.errorBadImageUrl;
+                    break;
+
+                case Asc.c_oAscError.ID.DataEncrypted:
+                    config.msg = this.errorDataEncrypted;
+                    break;
+
+                case Asc.c_oAscError.ID.ConvertationSaveError:
+                    config.msg = (this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.saveErrorTextDesktop : this.saveErrorText;
+                    break;
+
                 default:
                     config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
                     break;
@@ -277,11 +322,14 @@ define([
                 config.callback = _.bind(function(btn){
                     if (id == Asc.c_oAscError.ID.Warning && btn == 'ok' && this.appOptions.canDownload) {
                         Common.UI.Menu.Manager.hideAll();
-                        var me = this;
+                        if (this.appOptions.isDesktopApp && this.appOptions.isOffline)
-                        setTimeout(function() {
+                            this.api.asc_DownloadAs();
-                            $('button', me.view.btnOptions.cmpEl).click();
+                        else {
-                        }, 10);
+                            var me = this;
-
+                            setTimeout(function() {
+                                $('button', me.view.btnOptions.cmpEl).click();
+                            }, 10);
+                        }
                     } else if (id == Asc.c_oAscError.ID.EditingError) {
                         Common.NotificationCenter.trigger('api:disconnect', true); // enable download and print
                     }
@@ -314,6 +362,23 @@ define([
             this.view.txtGoToPage.setValue(number + 1);
         },
 
+        updateWindowTitle: function(force) {
+            var isModified = this.api.isDocumentModified();
+            if (this._state.isDocModified !== isModified || force) {
+                this._isDocReady && (this._state.isDocModified !== isModified) && Common.Gateway.setDocumentModified(isModified);
+                this._state.isDocModified = isModified;
+            }
+        },
+
+        onDocumentModifiedChanged: function() {
+            var isModified = this.api.asc_isDocumentCanSave();
+            if (this._state.isDocModified !== isModified) {
+                this._isDocReady && Common.Gateway.setDocumentModified(this.api.isDocumentModified());
+            }
+
+            this.updateWindowTitle();
+        },
+
         loadConfig: function(data) {
             this.editorConfig = $.extend(this.editorConfig, data.config);
             this.embedConfig = $.extend(this.embedConfig, data.config.embedded);
@@ -341,6 +406,12 @@ define([
             this.appOptions.canRequestClose = this.editorConfig.canRequestClose;
             this.appOptions.canBackToFolder = (this.editorConfig.canBackToFolder!==false) && (typeof (this.editorConfig.customization) == 'object') && (typeof (this.editorConfig.customization.goback) == 'object')
                                                 && (!_.isEmpty(this.editorConfig.customization.goback.url) || this.editorConfig.customization.goback.requestClose && this.appOptions.canRequestClose);
+
+            this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage;
+            this.appOptions.fileChoiceUrl   = this.editorConfig.fileChoiceUrl;
+            this.appOptions.saveAsUrl       = this.editorConfig.saveAsUrl;
+            this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs;
+            this.appOptions.isDesktopApp    = this.editorConfig.targetApp == 'desktop';
         },
 
         onExternalMessage: function(msg) {
@@ -468,13 +539,15 @@ define([
             if (params.asc_getRights() !== Asc.c_oRights.Edit)
                 this.permissions.edit = this.permissions.review = false;
 
+            this.appOptions.isOffline      = this.api.asc_isOffline();
             this.appOptions.trialMode      = params.asc_getLicenseMode();
             this.appOptions.isBeta         = params.asc_getIsBeta();
             this.appOptions.canLicense     = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit);
-            this.appOptions.canSubmitForms = this.appOptions.canLicense && (typeof (this.editorConfig.customization) == 'object') && !!this.editorConfig.customization.submitForm;
+            this.appOptions.canSubmitForms = this.appOptions.canLicense && (typeof (this.editorConfig.customization) == 'object') && !!this.editorConfig.customization.submitForm && !this.appOptions.isOffline;
 
             var type = /^(?:(oform))$/.exec(this.document.fileType); // can fill forms only in oform format
-            this.appOptions.canFillForms   = this.appOptions.canLicense && !!(type && typeof type[1] === 'string') && ((this.permissions.fillForms===undefined) ? (this.permissions.edit !== false) : this.permissions.fillForms) && (this.editorConfig.mode !== 'view');
+            this.appOptions.isOFORM = !!(type && typeof type[1] === 'string');
+            this.appOptions.canFillForms   = this.appOptions.canLicense && this.appOptions.isOFORM && ((this.permissions.fillForms===undefined) ? (this.permissions.edit !== false) : this.permissions.fillForms) && (this.editorConfig.mode !== 'view');
             this.api.asc_setViewMode(!this.appOptions.canFillForms);
 
             this.appOptions.canBranding  = params.asc_getCustomization();
@@ -491,6 +564,10 @@ define([
             var me = this;
             me.view.btnSubmit.setVisible(this.appOptions.canFillForms && this.appOptions.canSubmitForms);
             me.view.btnDownload.setVisible(this.appOptions.canDownload && this.appOptions.canFillForms && !this.appOptions.canSubmitForms);
+            if (me.appOptions.isOffline || me.appOptions.canRequestSaveAs || !!me.appOptions.saveAsUrl) {
+                me.view.btnDownload.setCaption(me.appOptions.isOffline ? me.textSaveAsDesktop : me.textSaveAs);
+                me.view.btnDownload.updateHint('');
+            }
             if (!this.appOptions.canFillForms) {
                 me.view.btnPrev.setVisible(false);
                 me.view.btnNext.setVisible(false);
@@ -509,7 +586,14 @@ define([
                     me.api.asc_SendForm();
                 });
                 me.view.btnDownload.on('click', function(){
-                    me.appOptions.canDownload && me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF));
+                    if (me.appOptions.canDownload) {
+                        if (me.appOptions.isOffline)
+                            me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF));
+                        else {
+                            me.isFromBtnDownload = me.appOptions.canRequestSaveAs || !!me.appOptions.saveAsUrl;
+                            me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF, me.isFromBtnDownload));
+                        }
+                    }
                 });
 
                 this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyForms);
@@ -518,17 +602,7 @@ define([
                 this.api.SetCollaborativeMarksShowType(Asc.c_oAscCollaborativeMarksShowType.None);
             }
 
-            var $parent = labelDocName.parent();
-            var _left_width = $parent.position().left,
-                _right_width = $parent.next().outerWidth();
-
-            if ( _left_width < _right_width )
-                $parent.css('padding-left', _right_width - _left_width);
-            else
-                $parent.css('padding-right', _left_width - _right_width);
-
             this.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
-
             this.api.asc_LoadDocument();
             this.api.Resize();
         },
@@ -660,10 +734,12 @@ define([
             }
         },
 
-         onLongActionEnd: function(type, id){
+        onLongActionEnd: function(type, id){
              var action = {id: id, type: type};
              this.stackLongActions.pop(action);
 
+            this.updateWindowTitle(true);
+
              action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information});
              action && this.setLongActionView(action);
              action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction});
@@ -688,6 +764,42 @@ define([
              }
         },
 
+        onAdvancedOptions: function(type, advOptions, mode, formatOptions) {
+            if (this._openDlg) return;
+
+            var me = this;
+            if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
+                me._openDlg = new Common.Views.OpenDialog({
+                    title: Common.Views.OpenDialog.prototype.txtTitleProtected,
+                    closeFile: me.appOptions.canRequestClose,
+                    type: Common.Utils.importTextType.DRM,
+                    warning: !(me.appOptions.isDesktopApp && me.appOptions.isOffline) && (typeof advOptions == 'string'),
+                    warningMsg: advOptions,
+                    validatePwd: !!me._isDRM,
+                    handler: function (result, value) {
+                        me.isShowOpenDialog = false;
+                        if (result == 'ok') {
+                            if (me.api) {
+                                me.api.asc_setAdvancedOptions(type, value.drmOptions);
+                                me.loadMask && me.loadMask.show();
+                            }
+                        } else {
+                            Common.Gateway.requestClose();
+                            Common.Controllers.Desktop.requestClose();
+                        }
+                        me._openDlg = null;
+                    }
+                });
+                me._isDRM = true;
+            }
+            if (me._openDlg) {
+                this.isShowOpenDialog = true;
+                this.loadMask && this.loadMask.hide();
+                this.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
+                me._openDlg.show();
+            }
+        },
+
         onDocMouseMoveStart: function() {
             screenTip.isHidden = true;
         },
@@ -760,8 +872,41 @@ define([
             }
         },
 
-        onDownloadUrl: function(url) {
+        onDownloadUrl: function(url, fileType) {
-            Common.Gateway.downloadAs(url);
+            if (this.isFromBtnDownload) { // download as pdf
+                var me = this,
+                    defFileName = this.embedConfig.docTitle;
+                !defFileName && (defFileName = me.txtUntitled);
+
+                var idx = defFileName.lastIndexOf('.');
+                if (idx>0)
+                    defFileName = defFileName.substring(0, idx) + '.pdf';
+
+                if (me.appOptions.canRequestSaveAs) {
+                    Common.Gateway.requestSaveAs(url, defFileName, fileType);
+                } else {
+                    me._saveCopyDlg = new Common.Views.SaveAsDlg({
+                        saveFolderUrl: me.appOptions.saveAsUrl,
+                        saveFileUrl: url,
+                        defFileName: defFileName
+                    });
+                    me._saveCopyDlg.on('saveaserror', function(obj, err){
+                        Common.UI.warning({
+                            closable: false,
+                            msg: err,
+                            callback: function(btn){
+                                Common.NotificationCenter.trigger('edit:complete', me);
+                            }
+                        });
+                    }).on('close', function(obj){
+                        me._saveCopyDlg = undefined;
+                    });
+                    me._saveCopyDlg.show();
+                }
+            } else {
+                Common.Gateway.downloadAs(url);
+            }
+            this.isFromBtnDownload = false;
         },
 
         onPrint: function() {
@@ -853,10 +998,7 @@ define([
                         if (lock == Asc.c_oAscSdtLockType.SdtContentLocked || lock==Asc.c_oAscSdtLockType.ContentLocked)
                             return;
                     }
-                    this.api.asc_addImage(obj);
+                    this.onShowImageActions(obj, x, y);
-                    setTimeout(function(){
-                        me.api.asc_UncheckContentControlButtons();
-                    }, 500);
                     break;
                 case Asc.c_oAscContentControlSpecificType.DropDownList:
                 case Asc.c_oAscContentControlSpecificType.ComboBox:
@@ -872,6 +1014,125 @@ define([
                 controlsContainer.hide();
         },
 
+        onShowImageActions: function(obj, x, y) {
+            var menu = this.imageControlMenu,
+                menuContainer = menu ? this.boxSdk.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null,
+                me = this;
+
+            this.internalFormObj = obj && obj.pr ? obj.pr.get_InternalId() : null;
+            this._fromShowContentControls = true;
+            Common.UI.Menu.Manager.hideAll();
+
+            if (!menu) {
+                this.imageControlMenu = menu = new Common.UI.Menu({
+                    maxHeight: 207,
+                    menuAlign: 'tl-bl',
+                    items: [
+                        {caption: this.mniImageFromFile, value: 'file'},
+                        {caption: this.mniImageFromUrl, value: 'url'},
+                        {caption: this.mniImageFromStorage, value: 'storage', visible: this.appOptions.canRequestInsertImage || this.appOptions.fileChoiceUrl && this.appOptions.fileChoiceUrl.indexOf("{documentType}")>-1}
+                    ]
+                });
+                menu.on('item:click', function(menu, item) {
+                    setTimeout(function(){
+                        me.onImageSelect(menu, item);
+                    }, 1);
+                    setTimeout(function(){
+                        me.api.asc_UncheckContentControlButtons();
+                    }, 500);
+                });
+
+                // Prepare menu container
+                if (!menuContainer || menuContainer.length < 1) {
+                    menuContainer = $(Common.Utils.String.format('<div id="menu-container-{0}" style="position: absolute; z-index: 10000;"><div class="dropdown-toggle" data-toggle="dropdown"></div></div>', menu.id));
+                    this.boxSdk.append(menuContainer);
+                }
+
+                menu.render(menuContainer);
+                menu.cmpEl.attr({tabindex: "-1"});
+                menu.on('hide:after', function(){
+                    if (!me._fromShowContentControls)
+                        me.api.asc_UncheckContentControlButtons();
+                });
+            }
+            menuContainer.css({left: x, top : y});
+            menuContainer.attr('data-value', 'prevent-canvas-click');
+            this._preventClick = true;
+            menu.show();
+
+            _.delay(function() {
+                menu.cmpEl.focus();
+            }, 10);
+            this._fromShowContentControls = false;
+        },
+
+        onImageSelect: function(menu, item) {
+            if (item.value=='url') {
+                var me = this;
+                (new Common.Views.ImageFromUrlDialog({
+                    handler: function(result, value) {
+                        if (result == 'ok') {
+                            if (me.api) {
+                                var checkUrl = value.replace(/ /g, '');
+                                if (!_.isEmpty(checkUrl)) {
+                                    me.setImageUrl(checkUrl);
+                                }
+                            }
+                        }
+                    }
+                })).show();
+            } else if (item.value=='storage') {
+                Common.NotificationCenter.trigger('storage:image-load', 'control');
+            } else {
+                if (this._isFromFile) return;
+                this._isFromFile = true;
+                this.api.asc_addImage(this.internalFormObj);
+                this._isFromFile = false;
+            }
+        },
+
+        openImageFromStorage: function(type) {
+            var me = this;
+            if (this.appOptions.canRequestInsertImage) {
+                Common.Gateway.requestInsertImage(type);
+            } else {
+                (new Common.Views.SelectFileDlg({
+                    fileChoiceUrl: this.appOptions.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly")
+                })).on('selectfile', function(obj, file){
+                    file && (file.c = type);
+                    !file.images && (file.images = [{fileType: file.fileType, url: file.url}]); // SelectFileDlg uses old format for inserting image
+                    file.url = null;
+                    me.insertImage(file);
+                }).show();
+            }
+        },
+
+        setImageUrl: function(url, token) {
+            this.api.asc_SetContentControlPictureUrl(url, this.internalFormObj && this.internalFormObj.pr ? this.internalFormObj.pr.get_InternalId() : null, token);
+        },
+
+        insertImage: function(data) { // gateway
+            if (data && (data.url || data.images)) {
+                data.url && console.log("Obsolete: The 'url' parameter of the 'insertImage' method is deprecated. Please use 'images' parameter instead.");
+
+                var arr = [];
+                if (data.images && data.images.length>0) {
+                    for (var i=0; i<data.images.length; i++) {
+                        data.images[i] && data.images[i].url && arr.push( data.images[i].url);
+                    }
+                } else
+                    data.url && arr.push(data.url);
+                data._urls = arr;
+            }
+            Common.NotificationCenter.trigger('storage:image-insert', data);
+        },
+
+        insertImageFromStorage: function(data) {
+            if (data && data._urls && data.c=='control') {
+                this.setImageUrl(data._urls[0], data.token);
+            }
+        },
+
         onShowListActions: function(obj, x, y) {
             var type = obj.type,
                 props = obj.pr,
@@ -1026,8 +1287,11 @@ define([
         },
 
         onDocumentContentReady: function() {
-            var me = this;
+            if (this._isDocReady)
+                return;
 
+            var me = this;
+            me._isDocReady = true;
             this.hidePreloader();
             this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
 
@@ -1051,8 +1315,13 @@ define([
                 this.api.asc_registerCallback('asc_onShowContentControlsActions', _.bind(this.onShowContentControlsActions, this));
                 this.api.asc_registerCallback('asc_onHideContentControlsActions', _.bind(this.onHideContentControlsActions, this));
                 this.api.asc_SetHighlightRequiredFields(true);
+                Common.Gateway.on('insertimage',        _.bind(this.insertImage, this));
+                Common.NotificationCenter.on('storage:image-load', _.bind(this.openImageFromStorage, this)); // try to load image from storage
+                Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this)); // set loaded image to control
             }
 
+            this.updateWindowTitle(true);
+
             if (this.editorConfig.mode !== 'view') // if want to open editor, but viewer is loaded
                 this.applyLicense();
 
@@ -1084,11 +1353,18 @@ define([
                     Common.Analytics.trackEvent('Print');
                     break;
                 case 'close':
-                    if (this.appOptions.customization && this.appOptions.customization.goback) {
+                    if (!DE.Controllers.Desktop.process('goback') &&
+                            this.appOptions.customization && this.appOptions.customization.goback)
+                    {
                         if (this.appOptions.customization.goback.requestClose && this.appOptions.canRequestClose)
                             Common.Gateway.requestClose();
-                        else if (this.appOptions.customization.goback.url)
+                        else if (this.appOptions.customization.goback.url) {
-                            window.parent.location.href = this.appOptions.customization.goback.url;
+                            if (this.appOptions.customization.goback.blank!==false) {
+                                window.open(this.appOptions.customization.goback.url, "_blank");
+                            } else {
+                                window.parent.location.href = this.appOptions.customization.goback.url;
+                            }
+                        }
                     }
                     break;
                 case 'download-docx':
@@ -1113,7 +1389,11 @@ define([
         },
 
         onThemeClick: function(menu, item) {
-            Common.UI.Themes.setTheme(item.value);
+            (item.value!==null) && Common.UI.Themes.setTheme(item.value);
+        },
+
+        onDarkModeClick: function(item) {
+            Common.UI.Themes.toggleContentTheme();
         },
 
         onThemeChange: function() {
@@ -1121,6 +1401,11 @@ define([
             _.each(this.view.mnuThemes.items, function(item){
                 item.setChecked(current===item.value, true);
             });
+            if (this.view.menuItemsDarkMode) {
+                this.view.menuItemsDarkMode.setDisabled(!Common.UI.Themes.isDarkTheme());
+                this.view.menuItemsDarkMode.setChecked(Common.UI.Themes.isContentThemeDark());
+            }
+
             if (this.appOptions.canBranding) {
                 var value = this.appOptions.customization;
                 if ( value && value.logo && (value.logo.image || value.logo.imageDark) && (value.logo.image !== value.logo.imageDark)) {
@@ -1130,6 +1415,10 @@ define([
             }
         },
 
+        onContentThemeChangedToDark: function (isdark) {
+            this.view.menuItemsDarkMode.setChecked(isdark, true);
+        },
+
         createDelayedElements: function() {
             var me = this,
                 menuItems = this.view.btnOptions.menu.items,
@@ -1172,12 +1461,12 @@ define([
                 itemsCount--;
             }
 
-            if ( !this.embedConfig.saveUrl || !this.appOptions.canDownload || this.appOptions.canFillForms) {
+            if ( !this.embedConfig.saveUrl || !this.appOptions.canDownload || this.appOptions.isOFORM) {
                 menuItems[2].setVisible(false);
                 itemsCount--;
             }
 
-            if ( !this.appOptions.canFillForms || !this.appOptions.canDownload) {
+            if ( !this.appOptions.isOFORM || !this.appOptions.canDownload || this.appOptions.isOffline) {
                 menuItems[3].setVisible(false);
                 menuItems[4].setVisible(false);
                 itemsCount -= 2;
@@ -1199,11 +1488,21 @@ define([
                 menuItems[6].setVisible(false);
                 itemsCount--;
             } else {
+                this.view.menuItemsDarkMode = new Common.UI.MenuItem({
+                    caption: this.view.txtDarkMode,
+                    checkable: true,
+                    checked: Common.UI.Themes.isContentThemeDark(),
+                    disabled: !Common.UI.Themes.isDarkTheme()
+                });
+                this.view.mnuThemes.addItem(new Common.UI.MenuItem({caption     :  '--'}));
+                this.view.mnuThemes.addItem(this.view.menuItemsDarkMode);
                 this.view.mnuThemes.on('item:click', _.bind(this.onThemeClick, this));
+                this.view.menuItemsDarkMode.on('click', _.bind(this.onDarkModeClick, this));
                 Common.NotificationCenter.on('uitheme:changed', this.onThemeChange.bind(this));
+                Common.NotificationCenter.on('contenttheme:dark', this.onContentThemeChangedToDark.bind(this));
             }
 
-            if ( !this.embedConfig.shareUrl || this.appOptions.canFillForms) {
+            if ( !this.embedConfig.shareUrl || this.appOptions.isOFORM) {
                 menuItems[8].setVisible(false);
                 itemsCount--;
             }
@@ -1213,12 +1512,12 @@ define([
                 itemsCount--;
             }
 
-            if ( !this.embedConfig.embedUrl || this.appOptions.canFillForms) {
+            if ( !this.embedConfig.embedUrl || this.appOptions.isOFORM) {
                 menuItems[11].setVisible(false);
                 itemsCount--;
             }
 
-            if ( !this.embedConfig.fullscreenUrl ) {
+            if ( !this.embedConfig.fullscreenUrl || this.appOptions.isOFORM) {
                 menuItems[12].setVisible(false);
                 itemsCount--;
             }
@@ -1421,11 +1720,12 @@ define([
                 var cancopy = this.api.can_CopyCut(),
                     disabled = menu_props.paraProps && menu_props.paraProps.locked || menu_props.headerProps && menu_props.headerProps.locked ||
                                menu_props.imgProps && (menu_props.imgProps.locked || menu_props.imgProps.content_locked);
-                this.textMenu.items[0].setDisabled(!cancopy); // copy
+                this.textMenu.items[0].setDisabled(disabled || !this.api.asc_getCanUndo()); // undo
-                this.textMenu.items[1].setDisabled(disabled || !cancopy); // cut
+                this.textMenu.items[1].setDisabled(disabled || !this.api.asc_getCanRedo()); // redo
-                this.textMenu.items[2].setDisabled(disabled) // paste;
+
-                this.textMenu.items[3].setVisible(this.appOptions.canPrint);
+                this.textMenu.items[3].setDisabled(!cancopy); // copy
-                this.textMenu.items[3].setDisabled(!cancopy);
+                this.textMenu.items[4].setDisabled(disabled || !cancopy); // cut
+                this.textMenu.items[5].setDisabled(disabled) // paste;
 
                 this.showPopupMenu(this.textMenu, {}, event);
             }
@@ -1433,6 +1733,12 @@ define([
 
         onContextMenuClick: function(menu, item, e) {
             switch (item.value) {
+                case 'undo':
+                    this.api && this.api.Undo();
+                    break;
+                case 'redo':
+                    this.api && this.api.Redo();
+                    break;
                 case 'copy':
                 case 'cut':
                 case 'paste':
@@ -1449,13 +1755,6 @@ define([
                         }
                     }
                     break;
-                case 'print':
-                    var printopt = new Asc.asc_CAdjustPrint();
-                    printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection);
-                    var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
-                    opts.asc_setAdvancedOptions(printopt);
-                    this.api.asc_Print(opts);
-                    break;
             }
         },
 
@@ -1507,7 +1806,96 @@ define([
         errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.',
         errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored and page is reloaded.',
         uploadImageSizeMessage: 'Maximum image size limit exceeded.',
-        uploadImageExtMessage: 'Unknown image format.'
+        uploadImageExtMessage: 'Unknown image format.',
+        txtArt: 'Your text here',
+        txtChoose: 'Choose an item',
+        txtEnterDate: 'Enter a date',
+        txtClickToLoad: 'Click to load image',
+        openErrorText: 'An error has occurred while opening the file',
+        mniImageFromFile: 'Image from File',
+        mniImageFromUrl: 'Image from URL',
+        mniImageFromStorage: 'Image from Storage',
+        txtUntitled: 'Untitled',
+        errorToken: 'The document security token is not correctly formed.<br>Please contact your Document Server administrator.',
+        errorSessionAbsolute: 'The document editing session has expired. Please reload the page.',
+        errorSessionIdle: 'The document has not been edited for quite a long time. Please reload the page.',
+        errorSessionToken: 'The connection to the server has been interrupted. Please reload the page.',
+        errorBadImageUrl: 'Image url is incorrect',
+        errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',
+        saveErrorText: 'An error has occurred while saving the file',
+        saveErrorTextDesktop: 'This file cannot be saved or created.<br>Possible reasons are: <br>1. The file is read-only. <br>2. The file is being edited by other users. <br>3. The disk is full or corrupted.',
+        errorEditingSaveas: 'An error occurred during the work with the document.<br>Use the \'Save as...\' option to save the file backup copy to your computer hard drive.',
+        textSaveAs: 'Save as PDF',
+        textSaveAsDesktop: 'Save as...'
 
     }, DE.Controllers.ApplicationController));
+
+    var Desktop = function () {
+        var features = {
+            version: '{{PRODUCT_VERSION}}',
+            // eventloading: true,
+            uithemes: true
+        };
+        var api;
+
+        var native = window.desktop || window.AscDesktopEditor;
+        !!native && native.execCommand('webapps:features', JSON.stringify(features));
+
+        if ( !!native ) {
+            $('#header-logo, .brand-logo').hide();
+
+            window.on_native_message = function (cmd, param) {
+                if (/theme:changed/.test(cmd)) {
+                    if ( !!Common.UI.Themes.setTheme )
+                        Common.UI.Themes.setTheme(param);
+                } else
+                if (/window:features/.test(cmd)) {
+                    var obj = JSON.parse(param);
+                    if ( obj.singlewindow !== undefined ) {
+                        $("#title-doc-name")[obj.singlewindow ? 'hide' : 'show']();
+                    }
+                }
+            };
+
+            if ( !!window.native_message_cmd ) {
+                for ( var c in window.native_message_cmd ) {
+                    window.on_native_message(c, window.native_message_cmd[c]);
+                }
+            }
+
+            Common.NotificationCenter.on({
+                'uitheme:changed' : function (name) {
+                    var theme = Common.UI.Themes.get(name);
+                    if ( theme )
+                        native.execCommand("uitheme:changed", JSON.stringify({name:name, type:theme.type}));
+                },
+            });
+        }
+
+        Common.Gateway.on('opendocument', function () {
+            api = DE.getController('ApplicationController').api;
+
+            var is_win_xp = window.RendererProcessVariable && window.RendererProcessVariable.os === 'winxp';
+            Common.UI.Themes.setAvailable(!is_win_xp);
+        });
+
+        return {
+            isActive: function () {
+                return !!native;
+            },
+            process: function (opts) {
+                if ( !!native && !!api ) {
+                    if ( opts == 'goback' ) {
+                        var config = DE.getController('ApplicationController').editorConfig;
+                        native.execCommand('go:folder',
+                            api.asc_isOffline() ? 'offline' : config.customization.goback.url);
+                        return true;
+                    }
+                }
+
+                return false;
+            },
+        }
+    };
+    DE.Controllers.Desktop = new Desktop();
 });

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

@@ -16,6 +16,7 @@ define([
                 cls: 'btn-toolbar no-caret',
                 iconCls: 'svg-icon more-vertical',
                 menu: new Common.UI.Menu({
+                    cls: 'shifted-right',
                     items: [
                         {caption: this.txtPrint, value: 'print', iconCls: 'mi-icon svg-icon print'},
                         {caption: '--'},
@@ -90,10 +91,12 @@ define([
             return new Common.UI.Menu({
                 cls: 'shifted-right',
                 items: [
+                    { caption: this.textUndo, value: 'undo', iconCls: 'mi-icon svg-icon undo' },
+                    { caption: this.textRedo, value: 'redo', iconCls: 'mi-icon svg-icon redo' },
+                    { caption: '--' },
                     { caption: this.textCut, value: 'cut', iconCls: 'mi-icon svg-icon cut' },
                     { caption: this.textCopy, value: 'copy', iconCls: 'mi-icon svg-icon copy' },
-                    { caption: this.textPaste, value: 'paste', iconCls: 'mi-icon svg-icon paste' },
+                    { caption: this.textPaste, value: 'paste', iconCls: 'mi-icon svg-icon paste' }
-                    { caption: this.textPrintSel, value: 'print', iconCls: 'mi-icon svg-icon print' }
                 ]
             });
         },
@@ -113,7 +116,10 @@ define([
         textCut: 'Cut',
         textCopy: 'Copy',
         textPaste: 'Paste',
-        textPrintSel: 'Print Selection'
+        textPrintSel: 'Print Selection',
+        txtDarkMode: 'Dark mode',
+        textUndo: 'Undo',
+        textRedo: 'Redo'
 
     }, DE.Views.ApplicationView || {}));
 });

apps/documenteditor/forms/index.html

@@ -152,6 +152,16 @@
 
   <body class="embed-body">
       <script src="../../common/main/lib/util/htmlutils.js"></script>
+      <script>
+          if ( !!window.desktop ) {
+              var sheet = document.createElement('style')
+              sheet.innerHTML = ".device-desktop .loading-logo {display:none;}";
+              document.body.appendChild(sheet);
+
+              document.body.classList.add('device-desktop');
+          }
+      </script>
+
       <div id="loading-mask" class="loadmask">
           <div class="brendpanel">
             <div><div class="brand-logo loading-logo"><img src=""></div><div class="doc-title"></div><div class="circle"></div></div>

apps/documenteditor/forms/index.html.deploy

@@ -127,6 +127,16 @@
         }
     </style>
 
+    <script>
+        if ( window.AscDesktopEditor ) {
+            window.on_native_message = function (cmd, param) {
+                !window.native_message_cmd && (window.native_message_cmd = []);
+                window.native_message_cmd[cmd] = param;
+            }
+            //window.desktop.execCommand('webapps:entry', '');
+        }
+    </script>
+
     <!--[if lt IE 9]>
       <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"></script>
     <![endif]-->
@@ -134,6 +144,16 @@
 
   <body class="embed-body">
       <script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>
+      <script>
+          if ( !!window.desktop ) {
+              var sheet = document.createElement('style')
+              sheet.innerHTML = ".device-desktop .loading-logo {display:none;}";
+              document.body.appendChild(sheet);
+
+              document.body.classList.add('device-desktop');
+          }
+      </script>
+
       <div id="loading-mask" class="loadmask">
           <div class="brendpanel">
             <div><div class="brand-logo loading-logo"><img src=""></div><div class="doc-title"></div><div class="circle"></div></div>

apps/documenteditor/forms/locale/ca.json

@@ -94,8 +94,12 @@
   "DE.Controllers.ApplicationController.textSubmited": "<b>El formulari s'ha enviat amb èxit</b><br>Cliqueu per tancar el consell",
   "DE.Controllers.ApplicationController.titleServerVersion": "S'ha actualitzat l'editor",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "S'ha canviat la versió",
+  "DE.Controllers.ApplicationController.txtArt": "El vostre text aquí",
+  "DE.Controllers.ApplicationController.txtChoose": "Tria un element",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "Clica per carregar la imatge",
   "DE.Controllers.ApplicationController.txtClose": "Tanca",
   "DE.Controllers.ApplicationController.txtEmpty": "(Buit)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "Introdueix una data",
   "DE.Controllers.ApplicationController.txtPressLink": "Prem CTRL i clica a l'enllaç",
   "DE.Controllers.ApplicationController.unknownErrorText": "Error desconegut.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "El vostre navegador no és compatible.",
@@ -115,6 +119,7 @@
   "DE.Views.ApplicationView.textPaste": "Enganxar",
   "DE.Views.ApplicationView.textPrintSel": "Imprimir la selecció",
   "DE.Views.ApplicationView.textSubmit": "Envia",
+  "DE.Views.ApplicationView.txtDarkMode": "Mode fosc",
   "DE.Views.ApplicationView.txtDownload": "Baixa",
   "DE.Views.ApplicationView.txtDownloadDocx": "Baixa-ho com a .docx",
   "DE.Views.ApplicationView.txtDownloadPdf": "Baixa-ho com a pdf",

apps/documenteditor/forms/locale/cs.json

@@ -1,34 +1,159 @@
 {
+  "Common.UI.Calendar.textApril": "duben",
+  "Common.UI.Calendar.textAugust": "srpen",
+  "Common.UI.Calendar.textDecember": "prosinec",
+  "Common.UI.Calendar.textFebruary": "únor",
+  "Common.UI.Calendar.textJanuary": "leden",
+  "Common.UI.Calendar.textJuly": "červenec",
+  "Common.UI.Calendar.textJune": "červen",
+  "Common.UI.Calendar.textMarch": "březen",
+  "Common.UI.Calendar.textMay": "květen",
+  "Common.UI.Calendar.textMonths": "měsíce",
+  "Common.UI.Calendar.textNovember": "listopad",
+  "Common.UI.Calendar.textOctober": "říjen",
+  "Common.UI.Calendar.textSeptember": "září",
+  "Common.UI.Calendar.textShortApril": "dub.",
+  "Common.UI.Calendar.textShortAugust": "srp.",
+  "Common.UI.Calendar.textShortDecember": "pro.",
+  "Common.UI.Calendar.textShortFebruary": "úno.",
+  "Common.UI.Calendar.textShortFriday": "pá",
+  "Common.UI.Calendar.textShortJanuary": "led.",
+  "Common.UI.Calendar.textShortJuly": "čvc.",
+  "Common.UI.Calendar.textShortJune": "čvn.",
+  "Common.UI.Calendar.textShortMarch": "bře.",
+  "Common.UI.Calendar.textShortMay": "květen",
+  "Common.UI.Calendar.textShortMonday": "po",
+  "Common.UI.Calendar.textShortNovember": "lis.",
+  "Common.UI.Calendar.textShortOctober": "říj.",
+  "Common.UI.Calendar.textShortSaturday": "so",
+  "Common.UI.Calendar.textShortSeptember": "zář.",
+  "Common.UI.Calendar.textShortSunday": "ne",
+  "Common.UI.Calendar.textShortThursday": "čt",
+  "Common.UI.Calendar.textShortTuesday": "út",
+  "Common.UI.Calendar.textShortWednesday": "st",
+  "Common.UI.Calendar.textYears": "roky",
+  "Common.UI.Themes.txtThemeClassicLight": "Standartní světlost",
+  "Common.UI.Themes.txtThemeDark": "Tmavé",
+  "Common.UI.Themes.txtThemeLight": "Světlé",
+  "Common.UI.Window.cancelButtonText": "Zrušit",
+  "Common.UI.Window.closeButtonText": "Zavřít",
+  "Common.UI.Window.noButtonText": "Ne",
+  "Common.UI.Window.okButtonText": "OK",
+  "Common.UI.Window.textConfirmation": "Potvrzení",
+  "Common.UI.Window.textDontShow": "Nezobrazovat znovu tuto zprávu",
+  "Common.UI.Window.textError": "Chyba",
+  "Common.UI.Window.textInformation": "Informace",
+  "Common.UI.Window.textWarning": "Varování",
+  "Common.UI.Window.yesButtonText": "Ano",
+  "Common.Views.CopyWarningDialog.textDontShow": "Nezobrazovat znovu tuto zprávu",
+  "Common.Views.CopyWarningDialog.textMsg": "Akce kopírovat, vyjmout a vložit použitím lišty nástrojů editoru a kontextové nabídky budou prováděny pouze v tomto okně editoru.<br><br>Pro kopírování do nebo vkládání z aplikací mimo okno editoru použijte následující klávesové zkratky:",
+  "Common.Views.CopyWarningDialog.textTitle": "Akce kopírovat, vyjmout a vložit",
+  "Common.Views.CopyWarningDialog.textToCopy": "pro kopírování",
+  "Common.Views.CopyWarningDialog.textToCut": "pro vyjmutí",
+  "Common.Views.CopyWarningDialog.textToPaste": "pro vložení",
+  "Common.Views.EmbedDialog.textHeight": "Výška",
+  "Common.Views.EmbedDialog.textTitle": "Vestavěný",
+  "Common.Views.EmbedDialog.textWidth": "Šířka",
+  "Common.Views.EmbedDialog.txtCopy": "Zkopírovat do schránky",
+  "Common.Views.EmbedDialog.warnCopy": "Chyba prohlížeče! Použijte klávesovou zkratku [Ctrl] + [C]",
+  "Common.Views.ImageFromUrlDialog.textUrl": "Vložit URL obrázku:",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "Toto pole je povinné",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Toto pole musí být URL adresa ve formátu \"http://www.example.com\"",
+  "Common.Views.OpenDialog.closeButtonText": "Zavřít soubor",
+  "Common.Views.OpenDialog.txtEncoding": "Kódování",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "Heslo není správné.",
+  "Common.Views.OpenDialog.txtOpenFile": "Zadejte heslo pro otevření souboru",
+  "Common.Views.OpenDialog.txtPassword": "Heslo",
+  "Common.Views.OpenDialog.txtPreview": "Náhled",
+  "Common.Views.OpenDialog.txtProtected": "Jakmile zadáte heslo a soubor otevřete, stávající heslo k souboru bude resetováno.",
+  "Common.Views.OpenDialog.txtTitle": "Vyberte %1 možností",
+  "Common.Views.OpenDialog.txtTitleProtected": "Zabezpečený soubor",
+  "Common.Views.SaveAsDlg.textLoading": "Načítání",
+  "Common.Views.SaveAsDlg.textTitle": "Složka do které uložit",
+  "Common.Views.SelectFileDlg.textLoading": "Načítání",
+  "Common.Views.SelectFileDlg.textTitle": "Vybrat zdroj dat",
+  "Common.Views.ShareDialog.textTitle": "Odkaz pro sdílení",
+  "Common.Views.ShareDialog.txtCopy": "Zkopírovat do schránky",
+  "Common.Views.ShareDialog.warnCopy": "Chyba prohlížeče! Použijte klávesovou zkratku [Ctrl] + [C]",
   "DE.Controllers.ApplicationController.convertationErrorText": "Převod se nezdařil.",
   "DE.Controllers.ApplicationController.convertationTimeoutText": "Překročen časový limit pro provedení převodu.",
   "DE.Controllers.ApplicationController.criticalErrorTitle": "Chyba",
   "DE.Controllers.ApplicationController.downloadErrorText": "Stahování se nezdařilo.",
   "DE.Controllers.ApplicationController.downloadTextText": "Stahování dokumentu…",
-  "DE.Controllers.ApplicationController.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.<br>Obraťte se na správce vámi využívaného dokumentového serveru.",
+  "DE.Controllers.ApplicationController.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.<br>Obraťte se na správce Vámi využívaného dokumentového serveru.",
+  "DE.Controllers.ApplicationController.errorBadImageUrl": "Adresa URL obrázku je nesprávná",
+  "DE.Controllers.ApplicationController.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte Vašeho správce.<br>Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.",
+  "DE.Controllers.ApplicationController.errorDataEncrypted": "Obdrženy šifrované změny – bez hesla je není možné zobrazit.",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "Kód chyby: %1",
   "DE.Controllers.ApplicationController.errorEditingDownloadas": "Při práci s dokumentem došlo k chybě.<br>Použijte volbu 'Stáhnout jako…' pro uložení záložní kopie na harddisk Vašeho počítače. ",
-  "DE.Controllers.ApplicationController.errorFilePassProtect": "Soubor je chráněn heslem a bez něj ho nelze otevřít.",
+  "DE.Controllers.ApplicationController.errorEditingSaveas": "Při práci s dokumentem došlo k chybě.<br>Použijte volbu „Uložit jako…“ a uložte si do souboru jako záložní kopii na svůj počítač.",
+  "DE.Controllers.ApplicationController.errorFilePassProtect": "Soubor je zabezpečen heslem, bez kterého ho nelze otevřít.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "Velikost souboru překračuje omezení nastavená na serveru, který využíváte.<br>Ohledně podrobností se obraťte na správce dokumentového serveru.",
   "DE.Controllers.ApplicationController.errorForceSave": "Při ukládání souboru došlo k chybě. Prosím použijte 'Stáhnout jako' k uložení souboru na harddisk Vašeho počítače, nebo opakujte volbu později.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Styly nejsou načteny.<br>Prosím kontaktujte Vašeho administrátora dokumentových serverů.",
+  "DE.Controllers.ApplicationController.errorServerVersion": "Verze editoru byla aktualizována. Stránka bude znovu načtena, aby se provedly změny.",
+  "DE.Controllers.ApplicationController.errorSessionAbsolute": "Úprava editace dokumentu vypršela. Prosím, znovu načtěte stránku.",
+  "DE.Controllers.ApplicationController.errorSessionIdle": "Dokument nebyl po dlouhou dobu upravován. Prosím, znovu načtěte stránku.",
+  "DE.Controllers.ApplicationController.errorSessionToken": "Připojení k serveru bylo přerušeno. Prosím, znovu načtěte stránku.",
   "DE.Controllers.ApplicationController.errorSubmit": "Potvrzení selhalo.",
+  "DE.Controllers.ApplicationController.errorToken": "Token zabezpečení dokumentu nemá správný formát.<br> Obraťte se na Vašeho správce dokumentového serveru.",
+  "DE.Controllers.ApplicationController.errorTokenExpire": "Dokument bezpečnostního tokenu vypršel.<br>Prosím, kontaktujte administrátora vašeho dokumentového serveru.",
+  "DE.Controllers.ApplicationController.errorUpdateVersion": "Verze souboru byla změněna. Stránka bude znovu načtena.",
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Připojení k Internetu bylo obnoveno a verze souboru byla změněna.<br>Než budete moci pokračovat v práci, bude třeba si soubor stáhnout nebo si zkopírovat jeho obsah, abyste si zajistili, že se nic neztratí a až poté tuto stránku znovu načtěte.",
   "DE.Controllers.ApplicationController.errorUserDrop": "Tento soubor nyní není přístupný.",
+  "DE.Controllers.ApplicationController.errorViewerDisconnect": "Spojení je ztraceno. Stále můžete zobrazit dokument,<br>ale nebudete moct stahovat ani tisknout, dokud nebude obnoveno připojení.",
+  "DE.Controllers.ApplicationController.mniImageFromFile": "Obrázek ze souboru",
+  "DE.Controllers.ApplicationController.mniImageFromStorage": "Obrázek z úložiště",
+  "DE.Controllers.ApplicationController.mniImageFromUrl": "Obrázek z URL adresy",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Varování",
+  "DE.Controllers.ApplicationController.openErrorText": "Při otevírání souboru došlo k chybě.",
+  "DE.Controllers.ApplicationController.saveErrorText": "Během ukládání souboru došlo k chybě.",
+  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "Soubor nemohl být uložen nebo vytvořen.<br>Možné důvody: <br>1. Soubor je pouze pro čtení. <br>2. Soubor je editován jinými uživateli. <br>3. Úložiště je plně zaplněno nebo poškozeno.",
   "DE.Controllers.ApplicationController.scriptLoadError": "Připojení je příliš pomalé, některé součásti se nepodařilo načíst. Načtěte stránku znovu.",
   "DE.Controllers.ApplicationController.textAnonymous": "Anonymní",
+  "DE.Controllers.ApplicationController.textBuyNow": "Navštívit webovou stránku",
+  "DE.Controllers.ApplicationController.textCloseTip": "Klikněte pro zavření nápovědy.",
+  "DE.Controllers.ApplicationController.textContactUs": "Kontaktovat obchodní oddělení",
   "DE.Controllers.ApplicationController.textGotIt": "Rozumím",
-  "DE.Controllers.ApplicationController.textGuest": "Host",
+  "DE.Controllers.ApplicationController.textGuest": "Návštěvník",
   "DE.Controllers.ApplicationController.textLoadingDocument": "Načítání dokumentu",
+  "DE.Controllers.ApplicationController.textNoLicenseTitle": "Došlo k dosažení limitu licence",
   "DE.Controllers.ApplicationController.textOf": "z",
   "DE.Controllers.ApplicationController.textRequired": "Pro odeslání formuláře vyplňte všechna požadovaná pole.",
+  "DE.Controllers.ApplicationController.textSaveAs": "Uložit jako PDF",
+  "DE.Controllers.ApplicationController.textSaveAsDesktop": "Uložit jako...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Formulář úspěšně uložen.</b><br>Klikněte pro zavření nápovědy.",
+  "DE.Controllers.ApplicationController.titleServerVersion": "Editor byl aktualizován",
+  "DE.Controllers.ApplicationController.titleUpdateVersion": "Verze změněna",
+  "DE.Controllers.ApplicationController.txtArt": "Zde napište text",
+  "DE.Controllers.ApplicationController.txtChoose": "Zvolte položku",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "Kliknutím nehrajte obrázek",
   "DE.Controllers.ApplicationController.txtClose": "Zavřít",
   "DE.Controllers.ApplicationController.txtEmpty": "(Prázdné)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "Zadejte datum",
   "DE.Controllers.ApplicationController.txtPressLink": "Stiskněte CTRL a klikněte na odkaz",
+  "DE.Controllers.ApplicationController.txtUntitled": "Bez názvu",
   "DE.Controllers.ApplicationController.unknownErrorText": "Neznámá chyba.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "Vámi používaný webový prohlížeč není podporován.",
+  "DE.Controllers.ApplicationController.uploadImageExtMessage": "Neznámý formát obrázku.",
+  "DE.Controllers.ApplicationController.uploadImageSizeMessage": "Obrázek je příliš velký. Maximální velikost je 25 MB.",
   "DE.Controllers.ApplicationController.waitText": "Čekejte prosím…",
+  "DE.Controllers.ApplicationController.warnLicenseExceeded": "Došlo k dosažení limitu počtu souběžných spojení %1 editorů. Dokument bude otevřen pouze pro náhled.<br>Pro více podrobností kontaktujte svého správce.",
+  "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "Platnost vaší licence skončila.<br>Nemáte přístup k upravování dokumentů.<br>Obraťte se na svého správce.",
+  "DE.Controllers.ApplicationController.warnLicenseLimitedRenewed": "Vaši licenci je nutné obnovit.<br>Přístup k možnostem editace dokumentu je omezen.<br>Pro získání plného přístupu prosím kontaktujte svého administrátora.",
+  "DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "Došlo dosažení limitu %1 editorů v režimu spolupráce na úpravách. Ohledně podrobností se obraťte na svého správce.",
+  "DE.Controllers.ApplicationController.warnNoLicense": "Došlo dosažení limitu souběžných připojení %1 editorů. Dokument bude otevřen pouze pro náhled.<br>Pro rozšíření funkcí kontaktujte %1 obchodní oddělení.",
+  "DE.Controllers.ApplicationController.warnNoLicenseUsers": "Došlo k dosažení limitu %1 editorů. Pro rozšíření funkcí kontaktujte %1 obchodní oddělení.",
+  "DE.Views.ApplicationView.textClear": "Vymazat všechna pole",
+  "DE.Views.ApplicationView.textCopy": "Kopírovat",
+  "DE.Views.ApplicationView.textCut": "Vyjmout",
+  "DE.Views.ApplicationView.textNext": "Následující pole",
+  "DE.Views.ApplicationView.textPaste": "Vložit",
+  "DE.Views.ApplicationView.textPrintSel": "Vytisknout vybrané",
+  "DE.Views.ApplicationView.textRedo": "Znovu",
+  "DE.Views.ApplicationView.textSubmit": "Potvrdit",
+  "DE.Views.ApplicationView.textUndo": "Zpět",
+  "DE.Views.ApplicationView.txtDarkMode": "Tmavý režim",
   "DE.Views.ApplicationView.txtDownload": "Stáhnout",
   "DE.Views.ApplicationView.txtDownloadDocx": "Stáhnout jako docx",
   "DE.Views.ApplicationView.txtDownloadPdf": "Stáhnout jako pdf",
@@ -36,5 +161,6 @@
   "DE.Views.ApplicationView.txtFileLocation": "Otevřít umístění souboru",
   "DE.Views.ApplicationView.txtFullScreen": "Na celou obrazovku",
   "DE.Views.ApplicationView.txtPrint": "Tisk",
-  "DE.Views.ApplicationView.txtShare": "Sdílet"
+  "DE.Views.ApplicationView.txtShare": "Sdílet",
+  "DE.Views.ApplicationView.txtTheme": "Vzhled uživatelského rozhraní"
 }

apps/documenteditor/forms/locale/en.json

@@ -56,6 +56,22 @@
   "Common.Views.EmbedDialog.textWidth": "Width",
   "Common.Views.EmbedDialog.txtCopy": "Copy to clipboard",
   "Common.Views.EmbedDialog.warnCopy": "Browser's error! Use keyboard shortcut [Ctrl] + [C]",
+  "Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "This field is required",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "This field should be a URL in the \"http://www.example.com\" format",
+  "Common.Views.OpenDialog.closeButtonText": "Close File",
+  "Common.Views.OpenDialog.txtEncoding": "Encoding ",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.",
+  "Common.Views.OpenDialog.txtOpenFile": "Enter a password to open the file",
+  "Common.Views.OpenDialog.txtPassword": "Password",
+  "Common.Views.OpenDialog.txtPreview": "Preview",
+  "Common.Views.OpenDialog.txtProtected": "Once you enter the password and open the file, the current password to the file will be reset.",
+  "Common.Views.OpenDialog.txtTitle": "Choose %1 options",
+  "Common.Views.OpenDialog.txtTitleProtected": "Protected File",
+  "Common.Views.SaveAsDlg.textLoading": "Loading",
+  "Common.Views.SaveAsDlg.textTitle": "Folder for save",
+  "Common.Views.SelectFileDlg.textLoading": "Loading",
+  "Common.Views.SelectFileDlg.textTitle": "Select Data Source",
   "Common.Views.ShareDialog.textTitle": "Share Link",
   "Common.Views.ShareDialog.txtCopy": "Copy to clipboard",
   "Common.Views.ShareDialog.warnCopy": "Browser's error! Use keyboard shortcut [Ctrl] + [C]",
@@ -65,21 +81,34 @@
   "DE.Controllers.ApplicationController.downloadErrorText": "Download failed.",
   "DE.Controllers.ApplicationController.downloadTextText": "Downloading document...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
+  "DE.Controllers.ApplicationController.errorBadImageUrl": "Image URL is incorrect",
   "DE.Controllers.ApplicationController.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.",
+  "DE.Controllers.ApplicationController.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "Error code: %1",
   "DE.Controllers.ApplicationController.errorEditingDownloadas": "An error occurred during the work with the document.<br>Use the 'Download as...' option to save the file backup copy to your computer hard drive.",
+  "DE.Controllers.ApplicationController.errorEditingSaveas": "An error occurred during the work with the document.<br>Use the 'Save as...' option to save the file backup copy to your computer hard drive.",
   "DE.Controllers.ApplicationController.errorFilePassProtect": "The file is password protected and cannot be opened.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
   "DE.Controllers.ApplicationController.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",
   "DE.Controllers.ApplicationController.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
+  "DE.Controllers.ApplicationController.errorSessionAbsolute": "The document editing session has expired. Please reload the page.",
+  "DE.Controllers.ApplicationController.errorSessionIdle": "The document has not been edited for quite a long time. Please reload the page.",
+  "DE.Controllers.ApplicationController.errorSessionToken": "The connection to the server has been interrupted. Please reload the page.",
   "DE.Controllers.ApplicationController.errorSubmit": "Submit failed.",
+  "DE.Controllers.ApplicationController.errorToken": "The document security token is not correctly formed.<br>Please contact your Document Server administrator.",
   "DE.Controllers.ApplicationController.errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
   "DE.Controllers.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print it until the connection is restored and page is reloaded.",
+  "DE.Controllers.ApplicationController.mniImageFromFile": "Image from File",
+  "DE.Controllers.ApplicationController.mniImageFromStorage": "Image from Storage",
+  "DE.Controllers.ApplicationController.mniImageFromUrl": "Image from URL",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Warning",
+  "DE.Controllers.ApplicationController.openErrorText": "An error has occurred while opening the file.",
+  "DE.Controllers.ApplicationController.saveErrorText": "An error has occurred while saving the file.",
+  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "This file cannot be saved or created.<br>Possible reasons are: <br>1. The file is read-only. <br>2. The file is being edited by other users. <br>3. The disk is full or corrupted.",
   "DE.Controllers.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
   "DE.Controllers.ApplicationController.textAnonymous": "Anonymous",
   "DE.Controllers.ApplicationController.textBuyNow": "Visit website",
@@ -91,12 +120,19 @@
   "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.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.titleServerVersion": "Editor updated",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "Version changed",
+  "DE.Controllers.ApplicationController.txtArt": "Your text here",
+  "DE.Controllers.ApplicationController.txtChoose": "Choose an item",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "Click to load image",
   "DE.Controllers.ApplicationController.txtClose": "Close",
   "DE.Controllers.ApplicationController.txtEmpty": "(Empty)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "Enter a date",
   "DE.Controllers.ApplicationController.txtPressLink": "Press Ctrl and click link",
+  "DE.Controllers.ApplicationController.txtUntitled": "Untitled",
   "DE.Controllers.ApplicationController.unknownErrorText": "Unknown error.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
   "DE.Controllers.ApplicationController.uploadImageExtMessage": "Unknown image format.",
@@ -114,7 +150,10 @@
   "DE.Views.ApplicationView.textNext": "Next Field",
   "DE.Views.ApplicationView.textPaste": "Paste",
   "DE.Views.ApplicationView.textPrintSel": "Print Selection",
+  "DE.Views.ApplicationView.textRedo": "Redo",
   "DE.Views.ApplicationView.textSubmit": "Submit",
+  "DE.Views.ApplicationView.textUndo": "Undo",
+  "DE.Views.ApplicationView.txtDarkMode": "Dark mode",
   "DE.Views.ApplicationView.txtDownload": "Download",
   "DE.Views.ApplicationView.txtDownloadDocx": "Download as docx",
   "DE.Views.ApplicationView.txtDownloadPdf": "Download as pdf",

apps/documenteditor/forms/locale/es.json

@@ -56,6 +56,22 @@
   "Common.Views.EmbedDialog.textWidth": "Ancho",
   "Common.Views.EmbedDialog.txtCopy": "Copiar al portapapeles",
   "Common.Views.EmbedDialog.warnCopy": "¡Error del navegador! Utilice el método abreviado de teclado [Ctrl] + [C]",
+  "Common.Views.ImageFromUrlDialog.textUrl": "Pegar URL de imagen:",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "Este campo es obligatorio",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Este campo debe ser una URL en el formato \"http://www.example.com\"",
+  "Common.Views.OpenDialog.closeButtonText": "Cerrar archivo",
+  "Common.Views.OpenDialog.txtEncoding": "Codificación",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "La contraseña es incorrecta",
+  "Common.Views.OpenDialog.txtOpenFile": "Introduzca la contraseña para abrir el archivo",
+  "Common.Views.OpenDialog.txtPassword": "Contraseña",
+  "Common.Views.OpenDialog.txtPreview": "Vista previa",
+  "Common.Views.OpenDialog.txtProtected": "Una vez que se ha introducido la contraseña y se ha abierto el archivo, la contraseña actual para el archivo se restablecerá",
+  "Common.Views.OpenDialog.txtTitle": "Elegir opciones de %1",
+  "Common.Views.OpenDialog.txtTitleProtected": "Archivo protegido",
+  "Common.Views.SaveAsDlg.textLoading": "Cargando",
+  "Common.Views.SaveAsDlg.textTitle": "Carpeta para guardar",
+  "Common.Views.SelectFileDlg.textLoading": "Cargando",
+  "Common.Views.SelectFileDlg.textTitle": "Seleccionar origen de datos",
   "Common.Views.ShareDialog.textTitle": "Compartir enlace",
   "Common.Views.ShareDialog.txtCopy": "Copiar al portapapeles",
   "Common.Views.ShareDialog.warnCopy": "¡Error del navegador! Utilice el método abreviado de teclado [Ctrl] + [C]",
@@ -65,21 +81,34 @@
   "DE.Controllers.ApplicationController.downloadErrorText": "Error en la descarga",
   "DE.Controllers.ApplicationController.downloadTextText": "Descargando documento...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "Está tratando de realizar una acción para la cual no tiene permiso.<br> Por favor, contacte con su Administrador del Servidor de Documentos.",
+  "DE.Controllers.ApplicationController.errorBadImageUrl": "URL de imagen es incorrecta",
   "DE.Controllers.ApplicationController.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.<br>Al hacer clic en el botón 'OK', se le solicitará que descargue el documento.",
+  "DE.Controllers.ApplicationController.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "Código de error: %1",
   "DE.Controllers.ApplicationController.errorEditingDownloadas": "Se produjo un error durante el trabajo con el documento.<br>Use la opción 'Descargar como...' para guardar la copia de seguridad de este archivo en el disco duro de su ordenador.",
+  "DE.Controllers.ApplicationController.errorEditingSaveas": "Se ha producido un error durante el trabajo con el documento.<br>Use la opción 'Guardar como...' para guardar la copia de seguridad de este archivo en el disco duro de su ordenador.",
   "DE.Controllers.ApplicationController.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "El tamaño del archivo excede el límite establecido para su servidor. Por favor póngase en contacto con el administrador del Servidor de Documentos para obtener más información.",
   "DE.Controllers.ApplicationController.errorForceSave": "Ha ocurrido un error al guardar el archivo. Por favor, use la opción \"Descargar como\" para guardar el archivo en el disco duro de su ordenador o inténtelo de nuevo más tarde.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Las fuentes no están cargadas.<br>Por favor, póngase en contacto con el administrador del Document Server.",
   "DE.Controllers.ApplicationController.errorServerVersion": "La versión del editor ha sido actualizada. La página será recargada para aplicar los cambios.",
+  "DE.Controllers.ApplicationController.errorSessionAbsolute": "La sesión de editar el documento ha expirado. Por favor, recargue la página.",
+  "DE.Controllers.ApplicationController.errorSessionIdle": "El documento no ha sido editado durante bastante tiempo. Por favor, recargue la página.",
+  "DE.Controllers.ApplicationController.errorSessionToken": "Se ha interrumpido la conexión con el servidor. Por favor, recargue la página.",
   "DE.Controllers.ApplicationController.errorSubmit": "Error al enviar.",
+  "DE.Controllers.ApplicationController.errorToken": "El token de seguridad de documento tiene un formato incorrecto.<br>Por favor, contacte con el Administrador del Servidor de Documentos.",
   "DE.Controllers.ApplicationController.errorTokenExpire": "El token de seguridad del documento ha expirado.<br>Por favor, póngase en contacto con el administrador del Servidor de Documentos.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "Se ha cambiado la versión del archivo. La página será actualizada.",
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "La conexión a Internet ha sido restaurada, y la versión del archivo ha sido cambiada. Antes de poder seguir trabajando, es necesario descargar el archivo o copiar su contenido para asegurarse de que no se pierda nada, y luego recargar esta página.",
   "DE.Controllers.ApplicationController.errorUserDrop": "No se puede acceder al archivo en este momento.",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "Se ha perdido la conexión. Usted todavía puede visualizar el documento,<br>pero no puede descargar o imprimirlo hasta que la conexión sea restaurada y la página esté recargada.",
+  "DE.Controllers.ApplicationController.mniImageFromFile": "Imagen desde archivo",
+  "DE.Controllers.ApplicationController.mniImageFromStorage": "Imagen de Almacenamiento",
+  "DE.Controllers.ApplicationController.mniImageFromUrl": "Imagen de URL",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Aviso",
+  "DE.Controllers.ApplicationController.openErrorText": "Se ha producido un error al abrir el archivo. ",
+  "DE.Controllers.ApplicationController.saveErrorText": "Se ha producido un error al guardar el archivo. ",
+  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "Este archivo no se puede guardar o crear.<br>Las razones posibles son: <br>1. El archivo es sólo para leer. <br>2. El archivo está siendo editado por otros usuarios. <br>3. El disco está lleno o corrupto.",
   "DE.Controllers.ApplicationController.scriptLoadError": "La conexión a Internet es demasiado lenta, algunos de los componentes no se han podido cargar. Por favor, recargue la página.",
   "DE.Controllers.ApplicationController.textAnonymous": "Anónimo",
   "DE.Controllers.ApplicationController.textBuyNow": "Visitar sitio web",
@@ -91,12 +120,19 @@
   "DE.Controllers.ApplicationController.textNoLicenseTitle": "Se ha alcanzado el límite de licencia",
   "DE.Controllers.ApplicationController.textOf": "de",
   "DE.Controllers.ApplicationController.textRequired": "Rellene todos los campos obligatorios para enviar el formulario.",
+  "DE.Controllers.ApplicationController.textSaveAs": "Guardar como PDF",
+  "DE.Controllers.ApplicationController.textSaveAsDesktop": "Guardar como...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Formulario enviado con éxito</b><br>Haga clic para cerrar el consejo",
   "DE.Controllers.ApplicationController.titleServerVersion": "Editor ha sido actualizado",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "Versión se ha cambiado",
+  "DE.Controllers.ApplicationController.txtArt": "Escriba el texto aquí",
+  "DE.Controllers.ApplicationController.txtChoose": "Elija un elemento",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "Haga clic para cargar la imagen",
   "DE.Controllers.ApplicationController.txtClose": "Cerrar",
   "DE.Controllers.ApplicationController.txtEmpty": "(Vacío)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "Introduzca una fecha",
   "DE.Controllers.ApplicationController.txtPressLink": "Pulse CTRL y haga clic en el enlace",
+  "DE.Controllers.ApplicationController.txtUntitled": "Sin título",
   "DE.Controllers.ApplicationController.unknownErrorText": "Error desconocido.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "Su navegador no es compatible.",
   "DE.Controllers.ApplicationController.uploadImageExtMessage": "Formato de imagen desconocido.",
@@ -114,7 +150,10 @@
   "DE.Views.ApplicationView.textNext": "Campo siguiente",
   "DE.Views.ApplicationView.textPaste": "Pegar",
   "DE.Views.ApplicationView.textPrintSel": "Imprimir selección",
+  "DE.Views.ApplicationView.textRedo": "Rehacer",
   "DE.Views.ApplicationView.textSubmit": "Enviar",
+  "DE.Views.ApplicationView.textUndo": "Deshacer",
+  "DE.Views.ApplicationView.txtDarkMode": "Modo oscuro",
   "DE.Views.ApplicationView.txtDownload": "Descargar",
   "DE.Views.ApplicationView.txtDownloadDocx": "Descargar como docx",
   "DE.Views.ApplicationView.txtDownloadPdf": "Descargar como pdf",

apps/documenteditor/forms/locale/fr.json

@@ -56,6 +56,22 @@
   "Common.Views.EmbedDialog.textWidth": "Largeur",
   "Common.Views.EmbedDialog.txtCopy": "Copier dans le presse-papiers",
   "Common.Views.EmbedDialog.warnCopy": "Erreur du navigateur ! Utilisez le raccourci clavier [Ctrl] + [C].",
+  "Common.Views.ImageFromUrlDialog.textUrl": "Collez l'URL de l'image :",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "Ce champ est obligatoire",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Ce champ doit être une URL au format \"http://www.example.com\"",
+  "Common.Views.OpenDialog.closeButtonText": "Fermer le fichier",
+  "Common.Views.OpenDialog.txtEncoding": "Codage",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "Le mot de passe est incorrect.",
+  "Common.Views.OpenDialog.txtOpenFile": "Entrez le mot de passe pour ouvrir le fichier",
+  "Common.Views.OpenDialog.txtPassword": "Mot de passe",
+  "Common.Views.OpenDialog.txtPreview": "Aperçu",
+  "Common.Views.OpenDialog.txtProtected": "Une fois le mot de passe saisi et le fichier ouvert, le mot de passe actuel de fichier sera réinitialisé.",
+  "Common.Views.OpenDialog.txtTitle": "Choisir les options %1",
+  "Common.Views.OpenDialog.txtTitleProtected": "Fichier protégé",
+  "Common.Views.SaveAsDlg.textLoading": "Chargement",
+  "Common.Views.SaveAsDlg.textTitle": "Dossier pour enregistrement",
+  "Common.Views.SelectFileDlg.textLoading": "Chargement",
+  "Common.Views.SelectFileDlg.textTitle": "Sélectionner la source de données",
   "Common.Views.ShareDialog.textTitle": "Partager un lien",
   "Common.Views.ShareDialog.txtCopy": "Copier dans le presse-papiers",
   "Common.Views.ShareDialog.warnCopy": "Erreur du navigateur ! Utilisez le raccourci clavier [Ctrl] + [C]",
@@ -65,21 +81,34 @@
   "DE.Controllers.ApplicationController.downloadErrorText": "Échec du téléchargement.",
   "DE.Controllers.ApplicationController.downloadTextText": "Téléchargement du document...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "Vous tentez d'exéсuter une action pour laquelle vous ne disposez pas des droits.<br>Veuillez contacter l'administrateur de Document Server.",
+  "DE.Controllers.ApplicationController.errorBadImageUrl": "L'URL de l'image est incorrecte",
   "DE.Controllers.ApplicationController.errorConnectToServer": "Impossible d'enregistrer le document. Veuillez vérifier vos paramètres de connexion ou contactez l'administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.",
+  "DE.Controllers.ApplicationController.errorDataEncrypted": "Les modifications chiffrées ont été reçues, elles ne peuvent pas être déchiffrées.",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "Code d'erreur: %1",
   "DE.Controllers.ApplicationController.errorEditingDownloadas": "Une erreur s'est produite lors du travail avec le document.<br>Utilisez l'option 'Télécharger comme...' pour enregistrer une copie de sauvegarde du fichier sur le disque dur de votre ordinateur.",
+  "DE.Controllers.ApplicationController.errorEditingSaveas": "Une erreure s'est produite lors du travail avec le document.<br>Utilisez l'option 'Enregistrer comme...' pour enregistrer une copie de sauvegarde  sur le disque dur de votre ordinateur. ",
   "DE.Controllers.ApplicationController.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut pas être ouvert.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "La taille du fichier dépasse les limites établies sur votre serveur.<br>Veuillez contacter votre administrateur de Document Server pour obtenir plus d'informations.  ",
   "DE.Controllers.ApplicationController.errorForceSave": "Une erreur est survenue lors de l'enregistrement du fichier. Veuillez utiliser l'option «Télécharger en tant que» pour enregistrer le fichier sur le disque dur de votre ordinateur ou réessayer plus tard.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Les polices ne sont pas téléchargées.<br>Veuillez contacter l'administrateur de Document Server.",
   "DE.Controllers.ApplicationController.errorServerVersion": "La version de l'éditeur a été mise à jour. La page sera rechargée pour appliquer les modifications.",
+  "DE.Controllers.ApplicationController.errorSessionAbsolute": "La session d'édition du document a expiré. Veuillez recharger la page.",
+  "DE.Controllers.ApplicationController.errorSessionIdle": "Le document n'a pas été modifié depuis trop longtemps. Veuillez recharger la page.",
+  "DE.Controllers.ApplicationController.errorSessionToken": "La connexion au serveur a été interrompue. Veuillez recharger la page.",
   "DE.Controllers.ApplicationController.errorSubmit": "Échec de soumission",
+  "DE.Controllers.ApplicationController.errorToken": "Le jeton de sécurité du document n’était pas formé correctement.<br>Veuillez contacter votre administrateur de Document Server.",
   "DE.Controllers.ApplicationController.errorTokenExpire": "Le jeton de sécurité du document a expiré.<br>Veuillez contactez l'administrateur de Document Server.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "La version du fichier a été changée. La page sera rechargée.",
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "La connexion internet a été rétablie, la version du fichier est modifiée.<br>Avant de continuer, téléchargez le fichier ou copiez le contenu pour vous assurer que tous les changements ont été enregistrés, et rechargez la page.",
   "DE.Controllers.ApplicationController.errorUserDrop": "Impossible d'accéder au fichier.",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "La connexion a été perdue. Vous pouvez toujours afficher le document,<br>mais vous ne pouvez pas le télécharger ou l'imprimer jusqu'à ce que la connexion soit rétablie et que la page soit actualisée.",
+  "DE.Controllers.ApplicationController.mniImageFromFile": "Image à partir d'un fichier",
+  "DE.Controllers.ApplicationController.mniImageFromStorage": "Image de stockage",
+  "DE.Controllers.ApplicationController.mniImageFromUrl": "Image à partir d'une URL",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Avertissement",
+  "DE.Controllers.ApplicationController.openErrorText": "Une erreur s’est produite lors de l’ouverture du fichier.",
+  "DE.Controllers.ApplicationController.saveErrorText": "Une erreur s'est produite lors de l'enregistrement du fichier.",
+  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "Ce fichier ne peut pas être enregistré ou créé.<br>Les raisons possibles sont : <br>1. Le fichier est en lecture seule. <br>2. Le fichier est en cours d'édition par d'autres utilisateurs. <br>3. le disque est plein ou corrompu.",
   "DE.Controllers.ApplicationController.scriptLoadError": "La connexion est trop lente, certains  éléments ne peuvent pas être chargés. Veuillez recharger la page.",
   "DE.Controllers.ApplicationController.textAnonymous": "Anonyme",
   "DE.Controllers.ApplicationController.textBuyNow": "Visiter le site web",
@@ -91,12 +120,19 @@
   "DE.Controllers.ApplicationController.textNoLicenseTitle": "La limite de la licence est atteinte",
   "DE.Controllers.ApplicationController.textOf": "de",
   "DE.Controllers.ApplicationController.textRequired": "Veuillez remplir tous les champs obligatoires avant d'envoyer le formulaire.",
+  "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.titleServerVersion": "L'éditeur est mis à jour",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "La version a été modifiée",
+  "DE.Controllers.ApplicationController.txtArt": "Saisissez votre texte",
+  "DE.Controllers.ApplicationController.txtChoose": "Choisissez un élément",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "Cliquez pour charger une image",
   "DE.Controllers.ApplicationController.txtClose": "Fermer",
   "DE.Controllers.ApplicationController.txtEmpty": "(Vide)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "Entrez une date",
   "DE.Controllers.ApplicationController.txtPressLink": "Appuyez sur Ctrl et cliquez sur le lien",
+  "DE.Controllers.ApplicationController.txtUntitled": "Sans titre",
   "DE.Controllers.ApplicationController.unknownErrorText": "Erreur inconnue.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "Votre navigateur n'est pas pris en charge.",
   "DE.Controllers.ApplicationController.uploadImageExtMessage": "Format d'image inconnu.",
@@ -114,7 +150,10 @@
   "DE.Views.ApplicationView.textNext": "Champ suivant",
   "DE.Views.ApplicationView.textPaste": "Coller",
   "DE.Views.ApplicationView.textPrintSel": "Imprimer la sélection",
+  "DE.Views.ApplicationView.textRedo": "Rétablir",
   "DE.Views.ApplicationView.textSubmit": "Soumettre ",
+  "DE.Views.ApplicationView.textUndo": "Annuler",
+  "DE.Views.ApplicationView.txtDarkMode": "Mode sombre",
   "DE.Views.ApplicationView.txtDownload": "Télécharger",
   "DE.Views.ApplicationView.txtDownloadDocx": "Télécharger en tant que docx",
   "DE.Views.ApplicationView.txtDownloadPdf": "Télécharger en tant que pdf",

apps/documenteditor/forms/locale/nl.json

@@ -80,6 +80,7 @@
   "DE.Controllers.ApplicationController.errorUserDrop": "Toegang tot het bestand is op dit moment niet mogelijk.",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "Verbinding is verbroken. U kunt het document nog wel bekijken,<br>maar u kunt het pas downloaden of afdrukken als de verbinding is hersteld en de pagina opnieuw is geladen.",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Waarschuwing",
+  "DE.Controllers.ApplicationController.openErrorText": "Er is een fout opgetreden bij het openen van het bestand",
   "DE.Controllers.ApplicationController.scriptLoadError": "De verbinding is te langzaam, sommige componenten konden niet geladen worden. Laad de pagina opnieuw.",
   "DE.Controllers.ApplicationController.textAnonymous": "Anoniem",
   "DE.Controllers.ApplicationController.textBuyNow": "Website bezoeken",
@@ -94,8 +95,12 @@
   "DE.Controllers.ApplicationController.textSubmited": "<b>Formulier succesvol ingediend</b><br>Klik om de tip te sluiten",
   "DE.Controllers.ApplicationController.titleServerVersion": "Editor bijgewerkt",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "Versie gewijzigd",
+  "DE.Controllers.ApplicationController.txtArt": "Hier tekst invoeren",
+  "DE.Controllers.ApplicationController.txtChoose": "Kies een item",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "Klik om afbeelding te laden",
   "DE.Controllers.ApplicationController.txtClose": "Sluiten",
   "DE.Controllers.ApplicationController.txtEmpty": "(Leeg)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "Vul een datum in",
   "DE.Controllers.ApplicationController.txtPressLink": "Druk op Ctrl en klik op koppeling",
   "DE.Controllers.ApplicationController.unknownErrorText": "Onbekende fout.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "Uw browser wordt niet ondersteund.",
@@ -115,6 +120,7 @@
   "DE.Views.ApplicationView.textPaste": "Plakken",
   "DE.Views.ApplicationView.textPrintSel": "Selectie afdrukken",
   "DE.Views.ApplicationView.textSubmit": "Indienen",
+  "DE.Views.ApplicationView.txtDarkMode": "Donkere modus",
   "DE.Views.ApplicationView.txtDownload": "Downloaden",
   "DE.Views.ApplicationView.txtDownloadDocx": "Downloaden als docx",
   "DE.Views.ApplicationView.txtDownloadPdf": "Downloaden als PDF",

apps/documenteditor/forms/locale/pt.json

@@ -80,6 +80,7 @@
   "DE.Controllers.ApplicationController.errorUserDrop": "O arquivo não pode ser acessado agora.",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "A ligação foi perdida. Você ainda pode ver o documento,<br> mas não pode fazer o download ou imprimir até que a conexão seja restaurada.",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Aviso",
+  "DE.Controllers.ApplicationController.openErrorText": "Ocorreu um erro ao abrir o arquivo",
   "DE.Controllers.ApplicationController.scriptLoadError": "A conexão está muito lenta, e alguns dos componentes não puderam ser carregados. Por favor, recarregue a página.",
   "DE.Controllers.ApplicationController.textAnonymous": "Anônimo",
   "DE.Controllers.ApplicationController.textBuyNow": "Visitar website",
@@ -94,8 +95,12 @@
   "DE.Controllers.ApplicationController.textSubmited": "<b> Formulário enviado com sucesso </b> <br> Clique para fechar a dica",
   "DE.Controllers.ApplicationController.titleServerVersion": "Editor atualizado",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "Versão alterada",
+  "DE.Controllers.ApplicationController.txtArt": "Seu texto aqui",
+  "DE.Controllers.ApplicationController.txtChoose": "Escolha um item",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "Clique para carregar imagem",
   "DE.Controllers.ApplicationController.txtClose": "Fechar",
   "DE.Controllers.ApplicationController.txtEmpty": "(Vazio)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "Insira uma data",
   "DE.Controllers.ApplicationController.txtPressLink": "Pressione CTRL e clique no link",
   "DE.Controllers.ApplicationController.unknownErrorText": "Erro desconhecido.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "Seu navegador não é suportado.",
@@ -115,6 +120,7 @@
   "DE.Views.ApplicationView.textPaste": "Colar",
   "DE.Views.ApplicationView.textPrintSel": "Imprimir seleção",
   "DE.Views.ApplicationView.textSubmit": "Enviar",
+  "DE.Views.ApplicationView.txtDarkMode": "Modo escuro",
   "DE.Views.ApplicationView.txtDownload": "Download",
   "DE.Views.ApplicationView.txtDownloadDocx": "Baixar como docx",
   "DE.Views.ApplicationView.txtDownloadPdf": "Baixar como pdf",

apps/documenteditor/forms/locale/ro.json

@@ -56,6 +56,22 @@
   "Common.Views.EmbedDialog.textWidth": "Lățime",
   "Common.Views.EmbedDialog.txtCopy": "Copiere cu clipboard",
   "Common.Views.EmbedDialog.warnCopy": "Eroare de browser! Utilizați comanda rapidă de la tastatură [Ctrl] + [C]",
+  "Common.Views.ImageFromUrlDialog.textUrl": "Lipire imagine prin URL:",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "Câmp obligatoriu",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Câmpul trebuie să conțină adresa URL in format \"http://www.example.com\" ",
+  "Common.Views.OpenDialog.closeButtonText": "Închide fișierul",
+  "Common.Views.OpenDialog.txtEncoding": "Codificare",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "Parolă incorectă",
+  "Common.Views.OpenDialog.txtOpenFile": "Introduceți o parolă pentru a deschide fișierul",
+  "Common.Views.OpenDialog.txtPassword": "Parola",
+  "Common.Views.OpenDialog.txtPreview": "Previzualizare",
+  "Common.Views.OpenDialog.txtProtected": "Parola curentă la fișierul va fi resetată de îndată ce este introdusă și fișierul este deschis.",
+  "Common.Views.OpenDialog.txtTitle": "Selectare opțiuni %1",
+  "Common.Views.OpenDialog.txtTitleProtected": "Fișierul protejat",
+  "Common.Views.SaveAsDlg.textLoading": "Încărcare",
+  "Common.Views.SaveAsDlg.textTitle": "Folderul de salvare",
+  "Common.Views.SelectFileDlg.textLoading": "Încărcare",
+  "Common.Views.SelectFileDlg.textTitle": "Selectați sursa de date",
   "Common.Views.ShareDialog.textTitle": "Partajare link",
   "Common.Views.ShareDialog.txtCopy": "Copiere cu clipboard",
   "Common.Views.ShareDialog.warnCopy": "Eroare de browser! Utilizați comanda rapidă de la tastatură [Ctrl] + [C]",
@@ -65,21 +81,34 @@
   "DE.Controllers.ApplicationController.downloadErrorText": "Descărcare eșuată.",
   "DE.Controllers.ApplicationController.downloadTextText": "Descărcarea documentului...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "Nu aveți dreptul să efectuați acțiunea pe care doriți.<br>Contactați administratorul dumneavoastră de Server Documente.",
+  "DE.Controllers.ApplicationController.errorBadImageUrl": "URL-ul imaginii incorectă",
   "DE.Controllers.ApplicationController.errorConnectToServer": "Salvarea documentului nu poate fi finalizată. Verificați configurarea conexeunii sau contactaţi administratorul dumneavoastră de reţea<br>Când faceți clic pe OK, vi se va solicita să descărcați documentul.",
+  "DE.Controllers.ApplicationController.errorDataEncrypted": "Modificările primite sunt criptate, decriptarea este imposibilă.",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "Codul de eroare: %1",
   "DE.Controllers.ApplicationController.errorEditingDownloadas": "S-a produs o eroare în timpul editării documentului.<br>Pentru copierea de rezervă pe PC utilizați opțiunea Descărcare ca...",
+  "DE.Controllers.ApplicationController.errorEditingSaveas": "S-a produs o eroare în timpul editării documentului.<br>Pentru copierea de rezervă pe PC utilizați opțiunea Salvare ca...",
   "DE.Controllers.ApplicationController.errorFilePassProtect": "Fișierul este protejat cu parolă și deaceea nu poate fi deschis.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "Dimensiunea fișierului depășește limita permisă de serverul Dvs.<br>Pentru detalii, contactați administratorul dumneavoastră de Server Documente.",
   "DE.Controllers.ApplicationController.errorForceSave": "S-a produs o eroare în timpul salvării fișierului. Pentru copierea de rezervă pe PC utilizați opțiunea Descărcare ca... sau încercați din nou mai târziu.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Fonturile nu sunt încărcate.<br>Contactați administratorul dvs de Server Documente.",
   "DE.Controllers.ApplicationController.errorServerVersion": "Editorul a fost actualizat. Pagina va fi reîmprospătată pentru a aplica această actualizare.",
+  "DE.Controllers.ApplicationController.errorSessionAbsolute": "Sesiunea de editare a expirat. Încercați să reîmprospătați pagina.",
+  "DE.Controllers.ApplicationController.errorSessionIdle": "Acțiunile de editare a documentului nu s-au efectuat de ceva timp. Încercați să reîmprospătați pagina.",
+  "DE.Controllers.ApplicationController.errorSessionToken": "Conexeunea la server s-a întrerupt. Încercați să reîmprospătati pagina.",
   "DE.Controllers.ApplicationController.errorSubmit": "Remiterea eșuată.",
+  "DE.Controllers.ApplicationController.errorToken": "Token de securitate din document este format în mod incorect.<br>Contactați administratorul dvs. de Server Documente.",
   "DE.Controllers.ApplicationController.errorTokenExpire": "Token de securitate din document a expirat.<br>Contactați administratorul dvs. de Server Documente.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "Versiunea fișierului s-a modificat. Pagina va fi reîmprospătată.",
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Conexiunea la Internet s-a restabilit și versiunea fișierului s-a schimbat.<br>Înainte de a continua, fișierul trebuie descărcat sau conținutul fișierului copiat ca să vă asigurați că nimic nu e pierdut, apoi reîmprospătați această pagină.",
   "DE.Controllers.ApplicationController.errorUserDrop": "Fișierul nu poate fi accesat deocamdată.",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "Conexiunea a fost pierdută. Încă mai puteți vizualiza documentul,<br>dar nu și să-l descărcați sau imprimați până când conexiunea se restabilește și pagina se reîmprospătează.",
+  "DE.Controllers.ApplicationController.mniImageFromFile": "Imaginea din fișier",
+  "DE.Controllers.ApplicationController.mniImageFromStorage": "Imaginea din serviciul stocare",
+  "DE.Controllers.ApplicationController.mniImageFromUrl": "Imaginea prin URL",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Avertisment",
+  "DE.Controllers.ApplicationController.openErrorText": "Eroare la deschiderea fișierului.",
+  "DE.Controllers.ApplicationController.saveErrorText": "S-a produs o eroare în timpul încercării de salvare a fișierului.",
+  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "Salvarea sau crearea fișierului imposibilă.<br>Cauzele posibile: <br>1. Fișierul s-a deschis doar în citire. <br>2. Fișierul este editat de alt utilizator. <br>3. Hard-disk-ul ori este plin, ori are un defect anume.",
   "DE.Controllers.ApplicationController.scriptLoadError": "Conexeunea e prea lentă și unele elemente nu se încarcă. Încercați să reîmprospătati pagina.",
   "DE.Controllers.ApplicationController.textAnonymous": "Anonim",
   "DE.Controllers.ApplicationController.textBuyNow": "Vizitarea site-ul Web",
@@ -91,12 +120,19 @@
   "DE.Controllers.ApplicationController.textNoLicenseTitle": "Ați atins limita stabilită de licență",
   "DE.Controllers.ApplicationController.textOf": "din",
   "DE.Controllers.ApplicationController.textRequired": "Toate câmpurile din formular trebuie completate înainte de a-l trimite.",
+  "DE.Controllers.ApplicationController.textSaveAs": "Salvare ca PDF",
+  "DE.Controllers.ApplicationController.textSaveAsDesktop": "Salvare ca...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Formularul a fost remis cu succes</b><br>Faceţi clic pentru a închide sfatul",
   "DE.Controllers.ApplicationController.titleServerVersion": "Editorul a fost actualizat",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "Versiunea s-a modificat",
+  "DE.Controllers.ApplicationController.txtArt": "Textul dvs. aici",
+  "DE.Controllers.ApplicationController.txtChoose": "Selectați un element",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "Faceți clic pentru a încărca imaginea",
   "DE.Controllers.ApplicationController.txtClose": "Închidere",
   "DE.Controllers.ApplicationController.txtEmpty": "(Gol)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "Introducere data",
   "DE.Controllers.ApplicationController.txtPressLink": "Apăsați Ctrl și faceți clic pe linkul",
+  "DE.Controllers.ApplicationController.txtUntitled": "Fără titlu",
   "DE.Controllers.ApplicationController.unknownErrorText": "Eroare necunoscută.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "Browserul nu este compatibil.",
   "DE.Controllers.ApplicationController.uploadImageExtMessage": "Format de imagine nerecunoscut.",
@@ -114,7 +150,10 @@
   "DE.Views.ApplicationView.textNext": "Câmpul următor",
   "DE.Views.ApplicationView.textPaste": "Lipire",
   "DE.Views.ApplicationView.textPrintSel": "Imprimare selecție",
+  "DE.Views.ApplicationView.textRedo": "Refacere",
   "DE.Views.ApplicationView.textSubmit": "Remitere",
+  "DE.Views.ApplicationView.textUndo": "Anulează",
+  "DE.Views.ApplicationView.txtDarkMode": "Modul Întunecat",
   "DE.Views.ApplicationView.txtDownload": "Descărcare",
   "DE.Views.ApplicationView.txtDownloadDocx": "Descărcare ca docx",
   "DE.Views.ApplicationView.txtDownloadPdf": "Descărcare ca pdf",

apps/documenteditor/forms/locale/ru.json

@@ -56,6 +56,22 @@
   "Common.Views.EmbedDialog.textWidth": "Ширина",
   "Common.Views.EmbedDialog.txtCopy": "Скопировать в буфер",
   "Common.Views.EmbedDialog.warnCopy": "Browser's error! Use keyboard shortcut [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": "Browser's error! Use keyboard shortcut [Ctrl] + [C]",
@@ -65,21 +81,34 @@
   "DE.Controllers.ApplicationController.downloadErrorText": "Загрузка не удалась.",
   "DE.Controllers.ApplicationController.downloadTextText": "Загрузка документа...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
+  "DE.Controllers.ApplicationController.errorBadImageUrl": "Неправильный URL-адрес изображения",
   "DE.Controllers.ApplicationController.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.",
+  "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.errorLoadingFont": "Шрифты не загружены.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.Controllers.ApplicationController.errorServerVersion": "Версия редактора была обновлена. Страница будет перезагружена, чтобы применить изменения.",
+  "DE.Controllers.ApplicationController.errorSessionAbsolute": "Время сеанса редактирования документа истекло. Пожалуйста, обновите страницу.",
+  "DE.Controllers.ApplicationController.errorSessionIdle": "Документ долгое время не редактировался. Пожалуйста, обновите страницу.",
+  "DE.Controllers.ApplicationController.errorSessionToken": "Подключение к серверу было прервано. Пожалуйста, обновите страницу.",
   "DE.Controllers.ApplicationController.errorSubmit": "Не удалось отправить.",
+  "DE.Controllers.ApplicationController.errorToken": "Токен безопасности документа имеет неправильный формат.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.Controllers.ApplicationController.errorTokenExpire": "Истек срок действия токена безопасности документа.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.",
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.<br>Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.",
   "DE.Controllers.ApplicationController.errorUserDrop": "В настоящий момент файл недоступен.",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,<br>но не сможете скачать или напечатать его до восстановления подключения и обновления страницы.",
+  "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": "Перейти на сайт",
@@ -91,12 +120,19 @@
   "DE.Controllers.ApplicationController.textNoLicenseTitle": "Лицензионное ограничение",
   "DE.Controllers.ApplicationController.textOf": "из",
   "DE.Controllers.ApplicationController.textRequired": "Заполните все обязательные поля для отправки формы.",
+  "DE.Controllers.ApplicationController.textSaveAs": "Сохранить как PDF",
+  "DE.Controllers.ApplicationController.textSaveAsDesktop": "Сохранить как...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Форма успешно отправлена</b><br>Нажмите, чтобы закрыть подсказку",
   "DE.Controllers.ApplicationController.titleServerVersion": "Редактор обновлен",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "Версия изменилась",
+  "DE.Controllers.ApplicationController.txtArt": "Введите ваш текст",
+  "DE.Controllers.ApplicationController.txtChoose": "Выберите элемент",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "Нажмите для загрузки изображения",
   "DE.Controllers.ApplicationController.txtClose": "Закрыть",
   "DE.Controllers.ApplicationController.txtEmpty": "(Пусто)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "Введите дату",
   "DE.Controllers.ApplicationController.txtPressLink": "Нажмите CTRL и щелкните по ссылке",
+  "DE.Controllers.ApplicationController.txtUntitled": "Без имени",
   "DE.Controllers.ApplicationController.unknownErrorText": "Неизвестная ошибка.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "Ваш браузер не поддерживается.",
   "DE.Controllers.ApplicationController.uploadImageExtMessage": "Неизвестный формат изображения.",
@@ -114,7 +150,10 @@
   "DE.Views.ApplicationView.textNext": "Следующее поле",
   "DE.Views.ApplicationView.textPaste": "Вставить",
   "DE.Views.ApplicationView.textPrintSel": "Напечатать выделенное",
+  "DE.Views.ApplicationView.textRedo": "Повторить",
   "DE.Views.ApplicationView.textSubmit": "Отправить",
+  "DE.Views.ApplicationView.textUndo": "Отменить",
+  "DE.Views.ApplicationView.txtDarkMode": "Темный режим",
   "DE.Views.ApplicationView.txtDownload": "Скачать файл",
   "DE.Views.ApplicationView.txtDownloadDocx": "Скачать как docx",
   "DE.Views.ApplicationView.txtDownloadPdf": "Скачать как pdf",

apps/documenteditor/forms/locale/tr.json

@@ -80,6 +80,7 @@
   "DE.Controllers.ApplicationController.errorUserDrop": "Belgeye şu an erişilemiyor.",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "Bağlantı kayboldu. Belgeyi yine de görüntüleyebilirsiniz,<br>ancak bağlantı yeniden kurulana ve sayfa yeniden yüklenene kadar indiremez veya yazdıramazsınız.",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Uyarı",
+  "DE.Controllers.ApplicationController.openErrorText": "Dosya açılırken bir hata oluştu.",
   "DE.Controllers.ApplicationController.scriptLoadError": "Bağlantı çok yavaş, bileşenlerin bazıları yüklenemedi. Lütfen sayfayı yenileyin.",
   "DE.Controllers.ApplicationController.textAnonymous": "Anonim",
   "DE.Controllers.ApplicationController.textBuyNow": "Websitesini ziyaret edin",
@@ -94,8 +95,12 @@
   "DE.Controllers.ApplicationController.textSubmited": "<b>Form başarılı bir şekilde kaydedildi</b><br>İpucunu kapatmak için tıklayın",
   "DE.Controllers.ApplicationController.titleServerVersion": "Editör güncellendi",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "Versiyon değişti",
+  "DE.Controllers.ApplicationController.txtArt": "Metni buraya giriniz",
+  "DE.Controllers.ApplicationController.txtChoose": "Bir öğe seçin",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "Resmi yüklemek için tıkla",
   "DE.Controllers.ApplicationController.txtClose": "Kapat",
   "DE.Controllers.ApplicationController.txtEmpty": "(Boş)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "Bir tarih girin",
   "DE.Controllers.ApplicationController.txtPressLink": "CTRL'ye basın ve bağlantıya tıklayın",
   "DE.Controllers.ApplicationController.unknownErrorText": "Bilinmeyen hata.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "Tarayıcınız desteklenmiyor.",
@@ -115,6 +120,7 @@
   "DE.Views.ApplicationView.textPaste": "Yapıştır",
   "DE.Views.ApplicationView.textPrintSel": "Seçimi Yazdır",
   "DE.Views.ApplicationView.textSubmit": "Kaydet",
+  "DE.Views.ApplicationView.txtDarkMode": "Karanlık mod",
   "DE.Views.ApplicationView.txtDownload": "İndir",
   "DE.Views.ApplicationView.txtDownloadDocx": "docx olarak indir",
   "DE.Views.ApplicationView.txtDownloadPdf": "Pdf olarak indir",

apps/documenteditor/forms/resources/less/application.less

@@ -4,3 +4,7 @@
 @header-background-color-ie: @toolbar-header-document-ie;
 @header-background-color: var(--toolbar-header-document);
 
+#editor_sdk {
+    background-color: #fff;
+    background-color: var(--background-normal);
+}

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

@@ -403,7 +403,8 @@ define([
                 this.appOptions.canRequestSharingSettings = this.editorConfig.canRequestSharingSettings;
                 this.appOptions.compatibleFeatures = (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compatibleFeatures;
                 this.appOptions.canFeatureComparison = !!this.api.asc_isSupportFeature("comparison");
-                this.appOptions.canFeatureContentControl = !!this.api.asc_isSupportFeature("content-controls");
+                this.appOptions.canFeatureContentControl = true;
+                this.appOptions.canFeatureForms = !!this.api.asc_isSupportFeature("forms");
 
                 this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false));
 
@@ -484,8 +485,7 @@ define([
                 }
 
                 var type = data.doc ? /^(?:(docxf))$/.exec(data.doc.fileType) : false;
-                this.appOptions.isFormCreator = !!(type && typeof type[1] === 'string');
+                this.appOptions.isFormCreator = !!(type && typeof type[1] === 'string') && this.appOptions.canFeatureForms; // show forms only for docxf
-                this.appOptions.canFeatureForms = this.appOptions.isFormCreator; // show forms only for docxf
 
                 type = data.doc ? /^(?:(oform))$/.exec(data.doc.fileType) : false;
                 if (type && typeof type[1] === 'string') {
@@ -558,10 +558,11 @@ define([
                             Asc.c_oAscFileType.OTT,
                             Asc.c_oAscFileType.FB2,
                             Asc.c_oAscFileType.EPUB,
-                            Asc.c_oAscFileType.DOCM,
+                            Asc.c_oAscFileType.DOCM
-                            Asc.c_oAscFileType.DOCXF,
-                            Asc.c_oAscFileType.OFORM
                         ];
+                    if (this.appOptions.canFeatureForms) {
+                        _supported = _supported.concat([Asc.c_oAscFileType.DOCXF, Asc.c_oAscFileType.OFORM]);
+                    }
 
                     if ( !_format || _supported.indexOf(_format) < 0 )
                         _format = Asc.c_oAscFileType.DOCX;

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

@@ -149,7 +149,8 @@ define([
                         disable.align       = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked;
                         disable.group       = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked;
                         disable.arrange     = (wrapping == Asc.c_oAscWrapStyle2.Inline) && !props.get_FromGroup() || shapeProps && shapeProps.asc_getFromSmartArtInternal() || content_locked;
-                        disable.wrapping    = islocked || props.get_FromGroup() || (notflow && !me.api.CanChangeWrapPolygon()) || content_locked || (!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture);
+                        disable.wrapping    = islocked || props.get_FromGroup() || (notflow && !me.api.CanChangeWrapPolygon()) || content_locked ||
+                                            (!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture && !control_props.get_FormPr());
 
                         if ( !disable.group ) {
                             if (me.api.CanGroup() || me.api.CanUnGroup()) {

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

@@ -159,10 +159,11 @@ define([
                             Asc.c_oAscFileType.OTT,
                             Asc.c_oAscFileType.FB2,
                             Asc.c_oAscFileType.EPUB,
-                            Asc.c_oAscFileType.DOCM,
+                            Asc.c_oAscFileType.DOCM
-                            Asc.c_oAscFileType.DOCXF,
-                            Asc.c_oAscFileType.OFORM
                         ];
+                        if (_main.appOptions.canFeatureForms) {
+                            _supported = _supported.concat([Asc.c_oAscFileType.DOCXF, Asc.c_oAscFileType.OFORM]);
+                        }
 
                         if ( !_format || _supported.indexOf(_format) < 0 )
                             _format = Asc.c_oAscFileType.PDF;
@@ -3130,6 +3131,7 @@ define([
                 this.api && this.api.asc_StartMailMerge();
             } else if (item.value === 'url') {
                 (new Common.Views.ImageFromUrlDialog({
+                    title: me.dataUrl,
                     handler: function(result, value) {
                         if (result == 'ok') {
                             if (me.api) {
@@ -3180,8 +3182,8 @@ define([
         onAppShowed: function (config) {
             var me = this;
 
-            var compactview = !(config.isEdit || config.isRestrictedEdit && config.canFillForms && config.canFeatureForms);
+            var compactview = !(config.isEdit || config.isRestrictedEdit && config.canFillForms && config.isFormCreator);
-            if ( config.isEdit || config.isRestrictedEdit && config.canFillForms && config.canFeatureForms) {
+            if ( config.isEdit || config.isRestrictedEdit && config.canFillForms && config.isFormCreator) {
                 if ( Common.localStorage.itemExists("de-compact-toolbar") ) {
                     compactview = Common.localStorage.getBool("de-compact-toolbar");
                 } else
@@ -3229,8 +3231,8 @@ define([
                 links.setApi(me.api).setConfig({toolbar: me});
                 Array.prototype.push.apply(me.toolbar.toolbarControls, links.getView('Links').getButtons());
             }
-            if ( config.isEdit && config.canFeatureContentControl || config.isRestrictedEdit && config.canFillForms ) {
+            if ( config.isEdit && config.canFeatureContentControl && config.canFeatureForms || config.isRestrictedEdit && config.canFillForms ) {
-                if (config.canFeatureForms) {
+                if (config.isFormCreator) {
                     tab = {caption: me.textTabForms, action: 'forms', dataHintTitle: 'M'};
                     var forms = me.getApplication().getController('FormsTab');
                     forms.setApi(me.api).setConfig({toolbar: me, config: config});
@@ -3238,7 +3240,7 @@ define([
                     if ($panel) {
                         me.toolbar.addTab(tab, $panel, 4);
                         me.toolbar.setVisible('forms', true);
-                        config.isEdit && config.canFeatureContentControl && Array.prototype.push.apply(me.toolbar.toolbarControls, forms.getView('FormsTab').getButtons());
+                        config.isEdit && config.canFeatureContentControl && config.canFeatureForms && Array.prototype.push.apply(me.toolbar.toolbarControls, forms.getView('FormsTab').getButtons());
                         !compactview && (config.isFormCreator || config.isRestrictedEdit && config.canFillForms) && me.toolbar.setTab('forms');
                     }
                 }
@@ -3668,7 +3670,8 @@ define([
         textTabForms: 'Forms',
         textGroup: 'Group',
         textEmptyMMergeUrl: 'You need to specify URL.',
-        textRecentlyUsed: 'Recently Used'
+        textRecentlyUsed: 'Recently Used',
+        dataUrl: 'Paste a data URL'
 
     }, DE.Controllers.Toolbar || {}));
 });

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

@@ -167,7 +167,7 @@ define([
 
             me.viewport.$el.attr('applang', me.appConfig.lang.split(/[\-_]/)[0]);
 
-            if ( !(config.isEdit || config.isRestrictedEdit && config.canFillForms && config.canFeatureForms) ||
+            if ( !(config.isEdit || config.isRestrictedEdit && config.canFillForms && config.isFormCreator) ||
                 ( !Common.localStorage.itemExists("de-compact-toolbar") &&
                 config.customization && config.customization.compactToolbar )) {
 
@@ -207,8 +207,8 @@ define([
         onAppReady: function (config) {
             var me = this;
             if ( me.header.btnOptions ) {
-                var compactview = !(config.isEdit || config.isRestrictedEdit && config.canFillForms && config.canFeatureForms);
+                var compactview = !(config.isEdit || config.isRestrictedEdit && config.canFillForms && config.isFormCreator);
-                if ( config.isEdit || config.isRestrictedEdit && config.canFillForms && config.canFeatureForms) {
+                if ( config.isEdit || config.isRestrictedEdit && config.canFillForms && config.isFormCreator) {
                     if ( Common.localStorage.itemExists("de-compact-toolbar") ) {
                         compactview = Common.localStorage.getBool("de-compact-toolbar");
                     } else
@@ -325,8 +325,7 @@ define([
                 })).on('click', _on_btn_zoom.bind(me, 'up'));
 
                 me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
-                var document = DE.getController('Main').document;
+                if ( !Common.UI.Themes.isDarkTheme() ) {
-                if ( !Common.UI.Themes.isDarkTheme() || /^pdf|djvu|xps|oxps$/.test(document.fileType) ) {
                     me.header.menuItemsDarkMode.hide();
                     me.header.menuItemsDarkMode.$el.prev('.divider').hide();
                 }
@@ -373,17 +372,20 @@ define([
         onThemeChanged: function (id) {
             var document = DE.getController('Main').document;
             if ( !/^pdf|djvu|xps|oxps$/.test(document.fileType) ) {
-                var current_dark = Common.UI.Themes.isDarkTheme();
+                if ( this.header.menuItemsDarkMode ) {
-                var menuItem = this.header.menuItemsDarkMode;
+                    var current_dark = Common.UI.Themes.isDarkTheme();
-                menuItem.setVisible(current_dark);
+                    var menuItem = this.header.menuItemsDarkMode;
-                menuItem.$el.prev('.divider')[current_dark ? 'show' : 'hide']();
+                    menuItem.setVisible(current_dark);
+                    menuItem.$el.prev('.divider')[current_dark ? 'show' : 'hide']();
 
-                menuItem.setChecked(Common.UI.Themes.isContentThemeDark());
+                    menuItem.setChecked(Common.UI.Themes.isContentThemeDark());
+                }
             }
         },
 
         onContentThemeChangedToDark: function (isdark) {
-            this.header.menuItemsDarkMode.setChecked(isdark, true);
+            if ( this.header.menuItemsDarkMode )
+                this.header.menuItemsDarkMode.setChecked(isdark, true);
         },
 
         onWindowResize: function(e) {

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

@@ -2,19 +2,19 @@
     <div class="inner-content">
     <table cols="4" width="100%">
         <tr>
-            <td width="88px">
+            <td width="78px">
                 <label class="input-label"><%= scope.textWidth %></label>
                 <div id="image-advanced-spin-width"></div>
             </td>
             <td width="28px" style="vertical-align: bottom;">
                 <div id="image-advanced-button-ratio"></div>
             </td>
-            <td width="88px">
+            <td width="78px">
                 <label class="input-label"><%= scope.textHeight %></label>
                 <div id="image-advanced-spin-height"></div>
             </td>
             <td style="vertical-align: bottom;">
-                <button type="button" class="btn btn-text-default" id="image-advanced-button-original-size" style="width:100px;"><%= scope.textOriginalSize %></button>
+                <button type="button" class="btn btn-text-default auto" id="image-advanced-button-original-size" style="min-width:100px;"><%= scope.textOriginalSize %></button>
             </td>
         </tr>
     </table>

apps/documenteditor/main/app/template/TableSettings.template

@@ -96,8 +96,7 @@
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <label class="header" style="margin-top: 3px;"><%= scope.textEdit %></label>
+            <div id="table-btn-edit" style="width:100%;"></div>
-            <div id="table-btn-edit" style="display: inline-block; float:right;"></div>
         </td>
     </tr>
     <tr>

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

@@ -546,6 +546,8 @@ define([
                                 ToolTip = '<b>'+ Common.Utils.String.htmlEncode(AscCommon.UserInfoParser.getParsedName(changes.get('username'))) +'  </b>';
                                 ToolTip += '<span style="font-size:10px; opacity: 0.7;">'+ changes.get('date') +'</span><br>';
                                 ToolTip += changes.get('changetext');
+                                if (ToolTip.length>1000)
+                                    ToolTip = ToolTip.substr(0, 1000) + '...';
                             }
                         }
 
@@ -2732,7 +2734,7 @@ define([
                     }
 
                     me.menuImageWrap.setDisabled(islocked || value.imgProps.value.get_FromGroup() || (notflow && menuWrapPolygon.isDisabled()) ||
-                                                (!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture));
+                                                (!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture && !control_props.get_FormPr()));
 
                     var cancopy = me.api && me.api.can_CopyCut();
                     menuImgCopy.setDisabled(!cancopy);
@@ -3881,9 +3883,13 @@ define([
                     var isInShape = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ShapeProperties()));
                     var isInChart = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ChartProperties()));
                     var isEquation= (value.mathProps && value.mathProps.value);
+                    var in_toc = me.api.asc_GetTableOfContentsPr(true),
+                        in_control = !in_toc && me.api.asc_IsContentControl(),
+                        control_props = in_control ? me.api.asc_GetContentControlProperties() : null,
+                        is_form = control_props && control_props.get_FormPr();
 
-                    menuParagraphVAlign.setVisible(isInShape && !isInChart && !isEquation); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !!
+                    menuParagraphVAlign.setVisible(isInShape && !isInChart && !isEquation && !(is_form && control_props.get_FormPr().get_Fixed())); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !!
-                    menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !!
+                    menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation && !(is_form && control_props.get_FormPr().get_Fixed())); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !!
                     if ( isInShape || isInChart ) {
                         var align = value.imgProps.value.get_VerticalTextAlign();
                         var cls = '';
@@ -4025,10 +4031,6 @@ define([
                     var control_lock = (value.paraProps) ? (!value.paraProps.value.can_DeleteBlockContentControl() || !value.paraProps.value.can_EditBlockContentControl() ||
                                                             !value.paraProps.value.can_DeleteInlineContentControl() || !value.paraProps.value.can_EditInlineContentControl()) : false;
 
-                    var in_toc = me.api.asc_GetTableOfContentsPr(true),
-                        in_control = !in_toc && me.api.asc_IsContentControl(),
-                        control_props = in_control ? me.api.asc_GetContentControlProperties() : null,
-                        is_form = control_props && control_props.get_FormPr();
                     menuParaRemoveControl.setVisible(in_control);
                     menuParaControlSettings.setVisible(in_control && me.mode.canEditContentControl && !is_form);
                     menuParaControlSeparator.setVisible(in_control);

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

@@ -443,12 +443,12 @@ define([
             }
 
             if (this.mode.canDownload) {
-                !this.panels['saveas'] && (this.panels['saveas'] = ((new DE.Views.FileMenuPanels.ViewSaveAs({menu: this, fileType: this.document.fileType})).render()));
+                !this.panels['saveas'] && (this.panels['saveas'] = ((new DE.Views.FileMenuPanels.ViewSaveAs({menu: this, fileType: this.document.fileType, mode: this.mode})).render()));
             } else if (this.mode.canDownloadOrigin)
                 $('a',this.miDownload.$el).text(this.textDownload);
 
             if (this.mode.canDownload && (this.mode.canRequestSaveAs || this.mode.saveAsUrl)) {
-                !this.panels['save-copy'] && (this.panels['save-copy'] = ((new DE.Views.FileMenuPanels.ViewSaveCopy({menu: this, fileType: this.document.fileType})).render()));
+                !this.panels['save-copy'] && (this.panels['save-copy'] = ((new DE.Views.FileMenuPanels.ViewSaveCopy({menu: this, fileType: this.document.fileType, mode: this.mode})).render()));
             }
 
             if (this.mode.canHelp && !this.panels['help']) {
@@ -457,13 +457,25 @@ define([
             }
 
             if ( Common.Controllers.Desktop.isActive() ) {
+                $('<li id="fm-btn-local-open" class="fm-btn"/>').insertAfter($('#fm-btn-recent', this.$el));
+                this.items.push(
+                    new Common.UI.MenuItem({
+                        el      : $('#fm-btn-local-open', this.$el),
+                        action  : 'file:open',
+                        caption : this.btnFileOpenCaption,
+                        canFocused: false,
+                        dataHint: 1,
+                        dataHintDirection: 'left-top',
+                        dataHintOffset: [2, 14]
+                    }));
+
                 $('<li class="devider" />' +
                     '<li id="fm-btn-exit" class="fm-btn"/>').insertAfter($('#fm-btn-back', this.$el));
                 this.items.push(
                     new Common.UI.MenuItem({
                         el      : $('#fm-btn-exit', this.$el),
-                        action  : 'app:exit',
+                        action  : 'file:exit',
-                        caption : 'Exit',
+                        caption : this.btnExitCaption,
                         canFocused: false,
                         dataHint: 1,
                         dataHintDirection: 'left-top',
@@ -603,6 +615,8 @@ define([
         btnRenameCaption        : 'Rename...',
         btnCloseMenuCaption     : 'Close Menu',
         btnProtectCaption: 'Protect',
-        btnSaveCopyAsCaption    : 'Save Copy as...'
+        btnSaveCopyAsCaption    : 'Save Copy as...',
+        btnExitCaption          : 'Exit',
+        btnFileOpenCaption      : 'Open...'
     }, DE.Views.FileMenu || {}));
 });

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

@@ -94,9 +94,16 @@ define([
 
             this.menu = options.menu;
             this.fileType = options.fileType;
+            this.mode = options.mode;
         },
 
         render: function() {
+            if (this.mode && !this.mode.canFeatureForms) {
+                this.formats[2].splice(1, 2);
+                this.formats[2] = this.formats[2].concat(this.formats[3]);
+                this.formats[3] = undefined;
+            }
+
             this.$el.html(this.template({rows:this.formats, fileType: (this.fileType || 'docx').toLowerCase()}));
             $('.btn-doc-format',this.el).on('click', _.bind(this.onFormatClick,this));
 
@@ -155,7 +162,7 @@ define([
                     '<tr>',
                         '<% _.each(row, function(item) { %>',
                             '<% if (item.type!==Asc.c_oAscFileType.DOCM || fileType=="docm") { %>',
-                            '<td><div><svg class="btn-doc-format" format="<%= item.type %>", format-ext="<%= item.ext %>">',
+                            '<td><div><svg class="btn-doc-format" format="<%= item.type %>", format-ext="<%= item.ext %>" data-hint="2" data-hint-direction="left-top" data-hint-offset="4, 4">',
                             '<use xlink:href="#svg-format-<%= item.imgCls %>"></use>',
                             '</svg></div></td>',
                             '<% } %>',
@@ -170,9 +177,16 @@ define([
 
             this.menu = options.menu;
             this.fileType = options.fileType;
+            this.mode = options.mode;
         },
 
         render: function() {
+            if (this.mode && !this.mode.canFeatureForms) {
+                this.formats[2].splice(1, 2);
+                this.formats[2] = this.formats[2].concat(this.formats[3]);
+                this.formats[3] = undefined;
+            }
+
             this.$el.html(this.template({rows:this.formats, fileType: (this.fileType || 'docx').toLowerCase()}));
             $('.btn-doc-format',this.el).on('click', _.bind(this.onFormatClick,this));
 
@@ -407,7 +421,10 @@ define([
                     { value: 120, displayValue: "120%" },
                     { value: 150, displayValue: "150%" },
                     { value: 175, displayValue: "175%" },
-                    { value: 200, displayValue: "200%" }
+                    { value: 200, displayValue: "200%" },
+                    { value: 300, displayValue: "300%" },
+                    { value: 400, displayValue: "400%" },
+                    { value: 500, displayValue: "500%" }
                 ],
                 dataHint: '2',
                 dataHintDirection: 'bottom',
@@ -915,14 +932,14 @@ define([
             '<div class="thumb-list">',
                 '<% if (blank) { %> ',
                 '<div class="blank-document">',
-                    '<div class="blank-document-btn">',
+                    '<div class="blank-document-btn" data-hint="2" data-hint-direction="left-top" data-hint-offset="2, 10">',
                         '<svg class="btn-blank-format"><use xlink:href="#svg-format-blank"></use></svg>',
                     '</div>',
                     '<div class="title"><%= scope.txtBlank %></div>',
                 '</div>',
                 '<% } %>',
                 '<% _.each(docs, function(item, index) { %>',
-                '<div class="thumb-wrap" template="<%= item.url %>">',
+                '<div class="thumb-wrap" template="<%= item.url %>" data-hint="2" data-hint-direction="left-top" data-hint-offset="14, 22">',
                     '<div class="thumb" ',
                         '<% if (!_.isEmpty(item.image)) {%> ',
                         ' style="background-image: url(<%= item.image %>);">',
@@ -1169,7 +1186,7 @@ define([
             this.lblApplication = $markup.findById('#id-info-appname');
             this.tblAuthor = $markup.findById('#id-info-author table');
             this.trAuthor = $markup.findById('#id-info-add-author').closest('tr');
-            this.authorTpl = '<tr><td><div style="display: inline-block;width: 200px;"><input type="text" spellcheck="false" class="form-control" readonly="true" value="{0}" ></div><div class="close img-commonctrl"></div></td></tr>';
+            this.authorTpl = '<tr><td><div style="display: inline-block;width: 200px;"><input type="text" spellcheck="false" class="form-control" readonly="true" value="{0}"></div><div class="tool close img-commonctrl" data-hint="2" data-hint-direction="right" data-hint-offset="small"></div></td></tr>';
 
             this.tblAuthor.on('click', function(e) {
                 var btn = $markup.find(e.target);
@@ -1848,8 +1865,8 @@ define([
                         '<td colspan="2"><label style="cursor: default;"><%= tipText %></label></td>',
                     '</tr>',
                     '<tr>',
-                        '<td><label class="link signature-view-link">' + me.txtView + '</label></td>',
+                        '<td><label class="link signature-view-link" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium">' + me.txtView + '</label></td>',
-                        '<td align="right"><label class="link signature-edit-link <% if (!hasSigned) { %>hidden<% } %>">' + me.txtEdit + '</label></td>',
+                        '<td align="right"><label class="link signature-edit-link <% if (!hasSigned) { %>hidden<% } %>" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium">' + me.txtEdit + '</label></td>',
                     '</tr>',
                 '</table>'
             ].join(''));

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

@@ -182,7 +182,6 @@ define([
                 dataHintDirection: 'bottom',
                 dataHintOffset: 'big'
             });
-            this.lockedControls.push(this.spnMaxChars);
             this.spnMaxChars.on('change', this.onMaxCharsChange.bind(this));
             this.spnMaxChars.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
 
@@ -209,24 +208,27 @@ define([
                 dataHintDirection: 'bottom',
                 dataHintOffset: 'big'
             });
-            this.lockedControls.push(this.spnWidth);
             this.spinners.push(this.spnWidth);
             this.spnWidth.on('change', this.onWidthChange.bind(this));
             this.spnWidth.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
 
             this.chAutofit = new Common.UI.CheckBox({
                 el: $markup.findById('#form-chb-autofit'),
-                labelText: this.textAutofit
+                labelText: this.textAutofit,
+                dataHint: '1',
+                dataHintDirection: 'left',
+                dataHintOffset: 'small'
             });
             this.chAutofit.on('change', this.onChAutofit.bind(this));
-            this.lockedControls.push(this.chAutofit);
 
             this.chMulti = new Common.UI.CheckBox({
                 el: $markup.findById('#form-chb-multiline'),
-                labelText: this.textMulti
+                labelText: this.textMulti,
+                dataHint: '1',
+                dataHintDirection: 'left',
+                dataHintOffset: 'small'
             });
             this.chMulti.on('change', this.onChMulti.bind(this));
-            this.lockedControls.push(this.chMulti);
 
             this.chRequired = new Common.UI.CheckBox({
                 el: $markup.findById('#form-chb-required'),
@@ -269,17 +271,22 @@ define([
             this.txtNewValue = new Common.UI.InputField({
                 el          : $markup.findById('#form-txt-new-value'),
                 allowBlank  : true,
-                validateOnChange: false,
+                validateOnChange: true,
                 validateOnBlur: false,
                 style       : 'width: 100%;',
                 value       : '',
                 dataHint    : '1',
                 dataHintDirection: 'left',
                 dataHintOffset: 'small'
+            }).on ('changing', function (input, value) {
+                me.btnListAdd.setDisabled(value.length<1 || me._state.DisabledControls);
             });
             this.lockedControls.push(this.txtNewValue);
             this.txtNewValue.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
             this.txtNewValue._input.on('keydown', _.bind(this.onNewValueKeydown, this));
+            this.txtNewValue.cmpEl.on('focus', 'input.form-control', function() {
+                setTimeout(function(){me.txtNewValue._input && me.txtNewValue._input.select();}, 1);
+            });
 
             this.list = new Common.UI.ListView({
                 el: $markup.findById('#form-list-list'),
@@ -306,7 +313,6 @@ define([
                 dataHintOffset: 'big'
             });
             this.btnListAdd.on('click', _.bind(this.onAddItem, this));
-            this.lockedControls.push(this.btnListAdd);
 
             this.btnListDelete = new Common.UI.Button({
                 parentEl: $markup.findById('#form-list-delete'),
@@ -402,10 +408,12 @@ define([
 
             this.chAspect = new Common.UI.CheckBox({
                 el: $markup.findById('#form-chb-aspect'),
-                labelText: this.textAspect
+                labelText: this.textAspect,
+                dataHint: '1',
+                dataHintDirection: 'left',
+                dataHintOffset: 'small'
             });
             this.chAspect.on('change', this.onChAspect.bind(this));
-            this.lockedControls.push(this.chAspect);
 
             this.cmbScale = new Common.UI.ComboBox({
                 el: $markup.findById('#form-combo-scale'),
@@ -415,7 +423,10 @@ define([
                 data: [{ displayValue: this.textAlways,  value: Asc.c_oAscPictureFormScaleFlag.Always },
                     { displayValue: this.textNever,  value: Asc.c_oAscPictureFormScaleFlag.Never },
                     { displayValue: this.textTooBig,  value: Asc.c_oAscPictureFormScaleFlag.Bigger },
-                    { displayValue: this.textTooSmall,  value: Asc.c_oAscPictureFormScaleFlag.Smaller }]
+                    { displayValue: this.textTooSmall,  value: Asc.c_oAscPictureFormScaleFlag.Smaller }],
+                dataHint: '1',
+                dataHintDirection: 'bottom',
+                dataHintOffset: 'big'
             });
             this.cmbScale.setValue(Asc.c_oAscPictureFormScaleFlag.Always);
             this.lockedControls.push(this.cmbScale);
@@ -435,7 +446,6 @@ define([
             });
             this.sldrPreviewPositionX.on('change', _.bind(this.onImagePositionChange, this, 'x'));
             this.sldrPreviewPositionX.on('changecomplete', _.bind(this.onImagePositionChangeComplete, this, 'x'));
-            this.lockedControls.push(this.sldrPreviewPositionX);
 
             this.sldrPreviewPositionY = new Common.UI.SingleSlider({
                 el: $('#form-img-slider-position-y'),
@@ -447,7 +457,6 @@ define([
             });
             this.sldrPreviewPositionY.on('change', _.bind(this.onImagePositionChange, this, 'y'));
             this.sldrPreviewPositionY.on('changecomplete', _.bind(this.onImagePositionChangeComplete, this, 'y'));
-            this.lockedControls.push(this.sldrPreviewPositionY);
 
             var xValue = this.sldrPreviewPositionX.getValue(),
                 yValue = this.sldrPreviewPositionY.getValue();
@@ -505,7 +514,7 @@ define([
 
         onChMaxCharsChanged: function(field, newValue, oldValue, eOpts){
             var checked = (field.getValue()=='checked');
-            this.spnMaxChars.setDisabled(!checked);
+            this.spnMaxChars.setDisabled(!checked || this._state.DisabledControls);
             if (!checked) {
                 this.chComb.setValue(false, true);
                 this.spnWidth.setDisabled(true);
@@ -536,9 +545,9 @@ define([
             var checked = (field.getValue()=='checked');
             if (checked) {
                 this.chMaxChars.setValue(true, true);
-                this.spnMaxChars.setDisabled(false);
+                this.spnMaxChars.setDisabled(false || this._state.DisabledControls);
             }
-            this.spnWidth.setDisabled(!checked);
+            this.spnWidth.setDisabled(!checked || this._state.DisabledControls);
             if (this.api && !this._noApply) {
                 var props   = this._originalProps || new AscCommon.CContentControlPr();
                 var formTextPr = this._originalTextFormProps || new AscCommon.CSdtTextFormPr();
@@ -858,6 +867,7 @@ define([
                             this.list.scrollToRecord(rec);
                         } else if (!this.txtNewValue._input.is(':focus')) {
                             this.txtNewValue.setValue('');
+                            this.btnListAdd.setDisabled(true);
                             this._state.listValue = this._state.listIndex = undefined;
                         }
                     }
@@ -1042,8 +1052,8 @@ define([
                     val = ((130 - 80) * this._state.imgPositionY) / 100 - 1;
                     this.imagePositionPreview.css({'top': val + 'px'});
 
-                    this.chAspect.setDisabled(this._state.scaleFlag === Asc.c_oAscPictureFormScaleFlag.Never);
+                    this.chAspect.setDisabled(this._state.scaleFlag === Asc.c_oAscPictureFormScaleFlag.Never || this._state.DisabledControls);
-                    var disableSliders = this._state.scaleFlag === Asc.c_oAscPictureFormScaleFlag.Always && !this._state.Aspect;
+                    var disableSliders = this._state.scaleFlag === Asc.c_oAscPictureFormScaleFlag.Always && !this._state.Aspect || this._state.DisabledControls;
                     this.sldrPreviewPositionX.setDisabled(disableSliders);
                     this.sldrPreviewPositionY.setDisabled(disableSliders);
                 }
@@ -1064,16 +1074,16 @@ define([
                         this.chMulti.setValue(!!val, true);
                         this._state.Multi=val;
                     }
-                    this.chMulti.setDisabled(!this._state.Fixed || this._state.Comb);
+                    this.chMulti.setDisabled(!this._state.Fixed || this._state.Comb || this._state.DisabledControls);
 
                     val = formTextPr.get_AutoFit();
                     if ( this._state.AutoFit!==val ) {
                         this.chAutofit.setValue(!!val, true);
                         this._state.AutoFit=val;
                     }
-                    this.chAutofit.setDisabled(!this._state.Fixed || this._state.Comb);
+                    this.chAutofit.setDisabled(!this._state.Fixed || this._state.Comb || this._state.DisabledControls);
 
-                    this.spnWidth.setDisabled(!this._state.Comb);
+                    this.spnWidth.setDisabled(!this._state.Comb || this._state.DisabledControls);
                     val = formTextPr.get_Width();
                     if ( (val===undefined || this._state.Width===undefined)&&(this._state.Width!==val) || Math.abs(this._state.Width-val)>0.1) {
                         this.spnWidth.setValue(val!==0 && val!==undefined ? Common.Utils.Metric.fnRecalcFromMM(val * 25.4 / 20 / 72.0) : -1, true);
@@ -1088,7 +1098,7 @@ define([
 
                     val = formTextPr.get_MaxCharacters();
                     this.chMaxChars.setValue(val && val>=0);
-                    this.spnMaxChars.setDisabled(!val || val<0);
+                    this.spnMaxChars.setDisabled(!val || val<0 || this._state.DisabledControls);
                     if ( (val===undefined || this._state.MaxChars===undefined)&&(this._state.MaxChars!==val) || Math.abs(this._state.MaxChars-val)>0.1) {
                         this.spnMaxChars.setValue(val && val>=0 ? val : 10, true);
                         this._state.MaxChars=val;
@@ -1154,7 +1164,10 @@ define([
                 this.btnBGColor = new Common.UI.ColorButton({
                     parentEl: $('#form-background-color-btn'),
                     transparent: true,
-                    menu: true
+                    menu: true,
+                    dataHint: '1',
+                    dataHintDirection: 'bottom',
+                    dataHintOffset: 'big'
                 });
                 this.lockedControls.push(this.btnBGColor);
                 this.btnBGColor.on('color:select', _.bind(this.onColorBGSelect, this));
@@ -1182,6 +1195,15 @@ define([
                     item.setDisabled(me._state.DisabledControls);
                 });
             }
+            this.spnMaxChars.setDisabled(this.chMaxChars.getValue()!=='checked' || this._state.DisabledControls);
+            this.spnWidth.setDisabled(!this._state.Comb || this._state.DisabledControls);
+            this.chMulti.setDisabled(!this._state.Fixed || this._state.Comb || this._state.DisabledControls);
+            this.chAutofit.setDisabled(!this._state.Fixed || this._state.Comb || this._state.DisabledControls);
+            this.chAspect.setDisabled(this._state.scaleFlag === Asc.c_oAscPictureFormScaleFlag.Never || this._state.DisabledControls);
+            var disableSliders = this._state.scaleFlag === Asc.c_oAscPictureFormScaleFlag.Always && !this._state.Aspect;
+            this.sldrPreviewPositionX.setDisabled(disableSliders || this._state.DisabledControls);
+            this.sldrPreviewPositionY.setDisabled(disableSliders || this._state.DisabledControls);
+            this.btnListAdd.setDisabled(this.txtNewValue.length<1 || this._state.DisabledControls);
             this.btnLockForm.setDisabled(disable);
         },
 
@@ -1219,19 +1241,21 @@ define([
             this.txtNewValue.setValue(record.get('name'));
             this._state.listValue = record.get('name');
             this._state.listIndex = undefined;
-            this.disableListButtons(false);
+            this.btnListAdd.setDisabled(this.txtNewValue.length<1 || this._state.DisabledControls);
+            this.disableListButtons();
         },
 
         onDisconnect: function() {
             this.onKeyChanged(this.cmbKey, {value: ""});
         },
 
-        disableListButtons: function(disabled) {
+        disableListButtons: function() {
-            if (disabled===undefined)
+            var rec = this.list.getSelectedRec(),
-                disabled = !this.list.getSelectedRec();
+                idx = rec ? this.list.store.indexOf(rec) : -1;
-            this.btnListDelete.setDisabled(disabled || this._state.DisabledControls);
+
-            this.btnListUp.setDisabled(disabled || this._state.DisabledControls);
+            this.btnListDelete.setDisabled(idx<0 || this._state.DisabledControls);
-            this.btnListDown.setDisabled(disabled || this._state.DisabledControls);
+            this.btnListUp.setDisabled(idx<1 || this._state.DisabledControls);
+            this.btnListDown.setDisabled(idx<0 || idx>this.list.store.length-2 || this._state.DisabledControls);
         },
 
         onImagePositionChange: function (type, field, newValue, oldValue) {

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

@@ -269,7 +269,7 @@ define([
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon previous-field',
                     caption: this.capBtnPrev,
-                    disabled: true,
+                    disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -280,7 +280,7 @@ define([
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon next-field',
                     caption: this.capBtnNext,
-                    disabled: true,
+                    disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode,
                     dataHint: '1',
                     dataHintDirection: 'bottom',
                     dataHintOffset: 'small'
@@ -292,7 +292,7 @@ define([
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon submit-form',
                         caption: this.capBtnSubmit,
-                        disabled: true,
+                        disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
@@ -304,7 +304,7 @@ define([
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon save-form',
                         caption: this.capBtnSaveForm,
-                        disabled: true,
+                        disabled: this.appConfig.isEdit && this.appConfig.canFeatureContentControl && this.appConfig.canFeatureForms, // disable only for edit mode,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: 'small'
@@ -327,7 +327,7 @@ define([
                 (new Promise(function (accept, reject) {
                     accept();
                 })).then(function(){
-                    if (config.isEdit && config.canFeatureContentControl) {
+                    if (config.isEdit && config.canFeatureContentControl && config.canFeatureForms) {
                         if (config.canEditContentControl) {
                             me.btnHighlight.setMenu();
                             me.mnuFormsColorPicker = me.btnHighlight.getPicker();

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

@@ -388,7 +388,7 @@ define([
                 value = props.get_CanBeFlow() && !this._locked;
                 var fromgroup = props.get_FromGroup() || this._locked;
                 var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
-                    isPictureControl = !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture) || this._locked;
+                    isPictureControl = !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture) && !control_props.get_FormPr() || this._locked;
                 if (this._state.CanBeFlow!==value || this._state.FromGroup!==fromgroup || this._state.isPictureControl!==isPictureControl) {
                     this.cmbWrapType.setDisabled(!value || fromgroup || isPictureControl);
                     this._state.CanBeFlow=value;

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

@@ -117,7 +117,7 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
             this.spnWidth = new Common.UI.MetricSpinner({
                 el: $('#image-advanced-spin-width'),
                 step: .1,
-                width: 80,
+                width: 70,
                 defaultUnit : "cm",
                 value: '3 cm',
                 maxValue: 55.88,
@@ -145,7 +145,7 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
             this.spnHeight = new Common.UI.MetricSpinner({
                 el: $('#image-advanced-spin-height'),
                 step: .1,
-                width: 80,
+                width: 70,
                 defaultUnit : "cm",
                 value: '3 cm',
                 maxValue: 55.88,
@@ -1390,7 +1390,8 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
                 if (control_props) {
                     var spectype = control_props.get_SpecificType();
                     fixed_size = (spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.ComboBox ||
-                                spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.None) &&
+                                spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.None ||
+                                spectype==Asc.c_oAscContentControlSpecificType.Picture) &&
                                 control_props.get_FormPr() && control_props.get_FormPr().get_Fixed();
                 }
 
@@ -1400,7 +1401,7 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
                 this.btnsCategory[6].setVisible(shapeprops!==null && !shapeprops.get_FromChart() && !fixed_size);   // Margins
                 this.btnsCategory[7].setVisible(!fixed_size);   // Alt
                 this.btnsCategory[2].setVisible(!chartprops && (pluginGuid === null || pluginGuid === undefined)); // Rotation
-                this.btnsCategory[3].setDisabled(props.get_FromGroup() || !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture)); // Wrapping
+                this.btnsCategory[3].setDisabled(props.get_FromGroup() || !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture) && !control_props.get_FormPr()); // Wrapping
 
                 if (shapeprops) {
                     this._objectType = Asc.c_oAscTypeSelectElement.Shape;

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

@@ -211,7 +211,7 @@ define([
                 this.signatureSettings = new DE.Views.SignatureSettings();
             }
 
-            if (mode && mode.canFeatureContentControl && mode.canEditContentControl && mode.canFeatureForms) {
+            if (mode && mode.canFeatureContentControl && mode.canEditContentControl && mode.isFormCreator) {
                 this.btnForm = new Common.UI.Button({
                     hint: this.txtFormSettings,
                     asctype: Common.Utils.documentSettingsType.Form,

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

@@ -805,7 +805,8 @@ define([
             if (control_props) {
                 var spectype = control_props.get_SpecificType();
                 control_props = (spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.ComboBox ||
-                                 spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.None) &&
+                                 spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.None ||
+                                spectype==Asc.c_oAscContentControlSpecificType.Picture) &&
                                 control_props.get_FormPr() && control_props.get_FormPr().get_Fixed();
             } else
                 control_props = false;
@@ -1211,6 +1212,7 @@ define([
                     this._state.GradColor = color;
                 }
 
+                this.chShadow.setDisabled(!!shapeprops.get_FromChart());
                 this.chShadow.setValue(!!shapeprops.asc_getShadow(), true);
 
                 this._noApply = false;

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

@@ -237,7 +237,10 @@ define([
                         { caption: "125%", value: 125 },
                         { caption: "150%", value: 150 },
                         { caption: "175%", value: 175 },
-                        { caption: "200%", value: 200 }
+                        { caption: "200%", value: 200 },
+                        { caption: "300%", value: 300 },
+                        { caption: "400%", value: 400 },
+                        { caption: "500%", value: 500 }
                     ]
                 });
 

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

@@ -347,9 +347,11 @@ define([
 
             this.btnEdit = new Common.UI.Button({
                 parentEl: $('#table-btn-edit'),
-                cls: 'btn-icon-default',
+                cls         : 'btn-toolbar align-left',
-                iconCls: 'btn-edit-table',
+                iconCls     : 'toolbar__icon rows-and-columns',
-                menu        : new Common.UI.Menu({
+                caption     : this.textEdit,
+                style       : 'width: 100%;',
+                menu: new Common.UI.Menu({
                     menuAlign: 'tr-br',
                     items: [
                         { caption: this.selectRowText, value: 0 },
@@ -370,9 +372,9 @@ define([
                         { caption: this.splitCellsText,  value: 12 }
                     ]
                 }),
-                dataHint: '1',
+                dataHint    : '1',
-                dataHintDirection: 'bottom',
+                dataHintDirection: 'left',
-                dataHintOffset: 'big'
+                dataHintOffset: 'small'
             });
             this.mnuMerge = this.btnEdit.menu.items[this.btnEdit.menu.items.length-2];
             this.mnuSplit = this.btnEdit.menu.items[this.btnEdit.menu.items.length-1];
@@ -442,7 +444,9 @@ define([
                 parentEl: $('#table-btn-distrub-rows', me.$el),
                 cls: 'btn-toolbar',
                 iconCls: 'toolbar__icon distribute-rows',
-                hint: this.textDistributeRows
+                hint: this.textDistributeRows,
+                dataHint: '1',
+                dataHintDirection: 'top'
             });
             this.lockedControls.push(this.btnDistributeRows);
             this.btnDistributeRows.on('click', _.bind(function(btn){
@@ -453,7 +457,10 @@ define([
                 parentEl: $('#table-btn-distrub-cols', me.$el),
                 cls: 'btn-toolbar',
                 iconCls: 'toolbar__icon distribute-columns',
-                hint: this.textDistributeCols
+                hint: this.textDistributeCols,
+                dataHint: '1',
+                dataHintDirection: 'bottom',
+                dataHintOffset: 'small'
             });
             this.lockedControls.push(this.btnDistributeCols);
             this.btnDistributeCols.on('click', _.bind(function(btn){
@@ -471,7 +478,10 @@ define([
                 cls         : 'btn-toolbar',
                 iconCls     : 'toolbar__icon table-to-text',
                 caption     : this.textConvert,
-                style       : 'width: 100%;text-align: left;'
+                style       : 'width: 100%;text-align: left;',
+                dataHint    : '1',
+                dataHintDirection: 'left',
+                dataHintOffset: 'medium'
             });
             this.btnConvert.on('click', _.bind(this.onConvertTable, this));
             this.lockedControls.push(this.btnConvert);

apps/documenteditor/main/index.html.deploy

@@ -224,6 +224,7 @@
                 !window.native_message_cmd && (window.native_message_cmd = []);
                 window.native_message_cmd[cmd] = param;
             }
+            window.desktop.execCommand('webapps:type', 'oform');
             window.desktop.execCommand('webapps:entry', '');
         }
     </script>

apps/documenteditor/main/locale/cs.json

@@ -39,7 +39,7 @@
   "Common.Controllers.ReviewChanges.textKeepLines": "Ponechat řádky pohromadě",
   "Common.Controllers.ReviewChanges.textKeepNext": "Svázat s následujícím",
   "Common.Controllers.ReviewChanges.textLeft": "Zarovnat vlevo",
-  "Common.Controllers.ReviewChanges.textLineSpacing": "Rozestupy řádků:",
+  "Common.Controllers.ReviewChanges.textLineSpacing": "Řádkování:",
   "Common.Controllers.ReviewChanges.textMultiple": "vícero",
   "Common.Controllers.ReviewChanges.textNoBreakBefore": "Nezalamovat stránku před",
   "Common.Controllers.ReviewChanges.textNoContextual": "Přidat mezeru mezi odstavce stejného stylu",
@@ -227,7 +227,7 @@
   "Common.Views.AutoCorrectDialog.textRestore": "Obnovit",
   "Common.Views.AutoCorrectDialog.textTitle": "Autokorekce",
   "Common.Views.AutoCorrectDialog.textWarnAddRec": "Rozpoznávané funkce musí obsahovat pouze malá, nebo velká písmena A až Z.",
-  "Common.Views.AutoCorrectDialog.textWarnResetRec": "Vámi zadané tvary slov budou odstraněny a odstraněné budou obnoveny. Opravdu chcete pokračovat? ",
+  "Common.Views.AutoCorrectDialog.textWarnResetRec": "Vámi zadané výrazy budou odstraněny a odstraněné budou obnoveny. Opravdu chcete pokračovat? ",
   "Common.Views.AutoCorrectDialog.warnReplace": "Hodnota pro automatické opravy %1 již existuje. Opravdu ji chcete nahradit?",
   "Common.Views.AutoCorrectDialog.warnReset": "Vámi přidané autokorekce budou odstraněny a změněné budou obnoveny do výchozích hodnot. Opravdu chcete pokračovat? ",
   "Common.Views.AutoCorrectDialog.warnRestore": "Hodnota pro automatické opravy %1 bude nastavena na původní hodnotu. Opravdu chcete pokračovat?",
@@ -240,7 +240,7 @@
   "Common.Views.Comments.mniPositionDesc": "Zdola",
   "Common.Views.Comments.textAdd": "Přidat",
   "Common.Views.Comments.textAddComment": "Přidat komentář",
-  "Common.Views.Comments.textAddCommentToDoc": "Přidat komentář k dokumentu",
+  "Common.Views.Comments.textAddCommentToDoc": "Přidat komentář do dokumentu",
   "Common.Views.Comments.textAddReply": "Přidat odpověď",
   "Common.Views.Comments.textAnonym": "Návštěvník",
   "Common.Views.Comments.textCancel": "Zrušit",
@@ -315,8 +315,8 @@
   "Common.Views.OpenDialog.txtPreview": "Náhled",
   "Common.Views.OpenDialog.txtProtected": "Jakmile zadáte heslo a soubor otevřete, stávající heslo k souboru bude resetováno.",
   "Common.Views.OpenDialog.txtTitle": "Vyberte %1 možností",
-  "Common.Views.OpenDialog.txtTitleProtected": "Chráněný soubor",
+  "Common.Views.OpenDialog.txtTitleProtected": "Zabezpečený soubor",
-  "Common.Views.PasswordDialog.txtDescription": "Nastavit heslo pro ochranu tohoto dokumentu",
+  "Common.Views.PasswordDialog.txtDescription": "Nastavit heslo pro zabezpečení tohoto dokumentu",
   "Common.Views.PasswordDialog.txtIncorrectPwd": "Hesla se neshodují",
   "Common.Views.PasswordDialog.txtPassword": "Heslo",
   "Common.Views.PasswordDialog.txtRepeat": "Zopakovat heslo",
@@ -353,7 +353,7 @@
   "Common.Views.ReviewChanges.textEnable": "Zapnout",
   "Common.Views.ReviewChanges.textWarnTrackChanges": "Sledování změn bude zapnuto pro všechny uživatele s plným přístupem. Při příštím otevření dokumentu bude sledování změn zachováno.",
   "Common.Views.ReviewChanges.textWarnTrackChangesTitle": "Povolit sledování změn pro všechny?",
-  "Common.Views.ReviewChanges.tipAcceptCurrent": "Přijmout změnu, která právě proběhla",
+  "Common.Views.ReviewChanges.tipAcceptCurrent": "Přijmout aktuální změnu",
   "Common.Views.ReviewChanges.tipCoAuthMode": "Nastavit režim spolupráce na úpravách",
   "Common.Views.ReviewChanges.tipCommentRem": "Odebrat komentáře",
   "Common.Views.ReviewChanges.tipCommentRemCurrent": "Odebrat aktuální komentáře",
@@ -370,7 +370,7 @@
   "Common.Views.ReviewChanges.txtAccept": "Přijmout",
   "Common.Views.ReviewChanges.txtAcceptAll": "Přijmout všechny změny",
   "Common.Views.ReviewChanges.txtAcceptChanges": "Přijmout změny",
-  "Common.Views.ReviewChanges.txtAcceptCurrent": "Přijmout změnu, která právě proběhla",
+  "Common.Views.ReviewChanges.txtAcceptCurrent": "Přijmout aktuální změnu",
   "Common.Views.ReviewChanges.txtChat": "Chat",
   "Common.Views.ReviewChanges.txtClose": "Zavřít",
   "Common.Views.ReviewChanges.txtCoAuthMode": "Režim spolupráce na úpravách",
@@ -411,10 +411,10 @@
   "Common.Views.ReviewChanges.txtSpelling": "Kontrola pravopisu",
   "Common.Views.ReviewChanges.txtTurnon": "Sledovat změny",
   "Common.Views.ReviewChanges.txtView": "Režim zobrazení",
-  "Common.Views.ReviewChangesDialog.textTitle": "Zkontrolovat změny",
+  "Common.Views.ReviewChangesDialog.textTitle": "Přehled změn",
   "Common.Views.ReviewChangesDialog.txtAccept": "Přijmout",
   "Common.Views.ReviewChangesDialog.txtAcceptAll": "Přijmout všechny změny",
-  "Common.Views.ReviewChangesDialog.txtAcceptCurrent": "Přijmout změnu, která právě proběhla",
+  "Common.Views.ReviewChangesDialog.txtAcceptCurrent": "Přijmout aktuální změnu",
   "Common.Views.ReviewChangesDialog.txtNext": "K další změně",
   "Common.Views.ReviewChangesDialog.txtPrev": "K předchozí změně",
   "Common.Views.ReviewChangesDialog.txtReject": "Odmítnout",
@@ -431,6 +431,10 @@
   "Common.Views.ReviewPopover.textOpenAgain": "Znovu otevřít",
   "Common.Views.ReviewPopover.textReply": "Odpovědět",
   "Common.Views.ReviewPopover.textResolve": "Vyřešit",
+  "Common.Views.ReviewPopover.txtAccept": "Přijmout",
+  "Common.Views.ReviewPopover.txtDeleteTip": "Smazat",
+  "Common.Views.ReviewPopover.txtEditTip": "Upravit",
+  "Common.Views.ReviewPopover.txtReject": "Odmítnout",
   "Common.Views.SaveAsDlg.textLoading": "Načítání",
   "Common.Views.SaveAsDlg.textTitle": "Složka do které uložit",
   "Common.Views.SelectFileDlg.textLoading": "Načítání",
@@ -522,12 +526,12 @@
   "DE.Controllers.Main.errorDataRange": "Nesprávný datový rozsah.",
   "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1",
   "DE.Controllers.Main.errorDirectUrl": "Ověřte správnost odkazu na dokument.<br>Je třeba, aby se jednalo o přímý odkaz pro stažení souboru.",
-  "DE.Controllers.Main.errorEditingDownloadas": "Při práci s dokumentem došlo k chybě.<br>Použijte volbu „Stáhnout jako…“ a uložte si do souboru jako záložní kopii na svůj počítač.",
+  "DE.Controllers.Main.errorEditingDownloadas": "Při práci s dokumentem došlo k chybě.<br>Použijte volbu 'Stáhnout jako…' pro uložení záložní kopie na harddisk Vašeho počítače. ",
-  "DE.Controllers.Main.errorEditingSaveas": "Při práci s dokumentem došlo k chybě.<br>Použijte volbu „Uložit jako…“ a uložte si do souboru jako záložní kopii na svůj počítač.",
+  "DE.Controllers.Main.errorEditingSaveas": "Při práci s dokumentem došlo k chybě.<br>Použijte volbu 'Uložit jako...' a uložte si do souboru jako záložní kopii na svůj počítač.",
   "DE.Controllers.Main.errorEmailClient": "Nenalezen žádný e-mailový klient.",
-  "DE.Controllers.Main.errorFilePassProtect": "Soubor je chráněn heslem, bez kterého jej nelze otevřít.",
+  "DE.Controllers.Main.errorFilePassProtect": "Soubor je zabezpečen heslem, bez kterého ho nelze otevřít.",
   "DE.Controllers.Main.errorFileSizeExceed": "Velikost souboru překračuje omezení nastavená na serveru, který využíváte.<br>Ohledně podrobností se obraťte na správce dokumentového serveru.",
-  "DE.Controllers.Main.errorForceSave": "Došlo k chybě při ukládání souboru. Použijte volbu „Stáhnout jako“ a uložte si do souboru na svůj počítač nebo to zkuste znovu později.",
+  "DE.Controllers.Main.errorForceSave": "Došlo k chybě při ukládání souboru. Použijte volbu 'Stáhnout jako' a uložte si do souboru na svůj počítač nebo to zkuste znovu později.",
   "DE.Controllers.Main.errorKeyEncrypt": "Neznámý popisovač klíče",
   "DE.Controllers.Main.errorKeyExpire": "Platnost popisovače klíče skončila",
   "DE.Controllers.Main.errorLoadingFont": "Styly nejsou načteny.<br>Prosím kontaktujte Vašeho administrátora dokumentových serverů.",
@@ -541,7 +545,7 @@
   "DE.Controllers.Main.errorSetPassword": "Heslo nemohlo být použito",
   "DE.Controllers.Main.errorStockChart": "Nesprávné pořadí řádků. Pro vytvoření burzovního grafu umístěte data na list v následujícím pořadí:<br> otevírací cena, maximální cena, minimální cena, uzavírací cena.",
   "DE.Controllers.Main.errorSubmit": "Potvrzení selhalo.",
-  "DE.Controllers.Main.errorToken": "Token zabezpečení dokumentu nemá správný formát.<br> Obraťte se na správce vámi využívaného dokumentového serveru.",
+  "DE.Controllers.Main.errorToken": "Token zabezpečení dokumentu nemá správný formát.<br> Obraťte se na Vašeho správce dokumentového serveru.",
   "DE.Controllers.Main.errorTokenExpire": "Platnost tokenu zabezpečení dokumentu skončila.<br>Obraťte se na správce vámi využívaného dokumentového serveru.",
   "DE.Controllers.Main.errorUpdateVersion": "Verze souboru byla změněna. Stránka bude znovu načtena.",
   "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Připojení k Internetu bylo obnoveno a verze souboru byla změněna.<br>Než budete moci pokračovat v práci, musíte stáhnout nebo zkopírovat obsah souboru, aby nedošlo ke ztrátě dat. Poté tuto stránku obnovte.",
@@ -571,7 +575,7 @@
   "DE.Controllers.Main.reloadButtonText": "Obnovit stránku",
   "DE.Controllers.Main.requestEditFailedMessageText": "Někdo právě upravuje tento dokument. Prosím zkuste to znovu později.",
   "DE.Controllers.Main.requestEditFailedTitleText": "Přístup odepřen",
-  "DE.Controllers.Main.saveErrorText": "Při ukládání souboru došlo k chybě.",
+  "DE.Controllers.Main.saveErrorText": "Během ukládání souboru došlo k chybě.",
   "DE.Controllers.Main.saveErrorTextDesktop": "Soubor nemohl být uložen nebo vytvořen.<br>Možné důvody: <br>1. Soubor je pouze pro čtení. <br>2. Soubor je editován jinými uživateli. <br>3. Úložiště je plně zaplněno nebo poškozeno.",
   "DE.Controllers.Main.saveTextText": "Ukládání dokumentu…",
   "DE.Controllers.Main.saveTitleText": "Ukládání dokumentu",
@@ -881,6 +885,7 @@
   "DE.Controllers.Statusbar.tipReview": "Sledovat změny",
   "DE.Controllers.Statusbar.zoomText": "Přiblížení {0}%",
   "DE.Controllers.Toolbar.confirmAddFontName": "Písmo (font) ve kterém se chystáte uložit, není na tomto zařízení k dispozici.<br>Text bude zobrazen pomocí některého ze systémových písem s tím, že uložené písmo bude použito, když bude dostupné.<br>Chcete pokračovat?",
+  "DE.Controllers.Toolbar.dataUrl": "Vložte URL -adresa domény",
   "DE.Controllers.Toolbar.notcriticalErrorTitle": "Varování",
   "DE.Controllers.Toolbar.textAccent": "Zvýraznění",
   "DE.Controllers.Toolbar.textBracket": "Závorky",
@@ -1221,6 +1226,7 @@
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "DE.Controllers.Viewport.textFitPage": "Přizpůsobit stránce",
   "DE.Controllers.Viewport.textFitWidth": "Přizpůsobit šířce",
+  "DE.Controllers.Viewport.txtDarkMode": "Tmavý režim",
   "DE.Views.AddNewCaptionLabelDialog.textLabel": "Štítek:",
   "DE.Views.AddNewCaptionLabelDialog.textLabelError": "Štítek je nutné vyplnit.",
   "DE.Views.BookmarksDialog.textAdd": "Přidat",
@@ -1500,7 +1506,7 @@
   "DE.Views.DocumentHolder.textWrap": "Obtékání textu",
   "DE.Views.DocumentHolder.tipIsLocked": "Tento prvek je právě upravován jiným uživatelem.",
   "DE.Views.DocumentHolder.toDictionaryText": "Přidat do slovníku",
-  "DE.Views.DocumentHolder.txtAddBottom": "Přidat ohraničení dolů",
+  "DE.Views.DocumentHolder.txtAddBottom": "Přidat spodní ohraničení",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Přidat zlomkovou čáru",
   "DE.Views.DocumentHolder.txtAddHor": "Přidat vodorovnou čáru",
   "DE.Views.DocumentHolder.txtAddLB": "Přidat přidat čáru vlevo dole",
@@ -1641,15 +1647,17 @@
   "DE.Views.FileMenu.btnCloseMenuCaption": "Zavřít nabídku",
   "DE.Views.FileMenu.btnCreateNewCaption": "Vytvořit nový",
   "DE.Views.FileMenu.btnDownloadCaption": "Stáhnout jako…",
+  "DE.Views.FileMenu.btnExitCaption": "Konec",
+  "DE.Views.FileMenu.btnFileOpenCaption": "Otevřít...",
   "DE.Views.FileMenu.btnHelpCaption": "Nápověda…",
   "DE.Views.FileMenu.btnHistoryCaption": "Historie verzí",
   "DE.Views.FileMenu.btnInfoCaption": "Informace o dokumentu…",
   "DE.Views.FileMenu.btnPrintCaption": "Tisk",
-  "DE.Views.FileMenu.btnProtectCaption": "Ochránit",
+  "DE.Views.FileMenu.btnProtectCaption": "Zabezpečení",
   "DE.Views.FileMenu.btnRecentFilesCaption": "Otevřít nedávné…",
   "DE.Views.FileMenu.btnRenameCaption": "Přejmenovat…",
   "DE.Views.FileMenu.btnReturnCaption": "Zpátky k dokumentu",
-  "DE.Views.FileMenu.btnRightsCaption": "Přístupová práva…",
+  "DE.Views.FileMenu.btnRightsCaption": "Přístupová práva...",
   "DE.Views.FileMenu.btnSaveAsCaption": "Uložit jako",
   "DE.Views.FileMenu.btnSaveCaption": "Uložit",
   "DE.Views.FileMenu.btnSaveCopyAsCaption": "Uložit kopii jako…",
@@ -1685,14 +1693,14 @@
   "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Osoby, které mají práva",
   "DE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Varování",
   "DE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "Heslem",
-  "DE.Views.FileMenuPanels.ProtectDoc.strProtect": "Ochránit dokument",
+  "DE.Views.FileMenuPanels.ProtectDoc.strProtect": "Zabezpečit dokument",
   "DE.Views.FileMenuPanels.ProtectDoc.strSignature": "Podpisem",
   "DE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Upravit dokument",
   "DE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "Upravením budou podpisy z dokumentu odebrány.<br>Opravdu chcete pokračovat?",
-  "DE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "Tento dokument je chráněný heslem",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "Tento dokument je zabezpečen heslem",
   "DE.Views.FileMenuPanels.ProtectDoc.txtRequestedSignatures": "Tento dokument je třeba podepsat.",
-  "DE.Views.FileMenuPanels.ProtectDoc.txtSigned": "Do dokumentu byly přidány platné podpisy. Tím je chráně před úpravami.",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtSigned": "Do dokumentu byly přidány platné podpisy. Je zabezpečen proti úpravám.",
-  "DE.Views.FileMenuPanels.ProtectDoc.txtSignedInvalid": "Některé z digitálních podpisů v dokumentu nejsou platné nebo se je nepodařilo ověřit. Dokument je chráněn proti úpravám.",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtSignedInvalid": "Některé z digitálních podpisů v dokumentu nejsou platné nebo se je nepodařilo ověřit. Dokument je zabezpečen proti úpravám.",
   "DE.Views.FileMenuPanels.ProtectDoc.txtView": "Zobrazit podpisy",
   "DE.Views.FileMenuPanels.Settings.okButtonText": "Použít",
   "DE.Views.FileMenuPanels.Settings.strAlignGuides": "Zapnout vodítka pro zarovnávání",
@@ -1722,7 +1730,7 @@
   "DE.Views.FileMenuPanels.Settings.text5Minutes": "Každých 5 minut",
   "DE.Views.FileMenuPanels.Settings.text60Minutes": "Každou hodinu",
   "DE.Views.FileMenuPanels.Settings.textAlignGuides": "Vodítka pro zarovnávání",
-  "DE.Views.FileMenuPanels.Settings.textAutoRecover": "Automatické obnovení",
+  "DE.Views.FileMenuPanels.Settings.textAutoRecover": "Automatická obnova",
   "DE.Views.FileMenuPanels.Settings.textAutoSave": "Automatické ukládání",
   "DE.Views.FileMenuPanels.Settings.textCompatible": "Kompatibilita",
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Vypnuto",
@@ -1734,7 +1742,7 @@
   "DE.Views.FileMenuPanels.Settings.txtCacheMode": "Výchozí režim mezipaměti",
   "DE.Views.FileMenuPanels.Settings.txtChangesBalloons": "Zobrazit kliknutím do bublin",
   "DE.Views.FileMenuPanels.Settings.txtChangesTip": "Zobrazit najetím na popisky",
-  "DE.Views.FileMenuPanels.Settings.txtCm": "Centimetry",
+  "DE.Views.FileMenuPanels.Settings.txtCm": "Centimetr",
   "DE.Views.FileMenuPanels.Settings.txtFitPage": "Přizpůsobit stránce",
   "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Přizpůsobit šířce",
   "DE.Views.FileMenuPanels.Settings.txtInch": "Palce",
@@ -1801,11 +1809,14 @@
   "DE.Views.FormsTab.capBtnNext": "Následující pole",
   "DE.Views.FormsTab.capBtnPrev": "Předchozí pole",
   "DE.Views.FormsTab.capBtnRadioBox": "Přepínač",
+  "DE.Views.FormsTab.capBtnSaveForm": "Uložit jako formulář",
   "DE.Views.FormsTab.capBtnSubmit": "Potvrdit",
   "DE.Views.FormsTab.capBtnText": "Textové pole",
   "DE.Views.FormsTab.capBtnView": "Zobrazit formulář",
   "DE.Views.FormsTab.textClear": "Vymazat pole",
   "DE.Views.FormsTab.textClearFields": "Vymazat všechna pole",
+  "DE.Views.FormsTab.textCreateForm": "Přidat pole a vytvořit plnitelný dokument OFORM",
+  "DE.Views.FormsTab.textGotIt": "Rozumím",
   "DE.Views.FormsTab.textHighlight": "Nastavení zvýraznění",
   "DE.Views.FormsTab.textNoHighlight": "Žádné zvýraznění",
   "DE.Views.FormsTab.textRequired": "Pro odeslání formuláře vyplňte všechna požadovaná pole.",
@@ -1817,9 +1828,11 @@
   "DE.Views.FormsTab.tipNextForm": "Přejít na následující pole",
   "DE.Views.FormsTab.tipPrevForm": "Přejít na předcházející pole",
   "DE.Views.FormsTab.tipRadioBox": "Vložit přepínač",
+  "DE.Views.FormsTab.tipSaveForm": "Uložit jako plnitelný dokument OFORM",
   "DE.Views.FormsTab.tipSubmit": "Potvrdit formulář",
   "DE.Views.FormsTab.tipTextField": "Vložit textové pole",
   "DE.Views.FormsTab.tipViewForm": "Zobrazit formulář",
+  "DE.Views.FormsTab.txtUntitled": "Bez názvu",
   "DE.Views.HeaderFooterSettings.textBottomCenter": "Dole uprostřed",
   "DE.Views.HeaderFooterSettings.textBottomLeft": "Vlevo dole",
   "DE.Views.HeaderFooterSettings.textBottomPage": "Spodní část stránky",
@@ -1845,7 +1858,7 @@
   "DE.Views.HyperlinkSettingsDialog.textExternal": "Externí odkaz",
   "DE.Views.HyperlinkSettingsDialog.textInternal": "Místo v rámci dokumentu",
   "DE.Views.HyperlinkSettingsDialog.textTitle": "Nastavení hypertextového odkazu",
-  "DE.Views.HyperlinkSettingsDialog.textTooltip": "Text bublinové nápovědy",
+  "DE.Views.HyperlinkSettingsDialog.textTooltip": "Text nápovědy",
   "DE.Views.HyperlinkSettingsDialog.textUrl": "Odkaz na",
   "DE.Views.HyperlinkSettingsDialog.txtBeginning": "Začátek dokumentu",
   "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Záložky",
@@ -2076,7 +2089,7 @@
   "DE.Views.MailMergeSettings.textSendMsg": "Všechny zprávy jsou připraveny a budou odeslány během následujících okamžiků.<br>Rychlost odesílání závisí na vámi využívané e-mailové službě.<br>Můžete pokračovat v práci na dokumentu nebo ho zavřít. Po dokončení akce o tom bude odesláno oznámení na e-mailovou adresu, kterou jste se zaregistrovali.",
   "DE.Views.MailMergeSettings.textTo": "Pro",
   "DE.Views.MailMergeSettings.txtFirst": "K prvnímu záznamu",
-  "DE.Views.MailMergeSettings.txtFromToError": "Je třeba, aby hodnota „Od“ byla nižší, než hodnota „Do“",
+  "DE.Views.MailMergeSettings.txtFromToError": "\"Od\" hodnota musí být menší než \"Do\" hodnota",
   "DE.Views.MailMergeSettings.txtLast": "K poslednímu záznamu",
   "DE.Views.MailMergeSettings.txtNext": "K dalšímu záznamu",
   "DE.Views.MailMergeSettings.txtPrev": "K předchozímu záznamu",
@@ -2145,7 +2158,7 @@
   "DE.Views.ParagraphSettings.strIndentsLeftText": "Vlevo",
   "DE.Views.ParagraphSettings.strIndentsRightText": "Vpravo",
   "DE.Views.ParagraphSettings.strIndentsSpecial": "Speciální",
-  "DE.Views.ParagraphSettings.strLineHeight": "Rozestupy řádek",
+  "DE.Views.ParagraphSettings.strLineHeight": "Řádkování",
   "DE.Views.ParagraphSettings.strParagraphSpacing": "Rozestup odstavců",
   "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Nepřidávat mezeru mezi odstavce se stejným stylem",
   "DE.Views.ParagraphSettings.strSpacingAfter": "Za",
@@ -2167,10 +2180,10 @@
   "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Dvojité přeškrtnutí",
   "DE.Views.ParagraphSettingsAdvanced.strIndent": "Odsazení",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Vlevo",
-  "DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Rozestupy řádek",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Řádkování",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Úroveň obrysu",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Vpravo",
-  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "Po",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "Za",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Před",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Speciální",
   "DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Ponechat řádky pohromadě",
@@ -2198,7 +2211,7 @@
   "DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Klikněte na diagram nebo pomocí tlačítek vyberte ohraničení a zvolený styl na ně uplatněte",
   "DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Tloušťka ohraničení",
   "DE.Views.ParagraphSettingsAdvanced.textBottom": "Dole",
-  "DE.Views.ParagraphSettingsAdvanced.textCentered": "Vystředěno",
+  "DE.Views.ParagraphSettingsAdvanced.textCentered": "Vycentrováno",
   "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Mezery mezi písmeny",
   "DE.Views.ParagraphSettingsAdvanced.textDefault": "Výchozí tabulátor",
   "DE.Views.ParagraphSettingsAdvanced.textEffects": "Efekty",
@@ -2320,8 +2333,8 @@
   "DE.Views.SignatureSettings.txtEditWarning": "Upravením budou podpisy z dokumentu odebrány.<br>Opravdu chcete pokračovat?",
   "DE.Views.SignatureSettings.txtRemoveWarning": "Chcete odstranit podpis?<br>Tento krok je nevratný. ",
   "DE.Views.SignatureSettings.txtRequestedSignatures": "Tento dokument je třeba podepsat.",
-  "DE.Views.SignatureSettings.txtSigned": "Do dokumentu byly přidány platné podpisy. Tím je chráně před úpravami.",
+  "DE.Views.SignatureSettings.txtSigned": "Do dokumentu byly přidány platné podpisy. Je zabezpečen proti úpravám.",
-  "DE.Views.SignatureSettings.txtSignedInvalid": "Některé z digitálních podpisů v dokumentu nejsou platné nebo se je nepodařilo ověřit. Dokument je chráněn proti úpravám.",
+  "DE.Views.SignatureSettings.txtSignedInvalid": "Některé z digitálních podpisů v dokumentu nejsou platné nebo se je nepodařilo ověřit. Dokument je zabezpečen proti úpravám.",
   "DE.Views.Statusbar.goToPageText": "Jít na stránku",
   "DE.Views.Statusbar.pageIndexText": "Stránka {0} z {1}",
   "DE.Views.Statusbar.tipFitPage": "Přizpůsobit stránce",
@@ -2391,7 +2404,7 @@
   "DE.Views.TableSettings.textAddFormula": "Přidat vzorec",
   "DE.Views.TableSettings.textAdvanced": "Zobrazit pokročilá nastavení",
   "DE.Views.TableSettings.textBackColor": "Barva pozadí",
-  "DE.Views.TableSettings.textBanded": "Pruhované",
+  "DE.Views.TableSettings.textBanded": "Pruhovaný",
   "DE.Views.TableSettings.textBorderColor": "Barva",
   "DE.Views.TableSettings.textBorders": "Styl ohraničení",
   "DE.Views.TableSettings.textCellSize": "Velikost řádek a sloupců",
@@ -2496,7 +2509,7 @@
   "DE.Views.TableSettingsAdvanced.tipTableOuterCellAll": "Nastavit vnější ohraničení a ohraničení všech vnitřních buněk",
   "DE.Views.TableSettingsAdvanced.tipTableOuterCellInner": "Nastavit vnější ohraničení a svislé a vodorovné čáry pro vnitřní buňky",
   "DE.Views.TableSettingsAdvanced.tipTableOuterCellOuter": "Nastavit vnější ohraničení tabulky a vnější ohraničení vnitřních buněk",
-  "DE.Views.TableSettingsAdvanced.txtCm": "Centimetry",
+  "DE.Views.TableSettingsAdvanced.txtCm": "Centimetr",
   "DE.Views.TableSettingsAdvanced.txtInch": "Palec",
   "DE.Views.TableSettingsAdvanced.txtNoBorders": "Bez ohraničení",
   "DE.Views.TableSettingsAdvanced.txtPercent": "Procento",
@@ -2665,7 +2678,7 @@
   "DE.Views.Toolbar.textTabInsert": "Vložit",
   "DE.Views.Toolbar.textTabLayout": "Rozvržení",
   "DE.Views.Toolbar.textTabLinks": "Odkazy",
-  "DE.Views.Toolbar.textTabProtect": "Ochrana",
+  "DE.Views.Toolbar.textTabProtect": "Zabezpečení",
   "DE.Views.Toolbar.textTabReview": "Přehled",
   "DE.Views.Toolbar.textTitleError": "Chyba",
   "DE.Views.Toolbar.textToCurrent": "Na stávající pozici",
@@ -2740,7 +2753,7 @@
   "DE.Views.Toolbar.txtScheme10": "Medián",
   "DE.Views.Toolbar.txtScheme11": "Metro",
   "DE.Views.Toolbar.txtScheme12": "Modul",
-  "DE.Views.Toolbar.txtScheme13": "Opulentní",
+  "DE.Views.Toolbar.txtScheme13": "Okázalý",
   "DE.Views.Toolbar.txtScheme14": "Oriel",
   "DE.Views.Toolbar.txtScheme15": "Původ",
   "DE.Views.Toolbar.txtScheme16": "Papír",

apps/documenteditor/main/locale/en.json

@@ -892,6 +892,7 @@
   "DE.Controllers.Statusbar.tipReview": "Track changes",
   "DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
   "DE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
+  "DE.Controllers.Toolbar.dataUrl": "Paste a data URL",
   "DE.Controllers.Toolbar.notcriticalErrorTitle": "Warning",
   "DE.Controllers.Toolbar.textAccent": "Accents",
   "DE.Controllers.Toolbar.textBracket": "Brackets",
@@ -1674,6 +1675,8 @@
   "DE.Views.FileMenu.btnCloseMenuCaption": "Close Menu",
   "DE.Views.FileMenu.btnCreateNewCaption": "Create New",
   "DE.Views.FileMenu.btnDownloadCaption": "Download as...",
+  "DE.Views.FileMenu.btnExitCaption": "Exit",
+  "DE.Views.FileMenu.btnFileOpenCaption": "Open...",
   "DE.Views.FileMenu.btnHelpCaption": "Help...",
   "DE.Views.FileMenu.btnHistoryCaption": "Version History",
   "DE.Views.FileMenu.btnInfoCaption": "Document Info...",

apps/documenteditor/main/locale/es.json

@@ -885,6 +885,7 @@
   "DE.Controllers.Statusbar.tipReview": "Seguimiento a cambios",
   "DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
   "DE.Controllers.Toolbar.confirmAddFontName": "El tipo de letra que usted va a guardar no está disponible en este dispositivo. <br>El estilo de letra se mostrará usando uno de los tipos de letra del dispositivo, el tipo de letra guardado va a usarse cuando esté disponible.<br>¿Desea continuar?",
+  "DE.Controllers.Toolbar.dataUrl": "Pegar una URL de datos",
   "DE.Controllers.Toolbar.notcriticalErrorTitle": "Aviso",
   "DE.Controllers.Toolbar.textAccent": "Acentos",
   "DE.Controllers.Toolbar.textBracket": "Paréntesis",
@@ -1646,6 +1647,8 @@
   "DE.Views.FileMenu.btnCloseMenuCaption": "Cerrar menú",
   "DE.Views.FileMenu.btnCreateNewCaption": "Crear nuevo",
   "DE.Views.FileMenu.btnDownloadCaption": "Descargar como...",
+  "DE.Views.FileMenu.btnExitCaption": "Salir",
+  "DE.Views.FileMenu.btnFileOpenCaption": "Abrir...",
   "DE.Views.FileMenu.btnHelpCaption": "Ayuda...",
   "DE.Views.FileMenu.btnHistoryCaption": "Historial de las Versiones",
   "DE.Views.FileMenu.btnInfoCaption": "Info sobre documento...",

apps/documenteditor/main/locale/fr.json

@@ -885,6 +885,7 @@
   "DE.Controllers.Statusbar.tipReview": "Suivi des modifications",
   "DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
   "DE.Controllers.Toolbar.confirmAddFontName": "La police que vous allez enregistrer n'est pas disponible sur l'appareil actuel.<br>Le style du texte sera affiché à l'aide de l'une des polices de système, la police sauvée sera utilisée lorsqu'il est disponible.<br>Voulez-vous continuer?",
+  "DE.Controllers.Toolbar.dataUrl": "Collez une URL de données",
   "DE.Controllers.Toolbar.notcriticalErrorTitle": "Avertissement",
   "DE.Controllers.Toolbar.textAccent": "Types d'accentuation",
   "DE.Controllers.Toolbar.textBracket": "Crochets",
@@ -1646,6 +1647,8 @@
   "DE.Views.FileMenu.btnCloseMenuCaption": "Fermer le menu",
   "DE.Views.FileMenu.btnCreateNewCaption": "Nouveau document",
   "DE.Views.FileMenu.btnDownloadCaption": "Télécharger comme...",
+  "DE.Views.FileMenu.btnExitCaption": "Quitter",
+  "DE.Views.FileMenu.btnFileOpenCaption": "Ouvrir...",
   "DE.Views.FileMenu.btnHelpCaption": "Aide...",
   "DE.Views.FileMenu.btnHistoryCaption": "Historique des versions",
   "DE.Views.FileMenu.btnInfoCaption": "Descriptif du document...",

apps/documenteditor/main/locale/ro.json

@@ -313,7 +313,7 @@
   "Common.Views.OpenDialog.txtOpenFile": "Introduceți parola pentru deschidere fișier",
   "Common.Views.OpenDialog.txtPassword": "Parola",
   "Common.Views.OpenDialog.txtPreview": "Previzualizare",
-  "Common.Views.OpenDialog.txtProtected": "Parola curentă la fișierul va fi resetată, de îndată ce este introdusă și fișierul este deschis.",
+  "Common.Views.OpenDialog.txtProtected": "Parola curentă la fișierul va fi resetată de îndată ce este introdusă și fișierul este deschis.",
   "Common.Views.OpenDialog.txtTitle": "Selectare opțiuni %1",
   "Common.Views.OpenDialog.txtTitleProtected": "Fișierul protejat",
   "Common.Views.PasswordDialog.txtDescription": "Setați o parolă pentru protejarea documentului",
@@ -576,7 +576,7 @@
   "DE.Controllers.Main.requestEditFailedMessageText": "La moment, altcineva lucrează la documentul. Vă rugăm să încercați mai târziu.",
   "DE.Controllers.Main.requestEditFailedTitleText": "Acces refuzat",
   "DE.Controllers.Main.saveErrorText": "S-a produs o eroare în timpul încercării de salvare a fișierului.",
-  "DE.Controllers.Main.saveErrorTextDesktop": "Salvarea sau crearea fișierului imposibilă.<br>Cauzele posibile: <br>1. Fișierul s-s deschis doar în citire. <br>2. Fișierul este editat de alt utilizator. <br>3. Hard-disk-ul ori este plin, ori are un defect anume.",
+  "DE.Controllers.Main.saveErrorTextDesktop": "Salvarea sau crearea fișierului imposibilă.<br>Cauzele posibile: <br>1. Fișierul s-a deschis doar în citire. <br>2. Fișierul este editat de alt utilizator. <br>3. Hard-disk-ul ori este plin, ori are un defect anume.",
   "DE.Controllers.Main.saveTextText": "Salvarea documentului...",
   "DE.Controllers.Main.saveTitleText": "Salvare document",
   "DE.Controllers.Main.scriptLoadError": "Conexeunea e prea lentă și unele elemente nu se încarcă. Încercați să reîmprospătati pagina.",
@@ -885,6 +885,7 @@
   "DE.Controllers.Statusbar.tipReview": "Urmărirea modificărilor",
   "DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
   "DE.Controllers.Toolbar.confirmAddFontName": "Fonturi pe care doriți să le salvați nu sunt disponibile pe acest dispozitiv.<br>Textul va apărea scris cu fontul și stilul disponibil pe sistem, fontul salvat va fi aplicat de îndată ce devine disponibil.<br>Doriți să continuați?",
+  "DE.Controllers.Toolbar.dataUrl": "Lipiti adresa URL a datelor",
   "DE.Controllers.Toolbar.notcriticalErrorTitle": "Avertisment",
   "DE.Controllers.Toolbar.textAccent": "Accente",
   "DE.Controllers.Toolbar.textBracket": "Paranteze",
@@ -1646,6 +1647,8 @@
   "DE.Views.FileMenu.btnCloseMenuCaption": "Închidere meniu",
   "DE.Views.FileMenu.btnCreateNewCaption": "Crearea unui document nou",
   "DE.Views.FileMenu.btnDownloadCaption": "Descărcare ca...",
+  "DE.Views.FileMenu.btnExitCaption": "Ieșire",
+  "DE.Views.FileMenu.btnFileOpenCaption": "Deschidere...",
   "DE.Views.FileMenu.btnHelpCaption": "Asistență...",
   "DE.Views.FileMenu.btnHistoryCaption": "Istoricul versiune",
   "DE.Views.FileMenu.btnInfoCaption": "Informații despre document",

apps/documenteditor/main/locale/ru.json

@@ -885,6 +885,7 @@
   "DE.Controllers.Statusbar.tipReview": "Отслеживать изменения",
   "DE.Controllers.Statusbar.zoomText": "Масштаб {0}%",
   "DE.Controllers.Toolbar.confirmAddFontName": "Шрифт, который вы хотите сохранить, недоступен на этом устройстве.<br>Стиль текста будет отображаться с помощью одного из системных шрифтов. Сохраненный шрифт будет использоваться, когда он станет доступен.<br>Вы хотите продолжить?",
+  "DE.Controllers.Toolbar.dataUrl": "Вставьте URL-адрес данных",
   "DE.Controllers.Toolbar.notcriticalErrorTitle": "Внимание",
   "DE.Controllers.Toolbar.textAccent": "Диакритические знаки",
   "DE.Controllers.Toolbar.textBracket": "Скобки",
@@ -1646,6 +1647,8 @@
   "DE.Views.FileMenu.btnCloseMenuCaption": "Закрыть меню",
   "DE.Views.FileMenu.btnCreateNewCaption": "Создать новый",
   "DE.Views.FileMenu.btnDownloadCaption": "Скачать как...",
+  "DE.Views.FileMenu.btnExitCaption": "Выйти",
+  "DE.Views.FileMenu.btnFileOpenCaption": "Открыть...",
   "DE.Views.FileMenu.btnHelpCaption": "Справка...",
   "DE.Views.FileMenu.btnHistoryCaption": "История версий",
   "DE.Views.FileMenu.btnInfoCaption": "Сведения о документе...",

apps/documenteditor/main/locale/tr.json

@@ -13,16 +13,16 @@
   "Common.Controllers.ReviewChanges.textAcceptBeforeCompare": "Belgeleri karşılaştırmak için, bunlarda izlenen tüm değişiklikler kabul edilmiş sayılacaktır. Devam etmek istiyor musun?",
   "Common.Controllers.ReviewChanges.textAtLeast": "en az",
   "Common.Controllers.ReviewChanges.textAuto": "Otomatik",
-  "Common.Controllers.ReviewChanges.textBaseline": "Baseline",
+  "Common.Controllers.ReviewChanges.textBaseline": "Kenar çizgisi",
   "Common.Controllers.ReviewChanges.textBold": "Kalın",
   "Common.Controllers.ReviewChanges.textBreakBefore": "Page break before",
-  "Common.Controllers.ReviewChanges.textCaps": "All caps",
+  "Common.Controllers.ReviewChanges.textCaps": "Tümü büyük harf",
-  "Common.Controllers.ReviewChanges.textCenter": "Align center",
+  "Common.Controllers.ReviewChanges.textCenter": "Ortaya Hizala",
   "Common.Controllers.ReviewChanges.textChar": "Karakter seviyesi",
   "Common.Controllers.ReviewChanges.textChart": "Chart",
   "Common.Controllers.ReviewChanges.textColor": "Font color",
   "Common.Controllers.ReviewChanges.textContextual": "Aynı stildeki paragraflar arasına aralık ekleme",
-  "Common.Controllers.ReviewChanges.textDeleted": "<b>Deleted:</b>",
+  "Common.Controllers.ReviewChanges.textDeleted": "<b>Silindi:</b>",
   "Common.Controllers.ReviewChanges.textDStrikeout": "Double strikeout",
   "Common.Controllers.ReviewChanges.textEquation": "Equation",
   "Common.Controllers.ReviewChanges.textExact": "exactly",
@@ -33,16 +33,16 @@
   "Common.Controllers.ReviewChanges.textImage": "Image",
   "Common.Controllers.ReviewChanges.textIndentLeft": "Indent left",
   "Common.Controllers.ReviewChanges.textIndentRight": "Indent right",
-  "Common.Controllers.ReviewChanges.textInserted": "<b>Inserted:</b>",
+  "Common.Controllers.ReviewChanges.textInserted": "<b>Eklenen:</b>",
   "Common.Controllers.ReviewChanges.textItalic": "Italic",
   "Common.Controllers.ReviewChanges.textJustify": "İki yana hizala",
   "Common.Controllers.ReviewChanges.textKeepLines": "Keep lines together",
   "Common.Controllers.ReviewChanges.textKeepNext": "Keep with next",
-  "Common.Controllers.ReviewChanges.textLeft": "Align left",
+  "Common.Controllers.ReviewChanges.textLeft": "Sola hizala",
   "Common.Controllers.ReviewChanges.textLineSpacing": "Line Spacing: ",
   "Common.Controllers.ReviewChanges.textMultiple": "multiple",
   "Common.Controllers.ReviewChanges.textNoBreakBefore": "No page break before",
-  "Common.Controllers.ReviewChanges.textNoContextual": "Add interval between paragraphs of the same style",
+  "Common.Controllers.ReviewChanges.textNoContextual": "Aynı stildeki paragraflar arasına aralık ekleyin",
   "Common.Controllers.ReviewChanges.textNoKeepLines": "Don't keep lines together",
   "Common.Controllers.ReviewChanges.textNoKeepNext": "Don't keep with next",
   "Common.Controllers.ReviewChanges.textNot": "Not ",
@@ -54,14 +54,14 @@
   "Common.Controllers.ReviewChanges.textOnGlobal": "{0}, herkes için Değişiklikleri İzle'yi etkinleştirdi.",
   "Common.Controllers.ReviewChanges.textParaDeleted": "<b>Paragraf Silindi</b>",
   "Common.Controllers.ReviewChanges.textParaFormatted": "Paragraph Formatted",
-  "Common.Controllers.ReviewChanges.textParaInserted": "<b>Paragraph Inserted</b>",
+  "Common.Controllers.ReviewChanges.textParaInserted": "<b>Paragraf Eklendi</b>",
   "Common.Controllers.ReviewChanges.textParaMoveFromDown": "<b>Aşağı Taşınan:</b>",
   "Common.Controllers.ReviewChanges.textParaMoveFromUp": "<b>Yukarı Taşınan:</b>",
   "Common.Controllers.ReviewChanges.textParaMoveTo": "<b>Taşınan:</b>",
   "Common.Controllers.ReviewChanges.textPosition": "Pozisyon",
-  "Common.Controllers.ReviewChanges.textRight": "Align right",
+  "Common.Controllers.ReviewChanges.textRight": "Sağa hizala",
   "Common.Controllers.ReviewChanges.textShape": "Shape",
-  "Common.Controllers.ReviewChanges.textShd": "Background color",
+  "Common.Controllers.ReviewChanges.textShd": "Arka plan rengi",
   "Common.Controllers.ReviewChanges.textShow": "Değişiklikleri şurada göster",
   "Common.Controllers.ReviewChanges.textSmallCaps": "Small caps",
   "Common.Controllers.ReviewChanges.textSpacing": "Spacing",
@@ -372,8 +372,8 @@
   "Common.Views.ReviewChanges.txtAcceptChanges": "Değişiklikleri Kabul Et",
   "Common.Views.ReviewChanges.txtAcceptCurrent": "Mevcut değişiklikleri kabul et",
   "Common.Views.ReviewChanges.txtChat": "Sohbet",
-  "Common.Views.ReviewChanges.txtClose": "Close",
+  "Common.Views.ReviewChanges.txtClose": "Kapat",
-  "Common.Views.ReviewChanges.txtCoAuthMode": "Ortak çalışma modunu ayarlayın",
+  "Common.Views.ReviewChanges.txtCoAuthMode": "Ortak Düzenleme Modu",
   "Common.Views.ReviewChanges.txtCommentRemAll": "Tüm yorumları kaldır",
   "Common.Views.ReviewChanges.txtCommentRemCurrent": "Mevcut yorumları kaldır",
   "Common.Views.ReviewChanges.txtCommentRemMy": "Benim yorumlarımı kaldır",
@@ -477,7 +477,7 @@
   "Common.Views.SymbolTableDialog.textNBHyphen": "Bölünemez kısa çizgi",
   "Common.Views.SymbolTableDialog.textNBSpace": "Bölünemez Boşluk",
   "Common.Views.SymbolTableDialog.textPilcrow": "Paragraf",
-  "Common.Views.SymbolTableDialog.textQEmSpace": "1/4 Uzun boşluk",
+  "Common.Views.SymbolTableDialog.textQEmSpace": "1/4 Em boşluk",
   "Common.Views.SymbolTableDialog.textRange": "Alt kğme",
   "Common.Views.SymbolTableDialog.textRecent": "Sık kullanılan simgeler",
   "Common.Views.SymbolTableDialog.textRegistered": "Kayıtlı",
@@ -611,7 +611,7 @@
   "DE.Controllers.Main.titleLicenseExp": "Lisans süresi doldu",
   "DE.Controllers.Main.titleServerVersion": "Editör güncellendi",
   "DE.Controllers.Main.titleUpdateVersion": "Versiyon değiştirildi",
-  "DE.Controllers.Main.txtAbove": "Yukarıda",
+  "DE.Controllers.Main.txtAbove": "yukarıda",
   "DE.Controllers.Main.txtArt": "Metni buraya giriniz",
   "DE.Controllers.Main.txtBasicShapes": "Temel Şekiller",
   "DE.Controllers.Main.txtBelow": "Altında",
@@ -904,20 +904,20 @@
   "DE.Controllers.Toolbar.textSymbols": "Simgeler",
   "DE.Controllers.Toolbar.textTabForms": "Formlar",
   "DE.Controllers.Toolbar.textWarning": "Dikkat",
-  "DE.Controllers.Toolbar.txtAccent_Accent": "Acute",
+  "DE.Controllers.Toolbar.txtAccent_Accent": "Akut",
   "DE.Controllers.Toolbar.txtAccent_ArrowD": "Right-Left Arrow Above",
   "DE.Controllers.Toolbar.txtAccent_ArrowL": "Leftwards Arrow Above",
   "DE.Controllers.Toolbar.txtAccent_ArrowR": "Rightwards Arrow Above",
-  "DE.Controllers.Toolbar.txtAccent_Bar": "Bar",
+  "DE.Controllers.Toolbar.txtAccent_Bar": "Çubuk grafik",
   "DE.Controllers.Toolbar.txtAccent_BarBot": "Underbar",
   "DE.Controllers.Toolbar.txtAccent_BarTop": "Overbar",
   "DE.Controllers.Toolbar.txtAccent_BorderBox": "Boxed Formula (With Placeholder)",
-  "DE.Controllers.Toolbar.txtAccent_BorderBoxCustom": "Boxed Formula(Example)",
+  "DE.Controllers.Toolbar.txtAccent_BorderBoxCustom": "Kutulu formül (örnek)",
   "DE.Controllers.Toolbar.txtAccent_Check": "Check",
   "DE.Controllers.Toolbar.txtAccent_CurveBracketBot": "Altparantez",
   "DE.Controllers.Toolbar.txtAccent_CurveBracketTop": "Üstparantez",
   "DE.Controllers.Toolbar.txtAccent_Custom_1": "Vector A",
-  "DE.Controllers.Toolbar.txtAccent_Custom_2": "ABC With Overbar",
+  "DE.Controllers.Toolbar.txtAccent_Custom_2": "Çizgili ABC",
   "DE.Controllers.Toolbar.txtAccent_Custom_3": "x XOR y With Overbar",
   "DE.Controllers.Toolbar.txtAccent_DDDot": "Triple Dot",
   "DE.Controllers.Toolbar.txtAccent_DDot": "Double Dot",
@@ -929,15 +929,15 @@
   "DE.Controllers.Toolbar.txtAccent_HarpoonL": "Leftwards Harpoon Above",
   "DE.Controllers.Toolbar.txtAccent_HarpoonR": "Rightwards Harpoon Above",
   "DE.Controllers.Toolbar.txtAccent_Hat": "Hat",
-  "DE.Controllers.Toolbar.txtAccent_Smile": "Breve",
+  "DE.Controllers.Toolbar.txtAccent_Smile": "Kısa",
   "DE.Controllers.Toolbar.txtAccent_Tilde": "Tilde",
   "DE.Controllers.Toolbar.txtBracket_Angle": "Ayraç",
-  "DE.Controllers.Toolbar.txtBracket_Angle_Delimiter_2": "Brackets with Separators",
+  "DE.Controllers.Toolbar.txtBracket_Angle_Delimiter_2": "Ayırıcılı Köşeli Ayraç",
-  "DE.Controllers.Toolbar.txtBracket_Angle_Delimiter_3": "Brackets with Separators",
+  "DE.Controllers.Toolbar.txtBracket_Angle_Delimiter_3": "Ayırıcılı Köşeli Ayraç",
   "DE.Controllers.Toolbar.txtBracket_Angle_NoneOpen": "Single Bracket",
   "DE.Controllers.Toolbar.txtBracket_Angle_OpenNone": "Single Bracket",
   "DE.Controllers.Toolbar.txtBracket_Curve": "Ayraç",
-  "DE.Controllers.Toolbar.txtBracket_Curve_Delimiter_2": "Brackets with Separators",
+  "DE.Controllers.Toolbar.txtBracket_Curve_Delimiter_2": "Ayırıcılı Köşeli Ayraç",
   "DE.Controllers.Toolbar.txtBracket_Curve_NoneOpen": "Single Bracket",
   "DE.Controllers.Toolbar.txtBracket_Curve_OpenNone": "Single Bracket",
   "DE.Controllers.Toolbar.txtBracket_Custom_1": "Cases (Two Conditions)",
@@ -945,8 +945,8 @@
   "DE.Controllers.Toolbar.txtBracket_Custom_3": "Stack Object",
   "DE.Controllers.Toolbar.txtBracket_Custom_4": "Stack Object",
   "DE.Controllers.Toolbar.txtBracket_Custom_5": "Cases Example",
-  "DE.Controllers.Toolbar.txtBracket_Custom_6": "Binomial Coefficient",
+  "DE.Controllers.Toolbar.txtBracket_Custom_6": "Binom Katsayı",
-  "DE.Controllers.Toolbar.txtBracket_Custom_7": "Binomial Coefficient",
+  "DE.Controllers.Toolbar.txtBracket_Custom_7": "Binom Katsayı",
   "DE.Controllers.Toolbar.txtBracket_Line": "Ayraç",
   "DE.Controllers.Toolbar.txtBracket_Line_NoneOpen": "Single Bracket",
   "DE.Controllers.Toolbar.txtBracket_Line_OpenNone": "Single Bracket",
@@ -957,7 +957,7 @@
   "DE.Controllers.Toolbar.txtBracket_LowLim_NoneNone": "Single Bracket",
   "DE.Controllers.Toolbar.txtBracket_LowLim_OpenNone": "Single Bracket",
   "DE.Controllers.Toolbar.txtBracket_Round": "Ayraç",
-  "DE.Controllers.Toolbar.txtBracket_Round_Delimiter_2": "Brackets with Separators",
+  "DE.Controllers.Toolbar.txtBracket_Round_Delimiter_2": "Ayırıcılı Köşeli Ayraç",
   "DE.Controllers.Toolbar.txtBracket_Round_NoneOpen": "Single Bracket",
   "DE.Controllers.Toolbar.txtBracket_Round_OpenNone": "Single Bracket",
   "DE.Controllers.Toolbar.txtBracket_Square": "Ayraç",
@@ -1079,28 +1079,28 @@
   "DE.Controllers.Toolbar.txtLimitLog_Min": "Minimum",
   "DE.Controllers.Toolbar.txtMarginsH": "Top and bottom margins are too high for a given page height",
   "DE.Controllers.Toolbar.txtMarginsW": "Left and right margins are too wide for a given page width",
-  "DE.Controllers.Toolbar.txtMatrix_1_2": "1x2 Empty Matrix",
+  "DE.Controllers.Toolbar.txtMatrix_1_2": "1x2 boş matris",
-  "DE.Controllers.Toolbar.txtMatrix_1_3": "1x3 Empty Matrix",
+  "DE.Controllers.Toolbar.txtMatrix_1_3": "1x3 boş matris",
-  "DE.Controllers.Toolbar.txtMatrix_2_1": "2x1 Empty Matrix",
+  "DE.Controllers.Toolbar.txtMatrix_2_1": "2x1 boş matris",
-  "DE.Controllers.Toolbar.txtMatrix_2_2": "2x2 Empty Matrix",
+  "DE.Controllers.Toolbar.txtMatrix_2_2": "2x2 boş matris",
   "DE.Controllers.Toolbar.txtMatrix_2_2_DLineBracket": "Ayraçlar içinde boş matris",
   "DE.Controllers.Toolbar.txtMatrix_2_2_LineBracket": "Ayraçlar içinde boş matris",
   "DE.Controllers.Toolbar.txtMatrix_2_2_RoundBracket": "Ayraçlar içinde boş matris",
   "DE.Controllers.Toolbar.txtMatrix_2_2_SquareBracket": "Ayraçlar içinde boş matris",
-  "DE.Controllers.Toolbar.txtMatrix_2_3": "2x3 Empty Matrix",
+  "DE.Controllers.Toolbar.txtMatrix_2_3": "2x3 boş matris",
-  "DE.Controllers.Toolbar.txtMatrix_3_1": "3x1 Empty Matrix",
+  "DE.Controllers.Toolbar.txtMatrix_3_1": "3x1 boş matris",
-  "DE.Controllers.Toolbar.txtMatrix_3_2": "3x2 Empty Matrix",
+  "DE.Controllers.Toolbar.txtMatrix_3_2": "3x2 boş matris",
-  "DE.Controllers.Toolbar.txtMatrix_3_3": "3x3 Empty Matrix",
+  "DE.Controllers.Toolbar.txtMatrix_3_3": "3x3 boş matris",
-  "DE.Controllers.Toolbar.txtMatrix_Dots_Baseline": "Baseline Dots",
+  "DE.Controllers.Toolbar.txtMatrix_Dots_Baseline": "Temel Noktalar",
   "DE.Controllers.Toolbar.txtMatrix_Dots_Center": "Midline Dots",
   "DE.Controllers.Toolbar.txtMatrix_Dots_Diagonal": "Diagonal Dots",
   "DE.Controllers.Toolbar.txtMatrix_Dots_Vertical": "Vertical Dots",
   "DE.Controllers.Toolbar.txtMatrix_Flat_Round": "Sparse Matrix",
   "DE.Controllers.Toolbar.txtMatrix_Flat_Square": "Sparse Matrix",
-  "DE.Controllers.Toolbar.txtMatrix_Identity_2": "2x2 Identity Matrix",
+  "DE.Controllers.Toolbar.txtMatrix_Identity_2": "2x2 birim matrisi",
-  "DE.Controllers.Toolbar.txtMatrix_Identity_2_NoZeros": "3x3 Identity Matrix",
+  "DE.Controllers.Toolbar.txtMatrix_Identity_2_NoZeros": "3x3 birim matrisi",
-  "DE.Controllers.Toolbar.txtMatrix_Identity_3": "3x3 Identity Matrix",
+  "DE.Controllers.Toolbar.txtMatrix_Identity_3": "3x3 birim matrisi",
-  "DE.Controllers.Toolbar.txtMatrix_Identity_3_NoZeros": "3x3 Identity Matrix",
+  "DE.Controllers.Toolbar.txtMatrix_Identity_3_NoZeros": "3x3 birim matrisi",
   "DE.Controllers.Toolbar.txtOperator_ArrowD_Bot": "Right-Left Arrow Below",
   "DE.Controllers.Toolbar.txtOperator_ArrowD_Top": "Right-Left Arrow Above",
   "DE.Controllers.Toolbar.txtOperator_ArrowL_Bot": "Leftwards Arrow Below",
@@ -1136,12 +1136,12 @@
   "DE.Controllers.Toolbar.txtScriptSubSup": "Alt Simge-Üst Simge",
   "DE.Controllers.Toolbar.txtScriptSubSupLeft": "Sol alt simge-üst simge",
   "DE.Controllers.Toolbar.txtScriptSup": "Üst Simge",
-  "DE.Controllers.Toolbar.txtSymbol_about": "Approximately",
+  "DE.Controllers.Toolbar.txtSymbol_about": "Yaklaşık",
   "DE.Controllers.Toolbar.txtSymbol_additional": "Complement",
   "DE.Controllers.Toolbar.txtSymbol_aleph": "Alef",
-  "DE.Controllers.Toolbar.txtSymbol_alpha": "Alpha",
+  "DE.Controllers.Toolbar.txtSymbol_alpha": "Alfa",
-  "DE.Controllers.Toolbar.txtSymbol_approx": "Almost Equal To",
+  "DE.Controllers.Toolbar.txtSymbol_approx": "Yaklaşık Değer",
-  "DE.Controllers.Toolbar.txtSymbol_ast": "Asterisk Operator",
+  "DE.Controllers.Toolbar.txtSymbol_ast": "Asterisk Operatörü",
   "DE.Controllers.Toolbar.txtSymbol_beta": "Beta",
   "DE.Controllers.Toolbar.txtSymbol_beth": "Bet",
   "DE.Controllers.Toolbar.txtSymbol_bullet": "Bullet Operator",
@@ -1150,7 +1150,7 @@
   "DE.Controllers.Toolbar.txtSymbol_cdots": "Midline Horizontal Ellipsis",
   "DE.Controllers.Toolbar.txtSymbol_celsius": "Degrees Celsius",
   "DE.Controllers.Toolbar.txtSymbol_chi": "Chi",
-  "DE.Controllers.Toolbar.txtSymbol_cong": "Approximately Equal To",
+  "DE.Controllers.Toolbar.txtSymbol_cong": "Yaklaşık",
   "DE.Controllers.Toolbar.txtSymbol_cup": "Union",
   "DE.Controllers.Toolbar.txtSymbol_ddots": "Down Right Diagonal Ellipsis",
   "DE.Controllers.Toolbar.txtSymbol_degree": "Degrees",
@@ -1242,7 +1242,7 @@
   "DE.Views.BookmarksDialog.txtInvalidName": "Yer imi adı sadece harfler, rakamlar ve alt çizgilerden oluşabilir ve harf ile başlamalıdır",
   "DE.Views.CaptionDialog.textAdd": "Etiket ekle",
   "DE.Views.CaptionDialog.textAfter": "Sonrasına",
-  "DE.Views.CaptionDialog.textBefore": "Öncesine",
+  "DE.Views.CaptionDialog.textBefore": "Önce",
   "DE.Views.CaptionDialog.textCaption": "Etiket",
   "DE.Views.CaptionDialog.textChapter": "Bölüm başlangıç stili",
   "DE.Views.CaptionDialog.textChapterInc": "Bölüm numarası içersin",
@@ -1490,7 +1490,7 @@
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Ortaya Hizala",
   "DE.Views.DocumentHolder.textShapeAlignLeft": "Sola Hizala",
   "DE.Views.DocumentHolder.textShapeAlignMiddle": "Ortaya hizala",
-  "DE.Views.DocumentHolder.textShapeAlignRight": "Sağa Hizla",
+  "DE.Views.DocumentHolder.textShapeAlignRight": "Sağa Hizala",
   "DE.Views.DocumentHolder.textShapeAlignTop": "Üste Hizala",
   "DE.Views.DocumentHolder.textStartNewList": "Yeni liste başlat",
   "DE.Views.DocumentHolder.textStartNumberingFrom": "Numaralandırma değerini ayarla",
@@ -1505,18 +1505,18 @@
   "DE.Views.DocumentHolder.tipIsLocked": "Bu element şu an başka bir kullanıcı tarafından düzenleniyor.",
   "DE.Views.DocumentHolder.toDictionaryText": "Sözlüğe ekle",
   "DE.Views.DocumentHolder.txtAddBottom": "Alt kenarlık ekle",
-  "DE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar",
+  "DE.Views.DocumentHolder.txtAddFractionBar": "Kesir çubuğu ekle",
-  "DE.Views.DocumentHolder.txtAddHor": "Add horizontal line",
+  "DE.Views.DocumentHolder.txtAddHor": "Yatay çizgi ekle",
-  "DE.Views.DocumentHolder.txtAddLB": "Add left bottom line",
+  "DE.Views.DocumentHolder.txtAddLB": "Sol alt satırı ekle",
   "DE.Views.DocumentHolder.txtAddLeft": "Sol kenarlık ekle",
-  "DE.Views.DocumentHolder.txtAddLT": "Add left top line",
+  "DE.Views.DocumentHolder.txtAddLT": "Sol üst çizgi ekle",
   "DE.Views.DocumentHolder.txtAddRight": "Sağ kenarlık ekle",
   "DE.Views.DocumentHolder.txtAddTop": "Üst kenarlık ekle",
-  "DE.Views.DocumentHolder.txtAddVer": "Add vertical line",
+  "DE.Views.DocumentHolder.txtAddVer": "Dikey çizgi ekle",
-  "DE.Views.DocumentHolder.txtAlignToChar": "Align to character",
+  "DE.Views.DocumentHolder.txtAlignToChar": "Karaktere uyarla",
   "DE.Views.DocumentHolder.txtBehind": "Arkada",
   "DE.Views.DocumentHolder.txtBorderProps": "Kenarlık özellikleri",
-  "DE.Views.DocumentHolder.txtBottom": "Bottom",
+  "DE.Views.DocumentHolder.txtBottom": "Alt",
   "DE.Views.DocumentHolder.txtColumnAlign": "Sütun hizalama",
   "DE.Views.DocumentHolder.txtDecreaseArg": "Decrease argument size",
   "DE.Views.DocumentHolder.txtDeleteArg": "Delete argument",
@@ -1702,7 +1702,7 @@
   "DE.Views.FileMenuPanels.Settings.strAlignGuides": "Hizalama kılavuzlarını aç",
   "DE.Views.FileMenuPanels.Settings.strAutoRecover": "Otomatik kaydetmeyi aç",
   "DE.Views.FileMenuPanels.Settings.strAutosave": "Otomatik kaydetmeyi aç",
-  "DE.Views.FileMenuPanels.Settings.strCoAuthMode": "Co-editing mode",
+  "DE.Views.FileMenuPanels.Settings.strCoAuthMode": "Ortak Düzenleme Modu",
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Other users will see your changes at once",
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "You will need to accept changes before you can see them",
   "DE.Views.FileMenuPanels.Settings.strFast": "Fast",
@@ -1761,7 +1761,7 @@
   "DE.Views.FormSettings.textAlways": "Her zaman",
   "DE.Views.FormSettings.textAspect": "En-boy oranını kilitle",
   "DE.Views.FormSettings.textAutofit": "Otomatik Sığdır",
-  "DE.Views.FormSettings.textBackgroundColor": "Arkaplan rengi",
+  "DE.Views.FormSettings.textBackgroundColor": "Arka plan rengi",
   "DE.Views.FormSettings.textCheckbox": "Onay kutusu",
   "DE.Views.FormSettings.textColor": "Kenarlık Rengi",
   "DE.Views.FormSettings.textComb": "Karakterleri alana eşit olarak yay",
@@ -2047,8 +2047,8 @@
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Send",
   "DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Theme",
-  "DE.Views.MailMergeEmailDlg.textAttachDocx": "Attach as DOCX",
+  "DE.Views.MailMergeEmailDlg.textAttachDocx": "Farklı ekle DOCX",
-  "DE.Views.MailMergeEmailDlg.textAttachPdf": "Attach as PDF",
+  "DE.Views.MailMergeEmailDlg.textAttachPdf": "Farklı ekle PDF",
   "DE.Views.MailMergeEmailDlg.textFileName": "File name",
   "DE.Views.MailMergeEmailDlg.textFormat": "Mail format",
   "DE.Views.MailMergeEmailDlg.textFrom": "From",
@@ -2063,7 +2063,7 @@
   "DE.Views.MailMergeSettings.errorMailMergeSaveFile": "Merge failed.",
   "DE.Views.MailMergeSettings.notcriticalErrorTitle": "Uyarı",
   "DE.Views.MailMergeSettings.textAddRecipients": "Önce listeye bazı alıcılar ekleyin",
-  "DE.Views.MailMergeSettings.textAll": "All records",
+  "DE.Views.MailMergeSettings.textAll": "Tüm kayıtlar",
   "DE.Views.MailMergeSettings.textCurrent": "Current record",
   "DE.Views.MailMergeSettings.textDataSource": "Data Source",
   "DE.Views.MailMergeSettings.textDocx": "Docx",
@@ -2127,7 +2127,7 @@
   "DE.Views.NotesRemoveDialog.textFoot": "Tüm dipnotları sil",
   "DE.Views.NotesRemoveDialog.textTitle": "Notları sil",
   "DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Uyarı",
-  "DE.Views.PageMarginsDialog.textBottom": "Bottom",
+  "DE.Views.PageMarginsDialog.textBottom": "Alt",
   "DE.Views.PageMarginsDialog.textGutter": "Cilt payı",
   "DE.Views.PageMarginsDialog.textGutterPosition": "Cilt payı pozisyonu",
   "DE.Views.PageMarginsDialog.textInside": "İçeri",
@@ -2556,7 +2556,7 @@
   "DE.Views.TextToTableDialog.textTitle": "Metni Tabloya Dönüştür",
   "DE.Views.TextToTableDialog.textWindow": "Pencereye otomatik sığdır",
   "DE.Views.TextToTableDialog.txtAutoText": "Otomatik",
-  "DE.Views.Toolbar.capBtnAddComment": "Yorum ekle",
+  "DE.Views.Toolbar.capBtnAddComment": "Yorum Ekle",
   "DE.Views.Toolbar.capBtnBlankPage": "Boş Sayfa",
   "DE.Views.Toolbar.capBtnColumns": "Sütunlar",
   "DE.Views.Toolbar.capBtnComment": "Yorum yap",
@@ -2608,7 +2608,7 @@
   "DE.Views.Toolbar.strMenuNoFill": "Dolgu Yok",
   "DE.Views.Toolbar.textAutoColor": "Otomatik",
   "DE.Views.Toolbar.textBold": "Kalın",
-  "DE.Views.Toolbar.textBottom": "Bottom: ",
+  "DE.Views.Toolbar.textBottom": "Alt:",
   "DE.Views.Toolbar.textChangeLevel": "Liste Düzeyini Değiştir",
   "DE.Views.Toolbar.textCheckboxControl": "Onay kutusu",
   "DE.Views.Toolbar.textColumnsCustom": "Özel Sütunlar",
@@ -2680,10 +2680,10 @@
   "DE.Views.Toolbar.textToCurrent": "Mevcut pozisyona",
   "DE.Views.Toolbar.textTop": "Top: ",
   "DE.Views.Toolbar.textUnderline": "Altı çizili",
-  "DE.Views.Toolbar.tipAlignCenter": "Ortaya Hizala",
+  "DE.Views.Toolbar.tipAlignCenter": "Ortaya hizala",
   "DE.Views.Toolbar.tipAlignJust": "İki yana yaslı",
   "DE.Views.Toolbar.tipAlignLeft": "Sola Hizala",
-  "DE.Views.Toolbar.tipAlignRight": "Sağa Hizla",
+  "DE.Views.Toolbar.tipAlignRight": "Sağa hizala",
   "DE.Views.Toolbar.tipBack": "Geri",
   "DE.Views.Toolbar.tipBlankPage": "Boş sayfa ekle",
   "DE.Views.Toolbar.tipChangeCase": "Büyük/küçük harf değiştir",
@@ -2760,7 +2760,7 @@
   "DE.Views.Toolbar.txtScheme20": "Kentsel",
   "DE.Views.Toolbar.txtScheme21": "Enerji",
   "DE.Views.Toolbar.txtScheme22": "Yeni Ofis",
-  "DE.Views.Toolbar.txtScheme3": "Apex",
+  "DE.Views.Toolbar.txtScheme3": "Zirve",
   "DE.Views.Toolbar.txtScheme4": "Açı",
   "DE.Views.Toolbar.txtScheme5": "Kentsel",
   "DE.Views.Toolbar.txtScheme6": "Toplama",

apps/documenteditor/main/resources/less/filemenu.less

@@ -200,6 +200,7 @@
         background-repeat: no-repeat;
         background-position: center;
         margin:  12px 12px 0px 12px;
+        background-size: contain;
       }
 
       .title {
@@ -378,45 +379,62 @@
     font-size: 12px;
   }
 
-  .close {
+  .tool {
-    width: 16px;
+    margin-left: 4px;
-    height: 16px;
+    background-image: none;
-    cursor: pointer;
+      &.close{
-    display: inline-block;
+        &:before, &:after {
-    vertical-align: middle;
+          height: 12px;
-    margin-left: 5px;
+          left: 8px;
-
+          width: 2px;
-    background-position: @but-close-offset-x @but-close-offset-y;
+          width: @scaled-two-px-value;
-
+        }
-    &.over,
+        &.disabled {
-    &:hover {
+          opacity: 0.4;
-      background-position: @but-close-offset-x @but-close-offset-y - 16px;
+        }
-    }
+      }
-
-    &.disabled {
-      background-position: @but-close-offset-x @but-close-offset-y - 32px;
-      cursor: default;
-    }
   }
+
+/*.close {
+  width: 16px;
+  height: 16px;
+  cursor: pointer;
+  display: inline-block;
+  vertical-align: middle;
+  margin-left: 5px;
+
+  background-position: @but-close-offset-x @but-close-offset-y;
+
+  &.over,
+  &:hover {
+    background-position: @but-close-offset-x @but-close-offset-y - 16px;
+    opacity: 1;
+  }
+
+  &.disabled {
+    background-position: @but-close-offset-x @but-close-offset-y - 32px;
+    cursor: default;
+  }
+}*/
 }
 
 #panel-protect {
-  label {
+label {
-    font-size: 12px;
+  font-size: 12px;
-  }
+}
 
-  #file-menu-panel & {
+#file-menu-panel & {
-    padding: 30px 30px;
+  padding: 30px 30px;
-  }
+}
 
-  .header {
+.header {
-    font-weight: bold;
+  font-weight: bold;
-    margin: 30px 0 10px;
+  margin: 30px 0 10px;
-  }
+}
 
-  table {
+table {
-    td {
+  td {
-      padding: 5px 0;
+    padding: 5px 0;
-    }
   }
+}
 }

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

@@ -88,18 +88,23 @@
         }
 
         .caret {
-            width: 23px;
+            margin: 9px;
-            height: 14px;
-            border: 0;
-            background-position: -43px -150px;
-            margin: 8px 15px;
             display: none;
             position: absolute;
-            right: 0;
+            right: 14px;
+            width: 8px;
+            height: 8px;
+            border: solid 1px @icon-normal-pressed-ie;
+            border: solid 1px @icon-normal-pressed;
+            opacity: 0.6;
+            border-bottom: none;
+            border-right: none;
+            background-image: none;
+            transform: rotate(-135deg);
 
             &.nomargin {
-                margin-top: 0;
+                margin: 2px;
-                margin-bottom: 0;
+                right: 26px;
             }
         }
     }
@@ -135,7 +140,8 @@
         position: relative;
         height: 130px;
         width: 130px;
-        border: 1px solid @border-regular-control;
+        border: @scaled-one-px-value-ie solid @border-regular-control-ie;
+        border: @scaled-one-px-value solid @border-regular-control;
         #form-img-example {
             position: absolute;
             top: 24px;
@@ -145,7 +151,8 @@
             align-items: center;
             height: 80px;
             width: 80px;
-            border: 1px solid @border-regular-control;
+            border: @scaled-one-px-value-ie solid @border-regular-control-ie;
+            border: @scaled-one-px-value solid @border-regular-control;
         }
     }
     #form-img-slider-position-x {

apps/documenteditor/mobile/locale/ro.json

@@ -588,7 +588,7 @@
     "txtDownloadTxt": "Încărcare TXT",
     "txtIncorrectPwd": "Parolă incorectă",
     "txtOk": "OK",
-    "txtProtected": "Parola curentă la fișierul va fi resetată, de îndată ce este introdusă și fișierul este deschis",
+    "txtProtected": "Parola curentă la fișierul va fi resetată de îndată ce este introdusă și fișierul este deschis",
     "txtScheme1": "Office",
     "txtScheme10": "Median",
     "txtScheme11": "Metrou",

apps/documenteditor/mobile/locale/tr.json

@@ -596,6 +596,7 @@
     "txtScheme13": "Zengin",
     "txtScheme15": "Orjin",
     "txtScheme16": "Kağıt",
+    "txtScheme17": "Gündönümü",
     "txtScheme18": "Yöntem",
     "txtScheme2": "Gri Ölçeği",
     "txtScheme20": "Kentsel",
@@ -609,7 +610,6 @@
     "txtScheme8": "Yayılma",
     "txtScheme9": "Döküm",
     "txtScheme14": "Oriel",
-    "txtScheme17": "Solstice",
     "txtScheme19": "Trek"
   },
   "Toolbar": {

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

@@ -221,6 +221,8 @@ class MainController extends Component {
                 Common.Notifications.trigger('preloader:close');
                 Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
 
+                appOptions.isRestrictedEdit && appOptions.canFillForms && this.api.asc_SetHighlightRequiredFields(true);
+
                 let value = LocalStorage.getItem("de-settings-zoom");
                 const zf = (value !== null) ? parseInt(value) : (appOptions.customization && appOptions.customization.zoom ? parseInt(appOptions.customization.zoom) : 100);
                 (zf === -1) ? this.api.zoomFitToPage() : ((zf === -2) ? this.api.zoomFitToWidth() : this.api.zoom(zf>0 ? zf : 100));
@@ -529,11 +531,11 @@ class MainController extends Component {
             this.api.Resize();
         });
 
-        $$(window).on('popover:open popup:open sheet:open actions:open', () => {
+        $$(window).on('popover:open popup:open sheet:open actions:open dialog:open', () => {
             this.api.asc_enableKeyEvents(false);
         });
 
-        $$(window).on('popover:close popup:close sheet:close actions:close', () => {
+        $$(window).on('popover:close popup:close sheet:close actions:close dialog:close', () => {
             this.api.asc_enableKeyEvents(true);
         });
 
@@ -578,7 +580,6 @@ class MainController extends Component {
             }
         });
 
-        // text settings
         const storeTextSettings = this.props.storeTextSettings;
         storeTextSettings.resetFontsRecent(LocalStorage.getItem('dde-settings-recent-fonts'));
 
@@ -731,8 +732,7 @@ class MainController extends Component {
             this.cmpCalendar.open();
         }, 100)
     }
-    
+
-        
     onShowListActions(obj, x, y) {
         if(!Device.isPhone) {
             this.dropdownListTarget = this.boxSdk.find('#dropdown-list-target');

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { List, ListItem, Toggle, Page, Navbar, NavRight, Link } from 'framework7-react';
 import { SearchController, SearchView, SearchSettingsView } from '../../../../common/mobile/lib/controller/Search';
 import { f7 } from 'framework7-react';
@@ -25,6 +25,8 @@ class SearchSettings extends SearchSettingsView {
         const _t = t("Settings", {returnObjects: true});
         const storeAppOptions = this.props.storeAppOptions;
         const isEdit = storeAppOptions.isEdit;
+        const storeReview =  this.props.storeReview;
+        const displayMode = storeReview.displayMode;
 
         const markup = (
                 <Page>
@@ -37,7 +39,7 @@ class SearchSettings extends SearchSettingsView {
                     </Navbar>
                     <List>
                         <ListItem radio title={_t.textFind} name="find-replace-checkbox" checked={!this.state.useReplace} onClick={e => this.onFindReplaceClick('find')} />
-                        {isEdit ? [
+                        {isEdit && displayMode === 'markup' ? [
                             <ListItem key="replace" radio title={_t.textFindAndReplace} name="find-replace-checkbox" checked={this.state.useReplace} 
                                 onClick={e => this.onFindReplaceClick('replace')} />, 
                             <ListItem key="replace-all" radio title={_t.textFindAndReplaceAll} name="find-replace-checkbox" checked={this.state.isReplaceAll}
@@ -92,6 +94,14 @@ const Search = withTranslation()(props => {
     const { t } = props;
     const _t = t('Settings', {returnObjects: true});
 
+    useEffect(() => {
+        if (f7.searchbar.get('.searchbar')?.enabled && Device.phone) {
+            const api = Common.EditorApi.get();
+            $$('.searchbar-input').focus();
+            api.asc_enableKeyEvents(false);
+        }
+    });
+
     const onSearchQuery = params => {
         const api = Common.EditorApi.get();
 
@@ -99,7 +109,8 @@ const Search = withTranslation()(props => {
 
         if (params.find && params.find.length) {
             
-            api.asc_selectSearchingResults(true);
+            if(params.highlight) api.asc_selectSearchingResults(true);
+            
             if (!api.asc_findText(params.find, params.forward, params.caseSensitive, params.highlight) ) {
                 f7.dialog.alert(null, _t.textNoTextFound);
             }
@@ -131,6 +142,6 @@ const Search = withTranslation()(props => {
     return <DESearchView _t={_t} onSearchQuery={onSearchQuery} onchangeSearchQuery={onchangeSearchQuery} onReplaceQuery={onReplaceQuery} onReplaceAllQuery={onReplaceAllQuery} />
 });
 
-const SearchSettingsWithTranslation = inject("storeAppOptions")(observer(withTranslation()(SearchSettings)));
+const SearchSettingsWithTranslation = inject("storeAppOptions", "storeReview")(observer(withTranslation()(SearchSettings)));
 
 export {Search, SearchSettingsWithTranslation as SearchSettings}

apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx

@@ -69,6 +69,7 @@ const PageDocumentMargins = props => {
             }
     
             if(errorMsg) {
+                f7.popover.close('#settings-popover');
                 f7.dialog.alert(errorMsg, _t.notcriticalErrorTitle);
                 return;
             }

apps/documenteditor/mobile/src/view/settings/Download.jsx

@@ -1,11 +1,13 @@
 import React from 'react';
-// import { observer } from "mobx-react";
+import { observer, inject } from "mobx-react";
 import { Page, Navbar, List, ListItem, BlockTitle, Icon } from "framework7-react";
 import { useTranslation } from "react-i18next";
 
 const Download = props => {
     const { t } = useTranslation();
     const _t = t("Settings", { returnObjects: true });
+    const storeDocumentInfo = props.storeDocumentInfo;
+    const dataDoc = storeDocumentInfo.dataDoc;
 
     return (
         <Page>
@@ -18,30 +20,33 @@ const Download = props => {
                 <ListItem title="PDF" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.PDF)}>
                     <Icon slot="media" icon="icon-format-pdf"></Icon>
                 </ListItem>
-                <ListItem title="PDF/A" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.PDFA)}>
+                {dataDoc.fileType !== 'oform' ? [
-                    <Icon slot="media" icon="icon-format-pdfa"></Icon>
+                    <ListItem title="PDF/A" key="PDF/A" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.PDFA)}>
-                </ListItem>
+                        <Icon slot="media" icon="icon-format-pdfa"></Icon>
-                <ListItem title="TXT" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.TXT)}>
+                    </ListItem>,
-                    <Icon slot="media" icon="icon-format-txt"></Icon>
+                    <ListItem title="TXT" key="TXT" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.TXT)}>
-                </ListItem>
+                        <Icon slot="media" icon="icon-format-txt"></Icon>
-                <ListItem title="RTF" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.RTF)}>
+                    </ListItem>,
-                    <Icon slot="media" icon="icon-format-rtf"></Icon>
+                    <ListItem title="RTF" key="RTF" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.RTF)}>
-                </ListItem>
+                        <Icon slot="media" icon="icon-format-rtf"></Icon>
-                <ListItem title="ODT" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.ODT)}>
+                    </ListItem>,
-                    <Icon slot="media" icon="icon-format-odt"></Icon>
+                    <ListItem title="ODT" key="ODT" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.ODT)}>
-                </ListItem>
+                        <Icon slot="media" icon="icon-format-odt"></Icon>
-                <ListItem title="HTML" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.HTML)}>
+                    </ListItem>,
-                    <Icon slot="media" icon="icon-format-html"></Icon>
+                    <ListItem title="HTML" key="HTML" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.HTML)}>
-                </ListItem>
+                        <Icon slot="media" icon="icon-format-html"></Icon>
-                <ListItem title="DOTX" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.DOTX)}>
+                    </ListItem>,
-                    <Icon slot="media" icon="icon-format-dotx"></Icon>
+                    <ListItem title="DOTX" key="DOTX" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.DOTX)}>
-                </ListItem>
+                        <Icon slot="media" icon="icon-format-dotx"></Icon>
-                <ListItem title="OTT" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.OTT)}>
+                    </ListItem>,
-                    <Icon slot="media" icon="icon-format-ott"></Icon>
+                    <ListItem title="OTT" key="OTT" onClick={() => props.onSaveFormat(Asc.c_oAscFileType.OTT)}>
-                </ListItem>
+                        <Icon slot="media" icon="icon-format-ott"></Icon>
+                    </ListItem>
+                    ]
+                : null}
             </List>
         </Page>
     )
 }
 
-export default Download;
+export default inject('storeDocumentInfo')(observer(Download));

apps/presentationeditor/embed/js/ApplicationController.js

@@ -119,6 +119,7 @@ PE.ApplicationController = new(function(){
             docInfo.put_Format(docConfig.fileType);
             docInfo.put_VKey(docConfig.vkey);
             docInfo.put_UserInfo(_user);
+            docInfo.put_CallbackUrl(config.callbackUrl);
             docInfo.put_Token(docConfig.token);
             docInfo.put_Permissions(_permissions);
             docInfo.put_EncryptedInfo(config.encryptionKeys);
@@ -332,8 +333,13 @@ PE.ApplicationController = new(function(){
                 if (config.customization && config.customization.goback) {
                     if (config.customization.goback.requestClose && config.canRequestClose)
                         Common.Gateway.requestClose();
-                    else if (config.customization.goback.url)
+                    else if (config.customization.goback.url) {
-                        window.parent.location.href = config.customization.goback.url;
+                        if (config.customization.goback.blank!==false) {
+                            window.open(config.customization.goback.url, "_blank");
+                        } else {
+                            window.parent.location.href = config.customization.goback.url;
+                        }
+                    }
                 }
             });
 
@@ -535,6 +541,10 @@ PE.ApplicationController = new(function(){
                 message = me.convertationErrorText;
                 break;
 
+            case Asc.c_oAscError.ID.ConvertationOpenError:
+                message = me.openErrorText;
+                break;
+
             case Asc.c_oAscError.ID.DownloadError:
                 message = me.downloadErrorText;
                 break;
@@ -737,6 +747,7 @@ PE.ApplicationController = new(function(){
         textAnonymous: 'Anonymous',
         errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
         errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.',
-        errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.'
+        errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.',
+        openErrorText: 'An error has occurred while opening the file'
     }
 })();

apps/presentationeditor/embed/locale/cs.json

@@ -11,16 +11,18 @@
   "PE.ApplicationController.downloadTextText": "Stahování prezentace…",
   "PE.ApplicationController.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.<br>Obraťte se na správce vámi využívaného dokumentového serveru.",
   "PE.ApplicationController.errorDefaultMessage": "Kód chyby: %1",
-  "PE.ApplicationController.errorFilePassProtect": "Soubor je chráněn heslem a bez něj ho nelze otevřít.",
+  "PE.ApplicationController.errorFilePassProtect": "Soubor je zabezpečen heslem, bez kterého ho nelze otevřít.",
   "PE.ApplicationController.errorFileSizeExceed": "Velikost souboru překračuje omezení nastavená na serveru, který využíváte.<br>Ohledně podrobností se obraťte na správce dokumentového serveru.",
   "PE.ApplicationController.errorForceSave": "Při ukládání souboru došlo k chybě. Prosím použijte „Stáhnout jako“ a uložte si soubor k sobě na počítač nebo původní volbu zkuste znovu později.",
   "PE.ApplicationController.errorLoadingFont": "Písma nejsou načtená.<br>Obraťte se na správce vámi využívaného dokumentového serveru.",
+  "PE.ApplicationController.errorTokenExpire": "Platnost tokenu zabezpečení dokumentu skončila.<br>Obraťte se na správce vámi využívaného dokumentového serveru.",
   "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Připojení k Internetu bylo obnoveno a verze souboru byla změněna.<br>Než budete moci pokračovat v práci, bude třeba si soubor stáhnout nebo si zkopírovat jeho obsah, abyste si zajistili, že se nic neztratí a až poté tuto stránku znovu načtěte.",
   "PE.ApplicationController.errorUserDrop": "Tento soubor nyní není přístupný.",
   "PE.ApplicationController.notcriticalErrorTitle": "Varování",
+  "PE.ApplicationController.openErrorText": "Při otevírání souboru došlo k chybě.",
   "PE.ApplicationController.scriptLoadError": "Připojení je příliš pomalé, některé součásti se nepodařilo načíst. Načtěte stránku znovu.",
   "PE.ApplicationController.textAnonymous": "Anonymní",
-  "PE.ApplicationController.textGuest": "Host",
+  "PE.ApplicationController.textGuest": "Návštěvník",
   "PE.ApplicationController.textLoadingDocument": "Načítání prezentace",
   "PE.ApplicationController.textOf": "z",
   "PE.ApplicationController.txtClose": "Zavřít",

apps/presentationeditor/embed/locale/en.json

@@ -19,6 +19,7 @@
   "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
   "PE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",
   "PE.ApplicationController.notcriticalErrorTitle": "Warning",
+  "PE.ApplicationController.openErrorText": "An error has occurred while opening the file.",
   "PE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
   "PE.ApplicationController.textAnonymous": "Anonymous",
   "PE.ApplicationController.textGuest": "Guest",

apps/presentationeditor/embed/locale/es.json

@@ -19,6 +19,7 @@
   "PE.ApplicationController.errorUpdateVersionOnDisconnect": "La conexión a Internet ha sido restaurada, y la versión del archivo ha sido cambiada. Antes de poder seguir trabajando, es necesario descargar el archivo o copiar su contenido para asegurarse de que no se pierda nada, y luego recargar esta página. ",
   "PE.ApplicationController.errorUserDrop": "No se puede acceder al archivo ahora mismo.",
   "PE.ApplicationController.notcriticalErrorTitle": "Aviso",
+  "PE.ApplicationController.openErrorText": "Se ha producido un error al abrir el archivo. ",
   "PE.ApplicationController.scriptLoadError": "La conexión a Internet es demasiado lenta, no se podía cargar algunos componentes. Por favor, recargue la página.",
   "PE.ApplicationController.textAnonymous": "Anónimo",
   "PE.ApplicationController.textGuest": "Invitado",

apps/presentationeditor/embed/locale/fr.json

@@ -19,6 +19,7 @@
   "PE.ApplicationController.errorUpdateVersionOnDisconnect": "La connexion internet a été rétablie, la version du fichier est modifiée.<br>Avant de continuer, téléchargez le fichier ou copiez le contenu pour vous assurer que tous les changements ont été enregistrés, et rechargez la page.",
   "PE.ApplicationController.errorUserDrop": "Impossible d'accéder au fichier.",
   "PE.ApplicationController.notcriticalErrorTitle": "Avertissement",
+  "PE.ApplicationController.openErrorText": "Une erreur s’est produite lors de l’ouverture du fichier.",
   "PE.ApplicationController.scriptLoadError": "La connexion est trop lente, certains éléments ne peuvent pas être chargés. Veuillez recharger la page.",
   "PE.ApplicationController.textAnonymous": "Anonyme",
   "PE.ApplicationController.textGuest": "Invité",