Merge branch 'release/v6.4.0' into develop

apps/api/documents/api.js

@@ -135,6 +135,9 @@
                         request: bool (default: true), // enable set name
                         label: string (default: "Guest") // postfix for user name
                     },
+                    review: {
+                        hideReviewDisplay: false // hide button Review mode
+                    },
                     chat: true,
                     comments: true,
                     zoom: 100,

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

@@ -129,7 +129,7 @@ define([
             me.dataHintDirection = me.options.dataHintDirection || '';
             me.dataHintOffset = me.options.dataHintOffset || '';
 
-            me.listenTo(me.model, 'change',             me.render);
+            me.listenTo(me.model, 'change', this.model.get('skipRenderOnChange') ? me.onChange : me.render);
             me.listenTo(me.model, 'change:selected',    me.onSelectChange);
             me.listenTo(me.model, 'remove',             me.remove);
         },
@@ -197,6 +197,18 @@ define([
 
         onSelectChange: function(model, selected) {
             this.trigger('select', this, model, selected);
+        },
+
+        onChange: function () {
+            if (_.isUndefined(this.model.id))
+                return this;
+            var el = this.$el || $(this.el);
+            el.toggleClass('selected', this.model.get('selected') && this.model.get('allowSelected'));
+            el.toggleClass('disabled', !!this.model.get('disabled'));
+
+            this.trigger('change', this, this.model);
+
+            return this;
         }
     });
 
@@ -321,7 +333,8 @@ define([
                 if (this.enableKeyEvents && this.parentMenu && this.handleSelect) {
                     if (!me.showLast)
                         this.parentMenu.on('show:before', function(menu) { me.deselectAll(); });
-                    this.parentMenu.on('show:after', function(menu) {
+                    this.parentMenu.on('show:after', function(menu, e) {
+                        if (e && (menu.el !== e.target)) return;
                         if (me.showLast) me.showLastSelected(); 
                         Common.NotificationCenter.trigger('dataview:focus');
                         _.delay(function() {

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

@@ -131,6 +131,8 @@ define([
                     this.api.asc_registerCallback('asc_onUpdateRevisionsChangesPosition', _.bind(this.onApiUpdateChangePosition, this));
                     this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this));
                     this.api.asc_registerCallback('asc_onParticipantsChanged',     _.bind(this.onAuthParticipantsChanged, this));
+                    this.api.asc_registerCallback('asc_onBeginViewModeInReview',   _.bind(this.onBeginViewModeInReview, this));
+                    this.api.asc_registerCallback('asc_onEndViewModeInReview',     _.bind(this.onEndViewModeInReview, this));
                 }
                 if (this.appConfig.canReview)
                     this.api.asc_registerCallback('asc_onOnTrackRevisionsChange', _.bind(this.onApiTrackRevisionsChange, this));
@@ -694,6 +696,18 @@ define([
             this._state.previewMode = (mode == 'final' || mode == 'original');
         },
 
+        onBeginViewModeInReview: function(mode) {
+            this.disableEditing(true);
+            this.view && this.view.turnDisplayMode(mode ? 'final' : 'original');
+            this._state.previewMode = true;
+        },
+
+        onEndViewModeInReview: function() {
+            this.disableEditing(false);
+            this.view && this.view.turnDisplayMode('markup');
+            this._state.previewMode = false;
+        },
+
         isPreviewChangesMode: function() {
             return this._state.previewMode;
         },

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

@@ -102,7 +102,7 @@ define([
                 var view = this,
                     textBox = $(this.el).find('textarea'),
                     domTextBox = null,
-                    minHeight = 50,
+                    minHeight = 55,
                     lineHeight = 0,
                     scrollPos = 0,
                     oldHeight = 0,

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

@@ -295,7 +295,7 @@ define([
                         dataHintOffset: 'small'
                     });
 
-                    if (!this.appConfig.isRestrictedEdit) {// hide Display mode option for fillForms and commenting mode
+                    if (!this.appConfig.isRestrictedEdit && !(this.appConfig.customization && this.appConfig.customization.review && this.appConfig.customization.review.hideReviewDisplay)) {// hide Display mode option for fillForms and commenting mode
                         var menuTemplate = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem"><div><%= caption %></div>' +
                             '<% if (options.description !== null) { %><label style="display: block;color: #a5a5a5;cursor: pointer;white-space: normal;"><%= options.description %></label>' +
                             '<% } %></a>');

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

@@ -176,7 +176,7 @@ define([
                         var view = this,
                             textBox = this.$el.find('textarea'),
                             domTextBox = null,
-                            minHeight = 50,
+                            minHeight = 55,
                             lineHeight = 0,
                             scrollPos = 0,
                             oldHeight = 0,

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

@@ -677,6 +677,7 @@
     &:active:not(.disabled),
     &.active:not(.disabled) {
         .caret {
+            border-color: @icon-normal;
         }
     }
 
@@ -990,6 +991,7 @@
     &.active:not(.disabled) {
         .caret {
             background-position: @arrow-small-offset-x @arrow-small-offset-y;
+            border-color: @icon-normal;
         }
     }
 

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

@@ -47,7 +47,7 @@
         --text-contrast-background: #fff;
 
         --icon-normal: #444;
-        --icon-normal-pressed: #444;
+        --icon-normal-pressed: #fff;
         --icon-inverse: #444;
         --icon-toolbar-header: fade(#fff, 80%);
         --icon-notification-badge: #000;

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

@@ -48,6 +48,12 @@
                     }
                 }
             }
+
+            &.active, &:active {
+                .caret {
+                    border-color: @icon-normal;
+                }
+            }
         }
     }
 

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

@@ -113,7 +113,7 @@
 
     textarea {
         width: 100%;
-        height: 50px;
+        height: 55px;
         resize: none;
         margin-bottom: 5px;
         border: @scaled-one-px-value-ie solid @border-regular-control-ie;

apps/common/mobile/resources/img/about/logo.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 290 55"><defs><style>.cls-1,.cls-2,.cls-3{fill-rule:evenodd;}.cls-1{fill:url(#grad_173);}.cls-2{fill:url(#grad_168);}.cls-3{fill:url(#grad_91);}.cls-4{fill:#526484;}.cls-5{fill:#3a4968;}</style><linearGradient id="grad_173" x1="35" y1="63.54" x2="35" y2="24.24" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#d94315" stop-opacity="0.3"/><stop offset="0.88" stop-color="#d9420b"/></linearGradient><linearGradient id="grad_168" x1="35.03" y1="46.52" x2="35.03" y2="20.68" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#8bba24" stop-opacity="0.3"/><stop offset="0.66" stop-color="#8bba25"/></linearGradient><linearGradient id="grad_91" x1="35" y1="35.95" x2="35" y2="1.23" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#28a8e0" stop-opacity="0.3"/><stop offset="1" stop-color="#26a8de"/></linearGradient></defs><path class="cls-1" d="M31.36,53.32L7.5,42.58c-2-.9-2-2.38,0-3.28l8.36-3.77,15.49,7a10.15,10.15,0,0,0,7.28,0l15.49-7L62.5,39.3c2,0.9,2,2.38,0,3.28L38.64,53.32a10.14,10.14,0,0,1-7.28,0h0Z"/><path class="cls-2" d="M31.39,40.14L7.56,29.39c-2-.9-2-2.38,0-3.28l8.1-3.65,15.73,7.09a10.12,10.12,0,0,0,7.28,0L54.4,22.46l8.1,3.65c2,0.9,2,2.38,0,3.28L38.67,40.14a10.12,10.12,0,0,1-7.28,0h0Z"/><path class="cls-3" d="M31.36,27.19L7.5,16.58c-2-.89-2-2.35,0-3.24L31.36,2.74a10.27,10.27,0,0,1,7.28,0L62.5,13.34c2,0.89,2,2.35,0,3.24L38.64,27.19a10.26,10.26,0,0,1-7.28,0h0Z"/><path class="cls-4" d="M72.06,27.86q0-6.86,4-10.31a14.37,14.37,0,0,1,18.68,0q4,3.45,4,10.35t-4,10.31a14.37,14.37,0,0,1-18.68,0q-4-3.45-4-10.31v0h0Zm5.78,0q0,4.74,1.8,7a7.77,7.77,0,0,0,3.9,2.79q0.51,0.12,1,.17a7.12,7.12,0,0,0,.92.06,7.59,7.59,0,0,0,.94-0.06,5.83,5.83,0,0,0,1-.21,7.58,7.58,0,0,0,3.87-2.79Q93,32.56,93,27.89T91.2,21a7.58,7.58,0,0,0-3.87-2.79,5.83,5.83,0,0,0-1-.21,7.76,7.76,0,0,0-.94-0.06,7.27,7.27,0,0,0-.92.06q-0.45.06-1,.17A7.77,7.77,0,0,0,79.64,21q-1.8,2.22-1.8,6.92v0h0Z"/><polygon class="cls-4" points="102 15 109 15 119.89 35 120 35 120 15 125 15 125 41 118 41 107.13 20.96 107.01 20.96 107 41 102 41 102 15 102 15"/><polygon class="cls-4" points="130 15 135 15 135 37 147 37 147 41 130 41 130 15 130 15"/><polygon class="cls-4" points="148 15 155.47 25.98 155.59 25.98 163 15 168.5 15 158 31 158 41 153 41 153 31 142.5 15 148 15"/><path class="cls-5" d="M168,27.94q0-6.77,3.9-10.18a13.88,13.88,0,0,1,18.22,0Q194,21.17,194,28t-3.88,10.18a13.88,13.88,0,0,1-18.22,0Q168,34.75,168,28v0h0Zm5.63,0q0,4.68,1.75,6.87a7.57,7.57,0,0,0,3.81,2.76q0.49,0.11.93,0.17a6.85,6.85,0,0,0,.89.06,7.31,7.31,0,0,0,.91-0.06,5.6,5.6,0,0,0,1-.21,7.39,7.39,0,0,0,3.77-2.76q1.71-2.19,1.71-6.79t-1.71-6.79a7.39,7.39,0,0,0-3.77-2.76,5.61,5.61,0,0,0-1-.21,7.48,7.48,0,0,0-.91-0.06,7,7,0,0,0-.89.06q-0.44.06-.93,0.17a7.57,7.57,0,0,0-3.81,2.76q-1.75,2.19-1.75,6.83v0h0Z"/><polygon class="cls-5" points="197 15 212 15 212 19 202 19 202 26 211 26 211 30 202 30 202 41 197 41 197 15 197 15"/><polygon class="cls-5" points="216 15 231 15 231 19 221 19 221 26 230 26 230 30 221 30 221 41 216 41 216 15 216 15"/><polygon class="cls-5" points="234 41 234 15 239 15 239 41 234 41 234 41"/><path class="cls-5" d="M262,19.88a18.8,18.8,0,0,0-6.3-1c-7,0-8.28,5.64-8.28,9.13,0,2.54.84,9.19,7.67,9.19a17,17,0,0,0,6.57-1.24L262,40.42a42.48,42.48,0,0,1-7.46.81c-5.08,0-12.54-3.1-12.54-13.36,0-9.28,7-13,13-13a24.56,24.56,0,0,1,7,.8v4.25Z"/><polygon class="cls-5" points="266 15 282 15 282 19 271 19 271 26 281 26 281 30 271 30 271 37 282 37 282 41 266 41 266 15 266 15"/></svg>

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

@@ -36,6 +36,6 @@
           display: inline-block;
           width: 100%;
           height: 55px;
-          background: url('../../../../common/mobile/resources/img/about/logo.svg') no-repeat center;
+          background: url('../../../../common/main/resources/img/about/logo_s.svg') no-repeat center;
     }
 }

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

@@ -383,47 +383,54 @@
     }
 }
 
-.color-palettes {
+.page {
-    .palette {
+    .color-palettes {
-        padding: 8px 0px;
+        .list {
-        a {
+            ul {
-            flex-grow: 1;
+                .palette {
-            position: relative;
+                    padding: 8px 0px;
-            min-width: 10px;
+                    a {
-            min-height: 26px;
+                        flex-grow: 1;
-            margin: 1px 1px 0 0;
+                        position: relative;
-            box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset;
+                        min-width: 10px;
-            &.active:after {
+                        min-height: 26px;
-                content: ' ';
+                        margin: 1px 1px 0 0;
-                position: absolute;
+                        box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset;
-                width: 100%;
+                        border-radius: 0;
-                height: 100%;
+                        &.active:after {
-                box-shadow: 0 0 0 1px @white, 0 0 0 4px @themeColor;
+                            content: ' ';
-                z-index: 1;
+                            position: absolute;
-                border-radius: 1px;
+                            width: 100%;
-            }
+                            height: 100%;
-            &.transparent {
+                            box-shadow: 0 0 0 1px @white, 0 0 0 4px @themeColor;
-                background-repeat: no-repeat;
+                            z-index: 1;
-                background-size: 100% 100%;
+                            border-radius: 1px;
-                .encoded-svg-background("<svg xmlns='http://www.w3.org/2000/svg' x='0px' y='0px' viewBox='0 0 22 22' xml:space='preserve'><line stroke='#ff0000' stroke-linecap='undefined' stroke-linejoin='undefined' id='svg_1' y2='0' x2='22' y1='22' x1='0' stroke-width='2' fill='none'/></svg>");
+                        }
+                        &.transparent {
+                            background-repeat: no-repeat;
+                            background-size: 100% 100%;
+                            .encoded-svg-background("<svg xmlns='http://www.w3.org/2000/svg' x='0px' y='0px' viewBox='0 0 22 22' xml:space='preserve'><line stroke='#ff0000' stroke-linecap='undefined' stroke-linejoin='undefined' id='svg_1' y2='0' x2='22' y1='22' x1='0' stroke-width='2' fill='none'/></svg>");
+                        }
+                    } 
+                }
             }
         }
-    }
+        .row {
-    .row {
+            padding: 0;
-        padding: 0;
+        }
-    }
+        .list .item-inner {
-    .list .item-inner {
+            display: block;
-        display: block;
+        }
-    }
+        .standart-colors, .dynamic-colors {
-    .standart-colors, .dynamic-colors {
+            .palette {
-        .palette {
+                display: flex;
-            display: flex;
+            }
         }
-    }
 
-    .dynamic-colors {
+        .dynamic-colors {
-        .empty-color {
+            .empty-color {
-            background-color: @white;
+                background-color: @white;
+            }
         }
     }
 }

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

@@ -2006,15 +2006,15 @@ define([
                     restoreHeight: 138,
                     allowScrollbar: false,
                     store: new Common.UI.DataViewStore([
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: -1}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: -1}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 1}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 1}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 2}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 2}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 3}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 3}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 4}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 4}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 5}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 5}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 6}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 6}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 7}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 7}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 8}}
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 8}, skipRenderOnChange: true}
                     ]),
                     itemTemplate: _.template('<div id="<%= id %>" class="item-markerlist"></div>')
                 });
