Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps 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') {
-            var canFillForms =  !config.document.permissions
-                                ? true : (config.document.permissions.fillForms===undefined)
-                                ? (config.document.permissions.edit !== false) : config.document.permissions.fillForms;
-            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";
+                    ? "embed" : (config.document && typeof config.document.fileType === 'string' && config.document.fileType.toLowerCase() === 'oform')
-        }
+                    ? "forms" : "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/DataView.js

@@ -299,7 +299,8 @@ define([
                 this.cmpEl = $(this.template({
                     groups: me.groups ? me.groups.toJSON() : null,
                     style: me.style,
-                    cls: me.cls
+                    cls: me.cls,
+                    options: me.options
                 }));
 
                 parentEl.html(this.cmpEl);
@@ -308,7 +309,8 @@ define([
                 this.cmpEl.html(this.template({
                     groups: me.groups ? me.groups.toJSON() : null,
                     style: me.style,
-                    cls: me.cls
+                    cls: me.cls,
+                    options: me.options
                 }));
             }
 
@@ -506,7 +508,8 @@ define([
             $(this.el).html(this.template({
                 groups: this.groups ? this.groups.toJSON() : null,
                 style: this.style,
-                cls: this.cls
+                cls: this.cls,
+                options: this.options
             }));
 
             if (!_.isUndefined(this.scroller)) {
@@ -805,14 +808,14 @@ define([
             };
 
             var el = $(this.dataViewItems[0].el),
-                itemW = el.outerWidth() + parseInt(el.css('margin-left')) + parseInt(el.css('margin-right')),
+                itemW = el.outerWidth() + parseFloat(el.css('margin-left')) + parseFloat(el.css('margin-right')),
                 offsetLeft = this.$el.offset().left,
                 offsetTop = el.offset().top,
                 prevtop = -1, topIdx = 0, leftIdx = 0;
 
             for (var i=0; i<this.dataViewItems.length; i++) {
                 var top = $(this.dataViewItems[i].el).offset().top - offsetTop;
-                leftIdx = Math.floor(($(this.dataViewItems[i].el).offset().left - offsetLeft)/itemW);
+                leftIdx = Math.floor(($(this.dataViewItems[i].el).offset().left - offsetLeft)/itemW + 0.01);
                 if (top>prevtop) {
                     prevtop = top;
                     this._layoutParams.itemsIndexes.push([]);
@@ -1275,7 +1278,7 @@ define([
             };
 
             var el = this.dataViewItems[0].el,
-                itemW = el.outerWidth() + parseInt(el.css('margin-left')) + parseInt(el.css('margin-right')),
+                itemW = el.outerWidth() + parseFloat(el.css('margin-left')) + parseFloat(el.css('margin-right')),
                 offsetLeft = this.$el.offset().left,
                 offsetTop = el.offset().top,
                 prevtop = -1, topIdx = 0, leftIdx = 0;

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

@@ -59,7 +59,7 @@ define([
             },
 
             template: _.template([
-                '<div class="listview inner <%= cls %>"></div>'
+                '<div class="listview inner <%= cls %>" <% if (options.dataHint) { %> data-hint="<%= options.dataHint %>" <% } if (options.dataHintDirection) { %> data-hint-direction="<%= options.dataHintDirection %>" <% } if (options.dataHintOffset) { %> data-hint-offset="<%= options.dataHintOffset %>" <% } %>></div>'
             ].join('')),
 
             onResetItems : 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/Comments.js

@@ -103,7 +103,8 @@ define([
                     // work handlers
 
                     'comment:closeEditing':     _.bind(this.closeEditing, this),
-                    'comment:sort':             _.bind(this.setComparator, this)
+                    'comment:sort':             _.bind(this.setComparator, this),
+                    'comment:filtergroups':     _.bind(this.setFilterGroups, this)
                 },
 
                 'Common.Views.ReviewPopover': {
@@ -157,6 +158,7 @@ define([
             }
 
             this.groupCollection = [];
+            this.userGroups = []; // for filtering comments
 
             this.view = this.createView('Common.Views.Comments', { store: this.collection });
             this.view.render();
@@ -695,14 +697,15 @@ define([
 
                     var end = true;
                     for (var i = this.collection.length - 1; i >= 0; --i) {
-                        if (end) {
+                        var item = this.collection.at(i);
-                            this.collection.at(i).set('last', true, {silent: true});
+                        if (end && !item.get('hide') && !item.get('filtered')) {
-                        } else {
+                            item.set('last', true, {silent: true});
-                            if (this.collection.at(i).get('last')) {
-                                this.collection.at(i).set('last', false, {silent: true});
-                            }
-                        }
                             end = false;
+                        } else {
+                            if (item.get('last')) {
+                                item.set('last', false, {silent: true});
+                            }
+                        }
                     }
                     this.view.render();
                     this.view.update();
@@ -820,6 +823,7 @@ define([
                 comment.set('userid',   data.asc_getUserId());
                 comment.set('username', data.asc_getUserName());
                 comment.set('parsedName', AscCommon.UserInfoParser.getParsedName(data.asc_getUserName()));
+                comment.set('parsedGroups', AscCommon.UserInfoParser.getParsedGroups(data.asc_getUserName()));
                 comment.set('usercolor', (user) ? user.get('color') : null);
                 comment.set('resolved', data.asc_getSolved());
                 comment.set('quote',    data.asc_getQuoteText());
@@ -830,6 +834,14 @@ define([
                 comment.set('removable', (t.mode.canDeleteComments || (data.asc_getUserId() == t.currentUserId)) && AscCommon.UserInfoParser.canDeleteComment(data.asc_getUserName()));
                 comment.set('hide', !AscCommon.UserInfoParser.canViewComment(data.asc_getUserName()));
 
+                if (!comment.get('hide')) {
+                    var usergroups = comment.get('parsedGroups');
+                    t.fillUserGroups(usergroups);
+                    var group = Common.Utils.InternalSettings.get(t.appPrefix + "comments-filtergroups");
+                    var filter = !!group && (group!==-1) && (!usergroups || usergroups.length<1 || usergroups.indexOf(group)<0);
+                    comment.set('filtered', filter);
+                }
+
                 replies = _.clone(comment.get('replys'));
 
                 replies.length = 0;
@@ -1148,14 +1160,15 @@ define([
                 this.onUpdateFilter(this.filter, true);
 
                 for (i = this.collection.length - 1; i >= 0; --i) {
-                    if (end) {
+                    var item = this.collection.at(i);
-                        this.collection.at(i).set('last', true, {silent: true});
+                    if (end && !item.get('hide') && !item.get('filtered')) {
-                    } else {
+                        item.set('last', true, {silent: true});
-                        if (this.collection.at(i).get('last')) {
-                            this.collection.at(i).set('last', false, {silent: true});
-                        }
-                    }
                         end = false;
+                    } else {
+                        if (item.get('last')) {
+                            item.set('last', false, {silent: true});
+                        }
+                    }
                 }
 
                 this.view.render();
@@ -1306,6 +1319,7 @@ define([
                 userid              : data.asc_getUserId(),
                 username            : data.asc_getUserName(),
                 parsedName          : AscCommon.UserInfoParser.getParsedName(data.asc_getUserName()),
+                parsedGroups        : AscCommon.UserInfoParser.getParsedGroups(data.asc_getUserName()),
                 usercolor           : (user) ? user.get('color') : null,
                 date                : this.dateToLocaleTimeString(date),
                 quote               : data.asc_getQuoteText(),
@@ -1329,6 +1343,13 @@ define([
                 groupName           : (groupname && groupname.length>1) ? groupname[1] : null
             });
             if (comment) {
+                if (!comment.get('hide')) {
+                    var usergroups = comment.get('parsedGroups');
+                    this.fillUserGroups(usergroups);
+                    var group = Common.Utils.InternalSettings.get(this.appPrefix + "comments-filtergroups");
+                    var filter = !!group && (group!==-1) && (!usergroups || usergroups.length<1 || usergroups.indexOf(group)<0);
+                    comment.set('filtered', filter);
+                }
                 var replies = this.readSDKReplies(data);
                 if (replies.length) {
                     comment.set('replys', replies);
@@ -1639,6 +1660,64 @@ define([
         clearCollections: function() {
             this.collection.reset();
             this.groupCollection = [];
+        },
+
+        fillUserGroups: function(usergroups) {
+            if (!this.mode.canUseCommentPermissions) return;
+
+            var viewgroups = AscCommon.UserInfoParser.getCommentPermissions('view');
+            if (usergroups && usergroups.length>0) {
+                if (viewgroups)
+                    usergroups = _.intersection(usergroups, viewgroups);
+                usergroups = _.uniq(this.userGroups.concat(usergroups));
+            }
+            if (this.view && this.view.buttonSort && _.difference(usergroups, this.userGroups).length>0) {
+                this.userGroups = usergroups;
+                var menu = this.view.buttonSort.menu;
+                menu.items[menu.items.length-1].setVisible(this.userGroups.length>0);
+                menu.items[menu.items.length-2].setVisible(this.userGroups.length>0);
+                menu = menu.items[menu.items.length-1].menu;
+                menu.removeAll();
+
+                var last = Common.Utils.InternalSettings.get(this.appPrefix + "comments-filtergroups");
+                menu.addItem(new Common.UI.MenuItem({
+                    checkable: true,
+                    checked: last===-1 || last===undefined,
+                    toggleGroup: 'filtercomments',
+                    caption: this.view.textAll,
+                    value: -1
+                }));
+                this.userGroups.forEach(function(item){
+                    menu.addItem(new Common.UI.MenuItem({
+                        checkable: true,
+                        checked: last === item,
+                        toggleGroup: 'filtercomments',
+                        caption: Common.Utils.String.htmlEncode(item),
+                        value: item
+                    }));
+                });
+            }
+        },
+
+        setFilterGroups: function (group) {
+            Common.Utils.InternalSettings.set(this.appPrefix + "comments-filtergroups", group);
+            var i, end = true;
+            for (i = this.collection.length - 1; i >= 0; --i) {
+                var item = this.collection.at(i);
+                if (!item.get('hide')) {
+                    var usergroups = item.get('parsedGroups');
+                    item.set('filtered', !!group && (group!==-1) && (!usergroups || usergroups.length<1 || usergroups.indexOf(group)<0), {silent: true});
+                }
+                if (end && !item.get('hide') && !item.get('filtered')) {
+                    item.set('last', true, {silent: true});
+                    end = false;
+                } else {
+                    if (item.get('last')) {
+                        item.set('last', false, {silent: true});
+                    }
+                }
+            }
+            this.updateComments(true);
         }
 
     }, Common.Controllers.Comments || {}));

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;
+        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,14 @@ 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 ($(section).prop('id') === 'toolbar' && $(section).outerHeight() < $(section).find('.box-controls').outerHeight()) {
+            bottomSection += $(section).find('.box-controls').outerHeight();
+        }
 
         if (_currentControls.length === 0)
             _getControls();
@@ -263,7 +302,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 +324,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,8 +384,13 @@ Common.UI.HintManager = new(function() {
                         top: top,
                         left: left
                     });
+                    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 +404,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 +428,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,6 +452,7 @@ Common.UI.HintManager = new(function() {
             if (_hintVisible) {
                 e.preventDefault();
                 if (e.keyCode == Common.UI.Keys.ESC ) {
+                    setTimeout(function () {
                         if (_currentLevel === 0) {
                             _hideHints();
                             _lockedKeyEvents(false);
@@ -415,8 +461,10 @@ Common.UI.HintManager = new(function() {
                             _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,11 +480,18 @@ 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)) {
+                                var title = item.attr('data-hint-title'),
+                                    regExp = new RegExp('^' + _inputLetters + '');
+                                if (regExp.test(title)) {
+                                    match = true;
+                                }
+                                if (title === _inputLetters) {
                                     curr = item;
                                     break;
                                 }
                             }
+                        }
                         if (curr) {
                             var tag = curr.prop("tagName").toLowerCase();
                             if (window.SSE && curr.parent().prop('id') === 'statusbar_bottom') {
@@ -448,15 +503,21 @@ Common.UI.HintManager = new(function() {
                                 curr.trigger(jQuery.Event('click', {which: 1}));
                                 curr.focus();
                                 _resetToDefault();
+                            } else if (curr.hasClass('listview')) {
+                                _hideHints();
+                                curr.focus();
+                                _resetToDefault();
                             } 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')) ||
+                                    (curr.parent().hasClass('ribtab') && !$('#toolbar').children('.toolbar').hasClass('expanded')));
+                                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 +531,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 +544,34 @@ Common.UI.HintManager = new(function() {
                                     return;
                                 }
                                 if (!_isComplete) {
+                                    if (curr.parent().prop('id') === 'slot-btn-chat') {
+                                        _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 +607,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,14 +250,31 @@ 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' ) {
+                        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);
+                    }
                 })
 
                 this.api = api;
@@ -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/model/Comment.js

@@ -57,6 +57,7 @@ define([
             userid              : 0,
             username            : 'Guest',
             parsedName          : 'Guest',
+            parsedGroups        : undefined,
             usercolor           : null,
             date                : undefined,
             quote               : '',
@@ -79,6 +80,7 @@ define([
             hideAddReply        : false,
             scope               : null,
             hide                : false,
+            filtered            : false,
             hint                : false,
             dummy               : undefined,
             editable            : true,

apps/common/main/lib/template/Comments.template

@@ -1,4 +1,4 @@
-<% if (!hide) { %>
+<% if (!hide && !filtered) { %>
     <div id="<%= id %>" class="user-comment-item">
 
         <!-- comment block -->

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/Comments.js

@@ -377,7 +377,21 @@ define([
                                 visible: this.appPrefix==='de-',
                                 checked: Common.localStorage.getItem(this.appPrefix + "comments-sort") === 'position-desc',
                                 toggleGroup: 'sortcomments'
-                            }
+                            },
+                            {
+                                caption: '--',
+                                visible: false
+                            },
+                            this.menuFilterGroups = new Common.UI.MenuItem({
+                                caption: this.mniFilterGroups,
+                                checkable: false,
+                                visible: false,
+                                menu: new Common.UI.Menu({
+                                    menuAlign: 'tl-tr',
+                                    style: 'min-width: auto;',
+                                    items: []
+                                })
+                            })
                         ]
                     })
                 });
@@ -394,6 +408,7 @@ define([
                 this.buttonCancel.on('click', _.bind(this.onClickCancelDocumentComment, this));
                 this.buttonClose.on('click', _.bind(this.onClickClosePanel, this));
                 this.buttonSort.menu.on('item:toggle', _.bind(this.onSortClick, this));
+                this.menuFilterGroups.menu.on('item:toggle', _.bind(this.onFilterGroupsClick, this));
 
                 this.txtComment = $('#comment-msg-new', this.el);
                 this.txtComment.keydown(function (event) {
@@ -812,6 +827,10 @@ define([
             state && this.fireEvent('comment:sort', [item.value]);
         },
 
+        onFilterGroupsClick: function(menu, item, state) {
+            state && this.fireEvent('comment:filtergroups', [item.value]);
+        },
+
         onClickClosePanel: function() {
             Common.NotificationCenter.trigger('leftmenu:change', 'hide');
         },
@@ -839,6 +858,8 @@ define([
         mniDateDesc: 'Newest',
         mniDateAsc: 'Oldest',
         textClosePanel: 'Close comments',
-        textViewResolved: 'You have not permission for reopen comment'
+        textViewResolved: 'You have not permission for reopen comment',
+        mniFilterGroups: 'Filter by Group',
+        textAll: 'All'
     }, Common.Views.Comments || {}))
 });

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"/>
-    </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

@@ -353,3 +353,49 @@
 .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,8 +261,8 @@ 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)}} />
+                                onChange={e => {this.changeSearchQuery(e.target.value)}} autoFocus/>
                             {isIos ? <i className="searchbar-icon" /> : null}
                             <span className="input-clear-button" onClick={() => this.changeSearchQuery('')} />
                         </div>
@@ -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" autofocus 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 {
@@ -886,14 +845,13 @@ input[type="number"]::-webkit-inner-spin-button {
 }
 
 .functions-list {
-    max-height: 175px;
+    max-height: 200px;
     width: 360px;
     overflow-y: auto;
     overflow-x: hidden;
-    background-color: @white;
+    background-color: @background-primary;
     &__mobile {
         position: absolute;
-        top: 30px;
         right: 0;
         left: 0;
         width: 100%;
@@ -916,6 +874,54 @@ input[type="number"]::-webkit-inner-spin-button {
     }
 }
 
+// Function List Popover
+
+#idx-functions-list {
+    width: 350px;
+    .popover-inner {
+        .navbars {
+            .right .link {
+                font-weight: 600;
+            }
+            .navbar-bg {
+                background:  @background-secondary;
+                &::after {
+                    background: @background-menu-divider;
+                }
+            }
+        }
+        .page-function-info{
+            .navbar {
+                .navbar-bg::after {
+                    background: @background-menu-divider;
+                }
+                .navbar-inner{
+                    background:  @background-secondary;
+                    .title {
+                        color: @text-normal;
+                    }
+                    .right .link {
+                        color: @brandColor;
+                        font-weight: 600;
+                    }
+                    .icon-back::after {
+                        color: @brandColor;
+                    }
+                }
+            }
+            .function-info {
+                p {
+                    color: @text-secondary;
+                }
+                h3 {
+                    font-weight: 500;
+                    color: @text-normal;
+                }
+            }
+        }
+    }
+}
+
 // Highlight Colors
 
 .highlight-palette {
@@ -960,6 +966,16 @@ input[type="number"]::-webkit-inner-spin-button {
     height: 100%;
 }
 
+.dropdown-list {
+    &__placeholder  {
+        opacity: 0.6;
+        .item-inner {
+            border-bottom: 1px solid var(--f7-list-item-border-color);
+        }
+    }
+}
+
+
 
 
 

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,9 +495,14 @@ 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) {
+                    if (config.customization.goback.blank!==false) {
+                        window.open(config.customization.goback.url, "_blank");
+                    } else {
                         window.parent.location.href = config.customization.goback.url;
                     }
+                }
+            }
         });
 
         var downloadAs =  function(format){
@@ -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/ca.json

@@ -9,19 +9,20 @@
   "DE.ApplicationController.criticalErrorTitle": "Error",
   "DE.ApplicationController.downloadErrorText": "S'ha produït un error en la baixada",
   "DE.ApplicationController.downloadTextText": "S'està baixant el document...",
-  "DE.ApplicationController.errorAccessDeny": "No teniu permisos per realitzar aquesta acció.<br>Contacteu amb el vostre administrador del servidor de documents.",
+  "DE.ApplicationController.errorAccessDeny": "No tens permisos per realitzar aquesta acció. <br>Contacta amb el teu administrador del servidor de documents.",
   "DE.ApplicationController.errorDefaultMessage": "Codi d'error:%1",
-  "DE.ApplicationController.errorEditingDownloadas": "S'ha produït un error mentre es treballava amb el document.<br>Utilitzeu l'opció \"Baixa-ho com a ...\" per desar la còpia de seguretat del fitxer al disc dur del vostre ordinador.",
+  "DE.ApplicationController.errorEditingDownloadas": "S'ha produït un error mentre es treballava amb el document.<br>Utilitzeu l'opció \"Baixa-ho com a ...\" per desar la còpia de seguretat del fitxer al disc dur del teu ordinador.",
   "DE.ApplicationController.errorFilePassProtect": "El fitxer està protegit amb contrasenya i no es pot obrir.",
-  "DE.ApplicationController.errorFileSizeExceed": "La mida del fitxer supera el límit establert pel vostre servidor. Contacteu amb el vostre administrador del servidor de documents per obtenir més informació.",
+  "DE.ApplicationController.errorFileSizeExceed": "La mida del fitxer supera el límit establert pel teu servidor. Contacta amb el teu administrador del servidor de documents per obtenir més informació.",
-  "DE.ApplicationController.errorForceSave": "S'ha produït un error en desar el fitxer. Utilitzeu l'opció \"Baixa-ho com a\" per desar el fitxer al disc dur de l’ordinador o torneu-ho a provar més endavant.",
+  "DE.ApplicationController.errorForceSave": "S'ha produït un error en desar el fitxer. Utilitza l'opció \"Baixa-ho com a\" per desar el fitxer al disc dur de l’ordinador o torna-ho a provar més endavant.",
-  "DE.ApplicationController.errorLoadingFont": "No s'han carregat els tipus de lletra.<br>Contacteu amb l'administrador del Servidor de Documents.",
+  "DE.ApplicationController.errorLoadingFont": "No s'han carregat els tipus de lletra. <br>Contacta amb l'administrador del Servidor de Documents.",
   "DE.ApplicationController.errorSubmit": "No s'ha pogut enviar.",
-  "DE.ApplicationController.errorTokenExpire": "El testimoni de seguretat del document ha caducat.<br>Contacteu amb l'administrador del servidor de documents.",
+  "DE.ApplicationController.errorTokenExpire": "El testimoni de seguretat del document ha caducat. <br>Contacteu amb l'administrador del servidor de documents.",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "S'ha restaurat la connexió a internet i la versió del fitxer ha canviat. <br> Abans de continuar treballant, heu de baixar el fitxer o copiar-ne el contingut per assegurar-vos que no es perdi res i, després, torneu a carregar aquesta pàgina.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "S'ha restaurat la connexió a internet i la versió del fitxer ha canviat. <br> Abans de continuar treballant, has de baixar el fitxer o copiar-ne el contingut per assegurar-te que no es perdi res i, després, torna a carregar aquesta pàgina.",
   "DE.ApplicationController.errorUserDrop": "Ara mateix no es pot accedir al fitxer.",
   "DE.ApplicationController.notcriticalErrorTitle": "Advertiment",
-  "DE.ApplicationController.scriptLoadError": "La connexió és massa lenta, alguns dels components no s’han pogut carregar. Torneu a carregar la pàgina.",
+  "DE.ApplicationController.openErrorText": "S'ha produït un error en obrir el fitxer.",
+  "DE.ApplicationController.scriptLoadError": "La connexió és massa lenta, alguns dels components no s’han pogut carregar. Torna a carregar la pàgina.",
   "DE.ApplicationController.textAnonymous": "Anònim",
   "DE.ApplicationController.textClear": "Esborra tots els camps",
   "DE.ApplicationController.textGotIt": "Ho tinc",
@@ -34,10 +35,10 @@
   "DE.ApplicationController.textSubmited": "<b>El formulari s'ha enviat amb èxit</b><br>Cliqueu per a tancar el consell",
   "DE.ApplicationController.txtClose": "Tanca",
   "DE.ApplicationController.txtEmpty": "(Buit)",
-  "DE.ApplicationController.txtPressLink": "Prem CTRL i clica a l'enllaç",
+  "DE.ApplicationController.txtPressLink": "Prem CTRL i fes clic a l'enllaç",
   "DE.ApplicationController.unknownErrorText": "Error desconegut.",
-  "DE.ApplicationController.unsupportedBrowserErrorText": "El vostre navegador no és compatible.",
+  "DE.ApplicationController.unsupportedBrowserErrorText": "El teu navegador no és compatible.",
-  "DE.ApplicationController.waitText": "Espereu...",
+  "DE.ApplicationController.waitText": "Espera...",
   "DE.ApplicationView.txtDownload": "Baixa",
   "DE.ApplicationView.txtDownloadDocx": "Baixa-ho com a .docx",
   "DE.ApplicationView.txtDownloadPdf": "Baixa-ho com a pdf",

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/de.json

@@ -17,9 +17,11 @@
   "DE.ApplicationController.errorForceSave": "Beim Speichern der Datei ist ein Fehler aufgetreten. Verwenden Sie die Option \"Herunterladen als\", um die Datei auf Ihrer Computerfestplatte zu speichern oder versuchen Sie es später erneut.",
   "DE.ApplicationController.errorLoadingFont": "Schriftarten nicht hochgeladen.<br>Bitte wenden Sie sich an Administratoren von Ihrem Document Server.",
   "DE.ApplicationController.errorSubmit": "Fehler beim Senden.",
+  "DE.ApplicationController.errorTokenExpire": "Sicherheitstoken des Dokuments ist abgelaufen.<br>Wenden Sie sich an Ihren Serveradministrator.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Die Internetverbindung wurde wiederhergestellt und die Dateiversion wurde geändert.<br>Bevor Sie weiterarbeiten können, müssen Sie die Datei herunterladen oder den Inhalt kopieren, um sicherzustellen, dass nichts verloren geht, und diese Seite anschließend neu laden.",
   "DE.ApplicationController.errorUserDrop": "Der Zugriff auf diese Datei ist nicht möglich.",
   "DE.ApplicationController.notcriticalErrorTitle": "Warnung",
+  "DE.ApplicationController.openErrorText": "Beim Öffnen dieser Datei ist ein Fehler aufgetreten.",
   "DE.ApplicationController.scriptLoadError": "Die Verbindung ist zu langsam, einige der Komponenten konnten nicht geladen werden. Bitte laden Sie die Seite erneut.",
   "DE.ApplicationController.textAnonymous": "Anonym",
   "DE.ApplicationController.textClear": "Alle Felder löschen",

apps/documenteditor/embed/locale/el.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/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/gl.json

@@ -17,9 +17,11 @@
   "DE.ApplicationController.errorForceSave": "Ocorreu un erro ao gardar o ficheiro. Utilice a opción 'Descargar como' para gardar o ficheiro no seu computador ou inténtao máis tarde.",
   "DE.ApplicationController.errorLoadingFont": "Tipos de letra non cargados.<br>Por favor contacte o administrador do servidor de documentos.",
   "DE.ApplicationController.errorSubmit": "Fallou ao enviar.",
+  "DE.ApplicationController.errorTokenExpire": "O token de seguridade do documento caducou. <br> Póñase en contacto co administrador do servidor de documentos.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Restaurouse a conexión a Internet. A versión do ficheiro cambiou.<br>Antes de continuar traballando, necesitas descargar o ficheiro ou copiar o seu contido para estar seguro de que nada se perde e despois recargar a páxina.",
   "DE.ApplicationController.errorUserDrop": "Agora mesmo, non se pode acceder ao ficheiro.",
   "DE.ApplicationController.notcriticalErrorTitle": "Aviso",
+  "DE.ApplicationController.openErrorText": "Ocorreu un erro ao abrir o ficheiro.",
   "DE.ApplicationController.scriptLoadError": "A conexión é lenta e algúns dos compoñentes non foron cargados. Debe recargar a páxina.",
   "DE.ApplicationController.textAnonymous": "Anónimo",
   "DE.ApplicationController.textClear": "Borrar todos os campos",

apps/documenteditor/embed/locale/it.json

@@ -17,9 +17,11 @@
   "DE.ApplicationController.errorForceSave": "Si è verificato un errore durante il salvataggio del file. Utilizzare l'opzione 'Scarica come' per salvare il file sul disco rigido del computer o riprovare più tardi.",
   "DE.ApplicationController.errorLoadingFont": "I caratteri non sono caricati.<br>Si prega di contattare il tuo amministratore di Document Server.",
   "DE.ApplicationController.errorSubmit": "Invio fallito.",
+  "DE.ApplicationController.errorTokenExpire": "Il token di sicurezza del documento è scaduto.<br>Ti preghiamo di contattare l'amministratore del Document Server.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La connessione Internet è stata ripristinata e la versione del file è stata modificata.<br>Prima di poter continuare a lavorare, è necessario scaricare il file o copiarne il contenuto per assicurarsi che non vada perso nulla, successivamente ricaricare questa pagina.",
   "DE.ApplicationController.errorUserDrop": "Impossibile accedere al file subito.",
   "DE.ApplicationController.notcriticalErrorTitle": "Avviso",
+  "DE.ApplicationController.openErrorText": "Si è verificato un errore durante l'apertura del file.",
   "DE.ApplicationController.scriptLoadError": "La connessione è troppo lenta, alcuni componenti non possono essere caricati. Si prega di ricaricare la pagina.",
   "DE.ApplicationController.textAnonymous": "Anonimo",
   "DE.ApplicationController.textClear": "‎Cancella tutti i campi‎",

apps/documenteditor/embed/locale/ja.json

@@ -17,9 +17,11 @@
   "DE.ApplicationController.errorForceSave": "文書の保存中にエラーが発生しました。コンピューターにファイルを保存するために、「...としてダウンロード」を使用し、または後で再お試しください。",
   "DE.ApplicationController.errorLoadingFont": "フォントがダウンロードされませんでした。文書サーバのアドミニストレータを連絡してください。",
   "DE.ApplicationController.errorSubmit": "送信に失敗しました。",
+  "DE.ApplicationController.errorTokenExpire": "ドキュメント・セキュリティ・トークンの有効期限が切れています。<br>ドキュメントサーバーの管理者に連絡してください。",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "インターネット接続が復旧し、ファイルのバージョンが更新されています。<br>作業を継続する前に、ファイルをダウンロードするか内容をコピーして、変更が消えてしまわないようにしてからページを再読み込みしてください。",
   "DE.ApplicationController.errorUserDrop": "今、ファイルにアクセスすることはできません。",
   "DE.ApplicationController.notcriticalErrorTitle": "警告",
+  "DE.ApplicationController.openErrorText": "ファイルの読み込み中にエラーが発生しました。",
   "DE.ApplicationController.scriptLoadError": "接続が非常に遅いため、いくつかのコンポーネントはロードされませんでした。ページを再読み込みしてください。",
   "DE.ApplicationController.textAnonymous": "匿名",
   "DE.ApplicationController.textClear": "すべてのフィールドを削除する",

apps/documenteditor/embed/locale/ko.json

@@ -17,9 +17,11 @@
   "DE.ApplicationController.errorForceSave": "파일을 저장하는 동안 오류가 발생했습니다. \"다른 이름으로 다운로드\" 옵션을 사용하여 파일을 컴퓨터의 하드 드라이브에 저장하거나 나중에 다시 시도하십시오.",
   "DE.ApplicationController.errorLoadingFont": "글꼴이 로드되지 않았습니다. <br>문서 관리 관리자에게 문의하십시오.",
   "DE.ApplicationController.errorSubmit": "전송실패",
+  "DE.ApplicationController.errorTokenExpire": "문서 보안 토큰이 만료되었습니다. <br> Document Server 관리자에게 문의하십시오.",
   "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/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/pl.json

@@ -17,12 +17,15 @@
   "DE.ApplicationController.errorForceSave": "Wystąpił błąd podczas zapisywania pliku. Użyj opcji \"Pobierz jako\", aby zapisać plik na dysku twardym komputera lub spróbuj poźniej zapisać plik ponownie.",
   "DE.ApplicationController.errorLoadingFont": "Czcionki nie zostały załadowane.<br>Skontaktuj się z administratorem Serwera Dokumentów.",
   "DE.ApplicationController.errorSubmit": "Przesyłanie nie powiodło się.",
+  "DE.ApplicationController.errorTokenExpire": "Token zabezpieczeń dokumentu wygasł.<br>Prosimy o kontakt z administratorem serwera dokumentów.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Połączenie z internetem zostało odzyskane, a wersja pliku uległa zmianie.<br>Zanim będziesz mógł kontynuować pracę, musisz pobrać plik albo skopiować jego zawartość, aby mieć pewność, że nic nie zostało utracone, a następnie odświeżyć stronę.",
   "DE.ApplicationController.errorUserDrop": "Nie można uzyskać dostępu do tego pliku.",
   "DE.ApplicationController.notcriticalErrorTitle": "Ostrzeżenie",
+  "DE.ApplicationController.openErrorText": "Wystąpił błąd podczas otwierania pliku",
   "DE.ApplicationController.scriptLoadError": "Połączenie jest zbyt wolne, niektóre komponenty mogą być niezaładowane. Proszę odświeżyć stronę.",
   "DE.ApplicationController.textAnonymous": "Anonimowy użytkownik ",
   "DE.ApplicationController.textClear": "Wyczyść wszystkie pola",
+  "DE.ApplicationController.textGotIt": "Rozumiem",
   "DE.ApplicationController.textGuest": "Gość",
   "DE.ApplicationController.textLoadingDocument": "Wgrywanie dokumentu",
   "DE.ApplicationController.textNext": "Następne pole",

apps/documenteditor/embed/locale/pt.json

@@ -17,9 +17,11 @@
   "DE.ApplicationController.errorForceSave": "Ocorreu um erro na gravação. Favor utilizar a opção 'Baixar como' para gravar o arquivo em seu computador ou tente novamente mais tarde.",
   "DE.ApplicationController.errorLoadingFont": "As fontes não foram carregadas. <br> Entre em contato com o administrador do Document Server.",
   "DE.ApplicationController.errorSubmit": "Falha no envio.",
+  "DE.ApplicationController.errorTokenExpire": "O token de segurança do documento expirou. <br> Entre em contato com o administrador do Document Server.",
   "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

@@ -7,7 +7,7 @@
   "DE.ApplicationController.convertationErrorText": "Değişim başarısız oldu.",
   "DE.ApplicationController.convertationTimeoutText": "Değişim süresi aşıldı.",
   "DE.ApplicationController.criticalErrorTitle": "Hata",
-  "DE.ApplicationController.downloadErrorText": "Yükleme başarısız oldu.",
+  "DE.ApplicationController.downloadErrorText": "İndirme başarısız oldu.",
   "DE.ApplicationController.downloadTextText": "Döküman yükleniyor...",
   "DE.ApplicationController.errorAccessDeny": "Hakkınız olmayan bir eylem gerçekleştirmeye çalışıyorsunuz.<br>Lütfen Belge Sunucu yöneticinize başvurun.",
   "DE.ApplicationController.errorDefaultMessage": "Hata kodu: %1",
@@ -15,12 +15,13 @@
   "DE.ApplicationController.errorFilePassProtect": "Döküman şifre korumalı ve açılamadı",
   "DE.ApplicationController.errorFileSizeExceed": "Dosya boyutu, sunucunuz için belirlenen limiti aşıyor.<br>Ayrıntılar için lütfen Doküman Sunucusu yöneticinizle iletişime geçin.",
   "DE.ApplicationController.errorForceSave": "Dosya kaydedilirken bir hata oluştu. Dosyayı bilgisayarınıza kaydetmek için lütfen 'Farklı İndir' seçeneğini kullanın veya daha sonra tekrar deneyin.",
-  "DE.ApplicationController.errorLoadingFont": "Fontlar yüklenmedi.<br>Lütfen Sistem Yöneticinizle iletişime geçin.",
+  "DE.ApplicationController.errorLoadingFont": "Yazı tipleri yüklenmedi.<br>Lütfen Doküman Sunucusu yöneticinize başvurun.",
   "DE.ApplicationController.errorSubmit": "Kaydetme başarısız oldu.",
   "DE.ApplicationController.errorTokenExpire": "Belge güvenlik belirtecinin süresi doldu.<br>Lütfen Belge Sunucusu yöneticinize başvurun.",
   "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/embed/locale/zh.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/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,14 +99,16 @@ 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));
                 Common.Gateway.on('opendocument',       this.loadDocument.bind(this));
                 Common.Gateway.on('showmessage',        this.onExternalMessage.bind(this));
+                Common.NotificationCenter.on('showmessage',   this.onExternalMessage.bind(this));
                 Common.Gateway.appReady();
             }
 
@@ -182,6 +196,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 +239,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 +256,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 +268,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 +323,14 @@ define([
                 config.callback = _.bind(function(btn){
                     if (id == Asc.c_oAscError.ID.Warning && btn == 'ok' && this.appOptions.canDownload) {
                         Common.UI.Menu.Manager.hideAll();
+                        if (this.appOptions.isDesktopApp && this.appOptions.isOffline)
+                            this.api.asc_DownloadAs();
+                        else {
                             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 +363,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 +407,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 +540,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 +565,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 +587,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 +603,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();
         },
@@ -664,6 +739,8 @@ define([
              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 +765,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 +873,41 @@ define([
             }
         },
 
-        onDownloadUrl: function(url) {
+        onDownloadUrl: function(url, fileType) {
+            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 +999,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 +1015,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 +1288,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 +1316,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,12 +1354,19 @@ 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) {
+                            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':
                     this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX));
@@ -1113,7 +1390,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 +1402,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 +1416,10 @@ define([
             }
         },
 
+        onContentThemeChangedToDark: function (isdark) {
+            this.view.menuItemsDarkMode.setChecked(isdark, true);
+        },
+
         createDelayedElements: function() {
             var me = this,
                 menuItems = this.view.btnOptions.menu.items,
@@ -1172,12 +1462,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 +1489,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 +1513,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 +1721,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 +1734,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 +1756,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 +1807,97 @@ 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,
+            uitype: 'fillform',
+            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>
@@ -287,6 +297,7 @@
               else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
               else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
               else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+              else if ( lang == 'tr') reqerr = 'Bağlantı çok yavaş, bileşenlerin bazıları yüklenemedi. Lütfen sayfayı yenileyin.';
               else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
 
               return reqerr;

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>
@@ -252,6 +272,7 @@
               else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
               else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
               else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+              else if ( lang == 'tr') reqerr = 'Bağlantı çok yavaş, bileşenlerin bazıları yüklenemedi. Lütfen sayfayı yenileyin.';
               else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
 
               return reqerr;

apps/documenteditor/forms/locale/ca.json

@@ -46,8 +46,8 @@
   "Common.UI.Window.textWarning": "Advertiment",
   "Common.UI.Window.yesButtonText": "Sí",
   "Common.Views.CopyWarningDialog.textDontShow": "No tornis a mostrar aquest missatge",
-  "Common.Views.CopyWarningDialog.textMsg": "Les accions de copiar, retallar i enganxar utilitzant el menú contextual només es realitzaran dins d'aquesta pestanya de l'editor.<br><br>Per copiar o enganxar a o des d'aplicacions fora de la pestanya de l'editor utilitzeu les següents combinacions de teclat:",
+  "Common.Views.CopyWarningDialog.textMsg": "Les accions de copia, retalla i enganxa utilitzant el menú contextual només es realitzaran dins d'aquesta pestanya de l'editor. <br><br>Per copiar o enganxar a o des d'aplicacions fora de la pestanya de l'editor utilitza les següents combinacions de teclat:",
-  "Common.Views.CopyWarningDialog.textTitle": "Accions de Copiar, Tallar i Enganxar ",
+  "Common.Views.CopyWarningDialog.textTitle": "Accions de copia, talla i enganxa ",
   "Common.Views.CopyWarningDialog.textToCopy": "Per copiar",
   "Common.Views.CopyWarningDialog.textToCut": "Per tallar",
   "Common.Views.CopyWarningDialog.textToPaste": "Per enganxar",
@@ -56,6 +56,22 @@
   "Common.Views.EmbedDialog.textWidth": "Amplada",
   "Common.Views.EmbedDialog.txtCopy": "Copia al porta-retalls",
   "Common.Views.EmbedDialog.warnCopy": "Error del navegador! Utilitza la drecera de teclat [Ctrl] + [C]",
+  "Common.Views.ImageFromUrlDialog.textUrl": "Enganxa un URL d'imatge:",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "Aquest camp és obligatori",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Aquest camp hauria de ser un URL amb el format \"http://www.example.com\"",
+  "Common.Views.OpenDialog.closeButtonText": "Tanca el fitxer",
+  "Common.Views.OpenDialog.txtEncoding": "Codificació",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "La contrasenya no és correcta.",
+  "Common.Views.OpenDialog.txtOpenFile": "Introdueix una contrasenya per obrir el fitxer",
+  "Common.Views.OpenDialog.txtPassword": "Contrasenya",
+  "Common.Views.OpenDialog.txtPreview": "Visualització prèvia",
+  "Common.Views.OpenDialog.txtProtected": "Un cop introdueixis la contrasenya i obris el fitxer, es restablirà la contrasenya actual del fitxer.",
+  "Common.Views.OpenDialog.txtTitle": "Tria les opcions %1",
+  "Common.Views.OpenDialog.txtTitleProtected": "El fitxer està protegit",
+  "Common.Views.SaveAsDlg.textLoading": "S'està carregant",
+  "Common.Views.SaveAsDlg.textTitle": "Carpeta per desar",
+  "Common.Views.SelectFileDlg.textLoading": "S'està carregant",
+  "Common.Views.SelectFileDlg.textTitle": "Selecciona l'origen de les dades",
   "Common.Views.ShareDialog.textTitle": "Comparteix l'enllaç",
   "Common.Views.ShareDialog.txtCopy": "Copia al porta-retalls",
   "Common.Views.ShareDialog.warnCopy": "Error del navegador! Utilitza la drecera de teclat [Ctrl] + [C]",
@@ -64,57 +80,80 @@
   "DE.Controllers.ApplicationController.criticalErrorTitle": "Error",
   "DE.Controllers.ApplicationController.downloadErrorText": "S'ha produït un error en la baixada",
   "DE.Controllers.ApplicationController.downloadTextText": "S'està baixant el document...",
-  "DE.Controllers.ApplicationController.errorAccessDeny": "No teniu permisos per realitzar aquesta acció.<br>Contacteu amb el vostre administrador del servidor de documents.",
+  "DE.Controllers.ApplicationController.errorAccessDeny": "No tens permisos per realitzar aquesta acció. <br>Contacta amb el teu administrador del servidor de documents.",
-  "DE.Controllers.ApplicationController.errorConnectToServer": "No s'ha pogut desar el document. Si us plau comproveu la configuració de la connexió o contacteu amb l'administrador.<br>Quan feu clic al botó «D'acord» se us demanarà que baixeu el document.",
+  "DE.Controllers.ApplicationController.errorBadImageUrl": "L'URL de la imatge no és correcta",
+  "DE.Controllers.ApplicationController.errorConnectToServer": "No s'ha pogut desar el document. Comprova la configuració de la connexió o contacta amb el teu administrador. <br>Quan facis clic en el botó \"D'acord\", et demanarà que descarreguis el document.",
+  "DE.Controllers.ApplicationController.errorDataEncrypted": "Els canvis xifrats que s'han rebut no es poden desxifrar.",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "Codi d'error:%1",
-  "DE.Controllers.ApplicationController.errorEditingDownloadas": "S'ha produït un error mentre es treballava amb el document.<br>Utilitzeu l'opció \"Baixa-ho com a ...\" per desar la còpia de seguretat del fitxer al disc dur del vostre ordinador.",
+  "DE.Controllers.ApplicationController.errorEditingDownloadas": "S'ha produït un error mentre es treballava amb el document. <br>Utilitza l'opció \"Baixa-ho com a ...\" per desar la còpia de seguretat del fitxer al disc dur de l'ordinador.",
+  "DE.Controllers.ApplicationController.errorEditingSaveas": "S'ha produït un error mentre es treballava amb el document. <br>Utilitza l'opció \"Desa com a ...\" per desar la còpia de seguretat del fitxer al disc dur de l’ordinador.",
   "DE.Controllers.ApplicationController.errorFilePassProtect": "El fitxer està protegit amb contrasenya i no es pot obrir.",
-  "DE.Controllers.ApplicationController.errorFileSizeExceed": "La mida del fitxer supera el límit establert pel vostre servidor. Contacteu amb el vostre administrador del servidor de documents per obtenir més informació.",
+  "DE.Controllers.ApplicationController.errorFileSizeExceed": "La mida del fitxer supera el límit establert pel teu servidor. Contacta amb el teu administrador del servidor de documents per obtenir més informació.",
-  "DE.Controllers.ApplicationController.errorForceSave": "S'ha produït un error en desar el fitxer. Utilitzeu l'opció \"Baixa-ho com a\" per desar el fitxer al disc dur de l’ordinador o torneu-ho a provar més endavant.",
+  "DE.Controllers.ApplicationController.errorForceSave": "S'ha produït un error en desar el fitxer. Utilitza l'opció \"Baixa-ho com a\" per desar el fitxer al disc dur de l’ordinador o torna-ho a provar més endavant.",
-  "DE.Controllers.ApplicationController.errorLoadingFont": "No s'han carregat els tipus de lletra.<br>Contacteu amb l'administrador del Servidor de Documents.",
+  "DE.Controllers.ApplicationController.errorLoadingFont": "No s'han carregat els tipus de lletra.<br> Contacta amb l'administrador del Servidor de Documents.",
   "DE.Controllers.ApplicationController.errorServerVersion": "S'ha actualitzat la versió de l'editor. Es tornarà a carregar la pàgina per aplicar els canvis.",
+  "DE.Controllers.ApplicationController.errorSessionAbsolute": "La sessió d’edició del document ha caducat. Torna a carregar la pàgina.",
+  "DE.Controllers.ApplicationController.errorSessionIdle": "Fa temps que no s'obre el document. Torna a carregar la pàgina.",
+  "DE.Controllers.ApplicationController.errorSessionToken": "S'ha interromput la connexió amb el servidor. Torna a carregar la pàgina.",
   "DE.Controllers.ApplicationController.errorSubmit": "No s'ha pogut enviar.",
-  "DE.Controllers.ApplicationController.errorTokenExpire": "El testimoni de seguretat del document ha caducat.<br>Contacteu amb l'administrador del servidor de documents.",
+  "DE.Controllers.ApplicationController.errorToken": "El testimoni de seguretat del document no s'ha format correctament. <br>Contacta amb el teu administrador del servidor de documents.",
+  "DE.Controllers.ApplicationController.errorTokenExpire": "El testimoni de seguretat del document ha caducat. <br>Contacta amb l'administrador del servidor de documents.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "S'ha canviat la versió del fitxer. La pàgina es tornarà a carregar.",
-  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "S'ha restaurat la connexió a internet i la versió del fitxer ha canviat. <br> Abans de continuar treballant, heu de baixar el fitxer o copiar-ne el contingut per assegurar-vos que no es perdi res i, després, torneu a carregar aquesta pàgina.",
+  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "S'ha restaurat la connexió a internet i la versió del fitxer ha canviat. <br> Abans de continuar treballant, has de baixar el fitxer o copiar-ne el contingut per assegurar-te que no es perdi res i, després, torna a carregar aquesta pàgina.",
-  "DE.Controllers.ApplicationController.errorUserDrop": "Ara mateix no es pot accedir al fitxer.",
+  "DE.Controllers.ApplicationController.errorUserDrop": "Ara no es pot accedir al fitxer.",
-  "DE.Controllers.ApplicationController.errorViewerDisconnect": "S'ha perdut la connexió. Encara podeu veure el document,<br>però no podreu descarregar-lo ni imprimir-lo fins que es restauri la connexió i es torni a carregar la pàgina.",
+  "DE.Controllers.ApplicationController.errorViewerDisconnect": "S'ha perdut la connexió. Encara pots visualitzar el document, <br>però no el podràs baixar ni imprimir fins que no es restableixi la connexió i es torni a carregar la pàgina.",
+  "DE.Controllers.ApplicationController.mniImageFromFile": "Imatge del fitxer",
+  "DE.Controllers.ApplicationController.mniImageFromStorage": "Imatge de l'emmagatzematge",
+  "DE.Controllers.ApplicationController.mniImageFromUrl": "Imatge d'URL",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Advertiment",
-  "DE.Controllers.ApplicationController.scriptLoadError": "La connexió és massa lenta, alguns dels components no s’han pogut carregar. Torneu a carregar la pàgina.",
+  "DE.Controllers.ApplicationController.openErrorText": "S'ha produït un error en obrir el fitxer.",
+  "DE.Controllers.ApplicationController.saveErrorText": "S'ha produït un error en desar el fitxer.",
+  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "Aquest fitxer no es pot desar o crear. <br>Les possibles raons són: <br>1. El fitxer és només de lectura. <br>2. El fitxer és en aquests moments obert per altres usuaris. <br>3. El disc és ple o s'ha fet malbé.",
+  "DE.Controllers.ApplicationController.scriptLoadError": "La connexió és massa lenta, alguns dels components no s’han pogut carregar. Torna a carregar la pàgina.",
   "DE.Controllers.ApplicationController.textAnonymous": "Anònim",
-  "DE.Controllers.ApplicationController.textBuyNow": "Visiteu el lloc web",
+  "DE.Controllers.ApplicationController.textBuyNow": "Visita el Lloc Web",
-  "DE.Controllers.ApplicationController.textCloseTip": "Feu clic per tancar el suggeriment.",
+  "DE.Controllers.ApplicationController.textCloseTip": "Fes clic per tancar el suggeriment.",
-  "DE.Controllers.ApplicationController.textContactUs": "Contacteu amb vendes",
+  "DE.Controllers.ApplicationController.textContactUs": "Contacta amb vendes",
   "DE.Controllers.ApplicationController.textGotIt": "Ho tinc",
   "DE.Controllers.ApplicationController.textGuest": "Convidat",
   "DE.Controllers.ApplicationController.textLoadingDocument": "S'està carregant el document",
   "DE.Controllers.ApplicationController.textNoLicenseTitle": "S'ha assolit el límit de llicència",
   "DE.Controllers.ApplicationController.textOf": "de",
   "DE.Controllers.ApplicationController.textRequired": "Emplena tots els camps necessaris per enviar el formulari.",
-  "DE.Controllers.ApplicationController.textSubmited": "<b>El formulari s'ha enviat amb èxit</b><br>Cliqueu per tancar el consell",
+  "DE.Controllers.ApplicationController.textSaveAs": "Desa com a PDF",
+  "DE.Controllers.ApplicationController.textSaveAsDesktop": "Desa com a...",
+  "DE.Controllers.ApplicationController.textSubmited": "<b>El formulari s'ha enviat amb èxit</b><br>Fes clic 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 teu text aquí",
+  "DE.Controllers.ApplicationController.txtChoose": "Tria un element",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "Fes clic 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.txtUntitled": "Sense títol",
   "DE.Controllers.ApplicationController.unknownErrorText": "Error desconegut.",
-  "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "El vostre navegador no és compatible.",
+  "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "El teu navegador no és compatible.",
   "DE.Controllers.ApplicationController.uploadImageExtMessage": "Format d'imatge desconegut.",
   "DE.Controllers.ApplicationController.uploadImageSizeMessage": "La imatge és massa gran. La mida màxima és 25 MB.",
-  "DE.Controllers.ApplicationController.waitText": "Espereu...",
+  "DE.Controllers.ApplicationController.waitText": "Espera...",
-  "DE.Controllers.ApplicationController.warnLicenseExceeded": "Heu arribat al límit de connexions simultànies amb %1 editors. Aquest document només s'obrirà en mode lectura. <br> Contacteu amb el vostre administrador per obtenir més informació.",
+  "DE.Controllers.ApplicationController.warnLicenseExceeded": "Has arribat al límit de connexions simultànies amb %1 editors. Aquest document només s'obrirà en mode lectura. <br> Contacta amb el teu administrador per obtenir més informació.",
-  "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "La llicència ha caducat.<br>No teniu accés a la funció d'edició de documents.<br>Contacteu amb el vostre administrador.",
+  "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "La llicència ha caducat. <br>No tens accés a la funció d'edició de documents. <br>Contacta amb el teu administrador.",
-  "DE.Controllers.ApplicationController.warnLicenseLimitedRenewed": "Cal renovar la llicència.<br>Teniu accés limitat a la funció d'edició de documents.<br>Contacteu amb el vostre administrador per obtenir accés complet",
+  "DE.Controllers.ApplicationController.warnLicenseLimitedRenewed": "Cal renovar la llicència. <br>Tens un accés limitat a la funció d'edició de documents. <br>Contacta amb el teu administrador per obtenir accés total",
-  "DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "Heu arribat al límit d'usuaris per a %1 editors. Contacteu amb el vostre administrador per a més informació.",
+  "DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "Has arribat al límit d'usuari per a %1 editors. Contacta amb el teu administrador per a més informació.",
-  "DE.Controllers.ApplicationController.warnNoLicense": "Heu arribat al límit de connexions simultànies per als editors %1. Aquest document s'obrirà en mode de només lectura. Contacteu l'equip de vendes %1 per a les condicions personals de millora del servei.",
+  "DE.Controllers.ApplicationController.warnNoLicense": "Has arribat al límit de connexions simultànies per als editors %1. Aquest document s'obrirà al mode de només lectura. Contacta l'equip de vendes %1 per a les condicions personals de millora del servei.",
-  "DE.Controllers.ApplicationController.warnNoLicenseUsers": "Heu arribat al límit d'usuaris per a %1 editors. Contacteu amb l'equip de vendes de %1 per obtenir les condicions de millora personals dels vostres serveis.",
+  "DE.Controllers.ApplicationController.warnNoLicenseUsers": "Has arribat al límit d'usuaris per a %1 editors. Contacta amb l'equip de vendes de %1 per obtenir les condicions de millora personals dels teus serveis.",
   "DE.Views.ApplicationView.textClear": "Esborra tots els camps",
-  "DE.Views.ApplicationView.textCopy": "Copiar",
+  "DE.Views.ApplicationView.textCopy": "Copia",
-  "DE.Views.ApplicationView.textCut": "Tallar",
+  "DE.Views.ApplicationView.textCut": "Talla",
   "DE.Views.ApplicationView.textNext": "Camp següent",
-  "DE.Views.ApplicationView.textPaste": "Enganxar",
+  "DE.Views.ApplicationView.textPaste": "Enganxa",
   "DE.Views.ApplicationView.textPrintSel": "Imprimir la selecció",
+  "DE.Views.ApplicationView.textRedo": "Refés",
   "DE.Views.ApplicationView.textSubmit": "Envia",
+  "DE.Views.ApplicationView.textUndo": "Desfés",
+  "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/de.json

@@ -1,22 +1,114 @@
 {
+  "Common.UI.Calendar.textApril": "April",
+  "Common.UI.Calendar.textAugust": "August",
+  "Common.UI.Calendar.textDecember": "Dezember",
+  "Common.UI.Calendar.textFebruary": "Februar",
+  "Common.UI.Calendar.textJanuary": "Januar",
+  "Common.UI.Calendar.textJuly": "Juli",
+  "Common.UI.Calendar.textJune": "Juni",
+  "Common.UI.Calendar.textMarch": "März",
+  "Common.UI.Calendar.textMay": "Mai",
+  "Common.UI.Calendar.textMonths": "Monate",
+  "Common.UI.Calendar.textNovember": "November",
+  "Common.UI.Calendar.textOctober": "Oktober",
+  "Common.UI.Calendar.textSeptember": "September",
+  "Common.UI.Calendar.textShortApril": "Apr",
+  "Common.UI.Calendar.textShortAugust": "Aug",
+  "Common.UI.Calendar.textShortDecember": "Dez",
+  "Common.UI.Calendar.textShortFebruary": "Feb",
+  "Common.UI.Calendar.textShortFriday": "Fr",
+  "Common.UI.Calendar.textShortJanuary": "Jan",
+  "Common.UI.Calendar.textShortJuly": "Jul",
+  "Common.UI.Calendar.textShortJune": "Jun",
+  "Common.UI.Calendar.textShortMarch": "Mär",
+  "Common.UI.Calendar.textShortMay": "Mai",
+  "Common.UI.Calendar.textShortMonday": "Mo",
+  "Common.UI.Calendar.textShortNovember": "Nov",
+  "Common.UI.Calendar.textShortOctober": "Okt",
+  "Common.UI.Calendar.textShortSaturday": "Sa",
+  "Common.UI.Calendar.textShortSeptember": "Sep",
+  "Common.UI.Calendar.textShortSunday": "Son",
+  "Common.UI.Calendar.textShortThursday": "Do",
+  "Common.UI.Calendar.textShortTuesday": "Di",
+  "Common.UI.Calendar.textShortWednesday": "Mi",
+  "Common.UI.Calendar.textYears": "Jahre",
+  "Common.UI.Themes.txtThemeClassicLight": "Klassisch Hell",
+  "Common.UI.Themes.txtThemeDark": "Dunkelmodus",
+  "Common.UI.Themes.txtThemeLight": "Hell",
+  "Common.UI.Window.cancelButtonText": "Abbrechen",
+  "Common.UI.Window.closeButtonText": "Schließen",
+  "Common.UI.Window.noButtonText": "Nein",
+  "Common.UI.Window.okButtonText": "OK",
+  "Common.UI.Window.textConfirmation": "Bestätigung",
+  "Common.UI.Window.textDontShow": "Diese Meldung nicht mehr anzeigen",
+  "Common.UI.Window.textError": "Fehler",
+  "Common.UI.Window.textInformation": "Informationen",
+  "Common.UI.Window.textWarning": "Warnung",
+  "Common.UI.Window.yesButtonText": "Ja",
+  "Common.Views.CopyWarningDialog.textDontShow": "Diese Meldung nicht mehr anzeigen",
+  "Common.Views.CopyWarningDialog.textMsg": "Kopieren, Ausschneiden und Einfügen im Kontextmenü werden nur innerhalb dieser Registerkarte ausgeführt.<br><br>Um in oder aus Anwendungen außerhalb der Registerkarte zu kopieren oder einzufügen, verwenden Sie die folgenden Tastaturkombinationen:",
+  "Common.Views.CopyWarningDialog.textTitle": "Kopieren, Ausschneiden und Einfügen",
+  "Common.Views.CopyWarningDialog.textToCopy": "zum Kopieren",
+  "Common.Views.CopyWarningDialog.textToCut": "zum Ausschneiden",
+  "Common.Views.CopyWarningDialog.textToPaste": "zum Einfügen",
+  "Common.Views.EmbedDialog.textHeight": "Höhe",
+  "Common.Views.EmbedDialog.textTitle": "Einbetten",
+  "Common.Views.EmbedDialog.textWidth": "Breite",
+  "Common.Views.EmbedDialog.txtCopy": "In die Zwischenablage kopieren",
+  "Common.Views.EmbedDialog.warnCopy": "Fehler im Browser! Benutzen Sie die Tastenkombination [Strg] + [C]",
+  "Common.Views.ImageFromUrlDialog.textUrl": "Bild-URL einfügen:",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "Dieses Feld ist erforderlich",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Dieses Feld muss eine URL im Format „http://www.example.com“ sein",
+  "Common.Views.OpenDialog.closeButtonText": "Datei schließen",
+  "Common.Views.OpenDialog.txtEncoding": "Verschlüsselung",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "Kennwort ist falsch.",
+  "Common.Views.OpenDialog.txtOpenFile": "Kennwort zum Öffnen der Datei eingeben",
+  "Common.Views.OpenDialog.txtPassword": "Passwort",
+  "Common.Views.OpenDialog.txtPreview": "Vorschau",
+  "Common.Views.OpenDialog.txtProtected": "Sobald Sie das Passwort eingegeben und die Datei geöffnet haben, wird das aktuelle Passwort für die Datei zurückgesetzt.",
+  "Common.Views.OpenDialog.txtTitle": "Parameter für %1 auswählen",
+  "Common.Views.OpenDialog.txtTitleProtected": "Geschützte Datei",
+  "Common.Views.SaveAsDlg.textLoading": "Ladevorgang",
+  "Common.Views.SaveAsDlg.textTitle": "Ausgabeordner",
+  "Common.Views.SelectFileDlg.textLoading": "Ladevorgang",
+  "Common.Views.SelectFileDlg.textTitle": "Datenquelle auswählen",
+  "Common.Views.ShareDialog.textTitle": "Link teilen",
+  "Common.Views.ShareDialog.txtCopy": "In die Zwischenablage kopieren",
+  "Common.Views.ShareDialog.warnCopy": "Fehler im Browser! Benutzen Sie die Tastenkombination [Strg] + [C]",
   "DE.Controllers.ApplicationController.convertationErrorText": "Konvertierung ist fehlgeschlagen.",
   "DE.Controllers.ApplicationController.convertationTimeoutText": "Zeitüberschreitung bei der Konvertierung.",
   "DE.Controllers.ApplicationController.criticalErrorTitle": "Fehler",
   "DE.Controllers.ApplicationController.downloadErrorText": "Herunterladen ist fehlgeschlagen.",
   "DE.Controllers.ApplicationController.downloadTextText": "Dokument wird heruntergeladen...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "Sie versuchen, eine Aktion durchzuführen, für die Sie keine Rechte haben.<br>Bitte wenden Sie sich an Ihren Document Serveradministrator.",
+  "DE.Controllers.ApplicationController.errorBadImageUrl": "URL des Bildes ist falsch",
+  "DE.Controllers.ApplicationController.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche „OK“ klicken, werden Sie aufgefordert, das Dokument herunterzuladen.",
+  "DE.Controllers.ApplicationController.errorDataEncrypted": "Verschlüsselte Änderungen wurden empfangen. Sie können nicht entschlüsselt werden.",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "Fehlercode: %1",
   "DE.Controllers.ApplicationController.errorEditingDownloadas": "Fehler bei der Bearbeitung.<br>Speichern Sie eine Kopie dieser Datei auf Ihrem Computer, indem Sie auf \"Herunterladen als...\" klicken.",
+  "DE.Controllers.ApplicationController.errorEditingSaveas": "Bei der Arbeit mit dem Dokument ist ein Fehler aufgetreten. <br> Verwenden Sie die Option \"Speichern als ...\", um die Sicherungskopie der Datei auf der Festplatte Ihres Computers zu speichern.",
   "DE.Controllers.ApplicationController.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "Die Dateigröße überschreitet die für Ihren Server festgelegte Einschränkung.<br>Weitere Informationen können Sie von Ihrem Document Server-Administrator erhalten.",
   "DE.Controllers.ApplicationController.errorForceSave": "Beim Speichern der Datei ist ein Fehler aufgetreten. Verwenden Sie die Option \"Herunterladen als\", um die Datei auf Ihrer Computerfestplatte zu speichern oder versuchen Sie es später erneut.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Schriftarten nicht hochgeladen.<br>Bitte wenden Sie sich an Administratoren von Ihrem Document Server.",
   "DE.Controllers.ApplicationController.errorServerVersion": "Version des Editors wurde aktualisiert. Die Seite wird neu geladen, um die Änderungen zu übernehmen.",
+  "DE.Controllers.ApplicationController.errorSessionAbsolute": "Die Bearbeitungssitzung des Dokumentes ist abgelaufen. Laden Sie die Seite neu.",
+  "DE.Controllers.ApplicationController.errorSessionIdle": "Das Dokument wurde lange nicht bearbeitet. Laden Sie die Seite neu.",
+  "DE.Controllers.ApplicationController.errorSessionToken": "Die Verbindung zum Server wurde unterbrochen. Laden Sie die Seite neu.",
   "DE.Controllers.ApplicationController.errorSubmit": "Fehler beim Senden.",
+  "DE.Controllers.ApplicationController.errorToken": "Sicherheitstoken des Dokuments ist nicht korrekt.<br>Wenden Sie sich an Ihren Serveradministrator.",
+  "DE.Controllers.ApplicationController.errorTokenExpire": "Sicherheitstoken des Dokuments ist abgelaufen.<br>Wenden Sie sich an Ihren Serveradministrator.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "Die Dateiversion wurde geändert. Die Seite wird neu geladen.",
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Die Internetverbindung wurde wiederhergestellt und die Dateiversion wurde geändert.<br>Bevor Sie weiterarbeiten können, müssen Sie die Datei herunterladen oder den Inhalt kopieren, um sicherzustellen, dass nichts verloren geht, und diese Seite anschließend neu laden.",
   "DE.Controllers.ApplicationController.errorUserDrop": "Der Zugriff auf diese Datei ist nicht möglich.",
+  "DE.Controllers.ApplicationController.errorViewerDisconnect": "Die Verbindung ist unterbrochen. Sie können sich das Dokument noch anschauen.<br>Es ist aber momentan nicht möglich, es herunterzuladen oder auszudrucken, bis die Verbindung wiederhergestellt wird.",
+  "DE.Controllers.ApplicationController.mniImageFromFile": "Bild aus Datei",
+  "DE.Controllers.ApplicationController.mniImageFromStorage": "Bild aus dem Speicher",
+  "DE.Controllers.ApplicationController.mniImageFromUrl": "Bild aus URL",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Warnung",
+  "DE.Controllers.ApplicationController.openErrorText": "Beim Öffnen dieser Datei ist ein Fehler aufgetreten.",
+  "DE.Controllers.ApplicationController.saveErrorText": "Beim Speichern dieser Datei ist ein Fehler aufgetreten.",
+  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "Diese Datei kann nicht erstellt oder gespeichert werden.<br>Dies ist möglicherweise davon verursacht: <br>1. Die Datei ist schreibgeschützt. <br>2. Die Datei wird von anderen Benutzern bearbeitet. <br>3. Die Festplatte ist voll oder beschädigt.",
   "DE.Controllers.ApplicationController.scriptLoadError": "Die Verbindung ist zu langsam, einige der Komponenten konnten nicht geladen werden. Bitte laden Sie die Seite erneut.",
   "DE.Controllers.ApplicationController.textAnonymous": "Anonym",
   "DE.Controllers.ApplicationController.textBuyNow": "Webseite besuchen",
@@ -28,14 +120,23 @@
   "DE.Controllers.ApplicationController.textNoLicenseTitle": "Lizenzlimit erreicht",
   "DE.Controllers.ApplicationController.textOf": "von",
   "DE.Controllers.ApplicationController.textRequired": "Füllen Sie alle erforderlichen Felder aus, um das Formular zu senden.",
+  "DE.Controllers.ApplicationController.textSaveAs": "Als PDF speichern",
+  "DE.Controllers.ApplicationController.textSaveAsDesktop": "Speichern als...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Das Formular wurde erfolgreich abgesendet</b><br>Klicken Sie hier, um den Tipp auszublenden",
   "DE.Controllers.ApplicationController.titleServerVersion": "Editor wurde aktualisiert",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "Version wurde geändert",
+  "DE.Controllers.ApplicationController.txtArt": "Hier den Text eingeben",
+  "DE.Controllers.ApplicationController.txtChoose": "Wählen Sie ein Element aus",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "Klicken Sie, um das Bild herunterzuladen",
   "DE.Controllers.ApplicationController.txtClose": "Schließen",
   "DE.Controllers.ApplicationController.txtEmpty": "(Leer)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "Datum einfügen",
   "DE.Controllers.ApplicationController.txtPressLink": "Drücken Sie STRG und klicken Sie auf den Link",
+  "DE.Controllers.ApplicationController.txtUntitled": "Unbenannt",
   "DE.Controllers.ApplicationController.unknownErrorText": "Unbekannter Fehler.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "Ihr Webbrowser wird nicht unterstützt.",
+  "DE.Controllers.ApplicationController.uploadImageExtMessage": "Unbekanntes Bildformat.",
+  "DE.Controllers.ApplicationController.uploadImageSizeMessage": "Die maximal zulässige Bildgröße von 25 MB ist überschritten.",
   "DE.Controllers.ApplicationController.waitText": "Bitte warten...",
   "DE.Controllers.ApplicationController.warnLicenseExceeded": "Sie haben das Limit für gleichzeitige Verbindungen in %1-Editoren erreicht. Dieses Dokument wird nur zum Anzeigen geöffnet.<br>Bitte wenden Sie sich an Ihren Administrator, um weitere Informationen zu erhalten.",
   "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "Die Lizenz ist abgelaufen.<br>Die Bearbeitungsfunktionen sind nicht verfügbar.<br>Bitte wenden Sie sich an Ihrem Administrator.",
@@ -44,8 +145,15 @@
   "DE.Controllers.ApplicationController.warnNoLicense": "Sie haben das Limit für gleichzeitige Verbindungen in %1-Editoren erreicht. Dieses Dokument wird nur zum Anzeigen geöffnet.<br>Bitte kontaktieren Sie unser Verkaufsteam, um persönliche Upgrade-Bedingungen zu erhalten.",
   "DE.Controllers.ApplicationController.warnNoLicenseUsers": "Sie haben das Benutzerlimit für %1-Editoren erreicht. Bitte kontaktieren Sie unser Verkaufsteam, um persönliche Upgrade-Bedingungen zu erhalten.",
   "DE.Views.ApplicationView.textClear": "Alle Felder leeren",
+  "DE.Views.ApplicationView.textCopy": "Kopieren",
+  "DE.Views.ApplicationView.textCut": "Ausschneiden",
   "DE.Views.ApplicationView.textNext": "Nächstes Feld",
+  "DE.Views.ApplicationView.textPaste": "Einfügen",
+  "DE.Views.ApplicationView.textPrintSel": "Auswahl drucken",
+  "DE.Views.ApplicationView.textRedo": "Wiederholen",
   "DE.Views.ApplicationView.textSubmit": "Senden",
+  "DE.Views.ApplicationView.textUndo": "Rückgängig machen",
+  "DE.Views.ApplicationView.txtDarkMode": "Dunkelmodus",
   "DE.Views.ApplicationView.txtDownload": "Herunterladen",
   "DE.Views.ApplicationView.txtDownloadDocx": "Als DOCX herunterladen",
   "DE.Views.ApplicationView.txtDownloadPdf": "Als PDF herunterladen",

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/gl.json

@@ -7,6 +7,7 @@
   "Common.UI.Calendar.textJuly": "Xullo",
   "Common.UI.Calendar.textJune": "Xuño",
   "Common.UI.Calendar.textMarch": "Marzo",
+  "Common.UI.Calendar.textMay": "Maio",
   "Common.UI.Calendar.textMonths": "Meses",
   "Common.UI.Calendar.textNovember": "Novembro",
   "Common.UI.Calendar.textOctober": "Outubro",
@@ -20,6 +21,7 @@
   "Common.UI.Calendar.textShortJuly": "Xul",
   "Common.UI.Calendar.textShortJune": "Xuñ",
   "Common.UI.Calendar.textShortMarch": "Mar",
+  "Common.UI.Calendar.textShortMay": "Maio",
   "Common.UI.Calendar.textShortMonday": "Me",
   "Common.UI.Calendar.textShortNovember": "Nov",
   "Common.UI.Calendar.textShortOctober": "Out",
@@ -43,29 +45,70 @@
   "Common.UI.Window.textInformation": "Información",
   "Common.UI.Window.textWarning": "Aviso",
   "Common.UI.Window.yesButtonText": "Si",
+  "Common.Views.CopyWarningDialog.textDontShow": "Non volver a amosar esta mensaxe",
+  "Common.Views.CopyWarningDialog.textMsg": "As accións de copiar, cortar e pegar utilizando as accións do menú contextual realízanse unicamente dentro deste lapela do editor.<br><br> Para copiar ou pegar no ou desde os aplicativos fóra da lapela do editor, use as seguintes combinacións de teclado:",
+  "Common.Views.CopyWarningDialog.textTitle": "Accións de copiar, cortar e pegar",
+  "Common.Views.CopyWarningDialog.textToCopy": "para Copiar",
+  "Common.Views.CopyWarningDialog.textToCut": "para Cortar",
+  "Common.Views.CopyWarningDialog.textToPaste": "para Pegar",
   "Common.Views.EmbedDialog.textHeight": "Altura",
+  "Common.Views.EmbedDialog.textTitle": "Incorporar",
   "Common.Views.EmbedDialog.textWidth": "Largura",
   "Common.Views.EmbedDialog.txtCopy": "Copiar no portapapeis",
+  "Common.Views.EmbedDialog.warnCopy": "Erro do navegador! Use o atallo do teclado [Ctrl] + [C]",
+  "Common.Views.ImageFromUrlDialog.textUrl": "Pegar URL da imaxe:",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "Este campo é obrigatorio",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Este campo debe ser unha URL no formato \"http://www.example.com\"",
+  "Common.Views.OpenDialog.closeButtonText": "Pechar ficheiro",
+  "Common.Views.OpenDialog.txtEncoding": "Codificación",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "O contrasinal é incorrecto",
+  "Common.Views.OpenDialog.txtOpenFile": "Insira o contrasinal para abrir o ficheiro",
+  "Common.Views.OpenDialog.txtPassword": "Contrasinal",
+  "Common.Views.OpenDialog.txtPreview": "Vista previa",
+  "Common.Views.OpenDialog.txtProtected": "Unha vez que se inseriu o contrasinal e aberto o ficheiro, o contrasinal actual ao ficheiro restablecerase",
+  "Common.Views.OpenDialog.txtTitle": "Elixir opcións de %1",
+  "Common.Views.OpenDialog.txtTitleProtected": "Ficheiro protexido",
+  "Common.Views.SaveAsDlg.textLoading": "Cargando",
+  "Common.Views.SaveAsDlg.textTitle": "Cartafol para gardar",
+  "Common.Views.SelectFileDlg.textLoading": "Cargando",
+  "Common.Views.SelectFileDlg.textTitle": "Seleccionar fonte de datos",
   "Common.Views.ShareDialog.textTitle": "Compartir ligazón",
   "Common.Views.ShareDialog.txtCopy": "Copiar no portapapeis",
+  "Common.Views.ShareDialog.warnCopy": "Erro do navegador! Use o atallo do teclado [Ctrl] + [C]",
   "DE.Controllers.ApplicationController.convertationErrorText": "Fallou a conversión.",
   "DE.Controllers.ApplicationController.convertationTimeoutText": "Excedeu o tempo límite de conversión.",
   "DE.Controllers.ApplicationController.criticalErrorTitle": "Erro",
   "DE.Controllers.ApplicationController.downloadErrorText": "Fallou a descarga.",
   "DE.Controllers.ApplicationController.downloadTextText": "Estase a descargar o documento...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "Estás intentando realizar unha acción que non tes permitido facer.<br>Por favor, contacta co teu administrador de Servidor de Documentos.",
+  "DE.Controllers.ApplicationController.errorBadImageUrl": "A URL da imaxe é incorrecta",
+  "DE.Controllers.ApplicationController.errorConnectToServer": "Non se puido gardar o documento. Comprobe a configuración de conexión ou contacte co administrador. <br> Cando premas no botón \"Aceptar\", solicitaráselle que descargue o documento.",
+  "DE.Controllers.ApplicationController.errorDataEncrypted": "Recibíronse cambios cifrados, e non poden ser cifrados",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "Código do erro: %1",
   "DE.Controllers.ApplicationController.errorEditingDownloadas": "Ocorreu un erro ao traballar no documento.<br>Utilice a opción 'Descargar como...' para gardar unha copia do ficheiro no seu computador.",
+  "DE.Controllers.ApplicationController.errorEditingSaveas": "Ocorreu un erro ao traballar no documento.<br>utilice a opción 'Gardar como...\" para gardar unha copia do ficheiro no seu computador.",
   "DE.Controllers.ApplicationController.errorFilePassProtect": "O documento está protexido por un contrasinal e non pode ser aberto.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "O tamaño do ficheiro excede os límites establecidos para o teu servidor.<br>Por favor, contacte co seu administrador de Servidor de Documentos para máis detalles.",
   "DE.Controllers.ApplicationController.errorForceSave": "Ocorreu un erro ao gardar o ficheiro. Utilice a opción 'Descargar como' para gardar o ficheiro no seu computador ou inténtao máis tarde.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Tipos de letra non cargados.<br>Por favor contacte o administrador do servidor de documentos.",
   "DE.Controllers.ApplicationController.errorServerVersion": "A versión do editor foi actualizada. A páxina será recargada para aplicar os cambios.",
+  "DE.Controllers.ApplicationController.errorSessionAbsolute": "A sesión de edición de documentos caducou. Recarga a páxina.",
+  "DE.Controllers.ApplicationController.errorSessionIdle": "O documento leva pouco tempo editándose. Recarga a páxina.",
+  "DE.Controllers.ApplicationController.errorSessionToken": "A conexión co servidor interrompeuse. Recarga a páxina.",
   "DE.Controllers.ApplicationController.errorSubmit": "Fallou ao enviar.",
+  "DE.Controllers.ApplicationController.errorToken": "O token de seguridade do documento non está formado correctamente. <br> Póñase en contacto co administrador do servidor de documentos.",
+  "DE.Controllers.ApplicationController.errorTokenExpire": "O token de seguridade do documento caducou. <br> Póñase en contacto co administrador do servidor de documentos.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "Cambiouse a versión do ficheiro. A páxina será actualizada.",
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Restaurouse a conexión a Internet. A versión do ficheiro cambiou.<br>Antes de continuar traballando, necesitas descargar o ficheiro ou copiar o seu contido para estar seguro de que nada se perde e despois recargar a páxina.",
   "DE.Controllers.ApplicationController.errorUserDrop": "Agora mesmo, non se pode acceder ao ficheiro.",
+  "DE.Controllers.ApplicationController.errorViewerDisconnect": "Perdeuse a conexión. Aínda pode visualizar o documento,<br>pero on pode descargalo ou imprimilo ata que a conexión sexa restaurada e a páxina recargada.",
+  "DE.Controllers.ApplicationController.mniImageFromFile": "Imaxe do ficheiro",
+  "DE.Controllers.ApplicationController.mniImageFromStorage": "Imaxe do Almacenamento",
+  "DE.Controllers.ApplicationController.mniImageFromUrl": "Imaxe da URL",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Aviso",
+  "DE.Controllers.ApplicationController.openErrorText": "Ocorreu un erro ao abrir o ficheiro.",
+  "DE.Controllers.ApplicationController.saveErrorText": "Ocorreu un erro ao gardar o ficheiro.",
+  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "Este ficheiro non se pode gardar nin crear. <br> Os motivos posibles son: <br> 1. O ficheiro é de só lectura. <br> 2. O ficheiro está a ser editado por outros usuarios. <br> 3. O disco está cheo ou corrompido.",
   "DE.Controllers.ApplicationController.scriptLoadError": "A conexión é lenta e algúns dos compoñentes non foron cargados. Debe recargar a páxina.",
   "DE.Controllers.ApplicationController.textAnonymous": "Anónimo",
   "DE.Controllers.ApplicationController.textBuyNow": "Visitar sitio web",
@@ -77,14 +120,23 @@
   "DE.Controllers.ApplicationController.textNoLicenseTitle": "Alcanzouse o límite da licenza",
   "DE.Controllers.ApplicationController.textOf": "de",
   "DE.Controllers.ApplicationController.textRequired": "Encha todos os campos obrigatorios para poder enviar o formulario.",
+  "DE.Controllers.ApplicationController.textSaveAs": "Gardar como PDF",
+  "DE.Controllers.ApplicationController.textSaveAsDesktop": "Gardar como...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Formulario enviado con éxito</b><br>Prema para pechar o consello",
   "DE.Controllers.ApplicationController.titleServerVersion": "Editor actualizado",
-  "DE.Controllers.ApplicationController.titleUpdateVersion": "Versión cambiada",
+  "DE.Controllers.ApplicationController.titleUpdateVersion": "A versión cambiou",
+  "DE.Controllers.ApplicationController.txtArt": "Escriba o texto aquí",
+  "DE.Controllers.ApplicationController.txtChoose": "Escolla un elemento",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "Prema para cargar a imaxe",
   "DE.Controllers.ApplicationController.txtClose": "Pechar",
   "DE.Controllers.ApplicationController.txtEmpty": "(Vacío)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "Insira unha data",
   "DE.Controllers.ApplicationController.txtPressLink": "Prema Ctrl e na ligazón",
+  "DE.Controllers.ApplicationController.txtUntitled": "Sen título",
   "DE.Controllers.ApplicationController.unknownErrorText": "Erro descoñecido.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "O seu navegador non é compatible.",
+  "DE.Controllers.ApplicationController.uploadImageExtMessage": "Formato da imaxe descoñecido.",
+  "DE.Controllers.ApplicationController.uploadImageSizeMessage": "A imaxe é demasiado grande. O tamaño máximo é de 25 MB.",
   "DE.Controllers.ApplicationController.waitText": "Agarde...",
   "DE.Controllers.ApplicationController.warnLicenseExceeded": "Alcanzou o límite de conexións simultáneas con %1 editores. Este documento abrirase só para a súa visualización.<br>Por favor, contacte co seu administrador para recibir máis información.",
   "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "Licenza expirada.<br>Non ten acceso á funcionalidade de edición de documentos.<br>por favor, póñase en contacto co seu administrador.",
@@ -93,12 +145,19 @@
   "DE.Controllers.ApplicationController.warnNoLicense": "Alcanzou o límite de conexións simultáneas con %1 editores. Este documento abrirase só para as úa visualización.<br>Contacte co equipo de vendas de %1 para coñecer os termos de actualización persoal.",
   "DE.Controllers.ApplicationController.warnNoLicenseUsers": "Alcanzou o límite de usuarios para os editores de %1.<br>Contacte co equipo de vendas de %1 para coñecer os termos de actualización persoal.",
   "DE.Views.ApplicationView.textClear": "Borrar todos os campos",
+  "DE.Views.ApplicationView.textCopy": "Copiar",
+  "DE.Views.ApplicationView.textCut": "Cortar",
   "DE.Views.ApplicationView.textNext": "Seguinte campo",
+  "DE.Views.ApplicationView.textPaste": "Pegar",
+  "DE.Views.ApplicationView.textPrintSel": "Imprimir selección",
+  "DE.Views.ApplicationView.textRedo": "Refacer",
   "DE.Views.ApplicationView.textSubmit": "Enviar",
+  "DE.Views.ApplicationView.textUndo": "Desfacer",
+  "DE.Views.ApplicationView.txtDarkMode": "Modo escuro",
   "DE.Views.ApplicationView.txtDownload": "Descargar",
   "DE.Views.ApplicationView.txtDownloadDocx": "Descargar como docx",
   "DE.Views.ApplicationView.txtDownloadPdf": "Descargar como pdf",
-  "DE.Views.ApplicationView.txtEmbed": "Incorporado",
+  "DE.Views.ApplicationView.txtEmbed": "Incorporar",
   "DE.Views.ApplicationView.txtFileLocation": "Abrir ubicación do ficheiro",
   "DE.Views.ApplicationView.txtFullScreen": "Pantalla completa",
   "DE.Views.ApplicationView.txtPrint": "Imprimir",

apps/documenteditor/forms/locale/ja.json

@@ -1,34 +1,159 @@
 {
+  "Common.UI.Calendar.textApril": "4月",
+  "Common.UI.Calendar.textAugust": "8月",
+  "Common.UI.Calendar.textDecember": "12月",
+  "Common.UI.Calendar.textFebruary": "2月",
+  "Common.UI.Calendar.textJanuary": "1月",
+  "Common.UI.Calendar.textJuly": "7月",
+  "Common.UI.Calendar.textJune": "6月",
+  "Common.UI.Calendar.textMarch": "3月",
+  "Common.UI.Calendar.textMay": "5月",
+  "Common.UI.Calendar.textMonths": "月",
+  "Common.UI.Calendar.textNovember": "11月",
+  "Common.UI.Calendar.textOctober": "10月",
+  "Common.UI.Calendar.textSeptember": "9月",
+  "Common.UI.Calendar.textShortApril": "4月",
+  "Common.UI.Calendar.textShortAugust": "8月",
+  "Common.UI.Calendar.textShortDecember": "12月",
+  "Common.UI.Calendar.textShortFebruary": "2月",
+  "Common.UI.Calendar.textShortFriday": "金",
+  "Common.UI.Calendar.textShortJanuary": "1月",
+  "Common.UI.Calendar.textShortJuly": "7月",
+  "Common.UI.Calendar.textShortJune": "6月",
+  "Common.UI.Calendar.textShortMarch": "3月",
+  "Common.UI.Calendar.textShortMay": "5月",
+  "Common.UI.Calendar.textShortMonday": "月",
+  "Common.UI.Calendar.textShortNovember": "11月",
+  "Common.UI.Calendar.textShortOctober": "10月",
+  "Common.UI.Calendar.textShortSaturday": "土",
+  "Common.UI.Calendar.textShortSeptember": "9月",
+  "Common.UI.Calendar.textShortSunday": "日",
+  "Common.UI.Calendar.textShortThursday": "木",
+  "Common.UI.Calendar.textShortTuesday": "火",
+  "Common.UI.Calendar.textShortWednesday": "水",
+  "Common.UI.Calendar.textYears": "年",
+  "Common.UI.Themes.txtThemeClassicLight": "ライト(クラシック)",
+  "Common.UI.Themes.txtThemeDark": "ダーク",
+  "Common.UI.Themes.txtThemeLight": "ライト",
+  "Common.UI.Window.cancelButtonText": "キャンセル",
+  "Common.UI.Window.closeButtonText": "閉じる",
+  "Common.UI.Window.noButtonText": "いいえ",
+  "Common.UI.Window.okButtonText": "OK",
+  "Common.UI.Window.textConfirmation": "確認",
+  "Common.UI.Window.textDontShow": "今後このメッセージを表示しない",
+  "Common.UI.Window.textError": "エラー",
+  "Common.UI.Window.textInformation": "情報",
+  "Common.UI.Window.textWarning": "警告",
+  "Common.UI.Window.yesButtonText": "はい",
+  "Common.Views.CopyWarningDialog.textDontShow": "今後このメッセージを表示しない",
+  "Common.Views.CopyWarningDialog.textMsg": "コンテキストメニューを使用したコピー、切り取り、貼り付け操作は、このエディタタブ内でのみ実行されます。<br> <br>エディタタブ外のアプリケーションとの間でコピーまたは貼り付けするには、次のキーボードの組み合わせを使用します。",
+  "Common.Views.CopyWarningDialog.textTitle": "コピー,切り取り,貼り付け",
+  "Common.Views.CopyWarningDialog.textToCopy": "コピー",
+  "Common.Views.CopyWarningDialog.textToCut": "切り取り",
+  "Common.Views.CopyWarningDialog.textToPaste": "貼り付",
+  "Common.Views.EmbedDialog.textHeight": "高さ",
+  "Common.Views.EmbedDialog.textTitle": "埋め込み",
+  "Common.Views.EmbedDialog.textWidth": "幅",
+  "Common.Views.EmbedDialog.txtCopy": "クリップボードにコピー",
+  "Common.Views.EmbedDialog.warnCopy": "ブラウザエラー。キーボードショートカットの[Ctrl]＋[C]を使用してください。",
+  "Common.Views.ImageFromUrlDialog.textUrl": "画像のURLの貼り付け",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "このフィールドは必須項目です",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "このフィールドは「http://www.example.com」の形式のURLである必要があります。",
+  "Common.Views.OpenDialog.closeButtonText": "ファイルを閉じる",
+  "Common.Views.OpenDialog.txtEncoding": "エンコーディング",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "パスワードが正しくありません。",
+  "Common.Views.OpenDialog.txtOpenFile": "ファイルを開くためにパスワードを入力してください",
+  "Common.Views.OpenDialog.txtPassword": "パスワード",
+  "Common.Views.OpenDialog.txtPreview": "プレビュー",
+  "Common.Views.OpenDialog.txtProtected": "パスワードを入力してファイルを開くと、既存のパスワードがリセットされます。",
+  "Common.Views.OpenDialog.txtTitle": "%1オプションの選択",
+  "Common.Views.OpenDialog.txtTitleProtected": "保護されたファイル",
+  "Common.Views.SaveAsDlg.textLoading": "読み込み中",
+  "Common.Views.SaveAsDlg.textTitle": "保存先のフォルダ",
+  "Common.Views.SelectFileDlg.textLoading": "読み込み中",
+  "Common.Views.SelectFileDlg.textTitle": "データソースを選択する",
+  "Common.Views.ShareDialog.textTitle": "共有リンク",
+  "Common.Views.ShareDialog.txtCopy": "クリップボードにコピー",
+  "Common.Views.ShareDialog.warnCopy": "ブラウザエラー。キーボードショートカットの[Ctrl]＋[C]を使用してください。",
   "DE.Controllers.ApplicationController.convertationErrorText": "変換に失敗しました",
   "DE.Controllers.ApplicationController.convertationTimeoutText": "変換のタイムアウトを超過しました。",
   "DE.Controllers.ApplicationController.criticalErrorTitle": "エラー",
   "DE.Controllers.ApplicationController.downloadErrorText": "ダウンロードに失敗しました",
   "DE.Controllers.ApplicationController.downloadTextText": "ドキュメントのダウンロード中...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "利用権限がない操作をしようとしました。<br>Documentサーバー管理者に連絡してください。",
+  "DE.Controllers.ApplicationController.errorBadImageUrl": "画像のURLが正しくありません。",
+  "DE.Controllers.ApplicationController.errorConnectToServer": "ドキュメントを保存できませんでした。接続設定を確認するか、管理者にお問い合わせください。<br>OKボタンをクリックするとドキュメントをダウンロードするように求められます。<br><br>ドキュメントサーバーの接続の詳細情報は:<a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">こちら</a>",
+  "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>Documentサーバー管理者に詳細をお問い合わせください。",
   "DE.Controllers.ApplicationController.errorForceSave": "文書の保存中にエラーが発生しました。コンピューターにファイルを保存するために、「...としてダウンロード」を使用し、または後で再お試しください。",
   "DE.Controllers.ApplicationController.errorLoadingFont": "フォントがダウンロードされませんでした。文書サーバのアドミニストレータを連絡してください。",
+  "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": "ウェブサイトを訪問する",
+  "DE.Controllers.ApplicationController.textCloseTip": "クリックするとヒントを閉じることができます。",
+  "DE.Controllers.ApplicationController.textContactUs": "営業部に連絡する",
   "DE.Controllers.ApplicationController.textGotIt": "OK",
   "DE.Controllers.ApplicationController.textGuest": "ゲスト",
   "DE.Controllers.ApplicationController.textLoadingDocument": "ドキュメントを読み込んでいます",
+  "DE.Controllers.ApplicationController.textNoLicenseTitle": "ライセンス制限に達しました。",
   "DE.Controllers.ApplicationController.textOf": "から",
   "DE.Controllers.ApplicationController.textRequired": "必須事項をすべて入力し、送信してください。",
+  "DE.Controllers.ApplicationController.textSaveAs": "PDFとして保存",
+  "DE.Controllers.ApplicationController.textSaveAsDesktop": "名前を付けて保存",
   "DE.Controllers.ApplicationController.textSubmited": "<b>フォームが正常に送信されました。</b><br>クリックしてヒントを閉じます。",
+  "DE.Controllers.ApplicationController.titleServerVersion": "編集者が更新されました",
+  "DE.Controllers.ApplicationController.titleUpdateVersion": "バージョンが変更されました",
+  "DE.Controllers.ApplicationController.txtArt": "ここにテキストを入力",
+  "DE.Controllers.ApplicationController.txtChoose": "アイテムを選択してください",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "クリックして写真を読み込む",
   "DE.Controllers.ApplicationController.txtClose": "閉じる",
   "DE.Controllers.ApplicationController.txtEmpty": "(空)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "日付を入力します",
   "DE.Controllers.ApplicationController.txtPressLink": "リンクをクリックしてCTRLを押してください",
+  "DE.Controllers.ApplicationController.txtUntitled": "無題",
   "DE.Controllers.ApplicationController.unknownErrorText": "不明なエラー",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "お使いのブラウザはサポートされていません。",
+  "DE.Controllers.ApplicationController.uploadImageExtMessage": "不明なイメージ形式です",
+  "DE.Controllers.ApplicationController.uploadImageSizeMessage": "画像サイズの上限を超えました。サイズの上限は２５MBです。",
   "DE.Controllers.ApplicationController.waitText": "少々お待ちください...",
+  "DE.Controllers.ApplicationController.warnLicenseExceeded": "％1エディターへの同時接続の制限に達しました。 このドキュメントは表示専用で開かれます。<br>詳細については、管理者にお問い合わせください。",
+  "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "ライセンスの有効期限が切れています。<br>ドキュメント編集機能にアクセスできません。<br>管理者にご連絡ください。",
+  "DE.Controllers.ApplicationController.warnLicenseLimitedRenewed": "ライセンスを更新する必要があります。<br>ドキュメント編集機能へのアクセスが制限されています。<br>フルアクセスを取得するには、管理者にご連絡ください",
+  "DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "％1エディターのユーザー制限に達しました。 詳細については、管理者にお問い合わせください。",
+  "DE.Controllers.ApplicationController.warnNoLicense": "％1エディターへの同時接続の制限に達しました。 このドキュメントは閲覧のみを目的として開かれます。<br>個人的なアップグレード条件については、％1セールスチームにお問い合わせください。",
+  "DE.Controllers.ApplicationController.warnNoLicenseUsers": "％1エディターのユーザー数制限に達しました。 アップグレード条件については、％1営業チームにお問い合わせください。",
+  "DE.Views.ApplicationView.textClear": "すべてのフィールドを削除する",
+  "DE.Views.ApplicationView.textCopy": "コピー",
+  "DE.Views.ApplicationView.textCut": "切り取り",
+  "DE.Views.ApplicationView.textNext": "次のフィールド",
+  "DE.Views.ApplicationView.textPaste": "貼り付け",
+  "DE.Views.ApplicationView.textPrintSel": "選択範囲の印刷",
+  "DE.Views.ApplicationView.textRedo": "やり直す",
+  "DE.Views.ApplicationView.textSubmit": "送信",
+  "DE.Views.ApplicationView.textUndo": "元に戻す",
+  "DE.Views.ApplicationView.txtDarkMode": "ダークモード",
   "DE.Views.ApplicationView.txtDownload": "ダウンロード",
   "DE.Views.ApplicationView.txtDownloadDocx": "docxとして保存",
   "DE.Views.ApplicationView.txtDownloadPdf": "PDFとして保存",
@@ -36,5 +161,6 @@
   "DE.Views.ApplicationView.txtFileLocation": "ファイルを開く",
   "DE.Views.ApplicationView.txtFullScreen": "全画面表示",
   "DE.Views.ApplicationView.txtPrint": "印刷する",
-  "DE.Views.ApplicationView.txtShare": "シェア"
+  "DE.Views.ApplicationView.txtShare": "シェア",
+  "DE.Views.ApplicationView.txtTheme": "インターフェイスのテーマ"
 }

apps/documenteditor/forms/locale/ko.json

@@ -1,22 +1,114 @@
 {
+  "Common.UI.Calendar.textApril": "4월",
+  "Common.UI.Calendar.textAugust": "8월",
+  "Common.UI.Calendar.textDecember": "12월",
+  "Common.UI.Calendar.textFebruary": "2월",
+  "Common.UI.Calendar.textJanuary": "1월",
+  "Common.UI.Calendar.textJuly": "7월",
+  "Common.UI.Calendar.textJune": "6월",
+  "Common.UI.Calendar.textMarch": "3월",
+  "Common.UI.Calendar.textMay": "5",
+  "Common.UI.Calendar.textMonths": "월",
+  "Common.UI.Calendar.textNovember": "11월",
+  "Common.UI.Calendar.textOctober": "10월",
+  "Common.UI.Calendar.textSeptember": "9월",
+  "Common.UI.Calendar.textShortApril": "4.",
+  "Common.UI.Calendar.textShortAugust": "8.",
+  "Common.UI.Calendar.textShortDecember": "12.",
+  "Common.UI.Calendar.textShortFebruary": "2.",
+  "Common.UI.Calendar.textShortFriday": "Fr",
+  "Common.UI.Calendar.textShortJanuary": "1.",
+  "Common.UI.Calendar.textShortJuly": "7.",
+  "Common.UI.Calendar.textShortJune": "6.",
+  "Common.UI.Calendar.textShortMarch": "3.",
+  "Common.UI.Calendar.textShortMay": "5월",
+  "Common.UI.Calendar.textShortMonday": "월",
+  "Common.UI.Calendar.textShortNovember": "11.",
+  "Common.UI.Calendar.textShortOctober": "10.",
+  "Common.UI.Calendar.textShortSaturday": "토",
+  "Common.UI.Calendar.textShortSeptember": "9",
+  "Common.UI.Calendar.textShortSunday": "일",
+  "Common.UI.Calendar.textShortThursday": "목",
+  "Common.UI.Calendar.textShortTuesday": "화",
+  "Common.UI.Calendar.textShortWednesday": "수",
+  "Common.UI.Calendar.textYears": "년",
+  "Common.UI.Themes.txtThemeClassicLight": "전통적인 밝은 색상",
+  "Common.UI.Themes.txtThemeDark": "어두운",
+  "Common.UI.Themes.txtThemeLight": "밝은",
+  "Common.UI.Window.cancelButtonText": "취소",
+  "Common.UI.Window.closeButtonText": "닫기",
+  "Common.UI.Window.noButtonText": "아니오",
+  "Common.UI.Window.okButtonText": "확인",
+  "Common.UI.Window.textConfirmation": "확인",
+  "Common.UI.Window.textDontShow": "이 메시지를 다시 표시하지 않음",
+  "Common.UI.Window.textError": "오류",
+  "Common.UI.Window.textInformation": "정보",
+  "Common.UI.Window.textWarning": "경고",
+  "Common.UI.Window.yesButtonText": "확인",
+  "Common.Views.CopyWarningDialog.textDontShow": "이 메시지를 다시 표시하지 않음",
+  "Common.Views.CopyWarningDialog.textMsg": "컨텍스트 메뉴를 사용한 복사, 잘라내기 및 붙여넣기 작업은 이 편집기 탭에서만 수행됩니다. <br><br>편집기 탭 외부의 응용 프로그램과 복사하거나 붙여넣으려면 다음 키보드 조합을 사용합니다.",
+  "Common.Views.CopyWarningDialog.textTitle": "복사, 잘라내기 및 붙여 넣기",
+  "Common.Views.CopyWarningDialog.textToCopy": "복사",
+  "Common.Views.CopyWarningDialog.textToCut": "잘라 내기",
+  "Common.Views.CopyWarningDialog.textToPaste": "붙여 넣기",
+  "Common.Views.EmbedDialog.textHeight": "높이",
+  "Common.Views.EmbedDialog.textTitle": "개체 삽입",
+  "Common.Views.EmbedDialog.textWidth": "너비",
+  "Common.Views.EmbedDialog.txtCopy": "클립보드로 복사",
+  "Common.Views.EmbedDialog.warnCopy": "브라우저 오류. 키보드 단축키의 [Ctrl]+[C]를 사용합니다.",
+  "Common.Views.ImageFromUrlDialog.textUrl": "이미지 URL 붙여 넣기 :",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "이 입력란은 필수 항목입니다.",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "이 필드는 \"http://www.example.com\"형식의 URL이어야합니다.",
+  "Common.Views.OpenDialog.closeButtonText": "파일 닫기",
+  "Common.Views.OpenDialog.txtEncoding": "인코딩",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "암호가 맞지 않음",
+  "Common.Views.OpenDialog.txtOpenFile": "파일을 열려면 암호를 입력하십시오.",
+  "Common.Views.OpenDialog.txtPassword": "암호",
+  "Common.Views.OpenDialog.txtPreview": "미리보기",
+  "Common.Views.OpenDialog.txtProtected": "암호를 입력하고 파일을 열면 파일의 현재 암호가 재설정됩니다.",
+  "Common.Views.OpenDialog.txtTitle": "% 1 옵션 선택",
+  "Common.Views.OpenDialog.txtTitleProtected": "보호 된 파일",
+  "Common.Views.SaveAsDlg.textLoading": "로드 중",
+  "Common.Views.SaveAsDlg.textTitle": "저장 폴더",
+  "Common.Views.SelectFileDlg.textLoading": "로드 중",
+  "Common.Views.SelectFileDlg.textTitle": "데이터 소스 선택",
+  "Common.Views.ShareDialog.textTitle": "링크 공유",
+  "Common.Views.ShareDialog.txtCopy": "클립보드로 복사",
+  "Common.Views.ShareDialog.warnCopy": "브라우저 오류. 키보드 단축키의 [Ctrl]+[C]를 사용합니다.",
   "DE.Controllers.ApplicationController.convertationErrorText": "변환 실패 ",
   "DE.Controllers.ApplicationController.convertationTimeoutText": "변환 시간을 초과했습니다.",
   "DE.Controllers.ApplicationController.criticalErrorTitle": "오류",
   "DE.Controllers.ApplicationController.downloadErrorText": "다운로드 실패",
   "DE.Controllers.ApplicationController.downloadTextText": "문서 다운로드 중...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "권한이없는 작업을 수행하려고합니다. <br> Document Server 관리자에게 문의하십시오.",
+  "DE.Controllers.ApplicationController.errorBadImageUrl": "이미지 URL이 잘못되었습니다.",
+  "DE.Controllers.ApplicationController.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하세요. <br>\"확인\" 버튼을 클릭하면 문서를 다운로드하라는 메시지가 표시됩니다.",
+  "DE.Controllers.ApplicationController.errorDataEncrypted": "암호화 변경 사항이 수신되었으며 해독할 수 없습니다.",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "오류 코드 : % 1",
   "DE.Controllers.ApplicationController.errorEditingDownloadas": "  문서 작업 중에 알수 없는 장애가 발생했습니다.<br>  \"다른 이름으로 다운로드...\"를 선택하여 파일을 현재 사용 중인 컴퓨터 하드 디스크에 저장하시기 바랍니다.",
+  "DE.Controllers.ApplicationController.errorEditingSaveas": "문서를 사용하는 동안 오류가 발생했습니다. <br>파일의 백업 사본을 컴퓨터의 하드 드라이브에 저장하려면 \"다른 이름으로 저장...\" 옵션을 사용하십시오.",
   "DE.Controllers.ApplicationController.errorFilePassProtect": "이 문서는 암호로 보호되어 있어 열 수 없습니다.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "파일의 크기가 서버에서 정해진 범위를 초과 했습니다. 문서 서버 관리자에게 해당 내용에 대한 자세한 안내를 받아 보시기 바랍니다.",
   "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> Document Server 관리자에게 문의하십시오.",
+  "DE.Controllers.ApplicationController.errorTokenExpire": "문서 보안 토큰이 만료되었습니다. <br> Document Server 관리자에게 문의하십시오.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "파일 버전이 변경되었습니다. 페이지가 다시로드됩니다.",
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "네트워크 연결이 복원되었으며 파일 버전이 변경되었습니다. <br>계속 작업하기 전에 데이터 손실을 방지하기 위해 파일을 다운로드하거나 내용을 복사한 다음 이 페이지를 새로 고쳐야 합니다.",
   "DE.Controllers.ApplicationController.errorUserDrop": "파일에 지금 액세스 할 수 없습니다.",
+  "DE.Controllers.ApplicationController.errorViewerDisconnect": "연결이 끊어졌습니다. 문서를 볼 수는 <br> <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": "웹 사이트 방문",
@@ -28,14 +120,23 @@
   "DE.Controllers.ApplicationController.textNoLicenseTitle": "ONLYOFFICE 연결 제한",
   "DE.Controllers.ApplicationController.textOf": "의",
   "DE.Controllers.ApplicationController.textRequired": "양식을 보내려면 모든 필수 필드를 채우십시오.",
+  "DE.Controllers.ApplicationController.textSaveAs": "PDF로 저장",
+  "DE.Controllers.ApplicationController.textSaveAsDesktop": "다른 이름으로 저장...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>양식이 성공적으로 전송되었습니다.</b><br>여기를 클릭하여 프롬프트를 닫으십시오",
   "DE.Controllers.ApplicationController.titleServerVersion": "편집기가 업데이트되었습니다.",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "버전이 변경되었습니다.",
+  "DE.Controllers.ApplicationController.txtArt": "여기에 텍스트를 입력하여 주십시오",
+  "DE.Controllers.ApplicationController.txtChoose": "아이템 선택",
+  "DE.Controllers.ApplicationController.txtClickToLoad": "이미지 표시하려면 여기를 클릭하세요",
   "DE.Controllers.ApplicationController.txtClose": "닫기",
   "DE.Controllers.ApplicationController.txtEmpty": "(없음)",
+  "DE.Controllers.ApplicationController.txtEnterDate": "날짜를 입력합니다.",
   "DE.Controllers.ApplicationController.txtPressLink": "CTRL 키를 누른 상태에서 링크 클릭",
+  "DE.Controllers.ApplicationController.txtUntitled": "이름없음",
   "DE.Controllers.ApplicationController.unknownErrorText": "알 수 없는 오류.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "사용중인 브라우저가 지원되지 않습니다.",
+  "DE.Controllers.ApplicationController.uploadImageExtMessage": "알 수없는 이미지 형식입니다.",
+  "DE.Controllers.ApplicationController.uploadImageSizeMessage": "이미지 크기 제한을 초과했습니다.",
   "DE.Controllers.ApplicationController.waitText": "잠시만 기다려주세요...",
   "DE.Controllers.ApplicationController.warnLicenseExceeded": "귀하의 시스템은 동시에 연결을 편집하는 %1명의 편집자에게 도달했습니다. 이 문서는 보기 모드에서만 열 수 있습니다. <br> 자세한 내용은 관리자에게 문의하십시오.",
   "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "라이센스가 만료되었습니다.<br>더 이상 파일을 수정할 수 있는 권한이 없습니다.<br> 관리자에게 문의하세요.",
@@ -44,8 +145,15 @@
   "DE.Controllers.ApplicationController.warnNoLicense": "이 버전의 %1 편집자는 문서 서버에 대한 동시 연결에 특정 제한 사항이 있습니다. <br> 더 많은 정보가 필요하면 현재 라이센스를 업그레이드하거나 상업용 라이센스를 구입하십시오.",
   "DE.Controllers.ApplicationController.warnNoLicenseUsers": "ONLYOFFICE 편집자의이 버전은 동시 사용자에게 일정한 제한이 있습니다. <br> 더 필요한 것이 있으면 현재 라이센스를 업그레이드하거나 상용 라이센스를 구입하십시오.",
   "DE.Views.ApplicationView.textClear": "모든 필드 지우기",
+  "DE.Views.ApplicationView.textCopy": "복사",
+  "DE.Views.ApplicationView.textCut": "잘라 내기",
   "DE.Views.ApplicationView.textNext": "다음 필드",
+  "DE.Views.ApplicationView.textPaste": "붙여 넣기",
+  "DE.Views.ApplicationView.textPrintSel": "선택 항목 인쇄",
+  "DE.Views.ApplicationView.textRedo": "다시 실행",
   "DE.Views.ApplicationView.textSubmit": "전송",
+  "DE.Views.ApplicationView.textUndo": "실행 취소",
+  "DE.Views.ApplicationView.txtDarkMode": "다크 모드",
   "DE.Views.ApplicationView.txtDownload": "다운로드 ",
   "DE.Views.ApplicationView.txtDownloadDocx": "docx 형식으로 다운로드",
   "DE.Views.ApplicationView.txtDownloadPdf": "PDF형식으로 다운로드",

apps/documenteditor/forms/locale/nl.json

@@ -68,6 +68,7 @@
   "DE.Controllers.ApplicationController.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.<br>Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "Foutcode: %1",
   "DE.Controllers.ApplicationController.errorEditingDownloadas": "Er is een fout ontstaan tijdens het werken met het document.<br>Gebruik de 'Opslaan als...' optie om het bestand als back-upkopie op te slaan op uw computer.",
+  "DE.Controllers.ApplicationController.errorEditingSaveas": "Er is een fout ontstaan tijdens het werken met het document.<br>Gebruik de 'Opslaan als...' optie om het bestand als backup op te slaan op uw computer.",
   "DE.Controllers.ApplicationController.errorFilePassProtect": "Het bestand is beschermd met een wachtwoord en kan niet worden geopend.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "De bestandsgrootte overschrijdt de limiet die is ingesteld voor uw server. <br>Neem contact op met uw Document Server-beheerder voor details.",
   "DE.Controllers.ApplicationController.errorForceSave": "Er is een fout opgetreden bij het opslaan van het bestand. Gebruik de 'Download als' knop om het bestand op te slaan op uw computer of probeer het later nog eens.",
@@ -80,6 +81,8 @@
   "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.saveErrorText": "Er is een fout opgetreden bij het opslaan 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 +97,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,10 +122,11 @@
   "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",
-  "DE.Views.ApplicationView.txtEmbed": "Invoegen",
+  "DE.Views.ApplicationView.txtEmbed": "Insluiten",
   "DE.Views.ApplicationView.txtFileLocation": "Open bestandslocatie",
   "DE.Views.ApplicationView.txtFullScreen": "Volledig scherm",
   "DE.Views.ApplicationView.txtPrint": "Afdrukken",

apps/documenteditor/forms/locale/pt.json

@@ -45,6 +45,12 @@
   "Common.UI.Window.textInformation": "Informações",
   "Common.UI.Window.textWarning": "Aviso",
   "Common.UI.Window.yesButtonText": "Sim",
+  "Common.Views.CopyWarningDialog.textDontShow": "Não exibir esta mensagem novamente",
+  "Common.Views.CopyWarningDialog.textMsg": "As ações de copiar, recortar e colar usando as ações do menu de contexto serão realizadas apenas nesta guia do editor. <br> <br> Para copiar ou colar de ou para aplicativos fora da guia do editor, use as seguintes combinações de teclado:",
+  "Common.Views.CopyWarningDialog.textTitle": "Ações copiar, cortar e colar",
+  "Common.Views.CopyWarningDialog.textToCopy": "para Copiar",
+  "Common.Views.CopyWarningDialog.textToCut": "para Cortar",
+  "Common.Views.CopyWarningDialog.textToPaste": "para Colar",
   "Common.Views.EmbedDialog.textHeight": "Altura",
   "Common.Views.EmbedDialog.textTitle": "Incorporar",
   "Common.Views.EmbedDialog.textWidth": "Largura",
@@ -59,6 +65,7 @@
   "DE.Controllers.ApplicationController.downloadErrorText": "Download falhou.",
   "DE.Controllers.ApplicationController.downloadTextText": "Baixando documento...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "Você está tentando executar uma ação que você não tem direitos. <br> Contate o administrador do Servidor de Documentos.",
+  "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.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "Código do erro: %1",
   "DE.Controllers.ApplicationController.errorEditingDownloadas": "Ocorreu um erro durante o trabalho com o documento. <br> Use a opção 'Baixar como ...' para salvar a cópia de backup do arquivo no disco rígido do seu computador.",
   "DE.Controllers.ApplicationController.errorFilePassProtect": "O documento é protegido por senha e não pode ser aberto.",
@@ -67,10 +74,13 @@
   "DE.Controllers.ApplicationController.errorLoadingFont": "As fontes não foram carregadas. <br> Entre em contato com o administrador do Document Server.",
   "DE.Controllers.ApplicationController.errorServerVersion": "A versão do editor foi atualizada. A página será recarregada para aplicar as alterações.",
   "DE.Controllers.ApplicationController.errorSubmit": "Falha no envio.",
+  "DE.Controllers.ApplicationController.errorTokenExpire": "O token de segurança do documento expirou. <br> Entre em contato com o administrador do Document Server.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "A versão do arquivo foi alterada. A página será recarregada.",
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "A conexão com a Internet foi restaurada e a versão do arquivo foi alterada. <br> Antes de continuar a trabalhar, você precisa fazer o download do arquivo ou copiar seu conteúdo para garantir que nada seja perdido e, em seguida, recarregar esta página.",
   "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",
@@ -85,11 +95,17 @@
   "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.",
+  "DE.Controllers.ApplicationController.uploadImageExtMessage": "Formato de imagem desconhecido.",
+  "DE.Controllers.ApplicationController.uploadImageSizeMessage": "Tamanho limite máximo da imagem excedido. O tamanho máximo é de 25 MB.",
   "DE.Controllers.ApplicationController.waitText": "Por favor, aguarde...",
   "DE.Controllers.ApplicationController.warnLicenseExceeded": "Você atingiu o limite de conexões simultâneas para editores %1. Este documento será aberto apenas para visualização.<br>Entre em contato com seu administrador para saber mais.",
   "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "A licença expirou.<br>Você não tem acesso à funcionalidade de edição de documentos.<br>Por favor, contate seu administrador.",
@@ -98,8 +114,13 @@
   "DE.Controllers.ApplicationController.warnNoLicense": "Você atingiu o limite de conexões simultâneas para editores %1. Este documento será aberto apenas para visualização.<br>Entre em contato com a equipe de vendas da %1 para obter os termos de atualização pessoais.",
   "DE.Controllers.ApplicationController.warnNoLicenseUsers": "Você atingiu o limite de usuários para editores %1.<br>Entre em contato com a equipe de vendas da %1 para obter os termos de atualização pessoais.",
   "DE.Views.ApplicationView.textClear": "Limpar todos os campos",
+  "DE.Views.ApplicationView.textCopy": "Copiar",
+  "DE.Views.ApplicationView.textCut": "Cortar",
   "DE.Views.ApplicationView.textNext": "Próximo campo",
+  "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

@@ -16,7 +16,7 @@
   "Common.UI.Calendar.textShortAugust": "Ağu",
   "Common.UI.Calendar.textShortDecember": "Ara",
   "Common.UI.Calendar.textShortFebruary": "Şubat",
-  "Common.UI.Calendar.textShortFriday": "Cuma",
+  "Common.UI.Calendar.textShortFriday": "Cum",
   "Common.UI.Calendar.textShortJanuary": "Oca",
   "Common.UI.Calendar.textShortJuly": "Temmuz",
   "Common.UI.Calendar.textShortJune": "Haziran",
@@ -32,7 +32,7 @@
   "Common.UI.Calendar.textShortTuesday": "Salı",
   "Common.UI.Calendar.textShortWednesday": "Çarşamba",
   "Common.UI.Calendar.textYears": "Yıl",
-  "Common.UI.Themes.txtThemeClassicLight": "Klasik Işık",
+  "Common.UI.Themes.txtThemeClassicLight": "Açık mod",
   "Common.UI.Themes.txtThemeDark": "Karanlık",
   "Common.UI.Themes.txtThemeLight": "Açık",
   "Common.UI.Window.cancelButtonText": "İptal",
@@ -56,6 +56,13 @@
   "Common.Views.EmbedDialog.textWidth": "Genişlik",
   "Common.Views.EmbedDialog.txtCopy": "Panoya kopyala",
   "Common.Views.EmbedDialog.warnCopy": "Tarayıcı hatası! [Ctrl] + [C] klavye kısayolunu kullanın",
+  "Common.Views.OpenDialog.closeButtonText": "Dosyayı Kapat",
+  "Common.Views.OpenDialog.txtOpenFile": "Dosyayı Açmak için Parola Girin",
+  "Common.Views.OpenDialog.txtPassword": "Şifre",
+  "Common.Views.OpenDialog.txtTitle": "%1 seçenekleri seçin",
+  "Common.Views.SaveAsDlg.textLoading": "Yükleniyor",
+  "Common.Views.SaveAsDlg.textTitle": "Kaydetmek için klasör",
+  "Common.Views.SelectFileDlg.textLoading": "Yükleniyor",
   "Common.Views.ShareDialog.textTitle": "Bağlantıyı Paylaş",
   "Common.Views.ShareDialog.txtCopy": "Panoya kopyala",
   "Common.Views.ShareDialog.warnCopy": "Tarayıcı hatası! [Ctrl] + [C] klavye kısayolunu kullanın",
@@ -66,20 +73,25 @@
   "DE.Controllers.ApplicationController.downloadTextText": "Döküman yükleniyor...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "Hakkınız olmayan bir eylem gerçekleştirmeye çalışıyorsunuz.<br>Lütfen Belge Sunucu yöneticinize başvurun.",
   "DE.Controllers.ApplicationController.errorConnectToServer": "Belge kaydedilemedi. Lütfen internet bağlantınızı kontrol edin veya yöneticiniz ile iletişime geçin. <br>'TAMAM' tuşuna tıkladığınızda belgeyi indirebileceksiniz.",
+  "DE.Controllers.ApplicationController.errorDataEncrypted": "Şifreli değişiklikler alındı, deşifre edilemezler.",
   "DE.Controllers.ApplicationController.errorDefaultMessage": "Hata kodu: %1",
   "DE.Controllers.ApplicationController.errorEditingDownloadas": "Dosyayla çalışırken hata meydana geldi. 'Farklı Kaydet...' seçeneğini kullanarak dosyayı bilgisayarınıza yedekleyin.",
+  "DE.Controllers.ApplicationController.errorEditingSaveas": "Belgeyle çalışma sırasında bir hata oluştu.<br>Dosya yedek kopyasını bilgisayarınızın sabit diskine kaydetmek için 'Farklı kaydet...' seçeneğini kullanın.",
   "DE.Controllers.ApplicationController.errorFilePassProtect": "Döküman şifre korumalı ve açılamadı",
-  "DE.Controllers.ApplicationController.errorFileSizeExceed": "Dosya boyutu, sunucunuz için belirlenen sınırlamayı aşıyor.<br>Ayrıntılar için lütfen Doküman Sunucusu yöneticinizle iletişime geçin.",
+  "DE.Controllers.ApplicationController.errorFileSizeExceed": "Dosya boyutu, sunucunuz için belirlenen limiti aşıyor.<br>Ayrıntılar için lütfen Doküman Sunucusu yöneticinizle iletişime geçin.",
   "DE.Controllers.ApplicationController.errorForceSave": "Dosya indirilirken bir hata oluştu. Dosyayı bilgisayarınıza kaydetmek için lütfen 'Farklı Kaydet' seçeneğini kullanın veya daha sonra tekrar deneyin.",
-  "DE.Controllers.ApplicationController.errorLoadingFont": "Fontlar yüklenmedi.<br>Lütfen Sistem Yöneticinizle iletişime geçin.",
+  "DE.Controllers.ApplicationController.errorLoadingFont": "Yazı tipleri yüklenmedi.<br>Lütfen Doküman Sunucusu yöneticinize başvurun.",
   "DE.Controllers.ApplicationController.errorServerVersion": "Editör versiyonu güncellendi. Değişikliklerin uygulanabilmesi için sayfa yenilenecek.",
   "DE.Controllers.ApplicationController.errorSubmit": "Kaydetme başarısız oldu.",
   "DE.Controllers.ApplicationController.errorTokenExpire": "Belge güvenlik belirteci süresi doldu. <br> Lütfen Belge Sunucusu yöneticinize başvurun.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "Dosya versiyonu değiştirildi. Sayfa yenilenecek.",
   "DE.Controllers.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.Controllers.ApplicationController.errorUserDrop": "Belgeye şu an erişilemiyor.",
-  "DE.Controllers.ApplicationController.errorViewerDisconnect": "Bağlantı kesildi. 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.errorViewerDisconnect": "Bağlantı kayboldu. Belgeyi yine de görüntüleyebilirsiniz,<br>ancak bağlantı yeniden kurulana ve sayfa yeniden yüklenene kadar indiremez veya yazdıramazsınız.",
+  "DE.Controllers.ApplicationController.mniImageFromFile": "Dosyadan resim",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Uyarı",
+  "DE.Controllers.ApplicationController.openErrorText": "Dosya açılırken bir hata oluştu.",
+  "DE.Controllers.ApplicationController.saveErrorText": "Dosya kaydedilirken 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,9 +106,14 @@
   "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.txtUntitled": "Başlıksız",
   "DE.Controllers.ApplicationController.unknownErrorText": "Bilinmeyen hata.",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "Tarayıcınız desteklenmiyor.",
   "DE.Controllers.ApplicationController.uploadImageExtMessage": "Bilinmeyen resim formatı.",
@@ -115,6 +132,8 @@
   "DE.Views.ApplicationView.textPaste": "Yapıştır",
   "DE.Views.ApplicationView.textPrintSel": "Seçimi Yazdır",
   "DE.Views.ApplicationView.textSubmit": "Kaydet",
+  "DE.Views.ApplicationView.textUndo": "Geri Al",
+  "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

@@ -402,8 +402,9 @@ define([
                 this.appOptions.canRequestMailMergeRecipients = this.editorConfig.canRequestMailMergeRecipients;
                 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.canFeatureComparison = true;
-                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();
                 }
@@ -371,8 +370,7 @@ define([
         },
 
         onThemeChanged: function (id) {
-            var document = DE.getController('Main').document;
+            if ( this.header.menuItemsDarkMode ) {
-            if ( !/^pdf|djvu|xps|oxps$/.test(document.fileType) ) {
                 var current_dark = Common.UI.Themes.isDarkTheme();
                 var menuItem = this.header.menuItemsDarkMode;
                 menuItem.setVisible(current_dark);
@@ -383,6 +381,7 @@ define([
         },
 
         onContentThemeChangedToDark: function (isdark) {
+            if ( this.header.menuItemsDarkMode )
                 this.header.menuItemsDarkMode.setChecked(isdark, true);
         },
 

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));
 
@@ -264,7 +278,9 @@ define([
                 /** coauthoring end **/
                 '<tr class="themes">',
                     '<td class="left"><label><%= scope.strTheme %></label></td>',
-                    '<td class="right"><span id="fms-cmb-theme"></span></td>',
+                    '<td class="right">',
+                        '<div><div id="fms-cmb-theme" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>',
+                        '<div id="fms-chb-dark-mode" style="display: inline-block; vertical-align: middle;margin-top: 2px;"></div></div></td>',
                 '</tr>','<tr class="divider"></tr>',
                 '<tr>',
                     '<td class="left"><label><%= scope.strZoom %></label></td>',
@@ -407,7 +423,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',
@@ -530,6 +549,16 @@ define([
                 dataHint: '2',
                 dataHintDirection: 'bottom',
                 dataHintOffset: 'big'
+            }).on('selected', function(combo, record) {
+                me.chDarkMode.setDisabled(record.themeType!=='dark');
+            });
+
+            this.chDarkMode = new Common.UI.CheckBox({
+                el: $markup.findById('#fms-chb-dark-mode'),
+                labelText: this.txtDarkMode,
+                dataHint: '2',
+                dataHintDirection: 'left',
+                dataHintOffset: 'small'
             });
 
             this.cmbReviewHover = new Common.UI.ComboBox({
@@ -685,7 +714,7 @@ define([
 
             var data = [];
             for (var t in Common.UI.Themes.map()) {
-                data.push({value: t, displayValue: Common.UI.Themes.get(t).text});
+                data.push({value: t, displayValue: Common.UI.Themes.get(t).text, themeType: Common.UI.Themes.get(t).type});
             }
 
             if ( data.length ) {
@@ -693,6 +722,8 @@ define([
                 item = this.cmbTheme.store.findWhere({value: Common.UI.Themes.currentThemeId()});
                 this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.defaultThemeId());
             }
+            this.chDarkMode.setValue(Common.UI.Themes.isContentThemeDark());
+            this.chDarkMode.setDisabled(!Common.UI.Themes.isDarkTheme());
 
             if (this.mode.canViewReview) {
                 value = Common.Utils.InternalSettings.get("de-settings-review-hover-mode");
@@ -703,6 +734,8 @@ define([
 
         applySettings: function() {
             Common.UI.Themes.setTheme(this.cmbTheme.getValue());
+            if (!this.chDarkMode.isDisabled() && (this.chDarkMode.isChecked() !== Common.UI.Themes.isContentThemeDark()))
+                Common.UI.Themes.toggleContentTheme();
             Common.localStorage.setItem("de-settings-inputmode", this.chInputMode.isChecked() ? 1 : 0);
             Common.localStorage.setItem("de-settings-zoom", this.cmbZoom.getValue());
             Common.Utils.InternalSettings.set("de-settings-zoom", Common.localStorage.getItem("de-settings-zoom"));
@@ -838,7 +871,8 @@ define([
         txtAutoCorrect: 'AutoCorrect options...',
         strReviewHover: 'Track Changes Display',
         txtChangesTip: 'Show by hover in tooltips',
-        txtChangesBalloons: 'Show by click in balloons'
+        txtChangesBalloons: 'Show by click in balloons',
+        txtDarkMode: 'Turn on document dark mode'
     }, DE.Views.FileMenuPanels.Settings || {}));
 
     DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
@@ -915,14 +949,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 +1203,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 +1882,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) {