Merge branch 'develop' into feature/optimization

apps/api/documents/api.js

@@ -23,9 +23,11 @@
                 key: 'key',
                 vkey: 'vkey',
                 info: {
-                    author: 'author name',
+                    author: 'author name', // must be deprecated, use owner instead
+                    owner: 'owner name',
                     folder: 'path to document',
-                    created: '<creation date>',
+                    created: '<creation date>', // must be deprecated, use uploaded instead
+                    uploaded: '<uploaded date>',
                     sharingSettings: [
                         {
                             user: 'user name',
@@ -63,6 +65,7 @@
                 saveAsUrl: 'folder for saving files'
                 licenseUrl: <url for license>,
                 customerId: <customer id>,
+                region: <regional settings> // can be 'en-us' or lang code
 
                 user: {
                     id: 'user id',
@@ -129,7 +132,6 @@
                 },
                 plugins: {
                     autostart: ['asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}'],
-                    url: '../../../../sdkjs-plugins/',
                     pluginsData: [
                         "helloworld/config.json",
                         "chess/config.json",
@@ -139,7 +141,6 @@
                 }
             },
             events: {
-                'onReady': <application ready callback>, // deprecated
                 'onAppReady': <application ready callback>,
                 'onBack': <back to folder callback>,
                 'onDocumentStateChange': <document state changed callback>
@@ -174,7 +175,6 @@
                 }
             },
             events: {
-                'onReady': <application ready callback>, // deprecated
                 'onAppReady': <application ready callback>,
                 'onBack': <back to folder callback>,
                 'onError': <error callback>,
@@ -202,11 +202,11 @@
         _config.editorConfig.canRequestUsers = _config.events && !!_config.events.onRequestUsers;
         _config.editorConfig.canRequestSendNotify = _config.events && !!_config.events.onRequestSendNotify;
         _config.editorConfig.mergeFolderUrl = _config.editorConfig.mergeFolderUrl || _config.editorConfig.saveAsUrl;
+        _config.editorConfig.canRequestSaveAs = _config.events && !!_config.events.onRequestSaveAs;
+        _config.editorConfig.canRequestInsertImage = _config.events && !!_config.events.onRequestInsertImage;
+        _config.editorConfig.canRequestMailMergeRecipients = _config.events && !!_config.events.onRequestMailMergeRecipients;
         _config.frameEditorId = placeholderId;
 
-        _config.events && !!_config.events.onReady && console.log("Obsolete: The onReady event is deprecated. Please use onAppReady instead.");
-        _config.events && (_config.events.onAppReady = _config.events.onAppReady || _config.events.onReady);
-
         var onMouseUp = function (evt) {
             _processMouse(evt);
         };
@@ -560,6 +560,20 @@
             });
         };
 
+        var _insertImage = function(data) {
+            _sendCommand({
+                command: 'insertImage',
+                data: data
+            });
+        };
+
+        var _setMailMergeRecipients = function(data) {
+            _sendCommand({
+                command: 'setMailMergeRecipients',
+                data: data
+            });
+        };
+
         var _processMouse = function(evt) {
             var r = iframe.getBoundingClientRect();
             var data = {
@@ -602,7 +616,9 @@
             destroyEditor       : _destroyEditor,
             setUsers            : _setUsers,
             showSharingSettings : _showSharingSettings,
-            setSharingSettings  : _setSharingSettings
+            setSharingSettings  : _setSharingSettings,
+            insertImage         : _insertImage,
+            setMailMergeRecipients: _setMailMergeRecipients
         }
     };
 

apps/common/Gateway.js

@@ -110,6 +110,14 @@ if (Common === undefined) {
 
             'setSharingSettings': function(data) {
                 $me.trigger('setsharingsettings', data);
+            },
+
+            'insertImage': function(data) {
+                $me.trigger('insertimage', data);
+            },
+
+            'setMailMergeRecipients': function(data) {
+                $me.trigger('setmailmergerecipients', data);
             }
         };
 
@@ -250,6 +258,16 @@ if (Common === undefined) {
                 });
             },
 
+            requestSaveAs: function(url, title) {
+                _postMessage({
+                    event: 'onRequestSaveAs',
+                    data: {
+                        url: url,
+                        title: title
+                    }
+                });
+            },
+
             collaborativeChanges: function() {
                 _postMessage({event: 'onCollaborativeChanges'});
             },
@@ -282,6 +300,14 @@ if (Common === undefined) {
                 _postMessage({event:'onRequestSendNotify', data: emails})
             },
 
+            requestInsertImage:  function () {
+                _postMessage({event:'onRequestInsertImage'})
+            },
+
+            requestMailMergeRecipients:  function () {
+                _postMessage({event:'onRequestMailMergeRecipients'})
+            },
+
             on: function(event, handler){
                 var localHandler = function(event, data){
                     handler.call(me, data)

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

@@ -44,7 +44,7 @@
                         newDocumentPage.focus();
                 }
             }
-            , dialogPrint: function(url) {
+            , dialogPrint: function(url, api) {
                 $('#id-print-frame').remove();
 
                 if ( !!url ) {
@@ -59,10 +59,14 @@
                     document.body.appendChild(iframePrint);
 
                     iframePrint.onload = function () {
-                        iframePrint.contentWindow.focus();
+                        try {
-                        iframePrint.contentWindow.print();
+                            iframePrint.contentWindow.focus();
-                        iframePrint.contentWindow.blur();
+                            iframePrint.contentWindow.print();
-                        window.focus();
+                            iframePrint.contentWindow.blur();
+                            window.focus();
+                        } catch (e) {
+                            api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF));
+                        }
                     };
 
                     iframePrint.src = url;

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

@@ -409,6 +409,10 @@ define([
             },
 
             onAfterKeydownMenu: function(e) {
+                this.trigger('keydown:before', this, e);
+                if (e.isDefaultPrevented())
+                    return;
+
                 if (e.keyCode == Common.UI.Keys.RETURN) {
                     var li = $(e.target).closest('li');
                     if (li.length<=0) li = $(e.target).parent().find('li .dataview');

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

@@ -286,6 +286,7 @@ define([
                     if ( $tp.length ) {
                         $tp.addClass('active');
                     }
+                    this.fireEvent('tab:active', [tab]);
                 }
             },
 

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

@@ -164,7 +164,7 @@ define([
                                     '<% if (closable!==false) %>' +
                                         '<div class="tool close img-commonctrl"></div>' +
                                     '<% %>' +
-                                    '<span class="title"><%= title %></span> ' +
+                                    '<div class="title"><%= title %></div> ' +
                                 '</div>' +
                             '<% } %>' +
                             '<div class="body"><%= tpl %></div>' +

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

@@ -130,7 +130,6 @@ define([
             });
 
             Common.NotificationCenter.on('comments:updatefilter',   _.bind(this.onUpdateFilter, this));
-            Common.NotificationCenter.on('comments:showaction',     _.bind(this.onShowAction, this));
             Common.NotificationCenter.on('app:comment:add',         _.bind(this.onAppAddComment, this));
             Common.NotificationCenter.on('layout:changed', function(area){
                 Common.Utils.asyncCall(function(e) {
@@ -253,6 +252,7 @@ define([
                 ascComment.asc_putUserId(comment.get('userid'));
                 ascComment.asc_putUserName(comment.get('username'));
                 ascComment.asc_putSolved(!comment.get('resolved'));
+                ascComment.asc_putGuid(comment.get('guid'));
 
                 if (!_.isUndefined(ascComment.asc_putDocumentFlag)) {
                     ascComment.asc_putDocumentFlag(comment.get('unattached'));
@@ -282,12 +282,7 @@ define([
             return false;
         },
         onShowComment: function (id, selected) {
-            var comment;
+            var comment = this.findComment(id);
-            if (typeof id == 'object') {
-                comment = id;
-                id = comment.get('uid');
-            } else
-                comment = this.findComment(id);
             if (comment) {
                 if (null !== comment.get('quote')) {
                     if (this.api) {
@@ -350,6 +345,7 @@ define([
                     ascComment.asc_putUserId(t.currentUserId);
                     ascComment.asc_putUserName(t.currentUserName);
                     ascComment.asc_putSolved(comment.get('resolved'));
+                    ascComment.asc_putGuid(comment.get('guid'));
 
                     if (!_.isUndefined(ascComment.asc_putDocumentFlag)) {
                         ascComment.asc_putDocumentFlag(comment.get('unattached'));
@@ -406,6 +402,7 @@ define([
                     ascComment.asc_putUserId(comment.get('userid'));
                     ascComment.asc_putUserName(comment.get('username'));
                     ascComment.asc_putSolved(comment.get('resolved'));
+                    ascComment.asc_putGuid(comment.get('guid'));
 
                     if (!_.isUndefined(ascComment.asc_putDocumentFlag)) {
                         ascComment.asc_putDocumentFlag(comment.get('unattached'));
@@ -468,6 +465,7 @@ define([
                     ascComment.asc_putUserId(comment.get('userid'));
                     ascComment.asc_putUserName(comment.get('username'));
                     ascComment.asc_putSolved(comment.get('resolved'));
+                    ascComment.asc_putGuid(comment.get('guid'));
 
                     if (!_.isUndefined(ascComment.asc_putDocumentFlag)) {
                         ascComment.asc_putDocumentFlag(comment.get('unattached'));
@@ -526,6 +524,7 @@ define([
                     ascComment.asc_putUserId(comment.get('userid'));
                     ascComment.asc_putUserName(comment.get('username'));
                     ascComment.asc_putSolved(comment.get('resolved'));
+                    ascComment.asc_putGuid(comment.get('guid'));
 
                     if (!_.isUndefined(ascComment.asc_putDocumentFlag)) {
                         ascComment.asc_putDocumentFlag(comment.get('unattached'));
@@ -1528,11 +1527,6 @@ define([
         clearCollections: function() {
             this.collection.reset();
             this.groupCollection = [];
-        },
-
-        onShowAction: function(id, selected) {
-            var comment = this.collection.findWhere({guid: id});
-            comment && this.onShowComment(comment, selected);
         }
 
     }, Common.Controllers.Comments || {}));

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

@@ -113,7 +113,7 @@ define([
                         Common.Gateway.requestRestore(record.get('revision'));
                     else {
                         this.isFromSelectRevision = record.get('revision');
-                        this.api.asc_DownloadAs(Asc.c_oAscFileType.DOCX, true);
+                        this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX, true));
                     }
                     return;
                 }

apps/common/main/lib/extend/Bootstrap.js

@@ -41,8 +41,8 @@
 function onDropDownKeyDown(e) {
     var $this       = $(this),
         $parent     = $this.parent(),
-        beforeEvent = jQuery.Event('keydown.before.bs.dropdown'),
+        beforeEvent = jQuery.Event('keydown.before.bs.dropdown', {keyCode: e.keyCode}),
-        afterEvent  = jQuery.Event('keydown.after.bs.dropdown');
+        afterEvent  = jQuery.Event('keydown.after.bs.dropdown', {keyCode: e.keyCode});
 
     $parent.trigger(beforeEvent);
 
@@ -110,8 +110,9 @@ function patchDropDownKeyDown(e) {
              _.delay(function() {
                  var mnu = $('> [role=menu]', li),
                     $subitems = mnu.find('> li:not(.divider):not(.disabled):visible > a'),
-                    $dataviews = mnu.find('> li:not(.divider):not(.disabled):visible .dataview');
+                    $dataviews = mnu.find('> li:not(.divider):not(.disabled):visible .dataview'),
-                if ($subitems.length>0 && $dataviews.length<1)
+                    $internal_menu = mnu.find('> li:not(.divider):not(.disabled):visible ul.internal-menu');
+                if ($subitems.length>0 && $dataviews.length<1 && $internal_menu.length<1)
                     ($subitems.index($subitems.filter(':focus'))<0) && $subitems.eq(0).focus();
             }, 250);
         }

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

@@ -446,9 +446,11 @@ Common.util.LanguageInfo = new(function() {
         },
 
         getLocalLanguageCode: function(name) {
-            for (var code in localLanguageName) {
+            if (name) {
-                if (localLanguageName[code][0].toLowerCase()===name.toLowerCase())
+                for (var code in localLanguageName) {
-                    return code;
+                    if (localLanguageName[code][0].toLowerCase()===name.toLowerCase())
+                        return code;
+                }
             }
             return null;
         },

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

@@ -688,16 +688,7 @@ Common.Utils.applyCustomizationPlugins = function(plugins) {
 Common.Utils.fillUserInfo = function(info, lang, defname) {
     var _user = info || {};
     !_user.id && (_user.id = ('uid-' + Date.now()));
-    if (_.isEmpty(_user.name)) {
+    _user.fullname = _.isEmpty(_user.name) ? defname : _user.name;
-        _.isEmpty(_user.firstname) && _.isEmpty(_user.lastname) && (_user.firstname = defname);
-        if (_.isEmpty(_user.firstname))
-            _user.fullname = _user.lastname;
-        else if (_.isEmpty(_user.lastname))
-            _user.fullname = _user.firstname;
-        else
-            _user.fullname = /^ru/.test(lang) ? _user.lastname + ' ' + _user.firstname :  _user.firstname + ' ' + _user.lastname;
-    } else
-        _user.fullname = _user.name;
     return _user;
 };
 

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

@@ -85,7 +85,7 @@ define([
         this.cmbLanguage = new Common.UI.ComboBox({
             el: $window.find('#id-document-language'),
             cls: 'input-group-nr',
-            menuStyle: 'min-width: 318px; max-height: 300px;',
+            menuStyle: 'min-width: 318px; max-height: 285px;',
             editable: false,
             template: _.template([
                 '<span class="input-group combobox <%= cls %> combo-langs" id="<%= id %>" style="<%= style %>">',

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

@@ -339,14 +339,14 @@ define([
 
             switch (this.type) {
                 case Common.Utils.importTextType.CSV:
-                    this.api.asc_decodeBuffer(this.preview, new Asc.asc_CCSVAdvancedOptions(encoding, delimiter, delimiterChar), _.bind(this.previewCallback, this));
+                    this.api.asc_decodeBuffer(this.preview, new Asc.asc_CTextOptions(encoding, delimiter, delimiterChar), _.bind(this.previewCallback, this));
                     break;
                 case Common.Utils.importTextType.TXT:
-                    this.api.asc_decodeBuffer(this.preview, new Asc.asc_CTXTAdvancedOptions(encoding), _.bind(this.previewCallback, this));
+                    this.api.asc_decodeBuffer(this.preview, new Asc.asc_CTextOptions(encoding), _.bind(this.previewCallback, this));
                     break;
                 case Common.Utils.importTextType.Paste:
                 case Common.Utils.importTextType.Columns:
-                    this.api.asc_TextImport(new Asc.asc_CCSVAdvancedOptions(encoding, delimiter, delimiterChar), _.bind(this.previewCallback, this), this.type == Common.Utils.importTextType.Paste);
+                    this.api.asc_TextImport(new Asc.asc_CTextOptions(encoding, delimiter, delimiterChar), _.bind(this.previewCallback, this), this.type == Common.Utils.importTextType.Paste);
                     break;
             }
         },

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

@@ -198,6 +198,10 @@
 
     .btn.small;
 
+    &.bg-white {
+        background-color: #fff;
+    }
+
     &:before,
     &:after {
         content: "";

apps/common/main/resources/less/dropdown-menu.less

@@ -16,6 +16,15 @@
         }
     }
 
+    &.internal-menu {
+        border: none;
+        border-radius: 0;
+        .box-shadow(none);
+        margin: 0;
+        padding: 0;
+        overflow: hidden;
+    }
+
     li {
         & > a {
             padding: 5px 20px;

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

@@ -542,6 +542,10 @@
         }
     }
 
+    .img-toolbarmenu.btn-ic-docspell {
+        .background-ximage('@{common-image-path}/controls/toolbar-menu-ru.png', '@{common-image-path}/controls/toolbar-menu-ru@2x.png', 60px);
+    }
+
     .button-normal-icon(btn-notes,            77, @toolbar-big-icon-size);
     .button-normal-icon(btn-controls,         78, @toolbar-big-icon-size);
 

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

@@ -85,6 +85,12 @@
         &.resizing {
             cursor: inherit !important;
         }
+
+        .title {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
     }
 
     > .body {

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

@@ -33,64 +33,78 @@
 
 /**
  *  Collaboration.js
- *  Document Editor
  *
- *  Created by Julia Svinareva on 14/5/19
+ *  Created by Julia Svinareva on 12/7/19
  *  Copyright (c) 2019 Ascensio System SIA. All rights reserved.
  *
  */
+
+if (Common === undefined)
+    var Common = {};
+
+Common.Controllers = Common.Controllers || {};
+
 define([
     'core',
     'jquery',
     'underscore',
     'backbone',
-    'documenteditor/mobile/app/view/Collaboration'
+    'common/mobile/lib/view/Collaboration'
 ], function (core, $, _, Backbone) {
     'use strict';
 
-    DE.Controllers.Collaboration = Backbone.Controller.extend(_.extend((function() {
+    Common.Controllers.Collaboration = Backbone.Controller.extend(_.extend((function() {
         // Private
-        var _settings = [],
+        var rootView,
-            _headerType = 1,
+            _userId,
-             rootView,
+            editUsers = [],
+            editor = !!window.DE ? 'DE' : !!window.PE ? 'PE' : 'SSE',
             displayMode = "Markup",
             arrChangeReview = [],
             dateChange = [],
-            _fileKey,
+            _fileKey;
-            _userId,
+
-            editUsers = [];
 
         return {
             models: [],
             collections: [],
             views: [
-                'Collaboration'
+                'Common.Views.Collaboration'
             ],
 
             initialize: function() {
                 var me = this;
                 me.addListeners({
-                    'Collaboration': {
+                    'Common.Views.Collaboration': {
                         'page:show' : me.onPageShow
                     }
                 });
+                Common.NotificationCenter.on('comments:filterchange',   _.bind(this.onFilterChange, this));
             },
 
             setApi: function(api) {
                 this.api = api;
-                this.api.asc_registerCallback('asc_onShowRevisionsChange', _.bind(this.changeReview, this));
                 this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onChangeEditUsers, this));
                 this.api.asc_registerCallback('asc_onParticipantsChanged',     _.bind(this.onChangeEditUsers, this));
+                this.api.asc_registerCallback('asc_onAddComment', _.bind(this.onApiAddComment, this));
+                this.api.asc_registerCallback('asc_onAddComments', _.bind(this.onApiAddComments, this));
+                this.api.asc_registerCallback('asc_onChangeCommentData', _.bind(this.onApiChangeCommentData, this));
+                this.api.asc_registerCallback('asc_onRemoveComment', _.bind(this.onApiRemoveComment, this));
+                if (editor === 'DE') {
+                    this.api.asc_registerCallback('asc_onShowRevisionsChange', _.bind(this.changeReview, this));
+                }
             },
 
             onLaunch: function () {
-                this.createView('Collaboration').render();
+                this.createView('Common.Views.Collaboration').render();
             },
 
             setMode: function(mode) {
                 this.appConfig = mode;
-                _fileKey = mode.fileKey;
                 _userId = mode.user.id;
+                if (editor === 'DE') {
+                    _fileKey = mode.fileKey;
+                }
                 return this;
             },
 
@@ -99,7 +113,8 @@ define([
                 var me = this,
                     isAndroid = Framework7.prototype.device.android === true,
                     modalView,
-                    mainView = DE.getController('Editor').getView('Editor').f7View;
+                    appPrefix = !!window.DE ? DE : !!window.PE ? PE : SSE,
+                    mainView = appPrefix.getController('Editor').getView('Editor').f7View;
 
                 uiApp.closeModal();
 
@@ -107,7 +122,7 @@ define([
                     modalView = $$(uiApp.pickerModal(
                         '<div class="picker-modal settings container-collaboration">' +
                         '<div class="view collaboration-root-view navbar-through">' +
-                        this.getView('Collaboration').rootLayout() +
+                        this.getView('Common.Views.Collaboration').rootLayout() +
                         '</div>' +
                         '</div>'
                     )).on('opened', function () {
@@ -129,7 +144,7 @@ define([
                         '<div class="popover-inner">' +
                         '<div class="content-block">' +
                         '<div class="view popover-view collaboration-root-view navbar-through">' +
-                        this.getView('Collaboration').rootLayout() +
+                        this.getView('Common.Views.Collaboration').rootLayout() +
                         '</div>' +
                         '</div>' +
                         '</div>' +
@@ -148,10 +163,26 @@ define([
                     domCache: true
                 });
 
-                Common.NotificationCenter.trigger('collaborationcontainer:show');
+                if (!Common.SharedSettings.get('phone')) {
-                this.onPageShow(this.getView('Collaboration'));
+                    this.picker = $$(modalView);
+                    var $overlay = $('.modal-overlay');
 
-                DE.getController('Toolbar').getView('Toolbar').hideSearch();
+                    $$(this.picker).on('opened', function () {
+                        $overlay.on('removeClass', function () {
+                            if (!$overlay.hasClass('modal-overlay-visible')) {
+                                $overlay.addClass('modal-overlay-visible')
+                            }
+                        });
+                    }).on('close', function () {
+                        $overlay.off('removeClass');
+                        $overlay.removeClass('modal-overlay-visible')
+                    });
+                }
+
+                Common.NotificationCenter.trigger('collaborationcontainer:show');
+                this.onPageShow(this.getView('Common.Views.Collaboration'));
+
+                appPrefix.getController('Toolbar').getView('Toolbar').hideSearch();
             },
 
             rootView : function() {
@@ -173,13 +204,69 @@ define([
                 } else if('#edit-users-view' == pageId) {
                     me.initEditUsers();
                     Common.Utils.addScrollIfNeed('.page[data-page=edit-users-view]', '.page[data-page=edit-users-view] .page-content');
+                } else if ('#comments-view' == pageId) {
+                    me.initComments();
+                    Common.Utils.addScrollIfNeed('.page[data-page=comments-view]', '.page[data-page=comments-view] .page-content');
                 } else {
-                    if(!this.appConfig.canReview) {
+                    if(editor === 'DE' && !this.appConfig.canReview) {
                         $('#reviewing-settings').hide();
                     }
                 }
             },
 
+            //Edit users
+
+            onChangeEditUsers: function(users) {
+                editUsers = users;
+            },
+
+            initEditUsers: function() {
+                var usersArray = [];
+                _.each(editUsers, function(item){
+                    var fio = item.asc_getUserName().split(' ');
+                    var initials = fio[0].substring(0, 1).toUpperCase();
+                    if (fio.length > 1) {
+                        initials += fio[fio.length - 1].substring(0, 1).toUpperCase();
+                    }
+                    if(!item.asc_getView()) {
+                        var userAttr = {
+                            color: item.asc_getColor(),
+                            id: item.asc_getId(),
+                            idOriginal: item.asc_getIdOriginal(),
+                            name: item.asc_getUserName(),
+                            view: item.asc_getView(),
+                            initial: initials
+                        };
+                        if(item.asc_getIdOriginal() == _userId) {
+                            usersArray.unshift(userAttr);
+                        } else {
+                            usersArray.push(userAttr);
+                        }
+                    }
+                });
+                var userSort = _.chain(usersArray).groupBy('idOriginal').value();
+                var templateUserItem = _.template([
+                    '<%  _.each(users, function (user) { %>',
+                    '<li id="<%= user[0].id %>" class="<% if (user[0].view) {%> viewmode <% } %> item-content">' +
+                    '<div class="user-name item-inner">' +
+                    '<div class="color" style="background-color: <%= user[0].color %>;"><%= user[0].initial %></div>'+
+                    '<label><%= user[0].name %></label>' +
+                    '<% if (user.length>1) { %><label class="length"> (<%= user.length %>)</label><% } %>' +
+                    '</div>'+
+                    '</li>',
+                    '<% }); %>'].join(''));
+                var templateUserList = _.template(
+                    '<div class="item-content"><div class="item-inner">' +
+                    this.textEditUser +
+                    '</div></div>' +
+                    '<ul>' +
+                    templateUserItem({users: userSort}) +
+                    '</ul>');
+                $('#user-list').html(templateUserList());
+            },
+
+            //Review
+
             initReviewingSettingsView: function () {
                 var me = this;
                 $('#settings-review input:checkbox').attr('checked', this.appConfig.isReviewOnly || Common.localStorage.getBool("de-mobile-track-changes-" + (_fileKey || '')));
@@ -204,13 +291,14 @@ define([
                     $checkbox.attr('checked', true);
                 } else {
                     this.api.asc_SetTrackRevisions(state);
-                    Common.localStorage.setItem("de-mobile-track-changes-" + (_fileKey || ''), state ? 1 : 0);
+                    var prefix = !!window.DE ? 'de' : !!window.PE ? 'pe' : 'sse';
+                    Common.localStorage.setItem(prefix + "-mobile-track-changes-" + (_fileKey || ''), state ? 1 : 0);
                 }
             },
 
             onAcceptAllClick: function() {
                 if (this.api) {
-                   this.api.asc_AcceptAllChanges();
+                    this.api.asc_AcceptAllChanges();
                 }
             },
 
@@ -517,15 +605,15 @@ define([
                                 changetext += '</b>';
                                 changetext += proptext;
                                 break;
-                                case Asc.c_oAscRevisionsChangeType.TablePr:
+                            case Asc.c_oAscRevisionsChangeType.TablePr:
-                                    changetext = me.textTableChanged;
+                                changetext = me.textTableChanged;
-                                    break;
+                                break;
-                                case Asc.c_oAscRevisionsChangeType.RowsAdd:
+                            case Asc.c_oAscRevisionsChangeType.RowsAdd:
-                                    changetext = me.textTableRowsAdd;
+                                changetext = me.textTableRowsAdd;
-                                    break;
+                                break;
-                                case Asc.c_oAscRevisionsChangeType.RowsRem:
+                            case Asc.c_oAscRevisionsChangeType.RowsRem:
-                                    changetext = me.textTableRowsDel;
+                                changetext = me.textTableRowsDel;
-                                    break;
+                                break;
 
                         }
                         var date = (item.get_DateTime() == '') ? new Date() : new Date(item.get_DateTime()),
@@ -577,56 +665,215 @@ define([
                 }
             },
 
-            onChangeEditUsers: function(users) {
+            //Comments
-                editUsers = users;
+
+            groupCollectionComments: [],
+            collectionComments: [],
+            groupCollectionFilter: [],
+            filter: [],
+
+            initComments: function() {
+                this.getView('Common.Views.Collaboration').renderComments((this.groupCollectionFilter.length !== 0) ? this.groupCollectionFilter : (this.collectionComments.length !== 0) ? this.collectionComments : false);
+                $('.comment-quote').single('click', _.bind(this.onSelectComment, this));
             },
 
-            initEditUsers: function() {
+            readSDKReplies: function (data) {
-                var usersArray = [];
+                var i = 0,
-                _.each(editUsers, function(item){
+                    replies = [],
-                    var fio = item.asc_getUserName().split(' ');
+                    date = null;
-                    var initials = fio[0].substring(0, 1).toUpperCase();
+                var repliesCount = data.asc_getRepliesCount();
-                    if (fio.length > 1) {
+                if (repliesCount) {
-                        initials += fio[fio.length - 1].substring(0, 1).toUpperCase();
+                    for (i = 0; i < repliesCount; ++i) {
+                        date = (data.asc_getReply(i).asc_getOnlyOfficeTime()) ? new Date(this.stringOOToLocalDate(data.asc_getReply(i).asc_getOnlyOfficeTime())) :
+                            ((data.asc_getReply(i).asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getReply(i).asc_getTime())));
+
+                        var user = _.findWhere(editUsers, {idOriginal: data.asc_getReply(i).asc_getUserId()});
+                        replies.push({
+                            userid              : data.asc_getReply(i).asc_getUserId(),
+                            username            : data.asc_getReply(i).asc_getUserName(),
+                            usercolor           : (user) ? user.asc_getColor() : null,
+                            date                : this.dateToLocaleTimeString(date),
+                            reply               : data.asc_getReply(i).asc_getText(),
+                            time                : date.getTime()
+                        });
                     }
-                    if(!item.asc_getView()) {
+                }
-                        var userAttr = {
+                return replies;
-                            color: item.asc_getColor(),
+            },
-                            id: item.asc_getId(),
+
-                            idOriginal: item.asc_getIdOriginal(),
+            readSDKComment: function(id, data) {
-                            name: item.asc_getUserName(),
+                var date = (data.asc_getOnlyOfficeTime()) ? new Date(this.stringOOToLocalDate(data.asc_getOnlyOfficeTime())) :
-                            view: item.asc_getView(),
+                    ((data.asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getTime())));
-                            initial: initials
+                var user = _.findWhere(editUsers, {idOriginal: data.asc_getUserId()}),
-                        };
+                    groupname = id.substr(0, id.lastIndexOf('_')+1).match(/^(doc|sheet[0-9_]+)_/);
-                        if(item.asc_getIdOriginal() == _userId) {
+                var comment = {
-                            usersArray.unshift(userAttr);
+                    uid                 : id,
-                        } else {
+                    userid              : data.asc_getUserId(),
-                            usersArray.push(userAttr);
+                    username            : data.asc_getUserName(),
+                    usercolor           : (user) ? user.asc_getColor() : null,
+                    date                : this.dateToLocaleTimeString(date),
+                    quote               : data.asc_getQuoteText(),
+                    comment             : data.asc_getText(),
+                    resolved            : data.asc_getSolved(),
+                    unattached          : !_.isUndefined(data.asc_getDocumentFlag) ? data.asc_getDocumentFlag() : false,
+                    time                : date.getTime(),
+                    replys              : [],
+                    groupName           : (groupname && groupname.length>1) ? groupname[1] : null
+                }
+                if (comment) {
+                    var replies = this.readSDKReplies(data);
+                    if (replies.length) {
+                        comment.replys = replies;
+                    }
+                }
+                return comment;
+            },
+
+            onApiChangeCommentData: function(id, data) {
+                var me = this,
+                    i = 0,
+                    date = null,
+                    replies = null,
+                    repliesCount = 0,
+                    dateReply = null,
+                    comment = _.findWhere(me.collectionComments, {uid: id}) || this.findCommentInGroup(id);
+
+                if (comment) {
+
+                    date = (data.asc_getOnlyOfficeTime()) ? new Date(this.stringOOToLocalDate(data.asc_getOnlyOfficeTime())) :
+                        ((data.asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getTime())));
+
+                    var user = _.findWhere(editUsers, {idOriginal: data.asc_getUserId()});
+                    comment.comment = data.asc_getText();
+                    comment.userid = data.asc_getUserId();
+                    comment.username = data.asc_getUserName();
+                    comment.usercolor = (user) ? user.asc_getColor() : null;
+                    comment.resolved = data.asc_getSolved();
+                    comment.quote = data.asc_getQuoteText();
+                    comment.time = date.getTime();
+                    comment.date = me.dateToLocaleTimeString(date);
+
+                    replies = _.clone(comment.replys);
+
+                    replies.length = 0;
+
+                    repliesCount = data.asc_getRepliesCount();
+                    for (i = 0; i < repliesCount; ++i) {
+
+                        dateReply = (data.asc_getReply(i).asc_getOnlyOfficeTime()) ? new Date(this.stringOOToLocalDate(data.asc_getReply(i).asc_getOnlyOfficeTime())) :
+                            ((data.asc_getReply(i).asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getReply(i).asc_getTime())));
+
+                        user = _.findWhere(editUsers, {idOriginal: data.asc_getReply(i).asc_getUserId()});
+                        replies.push({
+                            userid              : data.asc_getReply(i).asc_getUserId(),
+                            username            : data.asc_getReply(i).asc_getUserName(),
+                            usercolor           : (user) ? user.asc_getColor() : null,
+                            date                : me.dateToLocaleTimeString(dateReply),
+                            reply               : data.asc_getReply(i).asc_getText(),
+                            time                : dateReply.getTime()
+                        });
+                    }
+                    comment.replys = replies;
+                    if($('.page-comments').length > 0) {
+                        this.initComments();
+                    }
+                }
+            },
+
+            onApiAddComment: function (id, data) {
+                var comment = this.readSDKComment(id, data);
+                if (comment) {
+                    comment.groupName ? this.addCommentToGroupCollection(comment) : this.collectionComments.push(comment);
+                }
+                if($('.page-comments').length > 0) {
+                    this.initComments();
+                }
+            },
+
+            onApiAddComments: function (data) {
+                for (var i = 0; i < data.length; ++i) {
+                    var comment = this.readSDKComment(data[i].asc_getId(), data[i]);
+                    comment.groupName ? this.addCommentToGroupCollection(comment) : this.collectionComments.push(comment);
+                }
+                if($('.page-comments').length > 0) {
+                    this.initComments();
+                }
+            },
+
+            stringOOToLocalDate: function (date) {
+                if (typeof date === 'string')
+                    return parseInt(date);
+                return 0;
+            },
+
+            addCommentToGroupCollection: function (comment) {
+                var groupname = comment.groupName;
+                if (!this.groupCollectionComments[groupname])
+                    this.groupCollectionComments[groupname] = [];
+                this.groupCollectionComments[groupname].push(comment);
+                if (this.filter.indexOf(groupname) != -1) {
+                    this.groupCollectionFilter.push(comment);
+                }
+            },
+
+            findCommentInGroup: function (id) {
+                for (var name in this.groupCollectionComments) {
+                    var store = this.groupCollectionComments[name],
+                        model = _.findWhere(store, {uid: id});
+                    if (model) return model;
+                }
+            },
+
+            onApiRemoveComment: function (id) {
+                function remove (collection, key) {
+                    if(collection instanceof Array) {
+                        var index = collection.indexOf(key);
+                        if(index != -1) {
+                            collection.splice(index, 1);
                         }
                     }
-                });
+                }
-                var userSort = _.chain(usersArray).groupBy('idOriginal').value();
+                if (this.groupCollectionComments) {
-                var templateUserItem = _.template([
+                    for (var name in this.groupCollectionComments) {
-                    '<%  _.each(users, function (user) { %>',
+                        var store = this.groupCollectionComments[name],
-                    '<li id="<%= user[0].id %>" class="<% if (user[0].view) {%> viewmode <% } %> item-content">' +
+                            comment = _.findWhere(store, {uid: id});
-                    '<div class="user-name item-inner">' +
+                        if (comment) {
-                    '<div class="color" style="background-color: <%= user[0].color %>;"><%= user[0].initial %></div>'+
+                            remove(this.groupCollectionComments[name], comment);
-                    '<label><%= user[0].name %></label>' +
+                            if (this.filter.indexOf(name) != -1) {
-                    '<% if (user.length>1) { %><label class="length"> (<%= user.length %>)</label><% } %>' +
+                                remove(this.groupCollectionFilter, comment);
-                    '</div>'+
+                            }
-                    '</li>',
+                        }
-                    '<% }); %>'].join(''));
+                    }
-                var templateUserList = _.template(
+                }
-                    '<div class="item-content"><div class="item-inner">' +
+                if (this.collectionComments.length > 0) {
-                    this.textEditUser +
+                    var comment = _.findWhere(this.collectionComments, {uid: id});
-                    '</div></div>' +
+                    if (comment) {
-                    '<ul>' +
+                        remove(this.collectionComments, comment);
-                    templateUserItem({users: userSort}) +
+                    }
-                    '</ul>');
+                }
-                $('#user-list').html(templateUserList());
+                if($('.page-comments').length > 0) {
+                    this.initComments();
+                }
             },
 
+            onFilterChange: function (filter) {
+                if (filter) {
+                    var me = this,
+                        comments = [];
+                    this.filter = filter;
+                    filter.forEach(function(item){
+                        if (!me.groupCollectionComments[item])
+                            me.groupCollectionComments[item] = [];
+                        comments = comments.concat(me.groupCollectionComments[item]);
+                    });
+                    this.groupCollectionFilter = comments;
+                }
+            },
 
+            onSelectComment: function (e) {
+                var id = $(e.currentTarget).data('id');
+                this.api.asc_selectComment(id);
+            },
 
 
             textInserted: '<b>Inserted:</b>',
@@ -690,5 +937,5 @@ define([
             textEditUser: 'Document is currently being edited by several users.'
 
         }
-    })(), DE.Controllers.Collaboration || {}))
+    })(), Common.Controllers.Collaboration || {}))
 });

apps/common/mobile/lib/template/Collaboration.template

@@ -20,6 +20,16 @@
                                 </div>
                             </a>
                         </li>
+                        <li>
+                            <a id="comments-settings" class="item-link" data-page="#comments-view">
+                                <div class="item-content">
+                                    <div class="item-inner">
+                                        <div class="item-title"><%= scope.textСomments %></div>
+                                    </div>
+                                </div>
+                            </a>
+                        </li>
+                        <% if (editor === 'DE') { %>
                         <li>
                             <a id="reviewing-settings" class="item-link" data-page="#reviewing-settings-view">
                                 <div class="item-content">
@@ -29,6 +39,7 @@
                                 </div>
                             </a>
                         </li>
+                        <% } %>
                     </ul>
                 </div>
             </div>
@@ -36,6 +47,25 @@
     </div>
 </div>
 
+<!-- Editable Users view -->
+<div id="edit-users-view">
+    <div class="navbar">
+        <div class="navbar-inner">
+            <div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
+            <div class="center sliding"><%= scope.textEditUsers %></div>
+            <div class="right sliding"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
+        </div>
+    </div>
+    <div class="pages">
+        <div class="page page-change" data-page="edit-users-view">
+            <div class="page-content">
+                <div id="user-list" class="list-block">
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
 <!-- Reviewing Settings view -->
 <div id="reviewing-settings-view">
     <div class="navbar">
@@ -137,14 +167,14 @@
                             </label>
                         </li>
                         <li>
-                             <label class="label-radio item-content">
+                            <label class="label-radio item-content">
-                                 <input type="radio" name="doc-orientation" value="Original">
+                                <input type="radio" name="doc-orientation" value="Original">
-                                 <% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
+                                <% if (android) { %><div class="item-media"><i class="icon icon-form-radio"></i></div><% } %>
-                                 <div class="item-inner">
+                                <div class="item-inner">
-                                     <div class="item-title"><%= scope.textOriginal %></div>
+                                    <div class="item-title"><%= scope.textOriginal %></div>
-                                 </div>
+                                </div>
-                             </label>
+                            </label>
-                         </li>
+                        </li>
                     </ul>
                 </div>
 
@@ -170,7 +200,7 @@
                 <a href="#" id="btn-prev-change" class="link icon-only"><i class="icon icon-prev-change"></i></a>
                 <a href="#" id="btn-next-change" class="link icon-only"><i class="icon icon-next-change"></i></a>
                 </span>
-                <span class="right-buttons">
+                    <span class="right-buttons">
                 <a href="#" id="btn-goto-change" class="link icon-only" style="display: none;"><i class="icon icon-goto"></i></a>
                 <span class="accept-reject">
                 <a href="#" id="btn-accept-change" class="link icon-only"><i class="icon icon-accept"></i></a>
@@ -188,19 +218,20 @@
     </div>
 </div>
 
-<!-- Editable Users view -->
+<!-- Comments view -->
-<div id="edit-users-view">
+<div id="comments-view">
     <div class="navbar">
         <div class="navbar-inner">
             <div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
-            <div class="center sliding"><%= scope.textEditUsers %></div>
+            <div class="center sliding"><%= scope.textСomments %></div>
             <div class="right sliding"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
         </div>
     </div>
     <div class="pages">
-        <div class="page page-change" data-page="edit-users-view">
+        <div class="page page-comments" data-page="comments-view">
             <div class="page-content">
-                <div id="user-list" class="list-block">
+                <div class="list-block">
+                    <ul id="comments-list"></ul>
                 </div>
             </div>
         </div>

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

@@ -33,22 +33,26 @@
 
 /**
  *  Collaboration.js
- *  Document Editor
  *
- *  Created by Julia Svinareva on 14/5/19
+ *  Created by Julia Svinareva on 12/7/19
  *  Copyright (c) 2019 Ascensio System SIA. All rights reserved.
  *
  */
 
+if (Common === undefined)
+    var Common = {};
+
+Common.Views = Common.Views || {};
+
 define([
-    'text!documenteditor/mobile/app/template/Collaboration.template',
+    'text!common/mobile/lib/template/Collaboration.template',
     'jquery',
     'underscore',
     'backbone'
 ], function (settingsTemplate, $, _, Backbone) {
     'use strict';
 
-    DE.Views.Collaboration = Backbone.View.extend(_.extend((function() {
+    Common.Views.Collaboration = Backbone.View.extend(_.extend((function() {
         // private
 
         return {
@@ -81,7 +85,8 @@ define([
                     android : Common.SharedSettings.get('android'),
                     phone   : Common.SharedSettings.get('phone'),
                     orthography: Common.SharedSettings.get('sailfish'),
-                    scope   : this
+                    scope   : this,
+                    editor  : !!window.DE ? 'DE' : !!window.PE ? 'PE' : 'SSE'
                 }));
 
                 return this;
@@ -119,7 +124,10 @@ define([
             },
 
             showPage: function(templateId, animate) {
-                var rootView = DE.getController('Collaboration').rootView();
+                var me = this;
+                var prefix = !!window.DE ? DE : !!window.PE ? PE : SSE;
+                var rootView = prefix.getController('Common.Controllers.Collaboration').rootView();
+
 
                 if (rootView && this.layout) {
                     var $content = this.layout.find(templateId);
@@ -138,6 +146,54 @@ define([
                 }
             },
 
+            renderComments: function (comments) {
+                var $pageComments = $('.page-comments .page-content');
+                if (!comments) {
+                    if ($('.comment').length > 0) {
+                        $('.comment').remove();
+                    }
+                    var template = '<div id="no-comments" style="text-align: center; margin-top: 35px;">' + this.textNoComments + '</div>';
+                    $pageComments.append(_.template(template));
+                } else {
+                    if ($('#no-comments').length > 0) {
+                        $('#no-comments').remove();
+                    }
+                    var $listComments = $('#comments-list'),
+                        items = [];
+                    _.each(comments, function (comment) {
+                        var itemTemplate = [
+                            '<li class="comment item-content">',
+                            '<div class="item-inner">',
+                            '<p class="user-name"><%= item.username %></p>',
+                            '<p class="comment-date"><%= item.date %></p>',
+                            '<% if(item.quote) {%>',
+                            '<p class="comment-quote" data-id="<%= item.uid %>"><%= item.quote %></p>',
+                            '<% } %>',
+                            '<p class="comment-text"><%= item.comment %></p>',
+                            '<% if(replys > 0) {%>',
+                            '<ul class="list-reply">',
+                            '<% _.each(item.replys, function (reply) { %>',
+                            '<li class="reply-item">',
+                            '<p class="user-name"><%= reply.username %></p>',
+                            '<p class="reply-date"><%= reply.date %></p>',
+                            '<p class="reply-text"><%= reply.reply %></p>',
+                            '</li>',
+                            '<% }); %>',
+                            '</ul>',
+                            '<% } %>',
+                            '</div>',
+                            '</li>'
+                        ].join('');
+                        items.push(_.template(itemTemplate)({
+                            android: Framework7.prototype.device.android,
+                            item: comment,
+                            replys: comment.replys.length,
+                        }));
+                    });
+                    $listComments.html(items);
+                }
+            },
+
 
 
             textCollaboration: 'Collaboration',
@@ -152,8 +208,8 @@ define([
             textFinal: 'Final',
             textOriginal: 'Original',
             textChange: 'Review Change',
-            textEditUsers: 'Users'
+            textEditUsers: 'Users',
-
+            textNoComments: "This document doesn\'t contain comments"
         }
-    })(), DE.Views.Collaboration || {}))
+    })(), Common.Views.Collaboration || {}))
 });

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

@@ -59,4 +59,99 @@
   .page-content .list-block:first-child {
     margin-top: -1px;
   }
+}
+
+//Edit users
+@initialEditUser: #373737;
+
+#user-list {
+  .item-content {
+    padding-left: 0;
+  }
+  .item-inner {
+    justify-content: flex-start;
+    padding-left: 15px;
+  }
+  .length {
+    margin-left: 4px;
+  }
+  .color {
+    min-width: 40px;
+    min-height: 40px;
+    margin-right: 20px;
+    text-align: center;
+    border-radius: 50px;
+    line-height: 40px;
+    color: @initialEditUser;
+    font-weight: 500;
+
+  }
+  ul:before {
+    content: none;
+  }
+}
+
+//Comments
+.page-comments {
+  .list-block .item-inner {
+    display: block;
+    padding: 16px 0;
+    word-wrap: break-word;
+  }
+  p {
+    margin: 0;
+  }
+  .user-name {
+    font-size: 17px;
+    line-height: 22px;
+    color: #000000;
+    margin: 0;
+    font-weight: bold;
+  }
+  .comment-date, .reply-date {
+    font-size: 12px;
+    line-height: 18px;
+    color: #6d6d72;
+    margin: 0;
+    margin-top: 0px;
+  }
+  .comment-text, .reply-text {
+    color: #000000;
+    font-size: 15px;
+    line-height: 25px;
+    margin: 0;
+    max-width: 100%;
+    padding-right: 15px;
+  }
+  .reply-item {
+    margin-top: 15px;
+    .user-name {
+      padding-top: 16px;
+    }
+    &:before {
+      content: '';
+      position: absolute;
+      left: auto;
+      bottom: 0;
+      right: auto;
+      top: 0;
+      height: 1px;
+      width: 100%;
+      background-color: @listBlockBorderColor;
+      display: block;
+      z-index: 15;
+      -webkit-transform-origin: 50% 100%;
+      transform-origin: 50% 100%;
+    }
+  }
+  .comment-quote {
+    color: @themeColor;
+    border-left: 1px solid @themeColor;
+    padding-left: 10px;
+    margin: 5px 0;
+    font-size: 15px;
+  }
+}
+.settings.popup .list-block ul.list-reply:last-child:after, .settings.popover .list-block ul.list-reply:last-child:after {
+  display: none;
 }

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

@@ -57,4 +57,100 @@
   .page-content .list-block:first-child {
     margin-top: -1px;
   }
+}
+
+
+//Edit users
+@initialEditUser: #373737;
+
+#user-list {
+  .item-content {
+    padding-left: 0;
+  }
+  .item-inner {
+    justify-content: flex-start;
+    padding-left: 15px;
+  }
+  .length {
+    margin-left: 4px;
+  }
+  .color {
+    min-width: 40px;
+    min-height: 40px;
+    margin-right: 20px;
+    text-align: center;
+    border-radius: 50px;
+    line-height: 40px;
+    color: @initialEditUser;
+    font-weight: 400;
+  }
+  ul:before {
+    content: none;
+  }
+}
+
+
+//Comments
+.page-comments {
+  .list-block .item-inner {
+    display: block;
+    padding: 16px 0;
+    word-wrap: break-word;
+  }
+  p {
+    margin: 0;
+  }
+  .user-name {
+    font-size: 17px;
+    line-height: 22px;
+    color: #000000;
+    margin: 0;
+    font-weight: bold;
+  }
+  .comment-date, .reply-date {
+    font-size: 12px;
+    line-height: 18px;
+    color: #6d6d72;
+    margin: 0;
+    margin-top: 0px;
+  }
+  .comment-text, .reply-text {
+    color: #000000;
+    font-size: 15px;
+    line-height: 25px;
+    margin: 0;
+    max-width: 100%;
+    padding-right: 15px;
+  }
+  .reply-item {
+    margin-top: 15px;
+    .user-name {
+      padding-top: 16px;
+    }
+    &:before {
+      content: '';
+      position: absolute;
+      left: auto;
+      bottom: 0;
+      right: auto;
+      top: 0;
+      height: 1px;
+      width: 100%;
+      background-color: @listBlockBorderColor;
+      display: block;
+      z-index: 15;
+      -webkit-transform-origin: 50% 100%;
+      transform-origin: 50% 100%;
+    }
+  }
+  .comment-quote {
+    color: @themeColor;
+    border-left: 1px solid @themeColor;
+    padding-left: 10px;
+    margin: 5px 0;
+    font-size: 15px;
+  }
+}
+.settings.popup .list-block ul.list-reply:last-child:after, .settings.popover .list-block ul.list-reply:last-child:after {
+  display: none;
 }

apps/documenteditor/embed/js/ApplicationController.js

@@ -204,11 +204,11 @@ DE.ApplicationController = new(function(){
 
     function onPrint() {
         if ( permissions.print!==false )
-            api.asc_Print($.browser.chrome || $.browser.safari || $.browser.opera);
+            api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera));
     }
 
     function onPrintUrl(url) {
-        common.utils.dialogPrint(url);
+        common.utils.dialogPrint(url, api);
     }
 
     function hidePreloader() {
@@ -259,7 +259,7 @@ DE.ApplicationController = new(function(){
                         common.utils.openLink(embedConfig.saveUrl);
                     } else
                     if (api && permissions.print!==false){
-                        api.asc_Print($.browser.chrome || $.browser.safari || $.browser.opera);
+                        api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera));
                     }
 
                     Common.Analytics.trackEvent('Save');
@@ -458,7 +458,7 @@ DE.ApplicationController = new(function(){
             Common.Gateway.reportError(Asc.c_oAscError.ID.AccessDeny, me.errorAccessDeny);
             return;
         }
-        if (api) api.asc_DownloadAs(Asc.c_oAscFileType.DOCX, true);
+        if (api) api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX, true));
     }
 
     // Helpers

apps/documenteditor/embed/locale/hu.json

@@ -1,6 +1,10 @@
 {
+  "common.view.modals.txtCopy": "Másolás a vágólapra",
+  "common.view.modals.txtEmbed": "Beágyaz",
   "common.view.modals.txtHeight": "Magasság",
+  "common.view.modals.txtShare": "Hivatkozás megosztása",
   "common.view.modals.txtWidth": "Szélesség",
+  "DE.ApplicationController.convertationErrorText": "Az átalakítás nem sikerült.",
   "DE.ApplicationController.convertationTimeoutText": "Időtúllépés az átalakítás során.",
   "DE.ApplicationController.criticalErrorTitle": "Hiba",
   "DE.ApplicationController.downloadErrorText": "Sikertelen letöltés.",
@@ -12,10 +16,13 @@
   "DE.ApplicationController.notcriticalErrorTitle": "Figyelmeztetés",
   "DE.ApplicationController.scriptLoadError": "A kapcsolat túl lassú, néhány komponens nem töltődött be. Frissítse az oldalt.",
   "DE.ApplicationController.textLoadingDocument": "Dokumentum betöltése",
+  "DE.ApplicationController.textOf": "of",
   "DE.ApplicationController.txtClose": "Bezár",
   "DE.ApplicationController.unknownErrorText": "Ismeretlen hiba.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "A böngészője nem támogatott.",
+  "DE.ApplicationController.waitText": "Kérjük várjon...",
   "DE.ApplicationView.txtDownload": "Letöltés",
+  "DE.ApplicationView.txtEmbed": "Beágyaz",
   "DE.ApplicationView.txtFullScreen": "Teljes képernyő",
   "DE.ApplicationView.txtShare": "Megosztás"
 }

apps/documenteditor/embed/locale/tr.json

@@ -1,6 +1,8 @@
 {
   "common.view.modals.txtCopy": "Panoya kopyala",
+  "common.view.modals.txtEmbed": "Gömülü",
   "common.view.modals.txtHeight": "Yükseklik",
+  "common.view.modals.txtShare": "Bağlantıyı Paylaş",
   "common.view.modals.txtWidth": "Genişlik",
   "DE.ApplicationController.convertationErrorText": "Değişim başarısız oldu.",
   "DE.ApplicationController.convertationTimeoutText": "Değişim süresi aşıldı.",
@@ -12,11 +14,15 @@
   "DE.ApplicationController.errorFilePassProtect": "Döküman şifre korumalı ve açılamadı",
   "DE.ApplicationController.errorUserDrop": "Belgeye şu an erişilemiyor.",
   "DE.ApplicationController.notcriticalErrorTitle": "Uyarı",
+  "DE.ApplicationController.scriptLoadError": "Bağlantı çok yavaş, bileşenlerin bazıları yüklenemedi. Lütfen sayfayı yenileyin.",
   "DE.ApplicationController.textLoadingDocument": "Döküman yükleniyor",
   "DE.ApplicationController.textOf": "'in",
   "DE.ApplicationController.txtClose": "Kapat",
   "DE.ApplicationController.unknownErrorText": "Bilinmeyen hata.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Tarayıcınız desteklenmiyor.",
+  "DE.ApplicationController.waitText": "Lütfen bekleyin...",
   "DE.ApplicationView.txtDownload": "İndir",
+  "DE.ApplicationView.txtEmbed": "Gömülü",
+  "DE.ApplicationView.txtFullScreen": "Tam Ekran",
   "DE.ApplicationView.txtShare": "Paylaş"
 }

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

@@ -46,6 +46,19 @@ var c_paragraphLinerule = {
     LINERULE_EXACT: 2
 };
 
+var c_paragraphSpecial = {
+    NONE_SPECIAL: 0,
+    FIRST_LINE: 1,
+    HANGING: 2
+};
+
+var c_paragraphTextAlignment = {
+    RIGHT: 0,
+    LEFT: 1,
+    CENTERED: 2,
+    JUSTIFIED: 3
+};
+
 var c_pageNumPosition = {
     PAGE_NUM_POSITION_TOP: 0x01,
     PAGE_NUM_POSITION_BOTTOM: 0x02,

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

@@ -237,7 +237,7 @@ define([
                 if ( isopts ) close_menu = false;
                 else this.clickSaveCopyAsFormat(undefined);
                 break;
-            case 'print': this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); break;
+            case 'print': this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); break;
             case 'exit': Common.NotificationCenter.trigger('goback'); break;
             case 'edit':
                 this.getApplication().getController('Statusbar').setStatusCaption(this.requestEditRightsText);
@@ -302,13 +302,39 @@ define([
                         buttons: ['ok', 'cancel'],
                         callback: _.bind(function(btn){
                             if (btn == 'ok') {
-                                this.api.asc_DownloadAs(format);
+                                if (format == Asc.c_oAscFileType.TXT)
+                                    Common.NotificationCenter.trigger('download:advanced', Asc.c_oAscAdvancedOptionsID.TXT, this.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format));
+                                else
+                                    this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
                                 menu.hide();
                             }
                         }, this)
                     });
+                } else if (format == Asc.c_oAscFileType.DOCX) {
+                    if (!Common.Utils.InternalSettings.get("de-settings-compatible") && !Common.localStorage.getBool("de-hide-save-compatible") && this.api.asc_isCompatibilityMode()) {
+                        Common.UI.warning({
+                            closable: false,
+                            width: 600,
+                            title: this.notcriticalErrorTitle,
+                            msg: this.txtCompatible,
+                            buttons: ['ok', 'cancel'],
+                            dontshow: true,
+                            callback: _.bind(function(btn, dontshow){
+                                if (dontshow) Common.localStorage.setItem("de-hide-save-compatible", 1);
+                                if (btn == 'ok') {
+                                    this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
+                                    menu.hide();
+                                }
+                            }, this)
+                        });
+                    } else {
+                        var opts = new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX);
+                        opts.asc_setCompatible(!!Common.Utils.InternalSettings.get("de-settings-compatible"));
+                        this.api.asc_DownloadAs(opts);
+                        menu.hide();
+                    }
                 } else {
-                    this.api.asc_DownloadAs(format);
+                    this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
                     menu.hide();
                 }
             } else
@@ -326,14 +352,42 @@ define([
                         callback: _.bind(function(btn){
                             if (btn == 'ok') {
                                 this.isFromFileDownloadAs = ext;
-                                this.api.asc_DownloadAs(format, true);
+                                if (format == Asc.c_oAscFileType.TXT)
+                                    Common.NotificationCenter.trigger('download:advanced', Asc.c_oAscAdvancedOptionsID.TXT, this.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format, true));
+                                else
+                                    this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format, true));
                                 menu.hide();
                             }
                         }, this)
                     });
+                } else if (format == Asc.c_oAscFileType.DOCX) {
+                    if (!Common.Utils.InternalSettings.get("de-settings-compatible") && !Common.localStorage.getBool("de-hide-save-compatible") && this.api.asc_isCompatibilityMode()) {
+                        Common.UI.warning({
+                            closable: false,
+                            width: 600,
+                            title: this.notcriticalErrorTitle,
+                            msg: this.txtCompatible,
+                            buttons: ['ok', 'cancel'],
+                            dontshow: true,
+                            callback: _.bind(function(btn, dontshow){
+                                if (dontshow) Common.localStorage.setItem("de-hide-save-compatible", 1);
+                                if (btn == 'ok') {
+                                    this.isFromFileDownloadAs = ext;
+                                    this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format, true));
+                                    menu.hide();
+                                }
+                            }, this)
+                        });
+                    } else {
+                        this.isFromFileDownloadAs = ext;
+                        var opts = new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX, true);
+                        opts.asc_setCompatible(!!Common.Utils.InternalSettings.get("de-settings-compatible"));
+                        this.api.asc_DownloadAs(opts);
+                        menu.hide();
+                    }
                 } else {
                     this.isFromFileDownloadAs = ext;
-                    this.api.asc_DownloadAs(format, true);
+                    this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format, true));
                     menu.hide();
                 }
             } else {
@@ -354,27 +408,31 @@ define([
                         defFileName = defFileName.substring(0, idx) + this.isFromFileDownloadAs;
                 }
 
-                me._saveCopyDlg = new Common.Views.SaveAsDlg({
+                if (me.mode.canRequestSaveAs) {
-                    saveFolderUrl: me.mode.saveAsUrl,
+                    Common.Gateway.requestSaveAs(url, defFileName);
-                    saveFileUrl: url,
+                } else {
-                    defFileName: defFileName
+                    me._saveCopyDlg = new Common.Views.SaveAsDlg({
-                });
+                        saveFolderUrl: me.mode.saveAsUrl,
-                me._saveCopyDlg.on('saveaserror', function(obj, err){
+                        saveFileUrl: url,
-                    var config = {
+                        defFileName: defFileName
-                        closable: false,
+                    });
-                        title: me.notcriticalErrorTitle,
+                    me._saveCopyDlg.on('saveaserror', function(obj, err){
-                        msg: err,
+                        var config = {
-                        iconCls: 'warn',
+                            closable: false,
-                        buttons: ['ok'],
+                            title: me.notcriticalErrorTitle,
-                        callback: function(btn){
+                            msg: err,
-                            Common.NotificationCenter.trigger('edit:complete', me);
+                            iconCls: 'warn',
-                        }
+                            buttons: ['ok'],
-                    };
+                            callback: function(btn){
-                    Common.UI.alert(config);
+                                Common.NotificationCenter.trigger('edit:complete', me);
-                }).on('close', function(obj){
+                            }
-                    me._saveCopyDlg = undefined;
+                        };
-                });
+                        Common.UI.alert(config);
-                me._saveCopyDlg.show();
+                    }).on('close', function(obj){
+                        me._saveCopyDlg = undefined;
+                    });
+                    me._saveCopyDlg.show();
+                }
             }
             this.isFromFileDownloadAs = false;
         },
@@ -822,6 +880,8 @@ define([
         leavePageText: 'All unsaved changes in this document will be lost.<br> Click \'Cancel\' then \'Save\' to save them. Click \'OK\' to discard all the unsaved changes.',
         warnDownloadAs          : 'If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?',
         warnDownloadAsRTF       : 'If you continue saving in this format some of the formatting might be lost.<br>Are you sure you want to continue?',
-        txtUntitled: 'Untitled'
+        txtUntitled: 'Untitled',
+        txtCompatible: 'The document will be saved to the new format. It will allow to use all the editor features, but might affect the document layout.<br>Use the \'Compatibility\' option of the advanced settings if you want to make the files compatible with older MS Word versions.'
+
     }, DE.Controllers.LeftMenu || {}));
 });

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

@@ -191,7 +191,7 @@ define([
 
                     Common.NotificationCenter.on('api:disconnect',                  _.bind(this.onCoAuthoringDisconnect, this));
                     Common.NotificationCenter.on('goback',                          _.bind(this.goBack, this));
-                    Common.NotificationCenter.on('document:ready',                  _.bind(this.onDocumentReady, this));
+                    Common.NotificationCenter.on('download:advanced',               _.bind(this.onAdvancedOptions, this));
 
                     this.isShowOpenDialog = false;
                     
@@ -313,7 +313,7 @@ define([
                     });
                 }
 
-                me.defaultTitleText = me.defaultTitleText || '{{APP_TITLE_TEXT}}';
+                me.defaultTitleText = '{{APP_TITLE_TEXT}}';
                 me.warnNoLicense  = me.warnNoLicense.replace('%1', '{{COMPANY_NAME}}');
                 me.warnNoLicenseUsers = me.warnNoLicenseUsers.replace('%1', '{{COMPANY_NAME}}');
                 me.textNoLicenseTitle = me.textNoLicenseTitle.replace('%1', '{{COMPANY_NAME}}');
@@ -345,6 +345,9 @@ define([
                 this.appOptions.canMakeActionLink = this.editorConfig.canMakeActionLink;
                 this.appOptions.canRequestUsers = this.editorConfig.canRequestUsers;
                 this.appOptions.canRequestSendNotify = this.editorConfig.canRequestSendNotify;
+                this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs;
+                this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage;
+                this.appOptions.canRequestMailMergeRecipients = this.editorConfig.canRequestMailMergeRecipients;
 
                 appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header');
                 appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '')
@@ -460,7 +463,7 @@ define([
 
                     if ( !_format || _supported.indexOf(_format) < 0 )
                         _format = Asc.c_oAscFileType.DOCX;
-                    this.api.asc_DownloadAs(_format, true);
+                    this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(_format, true));
                 }
             },
 
@@ -887,6 +890,9 @@ define([
                 Common.Utils.InternalSettings.set("de-settings-spellcheck", value);
                 me.api.asc_setSpellCheck(value);
 
+                value = Common.localStorage.getBool("de-settings-compatible", false);
+                Common.Utils.InternalSettings.set("de-settings-compatible", value);
+
                 Common.Utils.InternalSettings.set("de-settings-showsnaplines", me.api.get_ShowSnapLines());
 
                 function checkWarns() {
@@ -1043,12 +1049,6 @@ define([
                 $('.doc-placeholder').remove();
             },
 
-            onDocumentReady: function() {
-                if (this.editorConfig.actionLink && this.editorConfig.actionLink.action && this.editorConfig.actionLink.action.type == 'comment') {
-                    Common.NotificationCenter.trigger('comments:showaction', this.editorConfig.actionLink.action.data, false);
-                }
-            },
-
             onLicenseChanged: function(params) {
                 var licType = params.asc_getLicenseType();
                 if (licType !== undefined && this.appOptions.canEdit && this.editorConfig.mode !== 'view' &&
@@ -1950,25 +1950,28 @@ define([
                 this.getApplication().getController('Toolbar').getView().updateMetricUnit();
             },
 
-            onAdvancedOptions: function(advOptions, mode) {
+            onAdvancedOptions: function(type, advOptions, mode, formatOptions) {
                 if (this._state.openDlg) return;
 
-                var type = advOptions.asc_getOptionId(),
+                var me = this;
-                    me = this;
                 if (type == Asc.c_oAscAdvancedOptionsID.TXT) {
                     me._state.openDlg = new Common.Views.OpenDialog({
                         title: Common.Views.OpenDialog.prototype.txtTitle.replace('%1', 'TXT'),
                         closable: (mode==2), // if save settings
                         type: Common.Utils.importTextType.TXT,
-                        preview: advOptions.asc_getOptions().asc_getData(),
+                        preview: advOptions.asc_getData(),
-                        codepages: advOptions.asc_getOptions().asc_getCodePages(),
+                        codepages: advOptions.asc_getCodePages(),
-                        settings: advOptions.asc_getOptions().asc_getRecommendedSettings(),
+                        settings: advOptions.asc_getRecommendedSettings(),
                         api: me.api,
                         handler: function (result, encoding) {
                             me.isShowOpenDialog = false;
                             if (result == 'ok') {
                                 if (me && me.api) {
-                                    me.api.asc_setAdvancedOptions(type, new Asc.asc_CTXTAdvancedOptions(encoding));
+                                    if (mode==2) {
+                                        formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CTextOptions(encoding));
+                                        me.api.asc_DownloadAs(formatOptions);
+                                    } else
+                                        me.api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding));
                                     me.loadMask && me.loadMask.show();
                                 }
                             }
@@ -2007,7 +2010,7 @@ define([
             },
 
             onTryUndoInFastCollaborative: function() {
-                if (!window.localStorage.getBool("de-hide-try-undoredo"))
+                if (!Common.localStorage.getBool("de-hide-try-undoredo"))
                     Common.UI.info({
                         width: 500,
                         msg: this.textTryUndoRedo,
@@ -2017,7 +2020,7 @@ define([
                         customButtonText: this.textStrict,
                         dontshow: true,
                         callback: _.bind(function(btn, dontshow){
-                            if (dontshow) window.localStorage.setItem("de-hide-try-undoredo", 1);
+                            if (dontshow) Common.localStorage.setItem("de-hide-try-undoredo", 1);
                             if (btn == 'custom') {
                                 Common.localStorage.setItem("de-settings-coauthmode", 0);
                                 Common.Utils.InternalSettings.set("de-settings-coauthmode", false);
@@ -2075,7 +2078,7 @@ define([
                 if (!this.appOptions.canPrint || this.isModalShowed) return;
                 
                 if (this.api)
-                    this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
+                    this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
                 Common.component.Analytics.trackEvent('Print');
             },
 
@@ -2095,10 +2098,14 @@ define([
                     this.iframePrint.style.bottom = "0";
                     document.body.appendChild(this.iframePrint);
                     this.iframePrint.onload = function() {
+                        try {
                         me.iframePrint.contentWindow.focus();
                         me.iframePrint.contentWindow.print();
                         me.iframePrint.contentWindow.blur();
                         window.focus();
+                        } catch (e) {
+                            me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF));
+                        }
                     };
                 }
                 if (url) this.iframePrint.src = url;

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

@@ -152,7 +152,7 @@ define([
                         if ( !_format || _supported.indexOf(_format) < 0 )
                             _format = Asc.c_oAscFileType.PDF;
 
-                        _main.api.asc_DownloadAs(_format);
+                        _main.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(_format));
                     },
                     'go:editor': function() {
                         Common.Gateway.requestEditRights();
@@ -323,6 +323,8 @@ define([
             toolbar.btnInsertEquation.on('click',                       _.bind(this.onInsertEquationClick, this));
             toolbar.mnuNoControlsColor.on('click',                      _.bind(this.onNoControlsColor, this));
             toolbar.mnuControlsColorPicker.on('select',                 _.bind(this.onSelectControlsColor, this));
+            Common.Gateway.on('insertimage',                            _.bind(this.insertImage, this));
+            Common.Gateway.on('setmailmergerecipients',                 _.bind(this.setMailMergeRecipients, this));
             $('#id-toolbar-menu-new-control-color').on('click',         _.bind(this.onNewControlsColor, this));
 
             $('#id-save-style-plus, #id-save-style-link', toolbar.$el).on('click', this.onMenuSaveStyle.bind(this));
@@ -966,7 +968,7 @@ define([
 
         onPrint: function(e) {
             if (this.api)
-                this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
+                this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
 
             Common.NotificationCenter.trigger('edit:complete', this.toolbar);
 
@@ -1427,13 +1429,23 @@ define([
                     }
                 })).show();
             } else if (item.value === 'storage') {
-                (new Common.Views.SelectFileDlg({
+                if (this.toolbar.mode.canRequestInsertImage) {
-                    fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly")
+                    Common.Gateway.requestInsertImage();
-                })).on('selectfile', function(obj, file){
+                } else {
-                    me.toolbar.fireEvent('insertimage', me.toolbar);
+                    (new Common.Views.SelectFileDlg({
-                    me.api.AddImageUrl(file.url, undefined, true);// for loading from storage
+                        fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly")
-                    Common.component.Analytics.trackEvent('ToolBar', 'Image');
+                    })).on('selectfile', function(obj, file){
-                }).show();
+                        me.insertImage(file);
+                    }).show();
+                }
+            }
+        },
+
+        insertImage: function(data) {
+            if (data && data.url) {
+                this.toolbar.fireEvent('insertimage', this.toolbar);
+                this.api.AddImageUrl(data.url, undefined, data.token);// for loading from storage
+                Common.component.Analytics.trackEvent('ToolBar', 'Image');
             }
         },
 
@@ -2578,7 +2590,7 @@ define([
             this.toolbar.btnRedo.setDisabled(this._state.can_redo!==true);
             this.toolbar.btnCopy.setDisabled(this._state.can_copycut!==true);
             this.toolbar.btnPrint.setDisabled(!this.toolbar.mode.canPrint);
-            if (this.toolbar.mode.fileChoiceUrl)
+            if (this.toolbar.mode.fileChoiceUrl || this.toolbar.mode.canRequestMailMergeRecipients)
                 this.toolbar.btnMailRecepients.setDisabled(false);
             this._state.activated = true;
 
@@ -2776,22 +2788,28 @@ define([
         onSelectRecepientsClick: function() {
             if (this._mailMergeDlg) return;
 
-            var me = this;
+            if (this.toolbar.mode.canRequestMailMergeRecipients) {
-            me._mailMergeDlg = new Common.Views.SelectFileDlg({
+                Common.Gateway.requestMailMergeRecipients();
-                            fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "xlsx").replace("{documentType}", "")
+            } else {
-                        });
+                var me = this;
-            me._mailMergeDlg.on('selectfile', function(obj, recepients){
+                me._mailMergeDlg = new Common.Views.SelectFileDlg({
-                me.api.asc_StartMailMerge(recepients);
+                    fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "xlsx").replace("{documentType}", "")
-                if (!me.mergeEditor)
+                });
-                    me.mergeEditor = me.getApplication().getController('Common.Controllers.ExternalMergeEditor').getView('Common.Views.ExternalMergeEditor');
+                me._mailMergeDlg.on('selectfile', function(obj, recepients){
-                if (me.mergeEditor)
+                    me.setMailMergeRecipients(recepients);
-                    me.mergeEditor.setEditMode(false);
+                }).on('close', function(obj){
+                    me._mailMergeDlg = undefined;
+                });
+                me._mailMergeDlg.show();
+            }
+        },
 
-            }).on('close', function(obj){
+        setMailMergeRecipients: function(recepients) {
-                me._mailMergeDlg = undefined;
+            this.api.asc_StartMailMerge(recepients);
-            });
+            if (!this.mergeEditor)
-
+                this.mergeEditor = this.getApplication().getController('Common.Controllers.ExternalMergeEditor').getView('Common.Views.ExternalMergeEditor');
-            me._mailMergeDlg.show();
+            if (this.mergeEditor)
+                this.mergeEditor.setEditMode(false);
         },
 
         createDelayedElements: function() {

apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template

@@ -1,23 +1,66 @@
 <div id="id-adv-paragraph-indents" class="settings-panel active">
     <div class="inner-content">
-        <table cols="3" style="width: 100%;">
+            <div>
-            <tr>
+                <div class="padding-large" style="display: inline-block;">
-                <td class="padding-large">
+                    <label class="input-label"><%= scope.textAlign %></label>
-                    <label class="input-label"><%= scope.strIndentsFirstLine %></label>
+                    <div id="paragraphadv-spin-text-alignment"></div>
-                    <div id="paragraphadv-spin-first-line" style="width: 85px;"></div>
+                </div>
-                </td>
+                <div class="padding-large text-only" style="display: none; float: right;">
-                <td class="padding-large">
+                    <label class="input-label"><%= scope.strIndentsOutlinelevel %></label>
+                    <div id="paragraphadv-spin-outline-level"></div>
+                </div>
+            </div>
+            <div><label class="header" style="padding-bottom: 4px;"><%= scope.strIndent %></label></div>
+            <div>
+                <div class="padding-large" style="display: inline-block;">
                     <label class="input-label"><%= scope.strIndentsLeftText %></label>
                     <div id="paragraphadv-spin-indent-left"></div>
-                </td>
+                </div>
-                <td class="padding-large">
+                <div class="padding-large" style="display: inline-block;">
                     <label class="input-label"><%= scope.strIndentsRightText %></label>
                     <div id="paragraphadv-spin-indent-right"></div>
-                </td>
+                </div>
-            </tr>
+                <div class="padding-large" style="display: inline-block;">
-        </table>
+                    <div>
+                        <label class="input-label"><%= scope.strIndentsSpecial %></label>
+                    </div>
+                    <div>
+                        <div id="paragraphadv-spin-special" style="display: inline-block;"></div>
+                        <div id="paragraphadv-spin-special-by" style="display: inline-block;"></div>
+                    </div>
+                </div>
+            </div>
+            <div><label class="header" style="padding-bottom: 4px;"><%= scope.strSpacing %></label></div>
+            <div>
+                <div style="display: inline-block;">
+                    <label class="input-label"><%= scope.strIndentsSpacingBefore %></label>
+                    <div id="paragraphadv-spin-spacing-before"></div>
+                </div>
+                <div style="display: inline-block;">
+                    <label class="input-label"><%= scope.strIndentsSpacingAfter %></label>
+                    <div id="paragraphadv-spin-spacing-after"></div>
+                </div>
+                <div style="display: inline-block;">
+                    <div>
+                        <label class="input-label"><%= scope.strIndentsLineSpacing %></label>
+                    </div>
+                    <div>
+                        <div id="paragraphadv-spin-line-rule" style="display: inline-block;"></div>
+                        <div id="paragraphadv-spin-line-height" style="display: inline-block;"></div>
+                    </div>
+                </div>
+            </div>
+            <div class="text-only" style="padding-top: 8px;">
+                <div id="paragraphadv-checkbox-add-interval"></div>
+            </div>
+            <div class="padding-large" style="padding-top: 16px; display: none;">
+                <div style="border: 1px solid #cbcbcb; width: 350px;">
+                    <div id="paragraphadv-indent-preview" style="height: 58px; position: relative;"></div>
+                </div>
+            </div>
     </div>
-    <div class="separator horizontal padding-large text-only"></div>
+</div>
+<div id="id-adv-paragraph-line" class="settings-panel">
     <div class="inner-content text-only" style="padding-right: 0px;" >
         <table cols="2" style="width: 100%;">
             <tr>
@@ -44,15 +87,15 @@
         <div style="width: 100%;" class="padding-small">
             <label class="input-label"><%= scope.textBorderWidth %></label>
             <div id="paragraphadv-combo-border-size" style="display: inline-block; vertical-align: middle; width: 93px;"></div>
-            <div style="display: inline-block; float:right;vertical-align: middle;">
+            <div style="display: inline-block; vertical-align: middle; padding-left: 20px;">
                 <label class="input-label" ><%= scope.textBorderColor %></label>
                 <div id="paragraphadv-border-color-btn" style="display: inline-block;"></div>
             </div>
         </div>
         <label class="input-label padding-small" style="width: 100%;"><%= scope.textBorderDesc %></label>
         <div style="width: 100%;" class="padding-large">
-            <div id="id-deparagraphstyler" style="display: inline-block; vertical-align: middle; width: 200px; height: 170px;outline: 1px solid #ccc;"></div>
+            <div id="id-deparagraphstyler" style="display: inline-block; vertical-align: middle; width: 200px; height: 170px;outline: 1px solid #ccc; margin-top: 2px;"></div>
-            <div style="display: inline-block; float:right;vertical-align: middle; width: 76px; text-align: right; height: 170px; padding-top: 10px;">
+            <div style="display: inline-block; vertical-align: top; width: 76px; text-align: right; height: 170px; padding-top: 0px; margin-left: 9px;">
                 <div id="paragraphadv-button-border-top" style="display: inline-block;"></div>
                 <div id="paragraphadv-button-border-inner-hor" style="display: inline-block;"></div>
                 <div id="paragraphadv-button-border-bottom" style="display: inline-block;"></div>
@@ -70,114 +113,94 @@
     </div>
 </div>
 <div id="id-adv-paragraph-font" class="settings-panel">
-    <div class="inner-content">
+    <div class="inner-content" style="width: 100%;">
-        <table cols="2" style="width: 100%;">
+        <div class="padding-small">
-            <tr>
+            <label class="header"><%= scope.textEffects %></label>
-                <td colspan=2 class="padding-small">
+        </div>
-                    <label class="header"><%= scope.textEffects %></label>
+        <div>
-                </td>
+            <div class="padding-large" style="display: inline-block;">
-            </tr>
+                <div class="padding-small" id="paragraphadv-checkbox-strike"></div>
-            <tr>
+                <div class="padding-small" id="paragraphadv-checkbox-double-strike"></div>
-                <td class="padding-small">
+                <div id="paragraphadv-checkbox-superscript"></div>
-                    <div id="paragraphadv-checkbox-strike"></div>
+            </div>
-                </td>
+            <div class="padding-large" style="display: inline-block; padding-left: 40px;">
-                <td class="padding-small">
+                <div class="padding-small" id="paragraphadv-checkbox-subscript"></div>
-                    <div id="paragraphadv-checkbox-subscript"></div>
+                <div class="padding-small" id="paragraphadv-checkbox-small-caps"></div>
-                </td>
+                <div id="paragraphadv-checkbox-all-caps"></div>
-            </tr>
+            </div>
-            <tr>
+        </div>
-                <td class="padding-small">
+            <div class="padding-small">
-                    <div id="paragraphadv-checkbox-double-strike"></div>
+                <label class="header"><%= scope.textCharacterSpacing %></label>
-                </td>
+            </div>
-                <td class="padding-small">
+            <div class="padding-large">
-                    <div id="paragraphadv-checkbox-small-caps"></div>
+                <div style="display: inline-block;">
-                </td>
-            </tr>
-            <tr>
-                <td class="padding-large">
-                    <div id="paragraphadv-checkbox-superscript"></div>
-                </td>
-                <td class="padding-large">
-                    <div id="paragraphadv-checkbox-all-caps"></div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan=2 class="padding-small">
-                    <label class="header"><%= scope.textCharacterSpacing %></label>
-                </td>
-            </tr>
-            <tr>
-                <td class="padding-large" width="50%">
                     <label class="input-label"><%= scope.textSpacing %></label>
                     <div id="paragraphadv-spin-spacing"></div>
-                </td>
+                </div>
-                <td class="padding-large text-only" width="50%">
+                <div class="text-only" style="display: inline-block; margin-left: 15px;">
                     <label class="input-label"><%= scope.textPosition %></label>
                     <div id="paragraphadv-spin-position"></div>
-                </td>
+                </div>
-            </tr>
+            </div>
-            <tr>
+            <div style="border: 1px solid #cbcbcb;">
-                <td colspan=2>
+                <div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative; margin: 0 auto;"></div>
-                    <div style="border: 1px solid #cbcbcb;">
+            </div>
-                        <div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative;"></div>
-                    </div>
-                </td>
-            </tr>
-        </table>
     </div>
 </div>
 <div id="id-adv-paragraph-tabs" class="settings-panel">
     <div class="inner-content">
-        <div class="padding-small" style="display: inline-block;">
+            <div class="padding-large">
-            <label class="input-label"><%= scope.textTabPosition %></label>
+                <label class="input-label"><%= scope.textDefault %></label>
-            <div id="paraadv-spin-tab"></div>
+                <div id="paraadv-spin-default-tab"></div>
-        </div>
+
-        <div class="padding-small" style="display: inline-block; float: right;">
+            </div>
-            <label class="input-label"><%= scope.textDefault %></label>
+            <div>
-            <div id="paraadv-spin-default-tab"></div>
+                <div class="padding-large" style="display: inline-block; margin-right: 9px;">
-        </div>
+                    <label class="input-label"><%= scope.textTabPosition %></label>
-        <div class="padding-large">
+                    <div id="paraadv-spin-tab"></div>
-            <div id="paraadv-list-tabs" style="width:180px; height: 94px;"></div>
+                </div>
-        </div>
+                <div class="padding-large" style=" display: inline-block; margin-right: 9px;">
-        <div class="padding-large" style="display: inline-block;margin-right: 7px;">
+                    <label class="input-label"><%= scope.textAlign %></label>
-            <label class="input-label"><%= scope.textAlign %></label>
+                    <div id="paraadv-cmb-align"></div>
-            <div id="paraadv-cmb-align"></div>
+                </div>
-        </div>
+                <div class="padding-large" style="display: inline-block;">
-        <div class="padding-large" style="display: inline-block;">
+                    <label class="input-label"><%= scope.textLeader %></label>
-            <label class="input-label"><%= scope.textLeader %></label>
+                    <div id="paraadv-cmb-leader"></div>
-            <div id="paraadv-cmb-leader"></div>
+                </div>
-        </div>
+            </div>
-        <div style="margin-bottom: 45px;"></div>
+            <div>
-        <div>
+                <div colspan=3 class="padding-large">
-            <button type="button" class="btn btn-text-default" id="paraadv-button-add-tab" style="width:90px;margin-right: 4px;"><%= scope.textSet %></button>
+                     <div id="paraadv-list-tabs" style="width:348px; height: 110px;"></div>
-            <button type="button" class="btn btn-text-default" id="paraadv-button-remove-tab" style="width:90px;margin-right: 4px;"><%= scope.textRemove %></button>
+                </div>
-            <button type="button" class="btn btn-text-default" id="paraadv-button-remove-all" style="width:90px;margin-right: 4px;"><%= scope.textRemoveAll %></button>
+            </div>
-        </div>
+            <div>
+                <button type="button" class="btn btn-text-default" id="paraadv-button-add-tab" style="width:108px;margin-right: 9px; display: inline-block;"><%= scope.textSet %></button>
+                <button type="button" class="btn btn-text-default" id="paraadv-button-remove-tab" style="width:108px;margin-right: 9px; display: inline-block;"><%= scope.textRemove %></button>
+                <button type="button" class="btn btn-text-default" id="paraadv-button-remove-all" style="width:108px;display: inline-block;"><%= scope.textRemoveAll %></button>
+            </div>
     </div>
 </div>
 <div id="id-adv-paragraph-margins" class="settings-panel">
     <div class="inner-content">
-        <table cols="2" style="width: 100%;">
+            <div>
-            <tr>
+                <div class="padding-small" style="display: inline-block;">
-                <td class="padding-small" width="50%">
                     <label class="input-label"><%= scope.textTop %></label>
                     <div id="paraadv-number-margin-top"></div>
-                </td>
+                </div>
-                <td class="padding-small" width="50%">
+                <div class="padding-small" style="display: inline-block; padding-left: 15px;">
                     <label class="input-label"><%= scope.textLeft %></label>
                     <div id="paraadv-number-margin-left"></div>
-                </td>
+                </div>
-            </tr>
+            </div>
-            <tr>
+            <div>
-                <td class="padding-small" width="50%">
+                <div class="padding-small" style="display: inline-block;">
                     <label class="input-label"><%= scope.textBottom %></label>
                     <div id="paraadv-number-margin-bottom"></div>
-                </td>
+                </div>
-                <td class="padding-small" width="50%">
+                <div class="padding-small" style="display: inline-block; padding-left: 15px;">
                     <label class="input-label"><%= scope.textRight %></label>
                     <div id="paraadv-number-margin-right"></div>
-                </td>
+                </div>
-            </tr>
+            </div>
-        </table>
     </div>
 </div>

apps/documenteditor/main/app/template/ShapeSettings.template

@@ -177,6 +177,16 @@
             <div id="shape-btn-change" style="display: inline-block; float:right;"></div>
         </td>
     </tr>
+    <tr>
+        <td class="padding-small" colspan=2>
+            <div class="separator horizontal"></div>
+        </td>
+    </tr>
+    <tr>
+        <td class="padding-small" colspan=2>
+            <div id="shape-checkbox-shadow"></div>
+        </td>
+    </tr>
     <tr class="shape-only">
         <td class="padding-small">
             <div class="separator horizontal"></div>

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

@@ -1861,6 +1861,18 @@ define([
             me.fireEvent('editcomplete', me);
         },
 
+        onPrintSelection: function(item){
+            if (this.api){
+                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); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
+                opts.asc_setAdvancedOptions(printopt);
+                this.api.asc_Print(opts);
+                this.fireEvent('editcomplete', this);
+                Common.component.Analytics.trackEvent('DocumentHolder', 'Print Selection');
+            }
+        },
+
         onControlsSelect: function(item, e) {
             var me = this;
             var props = this.api.asc_GetContentControlProperties();
@@ -2341,6 +2353,10 @@ define([
                 value : 'cut'
             }).on('click', _.bind(me.onCutCopyPaste, me));
 
+            var menuImgPrint = new Common.UI.MenuItem({
+                caption : me.txtPrintSelection
+            }).on('click', _.bind(me.onPrintSelection, me));
+
             var menuSignatureEditSign   = new Common.UI.MenuItem({caption: this.strSign,      value: 0 }).on('click', _.bind(me.onSignatureClick, me));
             var menuSignatureEditSetup  = new Common.UI.MenuItem({caption: this.strSetup,     value: 2 }).on('click', _.bind(me.onSignatureClick, me));
             var menuEditSignSeparator = new Common.UI.MenuItem({ caption: '--' });
@@ -2471,7 +2487,7 @@ define([
                     if (menuChartEdit.isVisible())
                         menuChartEdit.setDisabled(islocked || value.imgProps.value.get_SeveralCharts());
 
-                    me.pictureMenu.items[16].setVisible(menuChartEdit.isVisible());
+                    me.pictureMenu.items[17].setVisible(menuChartEdit.isVisible());
 
                     me.menuOriginalSize.setDisabled(islocked || value.imgProps.value.get_ImageUrl()===null || value.imgProps.value.get_ImageUrl()===undefined);
                     menuImageAdvanced.setDisabled(islocked);
@@ -2496,6 +2512,8 @@ define([
                     menuImgCopy.setDisabled(!cancopy);
                     menuImgCut.setDisabled(islocked || !cancopy);
                     menuImgPaste.setDisabled(islocked);
+                    menuImgPrint.setVisible(me.mode.canPrint);
+                    menuImgPrint.setDisabled(!cancopy);
 
                     var signGuid = (value.imgProps && value.imgProps.value && me.mode.isSignatureSupport) ? value.imgProps.value.asc_getSignatureId() : undefined,
                         isInSign = !!signGuid;
@@ -2512,6 +2530,7 @@ define([
                     menuImgCut,
                     menuImgCopy,
                     menuImgPaste,
+                    menuImgPrint,
                     { caption: '--' },
                     menuSignatureEditSign,
                     menuSignatureEditSetup,
@@ -2719,7 +2738,7 @@ define([
                 menu        : new Common.UI.MenuSimple({
                     cls: 'lang-menu',
                     menuAlign: 'tl-tr',
-                    restoreHeight: 300,
+                    restoreHeight: 285,
                     items   : [],
                     itemTemplate: langTemplate,
                     search: true
@@ -2744,6 +2763,13 @@ define([
                 }
             });
 
+            var menuToDictionaryTable = new Common.UI.MenuItem({
+                caption     : me.toDictionaryText
+            }).on('click', function(item, e) {
+                me.api.asc_spellCheckAddToDictionary(me._currentSpellObj);
+                me.fireEvent('editcomplete', me);
+            });
+
             var menuIgnoreSpellTableSeparator = new Common.UI.MenuItem({
                 caption     : '--'
             });
@@ -2762,6 +2788,7 @@ define([
                         menuIgnoreSpellTableSeparator,
                         menuIgnoreSpellTable,
                         menuIgnoreAllSpellTable,
+                        menuToDictionaryTable,
                         { caption: '--' },
                         me.langTableMenu
                     ]
@@ -2783,6 +2810,11 @@ define([
                 value : 'cut'
             }).on('click', _.bind(me.onCutCopyPaste, me));
 
+            var menuTablePrint = new Common.UI.MenuItem({
+                caption : me.txtPrintSelection
+            }).on('click', _.bind(me.onPrintSelection, me));
+
+
             var menuEquationSeparatorInTable = new Common.UI.MenuItem({
                 caption     : '--'
             });
@@ -2888,7 +2920,7 @@ define([
 
                     var isEquation= (value.mathProps && value.mathProps.value);
 
-                    for (var i = 7; i < 24; i++) {
+                    for (var i = 8; i < 25; i++) {
                         me.tableMenu.items[i].setVisible(!isEquation);
                     }
 
@@ -2903,8 +2935,8 @@ define([
                     me.menuTableDirect270.setChecked(dir == Asc.c_oAscCellTextDirection.BTLR);
 
                     var disabled = value.tableProps.locked || (value.headerProps!==undefined && value.headerProps.locked);
-                    me.tableMenu.items[10].setDisabled(disabled);
                     me.tableMenu.items[11].setDisabled(disabled);
+                    me.tableMenu.items[12].setDisabled(disabled);
 
                     if (me.api) {
                         mnuTableMerge.setDisabled(disabled || !me.api.CheckBeforeMergeCells());
@@ -2922,6 +2954,8 @@ define([
                     menuTableCopy.setDisabled(!cancopy);
                     menuTableCut.setDisabled(disabled || !cancopy);
                     menuTablePaste.setDisabled(disabled);
+                    menuTablePrint.setVisible(me.mode.canPrint);
+                    menuTablePrint.setDisabled(!cancopy);
 
                     // bullets & numbering
                     var listId = me.api.asc_GetCurrentNumberingId(),
@@ -2985,6 +3019,7 @@ define([
                     menuParagraphAdvancedInTable.setDisabled(disabled);
 
                     me.menuSpellCheckTable.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false);
+                    menuToDictionaryTable.setVisible(me.mode.isDesktopApp);
                     menuSpellcheckTableSeparator.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false);
                     
                     me.langTableMenu.setDisabled(disabled);
@@ -3004,9 +3039,9 @@ define([
                     //equation menu
                     var eqlen = 0;
                     if (isEquation) {
-                        eqlen = me.addEquationMenu(false, 6);
+                        eqlen = me.addEquationMenu(false, 7);
                     } else
-                        me.clearEquationMenu(false, 6);
+                        me.clearEquationMenu(false, 7);
                     menuEquationSeparatorInTable.setVisible(isEquation && eqlen>0);
 
                     var in_toc = me.api.asc_GetTableOfContentsPr(true),
@@ -3034,6 +3069,7 @@ define([
                     menuTableCut,
                     menuTableCopy,
                     menuTablePaste,
+                    menuTablePrint,
                     { caption: '--' },
                     menuEquationSeparatorInTable,
                     menuTableRefreshField,
@@ -3344,7 +3380,7 @@ define([
                 menu        : new Common.UI.MenuSimple({
                     cls: 'lang-menu',
                     menuAlign: 'tl-tr',
-                    restoreHeight: 300,
+                    restoreHeight: 285,
                     items   : [],
                     itemTemplate: langTemplate,
                     search: true
@@ -3365,6 +3401,13 @@ define([
                 me.fireEvent('editcomplete', me);
             });
 
+            var menuToDictionaryPara = new Common.UI.MenuItem({
+                caption     : me.toDictionaryText
+            }).on('click', function(item, e) {
+                me.api.asc_spellCheckAddToDictionary(me._currentSpellObj);
+                me.fireEvent('editcomplete', me);
+            });
+
             var menuIgnoreSpellParaSeparator = new Common.UI.MenuItem({
                 caption     : '--'
             });
@@ -3388,6 +3431,10 @@ define([
                 value : 'cut'
             }).on('click', _.bind(me.onCutCopyPaste, me));
 
+            var menuParaPrint = new Common.UI.MenuItem({
+                caption : me.txtPrintSelection
+            }).on('click', _.bind(me.onPrintSelection, me));
+
             var menuEquationSeparator = new Common.UI.MenuItem({
                 caption     : '--'
             });
@@ -3550,17 +3597,21 @@ define([
                     menuParaCopy.setDisabled(!cancopy);
                     menuParaCut.setDisabled(disabled || !cancopy);
                     menuParaPaste.setDisabled(disabled);
+                    menuParaPrint.setVisible(me.mode.canPrint);
+                    menuParaPrint.setDisabled(!cancopy);
 
                     // spellCheck
-                    me.menuSpellPara.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false);
+                    var spell = (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false);
-                    menuSpellcheckParaSeparator.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false);
+                    me.menuSpellPara.setVisible(spell);
-                    menuIgnoreSpellPara.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false);
+                    menuSpellcheckParaSeparator.setVisible(spell);
-                    menuIgnoreAllSpellPara.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false);
+                    menuIgnoreSpellPara.setVisible(spell);
-                    me.langParaMenu.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false);
+                    menuIgnoreAllSpellPara.setVisible(spell);
+                    menuToDictionaryPara.setVisible(spell && me.mode.isDesktopApp);
+                    me.langParaMenu.setVisible(spell);
                     me.langParaMenu.setDisabled(disabled);
-                    menuIgnoreSpellParaSeparator.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false);
+                    menuIgnoreSpellParaSeparator.setVisible(spell);
 
-                    if (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false && value.spellProps.value.get_Variants() !== null && value.spellProps.value.get_Variants() !== undefined) {
+                    if (spell && value.spellProps.value.get_Variants() !== null && value.spellProps.value.get_Variants() !== undefined) {
                         me.addWordVariants(true);
                     } else {
                         me.menuSpellPara.setCaption(me.loadSpellText, true);
@@ -3575,9 +3626,9 @@ define([
                     //equation menu
                     var eqlen = 0;
                     if (isEquation) {
-                        eqlen = me.addEquationMenu(true, 11);
+                        eqlen = me.addEquationMenu(true, 13);
                     } else
-                        me.clearEquationMenu(true, 11);
+                        me.clearEquationMenu(true, 13);
                     menuEquationSeparator.setVisible(isEquation && eqlen>0);
 
                     menuFrameAdvanced.setVisible(value.paraProps.value.get_FramePr() !== undefined);
@@ -3634,11 +3685,13 @@ define([
                     menuSpellcheckParaSeparator,
                     menuIgnoreSpellPara,
                     menuIgnoreAllSpellPara,
+                    menuToDictionaryPara,
                     me.langParaMenu,
                     menuIgnoreSpellParaSeparator,
                     menuParaCut,
                     menuParaCopy,
                     menuParaPaste,
+                    menuParaPrint,
                     { caption: '--' },
                     menuEquationSeparator,
                     menuParaRemoveControl,
@@ -4035,7 +4088,9 @@ define([
         textCrop: 'Crop',
         textCropFill: 'Fill',
         textCropFit: 'Fit',
-        textFollow: 'Follow move'
+        textFollow: 'Follow move',
+        toDictionaryText: 'Add to Dictionary',
+        txtPrintSelection: 'Print Selection'
 
     }, DE.Views.DocumentHolder || {}));
 });

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

@@ -284,7 +284,7 @@ define([
             this.miNew.$el.find('+.devider')[this.mode.canCreateNew?'show':'hide']();
 
             this.miDownload[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide']();
-            this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && this.mode.saveAsUrl ?'show':'hide']();
+            this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && (this.mode.canRequestSaveAs || this.mode.saveAsUrl) ?'show':'hide']();
             this.miSaveAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && this.mode.isDesktopApp && this.mode.isOffline)?'show':'hide']();
 //            this.hkSaveAs[this.mode.canDownload?'enable':'disable']();
 
@@ -328,7 +328,7 @@ define([
             } else if (this.mode.canDownloadOrigin)
                 $('a',this.miDownload.$el).text(this.textDownload);
 
-            if (this.mode.canDownload && this.mode.saveAsUrl) {
+            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})).render()));
             }
 

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

@@ -198,6 +198,10 @@ define([
                     '<td class="left"><label><%= scope.textAlignGuides %></label></td>',
                     '<td class="right"><span id="fms-chb-align-guides" /></td>',
                 '</tr>','<tr class="divider edit"></tr>',
+                '<tr class="edit">',
+                    '<td class="left"><label><%= scope.textCompatible %></label></td>',
+                    '<td class="right"><span id="fms-chb-compatible" /></td>',
+                '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="autosave">',
                     '<td class="left"><label id="fms-lbl-autosave"><%= scope.textAutoSave %></label></td>',
                     '<td class="right"><span id="fms-chb-autosave" /></td>',
@@ -271,6 +275,11 @@ define([
                 labelText: this.strSpellCheckMode
             });
 
+            this.chCompatible = new Common.UI.CheckBox({
+                el: $('#fms-chb-compatible'),
+                labelText: this.textOldVersions
+            });
+
             this.chAutosave = new Common.UI.CheckBox({
                 el: $markup.findById('#fms-chb-autosave'),
                 labelText: this.strAutosave
@@ -450,6 +459,7 @@ define([
 
             this.chSpell.setValue(Common.Utils.InternalSettings.get("de-settings-spellcheck"));
             this.chAlignGuides.setValue(Common.Utils.InternalSettings.get("de-settings-showsnaplines"));
+            this.chCompatible.setValue(Common.Utils.InternalSettings.get("de-settings-compatible"));
         },
 
         applySettings: function() {
@@ -471,6 +481,8 @@ define([
             if (this.mode.canForcesave)
                 Common.localStorage.setItem("de-settings-forcesave", this.chForcesave.isChecked() ? 1 : 0);
             Common.localStorage.setItem("de-settings-spellcheck", this.chSpell.isChecked() ? 1 : 0);
+            Common.localStorage.setItem("de-settings-compatible", this.chCompatible.isChecked() ? 1 : 0);
+            Common.Utils.InternalSettings.set("de-settings-compatible", this.chCompatible.isChecked() ? 1 : 0);
             Common.Utils.InternalSettings.set("de-settings-showsnaplines", this.chAlignGuides.isChecked());
             Common.localStorage.save();
 
@@ -533,7 +545,9 @@ define([
         txtFitWidth: 'Fit to Width',
         textForceSave: 'Save to Server',
         strForcesave: 'Always save to server (otherwise save to server on document close)',
-        strResolvedComment: 'Turn on display of the resolved comments'
+        strResolvedComment: 'Turn on display of the resolved comments',
+        textCompatible: 'Compatibility',
+        textOldVersions: 'Make the files compatible with older MS Word versions when saved as DOCX'
     }, DE.Views.FileMenuPanels.Settings || {}));
 
     DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
@@ -714,14 +728,14 @@ define([
                     //     '<td class="left"><label>' + this.txtEditTime + '</label></td>',
                     //     '<td class="right"><label id="id-info-edittime"></label></td>',
                     // '</tr>',
-                    '<tr>',
-                        '<td class="left"><label>' + this.txtSubject + '</label></td>',
-                        '<td class="right"><div id="id-info-subject"></div></td>',
-                    '</tr>',
                     '<tr>',
                         '<td class="left"><label>' + this.txtTitle + '</label></td>',
                         '<td class="right"><div id="id-info-title"></div></td>',
                     '</tr>',
+                    '<tr>',
+                        '<td class="left"><label>' + this.txtSubject + '</label></td>',
+                        '<td class="right"><div id="id-info-subject"></div></td>',
+                    '</tr>',
                     '<tr>',
                         '<td class="left"><label>' + this.txtComment + '</label></td>',
                         '<td class="right"><div id="id-info-comment"></div></td>',
@@ -908,6 +922,11 @@ define([
         },
 
         updateInfo: function(doc) {
+            if (!this.doc && doc && doc.info) {
+                doc.info.author && console.log("Obsolete: The 'author' parameter of the document 'info' section is deprecated. Please use 'owner' instead.");
+                doc.info.created && console.log("Obsolete: The 'created' parameter of the document 'info' section is deprecated. Please use 'uploaded' instead.");
+            }
+
             this.doc = doc;
             if (!this.rendered)
                 return;
@@ -919,12 +938,14 @@ define([
                 if (doc.info.folder )
                     this.lblPlacement.text( doc.info.folder );
                 visible = this._ShowHideInfoItem(this.lblPlacement, doc.info.folder!==undefined && doc.info.folder!==null) || visible;
-                if (doc.info.author)
+                var value = doc.info.owner || doc.info.author;
-                    this.lblOwner.text(doc.info.author);
+                if (value)
-                visible = this._ShowHideInfoItem(this.lblOwner, doc.info.author!==undefined && doc.info.author!==null) || visible;
+                    this.lblOwner.text(value);
-                if (doc.info.uploaded)
+                visible = this._ShowHideInfoItem(this.lblOwner, !!value) || visible;
-                    this.lblUploaded.text(doc.info.uploaded.toLocaleString());
+                value = doc.info.uploaded || doc.info.created;
-                visible = this._ShowHideInfoItem(this.lblUploaded, doc.info.uploaded!==undefined && doc.info.uploaded!==null) || visible;
+                if (value)
+                    this.lblUploaded.text(value);
+                visible = this._ShowHideInfoItem(this.lblUploaded, !!value) || visible;
             } else
                 this._ShowHideDocInfo(false);
             $('tr.divider.general', this.el)[visible?'show':'hide']();

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

@@ -365,7 +365,7 @@ define([
             this.$el.on('click', '#mmerge-readmore-link', _.bind(this.openHelp, this));
 
             if (this.mode) {
-                if (!this.mode.mergeFolderUrl)
+                if (!this.mode.canRequestSaveAs && !this.mode.mergeFolderUrl)
                     this.btnPortal.setVisible(false);
                 if (!this.mode.canSendEmailAddresses) {
                     this._arrMergeSrc.pop();
@@ -426,7 +426,7 @@ define([
                 if (num>this._state.recipientsCount-1) num = this._state.recipientsCount-1;
 
                 this.lockControls(DE.enumLockMM.noRecipients, this._state.recipientsCount<1, {
-                    array: (this.mode.mergeFolderUrl) ? [this.btnPortal] : [],
+                    array: (this.mode.canRequestSaveAs || this.mode.mergeFolderUrl) ? [this.btnPortal] : [],
                     merge: true
                 });
 
@@ -537,28 +537,33 @@ define([
             if (this._mailMergeDlg) return;
             var me = this;
             if (this.cmbMergeTo.getValue() != Asc.c_oAscFileType.HTML) {
-                me._mailMergeDlg = new Common.Views.SaveAsDlg({
+                var defFileName = me.defFileName + ((this.cmbMergeTo.getValue() == Asc.c_oAscFileType.PDF) ? '.pdf' : '.docx');
-                                    saveFolderUrl: me.mode.mergeFolderUrl,
+                if (me.mode.canRequestSaveAs) {
-                                    saveFileUrl: url,
+                    Common.Gateway.requestSaveAs(url, defFileName);
-                                    defFileName: me.defFileName + ((this.cmbMergeTo.getValue() == Asc.c_oAscFileType.PDF) ? '.pdf' : '.docx')
+                } else {
-                                });
+                    me._mailMergeDlg = new Common.Views.SaveAsDlg({
-                me._mailMergeDlg.on('saveasfolder', function(obj, folder){ // save last folder
+                        saveFolderUrl: me.mode.mergeFolderUrl,
-                }).on('saveaserror', function(obj, err){ // save last folder
+                        saveFileUrl: url,
-                    var config = {
+                        defFileName: defFileName
-                        closable: false,
+                    });
-                        title: me.notcriticalErrorTitle,
+                    me._mailMergeDlg.on('saveasfolder', function(obj, folder){ // save last folder
-                        msg: err,
+                    }).on('saveaserror', function(obj, err){ // save last folder
-                        iconCls: 'warn',
+                        var config = {
-                        buttons: ['ok'],
+                            closable: false,
-                        callback: function(btn){
+                            title: me.notcriticalErrorTitle,
-                            me.fireEvent('editcomplete', me);
+                            msg: err,
-                        }
+                            iconCls: 'warn',
-                    };
+                            buttons: ['ok'],
-                    Common.UI.alert(config);
+                            callback: function(btn){
-                }).on('close', function(obj){
+                                me.fireEvent('editcomplete', me);
-                    me._mailMergeDlg = undefined;
+                            }
-                });
+                        };
-                me._mailMergeDlg.show();
+                        Common.UI.alert(config);
+                    }).on('close', function(obj){
+                        me._mailMergeDlg = undefined;
+                    });
+                    me._mailMergeDlg.show();
+                }
             }
         },
 
@@ -766,7 +771,7 @@ define([
         onCmbMergeToSelect: function(combo, record) {
             var mergeVisible = (record.value == Asc.c_oAscFileType.HTML);
             this.btnMerge.setVisible(mergeVisible);
-            this.btnPortal.setVisible(!mergeVisible && this.mode.mergeFolderUrl);
+            this.btnPortal.setVisible(!mergeVisible && (this.mode.canRequestSaveAs || this.mode.mergeFolderUrl));
             this.btnDownload.setVisible(!mergeVisible);
         },
 
@@ -778,7 +783,7 @@ define([
             if (this._initSettings) return;
 
             this.lockControls(DE.enumLockMM.lostConnect, disable, {
-                array: _.union([this.btnEditData, this.btnInsField, this.chHighlight], (this.mode.mergeFolderUrl) ? [this.btnPortal] : []),
+                array: _.union([this.btnEditData, this.btnInsField, this.chHighlight], (this.mode.canRequestSaveAs || this.mode.mergeFolderUrl) ? [this.btnPortal] : []),
                 merge: true
             });
         },

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

@@ -123,7 +123,7 @@ define([
                     '</div>',
                     '<div class="footer center">',
                     '<button class="btn normal dlg-btn primary" result="insert" style="margin-right: 10px;  width: 86px;">' + me.textInsert + '</button>',
-                    '<button id="note-settings-btn-apply" class="btn normal dlg-btn primary" result="apply" style="margin-right: 10px;  width: 86px;">' + me.textApply + '</button>',
+                    '<button id="note-settings-btn-apply" class="btn normal dlg-btn" result="apply" style="margin-right: 10px;  width: 86px;">' + me.textApply + '</button>',
                     '<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + me.textCancel + '</button>',
                     '</div>'
                 ].join('')
@@ -271,17 +271,17 @@ define([
         },
 
         onDlgBtnClick: function(event) {
-            var me = this;
+            this._handleInput((typeof(event) == 'object') ? event.currentTarget.attributes['result'].value : event);
-            var state = (typeof(event) == 'object') ? event.currentTarget.attributes['result'].value : event;
-            if (state == 'insert' || state == 'apply') {
-                this.handler && this.handler.call(this, state,  (state == 'insert' || state == 'apply') ? this.getSettings() : undefined);
-            }
-
-            this.close();
         },
 
         onPrimary: function() {
-            return true;
+            this._handleInput('insert');
+            return false;
+        },
+
+        _handleInput: function(state) {
+            this.handler && this.handler.call(this, state,  (state == 'insert' || state == 'apply') ? this.getSettings() : undefined);
+            this.close();
         },
 
         onFormatSelect: function(combo, record) {

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

@@ -183,8 +183,9 @@ define([
 
         setApi: function(api) {
             this.api = api;
-            if (this.api)
+            if (this.api) {
                 this.api.asc_registerCallback('asc_onParaSpacingLine', _.bind(this._onLineSpacing, this));
+            }
             return this;
         },
 

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

@@ -51,17 +51,19 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
 
     DE.Views.ParagraphSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({
         options: {
-            contentWidth: 335,
+            contentWidth: 370,
             height: 394,
             toggleGroup: 'paragraph-adv-settings-group',
             storageName: 'de-para-settings-adv-category'
         },
 
         initialize : function(options) {
+            var me = this;
             _.extend(this.options, {
                 title: this.textTitle,
                 items: [
                     {panelId: 'id-adv-paragraph-indents', panelCaption: this.strParagraphIndents},
+                    {panelId: 'id-adv-paragraph-line',    panelCaption: this.strParagraphLine},
                     {panelId: 'id-adv-paragraph-borders', panelCaption: this.strBorders},
                     {panelId: 'id-adv-paragraph-font',    panelCaption: this.strParagraphFont},
                     {panelId: 'id-adv-paragraph-tabs',    panelCaption: this.strTabs},
@@ -84,6 +86,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             this.Margins = undefined;
             this.FirstLine = undefined;
             this.LeftIndent = undefined;
+            this.Spacing = null;
             this.spinners = [];
 
             this.tableStylerRows = this.options.tableStylerRows;
@@ -92,6 +95,63 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             this.api = this.options.api;
             this._originalProps = new Asc.asc_CParagraphProperty(this.options.paragraphProps);
             this.isChart = this.options.isChart;
+
+            this.CurLineRuleIdx = this._originalProps.get_Spacing().get_LineRule();
+
+            this._arrLineRule = [
+                {displayValue: this.textAtLeast,defaultValue: 5, value: c_paragraphLinerule.LINERULE_LEAST, minValue: 0.03,   step: 0.01, defaultUnit: 'cm'},
+                {displayValue: this.textAuto,   defaultValue: 1, value: c_paragraphLinerule.LINERULE_AUTO, minValue: 0.5,    step: 0.01, defaultUnit: ''},
+                {displayValue: this.textExact,  defaultValue: 5, value: c_paragraphLinerule.LINERULE_EXACT, minValue: 0.03,   step: 0.01, defaultUnit: 'cm'}
+            ];
+
+            this._arrSpecial = [
+                {displayValue: this.textNoneSpecial, value: c_paragraphSpecial.NONE_SPECIAL, defaultValue: 0},
+                {displayValue: this.textFirstLine, value: c_paragraphSpecial.FIRST_LINE, defaultValue: 12.7},
+                {displayValue: this.textHanging, value: c_paragraphSpecial.HANGING, defaultValue: 12.7}
+            ];
+            this.CurSpecial = undefined;
+
+            this._arrTextAlignment = [
+                {displayValue: this.textTabLeft, value: c_paragraphTextAlignment.LEFT},
+                {displayValue: this.textTabCenter, value: c_paragraphTextAlignment.CENTERED},
+                {displayValue: this.textTabRight, value: c_paragraphTextAlignment.RIGHT},
+                {displayValue: this.textJustified, value: c_paragraphTextAlignment.JUSTIFIED}
+            ];
+
+            this._arrOutlinelevel = [
+                {displayValue: this.textBodyText},
+                {displayValue: this.textLevel + '1'},
+                {displayValue: this.textLevel + '2'},
+                {displayValue: this.textLevel + '3'},
+                {displayValue: this.textLevel + '4'},
+                {displayValue: this.textLevel + '5'},
+                {displayValue: this.textLevel + '6'},
+                {displayValue: this.textLevel + '7'},
+                {displayValue: this.textLevel + '8'},
+                {displayValue: this.textLevel + '9'}
+            ];
+
+            this._arrTabAlign = [
+                { value: 1, displayValue: this.textTabLeft },
+                { value: 3, displayValue: this.textTabCenter },
+                { value: 2, displayValue: this.textTabRight }
+            ];
+            this._arrKeyTabAlign = [];
+            this._arrTabAlign.forEach(function(item) {
+                me._arrKeyTabAlign[item.value] = item.displayValue;
+            });
+
+            this._arrTabLeader = [
+                { value: Asc.c_oAscTabLeader.None,      displayValue: this.textNone },
+                { value: Asc.c_oAscTabLeader.Dot,       displayValue: '....................' },
+                { value: Asc.c_oAscTabLeader.Hyphen,    displayValue: '-----------------' },
+                { value: Asc.c_oAscTabLeader.MiddleDot, displayValue: '·················' },
+                { value: Asc.c_oAscTabLeader.Underscore,displayValue: '__________' }
+            ];
+            this._arrKeyTabLeader = [];
+            this._arrTabLeader.forEach(function(item) {
+                me._arrKeyTabLeader[item.value] = item.displayValue;
+            });
         },
 
         render: function() {
@@ -101,25 +161,6 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
 
             // Indents & Placement
 
-            this.numFirstLine = new Common.UI.MetricSpinner({
-                el: $('#paragraphadv-spin-first-line'),
-                step: .1,
-                width: 85,
-                defaultUnit : "cm",
-                defaultValue : 0,
-                value: '0 cm',
-                maxValue: 55.87,
-                minValue: -55.87
-            });
-            this.numFirstLine.on('change', _.bind(function(field, newValue, oldValue, eOpts){
-                if (this._changedProps) {
-                    if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined)
-                        this._changedProps.put_Ind(new Asc.asc_CParagraphInd());
-                    this._changedProps.get_Ind().put_FirstLine(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
-                }
-            }, this));
-            this.spinners.push(this.numFirstLine);
-
             this.numIndentsLeft = new Common.UI.MetricSpinner({
                 el: $('#paragraphadv-spin-indent-left'),
                 step: .1,
@@ -158,6 +199,121 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             }, this));
             this.spinners.push(this.numIndentsRight);
 
+            this.numSpacingBefore = new Common.UI.MetricSpinner({
+                el: $('#paragraphadv-spin-spacing-before'),
+                step: .1,
+                width: 85,
+                value: '',
+                defaultUnit : "cm",
+                maxValue: 55.88,
+                minValue: 0,
+                allowAuto   : true,
+                autoText    : this.txtAutoText
+            });
+            this.numSpacingBefore.on('change', _.bind(function (field, newValue, oldValue, eOpts) {
+                if (this.Spacing === null) {
+                    var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
+                    this.Spacing = properties.get_Spacing();
+                }
+                this.Spacing.Before = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
+            }, this));
+            this.spinners.push(this.numSpacingBefore);
+
+            this.numSpacingAfter = new Common.UI.MetricSpinner({
+                el: $('#paragraphadv-spin-spacing-after'),
+                step: .1,
+                width: 85,
+                value: '',
+                defaultUnit : "cm",
+                maxValue: 55.88,
+                minValue: 0,
+                allowAuto   : true,
+                autoText    : this.txtAutoText
+            });
+            this.numSpacingAfter.on('change', _.bind(function (field, newValue, oldValue, eOpts) {
+                if (this.Spacing === null) {
+                    var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
+                    this.Spacing = properties.get_Spacing();
+                }
+                this.Spacing.After = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
+            }, this));
+            this.spinners.push(this.numSpacingAfter);
+
+            this.cmbLineRule = new Common.UI.ComboBox({
+                el: $('#paragraphadv-spin-line-rule'),
+                cls: 'input-group-nr',
+                editable: false,
+                data: this._arrLineRule,
+                style: 'width: 85px;',
+                menuStyle   : 'min-width: 85px;'
+            });
+            this.cmbLineRule.setValue(this.CurLineRuleIdx);
+            this.cmbLineRule.on('selected', _.bind(this.onLineRuleSelect, this));
+
+            this.numLineHeight = new Common.UI.MetricSpinner({
+                el: $('#paragraphadv-spin-line-height'),
+                step: .01,
+                width: 85,
+                value: '',
+                defaultUnit : "",
+                maxValue: 132,
+                minValue: 0.5
+            });
+            this.spinners.push(this.numLineHeight);
+            this.numLineHeight.on('change', _.bind(this.onNumLineHeightChange, this));
+
+            this.chAddInterval = new Common.UI.CheckBox({
+                el: $('#paragraphadv-checkbox-add-interval'),
+                labelText: this.strSomeParagraphSpace
+            });
+
+            this.cmbSpecial = new Common.UI.ComboBox({
+                el: $('#paragraphadv-spin-special'),
+                cls: 'input-group-nr',
+                editable: false,
+                data: this._arrSpecial,
+                style: 'width: 85px;',
+                menuStyle   : 'min-width: 85px;'
+            });
+            this.cmbSpecial.setValue('');
+            this.cmbSpecial.on('selected', _.bind(this.onSpecialSelect, this));
+
+            this.numSpecialBy = new Common.UI.MetricSpinner({
+                el: $('#paragraphadv-spin-special-by'),
+                step: .1,
+                width: 85,
+                defaultUnit : "cm",
+                defaultValue : 0,
+                value: '0 cm',
+                maxValue: 55.87,
+                minValue: 0
+            });
+            this.spinners.push(this.numSpecialBy);
+            this.numSpecialBy.on('change', _.bind(this.onFirstLineChange, this));
+
+            this.cmbTextAlignment = new Common.UI.ComboBox({
+                el: $('#paragraphadv-spin-text-alignment'),
+                cls: 'input-group-nr',
+                editable: false,
+                data: this._arrTextAlignment,
+                style: 'width: 173px;',
+                menuStyle   : 'min-width: 173px;'
+            });
+            this.cmbTextAlignment.setValue('');
+
+            this.cmbOutlinelevel = new Common.UI.ComboBox({
+                el: $('#paragraphadv-spin-outline-level'),
+                cls: 'input-group-nr',
+                editable: false,
+                data: this._arrOutlinelevel,
+                style: 'width: 174px;',
+                menuStyle   : 'min-width: 174px;'
+            });
+            this.cmbOutlinelevel.setValue('');
+            this.cmbOutlinelevel.on('selected', _.bind(this.onOutlinelevelSelect, this));
+
+            // Line & Page Breaks
+
             this.chBreakBefore = new Common.UI.CheckBox({
                 el: $('#paragraphadv-checkbox-break-before'),
                 labelText: this.strBreakBefore
@@ -326,7 +482,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             this.numSpacing = new Common.UI.MetricSpinner({
                 el: $('#paragraphadv-spin-spacing'),
                 step: .01,
-                width: 100,
+                width: 90,
                 defaultUnit : "cm",
                 defaultValue : 0,
                 value: '0 cm',
@@ -348,7 +504,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             this.numPosition = new Common.UI.MetricSpinner({
                 el: $('#paragraphadv-spin-position'),
                 step: .01,
-                width: 100,
+                width: 90,
                 defaultUnit : "cm",
                 defaultValue : 0,
                 value: '0 cm',
@@ -371,7 +527,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             this.numTab = new Common.UI.MetricSpinner({
                 el: $('#paraadv-spin-tab'),
                 step: .1,
-                width: 180,
+                width: 108,
                 defaultUnit : "cm",
                 value: '1.25 cm',
                 maxValue: 55.87,
@@ -382,7 +538,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             this.numDefaultTab = new Common.UI.MetricSpinner({
                 el: $('#paraadv-spin-default-tab'),
                 step: .1,
-                width: 107,
+                width: 108,
                 defaultUnit : "cm",
                 value: '1.25 cm',
                 maxValue: 55.87,
@@ -398,7 +554,15 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             this.tabList = new Common.UI.ListView({
                 el: $('#paraadv-list-tabs'),
                 emptyText: this.noTabs,
-                store: new Common.UI.DataViewStore()
+                store: new Common.UI.DataViewStore(),
+                template: _.template(['<div class="listview inner" style=""></div>'].join('')),
+                itemTemplate: _.template([
+                    '<div id="<%= id %>" class="list-item" style="width: 100%;display:inline-block;">',
+                    '<div style="width:117px;display: inline-block;"><%= value %></div>',
+                    '<div style="width:121px;display: inline-block;"><%= displayTabAlign %></div>',
+                    '<div style="width:96px;display: inline-block;"><%= displayTabLeader %></div>',
+                    '</div>'
+                ].join(''))
             });
             this.tabList.store.comparator = function(rec) {
                 return rec.get("tabPos");
@@ -415,31 +579,21 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
 
             this.cmbAlign = new Common.UI.ComboBox({
                 el          : $('#paraadv-cmb-align'),
-                style       : 'width: 85px;',
+                style       : 'width: 108px;',
-                menuStyle   : 'min-width: 85px;',
+                menuStyle   : 'min-width: 108px;',
                 editable    : false,
                 cls         : 'input-group-nr',
-                data        : [
+                data        : this._arrTabAlign
-                    { value: 1, displayValue: this.textTabLeft },
-                    { value: 3, displayValue: this.textTabCenter },
-                    { value: 2, displayValue: this.textTabRight }
-                ]
             });
             this.cmbAlign.setValue(1);
 
             this.cmbLeader = new Common.UI.ComboBox({
                 el          : $('#paraadv-cmb-leader'),
-                style       : 'width: 85px;',
+                style       : 'width: 108px;',
-                menuStyle   : 'min-width: 85px;',
+                menuStyle   : 'min-width: 108px;',
                 editable    : false,
                 cls         : 'input-group-nr',
-                data        : [
+                data        : this._arrTabLeader
-                    { value: Asc.c_oAscTabLeader.None,      displayValue: this.textNone },
-                    { value: Asc.c_oAscTabLeader.Dot,       displayValue: '....................' },
-                    { value: Asc.c_oAscTabLeader.Hyphen,    displayValue: '-----------------' },
-                    { value: Asc.c_oAscTabLeader.MiddleDot, displayValue: '·················' },
-                    { value: Asc.c_oAscTabLeader.Underscore,displayValue: '__________' }
-                ]
             });
             this.cmbLeader.setValue(Asc.c_oAscTabLeader.None);
 
@@ -600,6 +754,16 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                 }
             }
 
+            if (this.Spacing !== null) {
+                this._changedProps.asc_putSpacing(this.Spacing);
+            }
+
+            var spaceBetweenPrg = this.chAddInterval.getValue();
+            this._changedProps.asc_putContextualSpacing(spaceBetweenPrg == 'checked');
+
+            var horizontalAlign = this.cmbTextAlignment.getValue();
+            this._changedProps.asc_putJc((horizontalAlign !== undefined && horizontalAlign !== null) ? horizontalAlign : c_paragraphTextAlignment.LEFT);
+
             return { paragraphProps: this._changedProps, borderProps: {borderSize: this.BorderSize, borderColor: this.btnBorderColor.color} };
         },
 
@@ -610,13 +774,34 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                 this.hideTextOnlySettings(this.isChart);
 
                 this.FirstLine = (props.get_Ind() !== null) ? props.get_Ind().get_FirstLine() : null;
-                this.numFirstLine.setValue(this.FirstLine!== null ? Common.Utils.Metric.fnRecalcFromMM(this.FirstLine) : '', true);
                 this.LeftIndent = (props.get_Ind() !== null) ? props.get_Ind().get_Left() : null;
                 if (this.FirstLine<0 && this.LeftIndent !== null)
                     this.LeftIndent = this.LeftIndent + this.FirstLine;
                 this.numIndentsLeft.setValue(this.LeftIndent!==null ? Common.Utils.Metric.fnRecalcFromMM(this.LeftIndent) : '', true);
                 this.numIndentsRight.setValue((props.get_Ind() !== null && props.get_Ind().get_Right() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_Right()) : '', true);
 
+                this.numSpacingBefore.setValue((props.get_Spacing() !== null && props.get_Spacing().get_Before() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_Before()) : '', true);
+                this.numSpacingAfter.setValue((props.get_Spacing() !== null && props.get_Spacing().get_After() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_After()) : '', true);
+
+                var linerule = props.get_Spacing().get_LineRule();
+                this.cmbLineRule.setValue((linerule !== null) ? linerule : '', true);
+
+                if(props.get_Spacing() !== null && props.get_Spacing().get_Line() !== null) {
+                    this.numLineHeight.setValue((linerule==c_paragraphLinerule.LINERULE_AUTO) ? props.get_Spacing().get_Line() : Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_Line()), true);
+                } else {
+                    this.numLineHeight.setValue('', true);
+                }
+
+                this.chAddInterval.setValue((props.get_ContextualSpacing() !== null && props.get_ContextualSpacing() !== undefined) ? props.get_ContextualSpacing() : 'indeterminate', true);
+
+                if(this.CurSpecial === undefined) {
+                    this.CurSpecial = (props.get_Ind().get_FirstLine() === 0) ? c_paragraphSpecial.NONE_SPECIAL : ((props.get_Ind().get_FirstLine() > 0) ? c_paragraphSpecial.FIRST_LINE : c_paragraphSpecial.HANGING);
+                }
+                this.cmbSpecial.setValue(this.CurSpecial);
+                this.numSpecialBy.setValue(this.FirstLine!== null ? Math.abs(Common.Utils.Metric.fnRecalcFromMM(this.FirstLine)) : '', true);
+
+                this.cmbTextAlignment.setValue((props.get_Jc() !== undefined && props.get_Jc() !== null) ? props.get_Jc() : c_paragraphTextAlignment.LEFT, true);
+
                 this.chKeepLines.setValue((props.get_KeepLines() !== null && props.get_KeepLines() !== undefined) ? props.get_KeepLines() : 'indeterminate', true);
                 this.chBreakBefore.setValue((props.get_PageBreakBefore() !== null && props.get_PageBreakBefore() !== undefined) ? props.get_PageBreakBefore() : 'indeterminate', true);
 
@@ -702,7 +887,9 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                             tabPos: pos,
                             value: parseFloat(pos.toFixed(3)) + ' ' + Common.Utils.Metric.getCurrentMetricName(),
                             tabAlign: tab.get_Value(),
-                            tabLeader: tab.asc_getLeader()
+                            tabLeader: tab.get_Leader(),
+                            displayTabLeader: this._arrKeyTabLeader[tab.get_Leader()],
+                            displayTabAlign: this._arrKeyTabAlign[tab.get_Value()]
                         });
                         arr.push(rec);
                     }
@@ -723,13 +910,19 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                 for (var i=0; i<this.spinners.length; i++) {
                     var spinner = this.spinners[i];
                     spinner.setDefaultUnit(Common.Utils.Metric.getCurrentMetricName());
-                    if (spinner.el.id == 'paragraphadv-spin-spacing' || spinner.el.id == 'paragraphadv-spin-position' )
+                    if (spinner.el.id == 'paragraphadv-spin-spacing' || spinner.el.id == 'paragraphadv-spin-position' || spinner.el.id == 'paragraphadv-spin-spacing-before' || spinner.el.id == 'paragraphadv-spin-spacing-after')
                         spinner.setStep(Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt ? 1 : 0.01);
                     else
                         spinner.setStep(Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt ? 1 : 0.1);
                 }
             }
-
+            this._arrLineRule[2].defaultUnit =  this._arrLineRule[0].defaultUnit = Common.Utils.Metric.getCurrentMetricName();
+            this._arrLineRule[2].minValue =  this._arrLineRule[0].minValue = parseFloat(Common.Utils.Metric.fnRecalcFromMM(0.3).toFixed(2));
+            this._arrLineRule[2].step =  this._arrLineRule[0].step = (Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt) ? 1 : 0.01;
+            if (this.CurLineRuleIdx !== null) {
+                this.numLineHeight.setDefaultUnit(this._arrLineRule[this.CurLineRuleIdx].defaultUnit);
+                this.numLineHeight.setStep(this._arrLineRule[this.CurLineRuleIdx].step);
+            }
         },
 
         updateThemeColors: function() {
@@ -1095,7 +1288,9 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
         addTab: function(btn, eOpts){
             var val = this.numTab.getNumberValue(),
                 align = this.cmbAlign.getValue(),
-                leader = this.cmbLeader.getValue();
+                leader = this.cmbLeader.getValue(),
+                displayAlign = this._arrKeyTabAlign[align],
+                displayLeader = this._arrKeyTabLeader[leader];
 
             var store = this.tabList.store;
             var rec = store.find(function(record){
@@ -1104,6 +1299,8 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             if (rec) {
                 rec.set('tabAlign', align);
                 rec.set('tabLeader', leader);
+                rec.set('displayTabAlign', displayAlign);
+                rec.set('displayTabLeader', displayLeader);
                 this._tabListChanged = true;
             } else {
                 rec = new Common.UI.DataViewModel();
@@ -1111,7 +1308,9 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                     tabPos: val,
                     value: val + ' ' + Common.Utils.Metric.getCurrentMetricName(),
                     tabAlign: align,
-                    tabLeader: leader
+                    tabLeader: leader,
+                    displayTabLeader: displayLeader,
+                    displayTabAlign: displayAlign
                 });
                 store.add(rec);
             }
@@ -1158,15 +1357,90 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
 
         hideTextOnlySettings: function(value) {
             this.TextOnlySettings.toggleClass('hidden', value==true);
-            this.btnsCategory[1].setVisible(!value);   // Borders
+            this.btnsCategory[1].setVisible(!value);   // Line & Page Breaks
-            this.btnsCategory[4].setVisible(!value);   // Paddings
+            this.btnsCategory[2].setVisible(!value);   // Borders
+            this.btnsCategory[5].setVisible(!value);   // Paddings
+        },
+
+        onLineRuleSelect: function(combo, record) {
+            if (this.Spacing === null) {
+                var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
+                this.Spacing = properties.get_Spacing();
+            }
+            this.Spacing.LineRule = record.value;
+            if ( this.CurLineRuleIdx !== this.Spacing.LineRule ) {
+                this.numLineHeight.setDefaultUnit(this._arrLineRule[record.value].defaultUnit);
+                this.numLineHeight.setMinValue(this._arrLineRule[record.value].minValue);
+                this.numLineHeight.setStep(this._arrLineRule[record.value].step);
+                var value = this.numLineHeight.getNumberValue();
+                if (this.Spacing.LineRule === c_paragraphLinerule.LINERULE_AUTO) {
+                    this.numLineHeight.setValue(this._arrLineRule[record.value].defaultValue);
+                } else if (this.CurLineRuleIdx === c_paragraphLinerule.LINERULE_AUTO) {
+                    this.numLineHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(this._arrLineRule[record.value].defaultValue));
+                } else {
+                    this.numLineHeight.setValue(value);
+                }
+                this.CurLineRuleIdx = record.value;
+            }
+        },
+
+        onNumLineHeightChange: function(field, newValue, oldValue, eOpts) {
+            if ( this.cmbLineRule.getRawValue() === '' )
+                return;
+            if (this.Spacing === null) {
+                var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
+                this.Spacing = properties.get_Spacing();
+            }
+            this.Spacing.Line = (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
+        },
+
+        onSpecialSelect: function(combo, record) {
+            this.CurSpecial = record.value;
+            if (this.CurSpecial === c_paragraphSpecial.NONE_SPECIAL) {
+                this.numSpecialBy.setValue(0, true);
+            }
+            if (this._changedProps) {
+                if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined)
+                    this._changedProps.put_Ind(new Asc.asc_CParagraphInd());
+                var value = Common.Utils.Metric.fnRecalcToMM(this.numSpecialBy.getNumberValue());
+                if (value === 0) {
+                    this.numSpecialBy.setValue(Common.Utils.Metric.fnRecalcFromMM(this._arrSpecial[record.value].defaultValue), true);
+                    value = this._arrSpecial[record.value].defaultValue;
+                }
+                if (this.CurSpecial === c_paragraphSpecial.HANGING) {
+                    value = -value;
+                }
+                this._changedProps.get_Ind().put_FirstLine(value);
+            }
+        },
+
+        onFirstLineChange: function(field, newValue, oldValue, eOpts){
+            if (this._changedProps) {
+                if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined)
+                    this._changedProps.put_Ind(new Asc.asc_CParagraphInd());
+                var value = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
+                if (this.CurSpecial === c_paragraphSpecial.HANGING) {
+                    value = -value;
+                } else if (this.CurSpecial === c_paragraphSpecial.NONE_SPECIAL && value > 0 )  {
+                    this.CurSpecial = c_paragraphSpecial.FIRST_LINE;
+                    this.cmbSpecial.setValue(c_paragraphSpecial.FIRST_LINE);
+                } else if (value === 0) {
+                    this.CurSpecial = c_paragraphSpecial.NONE_SPECIAL;
+                    this.cmbSpecial.setValue(c_paragraphSpecial.NONE_SPECIAL);
+                }
+                this._changedProps.get_Ind().put_FirstLine(value);
+            }
+        },
+
+        onOutlinelevelSelect: function(combo, record) {
+
         },
 
         textTitle:      'Paragraph - Advanced Settings',
         strIndentsFirstLine:    'First line',
         strIndentsLeftText:     'Left',
         strIndentsRightText:    'Right',
-        strParagraphIndents:    'Indents & Placement',
+        strParagraphIndents:    'Indents & Spacing',
         strParagraphPosition:   'Placement',
         strParagraphFont:   'Font',
         strBreakBefore:         'Page break before',
@@ -1217,6 +1491,26 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
         tipOuter:           'Set Outer Border Only',
         noTabs:             'The specified tabs will appear in this field',
         textLeader: 'Leader',
-        textNone: 'None'
+        textNone: 'None',
+        strParagraphLine: 'Line & Page Breaks',
+        strIndentsSpacingBefore: 'Before',
+        strIndentsSpacingAfter: 'After',
+        strIndentsLineSpacing: 'Line Spacing',
+        txtAutoText: 'Auto',
+        textAuto: 'Multiple',
+        textAtLeast: 'At least',
+        textExact: 'Exactly',
+        strSomeParagraphSpace: 'Don\'t add interval between paragraphs of the same style',
+        strIndentsSpecial: 'Special',
+        textNoneSpecial: '(none)',
+        textFirstLine: 'First line',
+        textHanging: 'Hanging',
+        textJustified: 'Justified',
+        textBodyText: 'BodyText',
+        textLevel: 'Level ',
+        strIndentsOutlinelevel: 'Outline level',
+        strIndent: 'Indents',
+        strSpacing: 'Spacing'
+
     }, DE.Views.ParagraphSettingsAdvanced || {}));
 });

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

@@ -187,7 +187,8 @@ define([
                     asctype: Common.Utils.documentSettingsType.MailMerge,
                     enableToggle: true,
                     disabled: true,
-                    toggleGroup: 'tabpanelbtnsGroup'
+                    toggleGroup: 'tabpanelbtnsGroup',
+                    allowMouseEventsOnDisabled: true
                 });
                 this._settings[Common.Utils.documentSettingsType.MailMerge]   = {panel: "id-mail-merge-settings",      btn: this.btnMailMerge};
 
@@ -202,7 +203,8 @@ define([
                     asctype: Common.Utils.documentSettingsType.Signature,
                     enableToggle: true,
                     disabled: true,
-                    toggleGroup: 'tabpanelbtnsGroup'
+                    toggleGroup: 'tabpanelbtnsGroup',
+                    allowMouseEventsOnDisabled: true
                 });
                 this._settings[Common.Utils.documentSettingsType.Signature]   = {panel: "id-signature-settings",      btn: this.btnSignature};
 

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

@@ -1156,6 +1156,8 @@ define([
                     this._state.GradColor = color;
                 }
 
+                this.chShadow.setValue(!!shapeprops.asc_getShadow(), true);
+
                 this._noApply = false;
             }
         },
@@ -1466,6 +1468,13 @@ define([
             this.btnChangeShape.render( $('#shape-btn-change')) ;
             this.lockedControls.push(this.btnChangeShape);
 
+            this.chShadow = new Common.UI.CheckBox({
+                el: $('#shape-checkbox-shadow'),
+                labelText: this.strShadow
+            });
+            this.chShadow.on('change', _.bind(this.onCheckShadow, this));
+            this.lockedControls.push(this.chShadow);
+
             this.linkAdvanced = $('#shape-advanced-link');
             $(this.el).on('click', '#shape-advanced-link', _.bind(this.openAdvancedSettings, this));
         },
@@ -1591,6 +1600,16 @@ define([
             this.fireEvent('editcomplete', this);
         },
 
+        onCheckShadow: function(field, newValue, oldValue, eOpts) {
+            if (this.api)   {
+                var props = new Asc.asc_CShapeProperty();
+                props.asc_putShadow((field.getValue()=='checked') ? new Asc.asc_CShadowProperty() : null);
+                this.imgprops.put_ShapeProperties(props);
+                this.api.ImgApply(this.imgprops);
+            }
+            this.fireEvent('editcomplete', this);
+        },
+
         fillAutoShapes: function() {
             var me = this,
                 shapesStore = this.application.getCollection('ShapeGroups');
@@ -1854,6 +1873,7 @@ define([
         textHint270: 'Rotate 90° Counterclockwise',
         textHint90: 'Rotate 90° Clockwise',
         textHintFlipV: 'Flip Vertically',
-        textHintFlipH: 'Flip Horizontally'
+        textHintFlipH: 'Flip Horizontally',
+        strShadow: 'Show shadow'
     }, DE.Views.ShapeSettings || {}));
 });

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

@@ -231,7 +231,7 @@ define([
                 this.langMenu = new Common.UI.MenuSimple({
                     cls: 'lang-menu',
                     style: 'margin-top:-5px;',
-                    restoreHeight: 300,
+                    restoreHeight: 285,
                     itemTemplate: _.template([
                         '<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value.value %>" class="<% if (checked) { %> checked <% } %>">',
                             '<i class="icon <% if (spellcheck) { %> img-toolbarmenu spellcheck-lang <% } %>"></i>',
@@ -364,12 +364,13 @@ define([
 
                     this.langMenu.prevTip = info.value;
 
-                    var index = $parent.find('ul li a:contains("'+info.displayValue+'")').parent().index();
+                    var lang = _.find(this.langMenu.items, function(item) { return item.caption == info.displayValue; });
-                    if (index < 0) {
+                    if (lang) {
+                        this.langMenu.setChecked(this.langMenu.items.indexOf(lang), true);
+                    } else {
                         this.langMenu.saved = info.displayValue;
                         this.langMenu.clearAll();
-                    } else
+                    }
-                        this.langMenu.setChecked(index, true);
                 }
             },
 

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

@@ -2055,7 +2055,7 @@ define([
                 this.listStylesAdditionalMenuItem.setVisible(mode.canEditStyles);
                 this.btnContentControls.menu.items[4].setVisible(mode.canEditContentControl);
                 this.btnContentControls.menu.items[5].setVisible(mode.canEditContentControl);
-                this.mnuInsertImage.items[2].setVisible(this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
+                this.mnuInsertImage.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
             },
 
             onSendThemeColorSchemes: function (schemas) {
@@ -2278,7 +2278,7 @@ define([
             textTitleError: 'Error',
             textInsertPageNumber: 'Insert page number',
             textToCurrent: 'To Current Position',
-            tipEditHeader: 'Edit Document Header or Footer',
+            tipEditHeader: 'Edit header or footer',
             mniEditHeader: 'Edit Document Header',
             mniEditFooter: 'Edit Document Footer',
             mniHiddenChars: 'Nonprinting Characters',

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

@@ -49,12 +49,11 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
     DE.Views.WatermarkText = new(function() {
         var langs;
         var _get = function() {
-            if (langs)
+            return langs;
-                return langs;
+        };
-
+        var _load = function(callback) {
             langs = [];
-            try {
+            Common.Utils.loadConfig('resources/watermark/wm-text.json', function (langJson) {
-                var langJson = Common.Utils.getConfigJson('resources/watermark/wm-text.json');
                 for (var lang in langJson) {
                     var val = Common.util.LanguageInfo.getLocalLanguageCode(lang);
                     if (val) {
@@ -66,14 +65,12 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
                     if (a.shortname > b.shortname) return 1;
                     return 0;
                 });
-            }
+                callback && callback(langs);
-            catch (e) {
+            });
-            }
-
-            return langs;
         };
         return {
-            get: _get
+            get: _get,
+            load: _load
         };
     })();
 
@@ -114,7 +111,8 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
             this.textControls = [];
             this.imageControls = [];
             this.fontName = 'Arial';
-            this.lang = 'en';
+            this.lang = {value: 'en', displayValue: 'English'};
+            this.text = '';
             this.isAutoColor = false;
             this.isImageLoaded = false;
 
@@ -209,6 +207,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
                 scrollAlwaysVisible: true,
                 data        : []
             }).on('selected', _.bind(this.onSelectLang, this));
+            this.cmbLang.setValue(Common.util.LanguageInfo.getLocalLanguageName(9)[1]);//en
             this.textControls.push(this.cmbLang);
 
             this.cmbText = new Common.UI.ComboBox({
@@ -422,18 +421,27 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
         },
 
         loadLanguages: function() {
-            this.languages = DE.Views.WatermarkText.get();
+            var me = this;
-            var data = [];
+            var callback = function(languages) {
-            this.languages && this.languages.forEach(function(item) {
+                var data = [];
-                data.push({displayValue: item.name, value: item.shortname, wmtext: item.text});
+                me.languages = languages;
-            });
+                me.languages && me.languages.forEach(function(item) {
-            this.cmbLang.setData(data);
+                    data.push({displayValue: item.name, value: item.shortname, wmtext: item.text});
-            if (data.length) {
+                });
-                var item = this.cmbLang.store.findWhere({value: this.lang}) || this.cmbLang.store.at(0);
+                if (data.length) {
-                this.cmbLang.setValue(this.lang);
+                    me.cmbLang.setData(data);
-                this.onSelectLang(this.cmbLang, item.toJSON());
+                    me.cmbLang.setValue(me.lang.displayValue);
-            } else
+                    me.loadWMText(me.lang.value);
-                this.cmbLang.setDisabled(true);
+                    me.cmbLang.setDisabled(!me.radioText.getValue());
+                    me.text && me.cmbText.setValue(me.text);
+                } else
+                    me.cmbLang.setDisabled(true);
+            };
+            var languages = DE.Views.WatermarkText.get();
+            if (languages)
+                callback(languages);
+            else
+                DE.Views.WatermarkText.load(callback);
         },
 
         onSelectLang: function(combo, record) {
@@ -443,9 +451,11 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
             record.wmtext.forEach(function(item) {
                 data.push({value: item});
             });
-            this.lang = record.value;
+            this.lang = record;
-            this.cmbText.setData(data);
+            if (data.length>0) {
-            this.cmbText.setValue(data[0].value);
+                this.cmbText.setData(data);
+                this.cmbText.setValue(data[0].value);
+            }
         },
 
         loadWMText: function(lang) {
@@ -463,8 +473,10 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
             item && item.get('wmtext').forEach(function(item) {
                 data.push({value: item});
             });
-            this.cmbText.setData(data);
+            if (data.length>0) {
-            this.cmbText.setValue(data[0].value);
+                this.cmbText.setData(data);
+                this.cmbText.setValue(data[0].value);
+            }
         },
 
         insertFromUrl: function() {
@@ -504,7 +516,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
                     val = props.get_TextPr();
                     if (val) {
                         var lang = Common.util.LanguageInfo.getLocalLanguageName(val.get_Lang());
-                        this.lang = lang[0];
+                        this.lang = {value: lang[0], displayValue: lang[1]};
                         this.cmbLang.setValue(lang[1]);
                         this.loadWMText(lang[0]);
 
@@ -555,6 +567,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
                     }
                     val = props.get_Text();
                     val && this.cmbText.setValue(val);
+                    this.text = val || '';
                 }
                 this.disableControls(type);
             }
@@ -584,7 +597,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
                     val.put_Underline(this.btnUnderline.pressed);
                     val.put_Strikeout(this.btnStrikeout.pressed);
 
-                    val.put_Lang(parseInt(Common.util.LanguageInfo.getLocalLanguageCode(this.lang)));
+                    val.put_Lang(parseInt(Common.util.LanguageInfo.getLocalLanguageCode(this.lang.value)));
 
                     var color = new Asc.asc_CColor();
                     if (this.isAutoColor) {
@@ -610,7 +623,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
             _.each(this.textControls, function(item) {
                 item.setDisabled(disable);
             });
-            this.cmbLang.setDisabled(disable || this.languages.length<1);
+            this.cmbLang.setDisabled(disable || !this.languages || this.languages.length<1);
             this.btnOk.setDisabled(type==Asc.c_oAscWatermarkType.Image && !this.isImageLoaded);
         },
 

apps/documenteditor/main/index.html

@@ -19,7 +19,7 @@
             overflow: hidden;
             border: none;
             background-color: #f4f4f4;
-            z-index: 10000;
+            z-index: 1001;
         }
 
         .loadmask {

apps/documenteditor/main/index.html.deploy

@@ -20,7 +20,7 @@
             overflow: hidden;
             border: none;
             background-color: #f4f4f4;
-            z-index: 10000;
+            z-index: 1001;
         }
 
         .loader-page {

apps/documenteditor/main/locale/bg.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Внимание",
   "Common.Controllers.Chat.textEnterMessage": "Въведете съобщението си тук",
-  "Common.Controllers.Chat.textUserLimit": "Използвате ONLYOFFICE Free Edition. <br> Само двама потребители могат да редактират документа едновременно. <br> Искате ли повече? Помислете за закупуване на ONLYOFFICE Enterprise Edition. <br> <a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\"> Прочетете повече </a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Анонимен",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Затвори",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Обектът е деактивиран, защото се редактира от друг потребител.",
@@ -333,7 +332,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Превишава се времето на изтичане на реализация. ",
   "DE.Controllers.Main.criticalErrorExtText": "Натиснете \"OK\", за да се върнете към списъка с документи.",
   "DE.Controllers.Main.criticalErrorTitle": "Грешка",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Редактор на документи",
   "DE.Controllers.Main.downloadErrorText": "Изтеглянето се провали.",
   "DE.Controllers.Main.downloadMergeText": "Изтегля се ...",
   "DE.Controllers.Main.downloadMergeTitle": "Изтеглянето",
@@ -342,7 +340,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Опитвате се да извършите действие, за което нямате права. <br> Моля, свържете се с администратора на сървъра за документи.",
   "DE.Controllers.Main.errorBadImageUrl": "URL адресът на изображението е неправилен",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Връзката със сървъра е загубена. Документът не може да бъде редактиран в момента.",
-  "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си. <br> Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа. <br> <br> Намерете повече информация за свързването на сървър за документи <a href = \"https: //api.onlyoffice.com/editors/callback \"target =\" _ blank \"> тук </a>",
+  "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.<br>Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа. <br><br>Намерете повече информация за свързването на сървър за документи <a href=\"%1\" target=\"_blank\">тук</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Външна грешка. <br> Грешка при свързване към база данни. Моля, свържете се с екипа за поддръжка, в случай че грешката продължава.",
   "DE.Controllers.Main.errorDataEncrypted": "Получени са криптирани промени, които не могат да бъдат дешифрирани.",
   "DE.Controllers.Main.errorDataRange": "Неправилен обхват от данни.",
@@ -1346,7 +1344,6 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Приложение",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Промяна на правото за достъп",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Дата на създаването",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Зареждане...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Страници",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Параграфи",

apps/documenteditor/main/locale/cs.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Varování",
   "Common.Controllers.Chat.textEnterMessage": "Zde napište svou zprávu",
-  "Common.Controllers.Chat.textUserLimit": "Používáte ONLYOFFICE bezplatnou edici.<br>Pouze dva uživatelé mohou zároveň upravovat dokument.<br>Chcete více? Zvažte zakoupení ONLYOFFICE Enterprise edice.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Více informací</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymní",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Zavřít",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je vypnut, protože je upravován jiným uživatelem.",
@@ -243,7 +242,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Vypršel čas konverze.",
   "DE.Controllers.Main.criticalErrorExtText": "Kliněte na \"OK\" pro návrat k seznamu dokumentů",
   "DE.Controllers.Main.criticalErrorTitle": "Chyba",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Editor dokumentů",
   "DE.Controllers.Main.downloadErrorText": "Stahování selhalo.",
   "DE.Controllers.Main.downloadMergeText": "Stahování...",
   "DE.Controllers.Main.downloadMergeTitle": "Stahuji",
@@ -252,7 +250,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.<br>Prosím, kontaktujte administrátora vašeho Dokumentového serveru.",
   "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávná",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Spojení se serverem ztraceno. Dokument nyní nelze upravovat.",
-  "DE.Controllers.Main.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.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.<br> Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.<br><br> Více informací o připojení najdete v Dokumentovém serveru <a href=\"%1\" target=\"_blank\">here</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Externí chyba.<br>Chyba spojení s databází. Prosím kontaktujte podporu, pokud chyba přetrvává.",
   "DE.Controllers.Main.errorDataRange": "Nesprávný datový rozsah.",
   "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1",
@@ -969,7 +967,6 @@
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nejsou zde žádné šablony.",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Změnit přístupová práva",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Datum vytvoření",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Nahrávám ...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Stránky",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Odstavce",

apps/documenteditor/main/locale/de.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Achtung",
   "Common.Controllers.Chat.textEnterMessage": "Geben Sie Ihre Nachricht hier ein",
-  "Common.Controllers.Chat.textUserLimit": "Sie benutzen ONLYOFFICE Free Edition.<br>Nur zwei Benutzer können das Dokument gleichzeitig bearbeiten.<br>Möchten Sie mehr? Erwerben Sie kommerzielle Version von ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Lesen Sie mehr davon</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonym",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Schließen",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Das Objekt ist deaktiviert, weil es momentan von einem anderen Benutzer bearbeitet wird.",
@@ -333,7 +332,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Timeout für die Konvertierung wurde überschritten.",
   "DE.Controllers.Main.criticalErrorExtText": "Klicken Sie auf \"OK\", um in die Dokumentenliste zu gelangen.",
   "DE.Controllers.Main.criticalErrorTitle": "Fehler",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Herunterladen ist fehlgeschlagen.",
   "DE.Controllers.Main.downloadMergeText": "Wird heruntergeladen...",
   "DE.Controllers.Main.downloadMergeTitle": "Wird heruntergeladen",
@@ -342,7 +340,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Sie haben versucht die Änderungen im Dokument, zu dem Sie keine Berechtigungen haben, vorzunehemen.<br>Wenden Sie sich an Ihren Serveradministrator.",
   "DE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Das Dokument kann momentan nicht bearbeitet werden.",
-  "DE.Controllers.Main.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.<br><br>Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
+  "DE.Controllers.Main.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.<br><br>Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie <a href=\"%1\" target=\"_blank\">hier</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Fehler beim Verbinden zur Datenbank. Bitte wenden Sie sich an den Kundendienst, falls der Fehler bestehen bleibt.",
   "DE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.",
   "DE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",
@@ -1346,7 +1344,6 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Anwendung",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Verfasser",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Zugriffsrechte ändern",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Erstellungsdatum",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Ladevorgang...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Seiten",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Absätze",

apps/documenteditor/main/locale/en.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Warning",
   "Common.Controllers.Chat.textEnterMessage": "Enter your message here",
-  "del_Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymous",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Close",
   "Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.",
@@ -163,11 +162,11 @@
   "Common.Views.Header.tipRedo": "Redo",
   "Common.Views.Header.tipSave": "Save",
   "Common.Views.Header.tipUndo": "Undo",
+  "Common.Views.Header.tipUndock": "Undock into separate window",
   "Common.Views.Header.tipViewSettings": "View settings",
   "Common.Views.Header.tipViewUsers": "View users and manage document access rights",
   "Common.Views.Header.txtAccessRights": "Change access rights",
   "Common.Views.Header.txtRename": "Rename",
-  "Common.Views.Header.tipUndock": "Undock into separate window",
   "Common.Views.History.textCloseHistory": "Close History",
   "Common.Views.History.textHide": "Collapse",
   "Common.Views.History.textHideAll": "Hide detailed changes",
@@ -330,12 +329,12 @@
   "DE.Controllers.LeftMenu.txtUntitled": "Untitled",
   "DE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?",
   "DE.Controllers.LeftMenu.warnDownloadAsRTF": "If you continue saving in this format some of the formatting might be lost.<br>Are you sure you want to continue?",
+  "DE.Controllers.LeftMenu.txtCompatible": "The document will be saved to the new format. It will allow to use all the editor features, but might affect the document layout.<br>Use the 'Compatibility' option of the advanced settings if you want to make the files compatible with older MS Word versions.",
   "DE.Controllers.Main.applyChangesTextText": "Loading the changes...",
   "DE.Controllers.Main.applyChangesTitleText": "Loading the Changes",
   "DE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
   "DE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.",
   "DE.Controllers.Main.criticalErrorTitle": "Error",
-  "del_DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Download failed.",
   "DE.Controllers.Main.downloadMergeText": "Downloading...",
   "DE.Controllers.Main.downloadMergeTitle": "Downloading",
@@ -1101,6 +1100,7 @@
   "DE.Views.DocumentHolder.hyperlinkText": "Hyperlink",
   "DE.Views.DocumentHolder.ignoreAllSpellText": "Ignore All",
   "DE.Views.DocumentHolder.ignoreSpellText": "Ignore",
+  "DE.Views.DocumentHolder.toDictionaryText": "Add to Dictionary",
   "DE.Views.DocumentHolder.imageText": "Image Advanced Settings",
   "DE.Views.DocumentHolder.insertColumnLeftText": "Column Left",
   "DE.Views.DocumentHolder.insertColumnRightText": "Column Right",
@@ -1277,6 +1277,7 @@
   "DE.Views.DocumentHolder.txtUngroup": "Ungroup",
   "DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
   "DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
+  "DE.Views.DocumentHolder.txtPrintSelection": "Print Selection",
   "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Cancel",
   "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
   "DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
@@ -1345,17 +1346,16 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Create a new blank text document which you will be able to style and format after it is created during the editing. Or choose one of the templates to start a document of a certain type or purpose where some styles have already been pre-applied.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "New Text Document",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "There are no templates",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Application",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Add Author",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Add Text",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Application",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Author",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Change access rights",
   "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Comment",
-  "del_DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Creation Date",
   "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Created",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Loading...",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Last Modified",
   "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Last Modified By",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Last Modified",
   "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Owner",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Pages",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Paragraphs",
@@ -1423,6 +1423,8 @@
   "DE.Views.FileMenuPanels.Settings.txtPt": "Point",
   "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spell Checking",
   "DE.Views.FileMenuPanels.Settings.txtWin": "as Windows",
+  "DE.Views.FileMenuPanels.Settings.textCompatible": "Compatibility",
+  "DE.Views.FileMenuPanels.Settings.textOldVersions": "Make the files compatible with older MS Word versions when saved as DOCX",
   "DE.Views.HeaderFooterSettings.textBottomCenter": "Bottom center",
   "DE.Views.HeaderFooterSettings.textBottomLeft": "Bottom left",
   "DE.Views.HeaderFooterSettings.textBottomPage": "Bottom of Page",
@@ -1706,7 +1708,6 @@
   "DE.Views.ParagraphSettingsAdvanced.strBorders": "Borders & Fill",
   "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Page break before",
   "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double strikethrough",
-  "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "First Line",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Left",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Right",
   "DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Keep lines together",
@@ -1714,7 +1715,7 @@
   "DE.Views.ParagraphSettingsAdvanced.strMargins": "Paddings",
   "DE.Views.ParagraphSettingsAdvanced.strOrphan": "Orphan control",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Font",
-  "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indents & Placement",
+  "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indents & Spacing",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Placement",
   "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Small caps",
   "DE.Views.ParagraphSettingsAdvanced.strStrike": "Strikethrough",
@@ -1755,6 +1756,26 @@
   "DE.Views.ParagraphSettingsAdvanced.tipRight": "Set right border only",
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Set top border only",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "No borders",
+  "DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Line & Page Breaks",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Before",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "After",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Line Spacing",
+  "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
+  "DE.Views.ParagraphSettingsAdvanced.textAuto": "Multiple",
+  "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "At least",
+  "DE.Views.ParagraphSettingsAdvanced.textExact": "Exactly",
+  "DE.Views.ParagraphSettingsAdvanced.strSomeParagraphSpace": "Don't add interval between paragraphs of the same style",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Special",
+  "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(none)",
+  "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "First line",
+  "DE.Views.ParagraphSettingsAdvanced.textHanging": "Hanging",
+  "DE.Views.ParagraphSettingsAdvanced.textCentered": "Centered",
+  "DE.Views.ParagraphSettingsAdvanced.textJustified": "Justified",
+  "DE.Views.ParagraphSettingsAdvanced.textBodyText": "BodyText",
+  "DE.Views.ParagraphSettingsAdvanced.textLevel": "Level ",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Outline level",
+  "DE.Views.ParagraphSettingsAdvanced.strIndent": "Indents",
+  "DE.Views.ParagraphSettingsAdvanced.strSpacing": "Spacing",
   "DE.Views.RightMenu.txtChartSettings": "Chart settings",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Header and footer settings",
   "DE.Views.RightMenu.txtImageSettings": "Image settings",
@@ -1821,6 +1842,7 @@
   "DE.Views.ShapeSettings.txtTight": "Tight",
   "DE.Views.ShapeSettings.txtTopAndBottom": "Top and bottom",
   "DE.Views.ShapeSettings.txtWood": "Wood",
+  "DE.Views.ShapeSettings.strShadow": "Show shadow",
   "DE.Views.SignatureSettings.notcriticalErrorTitle": "Warning",
   "DE.Views.SignatureSettings.strDelete": "Remove Signature",
   "DE.Views.SignatureSettings.strDetails": "Signature Details",
@@ -2039,6 +2061,7 @@
   "DE.Views.Toolbar.capBtnMargins": "Margins",
   "DE.Views.Toolbar.capBtnPageOrient": "Orientation",
   "DE.Views.Toolbar.capBtnPageSize": "Size",
+  "DE.Views.Toolbar.capBtnWatermark": "Watermark",
   "DE.Views.Toolbar.capImgAlign": "Align",
   "DE.Views.Toolbar.capImgBackward": "Send Backward",
   "DE.Views.Toolbar.capImgForward": "Bring Forward",
@@ -2070,6 +2093,7 @@
   "DE.Views.Toolbar.textColumnsThree": "Three",
   "DE.Views.Toolbar.textColumnsTwo": "Two",
   "DE.Views.Toolbar.textContPage": "Continuous Page",
+  "DE.Views.Toolbar.textEditWatermark": "Custom Watermark",
   "DE.Views.Toolbar.textEvenPage": "Even Page",
   "DE.Views.Toolbar.textInMargin": "In Margin",
   "DE.Views.Toolbar.textInsColumnBreak": "Insert Column Break",
@@ -2100,6 +2124,7 @@
   "DE.Views.Toolbar.textPoint": "XY (Scatter)",
   "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRemoveControl": "Remove content control",
+  "DE.Views.Toolbar.textRemWatermark": "Remove Watermark",
   "DE.Views.Toolbar.textRichControl": "Insert rich text content control",
   "DE.Views.Toolbar.textRight": "Right: ",
   "DE.Views.Toolbar.textStock": "Stock",
@@ -2181,6 +2206,7 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Nonprinting characters",
   "DE.Views.Toolbar.tipSynchronize": "The document has been changed by another user. Please click to save your changes and reload the updates.",
   "DE.Views.Toolbar.tipUndo": "Undo",
+  "DE.Views.Toolbar.tipWatermark": "Edit watermark",
   "DE.Views.Toolbar.txtDistribHor": "Distribute Horizontally",
   "DE.Views.Toolbar.txtDistribVert": "Distribute Vertically",
   "DE.Views.Toolbar.txtMarginAlign": "Align to Margin",
@@ -2207,33 +2233,29 @@
   "DE.Views.Toolbar.txtScheme7": "Equity",
   "DE.Views.Toolbar.txtScheme8": "Flow",
   "DE.Views.Toolbar.txtScheme9": "Foundry",
-  "DE.Views.Toolbar.capBtnWatermark": "Watermark",
-  "DE.Views.Toolbar.textEditWatermark": "Custom Watermark",
-  "DE.Views.Toolbar.textRemWatermark": "Remove Watermark",
-  "DE.Views.Toolbar.tipWatermark": "Edit watermark",
-  "DE.Views.WatermarkSettingsDialog.textTitle": "Watermark Settings",
-  "DE.Views.WatermarkSettingsDialog.textNone": "None",
-  "DE.Views.WatermarkSettingsDialog.textImageW": "Image watermark",
-  "DE.Views.WatermarkSettingsDialog.textTextW": "Text watermark",
-  "DE.Views.WatermarkSettingsDialog.textFromUrl": "From URL",
-  "DE.Views.WatermarkSettingsDialog.textFromFile": "From File",
-  "DE.Views.WatermarkSettingsDialog.textScale": "Scale",
-  "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
-  "DE.Views.WatermarkSettingsDialog.textText": "Text",
-  "DE.Views.WatermarkSettingsDialog.textFont": "Font",
-  "DE.Views.WatermarkSettingsDialog.tipFontName": "Font Name",
-  "DE.Views.WatermarkSettingsDialog.tipFontSize": "Font Size",
-  "DE.Views.WatermarkSettingsDialog.textBold": "Bold",
-  "DE.Views.WatermarkSettingsDialog.textItalic": "Italic",
-  "DE.Views.WatermarkSettingsDialog.textUnderline": "Underline",
-  "DE.Views.WatermarkSettingsDialog.textStrikeout": "Strikeout",
-  "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparent",
-  "DE.Views.WatermarkSettingsDialog.textLayout": "Layout",
-  "DE.Views.WatermarkSettingsDialog.textDiagonal": "Diagonal",
-  "DE.Views.WatermarkSettingsDialog.textHor": "Horizontal",
   "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Cancel",
-  "DE.Views.WatermarkSettingsDialog.okButtonText": "Ok",
+  "DE.Views.WatermarkSettingsDialog.okButtonText": "OK",
+  "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
+  "DE.Views.WatermarkSettingsDialog.textBold": "Bold",
   "DE.Views.WatermarkSettingsDialog.textColor": "Text color",
+  "DE.Views.WatermarkSettingsDialog.textDiagonal": "Diagonal",
+  "DE.Views.WatermarkSettingsDialog.textFont": "Font",
+  "DE.Views.WatermarkSettingsDialog.textFromFile": "From File",
+  "DE.Views.WatermarkSettingsDialog.textFromUrl": "From URL",
+  "DE.Views.WatermarkSettingsDialog.textHor": "Horizontal",
+  "DE.Views.WatermarkSettingsDialog.textImageW": "Image watermark",
+  "DE.Views.WatermarkSettingsDialog.textItalic": "Italic",
+  "DE.Views.WatermarkSettingsDialog.textLanguage": "Language",
+  "DE.Views.WatermarkSettingsDialog.textLayout": "Layout",
   "DE.Views.WatermarkSettingsDialog.textNewColor": "Add New Custom Color",
-  "DE.Views.WatermarkSettingsDialog.textLanguage": "Language"
+  "DE.Views.WatermarkSettingsDialog.textNone": "None",
+  "DE.Views.WatermarkSettingsDialog.textScale": "Scale",
+  "DE.Views.WatermarkSettingsDialog.textStrikeout": "Strikeout",
+  "DE.Views.WatermarkSettingsDialog.textText": "Text",
+  "DE.Views.WatermarkSettingsDialog.textTextW": "Text watermark",
+  "DE.Views.WatermarkSettingsDialog.textTitle": "Watermark Settings",
+  "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparent",
+  "DE.Views.WatermarkSettingsDialog.textUnderline": "Underline",
+  "DE.Views.WatermarkSettingsDialog.tipFontName": "Font Name",
+  "DE.Views.WatermarkSettingsDialog.tipFontSize": "Font Size"
 }

apps/documenteditor/main/locale/es.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Aviso",
   "Common.Controllers.Chat.textEnterMessage": "Introduzca su mensaje aquí",
-  "Common.Controllers.Chat.textUserLimit": "Usted está usando la edición ONLYOFFICE gratuita.<br>Sólo dos usuarios pueden editar el documento simultáneamente.<br>¿Quiere más? Compre ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Saber más</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anónimo",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Cerrar",
   "Common.Controllers.ExternalDiagramEditor.warningText": "El objeto está desactivado porque se está editando por otro usuario.",
@@ -163,6 +162,7 @@
   "Common.Views.Header.tipRedo": "Rehacer",
   "Common.Views.Header.tipSave": "Guardar",
   "Common.Views.Header.tipUndo": "Deshacer",
+  "Common.Views.Header.tipUndock": "Desacoplar en una ventana independiente",
   "Common.Views.Header.tipViewSettings": "Mostrar ajustes",
   "Common.Views.Header.tipViewUsers": "Ver usuarios y administrar derechos de acceso al documento",
   "Common.Views.Header.txtAccessRights": "Cambiar derechos de acceso",
@@ -333,7 +333,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Tiempo de conversión está superado.",
   "DE.Controllers.Main.criticalErrorExtText": "Pulse \"OK\" para regresar al documento.",
   "DE.Controllers.Main.criticalErrorTitle": "Error",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Error de descarga.",
   "DE.Controllers.Main.downloadMergeText": "Descargando...",
   "DE.Controllers.Main.downloadMergeTitle": "Descargando",
@@ -342,7 +341,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Usted no tiene permisos para realizar la acción que está intentando hacer.<br> Por favor, contacte con el Administrador del Servidor de Documentos.",
   "DE.Controllers.Main.errorBadImageUrl": "URL de imagen es incorrecto",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Se ha perdido la conexión con servidor. El documento no puede ser editado ahora.",
-  "DE.Controllers.Main.errorConnectToServer": "No se pudo guardar el documento. Por favor, compruebe la configuración de conexión o póngase en contacto con el administrador.<br>Al hacer clic en el botón \"Aceptar\", se le pedirá que descargue el documento.<br> Encuentre más información acerca de la conexión Servidor de Documentos<a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">aquí</a>",
+  "DE.Controllers.Main.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.<br><br>Encuentre más información acerca de la conexión de Servidor de Documentos <a href=\"%1\" target=\"_blank\">aquí</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Error externo.<br>Error de conexión de base de datos. Por favor póngase en contacto con soporte si el error se mantiene.",
   "DE.Controllers.Main.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.",
   "DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.",
@@ -409,7 +408,7 @@
   "DE.Controllers.Main.textContactUs": "Contactar con equipo de ventas",
   "DE.Controllers.Main.textCustomLoader": "Note, por favor, que según los términos de la licencia Usted no tiene derecho a cambiar el cargador.<br>Por favor, póngase en contacto con nuestro Departamento de Ventas para obtener una cotización.",
   "DE.Controllers.Main.textLoadingDocument": "Cargando documento",
-  "DE.Controllers.Main.textNoLicenseTitle": "Conexión ONLYOFFICE",
+  "DE.Controllers.Main.textNoLicenseTitle": "%1 limitación de conexiones",
   "DE.Controllers.Main.textPaidFeature": "Función de pago",
   "DE.Controllers.Main.textShape": "Forma",
   "DE.Controllers.Main.textStrict": "Modo estricto",
@@ -661,8 +660,8 @@
   "DE.Controllers.Main.warnLicenseExceeded": "Se ha excedido el número permitido de las conexiones simultáneas al servidor de documentos, y el documento se abrirá para sólo lectura.<br>Por favor, contacte con su administrador para recibir más información.",
   "DE.Controllers.Main.warnLicenseExp": "Su licencia ha expirado.<br>Por favor, actualice su licencia y después recargue la página.",
   "DE.Controllers.Main.warnLicenseUsersExceeded": "Se ha excedido el número permitido de los usuarios simultáneos, y el documento se abrirá para sólo lectura.<br>Por favor, contacte con su administrador para recibir más información.",
-  "DE.Controllers.Main.warnNoLicense": "Esta versión de los Editores de ONLYOFFICE tiene ciertas limitaciones para el número de conexiones simultáneas al servidor de documentos.<br>Si se requiere más, por favor, considere comprar una licencia comercial.",
+  "DE.Controllers.Main.warnNoLicense": "Esta versión de los editores %1 tiene ciertas limitaciones para el número de conexiones simultáneas al servidor de documentos.<br>Si necesita más, por favor, considere comprar una licencia comercial.",
-  "DE.Controllers.Main.warnNoLicenseUsers": "Esta versión de Editores de ONLYOFFICE tiene ciertas limitaciones para usuarios simultáneos.<br>Si se requiere más, por favor, considere comprar una licencia comercial.",
+  "DE.Controllers.Main.warnNoLicenseUsers": "Esta versión de editores %1 tiene ciertas limitaciones para usuarios simultáneos.<br>Si necesita más, por favor, considere comprar una licencia comercial.",
   "DE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado",
   "DE.Controllers.Navigation.txtBeginning": "Principio del documento",
   "DE.Controllers.Navigation.txtGotoBeginning": "Ir al principio de",
@@ -1343,19 +1342,27 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Cree un nuevo documento de texto en blanco para trabajar con el estilo y el formato y editarlo según sus necesidades. O seleccione una de las plantillas para iniciar documento de cierto tipo o propósito donde algunos estilos se han aplicado ya.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nuevo documento de texto",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "No hay ningunas plantillas",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Añadir autor",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Añadir texto",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Aplicación",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Cambiar derechos de acceso",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Fecha de creación",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Comentario",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Creado",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Cargando...",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Última modificación por",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Última modificación",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Propietario",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Páginas",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Párrafos",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Ubicación",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Personas que tienen derechos",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Símbolos con espacios",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Estadísticas",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Asunto",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Símbolos",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Título de documento",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Título",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Subido",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Palabras",
   "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Cambiar derechos de acceso",
   "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Personas que tienen derechos",
@@ -2028,6 +2035,7 @@
   "DE.Views.Toolbar.capBtnMargins": "Márgenes",
   "DE.Views.Toolbar.capBtnPageOrient": "Orientación",
   "DE.Views.Toolbar.capBtnPageSize": "Tamaño",
+  "DE.Views.Toolbar.capBtnWatermark": "Marca de agua",
   "DE.Views.Toolbar.capImgAlign": "Alinear",
   "DE.Views.Toolbar.capImgBackward": "Enviar atrás",
   "DE.Views.Toolbar.capImgForward": "Una capa adelante",
@@ -2059,6 +2067,7 @@
   "DE.Views.Toolbar.textColumnsThree": "Tres",
   "DE.Views.Toolbar.textColumnsTwo": "Dos",
   "DE.Views.Toolbar.textContPage": "Página continua",
+  "DE.Views.Toolbar.textEditWatermark": "Marca de agua personalizada",
   "DE.Views.Toolbar.textEvenPage": "Página par",
   "DE.Views.Toolbar.textInMargin": "En margen",
   "DE.Views.Toolbar.textInsColumnBreak": "Insertar Grieta de Columna",
@@ -2089,6 +2098,7 @@
   "DE.Views.Toolbar.textPoint": "XY (Dispersión)",
   "DE.Views.Toolbar.textPortrait": "Vertical",
   "DE.Views.Toolbar.textRemoveControl": "Elimine el control de contenido",
+  "DE.Views.Toolbar.textRemWatermark": "Quitar marca de agua",
   "DE.Views.Toolbar.textRichControl": "Introducir contenido de texto rico",
   "DE.Views.Toolbar.textRight": "Derecho: ",
   "DE.Views.Toolbar.textStock": "De cotizaciones",
@@ -2170,6 +2180,7 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Caracteres no imprimibles",
   "DE.Views.Toolbar.tipSynchronize": "El documento ha sido cambiado por otro usuario. Por favor haga clic para guardar sus cambios y recargue las actualizaciones.",
   "DE.Views.Toolbar.tipUndo": "Deshacer",
+  "DE.Views.Toolbar.tipWatermark": "Editar marca de agua",
   "DE.Views.Toolbar.txtDistribHor": "Distribuir horizontalmente",
   "DE.Views.Toolbar.txtDistribVert": "Distribuir verticalmente",
   "DE.Views.Toolbar.txtMarginAlign": "Alinear al margen",
@@ -2195,5 +2206,30 @@
   "DE.Views.Toolbar.txtScheme6": "Concurrencia",
   "DE.Views.Toolbar.txtScheme7": "Equidad ",
   "DE.Views.Toolbar.txtScheme8": "Flujo",
-  "DE.Views.Toolbar.txtScheme9": "Fundición"
+  "DE.Views.Toolbar.txtScheme9": "Fundición",
+  "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Cancelar",
+  "DE.Views.WatermarkSettingsDialog.okButtonText": "OK",
+  "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
+  "DE.Views.WatermarkSettingsDialog.textBold": "Negrita",
+  "DE.Views.WatermarkSettingsDialog.textColor": "Color de texto",
+  "DE.Views.WatermarkSettingsDialog.textDiagonal": "Diagonal",
+  "DE.Views.WatermarkSettingsDialog.textFont": "Fuente",
+  "DE.Views.WatermarkSettingsDialog.textFromFile": "De archivo",
+  "DE.Views.WatermarkSettingsDialog.textFromUrl": "De URL",
+  "DE.Views.WatermarkSettingsDialog.textHor": "Horizontal ",
+  "DE.Views.WatermarkSettingsDialog.textImageW": "Marca de agua de imagen",
+  "DE.Views.WatermarkSettingsDialog.textItalic": "Cursiva",
+  "DE.Views.WatermarkSettingsDialog.textLanguage": "Idioma",
+  "DE.Views.WatermarkSettingsDialog.textLayout": "Disposición",
+  "DE.Views.WatermarkSettingsDialog.textNewColor": "Añadir nuevo color personalizado",
+  "DE.Views.WatermarkSettingsDialog.textNone": "Ninguno",
+  "DE.Views.WatermarkSettingsDialog.textScale": "Escala",
+  "DE.Views.WatermarkSettingsDialog.textStrikeout": "Tachado",
+  "DE.Views.WatermarkSettingsDialog.textText": "Texto",
+  "DE.Views.WatermarkSettingsDialog.textTextW": "Marca de agua de texto",
+  "DE.Views.WatermarkSettingsDialog.textTitle": "Ajustes de Marca de agua",
+  "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparente",
+  "DE.Views.WatermarkSettingsDialog.textUnderline": "Subrayado",
+  "DE.Views.WatermarkSettingsDialog.tipFontName": "Nombre de fuente",
+  "DE.Views.WatermarkSettingsDialog.tipFontSize": "Tamaño de fuente"
 }

apps/documenteditor/main/locale/fr.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Avertissement",
   "Common.Controllers.Chat.textEnterMessage": "Entrez votre message ici",
-  "Common.Controllers.Chat.textUserLimit": "Vous êtes en train d'utiliser ONLYOFFICE Free Edition.<br>Ce ne sont que deux utilisateurs qui peuvent éditer le document simultanément.<br>Voulez plus ? Envisagez d'acheter ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">En savoir plus</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonyme",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Fermer",
   "Common.Controllers.ExternalDiagramEditor.warningText": "L'objet est désactivé car il est en cours de modification par un autre utilisateur.",
@@ -334,7 +333,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Délai de conversion expiré.",
   "DE.Controllers.Main.criticalErrorExtText": "Cliquez sur \"OK\" pour revenir à la liste des documents.",
   "DE.Controllers.Main.criticalErrorTitle": "Erreur",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Échec du téléchargement.",
   "DE.Controllers.Main.downloadMergeText": "Téléchargement en cours...",
   "DE.Controllers.Main.downloadMergeTitle": "Téléchargement en cours",
@@ -343,7 +341,7 @@
   "DE.Controllers.Main.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.Main.errorBadImageUrl": "L'URL de l'image est incorrecte",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Connexion au serveur perdue. Le document ne peut être modifié en ce moment.",
-  "DE.Controllers.Main.errorConnectToServer": "Le document n'a pas pu être enregistré. Veuillez vérifier les paramètres de connexion ou contactez votre administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.<br><br>Trouvez plus d'informations sur la connexion de Document Server<a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">ici</a>",
+  "DE.Controllers.Main.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.<br><br>Trouvez plus d'informations sur la connexion au Serveur de Documents <a href=\"%1\" target=\"_blank\">ici</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Erreur externe.<br>Erreur de connexion à la base de données. Si l'erreur persiste veillez contactez l'assistance technique.",
   "DE.Controllers.Main.errorDataEncrypted": "Les modifications chiffrées ont été reçues, elle ne peuvent pas être déchiffrées.",
   "DE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
@@ -1344,10 +1342,13 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Créez un nouveau document texte vierge que vous serez en mesure de styliser et de formater après sa création au cours de la modification. Ou choisissez un des modèles où certains styles sont déjà pré-appliqués pour commencer un document d'un certain type ou objectif.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nouveau document texte ",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Pas de modèles",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Ajouter un auteur",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Ajouter du texte",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Application",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Auteur",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Changer les droits d'accès",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Date de création",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Commentaire",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Créé",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Chargement en cours...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Pages",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Paragraphes",
@@ -1357,6 +1358,7 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistiques",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Symboles",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titre du document",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Chargé",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Mots",
   "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Changer les droits d'accès",
   "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Personnes qui ont des droits",
@@ -2029,6 +2031,7 @@
   "DE.Views.Toolbar.capBtnMargins": "Marges",
   "DE.Views.Toolbar.capBtnPageOrient": "Orientation",
   "DE.Views.Toolbar.capBtnPageSize": "Taille",
+  "DE.Views.Toolbar.capBtnWatermark": "Filigrane",
   "DE.Views.Toolbar.capImgAlign": "Aligner",
   "DE.Views.Toolbar.capImgBackward": "Reculer",
   "DE.Views.Toolbar.capImgForward": "Déplacer vers l'avant",
@@ -2060,6 +2063,7 @@
   "DE.Views.Toolbar.textColumnsThree": "Trois",
   "DE.Views.Toolbar.textColumnsTwo": "Deux",
   "DE.Views.Toolbar.textContPage": "Page continue",
+  "DE.Views.Toolbar.textEditWatermark": "Filigrane personnalisé",
   "DE.Views.Toolbar.textEvenPage": "Page paire",
   "DE.Views.Toolbar.textInMargin": "Dans la Marge",
   "DE.Views.Toolbar.textInsColumnBreak": "Insérer un saut de colonne",
@@ -2196,5 +2200,14 @@
   "DE.Views.Toolbar.txtScheme6": "Rotonde",
   "DE.Views.Toolbar.txtScheme7": "Capitaux",
   "DE.Views.Toolbar.txtScheme8": "Flux",
-  "DE.Views.Toolbar.txtScheme9": "Fonderie"
+  "DE.Views.Toolbar.txtScheme9": "Fonderie",
+  "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Annuler",
+  "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
+  "DE.Views.WatermarkSettingsDialog.textBold": "Gras",
+  "DE.Views.WatermarkSettingsDialog.textColor": "Couleur du texte",
+  "DE.Views.WatermarkSettingsDialog.textNewColor": "Ajouter une nouvelle couleur personnalisée",
+  "DE.Views.WatermarkSettingsDialog.textText": "Texte",
+  "DE.Views.WatermarkSettingsDialog.textTextW": "Filigrane de texte",
+  "DE.Views.WatermarkSettingsDialog.textTitle": "Paramètres de filigrane",
+  "DE.Views.WatermarkSettingsDialog.textUnderline": "Souligné"
 }

apps/documenteditor/main/locale/hu.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Figyelmeztetés",
   "Common.Controllers.Chat.textEnterMessage": "Írja be ide az üzenetet",
-  "Common.Controllers.Chat.textUserLimit": "Ön az ONLYOFFICE Ingyenes Kiadást használja.<br>Csak két felhasználó szerkesztheti egyszerre a dokumentumot.<br>Többet szeretne? Fontolja meg az ONLYOFFICE Vállalati Kiadás megvásárlását<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Tudjon meg többet</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Névtelen",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Bezár",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Az objektum le van tiltva, mert azt egy másik felhasználó szerkeszti.",
@@ -326,7 +325,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Időtúllépés az átalakítás során.",
   "DE.Controllers.Main.criticalErrorExtText": "Nyomja meg az \"OK\" gombot a dokumentumlistához való visszatéréshez.",
   "DE.Controllers.Main.criticalErrorTitle": "Hiba",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Dokumentum Szerkesztő",
   "DE.Controllers.Main.downloadErrorText": "Sikertelen letöltés.",
   "DE.Controllers.Main.downloadMergeText": "Letöltés...",
   "DE.Controllers.Main.downloadMergeTitle": "Letöltés",
@@ -335,7 +333,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.<br>Vegye fel a kapcsolatot a Document Server adminisztrátorával.",
   "DE.Controllers.Main.errorBadImageUrl": "Hibás kép URL",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Elveszett a kapcsolat a szerverrel. A dokumentum jelenleg nem szerkeszthető.",
-  "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.<br>Ha az 'OK'-ra kattint letöltheti a dokumentumot.<br><br>Bővebb információk a Dokumentum Szerverhez kapcsolódásról <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">itt</a> találhat.",
+  "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.<br>Ha az 'OK'-ra kattint letöltheti a dokumentumot.<br><br>Bővebb információk a Dokumentum Szerverhez kapcsolódásról <a href=\"%1\" target=\"_blank\">itt</a> találhat.",
   "DE.Controllers.Main.errorDatabaseConnection": "Külső hiba.<br>Adatbázis-kapcsolati hiba. Ha a hiba továbbra is fennáll, lépjen kapcsolatba a rendszer támogatással.",
   "DE.Controllers.Main.errorDataEncrypted": "Titkosított változások érkeztek, melyek feloldása sikertelen.",
   "DE.Controllers.Main.errorDataRange": "Hibás adattartomány.",
@@ -1266,7 +1264,6 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Applikáció",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Szerző",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Hozzáférési jogok módosítása",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Létrehozás dátuma",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Betöltés...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Oldalak",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Bekezdések",

apps/documenteditor/main/locale/it.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Avviso",
   "Common.Controllers.Chat.textEnterMessage": "Scrivi il tuo messaggio qui",
-  "Common.Controllers.Chat.textUserLimit": "Stai usando ONLYOFFICE Free Edition.<br>Solo due utenti possono modificare il documento contemporaneamente.<br>Si desidera di più? Considera l'acquisto di ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Ulteriori informazioni</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonimo",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Chiudi",
   "Common.Controllers.ExternalDiagramEditor.warningText": "L'oggetto è disabilitato perché si sta modificando da un altro utente.",
@@ -50,6 +49,9 @@
   "Common.Controllers.ReviewChanges.textParaDeleted": "<b>Paragrafo Eliminato</b>",
   "Common.Controllers.ReviewChanges.textParaFormatted": "Paragraph Formatted",
   "Common.Controllers.ReviewChanges.textParaInserted": "<b>Paragrafo Inserito</b>",
+  "Common.Controllers.ReviewChanges.textParaMoveFromDown": "<b>Spostato in basso:</b>",
+  "Common.Controllers.ReviewChanges.textParaMoveFromUp": "<b>Spostato in alto:</b>",
+  "Common.Controllers.ReviewChanges.textParaMoveTo": "<b>Spostato:</b>",
   "Common.Controllers.ReviewChanges.textPosition": "Position",
   "Common.Controllers.ReviewChanges.textRight": "Align right",
   "Common.Controllers.ReviewChanges.textShape": "Shape",
@@ -61,7 +63,10 @@
   "Common.Controllers.ReviewChanges.textStrikeout": "Strikeout",
   "Common.Controllers.ReviewChanges.textSubScript": "Subscript",
   "Common.Controllers.ReviewChanges.textSuperScript": "Superscript",
-  "Common.Controllers.ReviewChanges.textTabs": "Modifica tabelle",
+  "Common.Controllers.ReviewChanges.textTableChanged": "<b>Impostazioni tabella modificate</b>",
+  "Common.Controllers.ReviewChanges.textTableRowsAdd": "<b>Righe tabella aggiunte</b>",
+  "Common.Controllers.ReviewChanges.textTableRowsDel": "<b>Righe tabella eliminate</b>",
+  "Common.Controllers.ReviewChanges.textTabs": "Modifica Schede",
   "Common.Controllers.ReviewChanges.textUnderline": "Sottolineato",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
   "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo",
@@ -157,6 +162,7 @@
   "Common.Views.Header.tipRedo": "Ripristina",
   "Common.Views.Header.tipSave": "Salva",
   "Common.Views.Header.tipUndo": "Annulla",
+  "Common.Views.Header.tipUndock": "Sgancia in una finestra separata",
   "Common.Views.Header.tipViewSettings": "Mostra impostazioni",
   "Common.Views.Header.tipViewUsers": "Mostra gli utenti e gestisci i diritti di accesso al documento",
   "Common.Views.Header.txtAccessRights": "Modifica diritti di accesso",
@@ -255,13 +261,13 @@
   "Common.Views.ReviewChanges.txtOriginalCap": "Originale",
   "Common.Views.ReviewChanges.txtPrev": "Precedente",
   "Common.Views.ReviewChanges.txtReject": "Reject",
-  "Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes",
+  "Common.Views.ReviewChanges.txtRejectAll": "Annulla tutte le modifiche",
   "Common.Views.ReviewChanges.txtRejectChanges": "Rifiuta modifiche",
-  "Common.Views.ReviewChanges.txtRejectCurrent": "Reject Current Changes",
+  "Common.Views.ReviewChanges.txtRejectCurrent": "Annulla le modifiche attuali",
   "Common.Views.ReviewChanges.txtSharing": "Condivisione",
   "Common.Views.ReviewChanges.txtSpelling": "Controllo ortografia",
   "Common.Views.ReviewChanges.txtTurnon": "Traccia cambiamenti",
-  "Common.Views.ReviewChanges.txtView": "Modalità display",
+  "Common.Views.ReviewChanges.txtView": "Modalità Visualizzazione",
   "Common.Views.ReviewChangesDialog.textTitle": "Cambi di Revisione",
   "Common.Views.ReviewChangesDialog.txtAccept": "Accetta",
   "Common.Views.ReviewChangesDialog.txtAcceptAll": "Accetta tutte le modifiche",
@@ -276,6 +282,8 @@
   "Common.Views.ReviewPopover.textCancel": "Annulla",
   "Common.Views.ReviewPopover.textClose": "Chiudi",
   "Common.Views.ReviewPopover.textEdit": "OK",
+  "Common.Views.ReviewPopover.textFollowMove": "Segui mossa",
+  "Common.Views.ReviewPopover.textMention": "+mention fornirà l'accesso al documento e invierà un'e-mail",
   "Common.Views.ReviewPopover.textOpenAgain": "Apri di nuovo",
   "Common.Views.ReviewPopover.textReply": "Rispondi",
   "Common.Views.ReviewPopover.textResolve": "Risolvere",
@@ -318,6 +326,7 @@
   "DE.Controllers.LeftMenu.textNoTextFound": "I dati da cercare non sono stati trovati. Modifica i parametri di ricerca.",
   "DE.Controllers.LeftMenu.textReplaceSkipped": "La sostituzione è stata effettuata. {0} occorrenze sono state saltate.",
   "DE.Controllers.LeftMenu.textReplaceSuccess": "La ricerca è stata effettuata. Occorrenze sostituite: {0}",
+  "DE.Controllers.LeftMenu.txtCompatible": "Il documento verrà salvato nel nuovo formato questo consentirà di utilizzare tutte le funzionalità dell'editor, ma potrebbe influire sul layout del documento. <br> Utilizzare l'opzione \"Compatibilità\" nelle impostazioni avanzate se si desidera rendere i file compatibili con le versioni precedenti di MS Word.",
   "DE.Controllers.LeftMenu.txtUntitled": "Senza titolo",
   "DE.Controllers.LeftMenu.warnDownloadAs": "Se continua a salvare in questo formato tutte le caratteristiche tranne il testo saranno perse.<br>Sei sicuro di voler continuare?",
   "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Se si continua a salvare in questo formato, parte della formattazione potrebbe andare persa.<br>Vuoi continuare?",
@@ -326,7 +335,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "E' stato superato il tempo limite della conversione.",
   "DE.Controllers.Main.criticalErrorExtText": "Clicca su \"OK\" per ritornare all'elenco dei documenti",
   "DE.Controllers.Main.criticalErrorTitle": "Errore",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Download fallito.",
   "DE.Controllers.Main.downloadMergeText": "Downloading...",
   "DE.Controllers.Main.downloadMergeTitle": "Downloading",
@@ -335,7 +343,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.<br>Si prega di contattare l'amministratore del Server dei Documenti.",
   "DE.Controllers.Main.errorBadImageUrl": "URL dell'immagine non corretto",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Connessione al server persa. Impossibile modificare il documento.",
-  "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.<br><br>Per maggiori dettagli sulla connessione al Document Server  <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">clicca qui</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.<br><br>Per maggiori dettagli sulla connessione al Document Server  <a href=\"%1\" target=\"_blank\">clicca qui</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.",
   "DE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.",
   "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
@@ -402,21 +410,21 @@
   "DE.Controllers.Main.textContactUs": "Contatta il team di vendite",
   "DE.Controllers.Main.textCustomLoader": "Si noti che in base ai termini della licenza non si ha il diritto di cambiare il caricatore. <br> Si prega di contattare il nostro ufficio vendite per ottenere un preventivo.",
   "DE.Controllers.Main.textLoadingDocument": "Caricamento del documento",
-  "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE® limite connessione",
+  "DE.Controllers.Main.textNoLicenseTitle": "%1 limite connessione",
   "DE.Controllers.Main.textPaidFeature": "Caratteristica a pagamento",
   "DE.Controllers.Main.textShape": "Forma",
   "DE.Controllers.Main.textStrict": "Modalità Rigorosa",
   "DE.Controllers.Main.textTryUndoRedo": "Le funzioni Annulla/Ripristina sono disabilitate per la Modalità di Co-editing Veloce.<br>Clicca il pulsante 'Modalità Rigorosa' per passare alla Modalità di Co-editing Rigorosa per poter modificare il file senza l'interferenza di altri utenti e inviare le modifiche solamente dopo averle salvate. Puoi passare da una modalità all'altra di co-editing utilizzando le Impostazioni avanzate dell'editor.",
   "DE.Controllers.Main.titleLicenseExp": "La licenza è scaduta",
   "DE.Controllers.Main.titleServerVersion": "L'editor è stato aggiornato",
-  "DE.Controllers.Main.titleUpdateVersion": "Version changed",
+  "DE.Controllers.Main.titleUpdateVersion": "Versione Modificata",
   "DE.Controllers.Main.txtAbove": "Sopra",
   "DE.Controllers.Main.txtArt": "Il tuo testo qui",
   "DE.Controllers.Main.txtBasicShapes": "Figure di base",
   "DE.Controllers.Main.txtBelow": "sotto",
   "DE.Controllers.Main.txtBookmarkError": "Errore! Segnalibro non definito.",
   "DE.Controllers.Main.txtButtons": "Bottoni",
-  "DE.Controllers.Main.txtCallouts": "Chiamate",
+  "DE.Controllers.Main.txtCallouts": "Callout",
   "DE.Controllers.Main.txtCharts": "Grafici",
   "DE.Controllers.Main.txtCurrentDocument": "Documento Corrente",
   "DE.Controllers.Main.txtDiagramTitle": "Titolo diagramma",
@@ -430,6 +438,7 @@
   "DE.Controllers.Main.txtFormulaNotInTable": "La formula non in tabella",
   "DE.Controllers.Main.txtHeader": "Intestazione",
   "DE.Controllers.Main.txtHyperlink": "Collegamento ipertestuale",
+  "DE.Controllers.Main.txtIndTooLarge": "Indice troppo grande",
   "DE.Controllers.Main.txtLines": "Linee",
   "DE.Controllers.Main.txtMath": "Matematica",
   "DE.Controllers.Main.txtMissArg": "Argomento mancante",
@@ -443,6 +452,12 @@
   "DE.Controllers.Main.txtSameAsPrev": "come in precedenza",
   "DE.Controllers.Main.txtSection": "-Sezione",
   "DE.Controllers.Main.txtSeries": "Serie",
+  "DE.Controllers.Main.txtShape_accentBorderCallout1": "Callout Linea con bordo e barra in risalto",
+  "DE.Controllers.Main.txtShape_accentBorderCallout2": "Callout Linea piegata con bordo e barra in risalto",
+  "DE.Controllers.Main.txtShape_accentBorderCallout3": "Callout Doppia linea piegata con barra e bordo in risalto",
+  "DE.Controllers.Main.txtShape_accentCallout1": "Callout Linea con barra in risalto",
+  "DE.Controllers.Main.txtShape_accentCallout2": "Callout Linea piegata con barra in risalto",
+  "DE.Controllers.Main.txtShape_accentCallout3": "Callout Doppia linea piegata con barra in risalto",
   "DE.Controllers.Main.txtShape_actionButtonBackPrevious": "Indietro o Pulsante Precedente",
   "DE.Controllers.Main.txtShape_actionButtonBeginning": "Pulsante di Inizio",
   "DE.Controllers.Main.txtShape_actionButtonBlank": "Pulsante Vuoto",
@@ -452,19 +467,39 @@
   "DE.Controllers.Main.txtShape_actionButtonHelp": "Pulsante Aiuto",
   "DE.Controllers.Main.txtShape_actionButtonHome": "Pulsante Home",
   "DE.Controllers.Main.txtShape_actionButtonInformation": "Pulsante Informazioni",
+  "DE.Controllers.Main.txtShape_actionButtonMovie": "Pulsante Film",
   "DE.Controllers.Main.txtShape_actionButtonReturn": "Pulsante Invio",
   "DE.Controllers.Main.txtShape_actionButtonSound": "Pulsante Suono",
   "DE.Controllers.Main.txtShape_arc": "Arco",
   "DE.Controllers.Main.txtShape_bentArrow": "Freccia piegata",
+  "DE.Controllers.Main.txtShape_bentConnector5": "Connettore a gomito",
+  "DE.Controllers.Main.txtShape_bentConnector5WithArrow": "Connettore freccia a gomito",
+  "DE.Controllers.Main.txtShape_bentConnector5WithTwoArrows": "Connettore doppia freccia a gomito",
   "DE.Controllers.Main.txtShape_bentUpArrow": "Freccia curva in alto",
   "DE.Controllers.Main.txtShape_bevel": "Smussato",
   "DE.Controllers.Main.txtShape_blockArc": "Arco a tutto sesto",
-  "DE.Controllers.Main.txtShape_chevron": "Gallone",
+  "DE.Controllers.Main.txtShape_borderCallout1": "Callout Linea",
+  "DE.Controllers.Main.txtShape_borderCallout2": "Callout Linea piegata",
+  "DE.Controllers.Main.txtShape_borderCallout3": "Callout Doppia linea piegata",
+  "DE.Controllers.Main.txtShape_bracePair": "Doppia parentesi graffa",
+  "DE.Controllers.Main.txtShape_callout1": "Callout Linea senza bordo",
+  "DE.Controllers.Main.txtShape_callout2": "Callout Linea piegata senza bordo ",
+  "DE.Controllers.Main.txtShape_callout3": "Callout Doppia linea piegata senza bordo",
+  "DE.Controllers.Main.txtShape_can": "Cilindro",
+  "DE.Controllers.Main.txtShape_chevron": "freccia a Gallone",
+  "DE.Controllers.Main.txtShape_chord": "Corda",
   "DE.Controllers.Main.txtShape_circularArrow": "Freccia circolare",
   "DE.Controllers.Main.txtShape_cloud": "Nuvola",
   "DE.Controllers.Main.txtShape_cloudCallout": "Cloud Callout",
   "DE.Controllers.Main.txtShape_corner": "Angolo",
   "DE.Controllers.Main.txtShape_cube": "Cubo",
+  "DE.Controllers.Main.txtShape_curvedConnector3": "Connettore curvo",
+  "DE.Controllers.Main.txtShape_curvedConnector3WithArrow": "Connettore a freccia curva",
+  "DE.Controllers.Main.txtShape_curvedConnector3WithTwoArrows": "Connettore a doppia freccia curva",
+  "DE.Controllers.Main.txtShape_curvedDownArrow": "Freccia curva in basso",
+  "DE.Controllers.Main.txtShape_curvedLeftArrow": "Freccia curva a sinistra",
+  "DE.Controllers.Main.txtShape_curvedRightArrow": "Freccia curva a destra",
+  "DE.Controllers.Main.txtShape_curvedUpArrow": "Freccia curva in su",
   "DE.Controllers.Main.txtShape_decagon": "Decagono",
   "DE.Controllers.Main.txtShape_diagStripe": "Striscia diagonale",
   "DE.Controllers.Main.txtShape_diamond": "Diamante",
@@ -472,7 +507,10 @@
   "DE.Controllers.Main.txtShape_donut": "Ciambella",
   "DE.Controllers.Main.txtShape_doubleWave": "Onda doppia",
   "DE.Controllers.Main.txtShape_downArrow": "Freccia in giù",
+  "DE.Controllers.Main.txtShape_downArrowCallout": "Callout Freccia in basso",
   "DE.Controllers.Main.txtShape_ellipse": "Ellisse",
+  "DE.Controllers.Main.txtShape_ellipseRibbon": "Nastro curvo e inclinato in basso",
+  "DE.Controllers.Main.txtShape_ellipseRibbon2": "Nastro curvato in alto",
   "DE.Controllers.Main.txtShape_flowChartAlternateProcess": "Diagramma di flusso: processo alternativo",
   "DE.Controllers.Main.txtShape_flowChartCollate": "Diagramma di flusso: Fascicolazione",
   "DE.Controllers.Main.txtShape_flowChartConnector": "Diagramma di flusso: Connettore",
@@ -501,7 +539,9 @@
   "DE.Controllers.Main.txtShape_flowChartSort": "Diagramma di flusso: Ordinamento",
   "DE.Controllers.Main.txtShape_flowChartSummingJunction": "Diagramma di flusso: Giunzione di somma",
   "DE.Controllers.Main.txtShape_flowChartTerminator": "Diagramma di flusso: Terminatore",
+  "DE.Controllers.Main.txtShape_foldedCorner": "angolo ripiegato",
   "DE.Controllers.Main.txtShape_frame": "Cornice",
+  "DE.Controllers.Main.txtShape_halfFrame": "Mezza Cornice",
   "DE.Controllers.Main.txtShape_heart": "Cuore",
   "DE.Controllers.Main.txtShape_heptagon": "Ettagono",
   "DE.Controllers.Main.txtShape_hexagon": "Esagono",
@@ -510,16 +550,26 @@
   "DE.Controllers.Main.txtShape_irregularSeal1": "Esplosione 1",
   "DE.Controllers.Main.txtShape_irregularSeal2": "Esplosione 2",
   "DE.Controllers.Main.txtShape_leftArrow": "Freccia Sinistra",
+  "DE.Controllers.Main.txtShape_leftArrowCallout": "Callout Freccia a sinistra",
+  "DE.Controllers.Main.txtShape_leftBrace": "Parentesi graffa aperta",
+  "DE.Controllers.Main.txtShape_leftBracket": "Parentesi quadra aperta",
+  "DE.Controllers.Main.txtShape_leftRightArrow": "Freccia bidirezionale sinistra destra",
+  "DE.Controllers.Main.txtShape_leftRightArrowCallout": "Callout Freccia bidirezionane sinistra destra",
+  "DE.Controllers.Main.txtShape_leftRightUpArrow": "Freccia tridirezionale sinistra destra alto",
+  "DE.Controllers.Main.txtShape_leftUpArrow": "Freccia bidirezionale sinistra alto",
+  "DE.Controllers.Main.txtShape_lightningBolt": "Fulmine",
   "DE.Controllers.Main.txtShape_line": "Linea",
   "DE.Controllers.Main.txtShape_lineWithArrow": "Freccia",
   "DE.Controllers.Main.txtShape_lineWithTwoArrows": "Freccia doppia",
   "DE.Controllers.Main.txtShape_mathDivide": "Divisione",
   "DE.Controllers.Main.txtShape_mathEqual": "Uguale",
   "DE.Controllers.Main.txtShape_mathMinus": "Meno",
+  "DE.Controllers.Main.txtShape_mathMultiply": "Moltiplicazione",
   "DE.Controllers.Main.txtShape_mathNotEqual": "Non uguale",
   "DE.Controllers.Main.txtShape_mathPlus": "Più",
   "DE.Controllers.Main.txtShape_moon": "Luna",
   "DE.Controllers.Main.txtShape_noSmoking": "Simbolo \"No\"",
+  "DE.Controllers.Main.txtShape_notchedRightArrow": "Freccia dentellata a destra ",
   "DE.Controllers.Main.txtShape_octagon": "Ottagono",
   "DE.Controllers.Main.txtShape_parallelogram": "Parallelogramma",
   "DE.Controllers.Main.txtShape_pentagon": "Pentagono",
@@ -528,9 +578,25 @@
   "DE.Controllers.Main.txtShape_plus": "Più",
   "DE.Controllers.Main.txtShape_polyline1": "Bozza",
   "DE.Controllers.Main.txtShape_polyline2": "Forma libera",
+  "DE.Controllers.Main.txtShape_quadArrow": "Freccia a incrocio",
+  "DE.Controllers.Main.txtShape_quadArrowCallout": "Callout Freccia a incrocio",
   "DE.Controllers.Main.txtShape_rect": "Rettangolo",
+  "DE.Controllers.Main.txtShape_ribbon": "Nastro inclinato in basso",
+  "DE.Controllers.Main.txtShape_ribbon2": "Nastro inclinato in alto",
   "DE.Controllers.Main.txtShape_rightArrow": "Freccia destra",
+  "DE.Controllers.Main.txtShape_rightArrowCallout": "Callout Freccia a destra",
+  "DE.Controllers.Main.txtShape_rightBrace": "Parentesi graffa chiusa",
+  "DE.Controllers.Main.txtShape_rightBracket": "Parentesi quadra chiusa",
+  "DE.Controllers.Main.txtShape_round1Rect": "Rettangolo ad angolo singolo smussato",
+  "DE.Controllers.Main.txtShape_round2DiagRect": "Rettangolo ad angolo diagonale smussato",
+  "DE.Controllers.Main.txtShape_round2SameRect": "Rettangolo smussato dallo stesso lato",
+  "DE.Controllers.Main.txtShape_roundRect": "Rettangolo ad angoli smussati",
+  "DE.Controllers.Main.txtShape_rtTriangle": "Triangolo rettangolo",
   "DE.Controllers.Main.txtShape_smileyFace": "Faccia sorridente",
+  "DE.Controllers.Main.txtShape_snip1Rect": "Ritaglia rettangolo ad angolo singolo",
+  "DE.Controllers.Main.txtShape_snip2DiagRect": "Ritaglia rettangolo ad angolo diagonale",
+  "DE.Controllers.Main.txtShape_snip2SameRect": "Ritaglia Rettangolo smussato dallo stesso lato",
+  "DE.Controllers.Main.txtShape_snipRoundRect": "Ritaglia e smussa singolo angolo rettangolo",
   "DE.Controllers.Main.txtShape_spline": "Curva",
   "DE.Controllers.Main.txtShape_star10": "Stella a 10 punte",
   "DE.Controllers.Main.txtShape_star12": "Stella a 12 punte",
@@ -542,14 +608,21 @@
   "DE.Controllers.Main.txtShape_star6": "Stella a 6 punte",
   "DE.Controllers.Main.txtShape_star7": "Stella a 7 punte",
   "DE.Controllers.Main.txtShape_star8": "Stella a 8 punte",
+  "DE.Controllers.Main.txtShape_stripedRightArrow": "Freccia a strisce verso destra ",
   "DE.Controllers.Main.txtShape_sun": "Sole",
   "DE.Controllers.Main.txtShape_teardrop": "Goccia",
   "DE.Controllers.Main.txtShape_textRect": "Casella di testo",
   "DE.Controllers.Main.txtShape_trapezoid": "Trapezio",
-  "DE.Controllers.Main.txtShape_triangle": "Triangolo",
+  "DE.Controllers.Main.txtShape_triangle": "Triangolo isoscele",
   "DE.Controllers.Main.txtShape_upArrow": "Freccia su",
+  "DE.Controllers.Main.txtShape_upArrowCallout": "Callout Freccia in alto",
+  "DE.Controllers.Main.txtShape_upDownArrow": "Freccia bidirezionale su giù",
+  "DE.Controllers.Main.txtShape_uturnArrow": "Freccia a inversione",
   "DE.Controllers.Main.txtShape_verticalScroll": "Scorrimento verticale",
   "DE.Controllers.Main.txtShape_wave": "Onda",
+  "DE.Controllers.Main.txtShape_wedgeEllipseCallout": "Callout Ovale",
+  "DE.Controllers.Main.txtShape_wedgeRectCallout": "Callout Rettangolare",
+  "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Callout Rettangolare arrotondato",
   "DE.Controllers.Main.txtStarsRibbons": "Stelle e nastri",
   "DE.Controllers.Main.txtStyle_footnote_text": "Nota a piè di pagina",
   "DE.Controllers.Main.txtStyle_Heading_1": "Titolo 1",
@@ -571,9 +644,11 @@
   "DE.Controllers.Main.txtSyntaxError": "Errore di sintassi",
   "DE.Controllers.Main.txtTableInd": "L'indice della tabella non può essere zero",
   "DE.Controllers.Main.txtTableOfContents": "Sommario",
+  "DE.Controllers.Main.txtTooLarge": "Numero troppo grande per essere formattato",
   "DE.Controllers.Main.txtUndefBookmark": "Segnalibro indefinito",
   "DE.Controllers.Main.txtXAxis": "Asse X",
   "DE.Controllers.Main.txtYAxis": "Asse Y",
+  "DE.Controllers.Main.txtZeroDivide": "Diviso Zero",
   "DE.Controllers.Main.unknownErrorText": "Errore sconosciuto.",
   "DE.Controllers.Main.unsupportedBrowserErrorText": "Il tuo browser non è supportato.",
   "DE.Controllers.Main.uploadImageExtMessage": "Formato immagine sconosciuto.",
@@ -592,7 +667,7 @@
   "DE.Controllers.Main.warnProcessRightsChange": "Ci stato negato il diritto alla modifica del file.",
   "DE.Controllers.Navigation.txtBeginning": "Inizio del documento",
   "DE.Controllers.Navigation.txtGotoBeginning": "Vai all'inizio del documento",
-  "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
+  "DE.Controllers.Statusbar.textHasChanges": "Sono state tracciate nuove modifiche",
   "DE.Controllers.Statusbar.textTrackChanges": "Il documento è aperto in modalità Traccia Revisioni attivata",
   "DE.Controllers.Statusbar.tipReview": "Traccia cambiamenti",
   "DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
@@ -1080,6 +1155,7 @@
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Modifica bordi disposizione testo",
   "DE.Views.DocumentHolder.textFlipH": "Capovolgi orizzontalmente",
   "DE.Views.DocumentHolder.textFlipV": "Capovolgi verticalmente",
+  "DE.Views.DocumentHolder.textFollow": "Segui mossa",
   "DE.Views.DocumentHolder.textFromFile": "Da file",
   "DE.Views.DocumentHolder.textFromUrl": "Da URL",
   "DE.Views.DocumentHolder.textJoinList": "Iscriviti alla lista precedente",
@@ -1268,19 +1344,27 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Crea un nuovo documento di testo vuoto che potrai formattare in seguito durante la modifica. Oppure scegli uno dei modelli per creare un documento di un certo tipo al quale sono già applicati certi stili.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nuovo documento di testo",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nessun modello",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Aggiungi Autore",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Aggiungi testo",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Applicazione",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autore",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Cambia diritti di accesso",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Data di creazione",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Commento",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Creato",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Caricamento in corso...",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Ultima modifica di",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Ultima modifica",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Proprietario",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Pagine",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Paragrafi",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Percorso",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Persone con diritti",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Simboli con spazi",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistiche",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Oggetto",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Simboli",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titolo documento",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Caricato",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Parole",
   "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Cambia diritti di accesso",
   "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Persone con diritti",
@@ -1300,7 +1384,7 @@
   "DE.Views.FileMenuPanels.Settings.strAutoRecover": "Attiva il ripristino automatico",
   "DE.Views.FileMenuPanels.Settings.strAutosave": "Attiva salvataggio automatico",
   "DE.Views.FileMenuPanels.Settings.strCoAuthMode": "Modalità di co-editing",
-  "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Other users will see your changes at once",
+  "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Gli altri utenti vedranno immediatamente i tuoi cambiamenti",
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Dovrai accettare i cambiamenti prima di poterli visualizzare.",
   "DE.Views.FileMenuPanels.Settings.strFast": "Fast",
   "DE.Views.FileMenuPanels.Settings.strFontRender": "Hinting dei caratteri",
@@ -1320,9 +1404,11 @@
   "DE.Views.FileMenuPanels.Settings.textAlignGuides": "Guide di allineamento",
   "DE.Views.FileMenuPanels.Settings.textAutoRecover": "Recupero automatico",
   "DE.Views.FileMenuPanels.Settings.textAutoSave": "Salvataggio automatico",
+  "DE.Views.FileMenuPanels.Settings.textCompatible": "Compatibilità",
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Disattivato",
   "DE.Views.FileMenuPanels.Settings.textForceSave": "Salva sul server",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Ogni minuto",
+  "DE.Views.FileMenuPanels.Settings.textOldVersions": "Rendi i file compatibili con le versioni precedenti di MS Word quando vengono salvati come DOCX",
   "DE.Views.FileMenuPanels.Settings.txtAll": "Tutte",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Centimetro",
   "DE.Views.FileMenuPanels.Settings.txtFitPage": "Adatta alla pagina",
@@ -1953,6 +2039,7 @@
   "DE.Views.Toolbar.capBtnMargins": "Margini",
   "DE.Views.Toolbar.capBtnPageOrient": "Orientamento",
   "DE.Views.Toolbar.capBtnPageSize": "Dimensione",
+  "DE.Views.Toolbar.capBtnWatermark": "Filigrana",
   "DE.Views.Toolbar.capImgAlign": "Allinea",
   "DE.Views.Toolbar.capImgBackward": "Porta indietro",
   "DE.Views.Toolbar.capImgForward": "Porta avanti",
@@ -1984,6 +2071,7 @@
   "DE.Views.Toolbar.textColumnsThree": "Tre",
   "DE.Views.Toolbar.textColumnsTwo": "Two",
   "DE.Views.Toolbar.textContPage": "Pagina continua",
+  "DE.Views.Toolbar.textEditWatermark": "Filigrana personalizzata",
   "DE.Views.Toolbar.textEvenPage": "Pagina pari",
   "DE.Views.Toolbar.textInMargin": "Nel margine",
   "DE.Views.Toolbar.textInsColumnBreak": "Insert Column Break",
@@ -2014,6 +2102,7 @@
   "DE.Views.Toolbar.textPoint": "XY (A dispersione)",
   "DE.Views.Toolbar.textPortrait": "Verticale",
   "DE.Views.Toolbar.textRemoveControl": "Rimuovi il controllo del contenuto",
+  "DE.Views.Toolbar.textRemWatermark": "Rimuovi filigrana",
   "DE.Views.Toolbar.textRichControl": "Inserisci il controllo del contenuto RTF",
   "DE.Views.Toolbar.textRight": "Right: ",
   "DE.Views.Toolbar.textStock": "Azionario",
@@ -2089,12 +2178,13 @@
   "DE.Views.Toolbar.tipPrint": "Stampa",
   "DE.Views.Toolbar.tipRedo": "Ripristina",
   "DE.Views.Toolbar.tipSave": "Salva",
-  "DE.Views.Toolbar.tipSaveCoauth": "Save your changes for the other users to see them.",
+  "DE.Views.Toolbar.tipSaveCoauth": "Salva i tuoi cambiamenti per renderli disponibili agli altri utenti.",
   "DE.Views.Toolbar.tipSendBackward": "Porta indietro",
   "DE.Views.Toolbar.tipSendForward": "Porta avanti",
   "DE.Views.Toolbar.tipShowHiddenChars": "Caratteri non stampabili",
   "DE.Views.Toolbar.tipSynchronize": "Il documento è stato modificato da un altro utente. Clicca per salvare le modifiche e ricaricare gli aggiornamenti.",
   "DE.Views.Toolbar.tipUndo": "Annulla",
+  "DE.Views.Toolbar.tipWatermark": "Modifica filigrana",
   "DE.Views.Toolbar.txtDistribHor": "Distribuisci orizzontalmente",
   "DE.Views.Toolbar.txtDistribVert": "Distribuisci verticalmente",
   "DE.Views.Toolbar.txtMarginAlign": "Allinea al margine",
@@ -2120,5 +2210,30 @@
   "DE.Views.Toolbar.txtScheme6": "Viale",
   "DE.Views.Toolbar.txtScheme7": "Universo",
   "DE.Views.Toolbar.txtScheme8": "Flusso",
-  "DE.Views.Toolbar.txtScheme9": "Galassia"
+  "DE.Views.Toolbar.txtScheme9": "Galassia",
+  "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Annulla",
+  "DE.Views.WatermarkSettingsDialog.okButtonText": "OK",
+  "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
+  "DE.Views.WatermarkSettingsDialog.textBold": "Grassetto",
+  "DE.Views.WatermarkSettingsDialog.textColor": "Colore del testo",
+  "DE.Views.WatermarkSettingsDialog.textDiagonal": "Diagonale",
+  "DE.Views.WatermarkSettingsDialog.textFont": "Carattere",
+  "DE.Views.WatermarkSettingsDialog.textFromFile": "Da file",
+  "DE.Views.WatermarkSettingsDialog.textFromUrl": "Da URL",
+  "DE.Views.WatermarkSettingsDialog.textHor": "Orizzontale",
+  "DE.Views.WatermarkSettingsDialog.textImageW": "Immagine filigrana",
+  "DE.Views.WatermarkSettingsDialog.textItalic": "Corsivo",
+  "DE.Views.WatermarkSettingsDialog.textLanguage": "Lingua",
+  "DE.Views.WatermarkSettingsDialog.textLayout": "Layout",
+  "DE.Views.WatermarkSettingsDialog.textNewColor": "Colore personalizzato",
+  "DE.Views.WatermarkSettingsDialog.textNone": "Nessuno",
+  "DE.Views.WatermarkSettingsDialog.textScale": "Ridimensiona",
+  "DE.Views.WatermarkSettingsDialog.textStrikeout": "Barrato",
+  "DE.Views.WatermarkSettingsDialog.textText": "Testo",
+  "DE.Views.WatermarkSettingsDialog.textTextW": "Testo filigrana",
+  "DE.Views.WatermarkSettingsDialog.textTitle": "Impostazioni Filigrana",
+  "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitrasparente",
+  "DE.Views.WatermarkSettingsDialog.textUnderline": "Sottolineato",
+  "DE.Views.WatermarkSettingsDialog.tipFontName": "Nome carattere",
+  "DE.Views.WatermarkSettingsDialog.tipFontSize": "Dimensione carattere"
 }

apps/documenteditor/main/locale/ja.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "警告",
   "Common.Controllers.Chat.textEnterMessage": "メッセージをここに挿入する",
-  "Common.Controllers.Chat.textUserLimit": "ONLYOFFICE無料版を使用しています。<br>同時に2人のユーザのみは文書を編集することができます。<br>もっとが必要ですか。ONLYOFFICEエンタープライズ版の購入を検討してください。<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "匿名",
   "Common.Controllers.ExternalDiagramEditor.textClose": "閉じる",
   "Common.Controllers.ExternalDiagramEditor.warningText": "他のユーザは編集しているのためオブジェクトが無効になります。",
@@ -177,14 +176,13 @@
   "DE.Controllers.Main.convertationTimeoutText": "変換のタイムアウトを超過しました。",
   "DE.Controllers.Main.criticalErrorExtText": "OKボタンを押すと文書リストに戻ることができます。",
   "DE.Controllers.Main.criticalErrorTitle": "エラー",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "ダウンロード失敗",
   "DE.Controllers.Main.downloadMergeText": "ダウンロード中...",
   "DE.Controllers.Main.downloadMergeTitle": "ダウンロード中",
   "DE.Controllers.Main.downloadTextText": "ドキュメントのダウンロード中...",
   "DE.Controllers.Main.downloadTitleText": "ドキュメントのダウンロード中",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "サーバーとの接続が失われました。今、文書を編集することができません。",
-  "DE.Controllers.Main.errorConnectToServer": "文書を保存できませんでした。接続設定を確認するか、管理者にお問い合わせください。<br>OKボタンをクリックするとドキュメントをダウンロードするように求められます。<br><br>ドキュメントサーバーの接続の詳細情報を見つけます:<a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
+  "DE.Controllers.Main.errorConnectToServer": "文書を保存できませんでした。接続設定を確認するか、管理者にお問い合わせください。<br>OKボタンをクリックするとドキュメントをダウンロードするように求められます。<br><br>ドキュメントサーバーの接続の詳細情報を見つけます:<a href=\"%1\" target=\"_blank\">ここに</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "外部エラーです。<br>データベース接続エラーです。この問題は解決しない場合は、サポートにお問い合わせください。",
   "DE.Controllers.Main.errorDataRange": "データ範囲が正しくありません",
   "DE.Controllers.Main.errorDefaultMessage": "エラー コード:%1",
@@ -854,7 +852,6 @@
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "テンプレートなし",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "作成者",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "アクセス許可の変更",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "作成日時",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "読み込み中...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "ページ",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "段落",

apps/documenteditor/main/locale/ko.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "경고",
   "Common.Controllers.Chat.textEnterMessage": "여기에 메시지를 입력하십시오",
-  "Common.Controllers.Chat.textUserLimit": "ONLYOFFICE 무료 버전을 사용하고 있습니다. <br> 두 명의 사용자 만이 문서를 동시에 편집 할 수 있습니다. <br> ONLYOFFICE Enterprise Edition 구입 고려하십시오. <br> <a href =\"http://www.onlyoffice.com/free-edition.aspx \"target=\"_blank\"> 자세히보기 </a> ",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "익명",
   "Common.Controllers.ExternalDiagramEditor.textClose": "닫기",
   "Common.Controllers.ExternalDiagramEditor.warningText": "다른 사용자가 편집 중이므로 개체를 사용할 수 없습니다.",
@@ -310,7 +309,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "전환 시간 초과를 초과했습니다.",
   "DE.Controllers.Main.criticalErrorExtText": "문서 목록으로 돌아가려면 \"OK\"를 누르십시오.",
   "DE.Controllers.Main.criticalErrorTitle": "오류",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE 문서 편집기",
   "DE.Controllers.Main.downloadErrorText": "다운로드하지 못했습니다.",
   "DE.Controllers.Main.downloadMergeText": "다운로드 중 ...",
   "DE.Controllers.Main.downloadMergeTitle": "다운로드 중",
@@ -319,7 +317,7 @@
   "DE.Controllers.Main.errorAccessDeny": "권한이없는 작업을 수행하려고합니다. <br> 문서 관리자에게 문의하십시오.",
   "DE.Controllers.Main.errorBadImageUrl": "이미지 URL이 잘못되었습니다.",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "서버 연결이 끊어졌습니다. 지금 문서를 편집 할 수 없습니다.",
-  "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오. <br> '확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다. <br > <br> Document Server 연결에 대한 추가 정보 찾기 <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\"> 여기 </a> ",
+  "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.<br>'확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.<br ><br>Document Server 연결에 대한 추가 정보 찾기 <a href=\"%1\" target=\"_blank\">여기</a> ",
   "DE.Controllers.Main.errorDatabaseConnection": "외부 오류. <br> 데이터베이스 연결 오류입니다. 오류가 계속 발생하면 지원부에 문의하십시오.",
   "DE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.",
   "DE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1",
@@ -1095,7 +1093,6 @@
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "템플릿이 없습니다",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "작성자",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "액세스 권한 변경",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Creation Date",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "로드 중 ...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Pages",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "단락",

apps/documenteditor/main/locale/lv.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Warning",
   "Common.Controllers.Chat.textEnterMessage": "Ievadiet savu ziņu šeit",
-  "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymous",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Close",
   "Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.",
@@ -307,7 +306,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Konversijas taimauts pārsniegts.",
   "DE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.",
   "DE.Controllers.Main.criticalErrorTitle": "Kļūda",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Dokumentu Redaktors",
   "DE.Controllers.Main.downloadErrorText": "Lejuplāde neizdevās.",
   "DE.Controllers.Main.downloadMergeText": "Downloading...",
   "DE.Controllers.Main.downloadMergeTitle": "Downloading",
@@ -316,7 +314,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Jūs mēģināt veikt darbību, kuru nedrīkstat veikt.<br>Lūdzu, sazinieties ar savu dokumentu servera administratoru.",
   "DE.Controllers.Main.errorBadImageUrl": "Nav pareizs attēla URL",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.",
-  "DE.Controllers.Main.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.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.<br>Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.<br><br>Uzziniet vairāk par dokumentu servera pieslēgšanu <a href=\"%1\" target=\"_blank\">šeit</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
   "DE.Controllers.Main.errorDataRange": "Incorrect data range.",
   "DE.Controllers.Main.errorDefaultMessage": "Kļūdas kods: %1",
@@ -1092,7 +1090,6 @@
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nav veidnes",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autors",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Change access rights",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Izveides datums",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Ielādē...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Lapas",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Rindkopu",
@@ -1385,7 +1382,7 @@
   "DE.Views.NoteSettingsDialog.textTitle": "Piezīmju uzstādījumi",
   "DE.Views.PageMarginsDialog.cancelButtonText": "Cancel",
   "DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning",
-  "DE.Views.PageMarginsDialog.okButtonText": "OK",
+  "DE.Views.PageMarginsDialog.okButtonText": "Ok",
   "DE.Views.PageMarginsDialog.textBottom": "Bottom",
   "DE.Views.PageMarginsDialog.textLeft": "Left",
   "DE.Views.PageMarginsDialog.textRight": "Right",

apps/documenteditor/main/locale/nl.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Waarschuwing",
   "Common.Controllers.Chat.textEnterMessage": "Voer hier uw bericht in",
-  "Common.Controllers.Chat.textUserLimit": "U gebruikt ONLYOFFICE Free Edition.<br>Er kunnen maar twee gebruikers tegelijk het document bewerken.<br>U wilt meer? Overweeg ONLYOFFICE Enterprise Edition aan te schaffen.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Meer informatie</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anoniem",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Sluiten",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Het object is gedeactiveerd omdat het wordt bewerkt door een andere gebruiker.",
@@ -329,7 +328,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Time-out voor conversie overschreden.",
   "DE.Controllers.Main.criticalErrorExtText": "Klik op \"OK\" om terug te keren naar de lijst met documenten.",
   "DE.Controllers.Main.criticalErrorTitle": "Fout",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE-documenteditor",
   "DE.Controllers.Main.downloadErrorText": "Download mislukt.",
   "DE.Controllers.Main.downloadMergeText": "Downloaden...",
   "DE.Controllers.Main.downloadMergeTitle": "Downloaden",
@@ -338,7 +336,7 @@
   "DE.Controllers.Main.errorAccessDeny": "U probeert een actie uit te voeren waarvoor u geen rechten hebt.<br>Neem contact op met de beheerder van de documentserver.",
   "DE.Controllers.Main.errorBadImageUrl": "URL afbeelding is onjuist",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbinding met server is verbroken. Het document kan op dit moment niet worden bewerkt.",
-  "DE.Controllers.Main.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 om het document te downloaden.<br><br>Meer informatie over de verbinding met een documentserver is <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a> te vinden.",
+  "DE.Controllers.Main.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.<br><br>Meer informatie over verbindingen met de documentserver is <a href=\"%1\" target=\"_blank\">hier</a> te vinden.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externe fout.<br>Fout in databaseverbinding. Neem contact op met Support als deze fout zich blijft voordoen.",
   "DE.Controllers.Main.errorDataRange": "Onjuist gegevensbereik.",
   "DE.Controllers.Main.errorDefaultMessage": "Foutcode: %1",
@@ -1212,7 +1210,6 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Applicatie",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Auteur",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Toegangsrechten wijzigen",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Datum gemaakt",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Laden...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Pagina's",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Alinea's",

apps/documenteditor/main/locale/pl.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Ostrzeżenie",
   "Common.Controllers.Chat.textEnterMessage": "Wprowadź swoją wiadomość tutaj",
-  "Common.Controllers.Chat.textUserLimit": "Używasz ONLYOFFICE Free Edition. <br> Tylko dwóch użytkowników może jednocześnie edytować dokument. Chcesz więcej? Zastanów się nad zakupem ONLYOFFICE Enterprise Edition. <a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\"> Czytaj więcej </a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Gość",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Zamknij",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Obiekt jest wyłączony, ponieważ jest edytowany przez innego użytkownika.",
@@ -272,7 +271,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Przekroczono limit czasu konwersji.",
   "DE.Controllers.Main.criticalErrorExtText": "Naciśnij \"OK\", aby powrócić do listy dokumentów.",
   "DE.Controllers.Main.criticalErrorTitle": "Błąd",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Edytor dokumentów",
   "DE.Controllers.Main.downloadErrorText": "Pobieranie nieudane.",
   "DE.Controllers.Main.downloadMergeText": "Pobieranie...",
   "DE.Controllers.Main.downloadMergeTitle": "Pobieranie",
@@ -281,7 +279,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Próbujesz wykonać działanie, na które nie masz uprawnień.<br>Proszę skontaktować się z administratorem serwera dokumentów.",
   "DE.Controllers.Main.errorBadImageUrl": "Adres URL obrazu jest błędny",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Połączenie z serwerem zostało utracone. Nie można teraz edytować dokumentu.",
-  "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.<br>Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.<br><br>Dowiedz się więcej o połączeniu serwera dokumentów <a href=\"https://api.onlyoffice.com/editors/callback \"target =\"_blank \">tutaj</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.<br>Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.<br><br>Dowiedz się więcej o połączeniu serwera dokumentów <a href=\"%1\" target=\"_blank\">tutaj</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Błąd zewnętrzny.<br>Błąd połączenia z bazą danych. W przypadku wystąpienia błędu należy skontaktować się z pomocą techniczną.",
   "DE.Controllers.Main.errorDataRange": "Błędny zakres danych.",
   "DE.Controllers.Main.errorDefaultMessage": "Kod błędu: %1",
@@ -1057,10 +1055,11 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Utwórz nowy pusty dokument tekstowy, który będziesz mógł formatować po jego utworzeniu podczas edytowania. Możesz też wybrać jeden z szablonów, aby utworzyć dokument określonego typu lub celu, w którym niektóre style zostały wcześniej zastosowane.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nowy dokument tekstowy",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Tam nie ma żadnych szablonów",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Dodaj autora",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Dodaj tekst",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Aplikacja",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Zmień prawa dostępu",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Data utworzenia",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Ładowanie...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Strony",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Akapity",
@@ -1247,8 +1246,10 @@
   "DE.Views.LeftMenu.txtDeveloper": "TRYB DEWELOPERA",
   "DE.Views.Links.capBtnBookmarks": "Zakładka",
   "DE.Views.Links.capBtnInsContents": "Spis treści",
+  "DE.Views.Links.mniInsFootnote": "Wstaw przypis",
   "DE.Views.Links.tipBookmarks": "Utwórz zakładkę",
   "DE.Views.Links.tipInsertHyperlink": "Dodaj hiperłącze",
+  "DE.Views.Links.tipNotes": "Wstawianie lub edytowanie przypisów",
   "DE.Views.MailMergeEmailDlg.cancelButtonText": "Anuluj",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Wyślij",
@@ -1718,9 +1719,10 @@
   "DE.Views.Toolbar.textSurface": "Powierzchnia",
   "DE.Views.Toolbar.textTabCollaboration": "Współpraca",
   "DE.Views.Toolbar.textTabFile": "Plik",
-  "DE.Views.Toolbar.textTabHome": "Start",
+  "DE.Views.Toolbar.textTabHome": "Narzędzia główne",
-  "DE.Views.Toolbar.textTabInsert": "Wstawić",
+  "DE.Views.Toolbar.textTabInsert": "Wstawianie",
   "DE.Views.Toolbar.textTabLayout": "Układ",
+  "DE.Views.Toolbar.textTabLinks": "Odwołania",
   "DE.Views.Toolbar.textTabReview": "Przegląd",
   "DE.Views.Toolbar.textTitleError": "Błąd",
   "DE.Views.Toolbar.textToCurrent": "Do aktualnej pozycji",
@@ -1731,6 +1733,7 @@
   "DE.Views.Toolbar.tipAlignLeft": "Wyrównaj do lewej",
   "DE.Views.Toolbar.tipAlignRight": "Wyrównaj do prawej",
   "DE.Views.Toolbar.tipBack": "Powrót",
+  "DE.Views.Toolbar.tipBlankPage": "Wstaw pustą stronę",
   "DE.Views.Toolbar.tipChangeChart": "Zmień typ wykresu",
   "DE.Views.Toolbar.tipClearStyle": "Wyczyść style",
   "DE.Views.Toolbar.tipColorSchemas": "Zmień schemat kolorów",
@@ -1801,5 +1804,6 @@
   "DE.Views.Toolbar.txtScheme6": "Zbiegowisko",
   "DE.Views.Toolbar.txtScheme7": "Kapitał",
   "DE.Views.Toolbar.txtScheme8": "Przepływ",
-  "DE.Views.Toolbar.txtScheme9": "Odlewnia"
+  "DE.Views.Toolbar.txtScheme9": "Odlewnia",
+  "DE.Views.WatermarkSettingsDialog.textNewColor": "Nowy niestandardowy kolor"
 }

apps/documenteditor/main/locale/pt.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Aviso",
   "Common.Controllers.Chat.textEnterMessage": "Insira sua mensagem aqui",
-  "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anônimo",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Fechar",
   "Common.Controllers.ExternalDiagramEditor.warningText": "O objeto está desabilitado por que está sendo editado por outro usuário.",
@@ -280,7 +279,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Tempo limite de conversão excedido.",
   "DE.Controllers.Main.criticalErrorExtText": "Pressione \"OK\" para voltar para a lista de documentos.",
   "DE.Controllers.Main.criticalErrorTitle": "Erro",
-  "DE.Controllers.Main.defaultTitleText": "Editor de documento ONLYOFFICE",
   "DE.Controllers.Main.downloadErrorText": "Download falhou.",
   "DE.Controllers.Main.downloadMergeText": "Downloading...",
   "DE.Controllers.Main.downloadMergeTitle": "Downloading",
@@ -289,7 +287,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Você está tentando executar uma ação que você não tem direitos. <br> Contate o administrador do Servidor de Documentos.",
   "DE.Controllers.Main.errorBadImageUrl": "URL de imagem está incorreta",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Conexão com servidor perdida. O documento não pode ser editado neste momento.",
-  "DE.Controllers.Main.errorConnectToServer": "O documento não pode ser salvo. Verifique as configurações de conexão ou entre em contato com o seu administrador.<br>Quando você clicar no botão \"OK\", poderá baixar o documento.<br><br>Encontre mais informações sobre conexão com o Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">aqui</a>",
+  "DE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador.<br>Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento. <br><br>Encontre mais informações sobre como conecta ao Document Server <a href=\"%1\" target=\"_blank\">aqui</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Erro externo.<br>Erro de conexão ao banco de dados. Entre em contato com o suporte caso o erro persista.",
   "DE.Controllers.Main.errorDataRange": "Intervalo de dados incorreto.",
   "DE.Controllers.Main.errorDefaultMessage": "Código do erro: %1",
@@ -1044,7 +1042,6 @@
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Não há modelos",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Alterar direitos de acesso",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Data de criação",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Carregando...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Páginas",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Parágrafos",

apps/documenteditor/main/locale/ru.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Предупреждение",
   "Common.Controllers.Chat.textEnterMessage": "Введите здесь своё сообщение",
-  "Common.Controllers.Chat.textUserLimit": "Вы используете бесплатную версию ONLYOFFICE.<br>Только два пользователя одновременно могут совместно редактировать документ.<br>Требуется больше? Рекомендуем приобрести корпоративную версию ONLYOFFICE.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Читать дальше</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Аноним",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Закрыть",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Объект недоступен, так как редактируется другим пользователем.",
@@ -23,7 +22,7 @@
   "Common.Controllers.ReviewChanges.textContextual": "Не добавлять интервал между абзацами одного стиля",
   "Common.Controllers.ReviewChanges.textDeleted": "<b>Удалено:</b>",
   "Common.Controllers.ReviewChanges.textDStrikeout": "Двойное зачеркивание",
-  "Common.Controllers.ReviewChanges.textEquation": "Формула",
+  "Common.Controllers.ReviewChanges.textEquation": "Уравнение",
   "Common.Controllers.ReviewChanges.textExact": "Точно",
   "Common.Controllers.ReviewChanges.textFirstLine": "Первая строка",
   "Common.Controllers.ReviewChanges.textFontSize": "Размер шрифта",
@@ -284,6 +283,7 @@
   "Common.Views.ReviewPopover.textClose": "Закрыть",
   "Common.Views.ReviewPopover.textEdit": "OK",
   "Common.Views.ReviewPopover.textFollowMove": "Перейти на прежнее место",
+  "Common.Views.ReviewPopover.textMention": "+упоминание предоставит доступ к документу и отправит оповещение по почте",
   "Common.Views.ReviewPopover.textOpenAgain": "Открыть снова",
   "Common.Views.ReviewPopover.textReply": "Ответить",
   "Common.Views.ReviewPopover.textResolve": "Решить",
@@ -334,7 +334,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Превышено время ожидания конвертации.",
   "DE.Controllers.Main.criticalErrorExtText": "Нажмите \"OK\", чтобы вернуться к списку документов.",
   "DE.Controllers.Main.criticalErrorTitle": "Ошибка",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Загрузка не удалась.",
   "DE.Controllers.Main.downloadMergeText": "Загрузка...",
   "DE.Controllers.Main.downloadMergeTitle": "Загрузка",
@@ -343,7 +342,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.Controllers.Main.errorBadImageUrl": "Неправильный URL-адрес изображения",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Потеряно соединение с сервером. В данный момент нельзя отредактировать документ.",
-  "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.<br><br>Дополнительную информацию о подключении Сервера документов можно найти <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">здесь</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.<br><br>Дополнительную информацию о подключении Сервера документов можно найти <a href=\"%1\" target=\"_blank\">здесь</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.",
   "DE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.",
   "DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
@@ -410,7 +409,7 @@
   "DE.Controllers.Main.textContactUs": "Связаться с отделом продаж",
   "DE.Controllers.Main.textCustomLoader": "Обратите внимание, что по условиям лицензии у вас нет прав изменять экран, отображаемый при загрузке.<br>Пожалуйста, обратитесь в наш отдел продаж, чтобы сделать запрос.",
   "DE.Controllers.Main.textLoadingDocument": "Загрузка документа",
-  "DE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений ONLYOFFICE",
+  "DE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений %1",
   "DE.Controllers.Main.textPaidFeature": "Платная функция",
   "DE.Controllers.Main.textShape": "Фигура",
   "DE.Controllers.Main.textStrict": "Строгий режим",
@@ -662,8 +661,8 @@
   "DE.Controllers.Main.warnLicenseExceeded": "Превышено допустимое число одновременных подключений к серверу документов, и документ откроется только на просмотр.<br>Обратитесь к администратору за дополнительной информацией.",
   "DE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.<br>Обновите лицензию, а затем обновите страницу.",
   "DE.Controllers.Main.warnLicenseUsersExceeded": "Превышено допустимое число одновременно работающих пользователей, и документ откроется только на просмотр.<br>Обратитесь к администратору за дополнительной информацией.",
-  "DE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
+  "DE.Controllers.Main.warnNoLicense": "Эта версия редакторов %1 имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
-  "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
+  "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов %1 имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
   "DE.Controllers.Navigation.txtBeginning": "Начало документа",
   "DE.Controllers.Navigation.txtGotoBeginning": "Перейти в начало документа",
@@ -1100,6 +1099,7 @@
   "DE.Views.DocumentHolder.hyperlinkText": "Гиперссылка",
   "DE.Views.DocumentHolder.ignoreAllSpellText": "Пропустить все",
   "DE.Views.DocumentHolder.ignoreSpellText": "Пропустить",
+  "DE.Views.DocumentHolder.toDictionaryText": "Добавить в словарь",
   "DE.Views.DocumentHolder.imageText": "Дополнительные параметры изображения",
   "DE.Views.DocumentHolder.insertColumnLeftText": "Столбец слева",
   "DE.Views.DocumentHolder.insertColumnRightText": "Столбец справа",
@@ -1276,6 +1276,7 @@
   "DE.Views.DocumentHolder.txtUngroup": "Разгруппировать",
   "DE.Views.DocumentHolder.updateStyleText": "Обновить стиль %1",
   "DE.Views.DocumentHolder.vertAlignText": "Вертикальное выравнивание",
+  "DE.Views.DocumentHolder.txtPrintSelection": "Напечатать выделенное",
   "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Отмена",
   "DE.Views.DropcapSettingsAdvanced.okButtonText": "ОК",
   "DE.Views.DropcapSettingsAdvanced.strBorders": "Границы и заливка",
@@ -1344,19 +1345,27 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Создайте новый пустой текстовый документ, к которому Вы сможете применить стили и отформатировать при редактировании после того, как он создан. Или выберите один из шаблонов, чтобы создать документ определенного типа или предназначения, где уже предварительно применены некоторые стили.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Новый текстовый документ",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Шаблоны отсутствуют",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Добавить автора",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Добавить текст",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Приложение",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Изменить права доступа",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Дата создания",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Комментарий",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Создан",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Загрузка...",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Автор последнего изменения",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Последнее изменение",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Владелец",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Страницы",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Абзацы",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Размещение",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Люди, имеющие права",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Символы с пробелами",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Статистика",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Тема",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Символы",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Название документа",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Название",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Загружен",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Слова",
   "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Изменить права доступа",
   "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Люди, имеющие права",
@@ -1704,7 +1713,8 @@
   "DE.Views.ParagraphSettingsAdvanced.strMargins": "Внутренние поля",
   "DE.Views.ParagraphSettingsAdvanced.strOrphan": "Запрет висячих строк",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Шрифт",
-  "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Отступы и положение",
+  "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Отступы и интервалы",
+  "DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Положение на странице",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Положение",
   "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Малые прописные",
   "DE.Views.ParagraphSettingsAdvanced.strStrike": "Зачёркивание",
@@ -1745,6 +1755,24 @@
   "DE.Views.ParagraphSettingsAdvanced.tipRight": "Задать только правую границу",
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Задать только верхнюю границу",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Без границ",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Перед",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "После",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Междустрочный интервал",
+  "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Авто",
+  "DE.Views.ParagraphSettingsAdvanced.textAuto": "Множитель",
+  "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "Минимум",
+  "DE.Views.ParagraphSettingsAdvanced.textExact": "Точно",
+  "DE.Views.ParagraphSettingsAdvanced.strSomeParagraphSpace": "Не добавлять интервал между абзацами одного стиля",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Первая строка",
+  "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(нет)",
+  "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "Отступ",
+  "DE.Views.ParagraphSettingsAdvanced.textHanging": "Выступ",
+  "DE.Views.ParagraphSettingsAdvanced.textJustified": "По ширине",
+  "DE.Views.ParagraphSettingsAdvanced.textBodyText": "Основной текст",
+  "DE.Views.ParagraphSettingsAdvanced.textLevel": "Уровень ",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Уровень",
+  "DE.Views.ParagraphSettingsAdvanced.strIndent": "Отступы",
+  "DE.Views.ParagraphSettingsAdvanced.strSpacing": "Интервал между абзацами",
   "DE.Views.RightMenu.txtChartSettings": "Параметры диаграммы",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Параметры верхнего и нижнего колонтитулов",
   "DE.Views.RightMenu.txtImageSettings": "Параметры изображения",
@@ -1811,6 +1839,7 @@
   "DE.Views.ShapeSettings.txtTight": "По контуру",
   "DE.Views.ShapeSettings.txtTopAndBottom": "Сверху и снизу",
   "DE.Views.ShapeSettings.txtWood": "Дерево",
+  "DE.Views.ShapeSettings.strShadow": "Отображать тень",
   "DE.Views.SignatureSettings.notcriticalErrorTitle": "Внимание",
   "DE.Views.SignatureSettings.strDelete": "Удалить подпись",
   "DE.Views.SignatureSettings.strDetails": "Состав подписи",
@@ -2018,7 +2047,7 @@
   "DE.Views.Toolbar.capBtnInsChart": "Диаграмма",
   "DE.Views.Toolbar.capBtnInsControls": "Элементы управления содержимым",
   "DE.Views.Toolbar.capBtnInsDropcap": "Буквица",
-  "DE.Views.Toolbar.capBtnInsEquation": "Формула",
+  "DE.Views.Toolbar.capBtnInsEquation": "Уравнение",
   "DE.Views.Toolbar.capBtnInsHeader": "Колонтитулы",
   "DE.Views.Toolbar.capBtnInsImage": "Изображение",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Разрывы",
@@ -2029,6 +2058,7 @@
   "DE.Views.Toolbar.capBtnMargins": "Поля",
   "DE.Views.Toolbar.capBtnPageOrient": "Ориентация",
   "DE.Views.Toolbar.capBtnPageSize": "Размер",
+  "DE.Views.Toolbar.capBtnWatermark": "Подложка",
   "DE.Views.Toolbar.capImgAlign": "Выравнивание",
   "DE.Views.Toolbar.capImgBackward": "Перенести назад",
   "DE.Views.Toolbar.capImgForward": "Перенести вперед",
@@ -2060,6 +2090,7 @@
   "DE.Views.Toolbar.textColumnsThree": "Три",
   "DE.Views.Toolbar.textColumnsTwo": "Две",
   "DE.Views.Toolbar.textContPage": "На текущей странице",
+  "DE.Views.Toolbar.textEditWatermark": "Настраиваемая подложка",
   "DE.Views.Toolbar.textEvenPage": "С четной страницы",
   "DE.Views.Toolbar.textInMargin": "На поле",
   "DE.Views.Toolbar.textInsColumnBreak": "Вставить разрыв колонки",
@@ -2090,6 +2121,7 @@
   "DE.Views.Toolbar.textPoint": "Точечная",
   "DE.Views.Toolbar.textPortrait": "Книжная",
   "DE.Views.Toolbar.textRemoveControl": "Удалить элемент управления содержимым",
+  "DE.Views.Toolbar.textRemWatermark": "Удалить подложку",
   "DE.Views.Toolbar.textRichControl": "Вставить элемент управления \"Форматированный текст\"",
   "DE.Views.Toolbar.textRight": "Правое: ",
   "DE.Views.Toolbar.textStock": "Биржевая",
@@ -2143,7 +2175,7 @@
   "DE.Views.Toolbar.tipIncFont": "Увеличить размер шрифта",
   "DE.Views.Toolbar.tipIncPrLeft": "Увеличить отступ",
   "DE.Views.Toolbar.tipInsertChart": "Вставить диаграмму",
-  "DE.Views.Toolbar.tipInsertEquation": "Вставить формулу",
+  "DE.Views.Toolbar.tipInsertEquation": "Вставить уравнение",
   "DE.Views.Toolbar.tipInsertImage": "Вставить изображение",
   "DE.Views.Toolbar.tipInsertNum": "Вставить номер страницы",
   "DE.Views.Toolbar.tipInsertShape": "Вставить автофигуру",
@@ -2171,6 +2203,7 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Непечатаемые символы",
   "DE.Views.Toolbar.tipSynchronize": "Документ изменен другим пользователем. Нажмите, чтобы сохранить свои изменения и загрузить обновления.",
   "DE.Views.Toolbar.tipUndo": "Отменить",
+  "DE.Views.Toolbar.tipWatermark": "Изменить подложку",
   "DE.Views.Toolbar.txtDistribHor": "Распределить по горизонтали",
   "DE.Views.Toolbar.txtDistribVert": "Распределить по вертикали",
   "DE.Views.Toolbar.txtMarginAlign": "Выровнять относительно поля",
@@ -2196,5 +2229,30 @@
   "DE.Views.Toolbar.txtScheme6": "Открытая",
   "DE.Views.Toolbar.txtScheme7": "Справедливость",
   "DE.Views.Toolbar.txtScheme8": "Поток",
-  "DE.Views.Toolbar.txtScheme9": "Литейная"
+  "DE.Views.Toolbar.txtScheme9": "Литейная",
+  "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Отмена",
+  "DE.Views.WatermarkSettingsDialog.okButtonText": "OK",
+  "DE.Views.WatermarkSettingsDialog.textAuto": "Авто",
+  "DE.Views.WatermarkSettingsDialog.textBold": "Жирный",
+  "DE.Views.WatermarkSettingsDialog.textColor": "Цвет текста",
+  "DE.Views.WatermarkSettingsDialog.textDiagonal": "По диагонали",
+  "DE.Views.WatermarkSettingsDialog.textFont": "Шрифт",
+  "DE.Views.WatermarkSettingsDialog.textFromFile": "Из файла",
+  "DE.Views.WatermarkSettingsDialog.textFromUrl": "По URL",
+  "DE.Views.WatermarkSettingsDialog.textHor": "По горизонтали",
+  "DE.Views.WatermarkSettingsDialog.textImageW": "Графическая подложка",
+  "DE.Views.WatermarkSettingsDialog.textItalic": "Курсив",
+  "DE.Views.WatermarkSettingsDialog.textLanguage": "Язык",
+  "DE.Views.WatermarkSettingsDialog.textLayout": "Расположение",
+  "DE.Views.WatermarkSettingsDialog.textNewColor": "Пользовательский цвет",
+  "DE.Views.WatermarkSettingsDialog.textNone": "Нет",
+  "DE.Views.WatermarkSettingsDialog.textScale": "Масштаб",
+  "DE.Views.WatermarkSettingsDialog.textStrikeout": "Зачеркнутый",
+  "DE.Views.WatermarkSettingsDialog.textText": "Текст",
+  "DE.Views.WatermarkSettingsDialog.textTextW": "Текстовая подложка",
+  "DE.Views.WatermarkSettingsDialog.textTitle": "Параметры подложки",
+  "DE.Views.WatermarkSettingsDialog.textTransparency": "Полупрозрачный",
+  "DE.Views.WatermarkSettingsDialog.textUnderline": "Подчёркнутый",
+  "DE.Views.WatermarkSettingsDialog.tipFontName": "Шрифт",
+  "DE.Views.WatermarkSettingsDialog.tipFontSize": "Размер шрифта"
 }

apps/documenteditor/main/locale/sk.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Upozornenie",
   "Common.Controllers.Chat.textEnterMessage": "Zadať svoju správu tu",
-  "Common.Controllers.Chat.textUserLimit": "Používate ONLYOFFICE vydanie zadarmo.<br>Iba dvaja používatelia dokážu spolueditovať dokument súčasne.<br>Chcete viac? Zvážte kúpu ONLYOFFICE Podnikové vydanie.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymný",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Zatvoriť",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je blokovaný, pretože ho práve upravuje iný používateľ.",
@@ -288,7 +287,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Prekročený čas konverzie.",
   "DE.Controllers.Main.criticalErrorExtText": "Stlačte \"OK\" pre návrat do zoznamu dokumentov.",
   "DE.Controllers.Main.criticalErrorTitle": "Chyba",
-  "DE.Controllers.Main.defaultTitleText": "Dokumentový editor ONLYOFFICE ",
   "DE.Controllers.Main.downloadErrorText": "Sťahovanie zlyhalo.",
   "DE.Controllers.Main.downloadMergeText": "Sťahovanie...",
   "DE.Controllers.Main.downloadMergeTitle": "Sťahovanie",
@@ -297,7 +295,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Pokúšate sa vykonať akciu, na ktorú nemáte práva.<br>Prosím, kontaktujte svojho správcu dokumentového servera. ",
   "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávna",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Serverové pripojenie sa stratilo. Práve teraz nie je možné dokument upravovať.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.<br>Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.<br><br>Viac informácií o pripojení dokumentového servera nájdete <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">tu</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.<br>Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.<br><br>Viac informácií o pripojení dokumentového servera nájdete <a href=\"%1\" target=\"_blank\">tu</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Externá chyba.<br>Chyba spojenia databázy. Prosím, kontaktujte podporu ak chyba pretrváva. ",
   "DE.Controllers.Main.errorDataRange": "Nesprávny rozsah údajov.",
   "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1",
@@ -1041,7 +1039,6 @@
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Neexistujú žiadne šablóny",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Zmeniť prístupové práva",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Dátum vytvorenia",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Nahrávanie...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Strany",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Odseky",

apps/documenteditor/main/locale/sl.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Opozorilo",
   "Common.Controllers.Chat.textEnterMessage": "Svoje sporočilo vnesite tu",
-  "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonimno",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Zapri",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je onemogočen, saj ga ureja drug uporabnik.",
@@ -174,7 +173,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Pretvorbena prekinitev presežena.",
   "DE.Controllers.Main.criticalErrorExtText": "Pritisnite \"OK\" za vrnitev na seznam dokumentov.",
   "DE.Controllers.Main.criticalErrorTitle": "Napaka",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE urejevalec dokumentov",
   "DE.Controllers.Main.downloadErrorText": "Prenos ni uspel.",
   "DE.Controllers.Main.downloadMergeText": "Downloading...",
   "DE.Controllers.Main.downloadMergeTitle": "Downloading",
@@ -851,7 +849,6 @@
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Ni predlog",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Avtor",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Spremeni pravice dostopa",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Datum nastanka",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Nalaganje...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Strani",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Odstavki",

apps/documenteditor/main/locale/tr.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Dikkat",
   "Common.Controllers.Chat.textEnterMessage": "Mesajınızı buraya giriniz",
-  "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonim",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Kapat",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Obje devre dışı bırakıldı, çünkü başka kullanıcı tarafından düzenleniyor.",
@@ -145,10 +144,13 @@
   "Common.Views.Header.textSaveChanged": "Modifiyeli",
   "Common.Views.Header.textSaveEnd": "Tüm değişiklikler kaydedildi",
   "Common.Views.Header.textSaveExpander": "Tüm değişiklikler kaydedildi",
+  "Common.Views.Header.textZoom": "Büyüt",
   "Common.Views.Header.tipAccessRights": "Belge erişim haklarını yönet",
   "Common.Views.Header.tipDownload": "Dosyayı indir",
   "Common.Views.Header.tipGoEdit": "Mevcut belgeyi düzenle",
   "Common.Views.Header.tipPrint": "Sayfayı yazdır",
+  "Common.Views.Header.tipSave": "Kaydet",
+  "Common.Views.Header.tipUndo": "Geri Al",
   "Common.Views.Header.tipViewUsers": "Kullanıcıları görüntüle ve belge erişim haklarını yönet",
   "Common.Views.Header.txtAccessRights": "Erişim haklarını değiştir",
   "Common.Views.Header.txtRename": "Yeniden adlandır",
@@ -176,12 +178,16 @@
   "Common.Views.LanguageDialog.btnOk": "Tamam",
   "Common.Views.LanguageDialog.labelSelect": "Belge dilini seçin",
   "Common.Views.OpenDialog.cancelButtonText": "Cancel",
+  "Common.Views.OpenDialog.closeButtonText": "Dosyayı Kapat",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtEncoding": "Encoding ",
   "Common.Views.OpenDialog.txtIncorrectPwd": "Şifre hatalı.",
   "Common.Views.OpenDialog.txtPassword": "Şifre",
   "Common.Views.OpenDialog.txtTitle": "Choose %1 options",
   "Common.Views.OpenDialog.txtTitleProtected": "Korumalı dosya",
+  "Common.Views.PasswordDialog.cancelButtonText": "İptal",
+  "Common.Views.PasswordDialog.okButtonText": "Tamam",
+  "Common.Views.PasswordDialog.txtPassword": "Parola",
   "Common.Views.PluginDlg.textLoading": "Yükleniyor",
   "Common.Views.Plugins.groupCaption": "Eklentiler",
   "Common.Views.Plugins.strPlugins": "Plugin",
@@ -227,6 +233,21 @@
   "Common.Views.ReviewChangesDialog.txtReject": "Reddet",
   "Common.Views.ReviewChangesDialog.txtRejectAll": "Tüm Değişiklikleri Reddet",
   "Common.Views.ReviewChangesDialog.txtRejectCurrent": "Mevcut Değişiklikleri Reddet",
+  "Common.Views.ReviewPopover.textAdd": "Ekle",
+  "Common.Views.ReviewPopover.textCancel": "İptal",
+  "Common.Views.ReviewPopover.textClose": "Kapat",
+  "Common.Views.ReviewPopover.textEdit": "Tamam",
+  "Common.Views.ReviewPopover.textReply": "Yanıtla",
+  "Common.Views.SignDialog.cancelButtonText": "İptal",
+  "Common.Views.SignDialog.okButtonText": "Tamam",
+  "Common.Views.SignDialog.textBold": "Kalın",
+  "Common.Views.SignDialog.textCertificate": "Sertifika",
+  "Common.Views.SignDialog.textChange": "Değiştir",
+  "Common.Views.SignDialog.textItalic": "İtalik",
+  "Common.Views.SignSettingsDialog.cancelButtonText": "İptal",
+  "Common.Views.SignSettingsDialog.okButtonText": "Tamam",
+  "Common.Views.SignSettingsDialog.textInfoEmail": "E-posta",
+  "Common.Views.SignSettingsDialog.textInfoName": "İsim",
   "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "İsimlendirilmemiş döküman",
   "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
@@ -241,7 +262,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Değişim süresi geçti.",
   "DE.Controllers.Main.criticalErrorExtText": "Döküman listesine dönmek için \"TAMAM\"'a tıklayın",
   "DE.Controllers.Main.criticalErrorTitle": "Hata",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Döküman Editörü",
   "DE.Controllers.Main.downloadErrorText": "Yükleme başarısız oldu.",
   "DE.Controllers.Main.downloadMergeText": "Downloading...",
   "DE.Controllers.Main.downloadMergeTitle": "Downloading",
@@ -250,7 +270,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Hakiniz olmayan bir eylem gerçekleştirmeye çalışıyorsunuz. <br> Lütfen Document Server yöneticinize başvurun.",
   "DE.Controllers.Main.errorBadImageUrl": "Resim URL'si yanlış",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Sunucu bağlantısı kesildi. Döküman şu an düzenlenemez.",
-  "DE.Controllers.Main.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.Main.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.<br><br>Belge Sunucusuna bağlanma konusunda daha fazla bilgi için <a href=\"%1\" target=\"_blank\">buraya</a> tıklayın",
   "DE.Controllers.Main.errorDatabaseConnection": "Harci hata. <br>Veri tabanı bağlantı hatası. Hata devam ederse lütfen destek ile iletişime geçin.",
   "DE.Controllers.Main.errorDataRange": "Yanlış veri aralığı.",
   "DE.Controllers.Main.errorDefaultMessage": "Hata kodu: %1",
@@ -306,6 +326,7 @@
   "DE.Controllers.Main.textAnonymous": "Anonim",
   "DE.Controllers.Main.textBuyNow": "Websitesini ziyaret edin",
   "DE.Controllers.Main.textChangesSaved": "Tüm değişiklikler kaydedildi",
+  "DE.Controllers.Main.textClose": "Kapat",
   "DE.Controllers.Main.textCloseTip": "Ucu kapamak için tıklayın",
   "DE.Controllers.Main.textContactUs": "Satış departmanı ile iletişime geçin",
   "DE.Controllers.Main.textLoadingDocument": "Döküman yükleniyor",
@@ -330,6 +351,21 @@
   "DE.Controllers.Main.txtNeedSynchronize": "Güncellemeleriniz var",
   "DE.Controllers.Main.txtRectangles": "Dikdörtgenler",
   "DE.Controllers.Main.txtSeries": "Seriler",
+  "DE.Controllers.Main.txtShape_actionButtonHome": "Ev Tuşu",
+  "DE.Controllers.Main.txtShape_cloud": "Bulut",
+  "DE.Controllers.Main.txtShape_leftArrow": "Sol Ok",
+  "DE.Controllers.Main.txtShape_lineWithArrow": "Ok",
+  "DE.Controllers.Main.txtShape_noSmoking": "Simge \"Yok\"",
+  "DE.Controllers.Main.txtShape_star10": "10-Numara Yıldız",
+  "DE.Controllers.Main.txtShape_star12": "12-Numara Yıldız",
+  "DE.Controllers.Main.txtShape_star16": "16-Numara Yıldız",
+  "DE.Controllers.Main.txtShape_star24": "24-Numara Yıldız",
+  "DE.Controllers.Main.txtShape_star32": "32-Numara Yıldız",
+  "DE.Controllers.Main.txtShape_star4": "4-Numara Yıldız",
+  "DE.Controllers.Main.txtShape_star5": "5-Numara Yıldız",
+  "DE.Controllers.Main.txtShape_star6": "6-Numara Yıldız",
+  "DE.Controllers.Main.txtShape_star7": "7-Numara Yıldız",
+  "DE.Controllers.Main.txtShape_star8": "8-Numara Yıldız",
   "DE.Controllers.Main.txtStarsRibbons": "Yıldızlar & Kurdeleler",
   "DE.Controllers.Main.txtStyle_Heading_1": "Başlık 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "Başlık 2",
@@ -700,6 +736,10 @@
   "DE.Controllers.Toolbar.txtSymbol_vdots": "Vertical Ellipsis",
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
+  "DE.Views.BookmarksDialog.textAdd": "Ekle",
+  "DE.Views.BookmarksDialog.textClose": "Kapat",
+  "DE.Views.BookmarksDialog.textDelete": "Sil",
+  "DE.Views.BookmarksDialog.textName": "İsim",
   "DE.Views.ChartSettings.textAdvanced": "Gelişmiş ayarları göster",
   "DE.Views.ChartSettings.textArea": "Bölge Grafiği",
   "DE.Views.ChartSettings.textBar": "Çubuk grafik",
@@ -726,6 +766,11 @@
   "DE.Views.ChartSettings.txtTight": "Sıkı",
   "DE.Views.ChartSettings.txtTitle": "Grafik",
   "DE.Views.ChartSettings.txtTopAndBottom": "Üst ve alt",
+  "DE.Views.ControlSettingsDialog.cancelButtonText": "İptal",
+  "DE.Views.ControlSettingsDialog.okButtonText": "Tamam",
+  "DE.Views.ControlSettingsDialog.textColor": "Renk",
+  "DE.Views.ControlSettingsDialog.textName": "Başlık",
+  "DE.Views.ControlSettingsDialog.textTag": "Etiket",
   "DE.Views.CustomColumnsDialog.cancelButtonText": "İptal",
   "DE.Views.CustomColumnsDialog.okButtonText": "Tamam",
   "DE.Views.CustomColumnsDialog.textColumns": "Sütun sayısı",
@@ -806,6 +851,9 @@
   "DE.Views.DocumentHolder.textNextPage": "Sonraki Sayfa",
   "DE.Views.DocumentHolder.textPaste": "Yapıştır",
   "DE.Views.DocumentHolder.textPrevPage": "Önceki Sayfa",
+  "DE.Views.DocumentHolder.textRotate": "Döndür",
+  "DE.Views.DocumentHolder.textRotate270": "Döndür 90° Saatyönütersi",
+  "DE.Views.DocumentHolder.textRotate90": "Döndür 90° Saatyönü",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Alta Hizala",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Ortaya Hizala",
   "DE.Views.DocumentHolder.textShapeAlignLeft": "Sola Hizala",
@@ -950,6 +998,7 @@
   "DE.Views.FileMenu.btnHistoryCaption": "Version History",
   "DE.Views.FileMenu.btnInfoCaption": "Döküman Bilgisi...",
   "DE.Views.FileMenu.btnPrintCaption": "Yazdır",
+  "DE.Views.FileMenu.btnProtectCaption": "Koru",
   "DE.Views.FileMenu.btnRecentFilesCaption": "En sonunucuyu aç...",
   "DE.Views.FileMenu.btnRenameCaption": "Yeniden adlandır...",
   "DE.Views.FileMenu.btnReturnCaption": "Dökümana Geri Dön",
@@ -964,10 +1013,11 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Oluşturulduktan sonra düzenleme sırasında stil ve format verebileceğiniz yeni boş metin dosyası oluşturun. Yada belli tipte yada amaçta dökümana başlamak için şablonlardan birini seçin, bu şablonlar önceden düzenlenmiştir.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Yeni Metin Dökümanı",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Şablon yok",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Yazar Ekle",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Yayıncı",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Erişim haklarını değiştir",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Oluşturulma tarihi",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Yükleniyor...",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Sahip",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Sayfalar",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Paragraflar",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Lokasyon",
@@ -1051,8 +1101,11 @@
   "DE.Views.ImageSettings.textFromFile": "Dosyadan",
   "DE.Views.ImageSettings.textFromUrl": "URL'den",
   "DE.Views.ImageSettings.textHeight": "Yükseklik",
+  "DE.Views.ImageSettings.textHint270": "Döndür 90° Saatyönütersi",
+  "DE.Views.ImageSettings.textHint90": "Döndür 90° Saatyönü",
   "DE.Views.ImageSettings.textInsert": "Resimi Değiştir",
   "DE.Views.ImageSettings.textOriginalSize": "Varsayılan Boyut",
+  "DE.Views.ImageSettings.textRotate90": "Döndür 90°",
   "DE.Views.ImageSettings.textSize": "Boyut",
   "DE.Views.ImageSettings.textWidth": "Genişlik",
   "DE.Views.ImageSettings.textWrap": "Kaydırma Stili",
@@ -1072,6 +1125,7 @@
   "DE.Views.ImageSettingsAdvanced.textAltDescription": "Açıklama",
   "DE.Views.ImageSettingsAdvanced.textAltTip": "Görsel obje bilgilerinin alternatif metin tabanlı sunumu görsel veya bilinçsel açıdan problem yaşan kişilere okunarak resimdeki, şekildeki, grafikteki veya tablodaki bilgileri daha kolay anlamalarını sağlamayı amaçlar.",
   "DE.Views.ImageSettingsAdvanced.textAltTitle": "Başlık",
+  "DE.Views.ImageSettingsAdvanced.textAngle": "Açı",
   "DE.Views.ImageSettingsAdvanced.textArrows": "Oklar",
   "DE.Views.ImageSettingsAdvanced.textAspectRatio": "En-boy oranını kilitle",
   "DE.Views.ImageSettingsAdvanced.textBeginSize": "Başlama Boyutu",
@@ -1188,6 +1242,7 @@
   "DE.Views.MailMergeSettings.txtPrev": "To previous record",
   "DE.Views.MailMergeSettings.txtUntitled": "Untitled",
   "DE.Views.MailMergeSettings.warnProcessMailMerge": "Starting merge failed",
+  "DE.Views.Navigation.txtCollapse": "Hepsini daralt",
   "DE.Views.NoteSettingsDialog.textApply": "Uygula",
   "DE.Views.NoteSettingsDialog.textApplyTo": "Değişiklikleri uygula",
   "DE.Views.NoteSettingsDialog.textCancel": "İptal",
@@ -1207,6 +1262,8 @@
   "DE.Views.NoteSettingsDialog.textStart": "Başlatma zamanı",
   "DE.Views.NoteSettingsDialog.textTextBottom": "Aşağıdaki metin",
   "DE.Views.NoteSettingsDialog.textTitle": "Not ayarları",
+  "DE.Views.NumberingValueDialog.cancelButtonText": "İptal",
+  "DE.Views.NumberingValueDialog.okButtonText": "Tamam",
   "DE.Views.PageMarginsDialog.cancelButtonText": "Cancel",
   "DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning",
   "DE.Views.PageMarginsDialog.okButtonText": "OK",
@@ -1266,6 +1323,7 @@
   "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Karakter aralığı",
   "DE.Views.ParagraphSettingsAdvanced.textDefault": "Varsayılan Sekme",
   "DE.Views.ParagraphSettingsAdvanced.textEffects": "Efektler",
+  "DE.Views.ParagraphSettingsAdvanced.textLeader": "Lider",
   "DE.Views.ParagraphSettingsAdvanced.textLeft": "Sol",
   "DE.Views.ParagraphSettingsAdvanced.textNewColor": "Yeni Özel Renk Ekle",
   "DE.Views.ParagraphSettingsAdvanced.textPosition": "Pozisyon",
@@ -1316,12 +1374,15 @@
   "DE.Views.ShapeSettings.textFromUrl": "URL'den",
   "DE.Views.ShapeSettings.textGradient": "Gradyan",
   "DE.Views.ShapeSettings.textGradientFill": "Gradyan Dolgu",
+  "DE.Views.ShapeSettings.textHint270": "Döndür 90° Saatyönütersi",
+  "DE.Views.ShapeSettings.textHint90": "Döndür 90° Saatyönü",
   "DE.Views.ShapeSettings.textImageTexture": "Resim yada Doldurma Deseni",
   "DE.Views.ShapeSettings.textLinear": "Doğrusal",
   "DE.Views.ShapeSettings.textNewColor": "Yeni Özel Renk Ekle",
   "DE.Views.ShapeSettings.textNoFill": "Dolgu Yok",
   "DE.Views.ShapeSettings.textPatternFill": "Desen",
   "DE.Views.ShapeSettings.textRadial": "Radyal",
+  "DE.Views.ShapeSettings.textRotate90": "Döndür 90°",
   "DE.Views.ShapeSettings.textSelectTexture": "Seç",
   "DE.Views.ShapeSettings.textStretch": "Esnet",
   "DE.Views.ShapeSettings.textStyle": "Stil",
@@ -1361,6 +1422,14 @@
   "DE.Views.StyleTitleDialog.textTitle": "Title",
   "DE.Views.StyleTitleDialog.txtEmpty": "This field is required",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty",
+  "DE.Views.TableFormulaDialog.cancelButtonText": "İptal",
+  "DE.Views.TableFormulaDialog.okButtonText": "Tamam",
+  "DE.Views.TableOfContentsSettings.cancelButtonText": "İptal",
+  "DE.Views.TableOfContentsSettings.okButtonText": "Tamam",
+  "DE.Views.TableOfContentsSettings.textLeader": "Lider",
+  "DE.Views.TableOfContentsSettings.textLevel": "Seviye",
+  "DE.Views.TableOfContentsSettings.textLevels": "Seviyeler",
+  "DE.Views.TableOfContentsSettings.txtModern": "Modern",
   "DE.Views.TableSettings.deleteColumnText": "Sütunu Sil",
   "DE.Views.TableSettings.deleteRowText": "Satırı Sil",
   "DE.Views.TableSettings.deleteTableText": "Tabloyu Sil",
@@ -1382,6 +1451,7 @@
   "DE.Views.TableSettings.textBorderColor": "Renk",
   "DE.Views.TableSettings.textBorders": "Sınır Stili",
   "DE.Views.TableSettings.textCancel": "İptal Et",
+  "DE.Views.TableSettings.textCellSize": "Hücre boyutu",
   "DE.Views.TableSettings.textColumns": "Sütunlar",
   "DE.Views.TableSettings.textEdit": "Satırlar & Sütunlar",
   "DE.Views.TableSettings.textEmptyTemplate": "Şablon yok",
@@ -1394,6 +1464,7 @@
   "DE.Views.TableSettings.textSelectBorders": "Yukarıda seçilen stili uygulayarak değiştirmek istediğiniz sınırları seçin",
   "DE.Views.TableSettings.textTemplate": "Şablondan Seç",
   "DE.Views.TableSettings.textTotal": "Toplam",
+  "DE.Views.TableSettings.textWidth": "Genişlik",
   "DE.Views.TableSettings.tipAll": "Dış Sınır ve Tüm İç Satırları Belirle",
   "DE.Views.TableSettings.tipBottom": "Sadece Dış Alt Sınırı Belirle",
   "DE.Views.TableSettings.tipInner": "Sadece İç Satırları Belirle",
@@ -1586,6 +1657,7 @@
   "DE.Views.Toolbar.textTabHome": "Ana Sayfa",
   "DE.Views.Toolbar.textTabInsert": "Ekle",
   "DE.Views.Toolbar.textTabLayout": "Tasarım",
+  "DE.Views.Toolbar.textTabProtect": "Koruma",
   "DE.Views.Toolbar.textTabReview": "İnceleme",
   "DE.Views.Toolbar.textTitleError": "Hata",
   "DE.Views.Toolbar.textToCurrent": "Mevcut pozisyona",
@@ -1596,6 +1668,7 @@
   "DE.Views.Toolbar.tipAlignLeft": "Sola Hizala",
   "DE.Views.Toolbar.tipAlignRight": "Sağa Hizla",
   "DE.Views.Toolbar.tipBack": "Geri",
+  "DE.Views.Toolbar.tipBlankPage": "Boş sayfa ekle",
   "DE.Views.Toolbar.tipChangeChart": "Grafik tipini değiştir",
   "DE.Views.Toolbar.tipClearStyle": "Stili Temizle",
   "DE.Views.Toolbar.tipColorSchemas": "Renk Şemasını Değiştir",
@@ -1665,5 +1738,13 @@
   "DE.Views.Toolbar.txtScheme6": "Toplama",
   "DE.Views.Toolbar.txtScheme7": "Net Değer",
   "DE.Views.Toolbar.txtScheme8": "Yayılma",
-  "DE.Views.Toolbar.txtScheme9": "Döküm"
+  "DE.Views.Toolbar.txtScheme9": "Döküm",
+  "DE.Views.WatermarkSettingsDialog.cancelButtonText": "İptal",
+  "DE.Views.WatermarkSettingsDialog.okButtonText": "Tamam",
+  "DE.Views.WatermarkSettingsDialog.textAuto": "Otomatik",
+  "DE.Views.WatermarkSettingsDialog.textBold": "Kalın",
+  "DE.Views.WatermarkSettingsDialog.textHor": "Yatay",
+  "DE.Views.WatermarkSettingsDialog.textItalic": "İtalik",
+  "DE.Views.WatermarkSettingsDialog.textText": "Metin",
+  "DE.Views.WatermarkSettingsDialog.textUnderline": "Altı çizili"
 }

apps/documenteditor/main/locale/uk.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Застереження",
   "Common.Controllers.Chat.textEnterMessage": "ВВедіть своє повідомлення тут",
-  "Common.Controllers.Chat.textUserLimit": "Ви використовуюєте ONLYOFFICE Free Edition. <br> Тільки два користувачі можуть одночасно редагувати документ одночасно. <br> Хочете більше? Подумайте про придбання версії ONLYOFFICE Enterprise Edition. <br> <a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\"> Докладніше </a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Гість",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Закрити",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Об'єкт вимкнено, оскільки його редагує інший користувач.",
@@ -240,7 +239,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Термін переходу перевищено.",
   "DE.Controllers.Main.criticalErrorExtText": "Натисніть \"OK\", щоб повернутися до списку документів.",
   "DE.Controllers.Main.criticalErrorTitle": "Помилка",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Завантаження не вдалося",
   "DE.Controllers.Main.downloadMergeText": "Завантаження...",
   "DE.Controllers.Main.downloadMergeTitle": "Завантаження",
@@ -249,7 +247,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Ви намагаєтеся виконати дію, у якої у вас немає прав. <br> Будь ласка, зв'яжіться з адміністратором вашого Сервера документів.",
   "DE.Controllers.Main.errorBadImageUrl": "URL-адреса зображення невірна",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "З'єднання з сервером втрачено. Документ не можна редагувати прямо зараз.",
-  "DE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора. <br> Після натискання кнопки «ОК» вам буде запропоновано завантажити документ. <br> <br> Більше інформації про підключення сервера документів <a href = \"https: //api.onlyoffice.com/editors/callback \"target =\" _ blank \"> тут </ a>",
+  "DE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора.<br>Після натискання кнопки «ОК» вам буде запропоновано завантажити документ. <br><br>Більше інформації про підключення сервера документів <a href=\"%1\" target=\"_blank\">тут</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Зовнішня помилка. <br> Помилка підключення до бази даних. Будь ласка, зв'яжіться зі службою підтримки, якщо помилка не зникне.",
   "DE.Controllers.Main.errorDataRange": "Неправильний діапазон даних.",
   "DE.Controllers.Main.errorDefaultMessage": "Код помилки: %1 ",
@@ -965,7 +963,6 @@
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Немає шаблонів",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Змінити права доступу",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Дата створення",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Завантаження...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Сторінки",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Параграфи",

apps/documenteditor/main/locale/vi.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "Cảnh báo",
   "Common.Controllers.Chat.textEnterMessage": "Nhập tin nhắn của bạn ở đây",
-  "Common.Controllers.Chat.textUserLimit": "Bạn đang sử dụng ONLYOFFICE Free Edition.<br>Chỉ hai người dùng có thể đồng thời cùng chỉnh sửa tài liệu.<br>Bạn muốn nhiều hơn? Cân nhắc mua ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Đọc thêm</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Nặc danh",
   "Common.Controllers.ExternalDiagramEditor.textClose": "Đóng",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Đối tượng bị vô hiệu vì nó đang được chỉnh sửa bởi một người dùng khác.",
@@ -241,7 +240,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Đã quá thời gian chờ chuyển đổi.",
   "DE.Controllers.Main.criticalErrorExtText": "Nhấp \"OK\" để trở lại danh sách tài liệu.",
   "DE.Controllers.Main.criticalErrorTitle": "Lỗi",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Tải về không thành công.",
   "DE.Controllers.Main.downloadMergeText": "Đang tải...",
   "DE.Controllers.Main.downloadMergeTitle": "Đang tải về",
@@ -250,7 +248,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Bạn đang cố gắng thực hiện hành động mà bạn không có quyền.<br>Vui lòng liên hệ với quản trị viên Server Tài liệu của bạn.",
   "DE.Controllers.Main.errorBadImageUrl": "URL hình ảnh không chính xác",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Mất kết nối server. Không thể chỉnh sửa tài liệu ngay lúc này.",
-  "DE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.<br>Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.<br><br>Tìm thêm thông tin về kết nối Server Tài liệu <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">ở đây</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.<br>Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.<br><br>Tìm thêm thông tin về kết nối Server Tài liệu <a href=\"%1\" target=\"_blank\">ở đây</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Lỗi bên ngoài.<br>Lỗi kết nối cơ sở dữ liệu. Vui lòng liên hệ bộ phận hỗ trợ trong trường hợp lỗi vẫn còn.",
   "DE.Controllers.Main.errorDataRange": "Phạm vi dữ liệu không chính xác.",
   "DE.Controllers.Main.errorDefaultMessage": "Mã lỗi: %1",
@@ -966,7 +964,6 @@
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Không có template",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Tác giả",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Thay đổi quyền truy cập",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Ngày tạo",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Đang tải...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Trang",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Đoạn văn bản",

apps/documenteditor/main/locale/zh.json

@@ -1,7 +1,6 @@
 {
   "Common.Controllers.Chat.notcriticalErrorTitle": "警告",
   "Common.Controllers.Chat.textEnterMessage": "在这里输入你的信息",
-  "Common.Controllers.Chat.textUserLimit": "您正在使用ONLYOFFICE免费版。<br>只有两个用户可以同时共同编辑文档。<br>想要更多？考虑购买ONLYOFFICE企业版。<br> <a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">阅读更多内容</a>",
   "Common.Controllers.ExternalDiagramEditor.textAnonymous": "匿名",
   "Common.Controllers.ExternalDiagramEditor.textClose": "关闭",
   "Common.Controllers.ExternalDiagramEditor.warningText": "该对象被禁用，因为它被另一个用户编辑。",
@@ -333,7 +332,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "转换超时",
   "DE.Controllers.Main.criticalErrorExtText": "按“确定”返回该文件列表。",
   "DE.Controllers.Main.criticalErrorTitle": "错误:",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE文档编辑器",
   "DE.Controllers.Main.downloadErrorText": "下载失败",
   "DE.Controllers.Main.downloadMergeText": "下载中…",
   "DE.Controllers.Main.downloadMergeTitle": "下载中",
@@ -342,7 +340,7 @@
   "DE.Controllers.Main.errorAccessDeny": "您正在尝试执行您没有权限的操作。<br>请联系您的文档服务器管理员.",
   "DE.Controllers.Main.errorBadImageUrl": "图片地址不正确",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "服务器连接丢失。该文档现在无法编辑",
-  "DE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。<br>当你点击“OK”按钮,系统将提示您下载文档。<br><br>找到更多信息连接文件服务器<a href=\"https://api.onlyoffice.com/editors/callback\" target=\"平等\">在这里</>",
+  "DE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。<br>当你点击“OK”按钮,系统将提示您下载文档。<br><br>找到更多信息连接文件服务器<a href=\"%1\" target=\"平等\">在这里</>",
   "DE.Controllers.Main.errorDatabaseConnection": "外部错误。<br>数据库连接错误。如果错误仍然存​​在，请联系支持人员。",
   "DE.Controllers.Main.errorDataEncrypted": "加密更改已收到，无法对其解密。",
   "DE.Controllers.Main.errorDataRange": "数据范围不正确",
@@ -1346,7 +1344,6 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "应用",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "作者",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "更改访问权限",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "创建日期",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "载入中……",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "页面",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "段落",

apps/documenteditor/mobile/app-dev.js

@@ -151,7 +151,7 @@ require([
             'AddShape',
             'AddImage',
             'AddOther',
-            'Collaboration'
+            'Common.Controllers.Collaboration'
         ]
     });
 
@@ -222,7 +222,7 @@ require([
         'documenteditor/mobile/app/controller/add/AddShape',
         'documenteditor/mobile/app/controller/add/AddImage',
         'documenteditor/mobile/app/controller/add/AddOther',
-        'documenteditor/mobile/app/controller/Collaboration'
+        'common/mobile/lib/controller/Collaboration'
     ], function() {
         window.compareVersions = true;
         app.start();

apps/documenteditor/mobile/app.js

@@ -162,7 +162,7 @@ require([
             'AddShape',
             'AddImage',
             'AddOther',
-            'Collaboration'
+            'Common.Controllers.Collaboration'
         ]
     });
 
@@ -233,7 +233,7 @@ require([
         'documenteditor/mobile/app/controller/add/AddShape',
         'documenteditor/mobile/app/controller/add/AddImage',
         'documenteditor/mobile/app/controller/add/AddOther',
-        'documenteditor/mobile/app/controller/Collaboration'
+        'common/mobile/lib/controller/Collaboration'
     ], function() {
         app.start();
     });

apps/documenteditor/mobile/app/controller/DocumentHolder.js

@@ -149,14 +149,14 @@ define([
                         }
                     });
                 } else if ('review' == eventName) {
-                    var getCollaboration = DE.getController('Collaboration');
+                    var getCollaboration = DE.getController('Common.Controllers.Collaboration');
                     getCollaboration.showModal();
-                    getCollaboration.getView('Collaboration').showPage('#reviewing-settings-view', false);
+                    getCollaboration.getView('Common.Views.Collaboration').showPage('#reviewing-settings-view', false);
                 } else if('reviewchange' == eventName) {
-                    var getCollaboration = DE.getController('Collaboration');
+                    var getCollaboration = DE.getController('Common.Controllers.Collaboration');
                     getCollaboration.showModal();
-                    getCollaboration.getView('Collaboration').showPage('#reviewing-settings-view', false);
+                    getCollaboration.getView('Common.Views.Collaboration').showPage('#reviewing-settings-view', false);
-                    getCollaboration.getView('Collaboration').showPage('#change-view', false);
+                    getCollaboration.getView('Common.Views.Collaboration').showPage('#change-view', false);
                 } else if ('showActionSheet' == eventName && _actionSheets.length > 0) {
                     _.delay(function () {
                         _.each(_actionSheets, function (action) {

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

@@ -155,6 +155,7 @@ define([
 
                     Common.NotificationCenter.on('api:disconnect',                  _.bind(me.onCoAuthoringDisconnect, me));
                     Common.NotificationCenter.on('goback',                          _.bind(me.goBack, me));
+                    Common.NotificationCenter.on('download:advanced',               _.bind(me.onAdvancedOptions, me));
 
                     // Initialize descendants
                     _.each(me.getApplication().controllers, function(controller) {
@@ -186,7 +187,7 @@ define([
                     Common.Gateway.internalMessage('listenHardBack');
                 }
 
-                me.defaultTitleText = me.defaultTitleText || '{{APP_TITLE_TEXT}}';
+                me.defaultTitleText = '{{APP_TITLE_TEXT}}';
                 me.warnNoLicense  = me.warnNoLicense.replace('%1', '{{COMPANY_NAME}}');
                 me.warnNoLicenseUsers = me.warnNoLicenseUsers.replace('%1', '{{COMPANY_NAME}}');
                 me.textNoLicenseTitle = me.textNoLicenseTitle.replace('%1', '{{COMPANY_NAME}}');
@@ -266,6 +267,10 @@ define([
 
                 if (data.doc) {
                     DE.getController('Toolbar').setDocumentTitle(data.doc.title);
+                    if (data.doc.info) {
+                        data.doc.info.author && console.log("Obsolete: The 'author' parameter of the document 'info' section is deprecated. Please use 'owner' instead.");
+                        data.doc.info.created && console.log("Obsolete: The 'created' parameter of the document 'info' section is deprecated. Please use 'uploaded' instead.");
+                    }
                 }
             },
 
@@ -324,7 +329,7 @@ define([
                 if (type && typeof type[1] === 'string') {
                     this.api.asc_DownloadOrigin(true)
                 } else {
-                    this.api.asc_DownloadAs(Asc.c_oAscFileType.DOCX, true);
+                    this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX, true));
                 }
             },
 
@@ -518,7 +523,8 @@ define([
 
                 /** coauthoring begin **/
                 this.isLiveCommenting = Common.localStorage.getBool("de-settings-livecomment", true);
-                this.isLiveCommenting ? this.api.asc_showComments(true) : this.api.asc_hideComments();
+                var resolved = Common.localStorage.getBool("de-settings-resolvedcomment", true);
+                this.isLiveCommenting ? this.api.asc_showComments(resolved) : this.api.asc_hideComments();
                 /** coauthoring end **/
 
                 value = Common.localStorage.getItem("de-settings-zoom");
@@ -1116,17 +1122,16 @@ define([
                Common.Utils.ThemeColor.setColors(colors, standart_colors);
             },
 
-            onAdvancedOptions: function(advOptions) {
+            onAdvancedOptions: function(type, advOptions, mode, formatOptions) {
                 if (this._state.openDlg) return;
 
-                var type = advOptions.asc_getOptionId(),
+                var me = this;
-                    me = this;
                 if (type == Asc.c_oAscAdvancedOptionsID.TXT) {
                     var picker,
                         pages = [],
                         pagesName = [];
 
-                    _.each(advOptions.asc_getOptions().asc_getCodePages(), function(page) {
+                    _.each(advOptions.asc_getCodePages(), function(page) {
                         pages.push(page.asc_getCodePage());
                         pagesName.push(page.asc_getCodePageName());
                     });
@@ -1135,6 +1140,37 @@ define([
 
                     me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
 
+                    var buttons = [];
+                    if (mode === 2) {
+                        buttons.push({
+                            text: me.textCancel,
+                            onClick: function () {
+                                me._state.openDlg = null;
+                            }
+                        });
+                    }
+                    buttons.push({
+                        text: 'OK',
+                        bold: true,
+                        onClick: function() {
+                            var encoding = picker.value;
+
+                            if (me.api) {
+                                if (mode==2) {
+                                    formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CTextOptions(encoding));
+                                    me.api.asc_DownloadAs(formatOptions);
+                                } else {
+                                    me.api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding));
+                                }
+
+                                if (!me._isDocReady) {
+                                    me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
+                                }
+                            }
+                            me._state.openDlg = null;
+                        }
+                    });
+
                     me._state.openDlg = uiApp.modal({
                         title: me.advTxtOptions,
                         text: '',
@@ -1145,31 +1181,14 @@ define([
                             '</div>' +
                             '<div id="txt-encoding"></div>' +
                         '</div>',
-                        buttons: [
+                        buttons: buttons
-                            {
-                                text: 'OK',
-                                bold: true,
-                                onClick: function() {
-                                    var encoding = picker.value;
-
-                                    if (me.api) {
-                                        me.api.asc_setAdvancedOptions(type, new Asc.asc_CTXTAdvancedOptions(encoding));
-
-                                        if (!me._isDocReady) {
-                                            me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
-                                        }
-                                    }
-                                    me._state.openDlg = null;
-                                }
-                            }
-                        ]
                     });
 
                     picker = uiApp.picker({
                         container: '#txt-encoding',
                         toolbar: false,
                         rotateEffect: true,
-                        value: [advOptions.asc_getOptions().asc_getRecommendedSettings().asc_getCodePage()],
+                        value: [advOptions.asc_getRecommendedSettings().asc_getCodePage()],
                         cols: [{
                             values: pages,
                             displayValues: pagesName

apps/documenteditor/mobile/app/controller/Settings.js

@@ -47,7 +47,7 @@ define([
     'underscore',
     'backbone',
     'documenteditor/mobile/app/view/Settings',
-    'documenteditor/mobile/app/controller/Collaboration'
+    'common/mobile/lib/controller/Collaboration'
 ], function (core, $, _, Backbone) {
     'use strict';
 
@@ -85,7 +85,8 @@ define([
             _isReviewOnly = false,
             _fileKey,
             templateInsert,
-            _metricText = Common.Utils.Metric.getCurrentMetricName();
+            _metricText = Common.Utils.Metric.getCurrentMetricName(),
+            _isEdit;
 
         var mm2Cm = function(mm) {
             return parseFloat((mm/10.).toFixed(2));
@@ -147,6 +148,7 @@ define([
                 _canReview = mode.canReview;
                 _isReviewOnly = mode.isReviewOnly;
                 _fileKey = mode.fileKey;
+                _isEdit = mode.isEdit;
             },
 
             initEvents: function () {
@@ -234,6 +236,16 @@ define([
                     $('#settings-hidden-borders input:checkbox').attr('checked', (Common.localStorage.getItem("de-mobile-hidden-borders") == 'true') ? true : false);
                     $('#settings-hidden-borders input:checkbox').single('change',   _.bind(me.onShowTableEmptyLine, me));
                     $('#settings-orthography').single('click',                  _.bind(me.onOrthographyCheck, me));
+                    var displayComments = Common.localStorage.getBool("de-settings-livecomment", true);
+                    $('#settings-display-comments input:checkbox').attr('checked', displayComments);
+                    $('#settings-display-comments input:checkbox').single('change',   _.bind(me.onChangeDisplayComments, me));
+                    var displayResolved = Common.localStorage.getBool("de-settings-resolvedcomment", true);
+                    if (!displayComments) {
+                        $("#settings-display-resolved").addClass("disabled");
+                        displayResolved = false;
+                    }
+                    $('#settings-display-resolved input:checkbox').attr('checked', displayResolved);
+                    $('#settings-display-resolved input:checkbox').single('change',   _.bind(me.onChangeDisplayResolved, me));
                     Common.Utils.addScrollIfNeed('.page[data-page=settings-advanced-view]', '.page[data-page=settings-advanced-view] .page-content');
                 } else if ('#color-schemes-view' == pageId) {
                     me.initPageColorSchemes();
@@ -249,7 +261,7 @@ define([
                     $('#settings-download').single('click',                     _.bind(me.onDownloadOrigin, me));
                     $('#settings-print').single('click',                        _.bind(me.onPrint, me));
                     $('#settings-collaboration').single('click',                _.bind(me.clickCollaboration, me));
-                    var _stateDisplayMode = DE.getController('Collaboration').getDisplayMode();
+                    var _stateDisplayMode = DE.getController('Common.Controllers.Collaboration').getDisplayMode();
                     if(_stateDisplayMode == "Final" || _stateDisplayMode == "Original") {
                         $('#settings-document').addClass('disabled');
                     }
@@ -260,8 +272,34 @@ define([
                 }
             },
 
+            onChangeDisplayComments: function(e) {
+                var displayComments = $(e.currentTarget).is(':checked');
+                if (!displayComments) {
+                    this.api.asc_hideComments();
+                    $("#settings-display-resolved input").prop( "checked", false );
+                    Common.localStorage.setBool("de-settings-resolvedcomment", false);
+                    $("#settings-display-resolved").addClass("disabled");
+                } else {
+                    var resolved = Common.localStorage.getBool("de-settings-resolvedcomment");
+                    this.api.asc_showComments(resolved);
+                    $("#settings-display-resolved").removeClass("disabled");
+                }
+                Common.localStorage.setBool("de-settings-livecomment", displayComments);
+            },
+
+            onChangeDisplayResolved: function(e) {
+                var displayComments = Common.localStorage.getBool("de-settings-livecomment");
+                if (displayComments) {
+                    var resolved = $(e.currentTarget).is(':checked');
+                    if (this.api) {
+                        this.api.asc_showComments(resolved);
+                    }
+                    Common.localStorage.setBool("de-settings-resolvedcomment", resolved);
+                }
+            },
+
             clickCollaboration: function() {
-                DE.getController('Collaboration').showModal();
+                DE.getController('Common.Controllers.Collaboration').showModal();
             },
 
             onNoCharacters: function(e) {
@@ -339,11 +377,14 @@ define([
                 var value = Common.localStorage.getItem('de-mobile-settings-unit');
                     value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric();
                 $unitMeasurement.val([value]);
-                var _stateDisplayMode = DE.getController('Collaboration').getDisplayMode();
+                var _stateDisplayMode = DE.getController('Common.Controllers.Collaboration').getDisplayMode();
                 if(_stateDisplayMode == "Final" || _stateDisplayMode == "Original") {
                     $('#settings-no-characters').addClass('disabled');
                     $('#settings-hidden-borders').addClass('disabled');
                 }
+                if (!_isEdit) {
+                    $('.page[data-page=settings-advanced-view] .page-content > :not(.display-view)').hide();
+                }
             },
 
             initPageDocumentSettings: function () {
@@ -374,9 +415,39 @@ define([
                     var document = Common.SharedSettings.get('document') || {},
                         info = document.info || {};
 
-                    $('#settings-document-title').html(document.title ? document.title : me.unknownText);
+                    document.title ? $('#settings-document-title').html(document.title) : $('.display-document-title').remove();
-                    $('#settings-document-autor').html(info.author ? info.author : me.unknownText);
+                    var value = info.owner || info.author;
-                    $('#settings-document-date').html(info.created ? info.created : me.unknownText);
+                    value ? $('#settings-document-owner').html(value) : $('.display-owner').remove();
+                    value = info.uploaded || info.created;
+                    value ? $('#settings-doc-uploaded').html(value) : $('.display-uploaded').remove();
+                    info.folder ? $('#settings-doc-location').html(info.folder) : $('.display-location').remove();
+
+                    var appProps = (this.api) ? this.api.asc_getAppProps() : null;
+                    if (appProps) {
+                        var appName = (appProps.asc_getApplication() || '') + ' ' + (appProps.asc_getAppVersion() || '');
+                        appName ? $('#settings-doc-application').html(appName) : $('.display-application').remove();
+                    }
+                    var props = (this.api) ? this.api.asc_getCoreProps() : null;
+                    if (props) {
+                        value = props.asc_getTitle();
+                        value ? $('#settings-doc-title').html(value) : $('.display-title').remove();
+                        value = props.asc_getSubject();
+                        value ? $('#settings-doc-subject').html(value) : $('.display-subject').remove();
+                        value = props.asc_getDescription();
+                        value ? $('#settings-doc-comment').html(value) : $('.display-comment').remove();
+                        value = props.asc_getModified();
+                        value ? $('#settings-doc-last-mod').html(value.toLocaleString()) : $('.display-last-mode').remove();
+                        value = props.asc_getLastModifiedBy();
+                        value ? $('#settings-doc-mod-by').html(value) : $('.display-mode-by').remove();
+                        value = props.asc_getCreated();
+                        value ? $('#settings-doc-date').html(value.toLocaleString()) : $('.display-created-date').remove();
+                        value = props.asc_getCreator();
+                        var templateCreator = "";
+                        value && value.split(/\s*[,;]\s*/).forEach(function(item) {
+                            templateCreator = templateCreator + "<li class='item-content'><div class='item-inner'><div class='item-title'>" + item + "</div></div></li>";
+                        });
+                        templateCreator ? $('#list-creator').html(templateCreator) : $('.display-author').remove();
+                    }
                 }
             },
 
@@ -491,19 +562,22 @@ define([
                     format = $(e.currentTarget).data('format');
 
                 if (format) {
-                    if (format == Asc.c_oAscFileType.TXT) {
+                    if (format == Asc.c_oAscFileType.TXT || format == Asc.c_oAscFileType.RTF) {
                         _.defer(function () {
                             uiApp.confirm(
-                                me.warnDownloadAs,
+                                (format === Asc.c_oAscFileType.TXT) ? me.warnDownloadAs : me.warnDownloadAsRTF,
                                 me.notcriticalErrorTitle,
                                 function () {
-                                    me.api.asc_DownloadAs(format);
+                                    if (format == Asc.c_oAscFileType.TXT)
+                                        Common.NotificationCenter.trigger('download:advanced', Asc.c_oAscAdvancedOptionsID.TXT, me.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format));
+                                    else
+                                        me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
                                 }
                             );
                         });
                     } else {
                         _.defer(function () {
-                            me.api.asc_DownloadAs(format);
+                            me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
                         });
                     }
 
@@ -676,7 +750,8 @@ define([
             unknownText: 'Unknown',
             txtLoading              : 'Loading...',
             notcriticalErrorTitle   : 'Warning',
-            warnDownloadAs          : 'If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?'
+            warnDownloadAs          : 'If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?',
+            warnDownloadAsRTF       : 'If you continue saving in this format some of the formatting might be lost.<br>Are you sure you want to continue?'
         }
     })(), DE.Controllers.Settings || {}))
 });

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

@@ -81,7 +81,7 @@ define([
                 this.api.asc_registerCallback('asc_onCanRedo',      _.bind(this.onApiCanRevert, this, 'redo'));
                 this.api.asc_registerCallback('asc_onFocusObject',  _.bind(this.onApiFocusObject, this));
                 this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onCoAuthoringDisconnect, this));
-                this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this))
+                this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this));
                 this.api.asc_registerCallback('asc_onParticipantsChanged',     _.bind(this.displayCollaboration, this));
                 Common.NotificationCenter.on('api:disconnect',      _.bind(this.onCoAuthoringDisconnect, this));
             },

apps/documenteditor/mobile/app/template/Settings.template

@@ -55,7 +55,7 @@
                             </a>
                         </li>
                         <% } %>
-                        <% if(phone) {%>
+                        <% if(width < 360) {%>
                         <li>
                             <div id="settings-collaboration" class="item-content" style="display: none;">
                                 <div class="item-media">
@@ -302,22 +302,32 @@
                         </li>
                     </ul>
                 </div>
-                <div class="content-block-title"><%= scope.textAuthor %></div>
+                <div class="content-block-title display-owner"><%= scope.textOwner %></div>
-                <div class="list-block">
+                <div class="list-block display-owner">
                     <ul>
                         <li class="item-content">
                             <div class="item-inner">
-                                <div id="settings-document-autor" class="item-title"><%= scope.textLoading %></div>
+                                <div id="settings-document-owner" class="item-title"><%= scope.textLoading %></div>
                             </div>
                         </li>
                     </ul>
                 </div>
-                <div class="content-block-title"><%= scope.textCreateDate %></div>
+                <div class="content-block-title display-location"><%= scope.textLocation %></div>
-                <div class="list-block">
+                <div class="list-block display-location">
                     <ul>
                         <li class="item-content">
                             <div class="item-inner">
-                                <div id="settings-document-date" class="item-title"><%= scope.textLoading %></div>
+                                <div id="settings-doc-location" class="item-title"><%= scope.textLoading %></div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+                <div class="content-block-title display-uploaded"><%= scope.textUploaded %></div>
+                <div class="list-block display-uploaded">
+                    <ul>
+                        <li class="item-content">
+                            <div class="item-inner">
+                                <div id="settings-doc-uploaded" class="item-title"><%= scope.textLoading %></div>
                             </div>
                         </li>
                     </ul>
@@ -357,6 +367,87 @@
                         </li>
                     </ul>
                 </div>
+
+                <div class="content-block-title display-title"><%= scope.textTitle %></div>
+                <div class="list-block display-title">
+                    <ul>
+                        <li class="item-content">
+                            <div class="item-inner">
+                                <div id="settings-doc-title" class="item-title"><%= scope.textLoading %></div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+                <div class="content-block-title display-subject"><%= scope.textSubject %></div>
+                <div class="list-block display-subject">
+                    <ul>
+                        <li class="item-content">
+                            <div class="item-inner">
+                                <div id="settings-doc-subject" class="item-title"><%= scope.textLoading %></div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+                <div class="content-block-title display-comment"><%= scope.textComment %></div>
+                <div class="list-block display-comment">
+                    <ul>
+                        <li class="item-content">
+                            <div class="item-inner">
+                                <div id="settings-doc-comment" class="item-title"><%= scope.textLoading %></div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+                <div class="content-block-title display-last-mode"><%= scope.textLastModified %></div>
+                <div class="list-block display-last-mode">
+                    <ul>
+                        <li class="item-content">
+                            <div class="item-inner">
+                                <div id="settings-doc-last-mod" class="item-title"><%= scope.textLoading %></div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+                <div class="content-block-title display-mode-by"><%= scope.textLastModifiedBy %></div>
+                <div class="list-block display-mode-by">
+                    <ul>
+                        <li class="item-content">
+                            <div class="item-inner">
+                                <div id="settings-doc-mod-by" class="item-title"><%= scope.textLoading %></div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+                <div class="content-block-title display-created-date"><%= scope.textCreated %></div>
+                <div class="list-block display-created-date">
+                    <ul>
+                        <li class="item-content">
+                            <div class="item-inner">
+                                <div id="settings-doc-date" class="item-title"><%= scope.textLoading %></div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+                <div class="content-block-title display-application"><%= scope.textApplication %></div>
+                <div class="list-block display-application">
+                    <ul>
+                        <li class="item-content">
+                            <div class="item-inner">
+                                <div id="settings-doc-application" class="item-title"><%= scope.textLoading %></div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+                <div class="content-block-title display-author"><%= scope.textAuthor %></div>
+                <div class="list-block display-author">
+                    <ul id="list-creator">
+                        <li class="item-content">
+                            <div class="item-inner">
+                                <div id="settings-doc-author" class="item-title"><%= scope.textLoading %></div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
             </div>
         </div>
     </div>
@@ -428,6 +519,18 @@
                                 </div>
                             </a>
                         </li>
+                        <li>
+                            <a data-format="68" class="item-link no-indicator">
+                                <div class="item-content">
+                                    <div class="item-media">
+                                        <i class="icon icon-format-rtf"></i>
+                                    </div>
+                                    <div class="item-inner">
+                                        <div class="item-title">RTF</div>
+                                    </div>
+                                </div>
+                            </a>
+                        </li>
                         <li>
                             <a data-format="67" class="item-link no-indicator">
                                 <div class="item-content">
@@ -639,6 +742,34 @@
                     </ul>
                 </div>
 
+                <div class="content-block-title display-view"><%= scope.textCommentingDisplay %></div>
+                <div class="list-block display-view">
+                    <ul>
+                        <div id="settings-display-comments" class="item-content">
+                            <div class="item-inner">
+                                <div class="item-title"><%= scope.textDisplayComments %></div>
+                                <div class="item-after">
+                                    <label class="label-switch">
+                                        <input type="checkbox">
+                                        <div class="checkbox"></div>
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="settings-display-resolved" class="item-content">
+                            <div class="item-inner">
+                                <div class="item-title"><%= scope.textDisplayResolvedComments %></div>
+                                <div class="item-after">
+                                    <label class="label-switch">
+                                        <input type="checkbox">
+                                        <div class="checkbox"></div>
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+                    </ul>
+                </div>
+
             </div>
         </div>
     </div>

apps/documenteditor/mobile/app/template/Toolbar.template

@@ -42,7 +42,7 @@
                 <i class="icon icon-search"></i>
             </a>
             <% } %>
-            <% if (!phone) { %>
+            <% if (width >= 360) { %>
             <a href="#" id="toolbar-collaboration" class="link icon-only disabled" style="display: none;">
                 <i class="icon icon-collaboration"></i>
             </a>

apps/documenteditor/mobile/app/view/Settings.js

@@ -90,7 +90,8 @@ define([
                     android : Common.SharedSettings.get('android'),
                     phone   : Common.SharedSettings.get('phone'),
                     orthography: Common.SharedSettings.get('sailfish'),
-                    scope   : this
+                    scope   : this,
+                    width   : $(window).width()
                 }));
 
                 return this;
@@ -124,7 +125,6 @@ define([
                         $layour.find('#settings-search .item-title').text(this.textFindAndReplace)
                     } else {
                         $layour.find('#settings-document').hide();
-                        $layour.find('#settings-advanced').hide();
                         $layour.find('#color-schemes').hide();
                         $layour.find('#settings-spellcheck').hide();
                         $layour.find('#settings-orthography').hide();
@@ -287,7 +287,21 @@ define([
             textColorSchemes: 'Color Schemes',
             textNoCharacters: 'Nonprinting Characters',
             textHiddenTableBorders: 'Hidden Table Borders',
-            textCollaboration: 'Collaboration'
+            textCollaboration: 'Collaboration',
+            textCommentingDisplay: 'Commenting Display',
+            textDisplayComments: 'Comments',
+            textDisplayResolvedComments: 'Resolved Comments',
+            textSubject: 'Subject',
+            textTitle: 'Title',
+            textComment: 'Comment',
+            textOwner: 'Owner',
+            textApplication : 'Application',
+            textLocation: 'Location',
+            textUploaded: 'Uploaded',
+            textLastModified: 'Last Modified',
+            textLastModifiedBy: 'Last Modified By',
+            textCreated: 'Created'
+
 
     }
     })(), DE.Views.Settings || {}))

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

@@ -90,7 +90,8 @@ define([
                     android     : Common.SharedSettings.get('android'),
                     phone       : Common.SharedSettings.get('phone'),
                     backTitle   : Common.SharedSettings.get('android') ? '' : me.textBack,
-                    scope       : me
+                    scope       : me,
+                    width       : $(window).width()
                 }));
 
                 $('.view-main .navbar').on('addClass removeClass', _.bind(me.onDisplayMainNavbar, me));
@@ -153,7 +154,7 @@ define([
 
             //Collaboration
             showCollaboration: function () {
-                DE.getController('Collaboration').showModal();
+                DE.getController('Common.Controllers.Collaboration').showModal();
             },
 
             editDocument: function () {

apps/documenteditor/mobile/locale/bg.json

@@ -14,8 +14,6 @@
   "DE.Controllers.AddTable.textColumns": "Колони",
   "DE.Controllers.AddTable.textRows": "Редове",
   "DE.Controllers.AddTable.textTableSize": "Размер на таблицата",
-  "DE.Controllers.DocumentHolder.menuAccept": "Приемам",
-  "DE.Controllers.DocumentHolder.menuAcceptAll": "Приемам всичко",
   "DE.Controllers.DocumentHolder.menuAddLink": "Добавяне на връзка",
   "DE.Controllers.DocumentHolder.menuCopy": "Копие",
   "DE.Controllers.DocumentHolder.menuCut": "Изрежи",
@@ -24,8 +22,6 @@
   "DE.Controllers.DocumentHolder.menuMore": "Повече",
   "DE.Controllers.DocumentHolder.menuOpenLink": "Отвори линк",
   "DE.Controllers.DocumentHolder.menuPaste": "Паста",
-  "DE.Controllers.DocumentHolder.menuReject": "Отхвърляне",
-  "DE.Controllers.DocumentHolder.menuRejectAll": "Отхвърли всички",
   "DE.Controllers.DocumentHolder.menuReview": "Преглед",
   "DE.Controllers.DocumentHolder.sheetCancel": "Отказ",
   "DE.Controllers.DocumentHolder.textGuest": "Гост",
@@ -54,7 +50,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Превишава се времето на изтичане на реализация.",
   "DE.Controllers.Main.criticalErrorExtText": "Натиснете 'OK', за да се върнете към списъка с документи.",
   "DE.Controllers.Main.criticalErrorTitle": "Грешка",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Редактор на документи",
   "DE.Controllers.Main.downloadErrorText": "Изтеглянето се провали.",
   "DE.Controllers.Main.downloadMergeText": "Изтегля се ...",
   "DE.Controllers.Main.downloadMergeTitle": "Изтеглянето",
@@ -63,7 +58,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Опитвате се да извършите действие, за което нямате права. <br> Моля, свържете се с администратора на сървъра за документи.",
   "DE.Controllers.Main.errorBadImageUrl": "URL адресът на изображението е неправилен",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Връзката със сървъра е загубена. Вече не можете да редактирате.",
-  "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си. <br> Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа. <br> <br> Намерете повече информация за свързването на сървър за документи <a href = \"https: //api.onlyoffice.com/editors/callback \"target =\" _ blank \"> тук </a>",
+  "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.<br>Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа. <br><br>Намерете повече информация за свързването на сървър за документи <a href=\"%1\" target=\"_blank\">тук</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Външна грешка. <br> Грешка при свързване към база данни. Моля, свържете се с екипа за поддръжка.",
   "DE.Controllers.Main.errorDataEncrypted": "Получени са криптирани промени, които не могат да се дефинират.",
   "DE.Controllers.Main.errorDataRange": "Неправилен обхват от данни.",

apps/documenteditor/mobile/locale/cs.json

@@ -14,7 +14,6 @@
   "DE.Controllers.AddTable.textColumns": "Sloupce",
   "DE.Controllers.AddTable.textRows": "Řádky",
   "DE.Controllers.AddTable.textTableSize": "Velikost tabulky",
-  "DE.Controllers.DocumentHolder.menuAccept": "Přijmout",
   "DE.Controllers.DocumentHolder.menuAddLink": "Přidat odkaz",
   "DE.Controllers.DocumentHolder.menuCopy": "Kopírovat",
   "DE.Controllers.DocumentHolder.menuCut": "Vyjmout",
@@ -23,7 +22,6 @@
   "DE.Controllers.DocumentHolder.menuMore": "Více",
   "DE.Controllers.DocumentHolder.menuOpenLink": "Otevřít odkaz",
   "DE.Controllers.DocumentHolder.menuPaste": "Vložit",
-  "DE.Controllers.DocumentHolder.menuReject": "Odmítnout",
   "DE.Controllers.DocumentHolder.sheetCancel": "Zrušit",
   "DE.Controllers.DocumentHolder.textGuest": "Návštěvník",
   "DE.Controllers.EditContainer.textChart": "Graf",
@@ -50,7 +48,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Vypršel čas konverze.",
   "DE.Controllers.Main.criticalErrorExtText": "Stisknutím tlačítka \"OK\" se vrátíte do seznamu dokumentů.",
   "DE.Controllers.Main.criticalErrorTitle": "Chyba",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Editor dokumentů",
   "DE.Controllers.Main.downloadErrorText": "Stahování selhalo.",
   "DE.Controllers.Main.downloadMergeText": "Stahování...",
   "DE.Controllers.Main.downloadMergeTitle": "Stahuji",
@@ -59,7 +56,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.<br>Prosím, kontaktujte administrátora vašeho Dokumentového serveru.",
   "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávná",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Serverové připojení bylo ztraceno. Nadále nemůžete editovat.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.<br> Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.<br><br> Více informací o připojení najdete v Dokumentovém serveru <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.<br> Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.<br><br> Více informací o připojení najdete v Dokumentovém serveru <a href=\"%1\" target=\"_blank\">here</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Externí chyba.<br>Chyba připojení k databázi. Prosím, kontaktujte podporu.",
   "DE.Controllers.Main.errorDataRange": "Nesprávný datový rozsah.",
   "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1",

apps/documenteditor/mobile/locale/de.json

@@ -14,8 +14,6 @@
   "DE.Controllers.AddTable.textColumns": "Spalten",
   "DE.Controllers.AddTable.textRows": "Zeilen",
   "DE.Controllers.AddTable.textTableSize": "Tabellengröße",
-  "DE.Controllers.DocumentHolder.menuAccept": "Annehmen",
-  "DE.Controllers.DocumentHolder.menuAcceptAll": "Alles annehmen",
   "DE.Controllers.DocumentHolder.menuAddLink": "Link hinzufügen",
   "DE.Controllers.DocumentHolder.menuCopy": "Kopieren",
   "DE.Controllers.DocumentHolder.menuCut": "Ausschneiden",
@@ -24,8 +22,6 @@
   "DE.Controllers.DocumentHolder.menuMore": "Mehr",
   "DE.Controllers.DocumentHolder.menuOpenLink": "Link öffnen",
   "DE.Controllers.DocumentHolder.menuPaste": "Einfügen",
-  "DE.Controllers.DocumentHolder.menuReject": "Ablehnen",
-  "DE.Controllers.DocumentHolder.menuRejectAll": "Alles ablehnen",
   "DE.Controllers.DocumentHolder.menuReview": "Review",
   "DE.Controllers.DocumentHolder.sheetCancel": "Abbrechen",
   "DE.Controllers.DocumentHolder.textGuest": "Gast",
@@ -54,7 +50,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Timeout für die Konvertierung wurde überschritten.",
   "DE.Controllers.Main.criticalErrorExtText": "Drücken Sie \"OK\", um zur Dokumentenliste zurückzukehren.",
   "DE.Controllers.Main.criticalErrorTitle": "Fehler",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Herunterladen ist fehlgeschlagen.",
   "DE.Controllers.Main.downloadMergeText": "Wird heruntergeladen...",
   "DE.Controllers.Main.downloadMergeTitle": "Wird heruntergeladen",
@@ -63,7 +58,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Sie versuchen die Änderungen vorzunehemen, für die Sie keine Berechtigungen haben.<br>Wenden Sie sich an Ihren Document Server Serveradministrator.",
   "DE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Sie können nicht mehr editieren.",
-  "DE.Controllers.Main.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.<br><br>Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
+  "DE.Controllers.Main.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.<br><br>Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie <a href=\"%1\" target=\"_blank\">hier</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.",
   "DE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.",
   "DE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",

apps/documenteditor/mobile/locale/en.json

@@ -1,17 +1,90 @@
 {
+  "Common.Controllers.Collaboration.textAtLeast": "at least",
+  "Common.Controllers.Collaboration.textAuto": "auto",
+  "Common.Controllers.Collaboration.textBaseline": "Baseline",
+  "Common.Controllers.Collaboration.textBold": "Bold",
+  "Common.Controllers.Collaboration.textBreakBefore": "Page break before",
+  "Common.Controllers.Collaboration.textCaps": "All caps",
+  "Common.Controllers.Collaboration.textCenter": "Align center",
+  "Common.Controllers.Collaboration.textChart": "Chart",
+  "Common.Controllers.Collaboration.textColor": "Font color",
+  "Common.Controllers.Collaboration.textContextual": "Don't add interval between paragraphs of the same style",
+  "Common.Controllers.Collaboration.textDeleted": "<b>Deleted:</b>",
+  "Common.Controllers.Collaboration.textDStrikeout": "Double strikeout",
+  "Common.Controllers.Collaboration.textEditUser": "Document is currently being edited by several users.",
+  "Common.Controllers.Collaboration.textEquation": "Equation",
+  "Common.Controllers.Collaboration.textExact": "exactly",
+  "Common.Controllers.Collaboration.textFirstLine": "First line",
+  "Common.Controllers.Collaboration.textFormatted": "Formatted",
+  "Common.Controllers.Collaboration.textHighlight": "Highlight color",
+  "Common.Controllers.Collaboration.textImage": "Image",
+  "Common.Controllers.Collaboration.textIndentLeft": "Indent left",
+  "Common.Controllers.Collaboration.textIndentRight": "Indent right",
+  "Common.Controllers.Collaboration.textInserted": "<b>Inserted:</b>",
+  "Common.Controllers.Collaboration.textItalic": "Italic",
+  "Common.Controllers.Collaboration.textJustify": "Align justify",
+  "Common.Controllers.Collaboration.textKeepLines": "Keep lines together",
+  "Common.Controllers.Collaboration.textKeepNext": "Keep with next",
+  "Common.Controllers.Collaboration.textLeft": "Align left",
+  "Common.Controllers.Collaboration.textLineSpacing": "Line Spacing: ",
+  "Common.Controllers.Collaboration.textMultiple": "multiple",
+  "Common.Controllers.Collaboration.textNoBreakBefore": "No page break before",
+  "Common.Controllers.Collaboration.textNoContextual": "Add interval between paragraphs of the same style",
+  "Common.Controllers.Collaboration.textNoKeepLines": "Don't keep lines together",
+  "Common.Controllers.Collaboration.textNoKeepNext": "Don't keep with next",
+  "Common.Controllers.Collaboration.textNot": "Not",
+  "Common.Controllers.Collaboration.textNoWidow": "No widow control",
+  "Common.Controllers.Collaboration.textNum": "Change numbering",
+  "Common.Controllers.Collaboration.textParaDeleted": "<b>Paragraph Deleted</b>",
+  "Common.Controllers.Collaboration.textParaFormatted": "<b>Paragraph Formatted</b>",
+  "Common.Controllers.Collaboration.textParaInserted": "<b>Paragraph Inserted</b>",
+  "Common.Controllers.Collaboration.textParaMoveFromDown": "<b>Moved Down:</b>",
+  "Common.Controllers.Collaboration.textParaMoveFromUp": "<b>Moved Up:</b>",
+  "Common.Controllers.Collaboration.textParaMoveTo": "<b>Moved:</b>",
+  "Common.Controllers.Collaboration.textPosition": "Position",
+  "Common.Controllers.Collaboration.textRight": "Align right",
+  "Common.Controllers.Collaboration.textShape": "Shape",
+  "Common.Controllers.Collaboration.textShd": "Background color",
+  "Common.Controllers.Collaboration.textSmallCaps": "Small caps",
+  "Common.Controllers.Collaboration.textSpacing": "Spacing",
+  "Common.Controllers.Collaboration.textSpacingAfter": "Spacing after",
+  "Common.Controllers.Collaboration.textSpacingBefore": "Spacing before",
+  "Common.Controllers.Collaboration.textStrikeout": "Strikeout",
+  "Common.Controllers.Collaboration.textSubScript": "Subscript",
+  "Common.Controllers.Collaboration.textSuperScript": "Superscript",
+  "Common.Controllers.Collaboration.textTableChanged": "<b>Table Settings Changed</b>",
+  "Common.Controllers.Collaboration.textTableRowsAdd": "<b>Table Rows Added<b/>",
+  "Common.Controllers.Collaboration.textTableRowsDel": "<b>Table Rows Deleted<b/>",
+  "Common.Controllers.Collaboration.textTabs": "Change tabs",
+  "Common.Controllers.Collaboration.textUnderline": "Underline",
+  "Common.Controllers.Collaboration.textWidow": "Widow control",
   "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
   "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
   "Common.Utils.Metric.txtCm": "cm",
   "Common.Utils.Metric.txtPt": "pt",
+  "Common.Views.Collaboration.textAcceptAllChanges": "Accept All Changes",
+  "Common.Views.Collaboration.textBack": "Back",
+  "Common.Views.Collaboration.textChange": "Review Change",
+  "Common.Views.Collaboration.textCollaboration": "Collaboration",
+  "Common.Views.Collaboration.textDisplayMode": "Display Mode",
+  "Common.Views.Collaboration.textEditUsers": "Users",
+  "Common.Views.Collaboration.textFinal": "Final",
+  "Common.Views.Collaboration.textMarkup": "Markup",
+  "Common.Views.Collaboration.textOriginal": "Original",
+  "Common.Views.Collaboration.textRejectAllChanges": "Reject All Changes",
+  "Common.Views.Collaboration.textReview": "Track Changes",
+  "Common.Views.Collaboration.textReviewing": "Review",
+  "Common.Views.Collaboration.textСomments": "Сomments",
+  "Common.Views.Collaboration.textNoComments": "This document doesn't contain comments",
   "DE.Controllers.AddContainer.textImage": "Image",
   "DE.Controllers.AddContainer.textOther": "Other",
   "DE.Controllers.AddContainer.textShape": "Shape",
   "DE.Controllers.AddContainer.textTable": "Table",
   "DE.Controllers.AddImage.textEmptyImgUrl": "You need to specify image URL.",
   "DE.Controllers.AddImage.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format",
-  "DE.Controllers.AddOther.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format",
-  "DE.Controllers.AddOther.textBottomOfPage": "Bottom Of Page",
   "DE.Controllers.AddOther.textBelowText": "Below Text",
+  "DE.Controllers.AddOther.textBottomOfPage": "Bottom Of Page",
+  "DE.Controllers.AddOther.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format",
   "DE.Controllers.AddTable.textCancel": "Cancel",
   "DE.Controllers.AddTable.textColumns": "Columns",
   "DE.Controllers.AddTable.textRows": "Rows",
@@ -20,20 +93,20 @@
   "DE.Controllers.DocumentHolder.menuCopy": "Copy",
   "DE.Controllers.DocumentHolder.menuCut": "Cut",
   "DE.Controllers.DocumentHolder.menuDelete": "Delete",
+  "DE.Controllers.DocumentHolder.menuDeleteTable": "Delete Table",
   "DE.Controllers.DocumentHolder.menuEdit": "Edit",
+  "DE.Controllers.DocumentHolder.menuMerge": "Merge Cells",
   "DE.Controllers.DocumentHolder.menuMore": "More",
   "DE.Controllers.DocumentHolder.menuOpenLink": "Open Link",
   "DE.Controllers.DocumentHolder.menuPaste": "Paste",
   "DE.Controllers.DocumentHolder.menuReview": "Review",
-  "DE.Controllers.DocumentHolder.sheetCancel": "Cancel",
+  "DE.Controllers.DocumentHolder.menuReviewChange": "Review Change",
-  "DE.Controllers.DocumentHolder.textGuest": "Guest",
-  "DE.Controllers.DocumentHolder.menuMerge": "Merge Cells",
   "DE.Controllers.DocumentHolder.menuSplit": "Split Cell",
+  "DE.Controllers.DocumentHolder.sheetCancel": "Cancel",
   "DE.Controllers.DocumentHolder.textCancel": "Cancel",
   "DE.Controllers.DocumentHolder.textColumns": "Columns",
+  "DE.Controllers.DocumentHolder.textGuest": "Guest",
   "DE.Controllers.DocumentHolder.textRows": "Rows",
-  "DE.Controllers.DocumentHolder.menuDeleteTable": "Delete Table",
-  "DE.Controllers.DocumentHolder.menuReviewChange": "Review Change",
   "DE.Controllers.EditContainer.textChart": "Chart",
   "DE.Controllers.EditContainer.textFooter": "Footer",
   "DE.Controllers.EditContainer.textHeader": "Header",
@@ -59,7 +132,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
   "DE.Controllers.Main.criticalErrorExtText": "Press 'OK' to return to document list.",
   "DE.Controllers.Main.criticalErrorTitle": "Error",
-  "del_DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Download failed.",
   "DE.Controllers.Main.downloadMergeText": "Downloading...",
   "DE.Controllers.Main.downloadMergeTitle": "Downloading",
@@ -172,8 +244,8 @@
   "DE.Controllers.Main.warnLicenseExceeded": "The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.",
   "DE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "DE.Controllers.Main.warnLicenseUsersExceeded": "The number of concurrent users has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.",
-  "DE.Controllers.Main.warnNoLicense": "This version of %1 Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
+  "DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
-  "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
+  "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
   "DE.Controllers.Search.textNoTextFound": "Text not Found",
   "DE.Controllers.Search.textReplaceAll": "Replace All",
@@ -181,69 +253,11 @@
   "DE.Controllers.Settings.txtLoading": "Loading...",
   "DE.Controllers.Settings.unknownText": "Unknown",
   "DE.Controllers.Settings.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?",
+  "DE.Controllers.Settings.warnDownloadAsRTF": "If you continue saving in this format some of the formatting might be lost.<br>Are you sure you want to continue?",
   "DE.Controllers.Toolbar.dlgLeaveMsgText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
   "DE.Controllers.Toolbar.dlgLeaveTitleText": "You leave the application",
   "DE.Controllers.Toolbar.leaveButtonText": "Leave this Page",
   "DE.Controllers.Toolbar.stayButtonText": "Stay on this Page",
-  "DE.Controllers.Collaboration.textInserted": "<b>Inserted:</b>",
-  "DE.Controllers.Collaboration.textDeleted": "<b>Deleted:</b>",
-  "DE.Controllers.Collaboration.textParaInserted": "<b>Paragraph Inserted</b>",
-  "DE.Controllers.Collaboration.textParaDeleted": "<b>Paragraph Deleted</b>",
-  "DE.Controllers.Collaboration.textFormatted": "Formatted",
-  "DE.Controllers.Collaboration.textParaFormatted": "<b>Paragraph Formatted</b>",
-  "DE.Controllers.Collaboration.textNot": "Not",
-  "DE.Controllers.Collaboration.textBold": "Bold",
-  "DE.Controllers.Collaboration.textItalic": "Italic",
-  "DE.Controllers.Collaboration.textStrikeout": "Strikeout",
-  "DE.Controllers.Collaboration.textUnderline": "Underline",
-  "DE.Controllers.Collaboration.textColor": "Font color",
-  "DE.Controllers.Collaboration.textBaseline": "Baseline",
-  "DE.Controllers.Collaboration.textSuperScript": "Superscript",
-  "DE.Controllers.Collaboration.textSubScript": "Subscript",
-  "DE.Controllers.Collaboration.textHighlight": "Highlight color",
-  "DE.Controllers.Collaboration.textSpacing": "Spacing",
-  "DE.Controllers.Collaboration.textDStrikeout": "Double strikeout",
-  "DE.Controllers.Collaboration.textCaps": "All caps",
-  "DE.Controllers.Collaboration.textSmallCaps": "Small caps",
-  "DE.Controllers.Collaboration.textPosition": "Position",
-  "DE.Controllers.Collaboration.textShd": "Background color",
-  "DE.Controllers.Collaboration.textContextual": "Don't add interval between paragraphs of the same style",
-  "DE.Controllers.Collaboration.textNoContextual": "Add interval between paragraphs of the same style",
-  "DE.Controllers.Collaboration.textIndentLeft": "Indent left",
-  "DE.Controllers.Collaboration.textIndentRight": "Indent right",
-  "DE.Controllers.Collaboration.textFirstLine": "First line",
-  "DE.Controllers.Collaboration.textRight": "Align right",
-  "DE.Controllers.Collaboration.textLeft": "Align left",
-  "DE.Controllers.Collaboration.textCenter": "Align center",
-  "DE.Controllers.Collaboration.textJustify": "Align justify",
-  "DE.Controllers.Collaboration.textBreakBefore": "Page break before",
-  "DE.Controllers.Collaboration.textKeepNext": "Keep with next",
-  "DE.Controllers.Collaboration.textKeepLines": "Keep lines together",
-  "DE.Controllers.Collaboration.textNoBreakBefore": "No page break before",
-  "DE.Controllers.Collaboration.textNoKeepNext": "Don't keep with next",
-  "DE.Controllers.Collaboration.textNoKeepLines": "Don't keep lines together",
-  "DE.Controllers.Collaboration.textLineSpacing": "Line Spacing: ",
-  "DE.Controllers.Collaboration.textMultiple": "multiple",
-  "DE.Controllers.Collaboration.textAtLeast": "at least",
-  "DE.Controllers.Collaboration.textExact": "exactly",
-  "DE.Controllers.Collaboration.textSpacingBefore": "Spacing before",
-  "DE.Controllers.Collaboration.textSpacingAfter": "Spacing after",
-  "DE.Controllers.Collaboration.textAuto": "auto",
-  "DE.Controllers.Collaboration.textWidow": "Widow control",
-  "DE.Controllers.Collaboration.textNoWidow": "No widow control",
-  "DE.Controllers.Collaboration.textTabs": "Change tabs",
-  "DE.Controllers.Collaboration.textNum": "Change numbering",
-  "DE.Controllers.Collaboration.textEquation": "Equation",
-  "DE.Controllers.Collaboration.textImage": "Image",
-  "DE.Controllers.Collaboration.textChart": "Chart",
-  "DE.Controllers.Collaboration.textShape": "Shape",
-  "DE.Controllers.Collaboration.textTableChanged": "<b>Table Settings Changed</b>",
-  "DE.Controllers.Collaboration.textTableRowsAdd": "<b>Table Rows Added<b/>",
-  "DE.Controllers.Collaboration.textTableRowsDel": "<b>Table Rows Deleted<b/>",
-  "DE.Controllers.Collaboration.textParaMoveTo": "<b>Moved:</b>",
-  "DE.Controllers.Collaboration.textParaMoveFromUp": "<b>Moved Up:</b>",
-  "DE.Controllers.Collaboration.textParaMoveFromDown": "<b>Moved Down:</b>",
-  "DE.Controllers.Collaboration.textEditUser": "Document is currently being edited by several users.",
   "DE.Views.AddImage.textAddress": "Address",
   "DE.Views.AddImage.textBack": "Back",
   "DE.Views.AddImage.textFromLibrary": "Picture from Library",
@@ -260,10 +274,14 @@
   "DE.Views.AddOther.textCurrentPos": "Current Position",
   "DE.Views.AddOther.textDisplay": "Display",
   "DE.Views.AddOther.textEvenPage": "Even Page",
+  "DE.Views.AddOther.textFootnote": "Footnote",
+  "DE.Views.AddOther.textFormat": "Format",
   "DE.Views.AddOther.textInsert": "Insert",
+  "DE.Views.AddOther.textInsertFootnote": "Insert Footnote",
   "DE.Views.AddOther.textLeftBottom": "Left Bottom",
   "DE.Views.AddOther.textLeftTop": "Left Top",
   "DE.Views.AddOther.textLink": "Link",
+  "DE.Views.AddOther.textLocation": "Location",
   "DE.Views.AddOther.textNextPage": "Next Page",
   "DE.Views.AddOther.textOddPage": "Odd Page",
   "DE.Views.AddOther.textPageBreak": "Page Break",
@@ -272,12 +290,8 @@
   "DE.Views.AddOther.textRightBottom": "Right Bottom",
   "DE.Views.AddOther.textRightTop": "Right Top",
   "DE.Views.AddOther.textSectionBreak": "Section Break",
-  "DE.Views.AddOther.textTip": "Screen Tip",
-  "DE.Views.AddOther.textFootnote": "Footnote",
-  "DE.Views.AddOther.textInsertFootnote": "Insert Footnote",
-  "DE.Views.AddOther.textFormat": "Format",
   "DE.Views.AddOther.textStartFrom": "Start At",
-  "DE.Views.AddOther.textLocation": "Location",
+  "DE.Views.AddOther.textTip": "Screen Tip",
   "DE.Views.EditChart.textAlign": "Align",
   "DE.Views.EditChart.textBack": "Back",
   "DE.Views.EditChart.textBackward": "Move Backward",
@@ -442,12 +456,21 @@
   "DE.Views.Search.textSearch": "Search",
   "DE.Views.Settings.textAbout": "About",
   "DE.Views.Settings.textAddress": "address",
+  "DE.Views.Settings.textAdvancedSettings": "Application Settings",
+  "DE.Views.Settings.textApplication": "Application",
   "DE.Views.Settings.textAuthor": "Author",
   "DE.Views.Settings.textBack": "Back",
   "DE.Views.Settings.textBottom": "Bottom",
+  "DE.Views.Settings.textCentimeter": "Centimeter",
+  "DE.Views.Settings.textColorSchemes": "Color Schemes",
+  "DE.Views.Settings.textComment": "Comment",
+  "DE.Views.Settings.textCommentingDisplay": "Commenting Display",
+  "DE.Views.Settings.textCreated": "Created",
   "DE.Views.Settings.textCreateDate": "Creation date",
   "DE.Views.Settings.textCustom": "Custom",
   "DE.Views.Settings.textCustomSize": "Custom Size",
+  "DE.Views.Settings.textDisplayComments": "Comments",
+  "DE.Views.Settings.textDisplayResolvedComments": "Resolved Comments",
   "DE.Views.Settings.textDocInfo": "Document Info",
   "DE.Views.Settings.textDocTitle": "Document title",
   "DE.Views.Settings.textDocumentFormats": "Document Formats",
@@ -461,13 +484,21 @@
   "DE.Views.Settings.textFindAndReplace": "Find and Replace",
   "DE.Views.Settings.textFormat": "Format",
   "DE.Views.Settings.textHelp": "Help",
+  "DE.Views.Settings.textHiddenTableBorders": "Hidden Table Borders",
+  "DE.Views.Settings.textInch": "Inch",
   "DE.Views.Settings.textLandscape": "Landscape",
+  "DE.Views.Settings.textLastModified": "Last Modified",
+  "DE.Views.Settings.textLastModifiedBy": "Last Modified By",
   "DE.Views.Settings.textLeft": "Left",
   "DE.Views.Settings.textLoading": "Loading...",
+  "DE.Views.Settings.textLocation": "Location",
   "DE.Views.Settings.textMargins": "Margins",
+  "DE.Views.Settings.textNoCharacters": "Nonprinting Characters",
   "DE.Views.Settings.textOrientation": "Orientation",
+  "DE.Views.Settings.textOwner": "Owner",
   "DE.Views.Settings.textPages": "Pages",
   "DE.Views.Settings.textParagraphs": "Paragraphs",
+  "DE.Views.Settings.textPoint": "Point",
   "DE.Views.Settings.textPortrait": "Portrait",
   "DE.Views.Settings.textPoweredBy": "Powered by",
   "DE.Views.Settings.textPrint": "Print",
@@ -478,32 +509,16 @@
   "DE.Views.Settings.textSpaces": "Spaces",
   "DE.Views.Settings.textSpellcheck": "Spell Checking",
   "DE.Views.Settings.textStatistic": "Statistic",
+  "DE.Views.Settings.textSubject": "Subject",
   "DE.Views.Settings.textSymbols": "Symbols",
   "DE.Views.Settings.textTel": "tel",
+  "DE.Views.Settings.textTitle": "Title",
   "DE.Views.Settings.textTop": "Top",
+  "DE.Views.Settings.textUnitOfMeasurement": "Unit of Measurement",
+  "DE.Views.Settings.textUploaded": "Uploaded",
   "DE.Views.Settings.textVersion": "Version",
   "DE.Views.Settings.textWords": "Words",
   "DE.Views.Settings.unknownText": "Unknown",
-  "DE.Views.Settings.textAdvancedSettings": "Application Settings",
+  "DE.Views.Settings.textCollaboration": "Collaboration",
-  "DE.Views.Settings.textUnitOfMeasurement": "Unit of Measurement",
+  "DE.Views.Toolbar.textBack": "Back"
-  "DE.Views.Settings.textCentimeter": "Centimeter",
-  "DE.Views.Settings.textPoint": "Point",
-  "DE.Views.Settings.textInch": "Inch",
-  "DE.Views.Settings.textColorSchemes": "Color Schemes",
-  "DE.Views.Settings.textNoCharacters": "Nonprinting Characters",
-  "DE.Views.Settings.textHiddenTableBorders": "Hidden Table Borders",
-  "DE.Views.Toolbar.textBack": "Back",
-  "DE.Views.Collaboration.textCollaboration": "Collaboration",
-  "DE.Views.Collaboration.textReviewing": "Review",
-  "DE.Views.Collaboration.textСomments": "Сomments",
-  "DE.Views.Collaboration.textBack": "Back",
-  "DE.Views.Collaboration.textReview": "Track Changes",
-  "DE.Views.Collaboration.textAcceptAllChanges": "Accept All Changes",
-  "DE.Views.Collaboration.textRejectAllChanges": "Reject All Changes",
-  "DE.Views.Collaboration.textDisplayMode": "Display Mode",
-  "DE.Views.Collaboration.textMarkup": "Markup",
-  "DE.Views.Collaboration.textFinal": "Final",
-  "DE.Views.Collaboration.textOriginal": "Original",
-  "DE.Views.Collaboration.textChange": "Review Change",
-  "DE.Views.Collaboration.textEditUsers": "Users"
 }

apps/documenteditor/mobile/locale/es.json

@@ -1,34 +1,111 @@
 {
+  "Common.Controllers.Collaboration.textAtLeast": "al menos",
+  "Common.Controllers.Collaboration.textAuto": "auto",
+  "Common.Controllers.Collaboration.textBaseline": "Línea de base",
+  "Common.Controllers.Collaboration.textBold": "Negrita",
+  "Common.Controllers.Collaboration.textBreakBefore": "Salto de página anterior",
+  "Common.Controllers.Collaboration.textCaps": "Mayúsculas",
+  "Common.Controllers.Collaboration.textCenter": "Alinear al centro",
+  "Common.Controllers.Collaboration.textChart": "Gráfico",
+  "Common.Controllers.Collaboration.textColor": "Color de fuente",
+  "Common.Controllers.Collaboration.textContextual": "No añadir intervalo entre párrafos del mismo estilo",
+  "Common.Controllers.Collaboration.textDeleted": "<b>Eliminado:</b>",
+  "Common.Controllers.Collaboration.textDStrikeout": "Doble tachado",
+  "Common.Controllers.Collaboration.textEditUser": "El documento está siendo editado por múltiples usuarios.",
+  "Common.Controllers.Collaboration.textEquation": "Ecuación",
+  "Common.Controllers.Collaboration.textExact": "exactamente",
+  "Common.Controllers.Collaboration.textFirstLine": "Primera línea",
+  "Common.Controllers.Collaboration.textFormatted": "Formateado",
+  "Common.Controllers.Collaboration.textHighlight": "Color de resaltado",
+  "Common.Controllers.Collaboration.textImage": "Imagen",
+  "Common.Controllers.Collaboration.textIndentLeft": "Sangría izquierda",
+  "Common.Controllers.Collaboration.textIndentRight": "Sangría derecha",
+  "Common.Controllers.Collaboration.textInserted": "<b>Insertado:</b>",
+  "Common.Controllers.Collaboration.textItalic": "Cursiva",
+  "Common.Controllers.Collaboration.textJustify": "Alinear al ancho",
+  "Common.Controllers.Collaboration.textKeepLines": "Mantener líneas juntas",
+  "Common.Controllers.Collaboration.textKeepNext": "Mantener con el siguiente",
+  "Common.Controllers.Collaboration.textLeft": "Alinear a la izquierda",
+  "Common.Controllers.Collaboration.textLineSpacing": "Espaciado de línea: ",
+  "Common.Controllers.Collaboration.textMultiple": "Multiplicador",
+  "Common.Controllers.Collaboration.textNoBreakBefore": "Sin salto de página anterior",
+  "Common.Controllers.Collaboration.textNoContextual": "Añadir intervalo entre párrafos del mismo estilo",
+  "Common.Controllers.Collaboration.textNoKeepLines": "No mantener líneas juntas",
+  "Common.Controllers.Collaboration.textNoKeepNext": "No mantener con el siguiente",
+  "Common.Controllers.Collaboration.textNot": "No",
+  "Common.Controllers.Collaboration.textNoWidow": "Sin widow control",
+  "Common.Controllers.Collaboration.textNum": "Cambiar numeración",
+  "Common.Controllers.Collaboration.textParaDeleted": "<b>Párrafo Eliminado</b> ",
+  "Common.Controllers.Collaboration.textParaFormatted": "<b>Párrafo formateado</b>",
+  "Common.Controllers.Collaboration.textParaInserted": "<b>Párrafo Insertado</b> ",
+  "Common.Controllers.Collaboration.textParaMoveFromDown": "<b>Bajado:</b>",
+  "Common.Controllers.Collaboration.textParaMoveFromUp": "<b>Subido:</b>",
+  "Common.Controllers.Collaboration.textParaMoveTo": "<b>Movido:</b>",
+  "Common.Controllers.Collaboration.textPosition": "Posición",
+  "Common.Controllers.Collaboration.textRight": "Alinear a la derecha",
+  "Common.Controllers.Collaboration.textShape": "Forma",
+  "Common.Controllers.Collaboration.textShd": "Color del fondo",
+  "Common.Controllers.Collaboration.textSmallCaps": "Versalitas",
+  "Common.Controllers.Collaboration.textSpacing": "Espaciado",
+  "Common.Controllers.Collaboration.textSpacingAfter": "Espaciado después",
+  "Common.Controllers.Collaboration.textSpacingBefore": "Espaciado antes",
+  "Common.Controllers.Collaboration.textStrikeout": "Tachado",
+  "Common.Controllers.Collaboration.textSubScript": "Subíndice",
+  "Common.Controllers.Collaboration.textSuperScript": "Superíndice",
+  "Common.Controllers.Collaboration.textTableChanged": "<b>Se cambió configuración de la tabla</b>",
+  "Common.Controllers.Collaboration.textTableRowsAdd": "<b>Se añadieron filas de la tabla<b/>",
+  "Common.Controllers.Collaboration.textTableRowsDel": "<b>Se eliminaron filas de la tabla<b/>",
+  "Common.Controllers.Collaboration.textTabs": "Cambiar tabuladores",
+  "Common.Controllers.Collaboration.textUnderline": "Subrayado",
+  "Common.Controllers.Collaboration.textWidow": "Widow control",
   "Common.UI.ThemeColorPalette.textStandartColors": "Colores estándar",
   "Common.UI.ThemeColorPalette.textThemeColors": "Colores de tema",
   "Common.Utils.Metric.txtCm": "cm",
   "Common.Utils.Metric.txtPt": "pt",
+  "Common.Views.Collaboration.textAcceptAllChanges": "Aceptar todos los cambios",
+  "Common.Views.Collaboration.textBack": "Atrás",
+  "Common.Views.Collaboration.textChange": "Revisar cambios",
+  "Common.Views.Collaboration.textCollaboration": "Colaboración",
+  "Common.Views.Collaboration.textDisplayMode": "Modo de visualización",
+  "Common.Views.Collaboration.textEditUsers": "Usuarios",
+  "Common.Views.Collaboration.textFinal": "Final",
+  "Common.Views.Collaboration.textMarkup": "Cambios",
+  "Common.Views.Collaboration.textOriginal": "Original",
+  "Common.Views.Collaboration.textRejectAllChanges": "Rechazar todos los cambios",
+  "Common.Views.Collaboration.textReview": "Seguimiento de cambios",
+  "Common.Views.Collaboration.textReviewing": "Revisión",
+  "Common.Views.Collaboration.textСomments": "Comentarios",
   "DE.Controllers.AddContainer.textImage": "Imagen",
   "DE.Controllers.AddContainer.textOther": "Otro",
   "DE.Controllers.AddContainer.textShape": "Forma",
   "DE.Controllers.AddContainer.textTable": "Tabla",
   "DE.Controllers.AddImage.textEmptyImgUrl": "Hay que especificar URL de imagen.",
   "DE.Controllers.AddImage.txtNotUrl": "Este campo debe ser URL-dirección en el formato 'http://www.example.com'",
+  "DE.Controllers.AddOther.textBelowText": "Bajo el texto",
+  "DE.Controllers.AddOther.textBottomOfPage": "Al pie de la página",
   "DE.Controllers.AddOther.txtNotUrl": "Este campo debe ser URL-dirección en el formato 'http://www.example.com'",
   "DE.Controllers.AddTable.textCancel": "Cancelar",
   "DE.Controllers.AddTable.textColumns": "Columnas",
   "DE.Controllers.AddTable.textRows": "Filas",
   "DE.Controllers.AddTable.textTableSize": "Tamaño de tabla",
-  "DE.Controllers.DocumentHolder.menuAccept": "Aceptar",
-  "DE.Controllers.DocumentHolder.menuAcceptAll": "Aceptar todo",
   "DE.Controllers.DocumentHolder.menuAddLink": "Añadir enlace ",
   "DE.Controllers.DocumentHolder.menuCopy": "Copiar ",
   "DE.Controllers.DocumentHolder.menuCut": "Cortar",
   "DE.Controllers.DocumentHolder.menuDelete": "Eliminar",
+  "DE.Controllers.DocumentHolder.menuDeleteTable": "Borrar tabla",
   "DE.Controllers.DocumentHolder.menuEdit": "Editar",
+  "DE.Controllers.DocumentHolder.menuMerge": "Combinar celdas",
   "DE.Controllers.DocumentHolder.menuMore": "Más",
   "DE.Controllers.DocumentHolder.menuOpenLink": "Abrir enlace",
   "DE.Controllers.DocumentHolder.menuPaste": "Pegar",
-  "DE.Controllers.DocumentHolder.menuReject": "Rechazar",
-  "DE.Controllers.DocumentHolder.menuRejectAll": "Rechazar todo",
   "DE.Controllers.DocumentHolder.menuReview": "Revista",
+  "DE.Controllers.DocumentHolder.menuReviewChange": "Revisar cambios",
+  "DE.Controllers.DocumentHolder.menuSplit": "Dividir celda",
   "DE.Controllers.DocumentHolder.sheetCancel": "Cancelar",
+  "DE.Controllers.DocumentHolder.textCancel": "Cancelar",
+  "DE.Controllers.DocumentHolder.textColumns": "Columnas",
   "DE.Controllers.DocumentHolder.textGuest": "Visitante",
+  "DE.Controllers.DocumentHolder.textRows": "Filas",
   "DE.Controllers.EditContainer.textChart": "Gráfico",
   "DE.Controllers.EditContainer.textFooter": "Pie de página",
   "DE.Controllers.EditContainer.textHeader": "Encabezado",
@@ -54,7 +131,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Tiempo de conversión está superado.",
   "DE.Controllers.Main.criticalErrorExtText": "Pulse 'OK' para volver a la lista de documentos.",
   "DE.Controllers.Main.criticalErrorTitle": "Error",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Fallo en descarga ",
   "DE.Controllers.Main.downloadMergeText": "Descargando...",
   "DE.Controllers.Main.downloadMergeTitle": "Descargando",
@@ -63,7 +139,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Usted no tiene permisos para realizar la acción que está intentando hacer.<br> Por favor, contacte con su Administrador del Servidor de Documentos.",
   "DE.Controllers.Main.errorBadImageUrl": "URL de imagen es incorrecto",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "La conexión al servidor se ha perdido. Usted ya no puede editar.",
-  "DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, verifique los ajustes de conexión o contacte con su administrador.<br>Cuando pulsa el botón 'OK', se le solicitará que descargue el documento.<br><br>Encuentre más información acerca de la conexión de Servidor de Documentos <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">aquí</a>",
+  "DE.Controllers.Main.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.<br><br>Encuentre más información acerca de la conexión de Servidor de Documentos <a href=\"%1\" target=\"_blank\">aquí</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Error externo.<br>Error de conexión a la base de datos. Por favor, contacte con el equipo de soporte técnico.",
   "DE.Controllers.Main.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.",
   "DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.",
@@ -120,7 +196,7 @@
   "DE.Controllers.Main.textCustomLoader": "Note, por favor, que según los términos de la licencia Usted no tiene derecho a cambiar el cargador.<br>Por favor, póngase en contacto con nuestro Departamento de Ventas para obtener una cotización.",
   "DE.Controllers.Main.textDone": "Listo",
   "DE.Controllers.Main.textLoadingDocument": "Cargando documento",
-  "DE.Controllers.Main.textNoLicenseTitle": "Limitación de conexiones ONLYOFFICE",
+  "DE.Controllers.Main.textNoLicenseTitle": "%1 limitación de conexiones",
   "DE.Controllers.Main.textOK": "OK",
   "DE.Controllers.Main.textPaidFeature": "Función de pago",
   "DE.Controllers.Main.textPassword": "Contraseña",
@@ -168,7 +244,7 @@
   "DE.Controllers.Main.warnLicenseExp": "Su licencia ha expirado.<br>Por favor, actualice su licencia y después recargue la página.",
   "DE.Controllers.Main.warnLicenseUsersExceeded": "Se ha excedido el número permitido de los usuarios simultáneos, y el documento se abrirá para sólo lectura.<br>Por favor, contacte con su administrador para recibir más información.",
   "DE.Controllers.Main.warnNoLicense": "Esta versión de los Editores de ONLYOFFICE tiene ciertas limitaciones para el número de conexiones simultáneas al servidor de documentos.<br>Si se requiere más, por favor, considere comprar una licencia comercial.",
-  "DE.Controllers.Main.warnNoLicenseUsers": "Esta versión de Editores de ONLYOFFICE tiene ciertas limitaciones para usuarios simultáneos.<br>Si se requiere más, por favor, considere comprar una licencia comercial.",
+  "DE.Controllers.Main.warnNoLicenseUsers": "Esta versión de editores %1 tiene ciertas limitaciones para usuarios simultáneos.<br>Si necesita más, por favor, considere comprar una licencia comercial.",
   "DE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado.",
   "DE.Controllers.Search.textNoTextFound": "Texto no es encontrado",
   "DE.Controllers.Search.textReplaceAll": "Reemplazar todo",
@@ -196,10 +272,14 @@
   "DE.Views.AddOther.textCurrentPos": "Posición actual",
   "DE.Views.AddOther.textDisplay": "Mostrar",
   "DE.Views.AddOther.textEvenPage": "Página par",
+  "DE.Views.AddOther.textFootnote": "Nota al pie",
+  "DE.Views.AddOther.textFormat": "Formato",
   "DE.Views.AddOther.textInsert": "Insertar",
+  "DE.Views.AddOther.textInsertFootnote": "Insertar nota al pie",
   "DE.Views.AddOther.textLeftBottom": "Abajo a la izquierda",
   "DE.Views.AddOther.textLeftTop": "Arriba a la izquierda",
   "DE.Views.AddOther.textLink": "Enlace",
+  "DE.Views.AddOther.textLocation": "Ubicación",
   "DE.Views.AddOther.textNextPage": "Página siguiente",
   "DE.Views.AddOther.textOddPage": "Página impar",
   "DE.Views.AddOther.textPageBreak": "Salto de página ",
@@ -208,6 +288,7 @@
   "DE.Views.AddOther.textRightBottom": "Abajo a la derecha",
   "DE.Views.AddOther.textRightTop": "Arriba a la derecha",
   "DE.Views.AddOther.textSectionBreak": "Salto de sección",
+  "DE.Views.AddOther.textStartFrom": "Empezar con",
   "DE.Views.AddOther.textTip": "Consejos de pantalla",
   "DE.Views.EditChart.textAlign": "Alineación",
   "DE.Views.EditChart.textBack": "Atrás",
@@ -373,9 +454,12 @@
   "DE.Views.Search.textSearch": "Buscar",
   "DE.Views.Settings.textAbout": "Acerca",
   "DE.Views.Settings.textAddress": "dirección",
+  "DE.Views.Settings.textAdvancedSettings": "Ajustes de aplicación",
   "DE.Views.Settings.textAuthor": "Autor",
   "DE.Views.Settings.textBack": "Atrás",
   "DE.Views.Settings.textBottom": "Abajo ",
+  "DE.Views.Settings.textCentimeter": "Centímetro",
+  "DE.Views.Settings.textColorSchemes": "Esquemas de color",
   "DE.Views.Settings.textCreateDate": "Fecha de creación",
   "DE.Views.Settings.textCustom": "Personalizado",
   "DE.Views.Settings.textCustomSize": "Tamaño personalizado",
@@ -392,13 +476,17 @@
   "DE.Views.Settings.textFindAndReplace": "Encontrar y reemplazar",
   "DE.Views.Settings.textFormat": "Formato",
   "DE.Views.Settings.textHelp": "Ayuda",
+  "DE.Views.Settings.textHiddenTableBorders": "Bordes de tabla escondidos",
+  "DE.Views.Settings.textInch": "Pulgada",
   "DE.Views.Settings.textLandscape": "Horizontal",
   "DE.Views.Settings.textLeft": "A la izquierda",
   "DE.Views.Settings.textLoading": "Cargando...",
   "DE.Views.Settings.textMargins": "Márgenes",
+  "DE.Views.Settings.textNoCharacters": "Caracteres no imprimibles",
   "DE.Views.Settings.textOrientation": "Orientación ",
   "DE.Views.Settings.textPages": "Páginas",
   "DE.Views.Settings.textParagraphs": "Párrafos",
+  "DE.Views.Settings.textPoint": "Punto",
   "DE.Views.Settings.textPortrait": "Vertical",
   "DE.Views.Settings.textPoweredBy": "Desarrollado por",
   "DE.Views.Settings.textPrint": "Imprimir",
@@ -412,6 +500,7 @@
   "DE.Views.Settings.textSymbols": "Símbolos",
   "DE.Views.Settings.textTel": "Tel.",
   "DE.Views.Settings.textTop": "Superior",
+  "DE.Views.Settings.textUnitOfMeasurement": "Unidad de medida",
   "DE.Views.Settings.textVersion": "Versión ",
   "DE.Views.Settings.textWords": "Palabras",
   "DE.Views.Settings.unknownText": "Desconocido",

apps/documenteditor/mobile/locale/fr.json

@@ -1,34 +1,111 @@
 {
+  "Common.Controllers.Collaboration.textAtLeast": "au moins ",
+  "Common.Controllers.Collaboration.textAuto": "auto",
+  "Common.Controllers.Collaboration.textBaseline": "Ligne de base",
+  "Common.Controllers.Collaboration.textBold": "Gras",
+  "Common.Controllers.Collaboration.textBreakBefore": "Saut de page avant",
+  "Common.Controllers.Collaboration.textCaps": "Tout en majuscules",
+  "Common.Controllers.Collaboration.textCenter": "Aligner au centre",
+  "Common.Controllers.Collaboration.textChart": "Graphique",
+  "Common.Controllers.Collaboration.textColor": "Couleur de police",
+  "Common.Controllers.Collaboration.textContextual": "Ne pas ajouter d'intervalle entre paragraphes du même style",
+  "Common.Controllers.Collaboration.textDeleted": "<b>Supprimé:</b>",
+  "Common.Controllers.Collaboration.textDStrikeout": "Double-barré",
+  "Common.Controllers.Collaboration.textEditUser": "Document est en cours de modification par plusieurs utilisateurs.",
+  "Common.Controllers.Collaboration.textEquation": "Équation",
+  "Common.Controllers.Collaboration.textExact": "exactement",
+  "Common.Controllers.Collaboration.textFirstLine": "Première ligne",
+  "Common.Controllers.Collaboration.textFormatted": "Formaté",
+  "Common.Controllers.Collaboration.textHighlight": "Couleur de surlignage",
+  "Common.Controllers.Collaboration.textImage": "Image",
+  "Common.Controllers.Collaboration.textIndentLeft": "Retrait à gauche",
+  "Common.Controllers.Collaboration.textIndentRight": "Retrait à droite",
+  "Common.Controllers.Collaboration.textInserted": "<b>Inséré:</b>",
+  "Common.Controllers.Collaboration.textItalic": "Italique",
+  "Common.Controllers.Collaboration.textJustify": "Justifier ",
+  "Common.Controllers.Collaboration.textKeepLines": "Lignes solidaires",
+  "Common.Controllers.Collaboration.textKeepNext": "Paragraphes solidaires",
+  "Common.Controllers.Collaboration.textLeft": "Aligner à gauche",
+  "Common.Controllers.Collaboration.textLineSpacing": "Interligne:",
+  "Common.Controllers.Collaboration.textMultiple": "multiple ",
+  "Common.Controllers.Collaboration.textNoBreakBefore": "Pas de saut de page avant",
+  "Common.Controllers.Collaboration.textNoContextual": "Ajouter un intervalle entre les paragraphes du même style",
+  "Common.Controllers.Collaboration.textNoKeepLines": "Ne gardez pas de lignes ensemble",
+  "Common.Controllers.Collaboration.textNoKeepNext": "Ne gardez pas avec la prochaine",
+  "Common.Controllers.Collaboration.textNot": "Non",
+  "Common.Controllers.Collaboration.textNoWidow": "Pas de contrôle des veuves",
+  "Common.Controllers.Collaboration.textNum": "Changer la numérotation",
+  "Common.Controllers.Collaboration.textParaDeleted": "<b>Paragraphe supprimé</b> ",
+  "Common.Controllers.Collaboration.textParaFormatted": "<b>Paragraphe Formaté</b>",
+  "Common.Controllers.Collaboration.textParaInserted": "<b>Paragraphe inséré</b> ",
+  "Common.Controllers.Collaboration.textParaMoveFromDown": "<b>Déplacé vers le bas:</b>",
+  "Common.Controllers.Collaboration.textParaMoveFromUp": "<b>Déplacé vers le haut:</b>",
+  "Common.Controllers.Collaboration.textParaMoveTo": "<b>Déplacé:</b>",
+  "Common.Controllers.Collaboration.textPosition": "Position",
+  "Common.Controllers.Collaboration.textRight": "Aligner à droite",
+  "Common.Controllers.Collaboration.textShape": "Forme",
+  "Common.Controllers.Collaboration.textShd": "Couleur d'arrière-plan",
+  "Common.Controllers.Collaboration.textSmallCaps": "Petites majuscules",
+  "Common.Controllers.Collaboration.textSpacing": "Espacement",
+  "Common.Controllers.Collaboration.textSpacingAfter": "Espacement après",
+  "Common.Controllers.Collaboration.textSpacingBefore": "Espacement avant",
+  "Common.Controllers.Collaboration.textStrikeout": "Barré",
+  "Common.Controllers.Collaboration.textSubScript": "Indice",
+  "Common.Controllers.Collaboration.textSuperScript": "Exposant",
+  "Common.Controllers.Collaboration.textTableChanged": "<b>Paramètres du tableau modifiés</b>",
+  "Common.Controllers.Collaboration.textTableRowsAdd": "<b>Lignes de tableau ajoutées<b/>",
+  "Common.Controllers.Collaboration.textTableRowsDel": "<b>Lignes de tableau supprimées<b/>",
+  "Common.Controllers.Collaboration.textTabs": "Changer les tabulations",
+  "Common.Controllers.Collaboration.textUnderline": "Souligné",
+  "Common.Controllers.Collaboration.textWidow": "Contrôle des veuves",
   "Common.UI.ThemeColorPalette.textStandartColors": "Couleurs standard",
   "Common.UI.ThemeColorPalette.textThemeColors": "Couleurs de thème",
   "Common.Utils.Metric.txtCm": "cm",
   "Common.Utils.Metric.txtPt": "pt",
+  "Common.Views.Collaboration.textAcceptAllChanges": "Accepter toutes les modifications",
+  "Common.Views.Collaboration.textBack": "Retour",
+  "Common.Views.Collaboration.textChange": "Réviser modifications",
+  "Common.Views.Collaboration.textCollaboration": "Collaboration",
+  "Common.Views.Collaboration.textDisplayMode": "Mode d'affichage",
+  "Common.Views.Collaboration.textEditUsers": "Utilisateurs",
+  "Common.Views.Collaboration.textFinal": "Final",
+  "Common.Views.Collaboration.textMarkup": "Balisage",
+  "Common.Views.Collaboration.textOriginal": "Original",
+  "Common.Views.Collaboration.textRejectAllChanges": "Refuser toutes les modifications ",
+  "Common.Views.Collaboration.textReview": "Suivi des modifications",
+  "Common.Views.Collaboration.textReviewing": "Révision",
+  "Common.Views.Collaboration.textСomments": "Commentaires",
   "DE.Controllers.AddContainer.textImage": "Image",
   "DE.Controllers.AddContainer.textOther": "Autre",
   "DE.Controllers.AddContainer.textShape": "Forme",
   "DE.Controllers.AddContainer.textTable": "Tableau",
   "DE.Controllers.AddImage.textEmptyImgUrl": "Spécifiez URL de l'image",
   "DE.Controllers.AddImage.txtNotUrl": "Ce champ doit être une URL de la forme suivante: 'http://www.example.com'",
+  "DE.Controllers.AddOther.textBelowText": "Sous le texte",
+  "DE.Controllers.AddOther.textBottomOfPage": "Bas de page",
   "DE.Controllers.AddOther.txtNotUrl": "Ce champ doit être une URL de la forme suivante: 'http://www.example.com'",
   "DE.Controllers.AddTable.textCancel": "Annuler",
   "DE.Controllers.AddTable.textColumns": "Colonnes",
   "DE.Controllers.AddTable.textRows": "Lignes",
   "DE.Controllers.AddTable.textTableSize": "Taille du tableau",
-  "DE.Controllers.DocumentHolder.menuAccept": "Accepter",
-  "DE.Controllers.DocumentHolder.menuAcceptAll": "Accepter tout",
   "DE.Controllers.DocumentHolder.menuAddLink": "Ajouter le lien",
   "DE.Controllers.DocumentHolder.menuCopy": "Copier",
   "DE.Controllers.DocumentHolder.menuCut": "Couper",
   "DE.Controllers.DocumentHolder.menuDelete": "Supprimer",
+  "DE.Controllers.DocumentHolder.menuDeleteTable": "Supprimer le tableau",
   "DE.Controllers.DocumentHolder.menuEdit": "Modifier",
+  "DE.Controllers.DocumentHolder.menuMerge": "Fusionner les cellules",
   "DE.Controllers.DocumentHolder.menuMore": "Plus",
   "DE.Controllers.DocumentHolder.menuOpenLink": "Ouvrir le lien",
   "DE.Controllers.DocumentHolder.menuPaste": "Coller",
-  "DE.Controllers.DocumentHolder.menuReject": "Rejeter",
-  "DE.Controllers.DocumentHolder.menuRejectAll": "Rejeter tout",
   "DE.Controllers.DocumentHolder.menuReview": "Révision",
+  "DE.Controllers.DocumentHolder.menuReviewChange": "Réviser modifications",
+  "DE.Controllers.DocumentHolder.menuSplit": "Fractionner la cellule",
   "DE.Controllers.DocumentHolder.sheetCancel": "Annuler",
+  "DE.Controllers.DocumentHolder.textCancel": "Annuler",
+  "DE.Controllers.DocumentHolder.textColumns": "Colonnes",
   "DE.Controllers.DocumentHolder.textGuest": "Invité",
+  "DE.Controllers.DocumentHolder.textRows": "Lignes",
   "DE.Controllers.EditContainer.textChart": "Graphique",
   "DE.Controllers.EditContainer.textFooter": "Pied de page",
   "DE.Controllers.EditContainer.textHeader": "En-tête",
@@ -54,7 +131,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Délai de conversion expiré.",
   "DE.Controllers.Main.criticalErrorExtText": "Appuyez sur OK pour revenir à la liste des documents.",
   "DE.Controllers.Main.criticalErrorTitle": "Erreur",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Échec du téléchargement.",
   "DE.Controllers.Main.downloadMergeText": "Téléchargement en cours...",
   "DE.Controllers.Main.downloadMergeTitle": "Téléchargement en cours",
@@ -63,7 +139,7 @@
   "DE.Controllers.Main.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.Main.errorBadImageUrl": "L'URL de l'image est incorrecte",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "La connexion au serveur perdue. Désolé, vous ne pouvez plus modifier le document.",
-  "DE.Controllers.Main.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.<br><br>Trouvez plus d'informations sur la connexion au Serveur de Documents <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">ici</a>",
+  "DE.Controllers.Main.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.<br><br>Trouvez plus d'informations sur la connexion au Serveur de Documents <a href=\"%1\" target=\"_blank\">ici</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Erreur externe.<br>Erreur de connexion à la base de données.Contactez le support.",
   "DE.Controllers.Main.errorDataEncrypted": "Les modifications chiffrées ont été reçues, elle ne peuvent pas être déchiffrées.",
   "DE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
@@ -196,10 +272,14 @@
   "DE.Views.AddOther.textCurrentPos": "Position actuelle",
   "DE.Views.AddOther.textDisplay": "Afficher",
   "DE.Views.AddOther.textEvenPage": "Page paire",
+  "DE.Views.AddOther.textFootnote": "Note de bas de page",
+  "DE.Views.AddOther.textFormat": "Format",
   "DE.Views.AddOther.textInsert": "Insérer",
+  "DE.Views.AddOther.textInsertFootnote": "Insérer une note de bas de page",
   "DE.Views.AddOther.textLeftBottom": "À gauche en bas",
   "DE.Views.AddOther.textLeftTop": "À gauche en haut",
   "DE.Views.AddOther.textLink": "Lien",
+  "DE.Views.AddOther.textLocation": "Emplacement",
   "DE.Views.AddOther.textNextPage": "Page suivante",
   "DE.Views.AddOther.textOddPage": "Page impaire",
   "DE.Views.AddOther.textPageBreak": "Saut de page",
@@ -208,6 +288,7 @@
   "DE.Views.AddOther.textRightBottom": "À droite en bas",
   "DE.Views.AddOther.textRightTop": "À droite en haut",
   "DE.Views.AddOther.textSectionBreak": "Saut de section",
+  "DE.Views.AddOther.textStartFrom": "À partir de",
   "DE.Views.AddOther.textTip": "Info-bulle",
   "DE.Views.EditChart.textAlign": "Aligner",
   "DE.Views.EditChart.textBack": "Retour",
@@ -373,9 +454,12 @@
   "DE.Views.Search.textSearch": "Rechercher",
   "DE.Views.Settings.textAbout": "A propos",
   "DE.Views.Settings.textAddress": "adresse",
+  "DE.Views.Settings.textAdvancedSettings": "Paramètres de l'application",
   "DE.Views.Settings.textAuthor": "Auteur",
   "DE.Views.Settings.textBack": "Retour",
   "DE.Views.Settings.textBottom": "En bas",
+  "DE.Views.Settings.textCentimeter": "Centimètre",
+  "DE.Views.Settings.textColorSchemes": "Jeux de couleurs",
   "DE.Views.Settings.textCreateDate": "Date de création",
   "DE.Views.Settings.textCustom": "Personnalisé",
   "DE.Views.Settings.textCustomSize": "Taille personnalisée",
@@ -392,13 +476,17 @@
   "DE.Views.Settings.textFindAndReplace": "Rechercher et remplacer",
   "DE.Views.Settings.textFormat": "Format",
   "DE.Views.Settings.textHelp": "Aide",
+  "DE.Views.Settings.textHiddenTableBorders": "Bordures du tableau cachées",
+  "DE.Views.Settings.textInch": "Pouce",
   "DE.Views.Settings.textLandscape": "Paysage",
   "DE.Views.Settings.textLeft": "A gauche",
   "DE.Views.Settings.textLoading": "Chargement en cours...",
   "DE.Views.Settings.textMargins": "Marges",
+  "DE.Views.Settings.textNoCharacters": "Caractères non imprimables",
   "DE.Views.Settings.textOrientation": "Orientation",
   "DE.Views.Settings.textPages": "Pages",
   "DE.Views.Settings.textParagraphs": "Paragraphes",
+  "DE.Views.Settings.textPoint": "Point",
   "DE.Views.Settings.textPortrait": "Portrait",
   "DE.Views.Settings.textPoweredBy": "Propulsé par ",
   "DE.Views.Settings.textPrint": "Imprimer",
@@ -412,6 +500,7 @@
   "DE.Views.Settings.textSymbols": "Symboles",
   "DE.Views.Settings.textTel": "Tél.",
   "DE.Views.Settings.textTop": "En haut",
+  "DE.Views.Settings.textUnitOfMeasurement": "Unité de mesure",
   "DE.Views.Settings.textVersion": "Version",
   "DE.Views.Settings.textWords": "Mots",
   "DE.Views.Settings.unknownText": "Inconnu",

apps/documenteditor/mobile/locale/hu.json

@@ -14,8 +14,6 @@
   "DE.Controllers.AddTable.textColumns": "Oszlopok",
   "DE.Controllers.AddTable.textRows": "Sorok",
   "DE.Controllers.AddTable.textTableSize": "Táblázat méret",
-  "DE.Controllers.DocumentHolder.menuAccept": "Elfogad",
-  "DE.Controllers.DocumentHolder.menuAcceptAll": "Mindent elfogad",
   "DE.Controllers.DocumentHolder.menuAddLink": "Link hozzáadása",
   "DE.Controllers.DocumentHolder.menuCopy": "Másol",
   "DE.Controllers.DocumentHolder.menuCut": "Kivág",
@@ -24,8 +22,6 @@
   "DE.Controllers.DocumentHolder.menuMore": "Még",
   "DE.Controllers.DocumentHolder.menuOpenLink": "Link megnyitása",
   "DE.Controllers.DocumentHolder.menuPaste": "Beilleszt",
-  "DE.Controllers.DocumentHolder.menuReject": "Elutasít",
-  "DE.Controllers.DocumentHolder.menuRejectAll": "Elutasít mindent",
   "DE.Controllers.DocumentHolder.menuReview": "Összefoglaló",
   "DE.Controllers.DocumentHolder.sheetCancel": "Mégse",
   "DE.Controllers.DocumentHolder.textGuest": "Vendég",
@@ -54,7 +50,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Időtúllépés az átalakítás során.",
   "DE.Controllers.Main.criticalErrorExtText": "Nyomja meg az \"OK\"-t a dokumentumok listájához.",
   "DE.Controllers.Main.criticalErrorTitle": "Hiba",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Dokumentum Szerkesztő",
   "DE.Controllers.Main.downloadErrorText": "Sikertelen letöltés.",
   "DE.Controllers.Main.downloadMergeText": "Letöltés...",
   "DE.Controllers.Main.downloadMergeTitle": "Letöltés",
@@ -63,7 +58,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.<br>Vegye fel a kapcsolatot a Document Server adminisztrátorával.",
   "DE.Controllers.Main.errorBadImageUrl": "Hibás kép URL",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "A szerver elveszítette a kapcsolatot. A további szerkesztés nem lehetséges.",
-  "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.<br>Ha az 'OK'-ra kattint letöltheti a dokumentumot.<br><br>Bővebb információk a Dokumentum Szerverhez kapcsolódásról <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">itt</a> találhat.",
+  "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.<br>Ha az 'OK'-ra kattint letöltheti a dokumentumot.<br><br>Bővebb információk a Dokumentum Szerverhez kapcsolódásról <a href=\"%1\" target=\"_blank\">itt</a> találhat.",
   "DE.Controllers.Main.errorDatabaseConnection": "Külső hiba.<br>Adatbázis kapcsolati hiba. Kérem vegye igénybe támogatásunkat.",
   "DE.Controllers.Main.errorDataEncrypted": "Titkosított változások érkeztek, melyek feloldása sikertelen.",
   "DE.Controllers.Main.errorDataRange": "Hibás adattartomány.",

apps/documenteditor/mobile/locale/it.json

@@ -1,34 +1,109 @@
 {
+  "Common.Controllers.Collaboration.textAtLeast": "Minima",
+  "Common.Controllers.Collaboration.textAuto": "auto",
+  "Common.Controllers.Collaboration.textBaseline": "Linea guida",
+  "Common.Controllers.Collaboration.textBold": "Grassetto",
+  "Common.Controllers.Collaboration.textBreakBefore": "Anteponi interruzione",
+  "Common.Controllers.Collaboration.textCaps": "Tutto maiuscolo",
+  "Common.Controllers.Collaboration.textCenter": "Allinea al centro",
+  "Common.Controllers.Collaboration.textChart": "Grafico",
+  "Common.Controllers.Collaboration.textColor": "Colore del carattere",
+  "Common.Controllers.Collaboration.textContextual": "Non aggiungere intervallo tra paragrafi dello stesso stile",
+  "Common.Controllers.Collaboration.textDeleted": "<b>Eliminato:</b>",
+  "Common.Controllers.Collaboration.textDStrikeout": "Doppio barrato",
+  "Common.Controllers.Collaboration.textEditUser": "È in corso la modifica del documento da parte di più utenti.",
+  "Common.Controllers.Collaboration.textEquation": "Equazione",
+  "Common.Controllers.Collaboration.textExact": "Esatto",
+  "Common.Controllers.Collaboration.textFirstLine": "Prima riga",
+  "Common.Controllers.Collaboration.textFormatted": "Formattato",
+  "Common.Controllers.Collaboration.textHighlight": "Colore evidenziatore",
+  "Common.Controllers.Collaboration.textImage": "Immagine",
+  "Common.Controllers.Collaboration.textIndentLeft": "Rientro a sinistra",
+  "Common.Controllers.Collaboration.textIndentRight": "Rientro a destra",
+  "Common.Controllers.Collaboration.textInserted": "<b>Inserito:</b>",
+  "Common.Controllers.Collaboration.textItalic": "Corsivo",
+  "Common.Controllers.Collaboration.textJustify": "Giustificato",
+  "Common.Controllers.Collaboration.textKeepLines": "Mantieni assieme le righe",
+  "Common.Controllers.Collaboration.textKeepNext": "Mantieni con il successivo",
+  "Common.Controllers.Collaboration.textLeft": "Allinea a sinistra",
+  "Common.Controllers.Collaboration.textLineSpacing": "Interlinea:",
+  "Common.Controllers.Collaboration.textMultiple": "multiplo",
+  "Common.Controllers.Collaboration.textNoBreakBefore": "Nessuna interruzione di pagina prima",
+  "Common.Controllers.Collaboration.textNoContextual": "Aggiungi intervallo tra paragrafi dello stesso stile",
+  "Common.Controllers.Collaboration.textNoKeepLines": "Non tenere insieme le linee",
+  "Common.Controllers.Collaboration.textNoKeepNext": "Non tenere dal prossimo",
+  "Common.Controllers.Collaboration.textNot": "Not ",
+  "Common.Controllers.Collaboration.textNum": "Modifica numerazione",
+  "Common.Controllers.Collaboration.textParaDeleted": "<b>Paragrafo eliminato</b> ",
+  "Common.Controllers.Collaboration.textParaFormatted": "<b>Paragrafo formattato</b> ",
+  "Common.Controllers.Collaboration.textParaInserted": "<b>Paragrafo inserito</b> ",
+  "Common.Controllers.Collaboration.textParaMoveFromDown": "<b>Spostato in basso:</b>",
+  "Common.Controllers.Collaboration.textParaMoveFromUp": "<b>Spostato in alto:</b>",
+  "Common.Controllers.Collaboration.textParaMoveTo": "<b>Spostato:</b>",
+  "Common.Controllers.Collaboration.textPosition": "Posizione",
+  "Common.Controllers.Collaboration.textRight": "Allinea a destra",
+  "Common.Controllers.Collaboration.textShape": "Forma",
+  "Common.Controllers.Collaboration.textShd": "Colore sfondo",
+  "Common.Controllers.Collaboration.textSmallCaps": "Maiuscoletto",
+  "Common.Controllers.Collaboration.textSpacing": "Spaziatura",
+  "Common.Controllers.Collaboration.textSpacingAfter": "Spaziatura dopo",
+  "Common.Controllers.Collaboration.textSpacingBefore": "Spaziatura prima",
+  "Common.Controllers.Collaboration.textStrikeout": "Barrato",
+  "Common.Controllers.Collaboration.textSubScript": "Pedice",
+  "Common.Controllers.Collaboration.textSuperScript": "Apice",
+  "Common.Controllers.Collaboration.textTableChanged": "<b>Impostazioni tabella modificate</b>",
+  "Common.Controllers.Collaboration.textTableRowsAdd": "<b>Righe tabella aggiunte</b>",
+  "Common.Controllers.Collaboration.textTableRowsDel": "<b>Righe tabella eliminate</b>",
+  "Common.Controllers.Collaboration.textTabs": "Modifica Schede",
+  "Common.Controllers.Collaboration.textUnderline": "Sottolineato",
   "Common.UI.ThemeColorPalette.textStandartColors": "Colori standard",
   "Common.UI.ThemeColorPalette.textThemeColors": "Colori del tema",
   "Common.Utils.Metric.txtCm": "cm",
   "Common.Utils.Metric.txtPt": "pt",
+  "Common.Views.Collaboration.textAcceptAllChanges": "Accetta tutte le modifiche",
+  "Common.Views.Collaboration.textBack": "Indietro",
+  "Common.Views.Collaboration.textChange": "Modifica revisione",
+  "Common.Views.Collaboration.textCollaboration": "Collaborazione",
+  "Common.Views.Collaboration.textDisplayMode": "Modalità Visualizzazione",
+  "Common.Views.Collaboration.textEditUsers": "Utenti",
+  "Common.Views.Collaboration.textFinal": "Finale",
+  "Common.Views.Collaboration.textMarkup": "Marcatura",
+  "Common.Views.Collaboration.textOriginal": "Originale",
+  "Common.Views.Collaboration.textRejectAllChanges": "Annulla tutte le modifiche",
+  "Common.Views.Collaboration.textReview": "Traccia cambiamenti",
+  "Common.Views.Collaboration.textReviewing": "Revisione",
+  "Common.Views.Collaboration.textСomments": "Сommenti",
   "DE.Controllers.AddContainer.textImage": "Immagine",
   "DE.Controllers.AddContainer.textOther": "Altro",
   "DE.Controllers.AddContainer.textShape": "Forma",
   "DE.Controllers.AddContainer.textTable": "Tabella",
   "DE.Controllers.AddImage.textEmptyImgUrl": "Specifica URL immagine.",
   "DE.Controllers.AddImage.txtNotUrl": "Questo campo dovrebbe contenere un URL nel formato 'http://www.example.com'",
+  "DE.Controllers.AddOther.textBelowText": "Sotto al testo",
+  "DE.Controllers.AddOther.textBottomOfPage": "Fondo pagina",
   "DE.Controllers.AddOther.txtNotUrl": "Questo campo dovrebbe contenere un URL nel formato 'http://www.example.com'",
   "DE.Controllers.AddTable.textCancel": "Annulla",
   "DE.Controllers.AddTable.textColumns": "Colonne",
   "DE.Controllers.AddTable.textRows": "Righe",
   "DE.Controllers.AddTable.textTableSize": "Dimensioni tabella",
-  "DE.Controllers.DocumentHolder.menuAccept": "Accetta",
-  "DE.Controllers.DocumentHolder.menuAcceptAll": "Accetta tutto",
   "DE.Controllers.DocumentHolder.menuAddLink": "Aggiungi collegamento",
   "DE.Controllers.DocumentHolder.menuCopy": "Copia",
   "DE.Controllers.DocumentHolder.menuCut": "Taglia",
   "DE.Controllers.DocumentHolder.menuDelete": "Elimina",
+  "DE.Controllers.DocumentHolder.menuDeleteTable": "Elimina tabella",
   "DE.Controllers.DocumentHolder.menuEdit": "Modifica",
+  "DE.Controllers.DocumentHolder.menuMerge": "Unisci celle",
   "DE.Controllers.DocumentHolder.menuMore": "Altro",
   "DE.Controllers.DocumentHolder.menuOpenLink": "Apri collegamento",
   "DE.Controllers.DocumentHolder.menuPaste": "Incolla",
-  "DE.Controllers.DocumentHolder.menuReject": "Respingi",
-  "DE.Controllers.DocumentHolder.menuRejectAll": "Respingi tutti",
   "DE.Controllers.DocumentHolder.menuReview": "Revisione",
+  "DE.Controllers.DocumentHolder.menuReviewChange": "Modifica revisione",
+  "DE.Controllers.DocumentHolder.menuSplit": "Dividi cella",
   "DE.Controllers.DocumentHolder.sheetCancel": "Annulla",
+  "DE.Controllers.DocumentHolder.textCancel": "Annulla",
+  "DE.Controllers.DocumentHolder.textColumns": "Colonne",
   "DE.Controllers.DocumentHolder.textGuest": "Ospite",
+  "DE.Controllers.DocumentHolder.textRows": "Righe",
   "DE.Controllers.EditContainer.textChart": "Grafico",
   "DE.Controllers.EditContainer.textFooter": "Piè di pagina",
   "DE.Controllers.EditContainer.textHeader": "Intestazione",
@@ -54,7 +129,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "È stato superato il tempo limite della conversione.",
   "DE.Controllers.Main.criticalErrorExtText": "Clicca 'OK' per tornare alla lista documento",
   "DE.Controllers.Main.criticalErrorTitle": "Errore",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Scaricamento fallito",
   "DE.Controllers.Main.downloadMergeText": "Scaricamento in corso...",
   "DE.Controllers.Main.downloadMergeTitle": "Scaricamento",
@@ -63,7 +137,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.<br>Si prega di contattare l'amministratore del Server dei Documenti.",
   "DE.Controllers.Main.errorBadImageUrl": "URL dell'immagine non corretto",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Scollegato dal server. Non è possibile modificare.",
-  "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.<br><br>Per maggiori dettagli sulla connessione al Document Server  <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">clicca qui</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.<br><br>Per maggiori dettagli sulla connessione al Document Server  <a href=\"%1\" target=\"_blank\">clicca qui</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione al database. Si prega di contattare il supporto.",
   "DE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.",
   "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
@@ -120,7 +194,7 @@
   "DE.Controllers.Main.textCustomLoader": "Si noti che in base ai termini della licenza non si ha il diritto di cambiare il caricatore. <br> Si prega di contattare il nostro ufficio vendite per ottenere un preventivo.",
   "DE.Controllers.Main.textDone": "Fatto",
   "DE.Controllers.Main.textLoadingDocument": "Caricamento del documento",
-  "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE® limite connessione",
+  "DE.Controllers.Main.textNoLicenseTitle": "%1 limite connessione",
   "DE.Controllers.Main.textOK": "OK",
   "DE.Controllers.Main.textPaidFeature": "Caratteristica a pagamento",
   "DE.Controllers.Main.textPassword": "Password",
@@ -168,7 +242,7 @@
   "DE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.<br>Si prega di aggiornare la licenza e ricaricare la pagina.",
   "DE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione. <br>Per ulteriori informazioni, contattare l'amministratore.",
   "DE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.<br>Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.",
-  "DE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE Editors presenta alcune limitazioni per gli utenti simultanei. <br> Se hai bisogno di più, ti preghiamo di considerare l'aggiornamento della tua licenza attuale o l'acquisto di una licenza commerciale.",
+  "DE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.<br>Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.",
   "DE.Controllers.Main.warnProcessRightsChange": "Ti è stato negato il diritto di modificare il file.",
   "DE.Controllers.Search.textNoTextFound": "Testo non trovato",
   "DE.Controllers.Search.textReplaceAll": "Sostituisci tutto",
@@ -176,6 +250,7 @@
   "DE.Controllers.Settings.txtLoading": "Caricamento in corso...",
   "DE.Controllers.Settings.unknownText": "Sconosciuto",
   "DE.Controllers.Settings.warnDownloadAs": "Se continui a salvare in questo formato tutte le funzioni eccetto il testo vengono perse.<br>Sei sicuro di voler continuare?",
+  "DE.Controllers.Settings.warnDownloadAsRTF": "Se si continua a salvare in questo formato, parte della formattazione potrebbe andare persa.<br>Vuoi continuare?",
   "DE.Controllers.Toolbar.dlgLeaveMsgText": "Ci sono delle modifiche non salvate in questo documento. Clicca su 'Rimani in questa pagina, in attesa del salvataggio automatico del documento. Clicca su 'Lascia questa pagina' per annullare le modifiche.",
   "DE.Controllers.Toolbar.dlgLeaveTitleText": "Lascia l'applicazione",
   "DE.Controllers.Toolbar.leaveButtonText": "Lascia la pagina",
@@ -196,10 +271,14 @@
   "DE.Views.AddOther.textCurrentPos": "Posizione attuale",
   "DE.Views.AddOther.textDisplay": "Visualizza",
   "DE.Views.AddOther.textEvenPage": "Pagina pari",
+  "DE.Views.AddOther.textFootnote": "Note a piè di pagina",
+  "DE.Views.AddOther.textFormat": "Formato",
   "DE.Views.AddOther.textInsert": "Inserisci",
+  "DE.Views.AddOther.textInsertFootnote": "Inserisci nota a piè di pagina",
   "DE.Views.AddOther.textLeftBottom": "In basso a sinistra",
   "DE.Views.AddOther.textLeftTop": "In alto a sinistra",
   "DE.Views.AddOther.textLink": "Collegamento",
+  "DE.Views.AddOther.textLocation": "Posizione",
   "DE.Views.AddOther.textNextPage": "Pagina successiva",
   "DE.Views.AddOther.textOddPage": "Pagina dispari",
   "DE.Views.AddOther.textPageBreak": "Dividi pagina",
@@ -208,6 +287,7 @@
   "DE.Views.AddOther.textRightBottom": "In basso a destra",
   "DE.Views.AddOther.textRightTop": "In alto a destra",
   "DE.Views.AddOther.textSectionBreak": "Interrompi sezione",
+  "DE.Views.AddOther.textStartFrom": "Inizia da",
   "DE.Views.AddOther.textTip": "Suggerimento  ",
   "DE.Views.EditChart.textAlign": "Allinea",
   "DE.Views.EditChart.textBack": "Indietro",
@@ -373,12 +453,21 @@
   "DE.Views.Search.textSearch": "Cerca",
   "DE.Views.Settings.textAbout": "Informazioni su",
   "DE.Views.Settings.textAddress": "indirizzo",
+  "DE.Views.Settings.textAdvancedSettings": "Impostazioni Applicazione",
+  "DE.Views.Settings.textApplication": "Applicazione",
   "DE.Views.Settings.textAuthor": "Autore",
   "DE.Views.Settings.textBack": "Indietro",
   "DE.Views.Settings.textBottom": "In basso",
+  "DE.Views.Settings.textCentimeter": "Centimetro",
+  "DE.Views.Settings.textColorSchemes": "Schemi di colore",
+  "DE.Views.Settings.textComment": "Commento",
+  "DE.Views.Settings.textCommentingDisplay": "Visualizzazione dei Commenti",
+  "DE.Views.Settings.textCreated": "Creato",
   "DE.Views.Settings.textCreateDate": "Data di creazione",
   "DE.Views.Settings.textCustom": "Personalizzato",
   "DE.Views.Settings.textCustomSize": "Dimensione personalizzata",
+  "DE.Views.Settings.textDisplayComments": "Commenti",
+  "DE.Views.Settings.textDisplayResolvedComments": "Commenti risolti",
   "DE.Views.Settings.textDocInfo": "Informazioni sul documento",
   "DE.Views.Settings.textDocTitle": "Titolo documento",
   "DE.Views.Settings.textDocumentFormats": "Formati del documento",
@@ -392,13 +481,21 @@
   "DE.Views.Settings.textFindAndReplace": "Trova e sostituisci",
   "DE.Views.Settings.textFormat": "Formato",
   "DE.Views.Settings.textHelp": "Guida",
+  "DE.Views.Settings.textHiddenTableBorders": "Bordi tabella nascosti",
+  "DE.Views.Settings.textInch": "Pollice",
   "DE.Views.Settings.textLandscape": "Orizzontale",
+  "DE.Views.Settings.textLastModified": "Ultima modifica",
+  "DE.Views.Settings.textLastModifiedBy": "Ultima modifica di",
   "DE.Views.Settings.textLeft": "A sinistra",
   "DE.Views.Settings.textLoading": "Caricamento in corso...",
+  "DE.Views.Settings.textLocation": "Percorso",
   "DE.Views.Settings.textMargins": "Margini",
+  "DE.Views.Settings.textNoCharacters": "Caratteri non stampabili",
   "DE.Views.Settings.textOrientation": "Orientamento",
+  "DE.Views.Settings.textOwner": "Proprietario",
   "DE.Views.Settings.textPages": "Pagine",
   "DE.Views.Settings.textParagraphs": "Paragrafi",
+  "DE.Views.Settings.textPoint": "Punto",
   "DE.Views.Settings.textPortrait": "Verticale",
   "DE.Views.Settings.textPoweredBy": "Con tecnologia",
   "DE.Views.Settings.textPrint": "Stampa",
@@ -409,9 +506,13 @@
   "DE.Views.Settings.textSpaces": "Spazi",
   "DE.Views.Settings.textSpellcheck": "Controllo ortografia",
   "DE.Views.Settings.textStatistic": "Statistica",
+  "DE.Views.Settings.textSubject": "Oggetto",
   "DE.Views.Settings.textSymbols": "Simboli",
   "DE.Views.Settings.textTel": "Tel.",
+  "DE.Views.Settings.textTitle": "Titolo documento",
   "DE.Views.Settings.textTop": "In alto",
+  "DE.Views.Settings.textUnitOfMeasurement": "Unità di misura",
+  "DE.Views.Settings.textUploaded": "Caricato",
   "DE.Views.Settings.textVersion": "Versione",
   "DE.Views.Settings.textWords": "Parole",
   "DE.Views.Settings.unknownText": "Sconosciuto",

apps/documenteditor/mobile/locale/ko.json

@@ -14,8 +14,6 @@
   "DE.Controllers.AddTable.textColumns": "열",
   "DE.Controllers.AddTable.textRows": "Rows",
   "DE.Controllers.AddTable.textTableSize": "표 크기",
-  "DE.Controllers.DocumentHolder.menuAccept": "수락",
-  "DE.Controllers.DocumentHolder.menuAcceptAll": "모두 수락",
   "DE.Controllers.DocumentHolder.menuAddLink": "링크 추가",
   "DE.Controllers.DocumentHolder.menuCopy": "복사",
   "DE.Controllers.DocumentHolder.menuCut": "잘라 내기",
@@ -24,8 +22,6 @@
   "DE.Controllers.DocumentHolder.menuMore": "More",
   "DE.Controllers.DocumentHolder.menuOpenLink": "링크 열기",
   "DE.Controllers.DocumentHolder.menuPaste": "붙여 넣기",
-  "DE.Controllers.DocumentHolder.menuReject": "거부",
-  "DE.Controllers.DocumentHolder.menuRejectAll": "모두 거부",
   "DE.Controllers.DocumentHolder.menuReview": "다시보기",
   "DE.Controllers.DocumentHolder.sheetCancel": "취소",
   "DE.Controllers.DocumentHolder.textGuest": "Guest",
@@ -54,7 +50,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "전환 시간 초과를 초과했습니다.",
   "DE.Controllers.Main.criticalErrorExtText": "문서 목록으로 돌아가려면 '확인'을 누르십시오.",
   "DE.Controllers.Main.criticalErrorTitle": "오류",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE 문서 편집기",
   "DE.Controllers.Main.downloadErrorText": "다운로드하지 못했습니다.",
   "DE.Controllers.Main.downloadMergeText": "다운로드 중 ...",
   "DE.Controllers.Main.downloadMergeTitle": "다운로드 중",
@@ -62,7 +57,7 @@
   "DE.Controllers.Main.downloadTitleText": "문서 다운로드 중",
   "DE.Controllers.Main.errorBadImageUrl": "이미지 URL이 잘못되었습니다.",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "서버 연결이 끊어졌습니다. 더 이상 편집 할 수 없습니다.",
-  "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오. <br> '확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다. <br > <br> Document Server 연결에 대한 추가 정보 찾기 <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\"> 여기 </a> ",
+  "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.<br>'확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.<br ><br>Document Server 연결에 대한 추가 정보 찾기 <a href=\"%1\" target=\"_blank\">여기</a> ",
   "DE.Controllers.Main.errorDatabaseConnection": "외부 오류입니다. <br> 데이터베이스 연결 오류입니다. 지원팀에 문의하십시오.",
   "DE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.",
   "DE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1",

apps/documenteditor/mobile/locale/lv.json

@@ -46,7 +46,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Konversijas taimauts pārsniegts.",
   "DE.Controllers.Main.criticalErrorExtText": "Nospiediet \"OK\", lai atgrieztos dokumentu sarakstā.",
   "DE.Controllers.Main.criticalErrorTitle": "Kļūda",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Dokumentu Redaktors",
   "DE.Controllers.Main.downloadErrorText": "Lejuplāde neizdevās.",
   "DE.Controllers.Main.downloadMergeText": "Lejupielādē...",
   "DE.Controllers.Main.downloadMergeTitle": "Lejupielāde",
@@ -54,7 +53,7 @@
   "DE.Controllers.Main.downloadTitleText": "Dokumenta lejupielāde",
   "DE.Controllers.Main.errorBadImageUrl": "Nav pareizs attēla URL",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Zudis servera savienojums. Jūs vairs nevarat rediģēt.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.<br>Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.<br><br>Uzziniet vairāk par dokumentu servera pieslēgšanu <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">šeit</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.<br>Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.<br><br>Uzziniet vairāk par dokumentu servera pieslēgšanu <a href=\"%1\" target=\"_blank\">šeit</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Ārējā kļūda.<br>Datubāzes piekļuves kļūda. Lūdzu, sazinieties ar atbalsta daļu.",
   "DE.Controllers.Main.errorDataRange": "Nepareizs datu diapazons",
   "DE.Controllers.Main.errorDefaultMessage": "Kļūdas kods: %1",

apps/documenteditor/mobile/locale/nl.json

@@ -14,8 +14,6 @@
   "DE.Controllers.AddTable.textColumns": "Kolommen",
   "DE.Controllers.AddTable.textRows": "Rijen",
   "DE.Controllers.AddTable.textTableSize": "Tabelgrootte",
-  "DE.Controllers.DocumentHolder.menuAccept": "Accepteren",
-  "DE.Controllers.DocumentHolder.menuAcceptAll": "Alles accepteren",
   "DE.Controllers.DocumentHolder.menuAddLink": "Koppeling toevoegen",
   "DE.Controllers.DocumentHolder.menuCopy": "Kopiëren",
   "DE.Controllers.DocumentHolder.menuCut": "Knippen",
@@ -24,8 +22,6 @@
   "DE.Controllers.DocumentHolder.menuMore": "Meer",
   "DE.Controllers.DocumentHolder.menuOpenLink": "Koppeling openen",
   "DE.Controllers.DocumentHolder.menuPaste": "Plakken",
-  "DE.Controllers.DocumentHolder.menuReject": "Afwijzen",
-  "DE.Controllers.DocumentHolder.menuRejectAll": "Alles afwijzen",
   "DE.Controllers.DocumentHolder.menuReview": "Beoordelen",
   "DE.Controllers.DocumentHolder.sheetCancel": "Annuleren",
   "DE.Controllers.DocumentHolder.textGuest": "Gast",
@@ -54,7 +50,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Time-out voor conversie overschreden.",
   "DE.Controllers.Main.criticalErrorExtText": "Druk op \"OK\" om terug te gaan naar de lijst met documenten.",
   "DE.Controllers.Main.criticalErrorTitle": "Fout",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE-documenteditor",
   "DE.Controllers.Main.downloadErrorText": "Download mislukt.",
   "DE.Controllers.Main.downloadMergeText": "Downloaden...",
   "DE.Controllers.Main.downloadMergeTitle": "Downloaden",
@@ -63,7 +58,7 @@
   "DE.Controllers.Main.errorAccessDeny": "U probeert een actie uit te voeren waarvoor u geen rechten hebt.<br>Neem contact op met de beheerder van de documentserver.",
   "DE.Controllers.Main.errorBadImageUrl": "URL afbeelding is onjuist",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbinding met server verbroken. U kunt niet doorgaan met bewerken.",
-  "DE.Controllers.Main.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.<br><br>Meer informatie over verbindingen met de documentserver is <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a> te vinden.",
+  "DE.Controllers.Main.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.<br><br>Meer informatie over verbindingen met de documentserver is <a href=\"%1\" target=\"_blank\">hier</a> te vinden.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externe fout.<br>Fout in databaseverbinding. Neem contact op met Support.",
   "DE.Controllers.Main.errorDataEncrypted": "Versleutelde wijzigingen zijn ontvangen, deze kunnen niet ontcijferd worden.",
   "DE.Controllers.Main.errorDataRange": "Onjuist gegevensbereik",

apps/documenteditor/mobile/locale/pl.json

@@ -3,6 +3,7 @@
   "Common.UI.ThemeColorPalette.textThemeColors": "Kolory motywu",
   "Common.Utils.Metric.txtCm": "cm",
   "Common.Utils.Metric.txtPt": "pt",
+  "Common.Views.Collaboration.textCollaboration": "Współpraca",
   "DE.Controllers.AddContainer.textImage": "Obraz",
   "DE.Controllers.AddContainer.textOther": "Inny",
   "DE.Controllers.AddContainer.textShape": "Kształt",
@@ -14,8 +15,6 @@
   "DE.Controllers.AddTable.textColumns": "Kolumny",
   "DE.Controllers.AddTable.textRows": "Wiersze",
   "DE.Controllers.AddTable.textTableSize": "Rozmiar tabeli",
-  "DE.Controllers.DocumentHolder.menuAccept": "Akceptuj",
-  "DE.Controllers.DocumentHolder.menuAcceptAll": "Akceptuj wszystko",
   "DE.Controllers.DocumentHolder.menuAddLink": "Dodaj link",
   "DE.Controllers.DocumentHolder.menuCopy": "Kopiuj",
   "DE.Controllers.DocumentHolder.menuCut": "Wytnij",
@@ -49,7 +48,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Przekroczono limit czasu konwersji.",
   "DE.Controllers.Main.criticalErrorExtText": "Naciśnij \"OK\" aby powrócić do listy dokumentów.",
   "DE.Controllers.Main.criticalErrorTitle": "Błąd",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Edytor dokumentów",
   "DE.Controllers.Main.downloadErrorText": "Pobieranie nieudane.",
   "DE.Controllers.Main.downloadMergeText": "Pobieranie...",
   "DE.Controllers.Main.downloadMergeTitle": "Pobieranie",
@@ -57,7 +55,7 @@
   "DE.Controllers.Main.downloadTitleText": "Pobieranie dokumentu",
   "DE.Controllers.Main.errorBadImageUrl": "Adres URL obrazu jest błędny",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Połączenie z serwerem zostało utracone. Nie możesz już edytować.",
-  "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.<br>Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.<br><br>Dowiedz się więcej o połączeniu serwera dokumentów <a href=\"https: //api.onlyoffice.com/editors/callback\" target=\"_blank\">tutaj</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.<br>Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.<br><br>Dowiedz się więcej o połączeniu serwera dokumentów <a href=\"%1\" target=\"_blank\">tutaj</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Zewnętrzny błąd.<br>Błąd połączenia z bazą danych. Proszę skontaktuj się z administratorem.",
   "DE.Controllers.Main.errorDataRange": "Błędny zakres danych.",
   "DE.Controllers.Main.errorDefaultMessage": "Kod błędu: %1",

apps/documenteditor/mobile/locale/pt.json

@@ -46,7 +46,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Tempo limite de conversão excedido.",
   "DE.Controllers.Main.criticalErrorExtText": "Pressione \"OK\" para voltar para a lista de documento.",
   "DE.Controllers.Main.criticalErrorTitle": "Erro",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Falha ao Baixar",
   "DE.Controllers.Main.downloadMergeText": "Baixando...",
   "DE.Controllers.Main.downloadMergeTitle": "Baixando",
@@ -54,7 +53,7 @@
   "DE.Controllers.Main.downloadTitleText": "Baixando Documento",
   "DE.Controllers.Main.errorBadImageUrl": "URL de imagem está incorreta",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Conexão ao servidor perdida. Você não pode mais editar.",
-  "DE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador. <br> Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento. <br> <br> Encontre mais informações sobre como conecta ao Document Server <a href = \"https: //api.onlyoffice.com/editors/callback \"target =\" _ blank \"> aqui </a>",
+  "DE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador.<br>Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento. <br><br>Encontre mais informações sobre como conecta ao Document Server <a href=\"%1\" target=\"_blank\">aqui</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Erro externo. <br> Erro de conexão do banco de dados. Entre em contato com o suporte.",
   "DE.Controllers.Main.errorDataRange": "Intervalo de dados incorreto.",
   "DE.Controllers.Main.errorDefaultMessage": "Código do Erro: %1",

apps/documenteditor/mobile/locale/ru.json

@@ -1,34 +1,111 @@
 {
+  "Common.Controllers.Collaboration.textAtLeast": "минимум",
+  "Common.Controllers.Collaboration.textAuto": "авто",
+  "Common.Controllers.Collaboration.textBaseline": "Базовая линия",
+  "Common.Controllers.Collaboration.textBold": "Жирный",
+  "Common.Controllers.Collaboration.textBreakBefore": "С новой страницы",
+  "Common.Controllers.Collaboration.textCaps": "Все прописные",
+  "Common.Controllers.Collaboration.textCenter": "Выравнивание по центру",
+  "Common.Controllers.Collaboration.textChart": "Диаграмма",
+  "Common.Controllers.Collaboration.textColor": "Цвет шрифта",
+  "Common.Controllers.Collaboration.textContextual": "Не добавлять интервал между абзацами одного стиля",
+  "Common.Controllers.Collaboration.textDeleted": "<b>Удалено:</b>",
+  "Common.Controllers.Collaboration.textDStrikeout": "Двойное зачеркивание",
+  "Common.Controllers.Collaboration.textEditUser": "Документ редактируется несколькими пользователями.",
+  "Common.Controllers.Collaboration.textEquation": "Уравнение",
+  "Common.Controllers.Collaboration.textExact": "точно",
+  "Common.Controllers.Collaboration.textFirstLine": "Первая строка",
+  "Common.Controllers.Collaboration.textFormatted": "Отформатировано",
+  "Common.Controllers.Collaboration.textHighlight": "Цвет выделения",
+  "Common.Controllers.Collaboration.textImage": "Изображение",
+  "Common.Controllers.Collaboration.textIndentLeft": "Отступ слева",
+  "Common.Controllers.Collaboration.textIndentRight": "Отступ справа",
+  "Common.Controllers.Collaboration.textInserted": "<b>Добавлено:</b>",
+  "Common.Controllers.Collaboration.textItalic": "Курсив",
+  "Common.Controllers.Collaboration.textJustify": "Выравнивание по ширине",
+  "Common.Controllers.Collaboration.textKeepLines": "Не разрывать абзац",
+  "Common.Controllers.Collaboration.textKeepNext": "Не отрывать от следующего",
+  "Common.Controllers.Collaboration.textLeft": "Выравнивание по левому краю",
+  "Common.Controllers.Collaboration.textLineSpacing": "Междустрочный интервал: ",
+  "Common.Controllers.Collaboration.textMultiple": "множитель",
+  "Common.Controllers.Collaboration.textNoBreakBefore": "Не с новой страницы",
+  "Common.Controllers.Collaboration.textNoContextual": "Добавлять интервал между абзацами одного стиля",
+  "Common.Controllers.Collaboration.textNoKeepLines": "Разрешить разрывать абзац",
+  "Common.Controllers.Collaboration.textNoKeepNext": "Разрешить отрывать от следующего",
+  "Common.Controllers.Collaboration.textNot": "Не",
+  "Common.Controllers.Collaboration.textNoWidow": "Без запрета висячих строк",
+  "Common.Controllers.Collaboration.textNum": "Изменение нумерации",
+  "Common.Controllers.Collaboration.textParaDeleted": "<b>Абзац удален</b> ",
+  "Common.Controllers.Collaboration.textParaFormatted": "<b>Абзац отформатирован</b>",
+  "Common.Controllers.Collaboration.textParaInserted": "<b>Абзац добавлен</b> ",
+  "Common.Controllers.Collaboration.textParaMoveFromDown": "<b>Перемещено вниз:</b>",
+  "Common.Controllers.Collaboration.textParaMoveFromUp": "<b>Перемещено вверх:</b>",
+  "Common.Controllers.Collaboration.textParaMoveTo": "<b>Перемещено:</b>",
+  "Common.Controllers.Collaboration.textPosition": "Положение",
+  "Common.Controllers.Collaboration.textRight": "Выравнивание по правому краю",
+  "Common.Controllers.Collaboration.textShape": "Фигура",
+  "Common.Controllers.Collaboration.textShd": "Цвет фона",
+  "Common.Controllers.Collaboration.textSmallCaps": "Малые прописные",
+  "Common.Controllers.Collaboration.textSpacing": "Интервал",
+  "Common.Controllers.Collaboration.textSpacingAfter": "Интервал после абзаца",
+  "Common.Controllers.Collaboration.textSpacingBefore": "Интервал перед абзацем",
+  "Common.Controllers.Collaboration.textStrikeout": "Зачеркнутый",
+  "Common.Controllers.Collaboration.textSubScript": "Подстрочный",
+  "Common.Controllers.Collaboration.textSuperScript": "Надстрочный",
+  "Common.Controllers.Collaboration.textTableChanged": "<b>Изменены настройки таблицы</b>",
+  "Common.Controllers.Collaboration.textTableRowsAdd": "<b>Добавлены строки таблицы</b>",
+  "Common.Controllers.Collaboration.textTableRowsDel": "<b>Удалены строки таблицы</b>",
+  "Common.Controllers.Collaboration.textTabs": "Изменение табуляции",
+  "Common.Controllers.Collaboration.textUnderline": "Подчёркнутый",
+  "Common.Controllers.Collaboration.textWidow": "Запрет висячих строк",
   "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета",
   "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы",
   "Common.Utils.Metric.txtCm": "см",
   "Common.Utils.Metric.txtPt": "пт",
+  "Common.Views.Collaboration.textAcceptAllChanges": "Принять все изменения",
+  "Common.Views.Collaboration.textBack": "Назад",
+  "Common.Views.Collaboration.textChange": "Просмотр изменений",
+  "Common.Views.Collaboration.textCollaboration": "Совместная работа",
+  "Common.Views.Collaboration.textDisplayMode": "Отображение",
+  "Common.Views.Collaboration.textEditUsers": "Пользователи",
+  "Common.Views.Collaboration.textFinal": "Измененный документ",
+  "Common.Views.Collaboration.textMarkup": "Изменения",
+  "Common.Views.Collaboration.textOriginal": "Исходный документ",
+  "Common.Views.Collaboration.textRejectAllChanges": "Отклонить все изменения",
+  "Common.Views.Collaboration.textReview": "Отслеживание изменений",
+  "Common.Views.Collaboration.textReviewing": "Рецензирование",
+  "Common.Views.Collaboration.textСomments": "Комментарии",
   "DE.Controllers.AddContainer.textImage": "Изображение",
   "DE.Controllers.AddContainer.textOther": "Другое",
   "DE.Controllers.AddContainer.textShape": "Фигура",
   "DE.Controllers.AddContainer.textTable": "Таблица",
   "DE.Controllers.AddImage.textEmptyImgUrl": "Необходимо указать URL изображения.",
   "DE.Controllers.AddImage.txtNotUrl": "Это поле должно быть URL-адресом в формате 'http://www.example.com'",
+  "DE.Controllers.AddOther.textBelowText": "Под текстом",
+  "DE.Controllers.AddOther.textBottomOfPage": "Внизу страницы",
   "DE.Controllers.AddOther.txtNotUrl": "Это поле должно быть URL-адресом в формате 'http://www.example.com'",
   "DE.Controllers.AddTable.textCancel": "Отмена",
   "DE.Controllers.AddTable.textColumns": "Столбцы",
   "DE.Controllers.AddTable.textRows": "Строки",
   "DE.Controllers.AddTable.textTableSize": "Размер таблицы",
-  "DE.Controllers.DocumentHolder.menuAccept": "Принять",
-  "DE.Controllers.DocumentHolder.menuAcceptAll": "Принять все",
   "DE.Controllers.DocumentHolder.menuAddLink": "Добавить ссылку",
   "DE.Controllers.DocumentHolder.menuCopy": "Копировать",
   "DE.Controllers.DocumentHolder.menuCut": "Вырезать",
   "DE.Controllers.DocumentHolder.menuDelete": "Удалить",
+  "DE.Controllers.DocumentHolder.menuDeleteTable": "Удалить таблицу",
   "DE.Controllers.DocumentHolder.menuEdit": "Редактировать",
+  "DE.Controllers.DocumentHolder.menuMerge": "Объединить ячейки",
   "DE.Controllers.DocumentHolder.menuMore": "Ещё",
   "DE.Controllers.DocumentHolder.menuOpenLink": "Перейти",
   "DE.Controllers.DocumentHolder.menuPaste": "Вставить",
-  "DE.Controllers.DocumentHolder.menuReject": "Отклонить",
-  "DE.Controllers.DocumentHolder.menuRejectAll": "Отклонить все",
   "DE.Controllers.DocumentHolder.menuReview": "Рецензирование",
+  "DE.Controllers.DocumentHolder.menuReviewChange": "Просмотр изменений",
+  "DE.Controllers.DocumentHolder.menuSplit": "Разделить ячейку",
   "DE.Controllers.DocumentHolder.sheetCancel": "Отмена",
+  "DE.Controllers.DocumentHolder.textCancel": "Отмена",
+  "DE.Controllers.DocumentHolder.textColumns": "Колонки",
   "DE.Controllers.DocumentHolder.textGuest": "Гость",
+  "DE.Controllers.DocumentHolder.textRows": "Строки",
   "DE.Controllers.EditContainer.textChart": "Диаграмма",
   "DE.Controllers.EditContainer.textFooter": "Колонтитул",
   "DE.Controllers.EditContainer.textHeader": "Колонтитул",
@@ -54,7 +131,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Превышено время ожидания конвертации.",
   "DE.Controllers.Main.criticalErrorExtText": "Нажмите 'OK' для возврата к списку документов.",
   "DE.Controllers.Main.criticalErrorTitle": "Ошибка",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Загрузка не удалась.",
   "DE.Controllers.Main.downloadMergeText": "Загрузка...",
   "DE.Controllers.Main.downloadMergeTitle": "Загрузка",
@@ -63,7 +139,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.Controllers.Main.errorBadImageUrl": "Неправильный URL-адрес изображения",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Подключение к серверу прервано. Редактирование недоступно.",
-  "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.<br><br>Дополнительную информацию о подключении Сервера документов можно найти <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">здесь</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.<br><br>Дополнительную информацию о подключении Сервера документов можно найти <a href=\"%1\" target=\"_blank\">здесь</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Пожалуйста, обратитесь в службу технической поддержки.",
   "DE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.",
   "DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
@@ -120,7 +196,7 @@
   "DE.Controllers.Main.textCustomLoader": "Обратите внимание, что по условиям лицензии у вас нет прав изменять экран, отображаемый при загрузке.<br>Пожалуйста, обратитесь в наш отдел продаж, чтобы сделать запрос.",
   "DE.Controllers.Main.textDone": "Готово",
   "DE.Controllers.Main.textLoadingDocument": "Загрузка документа",
-  "DE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений ONLYOFFICE",
+  "DE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений %1",
   "DE.Controllers.Main.textOK": "OK",
   "DE.Controllers.Main.textPaidFeature": "Платная функция",
   "DE.Controllers.Main.textPassword": "Пароль",
@@ -167,8 +243,8 @@
   "DE.Controllers.Main.warnLicenseExceeded": "Превышено допустимое число одновременных подключений к серверу документов, и документ откроется только на просмотр.<br>Обратитесь к администратору за дополнительной информацией.",
   "DE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.<br>Обновите лицензию, а затем обновите страницу.",
   "DE.Controllers.Main.warnLicenseUsersExceeded": "Превышено допустимое число одновременно работающих пользователей, и документ откроется только на просмотр.<br>Обратитесь к администратору за дополнительной информацией.",
-  "DE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
+  "DE.Controllers.Main.warnNoLicense": "Эта версия редакторов %1 имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
-  "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
+  "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов %1 имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
   "DE.Controllers.Search.textNoTextFound": "Текст не найден",
   "DE.Controllers.Search.textReplaceAll": "Заменить все",
@@ -196,10 +272,14 @@
   "DE.Views.AddOther.textCurrentPos": "Текущая позиция",
   "DE.Views.AddOther.textDisplay": "Отобразить",
   "DE.Views.AddOther.textEvenPage": "С четной страницы",
+  "DE.Views.AddOther.textFootnote": "Сноска",
+  "DE.Views.AddOther.textFormat": "Формат",
   "DE.Views.AddOther.textInsert": "Вставить",
+  "DE.Views.AddOther.textInsertFootnote": "Вставить сноску",
   "DE.Views.AddOther.textLeftBottom": "Слева снизу",
   "DE.Views.AddOther.textLeftTop": "Слева сверху",
   "DE.Views.AddOther.textLink": "Ссылка",
+  "DE.Views.AddOther.textLocation": "Положение",
   "DE.Views.AddOther.textNextPage": "Со следующей страницы",
   "DE.Views.AddOther.textOddPage": "С нечетной страницы",
   "DE.Views.AddOther.textPageBreak": "Разрыв страницы",
@@ -208,6 +288,7 @@
   "DE.Views.AddOther.textRightBottom": "Снизу справа",
   "DE.Views.AddOther.textRightTop": "Справа сверху",
   "DE.Views.AddOther.textSectionBreak": "Разрыв раздела",
+  "DE.Views.AddOther.textStartFrom": "Начать с",
   "DE.Views.AddOther.textTip": "Подсказка",
   "DE.Views.EditChart.textAlign": "Выравнивание",
   "DE.Views.EditChart.textBack": "Назад",
@@ -373,9 +454,12 @@
   "DE.Views.Search.textSearch": "Найти",
   "DE.Views.Settings.textAbout": "О программе",
   "DE.Views.Settings.textAddress": "адрес",
+  "DE.Views.Settings.textAdvancedSettings": "Настройки приложения",
   "DE.Views.Settings.textAuthor": "Автор",
   "DE.Views.Settings.textBack": "Назад",
   "DE.Views.Settings.textBottom": "Нижнее",
+  "DE.Views.Settings.textCentimeter": "Сантиметр",
+  "DE.Views.Settings.textColorSchemes": "Цветовые схемы",
   "DE.Views.Settings.textCreateDate": "Дата создания",
   "DE.Views.Settings.textCustom": "Особый",
   "DE.Views.Settings.textCustomSize": "Особый размер",
@@ -392,13 +476,17 @@
   "DE.Views.Settings.textFindAndReplace": "Поиск и замена",
   "DE.Views.Settings.textFormat": "Формат",
   "DE.Views.Settings.textHelp": "Справка",
+  "DE.Views.Settings.textHiddenTableBorders": "Скрытые границы таблиц",
+  "DE.Views.Settings.textInch": "Дюйм",
   "DE.Views.Settings.textLandscape": "Альбомная",
   "DE.Views.Settings.textLeft": "Левое",
   "DE.Views.Settings.textLoading": "Загрузка...",
   "DE.Views.Settings.textMargins": "Поля",
+  "DE.Views.Settings.textNoCharacters": "Непечатаемые символы",
   "DE.Views.Settings.textOrientation": "Ориентация страницы",
   "DE.Views.Settings.textPages": "Страницы",
   "DE.Views.Settings.textParagraphs": "Абзацы",
+  "DE.Views.Settings.textPoint": "Пункт",
   "DE.Views.Settings.textPortrait": "Книжная",
   "DE.Views.Settings.textPoweredBy": "Разработано",
   "DE.Views.Settings.textPrint": "Печать",
@@ -412,8 +500,10 @@
   "DE.Views.Settings.textSymbols": "Символы",
   "DE.Views.Settings.textTel": "Телефон",
   "DE.Views.Settings.textTop": "Верхнее",
+  "DE.Views.Settings.textUnitOfMeasurement": "Единица измерения",
   "DE.Views.Settings.textVersion": "Версия",
   "DE.Views.Settings.textWords": "Слова",
   "DE.Views.Settings.unknownText": "Неизвестно",
+  "DE.Views.Settings.textCollaboration": "Совместная работа",
   "DE.Views.Toolbar.textBack": "Назад"
 }

apps/documenteditor/mobile/locale/sk.json

@@ -47,7 +47,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Prekročený čas konverzie.",
   "DE.Controllers.Main.criticalErrorExtText": "Stlačením tlačidla 'OK' sa vrátite do zoznamu dokumentov.",
   "DE.Controllers.Main.criticalErrorTitle": "Chyba",
-  "DE.Controllers.Main.defaultTitleText": "Dokumentový editor ONLYOFFICE ",
   "DE.Controllers.Main.downloadErrorText": "Sťahovanie zlyhalo.",
   "DE.Controllers.Main.downloadMergeText": "Sťahovanie...",
   "DE.Controllers.Main.downloadMergeTitle": "Sťahovanie",
@@ -55,7 +54,7 @@
   "DE.Controllers.Main.downloadTitleText": "Sťahovanie dokumentu",
   "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávna",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Spojenie so serverom sa stratilo. Už nemôžete upravovať.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.<br>Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.<br><br>Viac informácií o pripojení dokumentového servera nájdete <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">tu</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.<br>Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.<br><br>Viac informácií o pripojení dokumentového servera nájdete <a href=\"%1\" target=\"_blank\">tu</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Externá chyba.<br>Chyba spojenia databázy. Obráťte sa prosím na podporu.",
   "DE.Controllers.Main.errorDataRange": "Nesprávny rozsah údajov.",
   "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1",

apps/documenteditor/mobile/locale/tr.json

@@ -46,7 +46,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Değişim süresi aşıldı.",
   "DE.Controllers.Main.criticalErrorExtText": "Belge listesine dönmek için 'TAMAM' tuşuna tıklayın.",
   "DE.Controllers.Main.criticalErrorTitle": "Hata",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Belge Editörü",
   "DE.Controllers.Main.downloadErrorText": "İndirme başarısız oldu.",
   "DE.Controllers.Main.downloadMergeText": "İndiriliyor...",
   "DE.Controllers.Main.downloadMergeTitle": "İndiriliyor",
@@ -54,7 +53,7 @@
   "DE.Controllers.Main.downloadTitleText": "Belge indiriliyor",
   "DE.Controllers.Main.errorBadImageUrl": "Resim URL'si yanlış",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Sunucu bağlantısı kayboldu. Artık düzenleyemezsiniz.",
-  "DE.Controllers.Main.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.<br><br>Belge Sunucusuna bağlanma konusunda daha fazla bilgi için <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">buraya</a> tıklayın",
+  "DE.Controllers.Main.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.<br><br>Belge Sunucusuna bağlanma konusunda daha fazla bilgi için <a href=\"%1\" target=\"_blank\">buraya</a> tıklayın",
   "DE.Controllers.Main.errorDatabaseConnection": "Dışsal hata.<br>Veritabanı bağlantı hatası. Lütfen destek ile iletişime geçin.",
   "DE.Controllers.Main.errorDataRange": "Yanlış veri aralığı.",
   "DE.Controllers.Main.errorDefaultMessage": "Hata kodu: %1",

apps/documenteditor/mobile/locale/uk.json

@@ -46,7 +46,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Термін переходу перевищено.",
   "DE.Controllers.Main.criticalErrorExtText": "Натисніть \"ОК\", щоб повернутися до списку документів.",
   "DE.Controllers.Main.criticalErrorTitle": "Помилка",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Завантаження не вдалося",
   "DE.Controllers.Main.downloadMergeText": "Завантаження...",
   "DE.Controllers.Main.downloadMergeTitle": "Завантаження",
@@ -54,7 +53,7 @@
   "DE.Controllers.Main.downloadTitleText": "Завантаження документу",
   "DE.Controllers.Main.errorBadImageUrl": "URL-адреса зображення невірна",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "З'єднання з сервером втрачено. Ви більше не можете редагувати.",
-  "DE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора. <br> Після натискання кнопки «ОК» вам буде запропоновано завантажити документ. <br> <br> Більше інформації про підключення сервера документів <a href = \"https: //api.onlyoffice.com/editors/callback \"target =\" _ blank \"> тут </ a>",
+  "DE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора.<br>Після натискання кнопки «ОК» вам буде запропоновано завантажити документ. <br><br>Більше інформації про підключення сервера документів <a href=\"%1\" target=\"_blank\">тут</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Зовнішня помилка. <br> Помилка підключення до бази даних. Будь ласка, зв'яжіться зі службою підтримки.",
   "DE.Controllers.Main.errorDataRange": "Неправильний діапазон даних.",
   "DE.Controllers.Main.errorDefaultMessage": "Код помилки: %1 ",

apps/documenteditor/mobile/locale/vi.json

@@ -46,7 +46,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "Đã quá thời gian chờ chuyển đổi.",
   "DE.Controllers.Main.criticalErrorExtText": "Ấn 'OK' để trở lại danh sách tài liệu.",
   "DE.Controllers.Main.criticalErrorTitle": "Lỗi",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
   "DE.Controllers.Main.downloadErrorText": "Tải về không thành công.",
   "DE.Controllers.Main.downloadMergeText": "Đang tải...",
   "DE.Controllers.Main.downloadMergeTitle": "Đang tải về",
@@ -54,7 +53,7 @@
   "DE.Controllers.Main.downloadTitleText": "Đang tải tài liệu...",
   "DE.Controllers.Main.errorBadImageUrl": "URL hình ảnh không chính xác",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Kết nối máy chủ bị mất. Bạn không thể chỉnh sửa nữa.",
-  "DE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.<br>Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.<br><br>Tìm thêm thông tin về kết nối Server Tài liệu <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">ở đây</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.<br>Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.<br><br>Tìm thêm thông tin về kết nối Server Tài liệu <a href=\"%1\" target=\"_blank\">ở đây</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Lỗi bên ngoài.<br>Lỗi kết nối cơ sở dữ liệu. Vui lòng liên hệ bộ phận hỗ trợ.",
   "DE.Controllers.Main.errorDataRange": "Phạm vi dữ liệu không chính xác.",
   "DE.Controllers.Main.errorDefaultMessage": "Mã lỗi: %1",

apps/documenteditor/mobile/locale/zh.json

@@ -14,8 +14,6 @@
   "DE.Controllers.AddTable.textColumns": "列",
   "DE.Controllers.AddTable.textRows": "行",
   "DE.Controllers.AddTable.textTableSize": "表格大小",
-  "DE.Controllers.DocumentHolder.menuAccept": "接受",
-  "DE.Controllers.DocumentHolder.menuAcceptAll": "接受全部",
   "DE.Controllers.DocumentHolder.menuAddLink": "增加链接",
   "DE.Controllers.DocumentHolder.menuCopy": "复制",
   "DE.Controllers.DocumentHolder.menuCut": "剪切",
@@ -24,8 +22,6 @@
   "DE.Controllers.DocumentHolder.menuMore": "更多",
   "DE.Controllers.DocumentHolder.menuOpenLink": "打开链接",
   "DE.Controllers.DocumentHolder.menuPaste": "粘贴",
-  "DE.Controllers.DocumentHolder.menuReject": "拒绝",
-  "DE.Controllers.DocumentHolder.menuRejectAll": "拒绝全部",
   "DE.Controllers.DocumentHolder.menuReview": "检查",
   "DE.Controllers.DocumentHolder.sheetCancel": "取消",
   "DE.Controllers.DocumentHolder.textGuest": "游客",
@@ -54,7 +50,6 @@
   "DE.Controllers.Main.convertationTimeoutText": "转换超时",
   "DE.Controllers.Main.criticalErrorExtText": "按“确定”返回文件列表",
   "DE.Controllers.Main.criticalErrorTitle": "错误:",
-  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE文档编辑器",
   "DE.Controllers.Main.downloadErrorText": "下载失败",
   "DE.Controllers.Main.downloadMergeText": "下载中…",
   "DE.Controllers.Main.downloadMergeTitle": "下载中",
@@ -63,7 +58,7 @@
   "DE.Controllers.Main.errorAccessDeny": "您正在尝试执行您没有权限的操作。<br>请联系您的文档服务器管理员.",
   "DE.Controllers.Main.errorBadImageUrl": "图片地址不正确",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "服务器连接丢失。您无法再进行编辑。",
-  "DE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。<br>当你点击“OK”按钮,系统将提示您下载文档。<br><br>找到更多信息连接文件服务器<a href=\"https://api.onlyoffice.com/editors/callback\" target=\"平等\">在这里</>",
+  "DE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。<br>当你点击“OK”按钮,系统将提示您下载文档。<br><br>找到更多信息连接文件服务器<a href=\"%1\" target=\"平等\">在这里</>",
   "DE.Controllers.Main.errorDatabaseConnection": "外部错误。<br>数据库连接错误。请联系客服支持。",
   "DE.Controllers.Main.errorDataEncrypted": "加密更改已收到，无法对其解密。",
   "DE.Controllers.Main.errorDataRange": "数据范围不正确",

apps/documenteditor/mobile/resources/css/app-ios.css

@@ -6338,6 +6338,93 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
 .container-collaboration .page-content .list-block:first-child {
   margin-top: -1px;
 }
+#user-list .item-content {
+  padding-left: 0;
+}
+#user-list .item-inner {
+  justify-content: flex-start;
+  padding-left: 15px;
+}
+#user-list .length {
+  margin-left: 4px;
+}
+#user-list .color {
+  min-width: 40px;
+  min-height: 40px;
+  margin-right: 20px;
+  text-align: center;
+  border-radius: 50px;
+  line-height: 40px;
+  color: #373737;
+  font-weight: 500;
+}
+#user-list ul:before {
+  content: none;
+}
+.page-comments .list-block .item-inner {
+  display: block;
+  padding: 16px 0;
+  word-wrap: break-word;
+}
+.page-comments p {
+  margin: 0;
+}
+.page-comments .user-name {
+  font-size: 17px;
+  line-height: 22px;
+  color: #000000;
+  margin: 0;
+  font-weight: bold;
+}
+.page-comments .comment-date,
+.page-comments .reply-date {
+  font-size: 12px;
+  line-height: 18px;
+  color: #6d6d72;
+  margin: 0;
+  margin-top: 0px;
+}
+.page-comments .comment-text,
+.page-comments .reply-text {
+  color: #000000;
+  font-size: 15px;
+  line-height: 25px;
+  margin: 0;
+  max-width: 100%;
+  padding-right: 15px;
+}
+.page-comments .reply-item {
+  margin-top: 15px;
+}
+.page-comments .reply-item .user-name {
+  padding-top: 16px;
+}
+.page-comments .reply-item:before {
+  content: '';
+  position: absolute;
+  left: auto;
+  bottom: 0;
+  right: auto;
+  top: 0;
+  height: 1px;
+  width: 100%;
+  background-color: #c8c7cc;
+  display: block;
+  z-index: 15;
+  -webkit-transform-origin: 50% 100%;
+  transform-origin: 50% 100%;
+}
+.page-comments .comment-quote {
+  color: #446995;
+  border-left: 1px solid #446995;
+  padding-left: 10px;
+  margin: 5px 0;
+  font-size: 15px;
+}
+.settings.popup .list-block ul.list-reply:last-child:after,
+.settings.popover .list-block ul.list-reply:last-child:after {
+  display: none;
+}
 .tablet .searchbar.document.replace .center .searchbar:first-child {
   margin-right: 10px;
 }
@@ -6785,9 +6872,9 @@ i.icon.icon-format-dotx {
   background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2233%22%20height%3D%2233%22%20viewBox%3D%220%200%2033%2033%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D.cls-2%7Bfill%3A%23fff%3B%7D.cls-3%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%3E%3Crect%20id%3D%22Rectangle_20%22%20data-name%3D%22Rectangle%2020%22%20width%3D%2233%22%20height%3D%2233%22%20fill%3D%22none%22%2F%3E%3Cpath%20id%3D%22Path_38%22%20data-name%3D%22Path%2038%22%20d%3D%22M12.223%2C119.714c1.251-.066%2C2.5-.115%2C3.752-.177.875%2C4.123%2C1.771%2C8.239%2C2.718%2C12.343.744-4.239%2C1.567-8.464%2C2.363-12.7%2C1.317-.042%2C2.633-.109%2C3.944-.183-1.488%2C5.917-2.792%2C11.886-4.417%2C17.767-1.1.531-2.745-.026-4.049.06-.876-4.042-1.9-8.061-2.679-12.123-.77%2C3.945-1.771%2C7.854-2.653%2C11.775-1.264-.06-2.535-.134-3.805-.213C6.3%2C130.892%2C5.02%2C125.553%2C4%2C120.167c1.125-.049%2C2.258-.093%2C3.384-.129.678%2C3.889%2C1.448%2C7.762%2C2.041%2C11.659C10.353%2C127.7%2C11.3%2C123.708%2C12.223%2C119.714Z%22%20transform%3D%22translate(-2%20-117)%22%20class%3D%22cls-1%22%2F%3E%3Cg%20id%3D%22Group_5%22%20data-name%3D%22Group%205%22%20transform%3D%22translate(16%2016)%22%3E%3Cpath%20id%3D%22Path_44%22%20data-name%3D%22Path%2044%22%20d%3D%22M1.011%2C0H13.989A1.011%2C1.011%2C0%2C0%2C1%2C15%2C1.011V13.989A1.011%2C1.011%2C0%2C0%2C1%2C13.989%2C15H1.011A1.011%2C1.011%2C0%2C0%2C1%2C0%2C13.989V1.011A1.011%2C1.011%2C0%2C0%2C1%2C1.011%2C0Z%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_39%22%20data-name%3D%22Path%2039%22%20d%3D%22M5.794%2C13.25V3.911H9.258V2.25h-9V3.911H3.729V13.25Z%22%20transform%3D%22translate(2.742%20-0.25)%22%20class%3D%22cls-2%22%2F%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E");
 }
 i.icon.icon-format-txt {
-  width: 30px;
+  width: 24px;
-  height: 30px;
+  height: 24px;
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-14.47%20-14.5%2058%2058%22%20height%3D%2258px%22%20width%3D%2258px%22%20y%3D%220px%22%20x%3D%220px%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2228%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2224%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2220%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2216%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2212%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%228%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%224%22%20%2F%3E%3Crect%20class%3D%22cls-1%22%20height%3D%221%22%20width%3D%2229.063%22%20%2F%3E%3C%2Fsvg%3E");
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M22%2017H2V18H22V17Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2020H2V21H22V20Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2014H2V15H22V14Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2011H2V12H22V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%208H2V9H22V8Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%205H2V6H22V5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%202H2V3H22V2Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
 }
 i.icon.icon-format-pdf {
   width: 30px;
@@ -6814,6 +6901,11 @@ i.icon.icon-format-html {
   height: 30px;
   background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2262px%22%20height%3D%2262px%22%20viewBox%3D%220%200%2062%2062%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M24.993%2C38.689L11.34%2C32.753v-3.288l13.653-5.91v3.872l-9.523%2C3.641l9.523%2C3.777V38.689z%22%20%2F%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M27.09%2C41.298l4.931-20.596h2.867l-4.986%2C20.596H27.09z%22%20%2F%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M36.986%2C38.703v-3.845l9.536-3.75L36.986%2C27.4v-3.817l13.666%2C5.91v3.261L36.986%2C38.703z%22%20%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
 }
+i.icon.icon-format-rtf {
+  width: 24px;
+  height: 24px;
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Crect%20x%3D%222%22%20y%3D%222%22%20width%3D%227%22%20height%3D%227%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2011H2V12H22V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2014H2V15H22V14Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2017H2V18H22V17Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2020H2V21H22V20Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%202H11V3H22V2Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%205H11V6H22V5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%208H11V9H22V8Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
+}
 i.icon.icon-collaboration {
   width: 24px;
   height: 24px;
@@ -6862,17 +6954,17 @@ i.icon.icon-footnote {
 i.icon.icon-cut {
   width: 24px;
   height: 24px;
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20d%3D%22M19.4406%2016.7116C17.8368%2016.7116%2016.4336%2017.76%2015.9825%2019.2576L13.1259%2013.5167L19.4907%200.737143C19.5909%200.487542%2019.4907%200.18802%2019.2902%200.0881796C19.0396%20-0.011661%2018.7389%200.0881795%2018.6387%200.287861L12.5245%2012.3686L6.51049%200.287861C6.41026%200.0382593%206.10956%20-0.0615813%205.85898%200.0382593C5.6084%200.1381%205.50816%200.437622%205.6084%200.687223L11.9732%2013.4668L9.06644%2019.2576C8.61539%2017.8099%207.21213%2016.7116%205.6084%2016.7116C3.60373%2016.7116%202%2018.3091%202%2020.3059C2%2022.3027%203.60373%2023.9002%205.6084%2023.9002C6.91143%2023.9002%208.06411%2023.2013%208.71562%2022.153C8.71562%2022.153%208.71562%2022.1529%208.71562%2022.103C8.81586%2021.9533%208.86597%2021.8035%208.91609%2021.6537L12.5245%2014.615L16.0828%2021.7037C16.1329%2021.8534%2016.2331%2022.0032%2016.2832%2022.153V22.2029C16.2832%2022.2029%2016.2832%2022.2029%2016.2832%2022.2528C16.9347%2023.3011%2018.0874%2024%2019.3905%2024C21.3951%2024%2022.9989%2022.4026%2022.9989%2020.4057C23.049%2018.359%2021.4452%2016.7116%2019.4406%2016.7116ZM5.6084%2022.9517C4.15501%2022.9517%203.00233%2021.8035%203.00233%2020.3558C3.00233%2018.9081%204.15501%2017.76%205.6084%2017.76C7.06178%2017.76%208.21446%2018.9081%208.21446%2020.3558C8.21446%2020.7053%208.16434%2021.0547%208.01399%2021.3542L7.91376%2021.5539C7.51283%2022.3526%206.66084%2022.9517%205.6084%2022.9517ZM19.4406%2022.9517C18.4382%2022.9517%2017.5361%2022.3526%2017.1352%2021.504L17.035%2021.3043C16.9347%2021.0048%2016.8345%2020.6553%2016.8345%2020.3059C16.8345%2018.8582%2017.9872%2017.71%2019.4406%2017.71C20.894%2017.71%2022.0466%2018.8582%2022.0466%2020.3059C22.0466%2021.7536%2020.894%2022.9517%2019.4406%2022.9517Z%22%20fill%3D%22white%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22white%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E");
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3.22427%2022.2702C4.51527%2023.1269%206.52738%2022.7183%207.6592%2021.0127C8.79101%2019.3071%208.38572%2017.2943%207.09472%2016.4376C5.80372%2015.5809%203.79161%2015.9896%202.65979%2017.6952C1.52798%2019.4008%201.93328%2021.4136%203.22427%2022.2702ZM2.67135%2023.1035C4.51208%2024.325%207.11827%2023.6364%208.49243%2021.5656C9.8666%2019.4948%209.48837%2016.8259%207.64764%2015.6044C5.80691%2014.3829%203.20072%2015.0714%201.82656%2017.1422C0.452398%2019.2131%200.830625%2021.882%202.67135%2023.1035Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.9158%2022.2702C19.6248%2023.1269%2017.6127%2022.7183%2016.4809%2021.0127C15.349%2019.3071%2015.7543%2017.2943%2017.0453%2016.4376C18.3363%2015.5809%2020.3484%2015.9896%2021.4803%2017.6952C22.6121%2019.4008%2022.2068%2021.4136%2020.9158%2022.2702ZM21.4687%2023.1035C19.628%2024.325%2017.0218%2023.6364%2015.6476%2021.5656C14.2735%2019.4948%2014.6517%2016.8259%2016.4924%2015.6044C18.3331%2014.3829%2020.9393%2015.0714%2022.3135%2017.1422C23.6877%2019.2131%2023.3094%2021.882%2021.4687%2023.1035Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20d%3D%22M16.4924%2015.6044L13.9037%2012.4737L19.9552%200.675715C20.0693%200.446914%2019.9552%200.172352%2019.727%200.0808313C19.4416%20-0.0106892%2019.0993%200.0808312%2018.9851%200.263872L12.0233%2011.4212L5.17562%200.263872C5.06149%200.035071%204.71911%20-0.0564496%204.43379%200.035071C4.14847%200.126592%204.03434%200.401153%204.14847%200.629955L10.2001%2012.4279L7.64761%2015.6044L9.2292%2018L12.0233%2013.4804L14.9108%2018L16.4924%2015.6044Z%22%20fill%3D%22white%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22white%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E");
 }
 i.icon.icon-copy {
   width: 24px;
   height: 24px;
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%203.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%207.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%2011.5H9%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M9%2014.5H0.5V0.5H14.5V9H9.5H9V9.5V14.5ZM15%2010V9.5H23.5V23.5H9.5V15.5H10V15V14.5V10H15Z%22%20stroke%3D%22white%22%2F%3E%3C%2Fsvg%3E");
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M1%201H15V7H16V0H0V17H8V16H1V1Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M23%208H9V23H23V8ZM8%207V24H24V7H8Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M13%205H3V4H13V5Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%209H3V8H8V9Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%2013H3V12H8V13Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H11V11H21V12Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H11V15H21V16Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H11V19H21V20Z%22%20fill%3D%22white%22%2F%3E%3C%2Fsvg%3E");
 }
 i.icon.icon-paste {
   width: 24px;
   height: 24px;
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M13%202.5H4%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%202.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%201.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%203.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%204.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%200.5L5%200.500001%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M9.5%209H9V9.5V19H10V10H23.5V23.5H9.5V20V19.5H9H0.5V2.5H18.5V9H9.5Z%22%20stroke%3D%22white%22%2F%3E%3C%2Fsvg%3E");
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%202H0V20H9V24H24V7H19V2H14V3H18V7H9V19H1V3H5V2ZM10%208H23V23H10V8Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20d%3D%22M5%200H14V5H5V0Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H12V11H21V12Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H12V15H21V16Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H12V19H21V20Z%22%20fill%3D%22white%22%2F%3E%3C%2Fsvg%3E");
 }
 .label-switch input[type="checkbox"]:checked + .checkbox {
   background: #446995;
@@ -6989,29 +7081,7 @@ html.pixel-ratio-3 .numbers li {
   max-height: 100%;
   overflow: auto;
 }
-#user-list .item-content {
+
-  padding-left: 0;
-}
-#user-list .item-inner {
-  justify-content: flex-start;
-  padding-left: 15px;
-}
-#user-list .length {
-  margin-left: 4px;
-}
-#user-list .color {
-  min-width: 40px;
-  min-height: 40px;
-  margin-right: 20px;
-  text-align: center;
-  border-radius: 50px;
-  line-height: 40px;
-  color: #373737;
-  font-weight: 500;
-}
-#user-list ul:before {
-  content: none;
-}
 .doc-placeholder {
   background: #fbfbfb;
   width: 100%;
@@ -7032,4 +7102,4 @@ html.pixel-ratio-3 .numbers li {
   -moz-animation: flickerAnimation 2s infinite ease-in-out;
   -o-animation: flickerAnimation 2s infinite ease-in-out;
   animation: flickerAnimation 2s infinite ease-in-out;
-}
+}

apps/documenteditor/mobile/resources/css/app-material.css

@@ -5923,6 +5923,93 @@ html.phone .document-menu .list-block .item-link {
 .container-collaboration .page-content .list-block:first-child {
   margin-top: -1px;
 }
+#user-list .item-content {
+  padding-left: 0;
+}
+#user-list .item-inner {
+  justify-content: flex-start;
+  padding-left: 15px;
+}
+#user-list .length {
+  margin-left: 4px;
+}
+#user-list .color {
+  min-width: 40px;
+  min-height: 40px;
+  margin-right: 20px;
+  text-align: center;
+  border-radius: 50px;
+  line-height: 40px;
+  color: #373737;
+  font-weight: 400;
+}
+#user-list ul:before {
+  content: none;
+}
+.page-comments .list-block .item-inner {
+  display: block;
+  padding: 16px 0;
+  word-wrap: break-word;
+}
+.page-comments p {
+  margin: 0;
+}
+.page-comments .user-name {
+  font-size: 17px;
+  line-height: 22px;
+  color: #000000;
+  margin: 0;
+  font-weight: bold;
+}
+.page-comments .comment-date,
+.page-comments .reply-date {
+  font-size: 12px;
+  line-height: 18px;
+  color: #6d6d72;
+  margin: 0;
+  margin-top: 0px;
+}
+.page-comments .comment-text,
+.page-comments .reply-text {
+  color: #000000;
+  font-size: 15px;
+  line-height: 25px;
+  margin: 0;
+  max-width: 100%;
+  padding-right: 15px;
+}
+.page-comments .reply-item {
+  margin-top: 15px;
+}
+.page-comments .reply-item .user-name {
+  padding-top: 16px;
+}
+.page-comments .reply-item:before {
+  content: '';
+  position: absolute;
+  left: auto;
+  bottom: 0;
+  right: auto;
+  top: 0;
+  height: 1px;
+  width: 100%;
+  background-color: rgba(0, 0, 0, 0.12);
+  display: block;
+  z-index: 15;
+  -webkit-transform-origin: 50% 100%;
+  transform-origin: 50% 100%;
+}
+.page-comments .comment-quote {
+  color: #446995;
+  border-left: 1px solid #446995;
+  padding-left: 10px;
+  margin: 5px 0;
+  font-size: 15px;
+}
+.settings.popup .list-block ul.list-reply:last-child:after,
+.settings.popover .list-block ul.list-reply:last-child:after {
+  display: none;
+}
 .tablet .searchbar.document.replace .center > .replace {
   display: flex;
 }
@@ -6265,9 +6352,9 @@ i.icon.icon-format-dotx {
   background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2233%22%20height%3D%2233%22%20viewBox%3D%220%200%2033%2033%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D.cls-2%7Bfill%3A%23fff%3B%7D.cls-3%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3CclipPath%20id%3D%22clip-dotx%22%3E%3Crect%20width%3D%2233%22%20height%3D%2233%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3Cg%20id%3D%22dotx%22%20clip-path%3D%22url(%23clip-dotx)%22%3E%3Crect%20id%3D%22Rectangle_20%22%20data-name%3D%22Rectangle%2020%22%20width%3D%2233%22%20height%3D%2233%22%20fill%3D%22none%22%2F%3E%3Cpath%20id%3D%22Path_38%22%20data-name%3D%22Path%2038%22%20d%3D%22M12.223%2C119.714c1.251-.066%2C2.5-.115%2C3.752-.177.875%2C4.123%2C1.771%2C8.239%2C2.718%2C12.343.744-4.239%2C1.567-8.464%2C2.363-12.7%2C1.317-.042%2C2.633-.109%2C3.944-.183-1.488%2C5.917-2.792%2C11.886-4.417%2C17.767-1.1.531-2.745-.026-4.049.06-.876-4.042-1.9-8.061-2.679-12.123-.77%2C3.945-1.771%2C7.854-2.653%2C11.775-1.264-.06-2.535-.134-3.805-.213C6.3%2C130.892%2C5.02%2C125.553%2C4%2C120.167c1.125-.049%2C2.258-.093%2C3.384-.129.678%2C3.889%2C1.448%2C7.762%2C2.041%2C11.659C10.353%2C127.7%2C11.3%2C123.708%2C12.223%2C119.714Z%22%20transform%3D%22translate(-2%20-117)%22%20class%3D%22cls-1%22%2F%3E%3Cg%20id%3D%22Group_5%22%20data-name%3D%22Group%205%22%20transform%3D%22translate(16%2016)%22%3E%3Cpath%20id%3D%22Path_44%22%20data-name%3D%22Path%2044%22%20d%3D%22M1.011%2C0H13.989A1.011%2C1.011%2C0%2C0%2C1%2C15%2C1.011V13.989A1.011%2C1.011%2C0%2C0%2C1%2C13.989%2C15H1.011A1.011%2C1.011%2C0%2C0%2C1%2C0%2C13.989V1.011A1.011%2C1.011%2C0%2C0%2C1%2C1.011%2C0Z%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_39%22%20data-name%3D%22Path%2039%22%20d%3D%22M5.794%2C13.25V3.911H9.258V2.25h-9V3.911H3.729V13.25Z%22%20transform%3D%22translate(2.742%20-0.25)%22%20class%3D%22cls-2%22%2F%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E");
 }
 i.icon.icon-format-txt {
-  width: 30px;
+  width: 24px;
-  height: 30px;
+  height: 24px;
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%22-14.47%20-14.5%2058%2058%22%20height%3D%2258px%22%20width%3D%2258px%22%20y%3D%220px%22%20x%3D%220px%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2228%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2224%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2220%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2216%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2212%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%228%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%224%22%20%2F%3E%3Crect%20class%3D%22cls-1%22%20height%3D%221%22%20width%3D%2229.063%22%20%2F%3E%3C%2Fsvg%3E");
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M22%2017H2V18H22V17Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2020H2V21H22V20Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2014H2V15H22V14Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2011H2V12H22V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%208H2V9H22V8Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%205H2V6H22V5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%202H2V3H22V2Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
 }
 i.icon.icon-format-pdf {
   width: 30px;
@@ -6294,6 +6381,11 @@ i.icon.icon-format-html {
   height: 30px;
   background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2262px%22%20height%3D%2262px%22%20viewBox%3D%220%200%2062%2062%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M24.993%2C38.689L11.34%2C32.753v-3.288l13.653-5.91v3.872l-9.523%2C3.641l9.523%2C3.777V38.689z%22%20%2F%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M27.09%2C41.298l4.931-20.596h2.867l-4.986%2C20.596H27.09z%22%20%2F%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M36.986%2C38.703v-3.845l9.536-3.75L36.986%2C27.4v-3.817l13.666%2C5.91v3.261L36.986%2C38.703z%22%20%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
 }
+i.icon.icon-format-rtf {
+  width: 24px;
+  height: 24px;
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Crect%20x%3D%222%22%20y%3D%222%22%20width%3D%227%22%20height%3D%227%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2011H2V12H22V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2014H2V15H22V14Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2017H2V18H22V17Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2020H2V21H22V20Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%202H11V3H22V2Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%205H11V6H22V5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%208H11V9H22V8Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E");
+}
 i.icon.icon-collaboration {
   width: 24px;
   height: 24px;
@@ -6342,17 +6434,17 @@ i.icon.icon-footnote {
 i.icon.icon-cut {
   width: 24px;
   height: 24px;
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20d%3D%22M19.4406%2016.7116C17.8368%2016.7116%2016.4336%2017.76%2015.9825%2019.2576L13.1259%2013.5167L19.4907%200.737143C19.5909%200.487542%2019.4907%200.18802%2019.2902%200.0881796C19.0396%20-0.011661%2018.7389%200.0881795%2018.6387%200.287861L12.5245%2012.3686L6.51049%200.287861C6.41026%200.0382593%206.10956%20-0.0615813%205.85898%200.0382593C5.6084%200.1381%205.50816%200.437622%205.6084%200.687223L11.9732%2013.4668L9.06644%2019.2576C8.61539%2017.8099%207.21213%2016.7116%205.6084%2016.7116C3.60373%2016.7116%202%2018.3091%202%2020.3059C2%2022.3027%203.60373%2023.9002%205.6084%2023.9002C6.91143%2023.9002%208.06411%2023.2013%208.71562%2022.153C8.71562%2022.153%208.71562%2022.1529%208.71562%2022.103C8.81586%2021.9533%208.86597%2021.8035%208.91609%2021.6537L12.5245%2014.615L16.0828%2021.7037C16.1329%2021.8534%2016.2331%2022.0032%2016.2832%2022.153V22.2029C16.2832%2022.2029%2016.2832%2022.2029%2016.2832%2022.2528C16.9347%2023.3011%2018.0874%2024%2019.3905%2024C21.3951%2024%2022.9989%2022.4026%2022.9989%2020.4057C23.049%2018.359%2021.4452%2016.7116%2019.4406%2016.7116ZM5.6084%2022.9517C4.15501%2022.9517%203.00233%2021.8035%203.00233%2020.3558C3.00233%2018.9081%204.15501%2017.76%205.6084%2017.76C7.06178%2017.76%208.21446%2018.9081%208.21446%2020.3558C8.21446%2020.7053%208.16434%2021.0547%208.01399%2021.3542L7.91376%2021.5539C7.51283%2022.3526%206.66084%2022.9517%205.6084%2022.9517ZM19.4406%2022.9517C18.4382%2022.9517%2017.5361%2022.3526%2017.1352%2021.504L17.035%2021.3043C16.9347%2021.0048%2016.8345%2020.6553%2016.8345%2020.3059C16.8345%2018.8582%2017.9872%2017.71%2019.4406%2017.71C20.894%2017.71%2022.0466%2018.8582%2022.0466%2020.3059C22.0466%2021.7536%2020.894%2022.9517%2019.4406%2022.9517Z%22%20fill%3D%22black%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22black%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E");
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3.22427%2022.2702C4.51527%2023.1269%206.52738%2022.7183%207.6592%2021.0127C8.79101%2019.3071%208.38572%2017.2943%207.09472%2016.4376C5.80372%2015.5809%203.79161%2015.9896%202.65979%2017.6952C1.52798%2019.4008%201.93328%2021.4136%203.22427%2022.2702ZM2.67135%2023.1035C4.51208%2024.325%207.11827%2023.6364%208.49243%2021.5656C9.8666%2019.4948%209.48837%2016.8259%207.64764%2015.6044C5.80691%2014.3829%203.20072%2015.0714%201.82656%2017.1422C0.452398%2019.2131%200.830625%2021.882%202.67135%2023.1035Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.9158%2022.2702C19.6248%2023.1269%2017.6127%2022.7183%2016.4809%2021.0127C15.349%2019.3071%2015.7543%2017.2943%2017.0453%2016.4376C18.3363%2015.5809%2020.3484%2015.9896%2021.4803%2017.6952C22.6121%2019.4008%2022.2068%2021.4136%2020.9158%2022.2702ZM21.4687%2023.1035C19.628%2024.325%2017.0218%2023.6364%2015.6476%2021.5656C14.2735%2019.4948%2014.6517%2016.8259%2016.4924%2015.6044C18.3331%2014.3829%2020.9393%2015.0714%2022.3135%2017.1422C23.6877%2019.2131%2023.3094%2021.882%2021.4687%2023.1035Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20d%3D%22M16.4924%2015.6044L13.9037%2012.4737L19.9552%200.675715C20.0693%200.446914%2019.9552%200.172352%2019.727%200.0808313C19.4416%20-0.0106892%2019.0993%200.0808312%2018.9851%200.263872L12.0233%2011.4212L5.17562%200.263872C5.06149%200.035071%204.71911%20-0.0564496%204.43379%200.035071C4.14847%200.126592%204.03434%200.401153%204.14847%200.629955L10.2001%2012.4279L7.64761%2015.6044L9.2292%2018L12.0233%2013.4804L14.9108%2018L16.4924%2015.6044Z%22%20fill%3D%22black%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22black%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E");
 }
 i.icon.icon-copy {
   width: 24px;
   height: 24px;
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%203.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%207.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%2011.5H9%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M9%2014.5H0.5V0.5H14.5V9H9.5H9V9.5V14.5ZM15%2010V9.5H23.5V23.5H9.5V15.5H10V15V14.5V10H15Z%22%20stroke%3D%22black%22%2F%3E%3C%2Fsvg%3E");
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M1%201H15V7H16V0H0V17H8V16H1V1Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M23%208H9V23H23V8ZM8%207V24H24V7H8Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M13%205H3V4H13V5Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%209H3V8H8V9Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%2013H3V12H8V13Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H11V11H21V12Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H11V15H21V16Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H11V19H21V20Z%22%20fill%3D%22black%22%2F%3E%3C%2Fsvg%3E");
 }
 i.icon.icon-paste {
   width: 24px;
   height: 24px;
-  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M13%202.5H4%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%202.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%201.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%203.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%204.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%200.5L5%200.500001%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M9.5%209H9V9.5V19H10V10H23.5V23.5H9.5V20V19.5H9H0.5V2.5H18.5V9H9.5Z%22%20stroke%3D%22black%22%2F%3E%3C%2Fsvg%3E");
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%202H0V20H9V24H24V7H19V2H14V3H18V7H9V19H1V3H5V2ZM10%208H23V23H10V8Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20d%3D%22M5%200H14V5H5V0Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H12V11H21V12Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H12V15H21V16Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H12V19H21V20Z%22%20fill%3D%22black%22%2F%3E%3C%2Fsvg%3E");
 }
 .navbar i.icon.icon-undo {
   width: 22px;
@@ -6760,29 +6852,6 @@ html.pixel-ratio-3 .numbers li {
   max-height: 100%;
   overflow: auto;
 }
-#user-list .item-content {
-  padding-left: 0;
-}
-#user-list .item-inner {
-  justify-content: flex-start;
-  padding-left: 15px;
-}
-#user-list .length {
-  margin-left: 4px;
-}
-#user-list .color {
-  min-width: 40px;
-  min-height: 40px;
-  margin-right: 20px;
-  text-align: center;
-  border-radius: 50px;
-  line-height: 40px;
-  color: #373737;
-  font-weight: 400;
-}
-#user-list ul:before {
-  content: none;
-}
 .doc-placeholder {
   background: #fbfbfb;
   width: 100%;
@@ -6803,4 +6872,4 @@ html.pixel-ratio-3 .numbers li {
   -moz-animation: flickerAnimation 2s infinite ease-in-out;
   -o-animation: flickerAnimation 2s infinite ease-in-out;
   animation: flickerAnimation 2s infinite ease-in-out;
-}
+}

apps/documenteditor/mobile/resources/less/app-ios.less

@@ -241,36 +241,6 @@ input, textarea {
   overflow: auto;
 }
 
-//Edit users
-@initialEditUser: #373737;
-
-#user-list {
-  .item-content {
-    padding-left: 0;
-  }
-  .item-inner {
-    justify-content: flex-start;
-    padding-left: 15px;
-  }
-  .length {
-    margin-left: 4px;
-  }
-  .color {
-    min-width: 40px;
-    min-height: 40px;
-    margin-right: 20px;
-    text-align: center;
-    border-radius: 50px;
-    line-height: 40px;
-    color: @initialEditUser;
-    font-weight: 500;
-
-  }
-  ul:before {
-    content: none;
-  }
-}
-
 // Skeleton of document
 
 .doc-placeholder {
@@ -294,4 +264,4 @@ input, textarea {
     -o-animation: flickerAnimation 2s infinite ease-in-out;
     animation: flickerAnimation 2s infinite ease-in-out;
   }
-}
+}

apps/documenteditor/mobile/resources/less/app-material.less

@@ -228,35 +228,6 @@ input, textarea {
   overflow: auto;
 }
 
-//Edit users
-@initialEditUser: #373737;
-
-#user-list {
-  .item-content {
-    padding-left: 0;
-  }
-  .item-inner {
-    justify-content: flex-start;
-    padding-left: 15px;
-  }
-  .length {
-    margin-left: 4px;
-  }
-  .color {
-    min-width: 40px;
-    min-height: 40px;
-    margin-right: 20px;
-    text-align: center;
-    border-radius: 50px;
-    line-height: 40px;
-    color: @initialEditUser;
-    font-weight: 400;
-  }
-  ul:before {
-    content: none;
-  }
-}
-
 // Skeleton of document
 
 .doc-placeholder {
@@ -280,4 +251,4 @@ input, textarea {
     -o-animation: flickerAnimation 2s infinite ease-in-out;
     animation: flickerAnimation 2s infinite ease-in-out;
   }
-}
+}

apps/documenteditor/mobile/resources/less/ios/_icons.less

@@ -381,9 +381,9 @@ i.icon {
     .encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="33" height="33" viewBox="0 0 33 33"><defs><style>.cls-1{fill:@{themeColor};}.cls-2{fill:#fff;}.cls-3{fill:@{themeColor};}</style></defs><g><rect id="Rectangle_20" data-name="Rectangle 20" width="33" height="33" fill="none"/><path id="Path_38" data-name="Path 38" d="M12.223,119.714c1.251-.066,2.5-.115,3.752-.177.875,4.123,1.771,8.239,2.718,12.343.744-4.239,1.567-8.464,2.363-12.7,1.317-.042,2.633-.109,3.944-.183-1.488,5.917-2.792,11.886-4.417,17.767-1.1.531-2.745-.026-4.049.06-.876-4.042-1.9-8.061-2.679-12.123-.77,3.945-1.771,7.854-2.653,11.775-1.264-.06-2.535-.134-3.805-.213C6.3,130.892,5.02,125.553,4,120.167c1.125-.049,2.258-.093,3.384-.129.678,3.889,1.448,7.762,2.041,11.659C10.353,127.7,11.3,123.708,12.223,119.714Z" transform="translate(-2 -117)" class="cls-1"/><g id="Group_5" data-name="Group 5" transform="translate(16 16)"><path id="Path_44" data-name="Path 44" d="M1.011,0H13.989A1.011,1.011,0,0,1,15,1.011V13.989A1.011,1.011,0,0,1,13.989,15H1.011A1.011,1.011,0,0,1,0,13.989V1.011A1.011,1.011,0,0,1,1.011,0Z" class="cls-1"/><path id="Path_39" data-name="Path 39" d="M5.794,13.25V3.911H9.258V2.25h-9V3.911H3.729V13.25Z" transform="translate(2.742 -0.25)" class="cls-2"/></g></g></svg>');
   }
   &.icon-format-txt {
-    width: 30px;
+    width: 24px;
-    height: 30px;
+    height: 24px;
-    .encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-14.47 -14.5 58 58" height="58px" width="58px" y="0px" x="0px"><defs><style>.cls-1{fill:@{themeColor};}</style></defs><rect height="1" width="29.063" class="cls-1" y="28" /><rect height="1" width="29.063" class="cls-1" y="24" /><rect height="1" width="29.063" class="cls-1" y="20" /><rect height="1" width="29.063" class="cls-1" y="16" /><rect height="1" width="29.063" class="cls-1" y="12" /><rect height="1" width="29.063" class="cls-1" y="8" /><rect height="1" width="29.063" class="cls-1" y="4" /><rect class="cls-1" height="1" width="29.063" /></svg>');
+    .encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M22 17H2V18H22V17Z" fill="@{themeColor}"/><path d="M22 20H2V21H22V20Z" fill="@{themeColor}"/><path d="M22 14H2V15H22V14Z" fill="@{themeColor}"/><path d="M22 11H2V12H22V11Z" fill="@{themeColor}"/><path d="M22 8H2V9H22V8Z" fill="@{themeColor}"/><path d="M22 5H2V6H22V5Z" fill="@{themeColor}"/><path d="M22 2H2V3H22V2Z" fill="@{themeColor}"/></svg>');
   }
   &.icon-format-pdf {
     width: 30px;
@@ -410,6 +410,11 @@ i.icon {
     height: 30px;
     .encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="62px" height="62px" viewBox="0 0 62 62"><defs><style>.cls-1{fill:@{themeColor};}</style></defs><g><path class="cls-1" d="M24.993,38.689L11.34,32.753v-3.288l13.653-5.91v3.872l-9.523,3.641l9.523,3.777V38.689z" /><path class="cls-1" d="M27.09,41.298l4.931-20.596h2.867l-4.986,20.596H27.09z" /><path class="cls-1" d="M36.986,38.703v-3.845l9.536-3.75L36.986,27.4v-3.817l13.666,5.91v3.261L36.986,38.703z" /></g></svg>');
   }
+  &.icon-format-rtf {
+    width: 24px;
+    height: 24px;
+    .encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><rect x="2" y="2" width="7" height="7" fill="@{themeColor}"/><path d="M22 11H2V12H22V11Z" fill="@{themeColor}"/><path d="M22 14H2V15H22V14Z" fill="@{themeColor}"/><path d="M22 17H2V18H22V17Z" fill="@{themeColor}"/><path d="M22 20H2V21H22V20Z" fill="@{themeColor}"/><path d="M22 2H11V3H22V2Z" fill="@{themeColor}"/><path d="M22 5H11V6H22V5Z" fill="@{themeColor}"/><path d="M22 8H11V9H22V8Z" fill="@{themeColor}"/></svg>');
+  }
   //  Collaboration
   &.icon-collaboration {
     width: 24px;
@@ -459,16 +464,16 @@ i.icon {
   &.icon-cut {
     width: 24px;
     height: 24px;
-    .encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#cut)"><path d="M19.4406 16.7116C17.8368 16.7116 16.4336 17.76 15.9825 19.2576L13.1259 13.5167L19.4907 0.737143C19.5909 0.487542 19.4907 0.18802 19.2902 0.0881796C19.0396 -0.011661 18.7389 0.0881795 18.6387 0.287861L12.5245 12.3686L6.51049 0.287861C6.41026 0.0382593 6.10956 -0.0615813 5.85898 0.0382593C5.6084 0.1381 5.50816 0.437622 5.6084 0.687223L11.9732 13.4668L9.06644 19.2576C8.61539 17.8099 7.21213 16.7116 5.6084 16.7116C3.60373 16.7116 2 18.3091 2 20.3059C2 22.3027 3.60373 23.9002 5.6084 23.9002C6.91143 23.9002 8.06411 23.2013 8.71562 22.153C8.71562 22.153 8.71562 22.1529 8.71562 22.103C8.81586 21.9533 8.86597 21.8035 8.91609 21.6537L12.5245 14.615L16.0828 21.7037C16.1329 21.8534 16.2331 22.0032 16.2832 22.153V22.2029C16.2832 22.2029 16.2832 22.2029 16.2832 22.2528C16.9347 23.3011 18.0874 24 19.3905 24C21.3951 24 22.9989 22.4026 22.9989 20.4057C23.049 18.359 21.4452 16.7116 19.4406 16.7116ZM5.6084 22.9517C4.15501 22.9517 3.00233 21.8035 3.00233 20.3558C3.00233 18.9081 4.15501 17.76 5.6084 17.76C7.06178 17.76 8.21446 18.9081 8.21446 20.3558C8.21446 20.7053 8.16434 21.0547 8.01399 21.3542L7.91376 21.5539C7.51283 22.3526 6.66084 22.9517 5.6084 22.9517ZM19.4406 22.9517C18.4382 22.9517 17.5361 22.3526 17.1352 21.504L17.035 21.3043C16.9347 21.0048 16.8345 20.6553 16.8345 20.3059C16.8345 18.8582 17.9872 17.71 19.4406 17.71C20.894 17.71 22.0466 18.8582 22.0466 20.3059C22.0466 21.7536 20.894 22.9517 19.4406 22.9517Z" fill="white"/></g><defs><clipPath id="cut"><rect width="24" height="24" fill="white"/></clipPath></defs></svg>');
+    .encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#cut)"><path fill-rule="evenodd" clip-rule="evenodd" d="M3.22427 22.2702C4.51527 23.1269 6.52738 22.7183 7.6592 21.0127C8.79101 19.3071 8.38572 17.2943 7.09472 16.4376C5.80372 15.5809 3.79161 15.9896 2.65979 17.6952C1.52798 19.4008 1.93328 21.4136 3.22427 22.2702ZM2.67135 23.1035C4.51208 24.325 7.11827 23.6364 8.49243 21.5656C9.8666 19.4948 9.48837 16.8259 7.64764 15.6044C5.80691 14.3829 3.20072 15.0714 1.82656 17.1422C0.452398 19.2131 0.830625 21.882 2.67135 23.1035Z" fill="white"/><path fill-rule="evenodd" clip-rule="evenodd" d="M20.9158 22.2702C19.6248 23.1269 17.6127 22.7183 16.4809 21.0127C15.349 19.3071 15.7543 17.2943 17.0453 16.4376C18.3363 15.5809 20.3484 15.9896 21.4803 17.6952C22.6121 19.4008 22.2068 21.4136 20.9158 22.2702ZM21.4687 23.1035C19.628 24.325 17.0218 23.6364 15.6476 21.5656C14.2735 19.4948 14.6517 16.8259 16.4924 15.6044C18.3331 14.3829 20.9393 15.0714 22.3135 17.1422C23.6877 19.2131 23.3094 21.882 21.4687 23.1035Z" fill="white"/><path d="M16.4924 15.6044L13.9037 12.4737L19.9552 0.675715C20.0693 0.446914 19.9552 0.172352 19.727 0.0808313C19.4416 -0.0106892 19.0993 0.0808312 18.9851 0.263872L12.0233 11.4212L5.17562 0.263872C5.06149 0.035071 4.71911 -0.0564496 4.43379 0.035071C4.14847 0.126592 4.03434 0.401153 4.14847 0.629955L10.2001 12.4279L7.64761 15.6044L9.2292 18L12.0233 13.4804L14.9108 18L16.4924 15.6044Z" fill="white"/></g><defs><clipPath id="cut"><rect width="24" height="24" fill="white"/></clipPath></defs></svg>');
-  }
+   }
   &.icon-copy {
     width: 24px;
     height: 24px;
-    .encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M21 20.5H12" stroke="white"/><path d="M21 16.5H12" stroke="white"/><path d="M21 12.5H12" stroke="white"/><path d="M3 3.5H12" stroke="white"/><path d="M3 7.5H12" stroke="white"/><path d="M3 11.5H9" stroke="white"/><path d="M9 14.5H0.5V0.5H14.5V9H9.5H9V9.5V14.5ZM15 10V9.5H23.5V23.5H9.5V15.5H10V15V14.5V10H15Z" stroke="white"/></svg>');
+    .encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M1 1H15V7H16V0H0V17H8V16H1V1Z" fill="white"/><path fill-rule="evenodd" clip-rule="evenodd" d="M23 8H9V23H23V8ZM8 7V24H24V7H8Z" fill="white"/><path fill-rule="evenodd" clip-rule="evenodd" d="M13 5H3V4H13V5Z" fill="white"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8 9H3V8H8V9Z" fill="white"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8 13H3V12H8V13Z" fill="white"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 12H11V11H21V12Z" fill="white"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 16H11V15H21V16Z" fill="white"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 20H11V19H21V20Z" fill="white"/></svg>');
   }
   &.icon-paste {
     width: 24px;
     height: 24px;
-    .encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M21 20.5H12" stroke="white"/><path d="M21 16.5H12" stroke="white"/><path d="M21 12.5H12" stroke="white"/><path d="M13 2.5H4" stroke="white"/><path d="M14 2.5H5" stroke="white"/><path d="M14 1.5H5" stroke="white"/><path d="M14 3.5H5" stroke="white"/><path d="M14 4.5H5" stroke="white"/><path d="M14 0.5L5 0.500001" stroke="white"/><path d="M9.5 9H9V9.5V19H10V10H23.5V23.5H9.5V20V19.5H9H0.5V2.5H18.5V9H9.5Z" stroke="white"/></svg>');
+    .encoded-svg-background('<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M5 2H0V20H9V24H24V7H19V2H14V3H18V7H9V19H1V3H5V2ZM10 8H23V23H10V8Z" fill="white"/><path d="M5 0H14V5H5V0Z" fill="white"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 12H12V11H21V12Z" fill="white"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 16H12V15H21V16Z" fill="white"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 20H12V19H21V20Z" fill="white"/></svg>');
   }
 }