@@ -2027,14 +2027,14 @@ define([
                     restoreHeight: 92,
                     allowScrollbar: false,
                     store: new Common.UI.DataViewStore([
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: -1}},
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: -1}, skipRenderOnChange: true},
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 4}},
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 4}, skipRenderOnChange: true},
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 5}},
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 5}, skipRenderOnChange: true},
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 6}},
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 6}, skipRenderOnChange: true},
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 1}},
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 1}, skipRenderOnChange: true},
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 2}},
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 2}, skipRenderOnChange: true},
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 3}},
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 3}, skipRenderOnChange: true},
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 7}}
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 7}, skipRenderOnChange: true}
                     ]),
                     itemTemplate: _.template('<div id="<%= id %>" class="item-multilevellist"></div>')
                 });
@@ -2047,10 +2047,10 @@ define([
                     restoreHeight: 92,
                     allowScrollbar: false,
                     store: new Common.UI.DataViewStore([
-                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: -1}},
+                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: -1}, skipRenderOnChange: true},
-                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 1}},
+                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 1}, skipRenderOnChange: true},
-                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 2}},
+                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 2}, skipRenderOnChange: true},
-                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 3}}
+                        {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 3}, skipRenderOnChange: true}
                     ]),
                     itemTemplate: _.template('<div id="<%= id %>" class="item-multilevellist"></div>')
                 });

