[DE mobile][PE][SSE] Merge from develop.

apps/common/mobile/lib/component/ThemeColorPalette.js

@@ -120,6 +120,11 @@ define([
                 row = -1,
                 standartColors = Common.Utils.ThemeColor.getStandartColors();
 
+            // Disable duplicate
+            if ($(me.el).find('.list-block.color-palette').length > 0) {
+                return
+            }
+
             _.each(Common.Utils.ThemeColor.getEffectColors(), function(effect, index) {
                 if (0 == index % me.options.themecolors) {
                     themeColors.push([]);

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

@@ -18,6 +18,7 @@
 
   .list-block {
     font-size: 14px;
+    white-space: pre;
 
     &:first-child {
       ul {
@@ -53,6 +54,11 @@
           .hairline-color(right, transparent);
         }
       }
+
+      html.phone & {
+        padding: 0 10px;
+      }
+
       &.list-button {
         color: @white;
         .hairline(right, @modalHairlineColor);

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

@@ -10,6 +10,8 @@
   }
 
   .list-block {
+    white-space: pre;
+
     ul {
       height: 48px;
     }
@@ -17,5 +19,11 @@
     li {
       display: inline-block;
     }
+
+    .item-link {
+      html.phone & {
+        padding: 0 10px;
+      }
+    }
   }
 }

apps/documenteditor/embed/js/ApplicationController.js

@@ -65,14 +65,14 @@ var ApplicationController = new(function(){
         common.controller.modals.init(embedConfig);
 
         // Docked toolbar
-        if (embedConfig.toolbarDocked === 'top') {
-            $('#toolbar').addClass('top');
-            $('#editor_sdk').addClass('top');
-        } else {
+        if (embedConfig.toolbarDocked === 'bottom') {
             $('#toolbar').addClass('bottom');
             $('#editor_sdk').addClass('bottom');
             $('#box-tools').removeClass('dropdown').addClass('dropup');
             ttOffset[1] = -40;
+        } else {
+            $('#toolbar').addClass('top');
+            $('#editor_sdk').addClass('top');
         }
 
         if (config.canBackToFolder === false || !(config.customization && config.customization.goback && config.customization.goback.url)) {

apps/documenteditor/mobile/app-dev.js

@@ -220,6 +220,7 @@ require([
         'documenteditor/mobile/app/controller/add/AddImage',
         'documenteditor/mobile/app/controller/add/AddOther'
     ], function() {
+        window.compareVersions = true;
         app.start();
     });
 }, function(err) {

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

@@ -56,6 +56,7 @@ define([
         var _stack,
             _view,
             _fastCoAuthTips = [],
+            _actionSheets = [],
             _isEdit = false;
 
         return {
@@ -132,6 +133,22 @@ define([
                             return true;
                         }
                     });
+                } else if ('showActionSheet' == eventName && _actionSheets.length > 0) {
+                    _.delay(function () {
+                        _.each(_actionSheets, function (action) {
+                            action.text = action.caption
+                            action.onClick = function () {
+                                me.onContextMenuClick(null, action.event)
+                            }
+                        });
+
+                        uiApp.actions([_actionSheets, [
+                            {
+                                text: me.sheetCancel,
+                                bold: true
+                            }
+                        ]]);
+                    }, 100);
                 }
 
                 _view.hideMenu();
@@ -144,7 +161,7 @@ define([
             },
 
             onApiShowPopMenu: function(posX, posY) {
-                if ($('.popover.settings, .popup.settings, .picker-modal.settings, .modal.modal-in').length > 0) {
+                if ($('.popover.settings, .popup.settings, .picker-modal.settings, .modal.modal-in, .actions-modal').length > 0) {
                     return;
                 }
 
@@ -281,6 +298,8 @@ define([
                     menuItems = [],
                     canCopy = me.api.can_CopyCut();
 
+                _actionSheets = [];
+
                 if (canCopy) {
                     menuItems.push({
                         caption: me.menuCopy,
@@ -360,10 +379,6 @@ define([
                     }
                 }
 
-                if (Common.SharedSettings.get('phone') && menuItems.length > 3) {
-                    menuItems = menuItems.slice(0, 3);
-                }
-
                 if (isLink) {
                     menuItems.push({
                         caption: me.menuOpenLink,
@@ -371,6 +386,16 @@ define([
                     });
                 }
 
+                if (Common.SharedSettings.get('phone') && menuItems.length > 3) {
+                    _actionSheets = menuItems.slice(3);
+
+                    menuItems = menuItems.slice(0, 3);
+                    menuItems.push({
+                        caption: me.menuMore,
+                        event: 'showActionSheet'
+                    });
+                }
+
                 return menuItems;
             },
 
@@ -381,7 +406,9 @@ define([
             menuEdit: 'Edit',
             menuDelete: 'Delete',
             menuAddLink: 'Add Link',
-            menuOpenLink: 'Open Link'
+            menuOpenLink: 'Open Link',
+            menuMore: 'More',
+            sheetCancel: 'Cancel'
         }
     })(), DE.Controllers.DocumentHolder || {}))
 });

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

@@ -79,7 +79,6 @@ define([
                     isDisconnected      : false,
                     usersCount          : 1,
                     fastCoauth          : true,
-                    startModifyDocument : true,
                     lostEditingRights   : false,
                     licenseWarning      : false
                 };
@@ -131,6 +130,7 @@ define([
                     me.api.asc_registerCallback('asc_onDocumentContentReady',       _.bind(me.onDocumentContentReady, me));
                     me.api.asc_registerCallback('asc_onOpenDocumentProgress',       _.bind(me.onOpenDocument, me));
                     me.api.asc_registerCallback('asc_onDocumentUpdateVersion',      _.bind(me.onUpdateVersion, me));
+                    me.api.asc_registerCallback('asc_onServerVersion',              _.bind(me.onServerVersion, me));
                     me.api.asc_registerCallback('asc_onAdvancedOptions',            _.bind(me.onAdvancedOptions, me));
                     me.api.asc_registerCallback('asc_onDocumentName',               _.bind(me.onDocumentName, me));
                     me.api.asc_registerCallback('asc_onPrintUrl',                   _.bind(me.onPrintUrl, me));
@@ -311,14 +311,9 @@ define([
                     me.setLongActionView(action)
                 } else {
                     if (me._state.fastCoauth && me._state.usersCount>1 && id==Asc.c_oAscAsyncAction['Save']) {
-                        if (me._state.timerSave===undefined)
-                            me._state.timerSave = setInterval(function(){
-                                if ((new Date()) - me._state.isSaving>500) {
-                                    clearInterval(me._state.timerSave);
-                                    //console.debug('End long action');
-                                    me._state.timerSave = undefined;
-                                }
-                            }, 500);
+                        // me._state.timerSave = setTimeout(function () {
+                            //console.debug('End long action');
+                        // }, 500);
                     } else {
                         // console.debug('End long action');
                     }
@@ -351,7 +346,7 @@ define([
                         break;
 
                     case Asc.c_oAscAsyncAction['Save']:
-                        me._state.isSaving = new Date();
+                        // clearTimeout(this._state.timerSave);
                         title   = me.saveTitleText;
                         text    = me.saveTextText;
                         break;
@@ -588,6 +583,8 @@ define([
                     return;
                 }
 
+                if ( me.onServerVersion(params.asc_getBuildVersion()) ) return;
+
                 me.permissions.review         = (me.permissions.review === undefined) ? (me.permissions.edit !== false) : me.permissions.review;
                 me.appOptions.canAnalytics    = params.asc_getIsAnalyticsEnable();
                 me.appOptions.canLicense      = (licType === Asc.c_oLicenseResult.Success);
@@ -646,7 +643,8 @@ define([
                 });
 
                 if (me.api) {
-                    me.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this));
+                    me.api.asc_registerCallback('asc_onSendThemeColors', _.bind(me.onSendThemeColors, me));
+                    me.api.asc_registerCallback('asc_onDownloadUrl',     _.bind(me.onDownloadUrl, me));
 
                     var translateChart = new Asc.asc_CChartTranslate();
                     translateChart.asc_setTitle(me.txtDiagramTitle);
@@ -672,8 +670,6 @@ define([
 
                     me.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(me.onDocumentModifiedChanged, me));
                     me.api.asc_registerCallback('asc_onDocumentCanSaveChanged',  _.bind(me.onDocumentCanSaveChanged, me));
-                    me.api.asc_registerCallback('asc_onSaveUrl',                 _.bind(me.onSaveUrl, me));
-                    me.api.asc_registerCallback('asc_onDownloadUrl',             _.bind(me.onDownloadUrl, me));
                     /** coauthoring begin **/
                     me.api.asc_registerCallback('asc_onCollaborativeChanges',    _.bind(me.onCollaborativeChanges, me));
                     me.api.asc_registerCallback('asc_OnTryUndoInFastCollaborative',_.bind(me.onTryUndoInFastCollaborative, me));
@@ -813,6 +809,10 @@ define([
                         config.msg = this.errorConnectToServer;
                         break;
 
+                    case Asc.c_oAscError.ID.UplImageUrl:
+                        config.msg = this.errorBadImageUrl;
+                        break;
+
                     default:
                         config.msg = this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -875,21 +875,12 @@ define([
                     if (window.document.title != title)
                         window.document.title = title;
 
-                    if (!this._state.fastCoauth || this._state.usersCount<2 )
-                        Common.Gateway.setDocumentModified(isModified);
-                    else if ( this._state.startModifyDocument!==undefined && this._state.startModifyDocument === isModified){
-                        Common.Gateway.setDocumentModified(isModified);
-                        this._state.startModifyDocument = (this._state.startModifyDocument) ? !this._state.startModifyDocument : undefined;
-                    }
-
+                    Common.Gateway.setDocumentModified(isModified);
                     this._state.isDocModified = isModified;
                 }
             },
 
             onDocumentModifiedChanged: function() {
-                if (this._state.fastCoauth && this._state.usersCount > 1 && this._state.startModifyDocument===undefined )
-                    return;
-
                 var isModified = this.api.asc_isDocumentCanSave();
                 if (this._state.isDocModified !== isModified) {
                     Common.Gateway.setDocumentModified(this.api.isDocumentModified());
@@ -925,10 +916,6 @@ define([
                 $('#loading-mask').hide().remove();
             },
 
-            onSaveUrl: function(url) {
-                Common.Gateway.save(url);
-            },
-
             onDownloadUrl: function(url) {
                 if (this._state.isFromGatewayDownloadAs) {
                     Common.Gateway.downloadAs(url);
@@ -958,6 +945,25 @@ define([
                 });
             },
 
+            onServerVersion: function(buildVersion) {
+                var me = this;
+                if (me.changeServerVersion) return true;
+
+                if (DocsAPI.DocEditor.version() !== buildVersion && !window.compareVersions) {
+                    me.changeServerVersion = true;
+                    uiApp.alert(
+                        me.errorServerVersion,
+                        me.titleServerVersion,
+                        function () {
+                            _.defer(function() {
+                                Common.Gateway.updateVersion();
+                            })
+                        });
+                    return true;
+                }
+                return false;
+            },
+
             onCollaborativeChanges: function() {
                 //
             },
@@ -1206,7 +1212,10 @@ define([
             textPassword: 'Password',
             textBack: 'Back',
             textClose: 'Close',
-            textDone: 'Done'
+            textDone: 'Done',
+            titleServerVersion: 'Editor updated',
+            errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.',
+            errorBadImageUrl: 'Image url is incorrect'
         }
     })(), DE.Controllers.Main || {}))
 });

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

@@ -57,7 +57,7 @@ define([
             infoObj,
             modalView,
             _isPortrait = false,
-            _pageSizesIndex = -1,
+            _pageSizesIndex = 0,
             _pageSizesCurrent = [0, 0],
             txtCm = Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.cm),
             _pageSizes = [
@@ -359,6 +359,10 @@ define([
             },
 
             onApiPageSize: function(w, h) {
+                if (!_isPortrait) {
+                    var tempW = w; w = h; h = tempW;
+                }
+
                 if (Math.abs(_pageSizesCurrent[0] - w) > 0.01 ||
                     Math.abs(_pageSizesCurrent[1] - h) > 0.01) {
                     _pageSizesCurrent = [w, h];
@@ -377,7 +381,6 @@ define([
                 _isPortrait = isPortrait;
             },
 
-
             unknownText: 'Unknown',
             txtLoading              : 'Loading...',
             notcriticalErrorTitle   : 'Warning',

apps/documenteditor/mobile/app/controller/add/AddTable.js

@@ -92,11 +92,11 @@ define([
                     me.api.asc_GetDefaultTableStyles();
                 }
 
-                $('#add-table li').single('click',  _.buffered(this.onStyleClick, 300, this));
+                $('#add-table li').single('click',  _.buffered(this.onStyleClick, 100, this));
             },
 
             onViewRender: function () {
-                $('#add-table li').single('click',  _.buffered(this.onStyleClick, 300, this));
+                $('#add-table li').single('click',  _.buffered(this.onStyleClick, 100, this));
             },
 
             onStyleClick: function (e) {
@@ -104,64 +104,69 @@ define([
                     $target = $(e.currentTarget),
                     type = $target.data('type');
 
+                if ($('.modal.modal-in').length > 0) {
+                    return
+                }
+
                 DE.getController('AddContainer').hideModal();
 
-                _.delay(function () {
-                    if ($target) {
-                        var picker;
-                        var modal = uiApp.modal({
-                            title: me.textTableSize,
-                            text: '',
-                            afterText:
-                            '<div class="content-block">' +
-                                '<div class="row">' +
-                                    '<div class="col-50">' + me.textColumns + '</div>' +
-                                    '<div class="col-50">' + me.textRows + '</div>' +
-                                '</div>' +
-                            '<div id="picker-table-size"></div>' +
-                            '</div>',
-                            buttons: [
-                                {
-                                    text: me.textCancel
-                                },
-                                {
-                                    text: 'OK',
-                                    bold: true,
-                                    onClick: function () {
-                                        var size = picker.value;
+                if ($target) {
+                    var picker;
+                    var modal = uiApp.modal({
+                        title: me.textTableSize,
+                        text: '',
+                        afterText:
+                        '<div class="content-block">' +
+                            '<div class="row no-gutter" style="text-align: center;">' +
+                                '<div class="col-50">' + me.textColumns + '</div>' +
+                                '<div class="col-50">' + me.textRows + '</div>' +
+                            '</div>' +
+                        '<div id="picker-table-size"></div>' +
+                        '</div>',
+                        buttons: [
+                            {
+                                text: me.textCancel
+                            },
+                            {
+                                text: 'OK',
+                                bold: true,
+                                onClick: function () {
+                                    var size = picker.value;
 
-                                        if (me.api) {
-                                            me.api.put_Table(parseInt(size[0]), parseInt(size[1]));
+                                    if (me.api) {
+                                        me.api.put_Table(parseInt(size[0]), parseInt(size[1]));
 
-                                            var properties = new Asc.CTableProp();
-                                            properties.put_TableStyle(type);
+                                        var properties = new Asc.CTableProp();
+                                        properties.put_TableStyle(type);
 
-                                            me.api.tblApply(properties);
-                                        }
+                                        me.api.tblApply(properties);
                                     }
                                 }
-                            ]
-                        });
+                            }
+                        ]
+                    });
 
-                        picker = uiApp.picker({
-                            container: '#picker-table-size',
-                            toolbar: false,
-                            rotateEffect: true,
-                            value: [3, 3],
-                            cols: [{
-                                textAlign: 'left',
-                                values: [1,2,3,4,5,6,7,8,9,10]
-                            }, {
-                                values: [1,2,3,4,5,6,7,8,9,10]
-                            }]
-                        });
+                    picker = uiApp.picker({
+                        container: '#picker-table-size',
+                        toolbar: false,
+                        rotateEffect: true,
+                        value: [3, 3],
+                        cols: [{
+                            textAlign: 'center',
+                            width: '100%',
+                            values: [1,2,3,4,5,6,7,8,9,10]
+                        }, {
+                            textAlign: 'center',
+                            width: '100%',
+                            values: [1,2,3,4,5,6,7,8,9,10]
+                        }]
+                    });
 
-                        // Vertical align
-                        $$(modal).css({
-                            marginTop: - Math.round($$(modal).outerHeight() / 2) + 'px'
-                        });
-                    }
-                }, 300);
+                    // Vertical align
+                    $$(modal).css({
+                        marginTop: - Math.round($$(modal).outerHeight() / 2) + 'px'
+                    });
+                }
             },
 
             // Public

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

@@ -54,7 +54,8 @@ define([
         var _stack = [],
             _chartObject = undefined,
             _shapeObject = undefined,
-            _metricText = Common.Utils.Metric.getCurrentMetricName();
+            _metricText = Common.Utils.Metric.getCurrentMetricName(),
+            _borderColor = 'transparent';
 
         var wrapTypesTransform = (function() {
             var map = [
@@ -80,7 +81,7 @@ define([
                         return obj.ui === type;
                     })[0];
                     return record ? record.sdk : 0;
-                },
+                }
             }
         })();
 
@@ -260,13 +261,18 @@ define([
                 paletteFillColor && paletteFillColor.select(color);
 
                 // Init border color
-                var stroke = shapeProperties.get_stroke(),
-                    strokeType = stroke.get_type();
+                me._initBorderColorView();
+            },
 
-                color = 'transparent';
+            _initBorderColorView: function () {
+                var me = this,
+                    paletteBorderColor = me.getView('EditChart').paletteBorderColor,
+                    stroke = _shapeObject.get_ShapeProperties().get_stroke();
 
-                if (stroke && strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
-                    sdkColor = stroke.get_color();
+                var color = 'transparent';
+
+                if (stroke && stroke.get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
+                    var sdkColor = stroke.get_color();
 
                     if (sdkColor) {
                         if (sdkColor.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
@@ -277,6 +283,7 @@ define([
                         }
                     }
                 }
+                _borderColor = color;
 
                 paletteBorderColor && paletteBorderColor.select(color);
                 $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)))
@@ -440,29 +447,20 @@ define([
                 var me = this,
                     $target = $(e.currentTarget),
                     value = $target.val(),
-                    currentShape = _shapeObject.get_ShapeProperties(),
                     image = new Asc.asc_CImgProperty(),
                     shape = new Asc.asc_CShapeProperty(),
-                    stroke = new Asc.asc_CStroke(),
-                    currentColor = Common.Utils.ThemeColor.getRgbColor('000000');
+                    stroke = new Asc.asc_CStroke();
 
                 value = borderSizeTransform.sizeByIndex(parseInt(value));
 
-                var currentStroke = currentShape.get_stroke();
-
-                if (currentStroke) {
-                    var currentStrokeType = currentStroke.get_type();
-
-                    if (currentStrokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
-                        currentColor = currentStroke.get_color();
-                    }
-                }
-
                 if (value < 0.01) {
                     stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE);
                 } else {
                     stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR);
-                    stroke.put_color(currentColor);
+                    if (_borderColor == 'transparent')
+                        stroke.put_color(Common.Utils.ThemeColor.getRgbColor({color: '000000', effectId: 29}));
+                    else
+                        stroke.put_color(Common.Utils.ThemeColor.getRgbColor(Common.Utils.ThemeColor.colorValue2EffectId(_borderColor)));
                     stroke.put_width(value * 25.4 / 72.0);
                 }
 
@@ -470,6 +468,7 @@ define([
                 image.put_ShapeProperties(shape);
 
                 me.api.ImgApply(image);
+                me._initBorderColorView(); // when select STROKE_NONE or change from STROKE_NONE to STROKE_COLOR
             },
 
             onBorderSizeChanging: function (e) {
@@ -506,8 +505,9 @@ define([
                     currentShape = _shapeObject.get_ShapeProperties();
 
                 $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)));
+                _borderColor = color;
 
-                if (me.api && currentShape) {
+                if (me.api && currentShape && currentShape.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
                     var image = new Asc.asc_CImgProperty(),
                         shape = new Asc.asc_CShapeProperty(),
                         stroke = new Asc.asc_CStroke();

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

@@ -261,8 +261,16 @@ define([
                                 $layoutPages.prop('outerHTML') +
                             '</div>' +
                         '</div>'
-                    )).on('close', function (e) {
+                    )).on('opened', function () {
+                        if (_.isFunction(me.api.asc_OnShowContextMenu)) {
+                            me.api.asc_OnShowContextMenu()
+                        }
+                    }).on('close', function (e) {
                         mainView.showNavbar();
+                    }).on('closed', function () {
+                        if (_.isFunction(me.api.asc_OnHideContextMenu)) {
+                            me.api.asc_OnHideContextMenu()
+                        }
                     });
                     mainView.hideNavbar();
                 } else {
@@ -289,9 +297,17 @@ define([
                                 $overlay.addClass('modal-overlay-visible')
                             }
                         });
+
+                        if (_.isFunction(me.api.asc_OnShowContextMenu)) {
+                            me.api.asc_OnShowContextMenu()
+                        }
                     }).on('close', function () {
                         $overlay.off('removeClass');
                         $overlay.removeClass('modal-overlay-visible')
+                    }).on('closed', function () {
+                        if (_.isFunction(me.api.asc_OnHideContextMenu)) {
+                            me.api.asc_OnHideContextMenu()
+                        }
                     });
                 }
 

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

@@ -371,7 +371,7 @@ define([
 
             _uiTransformByWrap: function(type) {
                 $('.image-wrap .align')[('inline' == type) ? 'hide' : 'show']();
-                $('.image-wrap .distance')[('behind' == type || 'infront' == type) ? 'hide' : 'show']();
+                $('.image-wrap .distance')[('inline' == type || 'behind' == type || 'infront' == type) ? 'hide' : 'show']();
                 $('#edit-image-movetext').toggleClass('disabled', ('inline' == type));
             },
 

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

@@ -53,7 +53,8 @@ define([
         // Private
         var _stack = [],
             _shapeObject = undefined,
-            _metricText = Common.Utils.Metric.getCurrentMetricName();
+            _metricText = Common.Utils.Metric.getCurrentMetricName(),
+            _borderColor = 'transparent';
 
         var wrapTypesTransform = (function() {
             var map = [
@@ -79,7 +80,7 @@ define([
                         return obj.ui === type;
                     })[0];
                     return record ? record.sdk : 0;
-                },
+                }
             }
         })();
 
@@ -101,7 +102,7 @@ define([
                         }
                     });
 
-                    return index
+                    return index;
                 },
 
                 sizeByValue: function (value) {
@@ -224,7 +225,7 @@ define([
                 $('#edit-shape-bordersize .item-after').text(((borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.sizeByValue(borderSize)) + ' ' + _metricText);
 
                 // Init style opacity
-                $('#edit-shape-effect input').val([shapeProperties.get_fill().transparent ? shapeProperties.get_fill().transparent / 2.55 : 100]);
+                $('#edit-shape-effect input').val([shapeProperties.get_fill().asc_getTransparent() ? shapeProperties.get_fill().asc_getTransparent() / 2.55 : 100]);
                 $('#edit-shape-effect .item-after').text($('#edit-shape-effect input').val() + ' ' + "%");
 
                 paletteFillColor && paletteFillColor.on('select',       _.bind(me.onFillColor, me));
@@ -254,13 +255,18 @@ define([
                 paletteFillColor && paletteFillColor.select(color);
 
                 // Init border color
-                var stroke = shapeProperties.get_stroke(),
-                    strokeType = stroke.get_type();
+                me._initBorderColorView();
+            },
 
-                color = 'transparent';
+            _initBorderColorView: function () {
+                var me = this,
+                    paletteBorderColor = me.getView('EditShape').paletteBorderColor,
+                    stroke = _shapeObject.get_ShapeProperties().get_stroke();
 
-                if (stroke && strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
-                    sdkColor = stroke.get_color();
+                var color = 'transparent';
+
+                if (stroke && stroke.get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
+                    var sdkColor = stroke.get_color();
 
                     if (sdkColor) {
                         if (sdkColor.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
@@ -271,6 +277,7 @@ define([
                         }
                     }
                 }
+                _borderColor = color;
 
                 paletteBorderColor && paletteBorderColor.select(color);
                 $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)))
@@ -407,29 +414,20 @@ define([
                 var me = this,
                     $target = $(e.currentTarget),
                     value = $target.val(),
-                    currentShape = _shapeObject.get_ShapeProperties(),
                     image = new Asc.asc_CImgProperty(),
                     shape = new Asc.asc_CShapeProperty(),
-                    stroke = new Asc.asc_CStroke(),
-                    currentColor = Common.Utils.ThemeColor.getRgbColor('000000');
+                    stroke = new Asc.asc_CStroke();
 
                 value = borderSizeTransform.sizeByIndex(parseInt(value));
 
-                var currentStroke = currentShape.get_stroke();
-
-                if (currentStroke) {
-                    var currentStrokeType = currentStroke.get_type();
-
-                    if (currentStrokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
-                        currentColor = currentStroke.get_color();
-                    }
-                }
-
                 if (value < 0.01) {
                     stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE);
                 } else {
                     stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR);
-                    stroke.put_color(currentColor);
+                    if (_borderColor == 'transparent')
+                        stroke.put_color(Common.Utils.ThemeColor.getRgbColor({color: '000000', effectId: 29}));
+                    else
+                        stroke.put_color(Common.Utils.ThemeColor.getRgbColor(Common.Utils.ThemeColor.colorValue2EffectId(_borderColor)));
                     stroke.put_width(value * 25.4 / 72.0);
                 }
 
@@ -437,6 +435,7 @@ define([
                 image.put_ShapeProperties(shape);
 
                 me.api.ImgApply(image);
+                me._initBorderColorView(); // when select STROKE_NONE or change from STROKE_NONE to STROKE_COLOR
             },
 
             onBorderSizeChanging: function (e) {
@@ -494,8 +493,9 @@ define([
                     currentShape = _shapeObject.get_ShapeProperties();
 
                 $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)));
+                _borderColor = color;
 
-                if (me.api && currentShape) {
+                if (me.api && currentShape && currentShape.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
                     var image = new Asc.asc_CImgProperty(),
                         shape = new Asc.asc_CShapeProperty(),
                         stroke = new Asc.asc_CStroke();

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

@@ -80,14 +80,19 @@ define([
                     return _sizes[index];
                 },
 
-                sizeByValue: function (value) {
+                indexSizeByValue: function (value) {
                     var index = 0;
                     _.each(_sizes, function (size, idx) {
                         if (Math.abs(size - value) < 0.25) {
                             index = idx;
                         }
                     });
-                    return _sizes[index];
+
+                    return index;
+                },
+
+                sizeByValue: function (value) {
+                    return _sizes[this.indexSizeByValue(value)];
                 }
             }
         })();
@@ -207,7 +212,7 @@ define([
                 $('#table-option-repeatasheader input').prop('checked', _tableObject.get_RowsInHeader());
                 $('#table-option-resizetofit input').prop('checked', _tableObject.get_TableLayout()==Asc.c_oAscTableLayout.AutoFit);
 
-                var margins = _tableObject.get_DefaultMargins();
+                var margins = _tableObject.get_CellMargins();
                 if (margins) {
                     var distance = Common.Utils.Metric.fnRecalcFromMM(margins.get_Left());
                     $('#table-options-margins input').val(distance);
@@ -313,7 +318,7 @@ define([
                 //     });
                 // }
 
-                $('#edit-table-bordersize input').val([borderSizeTransform.sizeByIndex(_cellBorderWidth)]);
+                $('#edit-table-bordersize input').val([borderSizeTransform.indexSizeByValue(_cellBorderWidth)]);
                 $('#edit-table-bordersize .item-after').text(borderSizeTransform.sizeByValue(_cellBorderWidth) + ' ' + _metricText);
 
                 var borderPalette = me.getView('EditTable').paletteBorderColor;

apps/documenteditor/mobile/app/template/AddImage.template

@@ -40,12 +40,13 @@
     </div>
     <div class="page" id="addimage-url">
         <div class="page-content">
-            <div class="content-block-title"><%= scope.textAddress %></div>
+            <% if (!android) { %><div class="content-block-title"><%= scope.textAddress %></div><% } %>
             <div class="list-block">
                 <ul>
                     <li>
                         <div id="addimage-link-url" class="item-content">
                             <div class="item-inner">
+                                <% if (android) { %><div class="item-title label"><%= scope.textAddress %></div><% } %>
                                 <div class="item-input">
                                     <input type="url" placeholder="<%= scope.textImageURL %>">
                                 </div>

apps/documenteditor/mobile/app/template/EditImage.template

@@ -42,7 +42,7 @@
             </li>
             <li>
                 <% if (android) { %>
-                <a id="image-default" class="button button-raised button-fill" style="margin: 20px 16px; background-color: #f44336;"><%= scope.textRemove %></a>
+                <a id="image-remove" class="button button-raised button-fill" style="margin: 20px 16px; background-color: #f44336;"><%= scope.textRemove %></a>
                 <% } else { %>
                 <a id="image-remove" class="item-link list-button" style="text-align: center; color: #f00"><%= scope.textRemove %></a>
                 <% } %>

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

@@ -86,10 +86,13 @@ define([
 
             // Render layout
             render: function () {
+                var shapes = Common.SharedSettings.get('shapes').slice();
+                shapes.splice(0, 1); // Remove line shapes
+
                 this.layout = $('<div/>').append(this.template({
                     android : Common.SharedSettings.get('android'),
                     phone   : Common.SharedSettings.get('phone'),
-                    shapes  : Common.SharedSettings.get('shapes'),
+                    shapes  : shapes,
                     scope   : this
                 }));
 

apps/documenteditor/mobile/locale/de.json

@@ -20,6 +20,8 @@
   "DE.Controllers.DocumentHolder.menuDelete": "Löschen",
   "DE.Controllers.DocumentHolder.menuEdit": "Bearbeiten",
   "DE.Controllers.DocumentHolder.menuOpenLink": "Link öffnen",
+  "DE.Controllers.DocumentHolder.menuMore": "More",
+  "DE.Controllers.DocumentHolder.sheetCancel": "Abbrechen",
   "DE.Controllers.DocumentHolder.menuPaste": "Einfügen",
   "DE.Controllers.DocumentHolder.textGuest": "Gast",
   "DE.Controllers.EditContainer.textChart": "Diagramm",

apps/documenteditor/mobile/locale/en.json

@@ -20,6 +20,8 @@
   "DE.Controllers.DocumentHolder.menuDelete": "Delete",
   "DE.Controllers.DocumentHolder.menuEdit": "Edit",
   "DE.Controllers.DocumentHolder.menuOpenLink": "Open Link",
+  "DE.Controllers.DocumentHolder.menuMore": "More",
+  "DE.Controllers.DocumentHolder.sheetCancel": "Cancel",
   "DE.Controllers.DocumentHolder.menuPaste": "Paste",
   "DE.Controllers.DocumentHolder.textGuest": "Guest",
   "DE.Controllers.EditContainer.textChart": "Chart",
@@ -67,6 +69,7 @@
   "DE.Controllers.Main.errorUsersExceed": "The number of users was exceeded",
   "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.",
   "DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
+  "DE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
   "DE.Controllers.Main.loadFontsTextText": "Loading data...",
   "DE.Controllers.Main.loadFontsTitleText": "Loading Data",
   "DE.Controllers.Main.loadFontTextText": "Loading data...",
@@ -127,6 +130,8 @@
   "DE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "DE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<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.titleServerVersion": "Editor updated",
+  "DE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
   "DE.Controllers.Search.textNoTextFound": "Text not Found",
   "DE.Controllers.Search.textReplaceAll": "Replace All",
   "DE.Controllers.Settings.notcriticalErrorTitle": "Warning",

apps/documenteditor/mobile/locale/es.json

@@ -20,6 +20,8 @@
   "DE.Controllers.DocumentHolder.menuDelete": "Delete",
   "DE.Controllers.DocumentHolder.menuEdit": "Edit",
   "DE.Controllers.DocumentHolder.menuOpenLink": "Open Link",
+  "DE.Controllers.DocumentHolder.menuMore": "More",
+  "DE.Controllers.DocumentHolder.sheetCancel": "Cancel",
   "DE.Controllers.DocumentHolder.menuPaste": "Paste",
   "DE.Controllers.DocumentHolder.textGuest": "Guest",
   "DE.Controllers.EditContainer.textChart": "Chart",

apps/documenteditor/mobile/locale/fr.json

@@ -20,6 +20,8 @@
   "DE.Controllers.DocumentHolder.menuDelete": "Supprimer",
   "DE.Controllers.DocumentHolder.menuEdit": "Modifier",
   "DE.Controllers.DocumentHolder.menuOpenLink": "Ouvrir le lien",
+  "DE.Controllers.DocumentHolder.menuMore": "More",
+  "DE.Controllers.DocumentHolder.sheetCancel": "Annuler",
   "DE.Controllers.DocumentHolder.menuPaste": "Coller",
   "DE.Controllers.DocumentHolder.textGuest": "Invité",
   "DE.Controllers.EditContainer.textChart": "Graphique",

apps/documenteditor/mobile/locale/ru.json

@@ -3,7 +3,7 @@
   "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы",
   "Common.Utils.Metric.txtCm": "см",
   "Common.Utils.Metric.txtPt": "пт",
-  "DE.Controllers.AddContainer.textImage": "Изображение",
+  "DE.Controllers.AddContainer.textImage": "Картинка",
   "DE.Controllers.AddContainer.textOther": "Другое",
   "DE.Controllers.AddContainer.textShape": "Фигура",
   "DE.Controllers.AddContainer.textTable": "Таблица",
@@ -20,6 +20,8 @@
   "DE.Controllers.DocumentHolder.menuDelete": "Удалить",
   "DE.Controllers.DocumentHolder.menuEdit": "Редактировать",
   "DE.Controllers.DocumentHolder.menuOpenLink": "Перейти",
+  "DE.Controllers.DocumentHolder.menuMore": "Еще",
+  "DE.Controllers.DocumentHolder.sheetCancel": "Отмена",
   "DE.Controllers.DocumentHolder.menuPaste": "Вставить",
   "DE.Controllers.DocumentHolder.textGuest": "Гость",
   "DE.Controllers.EditContainer.textChart": "Диаграмма",
@@ -249,7 +251,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/sdk_dev_scripts.js

@@ -19,9 +19,10 @@ var sdk_dev_scrpipts = [
     "../../../../sdkjs/common/AdvancedOptions.js",
     "../../../../sdkjs/common/FontsFreeType/font_engine.js",
     "../../../../sdkjs/common/FontsFreeType/FontFile.js",
-    "../../../../sdkjs/common/FontsFreeType/font_map.js",
+    "../../../../sdkjs/common/FontsFreeType/font_map.js",	
     "../../../../sdkjs/common/FontsFreeType/FontManager.js",
 	"../../../../sdkjs/word/Editor/FontClassification.js",
+	"../../../../sdkjs/common/FontsFreeType/character.js",
     "../../../../sdkjs/common/Drawings/Metafile.js",
     "../../../../sdkjs/common/FontsFreeType/TextMeasurer.js",
     "../../../../sdkjs/common/Drawings/WorkEvents.js",
@@ -86,10 +87,13 @@ var sdk_dev_scrpipts = [
     "../../../../sdkjs/word/Editor/GraphicObjects/GraphicPage.js",
     "../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js",
     "../../../../sdkjs/word/Editor/CollaborativeEditing.js",
+	"../../../../sdkjs/word/Editor/DocumentContentElementBase.js",
+	"../../../../sdkjs/word/Editor/StructuredDocumentTags/BlockLevel.js",
     "../../../../sdkjs/word/Editor/Comments.js",
 	"../../../../sdkjs/word/Editor/CommentsChanges.js",
     "../../../../sdkjs/word/Editor/Styles.js",
 	"../../../../sdkjs/word/Editor/StylesChanges.js",
+	"../../../../sdkjs/word/Editor/RevisionsChange.js",
     "../../../../sdkjs/word/Editor/ParagraphContent.js",
 	"../../../../sdkjs/word/Editor/Paragraph/ParaTextPr.js",
 	"../../../../sdkjs/word/Editor/Paragraph/ParaTextPrChanges.js",

apps/presentationeditor/embed/js/ApplicationController.js

@@ -66,14 +66,14 @@ var ApplicationController = new(function(){
         common.controller.modals.init(embedConfig);
 
         // Docked toolbar
-        if (embedConfig.toolbarDocked === 'top') {
-            $('#toolbar').addClass('top');
-            $('#editor_sdk').addClass('top');
-        } else {
+        if (embedConfig.toolbarDocked === 'bottom') {
             $('#toolbar').addClass('bottom');
             $('#editor_sdk').addClass('bottom');
             $('#box-tools').removeClass('dropdown').addClass('dropup');
             ttOffset[1] = -40;
+        } else {
+            $('#toolbar').addClass('top');
+            $('#editor_sdk').addClass('top');
         }
 
         if (config.canBackToFolder === false || !(config.customization && config.customization.goback && config.customization.goback.url)) {
@@ -274,12 +274,20 @@ var ApplicationController = new(function(){
                 if ( e.keyCode == 13 ){
                     var newPage = parseInt($('#page-number').val());
 
-                    if ( newPage > maxPages ) newPage = maxPages; else
-                    if ( newPage < 2 || isNaN(newPage) ) newPage = 1;
+                    if ( isNaN(newPage) ) {
+                        $('#page-number').val(currentPage + 1);
+                    } else {
+                        if ( newPage > maxPages ) newPage = maxPages; else
+                        if ( newPage < 2 ) newPage = 1;
 
-                    if ( isplaymode )
-                        api.DemonstrationGoToSlide(newPage-1); else
-                        api.goToPage(newPage-1);
+                        if ( newPage == currentPage + 1 ) {
+                            $('#page-number').val( newPage );
+                        } else
+                        if (isplaymode) {
+                            currentPage = newPage - 1;
+                            api.DemonstrationGoToSlide(newPage - 1);
+                        } else api.goToPage(newPage - 1);
+                    }
 
                     $pagenum.blur();
                 }

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

@@ -157,7 +157,7 @@ define([
             if ( this.mode.canCoAuthoring ) {
                 this.leftMenu.btnComments[(this.mode.isEdit&&this.mode.canComments && !this.mode.isLightVersion) ? 'show' : 'hide']();
                 if (this.mode.canComments)
-                    this.leftMenu.setOptionsPanel('comment', this.getApplication().getController('Common.Controllers.Comments').getView());
+                    this.leftMenu.setOptionsPanel('comment', this.getApplication().getController('Common.Controllers.Comments').getView('Common.Views.Comments'));
 
                 this.leftMenu.btnChat[(this.mode.canChat && !this.mode.isLightVersion) ? 'show' : 'hide']();
                 if (this.mode.canChat)
@@ -166,6 +166,7 @@ define([
                 this.leftMenu.btnChat.hide();
                 this.leftMenu.btnComments.hide();
             }
+            this.mode.isTrial && this.leftMenu.setDeveloperMode(true);
             /** coauthoring end **/
             Common.util.Shortcuts.resumeEvents();
             this.leftMenu.btnThumbs.toggle(true);
@@ -178,6 +179,7 @@ define([
                 this.leftMenu.setOptionsPanel('plugins', this.getApplication().getController('Common.Controllers.Plugins').getView('Common.Views.Plugins'));
             } else
                 this.leftMenu.btnPlugins.hide();
+            this.mode.isTrial && this.leftMenu.setDeveloperMode(true);
         },
 
         clickMenuFileItem: function(menu, action, isopts) {

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

@@ -69,7 +69,8 @@ define([
             toolbar: '#viewport #toolbar',
             leftMenu: '#viewport #left-menu, #viewport #id-toolbar-full-placeholder-btn-settings, #viewport #id-toolbar-short-placeholder-btn-settings',
             rightMenu: '#viewport #right-menu',
-            header: '#viewport #header'
+            header: '#viewport #header',
+            statusBar: '#statusbar'
         };
 
         Common.localStorage.setId('presentation');
@@ -97,7 +98,7 @@ define([
             onLaunch: function() {
                 var me = this;
 
-                this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, startModifyDocument: true, lostEditingRights: false, licenseWarning: false};
+                this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false};
 
                 window.storagename = 'presentation';
 
@@ -130,6 +131,7 @@ define([
                     this.api.asc_registerCallback('asc_onOpenDocumentProgress',     _.bind(this.onOpenDocument, this));
                     this.api.asc_registerCallback('asc_onThumbnailsShow',           _.bind(this.onThumbnailsShow, this));
                     this.api.asc_registerCallback('asc_onDocumentUpdateVersion',    _.bind(this.onUpdateVersion, this));
+                    this.api.asc_registerCallback('asc_onServerVersion',            _.bind(this.onServerVersion, this));
                     this.api.asc_registerCallback('asc_onDocumentName',             _.bind(this.onDocumentName, this));
                     this.api.asc_registerCallback('asc_onPrintUrl',                 _.bind(this.onPrintUrl, this));
                     this.api.asc_registerCallback('asc_onMeta',                     _.bind(this.onMeta, this));
@@ -157,6 +159,8 @@ define([
                         if (!/area_id/.test(e.target.id)) {
                             if (/msg-reply/.test(e.target.className))
                                 me.dontCloseDummyComment = true;
+                            else if (/chat-msg-text/.test(e.target.id))
+                                me.dontCloseChat = true;
                         }
                     });
 
@@ -169,6 +173,8 @@ define([
                                 me.api.asc_enableKeyEvents(true);
                                 if (/msg-reply/.test(e.target.className))
                                     me.dontCloseDummyComment = false;
+                                else if (/chat-msg-text/.test(e.target.id))
+                                    me.dontCloseChat = false;
                             }
                         }
                     }).on('dragover', function(e) {
@@ -207,14 +213,22 @@ define([
                         },
                         'menu:show': function(e){
                         },
-                        'menu:hide': function(e){
-                            if (!me.isModalShowed)
+                        'menu:hide': function(e, isFromInputControl){
+                            if (!me.isModalShowed && !isFromInputControl)
                                 me.api.asc_enableKeyEvents(true);
                         },
                         'edit:complete': _.bind(me.onEditComplete, me)
                     });
 
                     this.initNames();
+                    Common.util.Shortcuts.delegateShortcuts({
+                        shortcuts: {
+                            'command+s,ctrl+s': _.bind(function (e) {
+                                e.preventDefault();
+                                e.stopPropagation();
+                            }, this)
+                        }
+                    });
                 }
             },
 
@@ -355,10 +369,11 @@ define([
 
                 application.getController('DocumentHolder').getView('DocumentHolder').focus();
                 if (this.api && this.api.asc_isDocumentCanSave) {
-                    var cansave = this.api.asc_isDocumentCanSave();
+                    var cansave = this.api.asc_isDocumentCanSave(),
+                        forcesave = this.appOptions.forcesave;
                     var isSyncButton = $('.btn-icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch');
-                    if (toolbarView.btnSave.isDisabled() !== (!cansave && !isSyncButton || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1))
-                        toolbarView.btnSave.setDisabled(!cansave && !isSyncButton || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1);
+                    if (toolbarView.btnSave.isDisabled() !== (!cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave))
+                        toolbarView.btnSave.setDisabled(!cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave);
                 }
             },
 
@@ -383,16 +398,14 @@ define([
                 if (action) {
                     this.setLongActionView(action)
                 } else {
-                    if (this._state.fastCoauth && this._state.usersCount>1 && id==Asc.c_oAscAsyncAction['Save']) {
-                        var me = this;
-                        if (me._state.timerSave===undefined)
-                            me._state.timerSave = setInterval(function(){
-                                if ((new Date()) - me._state.isSaving>500) {
-                                    clearInterval(me._state.timerSave);
-                                    me.getApplication().getController('Statusbar').setStatusCaption('');
-                                    me._state.timerSave = undefined;
-                                }
+                    if (id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) {
+                        if (this._state.fastCoauth && this._state.usersCount>1) {
+                            var me = this;
+                            me._state.timerSave = setTimeout(function () {
+                                me.getApplication().getController('Statusbar').setStatusCaption(me.textChangesSaved, false, 3000);
                             }, 500);
+                        } else
+                            this.getApplication().getController('Statusbar').setStatusCaption(this.textChangesSaved, false, 3000);
                     } else
                         this.getApplication().getController('Statusbar').setStatusCaption('');
                 }
@@ -400,17 +413,17 @@ define([
                 action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction});
                 action ? this.setLongActionView(action) : this.loadMask && this.loadMask.hide();
 
-                if (id==Asc.c_oAscAsyncAction['Save'] && (!this._state.fastCoauth || this._state.usersCount<2))
+                if ((id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) && (!this._state.fastCoauth || this._state.usersCount<2))
                     this.synchronizeChanges();
 
-               if (type == Asc.c_oAscAsyncActionType.BlockInteraction && !((id == Asc.c_oAscAsyncAction['LoadDocumentFonts'] || id == Asc.c_oAscAsyncAction['ApplyChanges']) && this.dontCloseDummyComment )) {
+               if (type == Asc.c_oAscAsyncActionType.BlockInteraction && !((id == Asc.c_oAscAsyncAction['LoadDocumentFonts'] || id == Asc.c_oAscAsyncAction['ApplyChanges']) && (this.dontCloseDummyComment || this.dontCloseChat))) {
                     this.onEditComplete(this.loadMask);
                     this.api.asc_enableKeyEvents(true);
                 }
             },
 
             setLongActionView: function(action) {
-                var title = '', text = '';
+                var title = '', text = '', force = false;
 
                 switch (action.id) {
                     case Asc.c_oAscAsyncAction['Open']:
@@ -419,11 +432,16 @@ define([
                         break;
 
                     case Asc.c_oAscAsyncAction['Save']:
-                        this._state.isSaving = new Date();
+                    case Asc.c_oAscAsyncAction['ForceSaveButton']:
+                        clearTimeout(this._state.timerSave);
+                        force = true;
                         title   = this.saveTitleText;
                         text    = this.saveTextText;
                         break;
 
+                    case Asc.c_oAscAsyncAction['ForceSaveTimeout']:
+                        break;
+
                     case Asc.c_oAscAsyncAction['LoadDocumentFonts']:
                         title   = this.loadFontsTitleText;
                         text    = this.loadFontsTextText;
@@ -495,72 +513,18 @@ define([
                         this.loadMask.show();
                 }
                 else {
-                    this.getApplication().getController('Statusbar').setStatusCaption(text);
+                    this.getApplication().getController('Statusbar').setStatusCaption(text, force);
                 }
             },
 
             onApplyEditRights: function(data) {
-                var application = this.getApplication();
-                application.getController('Statusbar').setStatusCaption('');
+                this.getApplication().getController('Statusbar').setStatusCaption('');
 
-                if (data) {
-                    if (data.allowed) {
-                        data.requestrights = true;
-                        this.appOptions.isEdit= true;
-
-                        this.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'],ApplyEditRights);
-
-                        var me = this;
-                        setTimeout(function(){
-                            me.applyModeCommonElements();
-                            me.applyModeEditorElements('view');
-                            me.api.asc_setViewMode(false);
-
-                            var timer_rp = setInterval(function(){
-                                clearInterval(timer_rp);
-
-                                var toolbarController           = application.getController('Toolbar'),
-                                    viewportController          = application.getController('Viewport'),
-                                    rightmenuController         = application.getController('RightMenu'),
-                                    leftmenuController          = application.getController('LeftMenu'),
-                                    documentHolderController    = application.getController('DocumentHolder'),
-                                    fontsControllers            = application.getController('Common.Controllers.Fonts');
-
-                                leftmenuController.setMode(me.appOptions).createDelayedElements();
-
-                                rightmenuController.createDelayedElements();
-
-                                Common.NotificationCenter.trigger('layout:changed', 'main');
-
-                                var timer_sl = setInterval(function(){
-                                    if (window.styles_loaded) {
-                                        clearInterval(timer_sl);
-
-                                        documentHolderController.getView('DocumentHolder').createDelayedElements();
-                                        documentHolderController.getView('DocumentHolder').changePosition();
-    //                                        me.getController('Common.controller.CommentsPopover').onDocumentContentReady();
-    //                                        me.getController('Search').setMode({isEdit: me.modeEdit});
-
-                                        me.api.asc_registerCallback('asc_onFocusObject',        _.bind(me.onFocusObject, me));
-                                        me.api.asc_registerCallback('asc_onUpdateLayout',       _.bind(me.fillLayoutsStore, me)); // slide layouts loading
-                                        me.updateThemeColors();
-                                        var shapes = me.api.asc_getPropertyEditorShapes();
-                                        if (shapes)
-                                            me.fillAutoShapes(shapes[0], shapes[1]);
-                                        me.fillTextArt(me.api.asc_getTextArtPreviews());
-                                        toolbarController.activateControls();
-
-                                        me.api.UpdateInterfaceState();
-                                    }
-                                }, 50);
-                            },50);
-                        }, 100);
-                    } else {
-                        Common.UI.info({
-                            title: this.requestEditFailedTitleText,
-                            msg: data.message || this.requestEditFailedMessageText
-                        });
-                    }
+                if (data && !data.allowed) {
+                    Common.UI.info({
+                        title: this.requestEditFailedTitleText,
+                        msg: data.message || this.requestEditFailedMessageText
+                    });
                 }
             },
 
@@ -642,7 +606,7 @@ define([
 
                 pluginsController.setApi(me.api);
                 me.updatePlugins(me.plugins, false);
-                me.requestPlugins('../../../../sdkjs-plugins/config.json');
+                me.requestPlugins('../../../../plugins.json');
                 me.api.asc_registerCallback('asc_onPluginsInit', _.bind(me.updatePluginsList, me));
 
                 documentHolderController.setApi(me.api);
@@ -665,6 +629,12 @@ define([
                     value = (!me._state.fastCoauth && value!==null) ? parseInt(value) : (me.appOptions.canCoAuthoring ? 1 : 0);
                     me.api.asc_setAutoSaveGap(value);
 
+                    if (me.appOptions.canForcesave) {// use asc_setIsForceSaveOnUserSave only when customization->forcesave = true
+                        value = Common.localStorage.getItem("pe-settings-forcesave");
+                        me.appOptions.forcesave = (value===null) ? me.appOptions.canForcesave : (parseInt(value)==1);
+                        me.api.asc_setIsForceSaveOnUserSave(me.appOptions.forcesave);
+                    }
+
                     if (me.needToUpdateVersion)
                         Common.NotificationCenter.trigger('api:disconnect');
                     var timer_sl = setInterval(function(){
@@ -756,6 +726,8 @@ define([
                     return;
                 }
 
+                if ( this.onServerVersion(params.asc_getBuildVersion()) ) return;
+
                 if (params.asc_getRights() !== Asc.c_oRights.Edit)
                     this.permissions.edit = false;
 
@@ -771,10 +743,14 @@ define([
                 this.appOptions.isEdit         = this.appOptions.canLicense && this.appOptions.canEdit && this.editorConfig.mode !== 'view';
                 this.appOptions.canDownload    = !this.appOptions.nativeApp && this.permissions.download !== false;
                 this.appOptions.canAnalytics   = params.asc_getIsAnalyticsEnable();
-                this.appOptions.canComments    = (licType === Asc.c_oLicenseResult.Success) && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false);
-                this.appOptions.canChat        = (licType === Asc.c_oLicenseResult.Success) && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);
+                this.appOptions.canComments    = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit) && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false);
+                this.appOptions.canChat        = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit) && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);
                 this.appOptions.canPrint       = (this.permissions.print !== false);
                 this.appOptions.canRename      = !!this.permissions.rename;
+                this.appOptions.canForcesave   = this.appOptions.isEdit && !this.appOptions.isOffline && (typeof (this.editorConfig.customization) == 'object' && !!this.editorConfig.customization.forcesave);
+                this.appOptions.forcesave      = this.appOptions.canForcesave;
+                this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly);
+                this.appOptions.isTrial        = params.asc_getTrial();
 
                 this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) && this.appOptions.canEdit && this.editorConfig.mode !== 'view';
 
@@ -783,7 +759,6 @@ define([
                 if (this.appOptions.canBranding)
                     headerView.setBranding(this.editorConfig.customization);
 
-                params.asc_getTrial() && headerView.setDeveloperMode(true);
                 this.appOptions.canRename && headerView.setCanRename(true);
 
                 this.appOptions.canBrandingExt = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object' || this.editorConfig.plugins);
@@ -826,6 +801,7 @@ define([
                 documentHolder.setMode(this.appOptions);
 
                 this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this));
+                this.api.asc_registerCallback('asc_onDownloadUrl',     _.bind(this.onDownloadUrl, this));
 
                 if (this.api) {
                     var translateChart = new Asc.asc_CChartTranslate();
@@ -898,8 +874,6 @@ define([
                     me.api.asc_registerCallback('asc_onChangeObjectLock',        _.bind(me._onChangeObjectLock, me));
                     me.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(me.onDocumentModifiedChanged, me));
                     me.api.asc_registerCallback('asc_onDocumentCanSaveChanged',  _.bind(me.onDocumentCanSaveChanged, me));
-                    me.api.asc_registerCallback('asc_onSaveUrl',                 _.bind(me.onSaveUrl, me));
-                    me.api.asc_registerCallback('asc_onDownloadUrl',             _.bind(me.onDownloadUrl, me));
                     /** coauthoring begin **/
                     me.api.asc_registerCallback('asc_onCollaborativeChanges',    _.bind(me.onCollaborativeChanges, me));
                     me.api.asc_registerCallback('asc_OnTryUndoInFastCollaborative',_.bind(me.onTryUndoInFastCollaborative, me));
@@ -1044,6 +1018,10 @@ define([
                         config.msg = this.errorAccessDeny;
                         break;
 
+                    case Asc.c_oAscError.ID.UplImageUrl:
+                        config.msg = this.errorBadImageUrl;
+                        break;
+
                     default:
                         config.msg = this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -1143,23 +1121,26 @@ define([
                         title = headerView.getDocumentCaption() + ' - ' + title;
 
                     if (isModified) {
-                        if (!_.isUndefined(title) && (!this._state.fastCoauth || this._state.usersCount<2 )) {
+                        clearTimeout(this._state.timerCaption);
+                        if (!_.isUndefined(title)) {
                             title = '* ' + title;
-                            headerView.setDocumentCaption(headerView.getDocumentCaption() + '*', true);
+                            headerView.setDocumentCaption(headerView.getDocumentCaption(), true);
                         }
                     } else {
-                        headerView.setDocumentCaption(headerView.getDocumentCaption());
+                        if (this._state.fastCoauth && this._state.usersCount>1) {
+                            this._state.timerCaption = setTimeout(function () {
+                                headerView.setDocumentCaption(headerView.getDocumentCaption(), false);
+                            }, 500);
+                        } else
+                            headerView.setDocumentCaption(headerView.getDocumentCaption(), false);
                     }
 
                     if (window.document.title != title)
                         window.document.title = title;
 
-                    if (!this._state.fastCoauth || this._state.usersCount<2 )
-                        Common.Gateway.setDocumentModified(isModified);
-                    else if ( this._state.startModifyDocument!==undefined && this._state.startModifyDocument === isModified){
-                        Common.Gateway.setDocumentModified(isModified);
-                        this._state.startModifyDocument = (this._state.startModifyDocument) ? !this._state.startModifyDocument : undefined;
-                    }
+                    Common.Gateway.setDocumentModified(isModified);
+                    if (isModified && (!this._state.fastCoauth || this._state.usersCount<2))
+                        this.getApplication().getController('Statusbar').setStatusCaption('', true);
 
                     this._state.isDocModified = isModified;
                 }
@@ -1169,8 +1150,6 @@ define([
             },
 
             onDocumentModifiedChanged: function() {
-                if (this._state.fastCoauth && this._state.usersCount>1 && this._state.startModifyDocument===undefined ) return;
-
                 var isModified = this.api.asc_isDocumentCanSave();
                 if (this._state.isDocModified !== isModified) {
                     Common.Gateway.setDocumentModified(this.api.isDocumentModified());
@@ -1180,9 +1159,10 @@ define([
 
                 var toolbarView = this.getApplication().getController('Toolbar').getView('Toolbar');
                 if (toolbarView) {
-                    var isSyncButton = $('.btn-icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch');
-                    if (toolbarView.btnSave.isDisabled() !== (!isModified && !isSyncButton || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1))
-                        toolbarView.btnSave.setDisabled(!isModified && !isSyncButton || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1);
+                    var isSyncButton = $('.btn-icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
+                        forcesave = this.appOptions.forcesave;
+                    if (toolbarView.btnSave.isDisabled() !== (!isModified && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave))
+                        toolbarView.btnSave.setDisabled(!isModified && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave);
                 }
             },
             onDocumentCanSaveChanged: function (isCanSave) {
@@ -1190,9 +1170,10 @@ define([
                     toolbarController = application.getController('Toolbar'),
                     toolbarView = toolbarController.getView('Toolbar');
                 if (toolbarView) {
-                    var isSyncButton = $('.btn-icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch');
-                    if (toolbarView.btnSave.isDisabled() !== (!isCanSave && !isSyncButton || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1))
-                        toolbarView.btnSave.setDisabled(!isCanSave && !isSyncButton || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1);
+                    var isSyncButton = $('.btn-icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
+                        forcesave = this.appOptions.forcesave;
+                    if (toolbarView.btnSave.isDisabled() !== (!isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave))
+                        toolbarView.btnSave.setDisabled(!isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave);
                 }
             },
 
@@ -1229,8 +1210,12 @@ define([
             hidePreloader: function() {
                 if (!this._state.customizationDone) {
                     this._state.customizationDone = true;
-                    if (this.appOptions.customization && !this.appOptions.isDesktopApp)
-                        this.appOptions.customization.about = true;
+                    if (this.appOptions.customization) {
+                        if (this.appOptions.isDesktopApp)
+                            this.appOptions.customization.about = false;
+                        else if (!this.appOptions.canBrandingExt)
+                            this.appOptions.customization.about = true;
+                    }
                     Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements);
                     if (this.appOptions.canBrandingExt) {
                         Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements);
@@ -1242,10 +1227,6 @@ define([
                 $('#loading-mask').hide().remove();
             },
 
-            onSaveUrl: function(url) {
-                Common.Gateway.save(url);
-            },
-
             onDownloadUrl: function(url) {
                 Common.Gateway.downloadAs(url);
             },
@@ -1266,6 +1247,25 @@ define([
                 });
             },
 
+            onServerVersion: function(buildVersion) {
+                if (this.changeServerVersion) return true;
+
+                if (DocsAPI.DocEditor.version() !== buildVersion && !window.compareVersions) {
+                    this.changeServerVersion = true;
+                    Common.UI.warning({
+                        title: this.titleServerVersion,
+                        msg: this.errorServerVersion,
+                        callback: function() {
+                            _.defer(function() {
+                                Common.Gateway.updateVersion();
+                            })
+                        }
+                    });
+                    return true;
+                }
+                return false;
+            },
+
             /** coauthoring begin **/
             fillUserStore: function(users){
                 if (!_.isEmpty(users)){
@@ -1280,7 +1280,7 @@ define([
                 if (this._state.hasCollaborativeChanges) return;
                 this._state.hasCollaborativeChanges = true;
                 if (this.appOptions.isEdit)
-                    this.getApplication().getController('Statusbar').setStatusCaption(this.txtNeedSynchronize);
+                    this.getApplication().getController('Statusbar').setStatusCaption(this.txtNeedSynchronize, true);
             },
             /** coauthoring end **/
 
@@ -1519,6 +1519,11 @@ define([
                     if (this._state.fastCoauth && !oldval)
                         this.synchronizeChanges();
                 }
+                if (this.appOptions.canForcesave) {
+                    value = Common.localStorage.getItem("pe-settings-forcesave");
+                    this.appOptions.forcesave = (value===null) ? this.appOptions.canForcesave : (parseInt(value)==1);
+                    this.api.asc_setIsForceSaveOnUserSave(this.appOptions.forcesave);
+                }
             },
 
             onDocumentName: function(name) {
@@ -1676,11 +1681,18 @@ define([
                     return null;
                 };
 
-                var arr = [];
+                var arr = [],
+                    baseUrl = _.isEmpty(plugins.url) ? "" : plugins.url;
+
+                if (baseUrl !== "")
+                    console.log("Obsolete: The url parameter is deprecated. Please check the documentation for new plugin connection configuration.");
+
                 pluginsData.forEach(function(item){
+                    item = baseUrl + item; // for compatibility with previouse version of server, where plugins.url is used.
                     var value = _getPluginJson(item);
                     if (value) {
                         value.baseUrl = item.substring(0, item.lastIndexOf("config.json"));
+                        value.oldVersion = (baseUrl !== "");
                         arr.push(value);
                     }
                 });
@@ -1698,6 +1710,8 @@ define([
                 if (plugins) {
                     var arr = [], arrUI = [];
                     plugins.pluginsData.forEach(function(item){
+                        if (uiCustomize!==undefined && (pluginStore.findWhere({baseUrl : item.baseUrl}) || pluginStore.findWhere({guid : item.guid}))) return;
+
                         var variations = item.variations,
                             variationsArr = [];
                         variations.forEach(function(itemVar){
@@ -1708,12 +1722,19 @@ define([
                                 }
                             }
                             if (isSupported && (isEdit || itemVar.isViewer)){
+                                var icons = itemVar.icons;
+                                if (item.oldVersion) { // for compatibility with previouse version of server, where plugins.url is used.
+                                    icons = [];
+                                    itemVar.icons.forEach(function(icon){
+                                        icons.push(icon.substring(icon.lastIndexOf("\/")+1));
+                                    });
+                                }
                                 item.isUICustomizer ? arrUI.push(item.baseUrl + itemVar.url) :
                                 variationsArr.push(new Common.Models.PluginVariation({
                                     description: itemVar.description,
                                     index: variationsArr.length,
-                                    url : itemVar.url,
-                                    icons  : itemVar.icons,
+                                    url : (item.oldVersion) ? (itemVar.url.substring(itemVar.url.lastIndexOf("\/")+1) ) : itemVar.url,
+                                    icons  : icons,
                                     isViewer: itemVar.isViewer,
                                     EditorsSupport: itemVar.EditorsSupport,
                                     isVisual: itemVar.isVisual,
@@ -1893,7 +1914,11 @@ define([
             errorSessionAbsolute: 'The document editing session has expired. Please reload the page.',
             errorSessionIdle: 'The document has not been edited for quite a long time. Please reload the page.',
             errorSessionToken: 'The connection to the server has been interrupted. Please reload the page.',
-            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.',
+            titleServerVersion: 'Editor updated',
+            errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.',
+            textChangesSaved: 'All changes saved',
+            errorBadImageUrl: 'Image url is incorrect'
         }
     })(), PE.Controllers.Main || {}))
 });

apps/presentationeditor/main/app/controller/Statusbar.js

@@ -177,9 +177,16 @@ define([
              }
         },
 
-        setStatusCaption: function(text) {
-            if (text.length)
-                this.statusbar.showStatusMessage(text); else
+        setStatusCaption: function(text, force, delay) {
+            if (this.timerCaption && ( ((new Date()) < this.timerCaption) || text.length==0 ) && !force )
+                return;
+
+            this.timerCaption = undefined;
+            if (text.length) {
+                this.statusbar.showStatusMessage(text);
+                if (delay>0)
+                    this.timerCaption = (new Date()).getTime() + delay;
+            } else
                 this.statusbar.clearStatusMessage();
         },
 

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

@@ -697,11 +697,11 @@ define([
         },
 
         onApiLockDocumentTheme: function() {
-            this.toolbar.lockToolbar(PE.enumLock.themeLock, true, {array: [this.toolbar.btnColorSchemas]});
+            this.toolbar.lockToolbar(PE.enumLock.themeLock, true, {array: [this.toolbar.btnColorSchemas, this.toolbar.listTheme]});
         },
 
         onApiUnLockDocumentTheme: function() {
-            this.toolbar.lockToolbar(PE.enumLock.themeLock, false, {array: [this.toolbar.btnColorSchemas]});
+            this.toolbar.lockToolbar(PE.enumLock.themeLock, false, {array: [this.toolbar.btnColorSchemas, this.toolbar.listTheme]});
         },
 
         onApiCoAuthoringDisconnect: function(disableDownload) {
@@ -872,13 +872,13 @@ define([
             if (this.api && this.api.asc_isDocumentCanSave) {
                 var isModified = this.api.asc_isDocumentCanSave();
                 var isSyncButton = $('.btn-icon', this.toolbar.btnSave.cmpEl).hasClass('btn-synch');
-                if (!isModified && !isSyncButton)
+                if (!isModified && !isSyncButton && !this.toolbar.mode.forcesave)
                     return;
 
                 this.api.asc_Save();
             }
 
-            this.toolbar.btnSave.setDisabled(true);
+            this.toolbar.btnSave.setDisabled(!this.toolbar.mode.forcesave);
 
             Common.NotificationCenter.trigger('edit:complete', this.toolbar);
             Common.component.Analytics.trackEvent('Save');
@@ -1718,7 +1718,7 @@ define([
                     store: this.getApplication().getCollection('Common.Collections.TextArt'),
                     parentMenu: this.toolbar.mnuInsertTextArt.menu,
                     showLast: false,
-                    itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>"></div>')
+                    itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>" style="width:50px;height:50px;"></div>')
                 });
 
                 this.toolbar.mnuTextArtPicker.on('item:click', function(picker, item, record, e) {

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

@@ -149,7 +149,7 @@ define([
 
                         if (this._isChartStylesChanged) {
                             if (rec)
-                                this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec(),true);
+                                this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec()[0],true);
                             else
                                 this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true);
                         }

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

@@ -1683,13 +1683,13 @@ define([
                     {caption: '--'},
                     mnuPreview
                 ]
-            }).on('hide:after', function(menu) {
+            }).on('hide:after', function(menu, e, isFromInputControl) {
                 if (me.suppressEditComplete) {
                     me.suppressEditComplete = false;
                     return;
                 }
 
-                me.fireEvent('editcomplete', me);
+                if (!isFromInputControl) me.fireEvent('editcomplete', me);
                 me.currentMenu = null;
             }).on('render:after', function(cmp) {
                 me.slideLayoutMenu = new Common.UI.DataView({
@@ -2425,13 +2425,13 @@ define([
                     menuAddHyperlinkPara,
                     menuHyperlinkPara
                 ]
-            }).on('hide:after', function(menu) {
+            }).on('hide:after', function(menu, e, isFromInputControl) {
                 if (me.suppressEditComplete) {
                     me.suppressEditComplete = false;
                     return;
                 }
 
-                me.fireEvent('editcomplete', me);
+                if (!isFromInputControl) me.fireEvent('editcomplete', me);
                 me.currentMenu = null;
             });
 
@@ -2591,13 +2591,13 @@ define([
                     menuAddHyperlinkTable,
                     menuHyperlinkTable
                 ]
-            }).on('hide:after', function(menu) {
+            }).on('hide:after', function(menu, e, isFromInputControl) {
                 if (me.suppressEditComplete) {
                     me.suppressEditComplete = false;
                     return;
                 }
 
-                me.fireEvent('editcomplete', me);
+                if (!isFromInputControl) me.fireEvent('editcomplete', me);
                 me.currentMenu = null;
             });
 
@@ -2654,13 +2654,13 @@ define([
                     menuAddCommentImg
                 /** coauthoring end **/
                 ]
-            }).on('hide:after', function(menu) {
+            }).on('hide:after', function(menu, e, isFromInputControl) {
                 if (me.suppressEditComplete) {
                     me.suppressEditComplete = false;
                     return;
                 }
 
-                me.fireEvent('editcomplete', me);
+                if (!isFromInputControl) me.fireEvent('editcomplete', me);
                 me.currentMenu = null;
             });
 

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

@@ -114,14 +114,18 @@ define([
                     '<td class="left"><label><%= scope.txtInput %></label></td>',
                     '<td class="right"><div id="fms-chb-input-mode"/></td>',
                 '</tr>','<tr class="divider edit"></tr>',
-                '<tr>',
+                '<tr class="edit">',
                     '<td class="left"><label><%= scope.textAlignGuides %></label></td>',
                     '<td class="right"><span id="fms-chb-align-guides" /></td>',
-                '</tr>','<tr class="divider"></tr>',
+                '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="autosave">',
                     '<td class="left"><label id="fms-lbl-autosave"><%= scope.textAutoSave %></label></td>',
                     '<td class="right"><span id="fms-chb-autosave" /></td>',
                 '</tr>','<tr class="divider autosave"></tr>',
+                '<tr class="forcesave">',
+                    '<td class="left"><label id="fms-lbl-forcesave"><%= scope.textForceSave %></label></td>',
+                    '<td class="right"><span id="fms-chb-forcesave" /></td>',
+                '</tr>','<tr class="divider forcesave"></tr>',
                 /** coauthoring begin **/
                 '<tr class="coauth changes">',
                     '<td class="left"><label><%= scope.strCoAuthMode %></label></td>',
@@ -212,6 +216,11 @@ define([
             }, this));
             this.lblAutosave = $('#fms-lbl-autosave');
 
+            this.chForcesave = new Common.UI.CheckBox({
+                el: $('#fms-chb-forcesave'),
+                labelText: this.strForcesave
+            });
+
             this.chAlignGuides = new Common.UI.CheckBox({
                 el: $('#fms-chb-align-guides'),
                 labelText: this.strAlignGuides
@@ -259,6 +268,7 @@ define([
                 this.chAutosave.setCaption(this.strAutoRecover);
                 this.lblAutosave.text(this.textAutoRecover);
             }
+            $('tr.forcesave', this.el)[mode.canForcesave ? 'show' : 'hide']();
             /** coauthoring begin **/
             $('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring ? 'show' : 'hide']();
             /** coauthoring end **/
@@ -295,6 +305,12 @@ define([
                 value = 0;
             this.chAutosave.setValue(fast_coauth || (value===null ? this.mode.canCoAuthoring : parseInt(value) == 1));
 
+            if (this.mode.canForcesave) {
+                value = Common.localStorage.getItem("pe-settings-forcesave");
+                value = (value === null) ? this.mode.canForcesave : (parseInt(value) == 1);
+                this.chForcesave.setValue(value);
+            }
+
             value = Common.localStorage.getItem("pe-settings-showsnaplines");
             this.chAlignGuides.setValue(value===null || parseInt(value) == 1);
         },
@@ -309,6 +325,8 @@ define([
             /** coauthoring end **/
             Common.localStorage.setItem("pe-settings-unit", this.cmbUnit.getValue());
             Common.localStorage.setItem("pe-settings-autosave", this.chAutosave.isChecked() ? 1 : 0);
+            if (this.mode.canForcesave)
+                Common.localStorage.setItem("pe-settings-forcesave", this.chForcesave.isChecked() ? 1 : 0);
             Common.localStorage.setItem("pe-settings-showsnaplines", this.chAlignGuides.isChecked() ? 1 : 0);
             Common.localStorage.save();
 
@@ -345,7 +363,9 @@ define([
         textAutoRecover: 'Autorecover',
         strAutoRecover: 'Turn on autorecover',
         txtInch: 'Inch',
-        txtFitWidth: 'Fit to Width'
+        txtFitWidth: 'Fit to Width',
+        textForceSave: 'Save to Server',
+        strForcesave: 'Always save to server (otherwise save to server on document close)'
     }, PE.Views.FileMenuPanels.Settings || {}));
 
     PE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({

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

@@ -373,6 +373,25 @@ define([
             return this;
         },
 
+        setDeveloperMode: function(mode) {
+            if ( !this.$el.is(':visible') ) return;
+
+            if (!this.developerHint) {
+                this.developerHint = $('<div id="developer-hint">' + this.txtDeveloper + '</div>').appendTo(this.$el);
+                this.devHeight = this.developerHint.outerHeight();
+                $(window).on('resize', _.bind(this.onWindowResize, this));
+            }
+            this.developerHint.toggleClass('hidden', !mode);
+
+            var lastbtn = this.$el.find('button.btn-category:visible:last-of-type');
+            this.minDevPosition = lastbtn.offset().top - lastbtn.offsetParent().offset().top + lastbtn.height() + 20;
+            this.onWindowResize();
+        },
+
+        onWindowResize: function() {
+            this.developerHint.css('top', Math.max((this.$el.height()-this.devHeight)/2, this.minDevPosition));
+        },
+
         /** coauthoring begin **/
         tipComments : 'Comments',
         tipChat     : 'Chat',
@@ -382,6 +401,7 @@ define([
         tipFile     : 'File',
         tipSearch   : 'Search',
         tipSlides: 'Slides',
-        tipPlugins  : 'Plugins'
+        tipPlugins  : 'Plugins',
+        txtDeveloper: 'DEVELOPER MODE'
     }, PE.Views.LeftMenu || {}));
 });

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

@@ -355,8 +355,8 @@ define([
             }
         },
 
-        onHideMenus: function(e){
-            this.fireEvent('editcomplete', this);
+        onHideMenus: function(menu, e, isFromInputControl){
+            if (!isFromInputControl) this.fireEvent('editcomplete', this);
         },
 
         setLocked: function (locked) {

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

@@ -78,42 +78,48 @@ define([
                 asctype: Common.Utils.documentSettingsType.Paragraph,
                 enableToggle: true,
                 disabled: true,
-                toggleGroup: 'tabpanelbtnsGroup'
+                toggleGroup: 'tabpanelbtnsGroup',
+                allowMouseEventsOnDisabled: true
             });
             this.btnTable = new Common.UI.Button({
                 hint: this.txtTableSettings,
                 asctype: Common.Utils.documentSettingsType.Table,
                 enableToggle: true,
                 disabled: true,
-                toggleGroup: 'tabpanelbtnsGroup'
+                toggleGroup: 'tabpanelbtnsGroup',
+                allowMouseEventsOnDisabled: true
             });
             this.btnImage = new Common.UI.Button({
                 hint: this.txtImageSettings,
                 asctype: Common.Utils.documentSettingsType.Image,
                 enableToggle: true,
                 disabled: true,
-                toggleGroup: 'tabpanelbtnsGroup'
+                toggleGroup: 'tabpanelbtnsGroup',
+                allowMouseEventsOnDisabled: true
             });
             this.btnSlide = new Common.UI.Button({
                 hint: this.txtSlideSettings,
                 asctype: Common.Utils.documentSettingsType.Slide,
                 enableToggle: true,
                 disabled: true,
-                toggleGroup: 'tabpanelbtnsGroup'
+                toggleGroup: 'tabpanelbtnsGroup',
+                allowMouseEventsOnDisabled: true
             });
             this.btnChart = new Common.UI.Button({
                 hint: this.txtChartSettings,
                 asctype: Common.Utils.documentSettingsType.Chart,
                 enableToggle: true,
                 disabled: true,
-                toggleGroup: 'tabpanelbtnsGroup'
+                toggleGroup: 'tabpanelbtnsGroup',
+                allowMouseEventsOnDisabled: true
             });
             this.btnShape = new Common.UI.Button({
                 hint: this.txtShapeSettings,
                 asctype: Common.Utils.documentSettingsType.Shape,
                 enableToggle: true,
                 disabled: true,
-                toggleGroup: 'tabpanelbtnsGroup'
+                toggleGroup: 'tabpanelbtnsGroup',
+                allowMouseEventsOnDisabled: true
             });
 
             this.btnTextArt = new Common.UI.Button({
@@ -121,7 +127,8 @@ define([
                 asctype: Common.Utils.documentSettingsType.TextArt,
                 enableToggle: true,
                 disabled: true,
-                toggleGroup: 'tabpanelbtnsGroup'
+                toggleGroup: 'tabpanelbtnsGroup',
+                allowMouseEventsOnDisabled: true
             });
 
             this._settings = [];

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

@@ -1234,6 +1234,18 @@ define([
             this.sldrGradient.on('thumbdblclick', function(cmp){
                 me.btnGradColor.cmpEl.find('button').dropdown('toggle');
             });
+            this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
+                var colors = [],
+                    currentIdx;
+                _.each (recalc_indexes, function(recalc_index, index) {
+                    colors.push(me.GradColor.colors[recalc_index]);
+                    if (me.GradColor.currentIdx == recalc_index)
+                        currentIdx = index;
+                });
+                me.OriginalFillType = null;
+                me.GradColor.colors = colors;
+                me.GradColor.currentIdx = currentIdx;
+            });
             this.fillControls.push(this.sldrGradient);
 
             this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

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

@@ -755,6 +755,18 @@ define([
             this.sldrGradient.on('thumbdblclick', function(cmp){
                 me.btnGradColor.cmpEl.find('button').dropdown('toggle');
             });
+            this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
+                var colors = [],
+                    currentIdx;
+                _.each (recalc_indexes, function(recalc_index, index) {
+                    colors.push(me.GradColor.colors[recalc_index]);
+                    if (me.GradColor.currentIdx == recalc_index)
+                        currentIdx = index;
+                });
+                me.OriginalFillType = null;
+                me.GradColor.colors = colors;
+                me.GradColor.currentIdx = currentIdx;
+            });
             this.FillItems.push(this.sldrGradient);
 
         },

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

@@ -175,6 +175,8 @@ define([
                 this.panelUsers = $('#status-users-ct', this.el);
                 this.panelUsers.on('shown.bs.dropdown', function () {
                     me.panelUsersList.scroller.update({minScrollbarLength  : 40, alwaysVisibleY: true});
+                    var tip = me.panelUsersBlock.data('bs.tooltip');
+                    if (tip) tip.hide();
                 });
 
                 this.panelUsersBlock = this.panelUsers.find('#status-users-block');

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

@@ -357,7 +357,7 @@ define([
              if (this._initSettings)
                 this.createDelayedElements();
 
-            this.disableControls(this._locked);
+            this.disableControls(this._locked); // need to update combodataview after disabled state
 
             if (props )
             {
@@ -376,7 +376,7 @@ define([
 
                     if (this._isTemplatesChanged) {
                         if (rec)
-                            this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec(),true);
+                            this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec()[0],true);
                         else
                             this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.store.at(0), true);
                     }

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

@@ -1224,6 +1224,18 @@ define([
             this.sldrGradient.on('thumbdblclick', function(cmp){
                 me.btnGradColor.cmpEl.find('button').dropdown('toggle');
             });
+            this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
+                var colors = [],
+                    currentIdx;
+                _.each (recalc_indexes, function(recalc_index, index) {
+                    colors.push(me.GradColor.colors[recalc_index]);
+                    if (me.GradColor.currentIdx == recalc_index)
+                        currentIdx = index;
+                });
+                me.OriginalFillType = null;
+                me.GradColor.colors = colors;
+                me.GradColor.currentIdx = currentIdx;
+            });
             this.lockedControls.push(this.sldrGradient);
 
             this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

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

@@ -855,7 +855,7 @@ define([
                 enableKeyEvents: true,
                 itemHeight  : 38,
                 hint: this.tipSlideTheme,
-                lock: [_set.lostConnect, _set.noSlides],
+                lock: [_set.themeLock, _set.lostConnect, _set.noSlides],
                 beforeOpenHandler: function(e) {
                     var cmp = this,
                         menu = cmp.openButton.menu,
@@ -1159,6 +1159,8 @@ define([
             );
             if (this.mode.isDesktopApp || this.mode.canBrandingExt && this.mode.customization && this.mode.customization.header===false)
                 this.mnuitemHideTitleBar.hide();
+            if (this.mode.canBrandingExt && this.mode.customization && this.mode.customization.statusBar===false)
+                this.mnuitemHideStatusBar.hide();
 
             this.mnuZoomOut = new Common.UI.Button({
                 el  : $('#id-menu-zoom-out'),
@@ -1540,7 +1542,7 @@ define([
                     if (this.synchTooltip)
                         this.synchTooltip.hide();
                     this.btnSave.updateHint(this.btnSaveTip);
-                    this.btnSave.setDisabled(true);
+                    this.btnSave.setDisabled(!this.mode.forcesave);
                     this._state.hasCollaborativeChanges = false;
                 }
             }

apps/presentationeditor/main/app_dev.js

@@ -181,6 +181,7 @@ require([
         'presentationeditor/main/app/view/ChartSettings',
         'common/main/lib/controller/ExternalDiagramEditor'
     ], function() {
+        window.compareVersions = true;
         app.start();
     });
 }, function(err) {

apps/presentationeditor/main/locale/de.json

@@ -131,6 +131,7 @@
   "PE.Controllers.Main.errorKeyEncrypt": "Unbekannter Schlüsseldeskriptor",
   "PE.Controllers.Main.errorKeyExpire": "Der Schlüsseldeskriptor ist abgelaufen",
   "PE.Controllers.Main.errorProcessSaveResult": "Speichern ist fehlgeschlagen.\n",
+  "PE.Controllers.Main.errorServerVersion": "Editor-Version wurde aktualisiert. Die Seite wird neu geladen, um die Änderungen zu übernehmen.",
   "PE.Controllers.Main.errorSessionAbsolute": "Die Bearbeitungssitzung des Dokumentes ist abgelaufen. Laden Sie die Seite neu.",
   "PE.Controllers.Main.errorSessionIdle": "Das Dokument wurde lange nicht bearbeitet. Laden Sie die Seite neu.",
   "PE.Controllers.Main.errorSessionToken": "Die Verbindung zum Server wurde unterbrochen. Laden Sie die Seite neu.",
@@ -181,6 +182,7 @@
   "PE.Controllers.Main.textStrict": "Formaler Modus",
   "PE.Controllers.Main.textTryUndoRedo": "Undo/Redo Optionen sind  für den halbformalen Zusammenbearbeitungsmodus deaktiviert.<br>Klicken Sie auf den Button \"Formaler Modus\", um den formalen Zusammenbearbeitungsmodus zu aktivieren, um die Datei, ohne Störungen anderer Benutzer zu bearbeiten und die Änderungen erst nachdem Sie sie gespeichert haben, zu senden. Sie können zwischen den Zusammenbearbeitungsmodi mit der Hilfe der erweiterten Einstellungen von Editor umschalten.",
   "PE.Controllers.Main.titleLicenseExp": "Lizenz ist abgelaufen",
+  "PE.Controllers.Main.titleServerVersion": "Editor wurde aktualisiert",
   "PE.Controllers.Main.txtArt": "Hier den Text eingeben",
   "PE.Controllers.Main.txtBasicShapes": "Standardformen",
   "PE.Controllers.Main.txtButtons": "Buttons",

apps/presentationeditor/main/locale/en.json

@@ -80,7 +80,7 @@
   "Common.Views.ExternalDiagramEditor.textTitle": "Chart Editor",
   "Common.Views.Header.openNewTabText": "Open in New Tab",
   "Common.Views.Header.textBack": "Go to Documents",
-  "Common.Views.Header.txtHeaderDeveloper": "DEVELOPER MODE",
+  "del_Common.Views.Header.txtHeaderDeveloper": "DEVELOPER MODE",
   "Common.Views.Header.txtRename": "Rename",
   "Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancel",
   "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
@@ -245,6 +245,10 @@
   "PE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "PE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
   "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
+  "PE.Controllers.Main.titleServerVersion": "Editor updated",
+  "PE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
+  "PE.Controllers.Main.textChangesSaved": "All changes saved",
+  "PE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
   "PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
   "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
   "PE.Controllers.Toolbar.textAccent": "Accents",
@@ -816,6 +820,8 @@
   "PE.Views.FileMenuPanels.Settings.txtInput": "Alternate Input",
   "PE.Views.FileMenuPanels.Settings.txtLast": "View Last",
   "PE.Views.FileMenuPanels.Settings.txtPt": "Point",
+  "PE.Views.FileMenuPanels.Settings.textForceSave": "Save to Server",
+  "PE.Views.FileMenuPanels.Settings.strForcesave": "Always save to server (otherwise save to server on document close)",
   "PE.Views.HyperlinkSettingsDialog.cancelButtonText": "Cancel",
   "PE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
   "PE.Views.HyperlinkSettingsDialog.strDisplay": "Display",
@@ -870,6 +876,7 @@
   "PE.Views.LeftMenu.tipSlides": "Slides",
   "PE.Views.LeftMenu.tipSupport": "Feedback & Support",
   "PE.Views.LeftMenu.tipTitles": "Titles",
+  "PE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE",
   "PE.Views.ParagraphSettings.strLineHeight": "Line Spacing",
   "PE.Views.ParagraphSettings.strParagraphSpacing": "Paragraph Spacing",
   "PE.Views.ParagraphSettings.strSpacingAfter": "After",

apps/presentationeditor/main/locale/es.json

@@ -28,8 +28,8 @@
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Reemplazar todo",
   "Common.UI.SynchronizeTip.textDontShow": "No volver a mostrar este mensaje",
   "Common.UI.SynchronizeTip.textSynchronize": "El documento ha sido cambiado por otro usuario.<br/>Por favor haga clic para guardar sus cambios y recargue las actualizaciones.",
-  "Common.UI.ThemeColorPalette.textStandartColors": "Colores estándar",
-  "Common.UI.ThemeColorPalette.textThemeColors": "Colores de tema",
+  "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
   "Common.UI.Window.cancelButtonText": "Cancelar",
   "Common.UI.Window.closeButtonText": "Cerrar",
   "Common.UI.Window.noButtonText": "No",
@@ -80,6 +80,8 @@
   "Common.Views.ExternalDiagramEditor.textTitle": "Editor de gráfico",
   "Common.Views.Header.openNewTabText": "Abrir en pestaña nueva",
   "Common.Views.Header.textBack": "Ir a Documentos",
+  "Common.Views.Header.txtHeaderDeveloper": "DEVELOPER MODE",
+  "Common.Views.Header.txtRename": "Rename",
   "Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancelar",
   "Common.Views.ImageFromUrlDialog.okButtonText": "Aceptar",
   "Common.Views.ImageFromUrlDialog.textUrl": "Pegar URL de imagen:",
@@ -93,16 +95,25 @@
   "Common.Views.InsertTableDialog.txtMinText": "El valor mínimo para este campo es {0}.",
   "Common.Views.InsertTableDialog.txtRows": "Número de filas",
   "Common.Views.InsertTableDialog.txtTitle": "Tamaño de tabla",
+  "Common.Views.OpenDialog.cancelButtonText": "Cancel",
+  "Common.Views.OpenDialog.okButtonText": "OK",
+  "Common.Views.OpenDialog.txtEncoding": "Encoding ",
+  "Common.Views.OpenDialog.txtPassword": "Password",
+  "Common.Views.OpenDialog.txtTitle": "Choose %1 options",
+  "Common.Views.OpenDialog.txtTitleProtected": "Protected File",
   "Common.Views.PluginDlg.textLoading": "Loading",
   "Common.Views.Plugins.strPlugins": "Plugins",
   "Common.Views.Plugins.textLoading": "Loading",
   "Common.Views.Plugins.textStart": "Start",
+  "Common.Views.RenameDialog.cancelButtonText": "Cancel",
+  "Common.Views.RenameDialog.okButtonText": "Ok",
+  "Common.Views.RenameDialog.textName": "File name",
+  "Common.Views.RenameDialog.txtInvalidName": "The file name cannot contain any of the following characters: ",
   "PE.Controllers.LeftMenu.newDocumentTitle": "Presentación sin nombre",
   "PE.Controllers.LeftMenu.requestEditRightsText": "Solicitando derechos de edición...",
   "PE.Controllers.LeftMenu.textNoTextFound": "No se puede encontrar los datos que usted busca. Por favor, ajuste los parámetros de búsqueda.",
   "PE.Controllers.Main.applyChangesTextText": "Cargando datos...",
   "PE.Controllers.Main.applyChangesTitleText": "Cargando datos",
-  "PE.Controllers.Main.convertationErrorText": "Fallo de conversión.",
   "PE.Controllers.Main.convertationTimeoutText": "Tiempo de conversión está superado.",
   "PE.Controllers.Main.criticalErrorExtText": "Pulse \"OK\" para regresar a la lista de documentos.",
   "PE.Controllers.Main.criticalErrorTitle": "Error",
@@ -110,6 +121,7 @@
   "PE.Controllers.Main.downloadErrorText": "Error de descarga.",
   "PE.Controllers.Main.downloadTextText": "Descargando presentación...",
   "PE.Controllers.Main.downloadTitleText": "Descargando presentación",
+  "PE.Controllers.Main.errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
   "PE.Controllers.Main.errorCoAuthoringDisconnect": "Se ha perdido la conexión con servidor. El documento no puede ser editado ahora.",
   "PE.Controllers.Main.errorConnectToServer": "No se pudo guardar el documento. Por favor, compruebe la configuración de conexión o póngase en contacto con el administrador.<br>Al hacer clic en el botón \"Aceptar\", se le pedirá que descargue el documento.<br> Encuentre más información acerca de la conexión con Servidor de Documentos<a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
   "PE.Controllers.Main.errorDatabaseConnection": "Error externo.<br>Error de conexión de base de datos. Por favor póngase en contacto con soporte si el error se mantiene.",
@@ -119,7 +131,13 @@
   "PE.Controllers.Main.errorKeyEncrypt": "Descriptor de clave desconocido",
   "PE.Controllers.Main.errorKeyExpire": "Descriptor de clave ha expirado",
   "PE.Controllers.Main.errorProcessSaveResult": "Problemas al guardar",
+  "PE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
+  "PE.Controllers.Main.errorSessionAbsolute": "The document editing session has expired. Please reload the page.",
+  "PE.Controllers.Main.errorSessionIdle": "The document has not been edited for quite a long time. Please reload the page.",
+  "PE.Controllers.Main.errorSessionToken": "The connection to the server has been interrupted. Please reload the page.",
   "PE.Controllers.Main.errorStockChart": "Orden de las filas incorrecto. Para crear un gráfico de cotizaciones introduzca los datos en la hoja de tal modo:<br> precio de apertura, precio máximo, precio mínimo, precio de cierre.",
+  "PE.Controllers.Main.errorToken": "The document security token is not correctly formed.<br>Please contact your Document Server administrator.",
+  "PE.Controllers.Main.errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator.",
   "PE.Controllers.Main.errorUpdateVersion": "Se ha cambiado la versión del archivo. La página será actualizada.",
   "PE.Controllers.Main.errorUserDrop": "No se puede acceder al archivo ahora.",
   "PE.Controllers.Main.errorUsersExceed": "El número de usuarios permitido según su plan de precios fue excedido",
@@ -164,6 +182,7 @@
   "PE.Controllers.Main.textStrict": "Modo estricto",
   "PE.Controllers.Main.textTryUndoRedo": "Las funciones Anular/Rehacer se desactivan para el modo co-edición rápido.<br>Haga Clic en el botón \"modo estricto\" para cambiar al modo de co-edición estricta para editar el archivo sin la interferencia de otros usuarios y enviar sus cambios sólo después de guardarlos. Se puede cambiar entre los modos de co-edición usando los ajustes avanzados de edición.",
   "PE.Controllers.Main.titleLicenseExp": "License expired",
+  "PE.Controllers.Main.titleServerVersion": "Editor updated",
   "PE.Controllers.Main.txtArt": "Su texto aquí",
   "PE.Controllers.Main.txtBasicShapes": "Formas básicas",
   "PE.Controllers.Main.txtButtons": "Botones",
@@ -226,13 +245,342 @@
   "PE.Controllers.Main.warnBrowserIE9": "Este aplicación tiene baja capacidad en IE9. Utilice IE10 o superior",
   "PE.Controllers.Main.warnBrowserZoom": "La configuración actual de zoom de su navegador no está soportada por completo. Por favor restablezca zoom predeterminado pulsando Ctrl+0.",
   "PE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
-  "PE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
+  "PE.Controllers.Main.warnNoLicense": "La licencia ha expirado o no ha sido encontrada. No puede editar archivos.<br>Haga clic en el botón 'Comprar ahora' para comprar una licencia Enterprise Edition o ´Contactar con nosotros´ si usa Intergration Edition.",
   "PE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado.",
   "PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
   "PE.Controllers.Toolbar.confirmAddFontName": "El tipo de letra que usted va a guardar no está disponible en este dispositivo.<br>El estilo de letra se mostrará usando uno de los tipos de letra del dispositivo, el tipo de letra guardado va a usarse cuando esté disponible.<br>¿Desea continuar?",
+  "PE.Controllers.Toolbar.textAccent": "Accents",
+  "PE.Controllers.Toolbar.textBracket": "Brackets",
   "PE.Controllers.Toolbar.textEmptyImgUrl": "Hay que especificar URL de imagen",
   "PE.Controllers.Toolbar.textFontSizeErr": "El valor introducido es incorrecto.<br>Por favor, introduzca un valor numérico entre 1 y 100",
+  "PE.Controllers.Toolbar.textFraction": "Fractions",
+  "PE.Controllers.Toolbar.textFunction": "Functions",
+  "PE.Controllers.Toolbar.textIntegral": "Integrals",
+  "PE.Controllers.Toolbar.textLargeOperator": "Large Operators",
+  "PE.Controllers.Toolbar.textLimitAndLog": "Limits And Logarithms",
+  "PE.Controllers.Toolbar.textMatrix": "Matrices",
+  "PE.Controllers.Toolbar.textOperator": "Operators",
+  "PE.Controllers.Toolbar.textRadical": "Radicals",
+  "PE.Controllers.Toolbar.textScript": "Scripts",
+  "PE.Controllers.Toolbar.textSymbols": "Symbols",
   "PE.Controllers.Toolbar.textWarning": "Aviso",
+  "PE.Controllers.Toolbar.txtAccent_Accent": "Acute",
+  "PE.Controllers.Toolbar.txtAccent_ArrowD": "Right-Left Arrow Above",
+  "PE.Controllers.Toolbar.txtAccent_ArrowL": "Leftwards Arrow Above",
+  "PE.Controllers.Toolbar.txtAccent_ArrowR": "Rightwards Arrow Above",
+  "PE.Controllers.Toolbar.txtAccent_Bar": "Bar",
+  "PE.Controllers.Toolbar.txtAccent_BarBot": "Underbar",
+  "PE.Controllers.Toolbar.txtAccent_BarTop": "Overbar",
+  "PE.Controllers.Toolbar.txtAccent_BorderBox": "Boxed Formula (With Placeholder)",
+  "PE.Controllers.Toolbar.txtAccent_BorderBoxCustom": "Boxed Formula(Example)",
+  "PE.Controllers.Toolbar.txtAccent_Check": "Check",
+  "PE.Controllers.Toolbar.txtAccent_CurveBracketBot": "Underbrace",
+  "PE.Controllers.Toolbar.txtAccent_CurveBracketTop": "Overbrace",
+  "PE.Controllers.Toolbar.txtAccent_Custom_1": "Vector A",
+  "PE.Controllers.Toolbar.txtAccent_Custom_2": "ABC With Overbar",
+  "PE.Controllers.Toolbar.txtAccent_Custom_3": "x XOR y With Overbar",
+  "PE.Controllers.Toolbar.txtAccent_DDDot": "Triple Dot",
+  "PE.Controllers.Toolbar.txtAccent_DDot": "Double Dot",
+  "PE.Controllers.Toolbar.txtAccent_Dot": "Dot",
+  "PE.Controllers.Toolbar.txtAccent_DoubleBar": "Double Overbar",
+  "PE.Controllers.Toolbar.txtAccent_Grave": "Grave",
+  "PE.Controllers.Toolbar.txtAccent_GroupBot": "Grouping Character Below",
+  "PE.Controllers.Toolbar.txtAccent_GroupTop": "Grouping Character Above",
+  "PE.Controllers.Toolbar.txtAccent_HarpoonL": "Leftwards Harpoon Above",
+  "PE.Controllers.Toolbar.txtAccent_HarpoonR": "Rightwards Harpoon Above",
+  "PE.Controllers.Toolbar.txtAccent_Hat": "Hat",
+  "PE.Controllers.Toolbar.txtAccent_Smile": "Breve",
+  "PE.Controllers.Toolbar.txtAccent_Tilde": "Tilde",
+  "PE.Controllers.Toolbar.txtBracket_Angle": "Brackets",
+  "PE.Controllers.Toolbar.txtBracket_Angle_Delimiter_2": "Brackets with Separators",
+  "PE.Controllers.Toolbar.txtBracket_Angle_Delimiter_3": "Brackets with Separators",
+  "PE.Controllers.Toolbar.txtBracket_Angle_NoneOpen": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_Angle_OpenNone": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_Curve": "Brackets",
+  "PE.Controllers.Toolbar.txtBracket_Curve_Delimiter_2": "Brackets with Separators",
+  "PE.Controllers.Toolbar.txtBracket_Curve_NoneOpen": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_Curve_OpenNone": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_Custom_1": "Cases (Two Conditions)",
+  "PE.Controllers.Toolbar.txtBracket_Custom_2": "Cases (Three Conditions)",
+  "PE.Controllers.Toolbar.txtBracket_Custom_3": "Stack Object",
+  "PE.Controllers.Toolbar.txtBracket_Custom_4": "Stack Object",
+  "PE.Controllers.Toolbar.txtBracket_Custom_5": "Cases Example",
+  "PE.Controllers.Toolbar.txtBracket_Custom_6": "Binomial Coefficient",
+  "PE.Controllers.Toolbar.txtBracket_Custom_7": "Binomial Coefficient",
+  "PE.Controllers.Toolbar.txtBracket_Line": "Brackets",
+  "PE.Controllers.Toolbar.txtBracket_Line_NoneOpen": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_Line_OpenNone": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_LineDouble": "Brackets",
+  "PE.Controllers.Toolbar.txtBracket_LineDouble_NoneOpen": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_LineDouble_OpenNone": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_LowLim": "Brackets",
+  "PE.Controllers.Toolbar.txtBracket_LowLim_NoneNone": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_LowLim_OpenNone": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_Round": "Brackets",
+  "PE.Controllers.Toolbar.txtBracket_Round_Delimiter_2": "Brackets with Separators",
+  "PE.Controllers.Toolbar.txtBracket_Round_NoneOpen": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_Round_OpenNone": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_Square": "Brackets",
+  "PE.Controllers.Toolbar.txtBracket_Square_CloseClose": "Brackets",
+  "PE.Controllers.Toolbar.txtBracket_Square_CloseOpen": "Brackets",
+  "PE.Controllers.Toolbar.txtBracket_Square_NoneOpen": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_Square_OpenNone": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_Square_OpenOpen": "Brackets",
+  "PE.Controllers.Toolbar.txtBracket_SquareDouble": "Brackets",
+  "PE.Controllers.Toolbar.txtBracket_SquareDouble_NoneOpen": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_SquareDouble_OpenNone": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_UppLim": "Brackets",
+  "PE.Controllers.Toolbar.txtBracket_UppLim_NoneOpen": "Single Bracket",
+  "PE.Controllers.Toolbar.txtBracket_UppLim_OpenNone": "Single Bracket",
+  "PE.Controllers.Toolbar.txtFractionDiagonal": "Skewed Fraction",
+  "PE.Controllers.Toolbar.txtFractionDifferential_1": "Differential",
+  "PE.Controllers.Toolbar.txtFractionDifferential_2": "Differential",
+  "PE.Controllers.Toolbar.txtFractionDifferential_3": "Differential",
+  "PE.Controllers.Toolbar.txtFractionDifferential_4": "Differential",
+  "PE.Controllers.Toolbar.txtFractionHorizontal": "Linear Fraction",
+  "PE.Controllers.Toolbar.txtFractionPi_2": "Pi Over 2",
+  "PE.Controllers.Toolbar.txtFractionSmall": "Small Fraction",
+  "PE.Controllers.Toolbar.txtFractionVertical": "Stacked Fraction",
+  "PE.Controllers.Toolbar.txtFunction_1_Cos": "Inverse Cosine Function",
+  "PE.Controllers.Toolbar.txtFunction_1_Cosh": "Hyperbolic Inverse Cosine Function",
+  "PE.Controllers.Toolbar.txtFunction_1_Cot": "Inverse Cotangent Function",
+  "PE.Controllers.Toolbar.txtFunction_1_Coth": "Hyperbolic Inverse Cotangent Function",
+  "PE.Controllers.Toolbar.txtFunction_1_Csc": "Inverse Cosecant Function",
+  "PE.Controllers.Toolbar.txtFunction_1_Csch": "Hyperbolic Inverse Cosecant Function",
+  "PE.Controllers.Toolbar.txtFunction_1_Sec": "Inverse Secant Function",
+  "PE.Controllers.Toolbar.txtFunction_1_Sech": "Hyperbolic Inverse Secant Function",
+  "PE.Controllers.Toolbar.txtFunction_1_Sin": "Inverse Sine Function",
+  "PE.Controllers.Toolbar.txtFunction_1_Sinh": "Hyperbolic Inverse Sine Function",
+  "PE.Controllers.Toolbar.txtFunction_1_Tan": "Inverse Tangent Function",
+  "PE.Controllers.Toolbar.txtFunction_1_Tanh": "Hyperbolic Inverse Tangent Function",
+  "PE.Controllers.Toolbar.txtFunction_Cos": "Cosine Function",
+  "PE.Controllers.Toolbar.txtFunction_Cosh": "Hyperbolic Cosine Function",
+  "PE.Controllers.Toolbar.txtFunction_Cot": "Cotangent Function",
+  "PE.Controllers.Toolbar.txtFunction_Coth": "Hyperbolic Cotangent Function",
+  "PE.Controllers.Toolbar.txtFunction_Csc": "Cosecant Function",
+  "PE.Controllers.Toolbar.txtFunction_Csch": "Hyperbolic Cosecant Function",
+  "PE.Controllers.Toolbar.txtFunction_Custom_1": "Sine theta",
+  "PE.Controllers.Toolbar.txtFunction_Custom_2": "Cos 2x",
+  "PE.Controllers.Toolbar.txtFunction_Custom_3": "Tangent formula",
+  "PE.Controllers.Toolbar.txtFunction_Sec": "Secant Function",
+  "PE.Controllers.Toolbar.txtFunction_Sech": "Hyperbolic Secant Function",
+  "PE.Controllers.Toolbar.txtFunction_Sin": "Sine Function",
+  "PE.Controllers.Toolbar.txtFunction_Sinh": "Hyperbolic Sine Function",
+  "PE.Controllers.Toolbar.txtFunction_Tan": "Tangent Function",
+  "PE.Controllers.Toolbar.txtFunction_Tanh": "Hyperbolic Tangent Function",
+  "PE.Controllers.Toolbar.txtIntegral": "Integral",
+  "PE.Controllers.Toolbar.txtIntegral_dtheta": "Differential theta",
+  "PE.Controllers.Toolbar.txtIntegral_dx": "Differential x",
+  "PE.Controllers.Toolbar.txtIntegral_dy": "Differential y",
+  "PE.Controllers.Toolbar.txtIntegralCenterSubSup": "Integral",
+  "PE.Controllers.Toolbar.txtIntegralDouble": "Double Integral",
+  "PE.Controllers.Toolbar.txtIntegralDoubleCenterSubSup": "Double Integral",
+  "PE.Controllers.Toolbar.txtIntegralDoubleSubSup": "Double Integral",
+  "PE.Controllers.Toolbar.txtIntegralOriented": "Contour Integral",
+  "PE.Controllers.Toolbar.txtIntegralOrientedCenterSubSup": "Contour Integral",
+  "PE.Controllers.Toolbar.txtIntegralOrientedDouble": "Surface Integral",
+  "PE.Controllers.Toolbar.txtIntegralOrientedDoubleCenterSubSup": "Surface Integral",
+  "PE.Controllers.Toolbar.txtIntegralOrientedDoubleSubSup": "Surface Integral",
+  "PE.Controllers.Toolbar.txtIntegralOrientedSubSup": "Contour Integral",
+  "PE.Controllers.Toolbar.txtIntegralOrientedTriple": "Volume Integral",
+  "PE.Controllers.Toolbar.txtIntegralOrientedTripleCenterSubSup": "Volume Integral",
+  "PE.Controllers.Toolbar.txtIntegralOrientedTripleSubSup": "Volume Integral",
+  "PE.Controllers.Toolbar.txtIntegralSubSup": "Integral",
+  "PE.Controllers.Toolbar.txtIntegralTriple": "Triple Integral",
+  "PE.Controllers.Toolbar.txtIntegralTripleCenterSubSup": "Triple Integral",
+  "PE.Controllers.Toolbar.txtIntegralTripleSubSup": "Triple Integral",
+  "PE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Wedge",
+  "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Wedge",
+  "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Wedge",
+  "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Wedge",
+  "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Wedge",
+  "PE.Controllers.Toolbar.txtLargeOperator_CoProd": "Co-Product",
+  "PE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSub": "Co-Product",
+  "PE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSubSup": "Co-Product",
+  "PE.Controllers.Toolbar.txtLargeOperator_CoProd_Sub": "Co-Product",
+  "PE.Controllers.Toolbar.txtLargeOperator_CoProd_SubSup": "Co-Product",
+  "PE.Controllers.Toolbar.txtLargeOperator_Custom_1": "Summation",
+  "PE.Controllers.Toolbar.txtLargeOperator_Custom_2": "Summation",
+  "PE.Controllers.Toolbar.txtLargeOperator_Custom_3": "Summation",
+  "PE.Controllers.Toolbar.txtLargeOperator_Custom_4": "Product",
+  "PE.Controllers.Toolbar.txtLargeOperator_Custom_5": "Union",
+  "PE.Controllers.Toolbar.txtLargeOperator_Disjunction": "Vee",
+  "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSub": "Vee",
+  "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSubSup": "Vee",
+  "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_Sub": "Vee",
+  "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_SubSup": "Vee",
+  "PE.Controllers.Toolbar.txtLargeOperator_Intersection": "Intersection",
+  "PE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSub": "Intersection",
+  "PE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSubSup": "Intersection",
+  "PE.Controllers.Toolbar.txtLargeOperator_Intersection_Sub": "Intersection",
+  "PE.Controllers.Toolbar.txtLargeOperator_Intersection_SubSup": "Intersection",
+  "PE.Controllers.Toolbar.txtLargeOperator_Prod": "Product",
+  "PE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSub": "Product",
+  "PE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSubSup": "Product",
+  "PE.Controllers.Toolbar.txtLargeOperator_Prod_Sub": "Product",
+  "PE.Controllers.Toolbar.txtLargeOperator_Prod_SubSup": "Product",
+  "PE.Controllers.Toolbar.txtLargeOperator_Sum": "Summation",
+  "PE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSub": "Summation",
+  "PE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSubSup": "Summation",
+  "PE.Controllers.Toolbar.txtLargeOperator_Sum_Sub": "Summation",
+  "PE.Controllers.Toolbar.txtLargeOperator_Sum_SubSup": "Summation",
+  "PE.Controllers.Toolbar.txtLargeOperator_Union": "Union",
+  "PE.Controllers.Toolbar.txtLargeOperator_Union_CenterSub": "Union",
+  "PE.Controllers.Toolbar.txtLargeOperator_Union_CenterSubSup": "Union",
+  "PE.Controllers.Toolbar.txtLargeOperator_Union_Sub": "Union",
+  "PE.Controllers.Toolbar.txtLargeOperator_Union_SubSup": "Union",
+  "PE.Controllers.Toolbar.txtLimitLog_Custom_1": "Limit Example",
+  "PE.Controllers.Toolbar.txtLimitLog_Custom_2": "Maximum Example",
+  "PE.Controllers.Toolbar.txtLimitLog_Lim": "Limit",
+  "PE.Controllers.Toolbar.txtLimitLog_Ln": "Natural Logarithm",
+  "PE.Controllers.Toolbar.txtLimitLog_Log": "Logarithm",
+  "PE.Controllers.Toolbar.txtLimitLog_LogBase": "Logarithm",
+  "PE.Controllers.Toolbar.txtLimitLog_Max": "Maximum",
+  "PE.Controllers.Toolbar.txtLimitLog_Min": "Minimum",
+  "PE.Controllers.Toolbar.txtMatrix_1_2": "1x2 Empty Matrix",
+  "PE.Controllers.Toolbar.txtMatrix_1_3": "1x3 Empty Matrix",
+  "PE.Controllers.Toolbar.txtMatrix_2_1": "2x1 Empty Matrix",
+  "PE.Controllers.Toolbar.txtMatrix_2_2": "2x2 Empty Matrix",
+  "PE.Controllers.Toolbar.txtMatrix_2_2_DLineBracket": "Empty Matrix with Brackets",
+  "PE.Controllers.Toolbar.txtMatrix_2_2_LineBracket": "Empty Matrix with Brackets",
+  "PE.Controllers.Toolbar.txtMatrix_2_2_RoundBracket": "Empty Matrix with Brackets",
+  "PE.Controllers.Toolbar.txtMatrix_2_2_SquareBracket": "Empty Matrix with Brackets",
+  "PE.Controllers.Toolbar.txtMatrix_2_3": "2x3 Empty Matrix",
+  "PE.Controllers.Toolbar.txtMatrix_3_1": "3x1 Empty Matrix",
+  "PE.Controllers.Toolbar.txtMatrix_3_2": "3x2 Empty Matrix",
+  "PE.Controllers.Toolbar.txtMatrix_3_3": "3x3 Empty Matrix",
+  "PE.Controllers.Toolbar.txtMatrix_Dots_Baseline": "Baseline Dots",
+  "PE.Controllers.Toolbar.txtMatrix_Dots_Center": "Midline Dots",
+  "PE.Controllers.Toolbar.txtMatrix_Dots_Diagonal": "Diagonal Dots",
+  "PE.Controllers.Toolbar.txtMatrix_Dots_Vertical": "Vertical Dots",
+  "PE.Controllers.Toolbar.txtMatrix_Flat_Round": "Sparse Matrix",
+  "PE.Controllers.Toolbar.txtMatrix_Flat_Square": "Sparse Matrix",
+  "PE.Controllers.Toolbar.txtMatrix_Identity_2": "2x2 Identity Matrix",
+  "PE.Controllers.Toolbar.txtMatrix_Identity_2_NoZeros": "3x3 Identity Matrix",
+  "PE.Controllers.Toolbar.txtMatrix_Identity_3": "3x3 Identity Matrix",
+  "PE.Controllers.Toolbar.txtMatrix_Identity_3_NoZeros": "3x3 Identity Matrix",
+  "PE.Controllers.Toolbar.txtOperator_ArrowD_Bot": "Right-Left Arrow Below",
+  "PE.Controllers.Toolbar.txtOperator_ArrowD_Top": "Right-Left Arrow Above",
+  "PE.Controllers.Toolbar.txtOperator_ArrowL_Bot": "Leftwards Arrow Below",
+  "PE.Controllers.Toolbar.txtOperator_ArrowL_Top": "Leftwards Arrow Above",
+  "PE.Controllers.Toolbar.txtOperator_ArrowR_Bot": "Rightwards Arrow Below",
+  "PE.Controllers.Toolbar.txtOperator_ArrowR_Top": "Rightwards Arrow Above",
+  "PE.Controllers.Toolbar.txtOperator_ColonEquals": "Colon Equal",
+  "PE.Controllers.Toolbar.txtOperator_Custom_1": "Yields",
+  "PE.Controllers.Toolbar.txtOperator_Custom_2": "Delta Yields",
+  "PE.Controllers.Toolbar.txtOperator_Definition": "Equal to By Definition",
+  "PE.Controllers.Toolbar.txtOperator_DeltaEquals": "Delta Equal To",
+  "PE.Controllers.Toolbar.txtOperator_DoubleArrowD_Bot": "Right-Left Arrow Below",
+  "PE.Controllers.Toolbar.txtOperator_DoubleArrowD_Top": "Right-Left Arrow Above",
+  "PE.Controllers.Toolbar.txtOperator_DoubleArrowL_Bot": "Leftwards Arrow Below",
+  "PE.Controllers.Toolbar.txtOperator_DoubleArrowL_Top": "Leftwards Arrow Above",
+  "PE.Controllers.Toolbar.txtOperator_DoubleArrowR_Bot": "Rightwards Arrow Below",
+  "PE.Controllers.Toolbar.txtOperator_DoubleArrowR_Top": "Rightwards Arrow Above",
+  "PE.Controllers.Toolbar.txtOperator_EqualsEquals": "Equal Equal",
+  "PE.Controllers.Toolbar.txtOperator_MinusEquals": "Minus Equal",
+  "PE.Controllers.Toolbar.txtOperator_PlusEquals": "Plus Equal",
+  "PE.Controllers.Toolbar.txtOperator_UnitOfMeasure": "Measured By",
+  "PE.Controllers.Toolbar.txtRadicalCustom_1": "Radical",
+  "PE.Controllers.Toolbar.txtRadicalCustom_2": "Radical",
+  "PE.Controllers.Toolbar.txtRadicalRoot_2": "Square Root With Degree",
+  "PE.Controllers.Toolbar.txtRadicalRoot_3": "Cubic Root",
+  "PE.Controllers.Toolbar.txtRadicalRoot_n": "Radical With Degree",
+  "PE.Controllers.Toolbar.txtRadicalSqrt": "Square Root",
+  "PE.Controllers.Toolbar.txtScriptCustom_1": "Script",
+  "PE.Controllers.Toolbar.txtScriptCustom_2": "Script",
+  "PE.Controllers.Toolbar.txtScriptCustom_3": "Script",
+  "PE.Controllers.Toolbar.txtScriptCustom_4": "Script",
+  "PE.Controllers.Toolbar.txtScriptSub": "Subscript",
+  "PE.Controllers.Toolbar.txtScriptSubSup": "Subscript-Superscript",
+  "PE.Controllers.Toolbar.txtScriptSubSupLeft": "LeftSubscript-Superscript",
+  "PE.Controllers.Toolbar.txtScriptSup": "Superscript",
+  "PE.Controllers.Toolbar.txtSymbol_about": "Approximately",
+  "PE.Controllers.Toolbar.txtSymbol_additional": "Complement",
+  "PE.Controllers.Toolbar.txtSymbol_aleph": "Alef",
+  "PE.Controllers.Toolbar.txtSymbol_alpha": "Alpha",
+  "PE.Controllers.Toolbar.txtSymbol_approx": "Almost Equal To",
+  "PE.Controllers.Toolbar.txtSymbol_ast": "Asterisk Operator",
+  "PE.Controllers.Toolbar.txtSymbol_beta": "Beta",
+  "PE.Controllers.Toolbar.txtSymbol_beth": "Bet",
+  "PE.Controllers.Toolbar.txtSymbol_bullet": "Bullet Operator",
+  "PE.Controllers.Toolbar.txtSymbol_cap": "Intersection",
+  "PE.Controllers.Toolbar.txtSymbol_cbrt": "Cube Root",
+  "PE.Controllers.Toolbar.txtSymbol_cdots": "Midline Horizontal Ellipsis",
+  "PE.Controllers.Toolbar.txtSymbol_celsius": "Degrees Celsius",
+  "PE.Controllers.Toolbar.txtSymbol_chi": "Chi",
+  "PE.Controllers.Toolbar.txtSymbol_cong": "Approximately Equal To",
+  "PE.Controllers.Toolbar.txtSymbol_cup": "Union",
+  "PE.Controllers.Toolbar.txtSymbol_ddots": "Down Right Diagonal Ellipsis",
+  "PE.Controllers.Toolbar.txtSymbol_degree": "Degrees",
+  "PE.Controllers.Toolbar.txtSymbol_delta": "Delta",
+  "PE.Controllers.Toolbar.txtSymbol_div": "Division Sign",
+  "PE.Controllers.Toolbar.txtSymbol_downarrow": "Down Arrow",
+  "PE.Controllers.Toolbar.txtSymbol_emptyset": "Empty Set",
+  "PE.Controllers.Toolbar.txtSymbol_epsilon": "Epsilon",
+  "PE.Controllers.Toolbar.txtSymbol_equals": "Equal",
+  "PE.Controllers.Toolbar.txtSymbol_equiv": "Identical To",
+  "PE.Controllers.Toolbar.txtSymbol_eta": "Eta",
+  "PE.Controllers.Toolbar.txtSymbol_exists": "There Exist",
+  "PE.Controllers.Toolbar.txtSymbol_factorial": "Factorial",
+  "PE.Controllers.Toolbar.txtSymbol_fahrenheit": "Degrees Fahrenheit",
+  "PE.Controllers.Toolbar.txtSymbol_forall": "For All",
+  "PE.Controllers.Toolbar.txtSymbol_gamma": "Gamma",
+  "PE.Controllers.Toolbar.txtSymbol_geq": "Greater Than or Equal To",
+  "PE.Controllers.Toolbar.txtSymbol_gg": "Much Greater Than",
+  "PE.Controllers.Toolbar.txtSymbol_greater": "Greater Than",
+  "PE.Controllers.Toolbar.txtSymbol_in": "Element Of",
+  "PE.Controllers.Toolbar.txtSymbol_inc": "Increment",
+  "PE.Controllers.Toolbar.txtSymbol_infinity": "Infinity",
+  "PE.Controllers.Toolbar.txtSymbol_iota": "Iota",
+  "PE.Controllers.Toolbar.txtSymbol_kappa": "Kappa",
+  "PE.Controllers.Toolbar.txtSymbol_lambda": "Lambda",
+  "PE.Controllers.Toolbar.txtSymbol_leftarrow": "Left Arrow",
+  "PE.Controllers.Toolbar.txtSymbol_leftrightarrow": "Left-Right Arrow",
+  "PE.Controllers.Toolbar.txtSymbol_leq": "Less Than or Equal To",
+  "PE.Controllers.Toolbar.txtSymbol_less": "Less Than",
+  "PE.Controllers.Toolbar.txtSymbol_ll": "Much Less Than",
+  "PE.Controllers.Toolbar.txtSymbol_minus": "Minus",
+  "PE.Controllers.Toolbar.txtSymbol_mp": "Minus Plus",
+  "PE.Controllers.Toolbar.txtSymbol_mu": "Mu",
+  "PE.Controllers.Toolbar.txtSymbol_nabla": "Nabla",
+  "PE.Controllers.Toolbar.txtSymbol_neq": "Not Equal To",
+  "PE.Controllers.Toolbar.txtSymbol_ni": "Contains as Member",
+  "PE.Controllers.Toolbar.txtSymbol_not": "Not Sign",
+  "PE.Controllers.Toolbar.txtSymbol_notexists": "There Does Not Exist",
+  "PE.Controllers.Toolbar.txtSymbol_nu": "Nu",
+  "PE.Controllers.Toolbar.txtSymbol_o": "Omicron",
+  "PE.Controllers.Toolbar.txtSymbol_omega": "Omega",
+  "PE.Controllers.Toolbar.txtSymbol_partial": "Partial Differential",
+  "PE.Controllers.Toolbar.txtSymbol_percent": "Percentage",
+  "PE.Controllers.Toolbar.txtSymbol_phi": "Phi",
+  "PE.Controllers.Toolbar.txtSymbol_pi": "Pi",
+  "PE.Controllers.Toolbar.txtSymbol_plus": "Plus",
+  "PE.Controllers.Toolbar.txtSymbol_pm": "Plus Minus",
+  "PE.Controllers.Toolbar.txtSymbol_propto": "Proportional To",
+  "PE.Controllers.Toolbar.txtSymbol_psi": "Psi",
+  "PE.Controllers.Toolbar.txtSymbol_qdrt": "Fourth Root",
+  "PE.Controllers.Toolbar.txtSymbol_qed": "End of Proof",
+  "PE.Controllers.Toolbar.txtSymbol_rddots": "Up Right Diagonal Ellipsis",
+  "PE.Controllers.Toolbar.txtSymbol_rho": "Rho",
+  "PE.Controllers.Toolbar.txtSymbol_rightarrow": "Right Arrow",
+  "PE.Controllers.Toolbar.txtSymbol_sigma": "Sigma",
+  "PE.Controllers.Toolbar.txtSymbol_sqrt": "Radical Sign",
+  "PE.Controllers.Toolbar.txtSymbol_tau": "Tau",
+  "PE.Controllers.Toolbar.txtSymbol_therefore": "Therefore",
+  "PE.Controllers.Toolbar.txtSymbol_theta": "Theta",
+  "PE.Controllers.Toolbar.txtSymbol_times": "Multiplication Sign",
+  "PE.Controllers.Toolbar.txtSymbol_uparrow": "Up Arrow",
+  "PE.Controllers.Toolbar.txtSymbol_upsilon": "Upsilon",
+  "PE.Controllers.Toolbar.txtSymbol_varepsilon": "Epsilon Variant",
+  "PE.Controllers.Toolbar.txtSymbol_varphi": "Phi Variant",
+  "PE.Controllers.Toolbar.txtSymbol_varpi": "Pi Variant",
+  "PE.Controllers.Toolbar.txtSymbol_varrho": "Rho Variant",
+  "PE.Controllers.Toolbar.txtSymbol_varsigma": "Sigma Variant",
+  "PE.Controllers.Toolbar.txtSymbol_vartheta": "Theta Variant",
+  "PE.Controllers.Toolbar.txtSymbol_vdots": "Vertical Ellipsis",
+  "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
+  "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
+  "PE.Views.ChartSettings.textAdvanced": "Show advanced settings",
   "PE.Views.ChartSettings.textArea": "Gráfico de área",
   "PE.Views.ChartSettings.textBar": "Gráfico de barras",
   "PE.Views.ChartSettings.textChartType": "Cambiar tipo de gráfico",
@@ -247,17 +595,26 @@
   "PE.Views.ChartSettings.textStock": "De cotizaciones",
   "PE.Views.ChartSettings.textStyle": "Estilo",
   "PE.Views.ChartSettings.textWidth": "Ancho",
+  "PE.Views.ChartSettingsAdvanced.cancelButtonText": "Cancel",
+  "PE.Views.ChartSettingsAdvanced.okButtonText": "Ok",
+  "PE.Views.ChartSettingsAdvanced.textAlt": "Alternative Text",
+  "PE.Views.ChartSettingsAdvanced.textAltDescription": "Description",
+  "PE.Views.ChartSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",
+  "PE.Views.ChartSettingsAdvanced.textAltTitle": "Title",
+  "PE.Views.ChartSettingsAdvanced.textTitle": "Chart - Advanced Settings",
   "PE.Views.DocumentHolder.aboveText": "Arriba",
   "PE.Views.DocumentHolder.addCommentText": "Añadir comentario",
   "PE.Views.DocumentHolder.advancedImageText": "Ajustes avanzados de imagen",
   "PE.Views.DocumentHolder.advancedParagraphText": "Ajustes avanzados de texto",
   "PE.Views.DocumentHolder.advancedShapeText": "Ajustes avanzados de forma",
   "PE.Views.DocumentHolder.advancedTableText": "Ajustes avanzados de tabla",
+  "PE.Views.DocumentHolder.alignmentText": "Alignment",
   "PE.Views.DocumentHolder.belowText": "Abajo",
   "PE.Views.DocumentHolder.bottomCellText": "Alinear en la parte inferior",
   "PE.Views.DocumentHolder.cellAlignText": "Alineación vertical de celda",
   "PE.Views.DocumentHolder.cellText": "Celda",
   "PE.Views.DocumentHolder.centerCellText": "Alinear al centro",
+  "PE.Views.DocumentHolder.centerText": "Center",
   "PE.Views.DocumentHolder.columnText": "Columna",
   "PE.Views.DocumentHolder.deleteColumnText": "Borrar columna",
   "PE.Views.DocumentHolder.deleteRowText": "Borrar fila",
@@ -277,9 +634,11 @@
   "PE.Views.DocumentHolder.insertRowBelowText": "Fila debajo",
   "PE.Views.DocumentHolder.insertRowText": "Insertar fila",
   "PE.Views.DocumentHolder.insertText": "Insertar",
+  "PE.Views.DocumentHolder.leftText": "Left",
   "PE.Views.DocumentHolder.mergeCellsText": "Unir celdas",
   "PE.Views.DocumentHolder.originalSizeText": "Tamaño Predeterminado",
   "PE.Views.DocumentHolder.removeHyperlinkText": "Eliminar hiperenlace",
+  "PE.Views.DocumentHolder.rightText": "Right",
   "PE.Views.DocumentHolder.rowText": "Fila",
   "PE.Views.DocumentHolder.selectText": "Seleccionar",
   "PE.Views.DocumentHolder.splitCellsText": "Dividir celda...",
@@ -303,20 +662,90 @@
   "PE.Views.DocumentHolder.textSlideSettings": "Ajustes de diapositiva",
   "PE.Views.DocumentHolder.tipIsLocked": "Otro usuario está editando este elemento ahora.",
   "PE.Views.DocumentHolder.topCellText": "Alinear en la parte superior",
+  "PE.Views.DocumentHolder.txtAddBottom": "Add bottom border",
+  "PE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar",
+  "PE.Views.DocumentHolder.txtAddHor": "Add horizontal line",
+  "PE.Views.DocumentHolder.txtAddLB": "Add left bottom line",
+  "PE.Views.DocumentHolder.txtAddLeft": "Add left border",
+  "PE.Views.DocumentHolder.txtAddLT": "Add left top line",
+  "PE.Views.DocumentHolder.txtAddRight": "Add right border",
+  "PE.Views.DocumentHolder.txtAddTop": "Add top border",
+  "PE.Views.DocumentHolder.txtAddVer": "Add vertical line",
   "PE.Views.DocumentHolder.txtAlign": "Alinear",
+  "PE.Views.DocumentHolder.txtAlignToChar": "Align to character",
   "PE.Views.DocumentHolder.txtArrange": "Arreglar",
   "PE.Views.DocumentHolder.txtBackground": "Fondo",
+  "PE.Views.DocumentHolder.txtBorderProps": "Border properties",
+  "PE.Views.DocumentHolder.txtBottom": "Bottom",
   "PE.Views.DocumentHolder.txtChangeLayout": "Cambiar diseño",
+  "PE.Views.DocumentHolder.txtColumnAlign": "Column alignment",
+  "PE.Views.DocumentHolder.txtDecreaseArg": "Decrease argument size",
+  "PE.Views.DocumentHolder.txtDeleteArg": "Delete argument",
+  "PE.Views.DocumentHolder.txtDeleteBreak": "Delete manual break",
+  "PE.Views.DocumentHolder.txtDeleteChars": "Delete enclosing characters",
+  "PE.Views.DocumentHolder.txtDeleteCharsAndSeparators": "Delete enclosing characters and separators",
+  "PE.Views.DocumentHolder.txtDeleteEq": "Delete equation",
+  "PE.Views.DocumentHolder.txtDeleteGroupChar": "Delete char",
+  "PE.Views.DocumentHolder.txtDeleteRadical": "Delete radical",
   "PE.Views.DocumentHolder.txtDeleteSlide": "Borrar diapositiva",
   "PE.Views.DocumentHolder.txtDistribHor": "Distribuir horizontalmente",
   "PE.Views.DocumentHolder.txtDistribVert": "Distribuir verticalmente",
   "PE.Views.DocumentHolder.txtDuplicateSlide": "Duplicar diapositiva",
+  "PE.Views.DocumentHolder.txtFractionLinear": "Change to linear fraction",
+  "PE.Views.DocumentHolder.txtFractionSkewed": "Change to skewed fraction",
+  "PE.Views.DocumentHolder.txtFractionStacked": "Change to stacked fraction",
   "PE.Views.DocumentHolder.txtGroup": "Agrupar",
+  "PE.Views.DocumentHolder.txtGroupCharOver": "Char over text",
+  "PE.Views.DocumentHolder.txtGroupCharUnder": "Char under text",
+  "PE.Views.DocumentHolder.txtHideBottom": "Hide bottom border",
+  "PE.Views.DocumentHolder.txtHideBottomLimit": "Hide bottom limit",
+  "PE.Views.DocumentHolder.txtHideCloseBracket": "Hide closing bracket",
+  "PE.Views.DocumentHolder.txtHideDegree": "Hide degree",
+  "PE.Views.DocumentHolder.txtHideHor": "Hide horizontal line",
+  "PE.Views.DocumentHolder.txtHideLB": "Hide left bottom line",
+  "PE.Views.DocumentHolder.txtHideLeft": "Hide left border",
+  "PE.Views.DocumentHolder.txtHideLT": "Hide left top line",
+  "PE.Views.DocumentHolder.txtHideOpenBracket": "Hide opening bracket",
+  "PE.Views.DocumentHolder.txtHidePlaceholder": "Hide placeholder",
+  "PE.Views.DocumentHolder.txtHideRight": "Hide right border",
+  "PE.Views.DocumentHolder.txtHideTop": "Hide top border",
+  "PE.Views.DocumentHolder.txtHideTopLimit": "Hide top limit",
+  "PE.Views.DocumentHolder.txtHideVer": "Hide vertical line",
+  "PE.Views.DocumentHolder.txtIncreaseArg": "Increase argument size",
+  "PE.Views.DocumentHolder.txtInsertArgAfter": "Insert argument after",
+  "PE.Views.DocumentHolder.txtInsertArgBefore": "Insert argument before",
+  "PE.Views.DocumentHolder.txtInsertBreak": "Insert manual break",
+  "PE.Views.DocumentHolder.txtInsertEqAfter": "Insert equation after",
+  "PE.Views.DocumentHolder.txtInsertEqBefore": "Insert equation before",
+  "PE.Views.DocumentHolder.txtLimitChange": "Change limits location",
+  "PE.Views.DocumentHolder.txtLimitOver": "Limit over text",
+  "PE.Views.DocumentHolder.txtLimitUnder": "Limit under text",
+  "PE.Views.DocumentHolder.txtMatchBrackets": "Match brackets to argument height",
+  "PE.Views.DocumentHolder.txtMatrixAlign": "Matrix alignment",
   "PE.Views.DocumentHolder.txtNewSlide": "Diapositiva nueva",
+  "PE.Views.DocumentHolder.txtOverbar": "Bar over text",
   "PE.Views.DocumentHolder.txtPressLink": "Pulse CTRL y haga clic en enlace",
   "PE.Views.DocumentHolder.txtPreview": "Vista previa",
+  "PE.Views.DocumentHolder.txtRemFractionBar": "Remove fraction bar",
+  "PE.Views.DocumentHolder.txtRemLimit": "Remove limit",
+  "PE.Views.DocumentHolder.txtRemoveAccentChar": "Remove accent character",
+  "PE.Views.DocumentHolder.txtRemoveBar": "Remove bar",
+  "PE.Views.DocumentHolder.txtRemScripts": "Remove scripts",
+  "PE.Views.DocumentHolder.txtRemSubscript": "Remove subscript",
+  "PE.Views.DocumentHolder.txtRemSuperscript": "Remove superscript",
+  "PE.Views.DocumentHolder.txtScriptsAfter": "Scripts after text",
+  "PE.Views.DocumentHolder.txtScriptsBefore": "Scripts before text",
   "PE.Views.DocumentHolder.txtSelectAll": "Seleccionar todo",
+  "PE.Views.DocumentHolder.txtShowBottomLimit": "Show bottom limit",
+  "PE.Views.DocumentHolder.txtShowCloseBracket": "Show closing bracket",
+  "PE.Views.DocumentHolder.txtShowDegree": "Show degree",
+  "PE.Views.DocumentHolder.txtShowOpenBracket": "Show opening bracket",
+  "PE.Views.DocumentHolder.txtShowPlaceholder": "Show placeholder",
+  "PE.Views.DocumentHolder.txtShowTopLimit": "Show top limit",
   "PE.Views.DocumentHolder.txtSlide": "Diapositiva",
+  "PE.Views.DocumentHolder.txtStretchBrackets": "Stretch brackets",
+  "PE.Views.DocumentHolder.txtTop": "Top",
+  "PE.Views.DocumentHolder.txtUnderbar": "Bar under text",
   "PE.Views.DocumentHolder.txtUngroup": "Desagrupar",
   "PE.Views.DocumentHolder.vertAlignText": "Alineación vertical",
   "PE.Views.DocumentPreview.goToSlideText": "Ir a diapositiva",
@@ -332,12 +761,14 @@
   "PE.Views.DocumentPreview.txtPrev": "Diapositiva anterior",
   "PE.Views.FileMenu.btnAboutCaption": "Acerca de programa",
   "PE.Views.FileMenu.btnBackCaption": "Ir a Documentos",
+  "PE.Views.FileMenu.btnCloseMenuCaption": "Close Menu",
   "PE.Views.FileMenu.btnCreateNewCaption": "Crear nuevo",
   "PE.Views.FileMenu.btnDownloadCaption": "Descargar como...",
   "PE.Views.FileMenu.btnHelpCaption": "Ayuda...",
   "PE.Views.FileMenu.btnInfoCaption": "Info sobre presentación...",
   "PE.Views.FileMenu.btnPrintCaption": "Imprimir",
   "PE.Views.FileMenu.btnRecentFilesCaption": "Abrir reciente...",
+  "PE.Views.FileMenu.btnRenameCaption": "Rename...",
   "PE.Views.FileMenu.btnReturnCaption": "Ir a presentación",
   "PE.Views.FileMenu.btnRightsCaption": "Derechos de acceso...",
   "PE.Views.FileMenu.btnSaveAsCaption": "Guardar como",
@@ -420,9 +851,14 @@
   "PE.Views.ImageSettings.textWidth": "Ancho",
   "PE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancelar",
   "PE.Views.ImageSettingsAdvanced.okButtonText": "Aceptar",
+  "PE.Views.ImageSettingsAdvanced.textAlt": "Alternative Text",
+  "PE.Views.ImageSettingsAdvanced.textAltDescription": "Description",
+  "PE.Views.ImageSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",
+  "PE.Views.ImageSettingsAdvanced.textAltTitle": "Title",
   "PE.Views.ImageSettingsAdvanced.textHeight": "Altura",
   "PE.Views.ImageSettingsAdvanced.textKeepRatio": "Proporciones constantes",
   "PE.Views.ImageSettingsAdvanced.textOriginalSize": "Tamaño Predeterminado",
+  "PE.Views.ImageSettingsAdvanced.textPlacement": "Placement",
   "PE.Views.ImageSettingsAdvanced.textPosition": "Posición",
   "PE.Views.ImageSettingsAdvanced.textSize": "Tamaño",
   "PE.Views.ImageSettingsAdvanced.textTitle": "Imagen - ajustes avanzados",
@@ -525,6 +961,10 @@
   "PE.Views.ShapeSettingsAdvanced.cancelButtonText": "Cancelar",
   "PE.Views.ShapeSettingsAdvanced.okButtonText": "Aceptar",
   "PE.Views.ShapeSettingsAdvanced.strMargins": "Márgenes interiores",
+  "PE.Views.ShapeSettingsAdvanced.textAlt": "Alternative Text",
+  "PE.Views.ShapeSettingsAdvanced.textAltDescription": "Description",
+  "PE.Views.ShapeSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",
+  "PE.Views.ShapeSettingsAdvanced.textAltTitle": "Title",
   "PE.Views.ShapeSettingsAdvanced.textArrows": "Flechas",
   "PE.Views.ShapeSettingsAdvanced.textBeginSize": "Tamaño inicial",
   "PE.Views.ShapeSettingsAdvanced.textBeginStyle": "Estilo inicial",
@@ -705,6 +1145,10 @@
   "PE.Views.TableSettings.txtNoBorders": "Sin bordes",
   "PE.Views.TableSettingsAdvanced.cancelButtonText": "Cancelar",
   "PE.Views.TableSettingsAdvanced.okButtonText": "Aceptar",
+  "PE.Views.TableSettingsAdvanced.textAlt": "Alternative Text",
+  "PE.Views.TableSettingsAdvanced.textAltDescription": "Description",
+  "PE.Views.TableSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",
+  "PE.Views.TableSettingsAdvanced.textAltTitle": "Title",
   "PE.Views.TableSettingsAdvanced.textBottom": "Inferior",
   "PE.Views.TableSettingsAdvanced.textCheckMargins": "Usar márgenes predeterminados",
   "PE.Views.TableSettingsAdvanced.textDefaultMargins": "Márgenes predeterminados",
@@ -777,6 +1221,7 @@
   "PE.Views.Toolbar.textBar": "Gráfico de barras",
   "PE.Views.Toolbar.textBold": "Negrita",
   "PE.Views.Toolbar.textCancel": "Cancelar",
+  "PE.Views.Toolbar.textCharts": "Charts",
   "PE.Views.Toolbar.textColumn": "Gráfico de columnas",
   "PE.Views.Toolbar.textCompactView": "Ver Barra de herramientas compacta",
   "PE.Views.Toolbar.textFitPage": "Ajustar diapositiva",
@@ -811,6 +1256,7 @@
   "PE.Views.Toolbar.tipAddSlide": "Añadir diapositiva",
   "PE.Views.Toolbar.tipAdvSettings": "Ajustes avanzados",
   "PE.Views.Toolbar.tipBack": "Atrás",
+  "PE.Views.Toolbar.tipChangeChart": "Change Chart Type",
   "PE.Views.Toolbar.tipChangeSlide": "Cambiar diseño de diapositiva",
   "PE.Views.Toolbar.tipClearStyle": "Limpiar estilo",
   "PE.Views.Toolbar.tipColorSchemas": "Cambiar combinación de colores",
@@ -824,6 +1270,7 @@
   "PE.Views.Toolbar.tipHideBars": "Ocultar barras de título y estado",
   "PE.Views.Toolbar.tipIncPrLeft": "Aumentar sangría",
   "PE.Views.Toolbar.tipInsertChart": "Insertar gráfico",
+  "PE.Views.Toolbar.tipInsertEquation": "Insert Equation",
   "PE.Views.Toolbar.tipInsertHyperlink": "Añadir hiperenlace",
   "PE.Views.Toolbar.tipInsertImage": "Insertar imagen",
   "PE.Views.Toolbar.tipInsertShape": "Insertar autoforma",

apps/presentationeditor/main/locale/fr.json

@@ -131,6 +131,7 @@
   "PE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu",
   "PE.Controllers.Main.errorKeyExpire": "Descripteur de clés expiré",
   "PE.Controllers.Main.errorProcessSaveResult": "Échec de l'enregistrement",
+  "PE.Controllers.Main.errorServerVersion": "La version de l'éditeur a été mise à jour. La page sera rechargée pour appliquer les modifications.",
   "PE.Controllers.Main.errorSessionAbsolute": "La session de la modification de document a expiré.Veuillez recharger la page.",
   "PE.Controllers.Main.errorSessionIdle": "Le document n'est pas modifié depuis longtemps. Veuillez recharger la page.",
   "PE.Controllers.Main.errorSessionToken": "La connexion au serveur a été interrompue. Veuillez recharger la page.",
@@ -181,7 +182,8 @@
   "PE.Controllers.Main.textStrict": "Mode strict",
   "PE.Controllers.Main.textTryUndoRedo": "Les fonctions annuler/rétablir sont désactivées pour le mode de co-édition rapide.<br>Cliquez sur le bouton \"Mode strict\" pour passer au mode de la co-édition stricte pour modifier le fichier sans interférence d'autres utilisateurs et envoyer vos modifications seulement après que vous les enregistrez. Vous pouvez basculer entre les modes de co-édition à l'aide de paramètres avancés d'éditeur.",
   "PE.Controllers.Main.titleLicenseExp": "Licence expirée",
-  "PE.Controllers.Main.txtArt": "Your text here",
+  "PE.Controllers.Main.titleServerVersion": "L'éditeur est mis à jour",
+  "PE.Controllers.Main.txtArt": "Entrez votre texte",
   "PE.Controllers.Main.txtBasicShapes": "Formes de base",
   "PE.Controllers.Main.txtButtons": "Boutons",
   "PE.Controllers.Main.txtCallouts": "Légendes",
@@ -897,7 +899,7 @@
   "PE.Views.ParagraphSettingsAdvanced.strTabs": "Tabulation",
   "PE.Views.ParagraphSettingsAdvanced.textAlign": "Alignement",
   "PE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Espacement des caractères",
-  "PE.Views.ParagraphSettingsAdvanced.textDefault": "Onglet par défaut",
+  "PE.Views.ParagraphSettingsAdvanced.textDefault": "Par défaut",
   "PE.Views.ParagraphSettingsAdvanced.textEffects": "Effets",
   "PE.Views.ParagraphSettingsAdvanced.textRemove": "Supprimer",
   "PE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Supprimer tout",
@@ -1014,7 +1016,7 @@
   "PE.Views.SlideSettings.textFromUrl": "D'une URL",
   "PE.Views.SlideSettings.textGradient": "Dégradé",
   "PE.Views.SlideSettings.textGradientFill": "Remplissage en dégradé",
-  "PE.Views.SlideSettings.textHorizontalIn": "Horizontal extérieur",
+  "PE.Views.SlideSettings.textHorizontalIn": "Horizontal intérieur",
   "PE.Views.SlideSettings.textHorizontalOut": "Horizontal intérieur",
   "PE.Views.SlideSettings.textImageTexture": "Image ou Texture",
   "PE.Views.SlideSettings.textLeft": "A gauche",

apps/presentationeditor/main/locale/ru.json

@@ -131,6 +131,7 @@
   "PE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
   "PE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек",
   "PE.Controllers.Main.errorProcessSaveResult": "Сбой при сохранении.",
+  "PE.Controllers.Main.errorServerVersion": "Версия редактора была обновлена. Страница будет перезагружена, чтобы применить изменения.",
   "PE.Controllers.Main.errorSessionAbsolute": "Время сеанса редактирования документа истекло. Пожалуйста, обновите страницу.",
   "PE.Controllers.Main.errorSessionIdle": "Документ долгое время не редактировался. Пожалуйста, обновите страницу.",
   "PE.Controllers.Main.errorSessionToken": "Подключение к серверу было прервано. Пожалуйста, обновите страницу.",
@@ -181,6 +182,7 @@
   "PE.Controllers.Main.textStrict": "Строгий режим",
   "PE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.<br>Нажмите на кнопку 'Строгий режим' для переключения в Строгий режим совместного редактирования, чтобы редактировать файл без вмешательства других пользователей и отправлять изменения только после того, как вы их сохраните. Переключаться между режимами совместного редактирования можно с помощью Дополнительных параметров редактора.",
   "PE.Controllers.Main.titleLicenseExp": "Истек срок действия лицензии",
+  "PE.Controllers.Main.titleServerVersion": "Редактор обновлен",
   "PE.Controllers.Main.txtArt": "Введите ваш текст",
   "PE.Controllers.Main.txtBasicShapes": "Основные фигуры",
   "PE.Controllers.Main.txtButtons": "Кнопки",
@@ -246,7 +248,7 @@
   "PE.Controllers.Main.warnNoLicense": "Вы используете open source версию ONLYOFFICE. Эта версия имеет ограничения по количеству одновременных подключений к серверу документов (20 подключений одновременно).<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "PE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
   "PE.Controllers.Statusbar.zoomText": "Масштаб {0}%",
-  "PE.Controllers.Toolbar.confirmAddFontName": "Шрифт, который вы собираетесь сохранить, недоступен на этом устройстве.<br>Стиль текста будет отображаться с использованием одного из системных шрифтов; сохраненный шрифт будет использоваться, когда он будет доступен.<br>Вы хотите продолжить?",
+  "PE.Controllers.Toolbar.confirmAddFontName": "Шрифт, который вы хотите сохранить, недоступен на этом устройстве.<br>Стиль текста будет отображаться с помощью одного из системных шрифтов. Сохраненный шрифт будет использоваться, когда он станет доступен.<br>Вы хотите продолжить?",
   "PE.Controllers.Toolbar.textAccent": "Диакритические знаки",
   "PE.Controllers.Toolbar.textBracket": "Скобки",
   "PE.Controllers.Toolbar.textEmptyImgUrl": "Необходимо указать URL изображения.",

apps/presentationeditor/main/resources/less/leftmenu.less

@@ -451,4 +451,20 @@
             }
         }
     }
+}
+
+#developer-hint {
+    position: absolute;
+    left: 0;
+    padding: 12px 0;
+    background-color: #ffb400;
+    color: #6e4e00 !important;
+    white-space: nowrap;
+    line-height: @app-header-height;
+    writing-mode: vertical-rl;
+    -moz-transform: rotate(180deg);
+    -ms-transform: rotate(180deg);
+    -webkit-transform: rotate(180deg);
+    -o-transform: rotate(180deg);
+    transform: rotate(180deg);
 }

apps/presentationeditor/main/resources/less/toolbar.less

@@ -386,6 +386,7 @@
     color: #ffffff;
     font: 11px arial;
     white-space: nowrap;
+    letter-spacing: 1px;
 }
 
 .item-equation {

apps/presentationeditor/mobile/app-dev.js

@@ -223,6 +223,7 @@ require([
         'presentationeditor/mobile/app/controller/add/AddSlide'
 
     ], function() {
+        window.compareVersions = true;
         app.start();
     });
 }, function(err) {

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

@@ -54,6 +54,7 @@ define([
         // private
         var _stack,
             _view,
+            _actionSheets = [],
             _isEdit = false,
             _isPopMenuHidden = false;
 
@@ -125,6 +126,22 @@ define([
                             return true;
                         }
                     });
+                } else if ('showActionSheet' == eventName && _actionSheets.length > 0) {
+                    _.delay(function () {
+                        _.each(_actionSheets, function (action) {
+                            action.text = action.caption
+                            action.onClick = function () {
+                                me.onContextMenuClick(null, action.event)
+                            }
+                        });
+
+                        uiApp.actions([_actionSheets, [
+                            {
+                                text: me.sheetCancel,
+                                bold: true
+                            }
+                        ]]);
+                    }, 100);
                 }
 
                 _view.hideMenu();
@@ -146,7 +163,7 @@ define([
             },
 
             onApiShowPopMenu: function(posX, posY) {
-                if (_isPopMenuHidden || $('.popover.settings, .popup.settings, .picker-modal.settings, .modal-in').length > 0)
+                if (_isPopMenuHidden || $('.popover.settings, .popup.settings, .picker-modal.settings, .modal-in, .actions-modal').length > 0)
                     return;
 
                 var me = this,
@@ -176,7 +193,7 @@ define([
                         newDocumentPage.focus();
                     }
                 } else
-                    this.api.openInternalLink(url);
+                    this.api.asc_GoToInternalHyperlink(url);
             },
 
             _initMenu: function (stack) {
@@ -184,6 +201,8 @@ define([
                     menuItems = [],
                     canCopy = me.api.can_CopyCut();
 
+                _actionSheets = [];
+
                 var isText = false,
                     isTable = false,
                     isImage = false,
@@ -270,10 +289,6 @@ define([
                     }
                 }
 
-                if (Common.SharedSettings.get('phone') && menuItems.length > 3) {
-                    menuItems = menuItems.slice(0, 3);
-                }
-
                 if (isLink) {
                     menuItems.push({
                         caption: me.menuOpenLink,
@@ -281,6 +296,16 @@ define([
                     });
                 }
 
+                if (Common.SharedSettings.get('phone') && menuItems.length > 3) {
+                    _actionSheets = menuItems.slice(3);
+
+                    menuItems = menuItems.slice(0, 3);
+                    menuItems.push({
+                        caption: me.menuMore,
+                        event: 'showActionSheet'
+                    });
+                }
+
                 return menuItems;
             },
 
@@ -290,7 +315,9 @@ define([
             menuEdit: 'Edit',
             menuDelete: 'Delete',
             menuAddLink: 'Add Link',
-            menuOpenLink: 'Open Link'
+            menuOpenLink: 'Open Link',
+            menuMore: 'More',
+            sheetCancel: 'Cancel'
         }
     })(), PE.Controllers.DocumentHolder || {}))
 });

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

@@ -79,7 +79,6 @@ define([
                     isDisconnected      : false,
                     usersCount          : 1,
                     fastCoauth          : true,
-                    startModifyDocument : true,
                     lostEditingRights   : false,
                     licenseWarning      : false
                 };
@@ -123,6 +122,7 @@ define([
                     me.api.asc_registerCallback('asc_onDocumentContentReady',       _.bind(me.onDocumentContentReady, me));
                     me.api.asc_registerCallback('asc_onOpenDocumentProgress',       _.bind(me.onOpenDocument, me));
                     me.api.asc_registerCallback('asc_onDocumentUpdateVersion',      _.bind(me.onUpdateVersion, me));
+                    me.api.asc_registerCallback('asc_onServerVersion',              _.bind(me.onServerVersion, me));
                     me.api.asc_registerCallback('asc_onAdvancedOptions',            _.bind(me.onAdvancedOptions, me));
                     me.api.asc_registerCallback('asc_onDocumentName',               _.bind(me.onDocumentName, me));
                     me.api.asc_registerCallback('asc_onPrintUrl',                   _.bind(me.onPrintUrl, me));
@@ -302,14 +302,9 @@ define([
                     me.setLongActionView(action)
                 } else {
                     if (me._state.fastCoauth && me._state.usersCount>1 && id==Asc.c_oAscAsyncAction['Save']) {
-                        if (me._state.timerSave===undefined)
-                            me._state.timerSave = setInterval(function(){
-                                if ((new Date()) - me._state.isSaving>500) {
-                                    clearInterval(me._state.timerSave);
-                                    //console.debug('End long action');
-                                    me._state.timerSave = undefined;
-                                }
-                            }, 500);
+                        // me._state.timerSave = setTimeout(function () {
+                            //console.debug('End long action');
+                        // }, 500);
                     } else {
                         // console.debug('End long action');
                     }
@@ -342,7 +337,7 @@ define([
                         break;
 
                     case Asc.c_oAscAsyncAction['Save']:
-                        me._state.isSaving = new Date();
+                        // clearTimeout(me._state.timerSave);
                         title   = me.saveTitleText;
                         text    = me.saveTextText;
                         break;
@@ -544,6 +539,8 @@ define([
                     return;
                 }
 
+                if ( me.onServerVersion(params.asc_getBuildVersion()) ) return;
+
                 me.permissions.review         = (me.permissions.review === undefined) ? (me.permissions.edit !== false) : me.permissions.review;
                 me.appOptions.canAnalytics    = params.asc_getIsAnalyticsEnable();
                 me.appOptions.canLicense      = (licType === Asc.c_oLicenseResult.Success);
@@ -602,7 +599,8 @@ define([
                 });
 
                 if (me.api) {
-                    me.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this));
+                    me.api.asc_registerCallback('asc_onSendThemeColors', _.bind(me.onSendThemeColors, me));
+                    me.api.asc_registerCallback('asc_onDownloadUrl',     _.bind(me.onDownloadUrl, me));
 
                     var translateChart = new Asc.asc_CChartTranslate();
                     translateChart.asc_setTitle(me.txtDiagramTitle);
@@ -633,8 +631,6 @@ define([
                     me.api.asc_registerCallback('asc_onChangeObjectLock',        _.bind(me._onChangeObjectLock, me));
                     me.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(me.onDocumentModifiedChanged, me));
                     me.api.asc_registerCallback('asc_onDocumentCanSaveChanged',  _.bind(me.onDocumentCanSaveChanged, me));
-                    me.api.asc_registerCallback('asc_onSaveUrl',                 _.bind(me.onSaveUrl, me));
-                    me.api.asc_registerCallback('asc_onDownloadUrl',             _.bind(me.onDownloadUrl, me));
                     /** coauthoring begin **/
                     me.api.asc_registerCallback('asc_onCollaborativeChanges',    _.bind(me.onCollaborativeChanges, me));
                     me.api.asc_registerCallback('asc_OnTryUndoInFastCollaborative',_.bind(me.onTryUndoInFastCollaborative, me));
@@ -766,6 +762,10 @@ define([
                         config.msg = this.errorConnectToServer;
                         break;
 
+                    case Asc.c_oAscError.ID.UplImageUrl:
+                        config.msg = this.errorBadImageUrl;
+                        break;
+
                     default:
                         config.msg = this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -827,21 +827,12 @@ define([
                     if (window.document.title != title)
                         window.document.title = title;
 
-                    if (!this._state.fastCoauth || this._state.usersCount<2 )
-                        Common.Gateway.setDocumentModified(isModified);
-                    else if ( this._state.startModifyDocument!==undefined && this._state.startModifyDocument === isModified){
-                        Common.Gateway.setDocumentModified(isModified);
-                        this._state.startModifyDocument = (this._state.startModifyDocument) ? !this._state.startModifyDocument : undefined;
-                    }
-
+                    Common.Gateway.setDocumentModified(isModified);
                     this._state.isDocModified = isModified;
                 }
             },
 
             onDocumentModifiedChanged: function() {
-                if (this._state.fastCoauth && this._state.usersCount > 1 && this._state.startModifyDocument===undefined )
-                    return;
-
                 var isModified = this.api.asc_isDocumentCanSave();
                 if (this._state.isDocModified !== isModified) {
                     Common.Gateway.setDocumentModified(this.api.isDocumentModified());
@@ -886,10 +877,6 @@ define([
                 $('#loading-mask').hide().remove();
             },
 
-            onSaveUrl: function(url) {
-                Common.Gateway.save(url);
-            },
-
             onDownloadUrl: function(url) {
                 if (this._state.isFromGatewayDownloadAs) {
                     Common.Gateway.downloadAs(url);
@@ -919,6 +906,25 @@ define([
                 });
             },
 
+            onServerVersion: function(buildVersion) {
+                var me = this;
+                if (me.changeServerVersion) return true;
+
+                if (DocsAPI.DocEditor.version() !== buildVersion && !window.compareVersions) {
+                    me.changeServerVersion = true;
+                    uiApp.alert(
+                        me.errorServerVersion,
+                        me.titleServerVersion,
+                        function () {
+                            _.defer(function() {
+                                Common.Gateway.updateVersion();
+                            })
+                        });
+                    return true;
+                }
+                return false;
+            },
+
             onCollaborativeChanges: function() {
                 //
             },
@@ -1209,7 +1215,10 @@ define([
             textPassword: 'Password',
             textBack: 'Back',
             textClose: 'Close',
-            textDone: 'Done'
+            textDone: 'Done',
+            titleServerVersion: 'Editor updated',
+            errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.',
+            errorBadImageUrl: 'Image url is incorrect'
         }
     })(), PE.Controllers.Main || {}))
 });

apps/presentationeditor/mobile/app/controller/add/AddLink.js

@@ -60,8 +60,7 @@ define([
             _linkType = c_oHyperlinkType.WebLink,
             _slideLink = 0,
             _slideNum = 0,
-            _slidesCount = 0,
-            _isDisplayChanged = false;
+            _slidesCount = 0;
 
         return {
             models: [],
@@ -106,7 +105,6 @@ define([
                 if ($target && $target.prop('id') === 'add-link') {
                     _linkType = c_oHyperlinkType.WebLink;
                     _slideLink = _slideNum = 0;
-                    _isDisplayChanged = false;
                     var text = this.api.can_AddHyperlink();
                     if (text !== false) {
                         $('#add-link-display input').val((text !== null) ? text : this.textDefault);
@@ -170,9 +168,6 @@ define([
                 $('#page-addlink-type li').single('click',  _.buffered(me.onLinkType, 100, me));
                 $('#page-addlink-slidenumber li').single('click', _.buffered(me.onSlideLink, 100, me));
                 $('#addlink-slide-number .button').single('click',_.buffered(me.onSlideNumber, 100, me));
-                $('#add-link-display input[type="text"]').single('input', _.bind(function(e) {
-                    _isDisplayChanged = true;
-                }, this));
                 me.initSettings(pageId);
             },
 
@@ -232,7 +227,7 @@ define([
                     def_display = slidetip;
                 }
 
-                if (!$('#add-link-display').hasClass('disabled') && (_isDisplayChanged || _.isEmpty(display))) {
+                if (!$('#add-link-display').hasClass('disabled')) {
                     props.put_Text(_.isEmpty(display) ? def_display : display);
                 } else
                     props.put_Text(null);

apps/presentationeditor/mobile/app/controller/add/AddTable.js

@@ -91,64 +91,69 @@ define([
                     $target = $(e.currentTarget),
                     type = $target.data('type');
 
+                if ($('.modal.modal-in').length > 0) {
+                    return;
+                }
+
                 PE.getController('AddContainer').hideModal();
 
-                _.delay(function () {
-                    if ($target) {
-                        var picker;
-                        var modal = uiApp.modal({
-                            title: me.textTableSize,
-                            text: '',
-                            afterText:
-                            '<div class="content-block">' +
-                                '<div class="row">' +
-                                    '<div class="col-50">' + me.textColumns + '</div>' +
-                                    '<div class="col-50">' + me.textRows + '</div>' +
-                                '</div>' +
-                            '<div id="picker-table-size"></div>' +
-                            '</div>',
-                            buttons: [
-                                {
-                                    text: me.textCancel
-                                },
-                                {
-                                    text: 'OK',
-                                    bold: true,
-                                    onClick: function () {
-                                        var size = picker.value;
+                if ($target) {
+                    var picker;
+                    var modal = uiApp.modal({
+                        title: me.textTableSize,
+                        text: '',
+                        afterText:
+                        '<div class="content-block">' +
+                            '<div class="row no-gutter" style="text-align: center;">' +
+                                '<div class="col-50">' + me.textColumns + '</div>' +
+                                '<div class="col-50">' + me.textRows + '</div>' +
+                            '</div>' +
+                        '<div id="picker-table-size"></div>' +
+                        '</div>',
+                        buttons: [
+                            {
+                                text: me.textCancel
+                            },
+                            {
+                                text: 'OK',
+                                bold: true,
+                                onClick: function () {
+                                    var size = picker.value;
 
-                                        if (me.api) {
-                                            me.api.put_Table(parseInt(size[0]), parseInt(size[1]));
+                                    if (me.api) {
+                                        me.api.put_Table(parseInt(size[0]), parseInt(size[1]));
 
-                                            var properties = new Asc.CTableProp();
-                                            properties.put_TableStyle(type);
+                                        var properties = new Asc.CTableProp();
+                                        properties.put_TableStyle(type);
 
-                                            me.api.tblApply(properties);
-                                        }
+                                        me.api.tblApply(properties);
                                     }
                                 }
-                            ]
-                        });
+                            }
+                        ]
+                    });
 
-                        picker = uiApp.picker({
-                            container: '#picker-table-size',
-                            toolbar: false,
-                            rotateEffect: true,
-                            value: [3, 3],
-                            cols: [{
-                                textAlign: 'left',
-                                values: [1,2,3,4,5,6,7,8,9,10]
-                            }, {
-                                values: [1,2,3,4,5,6,7,8,9,10]
-                            }]
-                        });
+                    picker = uiApp.picker({
+                        container: '#picker-table-size',
+                        toolbar: false,
+                        rotateEffect: true,
+                        value: [3, 3],
+                        cols: [{
+                            textAlign: 'center',
+                            width: '100%',
+                            values: [1,2,3,4,5,6,7,8,9,10]
+                        }, {
+                            textAlign: 'center',
+                            width: '100%',
+                            values: [1,2,3,4,5,6,7,8,9,10]
+                        }]
+                    });
 
-                        // Vertical align
-                        $$(modal).css({
-                            marginTop: - Math.round($$(modal).outerHeight() / 2) + 'px'
-                        });
-                    }
-                }, 300);
+                    // Vertical align
+                    $$(modal).css({
+                        marginTop: - Math.round($$(modal).outerHeight() / 2) + 'px'
+                    });
+                }
             },
 
             // Public

apps/presentationeditor/mobile/app/controller/edit/EditChart.js

@@ -54,7 +54,8 @@ define([
         var _stack = [],
             _chartObject = undefined,
             _shapeObject = undefined,
-            _metricText = Common.Utils.Metric.getCurrentMetricName();
+            _metricText = Common.Utils.Metric.getCurrentMetricName(),
+            _borderColor = 'transparent';
 
         var borderSizeTransform = (function() {
             var _sizes = [0, 0.5, 1, 1.5, 2.25, 3, 4.5, 6];
@@ -66,14 +67,19 @@ define([
                     return _sizes[index];
                 },
 
-                sizeByValue: function (value) {
+                indexSizeByValue: function (value) {
                     var index = 0;
                     _.each(_sizes, function (size, idx) {
                         if (Math.abs(size - value) < 0.25) {
                             index = idx;
                         }
                     });
-                    return _sizes[index];
+
+                    return index
+                },
+
+                sizeByValue: function (value) {
+                    return _sizes[this.indexSizeByValue(value)];
                 }
             }
         })();
@@ -157,9 +163,10 @@ define([
                 $('.chart-types li[data-type=' + type + ']').addClass('active');
 
                 // Init style border size
-                var borderSize = shapeProperties.get_stroke().get_width() * 72.0 / 25.4;
-                $('#edit-chart-bordersize input').val([borderSizeTransform.sizeByIndex(borderSize)]);
-                $('#edit-chart-bordersize .item-after').text(borderSizeTransform.sizeByValue(borderSize) + ' ' + _metricText);
+                var borderSize = shapeProperties.get_stroke().get_width() * 72.0 / 25.4,
+                    borderType = _shapeObject.get_stroke().get_type();
+                $('#edit-chart-bordersize input').val([(borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.indexSizeByValue(borderSize)]);
+                $('#edit-chart-bordersize .item-after').text(((borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.sizeByValue(borderSize)) + ' ' + _metricText);
 
                 paletteFillColor && paletteFillColor.on('select',       _.bind(me.onFillColor, me));
                 paletteBorderColor && paletteBorderColor.on('select',   _.bind(me.onBorderColor, me));
@@ -188,13 +195,18 @@ define([
                 paletteFillColor && paletteFillColor.select(color);
 
                 // Init border color
-                var stroke = shapeProperties.get_stroke(),
-                    strokeType = stroke.get_type();
+                me._initBorderColorView();
+            },
 
-                color = 'transparent';
+            _initBorderColorView: function () {
+                var me = this,
+                    paletteBorderColor = me.getView('EditChart').paletteBorderColor,
+                    stroke = _shapeObject.get_stroke();
 
-                if (stroke && strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
-                    sdkColor = stroke.get_color();
+                var color = 'transparent';
+
+                if (stroke && stroke.get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
+                    var sdkColor = stroke.get_color();
 
                     if (sdkColor) {
                         if (sdkColor.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
@@ -205,6 +217,7 @@ define([
                         }
                     }
                 }
+                _borderColor = color;
 
                 paletteBorderColor && paletteBorderColor.select(color);
                 $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)))
@@ -292,33 +305,25 @@ define([
                     $target = $(e.currentTarget),
                     value = $target.val(),
                     shape = new Asc.asc_CShapeProperty(),
-                    stroke = new Asc.asc_CStroke(),
-                    currentColor = Common.Utils.ThemeColor.getRgbColor('000000');
+                    stroke = new Asc.asc_CStroke();
 
                 value = borderSizeTransform.sizeByIndex(parseInt(value));
 
-                var currentStroke = _shapeObject.get_stroke();
-
-                if (currentStroke) {
-                    var currentStrokeType = currentStroke.get_type();
-
-                    if (currentStrokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
-                        currentColor = currentStroke.get_color();
-                    }
-                }
-
                 if (value < 0.01) {
                     stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE);
                 } else {
                     stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR);
-                    stroke.put_color(currentColor);
-                    stroke.asc_putPrstDash(currentStroke.asc_getPrstDash());
+                    if (_borderColor == 'transparent')
+                        stroke.put_color(Common.Utils.ThemeColor.getRgbColor({color: '000000', effectId: 29}));
+                    else
+                        stroke.put_color(Common.Utils.ThemeColor.getRgbColor(Common.Utils.ThemeColor.colorValue2EffectId(_borderColor)));
                     stroke.put_width(value * 25.4 / 72.0);
                 }
 
                 shape.put_stroke(stroke);
 
                 me.api.ShapeApply(shape);
+                me._initBorderColorView(); // when select STROKE_NONE or change from STROKE_NONE to STROKE_COLOR
             },
 
             onBorderSizeChanging: function (e) {
@@ -352,8 +357,9 @@ define([
                 var me = this;
 
                 $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)));
+                _borderColor = color;
 
-                if (me.api && _shapeObject) {
+                if (me.api && _shapeObject && _shapeObject.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
                     var shape = new Asc.asc_CShapeProperty(),
                         stroke = new Asc.asc_CStroke();
 

apps/presentationeditor/mobile/app/controller/edit/EditContainer.js

@@ -261,9 +261,18 @@ define([
                                 $layoutPages.prop('outerHTML') +
                             '</div>' +
                         '</div>'
-                    )).on('close', function (e) {
+                    )).on('opened', function () {
+                        if (_.isFunction(me.api.asc_OnShowContextMenu)) {
+                            me.api.asc_OnShowContextMenu()
+                        }
+                    }).on('close', function (e) {
                         mainView.showNavbar();
+                    }).on('closed', function () {
+                        if (_.isFunction(me.api.asc_OnHideContextMenu)) {
+                            me.api.asc_OnHideContextMenu()
+                        }
                     });
+
                     mainView.hideNavbar();
                 } else {
                     me.picker = uiApp.popover(
@@ -289,9 +298,17 @@ define([
                                 $overlay.addClass('modal-overlay-visible')
                             }
                         });
+
+                        if (_.isFunction(me.api.asc_OnShowContextMenu)) {
+                            me.api.asc_OnShowContextMenu()
+                        }
                     }).on('close', function () {
                         $overlay.off('removeClass');
                         $overlay.removeClass('modal-overlay-visible')
+                    }).on('closed', function () {
+                        if (_.isFunction(me.api.asc_OnHideContextMenu)) {
+                            me.api.asc_OnHideContextMenu()
+                        }
                     });
                 }
 

apps/presentationeditor/mobile/app/controller/edit/EditLink.js

@@ -65,8 +65,7 @@ define([
             _linkType = c_oHyperlinkType.WebLink,
             _slideLink = 0,
             _slideNum = 0,
-            _slidesCount = 0,
-            _isDisplayChanged = false;
+            _slidesCount = 0;
 
         return {
             models: [],
@@ -213,9 +212,6 @@ define([
                 $('#page-editlink-type li').single('click',  _.buffered(me.onLinkType, 100, me));
                 $('#page-editlink-slidenumber li').single('click', _.buffered(me.onSlideLink, 100, me));
                 $('#editlink-slide-number .button').single('click',_.buffered(me.onSlideNumber, 100, me));
-                $('#edit-link-display input[type="text"]').single('input', _.bind(function(e) {
-                    _isDisplayChanged = true;
-                }, this));
                 me.initSettings(pageId);
             },
 
@@ -275,7 +271,7 @@ define([
                     def_display = slidetip;
                 }
 
-                if (!$('#edit-link-display').hasClass('disabled') && (_isDisplayChanged || _.isEmpty(display))) {
+                if (!$('#edit-link-display').hasClass('disabled')) {
                     props.put_Text(_.isEmpty(display) ? def_display : display);
                 } else
                     props.put_Text(null);

apps/presentationeditor/mobile/app/controller/edit/EditShape.js

@@ -53,7 +53,8 @@ define([
         // Private
         var _stack = [],
             _shapeObject = undefined,
-            _metricText = Common.Utils.Metric.getCurrentMetricName();
+            _metricText = Common.Utils.Metric.getCurrentMetricName(),
+            _borderColor = 'transparent';
 
         var borderSizeTransform = (function() {
             var _sizes = [0, 0.5, 1, 1.5, 2.25, 3, 4.5, 6];
@@ -65,14 +66,19 @@ define([
                     return _sizes[index];
                 },
 
-                sizeByValue: function (value) {
+                indexSizeByValue: function (value) {
                     var index = 0;
                     _.each(_sizes, function (size, idx) {
                         if (Math.abs(size - value) < 0.25) {
                             index = idx;
                         }
                     });
-                    return _sizes[index];
+
+                    return index
+                },
+
+                sizeByValue: function (value) {
+                    return _sizes[this.indexSizeByValue(value)];
                 }
             }
         })();
@@ -146,12 +152,13 @@ define([
                     paletteBorderColor = me.getView('EditShape').paletteBorderColor;
 
                 // Init style border size
-                var borderSize = _shapeObject.get_stroke().get_width() * 72.0 / 25.4;
-                $('#edit-shape-bordersize input').val([borderSizeTransform.sizeByIndex(borderSize)]);
-                $('#edit-shape-bordersize .item-after').text(borderSizeTransform.sizeByValue(borderSize) + ' ' + _metricText);
+                var borderSize = _shapeObject.get_stroke().get_width() * 72.0 / 25.4,
+                    borderType = _shapeObject.get_stroke().get_type();
+                $('#edit-shape-bordersize input').val([(borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.indexSizeByValue(borderSize)]);
+                $('#edit-shape-bordersize .item-after').text(((borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.sizeByValue(borderSize)) + ' ' + _metricText);
 
                 // Init style opacity
-                $('#edit-shape-effect input').val([_shapeObject.get_fill().transparent ? _shapeObject.get_fill().transparent / 2.55 : 100]);
+                $('#edit-shape-effect input').val([_shapeObject.get_fill().asc_getTransparent() ? _shapeObject.get_fill().asc_getTransparent() / 2.55 : 100]);
                 $('#edit-shape-effect .item-after').text($('#edit-shape-effect input').val() + ' ' + "%");
 
                 paletteFillColor && paletteFillColor.on('select',       _.bind(me.onFillColor, me));
@@ -181,13 +188,18 @@ define([
                 paletteFillColor && paletteFillColor.select(color);
 
                 // Init border color
-                var stroke = _shapeObject.get_stroke(),
-                    strokeType = stroke.get_type();
+                me._initBorderColorView();
+            },
 
-                color = 'transparent';
+            _initBorderColorView: function () {
+                var me = this,
+                    paletteBorderColor = me.getView('EditShape').paletteBorderColor,
+                    stroke = _shapeObject.get_stroke();
 
-                if (stroke && strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
-                    sdkColor = stroke.get_color();
+                var color = 'transparent';
+
+                if (stroke && stroke.get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
+                    var sdkColor = stroke.get_color();
 
                     if (sdkColor) {
                         if (sdkColor.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
@@ -198,6 +210,7 @@ define([
                         }
                     }
                 }
+                _borderColor = color;
 
                 paletteBorderColor && paletteBorderColor.select(color);
                 $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)))
@@ -266,33 +279,25 @@ define([
                     $target = $(e.currentTarget),
                     value = $target.val(),
                     shape = new Asc.asc_CShapeProperty(),
-                    stroke = new Asc.asc_CStroke(),
-                    currentColor = Common.Utils.ThemeColor.getRgbColor('000000');
+                    stroke = new Asc.asc_CStroke();
 
                 value = borderSizeTransform.sizeByIndex(parseInt(value));
 
-                var currentStroke = _shapeObject.get_stroke();
-
-                if (currentStroke) {
-                    var currentStrokeType = currentStroke.get_type();
-
-                    if (currentStrokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
-                        currentColor = currentStroke.get_color();
-                    }
-                }
-
                 if (value < 0.01) {
                     stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE);
                 } else {
                     stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR);
-                    stroke.put_color(currentColor);
-                    stroke.asc_putPrstDash(currentStroke.asc_getPrstDash());
+                    if (_borderColor == 'transparent')
+                        stroke.put_color(Common.Utils.ThemeColor.getRgbColor({color: '000000', effectId: 29}));
+                    else
+                        stroke.put_color(Common.Utils.ThemeColor.getRgbColor(Common.Utils.ThemeColor.colorValue2EffectId(_borderColor)));
                     stroke.put_width(value * 25.4 / 72.0);
                 }
 
                 shape.put_stroke(stroke);
 
                 me.api.ShapeApply(shape);
+                me._initBorderColorView(); // when select STROKE_NONE or change from STROKE_NONE to STROKE_COLOR
             },
 
             onBorderSizeChanging: function (e) {
@@ -344,8 +349,9 @@ define([
                 var me = this;
 
                 $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)));
+                _borderColor = color;
 
-                if (me.api && _shapeObject) {
+                if (me.api && _shapeObject && _shapeObject.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
                     var shape = new Asc.asc_CShapeProperty(),
                         stroke = new Asc.asc_CStroke();
 

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

@@ -69,14 +69,19 @@ define([
                     return _sizes[index];
                 },
 
-                sizeByValue: function (value) {
+                indexSizeByValue: function (value) {
                     var index = 0;
                     _.each(_sizes, function (size, idx) {
                         if (Math.abs(size - value) < 0.25) {
                             index = idx;
                         }
                     });
-                    return _sizes[index];
+
+                    return index;
+                },
+
+                sizeByValue: function (value) {
+                    return _sizes[this.indexSizeByValue(value)];
                 }
             }
         })();
@@ -182,7 +187,7 @@ define([
             },
 
             _initTableOptionsView: function() {
-                var margins = _tableObject.get_DefaultMargins();
+                var margins = _tableObject.get_CellMargins();
                 if (margins) {
                     var distance = Common.Utils.Metric.fnRecalcFromMM(margins.get_Left());
                     $('#table-options-margins input').val(distance);
@@ -262,7 +267,7 @@ define([
                 //     });
                 // }
 
-                $('#edit-table-bordersize input').val([borderSizeTransform.sizeByIndex(_cellBorderWidth)]);
+                $('#edit-table-bordersize input').val([borderSizeTransform.indexSizeByValue(_cellBorderWidth)]);
                 $('#edit-table-bordersize .item-after').text(borderSizeTransform.sizeByValue(_cellBorderWidth) + ' ' + _metricText);
 
                 var borderPalette = me.getView('EditTable').paletteBorderColor;
@@ -342,7 +347,7 @@ define([
                     $target = $(e.currentTarget),
                     value = $target.val(),
                     properties = new Asc.CTableProp(),
-                    margins = new Asc.asc_CPaddings();
+                    margins = new Asc.CMargins();
 
                 $('#table-options-margins .item-after').text(value + ' ' + _metricText);
 
@@ -352,8 +357,9 @@ define([
                 margins.put_Right(value);
                 margins.put_Bottom(value);
                 margins.put_Left(value);
+                margins.put_Flag(2);
 
-                properties.put_DefaultMargins(margins);
+                properties.put_CellMargins(margins);
 
                 me.api.tblApply(properties);
             },

apps/presentationeditor/mobile/app/template/AddImage.template

@@ -40,12 +40,13 @@
     </div>
     <div class="page" id="addimage-url">
         <div class="page-content">
-            <div class="content-block-title"><%= scope.textAddress %></div>
+            <% if (!android) { %><div class="content-block-title"><%= scope.textAddress %></div><% } %>
             <div class="list-block">
                 <ul>
                     <li>
                         <div id="addimage-link-url" class="item-content">
                             <div class="item-inner">
+                                <% if (android) { %><div class="item-title label"><%= scope.textAddress %></div><% } %>
                                 <div class="item-input">
                                     <input type="url" placeholder="<%= scope.textImageURL %>">
                                 </div>

apps/presentationeditor/mobile/app/template/EditImage.template

@@ -42,7 +42,7 @@
             </li>
             <li>
                 <% if (android) { %>
-                <a id="image-default" class="button button-raised button-fill" style="margin: 20px 16px; background-color: #f44336;"><%= scope.textRemove %></a>
+                <a id="image-remove" class="button button-raised button-fill" style="margin: 20px 16px; background-color: #f44336;"><%= scope.textRemove %></a>
                 <% } else { %>
                 <a id="image-remove" class="item-link list-button" style="text-align: center; color: #f00"><%= scope.textRemove %></a>
                 <% } %>

apps/presentationeditor/mobile/app/template/Search.template

@@ -6,7 +6,7 @@
             <div class="center">
                 <form class="searchbar search">
                     <div class="searchbar-input search">
-                        <input type="search" placeholder="Search"><a href="#" class="searchbar-clear"></a>
+                        <input type="search" placeholder="<%= scope.textSearch %>"><a href="#" class="searchbar-clear"></a>
                     </div>
                 </form>
             </div>

apps/presentationeditor/mobile/app/view/Search.js

@@ -131,7 +131,9 @@ define([
                         uiApp.hideNavbar(searchBar);
                     }, 10);
                 }
-            }
+            },
+
+            textSearch: 'Search'
         }
     })(), PE.Views.Search || {}))
 });

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

@@ -86,10 +86,13 @@ define([
 
             // Render layout
             render: function () {
+                var shapes = Common.SharedSettings.get('shapes').slice();
+                shapes.splice(0, 1); // Remove line shapes
+
                 this.layout = $('<div/>').append(this.template({
                     android : Common.SharedSettings.get('android'),
                     phone   : Common.SharedSettings.get('phone'),
-                    shapes  : Common.SharedSettings.get('shapes'),
+                    shapes  : shapes,
                     scope   : this
                 }));
 

apps/presentationeditor/mobile/locale/de.json

@@ -0,0 +1,431 @@
+{
+  "Common.UI.ThemeColorPalette.textStandartColors": "Standardfarben",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Designfarben",
+  "Common.Utils.Metric.txtCm": "cm",
+  "Common.Utils.Metric.txtPt": "pt",
+  "PE.Controllers.AddContainer.textImage": "Bild",
+  "PE.Controllers.AddContainer.textLink": "Link",
+  "PE.Controllers.AddContainer.textShape": "Form",
+  "PE.Controllers.AddContainer.textSlide": "Folie",
+  "PE.Controllers.AddContainer.textTable": "Tabelle",
+  "PE.Controllers.AddImage.textEmptyImgUrl": "Sie müssen eine Bild-URL angeben.",
+  "PE.Controllers.AddImage.txtNotUrl": "Dieser Bereich soll ein URL in der Format \"http://www.example.com\" sein.",
+  "PE.Controllers.AddLink.textDefault": "Ausgewählter Text",
+  "PE.Controllers.AddLink.textExternalLink": "Externer Link",
+  "PE.Controllers.AddLink.textFirst": "Erste Folie",
+  "PE.Controllers.AddLink.textInternalLink": "Folie in dieser Präsentation",
+  "PE.Controllers.AddLink.textLast": "Letzte Folie",
+  "PE.Controllers.AddLink.textNext": "Nächste Folie",
+  "PE.Controllers.AddLink.textPrev": "Vorherige Folie",
+  "PE.Controllers.AddLink.textSlide": "Folie",
+  "PE.Controllers.AddLink.txtNotUrl": "Dieser Bereich soll ein URL in der Format \"http://www.example.com\" sein.",
+  "PE.Controllers.AddTable.textCancel": "Abbrechen",
+  "PE.Controllers.AddTable.textColumns": "Spalten",
+  "PE.Controllers.AddTable.textRows": "Zeilen",
+  "PE.Controllers.AddTable.textTableSize": "Tabellengröße",
+  "PE.Controllers.DocumentHolder.menuAddLink": "Link hinzufügen",
+  "PE.Controllers.DocumentHolder.menuCopy": "Kopieren",
+  "PE.Controllers.DocumentHolder.menuCut": "Ausschneiden",
+  "PE.Controllers.DocumentHolder.menuDelete": "Löschen",
+  "PE.Controllers.DocumentHolder.menuEdit": "Bearbeiten",
+  "PE.Controllers.DocumentHolder.menuOpenLink": "Link öffnen",
+  "PE.Controllers.DocumentHolder.menuPaste": "Einfügen",
+  "PE.Controllers.DocumentHolder.menuMore": "More",
+  "PE.Controllers.DocumentHolder.sheetCancel": "Abbrechen",
+  "PE.Controllers.EditContainer.textChart": "Diagramm",
+  "PE.Controllers.EditContainer.textHyperlink": "Hyperlink",
+  "PE.Controllers.EditContainer.textImage": "Bild",
+  "PE.Controllers.EditContainer.textSettings": "Einstellungen",
+  "PE.Controllers.EditContainer.textShape": "Form",
+  "PE.Controllers.EditContainer.textSlide": "Folie",
+  "PE.Controllers.EditContainer.textTable": "Tabelle",
+  "PE.Controllers.EditContainer.textText": "Text",
+  "PE.Controllers.EditImage.textEmptyImgUrl": "Sie müssen eine Bild-URL angeben.",
+  "PE.Controllers.EditImage.txtNotUrl": "Dieser Bereich soll ein URL in der Format \"http://www.example.com\" sein.",
+  "PE.Controllers.EditLink.textDefault": "Ausgewählter Text",
+  "PE.Controllers.EditLink.textExternalLink": "Externer Link",
+  "PE.Controllers.EditLink.textFirst": "Erste Folie",
+  "PE.Controllers.EditLink.textInternalLink": "Folie in dieser Präsentation",
+  "PE.Controllers.EditLink.textLast": "Letzte Folie",
+  "PE.Controllers.EditLink.textNext": "Nächste Folie",
+  "PE.Controllers.EditLink.textPrev": "Vorherige Folie",
+  "PE.Controllers.EditLink.textSlide": "Folie",
+  "PE.Controllers.EditLink.txtNotUrl": "Dieser Bereich soll ein URL in der Format \"http://www.example.com\" sein.",
+  "PE.Controllers.EditSlide.textSec": "s",
+  "PE.Controllers.EditText.textAuto": "Automatisch",
+  "PE.Controllers.EditText.textFonts": "Schriftarten",
+  "PE.Controllers.EditText.textPt": "pt",
+  "PE.Controllers.Main.advDRMEnterPassword": "Kennwort eingeben",
+  "PE.Controllers.Main.advDRMOptions": "Geschützte Datei",
+  "PE.Controllers.Main.advDRMPassword": "Kennwort",
+  "PE.Controllers.Main.applyChangesTextText": "Daten werden geladen...",
+  "PE.Controllers.Main.applyChangesTitleText": "Daten werden geladen",
+  "PE.Controllers.Main.convertationTimeoutText": "Timeout für die Konvertierung wurde überschritten.",
+  "PE.Controllers.Main.criticalErrorExtText": "Drücken Sie \"OK\", um zur Dokumentenliste zurückzukehren.",
+  "PE.Controllers.Main.criticalErrorTitle": "Fehler",
+  "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor",
+  "PE.Controllers.Main.downloadErrorText": "Herinterladen ist fehlgeschlagen.",
+  "PE.Controllers.Main.downloadTextText": "Dokument wird heruntergeladen...",
+  "PE.Controllers.Main.downloadTitleText": "Herunterladen des Dokuments",
+  "PE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Sie können nicht mehr editieren.",
+  "PE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen, oder kontaktieren Sie Ihren Administrator.<br>Wann Sie auf den Button \"OK\" klicken, werden Sie aufgefordert, das Dokument herunterzuladen.<br><br>Mehr Information zur Verbindung des Dokument Servers finden Sie <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
+  "PE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.",
+  "PE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",
+  "PE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1",
+  "PE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt.",
+  "PE.Controllers.Main.errorKeyEncrypt": "Unbekannter Schlüsseldeskriptor",
+  "PE.Controllers.Main.errorKeyExpire": "Der Schlüsseldeskriptor ist abgelaufen",
+  "PE.Controllers.Main.errorProcessSaveResult": "Fehler beim Speichern von Daten.",
+  "PE.Controllers.Main.errorServerVersion": "Editor-Version wurde aktualisiert. Die Seite wird neu geladen, um die Änderungen zu übernehmen.",
+  "PE.Controllers.Main.errorStockChart": "Falsche Reihenfolge der Zeilen. Um ein Kursdiagramm zu erstellen, ordnen Sie die Daten auf dem Blatt folgendermaßen an:<br> Eröffnungspreis, Höchstpreis, Tiefstpreis, Schlusskurs.",
+  "PE.Controllers.Main.errorUpdateVersion": "Die Dateiversion wurde geändert. Die Seite wird neu geladen.",
+  "PE.Controllers.Main.errorUserDrop": "Kein Zugriff auf diese Datei ist möglich.",
+  "PE.Controllers.Main.errorUsersExceed": "Die Anzahl der Benutzer ist überschritten ",
+  "PE.Controllers.Main.errorViewerDisconnect": "Die Verbindung ist verloren. Man kann das Dokument anschauen.<br>Es ist aber momentan nicht möglich, ihn herunterzuladen oder auszudrücken bis die Verbindung wiederhergestellt wird.",
+  "PE.Controllers.Main.leavePageText": "Dieses Dokument enthält ungespeicherte Änderungen. Klicken Sie \"Auf dieser Seite bleiben\", um auf automatisches Speichern des Dokumentes zu warten. Klicken Sie \"Diese Seite verlassen\", um alle nicht gespeicherten Änderungen zu verwerfen.",
+  "PE.Controllers.Main.loadFontsTextText": "Daten werden geladen...",
+  "PE.Controllers.Main.loadFontsTitleText": "Daten werden geladen",
+  "PE.Controllers.Main.loadFontTextText": "Daten werden geladen...",
+  "PE.Controllers.Main.loadFontTitleText": "Daten werden geladen",
+  "PE.Controllers.Main.loadImagesTextText": "Bilder werden geladen...",
+  "PE.Controllers.Main.loadImagesTitleText": "Bilder werden geladen",
+  "PE.Controllers.Main.loadImageTextText": "Bild wird geladen...",
+  "PE.Controllers.Main.loadImageTitleText": "Bild wird geladen",
+  "PE.Controllers.Main.loadingDocumentTextText": "Präsentation wird geladen...\t",
+  "PE.Controllers.Main.loadingDocumentTitleText": "Präsentation wird geladen ",
+  "PE.Controllers.Main.loadThemeTextText": "Design wird geladen...",
+  "PE.Controllers.Main.loadThemeTitleText": "Laden des Designs",
+  "PE.Controllers.Main.notcriticalErrorTitle": "Achtung",
+  "PE.Controllers.Main.openErrorText": "Beim Öffnen dieser Datei ist ein Fehler aufgetreten",
+  "PE.Controllers.Main.openTextText": "Dokument wird geöffnet...",
+  "PE.Controllers.Main.openTitleText": "Das Dokument wird geöffnet",
+  "PE.Controllers.Main.printTextText": "Dokument wird ausgedruckt...",
+  "PE.Controllers.Main.printTitleText": "Drucken des Dokuments",
+  "PE.Controllers.Main.reloadButtonText": "Seite neu laden",
+  "PE.Controllers.Main.requestEditFailedMessageText": "Das Dokument wurde gerade von einem anderen Benutzer bearbeitet. Bitte versuchen Sie es später erneut.",
+  "PE.Controllers.Main.requestEditFailedTitleText": "Zugriff verweigert",
+  "PE.Controllers.Main.saveErrorText": "Beim Speichern dieser Datei ist ein Fehler aufgetreten",
+  "PE.Controllers.Main.savePreparingText": "Speichervorbereitung",
+  "PE.Controllers.Main.savePreparingTitle": "Speichervorbereitung. Bitte warten...",
+  "PE.Controllers.Main.saveTextText": "Dokument wird gespeichert...",
+  "PE.Controllers.Main.saveTitleText": "Dokument wird gespeichert...",
+  "PE.Controllers.Main.splitDividerErrorText": "Die Anzahl der Zeilen muss einen Divisor von %1 sein. ",
+  "PE.Controllers.Main.splitMaxColsErrorText": "Spaltenanzahl muss weniger als %1 sein",
+  "PE.Controllers.Main.splitMaxRowsErrorText": "Die Anzahl der Zeilen muss weniger als %1 sein",
+  "PE.Controllers.Main.textAnonymous": "Anonym",
+  "PE.Controllers.Main.textBack": "Zurück",
+  "PE.Controllers.Main.textBuyNow": "Webseite besuchen",
+  "PE.Controllers.Main.textCancel": "Abbrechen",
+  "PE.Controllers.Main.textClose": "Schließen",
+  "PE.Controllers.Main.textCloseTip": "Um den Tipp zu schließen, tippen Sie darauf.",
+  "PE.Controllers.Main.textContactUs": "Verkaufsteam kontaktieren",
+  "PE.Controllers.Main.textDone": "Fertig",
+  "PE.Controllers.Main.textLoadingDocument": "Präsentation wird geladen ",
+  "PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE Open Source Version",
+  "PE.Controllers.Main.textOK": "OK",
+  "PE.Controllers.Main.textPassword": "Kennwort",
+  "PE.Controllers.Main.textPreloader": "Ladevorgang...",
+  "PE.Controllers.Main.textShape": "Form",
+  "PE.Controllers.Main.textTryUndoRedo": "Undo/Redo Optionen sind für den halbformalen Zusammenbearbeitungsmodus deaktiviert.",
+  "PE.Controllers.Main.textUsername": "Benutzername",
+  "PE.Controllers.Main.titleLicenseExp": "Lizenz ist abgelaufen",
+  "PE.Controllers.Main.titleServerVersion": "Editor wurde aktualisiert",
+  "PE.Controllers.Main.txtArt": "Hier den Text eingeben",
+  "PE.Controllers.Main.txtBasicShapes": "Standardformen",
+  "PE.Controllers.Main.txtButtons": "Buttons",
+  "PE.Controllers.Main.txtCallouts": "Legenden",
+  "PE.Controllers.Main.txtCharts": "Diagramme",
+  "PE.Controllers.Main.txtDiagramTitle": "Diagrammtitel",
+  "PE.Controllers.Main.txtEditingMode": "Bearbeitungsmodus einschalten...",
+  "PE.Controllers.Main.txtFiguredArrows": "Geformte Pfeile",
+  "PE.Controllers.Main.txtLines": "Linien",
+  "PE.Controllers.Main.txtMath": "Mathematik",
+  "PE.Controllers.Main.txtNeedSynchronize": "Änderungen wurden vorgenommen",
+  "PE.Controllers.Main.txtRectangles": "Rechtecke",
+  "PE.Controllers.Main.txtSeries": "Reihen",
+  "PE.Controllers.Main.txtSldLtTBlank": "Leer",
+  "PE.Controllers.Main.txtSldLtTChart": "Diagramm",
+  "PE.Controllers.Main.txtSldLtTChartAndTx": "Diagramm und Text",
+  "PE.Controllers.Main.txtSldLtTClipArtAndTx": "ClipArt und Text",
+  "PE.Controllers.Main.txtSldLtTClipArtAndVertTx": "ClipArt und vertikaler Text",
+  "PE.Controllers.Main.txtSldLtTCust": "Benutzerdefiniert",
+  "PE.Controllers.Main.txtSldLtTDgm": "Schema",
+  "PE.Controllers.Main.txtSldLtTFourObj": "Vier Objekte",
+  "PE.Controllers.Main.txtSldLtTMediaAndTx": "Medien und Text",
+  "PE.Controllers.Main.txtSldLtTObj": "Titel und Objekt",
+  "PE.Controllers.Main.txtSldLtTObjAndTwoObj": "Objekt und zwei Objekte",
+  "PE.Controllers.Main.txtSldLtTObjAndTx": "Objekt und Text",
+  "PE.Controllers.Main.txtSldLtTObjOnly": "Objekt",
+  "PE.Controllers.Main.txtSldLtTObjOverTx": "Objekt über Text",
+  "PE.Controllers.Main.txtSldLtTObjTx": "Titel, Objekt und Beschriftung",
+  "PE.Controllers.Main.txtSldLtTPicTx": "Bild und Überschrift",
+  "PE.Controllers.Main.txtSldLtTSecHead": "Überschrift des Abschnitts",
+  "PE.Controllers.Main.txtSldLtTTbl": "Tabelle",
+  "PE.Controllers.Main.txtSldLtTTitle": "Titel\t",
+  "PE.Controllers.Main.txtSldLtTTitleOnly": "Nur Titel",
+  "PE.Controllers.Main.txtSldLtTTwoColTx": "Zweispaltiger Text",
+  "PE.Controllers.Main.txtSldLtTTwoObj": "Zwei Objekte",
+  "PE.Controllers.Main.txtSldLtTTwoObjAndObj": "Zwei Objekte und Objekt",
+  "PE.Controllers.Main.txtSldLtTTwoObjAndTx": "Zwei Objekte und Text",
+  "PE.Controllers.Main.txtSldLtTTwoObjOverTx": "Zwei Objekte über Text",
+  "PE.Controllers.Main.txtSldLtTTwoTxTwoObj": "Zwei Texte und zwei Objekte",
+  "PE.Controllers.Main.txtSldLtTTx": "Text",
+  "PE.Controllers.Main.txtSldLtTTxAndChart": "Text und Diagramm",
+  "PE.Controllers.Main.txtSldLtTTxAndClipArt": "Text und ClipArt",
+  "PE.Controllers.Main.txtSldLtTTxAndMedia": "Text und Medien",
+  "PE.Controllers.Main.txtSldLtTTxAndObj": "Text und Objekt",
+  "PE.Controllers.Main.txtSldLtTTxAndTwoObj": "Text und zwei Objekte",
+  "PE.Controllers.Main.txtSldLtTTxOverObj": "Text über Objekt",
+  "PE.Controllers.Main.txtSldLtTVertTitleAndTx": "Vertikaler Titel und Text",
+  "PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "Vertikaler Titel und Text über Diagramm",
+  "PE.Controllers.Main.txtSldLtTVertTx": "Vertikaler Text",
+  "PE.Controllers.Main.txtStarsRibbons": "Sterne & Bänder",
+  "PE.Controllers.Main.txtXAxis": "x-Achse",
+  "PE.Controllers.Main.txtYAxis": "y-Achse",
+  "PE.Controllers.Main.unknownErrorText": "Unbekannter Fehler.",
+  "PE.Controllers.Main.unsupportedBrowserErrorText ": "Ihr Webbrowser wird nicht unterstützt.",
+  "PE.Controllers.Main.uploadImageExtMessage": "Unbekanntes Bildformat.",
+  "PE.Controllers.Main.uploadImageFileCountMessage": "Keine Bilder sind hochgeladen.",
+  "PE.Controllers.Main.uploadImageSizeMessage": "Die maximal zulässige Bildgröße ist überschritten.",
+  "PE.Controllers.Main.uploadImageTextText": "Bild wird hochgeladen...",
+  "PE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen",
+  "PE.Controllers.Main.warnLicenseExp": "Ihre Lizenz ist abgelaufen.<br>Bitte aktualisieren Sie Ihre Lizenz und laden Sie die Seite neu.",
+  "PE.Controllers.Main.warnNoLicense": "Sie nutzen die Open Source Version von ONLYOFFICE. Die Version hat gewisse Einschränkungen für gleichzeitige Verbindungen zu Dokumentenserver (20 Verbindungen in einer Zeit).<br>Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.",
+  "PE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.",
+  "PE.Controllers.Search.textNoTextFound": "Der Text wurde nicht gefunden.",
+  "PE.Controllers.Settings.notcriticalErrorTitle": "Achtung",
+  "PE.Controllers.Settings.txtLoading": "Ladevorgang...",
+  "PE.Controllers.Toolbar.dlgLeaveMsgText": "Dieses Dokument enthält ungespeicherte Änderungen. Klicken Sie \"Auf dieser Seite bleiben\", um auf automatisches Speichern des Dokumentes zu warten. Klicken Sie \"Diese Seite verlassen\", um alle nicht gespeicherten Änderungen zu verwerfen.",
+  "PE.Controllers.Toolbar.dlgLeaveTitleText": "Sie verlassen die Anwendung",
+  "PE.Controllers.Toolbar.leaveButtonText": "Seite verlassen",
+  "PE.Controllers.Toolbar.stayButtonText": "Auf dieser Seite bleiben",
+  "PE.Views.AddImage.textAddress": "Adresse",
+  "PE.Views.AddImage.textBack": "Zurück",
+  "PE.Views.AddImage.textFromLibrary": "Bild aus der Bibliothek",
+  "PE.Views.AddImage.textFromURL": "Bild aus URL",
+  "PE.Views.AddImage.textImageURL": "Bild-URL",
+  "PE.Views.AddImage.textInsertImage": "Bild einfügen",
+  "PE.Views.AddImage.textLinkSettings": "Verknüpfungseinstellungen",
+  "PE.Views.AddLink.textBack": "Zurück",
+  "PE.Views.AddLink.textDisplay": "Anzeigen",
+  "PE.Views.AddLink.textExternalLink": "Externer Link",
+  "PE.Views.AddLink.textFirst": "Erste Folie",
+  "PE.Views.AddLink.textInsert": "Einfügen",
+  "PE.Views.AddLink.textInternalLink": "Folie in dieser Präsentation",
+  "PE.Views.AddLink.textLast": "Letzte Folie",
+  "PE.Views.AddLink.textLink": "Link",
+  "PE.Views.AddLink.textLinkSlide": "Verknüpfen mit",
+  "PE.Views.AddLink.textLinkType": "Hyperlinktyp",
+  "PE.Views.AddLink.textNext": "Nächste Folie",
+  "PE.Views.AddLink.textNumber": "Foliennummer",
+  "PE.Views.AddLink.textPrev": "Vorherige Folie",
+  "PE.Views.AddLink.textTip": "Info-Tipp",
+  "PE.Views.EditChart.textAlign": "Ausrichtung",
+  "PE.Views.EditChart.textAlignBottom": "Unten ausrichten",
+  "PE.Views.EditChart.textAlignCenter": "Zentriert ausrichten",
+  "PE.Views.EditChart.textAlignLeft": "Links ausrichten",
+  "PE.Views.EditChart.textAlignMiddle": "Mittig ausrichten",
+  "PE.Views.EditChart.textAlignRight": "Rechts ausrichten",
+  "PE.Views.EditChart.textAlignTop": "Oben ausrichten",
+  "PE.Views.EditChart.textBack": "Zurück",
+  "PE.Views.EditChart.textBackward": "Rückwärts navigieren",
+  "PE.Views.EditChart.textBorder": "Rahmen",
+  "PE.Views.EditChart.textColor": "Farbe",
+  "PE.Views.EditChart.textFill": "Füllung",
+  "PE.Views.EditChart.textForward": "Vorwärts navigieren",
+  "PE.Views.EditChart.textRemoveChart": "Diagramm entfernen",
+  "PE.Views.EditChart.textReorder": "Neu ordnen",
+  "PE.Views.EditChart.textSize": "Größe",
+  "PE.Views.EditChart.textStyle": "Stil",
+  "PE.Views.EditChart.textToBackground": "In den Hintergrund",
+  "PE.Views.EditChart.textToForeground": "In den Vordergrund ",
+  "PE.Views.EditChart.textType": "Typ",
+  "PE.Views.EditChart.txtDistribHor": "Horizontal verteilen",
+  "PE.Views.EditChart.txtDistribVert": "Vertikal verteilen",
+  "PE.Views.EditImage.textAddress": "Adresse",
+  "PE.Views.EditImage.textAlign": "Ausrichtung",
+  "PE.Views.EditImage.textAlignBottom": "Unten ausrichten",
+  "PE.Views.EditImage.textAlignCenter": "Zentriert ausrichten",
+  "PE.Views.EditImage.textAlignLeft": "Links ausrichten",
+  "PE.Views.EditImage.textAlignMiddle": "Mittig ausrichten",
+  "PE.Views.EditImage.textAlignRight": "Rechts ausrichten",
+  "PE.Views.EditImage.textAlignTop": "Oben ausrichten",
+  "PE.Views.EditImage.textBack": "Zurück",
+  "PE.Views.EditImage.textBackward": "Rückwärts navigieren",
+  "PE.Views.EditImage.textDefault": "Standardgröße",
+  "PE.Views.EditImage.textForward": "Vorwärts navigieren",
+  "PE.Views.EditImage.textFromLibrary": "Bild aus der Bibliothek",
+  "PE.Views.EditImage.textFromURL": "Bild aus URL",
+  "PE.Views.EditImage.textImageURL": "Bild-URL",
+  "PE.Views.EditImage.textLinkSettings": "Verknüpfungseinstellungen",
+  "PE.Views.EditImage.textRemove": "Bild entfernen",
+  "PE.Views.EditImage.textReorder": "Neu ordnen",
+  "PE.Views.EditImage.textReplace": "Ersetzen",
+  "PE.Views.EditImage.textReplaceImg": "Bild ersetzen",
+  "PE.Views.EditImage.textToBackground": "In den Hintergrund",
+  "PE.Views.EditImage.textToForeground": "In den Vordergrund ",
+  "PE.Views.EditImage.txtDistribHor": "Horizontal verteilen",
+  "PE.Views.EditImage.txtDistribVert": "Vertikal verteilen",
+  "PE.Views.EditLink.textBack": "Zurück",
+  "PE.Views.EditLink.textDisplay": "Anzeigen",
+  "PE.Views.EditLink.textEdit": "Link bearbeiten",
+  "PE.Views.EditLink.textExternalLink": "Externer Link",
+  "PE.Views.EditLink.textFirst": "Erste Folie",
+  "PE.Views.EditLink.textInternalLink": "Folie in dieser Präsentation",
+  "PE.Views.EditLink.textLast": "Letzte Folie",
+  "PE.Views.EditLink.textLink": "Link",
+  "PE.Views.EditLink.textLinkSlide": "Verknüpfen mit",
+  "PE.Views.EditLink.textLinkType": "Hyperlinktyp",
+  "PE.Views.EditLink.textNext": "Nächste Folie",
+  "PE.Views.EditLink.textNumber": "Foliennummer",
+  "PE.Views.EditLink.textPrev": "Vorherige Folie",
+  "PE.Views.EditLink.textRemove": "Link entfernen",
+  "PE.Views.EditLink.textTip": "Info-Tipp",
+  "PE.Views.EditShape.textAlign": "Ausrichtung",
+  "PE.Views.EditShape.textAlignBottom": "Unten ausrichten",
+  "PE.Views.EditShape.textAlignCenter": "Zentriert ausrichten",
+  "PE.Views.EditShape.textAlignLeft": "Links ausrichten",
+  "PE.Views.EditShape.textAlignMiddle": "Mittig ausrichten",
+  "PE.Views.EditShape.textAlignRight": "Rechts ausrichten",
+  "PE.Views.EditShape.textAlignTop": "Oben ausrichten",
+  "PE.Views.EditShape.textBack": "Zurück",
+  "PE.Views.EditShape.textBackward": "Rückwärts navigieren",
+  "PE.Views.EditShape.textBorder": "Rahmen",
+  "PE.Views.EditShape.textColor": "Farbe",
+  "PE.Views.EditShape.textEffects": "Effekte",
+  "PE.Views.EditShape.textFill": "Füllung",
+  "PE.Views.EditShape.textForward": "Vorwärts navigieren",
+  "PE.Views.EditShape.textOpacity": "Intransparenz",
+  "PE.Views.EditShape.textRemoveShape": "AutoForm entfernen",
+  "PE.Views.EditShape.textReorder": "Neu ordnen",
+  "PE.Views.EditShape.textReplace": "Ersetzen",
+  "PE.Views.EditShape.textSize": "Größe",
+  "PE.Views.EditShape.textStyle": "Stil",
+  "PE.Views.EditShape.textToBackground": "In den Hintergrund",
+  "PE.Views.EditShape.textToForeground": "In den Vordergrund ",
+  "PE.Views.EditShape.txtDistribHor": "Horizontal verteilen",
+  "PE.Views.EditShape.txtDistribVert": "Vertikal verteilen",
+  "PE.Views.EditSlide.textApplyAll": "Auf alle Folien anwenden",
+  "PE.Views.EditSlide.textBack": "Zurück",
+  "PE.Views.EditSlide.textBlack": "Durch Schwarz",
+  "PE.Views.EditSlide.textBottom": "Unten",
+  "PE.Views.EditSlide.textBottomLeft": "Unten links",
+  "PE.Views.EditSlide.textBottomRight": "Unten rechts",
+  "PE.Views.EditSlide.textClock": "Uhr",
+  "PE.Views.EditSlide.textClockwise": "Im Uhrzeigersinn",
+  "PE.Views.EditSlide.textColor": "Farbe",
+  "PE.Views.EditSlide.textCounterclockwise": "Gegen Uhrzeigersinn",
+  "PE.Views.EditSlide.textCover": "Bedecken",
+  "PE.Views.EditSlide.textDelay": "Verzögern",
+  "PE.Views.EditSlide.textDuplicateSlide": "Folie duplizieren",
+  "PE.Views.EditSlide.textDuration": "Dauer",
+  "PE.Views.EditSlide.textEffect": "Effekt",
+  "PE.Views.EditSlide.textFade": "Einblendung",
+  "PE.Views.EditSlide.textFill": "Füllung",
+  "PE.Views.EditSlide.textHorizontalIn": "Horizontal nach innen",
+  "PE.Views.EditSlide.textHorizontalOut": "Horizontal nach außen",
+  "PE.Views.EditSlide.textLayout": "Layout",
+  "PE.Views.EditSlide.textLeft": "Links",
+  "PE.Views.EditSlide.textNone": "Kein",
+  "PE.Views.EditSlide.textOpacity": "Intransparenz",
+  "PE.Views.EditSlide.textPush": "Schieben",
+  "PE.Views.EditSlide.textRemoveSlide": "Folie löschen",
+  "PE.Views.EditSlide.textRight": "Rechts",
+  "PE.Views.EditSlide.textSmoothly": "Gleitend",
+  "PE.Views.EditSlide.textSplit": "Aufteilen",
+  "PE.Views.EditSlide.textStartOnClick": "Bei Klicken beginnen",
+  "PE.Views.EditSlide.textStyle": "Stil",
+  "PE.Views.EditSlide.textTheme": "Thema",
+  "PE.Views.EditSlide.textTop": "Oben",
+  "PE.Views.EditSlide.textTopLeft": "\tOben links",
+  "PE.Views.EditSlide.textTopRight": "Oben rechts",
+  "PE.Views.EditSlide.textTransition": "Übergang",
+  "PE.Views.EditSlide.textType": "Typ",
+  "PE.Views.EditSlide.textUnCover": "Aufdecken",
+  "PE.Views.EditSlide.textVerticalIn": "Vertikal nach innen",
+  "PE.Views.EditSlide.textVerticalOut": "Vertikal nach außen",
+  "PE.Views.EditSlide.textWedge": "Keil",
+  "PE.Views.EditSlide.textWipe": "Wischen",
+  "PE.Views.EditSlide.textZoom": "Zoom",
+  "PE.Views.EditSlide.textZoomIn": "Vergrößern",
+  "PE.Views.EditSlide.textZoomOut": "Verkleinern",
+  "PE.Views.EditSlide.textZoomRotate": "Zoom und Drehung",
+  "PE.Views.EditTable.textAlign": "Ausrichtung",
+  "PE.Views.EditTable.textAlignBottom": "Unten ausrichten",
+  "PE.Views.EditTable.textAlignCenter": "Zentriert ausrichten",
+  "PE.Views.EditTable.textAlignLeft": "Links ausrichten",
+  "PE.Views.EditTable.textAlignMiddle": "Mittig ausrichten",
+  "PE.Views.EditTable.textAlignRight": "Rechts ausrichten",
+  "PE.Views.EditTable.textAlignTop": "Oben ausrichten",
+  "PE.Views.EditTable.textBack": "Zurück",
+  "PE.Views.EditTable.textBackward": "Rückwärts navigieren",
+  "PE.Views.EditTable.textBandedColumn": "Gebänderte Spalten",
+  "PE.Views.EditTable.textBandedRow": "Gebänderte Zeilen",
+  "PE.Views.EditTable.textBorder": "Rahmen",
+  "PE.Views.EditTable.textCellMargins": "Zellenränder",
+  "PE.Views.EditTable.textColor": "Farbe",
+  "PE.Views.EditTable.textFill": "Füllung",
+  "PE.Views.EditTable.textFirstColumn": "Erste Spalte",
+  "PE.Views.EditTable.textForward": "Vorwärts navigieren",
+  "PE.Views.EditTable.textHeaderRow": "Kopfzeile",
+  "PE.Views.EditTable.textLastColumn": "Letzte Spalte",
+  "PE.Views.EditTable.textOptions": "Optionen",
+  "PE.Views.EditTable.textRemoveTable": "Tabelle entfernen",
+  "PE.Views.EditTable.textReorder": "Neu ordnen",
+  "PE.Views.EditTable.textSize": "Größe",
+  "PE.Views.EditTable.textStyle": "Stil",
+  "PE.Views.EditTable.textStyleOptions": "Formatoptionen",
+  "PE.Views.EditTable.textTableOptions": "Tabellenoptionen",
+  "PE.Views.EditTable.textToBackground": "In den Hintergrund",
+  "PE.Views.EditTable.textToForeground": "In den Vordergrund ",
+  "PE.Views.EditTable.textTotalRow": "Ergebniszeile",
+  "PE.Views.EditTable.txtDistribHor": "Horizontal verteilen",
+  "PE.Views.EditTable.txtDistribVert": "Vertikal verteilen",
+  "PE.Views.EditText.textAdditional": "Zusätzlich",
+  "PE.Views.EditText.textAdditionalFormat": "Zusätzliche Formatierung",
+  "PE.Views.EditText.textAfter": "Nach Absatz",
+  "PE.Views.EditText.textAllCaps": "Alle Großbuchstaben",
+  "PE.Views.EditText.textAutomatic": "Automatisch",
+  "PE.Views.EditText.textBack": "Zurück",
+  "PE.Views.EditText.textBefore": "Vor Absatz",
+  "PE.Views.EditText.textBullets": "Aufzählung",
+  "PE.Views.EditText.textDblStrikethrough": "Doppeltes Durchstreichen\t",
+  "PE.Views.EditText.textDblSuperscript": "Hochgestellt",
+  "PE.Views.EditText.textFontColor": "Schriftfarbe",
+  "PE.Views.EditText.textFontColors": "Schriftfarben",
+  "PE.Views.EditText.textFonts": "Schriftarten",
+  "PE.Views.EditText.textFromText": "Abstand vom Text",
+  "PE.Views.EditText.textLetterSpacing": "Zeichenabstand",
+  "PE.Views.EditText.textLineSpacing": "Zeilenabstand",
+  "PE.Views.EditText.textNone": "Kein",
+  "PE.Views.EditText.textNumbers": "Nummern",
+  "PE.Views.EditText.textSize": "Größe",
+  "PE.Views.EditText.textSmallCaps": "Kapitälchen",
+  "PE.Views.EditText.textStrikethrough": "Durchgestrichen",
+  "PE.Views.EditText.textSubscript": "Tiefgestellt",
+  "PE.Views.Search.textSearch": "Search",
+  "PE.Views.Settings.mniSlideStandard": "Standard (4:3)",
+  "PE.Views.Settings.mniSlideWide": "Breitbildschirm (16:9)",
+  "PE.Views.Settings.textAbout": "Über",
+  "PE.Views.Settings.textAddress": "Adresse",
+  "PE.Views.Settings.textAuthor": "Autor",
+  "PE.Views.Settings.textBack": "Zurück",
+  "PE.Views.Settings.textCreateDate": "Erstellungsdatum",
+  "PE.Views.Settings.textDone": "Fertig",
+  "PE.Views.Settings.textDownload": "Herunterladen",
+  "PE.Views.Settings.textDownloadAs": "Herunterladen als...",
+  "PE.Views.Settings.textEditPresent": "Präsentation bearbeiten",
+  "PE.Views.Settings.textEmail": "E-Email",
+  "PE.Views.Settings.textFind": "Suchen",
+  "PE.Views.Settings.textHelp": "Hilfe",
+  "PE.Views.Settings.textLoading": "Ladevorgang...",
+  "PE.Views.Settings.textPresentInfo": "Päsentation Infos",
+  "PE.Views.Settings.textPresentSetup": "Präsentation-Einstellungen",
+  "PE.Views.Settings.textPresentTitle": "Titel der Präsentation",
+  "PE.Views.Settings.textSettings": "Einstellungen",
+  "PE.Views.Settings.textSlideSize": "Foliengröße",
+  "PE.Views.Settings.textTel": "Tel.",
+  "PE.Views.Settings.textVersion": "Version",
+  "PE.Views.Settings.unknownText": "Unbekannt",
+  "PE.Views.Toolbar.textBack": "Zurück"
+}

apps/presentationeditor/mobile/locale/en.json

@@ -1,47 +1,149 @@
 {
-  "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
   "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
-
+  "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
   "Common.Utils.Metric.txtCm": "cm",
   "Common.Utils.Metric.txtPt": "pt",
-
-  "PE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
-  "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor",
+  "PE.Controllers.AddContainer.textImage": "Image",
+  "PE.Controllers.AddContainer.textLink": "Link",
+  "PE.Controllers.AddContainer.textShape": "Shape",
+  "PE.Controllers.AddContainer.textSlide": "Slide",
+  "PE.Controllers.AddContainer.textTable": "Table",
+  "PE.Controllers.AddImage.textEmptyImgUrl": "You need to specify image URL.",
+  "PE.Controllers.AddImage.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
+  "PE.Controllers.AddLink.textDefault": "Selected text",
+  "PE.Controllers.AddLink.textExternalLink": "External Link",
+  "PE.Controllers.AddLink.textFirst": "First Slide",
+  "PE.Controllers.AddLink.textInternalLink": "Slide in this Presentation",
+  "PE.Controllers.AddLink.textLast": "Last Slide",
+  "PE.Controllers.AddLink.textNext": "Next Slide",
+  "PE.Controllers.AddLink.textPrev": "Previous Slide",
+  "PE.Controllers.AddLink.textSlide": "Slide",
+  "PE.Controllers.AddLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
+  "PE.Controllers.AddTable.textCancel": "Cancel",
+  "PE.Controllers.AddTable.textColumns": "Columns",
+  "PE.Controllers.AddTable.textRows": "Rows",
+  "PE.Controllers.AddTable.textTableSize": "Table Size",
+  "PE.Controllers.DocumentHolder.menuAddLink": "Add Link",
+  "PE.Controllers.DocumentHolder.menuCopy": "Copy",
+  "PE.Controllers.DocumentHolder.menuCut": "Cut",
+  "PE.Controllers.DocumentHolder.menuDelete": "Delete",
+  "PE.Controllers.DocumentHolder.menuEdit": "Edit",
+  "PE.Controllers.DocumentHolder.menuOpenLink": "Open Link",
+  "PE.Controllers.DocumentHolder.menuPaste": "Paste",
+  "PE.Controllers.DocumentHolder.menuMore": "More",
+  "PE.Controllers.DocumentHolder.sheetCancel": "Cancel",
+  "PE.Controllers.EditContainer.textChart": "Chart",
+  "PE.Controllers.EditContainer.textHyperlink": "Hyperlink",
+  "PE.Controllers.EditContainer.textImage": "Image",
+  "PE.Controllers.EditContainer.textSettings": "Settings",
+  "PE.Controllers.EditContainer.textShape": "Shape",
+  "PE.Controllers.EditContainer.textSlide": "Slide",
+  "PE.Controllers.EditContainer.textTable": "Table",
+  "PE.Controllers.EditContainer.textText": "Text",
+  "PE.Controllers.EditImage.textEmptyImgUrl": "You need to specify image URL.",
+  "PE.Controllers.EditImage.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
+  "PE.Controllers.EditLink.textDefault": "Selected text",
+  "PE.Controllers.EditLink.textExternalLink": "External Link",
+  "PE.Controllers.EditLink.textFirst": "First Slide",
+  "PE.Controllers.EditLink.textInternalLink": "Slide in this Presentation",
+  "PE.Controllers.EditLink.textLast": "Last Slide",
+  "PE.Controllers.EditLink.textNext": "Next Slide",
+  "PE.Controllers.EditLink.textPrev": "Previous Slide",
+  "PE.Controllers.EditLink.textSlide": "Slide",
+  "PE.Controllers.EditLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
+  "PE.Controllers.EditSlide.textSec": "s",
+  "PE.Controllers.EditText.textAuto": "Auto",
+  "PE.Controllers.EditText.textFonts": "Fonts",
+  "PE.Controllers.EditText.textPt": "pt",
+  "PE.Controllers.Main.advDRMEnterPassword": "Enter your password:",
+  "PE.Controllers.Main.advDRMOptions": "Protected File",
+  "PE.Controllers.Main.advDRMPassword": "Password",
+  "PE.Controllers.Main.applyChangesTextText": "Loading data...",
+  "PE.Controllers.Main.applyChangesTitleText": "Loading Data",
+  "PE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
+  "PE.Controllers.Main.criticalErrorExtText": "Press 'OK' to return to document list.",
   "PE.Controllers.Main.criticalErrorTitle": "Error",
-  "PE.Controllers.Main.notcriticalErrorTitle": "Warning",
-  "PE.Controllers.Main.errorDefaultMessage": "Error code: %1",
-  "PE.Controllers.Main.criticalErrorExtText": "Press 'Ok' to to back to document list.",
-  "PE.Controllers.Main.openTitleText": "Opening Document",
-  "PE.Controllers.Main.openTextText": "Opening document...",
-  "PE.Controllers.Main.saveTitleText": "Saving Document",
-  "PE.Controllers.Main.saveTextText": "Saving document...",
-  "PE.Controllers.Main.loadFontsTitleText": "Loading Data",
-  "PE.Controllers.Main.loadFontsTextText": "Loading data...",
-  "PE.Controllers.Main.loadImagesTitleText": "Loading Images",
-  "PE.Controllers.Main.loadImagesTextText": "Loading images...",
-  "PE.Controllers.Main.loadFontTitleText": "Loading Data",
-  "PE.Controllers.Main.loadFontTextText": "Loading data...",
-  "PE.Controllers.Main.loadImageTitleText": "Loading Image",
-  "PE.Controllers.Main.loadImageTextText": "Loading image...",
-  "PE.Controllers.Main.downloadTitleText": "Downloading Document",
-  "PE.Controllers.Main.downloadTextText": "Downloading document...",
-  "PE.Controllers.Main.printTitleText": "Printing Document",
-  "PE.Controllers.Main.printTextText": "Printing document...",
-  "PE.Controllers.Main.uploadImageTitleText": "Uploading Image",
-  "PE.Controllers.Main.uploadImageTextText": "Uploading image...",
-  "PE.Controllers.Main.uploadImageSizeMessage": "Maximium image size limit exceeded.",
-  "PE.Controllers.Main.uploadImageExtMessage": "Unknown image format.",
-  "PE.Controllers.Main.uploadImageFileCountMessage": "No images uploaded.",
-  "PE.Controllers.Main.reloadButtonText": "Reload Page",
-  "PE.Controllers.Main.unknownErrorText": "Unknown error.",
-  "PE.Controllers.Main.convertationTimeoutText": "Convertation timeout exceeded.",
+  "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor",
   "PE.Controllers.Main.downloadErrorText": "Download failed.",
-  "PE.Controllers.Main.unsupportedBrowserErrorText ": "Your browser is not supported.",
-  "PE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1",
-  "PE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1",
-  "PE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1",
-  "PE.Controllers.Main.requestEditFailedTitleText": "Access denied",
+  "PE.Controllers.Main.downloadTextText": "Downloading document...",
+  "PE.Controllers.Main.downloadTitleText": "Downloading Document",
+  "PE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. You can't edit anymore.",
+  "PE.Controllers.Main.errorConnectToServer": " The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
+  "PE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
+  "PE.Controllers.Main.errorDataRange": "Incorrect data range.",
+  "PE.Controllers.Main.errorDefaultMessage": "Error code: %1",
+  "PE.Controllers.Main.errorFilePassProtect": "The document is password protected.",
+  "PE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
+  "PE.Controllers.Main.errorKeyExpire": "Key descriptor expired",
+  "PE.Controllers.Main.errorProcessSaveResult": "Saving is failed.",
+  "PE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
+  "PE.Controllers.Main.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.",
+  "PE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
+  "PE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.",
+  "PE.Controllers.Main.errorUsersExceed": "The number of users was exceeded",
+  "PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.",
+  "PE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
+  "PE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
+  "PE.Controllers.Main.loadFontsTextText": "Loading data...",
+  "PE.Controllers.Main.loadFontsTitleText": "Loading Data",
+  "PE.Controllers.Main.loadFontTextText": "Loading data...",
+  "PE.Controllers.Main.loadFontTitleText": "Loading Data",
+  "PE.Controllers.Main.loadImagesTextText": "Loading images...",
+  "PE.Controllers.Main.loadImagesTitleText": "Loading Images",
+  "PE.Controllers.Main.loadImageTextText": "Loading image...",
+  "PE.Controllers.Main.loadImageTitleText": "Loading Image",
+  "PE.Controllers.Main.loadingDocumentTextText": "Loading presentation...",
+  "PE.Controllers.Main.loadingDocumentTitleText": "Loading presentation",
+  "PE.Controllers.Main.loadThemeTextText": "Loading theme...",
+  "PE.Controllers.Main.loadThemeTitleText": "Loading Theme",
+  "PE.Controllers.Main.notcriticalErrorTitle": "Warning",
+  "PE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
+  "PE.Controllers.Main.openTextText": "Opening document...",
+  "PE.Controllers.Main.openTitleText": "Opening Document",
+  "PE.Controllers.Main.printTextText": "Printing document...",
+  "PE.Controllers.Main.printTitleText": "Printing Document",
+  "PE.Controllers.Main.reloadButtonText": "Reload Page",
   "PE.Controllers.Main.requestEditFailedMessageText": "Someone is editing this document right now. Please try again later.",
+  "PE.Controllers.Main.requestEditFailedTitleText": "Access denied",
+  "PE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
+  "PE.Controllers.Main.savePreparingText": "Preparing to save",
+  "PE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...",
+  "PE.Controllers.Main.saveTextText": "Saving document...",
+  "PE.Controllers.Main.saveTitleText": "Saving Document",
+  "PE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1",
+  "PE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1",
+  "PE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1",
+  "PE.Controllers.Main.textAnonymous": "Anonymous",
+  "PE.Controllers.Main.textBack": "Back",
+  "PE.Controllers.Main.textBuyNow": "Visit website",
+  "PE.Controllers.Main.textCancel": "Cancel",
+  "PE.Controllers.Main.textClose": "Close",
+  "PE.Controllers.Main.textCloseTip": "Tap to close the tip.",
+  "PE.Controllers.Main.textContactUs": "Contact sales",
+  "PE.Controllers.Main.textDone": "Done",
+  "PE.Controllers.Main.textLoadingDocument": "Loading presentation",
+  "PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version",
+  "PE.Controllers.Main.textOK": "OK",
+  "PE.Controllers.Main.textPassword": "Password",
+  "PE.Controllers.Main.textPreloader": "Loading... ",
+  "PE.Controllers.Main.textShape": "Shape",
+  "PE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.",
+  "PE.Controllers.Main.textUsername": "Username",
+  "PE.Controllers.Main.titleLicenseExp": "License expired",
+  "PE.Controllers.Main.titleServerVersion": "Editor updated",
+  "PE.Controllers.Main.txtArt": "Your text here",
+  "PE.Controllers.Main.txtBasicShapes": "Basic Shapes",
+  "PE.Controllers.Main.txtButtons": "Buttons",
+  "PE.Controllers.Main.txtCallouts": "Callouts",
+  "PE.Controllers.Main.txtCharts": "Charts",
+  "PE.Controllers.Main.txtDiagramTitle": "Chart Title",
+  "PE.Controllers.Main.txtEditingMode": "Set editing mode...",
+  "PE.Controllers.Main.txtFiguredArrows": "Figured Arrows",
+  "PE.Controllers.Main.txtLines": "Lines",
+  "PE.Controllers.Main.txtMath": "Math",
+  "PE.Controllers.Main.txtNeedSynchronize": "You have updates",
+  "PE.Controllers.Main.txtRectangles": "Rectangles",
+  "PE.Controllers.Main.txtSeries": "Series",
   "PE.Controllers.Main.txtSldLtTBlank": "Blank",
   "PE.Controllers.Main.txtSldLtTChart": "Chart",
   "PE.Controllers.Main.txtSldLtTChartAndTx": "Chart and Text",
@@ -52,7 +154,7 @@
   "PE.Controllers.Main.txtSldLtTFourObj": "Four Objects",
   "PE.Controllers.Main.txtSldLtTMediaAndTx": "Media and Text",
   "PE.Controllers.Main.txtSldLtTObj": "Title and Object",
-  "PE.Controllers.Main.txtSldLtTObjAndTwoObj": "Object and Two Object",
+  "PE.Controllers.Main.txtSldLtTObjAndTwoObj": "Object and Two Objects",
   "PE.Controllers.Main.txtSldLtTObjAndTx": "Object and Text",
   "PE.Controllers.Main.txtSldLtTObjOnly": "Object",
   "PE.Controllers.Main.txtSldLtTObjOverTx": "Object over Text",
@@ -78,367 +180,253 @@
   "PE.Controllers.Main.txtSldLtTVertTitleAndTx": "Vertical Title and Text",
   "PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "Vertical Title and Text Over Chart",
   "PE.Controllers.Main.txtSldLtTVertTx": "Vertical Text",
-  "PE.Controllers.Main.textLoadingDocument": "Loading presentation",
-  "PE.Controllers.Main.loadThemeTitleText": "Loading Theme",
-  "PE.Controllers.Main.loadThemeTextText": "Loading theme...",
-  "PE.Controllers.Main.txtBasicShapes": "Basic Shapes",
-  "PE.Controllers.Main.txtFiguredArrows": "Figured Arrows",
-  "PE.Controllers.Main.txtMath": "Math",
-  "PE.Controllers.Main.txtCharts": "Charts",
   "PE.Controllers.Main.txtStarsRibbons": "Stars & Ribbons",
-  "PE.Controllers.Main.txtCallouts": "Callouts",
-  "PE.Controllers.Main.txtButtons": "Buttons",
-  "PE.Controllers.Main.txtRectangles": "Rectangles",
-  "PE.Controllers.Main.txtLines": "Lines",
-  "PE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
-  "PE.Controllers.Main.errorKeyExpire": "Key descriptor expired",
-  "PE.Controllers.Main.errorUsersExceed": "Count of users was exceed",
-  "PE.Controllers.Main.txtEditingMode": "Set editing mode...",
-  "PE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. You can't edit anymore.",
-  "PE.Controllers.Main.errorFilePassProtect": "The document is password protected.",
-  "PE.Controllers.Main.textAnonymous": "Anonymous",
-  "PE.Controllers.Main.txtNeedSynchronize": "You have an updates",
-  "PE.Controllers.Main.applyChangesTitleText": "Loading Data",
-  "PE.Controllers.Main.applyChangesTextText": "Loading data...",
-  "PE.Controllers.Main.savePreparingText": "Preparing to save",
-  "PE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...",
-  "PE.Controllers.Main.loadingDocumentTitleText": "Loading presentation",
-  "PE.Controllers.Main.loadingDocumentTextText": "Loading presentation...",
-  "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
-  "PE.Controllers.Main.errorProcessSaveResult": "Saving is failed.",
-  "PE.Controllers.Main.textCloseTip": "\nClick to close the tip.",
-  "PE.Controllers.Main.textShape": "Shape",
-  "PE.Controllers.Main.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.",
-  "PE.Controllers.Main.errorDataRange": "Incorrect data range.",
-  "PE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
-  "PE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
-  "PE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.",
-  "PE.Controllers.Main.txtDiagramTitle": "Chart Title",
   "PE.Controllers.Main.txtXAxis": "X Axis",
   "PE.Controllers.Main.txtYAxis": "Y Axis",
-  "PE.Controllers.Main.txtSeries": "Seria",
-  "PE.Controllers.Main.txtArt": "Your text here",
-  "PE.Controllers.Main.errorConnectToServer": " The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
-  "PE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.",
-  "PE.Controllers.Main.textBuyNow": "Visit website",
-  "PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version",
-  "PE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
-  "PE.Controllers.Main.textContactUs": "Contact sales",
-  "PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.",
+  "PE.Controllers.Main.unknownErrorText": "Unknown error.",
+  "PE.Controllers.Main.unsupportedBrowserErrorText ": "Your browser is not supported.",
+  "PE.Controllers.Main.uploadImageExtMessage": "Unknown image format.",
+  "PE.Controllers.Main.uploadImageFileCountMessage": "No images uploaded.",
+  "PE.Controllers.Main.uploadImageSizeMessage": "Maximium image size limit exceeded.",
+  "PE.Controllers.Main.uploadImageTextText": "Uploading image...",
+  "PE.Controllers.Main.uploadImageTitleText": "Uploading Image",
   "PE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
-  "PE.Controllers.Main.titleLicenseExp": "License expired",
-  "PE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
-  "PE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
-  "PE.Controllers.Main.advDRMOptions": "Protected File",
-  "PE.Controllers.Main.advDRMEnterPassword": "You password please:",
-  "PE.Controllers.Main.advDRMPassword": "Password",
-  "PE.Controllers.Main.textOK": "OK",
-  "PE.Controllers.Main.textCancel": "Cancel",
-  "PE.Controllers.Main.textPreloader": "Loading... ",
-  "PE.Controllers.Main.textUsername": "Username",
-  "PE.Controllers.Main.textPassword": "Password",
-  "PE.Controllers.Main.textBack": "Back",
-  "PE.Controllers.Main.textClose": "Close",
-  "PE.Controllers.Main.textDone": "Done",
-
-  "PE.Controllers.DocumentHolder.menuCut": "Cut",
-  "PE.Controllers.DocumentHolder.menuCopy": "Copy",
-  "PE.Controllers.DocumentHolder.menuPaste": "Paste",
-  "PE.Controllers.DocumentHolder.menuEdit": "Edit",
-  "PE.Controllers.DocumentHolder.menuDelete": "Delete",
-  "PE.Controllers.DocumentHolder.menuAddLink": "Add Link",
-  "PE.Controllers.DocumentHolder.menuOpenLink": "Open Link",
-
+  "PE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
+  "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
   "PE.Controllers.Search.textNoTextFound": "Text not Found",
-
-  "PE.Controllers.Settings.txtLoading": "Loading...",
   "PE.Controllers.Settings.notcriticalErrorTitle": "Warning",
-  "PE.Views.Settings.unknownText": "Unknown",
-  "PE.Views.Settings.textSettings": "Settings",
-  "PE.Views.Settings.textDone": "Done",
-  "PE.Views.Settings.textFind": "Find",
-  "PE.Views.Settings.textEditPresent": "Edit Presentation",
-  "PE.Views.Settings.textPresentSetup": "Presentation Setup",
-  "PE.Views.Settings.textDownload": "Download",
-  "PE.Views.Settings.textPresentInfo": "Presentation Info",
-  "PE.Views.Settings.textHelp": "Help",
-  "PE.Views.Settings.textAbout": "About",
-  "PE.Views.Settings.textBack": "Back",
-  "PE.Views.Settings.textPresentTitle": "Presentation title",
-  "PE.Views.Settings.textLoading": "Loading...",
-  "PE.Views.Settings.textAuthor": "Author",
-  "PE.Views.Settings.textCreateDate": "Create date",
-  "PE.Views.Settings.textDownloadAs": "Download As...",
-  "PE.Views.Settings.textVersion": "Version",
-  "PE.Views.Settings.textAddress": "address",
-  "PE.Views.Settings.textEmail": "email",
-  "PE.Views.Settings.textTel": "tel",
-  "PE.Views.Settings.textSlideSize": "Slide Size",
-  "PE.Views.Settings.mniSlideStandard": "Standard (4:3)",
-  "PE.Views.Settings.mniSlideWide": "Widescreen (16:9)",
-
-  "PE.Controllers.Toolbar.dlgLeaveTitleText": "You leave the application",
+  "PE.Controllers.Settings.txtLoading": "Loading...",
   "PE.Controllers.Toolbar.dlgLeaveMsgText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
+  "PE.Controllers.Toolbar.dlgLeaveTitleText": "You leave the application",
   "PE.Controllers.Toolbar.leaveButtonText": "Leave this Page",
   "PE.Controllers.Toolbar.stayButtonText": "Stay on this Page",
-  "PE.Views.Toolbar.textBack": "Back",
-
-  "PE.Controllers.AddContainer.textTable": "Table",
-  "PE.Controllers.AddContainer.textShape": "Shape",
-  "PE.Controllers.AddContainer.textSlide": "Slide",
-  "PE.Controllers.AddContainer.textImage": "Image",
-  "PE.Controllers.AddContainer.textLink": "Link",
-
-  "PE.Controllers.AddImage.textEmptyImgUrl": "You need to specify image URL.",
-  "PE.Controllers.AddImage.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
+  "PE.Views.AddImage.textAddress": "Address",
+  "PE.Views.AddImage.textBack": "Back",
   "PE.Views.AddImage.textFromLibrary": "Picture from Library",
   "PE.Views.AddImage.textFromURL": "Picture from URL",
-  "PE.Views.AddImage.textBack": "Back",
-  "PE.Views.AddImage.textLinkSettings": "Link Settings",
-  "PE.Views.AddImage.textAddress": "Address",
   "PE.Views.AddImage.textImageURL": "Image URL",
   "PE.Views.AddImage.textInsertImage": "Insert Image",
-
-  "PE.Controllers.AddLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
-  "PE.Controllers.AddLink.textDefault": "Selected text",
-  "PE.Controllers.AddLink.textNext": "Next Slide",
-  "PE.Controllers.AddLink.textPrev": "Previous Slide",
-  "PE.Controllers.AddLink.textFirst": "First Slide",
-  "PE.Controllers.AddLink.textLast": "Last Slide",
-  "PE.Controllers.AddLink.textSlide": "Slide",
-  "PE.Controllers.AddLink.textExternalLink": "External Link",
-  "PE.Controllers.AddLink.textInternalLink": "Slide in this Presentation",
-  "PE.Views.AddLink.textLinkType": "Link Type",
-  "PE.Views.AddLink.textExternalLink": "External Link",
-  "PE.Views.AddLink.textInternalLink": "Slide in this Presentation",
-  "PE.Views.AddLink.textLink": "Link",
-  "PE.Views.AddLink.textLinkSlide": "Link to",
+  "PE.Views.AddImage.textLinkSettings": "Link Settings",
   "PE.Views.AddLink.textBack": "Back",
   "PE.Views.AddLink.textDisplay": "Display",
-  "PE.Views.AddLink.textTip": "Screen Tip",
-  "PE.Views.AddLink.textInsert": "Insert",
-  "PE.Views.AddLink.textNext": "Next Slide",
-  "PE.Views.AddLink.textPrev": "Previous Slide",
+  "PE.Views.AddLink.textExternalLink": "External Link",
   "PE.Views.AddLink.textFirst": "First Slide",
+  "PE.Views.AddLink.textInsert": "Insert",
+  "PE.Views.AddLink.textInternalLink": "Slide in this Presentation",
   "PE.Views.AddLink.textLast": "Last Slide",
+  "PE.Views.AddLink.textLink": "Link",
+  "PE.Views.AddLink.textLinkSlide": "Link to",
+  "PE.Views.AddLink.textLinkType": "Link Type",
+  "PE.Views.AddLink.textNext": "Next Slide",
   "PE.Views.AddLink.textNumber": "Slide Number",
-
-  "PE.Controllers.AddTable.textTableSize": "Table Size",
-  "PE.Controllers.AddTable.textColumns": "Columns",
-  "PE.Controllers.AddTable.textRows": "Rows",
-  "PE.Controllers.AddTable.textCancel": "Cancel",
-
-  "PE.Views.EditChart.textStyle": "Style",
-  "PE.Views.EditChart.textReorder": "Reorder",
-  "PE.Views.EditChart.textRemoveChart": "Remove Chart",
-  "PE.Views.EditChart.textBack": "Back",
-  "PE.Views.EditChart.textToForeground": "Bring to Foreground",
-  "PE.Views.EditChart.textToBackground": "Send to Background",
-  "PE.Views.EditChart.textForward": "Move Forward",
-  "PE.Views.EditChart.textBackward": "Move Backward",
-  "PE.Views.EditChart.textType": "Type",
-  "PE.Views.EditChart.textFill": "Fill",
-  "PE.Views.EditChart.textBorder": "Border",
-  "PE.Views.EditChart.textSize": "Size",
-  "PE.Views.EditChart.textColor": "Color",
+  "PE.Views.AddLink.textPrev": "Previous Slide",
+  "PE.Views.AddLink.textTip": "Screen Tip",
   "PE.Views.EditChart.textAlign": "Align",
-  "PE.Views.EditChart.textAlignLeft": "Align Left",
-  "PE.Views.EditChart.textAlignRight": "Align Right",
-  "PE.Views.EditChart.textAlignCenter": "Align Center",
-  "PE.Views.EditChart.textAlignTop": "Align Top",
   "PE.Views.EditChart.textAlignBottom": "Align Bottom",
+  "PE.Views.EditChart.textAlignCenter": "Align Center",
+  "PE.Views.EditChart.textAlignLeft": "Align Left",
   "PE.Views.EditChart.textAlignMiddle": "Align Middle",
+  "PE.Views.EditChart.textAlignRight": "Align Right",
+  "PE.Views.EditChart.textAlignTop": "Align Top",
+  "PE.Views.EditChart.textBack": "Back",
+  "PE.Views.EditChart.textBackward": "Move Backward",
+  "PE.Views.EditChart.textBorder": "Border",
+  "PE.Views.EditChart.textColor": "Color",
+  "PE.Views.EditChart.textFill": "Fill",
+  "PE.Views.EditChart.textForward": "Move Forward",
+  "PE.Views.EditChart.textRemoveChart": "Remove Chart",
+  "PE.Views.EditChart.textReorder": "Reorder",
+  "PE.Views.EditChart.textSize": "Size",
+  "PE.Views.EditChart.textStyle": "Style",
+  "PE.Views.EditChart.textToBackground": "Send to Background",
+  "PE.Views.EditChart.textToForeground": "Bring to Foreground",
+  "PE.Views.EditChart.textType": "Type",
   "PE.Views.EditChart.txtDistribHor": "Distribute Horizontally",
   "PE.Views.EditChart.txtDistribVert": "Distribute Vertically",
-
-  "PE.Controllers.EditContainer.textSettings": "Settings",
-  "PE.Controllers.EditContainer.textText": "Text",
-  "PE.Controllers.EditContainer.textSlide": "Slide",
-  "PE.Controllers.EditContainer.textTable": "Table",
-  "PE.Controllers.EditContainer.textShape": "Shape",
-  "PE.Controllers.EditContainer.textImage": "Image",
-  "PE.Controllers.EditContainer.textChart": "Chart",
-  "PE.Controllers.EditContainer.textHyperlink": "Hyperlink",
-
-  "PE.Controllers.EditImage.textEmptyImgUrl": "You need to specify image URL.",
-  "PE.Controllers.EditImage.txtNotUrl": "This field should be a URL in the format 'http://www.example.com",
-  "PE.Views.EditImage.textReplace": "Replace",
-  "PE.Views.EditImage.textReorder": "Reorder",
-  "PE.Views.EditImage.textDefault": "Default Size",
-  "PE.Views.EditImage.textRemove": "Remove Image",
+  "PE.Views.EditImage.textAddress": "Address",
+  "PE.Views.EditImage.textAlign": "Align",
+  "PE.Views.EditImage.textAlignBottom": "Align Bottom",
+  "PE.Views.EditImage.textAlignCenter": "Align Center",
+  "PE.Views.EditImage.textAlignLeft": "Align Left",
+  "PE.Views.EditImage.textAlignMiddle": "Align Middle",
+  "PE.Views.EditImage.textAlignRight": "Align Right",
+  "PE.Views.EditImage.textAlignTop": "Align Top",
   "PE.Views.EditImage.textBack": "Back",
-  "PE.Views.EditImage.textToForeground": "Bring to Foreground",
-  "PE.Views.EditImage.textToBackground": "Send to Background",
-  "PE.Views.EditImage.textForward": "Move Forward",
   "PE.Views.EditImage.textBackward": "Move Backward",
+  "PE.Views.EditImage.textDefault": "Default Size",
+  "PE.Views.EditImage.textForward": "Move Forward",
   "PE.Views.EditImage.textFromLibrary": "Picture from Library",
   "PE.Views.EditImage.textFromURL": "Picture from URL",
-  "PE.Views.EditImage.textLinkSettings": "Link Settings",
-  "PE.Views.EditImage.textAddress": "Address",
   "PE.Views.EditImage.textImageURL": "Image URL",
+  "PE.Views.EditImage.textLinkSettings": "Link Settings",
+  "PE.Views.EditImage.textRemove": "Remove Image",
+  "PE.Views.EditImage.textReorder": "Reorder",
+  "PE.Views.EditImage.textReplace": "Replace",
   "PE.Views.EditImage.textReplaceImg": "Replace Image",
-  "PE.Views.EditImage.textAlign": "Align",
-  "PE.Views.EditImage.textAlignLeft": "Align Left",
-  "PE.Views.EditImage.textAlignRight": "Align Right",
-  "PE.Views.EditImage.textAlignCenter": "Align Center",
-  "PE.Views.EditImage.textAlignTop": "Align Top",
-  "PE.Views.EditImage.textAlignBottom": "Align Bottom",
-  "PE.Views.EditImage.textAlignMiddle": "Align Middle",
+  "PE.Views.EditImage.textToBackground": "Send to Background",
+  "PE.Views.EditImage.textToForeground": "Bring to Foreground",
   "PE.Views.EditImage.txtDistribHor": "Distribute Horizontally",
   "PE.Views.EditImage.txtDistribVert": "Distribute Vertically",
-
-  "PE.Controllers.EditLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
-  "PE.Controllers.EditLink.textDefault": "Selected text",
-  "PE.Controllers.EditLink.textNext": "Next Slide",
-  "PE.Controllers.EditLink.textPrev": "Previous Slide",
-  "PE.Controllers.EditLink.textFirst": "First Slide",
-  "PE.Controllers.EditLink.textLast": "Last Slide",
-  "PE.Controllers.EditLink.textSlide": "Slide",
-  "PE.Controllers.EditLink.textExternalLink": "External Link",
-  "PE.Controllers.EditLink.textInternalLink": "Slide in this Presentation",
-  "PE.Views.EditLink.textLinkType": "Link Type",
-  "PE.Views.EditLink.textExternalLink": "External Link",
-  "PE.Views.EditLink.textInternalLink": "Slide in this Presentation",
-  "PE.Views.EditLink.textLink": "Link",
-  "PE.Views.EditLink.textLinkSlide": "Link to",
   "PE.Views.EditLink.textBack": "Back",
   "PE.Views.EditLink.textDisplay": "Display",
-  "PE.Views.EditLink.textTip": "Screen Tip",
-  "PE.Views.EditLink.textNext": "Next Slide",
-  "PE.Views.EditLink.textPrev": "Previous Slide",
-  "PE.Views.EditLink.textFirst": "First Slide",
-  "PE.Views.EditLink.textLast": "Last Slide",
-  "PE.Views.EditLink.textNumber": "Slide Number",
   "PE.Views.EditLink.textEdit": "Edit Link",
+  "PE.Views.EditLink.textExternalLink": "External Link",
+  "PE.Views.EditLink.textFirst": "First Slide",
+  "PE.Views.EditLink.textInternalLink": "Slide in this Presentation",
+  "PE.Views.EditLink.textLast": "Last Slide",
+  "PE.Views.EditLink.textLink": "Link",
+  "PE.Views.EditLink.textLinkSlide": "Link to",
+  "PE.Views.EditLink.textLinkType": "Link Type",
+  "PE.Views.EditLink.textNext": "Next Slide",
+  "PE.Views.EditLink.textNumber": "Slide Number",
+  "PE.Views.EditLink.textPrev": "Previous Slide",
   "PE.Views.EditLink.textRemove": "Remove Link",
-
-  "PE.Views.EditShape.textStyle": "Style",
-  "PE.Views.EditShape.textReplace": "Replace",
-  "PE.Views.EditShape.textReorder": "Reorder",
-  "PE.Views.EditShape.textRemoveShape": "Remove Shape",
-  "PE.Views.EditShape.textBack": "Back",
-  "PE.Views.EditShape.textToForeground": "Bring to Foreground",
-  "PE.Views.EditShape.textToBackground": "Send to Background",
-  "PE.Views.EditShape.textForward": "Move Forward",
-  "PE.Views.EditShape.textBackward": "Move Backward",
-  "PE.Views.EditShape.textFill": "Fill",
-  "PE.Views.EditShape.textBorder": "Border",
-  "PE.Views.EditShape.textEffects": "Effects",
-  "PE.Views.EditShape.textSize": "Size",
-  "PE.Views.EditShape.textColor": "Color",
-  "PE.Views.EditShape.textOpacity": "Opacity",
+  "PE.Views.EditLink.textTip": "Screen Tip",
   "PE.Views.EditShape.textAlign": "Align",
-  "PE.Views.EditShape.textAlignLeft": "Align Left",
-  "PE.Views.EditShape.textAlignRight": "Align Right",
-  "PE.Views.EditShape.textAlignCenter": "Align Center",
-  "PE.Views.EditShape.textAlignTop": "Align Top",
   "PE.Views.EditShape.textAlignBottom": "Align Bottom",
+  "PE.Views.EditShape.textAlignCenter": "Align Center",
+  "PE.Views.EditShape.textAlignLeft": "Align Left",
   "PE.Views.EditShape.textAlignMiddle": "Align Middle",
+  "PE.Views.EditShape.textAlignRight": "Align Right",
+  "PE.Views.EditShape.textAlignTop": "Align Top",
+  "PE.Views.EditShape.textBack": "Back",
+  "PE.Views.EditShape.textBackward": "Move Backward",
+  "PE.Views.EditShape.textBorder": "Border",
+  "PE.Views.EditShape.textColor": "Color",
+  "PE.Views.EditShape.textEffects": "Effects",
+  "PE.Views.EditShape.textFill": "Fill",
+  "PE.Views.EditShape.textForward": "Move Forward",
+  "PE.Views.EditShape.textOpacity": "Opacity",
+  "PE.Views.EditShape.textRemoveShape": "Remove Shape",
+  "PE.Views.EditShape.textReorder": "Reorder",
+  "PE.Views.EditShape.textReplace": "Replace",
+  "PE.Views.EditShape.textSize": "Size",
+  "PE.Views.EditShape.textStyle": "Style",
+  "PE.Views.EditShape.textToBackground": "Send to Background",
+  "PE.Views.EditShape.textToForeground": "Bring to Foreground",
   "PE.Views.EditShape.txtDistribHor": "Distribute Horizontally",
   "PE.Views.EditShape.txtDistribVert": "Distribute Vertically",
-
-  "PE.Controllers.EditSlide.textSec": "s",
-  "PE.Views.EditSlide.textTheme": "Theme",
-  "PE.Views.EditSlide.textStyle": "Style",
-  "PE.Views.EditSlide.textLayout": "Layout",
-  "PE.Views.EditSlide.textTransition": "Transition",
-  "PE.Views.EditSlide.textRemoveSlide": "Delete Slide",
-  "PE.Views.EditSlide.textDuplicateSlide": "Duplicate Slide",
+  "PE.Views.EditSlide.textApplyAll": "Apply to All Slides",
   "PE.Views.EditSlide.textBack": "Back",
-  "PE.Views.EditSlide.textFill": "Fill",
-  "PE.Views.EditSlide.textEffect": "Effect",
-  "PE.Views.EditSlide.textType": "Type",
-  "PE.Views.EditSlide.textDuration": "Duration",
-  "PE.Views.EditSlide.textColor": "Color",
-  "PE.Views.EditSlide.textOpacity": "Opacity",
-  "PE.Views.EditSlide.textNone": "None",
-  "PE.Views.EditSlide.textFade": "Fade",
-  "PE.Views.EditSlide.textPush": "Push",
-  "PE.Views.EditSlide.textWipe": "Wipe",
-  "PE.Views.EditSlide.textSplit": "Split",
-  "PE.Views.EditSlide.textUnCover": "UnCover",
-  "PE.Views.EditSlide.textCover": "Cover",
-  "PE.Views.EditSlide.textClock": "Clock",
-  "PE.Views.EditSlide.textZoom": "Zoom",
-  "PE.Views.EditSlide.textSmoothly": "Smoothly",
   "PE.Views.EditSlide.textBlack": "Through Black",
-  "PE.Views.EditSlide.textLeft": "Left",
-  "PE.Views.EditSlide.textTop": "Top",
-  "PE.Views.EditSlide.textRight": "Right",
   "PE.Views.EditSlide.textBottom": "Bottom",
-  "PE.Views.EditSlide.textTopLeft": "Top-Left",
-  "PE.Views.EditSlide.textTopRight": "Top-Right",
   "PE.Views.EditSlide.textBottomLeft": "Bottom-Left",
   "PE.Views.EditSlide.textBottomRight": "Bottom-Right",
-  "PE.Views.EditSlide.textVerticalIn": "Vertical In",
-  "PE.Views.EditSlide.textVerticalOut": "Vertical Out",
+  "PE.Views.EditSlide.textClock": "Clock",
+  "PE.Views.EditSlide.textClockwise": "Clockwise",
+  "PE.Views.EditSlide.textColor": "Color",
+  "PE.Views.EditSlide.textCounterclockwise": "Counterclockwise",
+  "PE.Views.EditSlide.textCover": "Cover",
+  "PE.Views.EditSlide.textDelay": "Delay",
+  "PE.Views.EditSlide.textDuplicateSlide": "Duplicate Slide",
+  "PE.Views.EditSlide.textDuration": "Duration",
+  "PE.Views.EditSlide.textEffect": "Effect",
+  "PE.Views.EditSlide.textFade": "Fade",
+  "PE.Views.EditSlide.textFill": "Fill",
   "PE.Views.EditSlide.textHorizontalIn": "Horizontal In",
   "PE.Views.EditSlide.textHorizontalOut": "Horizontal Out",
-  "PE.Views.EditSlide.textClockwise": "Clockwise",
-  "PE.Views.EditSlide.textCounterclockwise": "Counterclockwise",
+  "PE.Views.EditSlide.textLayout": "Layout",
+  "PE.Views.EditSlide.textLeft": "Left",
+  "PE.Views.EditSlide.textNone": "None",
+  "PE.Views.EditSlide.textOpacity": "Opacity",
+  "PE.Views.EditSlide.textPush": "Push",
+  "PE.Views.EditSlide.textRemoveSlide": "Delete Slide",
+  "PE.Views.EditSlide.textRight": "Right",
+  "PE.Views.EditSlide.textSmoothly": "Smoothly",
+  "PE.Views.EditSlide.textSplit": "Split",
+  "PE.Views.EditSlide.textStartOnClick": "Start On Click",
+  "PE.Views.EditSlide.textStyle": "Style",
+  "PE.Views.EditSlide.textTheme": "Theme",
+  "PE.Views.EditSlide.textTop": "Top",
+  "PE.Views.EditSlide.textTopLeft": "Top-Left",
+  "PE.Views.EditSlide.textTopRight": "Top-Right",
+  "PE.Views.EditSlide.textTransition": "Transition",
+  "PE.Views.EditSlide.textType": "Type",
+  "PE.Views.EditSlide.textUnCover": "UnCover",
+  "PE.Views.EditSlide.textVerticalIn": "Vertical In",
+  "PE.Views.EditSlide.textVerticalOut": "Vertical Out",
   "PE.Views.EditSlide.textWedge": "Wedge",
+  "PE.Views.EditSlide.textWipe": "Wipe",
+  "PE.Views.EditSlide.textZoom": "Zoom",
   "PE.Views.EditSlide.textZoomIn": "Zoom In",
   "PE.Views.EditSlide.textZoomOut": "Zoom Out",
   "PE.Views.EditSlide.textZoomRotate": "Zoom and Rotate",
-  "PE.Views.EditSlide.textStartOnClick": "Start On Click",
-  "PE.Views.EditSlide.textDelay": "Delay",
-  "PE.Views.EditSlide.textApplyAll": "Apply to All Slides",
-
-  "PE.Views.EditTable.textRemoveTable": "Remove Table",
-  "PE.Views.EditTable.textTableOptions": "Table Options",
-  "PE.Views.EditTable.textStyle": "Style",
-  "PE.Views.EditTable.textBack": "Back",
-  "PE.Views.EditTable.textOptions": "Options",
-  "PE.Views.EditTable.textCellMargins": "Cell Margins",
-  "PE.Views.EditTable.textFill": "Fill",
-  "PE.Views.EditTable.textBorder": "Border",
-  "PE.Views.EditTable.textStyleOptions": "Style Options",
-  "PE.Views.EditTable.textSize": "Size",
-  "PE.Views.EditTable.textColor": "Color",
-  "PE.Views.EditTable.textHeaderRow": "Header Row",
-  "PE.Views.EditTable.textTotalRow": "Total Row",
-  "PE.Views.EditTable.textBandedRow": "Banded Row",
-  "PE.Views.EditTable.textFirstColumn": "First Column",
-  "PE.Views.EditTable.textLastColumn": "Last Column",
-  "PE.Views.EditTable.textBandedColumn": "Banded Column",
-  "PE.Views.EditTable.textReorder": "Reorder",
-  "PE.Views.EditTable.textToForeground": "Bring to Foreground",
-  "PE.Views.EditTable.textToBackground": "Send to Background",
-  "PE.Views.EditTable.textForward": "Move Forward",
-  "PE.Views.EditTable.textBackward": "Move Backward",
   "PE.Views.EditTable.textAlign": "Align",
-  "PE.Views.EditTable.textAlignLeft": "Align Left",
-  "PE.Views.EditTable.textAlignRight": "Align Right",
-  "PE.Views.EditTable.textAlignCenter": "Align Center",
-  "PE.Views.EditTable.textAlignTop": "Align Top",
   "PE.Views.EditTable.textAlignBottom": "Align Bottom",
+  "PE.Views.EditTable.textAlignCenter": "Align Center",
+  "PE.Views.EditTable.textAlignLeft": "Align Left",
   "PE.Views.EditTable.textAlignMiddle": "Align Middle",
+  "PE.Views.EditTable.textAlignRight": "Align Right",
+  "PE.Views.EditTable.textAlignTop": "Align Top",
+  "PE.Views.EditTable.textBack": "Back",
+  "PE.Views.EditTable.textBackward": "Move Backward",
+  "PE.Views.EditTable.textBandedColumn": "Banded Column",
+  "PE.Views.EditTable.textBandedRow": "Banded Row",
+  "PE.Views.EditTable.textBorder": "Border",
+  "PE.Views.EditTable.textCellMargins": "Cell Margins",
+  "PE.Views.EditTable.textColor": "Color",
+  "PE.Views.EditTable.textFill": "Fill",
+  "PE.Views.EditTable.textFirstColumn": "First Column",
+  "PE.Views.EditTable.textForward": "Move Forward",
+  "PE.Views.EditTable.textHeaderRow": "Header Row",
+  "PE.Views.EditTable.textLastColumn": "Last Column",
+  "PE.Views.EditTable.textOptions": "Options",
+  "PE.Views.EditTable.textRemoveTable": "Remove Table",
+  "PE.Views.EditTable.textReorder": "Reorder",
+  "PE.Views.EditTable.textSize": "Size",
+  "PE.Views.EditTable.textStyle": "Style",
+  "PE.Views.EditTable.textStyleOptions": "Style Options",
+  "PE.Views.EditTable.textTableOptions": "Table Options",
+  "PE.Views.EditTable.textToBackground": "Send to Background",
+  "PE.Views.EditTable.textToForeground": "Bring to Foreground",
+  "PE.Views.EditTable.textTotalRow": "Total Row",
   "PE.Views.EditTable.txtDistribHor": "Distribute Horizontally",
   "PE.Views.EditTable.txtDistribVert": "Distribute Vertically",
-
-  "PE.Controllers.EditText.textFonts": "Fonts",
-  "PE.Controllers.EditText.textAuto": "Auto",
-  "PE.Controllers.EditText.textPt": "pt",
-  "PE.Views.EditText.textFonts": "Fonts",
-  "PE.Views.EditText.textFontColor": "Font Color",
-  "PE.Views.EditText.textAdditionalFormat": "Additional Formatting",
-  "PE.Views.EditText.textBack": "Back",
-  "PE.Views.EditText.textSize": "Size",
-  "PE.Views.EditText.textFontColors": "Font Colors",
-  "PE.Views.EditText.textAutomatic": "Automatic",
   "PE.Views.EditText.textAdditional": "Additional",
-  "PE.Views.EditText.textStrikethrough": "Strikethrough",
+  "PE.Views.EditText.textAdditionalFormat": "Additional Formatting",
+  "PE.Views.EditText.textAfter": "After",
+  "PE.Views.EditText.textAllCaps": "All Caps",
+  "PE.Views.EditText.textAutomatic": "Automatic",
+  "PE.Views.EditText.textBack": "Back",
+  "PE.Views.EditText.textBefore": "Before",
+  "PE.Views.EditText.textBullets": "Bullets",
   "PE.Views.EditText.textDblStrikethrough": "Double Strikethrough",
   "PE.Views.EditText.textDblSuperscript": "Superscript",
-  "PE.Views.EditText.textSubscript": "Subscript",
-  "PE.Views.EditText.textSmallCaps": "Small Caps",
-  "PE.Views.EditText.textAllCaps": "All Caps",
-  "PE.Views.EditText.textLetterSpacing": "Letter Spacing",
+  "PE.Views.EditText.textFontColor": "Font Color",
+  "PE.Views.EditText.textFontColors": "Font Colors",
+  "PE.Views.EditText.textFonts": "Fonts",
   "PE.Views.EditText.textFromText": "Distance from Text",
-  "PE.Views.EditText.textBefore": "Before",
-  "PE.Views.EditText.textAfter": "After",
+  "PE.Views.EditText.textLetterSpacing": "Letter Spacing",
   "PE.Views.EditText.textLineSpacing": "Line Spacing",
-  "PE.Views.EditText.textBullets": "Bullets",
   "PE.Views.EditText.textNone": "None",
-  "PE.Views.EditText.textNumbers": "Numbers"
+  "PE.Views.EditText.textNumbers": "Numbers",
+  "PE.Views.EditText.textSize": "Size",
+  "PE.Views.EditText.textSmallCaps": "Small Caps",
+  "PE.Views.EditText.textStrikethrough": "Strikethrough",
+  "PE.Views.EditText.textSubscript": "Subscript",
+  "PE.Views.Search.textSearch": "Search",
+  "PE.Views.Settings.mniSlideStandard": "Standard (4:3)",
+  "PE.Views.Settings.mniSlideWide": "Widescreen (16:9)",
+  "PE.Views.Settings.textAbout": "About",
+  "PE.Views.Settings.textAddress": "address",
+  "PE.Views.Settings.textAuthor": "Author",
+  "PE.Views.Settings.textBack": "Back",
+  "PE.Views.Settings.textCreateDate": "Creation date",
+  "PE.Views.Settings.textDone": "Done",
+  "PE.Views.Settings.textDownload": "Download",
+  "PE.Views.Settings.textDownloadAs": "Download As...",
+  "PE.Views.Settings.textEditPresent": "Edit Presentation",
+  "PE.Views.Settings.textEmail": "email",
+  "PE.Views.Settings.textFind": "Find",
+  "PE.Views.Settings.textHelp": "Help",
+  "PE.Views.Settings.textLoading": "Loading...",
+  "PE.Views.Settings.textPresentInfo": "Presentation Info",
+  "PE.Views.Settings.textPresentSetup": "Presentation Setup",
+  "PE.Views.Settings.textPresentTitle": "Presentation title",
+  "PE.Views.Settings.textSettings": "Settings",
+  "PE.Views.Settings.textSlideSize": "Slide Size",
+  "PE.Views.Settings.textTel": "tel",
+  "PE.Views.Settings.textVersion": "Version",
+  "PE.Views.Settings.unknownText": "Unknown",
+  "PE.Views.Toolbar.textBack": "Back"
 }

apps/presentationeditor/mobile/locale/fr.json

@@ -0,0 +1,431 @@
+{
+  "Common.UI.ThemeColorPalette.textStandartColors": "Couleurs standard",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Couleurs de thème",
+  "Common.Utils.Metric.txtCm": "cm",
+  "Common.Utils.Metric.txtPt": "pt",
+  "PE.Controllers.AddContainer.textImage": "Image",
+  "PE.Controllers.AddContainer.textLink": "Lien",
+  "PE.Controllers.AddContainer.textShape": "Forme",
+  "PE.Controllers.AddContainer.textSlide": "Diapositive",
+  "PE.Controllers.AddContainer.textTable": "Tableau",
+  "PE.Controllers.AddImage.textEmptyImgUrl": "Spécifiez l'URL de l'image",
+  "PE.Controllers.AddImage.txtNotUrl": "Ce champ doit être une URL au format 'http://www.example.com'",
+  "PE.Controllers.AddLink.textDefault": "Texte sélectionné",
+  "PE.Controllers.AddLink.textExternalLink": "Lien externe",
+  "PE.Controllers.AddLink.textFirst": "Première diapositive",
+  "PE.Controllers.AddLink.textInternalLink": "Diapositive dans cette présentation",
+  "PE.Controllers.AddLink.textLast": "Dernière diapositive",
+  "PE.Controllers.AddLink.textNext": "Diapositive suivante",
+  "PE.Controllers.AddLink.textPrev": "Diapositive précédente",
+  "PE.Controllers.AddLink.textSlide": "Diapositive",
+  "PE.Controllers.AddLink.txtNotUrl": "Ce champ doit être une URL au format 'http://www.example.com'",
+  "PE.Controllers.AddTable.textCancel": "Annuler",
+  "PE.Controllers.AddTable.textColumns": "Colonnes",
+  "PE.Controllers.AddTable.textRows": "Lignes",
+  "PE.Controllers.AddTable.textTableSize": "Taille du tableau",
+  "PE.Controllers.DocumentHolder.menuAddLink": "Ajouter le lien",
+  "PE.Controllers.DocumentHolder.menuCopy": "Copier",
+  "PE.Controllers.DocumentHolder.menuCut": "Couper",
+  "PE.Controllers.DocumentHolder.menuDelete": "Supprimer",
+  "PE.Controllers.DocumentHolder.menuEdit": "Modifier",
+  "PE.Controllers.DocumentHolder.menuOpenLink": "Ouvrir le lien",
+  "PE.Controllers.DocumentHolder.menuPaste": "Coller",
+  "PE.Controllers.DocumentHolder.menuMore": "More",
+  "PE.Controllers.DocumentHolder.sheetCancel": "Annuler",
+  "PE.Controllers.EditContainer.textChart": "Graphique",
+  "PE.Controllers.EditContainer.textHyperlink": "Lien hypertexte",
+  "PE.Controllers.EditContainer.textImage": "Image",
+  "PE.Controllers.EditContainer.textSettings": "Paramètres",
+  "PE.Controllers.EditContainer.textShape": "Forme",
+  "PE.Controllers.EditContainer.textSlide": "Diapositive",
+  "PE.Controllers.EditContainer.textTable": "Tableau",
+  "PE.Controllers.EditContainer.textText": "Texte",
+  "PE.Controllers.EditImage.textEmptyImgUrl": "Spécifiez l'URL de l'image",
+  "PE.Controllers.EditImage.txtNotUrl": "Ce champ doit être une URL au format 'http://www.example.com'",
+  "PE.Controllers.EditLink.textDefault": "Texte sélectionné",
+  "PE.Controllers.EditLink.textExternalLink": "Lien externe",
+  "PE.Controllers.EditLink.textFirst": "Première diapositive",
+  "PE.Controllers.EditLink.textInternalLink": "Diapositive dans cette présentation",
+  "PE.Controllers.EditLink.textLast": "Dernière diapositive",
+  "PE.Controllers.EditLink.textNext": "Diapositive suivante",
+  "PE.Controllers.EditLink.textPrev": "Diapositive précédente",
+  "PE.Controllers.EditLink.textSlide": "Diapositive",
+  "PE.Controllers.EditLink.txtNotUrl": "Ce champ doit être une URL au format 'http://www.example.com'",
+  "PE.Controllers.EditSlide.textSec": "sec",
+  "PE.Controllers.EditText.textAuto": "Auto",
+  "PE.Controllers.EditText.textFonts": "Polices",
+  "PE.Controllers.EditText.textPt": "pt",
+  "PE.Controllers.Main.advDRMEnterPassword": "Entrez votre mot de passe:",
+  "PE.Controllers.Main.advDRMOptions": "Fichier protégé",
+  "PE.Controllers.Main.advDRMPassword": " Mot de passe",
+  "PE.Controllers.Main.applyChangesTextText": "Chargement des données en cours...",
+  "PE.Controllers.Main.applyChangesTitleText": "Chargement des données",
+  "PE.Controllers.Main.convertationTimeoutText": "Expiration du délai de conversion.",
+  "PE.Controllers.Main.criticalErrorExtText": "Appuyez sur OK pour revenir à la liste des documents.",
+  "PE.Controllers.Main.criticalErrorTitle": "Erreur",
+  "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor",
+  "PE.Controllers.Main.downloadErrorText": "Échec du téléchargement.",
+  "PE.Controllers.Main.downloadTextText": "Téléchargement du document...",
+  "PE.Controllers.Main.downloadTitleText": "Téléchargement du document",
+  "PE.Controllers.Main.errorCoAuthoringDisconnect": "La connexion au serveur perdue. Désolé, vous ne pouvez plus modifier le document.",
+  "PE.Controllers.Main.errorConnectToServer": "Impossible d'enregistrer le document. Veuillez vérifier vos paramètres de connexion ou contactez l'administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.<br><br>Pour en savoir plus sur la connexion de Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
+  "PE.Controllers.Main.errorDatabaseConnection": "Erreur externe.<br>Erreur de connexion à la base de données.Contactez le support.",
+  "PE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
+  "PE.Controllers.Main.errorDefaultMessage": "Code d'erreur: %1",
+  "PE.Controllers.Main.errorFilePassProtect": "Le document est protégé par un mot de passe.",
+  "PE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu",
+  "PE.Controllers.Main.errorKeyExpire": "Descripteur clé a expiré",
+  "PE.Controllers.Main.errorProcessSaveResult": "Échec de l‘enregistrement.",
+  "PE.Controllers.Main.errorServerVersion": "La version de l'éditeur a été mise à jour. La page sera rechargée pour appliquer les modifications.",
+  "PE.Controllers.Main.errorStockChart": "L'ordre des lignes est incorrect. Pour créer un graphique boursier, organisez vos données sur la feuille de calcul dans l'ordre suivant:<br> cours à l'ouverture, cours maximal, cours minimal, cours à la clôture.",
+  "PE.Controllers.Main.errorUpdateVersion": "La version du fichier a été changée. La page sera rechargée.",
+  "PE.Controllers.Main.errorUserDrop": "Impossible d'accéder au fichier.",
+  "PE.Controllers.Main.errorUsersExceed": "Le nombre des utilisateurs a été dépassé",
+  "PE.Controllers.Main.errorViewerDisconnect": "La connexion a été perdue. Vous pouvez toujours afficher le document,<br>mais ne pouvez pas le télécharger jusqu'à ce que la connexion soit rétablie.",
+  "PE.Controllers.Main.leavePageText": "Vous avez des modifications non enregistrées dans ce document. Cliquez sur 'Rester sur cette Page' pour la sauvegarde automatique du document. Cliquez sur 'Quitter cette Page' pour ignorer toutes les modifications non enregistrées.",
+  "PE.Controllers.Main.loadFontsTextText": "Chargement des données en cours...",
+  "PE.Controllers.Main.loadFontsTitleText": "Chargement des données",
+  "PE.Controllers.Main.loadFontTextText": "Chargement des données en cours...",
+  "PE.Controllers.Main.loadFontTitleText": "Chargement des données",
+  "PE.Controllers.Main.loadImagesTextText": "Chargement des images en cours...",
+  "PE.Controllers.Main.loadImagesTitleText": "Chargement des images",
+  "PE.Controllers.Main.loadImageTextText": "Chargement d'une image en cours...",
+  "PE.Controllers.Main.loadImageTitleText": "Chargement d'une image",
+  "PE.Controllers.Main.loadingDocumentTextText": "Chargement de la présentation...",
+  "PE.Controllers.Main.loadingDocumentTitleText": "Chargement de la présentation",
+  "PE.Controllers.Main.loadThemeTextText": "Chargement du thème en cours...",
+  "PE.Controllers.Main.loadThemeTitleText": "Chargement du thème",
+  "PE.Controllers.Main.notcriticalErrorTitle": "Avertissement",
+  "PE.Controllers.Main.openErrorText": "Une erreur s’est produite lors de l’ouverture du fichier",
+  "PE.Controllers.Main.openTextText": "Ouverture du document...",
+  "PE.Controllers.Main.openTitleText": "Ouverture du document",
+  "PE.Controllers.Main.printTextText": "Impression du document...",
+  "PE.Controllers.Main.printTitleText": "Impression du document",
+  "PE.Controllers.Main.reloadButtonText": "Recharger la page",
+  "PE.Controllers.Main.requestEditFailedMessageText": "Quelqu'un est en train de modifier ce document. Veuillez réessayer plus tard.",
+  "PE.Controllers.Main.requestEditFailedTitleText": "Accès refusé",
+  "PE.Controllers.Main.saveErrorText": "Une erreur s'est produite lors de l'enregistrement du fichier",
+  "PE.Controllers.Main.savePreparingText": "Préparation à l'enregistrement ",
+  "PE.Controllers.Main.savePreparingTitle": "Préparation à l'enregistrement est en cours. Veuillez patienter...",
+  "PE.Controllers.Main.saveTextText": "Enregistrement du document...",
+  "PE.Controllers.Main.saveTitleText": "Enregistrement du document",
+  "PE.Controllers.Main.splitDividerErrorText": "Le nombre de lignes doit être un diviseur de %1",
+  "PE.Controllers.Main.splitMaxColsErrorText": "Le nombre de colonnes doit être moins que %1",
+  "PE.Controllers.Main.splitMaxRowsErrorText": "Le nombre de lignes doit être moins que %1",
+  "PE.Controllers.Main.textAnonymous": "Anonyme",
+  "PE.Controllers.Main.textBack": "Retour",
+  "PE.Controllers.Main.textBuyNow": "Visiter le site web",
+  "PE.Controllers.Main.textCancel": "Annuler",
+  "PE.Controllers.Main.textClose": "Fermer",
+  "PE.Controllers.Main.textCloseTip": "Appuyez sur le conseil pour le fermer",
+  "PE.Controllers.Main.textContactUs": "Contacter l'équipe de ventes",
+  "PE.Controllers.Main.textDone": "Terminé",
+  "PE.Controllers.Main.textLoadingDocument": "Chargement de la présentation",
+  "PE.Controllers.Main.textNoLicenseTitle": "La version open source de ONLYOFFICE",
+  "PE.Controllers.Main.textOK": "OK",
+  "PE.Controllers.Main.textPassword": "Mot de passe",
+  "PE.Controllers.Main.textPreloader": "Chargement en cours...",
+  "PE.Controllers.Main.textShape": "Forme",
+  "PE.Controllers.Main.textTryUndoRedo": "Les fonctions Annuler/Rétablir sont désactivées pour le mode collaboratif rapide.",
+  "PE.Controllers.Main.textUsername": "Nom d'utilisateur",
+  "PE.Controllers.Main.titleLicenseExp": "Licence expirée",
+  "PE.Controllers.Main.titleServerVersion": "L'éditeur est mis à jour",
+  "PE.Controllers.Main.txtArt": "Entrez votre texte",
+  "PE.Controllers.Main.txtBasicShapes": "Formes de base",
+  "PE.Controllers.Main.txtButtons": "Boutons",
+  "PE.Controllers.Main.txtCallouts": "Légendes",
+  "PE.Controllers.Main.txtCharts": "Graphiques",
+  "PE.Controllers.Main.txtDiagramTitle": "Titre du graphique",
+  "PE.Controllers.Main.txtEditingMode": "Définition du mode d'édition...",
+  "PE.Controllers.Main.txtFiguredArrows": "Flèches figurées",
+  "PE.Controllers.Main.txtLines": "Lignes",
+  "PE.Controllers.Main.txtMath": "Maths",
+  "PE.Controllers.Main.txtNeedSynchronize": "Vous avez des mises à jour",
+  "PE.Controllers.Main.txtRectangles": "Rectangles",
+  "PE.Controllers.Main.txtSeries": "Série",
+  "PE.Controllers.Main.txtSldLtTBlank": "Vide",
+  "PE.Controllers.Main.txtSldLtTChart": "Graphique",
+  "PE.Controllers.Main.txtSldLtTChartAndTx": "Graphique et texte",
+  "PE.Controllers.Main.txtSldLtTClipArtAndTx": "Clip Art et texte",
+  "PE.Controllers.Main.txtSldLtTClipArtAndVertTx": "Clip Art et texte vertical",
+  "PE.Controllers.Main.txtSldLtTCust": "Personnalisé",
+  "PE.Controllers.Main.txtSldLtTDgm": "Diagramme",
+  "PE.Controllers.Main.txtSldLtTFourObj": "Quatre objets",
+  "PE.Controllers.Main.txtSldLtTMediaAndTx": "Média et texte",
+  "PE.Controllers.Main.txtSldLtTObj": "Titre et objet",
+  "PE.Controllers.Main.txtSldLtTObjAndTwoObj": "Objet et deux objets",
+  "PE.Controllers.Main.txtSldLtTObjAndTx": "Objet et texte",
+  "PE.Controllers.Main.txtSldLtTObjOnly": "Objet",
+  "PE.Controllers.Main.txtSldLtTObjOverTx": "Objet sur texte",
+  "PE.Controllers.Main.txtSldLtTObjTx": "Titre, objet et légende",
+  "PE.Controllers.Main.txtSldLtTPicTx": "Image et légende",
+  "PE.Controllers.Main.txtSldLtTSecHead": "En-tête de section",
+  "PE.Controllers.Main.txtSldLtTTbl": "Tableau",
+  "PE.Controllers.Main.txtSldLtTTitle": "Diapositive de titre",
+  "PE.Controllers.Main.txtSldLtTTitleOnly": "Titre seul",
+  "PE.Controllers.Main.txtSldLtTTwoColTx": "Texte de deux colonnes",
+  "PE.Controllers.Main.txtSldLtTTwoObj": "Deux objets",
+  "PE.Controllers.Main.txtSldLtTTwoObjAndObj": "Deux objets et objet",
+  "PE.Controllers.Main.txtSldLtTTwoObjAndTx": "Deux objet et texte",
+  "PE.Controllers.Main.txtSldLtTTwoObjOverTx": "Deux objets sur texte",
+  "PE.Controllers.Main.txtSldLtTTwoTxTwoObj": "Deux textes et deux objets",
+  "PE.Controllers.Main.txtSldLtTTx": "Texte",
+  "PE.Controllers.Main.txtSldLtTTxAndChart": "Texte et graphique",
+  "PE.Controllers.Main.txtSldLtTTxAndClipArt": "Texte et Clip Art",
+  "PE.Controllers.Main.txtSldLtTTxAndMedia": "Texte et média",
+  "PE.Controllers.Main.txtSldLtTTxAndObj": "Texte et objet",
+  "PE.Controllers.Main.txtSldLtTTxAndTwoObj": "Texte et deux objets",
+  "PE.Controllers.Main.txtSldLtTTxOverObj": "Texte sur objet",
+  "PE.Controllers.Main.txtSldLtTVertTitleAndTx": "Titre vertical et texte",
+  "PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "Titre vertical et texte sur graphique",
+  "PE.Controllers.Main.txtSldLtTVertTx": "Texte vertical",
+  "PE.Controllers.Main.txtStarsRibbons": "Étoiles et rubans",
+  "PE.Controllers.Main.txtXAxis": "Axe X",
+  "PE.Controllers.Main.txtYAxis": "Axe Y",
+  "PE.Controllers.Main.unknownErrorText": "Erreur inconnue.",
+  "PE.Controllers.Main.unsupportedBrowserErrorText ": "Votre navigateur n'est pas pris en charge.",
+  "PE.Controllers.Main.uploadImageExtMessage": "Format d'image inconnu.",
+  "PE.Controllers.Main.uploadImageFileCountMessage": "Aucune image chargée.",
+  "PE.Controllers.Main.uploadImageSizeMessage": "La taille de l'image a dépassé la limite maximale.",
+  "PE.Controllers.Main.uploadImageTextText": "Chargement d'une image en cours...",
+  "PE.Controllers.Main.uploadImageTitleText": "Chargement d'une image",
+  "PE.Controllers.Main.warnLicenseExp": "Votre licence a expiré.<br>Veuillez mettre à jour votre licence et actualisez la page.",
+  "PE.Controllers.Main.warnNoLicense": "Vous utilisez la version open source de ONLYOFFICE. La version a des limitations en connexions simultanées au serveur de documents (20 connexions à la fois).<br>Pour en avoir plus, veuillez envisager l'achat d'une licence commerciale.",
+  "PE.Controllers.Main.warnProcessRightsChange": "Le droit d'édition du fichier vous a été refusé.",
+  "PE.Controllers.Search.textNoTextFound": "Le texte est introuvable",
+  "PE.Controllers.Settings.notcriticalErrorTitle": "Avertissement",
+  "PE.Controllers.Settings.txtLoading": "Chargement en cours...",
+  "PE.Controllers.Toolbar.dlgLeaveMsgText": "Vous avez des modifications non enregistrées dans ce document. Cliquez sur 'Rester sur cette Page' pour la sauvegarde automatique du document. Cliquez sur 'Quitter cette Page' pour ignorer toutes les modifications non enregistrées.",
+  "PE.Controllers.Toolbar.dlgLeaveTitleText": "Vous quittez l'application",
+  "PE.Controllers.Toolbar.leaveButtonText": "Quitter cette page",
+  "PE.Controllers.Toolbar.stayButtonText": "Rester sur cette page",
+  "PE.Views.AddImage.textAddress": "Adresse",
+  "PE.Views.AddImage.textBack": "Retour",
+  "PE.Views.AddImage.textFromLibrary": "Image de la bibliothèque",
+  "PE.Views.AddImage.textFromURL": "Image à partir d'une URL",
+  "PE.Views.AddImage.textImageURL": "URL d'une image",
+  "PE.Views.AddImage.textInsertImage": "Insérer une image",
+  "PE.Views.AddImage.textLinkSettings": "Paramètres de lien",
+  "PE.Views.AddLink.textBack": "Retour",
+  "PE.Views.AddLink.textDisplay": "Afficher",
+  "PE.Views.AddLink.textExternalLink": "Lien externe",
+  "PE.Views.AddLink.textFirst": "Première diapositive",
+  "PE.Views.AddLink.textInsert": "Insérer",
+  "PE.Views.AddLink.textInternalLink": "Diapositive dans cette présentation",
+  "PE.Views.AddLink.textLast": "Dernière diapositive",
+  "PE.Views.AddLink.textLink": "Lien",
+  "PE.Views.AddLink.textLinkSlide": "Lier à",
+  "PE.Views.AddLink.textLinkType": "Type de lien",
+  "PE.Views.AddLink.textNext": "Diapositive suivante",
+  "PE.Views.AddLink.textNumber": "Numéro de diapositive",
+  "PE.Views.AddLink.textPrev": "Diapositive précédente",
+  "PE.Views.AddLink.textTip": "Info-bulle",
+  "PE.Views.EditChart.textAlign": "Aligner",
+  "PE.Views.EditChart.textAlignBottom": "Aligner en bas",
+  "PE.Views.EditChart.textAlignCenter": "Aligner au centre",
+  "PE.Views.EditChart.textAlignLeft": "Aligner à gauche",
+  "PE.Views.EditChart.textAlignMiddle": "Aligner au milieu",
+  "PE.Views.EditChart.textAlignRight": "Aligner à droite",
+  "PE.Views.EditChart.textAlignTop": "Aligner en haut",
+  "PE.Views.EditChart.textBack": "Retour",
+  "PE.Views.EditChart.textBackward": "Déplacer vers l'arrière",
+  "PE.Views.EditChart.textBorder": "Bordure",
+  "PE.Views.EditChart.textColor": "Couleur",
+  "PE.Views.EditChart.textFill": "Remplissage",
+  "PE.Views.EditChart.textForward": "Déplacer vers l'avant",
+  "PE.Views.EditChart.textRemoveChart": "Supprimer le graphique",
+  "PE.Views.EditChart.textReorder": "Réorganiser",
+  "PE.Views.EditChart.textSize": "Taille",
+  "PE.Views.EditChart.textStyle": "Style",
+  "PE.Views.EditChart.textToBackground": "Mettre en arrière-plan",
+  "PE.Views.EditChart.textToForeground": "Mettre au premier plan",
+  "PE.Views.EditChart.textType": "Type",
+  "PE.Views.EditChart.txtDistribHor": "Distribuer horizontalement",
+  "PE.Views.EditChart.txtDistribVert": "Distribuer verticalement",
+  "PE.Views.EditImage.textAddress": "Adresse",
+  "PE.Views.EditImage.textAlign": "Aligner",
+  "PE.Views.EditImage.textAlignBottom": "Aligner en bas",
+  "PE.Views.EditImage.textAlignCenter": "Aligner au centre",
+  "PE.Views.EditImage.textAlignLeft": "Aligner à gauche",
+  "PE.Views.EditImage.textAlignMiddle": "Aligner au milieu",
+  "PE.Views.EditImage.textAlignRight": "Aligner à droite",
+  "PE.Views.EditImage.textAlignTop": "Aligner en haut",
+  "PE.Views.EditImage.textBack": "Retour",
+  "PE.Views.EditImage.textBackward": "Déplacer vers l'arrière",
+  "PE.Views.EditImage.textDefault": "Taille par défaut",
+  "PE.Views.EditImage.textForward": "Déplacer vers l'avant",
+  "PE.Views.EditImage.textFromLibrary": "Image de la bibliothèque",
+  "PE.Views.EditImage.textFromURL": "Image à partir d'une URL",
+  "PE.Views.EditImage.textImageURL": "URL d'une image",
+  "PE.Views.EditImage.textLinkSettings": "Paramètres de lien",
+  "PE.Views.EditImage.textRemove": "Supprimer l'image",
+  "PE.Views.EditImage.textReorder": "Réorganiser",
+  "PE.Views.EditImage.textReplace": "Remplacer",
+  "PE.Views.EditImage.textReplaceImg": "Remplacer l’image",
+  "PE.Views.EditImage.textToBackground": "Mettre en arrière-plan",
+  "PE.Views.EditImage.textToForeground": "Mettre au premier plan",
+  "PE.Views.EditImage.txtDistribHor": "Distribuer horizontalement",
+  "PE.Views.EditImage.txtDistribVert": "Distribuer verticalement",
+  "PE.Views.EditLink.textBack": "Retour",
+  "PE.Views.EditLink.textDisplay": "Afficher",
+  "PE.Views.EditLink.textEdit": "Modifier le lien",
+  "PE.Views.EditLink.textExternalLink": "Lien externe",
+  "PE.Views.EditLink.textFirst": "Première diapositive",
+  "PE.Views.EditLink.textInternalLink": "Diapositive dans cette présentation",
+  "PE.Views.EditLink.textLast": "Dernière diapositive",
+  "PE.Views.EditLink.textLink": "Lien",
+  "PE.Views.EditLink.textLinkSlide": "Lier à",
+  "PE.Views.EditLink.textLinkType": "Type de lien",
+  "PE.Views.EditLink.textNext": "Diapositive suivante",
+  "PE.Views.EditLink.textNumber": "Numéro de diapositive",
+  "PE.Views.EditLink.textPrev": "Diapositive précédente",
+  "PE.Views.EditLink.textRemove": "Supprimer le lien",
+  "PE.Views.EditLink.textTip": "Info-bulle",
+  "PE.Views.EditShape.textAlign": "Aligner",
+  "PE.Views.EditShape.textAlignBottom": "Aligner en bas",
+  "PE.Views.EditShape.textAlignCenter": "Aligner au centre",
+  "PE.Views.EditShape.textAlignLeft": "Aligner à gauche",
+  "PE.Views.EditShape.textAlignMiddle": "Aligner au milieu",
+  "PE.Views.EditShape.textAlignRight": "Aligner à droite",
+  "PE.Views.EditShape.textAlignTop": "Aligner en haut",
+  "PE.Views.EditShape.textBack": "Retour",
+  "PE.Views.EditShape.textBackward": "Déplacer vers l'arrière",
+  "PE.Views.EditShape.textBorder": "Bordure",
+  "PE.Views.EditShape.textColor": "Couleur",
+  "PE.Views.EditShape.textEffects": "Effets",
+  "PE.Views.EditShape.textFill": "Remplissage",
+  "PE.Views.EditShape.textForward": "Déplacer vers l'avant",
+  "PE.Views.EditShape.textOpacity": "Opacité",
+  "PE.Views.EditShape.textRemoveShape": "Supprimer la forme",
+  "PE.Views.EditShape.textReorder": "Réorganiser",
+  "PE.Views.EditShape.textReplace": "Remplacer",
+  "PE.Views.EditShape.textSize": "Taille",
+  "PE.Views.EditShape.textStyle": "Style",
+  "PE.Views.EditShape.textToBackground": "Mettre en arrière-plan",
+  "PE.Views.EditShape.textToForeground": "Mettre au premier plan",
+  "PE.Views.EditShape.txtDistribHor": "Distribuer horizontalement",
+  "PE.Views.EditShape.txtDistribVert": "Distribuer verticalement",
+  "PE.Views.EditSlide.textApplyAll": "Appliquer à toutes les diapositives",
+  "PE.Views.EditSlide.textBack": "Retour",
+  "PE.Views.EditSlide.textBlack": "À travers le noir",
+  "PE.Views.EditSlide.textBottom": "En bas",
+  "PE.Views.EditSlide.textBottomLeft": "Bas à gauche",
+  "PE.Views.EditSlide.textBottomRight": "Bas à droite",
+  "PE.Views.EditSlide.textClock": "Horloge",
+  "PE.Views.EditSlide.textClockwise": "Dans le sens des aiguilles d'une montre",
+  "PE.Views.EditSlide.textColor": "Couleur",
+  "PE.Views.EditSlide.textCounterclockwise": "Dans le sens inverse des aiguilles d'une montre",
+  "PE.Views.EditSlide.textCover": "Couvrir",
+  "PE.Views.EditSlide.textDelay": "Retard",
+  "PE.Views.EditSlide.textDuplicateSlide": "Dupliquer la diapositive",
+  "PE.Views.EditSlide.textDuration": "Durée",
+  "PE.Views.EditSlide.textEffect": "Effet",
+  "PE.Views.EditSlide.textFade": "Fondu",
+  "PE.Views.EditSlide.textFill": "Remplissage",
+  "PE.Views.EditSlide.textHorizontalIn": "Horizontal intérieur",
+  "PE.Views.EditSlide.textHorizontalOut": "Horizontal extérieur",
+  "PE.Views.EditSlide.textLayout": "Disposition",
+  "PE.Views.EditSlide.textLeft": "À gauche",
+  "PE.Views.EditSlide.textNone": "Aucun",
+  "PE.Views.EditSlide.textOpacity": "Opacité",
+  "PE.Views.EditSlide.textPush": "Expulsion",
+  "PE.Views.EditSlide.textRemoveSlide": "Supprimer la diapositive",
+  "PE.Views.EditSlide.textRight": "À droite",
+  "PE.Views.EditSlide.textSmoothly": "Transition douce",
+  "PE.Views.EditSlide.textSplit": "Fractionner",
+  "PE.Views.EditSlide.textStartOnClick": "Démarrer en cliquant",
+  "PE.Views.EditSlide.textStyle": "Style",
+  "PE.Views.EditSlide.textTheme": "Thème",
+  "PE.Views.EditSlide.textTop": "En haut",
+  "PE.Views.EditSlide.textTopLeft": "Haut à gauche",
+  "PE.Views.EditSlide.textTopRight": "Haut à droite",
+  "PE.Views.EditSlide.textTransition": "Transition",
+  "PE.Views.EditSlide.textType": "Type",
+  "PE.Views.EditSlide.textUnCover": "Découvrir",
+  "PE.Views.EditSlide.textVerticalIn": "Vertical intérieur",
+  "PE.Views.EditSlide.textVerticalOut": "Vertical extérieur ",
+  "PE.Views.EditSlide.textWedge": "Coin",
+  "PE.Views.EditSlide.textWipe": "Balayer",
+  "PE.Views.EditSlide.textZoom": "Zoom",
+  "PE.Views.EditSlide.textZoomIn": "Agrandir",
+  "PE.Views.EditSlide.textZoomOut": "Diminuer",
+  "PE.Views.EditSlide.textZoomRotate": "Zoom et rotation",
+  "PE.Views.EditTable.textAlign": "Aligner",
+  "PE.Views.EditTable.textAlignBottom": "Aligner en bas",
+  "PE.Views.EditTable.textAlignCenter": "Aligner au centre",
+  "PE.Views.EditTable.textAlignLeft": "Aligner à gauche",
+  "PE.Views.EditTable.textAlignMiddle": "Aligner au milieu",
+  "PE.Views.EditTable.textAlignRight": "Aligner à droite",
+  "PE.Views.EditTable.textAlignTop": "Aligner en haut",
+  "PE.Views.EditTable.textBack": "Retour",
+  "PE.Views.EditTable.textBackward": "Déplacer vers l'arrière",
+  "PE.Views.EditTable.textBandedColumn": "Colonne à bandes",
+  "PE.Views.EditTable.textBandedRow": "Ligne à bandes",
+  "PE.Views.EditTable.textBorder": "Bordure",
+  "PE.Views.EditTable.textCellMargins": "Marges de la cellule",
+  "PE.Views.EditTable.textColor": "Couleur",
+  "PE.Views.EditTable.textFill": "Remplissage",
+  "PE.Views.EditTable.textFirstColumn": "Première colonne",
+  "PE.Views.EditTable.textForward": "Déplacer vers l'avant",
+  "PE.Views.EditTable.textHeaderRow": "Ligne d’en-tête",
+  "PE.Views.EditTable.textLastColumn": "Dernière colonne",
+  "PE.Views.EditTable.textOptions": "Options",
+  "PE.Views.EditTable.textRemoveTable": "Supprimer la table",
+  "PE.Views.EditTable.textReorder": "Réorganiser",
+  "PE.Views.EditTable.textSize": "Taille",
+  "PE.Views.EditTable.textStyle": "Style",
+  "PE.Views.EditTable.textStyleOptions": "Options de style",
+  "PE.Views.EditTable.textTableOptions": "Options du tableau",
+  "PE.Views.EditTable.textToBackground": "Mettre en arrière-plan",
+  "PE.Views.EditTable.textToForeground": "Mettre au premier plan",
+  "PE.Views.EditTable.textTotalRow": "Ligne de total",
+  "PE.Views.EditTable.txtDistribHor": "Distribuer horizontalement",
+  "PE.Views.EditTable.txtDistribVert": "Distribuer verticalement",
+  "PE.Views.EditText.textAdditional": "Supplémentaire",
+  "PE.Views.EditText.textAdditionalFormat": "Supplémentaire",
+  "PE.Views.EditText.textAfter": "Après",
+  "PE.Views.EditText.textAllCaps": "Majuscules",
+  "PE.Views.EditText.textAutomatic": "Automatique",
+  "PE.Views.EditText.textBack": "Retour",
+  "PE.Views.EditText.textBefore": "Avant",
+  "PE.Views.EditText.textBullets": "Puces",
+  "PE.Views.EditText.textDblStrikethrough": "Double biffés",
+  "PE.Views.EditText.textDblSuperscript": "Exposant",
+  "PE.Views.EditText.textFontColor": "Couleur de police",
+  "PE.Views.EditText.textFontColors": "Couleurs de police",
+  "PE.Views.EditText.textFonts": "Polices",
+  "PE.Views.EditText.textFromText": "Distance du texte",
+  "PE.Views.EditText.textLetterSpacing": "Espacement entre les lettres",
+  "PE.Views.EditText.textLineSpacing": "Interligne",
+  "PE.Views.EditText.textNone": "Aucun",
+  "PE.Views.EditText.textNumbers": "Numéros",
+  "PE.Views.EditText.textSize": "Taille",
+  "PE.Views.EditText.textSmallCaps": "Petites majuscules",
+  "PE.Views.EditText.textStrikethrough": "Barré",
+  "PE.Views.EditText.textSubscript": "Indice",
+  "PE.Views.Search.textSearch": "Search",
+  "PE.Views.Settings.mniSlideStandard": "Standard (4:3)",
+  "PE.Views.Settings.mniSlideWide": "Écran large (16:9)",
+  "PE.Views.Settings.textAbout": "À propos du produit",
+  "PE.Views.Settings.textAddress": "adresse",
+  "PE.Views.Settings.textAuthor": "Auteur",
+  "PE.Views.Settings.textBack": "Retour",
+  "PE.Views.Settings.textCreateDate": "Date de création",
+  "PE.Views.Settings.textDone": "Terminé",
+  "PE.Views.Settings.textDownload": "Télécharger",
+  "PE.Views.Settings.textDownloadAs": "Télécharger comme...",
+  "PE.Views.Settings.textEditPresent": "Modifier la présentation",
+  "PE.Views.Settings.textEmail": "e-mail",
+  "PE.Views.Settings.textFind": "Trouver",
+  "PE.Views.Settings.textHelp": "Aide",
+  "PE.Views.Settings.textLoading": "Chargement en cours...",
+  "PE.Views.Settings.textPresentInfo": "Infos sur présentation",
+  "PE.Views.Settings.textPresentSetup": "Paramètres de la présentation",
+  "PE.Views.Settings.textPresentTitle": "Titre de la présentation",
+  "PE.Views.Settings.textSettings": "Paramètres",
+  "PE.Views.Settings.textSlideSize": "Taille de la diapositive",
+  "PE.Views.Settings.textTel": "Tél.",
+  "PE.Views.Settings.textVersion": "Version",
+  "PE.Views.Settings.unknownText": "Inconnu",
+  "PE.Views.Toolbar.textBack": "Retour"
+}

apps/presentationeditor/mobile/locale/ru.json

@@ -0,0 +1,431 @@
+{
+  "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы",
+  "Common.Utils.Metric.txtCm": "см",
+  "Common.Utils.Metric.txtPt": "пт",
+  "PE.Controllers.AddContainer.textImage": "Картинка",
+  "PE.Controllers.AddContainer.textLink": "Ссылка",
+  "PE.Controllers.AddContainer.textShape": "Фигура",
+  "PE.Controllers.AddContainer.textSlide": "Слайд",
+  "PE.Controllers.AddContainer.textTable": "Таблица",
+  "PE.Controllers.AddImage.textEmptyImgUrl": "Необходимо указать URL изображения.",
+  "PE.Controllers.AddImage.txtNotUrl": "Это поле должно быть URL-адресом в формате 'http://www.example.com'",
+  "PE.Controllers.AddLink.textDefault": "Выделенный текст",
+  "PE.Controllers.AddLink.textExternalLink": "Внешняя ссылка",
+  "PE.Controllers.AddLink.textFirst": "Первый слайд",
+  "PE.Controllers.AddLink.textInternalLink": "Слайд в этой презентации",
+  "PE.Controllers.AddLink.textLast": "Последний слайд",
+  "PE.Controllers.AddLink.textNext": "Следующий слайд",
+  "PE.Controllers.AddLink.textPrev": "Предыдущий слайд",
+  "PE.Controllers.AddLink.textSlide": "Слайд",
+  "PE.Controllers.AddLink.txtNotUrl": "Это поле должно быть URL-адресом в формате 'http://www.example.com'",
+  "PE.Controllers.AddTable.textCancel": "Отмена",
+  "PE.Controllers.AddTable.textColumns": "Столбцы",
+  "PE.Controllers.AddTable.textRows": "Строки",
+  "PE.Controllers.AddTable.textTableSize": "Размер таблицы",
+  "PE.Controllers.DocumentHolder.menuAddLink": "Добавить ссылку",
+  "PE.Controllers.DocumentHolder.menuCopy": "Копировать",
+  "PE.Controllers.DocumentHolder.menuCut": "Вырезать",
+  "PE.Controllers.DocumentHolder.menuDelete": "Удалить",
+  "PE.Controllers.DocumentHolder.menuEdit": "Редактировать",
+  "PE.Controllers.DocumentHolder.menuOpenLink": "Перейти по ссылке",
+  "PE.Controllers.DocumentHolder.menuPaste": "Вставить",
+  "PE.Controllers.DocumentHolder.menuMore": "Еще",
+  "PE.Controllers.DocumentHolder.sheetCancel": "Отмена",
+  "PE.Controllers.EditContainer.textChart": "Диаграмма",
+  "PE.Controllers.EditContainer.textHyperlink": "Гиперссылка",
+  "PE.Controllers.EditContainer.textImage": "Изображение",
+  "PE.Controllers.EditContainer.textSettings": "Настройки",
+  "PE.Controllers.EditContainer.textShape": "Фигура",
+  "PE.Controllers.EditContainer.textSlide": "Слайд",
+  "PE.Controllers.EditContainer.textTable": "Таблица",
+  "PE.Controllers.EditContainer.textText": "Текст",
+  "PE.Controllers.EditImage.textEmptyImgUrl": "Необходимо указать URL изображения.",
+  "PE.Controllers.EditImage.txtNotUrl": "Это поле должно быть URL-адресом в формате 'http://www.example.com'",
+  "PE.Controllers.EditLink.textDefault": "Выделенный текст",
+  "PE.Controllers.EditLink.textExternalLink": "Внешняя ссылка",
+  "PE.Controllers.EditLink.textFirst": "Первый слайд",
+  "PE.Controllers.EditLink.textInternalLink": "Слайд в этой презентации",
+  "PE.Controllers.EditLink.textLast": "Последний слайд",
+  "PE.Controllers.EditLink.textNext": "Следующий слайд",
+  "PE.Controllers.EditLink.textPrev": "Предыдущий слайд",
+  "PE.Controllers.EditLink.textSlide": "Слайд",
+  "PE.Controllers.EditLink.txtNotUrl": "Это поле должно быть URL-адресом в формате 'http://www.example.com'",
+  "PE.Controllers.EditSlide.textSec": "сек",
+  "PE.Controllers.EditText.textAuto": "Авто",
+  "PE.Controllers.EditText.textFonts": "Шрифты",
+  "PE.Controllers.EditText.textPt": "пт",
+  "PE.Controllers.Main.advDRMEnterPassword": "Введите пароль:",
+  "PE.Controllers.Main.advDRMOptions": "Защищенный файл",
+  "PE.Controllers.Main.advDRMPassword": "Пароль",
+  "PE.Controllers.Main.applyChangesTextText": "Загрузка данных...",
+  "PE.Controllers.Main.applyChangesTitleText": "Загрузка данных",
+  "PE.Controllers.Main.convertationTimeoutText": "Превышено время ожидания конвертации.",
+  "PE.Controllers.Main.criticalErrorExtText": "Нажмите 'OK' для возврата к списку документов.",
+  "PE.Controllers.Main.criticalErrorTitle": "Ошибка",
+  "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor",
+  "PE.Controllers.Main.downloadErrorText": "Загрузка не удалась.",
+  "PE.Controllers.Main.downloadTextText": "Загрузка документа...",
+  "PE.Controllers.Main.downloadTitleText": "Загрузка документа",
+  "PE.Controllers.Main.errorCoAuthoringDisconnect": "Подключение к серверу прервано. Редактирование недоступно.",
+  "PE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.<br><br>Дополнительную информацию о подключении Сервера документов можно найти <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">здесь</a>",
+  "PE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Пожалуйста, обратитесь в службу технической поддержки.",
+  "PE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
+  "PE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
+  "PE.Controllers.Main.errorFilePassProtect": "Документ защищен паролем.",
+  "PE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
+  "PE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек",
+  "PE.Controllers.Main.errorProcessSaveResult": "Не удалось завершить сохранение.",
+  "PE.Controllers.Main.errorServerVersion": "Версия редактора была обновлена. Страница будет перезагружена, чтобы применить изменения.",
+  "PE.Controllers.Main.errorStockChart": "Неверный порядок строк. Чтобы создать биржевую диаграмму, расположите данные на листе в следующем порядке:<br> цена открытия, максимальная цена, минимальная цена, цена закрытия.",
+  "PE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.",
+  "PE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.",
+  "PE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей",
+  "PE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,<br>но не сможете скачать или напечатать его до восстановления подключения.",
+  "PE.Controllers.Main.leavePageText": "В документе есть несохраненные изменения. Нажмите 'Остаться на странице', чтобы дождаться автосохранения документа. Нажмите 'Уйти со страницы', чтобы сбросить все несохраненные изменения.",
+  "PE.Controllers.Main.loadFontsTextText": "Загрузка данных...",
+  "PE.Controllers.Main.loadFontsTitleText": "Загрузка данных",
+  "PE.Controllers.Main.loadFontTextText": "Загрузка данных...",
+  "PE.Controllers.Main.loadFontTitleText": "Загрузка данных",
+  "PE.Controllers.Main.loadImagesTextText": "Загрузка изображений...",
+  "PE.Controllers.Main.loadImagesTitleText": "Загрузка изображений",
+  "PE.Controllers.Main.loadImageTextText": "Загрузка изображения...",
+  "PE.Controllers.Main.loadImageTitleText": "Загрузка изображения",
+  "PE.Controllers.Main.loadingDocumentTextText": "Загрузка презентации...",
+  "PE.Controllers.Main.loadingDocumentTitleText": "Загрузка презентации",
+  "PE.Controllers.Main.loadThemeTextText": "Загрузка темы...",
+  "PE.Controllers.Main.loadThemeTitleText": "Загрузка темы",
+  "PE.Controllers.Main.notcriticalErrorTitle": "Внимание",
+  "PE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка",
+  "PE.Controllers.Main.openTextText": "Открытие документа...",
+  "PE.Controllers.Main.openTitleText": "Открытие документа",
+  "PE.Controllers.Main.printTextText": "Печать документа...",
+  "PE.Controllers.Main.printTitleText": "Печать документа",
+  "PE.Controllers.Main.reloadButtonText": "Обновить страницу",
+  "PE.Controllers.Main.requestEditFailedMessageText": "В настоящее время документ редактируется. Пожалуйста, попробуйте позже.",
+  "PE.Controllers.Main.requestEditFailedTitleText": "Доступ запрещен",
+  "PE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка",
+  "PE.Controllers.Main.savePreparingText": "Подготовка к сохранению",
+  "PE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...",
+  "PE.Controllers.Main.saveTextText": "Сохранение документа...",
+  "PE.Controllers.Main.saveTitleText": "Сохранение документа",
+  "PE.Controllers.Main.splitDividerErrorText": "Число строк должно являться делителем для %1",
+  "PE.Controllers.Main.splitMaxColsErrorText": "Число столбцов должно быть меньше, чем %1",
+  "PE.Controllers.Main.splitMaxRowsErrorText": "Число строк должно быть меньше, чем %1",
+  "PE.Controllers.Main.textAnonymous": "Анонимный пользователь",
+  "PE.Controllers.Main.textBack": "Назад",
+  "PE.Controllers.Main.textBuyNow": "Перейти на сайт",
+  "PE.Controllers.Main.textCancel": "Отмена",
+  "PE.Controllers.Main.textClose": "Закрыть",
+  "PE.Controllers.Main.textCloseTip": "Коснитесь, чтобы закрыть подсказку.",
+  "PE.Controllers.Main.textContactUs": "Связаться с отделом продаж",
+  "PE.Controllers.Main.textDone": "Готово",
+  "PE.Controllers.Main.textLoadingDocument": "Загрузка презентации",
+  "PE.Controllers.Main.textNoLicenseTitle": "Open source версия ONLYOFFICE",
+  "PE.Controllers.Main.textOK": "OK",
+  "PE.Controllers.Main.textPassword": "Пароль",
+  "PE.Controllers.Main.textPreloader": "Загрузка...",
+  "PE.Controllers.Main.textShape": "Фигура",
+  "PE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.",
+  "PE.Controllers.Main.textUsername": "Имя пользователя",
+  "PE.Controllers.Main.titleLicenseExp": "Истек срок действия лицензии",
+  "PE.Controllers.Main.titleServerVersion": "Редактор обновлен",
+  "PE.Controllers.Main.txtArt": "Введите ваш текст",
+  "PE.Controllers.Main.txtBasicShapes": "Основные фигуры",
+  "PE.Controllers.Main.txtButtons": "Кнопки",
+  "PE.Controllers.Main.txtCallouts": "Выноски",
+  "PE.Controllers.Main.txtCharts": "Схемы",
+  "PE.Controllers.Main.txtDiagramTitle": "Заголовок диаграммы",
+  "PE.Controllers.Main.txtEditingMode": "Установка режима редактирования...",
+  "PE.Controllers.Main.txtFiguredArrows": "Фигурные стрелки",
+  "PE.Controllers.Main.txtLines": "Линии",
+  "PE.Controllers.Main.txtMath": "Математические знаки",
+  "PE.Controllers.Main.txtNeedSynchronize": "Есть обновления",
+  "PE.Controllers.Main.txtRectangles": "Прямоугольники",
+  "PE.Controllers.Main.txtSeries": "Ряд",
+  "PE.Controllers.Main.txtSldLtTBlank": "Пустой слайд",
+  "PE.Controllers.Main.txtSldLtTChart": "Диаграмма",
+  "PE.Controllers.Main.txtSldLtTChartAndTx": "Диаграмма и текст",
+  "PE.Controllers.Main.txtSldLtTClipArtAndTx": "Графика и текст",
+  "PE.Controllers.Main.txtSldLtTClipArtAndVertTx": "Графика и вертикальный текст",
+  "PE.Controllers.Main.txtSldLtTCust": "Особый",
+  "PE.Controllers.Main.txtSldLtTDgm": "Схема",
+  "PE.Controllers.Main.txtSldLtTFourObj": "Четыре объекта",
+  "PE.Controllers.Main.txtSldLtTMediaAndTx": "Медиаклип и текст",
+  "PE.Controllers.Main.txtSldLtTObj": "Заголовок и объект",
+  "PE.Controllers.Main.txtSldLtTObjAndTwoObj": "Объект и два объекта",
+  "PE.Controllers.Main.txtSldLtTObjAndTx": "Объект и текст",
+  "PE.Controllers.Main.txtSldLtTObjOnly": "Объект",
+  "PE.Controllers.Main.txtSldLtTObjOverTx": "Объект над текстом",
+  "PE.Controllers.Main.txtSldLtTObjTx": "Заголовок, объект и подпись",
+  "PE.Controllers.Main.txtSldLtTPicTx": "Рисунок с подписью",
+  "PE.Controllers.Main.txtSldLtTSecHead": "Заголовок раздела",
+  "PE.Controllers.Main.txtSldLtTTbl": "Таблица",
+  "PE.Controllers.Main.txtSldLtTTitle": "Титульный слайд",
+  "PE.Controllers.Main.txtSldLtTTitleOnly": "Только заголовок",
+  "PE.Controllers.Main.txtSldLtTTwoColTx": "Текст в две колонки",
+  "PE.Controllers.Main.txtSldLtTTwoObj": "Два объекта",
+  "PE.Controllers.Main.txtSldLtTTwoObjAndObj": "Два объекта и объект",
+  "PE.Controllers.Main.txtSldLtTTwoObjAndTx": "Два объекта и текст",
+  "PE.Controllers.Main.txtSldLtTTwoObjOverTx": "Два объекта над текстом",
+  "PE.Controllers.Main.txtSldLtTTwoTxTwoObj": "Два текста и два объекта",
+  "PE.Controllers.Main.txtSldLtTTx": "Текст",
+  "PE.Controllers.Main.txtSldLtTTxAndChart": "Текст и диаграмма",
+  "PE.Controllers.Main.txtSldLtTTxAndClipArt": "Текст и графика",
+  "PE.Controllers.Main.txtSldLtTTxAndMedia": "Текст и медиаклип",
+  "PE.Controllers.Main.txtSldLtTTxAndObj": "Текст и объект",
+  "PE.Controllers.Main.txtSldLtTTxAndTwoObj": "Текст и два объекта",
+  "PE.Controllers.Main.txtSldLtTTxOverObj": "Текст над объектом",
+  "PE.Controllers.Main.txtSldLtTVertTitleAndTx": "Вертикальный заголовок и текст",
+  "PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "Вертикальный заголовок и текст над диаграммой",
+  "PE.Controllers.Main.txtSldLtTVertTx": "Вертикальный текст",
+  "PE.Controllers.Main.txtStarsRibbons": "Звезды и ленты",
+  "PE.Controllers.Main.txtXAxis": "Ось X",
+  "PE.Controllers.Main.txtYAxis": "Ось Y",
+  "PE.Controllers.Main.unknownErrorText": "Неизвестная ошибка.",
+  "PE.Controllers.Main.unsupportedBrowserErrorText ": "Ваш браузер не поддерживается.",
+  "PE.Controllers.Main.uploadImageExtMessage": "Неизвестный формат изображения.",
+  "PE.Controllers.Main.uploadImageFileCountMessage": "Ни одного изображения не загружено.",
+  "PE.Controllers.Main.uploadImageSizeMessage": "Превышен максимальный размер изображения.",
+  "PE.Controllers.Main.uploadImageTextText": "Загрузка изображения...",
+  "PE.Controllers.Main.uploadImageTitleText": "Загрузка изображения",
+  "PE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.<br>Обновите лицензию, а затем обновите страницу.",
+  "PE.Controllers.Main.warnNoLicense": "Вы используете open source версию ONLYOFFICE. Эта версия имеет ограничения по количеству одновременных подключений к серверу документов (20 подключений одновременно).<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
+  "PE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
+  "PE.Controllers.Search.textNoTextFound": "Текст не найден",
+  "PE.Controllers.Settings.notcriticalErrorTitle": "Внимание",
+  "PE.Controllers.Settings.txtLoading": "Загрузка...",
+  "PE.Controllers.Toolbar.dlgLeaveMsgText": "В документе есть несохраненные изменения. Нажмите 'Остаться на странице', чтобы дождаться автосохранения документа. Нажмите 'Уйти со страницы', чтобы сбросить все несохраненные изменения.",
+  "PE.Controllers.Toolbar.dlgLeaveTitleText": "Вы выходите из приложения",
+  "PE.Controllers.Toolbar.leaveButtonText": "Уйти со страницы",
+  "PE.Controllers.Toolbar.stayButtonText": "Остаться на странице",
+  "PE.Views.AddImage.textAddress": "Адрес",
+  "PE.Views.AddImage.textBack": "Назад",
+  "PE.Views.AddImage.textFromLibrary": "Изображение из библиотеки",
+  "PE.Views.AddImage.textFromURL": "Изображение по URL",
+  "PE.Views.AddImage.textImageURL": "URL изображения",
+  "PE.Views.AddImage.textInsertImage": "Вставить изображение",
+  "PE.Views.AddImage.textLinkSettings": "Настройки ссылки",
+  "PE.Views.AddLink.textBack": "Назад",
+  "PE.Views.AddLink.textDisplay": "Отображать",
+  "PE.Views.AddLink.textExternalLink": "Внешняя ссылка",
+  "PE.Views.AddLink.textFirst": "Первый слайд",
+  "PE.Views.AddLink.textInsert": "Вставить",
+  "PE.Views.AddLink.textInternalLink": "Слайд в этой презентации",
+  "PE.Views.AddLink.textLast": "Последний слайд",
+  "PE.Views.AddLink.textLink": "Ссылка",
+  "PE.Views.AddLink.textLinkSlide": "Связать с",
+  "PE.Views.AddLink.textLinkType": "Тип ссылки",
+  "PE.Views.AddLink.textNext": "Следующий слайд",
+  "PE.Views.AddLink.textNumber": "Номер слайда",
+  "PE.Views.AddLink.textPrev": "Предыдущий слайд",
+  "PE.Views.AddLink.textTip": "Подсказка",
+  "PE.Views.EditChart.textAlign": "Выравнивание",
+  "PE.Views.EditChart.textAlignBottom": "По нижнему краю",
+  "PE.Views.EditChart.textAlignCenter": "По центру",
+  "PE.Views.EditChart.textAlignLeft": "По левому краю",
+  "PE.Views.EditChart.textAlignMiddle": "По середине",
+  "PE.Views.EditChart.textAlignRight": "По правому краю",
+  "PE.Views.EditChart.textAlignTop": "По верхнему краю",
+  "PE.Views.EditChart.textBack": "Назад",
+  "PE.Views.EditChart.textBackward": "Перенести назад",
+  "PE.Views.EditChart.textBorder": "Граница",
+  "PE.Views.EditChart.textColor": "Цвет",
+  "PE.Views.EditChart.textFill": "Заливка",
+  "PE.Views.EditChart.textForward": "Перенести вперед",
+  "PE.Views.EditChart.textRemoveChart": "Удалить диаграмму",
+  "PE.Views.EditChart.textReorder": "Порядок",
+  "PE.Views.EditChart.textSize": "Размер",
+  "PE.Views.EditChart.textStyle": "Стиль",
+  "PE.Views.EditChart.textToBackground": "Перенести на задний план",
+  "PE.Views.EditChart.textToForeground": "Перенести на передний план",
+  "PE.Views.EditChart.textType": "Тип",
+  "PE.Views.EditChart.txtDistribHor": "Распределить по горизонтали",
+  "PE.Views.EditChart.txtDistribVert": "Распределить по вертикали",
+  "PE.Views.EditImage.textAddress": "Адрес",
+  "PE.Views.EditImage.textAlign": "Выравнивание",
+  "PE.Views.EditImage.textAlignBottom": "По нижнему краю",
+  "PE.Views.EditImage.textAlignCenter": "По центру",
+  "PE.Views.EditImage.textAlignLeft": "По левому краю",
+  "PE.Views.EditImage.textAlignMiddle": "По середине",
+  "PE.Views.EditImage.textAlignRight": "По правому краю",
+  "PE.Views.EditImage.textAlignTop": "По верхнему краю",
+  "PE.Views.EditImage.textBack": "Назад",
+  "PE.Views.EditImage.textBackward": "Перенести назад",
+  "PE.Views.EditImage.textDefault": "Размер по умолчанию",
+  "PE.Views.EditImage.textForward": "Перенести вперед",
+  "PE.Views.EditImage.textFromLibrary": "Изображение из библиотеки",
+  "PE.Views.EditImage.textFromURL": "Изображение по URL",
+  "PE.Views.EditImage.textImageURL": "URL изображения",
+  "PE.Views.EditImage.textLinkSettings": "Настройки ссылки",
+  "PE.Views.EditImage.textRemove": "Удалить изображение",
+  "PE.Views.EditImage.textReorder": "Порядок",
+  "PE.Views.EditImage.textReplace": "Заменить",
+  "PE.Views.EditImage.textReplaceImg": "Заменить изображение",
+  "PE.Views.EditImage.textToBackground": "Перенести на задний план",
+  "PE.Views.EditImage.textToForeground": "Перенести на передний план",
+  "PE.Views.EditImage.txtDistribHor": "Распределить по горизонтали",
+  "PE.Views.EditImage.txtDistribVert": "Распределить по вертикали",
+  "PE.Views.EditLink.textBack": "Назад",
+  "PE.Views.EditLink.textDisplay": "Отображать",
+  "PE.Views.EditLink.textEdit": "Редактировать ссылку",
+  "PE.Views.EditLink.textExternalLink": "Внешняя ссылка",
+  "PE.Views.EditLink.textFirst": "Первый слайд",
+  "PE.Views.EditLink.textInternalLink": "Слайд в этой презентации",
+  "PE.Views.EditLink.textLast": "Последний слайд",
+  "PE.Views.EditLink.textLink": "Ссылка",
+  "PE.Views.EditLink.textLinkSlide": "Связать с",
+  "PE.Views.EditLink.textLinkType": "Тип ссылки",
+  "PE.Views.EditLink.textNext": "Следующий слайд",
+  "PE.Views.EditLink.textNumber": "Номер слайда",
+  "PE.Views.EditLink.textPrev": "Предыдущий слайд",
+  "PE.Views.EditLink.textRemove": "Удалить ссылку",
+  "PE.Views.EditLink.textTip": "Подсказка",
+  "PE.Views.EditShape.textAlign": "Выравнивание",
+  "PE.Views.EditShape.textAlignBottom": "По нижнему краю",
+  "PE.Views.EditShape.textAlignCenter": "По центру",
+  "PE.Views.EditShape.textAlignLeft": "По левому краю",
+  "PE.Views.EditShape.textAlignMiddle": "По середине",
+  "PE.Views.EditShape.textAlignRight": "По правому краю",
+  "PE.Views.EditShape.textAlignTop": "По верхнему краю",
+  "PE.Views.EditShape.textBack": "Назад",
+  "PE.Views.EditShape.textBackward": "Перенести назад",
+  "PE.Views.EditShape.textBorder": "Граница",
+  "PE.Views.EditShape.textColor": "Цвет",
+  "PE.Views.EditShape.textEffects": "Эффекты",
+  "PE.Views.EditShape.textFill": "Заливка",
+  "PE.Views.EditShape.textForward": "Перенести вперед",
+  "PE.Views.EditShape.textOpacity": "Прозрачность",
+  "PE.Views.EditShape.textRemoveShape": "Удалить фигуру",
+  "PE.Views.EditShape.textReorder": "Порядок",
+  "PE.Views.EditShape.textReplace": "Заменить",
+  "PE.Views.EditShape.textSize": "Размер",
+  "PE.Views.EditShape.textStyle": "Стиль",
+  "PE.Views.EditShape.textToBackground": "Перенести на задний план",
+  "PE.Views.EditShape.textToForeground": "Перенести на передний план",
+  "PE.Views.EditShape.txtDistribHor": "Распределить по горизонтали",
+  "PE.Views.EditShape.txtDistribVert": "Распределить по вертикали",
+  "PE.Views.EditSlide.textApplyAll": "Применить ко всем слайдам",
+  "PE.Views.EditSlide.textBack": "Назад",
+  "PE.Views.EditSlide.textBlack": "Через черное",
+  "PE.Views.EditSlide.textBottom": "Снизу",
+  "PE.Views.EditSlide.textBottomLeft": "Снизу слева",
+  "PE.Views.EditSlide.textBottomRight": "Снизу справа",
+  "PE.Views.EditSlide.textClock": "Часы",
+  "PE.Views.EditSlide.textClockwise": "По часовой стрелке",
+  "PE.Views.EditSlide.textColor": "Цвет",
+  "PE.Views.EditSlide.textCounterclockwise": "Против часовой стрелки",
+  "PE.Views.EditSlide.textCover": "Наплыв",
+  "PE.Views.EditSlide.textDelay": "Задержка",
+  "PE.Views.EditSlide.textDuplicateSlide": "Дублировать слайд",
+  "PE.Views.EditSlide.textDuration": "Длительность",
+  "PE.Views.EditSlide.textEffect": "Эффект",
+  "PE.Views.EditSlide.textFade": "Выцветание",
+  "PE.Views.EditSlide.textFill": "Заливка",
+  "PE.Views.EditSlide.textHorizontalIn": "По горизонтали внутрь",
+  "PE.Views.EditSlide.textHorizontalOut": "По горизонтали наружу",
+  "PE.Views.EditSlide.textLayout": "Макет",
+  "PE.Views.EditSlide.textLeft": "Слева",
+  "PE.Views.EditSlide.textNone": "Нет",
+  "PE.Views.EditSlide.textOpacity": "Прозрачность",
+  "PE.Views.EditSlide.textPush": "Задвигание",
+  "PE.Views.EditSlide.textRemoveSlide": "Удалить слайд",
+  "PE.Views.EditSlide.textRight": "Справа",
+  "PE.Views.EditSlide.textSmoothly": "Плавно",
+  "PE.Views.EditSlide.textSplit": "Панорама",
+  "PE.Views.EditSlide.textStartOnClick": "Запускать щелчком",
+  "PE.Views.EditSlide.textStyle": "Стиль",
+  "PE.Views.EditSlide.textTheme": "Тема",
+  "PE.Views.EditSlide.textTop": "Сверху",
+  "PE.Views.EditSlide.textTopLeft": "Сверху слева",
+  "PE.Views.EditSlide.textTopRight": "Сверху справа",
+  "PE.Views.EditSlide.textTransition": "Переход",
+  "PE.Views.EditSlide.textType": "Тип",
+  "PE.Views.EditSlide.textUnCover": "Открывание",
+  "PE.Views.EditSlide.textVerticalIn": "По вертикали внутрь",
+  "PE.Views.EditSlide.textVerticalOut": "По вертикали наружу",
+  "PE.Views.EditSlide.textWedge": "Симметрично по кругу",
+  "PE.Views.EditSlide.textWipe": "Появление",
+  "PE.Views.EditSlide.textZoom": "Масштабирование",
+  "PE.Views.EditSlide.textZoomIn": "Увеличение",
+  "PE.Views.EditSlide.textZoomOut": "Уменьшение",
+  "PE.Views.EditSlide.textZoomRotate": "Увеличение с поворотом",
+  "PE.Views.EditTable.textAlign": "Выравнивание",
+  "PE.Views.EditTable.textAlignBottom": "По нижнему краю",
+  "PE.Views.EditTable.textAlignCenter": "По центру",
+  "PE.Views.EditTable.textAlignLeft": "По левому краю",
+  "PE.Views.EditTable.textAlignMiddle": "По середине",
+  "PE.Views.EditTable.textAlignRight": "По правому краю",
+  "PE.Views.EditTable.textAlignTop": "По верхнему краю",
+  "PE.Views.EditTable.textBack": "Назад",
+  "PE.Views.EditTable.textBackward": "Перенести назад",
+  "PE.Views.EditTable.textBandedColumn": "Чередовать столбцы",
+  "PE.Views.EditTable.textBandedRow": "Чередовать строки",
+  "PE.Views.EditTable.textBorder": "Граница",
+  "PE.Views.EditTable.textCellMargins": "Поля ячейки",
+  "PE.Views.EditTable.textColor": "Цвет",
+  "PE.Views.EditTable.textFill": "Заливка",
+  "PE.Views.EditTable.textFirstColumn": "Первый столбец",
+  "PE.Views.EditTable.textForward": "Перенести вперед",
+  "PE.Views.EditTable.textHeaderRow": "Строка заголовка",
+  "PE.Views.EditTable.textLastColumn": "Последний столбец",
+  "PE.Views.EditTable.textOptions": "Параметры",
+  "PE.Views.EditTable.textRemoveTable": "Удалить таблицу",
+  "PE.Views.EditTable.textReorder": "Порядок",
+  "PE.Views.EditTable.textSize": "Размер",
+  "PE.Views.EditTable.textStyle": "Стиль",
+  "PE.Views.EditTable.textStyleOptions": "Настройки стиля",
+  "PE.Views.EditTable.textTableOptions": "Настройки таблицы",
+  "PE.Views.EditTable.textToBackground": "Перенести на задний план",
+  "PE.Views.EditTable.textToForeground": "Перенести на передний план",
+  "PE.Views.EditTable.textTotalRow": "Строка итогов",
+  "PE.Views.EditTable.txtDistribHor": "Распределить по горизонтали",
+  "PE.Views.EditTable.txtDistribVert": "Распределить по вертикали",
+  "PE.Views.EditText.textAdditional": "Дополнительно",
+  "PE.Views.EditText.textAdditionalFormat": "Дополнительно",
+  "PE.Views.EditText.textAfter": "После",
+  "PE.Views.EditText.textAllCaps": "Все прописные",
+  "PE.Views.EditText.textAutomatic": "Автоматический",
+  "PE.Views.EditText.textBack": "Назад",
+  "PE.Views.EditText.textBefore": "Перед",
+  "PE.Views.EditText.textBullets": "Маркеры",
+  "PE.Views.EditText.textDblStrikethrough": "Двойное зачёркивание",
+  "PE.Views.EditText.textDblSuperscript": "Надстрочные",
+  "PE.Views.EditText.textFontColor": "Цвет шрифта",
+  "PE.Views.EditText.textFontColors": "Цвета шрифта",
+  "PE.Views.EditText.textFonts": "Шрифты",
+  "PE.Views.EditText.textFromText": "Расстояние до текста",
+  "PE.Views.EditText.textLetterSpacing": "Интервал",
+  "PE.Views.EditText.textLineSpacing": "Междустрочный интервал",
+  "PE.Views.EditText.textNone": "Нет",
+  "PE.Views.EditText.textNumbers": "Нумерация",
+  "PE.Views.EditText.textSize": "Размер",
+  "PE.Views.EditText.textSmallCaps": "Малые прописные",
+  "PE.Views.EditText.textStrikethrough": "Зачеркнутый",
+  "PE.Views.EditText.textSubscript": "Подстрочные",
+  "PE.Views.Search.textSearch": "Найти",
+  "PE.Views.Settings.mniSlideStandard": "Стандартный (4:3)",
+  "PE.Views.Settings.mniSlideWide": "Широкоэкранный (16:9)",
+  "PE.Views.Settings.textAbout": "О продукте",
+  "PE.Views.Settings.textAddress": "адрес",
+  "PE.Views.Settings.textAuthor": "Автор",
+  "PE.Views.Settings.textBack": "Назад",
+  "PE.Views.Settings.textCreateDate": "Дата создания",
+  "PE.Views.Settings.textDone": "Готово",
+  "PE.Views.Settings.textDownload": "Скачать",
+  "PE.Views.Settings.textDownloadAs": "Скачать как...",
+  "PE.Views.Settings.textEditPresent": "Редактировать",
+  "PE.Views.Settings.textEmail": "email",
+  "PE.Views.Settings.textFind": "Найти",
+  "PE.Views.Settings.textHelp": "Справка",
+  "PE.Views.Settings.textLoading": "Загрузка...",
+  "PE.Views.Settings.textPresentInfo": "Информация о презентации",
+  "PE.Views.Settings.textPresentSetup": "Настройка презентации",
+  "PE.Views.Settings.textPresentTitle": "Название презентации",
+  "PE.Views.Settings.textSettings": "Настройки",
+  "PE.Views.Settings.textSlideSize": "Размер слайда",
+  "PE.Views.Settings.textTel": "Телефон",
+  "PE.Views.Settings.textVersion": "Версия",
+  "PE.Views.Settings.unknownText": "Неизвестно",
+  "PE.Views.Toolbar.textBack": "Назад"
+}

apps/presentationeditor/sdk_dev_scripts.js

@@ -77,6 +77,8 @@ var sdk_dev_scrpipts = [
     "../../../../sdkjs/cell/model/CellInfo.js",
     "../../../../sdkjs/cell/view/DrawingObjectsController.js",
     "../../../../sdkjs/slide/Drawing/ThemeLoader.js",
+	"../../../../sdkjs/word/Editor/DocumentContentElementBase.js",
+	"../../../../sdkjs/word/Editor/StructuredDocumentTags/BlockLevel.js",
     "../../../../sdkjs/word/Editor/Serialize2.js",
     "../../../../sdkjs/word/Editor/Numbering.js",
 	"../../../../sdkjs/word/Editor/NumberingChanges.js",
@@ -96,6 +98,7 @@ var sdk_dev_scrpipts = [
 	"../../../../sdkjs/word/Editor/SectionsChanges.js",
     "../../../../sdkjs/word/Editor/Styles.js",
 	"../../../../sdkjs/word/Editor/StylesChanges.js",
+	"../../../../sdkjs/word/Editor/RevisionsChange.js",
     "../../../../sdkjs/slide/Editor/Format/StylesPrototype.js",
     "../../../../sdkjs/word/Drawing/Graphics.js",
     "../../../../sdkjs/word/Drawing/ShapeDrawer.js",

apps/spreadsheeteditor/embed/js/ApplicationController.js

@@ -72,14 +72,14 @@ var ApplicationController = new(function(){
             $('#id-btn-close').hide();
 
         // Docked toolbar
-        if (embedConfig.toolbarDocked === 'top') {
-            $('#toolbar').addClass('top');
-            $('.viewer').addClass('top');
-        } else {
+        if (embedConfig.toolbarDocked === 'bottom') {
             $('#toolbar').addClass('bottom');
             $('.viewer').addClass('bottom');
             $('#box-tools').removeClass('dropdown').addClass('dropup');
             ttOffset[1] = -40;
+        } else {
+            $('#toolbar').addClass('top');
+            $('.viewer').addClass('top');
         }
     }
 

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

@@ -47,6 +47,7 @@ define([
     'spreadsheeteditor/main/app/view/DocumentHolder',
     'spreadsheeteditor/main/app/view/HyperlinkSettingsDialog',
     'spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced',
+    'spreadsheeteditor/main/app/view/ImageSettingsAdvanced',
     'spreadsheeteditor/main/app/view/SetValueDialog',
     'spreadsheeteditor/main/app/view/AutoFilterDialog'
 ], function () {
@@ -184,6 +185,7 @@ define([
             view.pmiTextAdvanced.on('click',                    _.bind(me.onTextAdvanced, me));
             view.mnuShapeAdvanced.on('click',                   _.bind(me.onShapeAdvanced, me));
             view.mnuChartEdit.on('click',                       _.bind(me.onChartEdit, me));
+            view.mnuImgAdvanced.on('click',                     _.bind(me.onImgAdvanced, me));
 
             var documentHolderEl = view.cmpEl;
 
@@ -253,6 +255,8 @@ define([
             this.api.asc_registerCallback('asc_onSelectionChanged',     _.bind(this.onSelectionChanged, this));
             this.api.asc_registerCallback('asc_onEntriesListMenu',      _.bind(this.onEntriesListMenu, this)); // Alt + Down
             this.api.asc_registerCallback('asc_onFormulaCompleteMenu',  _.bind(this.onFormulaCompleteMenu, this));
+            this.api.asc_registerCallback('asc_onShowSpecialPasteOptions',  _.bind(this.onShowSpecialPasteOptions, this));
+            this.api.asc_registerCallback('asc_onHideSpecialPasteOptions',  _.bind(this.onHideSpecialPasteOptions, this));
 
             return this;
         },
@@ -686,6 +690,25 @@ define([
             })).show();
         },
 
+        onImgAdvanced: function(item) {
+            var me = this;
+
+            (new SSE.Views.ImageSettingsAdvanced({
+                imageProps  : item.imageInfo,
+                api             : me.api,
+                handler         : function(result, value) {
+                    if (result == 'ok') {
+                        if (me.api) {
+                            me.api.asc_setGraphicObjectProps(value.imageProps);
+
+                            Common.component.Analytics.trackEvent('DocumentHolder', 'Apply advanced image settings');
+                        }
+                    }
+                    Common.NotificationCenter.trigger('edit:complete', me);
+                }
+            })).show();
+        },
+
         onChartEdit: function(item) {
             var me = this;
             var win, props;
@@ -695,12 +718,15 @@ define([
                     (new SSE.Views.ChartSettingsDlg(
                         {
                             chartSettings: props,
+                            imageSettings: item.chartInfo,
                             isChart: true,
                             api: me.api,
                             handler: function(result, value) {
                                 if (result == 'ok') {
                                     if (me.api) {
                                         me.api.asc_editChartDrawingObject(value.chartSettings);
+                                        if (value.imageSettings)
+                                            me.api.asc_setGraphicObjectProps(value.imageSettings);
                                     }
                                 }
                                 Common.NotificationCenter.trigger('edit:complete', me);
@@ -800,7 +826,7 @@ define([
                             linkstr = props.asc_getHyperlinkUrl() + '<br><b>' + me.textCtrlClick + '</b>';
                         }
                     } else {
-                        linkstr = props.asc_getTooltip() || (props.asc_getSheet() + '!' + props.asc_getRange());
+                        linkstr = props.asc_getTooltip() || (props.asc_getLocation());
                     }
 
                     if (hyperlinkTip.ref && hyperlinkTip.ref.isVisible()) {
@@ -1205,11 +1231,13 @@ define([
                                 isshapemenu = true;
                             }
                         } else if ( elValue.asc_getChartProperties() ) {
+                            documentHolder.mnuChartEdit.chartInfo = elValue;
                             ischartmenu = true;
                             has_chartprops = true;
-                        } 
-                        else
+                        } else {
+                            documentHolder.mnuImgAdvanced.imageInfo = elValue;
                             isimagemenu = true;
+                        }
                     }
                 }
 
@@ -1221,8 +1249,10 @@ define([
                 documentHolder.mnuChartEdit.setDisabled(isObjLocked);
                 documentHolder.pmiImgCut.setDisabled(isObjLocked);
                 documentHolder.pmiImgPaste.setDisabled(isObjLocked);
+                documentHolder.mnuImgAdvanced.setVisible(isimagemenu && !isshapemenu && !ischartmenu);
+                documentHolder.mnuImgAdvanced.setDisabled(isObjLocked);
                 if (showMenu) this.showPopupMenu(documentHolder.imgMenu, {}, event);
-                documentHolder.mnuShapeSeparator.setVisible(documentHolder.mnuShapeAdvanced.isVisible() || documentHolder.mnuChartEdit.isVisible());
+                documentHolder.mnuShapeSeparator.setVisible(documentHolder.mnuShapeAdvanced.isVisible() || documentHolder.mnuChartEdit.isVisible() || documentHolder.mnuImgAdvanced.isVisible());
             } else if (istextshapemenu || istextchartmenu) {
                 if (!showMenu && !documentHolder.textInShapeMenu.isVisible()) return;
                 
@@ -1341,7 +1371,7 @@ define([
                 documentHolder.pmiEntireHide.isrowmenu = isrowmenu;
                 documentHolder.pmiEntireShow.isrowmenu = isrowmenu;
 
-                documentHolder.setMenuItemCommentCaptionMode(cellinfo.asc_getComments().length > 0);
+                documentHolder.setMenuItemCommentCaptionMode(cellinfo.asc_getComments().length < 1, this.permissions.canEditComments);
                 commentsController && commentsController.blockPopover(true);
 
                 documentHolder.pmiClear.menu.items[1].setDisabled(iscelledit);
@@ -1594,6 +1624,89 @@ define([
             }
         },
 
+        onShowSpecialPasteOptions: function(specialPasteShowOptions) {
+            var me                  = this,
+                documentHolderView  = me.documentHolder,
+                coord  = specialPasteShowOptions.asc_getCellCoord(),
+                pasteContainer = documentHolderView.cmpEl.find('#special-paste-container'),
+                pasteItems = specialPasteShowOptions.asc_getOptions();
+
+            // Prepare menu container
+            if (pasteContainer.length < 1) {
+                me._arrSpecialPaste = [];
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.paste] = me.txtPaste;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.pasteOnlyFormula] = me.txtPasteFormulas;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaNumberFormat] = me.txtPasteFormulaNumFormat;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaAllFormatting] = me.txtPasteKeepSourceFormat;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaWithoutBorders] = me.txtPasteBorders;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaColumnWidth] = me.txtPasteColWidths;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.mergeConditionalFormating] = me.txtPasteMerge;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.pasteOnlyValues] = me.txtPasteValues;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.valueNumberFormat] = me.txtPasteValNumFormat;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.valueAllFormating] = me.txtPasteValFormat;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.pasteOnlyFormating] = me.txtPasteFormat;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.transpose] = me.txtPasteTranspose;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.link] = me.txtPasteLink;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.picture] = me.txtPastePicture;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.linkedPicture] = me.txtPasteLinkPicture;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.sourceformatting] = me.txtPasteSourceFormat;
+                me._arrSpecialPaste[Asc.c_oSpecialPasteProps.destinationFormatting] = me.txtPasteDestFormat;
+
+                pasteContainer = $('<div id="special-paste-container" style="position: absolute;"><div id="id-document-holder-btn-special-paste"></div></div>');
+                documentHolderView.cmpEl.append(pasteContainer);
+
+                me.btnSpecialPaste = new Common.UI.Button({
+                    cls         : 'btn-toolbar',
+                    iconCls     : 'btn-paste',
+                    menu        : new Common.UI.Menu({items: []})
+                });
+                me.btnSpecialPaste.render($('#id-document-holder-btn-special-paste')) ;
+            }
+
+            if (pasteItems.length>0) {
+                var menu = me.btnSpecialPaste.menu;
+                for (var i = 0; i < menu.items.length; i++) {
+                    menu.removeItem(menu.items[i]);
+                    i--;
+                }
+
+                var group_prev = -1;
+                _.each(pasteItems, function(menuItem, index) {
+                    var group = (menuItem<7) ? 0 : (menuItem>9 ? 2 : 1);
+                    if (group_prev !== group && group_prev>=0)
+                        menu.addItem(new Common.UI.MenuItem({ caption: '--' }));
+                    group_prev = group;
+
+                    var mnu = new Common.UI.MenuItem({
+                        caption: me._arrSpecialPaste[menuItem],
+                        value: menuItem,
+                        checkable: true,
+                        toggleGroup : 'specialPasteGroup'
+                    }).on('click', function(item, e) {
+                        var props = new Asc.SpecialPasteProps();
+                        props.asc_setProps(item.value);
+                        me.api.asc_SpecialPaste(props);
+                        setTimeout(function(){menu.hide();}, 100);
+                    });
+                    menu.addItem(mnu);
+                });
+                (menu.items.length>0) && menu.items[0].setChecked(true, true);
+            }
+            if (coord.asc_getX()<0 || coord.asc_getY()<0) {
+                if (pasteContainer.is(':visible')) pasteContainer.hide();
+            } else {
+                var showPoint = [coord.asc_getX() + coord.asc_getWidth() + 3, coord.asc_getY() + coord.asc_getHeight() + 3];
+                pasteContainer.css({left: showPoint[0], top : showPoint[1]});
+                pasteContainer.show();
+            }
+        },
+
+        onHideSpecialPasteOptions: function() {
+            var pasteContainer = this.documentHolder.cmpEl.find('#special-paste-container');
+            if (pasteContainer.is(':visible'))
+                pasteContainer.hide();
+        },
+
         onCellsRange: function(status) {
             this.rangeSelectionMode = (status != Asc.c_oAscSelectionDialogType.None);
         },
@@ -2323,7 +2436,24 @@ define([
         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?',
         txtExpand: 'Expand and sort',
         txtSorting: 'Sorting',
-        txtSortSelected: 'Sort selected'
+        txtSortSelected: 'Sort selected',
+        txtPaste: 'Paste',
+        txtPasteFormulas: 'Paste only formula',
+        txtPasteFormulaNumFormat: 'Formula + number format',
+        txtPasteKeepSourceFormat: 'Formula + all formatting',
+        txtPasteBorders: 'Formula without borders',
+        txtPasteColWidths: 'Formula + column width',
+        txtPasteMerge: 'Merge conditional formatting',
+        txtPasteTranspose: 'Transpose',
+        txtPasteValues: 'Paste only value',
+        txtPasteValNumFormat: 'Value + number format',
+        txtPasteValFormat: 'Value + all formatting',
+        txtPasteFormat: 'Paste only formatting',
+        txtPasteLink: 'Paste Link',
+        txtPastePicture: 'Picture',
+        txtPasteLinkPicture: 'Linked Picture',
+        txtPasteSourceFormat: 'Source formatting',
+        txtPasteDestFormat: 'Destination formatting'
 
     }, SSE.Controllers.DocumentHolder || {}));
 });

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

@@ -165,7 +165,7 @@ define([
             if ( this.mode.canCoAuthoring ) {
                 this.leftMenu.btnComments[(this.mode.isEdit&&this.mode.canComments && !this.mode.isLightVersion) ? 'show' : 'hide']();
                 if (this.mode.canComments)
-                    this.leftMenu.setOptionsPanel('comment', this.getApplication().getController('Common.Controllers.Comments').getView());
+                    this.leftMenu.setOptionsPanel('comment', this.getApplication().getController('Common.Controllers.Comments').getView('Common.Views.Comments'));
 
                 this.leftMenu.btnChat[(this.mode.canChat && !this.mode.isLightVersion) ? 'show' : 'hide']();
                 if (this.mode.canChat)
@@ -174,6 +174,7 @@ define([
                 this.leftMenu.btnChat.hide();
                 this.leftMenu.btnComments.hide();
             }
+            this.mode.isTrial && this.leftMenu.setDeveloperMode(true);
             /** coauthoring end **/
             Common.util.Shortcuts.resumeEvents();
             if (!this.mode.isEditMailMerge && !this.mode.isEditDiagram)
@@ -187,6 +188,7 @@ define([
                 this.leftMenu.setOptionsPanel('plugins', this.getApplication().getController('Common.Controllers.Plugins').getView('Common.Views.Plugins'));
             } else
                 this.leftMenu.btnPlugins.hide();
+            this.mode.isTrial && this.leftMenu.setDeveloperMode(true);
         },
 
         clickMenuFileItem: function(menu, action, isopts) {

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

@@ -74,7 +74,8 @@ define([
             toolbar: '#viewport #toolbar',
             leftMenu: '#viewport #left-menu, #viewport #id-toolbar-full-placeholder-btn-settings, #viewport #id-toolbar-short-placeholder-btn-settings',
             rightMenu: '#viewport #right-menu',
-            header: '#viewport #header'
+            header: '#viewport #header',
+            statusBar: '#statusbar'
         };
 
         Common.localStorage.setId('table');
@@ -102,7 +103,7 @@ define([
             onLaunch: function() {
 //                $(document.body).css('position', 'absolute');
 
-                this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, startModifyDocument: true, lostEditingRights: false, licenseWarning: false};
+                this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false};
 
                 if (!Common.Utils.isBrowserSupported()){
                     Common.Utils.showBrowserRestriction();
@@ -129,6 +130,7 @@ define([
                 this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onCoAuthoringDisconnect, this));
                 this.api.asc_registerCallback('asc_onAdvancedOptions',       _.bind(this.onAdvancedOptions, this));
                 this.api.asc_registerCallback('asc_onDocumentUpdateVersion', _.bind(this.onUpdateVersion, this));
+                this.api.asc_registerCallback('asc_onServerVersion',         _.bind(this.onServerVersion, this));
                 this.api.asc_registerCallback('asc_onDocumentName',          _.bind(this.onDocumentName, this));
                 this.api.asc_registerCallback('asc_onPrintUrl',              _.bind(this.onPrintUrl, this));
                 this.api.asc_registerCallback('asc_onMeta',                  _.bind(this.onMeta, this));
@@ -165,6 +167,8 @@ define([
                     if (e && e.target && !/area_id/.test(e.target.id)) {
                         if (/msg-reply/.test(e.target.className))
                             me.dontCloseDummyComment = true;
+                        else if (/chat-msg-text/.test(e.target.id))
+                            me.dontCloseChat = true;
                     }
                 });
 
@@ -179,6 +183,8 @@ define([
                             me.api.asc_enableKeyEvents(true);
                             if (/msg-reply/.test(e.target.className))
                                 me.dontCloseDummyComment = false;
+                            else if (/chat-msg-text/.test(e.target.id))
+                                me.dontCloseChat = false;
                         }
                     }
                 }).on('dragover', function(e) {
@@ -216,8 +222,8 @@ define([
                     },
                     'menu:show': function(e){
                     },
-                    'menu:hide': function(menu){
-                        if (!me.isModalShowed && (!menu || !menu.cmpEl.hasClass('from-cell-edit'))) {
+                    'menu:hide': function(menu, isFromInputControl){
+                        if (!me.isModalShowed && (!menu || !menu.cmpEl.hasClass('from-cell-edit')) && !isFromInputControl) {
                             me.api.asc_InputClearKeyboardElement();
                             me.api.asc_enableKeyEvents(true);
                         }
@@ -362,7 +368,7 @@ define([
                     var editor = document.getElementById('editor_sdk');
                     if (editor) {
                         var rect = editor.getBoundingClientRect();
-                        var event = window.event || arguments.callee.caller.arguments[0];
+                        var event = data.event || {};
                         this.api.asc_onMouseUp(event, data.x - rect.left, data.y - rect.top);
                     }
                 }
@@ -424,12 +430,12 @@ define([
                     this.setLongActionView(action);
                 } else {
                     if (this.loadMask) {
-                        if (this.loadMask.isVisible() && !this.dontCloseDummyComment)
+                        if (this.loadMask.isVisible() && !this.dontCloseDummyComment && !this.dontCloseChat)
                             this.api.asc_enableKeyEvents(true);
                         this.loadMask.hide();
                     }
 
-                    if (type == Asc.c_oAscAsyncActionType.BlockInteraction && !( (id == Asc.c_oAscAsyncAction['LoadDocumentFonts'] || id == Asc.c_oAscAsyncAction['ApplyChanges']) && this.dontCloseDummyComment ))
+                    if (type == Asc.c_oAscAsyncActionType.BlockInteraction && !( (id == Asc.c_oAscAsyncAction['LoadDocumentFonts'] || id == Asc.c_oAscAsyncAction['ApplyChanges']) && (this.dontCloseDummyComment || this.dontCloseChat) ))
                         this.onEditComplete(this.loadMask, {restorefocus:true});
                 }
             },
@@ -446,6 +452,12 @@ define([
                         title   = this.saveTitleText;
                         break;
 
+                    case Asc.c_oAscAsyncAction.ForceSaveTimeout:
+                        break;
+
+                    case Asc.c_oAscAsyncAction.ForceSaveButton:
+                        break;
+
                     case Asc.c_oAscAsyncAction.LoadDocumentFonts:
                         title   = this.loadFontsTitleText;
                         break;
@@ -507,57 +519,11 @@ define([
             },
 
             onApplyEditRights: function(data) {
-                if (data) {
-                    if (data.allowed) {
-                        this.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'],ApplyEditRights);
-                        this.appOptions.isEdit = true;
-
-                        var me = this;
-                        setTimeout(function(){
-                            me.applyModeCommonElements();
-                            me.applyModeEditorElements('view');
-                            me.api.asc_setViewMode(false);
-
-                            var application                 = me.getApplication();
-                            var documentHolderController    = application.getController('DocumentHolder');
-
-                            application.getController('LeftMenu').setMode(me.appOptions).createDelayedElements();
-                            Common.NotificationCenter.trigger('layout:changed', 'main');
-
-                            var timer_sl = setInterval(function(){
-                                if (window.styles_loaded) {
-                                    clearInterval(timer_sl);
-
-                                    documentHolderController.getView('DocumentHolder').createDelayedElements();
-                                    documentHolderController.resetApi();
-
-                                    application.getController('Toolbar').createDelayedElements();
-                                    application.getController('RightMenu').createDelayedElements();
-                                    application.getController('Statusbar').getView('Statusbar').update();
-                                    application.getController('CellEditor').setMode(me.appOptions);
-
-                                    me.api.asc_registerCallback('asc_onSaveUrl', _.bind(me.onSaveUrl, me));
-                                    me.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(me.onDocumentModifiedChanged, me));
-                                    me.api.asc_registerCallback('asc_onDocumentCanSaveChanged',  _.bind(me.onDocumentCanSaveChanged, me));
-                                    me.api.asc_registerCallback('asc_onDownloadUrl',             _.bind(me.onDownloadUrl, me));
-                                    var shapes = me.api.asc_getPropertyEditorShapes();
-                                    if (shapes)
-                                        me.fillAutoShapes(shapes[0], shapes[1]);
-
-                                    me.fillTextArt(me.api.asc_getTextArtPreviews());
-                                    me.updateThemeColors();
-
-                                    application.getController('FormulaDialog').setApi(me.api);
-                                }
-                            }, 50);
-                        }, 50);
-                    }
-                    else {
-                        Common.UI.info({
-                            title: this.requestEditFailedTitleText,
-                            msg: data.message || this.requestEditFailedMessageText
-                        });
-                    }
+                if (data && !data.allowed) {
+                    Common.UI.info({
+                        title: this.requestEditFailedTitleText,
+                        msg: data.message || this.requestEditFailedMessageText
+                    });
                 }
             },
 
@@ -623,7 +589,7 @@ define([
                  if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram) {
                     pluginsController.setApi(me.api);
                     me.updatePlugins(me.plugins, false);
-                    me.requestPlugins('../../../../sdkjs-plugins/config.json');
+                    me.requestPlugins('../../../../plugins.json');
                     me.api.asc_registerCallback('asc_onPluginsInit', _.bind(me.updatePluginsList, me));
                 }
 
@@ -655,6 +621,12 @@ define([
                     }
                     me.api.asc_setAutoSaveGap(value);
 
+                    if (me.appOptions.canForcesave) {// use asc_setIsForceSaveOnUserSave only when customization->forcesave = true
+                        value = Common.localStorage.getItem("sse-settings-forcesave");
+                        me.appOptions.forcesave = (value === null) ? me.appOptions.canForcesave : (parseInt(value) == 1);
+                        me.api.asc_setIsForceSaveOnUserSave(me.appOptions.forcesave);
+                    }
+
                     if (me.needToUpdateVersion) {
                         Common.NotificationCenter.trigger('api:disconnect');
                         toolbarController.onApiCoAuthoringDisconnect();
@@ -682,10 +654,8 @@ define([
 
                             rightmenuController.createDelayedElements();
 
-                            me.api.asc_registerCallback('asc_onSaveUrl', _.bind(me.onSaveUrl, me));
                             me.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(me.onDocumentModifiedChanged, me));
                             me.api.asc_registerCallback('asc_onDocumentCanSaveChanged',  _.bind(me.onDocumentCanSaveChanged, me));
-                            me.api.asc_registerCallback('asc_onDownloadUrl',             _.bind(me.onDownloadUrl, me));
                             me.api.asc_registerCallback('asc_OnTryUndoInFastCollaborative',_.bind(me.onTryUndoInFastCollaborative, me));
                             me.onDocumentModifiedChanged(me.api.asc_isDocumentModified());
 
@@ -777,6 +747,8 @@ define([
                         return;
                     }
 
+                    if ( this.onServerVersion(params.asc_getBuildVersion()) ) return;
+
                     if (params.asc_getRights() !== Asc.c_oRights.Edit)
                         this.permissions.edit = false;
 
@@ -789,9 +761,10 @@ define([
                     /** coauthoring begin **/
                     this.appOptions.canCoAuthoring = !this.appOptions.isLightVersion;
                     /** coauthoring end **/
-                    this.appOptions.canComments    = (licType === Asc.c_oLicenseResult.Success) && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false);
-                    this.appOptions.canChat        = (licType === Asc.c_oLicenseResult.Success) && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);
+                    this.appOptions.canComments    = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit) && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false);
+                    this.appOptions.canChat        = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit) && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);
                     this.appOptions.canRename      = !!this.permissions.rename;
+                    this.appOptions.isTrial        = params.asc_getTrial();
 
                     this.appOptions.canBranding  = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object');
                     if (this.appOptions.canBranding)
@@ -801,7 +774,6 @@ define([
                     if (this.appOptions.canBrandingExt)
                         this.updatePlugins(this.plugins, true);
 
-                    params.asc_getTrial() && this.headerView.setDeveloperMode(true);
                     this.appOptions.canRename && this.headerView.setCanRename(true);
                 }
 
@@ -811,6 +783,10 @@ define([
                 this.appOptions.isEdit         = (this.appOptions.canLicense || this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge) && this.permissions.edit !== false && this.editorConfig.mode !== 'view';
                 this.appOptions.canDownload    = !this.appOptions.nativeApp && (this.permissions.download !== false);
                 this.appOptions.canPrint       = (this.permissions.print !== false);
+                this.appOptions.canForcesave   = this.appOptions.isEdit && !this.appOptions.isOffline && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge) &&
+                                                (typeof (this.editorConfig.customization) == 'object' && !!this.editorConfig.customization.forcesave);
+                this.appOptions.forcesave      = this.appOptions.canForcesave;
+                this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly);
 
                 this._state.licenseWarning = !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge) && (licType===Asc.c_oLicenseResult.Connections) && this.appOptions.canEdit && this.editorConfig.mode !== 'view';
 
@@ -879,6 +855,7 @@ define([
 
                 if (!this.appOptions.isEditMailMerge && !this.appOptions.isEditDiagram) {
                     this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this));
+                    this.api.asc_registerCallback('asc_onDownloadUrl',     _.bind(this.onDownloadUrl, this));
 
                     var printController = app.getController('Print');
                     printController && this.api && printController.setApi(this.api);
@@ -1070,6 +1047,16 @@ define([
                         config.closable = true;
                         break;
 
+                    case Asc.c_oAscError.ID.FrmlOperandExpected:
+                        config.msg = this.errorOperandExpected;
+                        config.closable = true;
+                        break;
+
+                    case Asc.c_oAscError.ID.FrmlWrongReferences:
+                        config.msg = this.errorFrmlWrongReferences;
+                        config.closable = true;
+                        break;
+
                     case Asc.c_oAscError.ID.UnexpectedGuid:
                         config.msg = this.errorUnexpectedGuid;
                         break;
@@ -1094,10 +1081,6 @@ define([
                         config.msg = this.errorDataRange;
                         break;
 
-                    case Asc.c_oAscError.ID.FrmlOperandExpected:
-                        config.msg = this.errorOperandExpected;
-                        break;
-
                     case Asc.c_oAscError.ID.VKeyEncrypt:
                         config.msg = this.errorToken;
                         break;
@@ -1183,10 +1166,6 @@ define([
                         config.msg = this.errorOpenWarning;
                         break;
 
-                    case Asc.c_oAscError.ID.FrmlWrongReferences:
-                        config.msg = this.errorFrmlWrongReferences;
-                        break;
-
                     case Asc.c_oAscError.ID.CopyMultiselectAreaError:
                         config.msg = this.errorCopyMultiselectArea;
                         break;
@@ -1298,24 +1277,26 @@ define([
                         title = this.headerView.getDocumentCaption() + ' - ' + title;
 
                     if (change) {
-                        if (!_.isUndefined(title) && (!this._state.fastCoauth || this._state.usersCount<2 )) {
+                        clearTimeout(this._state.timerCaption);
+                        if (!_.isUndefined(title)) {
                             title = '* ' + title;
-                            this.headerView.setDocumentCaption(this.headerView.getDocumentCaption() + '*', true);
+                            this.headerView.setDocumentCaption(this.headerView.getDocumentCaption(), true);
                         }
                     } else {
-                        this.headerView.setDocumentCaption(this.headerView.getDocumentCaption());
+                        if (this._state.fastCoauth && this._state.usersCount>1) {
+                            var me = this;
+                            this._state.timerCaption = setTimeout(function () {
+                                me.headerView.setDocumentCaption(me.headerView.getDocumentCaption(), false);
+                            }, 500);
+                        } else
+                            this.headerView.setDocumentCaption(this.headerView.getDocumentCaption(), false);
                     }
 
                     if (window.document.title != title)
                         window.document.title = title;
 
-                    if (!this._state.fastCoauth || this._state.usersCount<2 )
-                        Common.Gateway.setDocumentModified(change);
-                    else if ( this._state.startModifyDocument!==undefined && this._state.startModifyDocument === change){
-                        Common.Gateway.setDocumentModified(change);
-                        this._state.startModifyDocument = (this._state.startModifyDocument) ? !this._state.startModifyDocument : undefined;
-                    }
-                    
+                    Common.Gateway.setDocumentModified(change);
+
                     this._state.isDocModified = change;
                 }
             },
@@ -1324,24 +1305,24 @@ define([
             },
 
             onDocumentModifiedChanged: function(change) {
-                if (this._state.fastCoauth && this._state.usersCount>1 && this._state.startModifyDocument===undefined ) return;
-
                 this.updateWindowTitle(change);
                 Common.Gateway.setDocumentModified(change);
 
                 if (this.toolbarView && this.api) {
-                    var isSyncButton = $('.btn-icon', this.toolbarView.btnSave.cmpEl).hasClass('btn-synch');
+                    var isSyncButton = $('.btn-icon', this.toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
+                        forcesave = this.appOptions.forcesave;
                     var cansave = this.api.asc_isDocumentCanSave();
-                    if (this.toolbarView.btnSave.isDisabled() !== (!cansave && !isSyncButton || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1))
-                        this.toolbarView.btnSave.setDisabled(!cansave && !isSyncButton || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1);
+                    if (this.toolbarView.btnSave.isDisabled() !== (!cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave))
+                        this.toolbarView.btnSave.setDisabled(!cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave);
                 }
             },
 
             onDocumentCanSaveChanged: function (isCanSave) {
                 if (this.toolbarView) {
-                    var isSyncButton = $('.btn-icon', this.toolbarView.btnSave.cmpEl).hasClass('btn-synch');
-                    if (this.toolbarView.btnSave.isDisabled() !== (!isCanSave && !isSyncButton || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1))
-                        this.toolbarView.btnSave.setDisabled(!isCanSave && !isSyncButton || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1);
+                    var isSyncButton = $('.btn-icon', this.toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
+                        forcesave = this.appOptions.forcesave;
+                    if (this.toolbarView.btnSave.isDisabled() !== (!isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave))
+                        this.toolbarView.btnSave.setDisabled(!isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave);
                 }
             },
 
@@ -1367,8 +1348,12 @@ define([
             hidePreloader: function() {
                 if (!this._state.customizationDone) {
                     this._state.customizationDone = true;
-                    if (this.appOptions.customization && !this.appOptions.isDesktopApp)
-                        this.appOptions.customization.about = true;
+                    if (this.appOptions.customization) {
+                        if (this.appOptions.isDesktopApp)
+                            this.appOptions.customization.about = false;
+                        else if (!this.appOptions.canBrandingExt)
+                            this.appOptions.customization.about = true;
+                    }
                     Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements);
                     if (this.appOptions.canBrandingExt) {
                         Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements);
@@ -1381,10 +1366,6 @@ define([
                 $('#loading-mask').hide().remove();
             },
 
-            onSaveUrl: function(url) {
-                Common.Gateway.save(url);
-            },
-
             onDownloadUrl: function(url) {
                 Common.Gateway.downloadAs(url);
             },
@@ -1405,6 +1386,25 @@ define([
                 });
             },
 
+            onServerVersion: function(buildVersion) {
+                if (this.changeServerVersion) return true;
+
+                if (DocsAPI.DocEditor.version() !== buildVersion && !window.compareVersions) {
+                    this.changeServerVersion = true;
+                    Common.UI.warning({
+                        title: this.titleServerVersion,
+                        msg: this.errorServerVersion,
+                        callback: function() {
+                            _.defer(function() {
+                                Common.Gateway.updateVersion();
+                            })
+                        }
+                    });
+                    return true;
+                }
+                return false;
+            },
+
             onAdvancedOptions: function(advOptions) {
                 var type = advOptions.asc_getOptionId(),
                     me = this, dlg;
@@ -1770,6 +1770,11 @@ define([
                     if (this._state.fastCoauth && !oldval)
                         this.toolbarView.synchronizeChanges();
                 }
+                if (this.appOptions.canForcesave) {
+                    value = Common.localStorage.getItem("sse-settings-forcesave");
+                    this.appOptions.forcesave = (value===null) ? this.appOptions.canForcesave : (parseInt(value)==1);
+                    this.api.asc_setIsForceSaveOnUserSave(this.appOptions.forcesave);
+                }
             },
 
             onDocumentName: function(name) {
@@ -1900,11 +1905,18 @@ define([
                     return null;
                 };
 
-                var arr = [];
+                var arr = [],
+                    baseUrl = _.isEmpty(plugins.url) ? "" : plugins.url;
+
+                if (baseUrl !== "")
+                    console.log("Obsolete: The url parameter is deprecated. Please check the documentation for new plugin connection configuration.");
+
                 pluginsData.forEach(function(item){
+                    item = baseUrl + item; // for compatibility with previouse version of server, where plugins.url is used.
                     var value = _getPluginJson(item);
                     if (value) {
                         value.baseUrl = item.substring(0, item.lastIndexOf("config.json"));
+                        value.oldVersion = (baseUrl !== "");
                         arr.push(value);
                     }
                 });
@@ -1922,6 +1934,8 @@ define([
                 if (plugins) {
                     var arr = [], arrUI = [];
                     plugins.pluginsData.forEach(function(item){
+                        if (uiCustomize!==undefined && (pluginStore.findWhere({baseUrl : item.baseUrl}) || pluginStore.findWhere({guid : item.guid}))) return;
+
                         var variations = item.variations,
                             variationsArr = [];
                         variations.forEach(function(itemVar){
@@ -1932,12 +1946,19 @@ define([
                                 }
                             }
                             if (isSupported && (isEdit || itemVar.isViewer)) {
+                                var icons = itemVar.icons;
+                                if (item.oldVersion) { // for compatibility with previouse version of server, where plugins.url is used.
+                                    icons = [];
+                                    itemVar.icons.forEach(function(icon){
+                                        icons.push(icon.substring(icon.lastIndexOf("\/")+1));
+                                    });
+                                }
                                 item.isUICustomizer ? arrUI.push(item.baseUrl + itemVar.url) :
                                 variationsArr.push(new Common.Models.PluginVariation({
                                     description: itemVar.description,
                                     index: variationsArr.length,
-                                    url : itemVar.url,
-                                    icons  : itemVar.icons,
+                                    url : (item.oldVersion) ? (itemVar.url.substring(itemVar.url.lastIndexOf("\/")+1) ) : itemVar.url,
+                                    icons  : icons,
                                     isViewer: itemVar.isViewer,
                                     EditorsSupport: itemVar.EditorsSupport,
                                     isVisual: itemVar.isVisual,
@@ -2038,7 +2059,7 @@ define([
             errorFileVKey: 'External error.<br>Incorrect securety key. Please, contact support.',
             errorStockChart: 'Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.',
             errorDataRange: 'Incorrect data range.',
-            errorOperandExpected: 'Operand expected',
+            errorOperandExpected: 'The entered function syntax is not correct. Please check if you are missing one of the parentheses - \'(\' or \')\'.',
             errorKeyEncrypt: 'Unknown key descriptor',
             errorKeyExpire: 'Key descriptor expired',
             errorUsersExceed: 'Count of users was exceed',
@@ -2107,7 +2128,9 @@ define([
             errorSessionAbsolute: 'The document editing session has expired. Please reload the page.',
             errorSessionIdle: 'The document has not been edited for quite a long time. Please reload the page.',
             errorSessionToken: 'The connection to the server has been interrupted. Please reload the page.',
-            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.',
+            titleServerVersion: 'Editor updated',
+            errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.'
         }
     })(), SSE.Controllers.Main || {}))
 });

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

@@ -87,7 +87,6 @@ define([
                 underline: undefined,
                 wrap: undefined,
                 merge: undefined,
-                filter: undefined,
                 angle: undefined,
                 controlsdisabled: {
                     rows: undefined,
@@ -97,6 +96,8 @@ define([
                     filters: undefined
                 },
                 selection_type: undefined,
+                filter: undefined,
+                filterapplied: false,
                 tablestylename: undefined,
                 tablename: undefined,
                 namedrange_locked: false,
@@ -306,7 +307,7 @@ define([
             if (this.api) {
                 var isModified = this.api.asc_isDocumentCanSave();
                 var isSyncButton = $('.btn-icon', this.toolbar.btnSave.cmpEl).hasClass('btn-synch');
-                if (!isModified && !isSyncButton)
+                if (!isModified && !isSyncButton && !this.toolbar.mode.forcesave)
                     return;
 
                 this.api.asc_Save();
@@ -607,7 +608,7 @@ define([
 
             if (me.api) {
                 var merged = me.api.asc_getCellInfo().asc_getFlags().asc_getMerge();
-                if (!merged && me.api.asc_mergeCellsDataLost(item.value)) {
+                if ((merged !== Asc.c_oAscMergeOptions.Merge) && me.api.asc_mergeCellsDataLost(item.value)) {
                     Common.UI.warning({
                         msg: me.warnMergeLostData,
                         buttons: ['yes', 'no'],
@@ -750,18 +751,30 @@ define([
                 var win, props;
                 if (me.api){
                     props = me.api.asc_getChartObject();
+                    var selectedObjects = me.api.asc_getGraphicObjectProps(),
+                        imageSettings = null;
+                    for (var i = 0; i < selectedObjects.length; i++) {
+                        if (selectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) {
+                            var elValue = selectedObjects[i].asc_getObjectValue();
+                            if ( elValue.asc_getChartProperties() )
+                                imageSettings = elValue;
+                        }
+                    }
                     if (props) {
                         var ischartedit = ( me.toolbar.mode.isEditDiagram || info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChart || info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChartText);
 
                         (new SSE.Views.ChartSettingsDlg(
                             {
                                 chartSettings: props,
+                                imageSettings: imageSettings,
                                 isChart: true,
                                 api: me.api,
                                 handler: function(result, value) {
                                     if (result == 'ok') {
                                         if (me.api) {
                                             (ischartedit) ? me.api.asc_editChartDrawingObject(value.chartSettings) : me.api.asc_addChartDrawingObject(value.chartSettings);
+                                            if (value.imageSettings)
+                                                me.api.asc_setGraphicObjectProps(value.imageSettings);
                                         }
                                     }
                                     Common.NotificationCenter.trigger('edit:complete', me.toolbar);
@@ -898,8 +911,15 @@ define([
         },
 
         onNumberFormatMenu: function(menu, item) {
-            if (this.api)
-                this.api.asc_setCellFormat(item.value);
+            if (this.api) {
+                var info = new Asc.asc_CFormatCellsInfo();
+                info.asc_setType(Asc.c_oAscNumFormatType.Accounting);
+                info.asc_setSeparator(false);
+                info.asc_setSymbol(item.value);
+                var format = this.api.asc_getFormatCells(info);
+                if (format && format.length>0)
+                    this.api.asc_setCellFormat(format[0]);
+            }
 
             Common.NotificationCenter.trigger('edit:complete', this.toolbar);
             Common.component.Analytics.trackEvent('ToolBar', 'Number Format');
@@ -1288,8 +1308,13 @@ define([
                 shortcuts: {
                     'command+l,ctrl+l': function(e) {
                         if (me.editMode && !me._state.multiselect) {
-                            if (!me.api.asc_getCellInfo().asc_getFormatTableInfo())
-                                me._setTableFormat(me.toolbar.mnuTableTemplatePicker.store.at(23).get('name'));
+                            var formattableinfo = me.api.asc_getCellInfo().asc_getFormatTableInfo();
+                            if (!formattableinfo) {
+                                if (_.isUndefined(me.toolbar.mnuTableTemplatePicker))
+                                    me.onApiInitTableTemplates(me.api.asc_getTablePictures(formattableinfo));
+                                var store = me.getCollection('TableTemplates');
+                                me._setTableFormat(store.at(23).get('name'));
+                            }
                         }
 
                         return false;
@@ -1411,7 +1436,7 @@ define([
                     restoreHeight: 300,
                     style: 'max-height: 300px;',
                     store: me.getCollection('TableTemplates'),
-                    itemTemplate: _.template('<div class="item-template"><img src="<%= imageUrl %>" id="<%= id %>"></div>')
+                    itemTemplate: _.template('<div class="item-template"><img src="<%= imageUrl %>" id="<%= id %>" style="width:61px;height:46px;"></div>')
                 });
 
                 picker.on('item:click', function(picker, item, record) {
@@ -1915,7 +1940,7 @@ define([
 
                     val = info.asc_getFlags().asc_getMerge();
                     if (this._state.merge !== val) {
-                        toolbar.btnMerge.toggle(val===true, true);
+                        toolbar.btnMerge.toggle(val===Asc.c_oAscMergeOptions.Merge, true);
                         this._state.merge = val;
                     }
 
@@ -1952,11 +1977,17 @@ define([
                     }
                 }
 
-                this._state.tablename = (formatTableInfo) ? formatTableInfo.asc_getTableName() : undefined;
-
                 need_disable =  this._state.controlsdisabled.filters || !filterInfo || (filterInfo.asc_getIsApplyAutoFilter()!==true);
                 toolbar.lockToolbar(SSE.enumLock.ruleDelFilter, need_disable, {array:[toolbar.btnClearAutofilter,toolbar.mnuitemClearFilter]});
-                this.getApplication().getController('Statusbar').onApiFilterInfo(!need_disable);
+
+                var old_name = this._state.tablename;
+                this._state.tablename = (formatTableInfo) ? formatTableInfo.asc_getTableName() : undefined;
+
+                var old_applied = this._state.filterapplied;
+                this._state.filterapplied = this._state.filter && filterInfo.asc_getIsApplyAutoFilter();
+
+                if (this._state.tablename !== old_name || this._state.filterapplied !== old_applied)
+                    this.getApplication().getController('Statusbar').onApiFilterInfo(!need_disable);
 
                 this._state.multiselect = info.asc_getFlags().asc_getMultiselect();
                 toolbar.lockToolbar(SSE.enumLock.multiselect, this._state.multiselect, { array: [toolbar.btnTableTemplate, toolbar.btnInsertHyperlink]});
@@ -2191,7 +2222,7 @@ define([
                     store: this.getApplication().getCollection('Common.Collections.TextArt'),
                     parentMenu: this.toolbar.mnuInsertTextArt.menu,
                     showLast: false,
-                    itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>"></div>')
+                    itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>" style="width:50px;height:50px;"></div>')
                 });
 
                 this.toolbar.mnuTextArtPicker.on('item:click', function(picker, item, record, e) {
@@ -2538,8 +2569,23 @@ define([
 
                             if (me._state.tablename)
                                 me.api.asc_changeAutoFilter(me._state.tablename, Asc.c_oAscChangeFilterOptions.style, fmtname);
-                            else
-                                me.api.asc_addAutoFilter(fmtname, dlg.getSettings());
+                            else {
+                                var settings = dlg.getSettings();
+                                if (settings.selectionType == Asc.c_oAscSelectionType.RangeMax || settings.selectionType == Asc.c_oAscSelectionType.RangeRow ||
+                                    settings.selectionType == Asc.c_oAscSelectionType.RangeCol)
+                                    Common.UI.warning({
+                                        title: me.textLongOperation,
+                                        msg: me.warnLongOperation,
+                                        buttons: ['ok', 'cancel'],
+                                        callback: function(btn) {
+                                            if (btn == 'ok')
+                                                setTimeout(function() { me.api.asc_addAutoFilter(fmtname, settings.range)}, 1);
+                                            Common.NotificationCenter.trigger('edit:complete', me.toolbar);
+                                        }
+                                    });
+                                else
+                                    me.api.asc_addAutoFilter(fmtname, settings.range);
+                            }
                         }
 
                         Common.NotificationCenter.trigger('edit:complete', me.toolbar);
@@ -2551,14 +2597,30 @@ define([
 
                     win.show();
                     win.setSettings({
-                        api     : me.api
+                        api     : me.api,
+                        selectionType: me.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType()
                     });
                 } else {
                     me._state.filter = undefined;
                     if (me._state.tablename)
                         me.api.asc_changeAutoFilter(me._state.tablename, Asc.c_oAscChangeFilterOptions.style, fmtname);
-                    else
-                        me.api.asc_addAutoFilter(fmtname);
+                    else {
+                        var selectionType = me.api.asc_getCellInfo().asc_getFlags().asc_getSelectionType();
+                        if (selectionType == Asc.c_oAscSelectionType.RangeMax || selectionType == Asc.c_oAscSelectionType.RangeRow ||
+                            selectionType == Asc.c_oAscSelectionType.RangeCol)
+                            Common.UI.warning({
+                                title: me.textLongOperation,
+                                msg: me.warnLongOperation,
+                                buttons: ['ok', 'cancel'],
+                                callback: function(btn) {
+                                    if (btn == 'ok')
+                                        setTimeout(function() { me.api.asc_addAutoFilter(fmtname)}, 1);
+                                    Common.NotificationCenter.trigger('edit:complete', me.toolbar);
+                                }
+                            });
+                        else
+                            me.api.asc_addAutoFilter(fmtname);
+                    }
                 }
             }
         },
@@ -2991,7 +3053,9 @@ define([
         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?',
         txtExpand: 'Expand and sort',
         txtSorting: 'Sorting',
-        txtSortSelected: 'Sort selected'
+        txtSortSelected: 'Sort selected',
+        textLongOperation: 'Long operation',
+        warnLongOperation: 'The operation you are about to perform might take rather much time to complete.<br>Are you sure you want to continue?'
 
     }, SSE.Controllers.Toolbar || {}));
 });

apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template

@@ -335,35 +335,35 @@
             <!--<div id="spark-dlg-radio-single" style="display: block;"></div>-->
         <!--</div>-->
         <table cols="2" style="width: 100%;">
-            <tr>
-                <td colspan=2 >
-                    <label class="header"><%= scope.textDataRange %></label>
-                </td>
-            </tr>
-            <tr>
-                <td class="padding-small" width="200">
-                    <div id="spark-dlg-txt-range" class="input-row" style="margin-right: 10px;"></div>
-                </td>
-                <td class="padding-small" style="text-align: right;">
-                    <button type="button" class="btn btn-text-default" id="spark-dlg-btn-data" style="min-width: 100px;"><%= scope.textSelectData %></button>
-                </td>
-            </tr>
-            <tr>
-                <td colspan=2 >
-                    <label class="header"><%= scope.textLocationRange %></label>
-                </td>
-            </tr>
-            <tr>
-                <td class="padding-large" width="200">
-                    <div id="spark-dlg-txt-location" class="input-row" style="margin-right: 10px;"></div>
-                </td>
-                <td class="padding-large" style="text-align: right;">
-                    <button type="button" class="btn btn-text-default" id="spark-dlg-btn-location-data" style="min-width: 100px;"><%= scope.textSelectData %></button>
-                </td>
-            </tr>
-            <tr>
-                <td colspan=2 class="padding-large"></td>
-            </tr>
+            <!--<tr>-->
+                <!--<td colspan=2 >-->
+                    <!--<label class="header"><%= scope.textDataRange %></label>-->
+                <!--</td>-->
+            <!--</tr>-->
+            <!--<tr>-->
+                <!--<td class="padding-small" width="200">-->
+                    <!--<div id="spark-dlg-txt-range" class="input-row" style="margin-right: 10px;"></div>-->
+                <!--</td>-->
+                <!--<td class="padding-small" style="text-align: right;">-->
+                    <!--<button type="button" class="btn btn-text-default" id="spark-dlg-btn-data" style="min-width: 100px;"><%= scope.textSelectData %></button>-->
+                <!--</td>-->
+            <!--</tr>-->
+            <!--<tr>-->
+                <!--<td colspan=2 >-->
+                    <!--<label class="header"><%= scope.textLocationRange %></label>-->
+                <!--</td>-->
+            <!--</tr>-->
+            <!--<tr>-->
+                <!--<td class="padding-large" width="200">-->
+                    <!--<div id="spark-dlg-txt-location" class="input-row" style="margin-right: 10px;"></div>-->
+                <!--</td>-->
+                <!--<td class="padding-large" style="text-align: right;">-->
+                    <!--<button type="button" class="btn btn-text-default" id="spark-dlg-btn-location-data" style="min-width: 100px;"><%= scope.textSelectData %></button>-->
+                <!--</td>-->
+            <!--</tr>-->
+            <!--<tr>-->
+                <!--<td colspan=2 class="padding-large"></td>-->
+            <!--</tr>-->
             <tr>
                 <td colspan=2 class="padding-small">
                     <label class="header"><%= scope.textEmptyCells %></label>

apps/spreadsheeteditor/main/app/template/TableSettings.template

@@ -73,6 +73,11 @@
             <div id="table-btn-edit" style="display: inline-block; float:right;"></div>
         </td>
     </tr>
+    <tr>
+        <td class="padding-small" colspan=2>
+            <button type="button" class="btn btn-text-default" id="table-btn-convert-range" style="width:100%;"><%= scope.textConvertRange %></button>
+        </td>
+    </tr>
     <tr>
         <td class="padding-small" colspan=2>
             <div class="separator horizontal"></div>

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

@@ -748,10 +748,12 @@ define([
                     itemTemplate: _.template([
                         '<div>',
                             '<label class="checkbox-indeterminate" style="position:absolute;">',
-                                '<% if (!check) { %>',
-                                    '<input type="button" class="img-commonctrl"/>',
-                                '<% } else { %>',
+                                '<% if (check=="indeterminate") { %>',
+                                    '<input type="button" class="indeterminate img-commonctrl"/>',
+                                '<% } else if (check) { %>',
                                     '<input type="button" class="checked img-commonctrl"/>',
+                                '<% } else { %>',
+                                    '<input type="button" class="img-commonctrl"/>',
                                 '<% } %>',
                             '</label>',
                             '<div id="<%= id %>" class="list-item" style="pointer-events:none;margin-left:20px;display:inline-block;width: 185px;"><%= Common.Utils.String.htmlEncode(value) %></div>',
@@ -1035,6 +1037,18 @@ define([
                 } else {
                     record.set('check', check);
                     idxs[parseInt(record.get('throughIndex'))] = check;
+
+                    var selectAllState = check;
+                    for (var i=0; i< this.cells.length; i++) {
+                        var cell = this.cells.at(i);
+                        if ('1' == cell.get('groupid') && cell.get('check') !== check) {
+                            selectAllState = 'indeterminate';
+                            break;
+                        }
+                    }
+                    this.checkCellTrigerBlock = true;
+                    this.cells.at(0).set('check', selectAllState);
+                    this.checkCellTrigerBlock = undefined;
                 }
 
                 this.btnOk.setDisabled(false);
@@ -1182,7 +1196,8 @@ define([
                 isnumber, value,
                 index = 0, throughIndex = 2,
                 applyfilter = true,
-                haveUnselectedCell = false,
+                selectAllState = false,
+                selectedCells = 0,
                 arr = [], arrEx = [],
                 idxs = (me.filter) ? me.filteredIndexes : me.throughIndexes;
 
@@ -1212,9 +1227,7 @@ define([
                         check           : idxs[throughIndex],
                         throughIndex    : throughIndex
                     }));
-                    if (!idxs[throughIndex]) {
-                        haveUnselectedCell = true;
-                    }
+                    if (idxs[throughIndex]) selectedCells++;
                 } else {
                     arrEx.push(new Common.UI.DataViewModel({
                         cellvalue       : value
@@ -1224,6 +1237,9 @@ define([
                 ++throughIndex;
             });
 
+            if (selectedCells==arr.length) selectAllState = true;
+            else if (selectedCells>0) selectAllState = 'indeterminate';
+
             if (me.filter || idxs[0]==undefined)
                 idxs[0] = true;
             if (!me.filter || arr.length>0)
@@ -1255,7 +1271,7 @@ define([
 
             if (this.cells.length) {
                 this.checkCellTrigerBlock = true;
-                this.cells.at(0).set('check', !haveUnselectedCell);
+                this.cells.at(0).set('check', selectAllState);
                 this.checkCellTrigerBlock = undefined;
             }
             this.btnOk.setDisabled(this.cells.length<1);

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

@@ -136,7 +136,7 @@ define([
         },
 
         onApiRangeChanged: function(info) {
-            this.inputRange.setValue(info);
+            this.inputRange.setValue(info.asc_getName());
             if (this.inputRange.cmpEl.hasClass('error'))
                 this.inputRange.cmpEl.removeClass('error');
         },

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

@@ -181,7 +181,7 @@ define([
 
                             if (this._isChartStylesChanged) {
                                 if (rec)
-                                    this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec(),true);
+                                    this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec()[0],true);
                                 else
                                     this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true);
                             }
@@ -925,6 +925,7 @@ define([
                         {
                             chartSettings: props,
                             imageSettings: (me.isChart) ? me._originalProps : null,
+                            sparklineStyles: me.sparklineStyles,
                             isChart: me.isChart,
                             api: me.api,
                             handler: function(result, value) {
@@ -1109,6 +1110,7 @@ define([
             if (styles && styles.length>1){
                 var stylesStore = this.cmbSparkStyle.menuPicker.store,
                     selectedIdx = styles[styles.length-1];
+                this.sparklineStyles = styles;
                 if (stylesStore.length == styles.length-1) {
                     var data = stylesStore.models;
                     for (var i=0; i<styles.length-1; i++) {

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

@@ -91,6 +91,7 @@ define([    'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
             this.api = this.options.api;
             this.chartSettings = this.options.chartSettings;
             this.imageSettings = this.options.imageSettings;
+            this.sparklineStyles = this.options.sparklineStyles;
             this.isChart       = this.options.isChart;
             this.vertAxisProps = null;
             this.horAxisProps = null;
@@ -819,7 +820,8 @@ define([    'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
                 itemHeight: 50,
                 menuMaxHeight: 272,
                 enableKeyEvents: true,
-                cls: 'combo-spark-style'
+                cls: 'combo-spark-style',
+                minWidth: 190
             });
             this.cmbSparkStyle.render($('#spark-dlg-combo-style'));
             this.cmbSparkStyle.openButton.menu.cmpEl.css({
@@ -844,7 +846,7 @@ define([    'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
                 labelText: this.textSingle,
                 name: 'asc-radio-sparkline'
             });
-            */
+
             this.txtSparkDataRange = new Common.UI.InputField({
                 el          : $('#spark-dlg-txt-range'),
                 name        : 'range',
@@ -872,6 +874,7 @@ define([    'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
                 el: $('#spark-dlg-btn-location-data')
             });
            this.btnSelectLocationData.on('click', _.bind(this.onSelectLocationData, this));
+             */
 
             this._arrEmptyCells = [
                 { value: Asc.c_oAscEDispBlanksAs.Gap, displayValue: this.textGaps },
@@ -1382,7 +1385,7 @@ define([    'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
                     if (record)
                         this.btnSparkType.setIconCls('item-chartlist ' + record.get('iconCls'));
 
-                    this.updateSparkStyles(props.asc_getStyles());
+                    this.updateSparkStyles((this.sparklineStyles) ? this.sparklineStyles : props.asc_getStyles());
 
                     if (this._state.SparkType !== Asc.c_oAscSparklineType.Line)
                         this._arrEmptyCells.pop();
@@ -1402,6 +1405,7 @@ define([    'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
                     this.spnSparkMinValue.setValue((props.asc_getManualMin() !== null) ? props.asc_getManualMin() : '', true);
                     this.spnSparkMaxValue.setValue((props.asc_getManualMax() !== null) ? props.asc_getManualMax() : '', true);
 
+                    /*
                     var value = props.asc_getDataRanges();
                     if (value && value.length==2) {
                         this.txtSparkDataRange.setValue((value[0]) ? value[0] : '');
@@ -1425,6 +1429,7 @@ define([    'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
                             return (isvalid==Asc.c_oAscError.ID.DataRangeError) ? me.textInvalidRange : true;
                         };
                     }
+                    */
 
                     this._changedProps = new Asc.sparklineGroup();
                     this._noApply = false;

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

@@ -418,6 +418,10 @@ define([
                 caption : me.advancedShapeText
             });
 
+            me.mnuImgAdvanced = new Common.UI.MenuItem({
+                caption : me.advancedImgText
+            });
+
             me.mnuChartEdit = new Common.UI.MenuItem({
                 caption : me.chartText
             });
@@ -469,7 +473,8 @@ define([
                     me.mnuUnGroupImg,
                     me.mnuShapeSeparator,
                     me.mnuChartEdit,
-                    me.mnuShapeAdvanced
+                    me.mnuShapeAdvanced,
+                    me.mnuImgAdvanced
                 ]
             });
 
@@ -622,9 +627,8 @@ define([
             me.fireEvent('createdelayedelements', [me]);
         },
 
-        setMenuItemCommentCaptionMode: function (edit) {
-            edit ? this.pmiAddComment.setCaption(this.txtEditComment, true) :
-                this.pmiAddComment.setCaption(this.txtAddComment, true);
+        setMenuItemCommentCaptionMode: function (add, editable) {
+            this.pmiAddComment.setCaption(add ? this.txtAddComment : (editable ? this.txtEditComment : this.txtShowComment), true);
         },
 
         txtSort:                'Sort',
@@ -681,17 +685,17 @@ define([
         textFreezePanes:        'Freeze Panes',
         textUnFreezePanes:      'Unfreeze Panes',
         txtSelect:              'Select',
-        selectRowText           : 'Select Row',
-        selectColumnText        : 'Select Entire Column',
-        selectDataText          : 'Select Column Data',
-        selectTableText         : 'Select Table',
-        insertRowAboveText      : 'Insert Row Above',
-        insertRowBelowText      : 'Insert Row Below',
-        insertColumnLeftText    : 'Insert Column Left',
-        insertColumnRightText   : 'Insert Column Right',
-        deleteRowText           : 'Delete Row',
-        deleteColumnText        : 'Delete Column',
-        deleteTableText         : 'Delete Table',
+        selectRowText           : 'Row',
+        selectColumnText        : 'Entire Column',
+        selectDataText          : 'Column Data',
+        selectTableText         : 'Table',
+        insertRowAboveText      : 'Row Above',
+        insertRowBelowText      : 'Row Below',
+        insertColumnLeftText    : 'Column Left',
+        insertColumnRightText   : 'Column Right',
+        deleteRowText           : 'Row',
+        deleteColumnText        : 'Column',
+        deleteTableText         : 'Table',
         txtFilter: 'Filter',
         txtFilterValue: 'Filter by Selected cell\'s value',
         txtFilterCellColor: 'Filter by cell\'s color',
@@ -706,7 +710,9 @@ define([
         textEntriesList: 'Select from drop-down list',
         txtSparklines: 'Sparklines',
         txtClearSparklines: 'Clear Selected Sparklines',
-        txtClearSparklineGroups: 'Clear Selected Sparkline Groups'
+        txtClearSparklineGroups: 'Clear Selected Sparkline Groups',
+        txtShowComment: 'Show Comment',
+        advancedImgText: 'Image Advanced Settings'
 
     }, SSE.Views.DocumentHolder || {}));
 });

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

@@ -447,6 +447,10 @@ define([
                     '<td class="left"><label id="fms-lbl-autosave"><%= scope.textAutoSave %></label></td>',
                     '<td class="right"><span id="fms-chb-autosave" /></td>',
                 '</tr>','<tr class="divider autosave"></tr>',
+                '<tr class="forcesave">',
+                    '<td class="left"><label id="fms-lbl-forcesave"><%= scope.textForceSave %></label></td>',
+                    '<td class="right"><span id="fms-chb-forcesave" /></td>',
+                '</tr>','<tr class="divider forcesave"></tr>',
                 '<tr class="coauth changes">',
                     '<td class="left"><label><%= scope.strCoAuthMode %></label></td>',
                     '<td class="right">',
@@ -561,7 +565,12 @@ define([
                 }
             }, this));
             this.lblAutosave = $('#fms-lbl-autosave');
-            
+
+            this.chForcesave = new Common.UI.CheckBox({
+                el: $('#fms-chb-forcesave'),
+                labelText: this.strForcesave
+            });
+
             this.cmbUnit = new Common.UI.ComboBox({
                 el          : $('#fms-cmb-unit'),
                 style       : 'width: 160px;',
@@ -582,7 +591,8 @@ define([
                 data        : [
                     { value: 'en', displayValue: this.txtEn, exampleValue: this.txtExampleEn },
                     { value: 'de', displayValue: this.txtDe, exampleValue: this.txtExampleDe },
-                    { value: 'ru', displayValue: this.txtRu, exampleValue: this.txtExampleRu }
+                    { value: 'ru', displayValue: this.txtRu, exampleValue: this.txtExampleRu },
+                    { value: 'pl', displayValue: this.txtPl, exampleValue: this.txtExamplePl }
                 ]
             }).on('selected', _.bind(function(combo, record) {
                 this.updateFuncExample(record.exampleValue);
@@ -652,6 +662,7 @@ define([
                 this.chAutosave.setCaption(this.strAutoRecover);
                 this.lblAutosave.text(this.textAutoRecover);
             }
+            $('tr.forcesave', this.el)[mode.canForcesave ? 'show' : 'hide']();
             $('tr.coauth', this.el)[mode.canCoAuthoring && mode.isEdit ? 'show' : 'hide']();
             $('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring? 'show' : 'hide']();
         },
@@ -695,6 +706,12 @@ define([
                 value = 0;
             this.chAutosave.setValue(fast_coauth || (value===null ? this.mode.canCoAuthoring : parseInt(value) == 1));
 
+            if (this.mode.canForcesave) {
+                value = Common.localStorage.getItem("sse-settings-forcesave");
+                value = (value === null) ? this.mode.canForcesave : (parseInt(value) == 1);
+                this.chForcesave.setValue(value);
+            }
+
             value = Common.localStorage.getItem("sse-settings-func-locale");
             if (value===null)
                 value = ((this.mode.lang) ? this.mode.lang : 'en').toLowerCase();
@@ -740,6 +757,8 @@ define([
             Common.localStorage.setItem("sse-settings-fontrender", this.cmbFontRender.getValue());
             Common.localStorage.setItem("sse-settings-unit", this.cmbUnit.getValue());
             Common.localStorage.setItem("sse-settings-autosave", this.chAutosave.isChecked() ? 1 : 0);
+            if (this.mode.canForcesave)
+                Common.localStorage.setItem("sse-settings-forcesave", this.chForcesave.isChecked() ? 1 : 0);
             Common.localStorage.setItem("sse-settings-func-locale", this.cmbFuncLocale.getValue());
             if (this.cmbRegSettings.getSelectedRecord())
                 Common.localStorage.setItem("sse-settings-reg-settings", this.cmbRegSettings.getValue());
@@ -791,9 +810,11 @@ define([
         txtEn: 'English',
         txtDe: 'Deutsch',
         txtRu: 'Russian',
+        txtPl: 'Polish',
         txtExampleEn: ' SUM; MIN; MAX; COUNT',
         txtExampleDe: ' SUMME; MIN; MAX; ANZAHL',
         txtExampleRu: ' СУММ; МИН; МАКС; СЧЁТ',
+        txtExamplePl: ' SUMA; MIN; MAX; ILE.LICZB',
         strFuncLocale: 'Formula Language',
         strFuncLocaleEx: 'Example: SUM; MIN; MAX; COUNT',
         strRegSettings: 'Regional Settings',
@@ -805,7 +826,9 @@ define([
         strStrict: 'Strict',
         textAutoRecover: 'Autorecover',
         strAutoRecover: 'Turn on autorecover',
-        txtInch: 'Inch'
+        txtInch: 'Inch',
+        textForceSave: 'Save to Server',
+        strForcesave: 'Always save to server (otherwise save to server on document close)'
     }, SSE.Views.FileMenuPanels.MainSettingsGeneral || {}));
 
     SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({

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

@@ -183,7 +183,7 @@ define([
             this.cmbNegative = new Common.UI.ComboBox({
                 el: $('#format-settings-combo-negative'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 264px;max-height:210px;',
+                menuStyle: 'min-width: 264px;max-height:235px;',
                 editable: false,
                 data: [],
                 scrollAlwaysVisible: true
@@ -211,7 +211,7 @@ define([
             this.cmbSymbols = new Common.UI.ComboBox({
                 el: $('#format-settings-combo-symbols'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 264px;max-height:210px;',
+                menuStyle: 'min-width: 264px;max-height:235px;',
                 editable: false,
                 data: [],
                 scrollAlwaysVisible: true
@@ -221,7 +221,7 @@ define([
             this.cmbType = new Common.UI.ComboBox({
                 el: $('#format-settings-combo-type'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 264px;max-height:210px;',
+                menuStyle: 'min-width: 264px;max-height:235px;',
                 editable: false,
                 data: [],
                 scrollAlwaysVisible: true
@@ -231,7 +231,7 @@ define([
             this.cmbCode = new Common.UI.ComboBox({
                 el: $('#format-settings-combo-code'),
                 cls: 'input-group-nr',
-                menuStyle: 'min-width: 310px;max-height:210px;',
+                menuStyle: 'min-width: 310px;max-height:235px;',
                 editable: false,
                 data: [],
                 scrollAlwaysVisible: true
@@ -267,7 +267,7 @@ define([
                 if ((props.formatInfo.asc_getType() == Asc.c_oAscNumFormatType.Custom) && props.format)
                     this.CustomFormat = this.Format = props.format;
 
-                this.onFormatSelect(this.cmbFormat, this.cmbFormat.getSelectedRecord());
+                this.onFormatSelect(this.cmbFormat, this.cmbFormat.getSelectedRecord(), null, props.formatInfo);
                 if (this._state.hasDecimal)
                     this.spnDecimal.setValue(props.formatInfo.asc_getDecimalPlaces());
                 if (this._state.hasSeparator)
@@ -275,8 +275,29 @@ define([
                 if (this._state.hasSymbols)
                     this.cmbSymbols.setValue(props.formatInfo.asc_getSymbol());
 
+                if (props.format) {
+                    if (this._state.hasNegative) {
+                        var selectedItem = this.cmbNegative.store.findWhere({value: props.format});
+                        if (selectedItem)
+                            this.cmbNegative.selectRecord(selectedItem);
+                        else
+                            this.cmbNegative.setValue(this.api.asc_getLocaleExample(props.format));
+                    } else if (this._state.hasType) {
+                        var selectedItem = this.cmbType.store.findWhere({value: props.format});
+                        if (selectedItem)
+                            this.cmbType.selectRecord(selectedItem);
+                        else if (props.formatInfo.asc_getType() == Asc.c_oAscNumFormatType.Fraction)
+                            this.cmbType.setValue(this.txtCustom);
+                        else if (props.formatInfo.asc_getType() == Asc.c_oAscNumFormatType.Time)
+                            this.cmbType.setValue(this.api.asc_getLocaleExample(props.format, 1.534));
+                        else
+                            this.cmbType.setValue(this.api.asc_getLocaleExample(props.format, 38822));
+                    }
+                    this.Format = props.format;
+                    this.lblExample.text(this.api.asc_getLocaleExample(this.Format));
+                }
                 // for fraction - if props.format not in cmbType - setValue(this.txtCustom)
-                // for date/time - if props.format not in cmbType - setValue(this.api.asc_getLocaleExample(props.format, 37973))
+                // for date/time - if props.format not in cmbType - setValue(this.api.asc_getLocaleExample(props.format, 38822))
                 // for cmbNegative - if props.format not in cmbNegative - setValue(this.api.asc_getLocaleExample(props.format))
             }
         },
@@ -380,7 +401,7 @@ define([
             this.lblExample.text(this.api.asc_getLocaleExample(this.Format));
         },
 
-        onFormatSelect: function(combo, record) {
+        onFormatSelect: function(combo, record, e, initFormatInfo) {
             if (!record) return;
 
             this.FormatType = record.value;
@@ -392,13 +413,16 @@ define([
                 hasType = (record.value == Asc.c_oAscNumFormatType.Date || record.value == Asc.c_oAscNumFormatType.Time || record.value == Asc.c_oAscNumFormatType.Fraction),
                 hasSymbols = (record.value == Asc.c_oAscNumFormatType.Accounting || record.value == Asc.c_oAscNumFormatType.Currency),
                 hasCode = (record.value == Asc.c_oAscNumFormatType.Custom),
-                me = this;
+                me = this,
+                valDecimal = (initFormatInfo) ? initFormatInfo.asc_getDecimalPlaces() : this.spnDecimal.getNumberValue(),
+                valSeparator = (initFormatInfo) ? initFormatInfo.asc_getSeparator() : (this.chSeparator.getValue()=='checked'),
+                valSymbol = (initFormatInfo && initFormatInfo.asc_getSymbol()) ? initFormatInfo.asc_getSymbol() : this.langId;
 
             if (record.value !== Asc.c_oAscNumFormatType.Custom) {
                 var info = new Asc.asc_CFormatCellsInfo();
                 info.asc_setType(record.value);
-                info.asc_setDecimalPlaces(hasDecimal ? this.spnDecimal.getNumberValue() : 0);
-                info.asc_setSeparator(hasSeparator ? this.chSeparator.getValue()=='checked' : false);
+                info.asc_setDecimalPlaces(hasDecimal ? valDecimal : 0);
+                info.asc_setSeparator(hasSeparator ? valSeparator : false);
 
                 if (hasNegative || record.value == Asc.c_oAscNumFormatType.Date || record.value == Asc.c_oAscNumFormatType.Time) {
                     if (hasSymbols) {
@@ -411,14 +435,14 @@ define([
                                 }
                             }
                             this.cmbSymbols.setData(this.CurrencySymbolsData);
-                            this.cmbSymbols.setValue(this.langId);
+                            this.cmbSymbols.setValue(valSymbol);
                         }
                         info.asc_setSymbol(this.cmbSymbols.getValue());
                     }
 
                     var formatsarr = this.api.asc_getFormatCells(info),
                         data = [],
-                        exampleVal = (record.value == Asc.c_oAscNumFormatType.Date) ? 37973 : ((record.value == Asc.c_oAscNumFormatType.Time) ? 0.123 : parseFloat("-1234.12345678901234567890"));
+                        exampleVal = (record.value == Asc.c_oAscNumFormatType.Date) ? 38822 : ((record.value == Asc.c_oAscNumFormatType.Time) ? 1.534 : parseFloat("-1234.12345678901234567890"));
                     formatsarr.forEach(function(item) {
                         data.push({value: item, displayValue: me.api.asc_getLocaleExample(item, exampleVal)});
                     });
@@ -442,7 +466,7 @@ define([
             } else {
                 var info = new Asc.asc_CFormatCellsInfo();
                 info.asc_setType(Asc.c_oAscNumFormatType.None);
-                info.asc_setSymbol(this.langId);
+                info.asc_setSymbol(valSymbol);
 
                 var formatsarr = this.api.asc_getFormatCells(info),
                     data = [],
@@ -489,15 +513,15 @@ define([
         txtFraction:        'Fraction',
         txtScientific:      'Scientific',
         txtText:            'Text',
-        txtUpto1: 'Up to one digit',
-        txtUpto2: 'Up to two digits',
-        txtUpto3: 'Up to three digits',
-        txtAs2:  'As halfs',
-        txtAs8:  'As eighths',
-        txtAs4:  'As fourths',
-        txtAs16:  'As sixteenths',
-        txtAs10:  'As tenths',
-        txtAs100: 'As hundredths',
+        txtUpto1: 'Up to one digit (1/3)',
+        txtUpto2: 'Up to two digits (12/25)',
+        txtUpto3: 'Up to three digits (131/135)',
+        txtAs2:  'As halfs (1/2)',
+        txtAs8:  'As eighths (4/8)',
+        txtAs4:  'As fourths (2/4)',
+        txtAs16:  'As sixteenths (8/16)',
+        txtAs10:  'As tenths (5/10)',
+        txtAs100: 'As hundredths (50/100)',
         txtSample: 'Sample:'
 
     }, SSE.Views.FormatSettingsDialog || {}))

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

@@ -339,6 +339,25 @@ define([
             return this;
         },
 
+        setDeveloperMode: function(mode) {
+            if ( !this.$el.is(':visible') ) return;
+
+            if (!this.developerHint) {
+                this.developerHint = $('<div id="developer-hint">' + this.txtDeveloper + '</div>').appendTo(this.$el);
+                this.devHeight = this.developerHint.outerHeight();
+                $(window).on('resize', _.bind(this.onWindowResize, this));
+            }
+            this.developerHint.toggleClass('hidden', !mode);
+
+            var lastbtn = this.$el.find('button.btn-category:visible:last-of-type');
+            this.minDevPosition = lastbtn.offset().top - lastbtn.offsetParent().offset().top + lastbtn.height() + 20;
+            this.onWindowResize();
+        },
+
+        onWindowResize: function() {
+            this.developerHint.css('top', Math.max((this.$el.height()-this.devHeight)/2, this.minDevPosition));
+        },
+
         /** coauthoring begin **/
         tipComments : 'Comments',
         tipChat     : 'Chat',
@@ -347,6 +366,7 @@ define([
         tipSupport  : 'Feedback & Support',
         tipFile     : 'File',
         tipSearch   : 'Search',
-        tipPlugins  : 'Plugins'
+        tipPlugins  : 'Plugins',
+        txtDeveloper: 'DEVELOPER MODE'
     }, SSE.Views.LeftMenu || {}));
 });

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

@@ -364,8 +364,8 @@ define([
             }
         },
 
-        onHideMenus: function(e){
-            Common.NotificationCenter.trigger('edit:complete', this);
+        onHideMenus: function(menu, e, isFromInputControl){
+            if (!isFromInputControl) Common.NotificationCenter.trigger('edit:complete', this);
         },
 
         setLocked: function (locked) {

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

@@ -77,28 +77,32 @@ define([
                 asctype: Common.Utils.documentSettingsType.Paragraph,
                 enableToggle: true,
                 disabled: true,
-                toggleGroup: 'tabpanelbtnsGroup'
+                toggleGroup: 'tabpanelbtnsGroup',
+                allowMouseEventsOnDisabled: true
             });
             this.btnImage = new Common.UI.Button({
                 hint: this.txtImageSettings,
                 asctype: Common.Utils.documentSettingsType.Image,
                 enableToggle: true,
                 disabled: true,
-                toggleGroup: 'tabpanelbtnsGroup'
+                toggleGroup: 'tabpanelbtnsGroup',
+                allowMouseEventsOnDisabled: true
             });
             this.btnChart = new Common.UI.Button({
                 hint: this.txtChartSettings,
                 asctype: Common.Utils.documentSettingsType.Chart,
                 enableToggle: true,
                 disabled: true,
-                toggleGroup: 'tabpanelbtnsGroup'
+                toggleGroup: 'tabpanelbtnsGroup',
+                allowMouseEventsOnDisabled: true
             });
             this.btnShape = new Common.UI.Button({
                 hint: this.txtShapeSettings,
                 asctype: Common.Utils.documentSettingsType.Shape,
                 enableToggle: true,
                 disabled: true,
-                toggleGroup: 'tabpanelbtnsGroup'
+                toggleGroup: 'tabpanelbtnsGroup',
+                allowMouseEventsOnDisabled: true
             });
 
             this.btnTextArt = new Common.UI.Button({
@@ -106,7 +110,8 @@ define([
                 asctype: Common.Utils.documentSettingsType.TextArt,
                 enableToggle: true,
                 disabled: true,
-                toggleGroup: 'tabpanelbtnsGroup'
+                toggleGroup: 'tabpanelbtnsGroup',
+                allowMouseEventsOnDisabled: true
             });
 
             this.btnTable = new Common.UI.Button({
@@ -114,7 +119,8 @@ define([
                 asctype: Common.Utils.documentSettingsType.Table,
                 enableToggle: true,
                 disabled: true,
-                toggleGroup: 'tabpanelbtnsGroup'
+                toggleGroup: 'tabpanelbtnsGroup',
+                allowMouseEventsOnDisabled: true
             });
 
             this._settings = [];

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

@@ -1258,6 +1258,18 @@ define([
             this.sldrGradient.on('thumbdblclick', function(cmp){
                 me.btnGradColor.cmpEl.find('button').dropdown('toggle');
             });
+            this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
+                var colors = [],
+                    currentIdx;
+                _.each (recalc_indexes, function(recalc_index, index) {
+                    colors.push(me.GradColor.colors[recalc_index]);
+                    if (me.GradColor.currentIdx == recalc_index)
+                        currentIdx = index;
+                });
+                me.OriginalFillType = null;
+                me.GradColor.colors = colors;
+                me.GradColor.currentIdx = currentIdx;
+            });
             this.fillControls.push(this.sldrGradient);
 
             this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

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

@@ -189,6 +189,8 @@ define([
                 this.panelUsers = $('#status-users-ct', this.el);
                 this.panelUsers.on('shown.bs.dropdown', function () {
                     me.panelUsersList.scroller.update({minScrollbarLength  : 40, alwaysVisibleY: true});
+                    var tip = me.panelUsersBlock.data('bs.tooltip');
+                    if (tip) tip.hide();
                 });
 
                 this.panelUsersBlock = this.panelUsers.find('#status-users-block');
@@ -437,8 +439,12 @@ define([
                 } else if (countFilter) {// filter mode
                     if (!this.boxFiltered.is(':visible')) this.boxFiltered.show();
                     this.labelFiltered.text(this.filteredText);
-                } else {
+                } else if (countFilter !== undefined && countFilter !== null){
                     if (this.boxFiltered.is(':visible')) this.boxFiltered.hide();
+                } else {
+                    var filterInfo = this.api.asc_getCellInfo().asc_getAutoFilterInfo(),
+                        need_disable =  !filterInfo || (filterInfo.asc_getIsApplyAutoFilter()!==true);
+                    this.setFilteredInfo(!need_disable);
                 }
 
                 var me = this;

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

@@ -74,6 +74,7 @@ define([
 
             this.options.tpl = _.template(this.template, this.options);
             this.checkRangeType = Asc.c_oAscSelectionDialogType.FormatTable;
+            this.selectionType = Asc.c_oAscSelectionType.RangeCells;
 
             Common.UI.Window.prototype.initialize.call(this, this.options);
         },
@@ -129,6 +130,8 @@ define([
                 }
                 if (settings.title)
                     me.setTitle(settings.title);
+                if (settings.selectionType)
+                    me.selectionType = settings.selectionType;
 
                 me.api.asc_unregisterCallback('asc_onSelectionRangeChanged', _.bind(me.onApiRangeChanged, me));
                 me.api.asc_registerCallback('asc_onSelectionRangeChanged', _.bind(me.onApiRangeChanged, me));
@@ -145,15 +148,16 @@ define([
             if (this.checkRangeType == Asc.c_oAscSelectionDialogType.FormatTable) {
                 var options = this.api.asc_getAddFormatTableOptions(this.inputRange.getValue());
                 options.asc_setIsTitle(this.cbTitle.checked);
-                return options;
+                return { selectionType: this.selectionType,  range: options};
             } else
-                return this.inputRange.getValue();
+                return { selectionType: this.selectionType,  range: this.inputRange.getValue()};
         },
 
         onApiRangeChanged: function(info) {
-            this.inputRange.setValue(info);
+            this.inputRange.setValue(info.asc_getName());
             if (this.inputRange.cmpEl.hasClass('error'))
                 this.inputRange.cmpEl.removeClass('error');
+            this.selectionType = info.asc_getType();
         },
 
         isRangeValid: function() {

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

@@ -286,6 +286,15 @@ define([
             this.btnEdit.menu.on('item:click', _.bind(this.onEditClick, this));
             this.lockedControls.push(this.btnEdit);
 
+            this.btnConvertRange = new Common.UI.Button({
+                el: $('#table-btn-convert-range')
+            });
+            this.btnConvertRange.on('click', _.bind(function(btn){
+                if (this.api) this.api.asc_convertTableToRange(this._state.TableName);
+                Common.NotificationCenter.trigger('edit:complete', this);
+            }, this));
+            this.lockedControls.push(this.btnConvertRange);
+
             $(this.el).on('click', '#table-advanced-link', _.bind(this.openAdvancedSettings, this));
 
             this._initSettings = false;
@@ -316,7 +325,7 @@ define([
             if (this._initSettings)
                 this.createDelayedControls();
 
-            this.disableControls(this._locked);
+            this.disableControls(this._locked); // need to update combodataview after disabled state
 
             if (props )//formatTableInfo
             {
@@ -396,7 +405,7 @@ define([
 
                     if (this._isTemplatesChanged) {
                         if (rec)
-                            this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec(),true);
+                            this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.getSelectedRec()[0],true);
                         else
                             this.cmbTableTemplate.fillComboView(this.cmbTableTemplate.menuPicker.store.at(0), true);
                     }
@@ -435,6 +444,7 @@ define([
                     self.cmbTableTemplate.menuPicker.scroller.update({alwaysVisibleY: true});
                 });
                 this.lockedControls.push(this.cmbTableTemplate);
+                if (this._locked) this.cmbTableTemplate.setDisabled(this._locked);
             }
 
             var count = self.cmbTableTemplate.menuPicker.store.length;
@@ -468,10 +478,25 @@ define([
                 var handlerDlg = function(dlg, result) {
                     if (result == 'ok') {
                         me.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.None);
-                        me.api.asc_changeTableRange(me._state.TableName, dlg.getSettings());
+
+                        var settings = dlg.getSettings();
+                        if (settings.selectionType == Asc.c_oAscSelectionType.RangeMax || settings.selectionType == Asc.c_oAscSelectionType.RangeRow ||
+                            settings.selectionType == Asc.c_oAscSelectionType.RangeCol)
+                            Common.UI.warning({
+                                title: me.textLongOperation,
+                                msg: me.warnLongOperation,
+                                buttons: ['ok', 'cancel'],
+                                callback: function(btn) {
+                                    if (btn == 'ok')
+                                        setTimeout(function() { me.api.asc_changeTableRange(me._state.TableName, settings.range)}, 1);
+                                    Common.NotificationCenter.trigger('edit:complete', me);
+                                }
+                            });
+                        else
+                            me.api.asc_changeTableRange(me._state.TableName, settings.range);
                     }
 
-                    Common.NotificationCenter.trigger('edit:complete', me.toolbar);
+                    Common.NotificationCenter.trigger('edit:complete', me);
                 };
                 var win = new SSE.Views.TableOptionsDialog({
                     handler: handlerDlg
@@ -534,7 +559,10 @@ define([
         textIsLocked            : 'This element is being edited by another user.',
         notcriticalErrorTitle   : 'Warning',
         textReservedName        : 'The name you are trying to use is already referenced in cell formulas. Please use some other name.',
-        textAdvanced:   'Show advanced settings'
+        textAdvanced:   'Show advanced settings',
+        textConvertRange: 'Convert to range',
+        textLongOperation: 'Long operation',
+        warnLongOperation: 'The operation you are about to perform might take rather much time to complete.<br>Are you sure you want to continue?'
 
     }, SSE.Views.TableSettings || {}));
 });

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

@@ -1228,6 +1228,18 @@ define([
             this.sldrGradient.on('thumbdblclick', function(cmp){
                 me.btnGradColor.cmpEl.find('button').dropdown('toggle');
             });
+            this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
+                var colors = [],
+                    currentIdx;
+                _.each (recalc_indexes, function(recalc_index, index) {
+                    colors.push(me.GradColor.colors[recalc_index]);
+                    if (me.GradColor.currentIdx == recalc_index)
+                        currentIdx = index;
+                });
+                me.OriginalFillType = null;
+                me.GradColor.colors = colors;
+                me.GradColor.currentIdx = currentIdx;
+            });
             this.lockedControls.push(this.sldrGradient);
 
             this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

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

@@ -392,7 +392,7 @@ define([
                         },
                         {
                             caption : me.txtUnmerge,
-                            value   : Asc.c_oAscMergeOptions.Unmerge
+                            value   : Asc.c_oAscMergeOptions.None
                         }
                     ]
                 })
@@ -692,23 +692,23 @@ define([
                     items : [
                         {
                             caption : me.txtDollar,
-                            value   : '_($* #,##0.00_);_($* (#,##0.00);_($* "-"??_);_(@_)'
+                            value   : 0x0409 // $ en-US
                         },
                         {
                             caption : me.txtEuro,
-                            value   : '_(€* #,##0.00_);_(€* (#,##0.00);_(€* "-"??_);_(@_)'
+                            value   : 0x0407 // € de-DE
                         },
                         {
                             caption : me.txtPound,
-                            value   : '_(£* #,##0.00_);_(£* (#,##0.00);_(£* "-"??_);_(@_)'
+                            value   : 0x0809 // £ en-GB
                         },
                         {
                             caption : me.txtRouble,
-                            value   : '_-* #,##0.00[$р.-419]_-;-* #,##0.00[$р.-419]_-;_-* "-"??[$р.-419]_-;_-@_-'
+                            value   : 0x0419 // ₽ ru-RU
                         },
                         {
                             caption : me.txtYen,
-                            value   : '_(¥* #,##0.00_);_(¥* (#,##0.00);_(¥* "-"??_);_(@_)'
+                            value   : 0x0411 // ¥ ja-JP
                         }
                     ]
                 })
@@ -1551,10 +1551,10 @@ define([
                     { id: 'menu-chart-group-hbar',    caption: me.textBar },
                     { id: 'menu-chart-group-area',    caption: me.textArea, inline: true },
                     { id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true },
-                    { id: 'menu-chart-group-stock',   caption: me.textStock, inline: true },
-                    { id: 'menu-chart-group-sparkcolumn', inline: true, headername: me.textSparks },
-                    { id: 'menu-chart-group-sparkline',   inline: true },
-                    { id: 'menu-chart-group-sparkwin',    inline: true }
+                    { id: 'menu-chart-group-stock',   caption: me.textStock, inline: true }
+                    // ,{ id: 'menu-chart-group-sparkcolumn', inline: true, headername: me.textSparks },
+                    // { id: 'menu-chart-group-sparkline',   inline: true },
+                    // { id: 'menu-chart-group-sparkwin',    inline: true }
                 ]),
                 store: new Common.UI.DataViewStore([
                     { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barNormal,          allowSelected: true, iconCls: 'column-normal', selected: true},
@@ -1581,10 +1581,10 @@ define([
                     { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaStacked,        allowSelected: true, iconCls: 'area-stack'},
                     { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaStackedPer,     allowSelected: true, iconCls: 'area-pstack'},
                     { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter,            allowSelected: true, iconCls: 'point-normal'},
-                    { group: 'menu-chart-group-stock',   type: Asc.c_oAscChartTypeSettings.stock,              allowSelected: true, iconCls: 'stock-normal'},
-                    { group: 'menu-chart-group-sparkcolumn',   type: Asc.c_oAscSparklineType.Column,    allowSelected: true, iconCls: 'spark-column', tip: me.textColumnSpark},
-                    { group: 'menu-chart-group-sparkline',     type: Asc.c_oAscSparklineType.Line,      allowSelected: true, iconCls: 'spark-line', tip: me.textLineSpark},
-                    { group: 'menu-chart-group-sparkwin',      type: Asc.c_oAscSparklineType.Stacked,   allowSelected: true, iconCls: 'spark-win', tip: me.textWinLossSpark}
+                    { group: 'menu-chart-group-stock',   type: Asc.c_oAscChartTypeSettings.stock,              allowSelected: true, iconCls: 'stock-normal'}
+                    // ,{ group: 'menu-chart-group-sparkcolumn',   type: Asc.c_oAscSparklineType.Column,    allowSelected: true, iconCls: 'spark-column', tip: me.textColumnSpark},
+                    // { group: 'menu-chart-group-sparkline',     type: Asc.c_oAscSparklineType.Line,      allowSelected: true, iconCls: 'spark-line', tip: me.textLineSpark},
+                    // { group: 'menu-chart-group-sparkwin',      type: Asc.c_oAscSparklineType.Stacked,   allowSelected: true, iconCls: 'spark-win', tip: me.textWinLossSpark}
                 ]),
                 itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
             });
@@ -1739,7 +1739,7 @@ define([
                     if (this.synchTooltip)
                         this.synchTooltip.hide();
                     this.btnSave.updateHint(this.btnSaveTip);
-                    this.btnSave.setDisabled(true);
+                    this.btnSave.setDisabled(!this.mode.forcesave);
                     this._state.hasCollaborativeChanges = false;
                 }
             }
@@ -1801,7 +1801,7 @@ define([
         txtCurrency:        'Currency',
         txtDollar:          '$ Dollar',
         txtEuro:            '€ Euro',
-        txtRouble:          'р. Rouble',
+        txtRouble:          '₽ Rouble',
         txtPound:           '£ Pound',
         txtYen:             '¥ Yen',
 //    txtFranc:           'CHF Swiss franc',

apps/spreadsheeteditor/main/app_dev.js

@@ -177,6 +177,7 @@ require([
         'common/main/lib/controller/Chat',
         'common/main/lib/controller/Plugins'
     ], function() {
+        window.compareVersions = true;
         app.start();
     });
 }, function(err) {

apps/spreadsheeteditor/main/locale/de.json

@@ -257,6 +257,7 @@
   "SSE.Controllers.Main.errorPasteMaxRange": "Der Bereich Kopieren und Einfügen stimmen nicht überein.<br>Bitte wählen Sie einen Bereich der gleichen Größe oder klicken auf die erste Zelle der Zeile, um die kopierten Zellen einzufügen",
   "SSE.Controllers.Main.errorPrintMaxPagesCount": "Leider kann man in der aktuellen Programmversion nicht mehr als 1500 Seiten gleichzeitig drucken.<br>Diese Einschränkung wird in den kommenden Versionen entfernt.",
   "SSE.Controllers.Main.errorProcessSaveResult": "Speichern ist fehlgeschlagen",
+  "SSE.Controllers.Main.errorServerVersion": "Editor-Version wurde aktualisiert. Die Seite wird neu geladen, um die Änderungen zu übernehmen.",
   "SSE.Controllers.Main.errorSessionAbsolute": "Die Bearbeitungssitzung des Dokumentes ist abgelaufen. Laden Sie die Seite neu.",
   "SSE.Controllers.Main.errorSessionIdle": "Das Dokument wurde lange nicht bearbeitet. Laden Sie die Seite neu.",
   "SSE.Controllers.Main.errorSessionToken": "Die Verbindung zum Server wurde unterbrochen. Laden Sie die Seite neu.",
@@ -311,6 +312,7 @@
   "SSE.Controllers.Main.textYes": "Ja",
   "SSE.Controllers.Main.titleLicenseExp": "Lizenz ist abgelaufen",
   "SSE.Controllers.Main.titleRecalcFormulas": "Berechnung...",
+  "SSE.Controllers.Main.titleServerVersion": "Editor wurde aktualisiert",
   "SSE.Controllers.Main.txtArt": "Hier den Text eingeben",
   "SSE.Controllers.Main.txtBasicShapes": "Standardformen",
   "SSE.Controllers.Main.txtButtons": "Buttons",
@@ -1052,6 +1054,7 @@
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtLiveComment": "Live-Kommentare",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtMac": "wie OS X",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNative": "Native",
+  "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPl": "Polnisch",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Punkt",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russisch",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "wie Windows",
@@ -1440,6 +1443,7 @@
   "SSE.Views.TableSettings.textBanded": "Gstreift",
   "SSE.Views.TableSettings.textCancel": "Abbrechen",
   "SSE.Views.TableSettings.textColumns": "Spalten",
+  "SSE.Views.TableSettings.textConvertRange": "In Zellenbereich konvertieren",
   "SSE.Views.TableSettings.textEdit": "Zeilen & Spalten",
   "SSE.Views.TableSettings.textEmptyTemplate": "Keine Vorlagen",
   "SSE.Views.TableSettings.textExistName": "FEHLER! Der Bereich mit demselben Namen existiert bereits\n",
@@ -1655,7 +1659,7 @@
   "SSE.Views.Toolbar.txtPasteRange": "Namen einfügen",
   "SSE.Views.Toolbar.txtPercentage": "Prozentsatz",
   "SSE.Views.Toolbar.txtPound": "£ Pfund",
-  "SSE.Views.Toolbar.txtRouble": "р. Rubel",
+  "SSE.Views.Toolbar.txtRouble": "₽ Rubel",
   "SSE.Views.Toolbar.txtScheme1": "Larissa",
   "SSE.Views.Toolbar.txtScheme10": "Median\t",
   "SSE.Views.Toolbar.txtScheme11": "Metro\n",

apps/spreadsheeteditor/main/locale/en.json

@@ -74,7 +74,7 @@
   "Common.Views.DocumentAccessDialog.textTitle": "Sharing Settings",
   "Common.Views.Header.openNewTabText": "Open in New Tab",
   "Common.Views.Header.textBack": "Go to Documents",
-  "Common.Views.Header.txtHeaderDeveloper": "DEVELOPER MODE",
+  "del_Common.Views.Header.txtHeaderDeveloper": "DEVELOPER MODE",
   "Common.Views.Header.txtRename": "Rename",
   "Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancel",
   "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
@@ -198,6 +198,23 @@
   "SSE.Controllers.DocumentHolder.txtTop": "Top",
   "SSE.Controllers.DocumentHolder.txtUnderbar": "Bar under text",
   "SSE.Controllers.DocumentHolder.txtWidth": "Width",
+  "SSE.Controllers.DocumentHolder.txtPaste": "Paste",
+  "SSE.Controllers.DocumentHolder.txtPasteFormulas": "Paste only formula",
+  "SSE.Controllers.DocumentHolder.txtPasteFormulaNumFormat": "Formula + number format",
+  "SSE.Controllers.DocumentHolder.txtPasteKeepSourceFormat": "Formula + all formatting",
+  "SSE.Controllers.DocumentHolder.txtPasteBorders": "Formula without borders",
+  "SSE.Controllers.DocumentHolder.txtPasteColWidths": "Formula + column width",
+  "SSE.Controllers.DocumentHolder.txtPasteMerge": "Merge conditional formatting",
+  "SSE.Controllers.DocumentHolder.txtPasteTranspose": "Transpose",
+  "SSE.Controllers.DocumentHolder.txtPasteValues": "Paste only value",
+  "SSE.Controllers.DocumentHolder.txtPasteValNumFormat": "Value + number format",
+  "SSE.Controllers.DocumentHolder.txtPasteValFormat": "Value + all formatting",
+  "SSE.Controllers.DocumentHolder.txtPasteFormat": "Paste only formatting",
+  "SSE.Controllers.DocumentHolder.txtPasteLink": "Paste link",
+  "SSE.Controllers.DocumentHolder.txtPastePicture": "Picture",
+  "SSE.Controllers.DocumentHolder.txtPasteLinkPicture": "Linked picture",
+  "SSE.Controllers.DocumentHolder.txtPasteSourceFormat": "Source formatting",
+  "SSE.Controllers.DocumentHolder.txtPasteDestFormat": "Destination formatting",
   "SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet",
   "SSE.Controllers.LeftMenu.textByColumns": "By columns",
   "SSE.Controllers.LeftMenu.textByRows": "By rows",
@@ -338,6 +355,8 @@
   "SSE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "SSE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
   "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
+  "SSE.Controllers.Main.titleServerVersion": "Editor updated",
+  "SSE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
   "SSE.Controllers.Print.strAllSheets": "All Sheets",
   "SSE.Controllers.Print.textWarning": "Warning",
   "SSE.Controllers.Print.warnCheckMargings": "Margins are incorrect",
@@ -683,6 +702,8 @@
   "SSE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "SSE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "SSE.Controllers.Toolbar.warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell. <br>Are you sure you want to continue?",
+  "SSE.Controllers.Toolbar.textLongOperation": "Long operation",
+  "SSE.Controllers.Toolbar.warnLongOperation": "The operation you are about to perform might take rather much time to complete.<br>Are you sure you want to continue?",
   "SSE.Views.AutoFilterDialog.btnCustomFilter": "Custom Filter",
   "SSE.Views.AutoFilterDialog.cancelButtonText": "Cancel",
   "SSE.Views.AutoFilterDialog.okButtonText": "OK",
@@ -915,27 +936,28 @@
   "SSE.Views.DigitalFilterDialog.textUse2": "Use * to present any series of character",
   "SSE.Views.DigitalFilterDialog.txtTitle": "Custom Filter",
   "SSE.Views.DocumentHolder.advancedShapeText": "Shape Advanced Settings",
+  "SSE.Views.DocumentHolder.advancedImgText": "Image Advanced Settings",
   "SSE.Views.DocumentHolder.bottomCellText": "Align Bottom",
   "SSE.Views.DocumentHolder.centerCellText": "Align Center",
   "SSE.Views.DocumentHolder.chartText": "Chart Advanced Settings",
-  "SSE.Views.DocumentHolder.deleteColumnText": "Delete Column",
-  "SSE.Views.DocumentHolder.deleteRowText": "Delete Row",
-  "SSE.Views.DocumentHolder.deleteTableText": "Delete Table",
+  "SSE.Views.DocumentHolder.deleteColumnText": "Column",
+  "SSE.Views.DocumentHolder.deleteRowText": "Row",
+  "SSE.Views.DocumentHolder.deleteTableText": "Table",
   "SSE.Views.DocumentHolder.direct270Text": "Rotate at 270°",
   "SSE.Views.DocumentHolder.direct90Text": "Rotate at 90°",
   "SSE.Views.DocumentHolder.directHText": "Horizontal",
   "SSE.Views.DocumentHolder.directionText": "Text Direction",
   "SSE.Views.DocumentHolder.editChartText": "Edit Data",
   "SSE.Views.DocumentHolder.editHyperlinkText": "Edit Hyperlink",
-  "SSE.Views.DocumentHolder.insertColumnLeftText": "Insert Column Left",
-  "SSE.Views.DocumentHolder.insertColumnRightText": "Insert Column Right",
-  "SSE.Views.DocumentHolder.insertRowAboveText": "Insert Row Above",
-  "SSE.Views.DocumentHolder.insertRowBelowText": "Insert Row Below",
+  "SSE.Views.DocumentHolder.insertColumnLeftText": "Column Left",
+  "SSE.Views.DocumentHolder.insertColumnRightText": "Column Right",
+  "SSE.Views.DocumentHolder.insertRowAboveText": "Row Above",
+  "SSE.Views.DocumentHolder.insertRowBelowText": "Row Below",
   "SSE.Views.DocumentHolder.removeHyperlinkText": "Remove Hyperlink",
-  "SSE.Views.DocumentHolder.selectColumnText": "Select Entire Column",
-  "SSE.Views.DocumentHolder.selectDataText": "Select Column Data",
-  "SSE.Views.DocumentHolder.selectRowText": "Select Row",
-  "SSE.Views.DocumentHolder.selectTableText": "Select Table",
+  "SSE.Views.DocumentHolder.selectColumnText": "Entire Column",
+  "SSE.Views.DocumentHolder.selectDataText": "Column Data",
+  "SSE.Views.DocumentHolder.selectRowText": "Row",
+  "SSE.Views.DocumentHolder.selectTableText": "Table",
   "SSE.Views.DocumentHolder.textArrangeBack": "Send to Background",
   "SSE.Views.DocumentHolder.textArrangeBackward": "Move Backward",
   "SSE.Views.DocumentHolder.textArrangeForward": "Move Forward",
@@ -967,6 +989,7 @@
   "SSE.Views.DocumentHolder.txtDelete": "Delete",
   "SSE.Views.DocumentHolder.txtDescending": "Descending",
   "SSE.Views.DocumentHolder.txtEditComment": "Edit Comment",
+  "SSE.Views.DocumentHolder.txtShowComment": "Show Comment",
   "SSE.Views.DocumentHolder.txtFilter": "Filter",
   "SSE.Views.DocumentHolder.txtFilterCellColor": "Filter by cell's color",
   "SSE.Views.DocumentHolder.txtFilterFontColor": "Filter by font color",
@@ -1053,8 +1076,11 @@
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtMac": "as OS X",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNative": "Native",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Point",
+  "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPl": "Polish",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows",
+  "SSE.Views.FileMenuPanels.MainSettingsGeneral.textForceSave": "Save to Server",
+  "SSE.Views.FileMenuPanels.MainSettingsGeneral.strForcesave": "Always save to server (otherwise save to server on document close)",
   "SSE.Views.FileMenuPanels.Settings.txtGeneral": "General",
   "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Page Settings",
   "SSE.Views.FormatSettingsDialog.textCancel": "Cancel",
@@ -1066,12 +1092,12 @@
   "SSE.Views.FormatSettingsDialog.textSymbols": "Symbols",
   "SSE.Views.FormatSettingsDialog.textTitle": "Number Format",
   "SSE.Views.FormatSettingsDialog.txtAccounting": "Accounting",
-  "SSE.Views.FormatSettingsDialog.txtAs10": "As tenths",
-  "SSE.Views.FormatSettingsDialog.txtAs100": "As hundredths",
-  "SSE.Views.FormatSettingsDialog.txtAs16": "As sixteenths",
-  "SSE.Views.FormatSettingsDialog.txtAs2": "As halves",
-  "SSE.Views.FormatSettingsDialog.txtAs4": "As fourths",
-  "SSE.Views.FormatSettingsDialog.txtAs8": "As eighths",
+  "SSE.Views.FormatSettingsDialog.txtAs10": "As tenths (5/10)",
+  "SSE.Views.FormatSettingsDialog.txtAs100": "As hundredths (50/100)",
+  "SSE.Views.FormatSettingsDialog.txtAs16": "As sixteenths (8/16)",
+  "SSE.Views.FormatSettingsDialog.txtAs2": "As halves (1/2)",
+  "SSE.Views.FormatSettingsDialog.txtAs4": "As fourths (2/4)",
+  "SSE.Views.FormatSettingsDialog.txtAs8": "As eighths (4/8)",
   "SSE.Views.FormatSettingsDialog.txtCurrency": "Currency",
   "SSE.Views.FormatSettingsDialog.txtCustom": "Custom",
   "SSE.Views.FormatSettingsDialog.txtDate": "Date",
@@ -1083,9 +1109,9 @@
   "SSE.Views.FormatSettingsDialog.txtScientific": "Scientific",
   "SSE.Views.FormatSettingsDialog.txtText": "Text",
   "SSE.Views.FormatSettingsDialog.txtTime": "Time",
-  "SSE.Views.FormatSettingsDialog.txtUpto1": "Up to one digit",
-  "SSE.Views.FormatSettingsDialog.txtUpto2": "Up to two digits",
-  "SSE.Views.FormatSettingsDialog.txtUpto3": "Up to three digits",
+  "SSE.Views.FormatSettingsDialog.txtUpto1": "Up to one digit (1/3)",
+  "SSE.Views.FormatSettingsDialog.txtUpto2": "Up to two digits (12/25)",
+  "SSE.Views.FormatSettingsDialog.txtUpto3": "Up to three digits (131/135)",
   "SSE.Views.FormulaDialog.cancelButtonText": "Cancel",
   "SSE.Views.FormulaDialog.okButtonText": "OK",
   "SSE.Views.FormulaDialog.sCategoryAll": "All",
@@ -1170,6 +1196,7 @@
   "SSE.Views.LeftMenu.tipPlugins": "Plugins",
   "SSE.Views.LeftMenu.tipSearch": "Search",
   "SSE.Views.LeftMenu.tipSupport": "Feedback & Support",
+  "SSE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE",
   "SSE.Views.MainSettingsPrint.okButtonText": "Save",
   "SSE.Views.MainSettingsPrint.strBottom": "Bottom",
   "SSE.Views.MainSettingsPrint.strLandscape": "Landscape",
@@ -1457,6 +1484,9 @@
   "SSE.Views.TableSettings.textTableName": "Table Name",
   "SSE.Views.TableSettings.textTemplate": "Select From Template",
   "SSE.Views.TableSettings.textTotal": "Total",
+  "SSE.Views.TableSettings.textConvertRange": "Convert to range",
+  "SSE.Views.TableSettings.textLongOperation": "Long operation",
+  "SSE.Views.TableSettings.warnLongOperation": "The operation you are about to perform might take rather much time to complete.<br>Are you sure you want to continue?",
   "SSE.Views.TableSettingsAdvanced.cancelButtonText": "Cancel",
   "SSE.Views.TableSettingsAdvanced.okButtonText": "Ok",
   "SSE.Views.TableSettingsAdvanced.textAlt": "Alternative Text",
@@ -1655,7 +1685,7 @@
   "SSE.Views.Toolbar.txtPasteRange": "Paste name",
   "SSE.Views.Toolbar.txtPercentage": "Percentage",
   "SSE.Views.Toolbar.txtPound": "£ Pound",
-  "SSE.Views.Toolbar.txtRouble": "р. Rouble",
+  "SSE.Views.Toolbar.txtRouble": "₽ Rouble",
   "SSE.Views.Toolbar.txtScheme1": "Office",
   "SSE.Views.Toolbar.txtScheme10": "Median",
   "SSE.Views.Toolbar.txtScheme11": "Metro",

apps/spreadsheeteditor/main/locale/es.json

@@ -25,8 +25,8 @@
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Reemplazar todo",
   "Common.UI.SynchronizeTip.textDontShow": "No volver a mostrar este mensaje",
   "Common.UI.SynchronizeTip.textSynchronize": "El documento ha sido cambiado por otro usuario.<br/>Por favor haga clic para guardar sus cambios y recargue las actualizaciones.",
-  "Common.UI.ThemeColorPalette.textStandartColors": "Colores estándar",
-  "Common.UI.ThemeColorPalette.textThemeColors": "Colores de tema",
+  "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
   "Common.UI.Window.cancelButtonText": "Cancelar",
   "Common.UI.Window.closeButtonText": "Cerrar",
   "Common.UI.Window.noButtonText": "No",
@@ -74,6 +74,8 @@
   "Common.Views.DocumentAccessDialog.textTitle": "Ajustes de uso compartido",
   "Common.Views.Header.openNewTabText": "Abrir en pestaña nueva",
   "Common.Views.Header.textBack": "Ir a Documentos",
+  "Common.Views.Header.txtHeaderDeveloper": "DEVELOPER MODE",
+  "Common.Views.Header.txtRename": "Rename",
   "Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancelar",
   "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
   "Common.Views.ImageFromUrlDialog.textUrl": "Pegar URL de imagen:",
@@ -92,9 +94,25 @@
   "Common.Views.Plugins.strPlugins": "Plugins",
   "Common.Views.Plugins.textLoading": "Loading",
   "Common.Views.Plugins.textStart": "Start",
+  "Common.Views.RenameDialog.cancelButtonText": "Cancelar",
+  "Common.Views.RenameDialog.okButtonText": "Ok",
+  "Common.Views.RenameDialog.textName": "File name",
+  "Common.Views.RenameDialog.txtInvalidName": "The file name cannot contain any of the following characters: ",
+  "SSE.Controllers.DocumentHolder.alignmentText": "Alineación",
+  "SSE.Controllers.DocumentHolder.centerText": "Al centro",
+  "SSE.Controllers.DocumentHolder.deleteColumnText": "Delete Column",
+  "SSE.Controllers.DocumentHolder.deleteRowText": "Delete Row",
+  "SSE.Controllers.DocumentHolder.deleteText": "Delete",
   "SSE.Controllers.DocumentHolder.errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.",
   "SSE.Controllers.DocumentHolder.guestText": "Visitante",
+  "SSE.Controllers.DocumentHolder.insertColumnLeftText": "Column Left",
+  "SSE.Controllers.DocumentHolder.insertColumnRightText": "Column Right",
+  "SSE.Controllers.DocumentHolder.insertRowAboveText": "Row Above",
+  "SSE.Controllers.DocumentHolder.insertRowBelowText": "Row Below",
+  "SSE.Controllers.DocumentHolder.insertText": "Insert",
+  "SSE.Controllers.DocumentHolder.leftText": "Left",
   "SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Warning",
+  "SSE.Controllers.DocumentHolder.rightText": "Right",
   "SSE.Controllers.DocumentHolder.textChangeColumnWidth": "Ancho de columna {0} símbolos ({1} píxeles)",
   "SSE.Controllers.DocumentHolder.textChangeRowHeight": "Altura de fila {0} puntos ({1} píxeles)",
   "SSE.Controllers.DocumentHolder.textCtrlClick": "Pulse CTRL y haga clic en el enlace",
@@ -102,8 +120,83 @@
   "SSE.Controllers.DocumentHolder.textInsertTop": "Insertar Arriba",
   "SSE.Controllers.DocumentHolder.textSym": "sym",
   "SSE.Controllers.DocumentHolder.tipIsLocked": "Este elemento se está editando por otro usuario.",
+  "SSE.Controllers.DocumentHolder.txtAddBottom": "Añadir borde inferior",
+  "SSE.Controllers.DocumentHolder.txtAddFractionBar": "Añadir barra de fracción",
+  "SSE.Controllers.DocumentHolder.txtAddHor": "Añadir línea horizontal",
+  "SSE.Controllers.DocumentHolder.txtAddLB": "Añadir línea inferior izquierda",
+  "SSE.Controllers.DocumentHolder.txtAddLeft": "Añadir borde izquierdo",
+  "SSE.Controllers.DocumentHolder.txtAddLT": "Añadir línea superior izquierda",
+  "SSE.Controllers.DocumentHolder.txtAddRight": "Añadir borde derecho",
+  "SSE.Controllers.DocumentHolder.txtAddTop": "Añadir borde superior",
+  "SSE.Controllers.DocumentHolder.txtAddVer": "Añadir línea vertical",
+  "SSE.Controllers.DocumentHolder.txtAlignToChar": "Alinear a carácter",
+  "SSE.Controllers.DocumentHolder.txtBorderProps": "Propiedades de borde",
+  "SSE.Controllers.DocumentHolder.txtBottom": "Abajo ",
+  "SSE.Controllers.DocumentHolder.txtColumnAlign": "Column alignment",
+  "SSE.Controllers.DocumentHolder.txtDecreaseArg": "Decrease argument size",
+  "SSE.Controllers.DocumentHolder.txtDeleteArg": "Delete argument",
+  "SSE.Controllers.DocumentHolder.txtDeleteBreak": "Delete manual break",
+  "SSE.Controllers.DocumentHolder.txtDeleteChars": "Delete enclosing characters",
+  "SSE.Controllers.DocumentHolder.txtDeleteCharsAndSeparators": "Delete enclosing characters and separators",
+  "SSE.Controllers.DocumentHolder.txtDeleteEq": "Delete equation",
+  "SSE.Controllers.DocumentHolder.txtDeleteGroupChar": "Delete char",
+  "SSE.Controllers.DocumentHolder.txtDeleteRadical": "Delete radical",
+  "SSE.Controllers.DocumentHolder.txtExpand": "Expand and sort",
+  "SSE.Controllers.DocumentHolder.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?",
+  "SSE.Controllers.DocumentHolder.txtFractionLinear": "Cambiar a la fracción lineal",
+  "SSE.Controllers.DocumentHolder.txtFractionSkewed": "Cambiar a la fracción sesgada",
+  "SSE.Controllers.DocumentHolder.txtFractionStacked": "Cambiar a la fracción apilada",
+  "SSE.Controllers.DocumentHolder.txtGroupCharOver": "Char sobre texto",
+  "SSE.Controllers.DocumentHolder.txtGroupCharUnder": "Char debajo de texto",
   "SSE.Controllers.DocumentHolder.txtHeight": "Altura",
+  "SSE.Controllers.DocumentHolder.txtHideBottom": "Hide bottom border",
+  "SSE.Controllers.DocumentHolder.txtHideBottomLimit": "Hide bottom limit",
+  "SSE.Controllers.DocumentHolder.txtHideCloseBracket": "Hide closing bracket",
+  "SSE.Controllers.DocumentHolder.txtHideDegree": "Hide degree",
+  "SSE.Controllers.DocumentHolder.txtHideHor": "Hide horizontal line",
+  "SSE.Controllers.DocumentHolder.txtHideLB": "Hide left bottom line",
+  "SSE.Controllers.DocumentHolder.txtHideLeft": "Hide left border",
+  "SSE.Controllers.DocumentHolder.txtHideLT": "Hide left top line",
+  "SSE.Controllers.DocumentHolder.txtHideOpenBracket": "Hide opening bracket",
+  "SSE.Controllers.DocumentHolder.txtHidePlaceholder": "Hide placeholder",
+  "SSE.Controllers.DocumentHolder.txtHideRight": "Hide right border",
+  "SSE.Controllers.DocumentHolder.txtHideTop": "Hide top border",
+  "SSE.Controllers.DocumentHolder.txtHideTopLimit": "Hide top limit",
+  "SSE.Controllers.DocumentHolder.txtHideVer": "Hide vertical line",
+  "SSE.Controllers.DocumentHolder.txtIncreaseArg": "Increase argument size",
+  "SSE.Controllers.DocumentHolder.txtInsertArgAfter": "Insert argument after",
+  "SSE.Controllers.DocumentHolder.txtInsertArgBefore": "Insert argument before",
+  "SSE.Controllers.DocumentHolder.txtInsertBreak": "Insert manual break",
+  "SSE.Controllers.DocumentHolder.txtInsertEqAfter": "Insert equation after",
+  "SSE.Controllers.DocumentHolder.txtInsertEqBefore": "Insert equation before",
+  "SSE.Controllers.DocumentHolder.txtLimitChange": "Cambiar ubicación de límites",
+  "SSE.Controllers.DocumentHolder.txtLimitOver": "Limit over text",
+  "SSE.Controllers.DocumentHolder.txtLimitUnder": "Limit under text",
+  "SSE.Controllers.DocumentHolder.txtMatchBrackets": "Match brackets to argument height",
+  "SSE.Controllers.DocumentHolder.txtMatrixAlign": "Matrix alignment",
+  "SSE.Controllers.DocumentHolder.txtNoChoices": "There are no choices for filling the cell.<br>Only text values from the column can be selected for replacement.",
+  "SSE.Controllers.DocumentHolder.txtOverbar": "Barra sobre texto",
+  "SSE.Controllers.DocumentHolder.txtRemFractionBar": "Remove fraction bar",
+  "SSE.Controllers.DocumentHolder.txtRemLimit": "Remove limit",
+  "SSE.Controllers.DocumentHolder.txtRemoveAccentChar": "Remove accent character",
+  "SSE.Controllers.DocumentHolder.txtRemoveBar": "Remove bar",
+  "SSE.Controllers.DocumentHolder.txtRemScripts": "Remove scripts",
+  "SSE.Controllers.DocumentHolder.txtRemSubscript": "Remove subscript",
+  "SSE.Controllers.DocumentHolder.txtRemSuperscript": "Remove superscript",
   "SSE.Controllers.DocumentHolder.txtRowHeight": "Altura de fila",
+  "SSE.Controllers.DocumentHolder.txtScriptsAfter": "Scripts after text",
+  "SSE.Controllers.DocumentHolder.txtScriptsBefore": "Scripts before text",
+  "SSE.Controllers.DocumentHolder.txtShowBottomLimit": "Show bottom limit",
+  "SSE.Controllers.DocumentHolder.txtShowCloseBracket": "Show closing bracket",
+  "SSE.Controllers.DocumentHolder.txtShowDegree": "Show degree",
+  "SSE.Controllers.DocumentHolder.txtShowOpenBracket": "Show opening bracket",
+  "SSE.Controllers.DocumentHolder.txtShowPlaceholder": "Show placeholder",
+  "SSE.Controllers.DocumentHolder.txtShowTopLimit": "Show top limit",
+  "SSE.Controllers.DocumentHolder.txtSorting": "Sorting",
+  "SSE.Controllers.DocumentHolder.txtSortSelected": "Sort selected",
+  "SSE.Controllers.DocumentHolder.txtStretchBrackets": "Stretch brackets",
+  "SSE.Controllers.DocumentHolder.txtTop": "Top",
+  "SSE.Controllers.DocumentHolder.txtUnderbar": "Barra debajo de texto",
   "SSE.Controllers.DocumentHolder.txtWidth": "Ancho",
   "SSE.Controllers.LeftMenu.newDocumentTitle": "Hoja de cálculo sin nombre",
   "SSE.Controllers.LeftMenu.textByColumns": "Columnas",
@@ -123,7 +216,6 @@
   "SSE.Controllers.LeftMenu.warnDownloadAs": "Si sigue guardando en este formato todas las características a excepción del texto se perderán.<br> ¿Está seguro de que quiere continuar?",
   "SSE.Controllers.Main.confirmMoveCellRange": "El rango de celdas final puede contener los datos. ¿Quiere continuar?",
   "SSE.Controllers.Main.confirmPutMergeRange": "Los datos de origen contienen celdas combinadas.<br>Habían estado sin combinar antes de que se pegaran en la tabla.",
-  "SSE.Controllers.Main.convertationErrorText": "Fallo de conversión.",
   "SSE.Controllers.Main.convertationTimeoutText": "Tiempo de conversión superado.",
   "SSE.Controllers.Main.criticalErrorExtText": "Pulse \"OK\" para regresar a la lista de documentos.",
   "SSE.Controllers.Main.criticalErrorTitle": "Error",
@@ -131,6 +223,7 @@
   "SSE.Controllers.Main.downloadErrorText": "Error de descarga.",
   "SSE.Controllers.Main.downloadTextText": "Cargando hoja de cálculo...",
   "SSE.Controllers.Main.downloadTitleText": "Cargando hoja de cálculo",
+  "SSE.Controllers.Main.errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
   "SSE.Controllers.Main.errorArgsRange": "Un error en la fórmula introducida.<br>Intervalo de argumentos incorrecto es usado.",
   "SSE.Controllers.Main.errorAutoFilterChange": "No se permite la operación porque intenta desplazar celdas en una tabla de su hoja de cálculo.",
   "SSE.Controllers.Main.errorAutoFilterChangeFormatTable": "No se puede realizar la operación para las celdas seleccionadas porque usted no puede mover una parte de la tabla.<br> Seleccione otro rango de celdas para que toda la tabla sea seleccionada y intente de nuevo.",
@@ -139,6 +232,7 @@
   "SSE.Controllers.Main.errorBadImageUrl": "URL de imagen es incorrecto",
   "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Se ha perdido la conexión con servidor. El documento no puede ser editado ahora.",
   "SSE.Controllers.Main.errorConnectToServer": "No se pudo guardar el documento. Por favor, compruebe la configuración de conexión o póngase en contacto con el administrador.<br>Al hacer clic en el botón \"Aceptar\", se le pedirá que descargue el documento.<br> Encuentre más información acerca de la conexión Servidor de Documentos<a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
+  "SSE.Controllers.Main.errorCopyMultiselectArea": "This command cannot be used with multiple selections.<br>Select a single range and try again.",
   "SSE.Controllers.Main.errorCountArg": "Un error en la fórmula introducida.<br>Número de argumentos incorrecto  es usado.",
   "SSE.Controllers.Main.errorCountArgExceed": "Un error en la fórmula introducida.<br>Número de argumentos es excedido.",
   "SSE.Controllers.Main.errorCreateDefName": "Los rangos con nombre existentes no pueden ser editados y los nuevos no se pueden crear<br>en este momento ya que algunos de ellos están editándose.",
@@ -161,8 +255,15 @@
   "SSE.Controllers.Main.errorOpenWarning": "La longitud de una de las fórmulas en el archivo superó <br> el número de caracteres permitidos y se quitó.",
   "SSE.Controllers.Main.errorOperandExpected": "Operando expectante",
   "SSE.Controllers.Main.errorPasteMaxRange": "El área de copiar y pegar no coincide.<br>Por favor, seleccione una zona con el mismo tamaño o haga clic en la primera celda de una fila para pegar las celdas copiadas.",
+  "SSE.Controllers.Main.errorPrintMaxPagesCount": "Unfortunately, it is not possible to print more than 1500 pages at once in the current program version.<br>This restriction will be removed in the upcoming releases.",
   "SSE.Controllers.Main.errorProcessSaveResult": "Problemas al guardar",
+  "SSE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
+  "SSE.Controllers.Main.errorSessionAbsolute": "The document editing session has expired. Please reload the page.",
+  "SSE.Controllers.Main.errorSessionIdle": "The document has not been edited for quite a long time. Please reload the page.",
+  "SSE.Controllers.Main.errorSessionToken": "The connection to the server has been interrupted. Please reload the page.",
   "SSE.Controllers.Main.errorStockChart": "Orden de las filas incorrecto. Para compilar un gráfico de cotizaciones introduzca los datos en la hoja de tal modo:<br> precio de apertura, precio máximo, precio mínimo, precio de cierre.",
+  "SSE.Controllers.Main.errorToken": "The document security token is not correctly formed.<br>Please contact your Document Server administrator.",
+  "SSE.Controllers.Main.errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator.",
   "SSE.Controllers.Main.errorUnexpectedGuid": "Error externo.<br>GUID inesparada. Por favor póngase en contacto con soporte si el error mantiene.",
   "SSE.Controllers.Main.errorUpdateVersion": "Se ha cambiado la versión del archivo. La página será actualizada.",
   "SSE.Controllers.Main.errorUserDrop": "No se puede acceder al archivo ahora.",
@@ -181,7 +282,7 @@
   "SSE.Controllers.Main.loadImageTitleText": "Cargando imagen",
   "SSE.Controllers.Main.loadingDocumentTitleText": "Cargando hoja de cálculo",
   "SSE.Controllers.Main.notcriticalErrorTitle": "Aviso",
-  "SSE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
+  "SSE.Controllers.Main.openErrorText": "Se ha producido un error al abrir el archivo ",
   "SSE.Controllers.Main.openTextText": "Abriendo hoja de cálculo...",
   "SSE.Controllers.Main.openTitleText": "Abriendo hoja de cálculo",
   "SSE.Controllers.Main.pastInMergeAreaError": "No se puede cambiar parte de una celda combinada",
@@ -190,7 +291,7 @@
   "SSE.Controllers.Main.reloadButtonText": "Recargar página",
   "SSE.Controllers.Main.requestEditFailedMessageText": "Alguien está editando este documento en este momento. Por favor, inténtelo de nuevo más tarde.",
   "SSE.Controllers.Main.requestEditFailedTitleText": "Acceso negado",
-  "SSE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
+  "SSE.Controllers.Main.saveErrorText": "Se ha producido un error al guardar el archivo ",
   "SSE.Controllers.Main.savePreparingText": "Preparando para guardar",
   "SSE.Controllers.Main.savePreparingTitle": "Preparando para guardar.Espere por favor...",
   "SSE.Controllers.Main.saveTextText": "Guardando hoja de cálculo...",
@@ -211,6 +312,7 @@
   "SSE.Controllers.Main.textYes": "Sí",
   "SSE.Controllers.Main.titleLicenseExp": "License expired",
   "SSE.Controllers.Main.titleRecalcFormulas": "Calculando...",
+  "SSE.Controllers.Main.titleServerVersion": "Editor updated",
   "SSE.Controllers.Main.txtArt": "Su texto aquí",
   "SSE.Controllers.Main.txtBasicShapes": "Formas básicas",
   "SSE.Controllers.Main.txtButtons": "Botones",
@@ -247,9 +349,341 @@
   "SSE.Controllers.Statusbar.warnDeleteSheet": "La hoja de cálculo puede contener datos. ¿Está seguro de que quiere continuar?",
   "SSE.Controllers.Statusbar.zoomText": "Zoom {0}%",
   "SSE.Controllers.Toolbar.confirmAddFontName": "El tipo de letra que usted va a guardar no está disponible en este dispositivo. <br>El estilo de letra se mostrará usando uno de los tipos de letra del sistema, el tipo de letra guardado va a usarse cuando esté disponible.<br>¿Desea continuar?",
+  "SSE.Controllers.Toolbar.textAccent": "Acentos",
+  "SSE.Controllers.Toolbar.textBracket": "Paréntesis",
   "SSE.Controllers.Toolbar.textCancel": "Cancelar",
   "SSE.Controllers.Toolbar.textFontSizeErr": "El valor introducido es incorrecto.<br>Por favor, introduzca un valor numérico entre 1 y 409",
+  "SSE.Controllers.Toolbar.textFraction": "Fractions",
+  "SSE.Controllers.Toolbar.textFunction": "Functions",
+  "SSE.Controllers.Toolbar.textIntegral": "Integrals",
+  "SSE.Controllers.Toolbar.textLargeOperator": "Large Operators",
+  "SSE.Controllers.Toolbar.textLimitAndLog": "Limits And Logarithms",
+  "SSE.Controllers.Toolbar.textMatrix": "Matrices",
+  "SSE.Controllers.Toolbar.textOperator": "Operators",
+  "SSE.Controllers.Toolbar.textRadical": "Radicals",
+  "SSE.Controllers.Toolbar.textScript": "Scripts",
+  "SSE.Controllers.Toolbar.textSymbols": "Symbols",
   "SSE.Controllers.Toolbar.textWarning": "Aviso",
+  "SSE.Controllers.Toolbar.txtAccent_Accent": "Agudo",
+  "SSE.Controllers.Toolbar.txtAccent_ArrowD": "Right-Left Arrow Above",
+  "SSE.Controllers.Toolbar.txtAccent_ArrowL": "Leftwards Arrow Above",
+  "SSE.Controllers.Toolbar.txtAccent_ArrowR": "Rightwards Arrow Above",
+  "SSE.Controllers.Toolbar.txtAccent_Bar": "Barra",
+  "SSE.Controllers.Toolbar.txtAccent_BarBot": "Underbar",
+  "SSE.Controllers.Toolbar.txtAccent_BarTop": "Overbar",
+  "SSE.Controllers.Toolbar.txtAccent_BorderBox": "Fórmula encuadrada (con marcador de posición)",
+  "SSE.Controllers.Toolbar.txtAccent_BorderBoxCustom": "Fórmula encuadrada (ejemplo)",
+  "SSE.Controllers.Toolbar.txtAccent_Check": "Comprobar",
+  "SSE.Controllers.Toolbar.txtAccent_CurveBracketBot": "Underbrace",
+  "SSE.Controllers.Toolbar.txtAccent_CurveBracketTop": "Overbrace",
+  "SSE.Controllers.Toolbar.txtAccent_Custom_1": "Vector A",
+  "SSE.Controllers.Toolbar.txtAccent_Custom_2": "ABC con barra superpuesta",
+  "SSE.Controllers.Toolbar.txtAccent_Custom_3": "x XOR y With Overbar",
+  "SSE.Controllers.Toolbar.txtAccent_DDDot": "Triple Dot",
+  "SSE.Controllers.Toolbar.txtAccent_DDot": "Double Dot",
+  "SSE.Controllers.Toolbar.txtAccent_Dot": "Dot",
+  "SSE.Controllers.Toolbar.txtAccent_DoubleBar": "Double Overbar",
+  "SSE.Controllers.Toolbar.txtAccent_Grave": "Grave",
+  "SSE.Controllers.Toolbar.txtAccent_GroupBot": "Grouping Character Below",
+  "SSE.Controllers.Toolbar.txtAccent_GroupTop": "Grouping Character Above",
+  "SSE.Controllers.Toolbar.txtAccent_HarpoonL": "Leftwards Harpoon Above",
+  "SSE.Controllers.Toolbar.txtAccent_HarpoonR": "Rightwards Harpoon Above",
+  "SSE.Controllers.Toolbar.txtAccent_Hat": "Hat",
+  "SSE.Controllers.Toolbar.txtAccent_Smile": "Acento breve",
+  "SSE.Controllers.Toolbar.txtAccent_Tilde": "Tilde",
+  "SSE.Controllers.Toolbar.txtBracket_Angle": "Paréntesis",
+  "SSE.Controllers.Toolbar.txtBracket_Angle_Delimiter_2": "Paréntesis con separadores",
+  "SSE.Controllers.Toolbar.txtBracket_Angle_Delimiter_3": "Paréntesis con separadores",
+  "SSE.Controllers.Toolbar.txtBracket_Angle_NoneOpen": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_Angle_OpenNone": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_Curve": "Paréntesis",
+  "SSE.Controllers.Toolbar.txtBracket_Curve_Delimiter_2": "Paréntesis con separadores",
+  "SSE.Controllers.Toolbar.txtBracket_Curve_NoneOpen": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_Curve_OpenNone": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_Custom_1": "Casos (dos condiciones)",
+  "SSE.Controllers.Toolbar.txtBracket_Custom_2": "Casos (tres condiciones)",
+  "SSE.Controllers.Toolbar.txtBracket_Custom_3": "Stack Object",
+  "SSE.Controllers.Toolbar.txtBracket_Custom_4": "Stack Object",
+  "SSE.Controllers.Toolbar.txtBracket_Custom_5": "Ejemplo de casos",
+  "SSE.Controllers.Toolbar.txtBracket_Custom_6": "Coeficiente de binomio",
+  "SSE.Controllers.Toolbar.txtBracket_Custom_7": "Binomial Coefficient",
+  "SSE.Controllers.Toolbar.txtBracket_Line": "Paréntesis",
+  "SSE.Controllers.Toolbar.txtBracket_Line_NoneOpen": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_Line_OpenNone": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_LineDouble": "Paréntesis",
+  "SSE.Controllers.Toolbar.txtBracket_LineDouble_NoneOpen": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_LineDouble_OpenNone": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_LowLim": "Paréntesis",
+  "SSE.Controllers.Toolbar.txtBracket_LowLim_NoneNone": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_LowLim_OpenNone": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_Round": "Paréntesis",
+  "SSE.Controllers.Toolbar.txtBracket_Round_Delimiter_2": "Paréntesis con separadores",
+  "SSE.Controllers.Toolbar.txtBracket_Round_NoneOpen": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_Round_OpenNone": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_Square": "Paréntesis",
+  "SSE.Controllers.Toolbar.txtBracket_Square_CloseClose": "Paréntesis",
+  "SSE.Controllers.Toolbar.txtBracket_Square_CloseOpen": "Paréntesis",
+  "SSE.Controllers.Toolbar.txtBracket_Square_NoneOpen": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_Square_OpenNone": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_Square_OpenOpen": "Paréntesis",
+  "SSE.Controllers.Toolbar.txtBracket_SquareDouble": "Paréntesis",
+  "SSE.Controllers.Toolbar.txtBracket_SquareDouble_NoneOpen": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_SquareDouble_OpenNone": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_UppLim": "Paréntesis",
+  "SSE.Controllers.Toolbar.txtBracket_UppLim_NoneOpen": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtBracket_UppLim_OpenNone": "Single Bracket",
+  "SSE.Controllers.Toolbar.txtExpand": "Expand and sort",
+  "SSE.Controllers.Toolbar.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?",
+  "SSE.Controllers.Toolbar.txtFractionDiagonal": "Skewed Fraction",
+  "SSE.Controllers.Toolbar.txtFractionDifferential_1": "Differential",
+  "SSE.Controllers.Toolbar.txtFractionDifferential_2": "Differential",
+  "SSE.Controllers.Toolbar.txtFractionDifferential_3": "Differential",
+  "SSE.Controllers.Toolbar.txtFractionDifferential_4": "Differential",
+  "SSE.Controllers.Toolbar.txtFractionHorizontal": "Linear Fraction",
+  "SSE.Controllers.Toolbar.txtFractionPi_2": "Pi Over 2",
+  "SSE.Controllers.Toolbar.txtFractionSmall": "Small Fraction",
+  "SSE.Controllers.Toolbar.txtFractionVertical": "Stacked Fraction",
+  "SSE.Controllers.Toolbar.txtFunction_1_Cos": "Inverse Cosine Function",
+  "SSE.Controllers.Toolbar.txtFunction_1_Cosh": "Hyperbolic Inverse Cosine Function",
+  "SSE.Controllers.Toolbar.txtFunction_1_Cot": "Inverse Cotangent Function",
+  "SSE.Controllers.Toolbar.txtFunction_1_Coth": "Hyperbolic Inverse Cotangent Function",
+  "SSE.Controllers.Toolbar.txtFunction_1_Csc": "Inverse Cosecant Function",
+  "SSE.Controllers.Toolbar.txtFunction_1_Csch": "Hyperbolic Inverse Cosecant Function",
+  "SSE.Controllers.Toolbar.txtFunction_1_Sec": "Inverse Secant Function",
+  "SSE.Controllers.Toolbar.txtFunction_1_Sech": "Hyperbolic Inverse Secant Function",
+  "SSE.Controllers.Toolbar.txtFunction_1_Sin": "Inverse Sine Function",
+  "SSE.Controllers.Toolbar.txtFunction_1_Sinh": "Hyperbolic Inverse Sine Function",
+  "SSE.Controllers.Toolbar.txtFunction_1_Tan": "Inverse Tangent Function",
+  "SSE.Controllers.Toolbar.txtFunction_1_Tanh": "Hyperbolic Inverse Tangent Function",
+  "SSE.Controllers.Toolbar.txtFunction_Cos": "Cosine Function",
+  "SSE.Controllers.Toolbar.txtFunction_Cosh": "Hyperbolic Cosine Function",
+  "SSE.Controllers.Toolbar.txtFunction_Cot": "Cotangent Function",
+  "SSE.Controllers.Toolbar.txtFunction_Coth": "Hyperbolic Cotangent Function",
+  "SSE.Controllers.Toolbar.txtFunction_Csc": "Cosecant Function",
+  "SSE.Controllers.Toolbar.txtFunction_Csch": "Hyperbolic Cosecant Function",
+  "SSE.Controllers.Toolbar.txtFunction_Custom_1": "Sine theta",
+  "SSE.Controllers.Toolbar.txtFunction_Custom_2": "Cos 2x",
+  "SSE.Controllers.Toolbar.txtFunction_Custom_3": "Tangent formula",
+  "SSE.Controllers.Toolbar.txtFunction_Sec": "Secant Function",
+  "SSE.Controllers.Toolbar.txtFunction_Sech": "Hyperbolic Secant Function",
+  "SSE.Controllers.Toolbar.txtFunction_Sin": "Sine Function",
+  "SSE.Controllers.Toolbar.txtFunction_Sinh": "Hyperbolic Sine Function",
+  "SSE.Controllers.Toolbar.txtFunction_Tan": "Tangent Function",
+  "SSE.Controllers.Toolbar.txtFunction_Tanh": "Hyperbolic Tangent Function",
+  "SSE.Controllers.Toolbar.txtIntegral": "Integral",
+  "SSE.Controllers.Toolbar.txtIntegral_dtheta": "Differential theta",
+  "SSE.Controllers.Toolbar.txtIntegral_dx": "Differential x",
+  "SSE.Controllers.Toolbar.txtIntegral_dy": "Differential y",
+  "SSE.Controllers.Toolbar.txtIntegralCenterSubSup": "Integral",
+  "SSE.Controllers.Toolbar.txtIntegralDouble": "Double Integral",
+  "SSE.Controllers.Toolbar.txtIntegralDoubleCenterSubSup": "Double Integral",
+  "SSE.Controllers.Toolbar.txtIntegralDoubleSubSup": "Double Integral",
+  "SSE.Controllers.Toolbar.txtIntegralOriented": "Contour Integral",
+  "SSE.Controllers.Toolbar.txtIntegralOrientedCenterSubSup": "Contour Integral",
+  "SSE.Controllers.Toolbar.txtIntegralOrientedDouble": "Surface Integral",
+  "SSE.Controllers.Toolbar.txtIntegralOrientedDoubleCenterSubSup": "Surface Integral",
+  "SSE.Controllers.Toolbar.txtIntegralOrientedDoubleSubSup": "Surface Integral",
+  "SSE.Controllers.Toolbar.txtIntegralOrientedSubSup": "Contour Integral",
+  "SSE.Controllers.Toolbar.txtIntegralOrientedTriple": "Volume Integral",
+  "SSE.Controllers.Toolbar.txtIntegralOrientedTripleCenterSubSup": "Volume Integral",
+  "SSE.Controllers.Toolbar.txtIntegralOrientedTripleSubSup": "Volume Integral",
+  "SSE.Controllers.Toolbar.txtIntegralSubSup": "Integral",
+  "SSE.Controllers.Toolbar.txtIntegralTriple": "Triple Integral",
+  "SSE.Controllers.Toolbar.txtIntegralTripleCenterSubSup": "Triple Integral",
+  "SSE.Controllers.Toolbar.txtIntegralTripleSubSup": "Triple Integral",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Wedge",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Wedge",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Wedge",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Wedge",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Wedge",
+  "SSE.Controllers.Toolbar.txtLargeOperator_CoProd": "Co-Product",
+  "SSE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSub": "Co-Product",
+  "SSE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSubSup": "Co-Product",
+  "SSE.Controllers.Toolbar.txtLargeOperator_CoProd_Sub": "Co-Product",
+  "SSE.Controllers.Toolbar.txtLargeOperator_CoProd_SubSup": "Co-Product",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Custom_1": "Summation",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Custom_2": "Summation",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Custom_3": "Summation",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Custom_4": "Product",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Custom_5": "Union",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction": "Vee",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSub": "Vee",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSubSup": "Vee",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_Sub": "Vee",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_SubSup": "Vee",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Intersection": "Intersection",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSub": "Intersection",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSubSup": "Intersection",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Intersection_Sub": "Intersection",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Intersection_SubSup": "Intersection",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Prod": "Product",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSub": "Product",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSubSup": "Product",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Prod_Sub": "Product",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Prod_SubSup": "Product",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Sum": "Summation",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSub": "Summation",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSubSup": "Summation",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Sum_Sub": "Summation",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Sum_SubSup": "Summation",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Union": "Union",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Union_CenterSub": "Union",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Union_CenterSubSup": "Union",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Union_Sub": "Union",
+  "SSE.Controllers.Toolbar.txtLargeOperator_Union_SubSup": "Union",
+  "SSE.Controllers.Toolbar.txtLimitLog_Custom_1": "Limit Example",
+  "SSE.Controllers.Toolbar.txtLimitLog_Custom_2": "Maximum Example",
+  "SSE.Controllers.Toolbar.txtLimitLog_Lim": "Limit",
+  "SSE.Controllers.Toolbar.txtLimitLog_Ln": "Natural Logarithm",
+  "SSE.Controllers.Toolbar.txtLimitLog_Log": "Logarithm",
+  "SSE.Controllers.Toolbar.txtLimitLog_LogBase": "Logarithm",
+  "SSE.Controllers.Toolbar.txtLimitLog_Max": "Maximum",
+  "SSE.Controllers.Toolbar.txtLimitLog_Min": "Minimum",
+  "SSE.Controllers.Toolbar.txtMatrix_1_2": "Matriz vacía 1x2",
+  "SSE.Controllers.Toolbar.txtMatrix_1_3": "Matriz vacía 1x3",
+  "SSE.Controllers.Toolbar.txtMatrix_2_1": "Matriz vacía 2x1",
+  "SSE.Controllers.Toolbar.txtMatrix_2_2": "Matriz vacía 2x2",
+  "SSE.Controllers.Toolbar.txtMatrix_2_2_DLineBracket": "Empty Matrix with Brackets",
+  "SSE.Controllers.Toolbar.txtMatrix_2_2_LineBracket": "Empty Matrix with Brackets",
+  "SSE.Controllers.Toolbar.txtMatrix_2_2_RoundBracket": "Empty Matrix with Brackets",
+  "SSE.Controllers.Toolbar.txtMatrix_2_2_SquareBracket": "Empty Matrix with Brackets",
+  "SSE.Controllers.Toolbar.txtMatrix_2_3": "Matriz vacía 2x3",
+  "SSE.Controllers.Toolbar.txtMatrix_3_1": "Matriz vacía 3x1",
+  "SSE.Controllers.Toolbar.txtMatrix_3_2": "Matriz vacía 3x2",
+  "SSE.Controllers.Toolbar.txtMatrix_3_3": "Matriz vacía 3x3",
+  "SSE.Controllers.Toolbar.txtMatrix_Dots_Baseline": "Puntos en línea de base",
+  "SSE.Controllers.Toolbar.txtMatrix_Dots_Center": "Midline Dots",
+  "SSE.Controllers.Toolbar.txtMatrix_Dots_Diagonal": "Diagonal Dots",
+  "SSE.Controllers.Toolbar.txtMatrix_Dots_Vertical": "Vertical Dots",
+  "SSE.Controllers.Toolbar.txtMatrix_Flat_Round": "Sparse Matrix",
+  "SSE.Controllers.Toolbar.txtMatrix_Flat_Square": "Sparse Matrix",
+  "SSE.Controllers.Toolbar.txtMatrix_Identity_2": "Matriz de identidad 2x2",
+  "SSE.Controllers.Toolbar.txtMatrix_Identity_2_NoZeros": "Matriz de identidad 3x3",
+  "SSE.Controllers.Toolbar.txtMatrix_Identity_3": "Matriz de identidad 3x3",
+  "SSE.Controllers.Toolbar.txtMatrix_Identity_3_NoZeros": "Matriz de identidad 3x3",
+  "SSE.Controllers.Toolbar.txtOperator_ArrowD_Bot": "Right-Left Arrow Below",
+  "SSE.Controllers.Toolbar.txtOperator_ArrowD_Top": "Right-Left Arrow Above",
+  "SSE.Controllers.Toolbar.txtOperator_ArrowL_Bot": "Leftwards Arrow Below",
+  "SSE.Controllers.Toolbar.txtOperator_ArrowL_Top": "Leftwards Arrow Above",
+  "SSE.Controllers.Toolbar.txtOperator_ArrowR_Bot": "Rightwards Arrow Below",
+  "SSE.Controllers.Toolbar.txtOperator_ArrowR_Top": "Rightwards Arrow Above",
+  "SSE.Controllers.Toolbar.txtOperator_ColonEquals": "Colon Equal",
+  "SSE.Controllers.Toolbar.txtOperator_Custom_1": "Yields",
+  "SSE.Controllers.Toolbar.txtOperator_Custom_2": "Delta Yields",
+  "SSE.Controllers.Toolbar.txtOperator_Definition": "Equal to By Definition",
+  "SSE.Controllers.Toolbar.txtOperator_DeltaEquals": "Delta Equal To",
+  "SSE.Controllers.Toolbar.txtOperator_DoubleArrowD_Bot": "Right-Left Arrow Below",
+  "SSE.Controllers.Toolbar.txtOperator_DoubleArrowD_Top": "Right-Left Arrow Above",
+  "SSE.Controllers.Toolbar.txtOperator_DoubleArrowL_Bot": "Leftwards Arrow Below",
+  "SSE.Controllers.Toolbar.txtOperator_DoubleArrowL_Top": "Leftwards Arrow Above",
+  "SSE.Controllers.Toolbar.txtOperator_DoubleArrowR_Bot": "Rightwards Arrow Below",
+  "SSE.Controllers.Toolbar.txtOperator_DoubleArrowR_Top": "Rightwards Arrow Above",
+  "SSE.Controllers.Toolbar.txtOperator_EqualsEquals": "Equal Equal",
+  "SSE.Controllers.Toolbar.txtOperator_MinusEquals": "Minus Equal",
+  "SSE.Controllers.Toolbar.txtOperator_PlusEquals": "Plus Equal",
+  "SSE.Controllers.Toolbar.txtOperator_UnitOfMeasure": "Measured By",
+  "SSE.Controllers.Toolbar.txtRadicalCustom_1": "Radical",
+  "SSE.Controllers.Toolbar.txtRadicalCustom_2": "Radical",
+  "SSE.Controllers.Toolbar.txtRadicalRoot_2": "Square Root With Degree",
+  "SSE.Controllers.Toolbar.txtRadicalRoot_3": "Cubic Root",
+  "SSE.Controllers.Toolbar.txtRadicalRoot_n": "Radical With Degree",
+  "SSE.Controllers.Toolbar.txtRadicalSqrt": "Square Root",
+  "SSE.Controllers.Toolbar.txtScriptCustom_1": "Script",
+  "SSE.Controllers.Toolbar.txtScriptCustom_2": "Script",
+  "SSE.Controllers.Toolbar.txtScriptCustom_3": "Script",
+  "SSE.Controllers.Toolbar.txtScriptCustom_4": "Script",
+  "SSE.Controllers.Toolbar.txtScriptSub": "Subscript",
+  "SSE.Controllers.Toolbar.txtScriptSubSup": "Subscript-Superscript",
+  "SSE.Controllers.Toolbar.txtScriptSubSupLeft": "LeftSubscript-Superscript",
+  "SSE.Controllers.Toolbar.txtScriptSup": "Superscript",
+  "SSE.Controllers.Toolbar.txtSorting": "Sorting",
+  "SSE.Controllers.Toolbar.txtSortSelected": "Sort selected",
+  "SSE.Controllers.Toolbar.txtSymbol_about": "Aproximadamente",
+  "SSE.Controllers.Toolbar.txtSymbol_additional": "Complement",
+  "SSE.Controllers.Toolbar.txtSymbol_aleph": "Alef",
+  "SSE.Controllers.Toolbar.txtSymbol_alpha": "Alfa",
+  "SSE.Controllers.Toolbar.txtSymbol_approx": "Casi igual a",
+  "SSE.Controllers.Toolbar.txtSymbol_ast": "Operador asterisco",
+  "SSE.Controllers.Toolbar.txtSymbol_beta": "Beta",
+  "SSE.Controllers.Toolbar.txtSymbol_beth": "Bet",
+  "SSE.Controllers.Toolbar.txtSymbol_bullet": "Operador de viñeta",
+  "SSE.Controllers.Toolbar.txtSymbol_cap": "Intersection",
+  "SSE.Controllers.Toolbar.txtSymbol_cbrt": "Cube Root",
+  "SSE.Controllers.Toolbar.txtSymbol_cdots": "Midline Horizontal Ellipsis",
+  "SSE.Controllers.Toolbar.txtSymbol_celsius": "Degrees Celsius",
+  "SSE.Controllers.Toolbar.txtSymbol_chi": "Ji",
+  "SSE.Controllers.Toolbar.txtSymbol_cong": "Aproximadamente igual a",
+  "SSE.Controllers.Toolbar.txtSymbol_cup": "Union",
+  "SSE.Controllers.Toolbar.txtSymbol_ddots": "Down Right Diagonal Ellipsis",
+  "SSE.Controllers.Toolbar.txtSymbol_degree": "Degrees",
+  "SSE.Controllers.Toolbar.txtSymbol_delta": "Delta",
+  "SSE.Controllers.Toolbar.txtSymbol_div": "Division Sign",
+  "SSE.Controllers.Toolbar.txtSymbol_downarrow": "Down Arrow",
+  "SSE.Controllers.Toolbar.txtSymbol_emptyset": "Empty Set",
+  "SSE.Controllers.Toolbar.txtSymbol_epsilon": "Epsilon",
+  "SSE.Controllers.Toolbar.txtSymbol_equals": "Equal",
+  "SSE.Controllers.Toolbar.txtSymbol_equiv": "Identical To",
+  "SSE.Controllers.Toolbar.txtSymbol_eta": "Eta",
+  "SSE.Controllers.Toolbar.txtSymbol_exists": "There Exist",
+  "SSE.Controllers.Toolbar.txtSymbol_factorial": "Factorial",
+  "SSE.Controllers.Toolbar.txtSymbol_fahrenheit": "Degrees Fahrenheit",
+  "SSE.Controllers.Toolbar.txtSymbol_forall": "For All",
+  "SSE.Controllers.Toolbar.txtSymbol_gamma": "Gamma",
+  "SSE.Controllers.Toolbar.txtSymbol_geq": "Greater Than or Equal To",
+  "SSE.Controllers.Toolbar.txtSymbol_gg": "Much Greater Than",
+  "SSE.Controllers.Toolbar.txtSymbol_greater": "Greater Than",
+  "SSE.Controllers.Toolbar.txtSymbol_in": "Element Of",
+  "SSE.Controllers.Toolbar.txtSymbol_inc": "Increment",
+  "SSE.Controllers.Toolbar.txtSymbol_infinity": "Infinity",
+  "SSE.Controllers.Toolbar.txtSymbol_iota": "Iota",
+  "SSE.Controllers.Toolbar.txtSymbol_kappa": "Kappa",
+  "SSE.Controllers.Toolbar.txtSymbol_lambda": "Lambda",
+  "SSE.Controllers.Toolbar.txtSymbol_leftarrow": "Left Arrow",
+  "SSE.Controllers.Toolbar.txtSymbol_leftrightarrow": "Left-Right Arrow",
+  "SSE.Controllers.Toolbar.txtSymbol_leq": "Less Than or Equal To",
+  "SSE.Controllers.Toolbar.txtSymbol_less": "Less Than",
+  "SSE.Controllers.Toolbar.txtSymbol_ll": "Much Less Than",
+  "SSE.Controllers.Toolbar.txtSymbol_minus": "Minus",
+  "SSE.Controllers.Toolbar.txtSymbol_mp": "Minus Plus",
+  "SSE.Controllers.Toolbar.txtSymbol_mu": "Mu",
+  "SSE.Controllers.Toolbar.txtSymbol_nabla": "Nabla",
+  "SSE.Controllers.Toolbar.txtSymbol_neq": "Not Equal To",
+  "SSE.Controllers.Toolbar.txtSymbol_ni": "Contains as Member",
+  "SSE.Controllers.Toolbar.txtSymbol_not": "Not Sign",
+  "SSE.Controllers.Toolbar.txtSymbol_notexists": "There Does Not Exist",
+  "SSE.Controllers.Toolbar.txtSymbol_nu": "Nu",
+  "SSE.Controllers.Toolbar.txtSymbol_o": "Omicron",
+  "SSE.Controllers.Toolbar.txtSymbol_omega": "Omega",
+  "SSE.Controllers.Toolbar.txtSymbol_partial": "Partial Differential",
+  "SSE.Controllers.Toolbar.txtSymbol_percent": "Percentage",
+  "SSE.Controllers.Toolbar.txtSymbol_phi": "Phi",
+  "SSE.Controllers.Toolbar.txtSymbol_pi": "Pi",
+  "SSE.Controllers.Toolbar.txtSymbol_plus": "Plus",
+  "SSE.Controllers.Toolbar.txtSymbol_pm": "Plus Minus",
+  "SSE.Controllers.Toolbar.txtSymbol_propto": "Proportional To",
+  "SSE.Controllers.Toolbar.txtSymbol_psi": "Psi",
+  "SSE.Controllers.Toolbar.txtSymbol_qdrt": "Fourth Root",
+  "SSE.Controllers.Toolbar.txtSymbol_qed": "End of Proof",
+  "SSE.Controllers.Toolbar.txtSymbol_rddots": "Up Right Diagonal Ellipsis",
+  "SSE.Controllers.Toolbar.txtSymbol_rho": "Rho",
+  "SSE.Controllers.Toolbar.txtSymbol_rightarrow": "Right Arrow",
+  "SSE.Controllers.Toolbar.txtSymbol_sigma": "Sigma",
+  "SSE.Controllers.Toolbar.txtSymbol_sqrt": "Radical Sign",
+  "SSE.Controllers.Toolbar.txtSymbol_tau": "Tau",
+  "SSE.Controllers.Toolbar.txtSymbol_therefore": "Therefore",
+  "SSE.Controllers.Toolbar.txtSymbol_theta": "Theta",
+  "SSE.Controllers.Toolbar.txtSymbol_times": "Multiplication Sign",
+  "SSE.Controllers.Toolbar.txtSymbol_uparrow": "Up Arrow",
+  "SSE.Controllers.Toolbar.txtSymbol_upsilon": "Upsilon",
+  "SSE.Controllers.Toolbar.txtSymbol_varepsilon": "Epsilon Variant",
+  "SSE.Controllers.Toolbar.txtSymbol_varphi": "Phi Variant",
+  "SSE.Controllers.Toolbar.txtSymbol_varpi": "Pi Variant",
+  "SSE.Controllers.Toolbar.txtSymbol_varrho": "Rho Variant",
+  "SSE.Controllers.Toolbar.txtSymbol_varsigma": "Sigma Variant",
+  "SSE.Controllers.Toolbar.txtSymbol_vartheta": "Theta Variant",
+  "SSE.Controllers.Toolbar.txtSymbol_vdots": "Vertical Ellipsis",
+  "SSE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
+  "SSE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "SSE.Controllers.Toolbar.warnMergeLostData": "En la celda unida permanecerán sólo los datos de la celda de la esquina superior izquierda.<br>Está seguro de que quiere continuar?",
   "SSE.Views.AutoFilterDialog.btnCustomFilter": "Filtro personalizado",
   "SSE.Views.AutoFilterDialog.cancelButtonText": "Cancelar",
@@ -291,30 +725,54 @@
   "SSE.Views.CellEditor.textManager": "Administrador de nombre",
   "SSE.Views.CellEditor.tipFormula": "Insertar función",
   "SSE.Views.CellRangeDialog.errorMaxRows": "¡ERROR! El número máximo de series de datos por gráfico es 225",
+  "SSE.Views.CellRangeDialog.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.",
   "SSE.Views.CellRangeDialog.textCancel": "Cancelar",
   "SSE.Views.CellRangeDialog.txtEmpty": "Este campo es obligatorio",
   "SSE.Views.CellRangeDialog.txtInvalidRange": "¡ERROR!Rango de celdas inválido",
   "SSE.Views.CellRangeDialog.txtTitle": "Selección de rango de datos",
+  "SSE.Views.ChartSettings.strLineWeight": "Line Weight",
+  "SSE.Views.ChartSettings.strSparkColor": "Color",
+  "SSE.Views.ChartSettings.strTemplate": "Template",
   "SSE.Views.ChartSettings.textAdvanced": "Mostrar ajustes avanzados",
   "SSE.Views.ChartSettings.textArea": "Gráfico de área",
   "SSE.Views.ChartSettings.textBar": "Gráfico de barras",
+  "SSE.Views.ChartSettings.textBorderSizeErr": "The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.",
   "SSE.Views.ChartSettings.textChartType": "Cambiar tipo de gráfico",
   "SSE.Views.ChartSettings.textColumn": "Gráfico de columnas",
+  "SSE.Views.ChartSettings.textColumnSpark": "Column",
   "SSE.Views.ChartSettings.textEditData": "Editar datos",
+  "SSE.Views.ChartSettings.textFirstPoint": "First Point",
   "SSE.Views.ChartSettings.textHeight": "Altura",
+  "SSE.Views.ChartSettings.textHighPoint": "High Point",
   "SSE.Views.ChartSettings.textKeepRatio": "Proporciones constantes",
+  "SSE.Views.ChartSettings.textLastPoint": "Last Point",
   "SSE.Views.ChartSettings.textLine": "Gráfico de líneas",
+  "SSE.Views.ChartSettings.textLineSpark": "Line",
+  "SSE.Views.ChartSettings.textLowPoint": "Low Point",
+  "SSE.Views.ChartSettings.textMarkers": "Markers",
+  "SSE.Views.ChartSettings.textNegativePoint": "Negative Point",
+  "SSE.Views.ChartSettings.textNewColor": "Añadir Color Personalizado Nuevo",
   "SSE.Views.ChartSettings.textPie": "Gráfico circular",
   "SSE.Views.ChartSettings.textPoint": "Gráfico de Punto",
+  "SSE.Views.ChartSettings.textRanges": "Data Range",
+  "SSE.Views.ChartSettings.textSelectData": "Select Data",
+  "SSE.Views.ChartSettings.textShow": "Show",
   "SSE.Views.ChartSettings.textSize": "Tamaño",
   "SSE.Views.ChartSettings.textStock": "De cotizaciones",
   "SSE.Views.ChartSettings.textStyle": "Estilo",
+  "SSE.Views.ChartSettings.textType": "Type",
   "SSE.Views.ChartSettings.textWidth": "Ancho",
+  "SSE.Views.ChartSettings.textWinLossSpark": "Win/Loss",
   "SSE.Views.ChartSettingsDlg.cancelButtonText": "Cancelar",
   "SSE.Views.ChartSettingsDlg.errorMaxRows": "¡ERROR! El número máximo de series de datos por gráfico es 225",
   "SSE.Views.ChartSettingsDlg.errorStockChart": "Orden de las filas incorrecto. Para compilar un gráfico de cotizaciones introduzca los datos en la hoja  de la forma siguiente:<br> precio de apertura, precio máximo, precio mínimo, precio de cierre.",
+  "SSE.Views.ChartSettingsDlg.textAlt": "Texto alternativo",
+  "SSE.Views.ChartSettingsDlg.textAltDescription": "Description",
+  "SSE.Views.ChartSettingsDlg.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",
+  "SSE.Views.ChartSettingsDlg.textAltTitle": "Title",
   "SSE.Views.ChartSettingsDlg.textArea": "Gráfico de área",
   "SSE.Views.ChartSettingsDlg.textAuto": "Auto",
+  "SSE.Views.ChartSettingsDlg.textAutoEach": "Automático para cada",
   "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Intersección con eje",
   "SSE.Views.ChartSettingsDlg.textAxisOptions": "Parámetros de eje",
   "SSE.Views.ChartSettingsDlg.textAxisPos": "Posición de eje",
@@ -322,12 +780,13 @@
   "SSE.Views.ChartSettingsDlg.textBar": "Gráfico de barras",
   "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Entre marcas de graduación",
   "SSE.Views.ChartSettingsDlg.textBillions": "Millardos",
-  "SSE.Views.ChartSettingsDlg.textBottom": "Bottom",
+  "SSE.Views.ChartSettingsDlg.textBottom": "Abajo ",
   "SSE.Views.ChartSettingsDlg.textCategoryName": "Nombre de categoría",
   "SSE.Views.ChartSettingsDlg.textCenter": "Al centro",
   "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Elementos de gráfico y <br/>leyenda de gráfico",
   "SSE.Views.ChartSettingsDlg.textChartTitle": "Título de gráfico",
   "SSE.Views.ChartSettingsDlg.textColumn": "Gráfico de columnas",
+  "SSE.Views.ChartSettingsDlg.textColumnSpark": "Column",
   "SSE.Views.ChartSettingsDlg.textCross": "Intersección",
   "SSE.Views.ChartSettingsDlg.textCustom": "Personalizado",
   "SSE.Views.ChartSettingsDlg.textDataColumns": "en columnas",
@@ -336,9 +795,13 @@
   "SSE.Views.ChartSettingsDlg.textDataRows": "en filas",
   "SSE.Views.ChartSettingsDlg.textDataSeries": "Serie de datos",
   "SSE.Views.ChartSettingsDlg.textDisplayLegend": "Mostrar Leyenda",
+  "SSE.Views.ChartSettingsDlg.textEmptyCells": "Hidden and Empty cells",
+  "SSE.Views.ChartSettingsDlg.textEmptyLine": "Connect data points with line",
   "SSE.Views.ChartSettingsDlg.textFit": "Fit to Width",
   "SSE.Views.ChartSettingsDlg.textFixed": "Corregido",
+  "SSE.Views.ChartSettingsDlg.textGaps": "Gaps",
   "SSE.Views.ChartSettingsDlg.textGridLines": "Líneas de cuadrícula",
+  "SSE.Views.ChartSettingsDlg.textGroup": "Group Sparkline",
   "SSE.Views.ChartSettingsDlg.textHide": "Ocultar",
   "SSE.Views.ChartSettingsDlg.textHigh": "Alto",
   "SSE.Views.ChartSettingsDlg.textHorAxis": "Eje horizontal",
@@ -366,6 +829,8 @@
   "SSE.Views.ChartSettingsDlg.textLegendTop": "Superior",
   "SSE.Views.ChartSettingsDlg.textLine": "Gráfico de líneas",
   "SSE.Views.ChartSettingsDlg.textLines": "Líneas",
+  "SSE.Views.ChartSettingsDlg.textLineSpark": "Line",
+  "SSE.Views.ChartSettingsDlg.textLocationRange": "Location Range",
   "SSE.Views.ChartSettingsDlg.textLow": "Bajo",
   "SSE.Views.ChartSettingsDlg.textMajor": "Principal",
   "SSE.Views.ChartSettingsDlg.textMajorMinor": "Principal y menor",
@@ -388,18 +853,25 @@
   "SSE.Views.ChartSettingsDlg.textPie": "Gráfico circular",
   "SSE.Views.ChartSettingsDlg.textPoint": "Gráfico de Punto",
   "SSE.Views.ChartSettingsDlg.textReverse": "Valores en orden inverso",
+  "SSE.Views.ChartSettingsDlg.textReverseOrder": "Reverse order",
   "SSE.Views.ChartSettingsDlg.textRight": "Right",
   "SSE.Views.ChartSettingsDlg.textRightOverlay": "Superposición a la derecha",
   "SSE.Views.ChartSettingsDlg.textRotated": "Girado",
+  "SSE.Views.ChartSettingsDlg.textSameAll": "Same for All",
   "SSE.Views.ChartSettingsDlg.textSelectData": "Selección de datos",
   "SSE.Views.ChartSettingsDlg.textSeparator": "Separador de etiquetas de datos",
   "SSE.Views.ChartSettingsDlg.textSeriesName": "Nombre de serie",
   "SSE.Views.ChartSettingsDlg.textShow": "Mostrar",
   "SSE.Views.ChartSettingsDlg.textShowAxis": "Mostrar eje",
   "SSE.Views.ChartSettingsDlg.textShowBorders": "Mostrar bordes",
+  "SSE.Views.ChartSettingsDlg.textShowData": "Show data in hidden rows and columns",
+  "SSE.Views.ChartSettingsDlg.textShowEmptyCells": "Show empty cells as",
   "SSE.Views.ChartSettingsDlg.textShowGrid": "Cuadrícula",
+  "SSE.Views.ChartSettingsDlg.textShowSparkAxis": "Show Axis",
   "SSE.Views.ChartSettingsDlg.textShowValues": "Mostrar los valores del gráfico",
+  "SSE.Views.ChartSettingsDlg.textSingle": "Single Sparkline",
   "SSE.Views.ChartSettingsDlg.textSmooth": "Suave",
+  "SSE.Views.ChartSettingsDlg.textSparkRanges": "Sparkline Ranges",
   "SSE.Views.ChartSettingsDlg.textStock": "De cotizaciones",
   "SSE.Views.ChartSettingsDlg.textStraight": "Recto",
   "SSE.Views.ChartSettingsDlg.textStyle": "Estilo",
@@ -408,6 +880,7 @@
   "SSE.Views.ChartSettingsDlg.textThousands": "Miles",
   "SSE.Views.ChartSettingsDlg.textTickOptions": "Parámetros de marcas de graduación",
   "SSE.Views.ChartSettingsDlg.textTitle": "Gráfico- Ajustes avanzados",
+  "SSE.Views.ChartSettingsDlg.textTitleSparkline": "Sparkline - Advanced Settings",
   "SSE.Views.ChartSettingsDlg.textTop": "Top",
   "SSE.Views.ChartSettingsDlg.textTrillions": "Billones",
   "SSE.Views.ChartSettingsDlg.textType": "Tipo",
@@ -418,8 +891,10 @@
   "SSE.Views.ChartSettingsDlg.textVertAxis": "Eje vertical",
   "SSE.Views.ChartSettingsDlg.textVertGrid": "Líneas de cuadrícula verticales",
   "SSE.Views.ChartSettingsDlg.textVertTitle": "Título de eje vertical",
+  "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Win/Loss",
   "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Título del eje X",
   "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Título del eje Y",
+  "SSE.Views.ChartSettingsDlg.textZero": "Zero",
   "SSE.Views.ChartSettingsDlg.txtEmpty": "Este campo es obligatorio",
   "SSE.Views.DigitalFilterDialog.cancelButtonText": "Cancelar",
   "SSE.Views.DigitalFilterDialog.capAnd": "Y",
@@ -467,6 +942,7 @@
   "SSE.Views.DocumentHolder.textArrangeBackward": "Enviar atrás",
   "SSE.Views.DocumentHolder.textArrangeForward": "Traer adelante",
   "SSE.Views.DocumentHolder.textArrangeFront": "Traer al primer plano",
+  "SSE.Views.DocumentHolder.textEntriesList": "Select from drop-down list",
   "SSE.Views.DocumentHolder.textFreezePanes": "Inmovilizar paneles",
   "SSE.Views.DocumentHolder.textUnFreezePanes": "Unfreeze Panes",
   "SSE.Views.DocumentHolder.topCellText": "Alinear en la parte superior",
@@ -474,13 +950,15 @@
   "SSE.Views.DocumentHolder.txtAddNamedRange": "Definir Nombre",
   "SSE.Views.DocumentHolder.txtArrange": "Arreglar",
   "SSE.Views.DocumentHolder.txtAscending": "Ascendente",
-  "SSE.Views.DocumentHolder.txtAutoColumnWidth": "Auto Fit Column Width",
-  "SSE.Views.DocumentHolder.txtAutoRowHeight": "Auto Fit Row Height",
+  "SSE.Views.DocumentHolder.txtAutoColumnWidth": "Ajuste automático de ancho de columna",
+  "SSE.Views.DocumentHolder.txtAutoRowHeight": "Ajuste automático de altura de fila ",
   "SSE.Views.DocumentHolder.txtClear": "Limpiar",
   "SSE.Views.DocumentHolder.txtClearAll": "Todo",
   "SSE.Views.DocumentHolder.txtClearComments": "Comentarios",
   "SSE.Views.DocumentHolder.txtClearFormat": "Formato",
   "SSE.Views.DocumentHolder.txtClearHyper": "Hiperenlaces",
+  "SSE.Views.DocumentHolder.txtClearSparklineGroups": "Clear Selected Sparkline Groups",
+  "SSE.Views.DocumentHolder.txtClearSparklines": "Clear Selected Sparklines",
   "SSE.Views.DocumentHolder.txtClearText": "Texto",
   "SSE.Views.DocumentHolder.txtColumn": "Toda la columna",
   "SSE.Views.DocumentHolder.txtColumnWidth": "Ancho de columna",
@@ -513,17 +991,20 @@
   "SSE.Views.DocumentHolder.txtSort": "Ordenar",
   "SSE.Views.DocumentHolder.txtSortCellColor": "Color seleccionado en la parte superior de la célula",
   "SSE.Views.DocumentHolder.txtSortFontColor": "Color de letra seleccionado en la parte superior",
+  "SSE.Views.DocumentHolder.txtSparklines": "Sparklines",
   "SSE.Views.DocumentHolder.txtTextAdvanced": "Ajustes avanzados de texto",
   "SSE.Views.DocumentHolder.txtUngroup": "Desagrupar",
   "SSE.Views.DocumentHolder.txtWidth": "Ancho",
   "SSE.Views.DocumentHolder.vertAlignText": "Alineación vertical",
   "SSE.Views.FileMenu.btnBackCaption": "Ir a Documentos",
+  "SSE.Views.FileMenu.btnCloseMenuCaption": "Close Menu",
   "SSE.Views.FileMenu.btnCreateNewCaption": "Crear nueva",
   "SSE.Views.FileMenu.btnDownloadCaption": "Descargar como...",
   "SSE.Views.FileMenu.btnHelpCaption": "Ayuda...",
   "SSE.Views.FileMenu.btnInfoCaption": "Info sobre hoja de cálculo...",
   "SSE.Views.FileMenu.btnPrintCaption": "Imprimir",
   "SSE.Views.FileMenu.btnRecentFilesCaption": "Abrir reciente...",
+  "SSE.Views.FileMenu.btnRenameCaption": "Rename...",
   "SSE.Views.FileMenu.btnReturnCaption": "Volver a hoja de cálculo",
   "SSE.Views.FileMenu.btnRightsCaption": "Derechos de acceso...",
   "SSE.Views.FileMenu.btnSaveAsCaption": "Guardar como",
@@ -573,11 +1054,41 @@
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtLiveComment": "Demostración de Comentarios ",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtMac": "como OS X",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNative": "Nativo",
+  "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPl": "Polish",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Punto",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Ruso",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "como Windows",
   "SSE.Views.FileMenuPanels.Settings.txtGeneral": "General",
   "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Ajustes de la Página",
+  "SSE.Views.FormatSettingsDialog.textCancel": "Cancelar",
+  "SSE.Views.FormatSettingsDialog.textCategory": "Categoría",
+  "SSE.Views.FormatSettingsDialog.textDecimal": "Decimal",
+  "SSE.Views.FormatSettingsDialog.textFormat": "Format",
+  "SSE.Views.FormatSettingsDialog.textOk": "OK",
+  "SSE.Views.FormatSettingsDialog.textSeparator": "Use 1000 separator",
+  "SSE.Views.FormatSettingsDialog.textSymbols": "Symbols",
+  "SSE.Views.FormatSettingsDialog.textTitle": "Number Format",
+  "SSE.Views.FormatSettingsDialog.txtAccounting": "Contabilidad",
+  "SSE.Views.FormatSettingsDialog.txtAs10": "Décimas (5/10)",
+  "SSE.Views.FormatSettingsDialog.txtAs100": "Сentésimas (50/100)",
+  "SSE.Views.FormatSettingsDialog.txtAs16": "Dieciseisavos (8/16)",
+  "SSE.Views.FormatSettingsDialog.txtAs2": "Mitades (1/2)",
+  "SSE.Views.FormatSettingsDialog.txtAs4": "Cuartos (2/4)",
+  "SSE.Views.FormatSettingsDialog.txtAs8": "Octavos (4/8)",
+  "SSE.Views.FormatSettingsDialog.txtCurrency": "Currency",
+  "SSE.Views.FormatSettingsDialog.txtCustom": "Custom",
+  "SSE.Views.FormatSettingsDialog.txtDate": "Date",
+  "SSE.Views.FormatSettingsDialog.txtFraction": "Fraction",
+  "SSE.Views.FormatSettingsDialog.txtGeneral": "General",
+  "SSE.Views.FormatSettingsDialog.txtNumber": "Number",
+  "SSE.Views.FormatSettingsDialog.txtPercentage": "Percentage",
+  "SSE.Views.FormatSettingsDialog.txtSample": "Sample:",
+  "SSE.Views.FormatSettingsDialog.txtScientific": "Scientific",
+  "SSE.Views.FormatSettingsDialog.txtText": "Text",
+  "SSE.Views.FormatSettingsDialog.txtTime": "Time",
+  "SSE.Views.FormatSettingsDialog.txtUpto1": "Up to one digit (1/3)",
+  "SSE.Views.FormatSettingsDialog.txtUpto2": "Up to two digits (12/25)",
+  "SSE.Views.FormatSettingsDialog.txtUpto3": "Up to three digits (131/135)",
   "SSE.Views.FormulaDialog.cancelButtonText": "Cancelar",
   "SSE.Views.FormulaDialog.okButtonText": "OK",
   "SSE.Views.FormulaDialog.sCategoryAll": "Todo",
@@ -637,6 +1148,7 @@
   "SSE.Views.HyperlinkSettingsDialog.textTitle": "Configuración de hiperenlace",
   "SSE.Views.HyperlinkSettingsDialog.txtEmpty": "Este campo es obligatorio",
   "SSE.Views.HyperlinkSettingsDialog.txtNotUrl": "El campo debe ser URL en el formato \"http://www.example.com\"",
+  "SSE.Views.ImageSettings.textAdvanced": "Show advanced settings",
   "SSE.Views.ImageSettings.textEdit": "Edit",
   "SSE.Views.ImageSettings.textEditObject": "Edit Object",
   "SSE.Views.ImageSettings.textFromFile": "De archivo",
@@ -647,6 +1159,13 @@
   "SSE.Views.ImageSettings.textOriginalSize": "Tamaño Predeterminado",
   "SSE.Views.ImageSettings.textSize": "Tamaño",
   "SSE.Views.ImageSettings.textWidth": "Ancho",
+  "SSE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancelar",
+  "SSE.Views.ImageSettingsAdvanced.okButtonText": "Ok",
+  "SSE.Views.ImageSettingsAdvanced.textAlt": "Texto alternativo",
+  "SSE.Views.ImageSettingsAdvanced.textAltDescription": "Description",
+  "SSE.Views.ImageSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",
+  "SSE.Views.ImageSettingsAdvanced.textAltTitle": "Title",
+  "SSE.Views.ImageSettingsAdvanced.textTitle": "Image - Advanced Settings",
   "SSE.Views.LeftMenu.tipAbout": "Acerca de programa",
   "SSE.Views.LeftMenu.tipChat": "Chat",
   "SSE.Views.LeftMenu.tipComments": "Comentarios",
@@ -785,6 +1304,7 @@
   "SSE.Views.RightMenu.txtParagraphSettings": "Ajustes de texto",
   "SSE.Views.RightMenu.txtSettings": "Ajustes comunes",
   "SSE.Views.RightMenu.txtShapeSettings": "Ajustes de forma",
+  "SSE.Views.RightMenu.txtSparklineSettings": "Sparkline Settings",
   "SSE.Views.RightMenu.txtTableSettings": "Ajustes de la tabla",
   "SSE.Views.RightMenu.txtTextArtSettings": "Ajustes de arte de texto",
   "SSE.Views.SetValueDialog.cancelButtonText": "Cancelar",
@@ -837,6 +1357,10 @@
   "SSE.Views.ShapeSettingsAdvanced.cancelButtonText": "Cancelar",
   "SSE.Views.ShapeSettingsAdvanced.okButtonText": "OK",
   "SSE.Views.ShapeSettingsAdvanced.strMargins": "Márgenes interiores",
+  "SSE.Views.ShapeSettingsAdvanced.textAlt": "Texto alternativo",
+  "SSE.Views.ShapeSettingsAdvanced.textAltDescription": "Description",
+  "SSE.Views.ShapeSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",
+  "SSE.Views.ShapeSettingsAdvanced.textAltTitle": "Title",
   "SSE.Views.ShapeSettingsAdvanced.textArrows": "Flechas",
   "SSE.Views.ShapeSettingsAdvanced.textBeginSize": "Tamaño inicial",
   "SSE.Views.ShapeSettingsAdvanced.textBeginStyle": "Estilo inicial",
@@ -864,6 +1388,8 @@
   "SSE.Views.Statusbar.CopyDialog.itemMoveToEnd": "(Mover al final)",
   "SSE.Views.Statusbar.CopyDialog.textCopyBefore": "Copiar antes de hoja",
   "SSE.Views.Statusbar.CopyDialog.textMoveBefore": "Desplazar delante de hoja",
+  "SSE.Views.Statusbar.filteredRecordsText": "Registros filtrados: {0} de {1}",
+  "SSE.Views.Statusbar.filteredText": "Filter mode",
   "SSE.Views.Statusbar.itemCopy": "Copiar",
   "SSE.Views.Statusbar.itemDelete": "Borrar",
   "SSE.Views.Statusbar.itemHidden": "Ocultado",
@@ -913,9 +1439,11 @@
   "SSE.Views.TableSettings.selectDataText": "Seleccionar datos de columna",
   "SSE.Views.TableSettings.selectRowText": "Seleccionar fila",
   "SSE.Views.TableSettings.selectTableText": "Seleccionar tabla",
+  "SSE.Views.TableSettings.textAdvanced": "Show advanced settings",
   "SSE.Views.TableSettings.textBanded": "Con bandas",
   "SSE.Views.TableSettings.textCancel": "Cancelar",
   "SSE.Views.TableSettings.textColumns": "Columnas",
+  "SSE.Views.TableSettings.textConvertRange": "Convert to range",
   "SSE.Views.TableSettings.textEdit": "Filas y columnas",
   "SSE.Views.TableSettings.textEmptyTemplate": "Sin plantillas",
   "SSE.Views.TableSettings.textExistName": "¡ERROR! Una gama con tal nombre ya existe",
@@ -933,6 +1461,13 @@
   "SSE.Views.TableSettings.textTableName": "Nombre de la tabla",
   "SSE.Views.TableSettings.textTemplate": "Seleccionar de plantilla",
   "SSE.Views.TableSettings.textTotal": "Total",
+  "SSE.Views.TableSettingsAdvanced.cancelButtonText": "Cancelar",
+  "SSE.Views.TableSettingsAdvanced.okButtonText": "Ok",
+  "SSE.Views.TableSettingsAdvanced.textAlt": "Texto alternativo",
+  "SSE.Views.TableSettingsAdvanced.textAltDescription": "Description",
+  "SSE.Views.TableSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",
+  "SSE.Views.TableSettingsAdvanced.textAltTitle": "Title",
+  "SSE.Views.TableSettingsAdvanced.textTitle": "Table - Advanced Settings",
   "SSE.Views.TextArtSettings.strBackground": "Color de fondo",
   "SSE.Views.TextArtSettings.strColor": "Color",
   "SSE.Views.TextArtSettings.strFill": "Relleno",
@@ -985,12 +1520,17 @@
   "SSE.Views.Toolbar.textAlignRight": "Alinear a la derecha",
   "SSE.Views.Toolbar.textAlignTop": "Alinear arriba",
   "SSE.Views.Toolbar.textAllBorders": "Todos los bordes",
+  "SSE.Views.Toolbar.textArea": "Área",
+  "SSE.Views.Toolbar.textBar": "Gráfico de barras",
   "SSE.Views.Toolbar.textBold": "Negrita",
   "SSE.Views.Toolbar.textBordersColor": "Color de borde",
-  "SSE.Views.Toolbar.textBordersWidth": "Ancho de borde",
+  "SSE.Views.Toolbar.textBordersStyle": "Estilo de borde",
   "SSE.Views.Toolbar.textBottomBorders": "Bordes inferiores",
   "SSE.Views.Toolbar.textCenterBorders": "Bordes verticales internos",
+  "SSE.Views.Toolbar.textCharts": "Gráficos",
   "SSE.Views.Toolbar.textClockwise": "En la dirección de manecillas de reloj",
+  "SSE.Views.Toolbar.textColumn": "Column",
+  "SSE.Views.Toolbar.textColumnSpark": "Column",
   "SSE.Views.Toolbar.textCompactToolbar": "Barra de herramientas compacta",
   "SSE.Views.Toolbar.textCounterCw": "En el sentido antihorario",
   "SSE.Views.Toolbar.textDelLeft": "Desplazar celdas a la izquierda",
@@ -999,7 +1539,6 @@
   "SSE.Views.Toolbar.textDiagUpBorder": "Borde diagonal ascendente",
   "SSE.Views.Toolbar.textEntireCol": "Toda la columna",
   "SSE.Views.Toolbar.textEntireRow": "Toda la fila",
-  "SSE.Views.Toolbar.textFreezePanes": "Inmovilizar paneles",
   "SSE.Views.Toolbar.textHideFBar": "Ocultar barra de fórmulas",
   "SSE.Views.Toolbar.textHideGridlines": "Ocultar cuadrícula",
   "SSE.Views.Toolbar.textHideHeadings": "Ocultar títulos",
@@ -1012,17 +1551,25 @@
   "SSE.Views.Toolbar.textInsTextArt": "Insertar Texto de Arte",
   "SSE.Views.Toolbar.textItalic": "Cursiva",
   "SSE.Views.Toolbar.textLeftBorders": "Bordes izquierdos",
+  "SSE.Views.Toolbar.textLine": "Line",
+  "SSE.Views.Toolbar.textLineSpark": "Line",
   "SSE.Views.Toolbar.textMiddleBorders": "Bordes horizontales internos",
+  "SSE.Views.Toolbar.textMoreFormats": "More formats",
   "SSE.Views.Toolbar.textNewColor": "Añadir Color Personalizado Nuevo",
   "SSE.Views.Toolbar.textNoBorders": "Sin bordes",
   "SSE.Views.Toolbar.textOutBorders": "Bordes externos",
+  "SSE.Views.Toolbar.textPie": "Pie",
+  "SSE.Views.Toolbar.textPoint": "XY (Scatter)",
   "SSE.Views.Toolbar.textPrint": "Imprimir",
   "SSE.Views.Toolbar.textPrintOptions": "Opciones de impresión",
   "SSE.Views.Toolbar.textRightBorders": "Bordes derechos",
   "SSE.Views.Toolbar.textRotateDown": "Girar texto hacia abajo",
   "SSE.Views.Toolbar.textRotateUp": "Girar texto hacia arriba",
+  "SSE.Views.Toolbar.textSparks": "Sparklines",
+  "SSE.Views.Toolbar.textStock": "Stock",
   "SSE.Views.Toolbar.textTopBorders": "Bordes superiores",
   "SSE.Views.Toolbar.textUnderline": "Subrayar",
+  "SSE.Views.Toolbar.textWinLossSpark": "Win/Loss",
   "SSE.Views.Toolbar.textZoom": "Zoom",
   "SSE.Views.Toolbar.tipAdvSettings": "Ajustes avanzados",
   "SSE.Views.Toolbar.tipAlignBottom": "Alinear en la parte inferior",
@@ -1054,6 +1601,8 @@
   "SSE.Views.Toolbar.tipIncDecimal": "Aumentar decimales",
   "SSE.Views.Toolbar.tipIncFont": "Aumentar tamaño de letra",
   "SSE.Views.Toolbar.tipInsertChart": "Insertar gráfico",
+  "SSE.Views.Toolbar.tipInsertChartSpark": "Insert Chart or Sparkline",
+  "SSE.Views.Toolbar.tipInsertEquation": "Insert Equation",
   "SSE.Views.Toolbar.tipInsertHyperlink": "Añadir hiperenlace",
   "SSE.Views.Toolbar.tipInsertImage": "Insertar imagen",
   "SSE.Views.Toolbar.tipInsertOpt": "Insertar celdas",
@@ -1110,7 +1659,7 @@
   "SSE.Views.Toolbar.txtPasteRange": "Pegar nombre",
   "SSE.Views.Toolbar.txtPercentage": "Porcentaje",
   "SSE.Views.Toolbar.txtPound": "£ Libra",
-  "SSE.Views.Toolbar.txtRouble": "р. Rublo",
+  "SSE.Views.Toolbar.txtRouble": "₽ Rublo",
   "SSE.Views.Toolbar.txtScheme1": "Oficina",
   "SSE.Views.Toolbar.txtScheme10": "Intermedio",
   "SSE.Views.Toolbar.txtScheme11": "Metro",

apps/spreadsheeteditor/main/locale/fr.json

@@ -87,7 +87,7 @@
   "Common.Views.OpenDialog.txtEncoding": "Encodage",
   "Common.Views.OpenDialog.txtPassword": "Mot de passe",
   "Common.Views.OpenDialog.txtSpace": "Espace",
-  "Common.Views.OpenDialog.txtTab": "Onglet",
+  "Common.Views.OpenDialog.txtTab": "Tabulation",
   "Common.Views.OpenDialog.txtTitle": "Choisir %1 des options ",
   "Common.Views.OpenDialog.txtTitleProtected": "Fichier protégé",
   "Common.Views.PluginDlg.textLoading": "Chargement",
@@ -257,6 +257,7 @@
   "SSE.Controllers.Main.errorPasteMaxRange": "La zone de copie ne correspond pas à la zone de collage.<br>Pour coller les cellules copiées, veuillez sélectionner une zone avec la même taille ou cliquer sur la première cellule d'une ligne.",
   "SSE.Controllers.Main.errorPrintMaxPagesCount": "Malheureusement, il n’est pas possible d’imprimer plus de 1500 pages à la fois en utilisant la version actuelle du programme.<br>Cette restriction sera supprimée dans la version future.",
   "SSE.Controllers.Main.errorProcessSaveResult": "Échec de l'enregistrement",
+  "SSE.Controllers.Main.errorServerVersion": "La version de l'éditeur a été mise à jour. La page sera rechargée pour appliquer les modifications.",
   "SSE.Controllers.Main.errorSessionAbsolute": "La session de la modification de document a expiré.Veuillez recharger la page.",
   "SSE.Controllers.Main.errorSessionIdle": "Le document n'est pas modifié depuis longtemps. Veuillez recharger la page.",
   "SSE.Controllers.Main.errorSessionToken": "La connexion au serveur a été interrompue. Veuillez recharger la page.",
@@ -311,6 +312,7 @@
   "SSE.Controllers.Main.textYes": "Oui",
   "SSE.Controllers.Main.titleLicenseExp": "Licence expirée",
   "SSE.Controllers.Main.titleRecalcFormulas": "Calcul en cours...",
+  "SSE.Controllers.Main.titleServerVersion": "L'éditeur est mis à jour",
   "SSE.Controllers.Main.txtArt": "Votre texte ici",
   "SSE.Controllers.Main.txtBasicShapes": "Formes de base",
   "SSE.Controllers.Main.txtButtons": "Boutons",
@@ -1052,6 +1054,7 @@
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtLiveComment": "Affichage des commentaires ",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtMac": "comme OS X",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNative": "Natif",
+  "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPl": "Polonais",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Point",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "comme Windows",
@@ -1066,12 +1069,12 @@
   "SSE.Views.FormatSettingsDialog.textSymbols": "Symboles",
   "SSE.Views.FormatSettingsDialog.textTitle": "Format de nombre",
   "SSE.Views.FormatSettingsDialog.txtAccounting": "Comptabilité",
-  "SSE.Views.FormatSettingsDialog.txtAs10": "Dizièmes",
-  "SSE.Views.FormatSettingsDialog.txtAs100": "Centièmes",
-  "SSE.Views.FormatSettingsDialog.txtAs16": "Seizièmes",
-  "SSE.Views.FormatSettingsDialog.txtAs2": "Demis",
-  "SSE.Views.FormatSettingsDialog.txtAs4": "Quatrième",
-  "SSE.Views.FormatSettingsDialog.txtAs8": "Huitièmes",
+  "SSE.Views.FormatSettingsDialog.txtAs10": "Dizièmes (5/10)",
+  "SSE.Views.FormatSettingsDialog.txtAs100": "Centièmes (50/100)",
+  "SSE.Views.FormatSettingsDialog.txtAs16": "Seizièmes (8/16)",
+  "SSE.Views.FormatSettingsDialog.txtAs2": "Demis (1/2)",
+  "SSE.Views.FormatSettingsDialog.txtAs4": "Quatrième (2/4)",
+  "SSE.Views.FormatSettingsDialog.txtAs8": "Huitièmes (4/8)",
   "SSE.Views.FormatSettingsDialog.txtCurrency": "Monétaire",
   "SSE.Views.FormatSettingsDialog.txtCustom": "Personnalisé",
   "SSE.Views.FormatSettingsDialog.txtDate": "Date",
@@ -1083,9 +1086,9 @@
   "SSE.Views.FormatSettingsDialog.txtScientific": "Scientifique",
   "SSE.Views.FormatSettingsDialog.txtText": "Texte",
   "SSE.Views.FormatSettingsDialog.txtTime": "Heure",
-  "SSE.Views.FormatSettingsDialog.txtUpto1": "D'un chiffre",
-  "SSE.Views.FormatSettingsDialog.txtUpto2": "De deux chiffres",
-  "SSE.Views.FormatSettingsDialog.txtUpto3": "De trois chiffres",
+  "SSE.Views.FormatSettingsDialog.txtUpto1": "D'un chiffre (1/3)",
+  "SSE.Views.FormatSettingsDialog.txtUpto2": "De deux chiffres (12/25)",
+  "SSE.Views.FormatSettingsDialog.txtUpto3": "De trois chiffres (131/135)",
   "SSE.Views.FormulaDialog.cancelButtonText": "Annuler",
   "SSE.Views.FormulaDialog.okButtonText": "OK",
   "SSE.Views.FormulaDialog.sCategoryAll": "Tout",
@@ -1255,17 +1258,17 @@
   "SSE.Views.ParagraphSettingsAdvanced.strStrike": "Biffés",
   "SSE.Views.ParagraphSettingsAdvanced.strSubscript": "Indice",
   "SSE.Views.ParagraphSettingsAdvanced.strSuperscript": "Exposant",
-  "SSE.Views.ParagraphSettingsAdvanced.strTabs": "Onglet",
+  "SSE.Views.ParagraphSettingsAdvanced.strTabs": "Tabulation",
   "SSE.Views.ParagraphSettingsAdvanced.textAlign": "Alignement",
   "SSE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Espacement des caractères",
-  "SSE.Views.ParagraphSettingsAdvanced.textDefault": "Onglet par défaut",
+  "SSE.Views.ParagraphSettingsAdvanced.textDefault": "Par défaut",
   "SSE.Views.ParagraphSettingsAdvanced.textEffects": "Effets",
   "SSE.Views.ParagraphSettingsAdvanced.textRemove": "Supprimer",
   "SSE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Supprimer tout",
   "SSE.Views.ParagraphSettingsAdvanced.textSet": "Spécifier",
   "SSE.Views.ParagraphSettingsAdvanced.textTabCenter": "Au centre",
   "SSE.Views.ParagraphSettingsAdvanced.textTabLeft": "A gauche",
-  "SSE.Views.ParagraphSettingsAdvanced.textTabPosition": "Position d'onglet",
+  "SSE.Views.ParagraphSettingsAdvanced.textTabPosition": "Position",
   "SSE.Views.ParagraphSettingsAdvanced.textTabRight": "A droite",
   "SSE.Views.ParagraphSettingsAdvanced.textTitle": "Paragraphe - Paramètres avancés",
   "SSE.Views.PrintSettings.btnPrint": "Enregistrer et imprimer",
@@ -1440,6 +1443,7 @@
   "SSE.Views.TableSettings.textBanded": "Bordé",
   "SSE.Views.TableSettings.textCancel": "Annuler",
   "SSE.Views.TableSettings.textColumns": "Colonnes",
+  "SSE.Views.TableSettings.textConvertRange": "Conversion en plage",
   "SSE.Views.TableSettings.textEdit": "Lignes et colonnes",
   "SSE.Views.TableSettings.textEmptyTemplate": "Aucun modèle",
   "SSE.Views.TableSettings.textExistName": "ERREUR! Une gamme avec un tel nom existe déjà",
@@ -1519,7 +1523,7 @@
   "SSE.Views.Toolbar.textArea": "En aires",
   "SSE.Views.Toolbar.textBar": "À barres",
   "SSE.Views.Toolbar.textBold": "Gras",
-  "SSE.Views.Toolbar.textBordersColor": "Couleur de la bordure",
+  "SSE.Views.Toolbar.textBordersColor": "Couleur",
   "SSE.Views.Toolbar.textBordersStyle": "Style de la bordure",
   "SSE.Views.Toolbar.textBottomBorders": "Bordures inférieures",
   "SSE.Views.Toolbar.textCenterBorders": "Bordures intérieures verticales",
@@ -1655,7 +1659,7 @@
   "SSE.Views.Toolbar.txtPasteRange": "Coller un nom ",
   "SSE.Views.Toolbar.txtPercentage": "Pourcentage",
   "SSE.Views.Toolbar.txtPound": "£ Livre",
-  "SSE.Views.Toolbar.txtRouble": "р. Rouble",
+  "SSE.Views.Toolbar.txtRouble": "₽ Rouble",
   "SSE.Views.Toolbar.txtScheme1": "Bureau",
   "SSE.Views.Toolbar.txtScheme10": "Médian",
   "SSE.Views.Toolbar.txtScheme11": "Métro",