Merge into develop from release/v5.3.0

apps/common/locale.js

@@ -39,6 +39,9 @@ Common.Locale = new(function() {
 
     var _createXMLHTTPObject = function() {
         var xmlhttp;
+        if (typeof XMLHttpRequest != 'undefined') {
+            xmlhttp = new XMLHttpRequest();
+        } else {
             try {
                 xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
             }
@@ -50,9 +53,8 @@ Common.Locale = new(function() {
                     xmlhttp = false;
                 }
             }
-        if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-            xmlhttp = new XMLHttpRequest();
         }
+
         return xmlhttp;
     };
 

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

@@ -73,7 +73,8 @@ define([
                 maskExp     : '',
                 validateOnChange: false,
                 validateOnBlur: true,
-                disabled: false
+                disabled: false,
+                editable: true
             },
 
             template: _.template([
@@ -106,7 +107,7 @@ define([
                 this.allowBlank     = me.options.allowBlank;
                 this.placeHolder    = me.options.placeHolder;
                 this.template       = me.options.template || me.template;
-                this.editable       = me.options.editable || true;
+                this.editable       = me.options.editable;
                 this.disabled       = me.options.disabled;
                 this.spellcheck     = me.options.spellcheck;
                 this.blankError     = me.options.blankError || 'This field is required';

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

@@ -130,6 +130,8 @@ define([
                     left: Math.round(ownerEl.width()  / 2 - (loaderEl.width()  + parseInt(loaderEl.css('padding-left')) + parseInt(loaderEl.css('padding-right')))  / 2) + 'px'
 
                 });
+                if (ownerEl.height()<1 || ownerEl.width()<1)
+                    loaderEl.css({visibility: 'hidden'});
 
                 Common.util.Shortcuts.suspendEvents();
 
@@ -156,6 +158,16 @@ define([
 
             isVisible: function() {
                 return !_.isEmpty(loaderEl);
+            },
+
+            updatePosition: function() {
+                if (ownerEl && ownerEl.hasClass('masked') && loaderEl){
+                    loaderEl.css({
+                        top : Math.round(ownerEl.height() / 2 - (loaderEl.height() + parseInt(loaderEl.css('padding-top'))  + parseInt(loaderEl.css('padding-bottom'))) / 2) + 'px',
+                        left: Math.round(ownerEl.width()  / 2 - (loaderEl.width()  + parseInt(loaderEl.css('padding-left')) + parseInt(loaderEl.css('padding-right')))  / 2) + 'px'
+                    });
+                    loaderEl.css({visibility: 'visible'});
+                }
             }
         }
     })())

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

@@ -135,6 +135,7 @@ define([
             this.toggleGroup    = me.options.toggleGroup;
             this.template       = me.options.template || this.template;
             this.iconCls        = me.options.iconCls;
+            this.hint           = me.options.hint;
             this.rendered       = false;
 
             if (this.menu !== null && !(this.menu instanceof Common.UI.Menu)) {
@@ -189,6 +190,29 @@ define([
                         }
                     }
 
+                    if (me.options.hint) {
+                        el.attr('data-toggle', 'tooltip');
+                        el.tooltip({
+                            title       : me.options.hint,
+                            placement   : me.options.hintAnchor||function(tip, element) {
+                                var pos = this.getPosition(),
+                                    actualWidth = tip.offsetWidth,
+                                    actualHeight = tip.offsetHeight,
+                                    innerWidth = Common.Utils.innerWidth(),
+                                    innerHeight = Common.Utils.innerHeight();
+                                var top = pos.top,
+                                    left = pos.left + pos.width + 2;
+                                if (top + actualHeight > innerHeight) {
+                                    top = innerHeight - actualHeight - 2;
+                                }
+                                if (left + actualWidth > innerWidth) {
+                                    left = pos.left - actualWidth - 2;
+                                }
+                                $(tip).offset({top: top,left: left}).addClass('in');
+                            }
+                        });
+                    }
+
                     if (this.disabled)
                         $(this.el).toggleClass('disabled', this.disabled);
 

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

@@ -118,7 +118,7 @@ define([
         rendered    : false,
 
         template    :
-                    '<input type="text" class="form-control">' +
+                    '<input type="text" class="form-control" spellcheck="false">' +
                     '<div class="spinner-buttons">' +
                         '<button type="button" class="spinner-up"><i class="img-commonctrl"></i></button>' +
                         '<button type="button" class="spinner-down"><i class="img-commonctrl"></i></button>' +

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

@@ -195,7 +195,7 @@ define([
                         var tab = active_panel.data('tab');
                         me.$tabs.find('> a[data-tab=' + tab + ']').parent().toggleClass('active', true);
                     } else {
-                        tab = me.$tabs.siblings(':not(.x-lone)').first().find('> a[data-tab]').data('tab');
+                        tab = me.$tabs.siblings(':not(.x-lone):visible').first().find('> a[data-tab]').data('tab');
                         me.setTab(tab);
                     }
                 }

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

@@ -777,7 +777,6 @@ define([
                     }));
                 }
 
-                replies.sort(function (a,b) { return a.get('time') - b.get('time');});
                 comment.set('replys', replies);
 
                 if (!silentUpdate) {
@@ -1246,10 +1245,6 @@ define([
                         editable            : this.mode.canEditComments || (data.asc_getReply(i).asc_getUserId() == this.currentUserId)
                     }));
                 }
-
-                replies.sort(function (a, b) {
-                    return a.get('time') - b.get('time');
-                });
             }
 
             return replies;

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

@@ -57,7 +57,7 @@ define([
                         $('.toolbar').addClass('editor-native-color');
                     });
 
-                    app.on_native_message = function (cmd, param) {
+                    !!app && (app.on_native_message = function (cmd, param) {
                         if (/^style:change/.test(cmd)) {
                             var obj = JSON.parse(param);
 
@@ -67,7 +67,7 @@ define([
                                 }
                             }
                         }
-                    }
+                    });
                 }
             },
             process: function (opts) {

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

@@ -418,7 +418,7 @@ define([
                         changetext  : changetext,
                         id          : Common.UI.getId(),
                         lock        : (item.get_LockUserId()!==null),
-                        lockuser    : item.get_LockUserId(),
+                        lockuser    : me.getUserName(item.get_LockUserId()),
                         type        : item.get_Type(),
                         changedata  : item,
                         scope       : me.view,
@@ -604,7 +604,7 @@ define([
 
                 this.view.btnsDocLang && this.view.btnsDocLang.forEach(function(button) {
                     if ( button ) {
-                        button.setDisabled(disable || this.langs.length<1);
+                        button.setDisabled(disable || !this.langs || this.langs.length<1);
                     }
                 }, this);
             }
@@ -649,7 +649,7 @@ define([
                 });
             } else if (config.canViewReview) {
                 config.canViewReview = me.api.asc_HaveRevisionsChanges(true); // check revisions from all users
-                config.canViewReview && me.turnDisplayMode(Common.localStorage.getItem(me.view.appPrefix + "review-mode") || 'original'); // load display mode only in viewer
+                config.canViewReview && me.turnDisplayMode(config.isRestrictedEdit ? 'markup' : Common.localStorage.getItem(me.view.appPrefix + "review-mode") || 'original'); // load display mode only in viewer
             }
 
             if (me.view && me.view.btnChat) {

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

@@ -165,13 +165,25 @@ function patchDropDownKeyDownAdditional(e) { // only for formula menu when typin
 
     if (!$items.length) return;
 
-    var index = $items.index($items.filter('.focus'));
+    var index = $items.index($items.filter('.focus')),
+        previndex = index;
     if (e.keyCode == 38) { index > 0 ? index-- : ($this.hasClass('no-cyclic') ? (index = 0) : (index = $items.length - 1));} else         // up
     if (e.keyCode == 40) { index < $items.length - 1 ? index++ : ($this.hasClass('no-cyclic') ? (index = $items.length - 1) : (index = 0));}              // down
     if (!~index) index=0;
 
     $items.removeClass('focus');
     $items.eq(index).addClass('focus');
+
+    if (previndex !== index) {
+        var tip = $items.eq(previndex).parent().data('bs.tooltip');
+        if (tip) {
+            tip.hide();
+        }
+        tip = $items.eq(index).parent().data('bs.tooltip');
+        if (tip) {
+            tip.show();
+        }
+    }
 }
 
 function getParent($this) {

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

@@ -36,8 +36,8 @@
                             <div class="btns-reply-ct">
                             <% if (item.get("editable")) { %>
                                 <div class="btn-edit img-commonctrl" data-value="<%=item.get("id")%>"></div>
-                            <% } %>
                                 <div class="btn-delete img-commonctrl" data-value="<%=item.get("id")%>"></div>
+                            <% } %>
                             </div>
                         <%}%>
                     <% } else { %>
@@ -67,8 +67,8 @@
             <div class="edit-ct">
                 <% if (editable) { %>
                     <div class="btn-edit img-commonctrl"></div>
-                <% } %>
                     <div class="btn-delete img-commonctrl"></div>
+                <% } %>
                 <% if (resolved) { %>
                 <div class="btn-resolve-check img-commonctrl" data-toggle="tooltip"></div>
                 <% } else { %>

apps/common/main/lib/template/CommentsPopover.template

@@ -10,7 +10,7 @@
         <div oo_editor_input="true" tabindex="-1" class="user-message user-select"><%=scope.pickLink(comment)%></div>
     <% } else { %>
         <div class="inner-edit-ct">
-            <textarea class="msg-reply user-select" maxlength="maxCommLength"><%=comment%></textarea>
+            <textarea class="msg-reply user-select" maxlength="maxCommLength" spellcheck="false"><%=comment%></textarea>
             <% if (hideAddReply) { %>
                 <button class="btn normal dlg-btn primary btn-inner-edit" id="id-comments-change-popover">textAdd</button>
             <% } else { %>
@@ -36,13 +36,13 @@
                         <div class="btns-reply-ct">
                             <% if (item.get("editable")) { %>
                                 <div class="btn-edit img-commonctrl" data-value="<%=item.get("id")%>"></div>
-                            <%}%>
                                 <div class="btn-delete img-commonctrl" data-value="<%=item.get("id")%>"></div>
+                            <%}%>
                         </div>
                     <%}%>
                 <% } else { %>
                     <div class="inner-edit-ct">
-                        <textarea class="msg-reply textarea-fix user-select" maxlength="maxCommLength"><%=item.get("reply")%></textarea>
+                        <textarea class="msg-reply textarea-fix user-select" maxlength="maxCommLength" spellcheck="false"><%=item.get("reply")%></textarea>
                         <button class="btn normal dlg-btn primary btn-inner-edit btn-fix" id="id-comments-change-popover">textEdit</button>
                         <button class="btn normal dlg-btn btn-inner-close">textClose</button>
                     </div>
@@ -68,8 +68,8 @@
         <div class="edit-ct">
             <% if (editable) { %>
                 <div class="btn-edit img-commonctrl"></div>
-            <% } %>
                 <div class="btn-delete img-commonctrl"></div>
+            <% } %>
             <% if (resolved) { %>
             <div class="btn-resolve-check img-commonctrl" data-toggle="tooltip"></div>
             <% } else { %>
@@ -82,7 +82,7 @@
 
     <% if (showReplyInPopover) { %>
         <div class="reply-ct">
-            <textarea class="msg-reply user-select" placeholder="textAddReply" maxlength="maxCommLength"></textarea>
+            <textarea class="msg-reply user-select" placeholder="textAddReply" maxlength="maxCommLength" spellcheck="false"></textarea>
             <button class="btn normal dlg-btn primary btn-reply" id="id-comments-change-popover">textReply</button>
             <button class="btn normal dlg-btn btn-close">textClose</button>
         </div>

apps/common/main/lib/template/ReviewChangesPopover.template

@@ -13,5 +13,9 @@
         <div class="btn-reject img-commonctrl"></div>
         <% } %>
     </div>
+    <% if (lock) { %>
+    <div class="lock-area" style="cursor: default;"></div>
+    <div class="lock-author" style="cursor: default;"><%=lockuser%></div>
+    <% } %>
     <% } %>
 </div>

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

@@ -127,15 +127,12 @@
             if (this.hasContent() && this.enabled && !this.dontShow) {
                 if (!this.$element.is(":visible") && this.$element.closest('[role=menu]').length>0) return;
                 var $tip = this.tip();
-                var placement = typeof this.options.placement === 'function' ?
-                                    this.options.placement.call(this, $tip[0], this.$element[0]) : this.options.placement;
 
                 if (this.options.arrow === false) $tip.addClass('arrow-free');
                 if (this.options.cls) $tip.addClass(this.options.cls);
 
-                var placementEx = /^([a-zA-Z]+)-?([a-zA-Z]*)$/.exec(placement);
+                var placementEx = (typeof this.options.placement !== 'function') ? /^([a-zA-Z]+)-?([a-zA-Z]*)$/.exec(this.options.placement) : null;
-
+                if (!at && placementEx && !placementEx[2].length) {
-                if (!at && !placementEx[2].length) {
                     _superclass.prototype.show.apply(this, arguments);
                 } else {
                     var e = $.Event('show.bs.tooltip');
@@ -152,7 +149,9 @@
                     this.options.container ?
                         $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element);
 
-                    if (typeof at == 'object') { 
+                    if (typeof this.options.placement === 'function') {
+                        this.options.placement.call(this, $tip[0], this.$element[0]);
+                    } else if (typeof at == 'object') {
                         var tp = {top: at[1] + 15, left: at[0] + 18},
                             innerWidth = Common.Utils.innerWidth(),
                             innerHeight = Common.Utils.innerHeight();

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

@@ -634,6 +634,9 @@ Common.Utils.applyCustomizationPlugins = function(plugins) {
 
     var _createXMLHTTPObject = function() {
         var xmlhttp;
+        if (typeof XMLHttpRequest != 'undefined') {
+            xmlhttp = new XMLHttpRequest();
+        } else {
             try {
                 xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
             }
@@ -645,9 +648,8 @@ Common.Utils.applyCustomizationPlugins = function(plugins) {
                     xmlhttp = false;
                 }
             }
-        if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-            xmlhttp = new XMLHttpRequest();
         }
+
         return xmlhttp;
     };
 
@@ -690,6 +692,10 @@ Common.Utils.fillUserInfo = function(info, lang, defname) {
 
 Common.Utils.createXhr = function () {
     var xmlhttp;
+
+    if (typeof XMLHttpRequest != 'undefined') {
+        xmlhttp = new XMLHttpRequest();
+    } else {
         try {
             xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
         } catch (e) {
@@ -699,8 +705,6 @@ Common.Utils.createXhr = function () {
                 xmlhttp = false;
             }
         }
-    if (!xmlhttp && typeof XMLHttpRequest != 'undefined') {
-        xmlhttp = new XMLHttpRequest();
     }
 
     return xmlhttp;

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

@@ -128,7 +128,7 @@ define([
                     me.fireEvent('reviewchange:preview', [me.btnNext, 'next']);
                 });
 
-                this.btnReviewView.menu.on('item:click', function (menu, item, e) {
+                this.btnReviewView && this.btnReviewView.menu.on('item:click', function (menu, item, e) {
                     me.fireEvent('reviewchanges:view', [menu, item]);
                 });
             }
@@ -209,6 +209,7 @@ define([
                         caption: this.txtNext
                     });
 
+                    if (!this.appConfig.isRestrictedEdit) // hide Display mode option for fillForms and commenting mode
                         this.btnReviewView = new Common.UI.Button({
                             cls: 'btn-toolbar x-huge icon-top',
                             iconCls: 'btn-ic-reviewview',
@@ -318,7 +319,7 @@ define([
                         me.btnPrev.updateHint(me.hintPrev);
                         me.btnNext.updateHint(me.hintNext);
 
-                        me.btnReviewView.setMenu(
+                        me.btnReviewView && me.btnReviewView.setMenu(
                             new Common.UI.Menu({
                                 cls: 'ppm-toolbar',
                                 items: [
@@ -351,7 +352,7 @@ define([
                                     }
                                 ]
                             }));
-                        me.btnReviewView.updateHint(me.tipReviewView);
+                        me.btnReviewView && me.btnReviewView.updateHint(me.tipReviewView);
                         !me.appConfig.canReview && me.turnDisplayMode(Common.localStorage.getItem(me.appPrefix + "review-mode") || 'original');
                     }
                     me.btnSharing && me.btnSharing.updateHint(me.tipSharing);

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

@@ -480,9 +480,7 @@ define([
                         handleSelect: false,
                         scrollable: true,
                         template: _.template('<div class="dataview-ct inner" style="overflow-y: visible;">'+
-                            '</div>' +
+                            '</div>'
-                            '<div class="lock-area" style="cursor: default;"></div>' +
-                            '<div class="lock-author" style="cursor: default;"></div>'
                         )
                     }
                 }
@@ -544,8 +542,8 @@ define([
 
         showReview: function (animate, lock, lockuser) {
             this.show(animate);
-            this.reviewChangesView.cmpEl.find('.lock-area').toggleClass('hidden', !lock);
+            // this.reviewChangesView.cmpEl.find('.lock-area').toggleClass('hidden', !lock);
-            this.reviewChangesView.cmpEl.find('.lock-author').toggleClass('hidden', !lock || _.isEmpty(lockuser)).text(lockuser);
+            // this.reviewChangesView.cmpEl.find('.lock-author').toggleClass('hidden', !lock || _.isEmpty(lockuser)).text(lockuser);
             this._state.reviewVisible = true;
         },
 

apps/common/mobile/resources/img/shapes/shape-01.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <g>
 	<path id="XMLID_2_" class="st0" d="M9.5,9v46h46V9H9.5z M55,54.5H10v-45h45V54.5z M32,41.5h1v-18h9.5v-1h-20v1H32V41.5z"/>

apps/common/mobile/resources/img/shapes/shape-02.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <path class="st0" d="M54.8,9.3l0.4,0.4l-46,46l-0.4-0.4L54.8,9.3z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-03.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <g>
 	<polygon id="XMLID_3_" class="st0" points="55,9 49.5,11 51.6,12 9.3,54.3 9.7,54.7 52,12.4 53.1,14.5 	"/>

apps/common/mobile/resources/img/shapes/shape-04.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <g>
 	<polygon id="XMLID_3_" class="st0" points="53.8,14 55.5,9 50.5,10.8 52.4,11.7 12.7,51.4 11.7,49.5 10,54.5 15,52.7 13.1,51.8 

apps/common/mobile/resources/img/shapes/shape-05.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <path class="st0" d="M9.5,8.5H56V55H9.5V8.5z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-06.svg

@@ -3,5 +3,5 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<polygon points="18.576,55 5.153,31.75 18.576,8.5 45.424,8.5 58.848,31.75 45.424,55 "/>
+<polygon fill="#aaa" points="18.576,55 5.153,31.75 18.576,8.5 45.424,8.5 58.848,31.75 45.424,55 "/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-07.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <path class="st0" d="M19,8.5h26.5c5.5,0,10,4.5,10,10V45c0,5.5-4.5,10-10,10H19c-5.5,0-10-4.5-10-10V18.5C9,13,13.5,8.5,19,8.5z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-08.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <path class="st0" d="M32.2,8.5c12.8,0,23.2,10.4,23.2,23.2C55.5,44.6,45.1,55,32.2,55S9,44.6,9,31.8C9,18.9,19.4,8.5,32.2,8.5z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-09.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <path class="st0" d="M32.8,9L56,55.5H9.5L32.8,9z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-10.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <path class="st0" d="M9.5,9L56,55.5H9.5L9.5,9z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-11.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <path class="st0" d="M19,9l26.5,0l15,46.5H4L19,9z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-12.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <path class="st0" d="M8.8,32.3L32.2,8.8l23.5,23.5L32.2,55.7L8.8,32.3z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-13.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <path class="st0" d="M33,9l23,23.3L33,55.5v-13H9.5v-20H33V9z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-14.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <path class="st0" d="M61,32.3L43,55.5v-13H22.5v13l-18-23.2L22.5,9v13.5H43V9L61,32.3z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-15.svg

@@ -3,5 +3,5 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<path d="M32.5,55.5l-23-23.3L32.5,9v13H56v20H32.5V55.5z"/>
+<path fill="#aaa" d="M32.5,55.5l-23-23.3L32.5,9v13H56v20H32.5V55.5z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-16.svg

@@ -3,6 +3,6 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
-<polygon id="XMLID_2_" points="43.75,53.25 43.75,25.25 53.75,25.25 38.45,7.75 23.25,25.25 32.75,25.25 32.75,42.25 11.75,42.25 
+<polygon fill="#aaa" id="XMLID_2_" points="43.75,53.25 43.75,25.25 53.75,25.25 38.45,7.75 23.25,25.25 32.75,25.25 32.75,42.25 11.75,42.25 
 	11.75,53.25 "/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-17.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <path class="st0" d="M9.5,8.5H56V40L32.8,55L9.5,40V8.5z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-18.svg

@@ -2,6 +2,6 @@
 <!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<path d="M32.7,52.6l17.3-16.5c0.2-0.2,5.9-5.4,5.9-11.6c0-7.5-4.6-12-12.4-12c-4.5,0-8.8,3.5-10.8,5.6c-2-2-6.3-5.6-10.8-5.6
+<path fill="#aaa" d="M32.7,52.6l17.3-16.5c0.2-0.2,5.9-5.4,5.9-11.6c0-7.5-4.6-12-12.4-12c-4.5,0-8.8,3.5-10.8,5.6c-2-2-6.3-5.6-10.8-5.6
 	c-7.8,0-12.4,4.5-12.4,12c0,6.2,5.7,11.3,5.9,11.5L32.7,52.6z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-19.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <path class="st0" d="M9,29.5h46.5v5H9V29.5z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-20.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <g>
 	<polygon id="XMLID_2_" class="st0" points="55.5,30 35,30 35,9.5 30,9.5 30,30 9.5,30 9.5,35 30,35 30,55.5 35,55.5 35,35 55.5,35 

apps/common/mobile/resources/img/shapes/shape-21.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <path class="st0" d="M14.5,9H61L51,55.5H4.5L14.5,9z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-22.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <path class="st0" d="M9,11h46.5v36.5H30l-6,6l-5.9-6H9V11z"/>
 </svg>

apps/common/mobile/resources/img/shapes/shape-23.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <g>
 	<path id="XMLID_2_" class="st0" d="M32.8,13C19.9,13,9.5,20.7,9.5,30.2c0,6,4.1,11.2,10.2,14.3c-0.1,0.6-0.3,1.2-0.5,2

apps/common/mobile/resources/img/shapes/shape-24.svg

@@ -4,6 +4,7 @@
 	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+        .st0{fill:#aaa;}
 </style>
 <path class="st0" d="M55.5,38.1c0,5.1-4.1,9.2-9.2,9.2c-1.4,0-2.7-0.3-3.9-0.9c-2,3.1-5.5,5.2-9.5,5.2c-3.8,0-7.2-1.9-9.2-4.8
 	c-1.3,1.2-3,2-4.9,2c-3.9,0-7-3.2-7-7.1c0-2.5,1.3-4.6,3.1-5.9c-3.4-0.8-6-3.9-6-7.5c0-4.3,3.5-7.8,7.7-7.8c0.8,0,1.5,0.1,2.1,0.3

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

@@ -0,0 +1,68 @@
+
+.icon-redefine (@name; @svgres) {
+    i.icon {
+        &.@{name} {
+            background-color: transparent;
+            -webkit-mask-image: none;
+            .encoded-svg-background(@svgres);
+        }
+    }
+}
+
+.shape-icon-redefine(@type, @svgname) {
+    .thumb {
+        -webkit-mask-image: none !important;
+    }
+
+    [data-type=@{type}] .thumb {
+        background-image: url('../img/shapes/@{svgname}');
+        background-color: transparent;
+    }
+}
+
+
+.sailfish {
+    .icon-redefine(icon-text-align-center, '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{themeColor}"><g><path d="M1,3v1h21V3H1z M4,7v1h14V7H4z M1,12h21v-1H1V12z M4,15v1h14v-1H4z M1,20h21v-1H1V20z"/></g></svg>');
+    .icon-redefine(icon-text-align-jast, '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{themeColor}"><g><path d="M1,3v1h21V3H1z M1,8h21V7H1V8z M1,12h21v-1H1V12z M1,16h21v-1H1V16z M1,20h21v-1H1V20z"/></g></svg>');
+    .icon-redefine(icon-text-align-left, '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{themeColor}"><g><path d="M1,3v1h21V3H1z M15,7H1v1h14V7z M1,12h21v-1H1V12z M15,15H1v1h14V15z M1,20h21v-1H1V20z"/></g></svg>');
+    .icon-redefine(icon-text-align-right, '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{themeColor}"><g><path d="M1,3v1h21V3H1z M8,8h14V7H8V8z M22,11H1v1h21V11z M8,16h14v-1H8V16z M22,19H1v1h21V19z"/></g></svg>');
+    .icon-redefine(icon-de-indent, '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{themeColor}"><g><path d="M1,20v-1h21v1H1z M11,15h11v1H11V15z M11,11h11v1H11V11z M11,7h11v1H11V7z M6.3,7L7,7.7l-3.8,3.8L7,15.3L6.3,16L2,11.8l-0.2-0.3L2,11.2L6.3,7z M1,3h21v1H1V3z"/></g></svg>');
+    .icon-redefine(icon-in-indent, '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{themeColor}"><g><path d="M1,20v-1h21v1H1z M12,16H1v-1h11V16z M12,12H1v-1h11V12z M12,8H1V7h11V8z M21,11.2l0.2,0.3L21,11.8L16.7,16L16,15.3l3.8-3.8L16,7.7L16.7,7L21,11.2z M22,4H1V3h21V4z"/></g></svg>');
+    .icon-redefine(icon-block-align-left, '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28" fill="@{themeColor}"><g><rect x="1" y="1" width="26" height="1"/><rect x="1" y="4" width="26" height="1"/><rect x="1" y="25" width="26" height="1"/><rect x="1" y="22" width="26" height="1"/><rect x="1" y="8" width="12" height="11"/></g></svg>');
+    .icon-redefine(icon-block-align-center, '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28" fill="@{themeColor}"><g><rect y="1" width="26" height="1"/><rect y="4" width="26" height="1"/><rect y="25" width="26" height="1"/><rect y="22" width="26" height="1"/><rect x="7" y="8.08" width="12" height="10.92"/></g></svg>');
+    .icon-redefine(icon-block-align-right, '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28" fill="@{themeColor}"><g><rect x="1" y="1" width="26" height="1"/><rect x="1" y="4" width="26" height="1"/><rect x="1" y="25" width="26" height="1"/><rect x="1" y="22" width="26" height="1"/><rect x="15" y="8" width="12" height="11"/></g></svg>');
+    .icon-redefine(icon-text-valign-top, '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{themeColor}"><g><rect x="2" y="2" width="19" height="1"/><rect x="2" y="4" width="19" height="1"/><polygon points="12 18 11 18 11 7.83 8.65 9.8 8 8.94 11.5 6 15 9 14.35 9.8 12 7.83 12 18"/></g></svg>');
+    .icon-redefine(icon-text-valign-middle, '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{themeColor}"><g><rect x="2" y="10" width="19" height="1"/><rect x="2" y="12" width="19" height="1"/><polygon points="11 2 12 2 12 7.17 14.35 5.2 15 6.06 11.5 9 8 6 8.65 5.2 11 7.17 11 2"/><polygon points="12 21 11 21 11 15.83 8.65 17.8 8 16.94 11.5 14 15 17 14.35 17.8 12 15.83 12 21"/></g></svg>');
+    .icon-redefine(icon-text-valign-bottom,'<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{themeColor}"><g><rect x="2" y="18" width="19" height="1"/><rect x="2" y="20" width="19" height="1"/><polygon points="11 4 12 4 12 15.17 14.35 13.2 15 14.06 11.5 17 8 14 8.65 13.2 11 15.17 11 4"/></g></svg>');
+
+    .item-content.buttons .item-inner > .row .button.active {
+        background-color: @themeColorLight;
+    }
+
+    .dataview.shapes {
+        .shape-icon-redefine(textRect,'shape-01.svg');
+        .shape-icon-redefine(line,'shape-02.svg');
+        .shape-icon-redefine(lineWithArrow,'shape-03.svg');
+        .shape-icon-redefine(lineWithTwoArrows,'shape-04.svg');
+        .shape-icon-redefine(rect,'shape-05.svg');
+        .shape-icon-redefine(hexagon,'shape-06.svg');
+        .shape-icon-redefine(roundRect,'shape-07.svg');
+        .shape-icon-redefine(ellipse,'shape-08.svg');
+        .shape-icon-redefine(triangle,'shape-09.svg');
+        .shape-icon-redefine(rtTriangle,'shape-10.svg');
+        .shape-icon-redefine(trapezoid,'shape-11.svg');
+        .shape-icon-redefine(diamond,'shape-12.svg');
+        .shape-icon-redefine(rightArrow,'shape-13.svg');
+        .shape-icon-redefine(leftRightArrow,'shape-14.svg');
+        .shape-icon-redefine(leftArrow,'shape-15.svg');
+        .shape-icon-redefine(bentUpArrow,'shape-16.svg');
+        .shape-icon-redefine(flowChartOffpageConnector,'shape-17.svg');
+        .shape-icon-redefine(heart,'shape-18.svg');
+        .shape-icon-redefine(mathMinus,'shape-19.svg');
+        .shape-icon-redefine(mathPlus,'shape-20.svg');
+        .shape-icon-redefine(parallelogram,'shape-21.svg');
+        .shape-icon-redefine(wedgeRectCallout,'shape-22.svg');
+        .shape-icon-redefine(wedgeEllipseCallout,'shape-23.svg');
+        .shape-icon-redefine(cloudCallout,'shape-24.svg');
+    }
+}

apps/common/mobile/utils/utils.js

@@ -111,4 +111,20 @@ define([
         // Apply Styles
         $popover.css({top: modalTop + 'px', left: modalLeft + 'px'});
     };
+
+    Common.Utils.addScrollIfNeed = function (targetSelector, containerSelector) {
+        if (Common.SharedSettings.get('sailfish')) {
+            _.delay(function(){
+                var $targetEl = $(targetSelector);
+                var $containerEl = $(containerSelector);
+                
+                if ($targetEl.length == 0 || $containerEl == 0) {
+                    return;
+                }
+
+                $containerEl.css('height', 'auto');
+                new IScroll(targetSelector);
+            }, 500);
+        }
+    }
 });

apps/documenteditor/embed/js/ApplicationController.js

@@ -394,6 +394,10 @@ var ApplicationController = new(function(){
                 message = me.errorFilePassProtect;
                 break;
 
+            case Asc.c_oAscError.ID.UserDrop:
+                message = me.errorUserDrop;
+                break;
+
             default:
                 message = me.errorDefaultMessage.replace('%1', id);
                 break;
@@ -544,6 +548,7 @@ var ApplicationController = new(function(){
         notcriticalErrorTitle   : 'Warning',
         scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.',
         errorFilePassProtect: 'The file is password protected and cannot be opened.',
-        errorAccessDeny: 'You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.'
+        errorAccessDeny: 'You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.',
+        errorUserDrop: 'The file cannot be accessed right now.'
     }
 })();

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

@@ -328,6 +328,7 @@ define([
             var me = this;
             (new DE.Views.BookmarksDialog({
                 api: me.api,
+                appOptions: me.toolbar.appOptions,
                 props: me.api.asc_GetBookmarksManager(),
                 handler: function (result, settings) {
                     if (settings) {

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

@@ -149,7 +149,18 @@ define([
                     "Same as Previous": this.txtSameAsPrev,
                     "Current Document": this.txtCurrentDocument,
                     "No table of contents entries found.": this.txtNoTableOfContents,
-                        "Table of Contents": this.txtTableOfContents
+                    "Table of Contents": this.txtTableOfContents,
+                    "Syntax Error": this.txtSyntaxError,
+                    "Missing Operator": this.txtMissOperator,
+                    "Missing Argument": this.txtMissArg,
+                    "Number Too Large To Format": this.txtTooLarge,
+                    "Zero Divide": this.txtZeroDivide,
+                    "Is Not In Table": this.txtNotInTable,
+                    "Index Too Large": this.txtIndTooLarge,
+                    "The Formula Not In Table": this.txtFormulaNotInTable,
+                    "Table Index Cannot be Zero": this.txtTableInd,
+                    "Undefined Bookmark": this.txtUndefBookmark,
+                    "Unexpected End of Formula": this.txtEndOfFormula
                 };
                 styleNames.forEach(function(item){
                     translate[item] = me.translationTable[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
@@ -180,7 +191,6 @@ define([
                     this.api.asc_registerCallback('asc_onPrintUrl',                 _.bind(this.onPrintUrl, this));
                     this.api.asc_registerCallback('asc_onMeta',                     _.bind(this.onMeta, this));
                     this.api.asc_registerCallback('asc_onSpellCheckInit',           _.bind(this.loadLanguages, this));
-                    this.api.asc_registerCallback('asc_onLicenseError',             _.bind(this.onPaidFeatureError, this));
 
                     Common.NotificationCenter.on('api:disconnect',                  _.bind(this.onCoAuthoringDisconnect, this));
                     Common.NotificationCenter.on('goback',                          _.bind(this.goBack, this));
@@ -351,7 +361,7 @@ define([
                     this.permissions = $.extend(this.permissions, data.doc.permissions);
 
                     var _permissions = $.extend({}, data.doc.permissions),
-                        _options = $.extend({}, data.doc.options, {actions: this.editorConfig.actionLink || {}});
+                        _options = $.extend({}, data.doc.options, this.editorConfig.actionLink || {});
 
                     var _user = new Asc.asc_CUserInfo();
                     _user.put_Id(this.appOptions.user.id);
@@ -1067,27 +1077,19 @@ define([
                             }
                         });
                     }
-                }
+                } else if (!this.appOptions.isDesktopApp && !this.appOptions.canBrandingExt &&
-            },
+                            this.editorConfig && this.editorConfig.customization && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)) {
-
+                    Common.UI.warning({
-            onPaidFeatureError: function() {
-                var buttons = [], primary,
-                    mail = (this.appOptions.canBranding) ? ((this.editorConfig && this.editorConfig.customization && this.editorConfig.customization.customer) ? this.editorConfig.customization.customer.mail : '') : '{{SALES_EMAIL}}';
-                if (mail.length>0) {
-                    buttons.push({value: 'contact', caption: this.textContactUs});
-                    primary = 'contact';
-                }
-                buttons.push({value: 'close', caption: this.textClose});
-                Common.UI.info({
                         title: this.textPaidFeature,
-                    msg  : this.textLicencePaidFeature,
+                        msg  : this.textCustomLoader,
-                    buttons: buttons,
+                        buttons: [{value: 'contact', caption: this.textContactUs}, {value: 'close', caption: this.textClose}],
-                    primary: primary,
+                        primary: 'contact',
                         callback: function(btn) {
                             if (btn == 'contact')
-                            window.open('mailto:'+mail, "_blank");
+                                window.open('mailto:sales@onlyoffice.com', "_blank");
                         }
                     });
+                }
             },
 
             onOpenDocument: function(progress) {
@@ -1237,12 +1239,15 @@ define([
                     reviewController    = application.getController('Common.Controllers.ReviewChanges');
                 reviewController.setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api);
 
-                if (this.appOptions.isEdit) {
+                if (this.appOptions.isEdit || this.appOptions.isRestrictedEdit) { // set api events for toolbar in the Restricted Editing mode
-                    var toolbarController   = application.getController('Toolbar'),
+                    var toolbarController   = application.getController('Toolbar');
-                        rightmenuController = application.getController('RightMenu'),
+                    toolbarController   && toolbarController.setApi(me.api);
+
+                    if (this.appOptions.isRestrictedEdit) return;
+
+                    var rightmenuController = application.getController('RightMenu'),
                         fontsControllers    = application.getController('Common.Controllers.Fonts');
                     fontsControllers    && fontsControllers.setApi(me.api);
-                    toolbarController   && toolbarController.setApi(me.api);
                     rightmenuController && rightmenuController.setApi(me.api);
 
                     if (this.appOptions.canProtect)
@@ -2362,7 +2367,6 @@ define([
             errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',
             textClose: 'Close',
             textPaidFeature: 'Paid feature',
-            textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.<br>If you need it, please contact Sales Department',
             scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.',
             errorEditingSaveas: 'An error occurred during the work with the document.<br>Use the \'Save as...\' option to save the file backup copy to your computer hard drive.',
             errorEditingDownloadas: 'An error occurred during the work with the document.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.',
@@ -2537,7 +2541,19 @@ define([
             txtShape_spline: 'Curve',
             txtShape_polyline1: 'Scribble',
             txtShape_polyline2: 'Freeform',
-            errorEmailClient: 'No email client could be found'
+            txtSyntaxError: 'Syntax Error',
+            txtMissOperator: 'Missing Operator',
+            txtMissArg: 'Missing Argument',
+            txtTooLarge: 'Number Too Large To Format',
+            txtZeroDivide: 'Zero Divide',
+            txtNotInTable: 'Is Not In Table',
+            txtIndTooLarge: 'Index Too Large',
+            txtFormulaNotInTable: 'The Formula Not In Table',
+            txtTableInd: 'Table Index Cannot be Zero',
+            txtUndefBookmark: 'Undefined Bookmark',
+            txtEndOfFormula: 'Unexpected End of Formula',
+            errorEmailClient: 'No email client could be found',
+            textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.'
         }
     })(), DE.Controllers.Main || {}))
 });

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

@@ -331,6 +331,7 @@ define([
         setApi: function(api) {
             this.api = api;
 
+            if (this.mode.isEdit) {
                 this.toolbar.setApi(api);
 
                 this.api.asc_registerCallback('asc_onFontSize', _.bind(this.onApiFontSize, this));
@@ -370,6 +371,11 @@ define([
                 this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this));
                 this.api.asc_registerCallback('asc_onShowParaMarks', _.bind(this.onShowParaMarks, this));
                 this.api.asc_registerCallback('asc_onChangeSdtGlobalSettings', _.bind(this.onChangeSdtGlobalSettings, this));
+            } else if (this.mode.isRestrictedEdit) {
+                this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObjectRestrictedEdit, this));
+                this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
+                Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
+            }
         },
 
         onChangeCompactView: function(view, compact) {
@@ -629,6 +635,31 @@ define([
             Common.localStorage.setItem("de-show-hiddenchars", v);
         },
 
+        onApiFocusObjectRestrictedEdit: function(selectedObjects) {
+            if (!this.editMode) return;
+
+            var i = -1, type,
+                paragraph_locked = false,
+                header_locked = false,
+                image_locked = false;
+
+            while (++i < selectedObjects.length) {
+                type = selectedObjects[i].get_ObjectType();
+
+                if (type === Asc.c_oAscTypeSelectElement.Paragraph) {
+                    paragraph_locked = selectedObjects[i].get_ObjectValue().get_Locked();
+                } else if (type === Asc.c_oAscTypeSelectElement.Header) {
+                    header_locked = selectedObjects[i].get_ObjectValue().get_Locked();
+                } else if (type === Asc.c_oAscTypeSelectElement.Image) {
+                    image_locked = selectedObjects[i].get_ObjectValue().get_Locked();
+                }
+            }
+
+            var need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked;
+            if ( this.btnsComment && this.btnsComment.length > 0 )
+                this.btnsComment.setDisabled(need_disable);
+        },
+
         onApiFocusObject: function(selectedObjects) {
             if (!this.editMode) return;
 
@@ -783,7 +814,7 @@ define([
             if (toolbar.listStylesAdditionalMenuItem && (frame_pr===undefined) !== toolbar.listStylesAdditionalMenuItem.isDisabled())
                 toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined);
 
-            need_disable = (paragraph_locked || header_locked) && this.api.can_AddQuotedComment() || image_locked;
+            need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked;
             if ( this.btnsComment && this.btnsComment.length > 0 )
                 this.btnsComment.setDisabled(need_disable);
 
@@ -2672,7 +2703,7 @@ define([
         },
 
         onApiCoAuthoringDisconnect: function(enableDownload) {
-            this.toolbar.setMode({isDisconnected:true, enableDownload: !!enableDownload});
+            this.mode.isEdit && this.toolbar.setMode({isDisconnected:true, enableDownload: !!enableDownload});
             this.editMode = false;
             this.DisableToolbar(true, true);
         },

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

@@ -212,7 +212,7 @@ define([
                 if (!config.isEdit) {
                     me.header.mnuitemCompactToolbar.hide();
                     Common.NotificationCenter.on('tab:visible', _.bind(function(action, visible){
-                        if (action=='plugins' && visible) {
+                        if ((action=='plugins' || action=='review') && visible) {
                             me.header.mnuitemCompactToolbar.show();
                         }
                     }, this));

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

@@ -137,6 +137,16 @@
             <div class="separator horizontal"></div>
         </td>
     </tr>
+    <tr>
+        <td class="padding-small" colspan=2>
+            <button type="button" class="btn btn-text-default" id="table-btn-add-formula" style="width:100%;"><%= scope.textAddFormula %></button>
+        </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="table-checkbox-repeat-row"></div>

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

@@ -50,7 +50,7 @@ define([
 
     DE.Views.BookmarksDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
         options: {
-            contentWidth: 300,
+            contentWidth: 310,
             height: 360
         },
 
@@ -84,13 +84,20 @@ define([
                                     '</tr>',
                                     '<tr>',
                                         '<td class="padding-small">',
-                                        '<div id="bookmarks-list" style="width:100%; height: 130px;"></div>',
+                                        '<div id="bookmarks-list" style="width:290px; height: 130px;"></div>',
                                         '</td>',
                                     '</tr>',
                                     '<tr>',
                                         '<td class="padding-large">',
-                                            '<button type="button" class="btn btn-text-default" id="bookmarks-btn-goto" style="margin-right: 10px;">', me.textGoto,'</button>',
+                                            '<button type="button" class="btn btn-text-default" id="bookmarks-btn-goto" style="margin-right: 5px;">', me.textGoto,'</button>',
-                                            '<button type="button" class="btn btn-text-default" id="bookmarks-btn-delete" style="">', me.textDelete,'</button>',
+                                            '<div style="display: inline-block; position: relative;">',
+                                                '<button type="button" class="btn btn-text-default auto dropdown-toggle" id="bookmarks-btn-link" style="min-width: 75px;" data-toggle="dropdown">', me.textGetLink,'</button>',
+                                                '<div id="id-clip-copy-box" class="dropdown-menu" style="width: 291px; left: -80px; padding: 10px;">',
+                                                    '<div id="id-dlg-clip-copy"></div>',
+                                                    '<button id="id-dlg-copy-btn" class="btn btn-text-default" style="margin-left: 5px; width: 86px;">' + me.textCopy + '</button>',
+                                                '</div>',
+                                            '</div>',
+                                            '<button type="button" class="btn btn-text-default" id="bookmarks-btn-delete" style="float: right;">', me.textDelete,'</button>',
                                         '</td>',
                                     '</tr>',
                                     '<tr>',
@@ -111,6 +118,7 @@ define([
             this.api        = options.api;
             this.handler    = options.handler;
             this.props      = options.props;
+            this.appOptions = options.appOptions;
 
             Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
         },
@@ -124,19 +132,22 @@ define([
                 allowBlank  : true,
                 validateOnChange: true,
                 validateOnBlur: true,
-                style       : 'width: 195px;',
+                style       : 'width: 205px;',
                 value       : '',
                 maxLength: 40,
                 validation  : function(value) {
                     var exist = me.props.asc_HaveBookmark(value),
                         check = me.props.asc_CheckNewBookmarkName(value);
-                    if (exist)
+                    if (exist) {
-                        me.bookmarksList.selectRecord(me.bookmarksList.store.findWhere({value: value}));
+                        var rec = me.bookmarksList.store.findWhere({value: value});
-                    else
+                        me.bookmarksList.selectRecord(rec);
+                        me.bookmarksList.scrollToRecord(rec);
+                    } else
                         me.bookmarksList.deselectAll();
                     me.btnAdd.setDisabled(!check && !exist);
                     me.btnGoto.setDisabled(!exist);
                     me.btnDelete.setDisabled(!exist);
+                    me.btnGetLink.setDisabled(!exist);
 
                     return (check || _.isEmpty(value)) ? true : me.txtInvalidName;
                 }
@@ -160,7 +171,7 @@ define([
             this.bookmarksList = new Common.UI.ListView({
                 el: $('#bookmarks-list', this.$window),
                 store: new Common.UI.DataViewStore(),
-                itemTemplate: _.template('<div id="<%= id %>" class="list-item" style="pointer-events:none;"><%= value %></div>')
+                itemTemplate: _.template('<div id="<%= id %>" class="list-item" style="pointer-events:none;overflow: hidden; text-overflow: ellipsis;"><%= value %></div>')
             });
             this.bookmarksList.store.comparator = function(rec) {
                 return (me.radioName.getValue() ? rec.get("value") : rec.get("location"));
@@ -173,7 +184,7 @@ define([
                 el: $('#bookmarks-btn-add'),
                 disabled: true
             });
-            this.$window.find('#bookmarks-btn-add').on('click', _.bind(this.onDlgBtnClick, this));
+            this.btnAdd.on('click', _.bind(this.addBookmark, this));
 
             this.btnGoto = new Common.UI.Button({
                 el: $('#bookmarks-btn-goto'),
@@ -187,6 +198,12 @@ define([
             });
             this.btnDelete.on('click', _.bind(this.deleteBookmark, this));
 
+            this.btnGetLink = new Common.UI.Button({
+                el: $('#bookmarks-btn-link'),
+                disabled: true
+            });
+            this.btnGetLink.on('click', _.bind(this.getBookmarkLink, this));
+
             this.chHidden = new Common.UI.CheckBox({
                 el: $('#bookmarks-checkbox-hidden'),
                 labelText: this.textHidden,
@@ -194,6 +211,37 @@ define([
             });
             this.chHidden.on('change', _.bind(this.onChangeHidden, this));
 
+            if (this.appOptions.canMakeActionLink) {
+                var inputCopy = new Common.UI.InputField({
+                    el          : $('#id-dlg-clip-copy'),
+                    editable    : false,
+                    style       : 'width: 176px;'
+                });
+
+                var copyBox = this.$window.find('#id-clip-copy-box');
+                copyBox.on('click', _.bind(function() {
+                    return false;
+                }, this));
+                copyBox.parent().on({
+                    'shown.bs.dropdown': function () {
+                        _.delay(function(){
+                            inputCopy._input.select().focus();
+                        },100);
+                    },
+                    'hide.bs.dropdown': function () {
+                        me.txtName._input.select().focus();
+                    }
+                });
+                copyBox.find('button').on('click', function() {
+                    inputCopy._input.select();
+                    document.execCommand("copy");
+                });
+
+                Common.Gateway.on('setactionlink', function (url) {
+                    inputCopy.setValue(url);
+                });
+            }
+
             this.afterRender();
         },
 
@@ -206,8 +254,7 @@ define([
 
             var me = this;
             _.delay(function(){
-                var input = $('input', me.txtName.cmpEl).select();
+                $('input', me.txtName.cmpEl).select().focus();
-                input.focus();
             },100);
         },
 
@@ -220,6 +267,7 @@ define([
         _setDefaults: function (props) {
             this.refreshBookmarks();
             this.bookmarksList.scrollToRecord(this.bookmarksList.selectByIndex(0));
+            this.btnGetLink.setVisible(this.appOptions.canMakeActionLink);
         },
 
         getSettings: function () {
@@ -227,11 +275,6 @@ define([
         },
 
         onDlgBtnClick: function(event) {
-            var state = (typeof(event) == 'object') ? event.currentTarget.attributes['result'].value : event;
-            if (state == 'add') {
-                this.props.asc_AddBookmark(this.txtName.getValue());
-            }
-
             this.close();
         },
 
@@ -266,6 +309,7 @@ define([
             this.btnAdd.setDisabled(false);
             this.btnGoto.setDisabled(false);
             this.btnDelete.setDisabled(false);
+            this.btnGetLink.setDisabled(false);
         },
 
         gotoBookmark: function(btn, eOpts){
@@ -275,6 +319,14 @@ define([
             }
         },
 
+        addBookmark: function(btn, eOpts){
+            this.props.asc_AddBookmark(this.txtName.getValue());
+            this.refreshBookmarks();
+            var rec = this.bookmarksList.store.findWhere({value: this.txtName.getValue()});
+            this.bookmarksList.selectRecord(rec);
+            this.bookmarksList.scrollToRecord(rec);
+        },
+
         onDblClickBookmark: function(listView, itemView, record) {
             this.props.asc_SelectBookmark(record.get('value'));
         },
@@ -290,6 +342,20 @@ define([
                 this.btnAdd.setDisabled(true);
                 this.btnGoto.setDisabled(true);
                 this.btnDelete.setDisabled(true);
+                this.btnGetLink.setDisabled(true);
+            }
+        },
+
+        getBookmarkLink: function(btn) {
+            if (btn.cmpEl && btn.cmpEl.parent().hasClass('open')) return;
+
+            var rec = this.bookmarksList.getSelectedRec();
+            if (rec.length>0) {
+                Common.Gateway.requestMakeActionLink({
+                                                        action: {
+                                                            type: "bookmark", data: rec[0].get('value')
+                                                        }
+                                                    });
             }
         },
 
@@ -314,7 +380,9 @@ define([
         textDelete: 'Delete',
         textClose: 'Close',
         textHidden: 'Hidden bookmarks',
-        txtInvalidName: 'Bookmark name can only contain letters, digits and underscores, and should begin with the letter'
+        txtInvalidName: 'Bookmark name can only contain letters, digits and underscores, and should begin with the letter',
+        textGetLink: 'Get Link',
+        textCopy: 'Copy'
 
     }, DE.Views.BookmarksDialog || {}))
 });

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

@@ -186,7 +186,14 @@ define([
             this.btnColor = new Common.UI.ColorButton({
                 style: "width:45px;",
                 menu        : new Common.UI.Menu({
+                    additionalAlign: this.menuAddAlign,
                     items: [
+                        {
+                            id: 'control-settings-system-color',
+                            caption: this.textSystemColor,
+                            template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 -7px; background-color: #dcdcdc;"></span><%= caption %></a>')
+                        },
+                        {caption: '--'},
                         { template: _.template('<div id="control-settings-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
                         { template: _.template('<a id="control-settings-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }
                     ]
@@ -201,7 +208,8 @@ define([
             });
             this.btnColor.render( $('#control-settings-color-btn'));
             this.btnColor.setColor('000000');
-            this.btnColor.menu.items[1].on('click',  _.bind(this.addNewColor, this, this.colors, this.btnColor));
+            this.btnColor.menu.items[3].on('click',  _.bind(this.addNewColor, this, this.colors, this.btnColor));
+            $('#control-settings-system-color').on('click', _.bind(this.onSystemColor, this));
 
             this.btnApplyAll = new Common.UI.Button({
                 el: $('#control-settings-btn-all')
@@ -223,7 +231,9 @@ define([
 
         onColorsSelect: function(picker, color) {
             this.btnColor.setColor(color);
-            this._isCanApplyColor = true;
+            var clr_item = this.btnColor.menu.$el.find('#control-settings-system-color > a');
+            clr_item.hasClass('selected') && clr_item.removeClass('selected');
+            this.isSystemColor = false;
         },
 
         updateThemeColors: function() {
@@ -234,6 +244,15 @@ define([
             picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
         },
 
+        onSystemColor: function(e) {
+            var color = Common.Utils.ThemeColor.getHexColor(220, 220, 220);
+            this.btnColor.setColor(color);
+            this.colors.clearSelection();
+            var clr_item = this.btnColor.menu.$el.find('#control-settings-system-color > a');
+            !clr_item.hasClass('selected') && clr_item.addClass('selected');
+            this.isSystemColor = true;
+        },
+
         afterRender: function() {
             this.updateThemeColors();
             this._setDefaults(this.props);
@@ -255,10 +274,17 @@ define([
                 (val!==null && val!==undefined) && this.cmbShow.setValue(val);
 
                 val = props.get_Color();
-                this._isCanApplyColor = !!val;
+                this.isSystemColor = (val===null);
-                val = (val) ? Common.Utils.ThemeColor.getHexColor(val.get_r(), val.get_g(), val.get_b()) : 'transparent';
+                if (val) {
-                this.btnColor.setColor(val);
+                    val = Common.Utils.ThemeColor.getHexColor(val.get_r(), val.get_g(), val.get_b());
                     this.colors.selectByRGB(val,true);
+                } else {
+                    this.colors.clearSelection();
+                    var clr_item = this.btnColor.menu.$el.find('#control-settings-system-color > a');
+                    !clr_item.hasClass('selected') && clr_item.addClass('selected');
+                    val = Common.Utils.ThemeColor.getHexColor(220, 220, 220);
+                }
+                this.btnColor.setColor(val);
 
                 val = props.get_Lock();
                 (val===undefined) && (val = Asc.c_oAscSdtLockType.Unlocked);
@@ -273,7 +299,9 @@ define([
             props.put_Tag(this.txtTag.getValue());
             props.put_Appearance(this.cmbShow.getValue());
 
-            if (this._isCanApplyColor) {
+            if (this.isSystemColor) {
+                props.put_Color(null);
+            } else {
                 var color = Common.Utils.ThemeColor.getRgbColor(this.colors.getColor());
                 props.put_Color(color.get_r(), color.get_g(), color.get_b());
             }
@@ -305,7 +333,9 @@ define([
             if (this.api) {
                 var props   = new AscCommon.CContentControlPr();
                 props.put_Appearance(this.cmbShow.getValue());
-                if (this._isCanApplyColor) {
+                if (this.isSystemColor) {
+                    props.put_Color(null);
+                } else {
                     var color = Common.Utils.ThemeColor.getRgbColor(this.colors.getColor());
                     props.put_Color(color.get_r(), color.get_g(), color.get_b());
                 }
@@ -327,7 +357,8 @@ define([
         textNone: 'None',
         textNewColor: 'Add New Custom Color',
         textApplyAll: 'Apply to All',
-        textAppearance: 'Appearance'
+        textAppearance: 'Appearance',
+        textSystemColor: 'System'
 
     }, DE.Views.ControlSettingsDialog || {}))
 });

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

@@ -2850,6 +2850,17 @@ define([
                 })
             });
 
+            var menuTableRefreshField = new Common.UI.MenuItem({
+                caption: me.textRefreshField
+            }).on('click', function(item, e){
+                me.api.asc_UpdateComplexField(item.options.fieldProps);
+                me.fireEvent('editcomplete', me);
+            });
+
+            var menuTableFieldSeparator = new Common.UI.MenuItem({
+                caption     : '--'
+            });
+
             this.tableMenu = new Common.UI.Menu({
                 initMenu: function(value){
                     // table properties
@@ -2858,7 +2869,7 @@ define([
 
                     var isEquation= (value.mathProps && value.mathProps.value);
 
-                    for (var i = 7; i < 22; i++) {
+                    for (var i = 7; i < 24; i++) {
                         me.tableMenu.items[i].setVisible(!isEquation);
                     }
 
@@ -2873,8 +2884,8 @@ define([
                     me.menuTableDirect270.setChecked(dir == Asc.c_oAscCellTextDirection.BTLR);
 
                     var disabled = value.tableProps.locked || (value.headerProps!==undefined && value.headerProps.locked);
-                    me.tableMenu.items[8].setDisabled(disabled);
+                    me.tableMenu.items[10].setDisabled(disabled);
-                    me.tableMenu.items[9].setDisabled(disabled);
+                    me.tableMenu.items[11].setDisabled(disabled);
 
                     if (me.api) {
                         mnuTableMerge.setDisabled(disabled || !me.api.CheckBeforeMergeCells());
@@ -2974,6 +2985,14 @@ define([
                         menuTableControlSettings.setVisible(me.mode.canEditContentControl);
                     }
                     menuTableTOC.setVisible(in_toc);
+
+                    var in_field = me.api.asc_GetCurrentComplexField();
+                    menuTableRefreshField.setVisible(!!in_field);
+                    menuTableRefreshField.setDisabled(disabled);
+                    menuTableFieldSeparator.setVisible(!!in_field);
+                    if (in_field) {
+                        menuTableRefreshField.options.fieldProps = in_field;
+                    }
                 },
                 items: [
                     me.menuSpellCheckTable,
@@ -2983,6 +3002,8 @@ define([
                     menuTablePaste,
                     { caption: '--' },
                     menuEquationSeparatorInTable,
+                    menuTableRefreshField,
+                    menuTableFieldSeparator,
                     {
                         caption     : me.selectText,
                         menu        : new Common.UI.Menu({

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

@@ -162,6 +162,7 @@ define([
             this.btnBorderColor = new Common.UI.ColorButton({
                 style: "width:45px;",
                 menu        : new Common.UI.Menu({
+                    additionalAlign: this.menuAddAlign,
                     items: [
                         { template: _.template('<div id="drop-advanced-border-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
                         { template: _.template('<a id="drop-advanced-border-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }
@@ -187,6 +188,7 @@ define([
             this.btnBackColor = new Common.UI.ColorButton({
                 style: "width:45px;",
                 menu        : new Common.UI.Menu({
+                    additionalAlign: this.menuAddAlign,
                     items: [
                         { template: _.template('<div id="drop-advanced-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
                         { template: _.template('<a id="drop-advanced-back-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }

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

@@ -212,6 +212,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             this.btnBorderColor = new Common.UI.ColorButton({
                 style: "width:45px;",
                 menu        : new Common.UI.Menu({
+                    additionalAlign: this.menuAddAlign,
                     items: [
                         { template: _.template('<div id="paragraphadv-border-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
                         { template: _.template('<a id="paragraphadv-border-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }
@@ -266,6 +267,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             this.btnBackColor = new Common.UI.ColorButton({
                 style: "width:45px;",
                 menu        : new Common.UI.Menu({
+                    additionalAlign: this.menuAddAlign,
                     items: [
                         { template: _.template('<div id="paragraphadv-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
                         { template: _.template('<a id="paragraphadv-back-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }

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

@@ -0,0 +1,247 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+/**
+ *  TableFormulaDialog.js
+ *
+ *  Created by Julia Radzhabova on 1/21/19
+ *  Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'common/main/lib/component/InputField',
+    'common/main/lib/component/Window'
+], function () { 'use strict';
+
+    DE.Views.TableFormulaDialog = Common.UI.Window.extend(_.extend({
+        options: {
+            width: 300,
+            style: 'min-width: 230px;',
+            cls: 'modal-dlg'
+        },
+
+        initialize : function(options) {
+            _.extend(this.options, {
+                title: this.textTitle
+            }, options || {});
+
+            this.template = [
+                '<div class="box" style="height: 150px;">',
+                    '<div class="input-row">',
+                        '<label>' + this.textFormula + '</label>',
+                    '</div>',
+                    '<div id="id-dlg-formula-formula" class="input-row" style="margin-bottom: 5px;"></div>',
+                    '<div class="input-row">',
+                        '<label>' + this.textFormat + '</label>',
+                    '</div>',
+                    '<div id="id-dlg-formula-format" class="input-row" style="margin-bottom: 20px;"></div>',
+                    '<div class="input-row">',
+                        '<div id="id-dlg-formula-function" style="display: inline-block; width: 50%; padding-right: 10px; float: left;"></div>',
+                        '<div id="id-dlg-formula-bookmark" style="display: inline-block; width: 50%;"></div>',
+                    '</div>',
+                    '</div>',
+                '<div class="footer right">',
+                    '<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px;">' + this.okButtonText + '</button>',
+                    '<button class="btn normal dlg-btn" result="cancel">' + this.cancelButtonText + '</button>',
+                '</div>'
+            ].join('');
+
+            this.options.tpl = _.template(this.template)(this.options);
+            this.bookmarks = this.options.bookmarks;
+            this.api = this.options.api;
+
+            Common.UI.Window.prototype.initialize.call(this, this.options);
+        },
+
+        render: function() {
+            Common.UI.Window.prototype.render.call(this);
+
+            var me = this,
+                $window = this.getChild();
+
+            this.inputFormula = new Common.UI.InputField({
+                el          : $('#id-dlg-formula-formula'),
+                allowBlank  : true,
+                validateOnChange: true,
+                style       : 'width: 100%;'
+            }).on('changing', _.bind(this.checkFormulaInput, this));
+
+            this.cmbFormat = new Common.UI.ComboBox({
+                el          : $('#id-dlg-formula-format'),
+                cls         : 'input-group-nr',
+                menuStyle   : 'min-width: 100%; max-height: 200px;'
+            });
+
+            this.cmbFunction = new Common.UI.ComboBox({
+                el          : $('#id-dlg-formula-function'),
+                cls         : 'input-group-nr',
+                menuStyle   : 'min-width: 100%; max-height: 150px;',
+                editable    : false,
+                scrollAlwaysVisible: true,
+                data: [
+                    {displayValue: 'ABS', value: 1},
+                    {displayValue: 'AND', value: 1},
+                    {displayValue: 'AVERAGE', value: 1},
+                    {displayValue: 'COUNT', value: 1},
+                    {displayValue: 'DEFINED', value: 1},
+                    {displayValue: 'FALSE', value: 0},
+                    {displayValue: 'INT', value: 1},
+                    {displayValue: 'MAX', value: 1},
+                    {displayValue: 'MIN', value: 1},
+                    {displayValue: 'MOD', value: 1},
+                    {displayValue: 'NOT', value: 1},
+                    {displayValue: 'OR', value: 1},
+                    {displayValue: 'PRODUCT', value: 1},
+                    {displayValue: 'ROUND', value: 1},
+                    {displayValue: 'SIGN', value: 1},
+                    {displayValue: 'SUM', value: 1},
+                    {displayValue: 'TRUE', value: 0}
+                ]
+            });
+            this.cmbFunction.on('selected', _.bind(function(combo, record) {
+                combo.setValue(this.textInsertFunction);
+                var _input = me.inputFormula._input,
+                    end = _input[0].selectionEnd;
+                _input.val(_input.val().substring(0, end) + record.displayValue + (record.value ? '()' : '') + _input.val().substring(end));
+                _input.focus();
+                _input[0].selectionStart = _input[0].selectionEnd = end + record.displayValue.length + record.value;
+                this.btnOk.setDisabled(false);
+            }, this));
+            this.cmbFunction.setValue(this.textInsertFunction);
+
+            this.cmbBookmark = new Common.UI.ComboBox({
+                el          : $('#id-dlg-formula-bookmark'),
+                cls         : 'input-group-nr',
+                menuStyle   : 'min-width: 100%; max-heigh: 150px;',
+                editable    : false
+            });
+            this.cmbBookmark.on('selected', _.bind(function(combo, record) {
+                combo.setValue(this.textBookmark);
+                var _input = me.inputFormula._input,
+                    end = _input[0].selectionEnd;
+                _input.val(_input.val().substring(0, end) + record.displayValue + _input.val().substring(end));
+                _input.focus();
+                _input[0].selectionStart = _input[0].selectionEnd = end + record.displayValue.length;
+                this.btnOk.setDisabled(false);
+            }, this));
+            this.cmbBookmark.setValue(this.textBookmark);
+
+            me.btnOk = new Common.UI.Button({
+                el: $window.find('.primary')
+            });
+
+            $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+            this.afterRender();
+        },
+
+        onSelectItem: function(picker, item, record, e){
+            this.btnOk.setDisabled(record.get('level')==0 && record.get('index')>0);
+        },
+
+        show: function() {
+            Common.UI.Window.prototype.show.apply(this, arguments);
+
+            var me = this;
+            _.delay(function(){
+                me.inputFormula.cmpEl.find('input').focus();
+            },500);
+        },
+
+        afterRender: function() {
+            this.refreshBookmarks();
+            this._setDefaults();
+        },
+
+        _setDefaults: function () {
+            var arr = [];
+            _.each(this.api.asc_GetTableFormulaFormats(), function(item) {
+                arr.push({value: item, displayValue: item});
+            });
+            this.cmbFormat.setData(arr);
+            var formula = this.api.asc_ParseTableFormulaInstrLine(this.api.asc_GetTableFormula());
+            this.inputFormula.setValue(formula[0]);
+            this.cmbFormat.setValue(formula[1]);
+            this.checkFormulaInput(this.inputFormula, this.inputFormula.getValue());
+        },
+
+        refreshBookmarks: function() {
+            var arr = [];
+            if (this.bookmarks) {
+                var count = this.bookmarks.asc_GetCount();
+                for (var i=0; i<count; i++) {
+                    var name = this.bookmarks.asc_GetName(i);
+                    if (!this.bookmarks.asc_IsInternalUseBookmark(name)) {
+                        arr.push({value: i, displayValue: name});
+                    }
+                }
+                this.cmbBookmark.setData(arr);
+                this.cmbBookmark.setValue(this.textBookmark);
+            }
+            this.cmbBookmark.setDisabled(arr.length<1);
+        },
+
+        checkFormulaInput: function(cmp, newValue) {
+            var value = newValue.trim();
+            this.btnOk.setDisabled(value=='' || value == '=');
+        },
+
+        getSettings: function () {
+            return this.api.asc_CreateInstructionLine(this.inputFormula.getValue(), this.cmbFormat.getValue());
+        },
+
+        onBtnClick: function(event) {
+            this._handleInput(event.currentTarget.attributes['result'].value);
+        },
+
+        onPrimary: function(event) {
+            this._handleInput('ok');
+            return false;
+        },
+
+        _handleInput: function(state) {
+            if (this.options.handler) {
+                this.options.handler.call(this, state, this.getSettings());
+            }
+
+            this.close();
+        },
+
+        textFormula: 'Formula',
+        textFormat: 'Number Format',
+        textBookmark: 'Paste Bookmark',
+        textInsertFunction: 'Paste Function',
+        cancelButtonText:   'Cancel',
+        okButtonText:       'Ok',
+        textTitle:          'Formula Settings'
+    }, DE.Views.TableFormulaDialog || {}))
+});

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

@@ -50,7 +50,8 @@ define([
     'common/main/lib/component/ComboBorderSize',
     'common/main/lib/component/ComboDataView',
     'common/main/lib/view/InsertTableDialog',
-    'documenteditor/main/app/view/TableSettingsAdvanced'
+    'documenteditor/main/app/view/TableSettingsAdvanced',
+    'documenteditor/main/app/view/TableFormulaDialog'
 ], function (menuTemplate, $, _, Backbone) {
     'use strict';
 
@@ -419,6 +420,12 @@ define([
                 this.api.asc_DistributeTableCells(true);
             }, this));
 
+            this.btnAddFormula = new Common.UI.Button({
+                el: $('#table-btn-add-formula')
+            });
+            this.lockedControls.push(this.btnAddFormula);
+            this.btnAddFormula.on('click', _.bind(this.onAddFormula, this));
+
             this.linkAdvanced = $('#table-advanced-link');
             $(this.el).on('click', '#table-advanced-link', _.bind(this.openAdvancedSettings, this));
         },
@@ -758,6 +765,26 @@ define([
             }
         },
 
+        onAddFormula: function(e) {
+            var me = this;
+            var win;
+            if (me.api && !this._locked){
+                (new DE.Views.TableFormulaDialog(
+                {
+                    api: me.api,
+                    bookmarks: me.api.asc_GetBookmarksManager(),
+                    handler: function(result, value) {
+                        if (result == 'ok') {
+                            if (me.api) {
+                                me.api.asc_AddTableFormula(value);
+                            }
+                        }
+                        me.fireEvent('editcomplete', me);
+                    }
+                })).show();
+            }
+        },
+
         setLocked: function (locked) {
             this._locked = locked;
         },
@@ -822,7 +849,8 @@ define([
         textHeight: 'Height',
         textWidth: 'Width',
         textDistributeRows: 'Distribute rows',
-        textDistributeCols: 'Distribute columns'
+        textDistributeCols: 'Distribute columns',
+        textAddFormula: 'Add formula'
 
     }, DE.Views.TableSettings || {}));
 });

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

@@ -881,6 +881,7 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
             this.btnBorderColor = new Common.UI.ColorButton({
                 style: "width:45px;",
                 menu        : new Common.UI.Menu({
+                    additionalAlign: this.menuAddAlign,
                     items: [
                         { template: _.template('<div id="tableadv-border-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
                         { template: _.template('<a id="tableadv-border-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }
@@ -901,6 +902,7 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
             this.btnBackColor = new Common.UI.ColorButton({
                 style: "width:45px;",
                 menu        : new Common.UI.Menu({
+                    additionalAlign: this.menuAddAlign,
                     items: [
                         { template: _.template('<div id="tableadv-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
                         { template: _.template('<a id="tableadv-back-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }
@@ -921,6 +923,7 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
             this.btnTableBackColor = new Common.UI.ColorButton({
                 style: "width:45px;",
                 menu        : new Common.UI.Menu({
+                    additionalAlign: this.menuAddAlign,
                     items: [
                         { template: _.template('<div id="tableadv-table-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
                         { template: _.template('<a id="tableadv-table-back-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }

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

@@ -1373,7 +1373,7 @@ define([
 
                         var _menu = new Common.UI.Menu({
                             items: [
-                                {caption: me.textInsPageBreak},
+                                {caption: me.textInsPageBreak, value: 'page'},
                                 {caption: me.textInsColumnBreak, value: 'column'},
                                 {caption: me.textInsSectionBreak, value: 'section', menu: _menu_section_break}
                             ]

apps/documenteditor/main/locale/bg.json

@@ -14,7 +14,7 @@
   "Common.Controllers.ReviewChanges.textAtLeast": "Поне",
   "Common.Controllers.ReviewChanges.textAuto": "Автоматичен",
   "Common.Controllers.ReviewChanges.textBaseline": "Изходна",
-  "Common.Controllers.ReviewChanges.textBold": "смел",
+  "Common.Controllers.ReviewChanges.textBold": "Получер",
   "Common.Controllers.ReviewChanges.textBreakBefore": "Страницата е прекъсната преди",
   "Common.Controllers.ReviewChanges.textCaps": "Всички шапки",
   "Common.Controllers.ReviewChanges.textCenter": "Подравняване в центъра",
@@ -33,7 +33,7 @@
   "Common.Controllers.ReviewChanges.textIndentLeft": "Отстъпът наляво",
   "Common.Controllers.ReviewChanges.textIndentRight": "Отстъп надясно",
   "Common.Controllers.ReviewChanges.textInserted": "<b>Добавено:</b>",
-  "Common.Controllers.ReviewChanges.textItalic": "италийски",
+  "Common.Controllers.ReviewChanges.textItalic": "Курсив",
   "Common.Controllers.ReviewChanges.textJustify": "Изравняване по ширине",
   "Common.Controllers.ReviewChanges.textKeepLines": "Поддържайте линиите заедно",
   "Common.Controllers.ReviewChanges.textKeepNext": "Продължете със следващия",
@@ -58,7 +58,7 @@
   "Common.Controllers.ReviewChanges.textSpacing": "Разстояние",
   "Common.Controllers.ReviewChanges.textSpacingAfter": "Разстояние след",
   "Common.Controllers.ReviewChanges.textSpacingBefore": "Преди",
-  "Common.Controllers.ReviewChanges.textStrikeout": "зачеркване",
+  "Common.Controllers.ReviewChanges.textStrikeout": "Зачеркнато",
   "Common.Controllers.ReviewChanges.textSubScript": "Долен",
   "Common.Controllers.ReviewChanges.textSuperScript": "Горен индекс",
   "Common.Controllers.ReviewChanges.textTabs": "Промяна на разделите",
@@ -141,7 +141,7 @@
   "Common.Views.ExternalMergeEditor.textTitle": "Получатели на обединяване на поща",
   "Common.Views.Header.labelCoUsersDescr": "Поставяне на документа да се редактира от няколко потребители.",
   "Common.Views.Header.textAdvSettings": "Разширени настройки",
-  "Common.Views.Header.textBack": "Отидете на Документи",
+  "Common.Views.Header.textBack": "Mестоположението на файла",
   "Common.Views.Header.textCompactView": "Скриване на лентата с инструменти",
   "Common.Views.Header.textHideLines": "Скриване на владетели",
   "Common.Views.Header.textHideStatusBar": "Скриване на лентата на състоянието",
@@ -285,11 +285,11 @@
   "Common.Views.SelectFileDlg.textTitle": "Изберете Източник на данни",
   "Common.Views.SignDialog.cancelButtonText": "Откажи",
   "Common.Views.SignDialog.okButtonText": "Добре",
-  "Common.Views.SignDialog.textBold": "смел",
+  "Common.Views.SignDialog.textBold": "Получер",
   "Common.Views.SignDialog.textCertificate": "сертификат",
   "Common.Views.SignDialog.textChange": "промяна",
   "Common.Views.SignDialog.textInputName": "Въведете името на подписалия",
-  "Common.Views.SignDialog.textItalic": "италийски",
+  "Common.Views.SignDialog.textItalic": "Курсив",
   "Common.Views.SignDialog.textPurpose": "Цел за подписване на този документ",
   "Common.Views.SignDialog.textSelect": "Изберете",
   "Common.Views.SignDialog.textSelectImage": "Изберете Изображение",
@@ -342,6 +342,7 @@
   "DE.Controllers.Main.errorDefaultMessage": "Код на грешка: %1",
   "DE.Controllers.Main.errorEditingDownloadas": "Възникна грешка по време на работа с документа. <br> Използвайте опцията 'Download as ...', за да запишете архивното копие на файла на твърдия диск на компютъра.",
   "DE.Controllers.Main.errorEditingSaveas": "Възникна грешка по време на работа с документа. <br> Използвайте опцията „Запазване като ...“, за да запишете архивното копие на файла на твърдия диск на компютъра.",
+  "DE.Controllers.Main.errorEmailClient": "Не може да се намери имейл клиент.",
   "DE.Controllers.Main.errorFilePassProtect": "Файлът е защитен с парола и не може да бъде отворен.",
   "DE.Controllers.Main.errorForceSave": "При запазването на файла възникна грешка. Моля, използвайте опцията \"Изтегляне като\", за да запишете файла на твърдия диск на компютъра или опитайте отново по-късно.",
   "DE.Controllers.Main.errorKeyEncrypt": "Дескриптор на неизвестен ключ",
@@ -399,7 +400,7 @@
   "DE.Controllers.Main.textClose": "Близо",
   "DE.Controllers.Main.textCloseTip": "Кликнете, за да затворите отгоре",
   "DE.Controllers.Main.textContactUs": "Свържете се с продажбите",
-  "DE.Controllers.Main.textLicencePaidFeature": "Функцията, която се опитвате да използвате, е достъпна за разширен лиценз. <br> Ако имате нужда, моля свържете се с отдел Продажби",
+  "DE.Controllers.Main.textCustomLoader": "Моля, имайте предвид, че според условията на лиценза нямате право да сменяте товарача. <br> Моля, свържете се с нашия отдел Продажби, за да получите оферта.",
   "DE.Controllers.Main.textLoadingDocument": "Зареждане на документ",
   "DE.Controllers.Main.textNoLicenseTitle": "Ограничение за връзка ONLYOFFICE",
   "DE.Controllers.Main.textPaidFeature": "Платена функция",
@@ -420,16 +421,22 @@
   "DE.Controllers.Main.txtCurrentDocument": "Текущ документ",
   "DE.Controllers.Main.txtDiagramTitle": "Заглавие на английски диалог",
   "DE.Controllers.Main.txtEditingMode": "Задаване на режим на редактиране ...",
+  "DE.Controllers.Main.txtEndOfFormula": "Неочакван край на формулата",
   "DE.Controllers.Main.txtErrorLoadHistory": "Неуспешно зареждане на историята",
   "DE.Controllers.Main.txtEvenPage": "Дори страница",
   "DE.Controllers.Main.txtFiguredArrows": "Фигурни стрели",
   "DE.Controllers.Main.txtFirstPage": "Първа страница ",
   "DE.Controllers.Main.txtFooter": "долния",
+  "DE.Controllers.Main.txtFormulaNotInTable": "Формулата не е в таблица",
   "DE.Controllers.Main.txtHeader": "Заглавие",
+  "DE.Controllers.Main.txtIndTooLarge": "Индексът е твърде голям",
   "DE.Controllers.Main.txtLines": "линии",
   "DE.Controllers.Main.txtMath": "Математик",
+  "DE.Controllers.Main.txtMissArg": "Липсващ аргумент",
+  "DE.Controllers.Main.txtMissOperator": "Липсващ оператор",
   "DE.Controllers.Main.txtNeedSynchronize": "Имате актуализации",
   "DE.Controllers.Main.txtNoTableOfContents": "Не са намерени записи за съдържанието.",
+  "DE.Controllers.Main.txtNotInTable": "Не е в таблица",
   "DE.Controllers.Main.txtOddPage": "Нечетна страница ",
   "DE.Controllers.Main.txtOnPage": "на страница ",
   "DE.Controllers.Main.txtRectangles": "правоъгълници",
@@ -625,9 +632,14 @@
   "DE.Controllers.Main.txtStyle_Quote": "цитат",
   "DE.Controllers.Main.txtStyle_Subtitle": "подзаглавие",
   "DE.Controllers.Main.txtStyle_Title": "Заглавие",
+  "DE.Controllers.Main.txtSyntaxError": "Синтактична грешка",
+  "DE.Controllers.Main.txtTableInd": "Табличен индекс Не може да бъде нула",
   "DE.Controllers.Main.txtTableOfContents": "Съдържание",
+  "DE.Controllers.Main.txtTooLarge": "Брой твърде голям за форматиране",
+  "DE.Controllers.Main.txtUndefBookmark": "Недефинирана отметка",
   "DE.Controllers.Main.txtXAxis": "X ос",
   "DE.Controllers.Main.txtYAxis": "Y ос",
+  "DE.Controllers.Main.txtZeroDivide": "нула дивизия",
   "DE.Controllers.Main.unknownErrorText": "Неизвестна грешка.",
   "DE.Controllers.Main.unsupportedBrowserErrorText ": "Вашият браузър не се поддържа.",
   "DE.Controllers.Main.uploadImageExtMessage": "Неизвестен формат на изображението.",
@@ -989,7 +1001,9 @@
   "DE.Views.BookmarksDialog.textAdd": "Добави",
   "DE.Views.BookmarksDialog.textBookmarkName": "Име на отметката",
   "DE.Views.BookmarksDialog.textClose": "Близо",
+  "DE.Views.BookmarksDialog.textCopy": "Копирай",
   "DE.Views.BookmarksDialog.textDelete": "Изтрий",
+  "DE.Views.BookmarksDialog.textGetLink": "Получаване на връзка",
   "DE.Views.BookmarksDialog.textGoto": "Отиди на",
   "DE.Views.BookmarksDialog.textHidden": "Скрити отметки",
   "DE.Views.BookmarksDialog.textLocation": "местоположение",
@@ -1034,6 +1048,7 @@
   "DE.Views.ControlSettingsDialog.textNewColor": "Добави Нов Потребителски Цвят",
   "DE.Views.ControlSettingsDialog.textNone": "Нито един",
   "DE.Views.ControlSettingsDialog.textShowAs": "Покажете като",
+  "DE.Views.ControlSettingsDialog.textSystemColor": "Система",
   "DE.Views.ControlSettingsDialog.textTag": "свободен край",
   "DE.Views.ControlSettingsDialog.textTitle": "Настройки за контрол на съдържанието",
   "DE.Views.ControlSettingsDialog.txtLockDelete": "Контролът на съдържанието не може да бъде изтрит",
@@ -1291,7 +1306,7 @@
   "DE.Views.DropcapSettingsAdvanced.textWidth": "Ширина",
   "DE.Views.DropcapSettingsAdvanced.tipFontName": "Шрифт",
   "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "Няма граници",
-  "DE.Views.FileMenu.btnBackCaption": "Отидете на Документи",
+  "DE.Views.FileMenu.btnBackCaption": "Mестоположението на файла",
   "DE.Views.FileMenu.btnCloseMenuCaption": "Затваряне на менюто",
   "DE.Views.FileMenu.btnCreateNewCaption": "Създай нов",
   "DE.Views.FileMenu.btnDownloadCaption": "Изтеглете като ...",
@@ -1426,7 +1441,7 @@
   "DE.Views.ImageSettings.textFromFile": "От файл",
   "DE.Views.ImageSettings.textFromUrl": "От URL",
   "DE.Views.ImageSettings.textHeight": "Височина",
-  "DE.Views.ImageSettings.textHint270": "Завъртете наляво на 90 °",
+  "DE.Views.ImageSettings.textHint270": "Завъртете на 90 ° обратно на часовниковата стрелка",
   "DE.Views.ImageSettings.textHint90": "Завъртете надясно на 90 °",
   "DE.Views.ImageSettings.textHintFlipH": "Обърнете наляво-надясно",
   "DE.Views.ImageSettings.textHintFlipV": "Отрязване по вертикала",
@@ -1675,7 +1690,7 @@
   "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Отстъп и разположение",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "поставяне",
   "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Малки букви",
-  "DE.Views.ParagraphSettingsAdvanced.strStrike": "зачеркване",
+  "DE.Views.ParagraphSettingsAdvanced.strStrike": "Зачеркнато",
   "DE.Views.ParagraphSettingsAdvanced.strSubscript": "Долен",
   "DE.Views.ParagraphSettingsAdvanced.strSuperscript": "Горен индекс",
   "DE.Views.ParagraphSettingsAdvanced.strTabs": "Табуляция",
@@ -1742,8 +1757,8 @@
   "DE.Views.ShapeSettings.textFromUrl": "От URL",
   "DE.Views.ShapeSettings.textGradient": "Градиент",
   "DE.Views.ShapeSettings.textGradientFill": "Градиентно запълване",
-  "DE.Views.ShapeSettings.textHint270": "Завъртете наляво на 90 °",
+  "DE.Views.ShapeSettings.textHint270": "Завъртете на 90 ° обратно на часовниковата стрелка",
-  "DE.Views.ShapeSettings.textHint90": "Завъртете надясно на 90 °",
+  "DE.Views.ShapeSettings.textHint90": "Завъртете на 90 ° по посока на часовниковата стрелка",
   "DE.Views.ShapeSettings.textHintFlipH": "Обърнете наляво-надясно",
   "DE.Views.ShapeSettings.textHintFlipV": "Отрязване по вертикала",
   "DE.Views.ShapeSettings.textImageTexture": "Картина или текстура",
@@ -1808,6 +1823,13 @@
   "DE.Views.StyleTitleDialog.textTitle": "Заглавие",
   "DE.Views.StyleTitleDialog.txtEmpty": "Това поле е задължително",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "Полето не трябва да е празно",
+  "DE.Views.TableFormulaDialog.cancelButtonText": "Отказ",
+  "DE.Views.TableFormulaDialog.okButtonText    ": "Добре",
+  "DE.Views.TableFormulaDialog.textBookmark": "Поставяне на отметката",
+  "DE.Views.TableFormulaDialog.textFormat": "Формат на номера",
+  "DE.Views.TableFormulaDialog.textFormula": "формула",
+  "DE.Views.TableFormulaDialog.textInsertFunction": "Функция за поставяне",
+  "DE.Views.TableFormulaDialog.textTitle": "Настройки на формулата",
   "DE.Views.TableOfContentsSettings.cancelButtonText": "Откажи",
   "DE.Views.TableOfContentsSettings.okButtonText    ": "Добре",
   "DE.Views.TableOfContentsSettings.strAlign": "Надясно подравнете номерата на страниците",
@@ -1843,6 +1865,7 @@
   "DE.Views.TableSettings.splitCellsText": "Разделяне на клетка ...",
   "DE.Views.TableSettings.splitCellTitleText": "Разделена клетка",
   "DE.Views.TableSettings.strRepeatRow": "Повторете като заглавен ред в горната част на всяка страница",
+  "DE.Views.TableSettings.textAddFormula": "Добавете формула",
   "DE.Views.TableSettings.textAdvanced": "Показване на разширените настройки",
   "DE.Views.TableSettings.textBackColor": "Цвят на фона",
   "DE.Views.TableSettings.textBanded": "на ивици",
@@ -2009,7 +2032,7 @@
   "DE.Views.Toolbar.textArea": "площ",
   "DE.Views.Toolbar.textAutoColor": "автоматичен",
   "DE.Views.Toolbar.textBar": "бар",
-  "DE.Views.Toolbar.textBold": "смел",
+  "DE.Views.Toolbar.textBold": "Получер",
   "DE.Views.Toolbar.textBottom": "Долу:",
   "DE.Views.Toolbar.textCharts": "Графики",
   "DE.Views.Toolbar.textColumn": "Колона",
@@ -2028,7 +2051,7 @@
   "DE.Views.Toolbar.textInsPageBreak": "Вмъкване на прекъсване на страницата",
   "DE.Views.Toolbar.textInsSectionBreak": "Вмъкване на разделителна секция",
   "DE.Views.Toolbar.textInText": "В текст",
-  "DE.Views.Toolbar.textItalic": "италийски",
+  "DE.Views.Toolbar.textItalic": "Курсив",
   "DE.Views.Toolbar.textLandscape": "пейзаж",
   "DE.Views.Toolbar.textLeft": "Наляво: ",
   "DE.Views.Toolbar.textLine": "линия",
@@ -2053,7 +2076,7 @@
   "DE.Views.Toolbar.textRichControl": "Вмъкване на контрол върху съдържанието на богатия текст",
   "DE.Views.Toolbar.textRight": "Дясно: ",
   "DE.Views.Toolbar.textStock": "Наличност",
-  "DE.Views.Toolbar.textStrikeout": "зачеркване",
+  "DE.Views.Toolbar.textStrikeout": "Зачеркнато",
   "DE.Views.Toolbar.textStyleMenuDelete": "Изтриване на стил",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Изтрийте всички персонализирани стилове",
   "DE.Views.Toolbar.textStyleMenuNew": "Нов стил от избора",

apps/documenteditor/main/locale/de.json

@@ -342,6 +342,7 @@
   "DE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1",
   "DE.Controllers.Main.errorEditingDownloadas": "Bei der Arbeit mit dem Dokument ist ein Fehler aufgetreten. <br> Verwenden Sie die Option 'Herunterladen als ...', um die Sicherungskopie der Datei auf der Festplatte Ihres Computers zu speichern.",
   "DE.Controllers.Main.errorEditingSaveas": "Bei der Arbeit mit dem Dokument ist ein Fehler aufgetreten. <br> Verwenden Sie die Option \"Speichern als ...\", um die Sicherungskopie der Datei auf der Festplatte Ihres Computers zu speichern.",
+  "DE.Controllers.Main.errorEmailClient": "Es wurde kein E-Mail-Client gefunden.",
   "DE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.",
   "DE.Controllers.Main.errorForceSave": "Beim Speichern der Datei ist ein Fehler aufgetreten. Verwenden Sie die Option \"Herunterladen als\", um die Datei auf Ihrer Computerfestplatte zu speichern oder versuchen Sie es später erneut.",
   "DE.Controllers.Main.errorKeyEncrypt": "Unbekannter Schlüsseldeskriptor",
@@ -399,7 +400,7 @@
   "DE.Controllers.Main.textClose": "Schließen",
   "DE.Controllers.Main.textCloseTip": "Klicken Sie, um den Tipp zu schließen",
   "DE.Controllers.Main.textContactUs": "Verkaufsteam kontaktieren",
-  "DE.Controllers.Main.textLicencePaidFeature": "Die Funktion, die Sie verwenden möchten, ist für zusätzliche Lizenz verfügbar. <br> Wenden Sie sich bei Bedarf an die Verkaufsabteilung",
+  "DE.Controllers.Main.textCustomLoader": "Bitte beachten Sie, dass Sie gemäß den Lizenzbedingungen nicht berechtigt sind, den Loader zu wechseln. <br> Wenden Sie sich an unseren Vertrieb, um ein Angebot zu erhalten.",
   "DE.Controllers.Main.textLoadingDocument": "Dokument wird geladen...",
   "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE Verbindungsbeschränkung",
   "DE.Controllers.Main.textPaidFeature": "Kostenpflichtige Funktion",
@@ -420,16 +421,22 @@
   "DE.Controllers.Main.txtCurrentDocument": "Aktuelles Dokument",
   "DE.Controllers.Main.txtDiagramTitle": "Diagrammtitel",
   "DE.Controllers.Main.txtEditingMode": "Bearbeitungsmodus festlegen...",
+  "DE.Controllers.Main.txtEndOfFormula": "Unerwartetes Ende der Formel",
   "DE.Controllers.Main.txtErrorLoadHistory": "Laden der Historie ist fehlgeschlagen ",
   "DE.Controllers.Main.txtEvenPage": "Gerade Seite",
   "DE.Controllers.Main.txtFiguredArrows": "Geformte Pfeile",
   "DE.Controllers.Main.txtFirstPage": "Erste Seite",
   "DE.Controllers.Main.txtFooter": "Fußzeile",
+  "DE.Controllers.Main.txtFormulaNotInTable": "Die Formel steht nicht in einer Tabelle",
   "DE.Controllers.Main.txtHeader": "Kopfzeile",
+  "DE.Controllers.Main.txtIndTooLarge": "Zu großer Index",
   "DE.Controllers.Main.txtLines": "Linien",
   "DE.Controllers.Main.txtMath": "Mathematik",
+  "DE.Controllers.Main.txtMissArg": "Fehlendes Argument",
+  "DE.Controllers.Main.txtMissOperator": "Fehlender Operator",
   "DE.Controllers.Main.txtNeedSynchronize": "Änderungen wurden vorgenommen",
   "DE.Controllers.Main.txtNoTableOfContents": "Keine Einträge zum Inhaltsverzeichnis gefunden.",
+  "DE.Controllers.Main.txtNotInTable": "Nicht in Tabelle",
   "DE.Controllers.Main.txtOddPage": "Ungerade Seite",
   "DE.Controllers.Main.txtOnPage": "auf Seite",
   "DE.Controllers.Main.txtRectangles": "Rechtecke",
@@ -625,9 +632,14 @@
   "DE.Controllers.Main.txtStyle_Quote": "Zitat",
   "DE.Controllers.Main.txtStyle_Subtitle": "Untertitel",
   "DE.Controllers.Main.txtStyle_Title": "Titel",
+  "DE.Controllers.Main.txtSyntaxError": "Syntaxfehler",
+  "DE.Controllers.Main.txtTableInd": "Tabellenindex darf nicht Null sein",
   "DE.Controllers.Main.txtTableOfContents": "Inhaltsverzeichnis",
+  "DE.Controllers.Main.txtTooLarge": "Nummer zu groß zum Formatieren",
+  "DE.Controllers.Main.txtUndefBookmark": "Undefiniertes Lesezeichen",
   "DE.Controllers.Main.txtXAxis": "x-Achse",
   "DE.Controllers.Main.txtYAxis": "y-Achse",
+  "DE.Controllers.Main.txtZeroDivide": "Nullteilung",
   "DE.Controllers.Main.unknownErrorText": "Unbekannter Fehler.",
   "DE.Controllers.Main.unsupportedBrowserErrorText ": "Ihr Webbrowser wird nicht unterstützt.",
   "DE.Controllers.Main.uploadImageExtMessage": "Unbekanntes Bildformat.",
@@ -1125,6 +1137,8 @@
   "DE.Views.DocumentHolder.textDistributeRows": "Zeilen verteilen",
   "DE.Views.DocumentHolder.textEditControls": "Einstellungen des Inhaltssteuerelements",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Umbruchsgrenze bearbeiten",
+  "DE.Views.DocumentHolder.textFlipH": "Horizontal kippen",
+  "DE.Views.DocumentHolder.textFlipV": "Vertikal kippen",
   "DE.Views.DocumentHolder.textFromFile": "Aus Datei",
   "DE.Views.DocumentHolder.textFromUrl": "Aus URL",
   "DE.Views.DocumentHolder.textJoinList": "Mit der vorherigen Liste verbinden",
@@ -1137,6 +1151,9 @@
   "DE.Views.DocumentHolder.textRemove": "Entfernen",
   "DE.Views.DocumentHolder.textRemoveControl": "Inhaltssteuerelement entfernen",
   "DE.Views.DocumentHolder.textReplace": "Bild ersetzen",
+  "DE.Views.DocumentHolder.textRotate": "Drehen",
+  "DE.Views.DocumentHolder.textRotate270": "Um 90 ° gegen den Uhrzeigersinn drehen",
+  "DE.Views.DocumentHolder.textRotate90": "90° im UZS drehen",
   "DE.Views.DocumentHolder.textSeparateList": "Separate Liste",
   "DE.Views.DocumentHolder.textSettings": "Einstellungen",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Unten ausrichten",
@@ -1345,7 +1362,7 @@
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Andere Benutzer werden Ihre Änderungen gleichzeitig sehen",
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Sie müssen die Änderungen annehmen, bevor Sie diese sehen können",
   "DE.Views.FileMenuPanels.Settings.strFast": "Schnell",
-  "DE.Views.FileMenuPanels.Settings.strFontRender": "Hinting der Schriftarten",
+  "DE.Views.FileMenuPanels.Settings.strFontRender": "Schriftglättung",
   "DE.Views.FileMenuPanels.Settings.strForcesave": "Immer auf dem Server speichern (ansonsten auf dem Server beim Schließen des Dokuments speichern)",
   "DE.Views.FileMenuPanels.Settings.strInputMode": "Hieroglyphen einschalten",
   "DE.Views.FileMenuPanels.Settings.strLiveComment": "Live-Kommentare einschalten",
@@ -1421,8 +1438,8 @@
   "DE.Views.ImageSettings.textFromFile": "Aus Datei",
   "DE.Views.ImageSettings.textFromUrl": "Aus URL",
   "DE.Views.ImageSettings.textHeight": "Höhe",
-  "DE.Views.ImageSettings.textHint270": "Linksdrehung 90 Grad",
+  "DE.Views.ImageSettings.textHint270": "Um 90 ° gegen den Uhrzeigersinn drehen",
-  "DE.Views.ImageSettings.textHint90": "Rechtsdrehung 90 Grad",
+  "DE.Views.ImageSettings.textHint90": "90° im UZS drehen",
   "DE.Views.ImageSettings.textHintFlipH": "Horizontal kippen",
   "DE.Views.ImageSettings.textHintFlipV": "Vertikal kippen",
   "DE.Views.ImageSettings.textInsert": "Bild ersetzen",
@@ -1737,8 +1754,8 @@
   "DE.Views.ShapeSettings.textFromUrl": "Aus URL",
   "DE.Views.ShapeSettings.textGradient": "Farbverlauf",
   "DE.Views.ShapeSettings.textGradientFill": "Füllung mit Farbverlauf",
-  "DE.Views.ShapeSettings.textHint270": "Linksdrehung 90 Grad",
+  "DE.Views.ShapeSettings.textHint270": "Um 90 ° gegen den Uhrzeigersinn drehen",
-  "DE.Views.ShapeSettings.textHint90": "Rechtsdrehung 90 Grad",
+  "DE.Views.ShapeSettings.textHint90": "90° im UZS drehen",
   "DE.Views.ShapeSettings.textHintFlipH": "Horizontal kippen",
   "DE.Views.ShapeSettings.textHintFlipV": "Vertikal kippen",
   "DE.Views.ShapeSettings.textImageTexture": "Bild oder Textur",
@@ -1803,6 +1820,13 @@
   "DE.Views.StyleTitleDialog.textTitle": "Titel",
   "DE.Views.StyleTitleDialog.txtEmpty": "Dieses Feld ist erforderlich",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "Das Feld darf nicht leer sein",
+  "DE.Views.TableFormulaDialog.cancelButtonText": "Abbrechen",
+  "DE.Views.TableFormulaDialog.okButtonText    ": "OK",
+  "DE.Views.TableFormulaDialog.textBookmark": "Lesezeichen einfügen",
+  "DE.Views.TableFormulaDialog.textFormat": "Zahlenformat",
+  "DE.Views.TableFormulaDialog.textFormula": "Formula",
+  "DE.Views.TableFormulaDialog.textInsertFunction": "Funktion einfügen",
+  "DE.Views.TableFormulaDialog.textTitle": "Formel-Einstellungen",
   "DE.Views.TableOfContentsSettings.cancelButtonText": "Abbrechen",
   "DE.Views.TableOfContentsSettings.okButtonText    ": "Ok",
   "DE.Views.TableOfContentsSettings.strAlign": "Seitenzahlen rechtsbündig",
@@ -1838,6 +1862,7 @@
   "DE.Views.TableSettings.splitCellsText": "Zelle teilen...",
   "DE.Views.TableSettings.splitCellTitleText": "Zelle teilen",
   "DE.Views.TableSettings.strRepeatRow": "Gleiche Kopfzeile auf jeder Seite wiederholen",
+  "DE.Views.TableSettings.textAddFormula": "Formel hinzufügen",
   "DE.Views.TableSettings.textAdvanced": "Erweiterte Einstellungen anzeigen",
   "DE.Views.TableSettings.textBackColor": "Hintergrundfarbe",
   "DE.Views.TableSettings.textBanded": "Gestreift",

apps/documenteditor/main/locale/en.json

@@ -141,7 +141,7 @@
   "Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients",
   "Common.Views.Header.labelCoUsersDescr": "Document is currently being edited by several users.",
   "Common.Views.Header.textAdvSettings": "Advanced settings",
-  "Common.Views.Header.textBack": "Go to Documents",
+  "Common.Views.Header.textBack": "Open file location",
   "Common.Views.Header.textCompactView": "Hide Toolbar",
   "Common.Views.Header.textHideLines": "Hide Rulers",
   "Common.Views.Header.textHideStatusBar": "Hide Status Bar",
@@ -342,6 +342,7 @@
   "DE.Controllers.Main.errorDefaultMessage": "Error code: %1",
   "DE.Controllers.Main.errorEditingDownloadas": "An error occurred during the work with the document.<br>Use the 'Download as...' option to save the file backup copy to your computer hard drive.",
   "DE.Controllers.Main.errorEditingSaveas": "An error occurred during the work with the document.<br>Use the 'Save as...' option to save the file backup copy to your computer hard drive.",
+  "DE.Controllers.Main.errorEmailClient": "No email client could be found.",
   "DE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
   "DE.Controllers.Main.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
   "DE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
@@ -399,7 +400,7 @@
   "DE.Controllers.Main.textClose": "Close",
   "DE.Controllers.Main.textCloseTip": "Click to close the tip",
   "DE.Controllers.Main.textContactUs": "Contact sales",
-  "DE.Controllers.Main.textLicencePaidFeature": "The feature you are trying to use is available for extended license.<br>If you need it, please contact Sales Department",
+  "DE.Controllers.Main.textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.",
   "DE.Controllers.Main.textLoadingDocument": "Loading document",
   "DE.Controllers.Main.textNoLicenseTitle": "%1 connection limitation",
   "DE.Controllers.Main.textPaidFeature": "Paid feature",
@@ -420,16 +421,22 @@
   "DE.Controllers.Main.txtCurrentDocument": "Current Document",
   "DE.Controllers.Main.txtDiagramTitle": "Chart Title",
   "DE.Controllers.Main.txtEditingMode": "Set editing mode...",
+  "DE.Controllers.Main.txtEndOfFormula": "Unexpected End of Formula",
   "DE.Controllers.Main.txtErrorLoadHistory": "History loading failed",
   "DE.Controllers.Main.txtEvenPage": "Even Page ",
   "DE.Controllers.Main.txtFiguredArrows": "Figured Arrows",
   "DE.Controllers.Main.txtFirstPage": "First Page ",
   "DE.Controllers.Main.txtFooter": "Footer",
+  "DE.Controllers.Main.txtFormulaNotInTable": "The Formula Not In Table",
   "DE.Controllers.Main.txtHeader": "Header",
+  "DE.Controllers.Main.txtIndTooLarge": "Index Too Large",
   "DE.Controllers.Main.txtLines": "Lines",
   "DE.Controllers.Main.txtMath": "Math",
+  "DE.Controllers.Main.txtMissArg": "Missing Argument",
+  "DE.Controllers.Main.txtMissOperator": "Missing Operator",
   "DE.Controllers.Main.txtNeedSynchronize": "You have updates",
   "DE.Controllers.Main.txtNoTableOfContents": "No table of contents entries found.",
+  "DE.Controllers.Main.txtNotInTable": "Is Not In Table",
   "DE.Controllers.Main.txtOddPage": "Odd Page ",
   "DE.Controllers.Main.txtOnPage": "on page ",
   "DE.Controllers.Main.txtRectangles": "Rectangles",
@@ -625,9 +632,14 @@
   "DE.Controllers.Main.txtStyle_Quote": "Quote",
   "DE.Controllers.Main.txtStyle_Subtitle": "Subtitle",
   "DE.Controllers.Main.txtStyle_Title": "Title",
+  "DE.Controllers.Main.txtSyntaxError": "Syntax Error",
+  "DE.Controllers.Main.txtTableInd": "Table Index Cannot be Zero",
   "DE.Controllers.Main.txtTableOfContents": "Table of Contents",
+  "DE.Controllers.Main.txtTooLarge": "Number Too Large To Format",
+  "DE.Controllers.Main.txtUndefBookmark": "Undefined Bookmark",
   "DE.Controllers.Main.txtXAxis": "X Axis",
   "DE.Controllers.Main.txtYAxis": "Y Axis",
+  "DE.Controllers.Main.txtZeroDivide": "Zero Divide",
   "DE.Controllers.Main.unknownErrorText": "Unknown error.",
   "DE.Controllers.Main.unsupportedBrowserErrorText ": "Your browser is not supported.",
   "DE.Controllers.Main.uploadImageExtMessage": "Unknown image format.",
@@ -643,7 +655,6 @@
   "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.warnProcessRightsChange": "You have been denied the right to edit the file.",
-  "DE.Controllers.Main.errorEmailClient": "No email client could be found.",
   "DE.Controllers.Navigation.txtBeginning": "Beginning of document",
   "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
   "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
@@ -990,7 +1001,9 @@
   "DE.Views.BookmarksDialog.textAdd": "Add",
   "DE.Views.BookmarksDialog.textBookmarkName": "Bookmark name",
   "DE.Views.BookmarksDialog.textClose": "Close",
+  "DE.Views.BookmarksDialog.textCopy": "Copy",
   "DE.Views.BookmarksDialog.textDelete": "Delete",
+  "DE.Views.BookmarksDialog.textGetLink": "Get Link",
   "DE.Views.BookmarksDialog.textGoto": "Go to",
   "DE.Views.BookmarksDialog.textHidden": "Hidden bookmarks",
   "DE.Views.BookmarksDialog.textLocation": "Location",
@@ -1035,6 +1048,7 @@
   "DE.Views.ControlSettingsDialog.textNewColor": "Add New Custom Color",
   "DE.Views.ControlSettingsDialog.textNone": "None",
   "DE.Views.ControlSettingsDialog.textShowAs": "Show as",
+  "DE.Views.ControlSettingsDialog.textSystemColor": "System",
   "DE.Views.ControlSettingsDialog.textTag": "Tag",
   "DE.Views.ControlSettingsDialog.textTitle": "Content Control Settings",
   "DE.Views.ControlSettingsDialog.txtLockDelete": "Content control cannot be deleted",
@@ -1292,7 +1306,7 @@
   "DE.Views.DropcapSettingsAdvanced.textWidth": "Width",
   "DE.Views.DropcapSettingsAdvanced.tipFontName": "Font",
   "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "No borders",
-  "DE.Views.FileMenu.btnBackCaption": "Go to Documents",
+  "DE.Views.FileMenu.btnBackCaption": "Open file location",
   "DE.Views.FileMenu.btnCloseMenuCaption": "Close Menu",
   "DE.Views.FileMenu.btnCreateNewCaption": "Create New",
   "DE.Views.FileMenu.btnDownloadCaption": "Download as...",
@@ -1809,6 +1823,13 @@
   "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": "Cancel",
+  "DE.Views.TableFormulaDialog.okButtonText    ": "Ok",
+  "DE.Views.TableFormulaDialog.textBookmark": "Paste Bookmark",
+  "DE.Views.TableFormulaDialog.textFormat": "Number Format",
+  "DE.Views.TableFormulaDialog.textFormula": "Formula",
+  "DE.Views.TableFormulaDialog.textInsertFunction": "Paste Function",
+  "DE.Views.TableFormulaDialog.textTitle": "Formula Settings",
   "DE.Views.TableOfContentsSettings.cancelButtonText": "Cancel",
   "DE.Views.TableOfContentsSettings.okButtonText    ": "Ok",
   "DE.Views.TableOfContentsSettings.strAlign": "Right align page numbers",
@@ -1844,6 +1865,7 @@
   "DE.Views.TableSettings.splitCellsText": "Split Cell...",
   "DE.Views.TableSettings.splitCellTitleText": "Split Cell",
   "DE.Views.TableSettings.strRepeatRow": "Repeat as header row at the top of each page",
+  "DE.Views.TableSettings.textAddFormula": "Add formula",
   "DE.Views.TableSettings.textAdvanced": "Show advanced settings",
   "DE.Views.TableSettings.textBackColor": "Background Color",
   "DE.Views.TableSettings.textBanded": "Banded",

apps/documenteditor/main/locale/es.json

@@ -399,7 +399,6 @@
   "DE.Controllers.Main.textClose": "Cerrar",
   "DE.Controllers.Main.textCloseTip": "Pulse para cerrar el consejo",
   "DE.Controllers.Main.textContactUs": "Contactar con equipo de ventas",
-  "DE.Controllers.Main.textLicencePaidFeature": "Función que Usted intenta usar es disponible por la licencia avanzada.<br>Si la necesita, por favor, póngase en contacto con departamento de ventas",
   "DE.Controllers.Main.textLoadingDocument": "Cargando documento",
   "DE.Controllers.Main.textNoLicenseTitle": "Conexión ONLYOFFICE",
   "DE.Controllers.Main.textPaidFeature": "Función de pago",
@@ -1808,6 +1807,9 @@
   "DE.Views.StyleTitleDialog.textTitle": "Title",
   "DE.Views.StyleTitleDialog.txtEmpty": "Este campo es obligatorio",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "El campo no puede estar vacío",
+  "DE.Views.TableFormulaDialog.okButtonText    ": "OK",
+  "DE.Views.TableFormulaDialog.textFormat": "Formato de número",
+  "DE.Views.TableFormulaDialog.textFormula": "Fórmula",
   "DE.Views.TableOfContentsSettings.cancelButtonText": "Cancelar",
   "DE.Views.TableOfContentsSettings.okButtonText    ": "OK",
   "DE.Views.TableOfContentsSettings.strAlign": "Alinee los números de página a la derecha",

apps/documenteditor/main/locale/fr.json

@@ -342,6 +342,7 @@
   "DE.Controllers.Main.errorDefaultMessage": "Code d'erreur: %1",
   "DE.Controllers.Main.errorEditingDownloadas": "Une erreure s'est produite lors du travail avec le document.<br>Utilisez l'option 'Télécharger comme...' pour enregistrer une copie de sauvegarde du fichier sur le disque dur de votre ordinateur.",
   "DE.Controllers.Main.errorEditingSaveas": "Une erreure s'est produite lors du travail avec le document.<br>Utilisez l'option 'Enregistrer comme...' pour enregistrer une copie de sauvegarde  sur le disque dur de votre ordinateur. ",
+  "DE.Controllers.Main.errorEmailClient": "Pas de client messagerie trouvé",
   "DE.Controllers.Main.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut être ouvert.",
   "DE.Controllers.Main.errorForceSave": "Une erreur est survenue lors de l'enregistrement du fichier. Veuillez utiliser l'option «Télécharger en tant que» pour enregistrer le fichier sur le disque dur de votre ordinateur ou réessayer plus tard.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu",
@@ -399,7 +400,7 @@
   "DE.Controllers.Main.textClose": "Fermer",
   "DE.Controllers.Main.textCloseTip": "Cliquez pour fermer le conseil",
   "DE.Controllers.Main.textContactUs": "Contacter l'équipe de ventes",
-  "DE.Controllers.Main.textLicencePaidFeature": "La fonction que vouz essayez d'utiliser est disponible pour la Licence Etendue.<br>Si vous en avez besoin, veuillez  contacter Sales Department ",
+  "DE.Controllers.Main.textCustomLoader": "Veuillez noter que conformément aux clauses du contrat de licence vous n'êtes pas autorisé à changer le chargeur.<br>Veuillez contacter notre Service des Ventes pour obtenir le devis.",
   "DE.Controllers.Main.textLoadingDocument": "Chargement du document",
   "DE.Controllers.Main.textNoLicenseTitle": "Limitation de connexion ONLYOFFICE",
   "DE.Controllers.Main.textPaidFeature": "Fonction payée",
@@ -420,16 +421,22 @@
   "DE.Controllers.Main.txtCurrentDocument": "Document actuel",
   "DE.Controllers.Main.txtDiagramTitle": "Titre du graphique",
   "DE.Controllers.Main.txtEditingMode": "Définissez le mode d'édition...",
+  "DE.Controllers.Main.txtEndOfFormula": "Fin de Formule Inattendue.",
   "DE.Controllers.Main.txtErrorLoadHistory": "Chargement de histoire a échoué",
   "DE.Controllers.Main.txtEvenPage": "Page paire",
   "DE.Controllers.Main.txtFiguredArrows": "Flèches figurées",
   "DE.Controllers.Main.txtFirstPage": "Première Page",
   "DE.Controllers.Main.txtFooter": "Pied de page",
+  "DE.Controllers.Main.txtFormulaNotInTable": "La formule n'est pas dans le tableau",
   "DE.Controllers.Main.txtHeader": "En-tête",
+  "DE.Controllers.Main.txtIndTooLarge": "Index trop long",
   "DE.Controllers.Main.txtLines": "Lignes",
   "DE.Controllers.Main.txtMath": "Maths",
+  "DE.Controllers.Main.txtMissArg": "Argument Manquant",
+  "DE.Controllers.Main.txtMissOperator": "Operateur Manquant",
   "DE.Controllers.Main.txtNeedSynchronize": "Vous avez des mises à jour",
   "DE.Controllers.Main.txtNoTableOfContents": "Aucune entrée de table des matières trouvée.",
+  "DE.Controllers.Main.txtNotInTable": "n'est pas dans le tableau",
   "DE.Controllers.Main.txtOddPage": "Page impaire",
   "DE.Controllers.Main.txtOnPage": "sur la page",
   "DE.Controllers.Main.txtRectangles": "Rectangles",
@@ -625,9 +632,14 @@
   "DE.Controllers.Main.txtStyle_Quote": "Citation",
   "DE.Controllers.Main.txtStyle_Subtitle": "Sous-titres",
   "DE.Controllers.Main.txtStyle_Title": "Titre",
+  "DE.Controllers.Main.txtSyntaxError": "Erreur de Syntaxe",
+  "DE.Controllers.Main.txtTableInd": "Index d'un Tableau Ne Peut Pas Être Zero",
   "DE.Controllers.Main.txtTableOfContents": "Table des matières",
+  "DE.Controllers.Main.txtTooLarge": "Nom Trop Grand Pour Formater",
+  "DE.Controllers.Main.txtUndefBookmark": "Signet indéterminé ",
   "DE.Controllers.Main.txtXAxis": "Axe X",
   "DE.Controllers.Main.txtYAxis": "Axe Y",
+  "DE.Controllers.Main.txtZeroDivide": "Division par Zéro",
   "DE.Controllers.Main.unknownErrorText": "Erreur inconnue.",
   "DE.Controllers.Main.unsupportedBrowserErrorText ": "Votre navigateur n'est pas pris en charge.",
   "DE.Controllers.Main.uploadImageExtMessage": "Format d'image inconnu.",
@@ -989,7 +1001,9 @@
   "DE.Views.BookmarksDialog.textAdd": "Ajouter",
   "DE.Views.BookmarksDialog.textBookmarkName": "Nom du signet",
   "DE.Views.BookmarksDialog.textClose": "Fermer",
+  "DE.Views.BookmarksDialog.textCopy": "Copier",
   "DE.Views.BookmarksDialog.textDelete": "Supprimer",
+  "DE.Views.BookmarksDialog.textGetLink": "Obtenir le lien",
   "DE.Views.BookmarksDialog.textGoto": "Aller à",
   "DE.Views.BookmarksDialog.textHidden": "Signets cachés",
   "DE.Views.BookmarksDialog.textLocation": "Emplacement",
@@ -1034,6 +1048,7 @@
   "DE.Views.ControlSettingsDialog.textNewColor": "Couleur personnalisée",
   "DE.Views.ControlSettingsDialog.textNone": "Aucun",
   "DE.Views.ControlSettingsDialog.textShowAs": "Afficher comme ",
+  "DE.Views.ControlSettingsDialog.textSystemColor": "Système",
   "DE.Views.ControlSettingsDialog.textTag": "Tag",
   "DE.Views.ControlSettingsDialog.textTitle": "Paramètres de contrôle du contenu",
   "DE.Views.ControlSettingsDialog.txtLockDelete": "Le contrôle du contenu ne peut pas être supprimé",
@@ -1808,6 +1823,13 @@
   "DE.Views.StyleTitleDialog.textTitle": "Titre",
   "DE.Views.StyleTitleDialog.txtEmpty": "Ce champ est obligatoire",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "Le champ ne doit pas être vide",
+  "DE.Views.TableFormulaDialog.cancelButtonText": "Annuler",
+  "DE.Views.TableFormulaDialog.okButtonText    ": "OK",
+  "DE.Views.TableFormulaDialog.textBookmark": "Coller Signet ",
+  "DE.Views.TableFormulaDialog.textFormat": "Format de nombre",
+  "DE.Views.TableFormulaDialog.textFormula": "Formule",
+  "DE.Views.TableFormulaDialog.textInsertFunction": "Coller Fonction",
+  "DE.Views.TableFormulaDialog.textTitle": "Paramètres de formule",
   "DE.Views.TableOfContentsSettings.cancelButtonText": "Annuler",
   "DE.Views.TableOfContentsSettings.okButtonText    ": "Ok",
   "DE.Views.TableOfContentsSettings.strAlign": "Aligner les numéros de page à droite",
@@ -1843,6 +1865,7 @@
   "DE.Views.TableSettings.splitCellsText": "Fractionner la cellule...",
   "DE.Views.TableSettings.splitCellTitleText": "Fractionner la cellule",
   "DE.Views.TableSettings.strRepeatRow": "Répéter en haut de chaque page en tant que ligne d'en-tête",
+  "DE.Views.TableSettings.textAddFormula": "Ajouter une formule",
   "DE.Views.TableSettings.textAdvanced": "Afficher les paramètres avancés",
   "DE.Views.TableSettings.textBackColor": "Couleur d'arrière-plan",
   "DE.Views.TableSettings.textBanded": "Bordé",

apps/documenteditor/main/locale/hu.json

@@ -399,7 +399,6 @@
   "DE.Controllers.Main.textClose": "Bezár",
   "DE.Controllers.Main.textCloseTip": "Kattintson, a tippek bezárásához",
   "DE.Controllers.Main.textContactUs": "Értékesítés elérhetősége",
-  "DE.Controllers.Main.textLicencePaidFeature": "A funkció, amelyet használni kíván, kiterjesztett licenchez érhető el.<br>Ha szüksége van rá, forduljon az értékesítéshez",
   "DE.Controllers.Main.textLoadingDocument": "Dokumentum betöltése",
   "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE kapcsolódási limitáció",
   "DE.Controllers.Main.textPaidFeature": "Fizetett funkció",
@@ -439,13 +438,18 @@
   "DE.Controllers.Main.txtShape_actionButtonBackPrevious": "Vissza vagy előző gomb",
   "DE.Controllers.Main.txtShape_actionButtonBeginning": "Kezdő gomb",
   "DE.Controllers.Main.txtShape_actionButtonBlank": "Inaktív gomb",
+  "DE.Controllers.Main.txtShape_actionButtonDocument": "Dokumentum gomb",
+  "DE.Controllers.Main.txtShape_actionButtonEnd": "Vége gomb",
+  "DE.Controllers.Main.txtShape_actionButtonForwardNext": "Előre, vagy következő gomb",
   "DE.Controllers.Main.txtShape_arc": "Körív",
   "DE.Controllers.Main.txtShape_bentArrow": "Hajlított nyíl",
+  "DE.Controllers.Main.txtShape_bentConnector5": "Könyökcsatlakozó",
   "DE.Controllers.Main.txtShape_bentConnector5WithArrow": "Tört összekötő nyíl",
   "DE.Controllers.Main.txtShape_bentConnector5WithTwoArrows": "Tört dupla összekötő nyíl",
   "DE.Controllers.Main.txtShape_bentUpArrow": "Felhajlított nyíl",
   "DE.Controllers.Main.txtShape_bevel": "Tompaszög",
   "DE.Controllers.Main.txtShape_blockArc": "Körív blokk",
+  "DE.Controllers.Main.txtShape_bracePair": "Dupla zárójel",
   "DE.Controllers.Main.txtShape_can": "Henger",
   "DE.Controllers.Main.txtShape_chevron": "Szarufa",
   "DE.Controllers.Main.txtShape_chord": "Akkord",
@@ -461,9 +465,48 @@
   "DE.Controllers.Main.txtShape_curvedLeftArrow": "Balra ívelt nyíl",
   "DE.Controllers.Main.txtShape_curvedRightArrow": "Jobbra ívelt nyíl",
   "DE.Controllers.Main.txtShape_curvedUpArrow": "Felfele ívelt nyíl",
+  "DE.Controllers.Main.txtShape_decagon": "Tízszög",
+  "DE.Controllers.Main.txtShape_diagStripe": "Átlós sáv",
+  "DE.Controllers.Main.txtShape_diamond": "Gyémánt",
+  "DE.Controllers.Main.txtShape_dodecagon": "Tizenkétszög",
+  "DE.Controllers.Main.txtShape_donut": "Fánk",
+  "DE.Controllers.Main.txtShape_doubleWave": "Dupla hullám",
   "DE.Controllers.Main.txtShape_downArrow": "Lefele nyíl",
   "DE.Controllers.Main.txtShape_downArrowCallout": "Jelmagyarázat lefelé",
+  "DE.Controllers.Main.txtShape_ellipse": "Ellipszis",
   "DE.Controllers.Main.txtShape_ellipseRibbon": "Lefelé ívelt szalag",
+  "DE.Controllers.Main.txtShape_ellipseRibbon2": "Felfelé ívelt szalag",
+  "DE.Controllers.Main.txtShape_flowChartAlternateProcess": "Folyamatábra: alternatív folyamat",
+  "DE.Controllers.Main.txtShape_flowChartCollate": "Folyamatábra: összehasonlít",
+  "DE.Controllers.Main.txtShape_flowChartConnector": "Folyamatábra: csatlakozó",
+  "DE.Controllers.Main.txtShape_flowChartDecision": "Folyamatábra: döntés",
+  "DE.Controllers.Main.txtShape_flowChartDelay": "Folyamatábra: várakozás",
+  "DE.Controllers.Main.txtShape_flowChartDisplay": "Folyamatábra: megjelenítés",
+  "DE.Controllers.Main.txtShape_flowChartDocument": "Folyamatábra: dokumentum",
+  "DE.Controllers.Main.txtShape_flowChartExtract": "Folyamatábra: kivon",
+  "DE.Controllers.Main.txtShape_flowChartInputOutput": "Folyamatábra: adat",
+  "DE.Controllers.Main.txtShape_flowChartInternalStorage": "Folyamatábra: belső tár",
+  "DE.Controllers.Main.txtShape_flowChartMagneticDisk": "Folyamatábra: mágneslemez",
+  "DE.Controllers.Main.txtShape_flowChartMagneticDrum": "Folyamatábra: közvetlen elérés",
+  "DE.Controllers.Main.txtShape_flowChartMagneticTape": "Folyamatábra: szekvenciális elérésű tároló",
+  "DE.Controllers.Main.txtShape_flowChartManualInput": "Folyamatábra: kézi bevitel",
+  "DE.Controllers.Main.txtShape_flowChartManualOperation": "Folyamatábra: kézi művelet",
+  "DE.Controllers.Main.txtShape_flowChartMerge": "Folyamatábra: összevon",
+  "DE.Controllers.Main.txtShape_flowChartMultidocument": "Folyamatábra: multi dokumentum",
+  "DE.Controllers.Main.txtShape_flowChartOffpageConnector": "Folyamatábra: oldalon kívüli csatlakozó",
+  "DE.Controllers.Main.txtShape_flowChartOnlineStorage": "Folyamatábra: tárolt adat",
+  "DE.Controllers.Main.txtShape_flowChartOr": "Folyamatábra: vagy",
+  "DE.Controllers.Main.txtShape_flowChartPredefinedProcess": "Folyamatábra: előre definiált folyamat",
+  "DE.Controllers.Main.txtShape_flowChartPreparation": "Folyamatábra: előkészület",
+  "DE.Controllers.Main.txtShape_flowChartProcess": "Folyamatábra: folyamat",
+  "DE.Controllers.Main.txtShape_flowChartPunchedCard": "Folyamatábra: kártya",
+  "DE.Controllers.Main.txtShape_flowChartPunchedTape": "Folyamatábra: lyukasztott szalag",
+  "DE.Controllers.Main.txtShape_flowChartSort": "Folyamatábra: rendez",
+  "DE.Controllers.Main.txtShape_flowChartSummingJunction": "Folyamatábra: összefoglaló csomópont",
+  "DE.Controllers.Main.txtShape_flowChartTerminator": "Folyamatábra: megszakító",
+  "DE.Controllers.Main.txtShape_frame": "Keret",
+  "DE.Controllers.Main.txtShape_irregularSeal1": "Kitörés 1",
+  "DE.Controllers.Main.txtShape_irregularSeal2": "Kitörés 2",
   "DE.Controllers.Main.txtShape_leftArrow": "Balra nyíl",
   "DE.Controllers.Main.txtShape_leftArrowCallout": "Jelmagyarázat balra",
   "DE.Controllers.Main.txtShape_leftRightArrow": "Jobbra-balra nyíl",
@@ -472,7 +515,10 @@
   "DE.Controllers.Main.txtShape_leftUpArrow": "Balra felfele nyíl",
   "DE.Controllers.Main.txtShape_lineWithArrow": "Nyíl",
   "DE.Controllers.Main.txtShape_lineWithTwoArrows": "Dupla nyíl",
+  "DE.Controllers.Main.txtShape_mathDivide": "Osztás",
+  "DE.Controllers.Main.txtShape_mathEqual": "Egyenlő",
   "DE.Controllers.Main.txtShape_noSmoking": "\"Nem\" szimbólum",
+  "DE.Controllers.Main.txtShape_ribbon": "Dupla szalag",
   "DE.Controllers.Main.txtShape_spline": "Görbe",
   "DE.Controllers.Main.txtShape_star10": "10 pontos csillag",
   "DE.Controllers.Main.txtShape_star12": "12 pontos csillag",
@@ -1007,6 +1053,8 @@
   "DE.Views.DocumentHolder.textDistributeRows": "Sorok elosztása",
   "DE.Views.DocumentHolder.textEditControls": "Tartalomkezelő beállításai",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Tördelés határ szerkesztése",
+  "DE.Views.DocumentHolder.textFlipH": "Vízszintesen tükröz",
+  "DE.Views.DocumentHolder.textFlipV": "Függőlegesen tükröz",
   "DE.Views.DocumentHolder.textFromFile": "Fájlból",
   "DE.Views.DocumentHolder.textFromUrl": "URL-ből",
   "DE.Views.DocumentHolder.textJoinList": "Számozás, felsorolás folytatása",
@@ -1059,6 +1107,8 @@
   "DE.Views.DocumentHolder.txtDeleteEq": "Egyenlet törlése",
   "DE.Views.DocumentHolder.txtDeleteGroupChar": "Karakter törlése",
   "DE.Views.DocumentHolder.txtDeleteRadical": "Gyök törlése",
+  "DE.Views.DocumentHolder.txtDistribHor": "Vízszintes igazítás",
+  "DE.Views.DocumentHolder.txtDistribVert": "Függőleges igazítás",
   "DE.Views.DocumentHolder.txtFractionLinear": "Változtatás lineáris törtté",
   "DE.Views.DocumentHolder.txtFractionSkewed": "Változtatás ferde törtté",
   "DE.Views.DocumentHolder.txtFractionStacked": "Változtatás törtté",
@@ -1683,6 +1733,9 @@
   "DE.Views.StyleTitleDialog.textTitle": "Cím",
   "DE.Views.StyleTitleDialog.txtEmpty": "Ez egy szükséges mező",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "A mező nem lehet üres",
+  "DE.Views.TableFormulaDialog.cancelButtonText": "Mégse",
+  "DE.Views.TableFormulaDialog.textFormula": "Függvény",
+  "DE.Views.TableFormulaDialog.textTitle": "Függvény beállítások",
   "DE.Views.TableOfContentsSettings.cancelButtonText": "Mégsem",
   "DE.Views.TableOfContentsSettings.okButtonText    ": "OK",
   "DE.Views.TableOfContentsSettings.strAlign": "Jobbra rendezett oldalszámok",
@@ -1718,6 +1771,7 @@
   "DE.Views.TableSettings.splitCellsText": "Cella felosztása...",
   "DE.Views.TableSettings.splitCellTitleText": "Cella felosztása",
   "DE.Views.TableSettings.strRepeatRow": "Ismételje fejléc-sorként az egyes oldalak tetején",
+  "DE.Views.TableSettings.textAddFormula": "Képlet hozzáadása",
   "DE.Views.TableSettings.textAdvanced": "Speciális beállítások megjelenítése",
   "DE.Views.TableSettings.textBackColor": "Háttérszín",
   "DE.Views.TableSettings.textBanded": "Csíkos",
@@ -2006,6 +2060,8 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Tabulátorok",
   "DE.Views.Toolbar.tipSynchronize": "A dokumentumot egy másik felhasználó módosította. Kattintson a gombra a módosítások mentéséhez és a frissítések újratöltéséhez.",
   "DE.Views.Toolbar.tipUndo": "Vissza",
+  "DE.Views.Toolbar.txtDistribHor": "Vízszintes igazítás",
+  "DE.Views.Toolbar.txtDistribVert": "Függőleges igazítás",
   "DE.Views.Toolbar.txtMarginAlign": "Margóhoz igazít",
   "DE.Views.Toolbar.txtObjectsAlign": "A kijelölt objektumok igazítása",
   "DE.Views.Toolbar.txtPageAlign": "Laphoz igazít",

apps/documenteditor/main/locale/it.json

@@ -141,7 +141,7 @@
   "Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients",
   "Common.Views.Header.labelCoUsersDescr": "È in corso la modifica del documento da parte di più utenti.",
   "Common.Views.Header.textAdvSettings": "Impostazioni avanzate",
-  "Common.Views.Header.textBack": "Va' ai Documenti",
+  "Common.Views.Header.textBack": "Apri percorso file",
   "Common.Views.Header.textCompactView": "Mostra barra degli strumenti compatta",
   "Common.Views.Header.textHideLines": "Nascondi righelli",
   "Common.Views.Header.textHideStatusBar": "Nascondi barra di stato",
@@ -279,7 +279,9 @@
   "Common.Views.ReviewPopover.textOpenAgain": "Apri di nuovo",
   "Common.Views.ReviewPopover.textReply": "Rispondi",
   "Common.Views.ReviewPopover.textResolve": "Risolvere",
+  "Common.Views.SaveAsDlg.textLoading": "Caricamento",
   "Common.Views.SaveAsDlg.textTitle": "Cartella di salvataggio",
+  "Common.Views.SelectFileDlg.textLoading": "Caricamento",
   "Common.Views.SelectFileDlg.textTitle": "Seleziona Sorgente Dati",
   "Common.Views.SignDialog.cancelButtonText": "Annulla",
   "Common.Views.SignDialog.okButtonText": "OK",
@@ -340,6 +342,7 @@
   "DE.Controllers.Main.errorDefaultMessage": "Codice errore: %1",
   "DE.Controllers.Main.errorEditingDownloadas": "Si è verificato un errore durante il lavoro con il documento.<br>Utilizzare l'opzione 'Scarica come ...' per salvare la copia di backup del file sul disco rigido del computer.",
   "DE.Controllers.Main.errorEditingSaveas": "Si è verificato un errore durante il lavoro con il documento.<br>Utilizzare l'opzione 'Salva come ...' per salvare la copia di backup del file sul disco rigido del computer.",
+  "DE.Controllers.Main.errorEmailClient": "Non è stato trovato nessun client di posta elettronica.",
   "DE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
   "DE.Controllers.Main.errorForceSave": "Si è verificato un errore durante il salvataggio del file. Utilizzare l'opzione 'Scarica come' per salvare il file sul disco rigido del computer o riprovare più tardi.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descrittore di chiave sconosciuto",
@@ -397,7 +400,6 @@
   "DE.Controllers.Main.textClose": "Chiudi",
   "DE.Controllers.Main.textCloseTip": "Clicca per chiudere il consiglio",
   "DE.Controllers.Main.textContactUs": "Contatta il team di vendite",
-  "DE.Controllers.Main.textLicencePaidFeature": "La funzione che si sta tentando di utilizzare è disponibile con la licenza estesa. <br>Se necessario, contattare l'ufficio vendite",
   "DE.Controllers.Main.textLoadingDocument": "Caricamento del documento",
   "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE® limite connessione",
   "DE.Controllers.Main.textPaidFeature": "Caratteristica a pagamento",
@@ -418,16 +420,21 @@
   "DE.Controllers.Main.txtCurrentDocument": "Documento Corrente",
   "DE.Controllers.Main.txtDiagramTitle": "Titolo diagramma",
   "DE.Controllers.Main.txtEditingMode": "Impostazione modo di modifica...",
+  "DE.Controllers.Main.txtEndOfFormula": "Fine inaspettata della formula",
   "DE.Controllers.Main.txtErrorLoadHistory": "History loading failed",
   "DE.Controllers.Main.txtEvenPage": "Pagina pari",
   "DE.Controllers.Main.txtFiguredArrows": "Frecce decorate",
   "DE.Controllers.Main.txtFirstPage": "Prima Pagina",
   "DE.Controllers.Main.txtFooter": "Piè di pagina",
+  "DE.Controllers.Main.txtFormulaNotInTable": "La formula non in tabella",
   "DE.Controllers.Main.txtHeader": "Intestazione",
   "DE.Controllers.Main.txtLines": "Linee",
   "DE.Controllers.Main.txtMath": "Matematica",
+  "DE.Controllers.Main.txtMissArg": "Argomento mancante",
+  "DE.Controllers.Main.txtMissOperator": "Operatore mancante",
   "DE.Controllers.Main.txtNeedSynchronize": "Ci sono aggiornamenti disponibili",
   "DE.Controllers.Main.txtNoTableOfContents": "Sommario non trovato",
+  "DE.Controllers.Main.txtNotInTable": "Non è in Tabella",
   "DE.Controllers.Main.txtOddPage": "Pagina dispari",
   "DE.Controllers.Main.txtOnPage": "sulla pagina",
   "DE.Controllers.Main.txtRectangles": "Rettangoli",
@@ -439,6 +446,7 @@
   "DE.Controllers.Main.txtShape_actionButtonBlank": "Pulsante Vuoto",
   "DE.Controllers.Main.txtShape_actionButtonDocument": "Pulsante Documento",
   "DE.Controllers.Main.txtShape_actionButtonEnd": "Pulsante Fine",
+  "DE.Controllers.Main.txtShape_actionButtonForwardNext": "Pulsante Avanti o Successivo",
   "DE.Controllers.Main.txtShape_actionButtonHelp": "Pulsante Aiuto",
   "DE.Controllers.Main.txtShape_actionButtonHome": "Pulsante Home",
   "DE.Controllers.Main.txtShape_actionButtonInformation": "Pulsante Informazioni",
@@ -446,7 +454,9 @@
   "DE.Controllers.Main.txtShape_actionButtonSound": "Pulsante Suono",
   "DE.Controllers.Main.txtShape_arc": "Arco",
   "DE.Controllers.Main.txtShape_bentArrow": "Freccia piegata",
+  "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_circularArrow": "Freccia circolare",
   "DE.Controllers.Main.txtShape_cloud": "Nuvola",
@@ -460,12 +470,42 @@
   "DE.Controllers.Main.txtShape_doubleWave": "Onda doppia",
   "DE.Controllers.Main.txtShape_downArrow": "Freccia in giù",
   "DE.Controllers.Main.txtShape_ellipse": "Ellisse",
-  "DE.Controllers.Main.txtShape_flowChartOr": "Flowchart: Or",
+  "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",
+  "DE.Controllers.Main.txtShape_flowChartDecision": "Diagramma di flusso: Decisione",
+  "DE.Controllers.Main.txtShape_flowChartDelay": "Diagramma di flusso: Ritardo",
+  "DE.Controllers.Main.txtShape_flowChartDisplay": "Diagramma di flusso: Visualizza",
+  "DE.Controllers.Main.txtShape_flowChartDocument": "Diagramma di flusso: Documento",
+  "DE.Controllers.Main.txtShape_flowChartExtract": "Diagramma di flusso: Estrai",
+  "DE.Controllers.Main.txtShape_flowChartInputOutput": "Diagramma di flusso: Dati",
+  "DE.Controllers.Main.txtShape_flowChartInternalStorage": "Diagramma di flusso: Memoria interna",
+  "DE.Controllers.Main.txtShape_flowChartMagneticDisk": "Diagramma di flusso: Disco magnetico",
+  "DE.Controllers.Main.txtShape_flowChartMagneticDrum": "Diagramma di flusso: Memoria ad accesso diretto",
+  "DE.Controllers.Main.txtShape_flowChartMagneticTape": "Diagramma di flusso: Memoria ad accesso sequenziale",
+  "DE.Controllers.Main.txtShape_flowChartManualInput": "Diagramma di flusso: Input manuale",
+  "DE.Controllers.Main.txtShape_flowChartManualOperation": "Diagramma di flusso: Operazione manuale",
+  "DE.Controllers.Main.txtShape_flowChartMerge": "Diagramma di flusso: Unione",
+  "DE.Controllers.Main.txtShape_flowChartMultidocument": "Diagramma di flusso: Multidocumento",
+  "DE.Controllers.Main.txtShape_flowChartOffpageConnector": "Diagramma di flusso: Connettore fuori pagina",
+  "DE.Controllers.Main.txtShape_flowChartOnlineStorage": "Diagramma di flusso: Dati salvati",
+  "DE.Controllers.Main.txtShape_flowChartOr": "Diagramma di flusso: O",
+  "DE.Controllers.Main.txtShape_flowChartPredefinedProcess": "Diagramma di flusso: Elaborazione predefinita",
+  "DE.Controllers.Main.txtShape_flowChartPreparation": "Diagramma di flusso: Preparazione",
+  "DE.Controllers.Main.txtShape_flowChartProcess": "Diagramma di flusso: Elaborazione",
+  "DE.Controllers.Main.txtShape_flowChartPunchedCard": "Diagramma di flusso: Scheda",
+  "DE.Controllers.Main.txtShape_flowChartPunchedTape": "Diagramma di flusso: Nastro perforato",
+  "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_frame": "Cornice",
   "DE.Controllers.Main.txtShape_heart": "Cuore",
   "DE.Controllers.Main.txtShape_heptagon": "Ettagono",
   "DE.Controllers.Main.txtShape_hexagon": "Esagono",
   "DE.Controllers.Main.txtShape_homePlate": "Pentagono",
+  "DE.Controllers.Main.txtShape_horizontalScroll": "Scorrimento orizzontale",
+  "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_line": "Linea",
   "DE.Controllers.Main.txtShape_lineWithArrow": "Freccia",
@@ -480,11 +520,14 @@
   "DE.Controllers.Main.txtShape_octagon": "Ottagono",
   "DE.Controllers.Main.txtShape_parallelogram": "Parallelogramma",
   "DE.Controllers.Main.txtShape_pentagon": "Pentagono",
+  "DE.Controllers.Main.txtShape_pie": "Torta",
   "DE.Controllers.Main.txtShape_plaque": "Firma",
   "DE.Controllers.Main.txtShape_plus": "Più",
+  "DE.Controllers.Main.txtShape_polyline1": "Bozza",
   "DE.Controllers.Main.txtShape_polyline2": "Forma libera",
   "DE.Controllers.Main.txtShape_rect": "Rettangolo",
   "DE.Controllers.Main.txtShape_rightArrow": "Freccia destra",
+  "DE.Controllers.Main.txtShape_smileyFace": "Faccia sorridente",
   "DE.Controllers.Main.txtShape_spline": "Curva",
   "DE.Controllers.Main.txtShape_star10": "Stella a 10 punte",
   "DE.Controllers.Main.txtShape_star12": "Stella a 12 punte",
@@ -522,7 +565,10 @@
   "DE.Controllers.Main.txtStyle_Quote": "Cita",
   "DE.Controllers.Main.txtStyle_Subtitle": "Sottotitolo",
   "DE.Controllers.Main.txtStyle_Title": "Titolo",
+  "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.txtUndefBookmark": "Segnalibro indefinito",
   "DE.Controllers.Main.txtXAxis": "Asse X",
   "DE.Controllers.Main.txtYAxis": "Asse Y",
   "DE.Controllers.Main.unknownErrorText": "Errore sconosciuto.",
@@ -886,7 +932,9 @@
   "DE.Views.BookmarksDialog.textAdd": "Aggiungi",
   "DE.Views.BookmarksDialog.textBookmarkName": "Nome segnalibro",
   "DE.Views.BookmarksDialog.textClose": "Chiudi",
+  "DE.Views.BookmarksDialog.textCopy": "Copia",
   "DE.Views.BookmarksDialog.textDelete": "Elimina",
+  "DE.Views.BookmarksDialog.textGetLink": "Ottieni collegamento",
   "DE.Views.BookmarksDialog.textGoto": "Vai a",
   "DE.Views.BookmarksDialog.textHidden": "Segnalibri nascosti",
   "DE.Views.BookmarksDialog.textLocation": "Percorso",
@@ -931,6 +979,7 @@
   "DE.Views.ControlSettingsDialog.textNewColor": "Aggiungi un nuovo colore personalizzato",
   "DE.Views.ControlSettingsDialog.textNone": "Nessuno",
   "DE.Views.ControlSettingsDialog.textShowAs": "Mostra come",
+  "DE.Views.ControlSettingsDialog.textSystemColor": "Sistema",
   "DE.Views.ControlSettingsDialog.textTag": "Etichetta",
   "DE.Views.ControlSettingsDialog.textTitle": "Impostazioni di controllo del contenuto",
   "DE.Views.ControlSettingsDialog.txtLockDelete": "Il controllo del contenuto non può essere eliminato",
@@ -1022,6 +1071,8 @@
   "DE.Views.DocumentHolder.textDistributeRows": "Distribuisci righe",
   "DE.Views.DocumentHolder.textEditControls": "Impostazioni di controllo del contenuto",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Modifica bordi disposizione testo",
+  "DE.Views.DocumentHolder.textFlipH": "Capovolgi orizzontalmente",
+  "DE.Views.DocumentHolder.textFlipV": "Capovolgi verticalmente",
   "DE.Views.DocumentHolder.textFromFile": "Da file",
   "DE.Views.DocumentHolder.textFromUrl": "Da URL",
   "DE.Views.DocumentHolder.textJoinList": "Iscriviti alla lista precedente",
@@ -1034,6 +1085,9 @@
   "DE.Views.DocumentHolder.textRemove": "Elimina",
   "DE.Views.DocumentHolder.textRemoveControl": "Rimuovi il controllo del contenuto",
   "DE.Views.DocumentHolder.textReplace": "Sostituisci immagine",
+  "DE.Views.DocumentHolder.textRotate": "Ruota",
+  "DE.Views.DocumentHolder.textRotate270": "Ruota 90° a sinistra",
+  "DE.Views.DocumentHolder.textRotate90": "Ruota 90° a destra",
   "DE.Views.DocumentHolder.textSeparateList": "Elenco separato",
   "DE.Views.DocumentHolder.textSettings": "Impostazioni",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Allinea in basso",
@@ -1183,7 +1237,7 @@
   "DE.Views.DropcapSettingsAdvanced.textWidth": "Larghezza",
   "DE.Views.DropcapSettingsAdvanced.tipFontName": "Tipo di carattere",
   "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "Nessun bordo",
-  "DE.Views.FileMenu.btnBackCaption": "Va' ai Documenti",
+  "DE.Views.FileMenu.btnBackCaption": "Apri percorso file",
   "DE.Views.FileMenu.btnCloseMenuCaption": "Chiudi il menù",
   "DE.Views.FileMenu.btnCreateNewCaption": "Crea nuovo oggetto",
   "DE.Views.FileMenu.btnDownloadCaption": "Scarica in...",
@@ -1700,6 +1754,13 @@
   "DE.Views.StyleTitleDialog.textTitle": "Title",
   "DE.Views.StyleTitleDialog.txtEmpty": "Campo obbligatorio",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty",
+  "DE.Views.TableFormulaDialog.cancelButtonText": "Annulla",
+  "DE.Views.TableFormulaDialog.okButtonText    ": "OK",
+  "DE.Views.TableFormulaDialog.textBookmark": "Incolla il segnalibro",
+  "DE.Views.TableFormulaDialog.textFormat": "Formato del numero",
+  "DE.Views.TableFormulaDialog.textFormula": "Formula",
+  "DE.Views.TableFormulaDialog.textInsertFunction": "Incolla la funzione",
+  "DE.Views.TableFormulaDialog.textTitle": "Impostazioni della formula",
   "DE.Views.TableOfContentsSettings.cancelButtonText": "Annulla",
   "DE.Views.TableOfContentsSettings.okButtonText    ": "OK",
   "DE.Views.TableOfContentsSettings.strAlign": "Numeri di pagina allineati a destra",
@@ -1735,6 +1796,7 @@
   "DE.Views.TableSettings.splitCellsText": "Dividi cella...",
   "DE.Views.TableSettings.splitCellTitleText": "Dividi cella",
   "DE.Views.TableSettings.strRepeatRow": "Ripeti come riga di intestazione in ogni pagina",
+  "DE.Views.TableSettings.textAddFormula": "Aggiungi formula",
   "DE.Views.TableSettings.textAdvanced": "Mostra impostazioni avanzate",
   "DE.Views.TableSettings.textBackColor": "Colore sfondo",
   "DE.Views.TableSettings.textBanded": "Altera",

apps/documenteditor/main/locale/ru.json

@@ -104,7 +104,7 @@
   "Common.Views.About.txtLicensee": "ЛИЦЕНЗИАТ",
   "Common.Views.About.txtLicensor": "ЛИЦЕНЗИАР",
   "Common.Views.About.txtMail": "email: ",
-  "Common.Views.About.txtPoweredBy": "Powered by",
+  "Common.Views.About.txtPoweredBy": "Разработано",
   "Common.Views.About.txtTel": "тел.: ",
   "Common.Views.About.txtVersion": "Версия ",
   "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Отмена",
@@ -141,7 +141,7 @@
   "Common.Views.ExternalMergeEditor.textTitle": "Получатели слияния",
   "Common.Views.Header.labelCoUsersDescr": "Документ редактируется несколькими пользователями.",
   "Common.Views.Header.textAdvSettings": "Дополнительные параметры",
-  "Common.Views.Header.textBack": "Перейти к Документам",
+  "Common.Views.Header.textBack": "Открыть расположение файла",
   "Common.Views.Header.textCompactView": "Скрыть панель инструментов",
   "Common.Views.Header.textHideLines": "Скрыть линейки",
   "Common.Views.Header.textHideStatusBar": "Скрыть строку состояния",
@@ -342,6 +342,7 @@
   "DE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
   "DE.Controllers.Main.errorEditingDownloadas": "В ходе работы с документом произошла ошибка.<br>Используйте опцию 'Скачать как...', чтобы сохранить резервную копию файла на жесткий диск компьютера.",
   "DE.Controllers.Main.errorEditingSaveas": "В ходе работы с документом произошла ошибка.<br>Используйте опцию 'Сохранить как...', чтобы сохранить резервную копию файла на жесткий диск компьютера.",
+  "DE.Controllers.Main.errorEmailClient": "Не найден почтовый клиент",
   "DE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
   "DE.Controllers.Main.errorForceSave": "При сохранении файла произошла ошибка. Используйте опцию 'Скачать как', чтобы сохранить файл на жестком диске компьютера или повторите попытку позже.",
   "DE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
@@ -399,7 +400,7 @@
   "DE.Controllers.Main.textClose": "Закрыть",
   "DE.Controllers.Main.textCloseTip": "Щелкните, чтобы закрыть эту подсказку",
   "DE.Controllers.Main.textContactUs": "Связаться с отделом продаж",
-  "DE.Controllers.Main.textLicencePaidFeature": "Функция, которую вы пытаетесь использовать, доступна по расширенной лицензии.<br>Если вам нужна эта функция, обратитесь в отдел продаж",
+  "DE.Controllers.Main.textCustomLoader": "Обратите внимание, что по условиям лицензии у вас нет прав изменять экран, отображаемый при загрузке.<br>Пожалуйста, обратитесь в наш отдел продаж, чтобы сделать запрос.",
   "DE.Controllers.Main.textLoadingDocument": "Загрузка документа",
   "DE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений ONLYOFFICE",
   "DE.Controllers.Main.textPaidFeature": "Платная функция",
@@ -420,16 +421,22 @@
   "DE.Controllers.Main.txtCurrentDocument": "Текущий документ",
   "DE.Controllers.Main.txtDiagramTitle": "Заголовок диаграммы",
   "DE.Controllers.Main.txtEditingMode": "Установка режима редактирования...",
+  "DE.Controllers.Main.txtEndOfFormula": "Непредвиденное завершение формулы",
   "DE.Controllers.Main.txtErrorLoadHistory": "Не удалось загрузить историю",
   "DE.Controllers.Main.txtEvenPage": "Четная страница",
   "DE.Controllers.Main.txtFiguredArrows": "Фигурные стрелки",
   "DE.Controllers.Main.txtFirstPage": "Первая страница",
   "DE.Controllers.Main.txtFooter": "Нижний колонтитул",
+  "DE.Controllers.Main.txtFormulaNotInTable": "Формула не в таблице",
   "DE.Controllers.Main.txtHeader": "Верхний колонтитул",
+  "DE.Controllers.Main.txtIndTooLarge": "Индекс слишком большой",
   "DE.Controllers.Main.txtLines": "Линии",
   "DE.Controllers.Main.txtMath": "Математические знаки",
+  "DE.Controllers.Main.txtMissArg": "Отсутствует аргумент",
+  "DE.Controllers.Main.txtMissOperator": "Отсутствует оператор",
   "DE.Controllers.Main.txtNeedSynchronize": "Есть обновления",
   "DE.Controllers.Main.txtNoTableOfContents": "Элементов оглавления не найдено.",
+  "DE.Controllers.Main.txtNotInTable": "Не в таблице",
   "DE.Controllers.Main.txtOddPage": "Нечетная страница",
   "DE.Controllers.Main.txtOnPage": "на странице",
   "DE.Controllers.Main.txtRectangles": "Прямоугольники",
@@ -625,9 +632,14 @@
   "DE.Controllers.Main.txtStyle_Quote": "Цитата",
   "DE.Controllers.Main.txtStyle_Subtitle": "Подзаголовок",
   "DE.Controllers.Main.txtStyle_Title": "Название",
+  "DE.Controllers.Main.txtSyntaxError": "Синтаксическая ошибка",
+  "DE.Controllers.Main.txtTableInd": "Индекс таблицы не может быть нулевым",
   "DE.Controllers.Main.txtTableOfContents": "Оглавление",
+  "DE.Controllers.Main.txtTooLarge": "Число слишком большое для форматирования",
+  "DE.Controllers.Main.txtUndefBookmark": "Закладка не определена",
   "DE.Controllers.Main.txtXAxis": "Ось X",
   "DE.Controllers.Main.txtYAxis": "Ось Y",
+  "DE.Controllers.Main.txtZeroDivide": "Деление на ноль",
   "DE.Controllers.Main.unknownErrorText": "Неизвестная ошибка.",
   "DE.Controllers.Main.unsupportedBrowserErrorText ": "Ваш браузер не поддерживается.",
   "DE.Controllers.Main.uploadImageExtMessage": "Неизвестный формат изображения.",
@@ -643,7 +655,6 @@
   "DE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
-  "DE.Controllers.Main.errorEmailClient": "Не найден почтовый клиент.",
   "DE.Controllers.Navigation.txtBeginning": "Начало документа",
   "DE.Controllers.Navigation.txtGotoBeginning": "Перейти в начало документа",
   "DE.Controllers.Statusbar.textHasChanges": "Отслежены новые изменения",
@@ -990,7 +1001,9 @@
   "DE.Views.BookmarksDialog.textAdd": "Добавить",
   "DE.Views.BookmarksDialog.textBookmarkName": "Имя закладки",
   "DE.Views.BookmarksDialog.textClose": "Закрыть",
+  "DE.Views.BookmarksDialog.textCopy": "Копировать",
   "DE.Views.BookmarksDialog.textDelete": "Удалить",
+  "DE.Views.BookmarksDialog.textGetLink": "Получить ссылку",
   "DE.Views.BookmarksDialog.textGoto": "Перейти",
   "DE.Views.BookmarksDialog.textHidden": "Скрытые закладки",
   "DE.Views.BookmarksDialog.textLocation": "Положение",
@@ -1035,6 +1048,7 @@
   "DE.Views.ControlSettingsDialog.textNewColor": "Пользовательский цвет",
   "DE.Views.ControlSettingsDialog.textNone": "Без рамки",
   "DE.Views.ControlSettingsDialog.textShowAs": "Отображать",
+  "DE.Views.ControlSettingsDialog.textSystemColor": "Системный",
   "DE.Views.ControlSettingsDialog.textTag": "Тег",
   "DE.Views.ControlSettingsDialog.textTitle": "Параметры элемента управления содержимым",
   "DE.Views.ControlSettingsDialog.txtLockDelete": "Элемент управления содержимым нельзя удалить",
@@ -1292,7 +1306,7 @@
   "DE.Views.DropcapSettingsAdvanced.textWidth": "Ширина",
   "DE.Views.DropcapSettingsAdvanced.tipFontName": "Шрифт",
   "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "Без границ",
-  "DE.Views.FileMenu.btnBackCaption": "Перейти к Документам",
+  "DE.Views.FileMenu.btnBackCaption": "Открыть расположение файла",
   "DE.Views.FileMenu.btnCloseMenuCaption": "Закрыть меню",
   "DE.Views.FileMenu.btnCreateNewCaption": "Создать новый",
   "DE.Views.FileMenu.btnDownloadCaption": "Скачать как...",
@@ -1809,6 +1823,13 @@
   "DE.Views.StyleTitleDialog.textTitle": "Название",
   "DE.Views.StyleTitleDialog.txtEmpty": "Это поле необходимо заполнить",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "Поле не может быть пустым",
+  "DE.Views.TableFormulaDialog.cancelButtonText": "Отмена",
+  "DE.Views.TableFormulaDialog.okButtonText    ": "Ok",
+  "DE.Views.TableFormulaDialog.textBookmark": "Вставить закладку",
+  "DE.Views.TableFormulaDialog.textFormat": "Формат числа",
+  "DE.Views.TableFormulaDialog.textFormula": "Формула",
+  "DE.Views.TableFormulaDialog.textInsertFunction": "Вставить функцию",
+  "DE.Views.TableFormulaDialog.textTitle": "Настройки формулы",
   "DE.Views.TableOfContentsSettings.cancelButtonText": "Отмена",
   "DE.Views.TableOfContentsSettings.okButtonText    ": "Ok",
   "DE.Views.TableOfContentsSettings.strAlign": "Номера страниц по правому краю",
@@ -1844,6 +1865,7 @@
   "DE.Views.TableSettings.splitCellsText": "Разделить ячейку...",
   "DE.Views.TableSettings.splitCellTitleText": "Разделить ячейку",
   "DE.Views.TableSettings.strRepeatRow": "Повторять как заголовок на каждой странице",
+  "DE.Views.TableSettings.textAddFormula": "Добавить формулу",
   "DE.Views.TableSettings.textAdvanced": "Дополнительные параметры",
   "DE.Views.TableSettings.textBackColor": "Цвет фона",
   "DE.Views.TableSettings.textBanded": "Чередовать",

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

@@ -395,7 +395,9 @@
     text-overflow: ellipsis;
 }
 
-#id-toolbar-menu-auto-fontcolor > a.selected {
+#id-toolbar-menu-auto-fontcolor > a.selected,
+#control-settings-system-color > a.selected,
+#control-settings-system-color > a:hover {
     span {
         outline: 1px solid #000;
         border: 1px solid #fff;

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

@@ -60,7 +60,8 @@ define([
             _isEdit = false,
             _canAcceptChanges = false,
             _inRevisionChange = false,
-            _menuPos = [];
+            _menuPos = [],
+            _timer = 0;
 
         return {
             models: [],
@@ -157,6 +158,7 @@ define([
                     } else {
                         _.delay(function () {
                             _view.showMenu(me._initReviewMenu(), _menuPos[0] || 0, _menuPos[1] || 0);
+                            _timer = (new Date).getTime();
                         }, 100);
                     }
                 } else if ('showActionSheet' == eventName && _actionSheets.length > 0) {
@@ -190,6 +192,10 @@ define([
                 if ($('.popover.settings, .popup.settings, .picker-modal.settings, .modal.modal-in, .actions-modal').length > 0) {
                     return;
                 }
+                var now = (new Date).getTime();
+                if (now - _timer < 1000) return;
+                _timer = 0;
+
                 _menuPos = [posX, posY];
 
                 var me = this,
@@ -202,6 +208,8 @@ define([
             },
 
             onApiHidePopMenu: function() {
+                var now = (new Date).getTime();
+                if (now - _timer < 1000) return;
                 _view && _view.hideMenu();
             },
 

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

@@ -66,6 +66,11 @@ define([
                 (/MSIE 10/.test(ua) && /; Touch/.test(ua)));
         }
 
+        function isSailfish() {
+            var ua = navigator.userAgent;
+            return /Sailfish/.test(ua) || /Jolla/.test(ua);
+        }
+
         return {
             // Specifying a EditorController model
             models: [],
@@ -93,6 +98,11 @@ define([
                 var phone = isPhone();
                 // console.debug('Layout profile:', phone ? 'Phone' : 'Tablet');
 
+                if ( isSailfish() ) {
+                    Common.SharedSettings.set('sailfish', true);
+                    $('html').addClass('sailfish');
+                }
+
                 Common.SharedSettings.set('android', Framework7.prototype.device.android);
                 Common.SharedSettings.set('phone', phone);
 

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

@@ -639,8 +639,24 @@ define([
                             buttons: buttons
                         });
                     }
-                } else
+                } else {
+                    if (!me.appOptions.isDesktopApp && !me.appOptions.canBrandingExt &&
+                        me.editorConfig && me.editorConfig.customization && (me.editorConfig.customization.loaderName || me.editorConfig.customization.loaderLogo)) {
+                        uiApp.modal({
+                            title: me.textPaidFeature,
+                            text  : me.textCustomLoader,
+                            buttons: [{
+                                        text: me.textContactUs,
+                                        bold: true,
+                                        onClick: function() {
+                                            window.open('mailto:sales@onlyoffice.com', "_blank");
+                                        }
+                                    },
+                                    { text: me.textClose }]
+                        });
+                    }
                     DE.getController('Toolbar').activateControls();
+                }
             },
 
             onOpenDocument: function(progress) {
@@ -1379,7 +1395,9 @@ define([
             closeButtonText: 'Close File',
             scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.',
             errorAccessDeny: 'You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.',
-            errorEditingDownloadas: 'An error occurred during the work with the document.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.'
+            errorEditingDownloadas: 'An error occurred during the work with the document.<br>Use the \'Download\' option to save the file backup copy to your computer hard drive.',
+            textPaidFeature: 'Paid feature',
+            textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.'
         }
     })(), DE.Controllers.Main || {}))
 });

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

@@ -206,16 +206,21 @@ define([
 
                 if ('#settings-document-view' == pageId) {
                     me.initPageDocumentSettings();
+                    Common.Utils.addScrollIfNeed('.page[data-page=settings-document-view]', '.page[data-page=settings-document-view] .page-content');
                 } else if ('#settings-document-formats-view' == pageId) {
                     me.getView('Settings').renderPageSizes(_pageSizes, _pageSizesIndex);
                     $('.page[data-page=settings-document-formats-view] input:radio[name=document-format]').single('change', _.bind(me.onFormatChange, me));
+                    Common.Utils.addScrollIfNeed('.page[data-page=settings-document-formats-view]', '.page[data-page=settings-document-formats-view] .page-content');
                 } else if ('#settings-download-view' == pageId) {
                     $(modalView).find('.formats a').single('click', _.bind(me.onSaveFormat, me));
+                    Common.Utils.addScrollIfNeed('.page[data-page=settings-download-view]', '.page[data-page=settings-download-view] .page-content');
                 } else if ('#settings-info-view' == pageId) {
                     me.initPageInfo();
+                    Common.Utils.addScrollIfNeed('.page[data-page=settings-info-view]', '.page[data-page=settings-info-view] .page-content');
                 } else if ('#settings-about-view' == pageId) {
                     // About
                     me.setLicInfo(_licInfo);
+                    Common.Utils.addScrollIfNeed('.page[data-page=settings-about-view]', '.page[data-page=settings-about-view] .page-content');
                 } else {
                     $('#settings-readermode input:checkbox').attr('checked', Common.SharedSettings.get('readerMode'));
                     $('#settings-spellcheck input:checkbox').attr('checked', Common.localStorage.getBool("de-mobile-spellcheck", false));
@@ -223,6 +228,7 @@ define([
                     $('#settings-search').single('click',                       _.bind(me.onSearch, me));
                     $('#settings-readermode input:checkbox').single('change',   _.bind(me.onReaderMode, me));
                     $('#settings-spellcheck input:checkbox').single('change',   _.bind(me.onSpellcheck, me));
+                    $('#settings-orthography').single('click',                  _.bind(me.onOrthographyCheck, me));
                     $('#settings-review input:checkbox').single('change',       _.bind(me.onTrackChanges, me));
                     $('#settings-help').single('click',                         _.bind(me.onShowHelp, me));
                     $('#settings-download').single('click',                     _.bind(me.onDownloadOrigin, me));
@@ -372,6 +378,12 @@ define([
                 this.api && this.api.asc_setSpellCheck(state);
             },
 
+            onOrthographyCheck: function (e) {
+                this.hideModal();
+
+                this.api && this.api.asc_pluginRun("asc.{B631E142-E40B-4B4C-90B9-2D00222A286E}", 0);
+            },
+
             onTrackChanges: function(e) {
                 var $checkbox = $(e.currentTarget),
                     state = $checkbox.is(':checked');

apps/documenteditor/mobile/app/controller/edit/EditParagraph.js

@@ -54,6 +54,7 @@ define([
         var _stack = [],
             _paragraphInfo = {},
             _paragraphObject = undefined,
+            _paragraphProperty = undefined,
             _styles = [],
             _styleThumbSize,
             _styleName,
@@ -113,6 +114,7 @@ define([
 
                 $('#paragraph-distance-before .button').single('click',          _.bind(me.onDistanceBefore, me));
                 $('#paragraph-distance-after .button').single('click',           _.bind(me.onDistanceAfter, me));
+                $('#paragraph-spin-first-line .button').single('click',          _.bind(me.onSpinFirstLine, me));
                 $('#paragraph-space input:checkbox').single('change',            _.bind(me.onSpaceBetween, me));
                 $('#paragraph-page-break input:checkbox').single('change',       _.bind(me.onBreakBefore, me));
                 $('#paragraph-page-orphan input:checkbox').single('change',      _.bind(me.onOrphan, me));
@@ -127,6 +129,23 @@ define([
             initSettings: function () {
                 var me = this;
 
+                var selectedElements = me.api.getSelectedElements();
+                if (selectedElements && _.isArray(selectedElements)) {
+                    for (var i = selectedElements.length - 1; i >= 0; i--) {
+                        if (Asc.c_oAscTypeSelectElement.Paragraph == selectedElements[i].get_ObjectType()) {
+                            _paragraphProperty = selectedElements[i].get_ObjectValue(); 
+                            break;
+                        }
+                    }
+                }
+
+                if (_paragraphProperty) {
+                    if (_paragraphProperty.get_Ind()===null || _paragraphProperty.get_Ind()===undefined) {
+                        _paragraphProperty.get_Ind().put_FirstLine(0);
+                    }
+                    $('#paragraph-spin-first-line .item-after label').text(_paragraphProperty.get_Ind().get_FirstLine() + ' ' + metricText);
+                }
+
                 if (_paragraphObject) {
                     _paragraphInfo.spaceBefore = _paragraphObject.get_Spacing().get_Before() < 0 ? _paragraphObject.get_Spacing().get_Before() : Common.Utils.Metric.fnRecalcFromMM(_paragraphObject.get_Spacing().get_Before());
                     _paragraphInfo.spaceAfter  = _paragraphObject.get_Spacing().get_After() < 0 ? _paragraphObject.get_Spacing().get_After() : Common.Utils.Metric.fnRecalcFromMM(_paragraphObject.get_Spacing().get_After());
@@ -236,12 +255,22 @@ define([
                 } else {
                     distance = Math.min(100, ++distance);
                 }
+            },
 
-                _paragraphInfo.spaceAfter = distance;
+            onSpinFirstLine: function(e) {
+                var $button = $(e.currentTarget),
+                    distance = _paragraphProperty.get_Ind().get_FirstLine();
 
-                $('#paragraph-distance-after .item-after label').text(_paragraphInfo.spaceAfter < 0 ? 'Auto' : (_paragraphInfo.spaceAfter) + ' ' + metricText);
+                if ($button.hasClass('decrement')) {
+                    distance = Math.max(-999, --distance);
+                } else {
+                    distance = Math.min(999, ++distance);
+                }
 
-                this.api.put_LineSpacingBeforeAfter(1, (_paragraphInfo.spaceAfter < 0) ? -1 : Common.Utils.Metric.fnRecalcToMM(_paragraphInfo.spaceAfter));
+                _paragraphProperty.get_Ind().put_FirstLine(distance)
+
+                $('#paragraph-spin-first-line .item-after label').text(distance + ' ' + metricText);
+                this.api.paraApply(_paragraphProperty);
             },
 
             onSpaceBetween: function (e) {

apps/documenteditor/mobile/app/controller/edit/EditTable.js

@@ -189,11 +189,24 @@ define([
                 if (_tableObject) {
                     if (pageId == '#edit-table-wrap') {
                         me._initWrappView();
+                        Common.Utils.addScrollIfNeed('.page[data-page=edit-table-wrap]', '.page[data-page=edit-table-wrap] .page-content');
                     } else if (pageId == "#edit-table-style" || pageId == '#edit-table-border-color-view') {
                         me._initStyleView();
+                        
+                        if (pageId == '#edit-table-border-color-view') {
+                            Common.Utils.addScrollIfNeed('.page[data-page=edit-table-border-color]', '.page[data-page=edit-table-border-color] .page-content');
+                        } else {
+                            Common.Utils.addScrollIfNeed('.page[data-page=edit-table-style]', '.page[data-page=edit-table-style] .page-content');
+                        }
+
+                        Common.Utils.addScrollIfNeed('#tab-table-border .list-block', '#tab-table-border .list-block ul');
+                        Common.Utils.addScrollIfNeed('#tab-table-fill .list-block', '#tab-table-fill .list-block ul');
+                        Common.Utils.addScrollIfNeed('#tab-table-style .list-block', '#tab-table-style .list-block ul');
                     } else if (pageId == '#edit-table-options') {
+                        Common.Utils.addScrollIfNeed('.page[data-page=edit-table-wrap]', '.page[data-page=edit-table-wrap] .page-content');
                         me._initTableOptionsView();
                     } else if (pageId == '#edit-table-style-options-view') {
+                        Common.Utils.addScrollIfNeed('.page[data-page=edit-table-style-options]', '.page[data-page=edit-table-style-options] .page-content');
                         me._initStyleOptionsView();
                     }
                 }

apps/documenteditor/mobile/app/template/EditParagraph.template

@@ -92,6 +92,21 @@
                             </div>
                         </div>
                     </li>
+                    <li id="paragraph-spin-first-line">
+                        <div class="item-content">
+                            <div class="item-inner">
+                                <div class="item-title"><%= scope.textFirstLine %></div>
+                                <div class="item-after splitter">
+                                    <% if (!android) { %><label><%= scope.textAuto %></label><% } %>
+                                    <p class="buttons-row">
+                                        <span class="button decrement no-ripple"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
+                                        <% if (android) { %><label><%= scope.textAuto %></label><% } %>
+                                        <span class="button increment no-ripple"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
                 </ul>
             </div>
             <div class="list-block">

apps/documenteditor/mobile/app/template/EditText.template

@@ -16,10 +16,10 @@
                 <div class="item-content buttons">
                     <div class="item-inner">
                         <div class="row">
-                            <a id="font-bold" class="button"><b>B</b></a>
+                            <a id="font-bold" class="button"><b><%= scope.textCharacterBold %></b></a>
-                            <a id="font-italic" class="button"><i>I</i></a>
+                            <a id="font-italic" class="button"><i><%= scope.textCharacterItalic %></i></a>
-                            <a id="font-underline" class="button" style="text-decoration: underline;">U</a>
+                            <a id="font-underline" class="button" style="text-decoration: underline;"><%= scope.textCharacterUnderline %></a>
-                            <a id="font-strikethrough" class="button" style="text-decoration: line-through">S</a>
+                            <a id="font-strikethrough" class="button" style="text-decoration: line-through"><%= scope.textCharacterStrikethrough %></a>
                         </div>
                     </div>
                 </div>

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

@@ -57,6 +57,20 @@
                                 </div>
                             </div>
                         </li>
+                        <% if (orthography) { %>
+                        <li>
+                            <a id="settings-orthography" class="item-link no-indicator">
+                                <div class="item-content">
+                                    <div class="item-media">
+                                        <i class="icon icon-spellcheck"></i>
+                                    </div>
+                                    <div class="item-inner">
+                                        <div class="item-title">Проверка правописания</div>
+                                    </div>
+                                </div>
+                            </a>
+                        </li>
+                        <% } %>
                         <li>
                             <div id="settings-review" class="item-content">
                                 <div class="item-media">

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

@@ -79,6 +79,7 @@ define([
             initEvents: function () {
                 var me = this;
 
+                Common.Utils.addScrollIfNeed('.view[data-page=settings-root-view] .pages', '.view[data-page=settings-root-view] .page');
                 me.updateItemHandlers();
                 me.initControls();
             },
@@ -88,6 +89,7 @@ define([
                 this.layout = $('<div/>').append(this.template({
                     android : Common.SharedSettings.get('android'),
                     phone   : Common.SharedSettings.get('phone'),
+                    orthography: Common.SharedSettings.get('sailfish'),
                     scope   : this
                 }));
 
@@ -123,6 +125,7 @@ define([
                     } else {
                         $layour.find('#settings-document').hide();
                         $layour.find('#settings-spellcheck').hide();
+                        $layour.find('#settings-orthography').hide();
                     }
                     if (!_canReader)
                         $layour.find('#settings-readermode').hide();

apps/documenteditor/mobile/app/view/edit/EditChart.js

@@ -105,6 +105,7 @@ define([
 
                 $('.edit-chart-style .categories a').single('click', _.bind(me.showStyleCategory, me));
 
+                Common.Utils.addScrollIfNeed('#edit-chart .pages', '#edit-chart .page');
                 me.initControls();
                 me.renderStyles();
             },
@@ -220,15 +221,18 @@ define([
                     transparent: true
                 });
 
+                
                 this.fireEvent('page:show', [this, selector]);
             },
 
             showWrap: function () {
                 this.showPage('#edit-chart-wrap');
+                Common.Utils.addScrollIfNeed('.page.chart-wrap', '.page.chart-wrap .page-content');
             },
 
             showReorder: function () {
                 this.showPage('#edit-chart-reorder');
+                Common.Utils.addScrollIfNeed('.page.chart-reorder', '.page.chart-reorder .page-content');
             },
 
             showBorderColor: function () {

apps/documenteditor/mobile/app/view/edit/EditHeader.js

@@ -65,6 +65,7 @@ define([
                 var me = this;
 
                 DE.getController('EditHeader').initSettings();
+                Common.Utils.addScrollIfNeed('#edit-header .pages', '#edit-header .page');
             },
 
             // Render layout

apps/documenteditor/mobile/app/view/edit/EditHyperlink.js

@@ -69,6 +69,7 @@ define([
                 $('#edit-link-url input[type=url]').single('input', _.bind(function(e) {
                     $('#edit-link-edit').toggleClass('disabled', _.isEmpty($(e.currentTarget).val()));
                 }, this));
+                Common.Utils.addScrollIfNeed('#edit-link .pages', '#edit-link .page');
             },
 
             categoryShow: function(e) {

apps/documenteditor/mobile/app/view/edit/EditImage.js

@@ -72,6 +72,7 @@ define([
                 $('#image-reorder').single('click',                 _.bind(me.showReorder, me));
                 $('#edit-image-url').single('click',                _.bind(me.showEditUrl, me));
 
+                Common.Utils.addScrollIfNeed('#edit-image .pages', '#edit-image .page');
                 me.initControls();
             },
 
@@ -130,6 +131,7 @@ define([
             showWrap: function () {
                 this.showPage('#edit-image-wrap-view');
                 $('.image-wrap .list-block.inputs-list').removeClass('inputs-list');
+                Common.Utils.addScrollIfNeed('.page.image-wrap', '.page.image-wrap .page-content');
             },
 
             showReplace: function () {
@@ -138,6 +140,7 @@ define([
 
             showReorder: function () {
                 this.showPage('#edit-image-reorder-view');
+                Common.Utils.addScrollIfNeed('.page.image-reorder', '.page.image-reorder .page-content');
             },
 
             showEditUrl: function () {
@@ -150,6 +153,7 @@ define([
                 _.delay(function () {
                     $('.edit-image-url-link input[type="url"]').focus();
                 }, 1000);
+                Common.Utils.addScrollIfNeed('.page.edit-image-url-link', '.page.edit-image-url-link .page-content');
             },
 
             textWrap: 'Wrap',

apps/documenteditor/mobile/app/view/edit/EditParagraph.js

@@ -75,6 +75,7 @@ define([
                 me.renderStyles();
 
                 DE.getController('EditParagraph').initSettings();
+                Common.Utils.addScrollIfNeed('#edit-paragraph .pages', '#edit-paragraph .page');
             },
 
             // Render layout
@@ -150,11 +151,13 @@ define([
                     transparent: true
                 });
 
+                Common.Utils.addScrollIfNeed('.page[data-page=edit-paragraph-color]', '.page[data-page=edit-paragraph-color] .page-content');
                 this.fireEvent('page:show', [this, '#edit-paragraph-color']);
             },
 
             showAdvanced: function () {
                 this.showPage('#edit-paragraph-advanced');
+                Common.Utils.addScrollIfNeed('.page[data-page=edit-paragraph-advanced]', '.page[data-page=edit-paragraph-advanced] .page-content');
             },
 
             textBackground: 'Background',
@@ -165,6 +168,7 @@ define([
             textFromText: 'Distance from Text',
             textBefore: 'Before',
             textAuto: 'Auto',
+            textFirstLine: 'First Line',
             textAfter: 'After',
             textSpaceBetween: 'Space Between Paragraphs',
             textPageBreak: 'Page Break Before',

apps/documenteditor/mobile/app/view/edit/EditShape.js

@@ -76,6 +76,7 @@ define([
 
                 $('.edit-shape-style .categories a').single('click', _.bind(me.showStyleCategory, me));
 
+                Common.Utils.addScrollIfNeed('#edit-shape .pages', '#edit-shape .page');
                 me.initControls();
             },
 
@@ -154,19 +155,23 @@ define([
                     transparent: true
                 });
 
+                // Common.Utils.addScrollIfNeed('.page[data-page=edit-text-font-color]', '.page[data-page=edit-text-font-color] .page-content');
                 this.fireEvent('page:show', [this, selector]);
             },
 
             showWrap: function () {
                 this.showPage('#edit-shape-wrap');
+                Common.Utils.addScrollIfNeed('.page.shape-wrap', '.page.shape-wrap .page-content');
             },
 
             showReplace: function () {
                 this.showPage('#edit-shape-replace');
+                Common.Utils.addScrollIfNeed('.page.shape-replace', '.page.shape-replace .page-content');
             },
 
             showReorder: function () {
                 this.showPage('#edit-shape-reorder');
+                Common.Utils.addScrollIfNeed('.page.shape-reorder', '.page.shape-reorder .page-content');
             },
 
             showBorderColor: function () {

apps/documenteditor/mobile/app/view/edit/EditTable.js

@@ -76,6 +76,7 @@ define([
                 $('#edit-table-bordercolor').single('click',            _.bind(me.showBorderColor, me));
                 $('.edit-table-style .categories a').single('click',    _.bind(me.showStyleCategory, me));
 
+                Common.Utils.addScrollIfNeed('#edit-table .pages', '#edit-table .page');
                 me.initControls();
                 me.renderStyles();
             },
@@ -158,6 +159,7 @@ define([
                 if ($(e.currentTarget).data('type') == 'fill') {
                     this.fireEvent('page:show', [this, '#edit-table-style']);
                 }
+                // this.fireEvent('page:show', [this, '#edit-table-style']);
             },
 
             showPage: function (templateId, suspendEvent) {

apps/documenteditor/mobile/app/view/edit/EditText.js

@@ -108,6 +108,7 @@ define([
                 $('#font-bullets').single('click',      _.bind(me.showBullets, me));
                 $('#font-numbers').single('click',      _.bind(me.showNumbers, me));
 
+                Common.Utils.addScrollIfNeed('#edit-text .pages', '#edit-text .page');
                 me.initControls();
             },
 
@@ -189,6 +190,8 @@ define([
                         }, 100));
                     }
                 });
+
+                Common.Utils.addScrollIfNeed('.page[data-page=edit-text-font-page]', '.page[data-page=edit-text-font-page] .page-content');
             },
 
             showFontColor: function () {
@@ -198,6 +201,7 @@ define([
                     el: $('.page[data-page=edit-text-font-color] .page-content')
                 });
 
+                Common.Utils.addScrollIfNeed('.page[data-page=edit-text-font-color]', '.page[data-page=edit-text-font-color] .page-content');
                 this.fireEvent('page:show', [this, '#edit-text-color']);
             },
 
@@ -209,15 +213,18 @@ define([
                     transparent: true
                 });
 
+                Common.Utils.addScrollIfNeed('.page[data-page=edit-text-font-background]', '.page[data-page=edit-text-font-background] .page-content');
                 this.fireEvent('page:show', [this, '#edit-text-background']);
             },
 
             showAdditional: function () {
                 this.showPage('#edit-text-additional');
+                Common.Utils.addScrollIfNeed('.page[data-page=edit-text-additional]', '.page[data-page=edit-text-additional] .page-content');
             },
 
             showLineSpacing: function () {
                 this.showPage('#edit-text-linespacing');
+                Common.Utils.addScrollIfNeed('#page-text-linespacing', '#page-text-linespacing .page-content');
             },
 
             showBullets: function () {
@@ -248,7 +255,11 @@ define([
             textLineSpacing: 'Line Spacing',
             textBullets: 'Bullets',
             textNone: 'None',
-            textNumbers: 'Numbers'
+            textNumbers: 'Numbers',
+            textCharacterBold: 'B',
+            textCharacterItalic: 'I',
+            textCharacterUnderline: 'U',
+            textCharacterStrikethrough: 'S'
         }
     })(), DE.Views.EditText || {}))
 });

apps/documenteditor/mobile/index.html

@@ -246,6 +246,19 @@
 
         <script type="text/javascript" src="../sdk_dev_scripts.js"></script>
         <script>
+            var ua = navigator.userAgent;
+
+            if (/Sailfish/.test(ua) || /Jolla/.test(ua)) {
+                document.write('<script type="text/javascript" src="../../../vendor/iscroll/iscroll.min.js"><\/script>');
+
+                    if (!/R7OfficeApp/.test(ua)) {
+                        var ua = navigator.userAgent + ';Android 5.0;';
+                        Object.defineProperty(navigator, 'userAgent', {
+                            get: function () { return ua; }
+                        });
+                    }
+            }
+
             window.sdk_dev_scrpipts.forEach(function(item){
                 document.write('<script type="text/javascript" src="' + item + '"><\/script>');
             });

apps/documenteditor/mobile/index.html.deploy

@@ -182,6 +182,19 @@
     </head>
     <body>
         <script type="text/javascript">
+            var ua = navigator.userAgent;
+
+            if (/Sailfish/.test(ua) || /Jolla/.test(ua)) {
+                document.write('<script type="text/javascript" src="../../../vendor/iscroll/iscroll.min.js"><\/script>');
+
+                    if (!/R7OfficeApp/.test(ua)) {
+                        var ua = navigator.userAgent + ';Android 5.0;';
+                        Object.defineProperty(navigator, 'userAgent', {
+                            get: function () { return ua; }
+                        });
+                    }
+            }
+
             function getUrlParams() {
                 var e,
                     a = /\+/g,  // Regex for replacing addition symbol with a space

apps/documenteditor/mobile/locale/bg.json

@@ -116,11 +116,13 @@
   "DE.Controllers.Main.textBuyNow": "Посетете уебсайта",
   "DE.Controllers.Main.textCancel": "Отказ",
   "DE.Controllers.Main.textClose": "Близо",
-  "DE.Controllers.Main.textContactUs": "Свържете се с продажбите",
+  "DE.Controllers.Main.textContactUs": "Търговски отдел",
+  "DE.Controllers.Main.textCustomLoader": "Моля, имайте предвид, че според условията на лиценза нямате право да сменяте товарача. <br> Моля, свържете се с нашия отдел Продажби, за да получите оферта.",
   "DE.Controllers.Main.textDone": "Завършен",
   "DE.Controllers.Main.textLoadingDocument": "Зареждане на документ",
   "DE.Controllers.Main.textNoLicenseTitle": "Ограничение за връзка ONLYOFFICE",
   "DE.Controllers.Main.textOK": "Добре",
+  "DE.Controllers.Main.textPaidFeature": "Платена функция",
   "DE.Controllers.Main.textPassword": "Парола",
   "DE.Controllers.Main.textPreloader": "Зареждане ...",
   "DE.Controllers.Main.textTryUndoRedo": "Функциите Undo / Redo са забранени за режима Fast co-edit.",
@@ -276,6 +278,7 @@
   "DE.Views.EditParagraph.textBack": "обратно",
   "DE.Views.EditParagraph.textBackground": "Заден план",
   "DE.Views.EditParagraph.textBefore": "Преди",
+  "DE.Views.EditParagraph.textFirstLine": "Първа линия",
   "DE.Views.EditParagraph.textFromText": "Разстояние от текста",
   "DE.Views.EditParagraph.textKeepLines": "Поддържайте линиите заедно",
   "DE.Views.EditParagraph.textKeepNext": "Продължете със следващия",
@@ -341,6 +344,10 @@
   "DE.Views.EditText.textAutomatic": "автоматичен",
   "DE.Views.EditText.textBack": "обратно",
   "DE.Views.EditText.textBullets": "Маркиран списък",
+  "DE.Views.EditText.textCharacterBold": "П",
+  "DE.Views.EditText.textCharacterItalic": "К",
+  "DE.Views.EditText.textCharacterStrikethrough": "З",
+  "DE.Views.EditText.textCharacterUnderline": "у",
   "DE.Views.EditText.textDblStrikethrough": "Двойно зачертаване",
   "DE.Views.EditText.textDblSuperscript": "Горен индекс",
   "DE.Views.EditText.textFontColor": "Цвят на шрифта",
@@ -354,7 +361,7 @@
   "DE.Views.EditText.textNumbers": "численост",
   "DE.Views.EditText.textSize": "Размер",
   "DE.Views.EditText.textSmallCaps": "Малки букви",
-  "DE.Views.EditText.textStrikethrough": "зачеркване",
+  "DE.Views.EditText.textStrikethrough": "Зачеркнато",
   "DE.Views.EditText.textSubscript": "Долен",
   "DE.Views.Search.textCase": "Различаващ главни от малки букви",
   "DE.Views.Search.textDone": "Завършен",

apps/documenteditor/mobile/locale/cs.json

@@ -14,6 +14,7 @@
   "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",
@@ -22,9 +23,12 @@
   "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",
+  "DE.Controllers.EditContainer.textFooter": "Zápatí",
+  "DE.Controllers.EditContainer.textHeader": "Záhlaví",
   "DE.Controllers.EditContainer.textHyperlink": "Hypertextový odkaz",
   "DE.Controllers.EditContainer.textImage": "Obrázek",
   "DE.Controllers.EditContainer.textParagraph": "Odstavec",
@@ -52,6 +56,7 @@
   "DE.Controllers.Main.downloadMergeTitle": "Stahuji",
   "DE.Controllers.Main.downloadTextText": "Stahování dokumentu...",
   "DE.Controllers.Main.downloadTitleText": "Stahování dokumentu",
+  "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>",
@@ -104,7 +109,7 @@
   "DE.Controllers.Main.textBuyNow": "Navštívit webovou stránku",
   "DE.Controllers.Main.textCancel": "Zrušit",
   "DE.Controllers.Main.textClose": "Zavřít",
-  "DE.Controllers.Main.textContactUs": "Kontaktujte prodejce",
+  "DE.Controllers.Main.textContactUs": "Obchodní oddělení",
   "DE.Controllers.Main.textDone": "Hotovo",
   "DE.Controllers.Main.textLoadingDocument": "Načítání dokumentu",
   "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source verze",
@@ -119,6 +124,8 @@
   "DE.Controllers.Main.txtArt": "Zde napište text",
   "DE.Controllers.Main.txtDiagramTitle": "Nadpis grafu",
   "DE.Controllers.Main.txtEditingMode": "Nastavit editační režim...",
+  "DE.Controllers.Main.txtFooter": "Zápatí",
+  "DE.Controllers.Main.txtHeader": "Záhlaví",
   "DE.Controllers.Main.txtSeries": "Řady",
   "DE.Controllers.Main.txtStyle_Heading_1": "Nadpis 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "Nadpis 2",
@@ -212,6 +219,10 @@
   "DE.Views.EditChart.textTopBottom": "Nahoře a dole",
   "DE.Views.EditChart.textType": "Typ",
   "DE.Views.EditChart.textWrap": "Zabalit",
+  "DE.Views.EditHeader.textDiffFirst": "Odlišná první stránka",
+  "DE.Views.EditHeader.textDiffOdd": "Rozdílné liché a sudé stránky",
+  "DE.Views.EditHeader.textFrom": "Začít na",
+  "DE.Views.EditHeader.textSameAs": "Odkázat na předchozí",
   "DE.Views.EditHyperlink.textDisplay": "Zobrazit",
   "DE.Views.EditHyperlink.textEdit": "Upravit odkaz",
   "DE.Views.EditHyperlink.textLink": "Odkaz",
@@ -251,6 +262,7 @@
   "DE.Views.EditParagraph.textBack": "Zpět",
   "DE.Views.EditParagraph.textBackground": "Pozadí",
   "DE.Views.EditParagraph.textBefore": "Před",
+  "DE.Views.EditParagraph.textFirstLine": "První řádek",
   "DE.Views.EditParagraph.textFromText": "Vzdálenost od textu",
   "DE.Views.EditParagraph.textKeepLines": "Ponechat řádky pohromadě",
   "DE.Views.EditParagraph.textKeepNext": "Zachovat s dalším",
@@ -359,15 +371,21 @@
   "DE.Views.Settings.textFormat": "Formát",
   "DE.Views.Settings.textHelp": "Nápověda",
   "DE.Views.Settings.textLandscape": "Na šířku",
+  "DE.Views.Settings.textLeft": "Vlevo",
   "DE.Views.Settings.textLoading": "Nahrávám ...",
+  "DE.Views.Settings.textMargins": "Okraje",
   "DE.Views.Settings.textOrientation": "Orientace",
   "DE.Views.Settings.textPages": "Stránky",
   "DE.Views.Settings.textParagraphs": "Odstavce",
   "DE.Views.Settings.textPortrait": "Na výšku",
   "DE.Views.Settings.textPoweredBy": "Poháněno",
+  "DE.Views.Settings.textPrint": "Tisk",
   "DE.Views.Settings.textReader": "Čtecí režim",
+  "DE.Views.Settings.textReview": "Sledovat změny",
+  "DE.Views.Settings.textRight": "Vpravo",
   "DE.Views.Settings.textSettings": "Nastavení",
   "DE.Views.Settings.textSpaces": "Mezery",
+  "DE.Views.Settings.textSpellcheck": "Kontrola pravopisu",
   "DE.Views.Settings.textStatistic": "Statistika",
   "DE.Views.Settings.textSymbols": "Symboly",
   "DE.Views.Settings.textTel": "Sdělit",

apps/documenteditor/mobile/locale/de.json

@@ -116,11 +116,13 @@
   "DE.Controllers.Main.textBuyNow": "Webseite besuchen",
   "DE.Controllers.Main.textCancel": "Abbrechen",
   "DE.Controllers.Main.textClose": "Schließen",
-  "DE.Controllers.Main.textContactUs": "Verkaufsteam kontaktieren",
+  "DE.Controllers.Main.textContactUs": "Verkaufsteam",
+  "DE.Controllers.Main.textCustomLoader": "Bitte beachten Sie, dass Sie gemäß den Lizenzbedingungen nicht berechtigt sind, den Loader zu wechseln. <br> Wenden Sie sich an unseren Vertrieb, um ein Angebot zu erhalten.",
   "DE.Controllers.Main.textDone": "Fertig",
   "DE.Controllers.Main.textLoadingDocument": "Dokument wird geladen",
   "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE Verbindungsbeschränkung",
   "DE.Controllers.Main.textOK": "OK",
+  "DE.Controllers.Main.textPaidFeature": "Kostenpflichtige Funktion",
   "DE.Controllers.Main.textPassword": "Kennwort",
   "DE.Controllers.Main.textPreloader": "Ladevorgang...",
   "DE.Controllers.Main.textTryUndoRedo": "Undo/Redo Optionen sind für den halbformalen Zusammenbearbeitungsmodus deaktiviert.",
@@ -276,6 +278,7 @@
   "DE.Views.EditParagraph.textBack": "Zurück",
   "DE.Views.EditParagraph.textBackground": "Hintergrund",
   "DE.Views.EditParagraph.textBefore": "Vor ",
+  "DE.Views.EditParagraph.textFirstLine": "Erste Zeile",
   "DE.Views.EditParagraph.textFromText": "Abstand vom Text",
   "DE.Views.EditParagraph.textKeepLines": "Absatz zusammenhalten",
   "DE.Views.EditParagraph.textKeepNext": "Nicht vom nächsten Absatz trennen",
@@ -341,6 +344,10 @@
   "DE.Views.EditText.textAutomatic": "Automatisch",
   "DE.Views.EditText.textBack": "Zurück",
   "DE.Views.EditText.textBullets": "Aufzählung",
+  "DE.Views.EditText.textCharacterBold": "B",
+  "DE.Views.EditText.textCharacterItalic": "I",
+  "DE.Views.EditText.textCharacterStrikethrough": "S",
+  "DE.Views.EditText.textCharacterUnderline": "U",
   "DE.Views.EditText.textDblStrikethrough": "Doppeltes Durchstreichen",
   "DE.Views.EditText.textDblSuperscript": "Hochgestellt",
   "DE.Views.EditText.textFontColor": "Schriftfarbe",

apps/documenteditor/mobile/locale/en.json

@@ -117,10 +117,12 @@
   "DE.Controllers.Main.textCancel": "Cancel",
   "DE.Controllers.Main.textClose": "Close",
   "DE.Controllers.Main.textContactUs": "Contact sales",
+  "DE.Controllers.Main.textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.",
   "DE.Controllers.Main.textDone": "Done",
   "DE.Controllers.Main.textLoadingDocument": "Loading document",
   "DE.Controllers.Main.textNoLicenseTitle": "%1 connection limitation",
   "DE.Controllers.Main.textOK": "OK",
+  "DE.Controllers.Main.textPaidFeature": "Paid feature",
   "DE.Controllers.Main.textPassword": "Password",
   "DE.Controllers.Main.textPreloader": "Loading... ",
   "DE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.",
@@ -276,6 +278,7 @@
   "DE.Views.EditParagraph.textBack": "Back",
   "DE.Views.EditParagraph.textBackground": "Background",
   "DE.Views.EditParagraph.textBefore": "Before",
+  "DE.Views.EditParagraph.textFirstLine": "First Line",
   "DE.Views.EditParagraph.textFromText": "Distance from Text",
   "DE.Views.EditParagraph.textKeepLines": "Keep Lines Together",
   "DE.Views.EditParagraph.textKeepNext": "Keep with Next",
@@ -341,6 +344,10 @@
   "DE.Views.EditText.textAutomatic": "Automatic",
   "DE.Views.EditText.textBack": "Back",
   "DE.Views.EditText.textBullets": "Bullets",
+  "DE.Views.EditText.textCharacterBold": "B",
+  "DE.Views.EditText.textCharacterItalic": "I",
+  "DE.Views.EditText.textCharacterStrikethrough": "S",
+  "DE.Views.EditText.textCharacterUnderline": "U",
   "DE.Views.EditText.textDblStrikethrough": "Double Strikethrough",
   "DE.Views.EditText.textDblSuperscript": "Superscript",
   "DE.Views.EditText.textFontColor": "Font Color",

apps/documenteditor/mobile/locale/es.json

@@ -116,11 +116,13 @@
   "DE.Controllers.Main.textBuyNow": "Visitar sitio web",
   "DE.Controllers.Main.textCancel": "Cancelar",
   "DE.Controllers.Main.textClose": "Cerrar",
-  "DE.Controllers.Main.textContactUs": "Contactar con equipo de ventas",
+  "DE.Controllers.Main.textContactUs": "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.textDone": "Listo",
   "DE.Controllers.Main.textLoadingDocument": "Cargando documento",
   "DE.Controllers.Main.textNoLicenseTitle": "Limitación de conexiones ONLYOFFICE",
   "DE.Controllers.Main.textOK": "OK",
+  "DE.Controllers.Main.textPaidFeature": "Función de pago",
   "DE.Controllers.Main.textPassword": "Contraseña",
   "DE.Controllers.Main.textPreloader": "Cargando...",
   "DE.Controllers.Main.textTryUndoRedo": "Las funciones Deshacer/Rehacer son desactivados en el modo de co-edición rápido.",
@@ -276,6 +278,7 @@
   "DE.Views.EditParagraph.textBack": "Atrás",
   "DE.Views.EditParagraph.textBackground": "Fondo",
   "DE.Views.EditParagraph.textBefore": "Antes",
+  "DE.Views.EditParagraph.textFirstLine": "Primera línea",
   "DE.Views.EditParagraph.textFromText": "Distancia del texto",
   "DE.Views.EditParagraph.textKeepLines": "Mantener líneas juntas",
   "DE.Views.EditParagraph.textKeepNext": "Conservar con el siguiente",
@@ -341,6 +344,10 @@
   "DE.Views.EditText.textAutomatic": "Automático",
   "DE.Views.EditText.textBack": "Atrás",
   "DE.Views.EditText.textBullets": "Viñetas",
+  "DE.Views.EditText.textCharacterBold": "B",
+  "DE.Views.EditText.textCharacterItalic": "I",
+  "DE.Views.EditText.textCharacterStrikethrough": "S",
+  "DE.Views.EditText.textCharacterUnderline": "U",
   "DE.Views.EditText.textDblStrikethrough": "Doble tachado",
   "DE.Views.EditText.textDblSuperscript": "Sobreíndice",
   "DE.Views.EditText.textFontColor": "Color de fuente",

apps/documenteditor/mobile/locale/fr.json

@@ -116,11 +116,13 @@
   "DE.Controllers.Main.textBuyNow": "Visiter le site web",
   "DE.Controllers.Main.textCancel": "Annuler",
   "DE.Controllers.Main.textClose": "Fermer",
-  "DE.Controllers.Main.textContactUs": "Contacter l'équipe de ventes",
+  "DE.Controllers.Main.textContactUs": "L'équipe de ventes",
+  "DE.Controllers.Main.textCustomLoader": "Veuillez noter que conformément aux clauses du contrat de licence vous n'êtes pas autorisé à changer le chargeur.<br>Veuillez contacter notre Service des Ventes pour obtenir le devis.",
   "DE.Controllers.Main.textDone": "Terminé",
   "DE.Controllers.Main.textLoadingDocument": "Chargement du document",
   "DE.Controllers.Main.textNoLicenseTitle": "Limitation de connexion ONLYOFFICE",
   "DE.Controllers.Main.textOK": "OK",
+  "DE.Controllers.Main.textPaidFeature": "Fonction payée",
   "DE.Controllers.Main.textPassword": "Mot de passe",
   "DE.Controllers.Main.textPreloader": "Chargement en cours...",
   "DE.Controllers.Main.textTryUndoRedo": "Les fonctions Annuler/Rétablir sont désactivées pour le mode collaboratif rapide.",
@@ -233,6 +235,7 @@
   "DE.Views.EditChart.textWrap": "Enveloppant",
   "DE.Views.EditHeader.textDiffFirst": "Première page différente",
   "DE.Views.EditHeader.textDiffOdd": "Pages paires et impaires différentes",
+  "DE.Views.EditHeader.textFrom": "Commencer par",
   "DE.Views.EditHeader.textPageNumbering": "Numérotation des pages",
   "DE.Views.EditHeader.textPrev": "Continuer à partir de la section précédente",
   "DE.Views.EditHeader.textSameAs": "Lier au précédent",
@@ -275,6 +278,7 @@
   "DE.Views.EditParagraph.textBack": "Retour",
   "DE.Views.EditParagraph.textBackground": "Arrière-plan",
   "DE.Views.EditParagraph.textBefore": "Avant",
+  "DE.Views.EditParagraph.textFirstLine": "Première ligne",
   "DE.Views.EditParagraph.textFromText": "Distance du texte",
   "DE.Views.EditParagraph.textKeepLines": "Lignes solidaires",
   "DE.Views.EditParagraph.textKeepNext": "Paragraphes solidaires",
@@ -340,6 +344,10 @@
   "DE.Views.EditText.textAutomatic": "Automatique",
   "DE.Views.EditText.textBack": "Retour",
   "DE.Views.EditText.textBullets": "Puces",
+  "DE.Views.EditText.textCharacterBold": "B",
+  "DE.Views.EditText.textCharacterItalic": "I",
+  "DE.Views.EditText.textCharacterStrikethrough": "S",
+  "DE.Views.EditText.textCharacterUnderline": "U",
   "DE.Views.EditText.textDblStrikethrough": "Barré double",
   "DE.Views.EditText.textDblSuperscript": "Exposant",
   "DE.Views.EditText.textFontColor": "Couleur de police",

apps/documenteditor/mobile/locale/hu.json

@@ -116,11 +116,13 @@
   "DE.Controllers.Main.textBuyNow": "Weboldalt meglátogat",
   "DE.Controllers.Main.textCancel": "Mégse",
   "DE.Controllers.Main.textClose": "Bezár",
-  "DE.Controllers.Main.textContactUs": "Értékesítés elérhetősége",
+  "DE.Controllers.Main.textContactUs": "Értékesítési osztály",
+  "DE.Controllers.Main.textCustomLoader": "Kérjük, vegye figyelembe, hogy az engedély feltételei szerint nem jogosult a betöltő cseréjére.<br>Kérjük, forduljon értékesítési osztályunkhoz, hogy árajánlatot kapjon.",
   "DE.Controllers.Main.textDone": "Kész",
   "DE.Controllers.Main.textLoadingDocument": "Dokumentum betöltése",
   "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE kapcsolódási limitáció",
   "DE.Controllers.Main.textOK": "OK",
+  "DE.Controllers.Main.textPaidFeature": "Fizetett funkció",
   "DE.Controllers.Main.textPassword": "Jelszó",
   "DE.Controllers.Main.textPreloader": "Betöltés...",
   "DE.Controllers.Main.textTryUndoRedo": "A Visszavonás/Újra funkciók nem elérhetőek Gyors közös szerkesztés módban.",
@@ -276,6 +278,7 @@
   "DE.Views.EditParagraph.textBack": "Vissza",
   "DE.Views.EditParagraph.textBackground": "Háttér",
   "DE.Views.EditParagraph.textBefore": "Elötte",
+  "DE.Views.EditParagraph.textFirstLine": "Első sor",
   "DE.Views.EditParagraph.textFromText": "Távolság a szövegtől",
   "DE.Views.EditParagraph.textKeepLines": "Sorok egyben tartása",
   "DE.Views.EditParagraph.textKeepNext": "Következővel együtt tartás",
@@ -341,6 +344,10 @@
   "DE.Views.EditText.textAutomatic": "Automatikus",
   "DE.Views.EditText.textBack": "Vissza",
   "DE.Views.EditText.textBullets": "Felsorolás",
+  "DE.Views.EditText.textCharacterBold": "B",
+  "DE.Views.EditText.textCharacterItalic": "I",
+  "DE.Views.EditText.textCharacterStrikethrough": "s",
+  "DE.Views.EditText.textCharacterUnderline": "U",
   "DE.Views.EditText.textDblStrikethrough": "Dupla áthúzás",
   "DE.Views.EditText.textDblSuperscript": "Felső index",
   "DE.Views.EditText.textFontColor": "Betűszín",

apps/documenteditor/mobile/locale/it.json

@@ -116,11 +116,13 @@
   "DE.Controllers.Main.textBuyNow": "Visita il sito web",
   "DE.Controllers.Main.textCancel": "Annulla",
   "DE.Controllers.Main.textClose": "Chiudi",
-  "DE.Controllers.Main.textContactUs": "Contatta il reparto vendite.",
+  "DE.Controllers.Main.textContactUs": "Reparto 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.textDone": "Fatto",
   "DE.Controllers.Main.textLoadingDocument": "Caricamento del documento",
   "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE® limite connessione",
   "DE.Controllers.Main.textOK": "OK",
+  "DE.Controllers.Main.textPaidFeature": "Caratteristica a pagamento",
   "DE.Controllers.Main.textPassword": "Password",
   "DE.Controllers.Main.textPreloader": "Caricamento in corso...",
   "DE.Controllers.Main.textTryUndoRedo": "Le funzioni Annulla/Ripeti sono disattivate nella modalità rapida di co-editing",
@@ -276,6 +278,7 @@
   "DE.Views.EditParagraph.textBack": "Indietro",
   "DE.Views.EditParagraph.textBackground": "Sfondo",
   "DE.Views.EditParagraph.textBefore": "Prima",
+  "DE.Views.EditParagraph.textFirstLine": "Prima riga",
   "DE.Views.EditParagraph.textFromText": "Distanza dal testo",
   "DE.Views.EditParagraph.textKeepLines": "Mantieni assieme le righe",
   "DE.Views.EditParagraph.textKeepNext": "Mantieni con il successivo",
@@ -341,6 +344,10 @@
   "DE.Views.EditText.textAutomatic": "Automatico",
   "DE.Views.EditText.textBack": "Indietro",
   "DE.Views.EditText.textBullets": "Elenchi puntati",
+  "DE.Views.EditText.textCharacterBold": "B",
+  "DE.Views.EditText.textCharacterItalic": "I",
+  "DE.Views.EditText.textCharacterStrikethrough": "S",
+  "DE.Views.EditText.textCharacterUnderline": "U",
   "DE.Views.EditText.textDblStrikethrough": "Barrato doppio",
   "DE.Views.EditText.textDblSuperscript": "Apice",
   "DE.Views.EditText.textFontColor": "Colore del carattere",

apps/documenteditor/mobile/locale/ko.json

@@ -104,7 +104,7 @@
   "DE.Controllers.Main.textBuyNow": "웹 사이트 방문",
   "DE.Controllers.Main.textCancel": "취소",
   "DE.Controllers.Main.textClose": "닫기",
-  "DE.Controllers.Main.textContactUs": "영업 담당자에게 문의",
+  "DE.Controllers.Main.textContactUs": "영업 부서",
   "DE.Controllers.Main.textDone": "완료",
   "DE.Controllers.Main.textLoadingDocument": "문서로드 중",
   "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE 연결 제한",

apps/documenteditor/mobile/locale/lv.json

@@ -104,7 +104,7 @@
   "DE.Controllers.Main.textBuyNow": "Apmeklēt vietni",
   "DE.Controllers.Main.textCancel": "Atcelt",
   "DE.Controllers.Main.textClose": "Aizvērt",
-  "DE.Controllers.Main.textContactUs": "Sazināties ar pārdošanas daļu",
+  "DE.Controllers.Main.textContactUs": "Pārdošanas nodaļa",
   "DE.Controllers.Main.textDone": "Gatavs",
   "DE.Controllers.Main.textLoadingDocument": "Ielādē dokumentu",
   "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE pieslēguma ierobežojums",

apps/documenteditor/mobile/locale/nl.json

@@ -104,7 +104,7 @@
   "DE.Controllers.Main.textBuyNow": "Website bezoeken",
   "DE.Controllers.Main.textCancel": "Annuleren",
   "DE.Controllers.Main.textClose": "Sluiten",
-  "DE.Controllers.Main.textContactUs": "Contact opnemen met Verkoop",
+  "DE.Controllers.Main.textContactUs": "Verkoopafdeling",
   "DE.Controllers.Main.textDone": "Klaar",
   "DE.Controllers.Main.textLoadingDocument": "Document wordt geladen",
   "DE.Controllers.Main.textNoLicenseTitle": "Only Office verbindingslimiet",

apps/documenteditor/mobile/locale/pl.json

@@ -105,7 +105,7 @@
   "DE.Controllers.Main.textBuyNow": "Odwiedź stronę web",
   "DE.Controllers.Main.textCancel": "Anuluj",
   "DE.Controllers.Main.textClose": "Zamknij",
-  "DE.Controllers.Main.textContactUs": "Skontaktuj się z działem sprzedaży",
+  "DE.Controllers.Main.textContactUs": "Dział sprzedaży",
   "DE.Controllers.Main.textDone": "Gotowe",
   "DE.Controllers.Main.textLoadingDocument": "Ładowanie dokumentu",
   "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE wersja open source",

apps/documenteditor/mobile/locale/ru.json

@@ -116,11 +116,13 @@
   "DE.Controllers.Main.textBuyNow": "Перейти на сайт",
   "DE.Controllers.Main.textCancel": "Отмена",
   "DE.Controllers.Main.textClose": "Закрыть",
-  "DE.Controllers.Main.textContactUs": "Связаться с отделом продаж",
+  "DE.Controllers.Main.textContactUs": "Отдел продаж",
+  "DE.Controllers.Main.textCustomLoader": "Обратите внимание, что по условиям лицензии у вас нет прав изменять экран, отображаемый при загрузке.<br>Пожалуйста, обратитесь в наш отдел продаж, чтобы сделать запрос.",
   "DE.Controllers.Main.textDone": "Готово",
   "DE.Controllers.Main.textLoadingDocument": "Загрузка документа",
   "DE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений ONLYOFFICE",
   "DE.Controllers.Main.textOK": "OK",
+  "DE.Controllers.Main.textPaidFeature": "Платная функция",
   "DE.Controllers.Main.textPassword": "Пароль",
   "DE.Controllers.Main.textPreloader": "Загрузка...",
   "DE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.",
@@ -276,6 +278,7 @@
   "DE.Views.EditParagraph.textBack": "Назад",
   "DE.Views.EditParagraph.textBackground": "Фон",
   "DE.Views.EditParagraph.textBefore": "Перед",
+  "DE.Views.EditParagraph.textFirstLine": "Первая строка",
   "DE.Views.EditParagraph.textFromText": "Расстояние до текста",
   "DE.Views.EditParagraph.textKeepLines": "Не разрывать абзац",
   "DE.Views.EditParagraph.textKeepNext": "Не отрывать от следующего",
@@ -341,6 +344,10 @@
   "DE.Views.EditText.textAutomatic": "Автоматический",
   "DE.Views.EditText.textBack": "Назад",
   "DE.Views.EditText.textBullets": "Маркеры",
+  "DE.Views.EditText.textCharacterBold": "Ж",
+  "DE.Views.EditText.textCharacterItalic": "К",
+  "DE.Views.EditText.textCharacterStrikethrough": "Т",
+  "DE.Views.EditText.textCharacterUnderline": "Ч",
   "DE.Views.EditText.textDblStrikethrough": "Двойное зачёркивание",
   "DE.Views.EditText.textDblSuperscript": "Надстрочные",
   "DE.Views.EditText.textFontColor": "Цвет шрифта",
@@ -392,7 +399,7 @@
   "DE.Views.Settings.textPages": "Страницы",
   "DE.Views.Settings.textParagraphs": "Абзацы",
   "DE.Views.Settings.textPortrait": "Книжная",
-  "DE.Views.Settings.textPoweredBy": "Powered by",
+  "DE.Views.Settings.textPoweredBy": "Разработано",
   "DE.Views.Settings.textPrint": "Печать",
   "DE.Views.Settings.textReader": "Режим чтения",
   "DE.Views.Settings.textReview": "Отслеживать изменения",