apps/documenteditor/mobile/locale/backup/ru.json

@@ -106,7 +106,7 @@
   "DE.Controllers.DocumentHolder.menuSplit": "Разделить ячейку",
   "DE.Controllers.DocumentHolder.sheetCancel": "Отмена",
   "DE.Controllers.DocumentHolder.textCancel": "Отмена",
-  "DE.Controllers.DocumentHolder.textColumns": "Колонки",
+  "DE.Controllers.DocumentHolder.textColumns": "Столбцы",
   "DE.Controllers.DocumentHolder.textCopyCutPasteActions": "Операции копирования, вырезания и вставки",
   "DE.Controllers.DocumentHolder.textDoNotShowAgain": "Больше не показывать",
   "DE.Controllers.DocumentHolder.textGuest": "Гость",
@@ -394,7 +394,7 @@
   "DE.Views.EditShape.textFromText": "Расстояние до текста",
   "DE.Views.EditShape.textInFront": "Перед текстом",
   "DE.Views.EditShape.textInline": "В тексте",
-  "DE.Views.EditShape.textOpacity": "Прозрачность",
+  "DE.Views.EditShape.textOpacity": "Непрозрачность",
   "DE.Views.EditShape.textOverlap": "Разрешить перекрытие",
   "DE.Views.EditShape.textRemoveShape": "Удалить фигуру",
   "DE.Views.EditShape.textReorder": "Порядок",

apps/documenteditor/mobile/locale/en.json

@@ -205,6 +205,7 @@
     "textBehind": "Behind",
     "textBorder": "Border",
     "textBringToForeground": "Bring to foreground",
+    "textBullets": "Bullets",
     "textBulletsAndNumbers": "Bullets & Numbers",
     "textCellMargins": "Cell Margins",
     "textChart": "Chart",
@@ -250,6 +251,7 @@
     "textNone": "None",
     "textNoStyles": "No styles for this type of charts.",
     "textNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textNumbers": "Numbers",
     "textOpacity": "Opacity",
     "textOptions": "Options",
     "textOrphanControl": "Orphan Control",
@@ -293,11 +295,13 @@
     "textTopAndBottom": "Top and Bottom",
     "textTotalRow": "Total Row",
     "textType": "Type",
-    "textWrap": "Wrap"
+    "textWrap": "Wrap",
+    "textBullets": "Bullets",
+    "textNumbers": "Numbers"
   },
   "Error": {
     "convertationTimeoutText": "Conversion timeout exceeded.",
-    "criticalErrorExtText": "Press 'OK' to back to the document list.",
+    "criticalErrorExtText": "Press 'OK' to go back to the document list.",
     "criticalErrorTitle": "Error",
     "downloadErrorText": "Download failed.",
     "errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please, contact your admin.",
@@ -379,7 +383,22 @@
     "leavePageText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",
     "notcriticalErrorTitle": "Warning",
     "SDK": {
+      " -Section ": " -Section ",
+      "above": "above",
+      "below": "below",
+      "Caption": "Caption",
+      "Choose an item": "Choose an item",
+      "Click to load image": "Click to load image",
+      "Current Document": "Current Document",
       "Diagram Title": "Chart Title",
+      "endnote text": "Endnote Text",
+      "Enter a date": "Enter a date",
+      "Error! Bookmark not defined": "Error! Bookmark not defined.",
+      "Error! Main Document Only": "Error! Main Document Only.",
+      "Error! No text of specified style in document": "Error! No text of specified style in document.",
+      "Error! Not a valid bookmark self-reference": "Error! Not a valid bookmark self-reference.",
+      "Even Page ": "Even Page ",
+      "First Page ": "First Page ",
       "Footer": "Footer",
       "footnote text": "Footnote Text",
       "Header": "Header",
@@ -392,17 +411,38 @@
       "Heading 7": "Heading 7",
       "Heading 8": "Heading 8",
       "Heading 9": "Heading 9",
+      "Hyperlink": "Hyperlink",
+      "Index Too Large": "Index Too Large",
       "Intense Quote": "Intense Quote",
+      "Is Not In Table": "Is Not In Table",
       "List Paragraph": "List Paragraph",
+      "Missing Argument": "Missing Argument",
+      "Missing Operator": "Missing Operator",
       "No Spacing": "No Spacing",
+      "No table of contents entries found": "There are no headings in the document. Apply a heading style to the text so that it appears in the table of contents.",
+      "No table of figures entries found": "No table of figures entries found.",
+      "None": "None",
       "Normal": "Normal",
+      "Number Too Large To Format": "Number Too Large To Format",
+      "Odd Page ": "Odd Page ",
       "Quote": "Quote",
+      "Same as Previous": "Same as Previous",
       "Series": "Series",
       "Subtitle": "Subtitle",
+      "Syntax Error": "Syntax Error",
+      "Table Index Cannot be Zero": "Table Index Cannot be Zero",
+      "Table of Contents": "Table of Contents",
+      "table of figures": "Table of figures",
+      "The Formula Not In Table": "The Formula Not In Table",
       "Title": "Title",
+      "TOC Heading": "TOC Heading",
+      "Type equation here": "Type equation here",
+      "Undefined Bookmark": "Undefined Bookmark",
+      "Unexpected End of Formula": "Unexpected End of Formula",
       "X Axis": "X Axis XAS",
       "Y Axis": "Y Axis",
-      "Your text here": "Your text here"
+      "Your text here": "Your text here",
+      "Zero Divide": "Zero Divide"
     },
     "textAnonymous": "Anonymous",
     "textBuyNow": "Visit website",
@@ -481,7 +521,7 @@
     "textMacrosSettings": "Macros Settings",
     "textMargins": "Margins",
     "textMarginsH": "Top and bottom margins are too high for a given page height",
-    "textMarginsW": "Left and right margins are too high for a given page width",
+    "textMarginsW": "Left and right margins are too wide for a given page width",
     "textNoCharacters": "Nonprinting Characters",
     "textNoTextFound": "Text not found",
     "textOpenFile": "Enter a password to open the file",
@@ -506,7 +546,27 @@
     "textUnitOfMeasurement": "Unit Of Measurement",
     "textUploaded": "Uploaded",
     "txtIncorrectPwd": "Password is incorrect",
-    "txtProtected": "Once you enter the password and open the file, the current password will be reset"
+    "txtProtected": "Once you enter the password and open the file, the current password will be reset",
+    "txtScheme1": "Office",
+    "txtScheme10": "Median",
+    "txtScheme11": "Metro",
+    "txtScheme12": "Module",
+    "txtScheme13": "Opulent",
+    "txtScheme14": "Oriel",
+    "txtScheme15": "Origin",
+    "txtScheme16": "Paper",
+    "txtScheme17": "Solstice",
+    "txtScheme18": "Technic",
+    "txtScheme19": "Trek",
+    "txtScheme2": "Grayscale",
+    "txtScheme22": "New Office",
+    "txtScheme3": "Apex",
+    "txtScheme4": "Aspect",
+    "txtScheme5": "Civic",
+    "txtScheme6": "Concourse",
+    "txtScheme7": "Equity",
+    "txtScheme8": "Flow",
+    "txtScheme9": "Foundry"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

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

@@ -1407,15 +1407,15 @@ define([
                     restoreHeight: 138,
                     allowScrollbar: false,
                     store: new Common.UI.DataViewStore([
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: -1}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: -1}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 1}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 1}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 2}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 2}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 3}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 3}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 4}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 4}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 5}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 5}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 6}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 6}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 7}},
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 7}, skipRenderOnChange: true},
-                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 8}}
+                        {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 8}, skipRenderOnChange: true}
                     ]),
                     itemTemplate: _.template('<div id="<%= id %>" class="item-markerlist"></div>')
                 });
@@ -1428,14 +1428,14 @@ define([
                     restoreHeight: 92,
                     allowScrollbar: false,
                     store: new Common.UI.DataViewStore([
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: -1}},
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: -1}, skipRenderOnChange: true},
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 4}},
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 4}, skipRenderOnChange: true},
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 5}},
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 5}, skipRenderOnChange: true},
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 6}},
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 6}, skipRenderOnChange: true},
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 1}},
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 1}, skipRenderOnChange: true},
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 2}},
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 2}, skipRenderOnChange: true},
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 3}},
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 3}, skipRenderOnChange: true},
-                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 7}}
+                        {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 7}, skipRenderOnChange: true}
                     ]),
                     itemTemplate: _.template('<div id="<%= id %>" class="item-multilevellist"></div>')
                 });

apps/presentationeditor/main/locale/en.json

@@ -186,6 +186,13 @@
   "Common.Views.Header.tipViewUsers": "View users and manage document access rights",
   "Common.Views.Header.txtAccessRights": "Change access rights",
   "Common.Views.Header.txtRename": "Rename",
+  "Common.Views.History.textCloseHistory": "Close History",
+  "Common.Views.History.textHide": "Collapse",
+  "Common.Views.History.textHideAll": "Hide detailed changes",
+  "Common.Views.History.textRestore": "Restore",
+  "Common.Views.History.textShow": "Expand",
+  "Common.Views.History.textShowAll": "Show detailed changes",
+  "Common.Views.History.textVer": "ver.",
   "Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:",
   "Common.Views.ImageFromUrlDialog.txtEmpty": "This field is required",
   "Common.Views.ImageFromUrlDialog.txtNotUrl": "This field should be a URL in the \"http://www.example.com\" format",

apps/presentationeditor/mobile/locale/en.json

@@ -71,6 +71,8 @@
       "notcriticalErrorTitle": "Warning",
       "SDK": {
         "Chart": "Chart",
+        "Click to add first slide": "Click to add first slide",
+        "Click to add notes": "Click to add notes",
         "ClipArt": "Clip Art",
         "Date and time": "Date and time",
         "Diagram": "Diagram",
@@ -78,7 +80,9 @@
         "Footer": "Footer",
         "Header": "Header",
         "Image": "Image",
+        "Loading": "Loading",
         "Media": "Media",
+        "None": "None",
         "Picture": "Picture",
         "Series": "Series",
         "Slide number": "Slide number",
@@ -258,6 +262,7 @@
       "textBottomLeft": "Bottom-Left",
       "textBottomRight": "Bottom-Right",
       "textBringToForeground": "Bring to Foreground",
+      "textBullets": "Bullets",
       "textBulletsAndNumbers": "Bullets & Numbers",
       "textCaseSensitive": "Case Sensitive",
       "textCellMargins": "Cell Margins",
@@ -321,6 +326,7 @@
       "textNoStyles": "No styles for this type of chart.",
       "textNoTextFound": "Text not found",
       "textNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+      "textNumbers": "Numbers",
       "textOpacity": "Opacity",
       "textOptions": "Options",
       "textPictureFromLibrary": "Picture from Library",
@@ -374,7 +380,9 @@
       "textZoom": "Zoom",
       "textZoomIn": "Zoom In",
       "textZoomOut": "Zoom Out",
-      "textZoomRotate": "Zoom and Rotate"
+      "textZoomRotate": "Zoom and Rotate",
+      "textBullets": "Bullets",
+      "textNumbers": "Numbers"
     },
     "Settings": {
       "mniSlideStandard": "Standard (4:3)",
@@ -431,7 +439,27 @@
       "textTitle": "Title",
       "textUnitOfMeasurement": "Unit Of Measurement",
       "textUploaded": "Uploaded",
-      "textVersion": "Version"
+      "textVersion": "Version",
+      "txtScheme1": "Office",
+      "txtScheme10": "Median",
+      "txtScheme11": "Metro",
+      "txtScheme12": "Module",
+      "txtScheme13": "Opulent",
+      "txtScheme14": "Oriel",
+      "txtScheme15": "Origin",
+      "txtScheme16": "Paper",
+      "txtScheme17": "Solstice",
+      "txtScheme18": "Technic",
+      "txtScheme19": "Trek",
+      "txtScheme2": "Grayscale",
+      "txtScheme22": "New Office",
+      "txtScheme3": "Apex",
+      "txtScheme4": "Aspect",
+      "txtScheme5": "Civic",
+      "txtScheme6": "Concourse",
+      "txtScheme7": "Equity",
+      "txtScheme8": "Flow",
+      "txtScheme9": "Foundry"
     }
   }
 }

apps/spreadsheeteditor/main/app/controller/DataTab.js

@@ -226,6 +226,7 @@ define([
                 Common.NotificationCenter.trigger('edit:complete', this.toolbar);
             } else if (type === 'url') {
                 (new Common.Views.ImageFromUrlDialog({
+                    title: me.txtUrlTitle,
                     handler: function(result, value) {
                         if (result == 'ok') {
                             if (me.api) {
@@ -426,7 +427,8 @@ define([
         txtExtendDataValidation: 'The selection contains some cells without Data Validation settings.<br>Do you want to extend Data Validation to these cells?',
         txtRemoveDataValidation: 'The selection contains more than one type of validation.<br>Erase current settings and continue?',
         textEmptyUrl: 'You need to specify URL.',
-        txtImportWizard: 'Text Import Wizard'
+        txtImportWizard: 'Text Import Wizard',
+        txtUrlTitle: 'Paste a data URL'
 
     }, SSE.Controllers.DataTab || {}));
 });

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

@@ -1776,6 +1776,14 @@ define([
                         config.msg = this.errorPivotWithoutUnderlying;
                         break;
 
+                    case Asc.c_oAscError.ID.SingleColumnOrRowError:
+                        config.msg = this.errorSingleColumnOrRowError;
+                        break;
+
+                    case Asc.c_oAscError.ID.LocationOrDataRangeError:
+                        config.msg = this.errorLocationOrDataRangeError;
+                        break;
+
                     default:
                         config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -3064,7 +3072,9 @@ define([
             textDisconnect: 'Connection is lost',
             textConvertEquation: 'This equation was created with an old version of equation editor which is no longer supported. Converting this equation to Office Math ML format will make it editable.<br>Do you want to convert this equation?',
             textApplyAll: 'Apply to all equations',
-            textLearnMore: 'Learn More'
+            textLearnMore: 'Learn More',
+            errorSingleColumnOrRowError: 'Location reference is not valid because the cells are not all in the same column or row.<br>Select cells that are all in a single column or row.',
+            errorLocationOrDataRangeError: 'The reference for the location or data range is not valid.'
         }
     })(), SSE.Controllers.Main || {}))
 });

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

@@ -946,21 +946,21 @@ define([
             me.paraBulletsPicker = {
                 conf: {rec: null},
                 store       : new Common.UI.DataViewStore([
-                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 1},
+                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 1, skipRenderOnChange: true},
-                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 2},
+                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 2, skipRenderOnChange: true},
-                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 3},
+                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 3, skipRenderOnChange: true},
-                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 4},
+                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 4, skipRenderOnChange: true},
-                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 5},
+                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 5, skipRenderOnChange: true},
-                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 6},
+                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 6, skipRenderOnChange: true},
-                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 7},
+                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 7, skipRenderOnChange: true},
-                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 8},
+                    {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 8, skipRenderOnChange: true},
-                    {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 4},
+                    {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 4, skipRenderOnChange: true},
-                    {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 5},
+                    {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 5, skipRenderOnChange: true},
-                    {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 6},
+                    {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 6, skipRenderOnChange: true},
-                    {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 1},
+                    {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 1, skipRenderOnChange: true},
-                    {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 2},
+                    {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 2, skipRenderOnChange: true},
-                    {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 3},
+                    {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 3, skipRenderOnChange: true},
-                    {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 7}
+                    {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 7, skipRenderOnChange: true}
                 ]),
                 groups: new Common.UI.DataViewGroupStore([
                     {id: 'menu-list-bullet-group', caption: this.textBullets},

apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js

@@ -844,7 +844,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
                         record.value==Asc.c_oAscCfvoType.AutoMin || record.value==Asc.c_oAscCfvoType.AutoMax);
                     me.setDefComboValue(combo.options.type, record.value, me.barControls[combo.options.type].range);
                 });
-                combo.setValue(arr[1].value);
+                var value = (i==0) ? Asc.c_oAscCfvoType.AutoMin : Asc.c_oAscCfvoType.AutoMax;
+                combo.setValue(value);
                 Common.UI.FocusManager.add(this, combo);
 
                 var range = new Common.UI.InputFieldBtn({
@@ -854,9 +855,10 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template',
                     allowBlank  : true,
                     btnHint     : this.textSelectData,
                     validateOnChange: false,
-                    type        : i
+                    type        : i,
+                    disabled    : (value==Asc.c_oAscCfvoType.AutoMin || value==Asc.c_oAscCfvoType.AutoMax || value==Asc.c_oAscCfvoType.Minimum || value==Asc.c_oAscCfvoType.Maximum)
                 });
-                range.setValue(0);
+                me.setDefComboValue(i, value, range);
                 range.on('button:click', _.bind(this.onSelectData, this));
                 this.barControls.push({combo: combo, range: range});
                 Common.UI.FocusManager.add(this, range);

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

@@ -472,7 +472,7 @@ define([
                 if (this.chFilter.isDisabled() !== (!this._state.CheckHeader || this._locked || value===null))
                     this.chFilter.setDisabled(!this._state.CheckHeader || this._locked || value===null);
 
-                if (needTablePictures)
+                if (needTablePictures || !this.mnuTableTemplatePicker)
                     this.onApiInitTableTemplates(this.api.asc_getTablePictures(props));
 
                 //for table-template

apps/spreadsheeteditor/main/locale/en.json

@@ -163,6 +163,7 @@
   "Common.Views.AutoCorrectDialog.textRecognized": "Recognized Functions",
   "Common.Views.AutoCorrectDialog.textRecognizedDesc": "The following expressions are recognized math expressions. They will not be automatically italicized.",
   "Common.Views.AutoCorrectDialog.textReplace": "Replace",
+  "Common.Views.AutoCorrectDialog.textReplaceText": "Replace As You Type",
   "Common.Views.AutoCorrectDialog.textReplaceType": "Replace text as you type",
   "Common.Views.AutoCorrectDialog.textReset": "Reset",
   "Common.Views.AutoCorrectDialog.textResetAll": "Reset to default",
@@ -427,6 +428,7 @@
   "SSE.Controllers.DataTab.txtRemDuplicates": "Remove Duplicates",
   "SSE.Controllers.DataTab.txtRemoveDataValidation": "The selection contains more than one type of validation.<br>Erase current settings and continue?",
   "SSE.Controllers.DataTab.txtRemSelected": "Remove in selected",
+  "SSE.Controllers.DataTab.txtUrlTitle": "Paste a data URL",
   "SSE.Controllers.DocumentHolder.alignmentText": "Alignment",
   "SSE.Controllers.DocumentHolder.centerText": "Center",
   "SSE.Controllers.DocumentHolder.deleteColumnText": "Delete Column",
@@ -695,6 +697,8 @@
   "SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula.<br>Wrong number of brackets is used.",
   "SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used.<br>Please correct the error.",
   "SSE.Controllers.Main.errRemDuplicates": "Duplicate values found and deleted: {0}, unique values left: {1}.",
+  "SSE.Controllers.Main.errorSingleColumnOrRowError": "Location reference is not valid because the cells are not all in the same column or row.<br>Select cells that are all in a single column or row.",
+  "SSE.Controllers.Main.errorLocationOrDataRangeError": "The reference for the location or data range is not valid.",
   "SSE.Controllers.Main.leavePageText": "You have unsaved changes in this spreadsheet. Click 'Stay on this Page' then 'Save' to save them. Click 'Leave this Page' to discard all the unsaved changes.",
   "SSE.Controllers.Main.leavePageTextOnClose": "All unsaved changes in this spreadsheet will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
   "SSE.Controllers.Main.loadFontsTextText": "Loading data...",
@@ -1934,6 +1938,7 @@
   "SSE.Views.DocumentHolder.txtUngroup": "Ungroup",
   "SSE.Views.DocumentHolder.txtWidth": "Width",
   "SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
+  "SSE.Views.DocumentHolder.txtCondFormat": "Conditional Formatting",
   "SSE.Views.FieldSettingsDialog.strLayout": "Layout",
   "SSE.Views.FieldSettingsDialog.strSubtotals": "Subtotals",
   "SSE.Views.FieldSettingsDialog.textReport": "Report Form",

apps/spreadsheeteditor/mobile/locale/en.json

@@ -73,8 +73,35 @@
       "notcriticalErrorTitle": "Warning",
       "SDK": {
         "txtAccent": "Accent",
+        "txtAll": "(All)",
         "txtArt": "Your text here",
+        "txtBlank": "(blank)",
+        "txtByField": "%1 of %2",
+        "txtClearFilter": "Clear Filter (Alt+C)",
+        "txtColLbls": "Column Labels",
+        "txtColumn": "Column",
+        "txtConfidential": "Confidential",
+        "txtDate": "Date",
+        "txtDays": "Days",
         "txtDiagramTitle": "Chart Title",
+        "txtFile": "File",
+        "txtGrandTotal": "Grand Total",
+        "txtGroup": "Group",
+        "txtHours": "Hours",
+        "txtMinutes": "Minutes",
+        "txtMonths": "Months",
+        "txtMultiSelect": "Multi-Select (Alt+S)",
+        "txtOr": "%1 or %2",
+        "txtPage": "Page",
+        "txtPageOf": "Page %1 of %2",
+        "txtPages": "Pages",
+        "txtPreparedBy": "Prepared by",
+        "txtPrintArea": "Print_Area",
+        "txtQuarter": "Qtr",
+        "txtQuarters": "Quarters",
+        "txtRow": "Row",
+        "txtRowLbls": "Row Labels",
+        "txtSeconds": "Seconds",
         "txtSeries": "Series",
         "txtStyle_Bad": "Bad",
         "txtStyle_Calculation": "Calculation",
@@ -97,8 +124,13 @@
         "txtStyle_Title": "Title",
         "txtStyle_Total": "Total",
         "txtStyle_Warning_Text": "Warning Text",
+        "txtTab": "Tab",
+        "txtTable": "Table",
+        "txtTime": "Time",
+        "txtValues": "Values",
         "txtXAxis": "X Axis",
-        "txtYAxis": "Y Axis"
+        "txtYAxis": "Y Axis",
+        "txtYears": "Years"
       },
       "textAnonymous": "Anonymous",
       "textBuyNow": "Visit website",
@@ -270,6 +302,7 @@
       "textAddLink": "Add Link",
       "textAddress": "Address",
       "textBack": "Back",
+      "textCancel": "Cancel",
       "textChart": "Chart",
       "textComment": "Comment",
       "textDisplay": "Display",
@@ -296,7 +329,11 @@
       "textShape": "Shape",
       "textSheet": "Sheet",
       "textSortAndFilter": "Sort and Filter",
-      "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\""
+      "txtExpand": "Expand and sort",
+      "txtExpandSort": "The data next to the selection will not be sorted. Do you want to expand the selection to include the adjacent data or continue with sorting the currently selected cells only?",
+      "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+      "txtSorting": "Sorting",
+      "txtSortSelected": "Sort selected"
     },
     "Edit": {
       "notcriticalErrorTitle": "Warning",
@@ -474,7 +511,9 @@
       "textVerticalText": "Vertical Text",
       "textWrapText": "Wrap Text",
       "textYen": "Yen",
-      "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\""
+      "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+      "txtSortHigh2Low": "Sort Highest to Lowest",
+      "txtSortLow2High": "Sort Lowest to Highest"
     },
     "Settings": {
       "advCSVOptions": "Choose CSV options",
@@ -568,6 +607,26 @@
       "txtEncoding": "Encoding",
       "txtIncorrectPwd": "Password is incorrect",
       "txtProtected": "Once you enter the password and open the file, the current password to the file will be reset",
+      "txtScheme1": "Office",
+      "txtScheme10": "Median",
+      "txtScheme11": "Metro",
+      "txtScheme12": "Module",
+      "txtScheme13": "Opulent",
+      "txtScheme14": "Oriel",
+      "txtScheme15": "Origin",
+      "txtScheme16": "Paper",
+      "txtScheme17": "Solstice",
+      "txtScheme18": "Technic",
+      "txtScheme19": "Trek",
+      "txtScheme2": "Grayscale",
+      "txtScheme22": "New Office",
+      "txtScheme3": "Apex",
+      "txtScheme4": "Aspect",
+      "txtScheme5": "Civic",
+      "txtScheme6": "Concourse",
+      "txtScheme7": "Equity",
+      "txtScheme8": "Flow",
+      "txtScheme9": "Foundry",
       "txtSpace": "Space",
       "txtTab": "Tab",
       "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?"

build/Gruntfile.js

@@ -4,7 +4,7 @@ module.exports = function(grunt) {
         packageFile;
 
     const copyrightHeader = 'Copyright (c) Ascensio System SIA <%= grunt.template.today("yyyy") %>. All rights reserved'
-    var copyright = '/*\n' +
+    var copyright = '/*!\n' +
                     ' * ' + (process.env['APP_COPYRIGHT'] || copyrightHeader) + '\n' +
                     ' *\n' +
                     ' * <%= pkg.homepage %> \n' +
@@ -432,11 +432,6 @@ module.exports = function(grunt) {
                 'template-backup': packageFile.mobile.copy['template-backup'][0].dest
             },
 
-            requirejs: {
-                compile: {
-                    options: packageFile['mobile']['js']['requirejs']['options']
-                }
-            },
 
             concat: {
                 options: {
@@ -444,8 +439,8 @@ module.exports = function(grunt) {
                     banner: copyright
                 },
                 dist: {
-                    src: packageFile.mobile.js.requirejs.options.out,
+                    src: packageFile.mobile.js.dest,
-                    dest: packageFile.mobile.js.requirejs.options.out
+                    dest: packageFile.mobile.js.dest
                 }
             },
 
@@ -498,29 +493,29 @@ module.exports = function(grunt) {
                 },
             },
             
-            replace: {
+            // replace: {
-                writeVersion: {
+                // writeVersion: {
-                    src: ['<%= pkg.mobile.js.requirejs.options.out %>'],
+                //     src: ['<%= pkg.mobile.js.requirejs.options.out %>'],
-                    overwrite: true,
+                //     overwrite: true,
-                    replacements: [{
+                //     replacements: [{
-                        from: /\{\{PRODUCT_VERSION\}\}/,
+                //         from: /\{\{PRODUCT_VERSION\}\}/,
-                        to: packageFile.version
+                //         to: packageFile.version
-                    }]
+                //     }]
-                },
+                // },
-                fixResourceUrl: {
+                // fixResourceUrl: {
-                    src: ['<%= pkg.mobile.js.requirejs.options.out %>',
+                //     src: ['<%= pkg.mobile.js.requirejs.options.out %>',
-                            '<%= pkg.mobile.css.ios.dist %>',
+                //             '<%= pkg.mobile.css.ios.dist %>',
-                            '<%= pkg.mobile.css.material.dist %>'],
+                //             '<%= pkg.mobile.css.material.dist %>'],
-                    overwrite: true,
+                //     overwrite: true,
-                    replacements: [{
+                //     replacements: [{
-                        from: /(?:\.{2}\/){4}common\/mobile\/resources\/img/g,
+                //         from: /(?:\.{2}\/){4}common\/mobile\/resources\/img/g,
-                        to: '../img'
+                //         to: '../img'
-                    },{
+                //     },{
-                        from: /(?:\.{2}\/){2}common\/mobile/g,
+                //         from: /(?:\.{2}\/){2}common\/mobile/g,
-                        to: '../mobile'
+                //         to: '../mobile'
-                    }]
+                //     }]
-                }
+                // }
-            },
+            // },
 
             exec: {
                 webpack_app_build: {
@@ -542,9 +537,9 @@ module.exports = function(grunt) {
             }
         });
 
-        var replace = grunt.config.get('replace');
+        // var replace = grunt.config.get('replace');
-        replace.writeVersion.replacements.push(...jsreplacements);
+        // replace.writeVersion.replacements.push(...jsreplacements);
-        grunt.config.set('replace', replace);
+        // grunt.config.set('replace', replace);
     });
 
     grunt.registerTask('embed-app-init', function() {
@@ -629,10 +624,10 @@ module.exports = function(grunt) {
                                                             'replace:writeVersion', 'replace:prepareHelp', 'clean:postbuild']);
 
     grunt.registerTask('deploy-app-mobile',             ['mobile-app-init', 'clean:deploy', /*'cssmin',*/ /*'copy:template-backup',*/
-                                                            'htmlmin', /*'requirejs',*/ 'exec:webpack_install', 'exec:webpack_app_build', /*'concat',*/ /*'copy:template-restore',*/
+                                                            'htmlmin', /*'requirejs',*/ 'exec:webpack_install', 'exec:webpack_app_build', /*'copy:template-restore',*/
                                                             /*'clean:template-backup',*/ 'copy:localization', 'copy:index-page',
-                                                            'copy:images-app', 'copy:webpack-dist', 'json-minify',
+                                                            'copy:images-app', 'copy:webpack-dist', 'concat', 'json-minify'/*,*/
-                                                            'replace:writeVersion', 'replace:fixResourceUrl']);
+                                                            /*'replace:writeVersion', 'replace:fixResourceUrl'*/]);
 
     grunt.registerTask('deploy-app-embed',              ['embed-app-init', 'clean:prebuild', 'uglify', 'less', 'copy', 
                                                             'clean:postbuild']);

build/documenteditor.json

@@ -224,98 +224,8 @@
             ]
         },
         "js": {
-            "requirejs": {
+            "src": "../apps/documenteditor/mobile/dist/js/app.js",
-                "options": {
+            "dest": "../deploy/web-apps/apps/documenteditor/mobile/dist/js/app.js"
-                    "name": "../apps/documenteditor/mobile/app.js",
-                    "out": "../deploy/web-apps/apps/documenteditor/mobile/app.js",
-                    "baseUrl": "../apps/",
-                    "inlineText": true,
-                    "findNestedDependencies": true,
-                    "preserveLicenseComments": false,
-                    "optimizeAllPluginResources": true,
-                    "paths": {
-                        "jquery": "../vendor/jquery/jquery",
-                        "underscore": "../vendor/underscore/underscore",
-                        "backbone": "../vendor/backbone/backbone",
-                        "framework7": "../vendor/framework7/js/framework7",
-                        "text": "../vendor/requirejs-text/text",
-                        "xregexp": "empty:",
-                        "sockjs": "empty:",
-                        "jszip": "empty:",
-                        "jszip-utils": "empty:",
-                        "coapisettings": "empty:",
-                        "allfonts": "empty:",
-                        "sdk": "empty:",
-                        "api": "empty:",
-                        "core": "common/main/lib/core/application",
-                        "extendes": "common/mobile/utils/extendes",
-                        "notification": "common/main/lib/core/NotificationCenter",
-                        "localstorage": "common/main/lib/util/LocalStorage",
-                        "analytics": "common/Analytics",
-                        "gateway": "common/Gateway",
-                        "locale": "common/locale",
-                        "irregularstack": "common/IrregularStack",
-                        "sharedsettings": "common/mobile/utils/SharedSettings"
-                    },
-                    "shim": {
-                        "framework7": {
-                            "exports": "Framework7"
-                        },
-                        "underscore": {
-                            "exports": "_"
-                        },
-                        "backbone": {
-                            "deps": [
-                                "underscore",
-                                "jquery"
-                            ],
-                            "exports": "Backbone"
-                        },
-                        "notification": {
-                            "deps": [
-                                "backbone"
-                            ]
-                        },
-                        "core": {
-                            "deps": [
-                                "backbone",
-                                "notification",
-                                "irregularstack",
-                                "sharedsettings"
-                            ]
-                        },
-                        "extendes": {
-                            "deps": [
-                                "underscore",
-                                "jquery",
-                                "framework7"
-                            ]
-                        },
-                        "sdk": {
-                            "deps": [
-                                "jquery",
-                                "underscore",
-                                "coapisettings",
-                                "allfonts",
-                                "xregexp",
-                                "sockjs",
-                                "jszip",
-                                "jszip-utils"
-                            ]
-                        },
-                        "gateway": {
-                            "deps": [
-                                "jquery"
-                            ]
-                        },
-                        "analytics": {
-                            "deps": [
-                                "jquery"
-                            ]
-                        }
-                    }
-                }
-            }
         },
         "css": {
             "ios": {

build/presentationeditor.json

@@ -228,98 +228,8 @@
             ]
         },
         "js": {
-            "requirejs": {
+            "src": "../apps/presentationeditor/mobile/dist/js/app.js",
-                "options": {
+            "dest": "../deploy/web-apps/apps/presentationeditor/mobile/dist/js/app.js"
-                    "name": "../apps/presentationeditor/mobile/app.js",
-                    "out": "../deploy/web-apps/apps/presentationeditor/mobile/app.js",
-                    "baseUrl": "../apps/",
-                    "inlineText": true,
-                    "findNestedDependencies": true,
-                    "preserveLicenseComments": false,
-                    "optimizeAllPluginResources": true,
-                    "paths": {
-                        "jquery": "../vendor/jquery/jquery",
-                        "underscore": "../vendor/underscore/underscore",
-                        "backbone": "../vendor/backbone/backbone",
-                        "framework7": "../vendor/framework7/js/framework7",
-                        "text": "../vendor/requirejs-text/text",
-                        "xregexp": "empty:",
-                        "sockjs": "empty:",
-                        "jszip": "empty:",
-                        "jszip-utils": "empty:",
-                        "coapisettings": "empty:",
-                        "allfonts": "empty:",
-                        "sdk": "empty:",
-                        "api": "empty:",
-                        "core": "common/main/lib/core/application",
-                        "extendes": "common/mobile/utils/extendes",
-                        "notification": "common/main/lib/core/NotificationCenter",
-                        "localstorage": "common/main/lib/util/LocalStorage",
-                        "analytics": "common/Analytics",
-                        "gateway": "common/Gateway",
-                        "locale": "common/locale",
-                        "irregularstack": "common/IrregularStack",
-                        "sharedsettings": "common/mobile/utils/SharedSettings"
-                    },
-                    "shim": {
-                        "framework7": {
-                            "exports": "Framework7"
-                        },
-                        "underscore": {
-                            "exports": "_"
-                        },
-                        "backbone": {
-                            "deps": [
-                                "underscore",
-                                "jquery"
-                            ],
-                            "exports": "Backbone"
-                        },
-                        "notification": {
-                            "deps": [
-                                "backbone"
-                            ]
-                        },
-                        "core": {
-                            "deps": [
-                                "backbone",
-                                "notification",
-                                "irregularstack",
-                                "sharedsettings"
-                            ]
-                        },
-                        "extendes": {
-                            "deps": [
-                                "underscore",
-                                "jquery",
-                                "framework7"
-                            ]
-                        },
-                        "sdk": {
-                            "deps": [
-                                "jquery",
-                                "underscore",
-                                "coapisettings",
-                                "allfonts",
-                                "xregexp",
-                                "sockjs",
-                                "jszip",
-                                "jszip-utils"
-                            ]
-                        },
-                        "gateway": {
-                            "deps": [
-                                "jquery"
-                            ]
-                        },
-                        "analytics": {
-                            "deps": [
-                                "jquery"
-                            ]
-                        }
-                    }
-                }
-            }
         },
         "css": {
             "ios": {

build/spreadsheeteditor.json

@@ -229,98 +229,8 @@
             ]
         },
         "js": {
-            "requirejs": {
+            "src": "../apps/spreadsheeteditor/mobile/dist/js/app.js",
-                "options": {
+            "dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/dist/js/app.js"
-                    "name": "../apps/spreadsheeteditor/mobile/app.js",
-                    "out": "../deploy/web-apps/apps/spreadsheeteditor/mobile/app.js",
-                    "baseUrl": "../apps/",
-                    "inlineText": true,
-                    "findNestedDependencies": true,
-                    "preserveLicenseComments": false,
-                    "optimizeAllPluginResources": true,
-                    "paths": {
-                        "jquery": "../vendor/jquery/jquery",
-                        "underscore": "../vendor/underscore/underscore",
-                        "backbone": "../vendor/backbone/backbone",
-                        "framework7": "../vendor/framework7/js/framework7",
-                        "text": "../vendor/requirejs-text/text",
-                        "xregexp": "empty:",
-                        "sockjs": "empty:",
-                        "jszip": "empty:",
-                        "jszip-utils": "empty:",
-                        "coapisettings": "empty:",
-                        "allfonts": "empty:",
-                        "sdk": "empty:",
-                        "api": "empty:",
-                        "core": "common/main/lib/core/application",
-                        "extendes": "common/mobile/utils/extendes",
-                        "notification": "common/main/lib/core/NotificationCenter",
-                        "localstorage": "common/main/lib/util/LocalStorage",
-                        "analytics": "common/Analytics",
-                        "gateway": "common/Gateway",
-                        "locale": "common/locale",
-                        "irregularstack": "common/IrregularStack",
-                        "sharedsettings": "common/mobile/utils/SharedSettings"
-                    },
-                    "shim": {
-                        "framework7": {
-                            "exports": "Framework7"
-                        },
-                        "underscore": {
-                            "exports": "_"
-                        },
-                        "backbone": {
-                            "deps": [
-                                "underscore",
-                                "jquery"
-                            ],
-                            "exports": "Backbone"
-                        },
-                        "notification": {
-                            "deps": [
-                                "backbone"
-                            ]
-                        },
-                        "core": {
-                            "deps": [
-                                "backbone",
-                                "notification",
-                                "irregularstack",
-                                "sharedsettings"
-                            ]
-                        },
-                        "extendes": {
-                            "deps": [
-                                "underscore",
-                                "jquery",
-                                "framework7"
-                            ]
-                        },
-                        "sdk": {
-                            "deps": [
-                                "jquery",
-                                "underscore",
-                                "coapisettings",
-                                "allfonts",
-                                "xregexp",
-                                "sockjs",
-                                "jszip",
-                                "jszip-utils"
-                            ]
-                        },
-                        "gateway": {
-                            "deps": [
-                                "jquery"
-                            ]
-                        },
-                        "analytics": {
-                            "deps": [
-                                "jquery"
-                            ]
-                        }
-                    }
-                }
-            }
         },
         "css": {
             "ios": {