Merge branch 'feature/new-toolbar'

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

@@ -248,8 +248,8 @@ define([
             Common.UI.Menu.Manager.hideAll();
             var zoom = (event instanceof jQuery.Event) ? Common.Utils.zoom() : 1;
             this.dragging.enabled = true;
-            this.dragging.initx = event.pageX*zoom - parseInt(this.$window.css('left'));
+            this.dragging.initx = event.pageX*zoom - this.getLeft();
-            this.dragging.inity = event.pageY*zoom - parseInt(this.$window.css('top'));
+            this.dragging.inity = event.pageY*zoom - this.getTop();
 
             if (window.innerHeight == undefined) {
                 var main_width  = document.documentElement.offsetWidth;
@@ -259,8 +259,8 @@ define([
                 main_height = Common.Utils.innerHeight();
             }
 
-            this.dragging.maxx  = main_width - parseInt(this.$window.css("width"));
+            this.dragging.maxx  = main_width - this.getWidth();
-            this.dragging.maxy  = main_height - parseInt(this.$window.css("height"));
+            this.dragging.maxy  = main_height - this.getHeight();
 
             $(document).on('mousemove', this.binding.drag);
             $(document).on('mouseup', this.binding.dragStop);
@@ -298,16 +298,16 @@ define([
         function _resizestart(event) {
             Common.UI.Menu.Manager.hideAll();
             var el = $(event.target),
-                left = parseInt(this.$window.css('left')),
+                left = this.getLeft(),
-                top = parseInt(this.$window.css('top'));
+                top = this.getTop();
 
             this.resizing.enabled = true;
             this.resizing.initpage_x = event.pageX*Common.Utils.zoom();
             this.resizing.initpage_y = event.pageY*Common.Utils.zoom();
             this.resizing.initx = this.resizing.initpage_x - left;
             this.resizing.inity = this.resizing.initpage_y - top;
-            this.resizing.initw = parseInt(this.$window.css("width"));
+            this.resizing.initw = this.getWidth();
-            this.resizing.inith = parseInt(this.$window.css("height"));
+            this.resizing.inith = this.getHeight();
             this.resizing.type = [el.hasClass('left') ? -1 : (el.hasClass('right') ? 1 : 0), el.hasClass('top') ? -1 : (el.hasClass('bottom') ? 1 : 0)];
 
             var main_width  = (window.innerHeight == undefined) ? document.documentElement.offsetWidth : Common.Utils.innerWidth(),
@@ -827,6 +827,14 @@ define([
                 return this.$window.find('> .header > .title').text();
             },
 
+            getLeft: function() {
+                return parseInt(this.$window.css('left'));
+            },
+
+            getTop: function() {
+                return parseInt(this.$window.css('top'));
+            },
+
             isVisible: function() {
                 return this.$window && this.$window.is(':visible');
             },

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

@@ -148,6 +148,7 @@ define([
                     variation.set_Url(itemVar.get('url'));
                     variation.set_Icons(itemVar.get('icons'));
                     variation.set_Visual(itemVar.get('isVisual'));
+                    variation.set_CustomWindow(itemVar.get('isCustomWindow'));
                     variation.set_Viewer(itemVar.get('isViewer'));
                     variation.set_EditorsSupport(itemVar.get('EditorsSupport'));
                     variation.set_Modal(itemVar.get('isModal'));
@@ -248,6 +249,7 @@ define([
                         this.api.asc_pluginButtonClick(-1);
                 } else {
                     var me = this,
+                        isCustomWindow = variation.get_CustomWindow(),
                         arrBtns = variation.get_Buttons(),
                         newBtns = {},
                         size = variation.get_Size();
@@ -260,11 +262,13 @@ define([
                     }
 
                     me.pluginDlg = new Common.Views.PluginDlg({
+                        cls: isCustomWindow ? 'plain' : '',
+                        header: !isCustomWindow,
                         title: plugin.get_Name(),
                         width: size[0], // inner width
                         height: size[1], // inner height
                         url: url,
-                        buttons: newBtns,
+                        buttons: isCustomWindow ? undefined : newBtns,
                         toolcallback: _.bind(this.onToolClose, this)
                     });
                     me.pluginDlg.on('render:after', function(obj){

apps/common/main/lib/model/Plugin.js

@@ -58,6 +58,7 @@ define([
                 isViewer: false,
                 EditorsSupport: ["word", "cell", "slide"],
                 isVisual: false,
+                isCustomWindow: false,
                 isModal: false,
                 isInsideMode: false,
                 initDataType: 0,

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

@@ -290,21 +290,23 @@ define([
         initialize : function(options) {
             var _options = {};
             _.extend(_options,  {
-                cls: 'advanced-settings-dlg',
                 header: true,
                 enableKeyEvents: false
             }, options);
 
             var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34;
-            _options.width = (Common.Utils.innerWidth()-_options.width)<0 ? Common.Utils.innerWidth(): _options.width,
+            if (!_options.header) header_footer -= 34;
+            this.bordersOffset = 25;
+            _options.width = (Common.Utils.innerWidth()-this.bordersOffset*2-_options.width)<0 ? Common.Utils.innerWidth()-this.bordersOffset*2: _options.width;
             _options.height += header_footer;
-            _options.height = (Common.Utils.innerHeight()-_options.height)<0 ? Common.Utils.innerHeight(): _options.height;
+            _options.height = (Common.Utils.innerHeight()-this.bordersOffset*2-_options.height)<0 ? Common.Utils.innerHeight()-this.bordersOffset*2: _options.height;
+            _options.cls += ' advanced-settings-dlg';
 
             this.template = [
                 '<div id="id-plugin-container" class="box" style="height:' + (_options.height-header_footer) + 'px;">',
                     '<div id="id-plugin-placeholder" style="width: 100%;height: 100%;"></div>',
                 '</div>',
-                '<% if (_.size(buttons) > 0) { %>',
+                '<% if ((typeof buttons !== "undefined") && _.size(buttons) > 0) { %>',
                     '<div class="separator horizontal"/>',
                     '<div class="footer" style="text-align: center;">',
                         '<% for(var bt in buttons) { %>',
@@ -326,6 +328,7 @@ define([
 
             this.boxEl = this.$window.find('.body > .box');
             this._headerFooterHeight = (this.options.buttons && _.size(this.options.buttons)>0) ? 85 : 34;
+            if (!this.options.header) this._headerFooterHeight -= 34;
             this._headerFooterHeight += ((parseInt(this.$window.css('border-top-width')) + parseInt(this.$window.css('border-bottom-width'))));
 
             var iframe = document.createElement("iframe");
@@ -353,6 +356,14 @@ define([
             this.on('resizing', function(args){
                 me.boxEl.css('height', parseInt(me.$window.css('height')) - me._headerFooterHeight);
             });
+
+            var onMainWindowResize = function(){
+                me.onWindowResize();
+            };
+            $(window).on('resize', onMainWindowResize);
+            this.on('close', function() {
+                $(window).off('resize', onMainWindowResize);
+            });
         },
 
         _onLoad: function() {
@@ -364,11 +375,12 @@ define([
         setInnerSize: function(width, height) {
             var maxHeight = Common.Utils.innerHeight(),
                 maxWidth = Common.Utils.innerWidth(),
-                borders_width = (parseInt(this.$window.css('border-left-width')) + parseInt(this.$window.css('border-right-width')));
+                borders_width = (parseInt(this.$window.css('border-left-width')) + parseInt(this.$window.css('border-right-width'))),
-            if (maxHeight<height + this._headerFooterHeight)
+                bordersOffset = this.bordersOffset*2;
-                height = maxHeight - this._headerFooterHeight;
+            if (maxHeight - bordersOffset<height + this._headerFooterHeight)
-            if (maxWidth<width + borders_width)
+                height = maxHeight - bordersOffset - this._headerFooterHeight;
-                width = maxWidth - borders_width;
+            if (maxWidth - bordersOffset<width + borders_width)
+                width = maxWidth - bordersOffset - borders_width;
 
             this.boxEl.css('height', height);
 
@@ -379,6 +391,35 @@ define([
             this.$window.css('top',((maxHeight - height - this._headerFooterHeight) / 2) * 0.9);
         },
 
+        onWindowResize: function() {
+            var main_width  = Common.Utils.innerWidth(),
+                main_height = Common.Utils.innerHeight(),
+                win_width = this.getWidth(),
+                win_height = this.getHeight(),
+                bordersOffset = (this.resizable) ? 0 : this.bordersOffset;
+            if (win_height<main_height-bordersOffset*2+0.1 && win_width<main_width-bordersOffset*2+0.1) {
+                var left = this.getLeft(),
+                    top = this.getTop();
+
+                if (top<bordersOffset) this.$window.css('top', bordersOffset);
+                else if (top+win_height>main_height-bordersOffset)
+                    this.$window.css('top', main_height-bordersOffset - win_height);
+                if (left<bordersOffset) this.$window.css('left', bordersOffset);
+                else if (left+win_width>main_width-bordersOffset)
+                    this.$window.css('left', main_width-bordersOffset-win_width);
+            } else {
+                if (win_height>main_height-bordersOffset*2) {
+                    this.setHeight(Math.max(main_height-bordersOffset*2, this.initConfig.minheight));
+                    this.boxEl.css('height', Math.max(main_height-bordersOffset*2, this.initConfig.minheight) - this._headerFooterHeight);
+                    this.$window.css('top', bordersOffset);
+                }
+                if (win_width>main_width-bordersOffset*2) {
+                    this.setWidth(Math.max(main_width-bordersOffset*2, this.initConfig.minwidth));
+                    this.$window.css('left', bordersOffset);
+                }
+            }
+        },
+
         textLoading : 'Loading'
     }, Common.Views.PluginDlg || {}));
 });

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

@@ -190,6 +190,16 @@
         -o-transition: none !important;
     }
 
+    &.plain {
+        border: none;
+        box-shadow: none;
+        border-radius: 0;
+
+        .body, .resize-border {
+            border-radius: 0 !important;
+        }
+    }
+
     .resize-border {
         position: absolute;
         width: 5px;

apps/documenteditor/embed/js/ApplicationController.js

@@ -313,7 +313,7 @@ var ApplicationController = new(function(){
     }
 
     function onEditorPermissions(params) {
-        if ( params.asc_getCanBranding() && (typeof config.customization == 'object') &&
+        if ( (params.asc_getLicenseType() === Asc.c_oLicenseResult.Success) && (typeof config.customization == 'object') &&
              config.customization && config.customization.logo ) {
 
             var logo = $('#header-logo');

apps/documenteditor/main/app.js

@@ -200,37 +200,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
-        var getUrlParams = function() {
+        reqerr = window.requireTimeourError();
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
-                    .replace(/'/g, ''')
-                    .replace(/</g, '&lt;')
-                    .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
-        else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
-        else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
-        else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
-        else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
-
         window.alert(reqerr);
         window.location.reload();
     }

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

@@ -287,13 +287,12 @@ define([
         },
 
         applySettings: function(menu) {
-            var value = Common.localStorage.getItem("de-settings-inputmode");
+            var value;
-            this.api.SetTextBoxInputMode(parseInt(value) == 1);
+            this.api.SetTextBoxInputMode(Common.localStorage.getBool("de-settings-inputmode"));
 
             /** coauthoring begin **/
             if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring) {
-                value = Common.localStorage.getItem("de-settings-coauthmode");
+                var fast_coauth = Common.localStorage.getBool("de-settings-coauthmode", true);
-                var fast_coauth = (value===null || parseInt(value) == 1);
                 this.api.asc_SetFastCollaborative(fast_coauth);
 
                 value = Common.localStorage.getItem((fast_coauth) ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict");
@@ -306,9 +305,7 @@ define([
                 this.api.SetCollaborativeMarksShowType(value);
             }
 
-            value = Common.localStorage.getItem("de-settings-livecomment");
+            (Common.localStorage.getBool("de-settings-livecomment", true)) ? this.api.asc_showComments(Common.localStorage.getBool("de-settings-resolvedcomment", true)) : this.api.asc_hideComments();
-            var resolved = Common.localStorage.getItem("de-settings-resolvedcomment");
-            (!(value!==null && parseInt(value) == 0)) ? this.api.asc_showComments(!(resolved!==null && parseInt(resolved) == 0)) : this.api.asc_hideComments();
             /** coauthoring end **/
 
             value = Common.localStorage.getItem("de-settings-fontrender");
@@ -325,8 +322,7 @@ define([
                 this.api.asc_setSpellCheck(Common.localStorage.getBool("de-settings-spellcheck", true));
             }
 
-            value = Common.localStorage.getItem("de-settings-showsnaplines");
+            this.api.put_ShowSnapLines(Common.localStorage.getBool("de-settings-showsnaplines", true));
-            this.api.put_ShowSnapLines(value===null || parseInt(value) == 1);
 
             menu.hide();
         },
@@ -517,12 +513,10 @@ define([
         },
 
         commentsShowHide: function(mode) {
-            var value = Common.localStorage.getItem("de-settings-livecomment"),
+            var value = Common.localStorage.getBool("de-settings-livecomment", true),
-                resolved = Common.localStorage.getItem("de-settings-resolvedcomment");
+                resolved = Common.localStorage.getBool("de-settings-resolvedcomment", true);
-            value = (value!==null && parseInt(value) == 0);
+            if (!value || !resolved) {
-            resolved = (resolved!==null && parseInt(resolved) == 0);
+                (mode === 'show') ? this.api.asc_showComments(true) : ((value) ? this.api.asc_showComments(resolved) : this.api.asc_hideComments());
-            if (value || resolved) {
-                (mode === 'show') ? this.api.asc_showComments(true) : ((!value) ? this.api.asc_showComments(!resolved) : this.api.asc_hideComments());
             }
 
             if (mode === 'show') {
@@ -543,7 +537,7 @@ define([
                 if ( state == 'show' )
                     this.dlgSearch.suspendKeyEvents();
                 else
-                    Common.Utils.asyncCall(this.dlgSearch.resumeKeyEvents);
+                    Common.Utils.asyncCall(this.dlgSearch.resumeKeyEvents, this.dlgSearch);
             }
         },
 

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

@@ -107,6 +107,7 @@ define([
 
                 this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false};
                 this.languages = null;
+                this.translationTable = [];
                 // Initialize viewport
 
                 if (!Common.Utils.isBrowserSupported()){
@@ -122,8 +123,23 @@ define([
                 // Initialize api
 
                 window["flat_desine"] = true;
+
+                var styleNames = ['Normal', 'No Spacing', 'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Heading 5',
+                                  'Heading 6', 'Heading 7', 'Heading 8', 'Heading 9', 'Title', 'Subtitle', 'Quote', 'Intense Quote', 'List Paragraph'],
+                    translate = {
+                        'Series': this.txtSeries,
+                        'Diagram Title': this.txtDiagramTitle,
+                        'X Axis': this.txtXAxis,
+                        'Y Axis': this.txtYAxis,
+                        'Your text here': this.txtArt
+                    };
+                styleNames.forEach(function(item){
+                    translate[item] = me.translationTable[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
+                });
+
                 this.api = new Asc.asc_docs_api({
-                    'id-view'  : 'editor_sdk'
+                    'id-view'  : 'editor_sdk',
+                    'translate': translate
                 });
 
                 if (this.api){
@@ -735,10 +751,8 @@ define([
                 me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
 
                 /** coauthoring begin **/
-                value = Common.localStorage.getItem("de-settings-livecomment");
+                this.isLiveCommenting = Common.localStorage.getBool("de-settings-livecomment", true);
-                this.isLiveCommenting = !(value!==null && parseInt(value) == 0);
+                this.isLiveCommenting ? this.api.asc_showComments(Common.localStorage.getBool("de-settings-resolvedcomment", true)) : this.api.asc_hideComments();
-                var resolved = Common.localStorage.getItem("de-settings-resolvedcomment");
-                this.isLiveCommenting ? this.api.asc_showComments(!(resolved!==null && parseInt(resolved) == 0)) : this.api.asc_hideComments();
                 /** coauthoring end **/
 
                 value = Common.localStorage.getItem("de-settings-zoom");
@@ -782,7 +796,7 @@ define([
                 /** coauthoring begin **/
                 if (me.appOptions.isEdit && !me.appOptions.isOffline && me.appOptions.canCoAuthoring) {
                     value = Common.localStorage.getItem("de-settings-coauthmode");
-                    if (value===null && Common.localStorage.getItem("de-settings-autosave")===null &&
+                    if (value===null && !Common.localStorage.itemExists("de-settings-autosave") &&
                         me.appOptions.customization && me.appOptions.customization.autosave===false) {
                         value = 0; // use customization.autosave only when de-settings-coauthmode and de-settings-autosave are null
                     }
@@ -848,8 +862,7 @@ define([
                     me.api.asc_setAutoSaveGap(value);
 
                     if (me.appOptions.canForcesave) {// use asc_setIsForceSaveOnUserSave only when customization->forcesave = true
-                        value = Common.localStorage.getItem("de-settings-forcesave");
+                        me.appOptions.forcesave = Common.localStorage.getBool("de-settings-forcesave", me.appOptions.canForcesave);
-                        me.appOptions.forcesave = (value===null) ? me.appOptions.canForcesave : (parseInt(value)==1);
                         me.api.asc_setIsForceSaveOnUserSave(me.appOptions.forcesave);
                     }
 
@@ -1049,19 +1062,6 @@ define([
 
                 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();
-                    translateChart.asc_setTitle(this.txtDiagramTitle);
-                    translateChart.asc_setXAxis(this.txtXAxis);
-                    translateChart.asc_setYAxis(this.txtYAxis);
-                    translateChart.asc_setSeries(this.txtSeries);
-                    this.api.asc_setChartTranslate(translateChart);
-
-                    var translateArt = new Asc.asc_TextArtTranslate();
-                    translateArt.asc_setDefaultText(this.txtArt);
-                    this.api.asc_setTextArtTranslate(translateArt);
-                }
             },
 
             applyModeEditorElements: function() {
@@ -1750,8 +1750,7 @@ define([
             },
 
             onTryUndoInFastCollaborative: function() {
-                var val = window.localStorage.getItem("de-hide-try-undoredo");
+                if (!window.localStorage.getBool("de-hide-try-undoredo"))
-                if (!(val && parseInt(val) == 1))
                     Common.UI.info({
                         width: 500,
                         msg: this.textTryUndoRedo,
@@ -1785,15 +1784,13 @@ define([
 
             applySettings: function() {
                 if (this.appOptions.isEdit && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) {
-                    var value = Common.localStorage.getItem("de-settings-coauthmode"),
+                    var oldval = this._state.fastCoauth;
-                        oldval = this._state.fastCoauth;
+                    this._state.fastCoauth = Common.localStorage.getBool("de-settings-coauthmode", true);
-                    this._state.fastCoauth = (value===null || parseInt(value) == 1);
                     if (this._state.fastCoauth && !oldval)
                         this.synchronizeChanges();
                 }
                 if (this.appOptions.canForcesave) {
-                    value = Common.localStorage.getItem("de-settings-forcesave");
+                    this.appOptions.forcesave = Common.localStorage.getBool("de-settings-forcesave", this.appOptions.canForcesave);
-                    this.appOptions.forcesave = (value===null) ? this.appOptions.canForcesave : (parseInt(value)==1);
                     this.api.asc_setIsForceSaveOnUserSave(this.appOptions.forcesave);
                 }
             },
@@ -1946,6 +1943,7 @@ define([
                                     isViewer: itemVar.isViewer,
                                     EditorsSupport: itemVar.EditorsSupport,
                                     isVisual: itemVar.isVisual,
+                                    isCustomWindow: itemVar.isCustomWindow,
                                     isModal: itemVar.isModal,
                                     isInsideMode: itemVar.isInsideMode,
                                     initDataType: itemVar.initDataType,
@@ -2094,7 +2092,23 @@ define([
             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.',
-            errorBadImageUrl: 'Image url is incorrect'
+            errorBadImageUrl: 'Image url is incorrect',
+            txtStyle_Normal: 'Normal',
+            txtStyle_No_Spacing: 'No Spacing',
+            txtStyle_Heading_1: 'Heading 1',
+            txtStyle_Heading_2: 'Heading 2',
+            txtStyle_Heading_3: 'Heading 3',
+            txtStyle_Heading_4: 'Heading 4',
+            txtStyle_Heading_5: 'Heading 5',
+            txtStyle_Heading_6: 'Heading 6',
+            txtStyle_Heading_7: 'Heading 7',
+            txtStyle_Heading_8: 'Heading 8',
+            txtStyle_Heading_9: 'Heading 9',
+            txtStyle_Title: 'Title',
+            txtStyle_Subtitle: 'Subtitle',
+            txtStyle_Quote: 'Quote',
+            txtStyle_Intense_Quote: 'Intense Quote',
+            txtStyle_List_Paragraph: 'List Paragraph'
         }
     })(), DE.Controllers.Main || {}))
 });

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

@@ -55,7 +55,8 @@ define([
     'documenteditor/main/app/view/PageMarginsDialog',
     'documenteditor/main/app/view/PageSizeDialog',
     'documenteditor/main/app/view/NoteSettingsDialog',
-    'documenteditor/main/app/controller/PageLayout'
+    'documenteditor/main/app/controller/PageLayout',
+    'documenteditor/main/app/view/CustomColumnsDialog'
 ], function () {
     'use strict';
 
@@ -720,6 +721,10 @@ define([
             if (need_disable !== toolbar.btnNotes.isDisabled())
                 toolbar.btnNotes.setDisabled(need_disable);
 
+            need_disable = paragraph_locked || header_locked || in_image;
+            if (need_disable != toolbar.btnColumns.isDisabled())
+                toolbar.btnColumns.setDisabled(need_disable);
+
             if (toolbar.listStylesAdditionalMenuItem && (frame_pr===undefined) !== toolbar.listStylesAdditionalMenuItem.isDisabled())
                 toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined);
 
@@ -1621,7 +1626,23 @@ define([
                 return;
 
             this._state.columns = undefined;
-            if (this.api && item.checked) {
+
+            if (this.api) {
+                if (item.value == 'advanced') {
+                    var win, props = this.api.asc_GetSectionProps(),
+                        me = this;
+                    win = new DE.Views.CustomColumnsDialog({
+                        handler: function(dlg, result) {
+                            if (result == 'ok') {
+                                props = dlg.getSettings();
+                                me.api.asc_SetColumnsProps(props);
+                                Common.NotificationCenter.trigger('edit:complete', me.toolbar);
+                            }
+                        }
+                    });
+                    win.show();
+                    win.setSettings(me.api.asc_GetColumnsProps());
+                } else if (item.checked) {
                     var props = new Asc.CDocumentColumnsProps(),
                         cols = item.value,
                         def_space = 12.5;
@@ -1639,6 +1660,7 @@ define([
                     }
                     this.api.asc_SetColumnsProps(props);
                 }
+            }
 
             Common.NotificationCenter.trigger('edit:complete', this.toolbar);
             Common.component.Analytics.trackEvent('ToolBar', 'Insert Columns');
@@ -1883,9 +1905,10 @@ define([
                     Common.NotificationCenter.trigger('edit:complete', me.toolbar);
                 };
 
-                var formats = [];
+                var formats = [],
+                    mainController = me.getApplication().getController('Main');
                 _.each(window.styles.get_MergedStyles(), function (style) {
-                    formats.push({value: style, displayValue: style.get_Name()})
+                    formats.push({value: style, displayValue: mainController.translationTable[style.get_Name()] || style.get_Name()})
                 });
 
                 win = new DE.Views.StyleTitleDialog({
@@ -2601,11 +2624,12 @@ define([
 
             listStyles.menuPicker.store.reset([]); // remove all
 
+            var mainController = this.getApplication().getController('Main');
             _.each(styles.get_MergedStyles(), function(style){
                 listStyles.menuPicker.store.add({
                     imageUrl: style.asc_getImage(),
                     title   : style.get_Name(),
-                    tip     : style.get_Name(),
+                    tip     : mainController.translationTable[style.get_Name()] || style.get_Name(),
                     id      : Common.UI.getId()
                 });
             });

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

@@ -0,0 +1,178 @@
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2017
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+*/
+/**
+ *  CustomColumnsDialog.js
+ *
+ *  Created by Julia Radzhabova on 6/23/17
+ *  Copyright (c) 2017 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'common/main/lib/component/Window',
+    'common/main/lib/component/MetricSpinner',
+    'common/main/lib/component/CheckBox'
+], function () { 'use strict';
+
+    DE.Views.CustomColumnsDialog = Common.UI.Window.extend(_.extend({
+        options: {
+            width: 300,
+            header: true,
+            style: 'min-width: 216px;',
+            cls: 'modal-dlg'
+        },
+
+        initialize : function(options) {
+            _.extend(this.options, {
+                title: this.textTitle
+            }, options || {});
+
+            this.template = [
+                '<div class="box" style="height: 90px;">',
+                    '<div class="input-row" style="margin: 10px 0;">',
+                        '<label class="input-label">' + this.textColumns + '</label><div id="custom-columns-spin-num" style="float: right;"></div>',
+                    '</div>',
+                    '<div class="input-row" style="margin: 10px 0;">',
+                        '<label class="input-label">' + this.textSpacing + '</label><div id="custom-columns-spin-spacing" style="float: right;"></div>',
+                    '</div>',
+                    '<div class="input-row" style="margin: 10px 0;">',
+                        '<div id="custom-columns-separator"></div>',
+                    '</div>',
+                '</div>',
+                '<div class="separator horizontal"/>',
+                '<div class="footer center">',
+                    '<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px;">' + this.okButtonText + '</button>',
+                    '<button class="btn normal dlg-btn" result="cancel">' + this.cancelButtonText + '</button>',
+                '</div>'
+            ].join('');
+
+            this.options.tpl = _.template(this.template)(this.options);
+
+            this.spinners = [];
+            this._noApply = false;
+
+            Common.UI.Window.prototype.initialize.call(this, this.options);
+        },
+
+        render: function() {
+            Common.UI.Window.prototype.render.call(this);
+
+            this.spnColumns = new Common.UI.MetricSpinner({
+                el: $('#custom-columns-spin-num'),
+                step: 1,
+                allowDecimal: false,
+                width: 100,
+                defaultUnit : "",
+                value: '1',
+                maxValue: 12,
+                minValue: 1
+            });
+
+            this.spnSpacing = new Common.UI.MetricSpinner({
+                el: $('#custom-columns-spin-spacing'),
+                step: .1,
+                width: 100,
+                defaultUnit : "cm",
+                value: '0 cm',
+                maxValue: 40.64,
+                minValue: 0
+            });
+            this.spinners.push(this.spnSpacing);
+
+            this.chSeparator = new Common.UI.CheckBox({
+                el: $('#custom-columns-separator'),
+                labelText: this.textSeparator
+            });
+
+            this.getChild().find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+
+            this.updateMetricUnit();
+        },
+
+        _handleInput: function(state) {
+            if (this.options.handler) {
+                this.options.handler.call(this, this, state);
+            }
+
+            this.close();
+        },
+
+        onBtnClick: function(event) {
+            this._handleInput(event.currentTarget.attributes['result'].value);
+        },
+
+        onPrimary: function() {
+            this._handleInput('ok');
+            return false;
+        },
+
+        setSettings: function (props) {
+            if (props) {
+                var equal = props.get_EqualWidth(),
+                    num = (equal) ? props.get_Num() : props.get_ColsCount(),
+                    space = (equal) ? props.get_Space() : (num>1 ? props.get_Col(0).get_Space() : 12.5);
+
+                this.spnColumns.setValue(num, true);
+                this.spnSpacing.setValue(Common.Utils.Metric.fnRecalcFromMM(space), true);
+                this.chSeparator.setValue(props.get_Sep());
+            }
+        },
+
+        getSettings: function() {
+            var props = new Asc.CDocumentColumnsProps();
+            props.put_EqualWidth(true);
+            props.put_Num(this.spnColumns.getNumberValue());
+            props.put_Space(Common.Utils.Metric.fnRecalcToMM(this.spnSpacing.getNumberValue()));
+            props.put_Sep(this.chSeparator.getValue()=='checked');
+            return props;
+        },
+
+        updateMetricUnit: function() {
+            if (this.spinners) {
+                for (var i=0; i<this.spinners.length; i++) {
+                    var spinner = this.spinners[i];
+                    spinner.setDefaultUnit(Common.Utils.Metric.getCurrentMetricName());
+                    spinner.setStep(Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt ? 1 : 0.1);
+                }
+            }
+
+        },
+
+        textTitle: 'Columns',
+        textSpacing: 'Spacing between columns',
+        textColumns: 'Number of columns',
+        textSeparator: 'Column divider',
+        cancelButtonText:   'Cancel',
+        okButtonText:       'Ok'
+    }, DE.Views.CustomColumnsDialog || {}))
+});

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

@@ -1587,10 +1587,6 @@ define([
 
         onApiParagraphStyleChange: function(name) {
             window.currentStyleName = name;
-            var menuStyleUpdate = this.menuStyleUpdate;
-            if (menuStyleUpdate != undefined) {
-                menuStyleUpdate.setCaption(this.updateStyleText.replace('%1', window.currentStyleName));
-            }
         },
 
         _applyTableWrap: function(wrap, align){
@@ -3165,6 +3161,9 @@ define([
 
                     menuStyleSeparator.setVisible(me.mode.canEditStyles && !isInChart);
                     menuStyle.setVisible(me.mode.canEditStyles && !isInChart);
+                    if (me.mode.canEditStyles && !isInChart) {
+                        me.menuStyleUpdate.setCaption(me.updateStyleText.replace('%1', DE.getController('Main').translationTable[window.currentStyleName] || window.currentStyleName));
+                    }
                 },
                 items: [
                     me.menuSpellPara,

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

@@ -350,14 +350,11 @@ define([
             this.cmbZoom.setValue(item ? parseInt(item.get('value')) : (value>0 ? value+'%' : 100));
 
             /** coauthoring begin **/
-            value = Common.localStorage.getItem("de-settings-livecomment");
+            this.chLiveComment.setValue(Common.localStorage.getBool("de-settings-livecomment", true));
-            this.chLiveComment.setValue(!(value!==null && parseInt(value) == 0));
+            this.chResolvedComment.setValue(Common.localStorage.getBool("de-settings-resolvedcomment", true));
-
-            value = Common.localStorage.getItem("de-settings-resolvedcomment");
-            this.chResolvedComment.setValue(!(value!==null && parseInt(value) == 0));
 
             value = Common.localStorage.getItem("de-settings-coauthmode");
-            if (value===null && Common.localStorage.getItem("de-settings-autosave")===null &&
+            if (value===null && !Common.localStorage.itemExists("de-settings-autosave") &&
                 this.mode.customization && this.mode.customization.autosave===false)
                 value = 0; // use customization.autosave only when de-settings-coauthmode and de-settings-autosave are null
             var fast_coauth = (value===null || parseInt(value) == 1) && !(this.mode.isDesktopApp && this.mode.isOffline) && this.mode.canCoAuthoring;
@@ -387,16 +384,11 @@ define([
                 value = 0;
             this.chAutosave.setValue(fast_coauth || (value===null ? this.mode.canCoAuthoring : parseInt(value) == 1));
 
-            if (this.mode.canForcesave) {
+            if (this.mode.canForcesave)
-                value = Common.localStorage.getItem("de-settings-forcesave");
+                this.chForcesave.setValue(Common.localStorage.getBool("de-settings-forcesave", this.mode.canForcesave));
-                value = (value === null) ? this.mode.canForcesave : (parseInt(value) == 1);
-                this.chForcesave.setValue(value);
-            }
 
             this.chSpell.setValue(Common.localStorage.getBool("de-settings-spellcheck", true));
-
+            this.chAlignGuides.setValue(Common.localStorage.getBool("de-settings-showsnaplines", true));
-            value = Common.localStorage.getItem("de-settings-showsnaplines");
-            this.chAlignGuides.setValue(value===null || parseInt(value) == 1);
         },
 
         applySettings: function() {

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

@@ -136,6 +136,7 @@ define([
             this.btnChat.hide();
 
             this.btnComments.on('click',        _.bind(this.onBtnMenuClick, this));
+            this.btnComments.on('toggle',       _.bind(this.onBtnCommentsToggle, this));
             this.btnChat.on('click',            _.bind(this.onBtnMenuClick, this));
             /** coauthoring end **/
 
@@ -174,6 +175,11 @@ define([
                 Common.NotificationCenter.trigger('layout:changed', 'leftmenu');
         },
 
+        onBtnCommentsToggle: function(btn, state) {
+            if (!state)
+                this.fireEvent('comments:hide', this);
+        },
+
         onBtnMenuClick: function(btn, e) {
             this.supressEvents = true;
             this.btnAbout.toggle(false);

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

@@ -648,7 +648,9 @@ define([
                                 checkable: true,
                                 toggleGroup: 'menuColumns',
                                 value: 4
-                            }
+                            },
+                            { caption: '--' },
+                            { caption: this.textColumnsCustom, value: 'advanced' }
                         ]
                     })
                 });
@@ -2486,7 +2488,8 @@ define([
             capImgForward: 'Move forward',
             capImgBackward: 'Move backward',
             capImgWrapping: 'Wrapping',
-            capBtnComment: 'Comment'
+            capBtnComment: 'Comment',
+            textColumnsCustom: 'Custom Columns'
         }
     })(), DE.Views.Toolbar || {}));
 });

apps/documenteditor/main/app_dev.js

@@ -191,37 +191,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
-        var getUrlParams = function() {
+        reqerr = window.requireTimeourError();
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
-                    .replace(/'/g, ''')
-                    .replace(/</g, '&lt;')
-                    .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
-        else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
-        else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
-        else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
-        else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
-
         window.alert(reqerr);
         window.location.reload();
     }

apps/documenteditor/main/index.html

@@ -283,6 +283,18 @@
         window.sdk_dev_scrpipts.forEach(function(item){
             document.write('<script type="text/javascript" src="' + item + '"><\/script>');
         });
+
+        window.requireTimeourError = function(){
+            var reqerr;
+
+            if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
+            else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
+            else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
+            else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+            else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
+
+            return reqerr;
+        };
     </script>
     <!-- application -->
     <script data-main="app_dev" src="../../../vendor/requirejs/require.js"></script>

apps/documenteditor/main/index.html.deploy

@@ -254,8 +254,28 @@
                 '</div>' +
             '</div>');
 
+        window.requireTimeourError = function(){
+            var reqerr;
+
+            if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
+            else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
+            else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
+            else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+            else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
+
+            return reqerr;
+        };
+
+        var requireTimeoutID = setTimeout(function(){
+            window.alert(window.requireTimeourError());
+            window.location.reload();
+        }, 30000);
+
         var require = {
-            waitSeconds: 30 
+            waitSeconds: 30,
+            callback: function(){
+                clearTimeout(requireTimeoutID);
+            }
         };
     </script>
 

apps/documenteditor/main/locale/de.json

@@ -677,11 +677,9 @@
   "DE.Views.DocumentHolder.advancedText": "Erweiterte Einstellungen",
   "DE.Views.DocumentHolder.alignmentText": "Ausrichtung",
   "DE.Views.DocumentHolder.belowText": "Unten",
-  "DE.Views.DocumentHolder.bottomCellText": "Unten ausrichten",
   "DE.Views.DocumentHolder.breakBeforeText": "Seitenumbruch oberhalb",
   "DE.Views.DocumentHolder.cellAlignText": "Vertikale Ausrichtung in Zellen",
   "DE.Views.DocumentHolder.cellText": "Zelle",
-  "DE.Views.DocumentHolder.centerCellText": "Zentriert ausrichten",
   "DE.Views.DocumentHolder.centerText": "Zentriert",
   "DE.Views.DocumentHolder.chartText": "Erweiterte Einstellungen des Diagramms",
   "DE.Views.DocumentHolder.columnText": "Spalte",
@@ -753,9 +751,9 @@
   "DE.Views.DocumentHolder.textShapeAlignMiddle": "Mittig ausrichten",
   "DE.Views.DocumentHolder.textShapeAlignRight": "Rechtsbündig ausrichten",
   "DE.Views.DocumentHolder.textShapeAlignTop": "Oben ausrichten",
+  "DE.Views.DocumentHolder.textUndo": "Undo",
   "DE.Views.DocumentHolder.textWrap": "Textumbruch",
   "DE.Views.DocumentHolder.tipIsLocked": "Dieses Element wird gerade von einem anderen Benutzer bearbeitet.",
-  "DE.Views.DocumentHolder.topCellText": "Oben ausrichten",
   "DE.Views.DocumentHolder.txtAddBottom": "Unterer Rand hinzufügen",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Bruchstrich hinzufügen",
   "DE.Views.DocumentHolder.txtAddHor": "Horizontale Linie einfügen",

apps/documenteditor/main/locale/en.json

@@ -331,6 +331,22 @@
   "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.txtStyle_Normal": "Normal",
+  "DE.Controllers.Main.txtStyle_No_Spacing": "No Spacing",
+  "DE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
+  "DE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
+  "DE.Controllers.Main.txtStyle_Heading_3": "Heading 3",
+  "DE.Controllers.Main.txtStyle_Heading_4": "Heading 4",
+  "DE.Controllers.Main.txtStyle_Heading_5": "Heading 5",
+  "DE.Controllers.Main.txtStyle_Heading_6": "Heading 6",
+  "DE.Controllers.Main.txtStyle_Heading_7": "Heading 7",
+  "DE.Controllers.Main.txtStyle_Heading_8": "Heading 8",
+  "DE.Controllers.Main.txtStyle_Heading_9": "Heading 9",
+  "DE.Controllers.Main.txtStyle_Title": "Title",
+  "DE.Controllers.Main.txtStyle_Subtitle": "Subtitle",
+  "DE.Controllers.Main.txtStyle_Quote": "Quote",
+  "DE.Controllers.Main.txtStyle_Intense_Quote": "Intense Quote",
+  "DE.Controllers.Main.txtStyle_List_Paragraph": "List Paragraph",
   "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
   "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
   "DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
@@ -696,6 +712,12 @@
   "DE.Views.ChartSettings.txtTight": "Tight",
   "DE.Views.ChartSettings.txtTitle": "Chart",
   "DE.Views.ChartSettings.txtTopAndBottom": "Top and bottom",
+  "DE.Views.CustomColumnsDialog.textTitle": "Columns",
+  "DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns",
+  "DE.Views.CustomColumnsDialog.textColumns": "Number of columns",
+  "DE.Views.CustomColumnsDialog.textSeparator": "Column divider",
+  "DE.Views.CustomColumnsDialog.cancelButtonText": "Cancel",
+  "DE.Views.CustomColumnsDialog.okButtonText": "Ok",
   "DE.Views.DocumentHolder.aboveText": "Above",
   "DE.Views.DocumentHolder.addCommentText": "Add Comment",
   "DE.Views.DocumentHolder.advancedFrameText": "Frame Advanced Settings",
@@ -704,11 +726,9 @@
   "DE.Views.DocumentHolder.advancedText": "Advanced Settings",
   "DE.Views.DocumentHolder.alignmentText": "Alignment",
   "DE.Views.DocumentHolder.belowText": "Below",
-  "del_DE.Views.DocumentHolder.bottomCellText": "Align Bottom",
   "DE.Views.DocumentHolder.breakBeforeText": "Page break before",
   "DE.Views.DocumentHolder.cellAlignText": "Cell Vertical Alignment",
   "DE.Views.DocumentHolder.cellText": "Cell",
-  "del_DE.Views.DocumentHolder.centerCellText": "Align Center",
   "DE.Views.DocumentHolder.centerText": "Center",
   "DE.Views.DocumentHolder.chartText": "Chart Advanced Settings",
   "DE.Views.DocumentHolder.columnText": "Column",
@@ -782,7 +802,6 @@
   "DE.Views.DocumentHolder.textShapeAlignTop": "Align Top",
   "DE.Views.DocumentHolder.textWrap": "Wrapping Style",
   "DE.Views.DocumentHolder.tipIsLocked": "This element is currently being edited by another user.",
-  "del_DE.Views.DocumentHolder.topCellText": "Align Top",
   "DE.Views.DocumentHolder.txtAddBottom": "Add bottom border",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar",
   "DE.Views.DocumentHolder.txtAddHor": "Add horizontal line",
@@ -1657,5 +1676,6 @@
   "DE.Views.Toolbar.textTabHome": "Home",
   "DE.Views.Toolbar.textTabInsert": "Insert",
   "DE.Views.Toolbar.textTabLayout": "Page Layout",
-  "DE.Views.Toolbar.textTabReview": "Review"
+  "DE.Views.Toolbar.textTabReview": "Review",
+  "DE.Views.Toolbar.textColumnsCustom": "Custom Columns"
 }

apps/documenteditor/main/locale/es.json

@@ -141,7 +141,6 @@
   "Common.Views.ExternalMergeEditor.textTitle": "Receptores de Fusión de Correo",
   "Common.Views.Header.openNewTabText": "Abrir en pestaña nueva",
   "Common.Views.Header.textBack": "Ir a Documentos",
-  "Common.Views.Header.txtHeaderDeveloper": "MODO DE DESARROLLO",
   "Common.Views.Header.txtRename": "Renombrar",
   "Common.Views.History.textCloseHistory": "Cerrar historial",
   "Common.Views.History.textHide": "Plegar",
@@ -162,6 +161,9 @@
   "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.LanguageDialog.btnCancel": "Cancel",
+  "Common.Views.LanguageDialog.btnOk": "Ok",
+  "Common.Views.LanguageDialog.labelSelect": "Select document language",
   "Common.Views.OpenDialog.cancelButtonText": "Cancelar",
   "Common.Views.OpenDialog.okButtonText": "Aceptar",
   "Common.Views.OpenDialog.txtEncoding": "Codificación",
@@ -206,8 +208,9 @@
   "DE.Controllers.Main.downloadTextText": "Cargando documento...",
   "DE.Controllers.Main.downloadTitleText": "Cargando documento",
   "DE.Controllers.Main.errorAccessDeny": "Usted no tiene permisos para realizar la acción que está intentando hacer.<br> Por favor, contacte con el Administrador del Servidor de Documentos.",
+  "DE.Controllers.Main.errorBadImageUrl": "URL de imagen es incorrecto",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Se ha perdido la conexión con servidor. El documento no puede ser editado ahora.",
-  "DE.Controllers.Main.errorConnectToServer": "No se pudo guardar el documento. Por favor, compruebe la configuración de conexión o póngase en contacto con el administrador.<br>Al hacer clic en el botón \"Aceptar\", se le pedirá que descargue el documento.<br> Encuentre más información acerca de la conexión Servidor de Documentos<a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
+  "DE.Controllers.Main.errorConnectToServer": "No se pudo guardar el documento. Por favor, compruebe la configuración de conexión o póngase en contacto con el administrador.<br>Al hacer clic en el botón \"Aceptar\", se le pedirá que descargue el documento.<br> Encuentre más información acerca de la conexión Servidor de Documentos<a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">aquí</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Error externo.<br>Error de conexión de base de datos. Por favor póngase en contacto con soporte si el error se mantiene.",
   "DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.",
   "DE.Controllers.Main.errorDefaultMessage": "Código de error: %1",
@@ -262,10 +265,12 @@
   "DE.Controllers.Main.splitMaxRowsErrorText": "El número de filas debe ser menos que %1.",
   "DE.Controllers.Main.textAnonymous": "Anónimo",
   "DE.Controllers.Main.textBuyNow": "Visitar sitio web",
+  "DE.Controllers.Main.textChangesSaved": "Todos los cambios son guardados",
   "DE.Controllers.Main.textCloseTip": "Pulse para cerrar el consejo",
   "DE.Controllers.Main.textContactUs": "Contactar con equipo de ventas",
   "DE.Controllers.Main.textLoadingDocument": "Cargando documento",
   "DE.Controllers.Main.textNoLicenseTitle": "Versión de código abierto de ONLYOFFICE",
+  "DE.Controllers.Main.textShape": "Forma",
   "DE.Controllers.Main.textStrict": "Modo estricto",
   "DE.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.",
   "DE.Controllers.Main.titleLicenseExp": "Licencia ha expirado",
@@ -649,7 +654,7 @@
   "DE.Views.ChartSettings.textLine": "Línea",
   "DE.Views.ChartSettings.textOriginalSize": "Tamaño Predeterminado",
   "DE.Views.ChartSettings.textPie": "Gráfico circular",
-  "DE.Views.ChartSettings.textPoint": "Gráfico de Punto",
+  "DE.Views.ChartSettings.textPoint": "XY (Dispersión)",
   "DE.Views.ChartSettings.textSize": "Tamaño",
   "DE.Views.ChartSettings.textStock": "De cotizaciones",
   "DE.Views.ChartSettings.textStyle": "Estilo",
@@ -672,11 +677,9 @@
   "DE.Views.DocumentHolder.advancedText": "Ajustes avanzados",
   "DE.Views.DocumentHolder.alignmentText": "Alineación",
   "DE.Views.DocumentHolder.belowText": "Abajo",
-  "DE.Views.DocumentHolder.bottomCellText": "Alinear en la parte inferior",
   "DE.Views.DocumentHolder.breakBeforeText": "Salto de página antes",
   "DE.Views.DocumentHolder.cellAlignText": "Alineación vertical de celda",
   "DE.Views.DocumentHolder.cellText": "Celda",
-  "DE.Views.DocumentHolder.centerCellText": "Alinear al centro",
   "DE.Views.DocumentHolder.centerText": "Al centro",
   "DE.Views.DocumentHolder.chartText": "Ajustes avanzados de gráfico",
   "DE.Views.DocumentHolder.columnText": "Columna",
@@ -748,9 +751,9 @@
   "DE.Views.DocumentHolder.textShapeAlignMiddle": "Alinear al medio",
   "DE.Views.DocumentHolder.textShapeAlignRight": "Alinear a la derecha",
   "DE.Views.DocumentHolder.textShapeAlignTop": "Alinear en la parte superior",
+  "DE.Views.DocumentHolder.textUndo": "Undo",
   "DE.Views.DocumentHolder.textWrap": "Ajuste de texto",
   "DE.Views.DocumentHolder.tipIsLocked": "Otro usuario está editando este elemento ahora.",
-  "DE.Views.DocumentHolder.topCellText": "Alinear en la parte superior",
   "DE.Views.DocumentHolder.txtAddBottom": "Add bottom border",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Añadir barra de fracción",
   "DE.Views.DocumentHolder.txtAddHor": "Añadir línea horizontal",
@@ -801,6 +804,7 @@
   "DE.Views.DocumentHolder.txtInsertBreak": "Insertar grieta manual",
   "DE.Views.DocumentHolder.txtInsertEqAfter": "Insertar la ecuación después de",
   "DE.Views.DocumentHolder.txtInsertEqBefore": "Insertar la ecuación antes de",
+  "DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
   "DE.Views.DocumentHolder.txtLimitChange": "Cambiar ubicación de límites",
   "DE.Views.DocumentHolder.txtLimitOver": "Límite sobre el texto",
   "DE.Views.DocumentHolder.txtLimitUnder": "Límite debajo del texto",
@@ -923,8 +927,10 @@
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Usted tendrá que aceptar los cambios antes de poder verlos",
   "DE.Views.FileMenuPanels.Settings.strFast": "rápido",
   "DE.Views.FileMenuPanels.Settings.strFontRender": "Hinting",
+  "DE.Views.FileMenuPanels.Settings.strForcesave": "Siempre guardar en el servidor (de lo contrario guardar en el servidor al cerrar documento)",
   "DE.Views.FileMenuPanels.Settings.strInputMode": "Activar jeroglíficos",
   "DE.Views.FileMenuPanels.Settings.strLiveComment": "Activar opción de demostración de comentarios",
+  "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Turn on display of the resolved comments",
   "DE.Views.FileMenuPanels.Settings.strShowChanges": "Cambios de colaboración en tiempo real",
   "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Activar corrección ortográfica",
   "DE.Views.FileMenuPanels.Settings.strStrict": "Estricto",
@@ -938,6 +944,7 @@
   "DE.Views.FileMenuPanels.Settings.textAutoRecover": "Autorrecuperación",
   "DE.Views.FileMenuPanels.Settings.textAutoSave": "Guardar automáticamente",
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Desactivado",
+  "DE.Views.FileMenuPanels.Settings.textForceSave": "Guardar al Servidor",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Cada minuto",
   "DE.Views.FileMenuPanels.Settings.txtAll": "Ver todo",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Centímetro",
@@ -1070,6 +1077,7 @@
   "DE.Views.LeftMenu.tipSearch": "Búsqueda",
   "DE.Views.LeftMenu.tipSupport": "Feedback y Soporte",
   "DE.Views.LeftMenu.tipTitles": "Títulos",
+  "DE.Views.LeftMenu.txtDeveloper": "MODO DE DESARROLLO",
   "DE.Views.MailMergeEmailDlg.cancelButtonText": "Cancelar",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Enviar",
@@ -1282,9 +1290,6 @@
   "DE.Views.ShapeSettings.txtTopAndBottom": "Superior e inferior",
   "DE.Views.ShapeSettings.txtWood": "Madera",
   "DE.Views.Statusbar.goToPageText": "Ir a página",
-  "DE.Views.Statusbar.LanguageDialog.btnCancel": "Cancelar",
-  "DE.Views.Statusbar.LanguageDialog.btnOk": "Aceptar",
-  "DE.Views.Statusbar.LanguageDialog.labelSelect": "Seleccione el idioma de documento",
   "DE.Views.Statusbar.pageIndexText": "Página {0} de {1}",
   "DE.Views.Statusbar.textChangesPanel": "Panel de cambios",
   "DE.Views.Statusbar.textTrackChanges": "Cambio de pista",
@@ -1342,7 +1347,7 @@
   "DE.Views.TableSettings.textSelectBorders": "Seleccione bordes que usted desea cambiar aplicando estilo seleccionado",
   "DE.Views.TableSettings.textTemplate": "Seleccionar de plantilla",
   "DE.Views.TableSettings.textTotal": "Total",
-  "DE.Views.TableSettings.textWrap": "Ajuste de texto",
+  "DE.Views.TableSettings.textWrap": "Estilo de ajuste",
   "DE.Views.TableSettings.textWrapNoneTooltip": "Tabla en línea",
   "DE.Views.TableSettings.textWrapParallelTooltip": "Tabla flujo",
   "DE.Views.TableSettings.tipAll": "Fijar borde exterior y todas líneas interiores ",
@@ -1510,7 +1515,7 @@
   "DE.Views.Toolbar.textPageMarginsCustom": "Márgenes personalizados",
   "DE.Views.Toolbar.textPageSizeCustom": "Tamaño de página personalizado",
   "DE.Views.Toolbar.textPie": "Gráfico circular",
-  "DE.Views.Toolbar.textPoint": "Gráfico de Punto",
+  "DE.Views.Toolbar.textPoint": "XY (Dispersión)",
   "DE.Views.Toolbar.textPortrait": "Vertical",
   "DE.Views.Toolbar.textRight": "Derecho: ",
   "DE.Views.Toolbar.textStock": "De cotizaciones",

apps/documenteditor/main/locale/fr.json

@@ -677,11 +677,9 @@
   "DE.Views.DocumentHolder.advancedText": "Paramètres avancés",
   "DE.Views.DocumentHolder.alignmentText": "Alignement",
   "DE.Views.DocumentHolder.belowText": "En dessous",
-  "DE.Views.DocumentHolder.bottomCellText": "Aligner en bas",
   "DE.Views.DocumentHolder.breakBeforeText": "Saut de page avant",
   "DE.Views.DocumentHolder.cellAlignText": "Alignement vertical de la cellule",
   "DE.Views.DocumentHolder.cellText": "Cellule",
-  "DE.Views.DocumentHolder.centerCellText": "Aligner au centre",
   "DE.Views.DocumentHolder.centerText": "Centre",
   "DE.Views.DocumentHolder.chartText": "Paramètres avancés du graphique ",
   "DE.Views.DocumentHolder.columnText": "Colonne",
@@ -753,9 +751,9 @@
   "DE.Views.DocumentHolder.textShapeAlignMiddle": "Aligner au milieu",
   "DE.Views.DocumentHolder.textShapeAlignRight": "Aligner à droite",
   "DE.Views.DocumentHolder.textShapeAlignTop": "Aligner en haut",
+  "DE.Views.DocumentHolder.textUndo": "Undo",
   "DE.Views.DocumentHolder.textWrap": "Style d'habillage",
   "DE.Views.DocumentHolder.tipIsLocked": "Cet élément est en cours d'édition par un autre utilisateur.",
-  "DE.Views.DocumentHolder.topCellText": "Aligner en haut",
   "DE.Views.DocumentHolder.txtAddBottom": "Ajouter bordure inférieure",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Ajouter barre de fraction",
   "DE.Views.DocumentHolder.txtAddHor": "Ajouter une ligne horizontale",

apps/documenteditor/main/locale/ru.json

@@ -305,6 +305,22 @@
   "DE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.<br>Обновите лицензию, а затем обновите страницу.",
   "DE.Controllers.Main.warnNoLicense": "Вы используете open source версию ONLYOFFICE. Эта версия имеет ограничения по количеству одновременных подключений к серверу документов (20 подключений одновременно).<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
+  "DE.Controllers.Main.txtStyle_Normal": "Обычный",
+  "DE.Controllers.Main.txtStyle_No_Spacing": "Без интервала",
+  "DE.Controllers.Main.txtStyle_Heading_1": "Заголовок 1",
+  "DE.Controllers.Main.txtStyle_Heading_2": "Заголовок 2",
+  "DE.Controllers.Main.txtStyle_Heading_3": "Заголовок 3",
+  "DE.Controllers.Main.txtStyle_Heading_4": "Заголовок 4",
+  "DE.Controllers.Main.txtStyle_Heading_5": "Заголовок 5",
+  "DE.Controllers.Main.txtStyle_Heading_6": "Заголовок 6",
+  "DE.Controllers.Main.txtStyle_Heading_7": "Заголовок 7",
+  "DE.Controllers.Main.txtStyle_Heading_8": "Заголовок 8",
+  "DE.Controllers.Main.txtStyle_Heading_9": "Заголовок 9",
+  "DE.Controllers.Main.txtStyle_Title": "Название",
+  "DE.Controllers.Main.txtStyle_Subtitle": "Подзаголовок",
+  "DE.Controllers.Main.txtStyle_Quote": "Цитата",
+  "DE.Controllers.Main.txtStyle_Intense_Quote": "Выделенная цитата",
+  "DE.Controllers.Main.txtStyle_List_Paragraph": "Абзац списка",
   "DE.Controllers.Statusbar.textHasChanges": "Отслежены новые изменения",
   "DE.Controllers.Statusbar.textTrackChanges": "Документ открыт при включенном режиме отслеживания изменений",
   "DE.Controllers.Statusbar.zoomText": "Масштаб {0}%",

apps/documenteditor/mobile/app-dev.js

@@ -218,37 +218,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
-        var getUrlParams = function() {
+        reqerr = window.requireTimeourError();
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&')
-                .replace(/"/g, '"')
-                .replace(/'/g, ''')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
-        else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
-        else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
-        else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
-        else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
-
         window.alert(reqerr);
         window.location.reload();
     }

apps/documenteditor/mobile/app.js

@@ -228,37 +228,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
-        var getUrlParams = function() {
+        reqerr = window.requireTimeourError();
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&')
-                .replace(/"/g, '"')
-                .replace(/'/g, ''')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
-        else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
-        else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
-        else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
-        else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
-
         window.alert(reqerr);
         window.location.reload();
     }

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

@@ -101,9 +101,23 @@ define([
 
                 window["flat_desine"] = true;
 
+                var styleNames = ['Normal', 'No Spacing', 'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Heading 5',
+                        'Heading 6', 'Heading 7', 'Heading 8', 'Heading 9', 'Title', 'Subtitle', 'Quote', 'Intense Quote', 'List Paragraph'],
+                    translate = {
+                        'Series': this.txtSeries,
+                        'Diagram Title': this.txtDiagramTitle,
+                        'X Axis': this.txtXAxis,
+                        'Y Axis': this.txtYAxis,
+                        'Your text here': this.txtArt
+                    };
+                styleNames.forEach(function(item){
+                    translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
+                });
+
                 me.api = new Asc.asc_docs_api({
                     'id-view'  : 'editor_sdk',
-                    'mobile'   : true
+                    'mobile'   : true,
+                    'translate': translate
                 });
 
                 // Localization uiApp params
@@ -452,8 +466,7 @@ define([
                 me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
 
                 /** coauthoring begin **/
-                value = Common.localStorage.getItem("de-settings-livecomment");
+                this.isLiveCommenting = Common.localStorage.getBool("de-settings-livecomment", true);
-                this.isLiveCommenting = !(value!==null && parseInt(value) == 0);
                 this.isLiveCommenting ? this.api.asc_showComments(true) : this.api.asc_hideComments();
                 /** coauthoring end **/
 
@@ -645,17 +658,6 @@ define([
                 if (me.api) {
                     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);
-                    translateChart.asc_setXAxis(me.txtXAxis);
-                    translateChart.asc_setYAxis(me.txtYAxis);
-                    translateChart.asc_setSeries(me.txtSeries);
-                    me.api.asc_setChartTranslate(translateChart);
-
-                    var translateArt = new Asc.asc_TextArtTranslate();
-                    translateArt.asc_setDefaultText(me.txtArt);
-                    me.api.asc_setTextArtTranslate(translateArt);
                 }
             },
 
@@ -1215,7 +1217,23 @@ define([
             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'
+            errorBadImageUrl: 'Image url is incorrect',
+            txtStyle_Normal: 'Normal',
+            txtStyle_No_Spacing: 'No Spacing',
+            txtStyle_Heading_1: 'Heading 1',
+            txtStyle_Heading_2: 'Heading 2',
+            txtStyle_Heading_3: 'Heading 3',
+            txtStyle_Heading_4: 'Heading 4',
+            txtStyle_Heading_5: 'Heading 5',
+            txtStyle_Heading_6: 'Heading 6',
+            txtStyle_Heading_7: 'Heading 7',
+            txtStyle_Heading_8: 'Heading 8',
+            txtStyle_Heading_9: 'Heading 9',
+            txtStyle_Title: 'Title',
+            txtStyle_Subtitle: 'Subtitle',
+            txtStyle_Quote: 'Quote',
+            txtStyle_Intense_Quote: 'Intense Quote',
+            txtStyle_List_Paragraph: 'List Paragraph'
         }
     })(), DE.Controllers.Main || {}))
 });

apps/documenteditor/mobile/index.html

@@ -249,6 +249,18 @@
             window.sdk_dev_scrpipts.forEach(function(item){
                 document.write('<script type="text/javascript" src="' + item + '"><\/script>');
             });
+
+            window.requireTimeourError = function(){
+                var reqerr;
+
+                if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
+                else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
+                else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
+                else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+                else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
+
+                return reqerr;
+            };
         </script>
         <!-- application -->
         <script data-main="app-dev" src="../../../vendor/requirejs/require.js"></script>

apps/documenteditor/mobile/index.html.deploy

@@ -236,6 +236,30 @@
                     '<div class="loader-page-text-loading">' + loading + '</div>' +
                     '</div>' +
                 '</div>');
+
+            window.requireTimeourError = function(){
+                var reqerr;
+
+                if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
+                else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
+                else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
+                else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+                else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
+
+                return reqerr;
+            };
+
+            var requireTimeoutID = setTimeout(function(){
+                window.alert(window.requireTimeourError());
+                window.location.reload();
+            }, 30000);
+
+            var require = {
+                waitSeconds: 30,
+                callback: function(){
+                    clearTimeout(requireTimeoutID);
+                }
+            };
         </script>
 
         <div id="viewport"></div>

apps/documenteditor/mobile/locale/en.json

@@ -132,6 +132,22 @@
   "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.txtStyle_Normal": "Normal",
+  "DE.Controllers.Main.txtStyle_No_Spacing": "No Spacing",
+  "DE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
+  "DE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
+  "DE.Controllers.Main.txtStyle_Heading_3": "Heading 3",
+  "DE.Controllers.Main.txtStyle_Heading_4": "Heading 4",
+  "DE.Controllers.Main.txtStyle_Heading_5": "Heading 5",
+  "DE.Controllers.Main.txtStyle_Heading_6": "Heading 6",
+  "DE.Controllers.Main.txtStyle_Heading_7": "Heading 7",
+  "DE.Controllers.Main.txtStyle_Heading_8": "Heading 8",
+  "DE.Controllers.Main.txtStyle_Heading_9": "Heading 9",
+  "DE.Controllers.Main.txtStyle_Title": "Title",
+  "DE.Controllers.Main.txtStyle_Subtitle": "Subtitle",
+  "DE.Controllers.Main.txtStyle_Quote": "Quote",
+  "DE.Controllers.Main.txtStyle_Intense_Quote": "Intense Quote",
+  "DE.Controllers.Main.txtStyle_List_Paragraph": "List Paragraph",
   "DE.Controllers.Search.textNoTextFound": "Text not Found",
   "DE.Controllers.Search.textReplaceAll": "Replace All",
   "DE.Controllers.Settings.notcriticalErrorTitle": "Warning",

apps/documenteditor/mobile/locale/ru.json

@@ -132,6 +132,22 @@
   "DE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.<br>Обновите лицензию, а затем обновите страницу.",
   "DE.Controllers.Main.warnNoLicense": "Вы используете open source версию ONLYOFFICE. Эта версия имеет ограничения по количеству одновременных подключений к серверу документов (20 подключений одновременно).<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
+  "DE.Controllers.Main.txtStyle_Normal": "Обычный",
+  "DE.Controllers.Main.txtStyle_No_Spacing": "Без интервала",
+  "DE.Controllers.Main.txtStyle_Heading_1": "Заголовок 1",
+  "DE.Controllers.Main.txtStyle_Heading_2": "Заголовок 2",
+  "DE.Controllers.Main.txtStyle_Heading_3": "Заголовок 3",
+  "DE.Controllers.Main.txtStyle_Heading_4": "Заголовок 4",
+  "DE.Controllers.Main.txtStyle_Heading_5": "Заголовок 5",
+  "DE.Controllers.Main.txtStyle_Heading_6": "Заголовок 6",
+  "DE.Controllers.Main.txtStyle_Heading_7": "Заголовок 7",
+  "DE.Controllers.Main.txtStyle_Heading_8": "Заголовок 8",
+  "DE.Controllers.Main.txtStyle_Heading_9": "Заголовок 9",
+  "DE.Controllers.Main.txtStyle_Title": "Название",
+  "DE.Controllers.Main.txtStyle_Subtitle": "Подзаголовок",
+  "DE.Controllers.Main.txtStyle_Quote": "Цитата",
+  "DE.Controllers.Main.txtStyle_Intense_Quote": "Выделенная цитата",
+  "DE.Controllers.Main.txtStyle_List_Paragraph": "Абзац списка",
   "DE.Controllers.Search.textNoTextFound": "Текст не найден",
   "DE.Controllers.Search.textReplaceAll": "Заменить все",
   "DE.Controllers.Settings.notcriticalErrorTitle": "Внимание",

apps/documenteditor/mobile/locale/zh.json

@@ -0,0 +1,361 @@
+{
+  "Common.UI.ThemeColorPalette.textStandartColors": "标准颜色",
+  "Common.UI.ThemeColorPalette.textThemeColors": "主题颜色",
+  "Common.Utils.Metric.txtCm": "厘米",
+  "Common.Utils.Metric.txtPt": "像素",
+  "DE.Controllers.AddContainer.textImage": "图片",
+  "DE.Controllers.AddContainer.textOther": "其他",
+  "DE.Controllers.AddContainer.textShape": "形状",
+  "DE.Controllers.AddContainer.textTable": "表格",
+  "DE.Controllers.AddImage.textEmptyImgUrl": "您需要指定图像URL。",
+  "DE.Controllers.AddImage.txtNotUrl": "该字段应为“http://www.example.com”格式的URL",
+  "DE.Controllers.AddOther.txtNotUrl": "该字段应为“http://www.example.com”格式的URL",
+  "DE.Controllers.AddTable.textCancel": "取消",
+  "DE.Controllers.AddTable.textColumns": "列",
+  "DE.Controllers.AddTable.textRows": "行",
+  "DE.Controllers.AddTable.textTableSize": "表格大小",
+  "DE.Controllers.DocumentHolder.menuAddLink": "增加链接",
+  "DE.Controllers.DocumentHolder.menuCopy": "复制",
+  "DE.Controllers.DocumentHolder.menuCut": "剪切",
+  "DE.Controllers.DocumentHolder.menuDelete": "删除",
+  "DE.Controllers.DocumentHolder.menuEdit": "编辑",
+  "DE.Controllers.DocumentHolder.menuMore": "更多",
+  "DE.Controllers.DocumentHolder.menuOpenLink": "打开链接",
+  "DE.Controllers.DocumentHolder.menuPaste": "粘贴",
+  "DE.Controllers.DocumentHolder.sheetCancel": "取消",
+  "DE.Controllers.DocumentHolder.textGuest": "游客",
+  "DE.Controllers.EditContainer.textChart": "图表",
+  "DE.Controllers.EditContainer.textHyperlink": "超链接",
+  "DE.Controllers.EditContainer.textImage": "图片",
+  "DE.Controllers.EditContainer.textParagraph": "段",
+  "DE.Controllers.EditContainer.textSettings": "设置",
+  "DE.Controllers.EditContainer.textShape": "形状",
+  "DE.Controllers.EditContainer.textTable": "表格",
+  "DE.Controllers.EditContainer.textText": "文本",
+  "DE.Controllers.EditImage.textEmptyImgUrl": "您需要指定图像URL。",
+  "DE.Controllers.EditImage.txtNotUrl": "该字段应为“http://www.example.com”格式的URL",
+  "DE.Controllers.EditText.textAuto": "自动",
+  "DE.Controllers.EditText.textFonts": "字体",
+  "DE.Controllers.EditText.textPt": "像素",
+  "DE.Controllers.Main.advDRMEnterPassword": "输入密码：",
+  "DE.Controllers.Main.advDRMOptions": "受保护的文件",
+  "DE.Controllers.Main.advDRMPassword": "密码",
+  "DE.Controllers.Main.advTxtOptions": "选择TXT选项",
+  "DE.Controllers.Main.applyChangesTextText": "数据加载中…",
+  "DE.Controllers.Main.applyChangesTitleText": "数据加载中",
+  "DE.Controllers.Main.convertationTimeoutText": "转换超时",
+  "DE.Controllers.Main.criticalErrorExtText": "按“确定”返回文件列表",
+  "DE.Controllers.Main.criticalErrorTitle": "错误:",
+  "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE 文件编辑器",
+  "DE.Controllers.Main.downloadErrorText": "下载失败",
+  "DE.Controllers.Main.downloadMergeText": "下载中…",
+  "DE.Controllers.Main.downloadMergeTitle": "下载中",
+  "DE.Controllers.Main.downloadTextText": "正在下载文件...",
+  "DE.Controllers.Main.downloadTitleText": "下载文件",
+  "DE.Controllers.Main.errorBadImageUrl": "图片地址不正确",
+  "DE.Controllers.Main.errorCoAuthoringDisconnect": "服务器连接丢失。你不能再编辑了。",
+  "DE.Controllers.Main.errorConnectToServer": "无法保存文档。请检查连接设置，或与管理员联系。<BR>当你点击“确定”按钮，系统会提示您下载文件。<BR> <BR>找到更多的信息关于连接文件服务器< a href =“https://api.onlyoffice.com/editors/callback”目标=“_blank”>这里</a>",
+  "DE.Controllers.Main.errorDatabaseConnection": "外部错误。<br>数据库连接错误。请联系支持。",
+  "DE.Controllers.Main.errorDataRange": "数据范围不正确",
+  "DE.Controllers.Main.errorDefaultMessage": "错误代码：％1",
+  "DE.Controllers.Main.errorFilePassProtect": "该文档受密码保护",
+  "DE.Controllers.Main.errorKeyEncrypt": "未知密钥描述",
+  "DE.Controllers.Main.errorKeyExpire": "密钥过期",
+  "DE.Controllers.Main.errorMailMergeLoadFile": "加载失败",
+  "DE.Controllers.Main.errorMailMergeSaveFile": "合并失败",
+  "DE.Controllers.Main.errorProcessSaveResult": "保存失败",
+  "DE.Controllers.Main.errorServerVersion": "该编辑版本已经更新。该页面将被重新加载以应用更改。",
+  "DE.Controllers.Main.errorStockChart": "行顺序不正确，建立股票图表将数据按照以下顺序放置在表格上：<br>开盘价，最高价格，最低价格，收盘价。",
+  "DE.Controllers.Main.errorUpdateVersion": "\n该文件版本已经改变了。该页面将被重新加载。",
+  "DE.Controllers.Main.errorUserDrop": "该文件现在无法访问",
+  "DE.Controllers.Main.errorUsersExceed": "超过了用户数",
+  "DE.Controllers.Main.errorViewerDisconnect": "连接丢失。您仍然可以查看文档<br>，但在连接恢复之前无法下载。",
+  "DE.Controllers.Main.leavePageText": "您在本文档中有未保存的更改。点击“留在这个页面”等待文档的自动保存。点击“离开此页面”以放弃所有未保存的更改。",
+  "DE.Controllers.Main.loadFontsTextText": "数据加载中…",
+  "DE.Controllers.Main.loadFontsTitleText": "数据加载中",
+  "DE.Controllers.Main.loadFontTextText": "数据加载中…",
+  "DE.Controllers.Main.loadFontTitleText": "数据加载中",
+  "DE.Controllers.Main.loadImagesTextText": "图片加载中…",
+  "DE.Controllers.Main.loadImagesTitleText": "图片加载中",
+  "DE.Controllers.Main.loadImageTextText": "图片加载中…",
+  "DE.Controllers.Main.loadImageTitleText": "图片加载中",
+  "DE.Controllers.Main.loadingDocumentTextText": "文件加载中…",
+  "DE.Controllers.Main.loadingDocumentTitleText": "文件加载中…",
+  "DE.Controllers.Main.mailMergeLoadFileText": "原始数据加载中…",
+  "DE.Controllers.Main.mailMergeLoadFileTitle": "原始数据加载中…",
+  "DE.Controllers.Main.notcriticalErrorTitle": "警告中",
+  "DE.Controllers.Main.openErrorText": "打开文件时发生错误",
+  "DE.Controllers.Main.openTextText": "打开文件...",
+  "DE.Controllers.Main.openTitleText": "正在打开文件",
+  "DE.Controllers.Main.printTextText": "打印文件",
+  "DE.Controllers.Main.printTitleText": "打印文件",
+  "DE.Controllers.Main.saveErrorText": "保存文件时发生错误",
+  "DE.Controllers.Main.savePreparingText": "图像上传中……",
+  "DE.Controllers.Main.savePreparingTitle": "正在保存，请稍候...",
+  "DE.Controllers.Main.saveTextText": "保存文件",
+  "DE.Controllers.Main.saveTitleText": "保存文件",
+  "DE.Controllers.Main.sendMergeText": "任务合并",
+  "DE.Controllers.Main.sendMergeTitle": "任务合并",
+  "DE.Controllers.Main.splitDividerErrorText": "该行数必须是％1的除数。",
+  "DE.Controllers.Main.splitMaxColsErrorText": "列数必须小于％1",
+  "DE.Controllers.Main.splitMaxRowsErrorText": "行数必须小于％1",
+  "DE.Controllers.Main.textAnonymous": "匿名",
+  "DE.Controllers.Main.textBack": "返回",
+  "DE.Controllers.Main.textBuyNow": "访问网站",
+  "DE.Controllers.Main.textCancel": "取消",
+  "DE.Controllers.Main.textClose": "关闭",
+  "DE.Controllers.Main.textContactUs": "联系销售",
+  "DE.Controllers.Main.textDone": "完成",
+  "DE.Controllers.Main.textLoadingDocument": "文件加载中…",
+  "DE.Controllers.Main.textNoLicenseTitle": "NLYOFFICE开源版本",
+  "DE.Controllers.Main.textOK": "确定",
+  "DE.Controllers.Main.textPassword": "密码",
+  "DE.Controllers.Main.textPreloader": "载入中……",
+  "DE.Controllers.Main.textTryUndoRedo": "快速共同编辑模式下，Undo / Redo功能被禁用。",
+  "DE.Controllers.Main.textUsername": "用户名",
+  "DE.Controllers.Main.titleLicenseExp": "许可证过期",
+  "DE.Controllers.Main.titleServerVersion": "编辑器已更新",
+  "DE.Controllers.Main.titleUpdateVersion": "版本已变化",
+  "DE.Controllers.Main.txtArt": "你的文本在此",
+  "DE.Controllers.Main.txtDiagramTitle": "图表标题",
+  "DE.Controllers.Main.txtEditingMode": "设置编辑模式..",
+  "DE.Controllers.Main.txtSeries": "系列",
+  "DE.Controllers.Main.txtXAxis": "X轴",
+  "DE.Controllers.Main.txtYAxis": "Y轴",
+  "DE.Controllers.Main.unknownErrorText": "示知错误",
+  "DE.Controllers.Main.unsupportedBrowserErrorText": "你的浏览器不支持",
+  "DE.Controllers.Main.uploadImageExtMessage": "未知图像格式",
+  "DE.Controllers.Main.uploadImageFileCountMessage": "没有图片上传",
+  "DE.Controllers.Main.uploadImageSizeMessage": "超过了Maximium图像大小限制。",
+  "DE.Controllers.Main.uploadImageTextText": "上传图片...",
+  "DE.Controllers.Main.uploadImageTitleText": "图片上传中",
+  "DE.Controllers.Main.warnLicenseExp": "您的许可证已过期。<br>请更新您的许可证并刷新页面。",
+  "DE.Controllers.Main.warnNoLicense": "您正在使用ONLYOFFICE的开源版本。该版本对文档服务器的并发连接有限制（每次20个连接）。<br>如果需要更多请考虑购买商业许可证。",
+  "DE.Controllers.Main.warnProcessRightsChange": "您被拒绝编辑文件的权限。",
+  "DE.Controllers.Search.textNoTextFound": "文本没找到",
+  "DE.Controllers.Search.textReplaceAll": "全部替换",
+  "DE.Controllers.Settings.notcriticalErrorTitle": "警告中",
+  "DE.Controllers.Settings.txtLoading": "载入中……",
+  "DE.Controllers.Settings.unknownText": "未知",
+  "DE.Controllers.Settings.warnDownloadAs": "如果您继续以此格式保存，除文本之外的所有功能将丢失。<br>您确定要继续吗？",
+  "DE.Controllers.Toolbar.dlgLeaveMsgText": "您在本文档中有未保存的更改。点击“留在这个页面”等待文档的自动保存。点击“离开此页面”以放弃所有未保存的更改。",
+  "DE.Controllers.Toolbar.dlgLeaveTitleText": "你退出应用程序",
+  "DE.Controllers.Toolbar.leaveButtonText": "离开这个页面",
+  "DE.Controllers.Toolbar.stayButtonText": "保持此页上",
+  "DE.Views.AddImage.textAddress": "地址",
+  "DE.Views.AddImage.textBack": "返回",
+  "DE.Views.AddImage.textFromLibrary": "图库",
+  "DE.Views.AddImage.textFromURL": "图上来自网络",
+  "DE.Views.AddImage.textImageURL": "图片地址",
+  "DE.Views.AddImage.textInsertImage": "插入图像",
+  "DE.Views.AddImage.textLinkSettings": "链接设置",
+  "DE.Views.AddOther.textAddLink": "增加链接",
+  "DE.Views.AddOther.textBack": "返回",
+  "DE.Views.AddOther.textCenterBottom": "中间底部",
+  "DE.Views.AddOther.textCenterTop": "中心顶部",
+  "DE.Views.AddOther.textColumnBreak": "分栏",
+  "DE.Views.AddOther.textContPage": "连续页",
+  "DE.Views.AddOther.textCurrentPos": "当前位置",
+  "DE.Views.AddOther.textDisplay": "展示",
+  "DE.Views.AddOther.textEvenPage": "偶数页",
+  "DE.Views.AddOther.textInsert": "插入",
+  "DE.Views.AddOther.textLeftBottom": "左下",
+  "DE.Views.AddOther.textLeftTop": "左上",
+  "DE.Views.AddOther.textLink": "链接",
+  "DE.Views.AddOther.textNextPage": "下一页",
+  "DE.Views.AddOther.textOddPage": "奇数页",
+  "DE.Views.AddOther.textPageBreak": "分页符",
+  "DE.Views.AddOther.textPageNumber": "页码",
+  "DE.Views.AddOther.textPosition": "位置",
+  "DE.Views.AddOther.textRightBottom": "右下",
+  "DE.Views.AddOther.textRightTop": "右上",
+  "DE.Views.AddOther.textSectionBreak": "部分中断",
+  "DE.Views.AddOther.textTip": "屏幕提示",
+  "DE.Views.EditChart.textAlign": "排列",
+  "DE.Views.EditChart.textBack": "返回",
+  "DE.Views.EditChart.textBackward": "向后移动",
+  "DE.Views.EditChart.textBehind": "之后",
+  "DE.Views.EditChart.textBorder": "边界",
+  "DE.Views.EditChart.textColor": "颜色",
+  "DE.Views.EditChart.textDistanceText": "文字距离",
+  "DE.Views.EditChart.textFill": "填满",
+  "DE.Views.EditChart.textForward": "向前移动",
+  "DE.Views.EditChart.textInFront": "前面",
+  "DE.Views.EditChart.textInline": "内嵌",
+  "DE.Views.EditChart.textMoveText": "文字移动",
+  "DE.Views.EditChart.textOverlap": "允许重叠",
+  "DE.Views.EditChart.textRemoveChart": "删除图表",
+  "DE.Views.EditChart.textReorder": "重新订购",
+  "DE.Views.EditChart.textSize": "大小",
+  "DE.Views.EditChart.textSquare": "正方形",
+  "DE.Views.EditChart.textStyle": "类型",
+  "DE.Views.EditChart.textThrough": "通过",
+  "DE.Views.EditChart.textTight": "紧",
+  "DE.Views.EditChart.textToBackground": "发送到背景",
+  "DE.Views.EditChart.textToForeground": "放到最上面",
+  "DE.Views.EditChart.textTopBottom": "上下",
+  "DE.Views.EditChart.textType": "类型",
+  "DE.Views.EditChart.textWrap": "包裹",
+  "DE.Views.EditHyperlink.textDisplay": "展示",
+  "DE.Views.EditHyperlink.textEdit": "编辑链接",
+  "DE.Views.EditHyperlink.textLink": "链接",
+  "DE.Views.EditHyperlink.textRemove": "删除链接",
+  "DE.Views.EditHyperlink.textTip": "屏幕提示",
+  "DE.Views.EditImage.textAddress": "地址",
+  "DE.Views.EditImage.textAlign": "排列",
+  "DE.Views.EditImage.textBack": "返回",
+  "DE.Views.EditImage.textBackward": "向后移动",
+  "DE.Views.EditImage.textBehind": "之后",
+  "DE.Views.EditImage.textDefault": "默认大小",
+  "DE.Views.EditImage.textDistanceText": "文字距离",
+  "DE.Views.EditImage.textForward": "向前移动",
+  "DE.Views.EditImage.textFromLibrary": "图库",
+  "DE.Views.EditImage.textFromURL": "图片来自网络",
+  "DE.Views.EditImage.textImageURL": "图片地址",
+  "DE.Views.EditImage.textInFront": "前面",
+  "DE.Views.EditImage.textInline": "内嵌",
+  "DE.Views.EditImage.textLinkSettings": "链接设置",
+  "DE.Views.EditImage.textMoveText": "文字移动",
+  "DE.Views.EditImage.textOverlap": "允许重叠",
+  "DE.Views.EditImage.textRemove": "删除图片",
+  "DE.Views.EditImage.textReorder": "重新订购",
+  "DE.Views.EditImage.textReplace": "替换",
+  "DE.Views.EditImage.textReplaceImg": "替换图像",
+  "DE.Views.EditImage.textSquare": "正方形",
+  "DE.Views.EditImage.textThrough": "通过",
+  "DE.Views.EditImage.textTight": "紧",
+  "DE.Views.EditImage.textToBackground": "发送到背景",
+  "DE.Views.EditImage.textToForeground": "放到最上面",
+  "DE.Views.EditImage.textTopBottom": "上下",
+  "DE.Views.EditImage.textWrap": "包裹",
+  "DE.Views.EditParagraph.textAdvanced": "高级",
+  "DE.Views.EditParagraph.textAdvSettings": "高级设置",
+  "DE.Views.EditParagraph.textAfter": "后",
+  "DE.Views.EditParagraph.textAuto": "自动",
+  "DE.Views.EditParagraph.textBack": "返回",
+  "DE.Views.EditParagraph.textBackground": "背景",
+  "DE.Views.EditParagraph.textBefore": "以前",
+  "DE.Views.EditParagraph.textFromText": "文字距离",
+  "DE.Views.EditParagraph.textKeepLines": "保持一条线上",
+  "DE.Views.EditParagraph.textKeepNext": "与下一个保持一致",
+  "DE.Views.EditParagraph.textOrphan": "单独控制",
+  "DE.Views.EditParagraph.textPageBreak": "分页前",
+  "DE.Views.EditParagraph.textPrgStyles": "段落样式",
+  "DE.Views.EditParagraph.textSpaceBetween": "段间距",
+  "DE.Views.EditShape.textAlign": "排列",
+  "DE.Views.EditShape.textBack": "返回",
+  "DE.Views.EditShape.textBackward": "向后移动",
+  "DE.Views.EditShape.textBehind": "之后",
+  "DE.Views.EditShape.textBorder": "边界",
+  "DE.Views.EditShape.textColor": "颜色",
+  "DE.Views.EditShape.textEffects": "效果",
+  "DE.Views.EditShape.textFill": "填满",
+  "DE.Views.EditShape.textForward": "向前移动",
+  "DE.Views.EditShape.textFromText": "文字距离",
+  "DE.Views.EditShape.textInFront": "前面",
+  "DE.Views.EditShape.textInline": "内嵌",
+  "DE.Views.EditShape.textOpacity": "不透明度",
+  "DE.Views.EditShape.textOverlap": "允许重叠",
+  "DE.Views.EditShape.textRemoveShape": "去除形状",
+  "DE.Views.EditShape.textReorder": "重新订购",
+  "DE.Views.EditShape.textReplace": "替换",
+  "DE.Views.EditShape.textSize": "大小",
+  "DE.Views.EditShape.textSquare": "正方形",
+  "DE.Views.EditShape.textStyle": "类型",
+  "DE.Views.EditShape.textThrough": "通过",
+  "DE.Views.EditShape.textTight": "紧",
+  "DE.Views.EditShape.textToBackground": "发送到背景",
+  "DE.Views.EditShape.textToForeground": "放到最上面",
+  "DE.Views.EditShape.textTopAndBottom": "上下",
+  "DE.Views.EditShape.textWithText": "文字移动",
+  "DE.Views.EditShape.textWrap": "包裹",
+  "DE.Views.EditTable.textAlign": "排列",
+  "DE.Views.EditTable.textBack": "返回",
+  "DE.Views.EditTable.textBandedColumn": "带状列",
+  "DE.Views.EditTable.textBandedRow": "带状行",
+  "DE.Views.EditTable.textBorder": "边界",
+  "DE.Views.EditTable.textCellMargins": "元据边缘",
+  "DE.Views.EditTable.textColor": "颜色",
+  "DE.Views.EditTable.textFill": "填满",
+  "DE.Views.EditTable.textFirstColumn": "第一列",
+  "DE.Views.EditTable.textFlow": "流动",
+  "DE.Views.EditTable.textFromText": "文件格式",
+  "DE.Views.EditTable.textHeaderRow": "标题行",
+  "DE.Views.EditTable.textInline": "内嵌",
+  "DE.Views.EditTable.textLastColumn": "最后一列",
+  "DE.Views.EditTable.textOptions": "选项",
+  "DE.Views.EditTable.textRemoveTable": "删除表",
+  "DE.Views.EditTable.textRepeatHeader": "重复标题行",
+  "DE.Views.EditTable.textResizeFit": "调整大小以适应内容",
+  "DE.Views.EditTable.textSize": "大小",
+  "DE.Views.EditTable.textStyle": "类型",
+  "DE.Views.EditTable.textStyleOptions": "样式选项",
+  "DE.Views.EditTable.textTableOptions": "表格选项",
+  "DE.Views.EditTable.textTotalRow": "总行",
+  "DE.Views.EditTable.textWithText": "文字移动",
+  "DE.Views.EditTable.textWrap": "包裹",
+  "DE.Views.EditText.textAdditional": "另外",
+  "DE.Views.EditText.textAdditionalFormat": "附加格式",
+  "DE.Views.EditText.textAllCaps": "全部大写",
+  "DE.Views.EditText.textAutomatic": "自动化的",
+  "DE.Views.EditText.textBack": "返回",
+  "DE.Views.EditText.textBullets": "子弹",
+  "DE.Views.EditText.textDblStrikethrough": "双删除线",
+  "DE.Views.EditText.textDblSuperscript": "上标",
+  "DE.Views.EditText.textFontColor": "字体颜色",
+  "DE.Views.EditText.textFontColors": "字体颜色",
+  "DE.Views.EditText.textFonts": "字体",
+  "DE.Views.EditText.textHighlightColor": "颜色高亮",
+  "DE.Views.EditText.textHighlightColors": "颜色高亮",
+  "DE.Views.EditText.textLetterSpacing": "字母间距",
+  "DE.Views.EditText.textLineSpacing": "行间距",
+  "DE.Views.EditText.textNone": "没有",
+  "DE.Views.EditText.textNumbers": "数字",
+  "DE.Views.EditText.textSize": "大小",
+  "DE.Views.EditText.textSmallCaps": "小帽子",
+  "DE.Views.EditText.textStrikethrough": "删除线",
+  "DE.Views.EditText.textSubscript": "下标",
+  "DE.Views.Search.textCase": "区分大小写",
+  "DE.Views.Search.textDone": "完成",
+  "DE.Views.Search.textFind": "发现",
+  "DE.Views.Search.textFindAndReplace": "查找和替换",
+  "DE.Views.Search.textHighlight": "高亮效果",
+  "DE.Views.Search.textReplace": "替换",
+  "DE.Views.Search.textSearch": "搜索",
+  "DE.Views.Settings.textAbout": "关于",
+  "DE.Views.Settings.textAddress": "地址\n",
+  "DE.Views.Settings.textAuthor": "创建者",
+  "DE.Views.Settings.textBack": "返回",
+  "DE.Views.Settings.textCreateDate": "创建日期",
+  "DE.Views.Settings.textCustom": "自定义",
+  "DE.Views.Settings.textCustomSize": "自定义大小",
+  "DE.Views.Settings.textDocInfo": "文件信息",
+  "DE.Views.Settings.textDocTitle": "文件名",
+  "DE.Views.Settings.textDocumentFormats": "文件格式",
+  "DE.Views.Settings.textDocumentSettings": "文档设置",
+  "DE.Views.Settings.textDone": "完成",
+  "DE.Views.Settings.textDownload": "下载",
+  "DE.Views.Settings.textDownloadAs": "下载为...",
+  "DE.Views.Settings.textEditDoc": "编辑文档",
+  "DE.Views.Settings.textEmail": "电子邮件",
+  "DE.Views.Settings.textFind": "发现",
+  "DE.Views.Settings.textFindAndReplace": "查找和替换",
+  "DE.Views.Settings.textFormat": "格式",
+  "DE.Views.Settings.textHelp": "帮助",
+  "DE.Views.Settings.textLandscape": "横向",
+  "DE.Views.Settings.textLoading": "载入中……",
+  "DE.Views.Settings.textOrientation": "选项",
+  "DE.Views.Settings.textPages": "页面",
+  "DE.Views.Settings.textParagraphs": "段落",
+  "DE.Views.Settings.textPortrait": "肖像",
+  "DE.Views.Settings.textReader": "阅读模式",
+  "DE.Views.Settings.textSettings": "设置",
+  "DE.Views.Settings.textSpaces": "间隔",
+  "DE.Views.Settings.textStatistic": "统计",
+  "DE.Views.Settings.textSymbols": "符号",
+  "DE.Views.Settings.textTel": "电话",
+  "DE.Views.Settings.textVersion": "版本",
+  "DE.Views.Settings.textWords": "单词",
+  "DE.Views.Settings.unknownText": "未知",
+  "DE.Views.Toolbar.textBack": "返回"
+}

apps/presentationeditor/embed/js/ApplicationController.js

@@ -391,7 +391,7 @@ var ApplicationController = new(function(){
     }
 
     function onEditorPermissions(params) {
-        if ( params.asc_getCanBranding() && (typeof config.customization == 'object') &&
+        if ( (params.asc_getLicenseType() === Asc.c_oLicenseResult.Success) && (typeof config.customization == 'object') &&
             config.customization && config.customization.logo ) {
 
             var logo = $('#header-logo');

apps/presentationeditor/main/app.js

@@ -189,37 +189,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
-        var getUrlParams = function() {
+        reqerr = window.requireTimeourError();
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
-                    .replace(/'/g, ''')
-                    .replace(/</g, '&lt;')
-                    .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
-        else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
-        else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
-        else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
-        else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
-
         window.alert(reqerr);
         window.location.reload();
     }

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

@@ -430,7 +430,7 @@ define([
                 if ( state == 'show' )
                     this.dlgSearch.suspendKeyEvents();
                 else
-                    Common.Utils.asyncCall(this.dlgSearch.resumeKeyEvents);
+                    Common.Utils.asyncCall(this.dlgSearch.resumeKeyEvents, this.dlgSearch);
             }
         },
 

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

@@ -121,7 +121,28 @@ define([
 
                 window["flat_desine"] = true;
                 this.api = new Asc.asc_docs_api({
-                    'id-view'  : 'editor_sdk'
+                    'id-view'  : 'editor_sdk',
+                    'translate': {
+                        'Series': this.txtSeries,
+                        'Diagram Title': this.txtDiagramTitle,
+                        'X Axis': this.txtXAxis,
+                        'Y Axis': this.txtYAxis,
+                        'Your text here': this.txtArt,
+                        'Slide text': this.txtSlideText,
+                        'Chart': this.txtSldLtTChart,
+                        'ClipArt': this.txtClipArt,
+                        'Diagram': this.txtDiagram,
+                        'Date and time': this.txtDateTime,
+                        'Footer': this.txtFooter,
+                        'Header': this.txtHeader,
+                        'Media': this.txtMedia,
+                        'Picture': this.txtPicture,
+                        'Image': this.txtImage,
+                        'Slide number': this.txtSlideNumber,
+                        'Slide subtitle': this.txtSlideSubtitle,
+                        'Table': this.txtSldLtTTbl,
+                        'Slide title': this.txtSlideTitle
+                    }
                 });
 
                 if (this.api){
@@ -804,19 +825,6 @@ define([
 
                 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();
-                    translateChart.asc_setTitle(this.txtDiagramTitle);
-                    translateChart.asc_setXAxis(this.txtXAxis);
-                    translateChart.asc_setYAxis(this.txtYAxis);
-                    translateChart.asc_setSeries(this.txtSeries);
-                    this.api.asc_setChartTranslate(translateChart);
-
-                    var translateArt = new Asc.asc_TextArtTranslate();
-                    translateArt.asc_setDefaultText(this.txtArt);
-                    this.api.asc_setTextArtTranslate(translateArt);
-                }
             },
 
             applyModeEditorElements: function(prevmode) {
@@ -1750,6 +1758,7 @@ define([
                                     isViewer: itemVar.isViewer,
                                     EditorsSupport: itemVar.EditorsSupport,
                                     isVisual: itemVar.isVisual,
+                                    isCustomWindow: itemVar.isCustomWindow,
                                     isModal: itemVar.isModal,
                                     isInsideMode: itemVar.isInsideMode,
                                     initDataType: itemVar.initDataType,
@@ -1927,7 +1936,19 @@ define([
             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.',
-            errorBadImageUrl: 'Image url is incorrect'
+            errorBadImageUrl: 'Image url is incorrect',
+            txtSlideText: 'Slide text',
+            txtClipArt: 'Clip Art',
+            txtDiagram: 'Diagram',
+            txtDateTime: 'Date and time',
+            txtFooter: 'Footer',
+            txtHeader: 'Header',
+            txtMedia: 'Media',
+            txtPicture: 'Picture',
+            txtImage: 'Image',
+            txtSlideNumber: 'Slide number',
+            txtSlideSubtitle: 'Slide subtitle',
+            txtSlideTitle: 'Slide title'
         }
     })(), PE.Controllers.Main || {}))
 });

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

@@ -417,6 +417,7 @@ define([    'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
             this.spnColumns = new Common.UI.MetricSpinner({
                 el: $('#shape-columns-number'),
                 step: 1,
+                allowDecimal: false,
                 width: 100,
                 defaultUnit : "",
                 value: '1',

apps/presentationeditor/main/app_dev.js

@@ -181,37 +181,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
-        var getUrlParams = function() {
+        reqerr = window.requireTimeourError();
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
-                    .replace(/'/g, ''')
-                    .replace(/</g, '&lt;')
-                    .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
-        else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
-        else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
-        else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
-        else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
-
         window.alert(reqerr);
         window.location.reload();
     }

apps/presentationeditor/main/index.html

@@ -290,6 +290,18 @@
         window.sdk_dev_scrpipts.forEach(function(item){
             document.write('<script type="text/javascript" src="' + item + '"><\/script>');
         });
+
+        window.requireTimeourError = function(){
+            var reqerr;
+
+            if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
+            else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
+            else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
+            else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+            else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
+
+            return reqerr;
+        };
     </script>
 
     <!-- application -->

apps/presentationeditor/main/index.html.deploy

@@ -254,8 +254,28 @@
                 '</div>' +
             '</div>');
 
+        window.requireTimeourError = function(){
+            var reqerr;
+
+            if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
+            else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
+            else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
+            else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+            else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
+
+            return reqerr;
+        };
+
+        var requireTimeoutID = setTimeout(function(){
+            window.alert(window.requireTimeourError());
+            window.location.reload();
+        }, 30000);
+
         var require = {
-            waitSeconds: 30 
+            waitSeconds: 30,
+            callback: function(){
+                clearTimeout(requireTimeoutID);
+            }
         };
     </script>
 

apps/presentationeditor/main/locale/de.json

@@ -614,10 +614,8 @@
   "PE.Views.DocumentHolder.advancedTableText": "Tabelle - Erweiterte Einstellungen",
   "PE.Views.DocumentHolder.alignmentText": "Ausrichtung",
   "PE.Views.DocumentHolder.belowText": "Unten",
-  "PE.Views.DocumentHolder.bottomCellText": "Unten ausrichten",
   "PE.Views.DocumentHolder.cellAlignText": "Vertikale Ausrichtung in Zellen",
   "PE.Views.DocumentHolder.cellText": "Zelle",
-  "PE.Views.DocumentHolder.centerCellText": "Zentriert ausrichten",
   "PE.Views.DocumentHolder.centerText": "Zentriert",
   "PE.Views.DocumentHolder.columnText": "Spalte",
   "PE.Views.DocumentHolder.deleteColumnText": "Spalte löschen",
@@ -671,8 +669,8 @@
   "PE.Views.DocumentHolder.textShapeAlignRight": "Rechts ausrichten",
   "PE.Views.DocumentHolder.textShapeAlignTop": "Oben ausrichten",
   "PE.Views.DocumentHolder.textSlideSettings": "Folien-Einstellungen",
+  "PE.Views.DocumentHolder.textUndo": "Undo",
   "PE.Views.DocumentHolder.tipIsLocked": "Dieses Element wird gerade von einem anderen Benutzer bearbeitet.",
-  "PE.Views.DocumentHolder.topCellText": "Oben ausrichten",
   "PE.Views.DocumentHolder.txtAddBottom": "Unterer Rand hinzufügen",
   "PE.Views.DocumentHolder.txtAddFractionBar": "Bruchstrich einfügen",
   "PE.Views.DocumentHolder.txtAddHor": "Horizontale Linie einfügen",

apps/presentationeditor/main/locale/en.json

@@ -262,6 +262,18 @@
   "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.txtSlideText": "Slide text",
+  "PE.Controllers.Main.txtClipArt": "Clip Art",
+  "PE.Controllers.Main.txtDiagram": "Diagram",
+  "PE.Controllers.Main.txtDateTime": "Date and time",
+  "PE.Controllers.Main.txtFooter": "Footer",
+  "PE.Controllers.Main.txtHeader": "Header",
+  "PE.Controllers.Main.txtMedia": "Media",
+  "PE.Controllers.Main.txtPicture": "Picture",
+  "PE.Controllers.Main.txtImage": "Image",
+  "PE.Controllers.Main.txtSlideNumber": "Slide number",
+  "PE.Controllers.Main.txtSlideSubtitle": "Slide subtitle",
+  "PE.Controllers.Main.txtSlideTitle": "Slide title",
   "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",
@@ -625,10 +637,8 @@
   "PE.Views.DocumentHolder.advancedTableText": "Table Advanced Settings",
   "PE.Views.DocumentHolder.alignmentText": "Alignment",
   "PE.Views.DocumentHolder.belowText": "Below",
-  "del_PE.Views.DocumentHolder.bottomCellText": "Align Bottom",
   "PE.Views.DocumentHolder.cellAlignText": "Cell Vertical Alignment",
   "PE.Views.DocumentHolder.cellText": "Cell",
-  "del_PE.Views.DocumentHolder.centerCellText": "Align Center",
   "PE.Views.DocumentHolder.centerText": "Center",
   "PE.Views.DocumentHolder.columnText": "Column",
   "PE.Views.DocumentHolder.deleteColumnText": "Delete Column",
@@ -683,7 +693,6 @@
   "PE.Views.DocumentHolder.textShapeAlignTop": "Align Top",
   "PE.Views.DocumentHolder.textSlideSettings": "Slide Settings",
   "PE.Views.DocumentHolder.tipIsLocked": "This element is currently being edited by another user.",
-  "del_PE.Views.DocumentHolder.topCellText": "Align Top",
   "PE.Views.DocumentHolder.txtAddBottom": "Add bottom border",
   "PE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar",
   "PE.Views.DocumentHolder.txtAddHor": "Add horizontal line",

apps/presentationeditor/main/locale/fr.json

@@ -614,10 +614,8 @@
   "PE.Views.DocumentHolder.advancedTableText": "Paramètres avancés du tableau",
   "PE.Views.DocumentHolder.alignmentText": "Alignement",
   "PE.Views.DocumentHolder.belowText": "En dessous",
-  "PE.Views.DocumentHolder.bottomCellText": "Aligner en bas",
   "PE.Views.DocumentHolder.cellAlignText": "Alignement vertical de cellule",
   "PE.Views.DocumentHolder.cellText": "Cellule",
-  "PE.Views.DocumentHolder.centerCellText": "Aligner au centre",
   "PE.Views.DocumentHolder.centerText": "Au centre",
   "PE.Views.DocumentHolder.columnText": "Colonne",
   "PE.Views.DocumentHolder.deleteColumnText": "Supprimer la colonne",
@@ -671,8 +669,8 @@
   "PE.Views.DocumentHolder.textShapeAlignRight": "Aligner à droite",
   "PE.Views.DocumentHolder.textShapeAlignTop": "Aligner en haut",
   "PE.Views.DocumentHolder.textSlideSettings": "Paramètres de la diapositive",
+  "PE.Views.DocumentHolder.textUndo": "Undo",
   "PE.Views.DocumentHolder.tipIsLocked": "Cet élément est en cours d'édition par un autre utilisateur.",
-  "PE.Views.DocumentHolder.topCellText": "Aligner en haut",
   "PE.Views.DocumentHolder.txtAddBottom": "Ajouter bordure inférieure",
   "PE.Views.DocumentHolder.txtAddFractionBar": "Ajouter barre de fraction",
   "PE.Views.DocumentHolder.txtAddHor": "Ajouter une ligne horizontale",

apps/presentationeditor/mobile/app-dev.js

@@ -221,37 +221,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
-        var getUrlParams = function() {
+        reqerr = window.requireTimeourError();
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&')
-                .replace(/"/g, '"')
-                .replace(/'/g, ''')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
-        else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
-        else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
-        else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
-        else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
-
         window.alert(reqerr);
         window.location.reload();
     }

apps/presentationeditor/mobile/app.js

@@ -230,37 +230,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
-        var getUrlParams = function() {
+        reqerr = window.requireTimeourError();
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&')
-                .replace(/"/g, '"')
-                .replace(/'/g, ''')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
-        else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
-        else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
-        else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
-        else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
-
         window.alert(reqerr);
         window.location.reload();
     }

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

@@ -98,7 +98,28 @@ define([
 
                 me.api = new Asc.asc_docs_api({
                     'id-view'  : 'editor_sdk',
-                    'mobile'   : true
+                    'mobile'   : true,
+                    'translate': {
+                        'Series': me.txtSeries,
+                        'Diagram Title': me.txtDiagramTitle,
+                        'X Axis': me.txtXAxis,
+                        'Y Axis': me.txtYAxis,
+                        'Your text here': me.txtArt,
+                        'Slide text': this.txtSlideText,
+                        'Chart': this.txtSldLtTChart,
+                        'ClipArt': this.txtClipArt,
+                        'Diagram': this.txtDiagram,
+                        'Date and time': this.txtDateTime,
+                        'Footer': this.txtFooter,
+                        'Header': this.txtHeader,
+                        'Media': this.txtMedia,
+                        'Picture': this.txtPicture,
+                        'Image': this.txtImage,
+                        'Slide number': this.txtSlideNumber,
+                        'Slide subtitle': this.txtSlideSubtitle,
+                        'Table': this.txtSldLtTTbl,
+                        'Slide title': this.txtSlideTitle
+                    }
                 });
 
                 // Localization uiApp params
@@ -603,17 +624,6 @@ define([
                 if (me.api) {
                     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);
-                    translateChart.asc_setXAxis(me.txtXAxis);
-                    translateChart.asc_setYAxis(me.txtYAxis);
-                    translateChart.asc_setSeries(me.txtSeries);
-                    me.api.asc_setChartTranslate(translateChart);
-
-                    var translateArt = new Asc.asc_TextArtTranslate();
-                    translateArt.asc_setDefaultText(me.txtArt);
-                    me.api.asc_setTextArtTranslate(translateArt);
                 }
             },
 
@@ -1220,7 +1230,19 @@ define([
             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'
+            errorBadImageUrl: 'Image url is incorrect',
+            txtSlideText: 'Slide text',
+            txtClipArt: 'Clip Art',
+            txtDiagram: 'Diagram',
+            txtDateTime: 'Date and time',
+            txtFooter: 'Footer',
+            txtHeader: 'Header',
+            txtMedia: 'Media',
+            txtPicture: 'Picture',
+            txtImage: 'Image',
+            txtSlideNumber: 'Slide number',
+            txtSlideSubtitle: 'Slide subtitle',
+            txtSlideTitle: 'Slide title'
         }
     })(), PE.Controllers.Main || {}))
 });

apps/presentationeditor/mobile/app/template/Settings.template

@@ -247,7 +247,7 @@
                     <p><label id="settings-about-info" style="display: none;"></label></p>
                 </div>
                 <div class="content-block" id="settings-about-licensor" style="display: none;">
-                    <div class="content-block-inner" style="padding-top:0; padding-bottom: 1px;"/>
+                    <div class="content-block-inner" style="padding-top:0; padding-bottom: 1px;"></div >
                     <p><label><%= scope.textPoweredBy %></label></p>
                     <h3 class="vendor">Ascensio System SIA</h3>
                     <p><a class="external" target="_blank" href="http://www.onlyoffice.com">www.onlyoffice.com</a></p>
@@ -260,7 +260,7 @@
 <div id="settings-setup-view">
     <div class="navbar">
         <div class="navbar-inner">
-            <div class="left sliding"><a href="#" class="back link"> <i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></a></div>
+            <div class="left sliding"><a href="#" class="back link"><i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
             <div class="center sliding"><%= scope.textSlideSize %></div>
         </div>
     </div>

apps/presentationeditor/mobile/index.html

@@ -249,6 +249,18 @@
             window.sdk_dev_scrpipts.forEach(function(item){
                 document.write('<script type="text/javascript" src="' + item + '"><\/script>');
             });
+
+            window.requireTimeourError = function(){
+                var reqerr;
+
+                if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
+                else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
+                else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
+                else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+                else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
+
+                return reqerr;
+            };
         </script>
         <!-- application -->
         <script data-main="app-dev" src="../../../vendor/requirejs/require.js"></script>

apps/presentationeditor/mobile/index.html.deploy

@@ -236,6 +236,30 @@
                     '<div class="loader-page-text-loading">' + loading + '</div>' +
                     '</div>' +
                 '</div>');
+
+            window.requireTimeourError = function(){
+                var reqerr;
+
+                if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
+                else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
+                else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
+                else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+                else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
+
+                return reqerr;
+            };
+
+            var requireTimeoutID = setTimeout(function(){
+                window.alert(window.requireTimeourError());
+                window.location.reload();
+            }, 30000);
+
+            var require = {
+                waitSeconds: 30,
+                callback: function(){
+                    clearTimeout(requireTimeoutID);
+                }
+            };
         </script>
 
         <div id="viewport"></div>

apps/presentationeditor/mobile/locale/en.json

@@ -193,6 +193,18 @@
   "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.txtSlideText": "Slide text",
+  "PE.Controllers.Main.txtClipArt": "Clip Art",
+  "PE.Controllers.Main.txtDiagram": "Diagram",
+  "PE.Controllers.Main.txtDateTime": "Date and time",
+  "PE.Controllers.Main.txtFooter": "Footer",
+  "PE.Controllers.Main.txtHeader": "Header",
+  "PE.Controllers.Main.txtMedia": "Media",
+  "PE.Controllers.Main.txtPicture": "Picture",
+  "PE.Controllers.Main.txtImage": "Image",
+  "PE.Controllers.Main.txtSlideNumber": "Slide number",
+  "PE.Controllers.Main.txtSlideSubtitle": "Slide subtitle",
+  "PE.Controllers.Main.txtSlideTitle": "Slide title",
   "PE.Controllers.Search.textNoTextFound": "Text not Found",
   "PE.Controllers.Settings.notcriticalErrorTitle": "Warning",
   "PE.Controllers.Settings.txtLoading": "Loading...",

apps/presentationeditor/mobile/locale/zh.json

@@ -0,0 +1,432 @@
+{
+  "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": "此字段应为格式为“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": "此字段应为格式为“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.menuMore": "更多",
+  "PE.Controllers.DocumentHolder.menuOpenLink": "打开链接",
+  "PE.Controllers.DocumentHolder.menuPaste": "粘贴",
+  "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": "此字段应为格式为“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": "此字段应为格式为“http://www.example.com”的网址",
+  "PE.Controllers.EditSlide.textSec": "s",
+  "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": "按“确定”返回文件列表",
+  "PE.Controllers.Main.criticalErrorTitle": "错误:",
+  "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE演示编辑器",
+  "PE.Controllers.Main.downloadErrorText": "下载失败",
+  "PE.Controllers.Main.downloadTextText": "正在下载文件...",
+  "PE.Controllers.Main.downloadTitleText": "下载文件",
+  "PE.Controllers.Main.errorBadImageUrl": "图片地址不正确",
+  "PE.Controllers.Main.errorCoAuthoringDisconnect": "服务器连接丢失。你不能再编辑了。",
+  "PE.Controllers.Main.errorConnectToServer": "无法保存文档。请检查连接设置，或与管理员联系。<BR>当你点击“确定”按钮，系统会提示您下载文件。<BR> <BR>找到更多的信息关于连接文件服务器< a href =“https://api.onlyoffice.com/editors/callback”目标=“_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": "\n该文件版本已经改变了。该页面将被重新加载。",
+  "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": "NLYOFFICE开源版本",
+  "PE.Controllers.Main.textOK": "确定",
+  "PE.Controllers.Main.textPassword": "密码",
+  "PE.Controllers.Main.textPreloader": "载入中…",
+  "PE.Controllers.Main.textShape": "形状",
+  "PE.Controllers.Main.textTryUndoRedo": "快速共同编辑模式下，Undo / Redo功能被禁用。",
+  "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": "对象在文本之上\n",
+  "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": "超过了Maximium图像大小限制。",
+  "PE.Controllers.Main.uploadImageTextText": "上传图片...",
+  "PE.Controllers.Main.uploadImageTitleText": "图片上传中",
+  "PE.Controllers.Main.warnLicenseExp": "您的许可证已过期。<br>请更新您的许可证并刷新页面。",
+  "PE.Controllers.Main.warnNoLicense": "您正在使用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": "地址\n",
+  "PE.Views.AddImage.textBack": "返回",
+  "PE.Views.AddImage.textFromLibrary": "图库",
+  "PE.Views.AddImage.textFromURL": "图片来自网络",
+  "PE.Views.AddImage.textImageURL": "图片地址",
+  "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": "地址\n",
+  "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": "图片来自网络",
+  "PE.Views.EditImage.textImageURL": "图片地址",
+  "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": "地址\n",
+  "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": "电子邮件",
+  "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/spreadsheeteditor/embed/js/ApplicationController.js

@@ -292,7 +292,7 @@ var ApplicationController = new(function(){
     }
 
     function onEditorPermissions(params) {
-        if ( params.asc_getCanBranding() && (typeof config.customization == 'object') &&
+        if ( (params.asc_getLicenseType() === Asc.c_oLicenseResult.Success) && (typeof config.customization == 'object') &&
             config.customization && config.customization.logo ) {
 
             var logo = $('#header-logo');

apps/spreadsheeteditor/main/app.js

@@ -186,37 +186,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
-        var getUrlParams = function() {
+        reqerr = window.requireTimeourError();
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
-                    .replace(/'/g, ''')
-                    .replace(/</g, '&lt;')
-                    .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
-        else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
-        else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
-        else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
-        else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
-
         window.alert(reqerr);
         window.location.reload();
     }

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

@@ -589,7 +589,7 @@ define([
                 if ( state == 'show' )
                     this.dlgSearch.suspendKeyEvents();
                 else
-                    Common.Utils.asyncCall(this.dlgSearch.resumeKeyEvents);
+                    Common.Utils.asyncCall(this.dlgSearch.resumeKeyEvents, this.dlgSearch);
             }
         },
 

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

@@ -102,6 +102,7 @@ define([
 
             onLaunch: function() {
 //                $(document.body).css('position', 'absolute');
+                var me = this;
 
                 this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false};
 
@@ -118,9 +119,32 @@ define([
                 if (value===null) value = window.devicePixelRatio > 1 ? '1' : '3';
 
                 // Initialize api
+                var styleNames = ['Normal', 'Neutral', 'Bad', 'Good', 'Input', 'Output', 'Calculation', 'Check Cell', 'Explanatory Text', 'Note', 'Linked Cell', 'Warning Text',
+                                'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Title', 'Total', 'Currency', 'Percent', 'Comma'],
+                    translate = {
+                        'Series': this.txtSeries,
+                        'Diagram Title': this.txtDiagramTitle,
+                        'X Axis': this.txtXAxis,
+                        'Y Axis': this.txtYAxis,
+                        'Your text here': this.txtArt
+                    };
+                styleNames.forEach(function(item){
+                    translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
+                });
+                translate['Currency [0]'] = me.txtStyle_Currency + ' [0]';
+                translate['Comma [0]'] = me.txtStyle_Comma + ' [0]';
+
+                for (var i=1; i<7; i++) {
+                    translate['Accent'+i] = me.txtAccent + i;
+                    translate['20% - Accent'+i] = '20% - ' + me.txtAccent + i;
+                    translate['40% - Accent'+i] = '40% - ' + me.txtAccent + i;
+                    translate['60% - Accent'+i] = '60% - ' + me.txtAccent + i;
+                }
+
                 this.api = new Asc.spreadsheet_api({
                     'id-view'  : 'editor_sdk',
-                    'id-input' : 'ce-cell-content'
+                    'id-input' : 'ce-cell-content',
+                    'translate': translate
                 });
                 this.api.asc_setFontRenderingMode(parseInt(value));
 
@@ -159,7 +183,6 @@ define([
 
                 this.getApplication().getController('Viewport').setApi(this.api);
 
-                var me = this;
                 // Syncronize focus with api
                 $(document.body).on('focus', 'input, textarea:not(#ce-cell-content)', function(e) {
                     if (me.isAppDisabled === true) return;
@@ -851,19 +874,6 @@ define([
                         },this));
                 }
 
-                if (this.api) {
-                    var translateChart = new Asc.asc_CChartTranslate();
-                    translateChart.asc_setTitle(this.txtDiagramTitle);
-                    translateChart.asc_setXAxis(this.txtXAxis);
-                    translateChart.asc_setYAxis(this.txtYAxis);
-                    translateChart.asc_setSeries(this.txtSeries);
-                    this.api.asc_setChartTranslate(translateChart);
-
-                    var translateArt = new Asc.asc_TextArtTranslate();
-                    translateArt.asc_setDefaultText(this.txtArt);
-                    this.api.asc_setTextArtTranslate(translateArt);
-                }
-
                 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));
@@ -1932,6 +1942,7 @@ define([
                                     isViewer: itemVar.isViewer,
                                     EditorsSupport: itemVar.EditorsSupport,
                                     isVisual: itemVar.isVisual,
+                                    isCustomWindow: itemVar.isCustomWindow,
                                     isModal: itemVar.isModal,
                                     isInsideMode: itemVar.isInsideMode,
                                     initDataType: itemVar.initDataType,
@@ -2100,7 +2111,29 @@ define([
             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.',
             titleServerVersion: 'Editor updated',
-            errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.'
+            errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.',
+            txtAccent: 'Accent',
+            txtStyle_Normal: 'Normal',
+            txtStyle_Heading_1: 'Heading 1',
+            txtStyle_Heading_2: 'Heading 2',
+            txtStyle_Heading_3: 'Heading 3',
+            txtStyle_Heading_4: 'Heading 4',
+            txtStyle_Title: 'Title',
+            txtStyle_Neutral: 'Neutral',
+            txtStyle_Bad: 'Bad',
+            txtStyle_Good: 'Good',
+            txtStyle_Input: 'Input',
+            txtStyle_Output: 'Output',
+            txtStyle_Calculation: 'Calculation',
+            txtStyle_Check_Cell: 'Check Cell',
+            txtStyle_Explanatory_Text: 'Explanatory Text',
+            txtStyle_Note: 'Note',
+            txtStyle_Linked_Cell: 'Linked Cell',
+            txtStyle_Warning_Text: 'Warning Text',
+            txtStyle_Total: 'Total',
+            txtStyle_Currency: 'Currency',
+            txtStyle_Percent: 'Percent',
+            txtStyle_Comma: 'Comma'
         }
     })(), SSE.Controllers.Main || {}))
 });

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

@@ -317,7 +317,8 @@ define([
         },
 
         onPrimary: function() {
-            return true;
+            this.onDlgBtnClick('ok');
+            return false;
         },
 
         onNegativeSelect: function(combo, record) {

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

@@ -126,6 +126,7 @@ define([
             this.btnChat.hide();
 
             this.btnComments.on('click',        _.bind(this.onBtnMenuClick, this));
+            this.btnComments.on('toggle',       _.bind(this.onBtnCommentsToggle, this));
             this.btnChat.on('click',            _.bind(this.onBtnMenuClick, this));
             /** coauthoring end **/
 
@@ -163,6 +164,11 @@ define([
             Common.NotificationCenter.trigger('layout:changed', 'leftmenu');
         },
 
+        onBtnCommentsToggle: function(btn, state) {
+            if (!state)
+                this.fireEvent('comments:hide', this);
+        },
+
         onBtnMenuClick: function(btn, e) {
             this.btnAbout.toggle(false);
 

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

@@ -133,6 +133,7 @@ define([
 
         onPrimary: function() {
             this._handleInput('ok');
+            return false;
         },
 
         cancelButtonText: 'Cancel',

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

@@ -441,6 +441,7 @@ define([    'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
             this.spnColumns = new Common.UI.MetricSpinner({
                 el: $('#shape-columns-number'),
                 step: 1,
+                allowDecimal: false,
                 width: 100,
                 defaultUnit : "",
                 value: '1',

apps/spreadsheeteditor/main/app_dev.js

@@ -177,37 +177,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
-        var getUrlParams = function() {
+        reqerr = window.requireTimeourError();
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
-                    .replace(/'/g, ''')
-                    .replace(/</g, '&lt;')
-                    .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
-        else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
-        else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
-        else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
-        else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
-
         window.alert(reqerr);
         window.location.reload();
     }

apps/spreadsheeteditor/main/index.html

@@ -291,6 +291,18 @@
         window.sdk_dev_scrpipts.forEach(function(item){
             document.write('<script type="text/javascript" src="' + item + '"><\/script>');
         });
+
+        window.requireTimeourError = function(){
+            var reqerr;
+
+            if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
+            else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
+            else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
+            else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+            else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
+
+            return reqerr;
+        };
     </script>
 
     <!-- application -->

apps/spreadsheeteditor/main/index.html.deploy

@@ -255,8 +255,28 @@
                 '</div>' +
             '</div>');
 
+        window.requireTimeourError = function(){
+            var reqerr;
+
+            if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
+            else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
+            else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
+            else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+            else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
+
+            return reqerr;
+        };
+
+        var requireTimeoutID = setTimeout(function(){
+            window.alert(window.requireTimeourError());
+            window.location.reload();
+        }, 30000);
+
         var require = {
-            waitSeconds: 30 
+            waitSeconds: 30,
+            callback: function(){
+                clearTimeout(requireTimeoutID);
+            }
         };
     </script>
 

apps/spreadsheeteditor/main/locale/de.json

@@ -969,6 +969,7 @@
   "SSE.Views.DocumentHolder.textEntriesList": "Aus der Dropdown-Liste wählen\n",
   "SSE.Views.DocumentHolder.textFreezePanes": "Fensterausschnitten fixieren",
   "SSE.Views.DocumentHolder.textNone": "Kein",
+  "SSE.Views.DocumentHolder.textUndo": "Undo",
   "SSE.Views.DocumentHolder.textUnFreezePanes": "Unfreeze Panes",
   "SSE.Views.DocumentHolder.topCellText": "Oben ausrichten",
   "SSE.Views.DocumentHolder.txtAddComment": "Kommentar hinzufügen",

apps/spreadsheeteditor/main/locale/en.json

@@ -364,6 +364,28 @@
   "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.txtAccent": "Accent",
+  "SSE.Controllers.Main.txtStyle_Normal": "Normal",
+  "SSE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
+  "SSE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
+  "SSE.Controllers.Main.txtStyle_Heading_3": "Heading 3",
+  "SSE.Controllers.Main.txtStyle_Heading_4": "Heading 4",
+  "SSE.Controllers.Main.txtStyle_Title": "Title",
+  "SSE.Controllers.Main.txtStyle_Neutral": "Neutral",
+  "SSE.Controllers.Main.txtStyle_Bad": "Bad",
+  "SSE.Controllers.Main.txtStyle_Good": "Good",
+  "SSE.Controllers.Main.txtStyle_Input": "Input",
+  "SSE.Controllers.Main.txtStyle_Output": "Output",
+  "SSE.Controllers.Main.txtStyle_Calculation": "Calculation",
+  "SSE.Controllers.Main.txtStyle_Check_Cell": "Check Cell",
+  "SSE.Controllers.Main.txtStyle_Explanatory_Text": "Explanatory Text",
+  "SSE.Controllers.Main.txtStyle_Note": "Note",
+  "SSE.Controllers.Main.txtStyle_Linked_Cell": "Linked Cell",
+  "SSE.Controllers.Main.txtStyle_Warning_Text": "Warning Text",
+  "SSE.Controllers.Main.txtStyle_Total": "Total",
+  "SSE.Controllers.Main.txtStyle_Currency": "Currency",
+  "SSE.Controllers.Main.txtStyle_Percent": "Percent",
+  "SSE.Controllers.Main.txtStyle_Comma": "Comma",
   "SSE.Controllers.Print.strAllSheets": "All Sheets",
   "SSE.Controllers.Print.textWarning": "Warning",
   "SSE.Controllers.Print.warnCheckMargings": "Margins are incorrect",

apps/spreadsheeteditor/main/locale/fr.json

@@ -84,7 +84,7 @@
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtDelimiter": "Délimiteur",
   "Common.Views.OpenDialog.txtEncoding": "Encodage",
-  "Common.Views.OpenDialog.txtOther": "Other",
+  "Common.Views.OpenDialog.txtOther": "Autres",
   "Common.Views.OpenDialog.txtPassword": "Mot de passe",
   "Common.Views.OpenDialog.txtSpace": "Espace",
   "Common.Views.OpenDialog.txtTab": "Tabulation",
@@ -366,8 +366,8 @@
   "SSE.Controllers.Statusbar.warnDeleteSheet": "La feuille de travail peut contenir des données. Êtes-vous sûr de vouloir continuer ?",
   "SSE.Controllers.Statusbar.zoomText": "Zoom {0}%",
   "SSE.Controllers.Toolbar.confirmAddFontName": "La police que vous allez enregistrer n'est pas disponible sur l'appareil actuel.<br>Le style du texte sera affiché à l'aide de l'une des polices de système, la police sauvée sera utilisée lorsqu'il est disponible.<br>Voulez-vous continuer?",
-  "SSE.Controllers.Toolbar.errorMaxRows": "ERROR! The maximum number of data series per chart is 255",
+  "SSE.Controllers.Toolbar.errorMaxRows": "ERREUR ! Maximum de 255 séries de données par graphique.",
-  "SSE.Controllers.Toolbar.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.Controllers.Toolbar.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.",
   "SSE.Controllers.Toolbar.textAccent": "Types d'accentuation",
   "SSE.Controllers.Toolbar.textBracket": "Crochets",
   "SSE.Controllers.Toolbar.textCancel": "Annuler",
@@ -511,7 +511,7 @@
   "SSE.Controllers.Toolbar.txtIntegralTriple": "Triple intégrale",
   "SSE.Controllers.Toolbar.txtIntegralTripleCenterSubSup": "Triple intégrale",
   "SSE.Controllers.Toolbar.txtIntegralTripleSubSup": "Triple intégrale",
-  "SSE.Controllers.Toolbar.txtInvalidRange": "ERROR! Invalid cell range",
+  "SSE.Controllers.Toolbar.txtInvalidRange": "ERREUR! Plage de cellules est non valable",
   "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Coin",
   "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Coin",
   "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Coin",
@@ -947,8 +947,8 @@
   "SSE.Views.DocumentHolder.deleteColumnText": "Colonne",
   "SSE.Views.DocumentHolder.deleteRowText": "Ligne",
   "SSE.Views.DocumentHolder.deleteTableText": "Tableau",
-  "SSE.Views.DocumentHolder.direct270Text": "Rotation à 270 °",
+  "SSE.Views.DocumentHolder.direct270Text": "Rotation du texte vers le haut",
-  "SSE.Views.DocumentHolder.direct90Text": "Rotation à 90 °",
+  "SSE.Views.DocumentHolder.direct90Text": "Rotation du texte vers le bas",
   "SSE.Views.DocumentHolder.directHText": "Horizontal",
   "SSE.Views.DocumentHolder.directionText": "Orientation du texte",
   "SSE.Views.DocumentHolder.editChartText": "Modifier les données",
@@ -968,7 +968,8 @@
   "SSE.Views.DocumentHolder.textArrangeFront": "Mettre au premier plan",
   "SSE.Views.DocumentHolder.textEntriesList": "Choisir dans la liste déroulante",
   "SSE.Views.DocumentHolder.textFreezePanes": "Verrouiller les volets",
-  "SSE.Views.DocumentHolder.textNone": "None",
+  "SSE.Views.DocumentHolder.textNone": "Aucune",
+  "SSE.Views.DocumentHolder.textUndo": "Undo",
   "SSE.Views.DocumentHolder.textUnFreezePanes": "Dégager les volets",
   "SSE.Views.DocumentHolder.topCellText": "Aligner en haut",
   "SSE.Views.DocumentHolder.txtAddComment": "Ajouter un commentaire",
@@ -1386,7 +1387,7 @@
   "SSE.Views.ShapeSettings.txtWood": "Bois",
   "SSE.Views.ShapeSettingsAdvanced.cancelButtonText": "Annuler",
   "SSE.Views.ShapeSettingsAdvanced.okButtonText": "OK",
-  "SSE.Views.ShapeSettingsAdvanced.strColumns": "Columns",
+  "SSE.Views.ShapeSettingsAdvanced.strColumns": "Colonnes",
   "SSE.Views.ShapeSettingsAdvanced.strMargins": "Rembourrage texte",
   "SSE.Views.ShapeSettingsAdvanced.textAlt": "Texte de remplacement",
   "SSE.Views.ShapeSettingsAdvanced.textAltDescription": "Description",
@@ -1398,7 +1399,7 @@
   "SSE.Views.ShapeSettingsAdvanced.textBevel": "Biseau",
   "SSE.Views.ShapeSettingsAdvanced.textBottom": "En bas",
   "SSE.Views.ShapeSettingsAdvanced.textCapType": "Type de lettrine",
-  "SSE.Views.ShapeSettingsAdvanced.textColNumber": "Number of columns",
+  "SSE.Views.ShapeSettingsAdvanced.textColNumber": "Nombre de colonnes",
   "SSE.Views.ShapeSettingsAdvanced.textEndSize": "Taille de fin",
   "SSE.Views.ShapeSettingsAdvanced.textEndStyle": "Style de fin",
   "SSE.Views.ShapeSettingsAdvanced.textFlat": "Plat",
@@ -1411,7 +1412,7 @@
   "SSE.Views.ShapeSettingsAdvanced.textRight": "A droite",
   "SSE.Views.ShapeSettingsAdvanced.textRound": "Arrondi",
   "SSE.Views.ShapeSettingsAdvanced.textSize": "Taille",
-  "SSE.Views.ShapeSettingsAdvanced.textSpacing": "Spacing between columns",
+  "SSE.Views.ShapeSettingsAdvanced.textSpacing": "Espacement entre les colonnes",
   "SSE.Views.ShapeSettingsAdvanced.textSquare": "Carré",
   "SSE.Views.ShapeSettingsAdvanced.textTitle": "Forme - Paramètres avancés",
   "SSE.Views.ShapeSettingsAdvanced.textTop": "En haut",

apps/spreadsheeteditor/main/locale/ru.json

@@ -357,6 +357,15 @@
   "SSE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.<br>Обновите лицензию, а затем обновите страницу.",
   "SSE.Controllers.Main.warnNoLicense": "Вы используете open source версию ONLYOFFICE. Эта версия имеет ограничения по количеству одновременных подключений к серверу документов (20 подключений одновременно).<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "SSE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
+  "SSE.Controllers.Main.txtAccent": "Акцент",
+  "SSE.Controllers.Main.txtStyle_Normal": "Обычный",
+  "SSE.Controllers.Main.txtStyle_Heading_1": "Заголовок 1",
+  "SSE.Controllers.Main.txtStyle_Heading_2": "Заголовок 2",
+  "SSE.Controllers.Main.txtStyle_Heading_3": "Заголовок 3",
+  "SSE.Controllers.Main.txtStyle_Heading_4": "Заголовок 4",
+  "SSE.Controllers.Main.txtStyle_Currency": "Денежный",
+  "SSE.Controllers.Main.txtStyle_Percent": "Процентный",
+  "SSE.Controllers.Main.txtStyle_Comma": "Финансовый",
   "SSE.Controllers.Print.strAllSheets": "Все листы",
   "SSE.Controllers.Print.textWarning": "Предупреждение",
   "SSE.Controllers.Print.warnCheckMargings": "Неправильные поля",

apps/spreadsheeteditor/mobile/app-dev.js

@@ -204,37 +204,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
-        var getUrlParams = function() {
+        reqerr = window.requireTimeourError();
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&')
-                .replace(/"/g, '"')
-                .replace(/'/g, ''')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
-        else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
-        else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
-        else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
-        else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
-
         window.alert(reqerr);
         window.location.reload();
     }

apps/spreadsheeteditor/mobile/app.js

@@ -214,37 +214,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
-        var getUrlParams = function() {
+        reqerr = window.requireTimeourError();
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&')
-                .replace(/"/g, '"')
-                .replace(/'/g, ''')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
-        else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
-        else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
-        else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
-        else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
-
         window.alert(reqerr);
         window.location.reload();
     }

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

@@ -96,10 +96,33 @@ define([
 
                 // window["flat_desine"] = true;
 
+                var styleNames = ['Normal', 'Neutral', 'Bad', 'Good', 'Input', 'Output', 'Calculation', 'Check Cell', 'Explanatory Text', 'Note', 'Linked Cell', 'Warning Text',
+                        'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Title', 'Total', 'Currency', 'Percent', 'Comma'],
+                    translate = {
+                        'Series': me.txtSeries,
+                        'Diagram Title': me.txtDiagramTitle,
+                        'X Axis': me.txtXAxis,
+                        'Y Axis': me.txtYAxis,
+                        'Your text here': me.txtArt
+                    };
+                styleNames.forEach(function(item){
+                    translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
+                });
+                translate['Currency [0]'] = me.txtStyle_Currency + ' [0]';
+                translate['Comma [0]'] = me.txtStyle_Comma + ' [0]';
+
+                for (var i=1; i<7; i++) {
+                    translate['Accent'+i] = me.txtAccent + i;
+                    translate['20% - Accent'+i] = '20% - ' + me.txtAccent + i;
+                    translate['40% - Accent'+i] = '40% - ' + me.txtAccent + i;
+                    translate['60% - Accent'+i] = '60% - ' + me.txtAccent + i;
+                }
+
                 me.api = new Asc.spreadsheet_api({
                     'id-view'  : 'editor_sdk',
                     'id-input' : 'ce-cell-content'
-                    ,'mobile'  : true
+                    ,'mobile'  : true,
+                    'translate': translate
                 });
 
                 // Localization uiApp params
@@ -618,19 +641,6 @@ define([
                     }
                 });
 
-                if (me.api) {
-                    var translateChart = new Asc.asc_CChartTranslate();
-                    translateChart.asc_setTitle(me.txtDiagramTitle);
-                    translateChart.asc_setXAxis(me.txtXAxis);
-                    translateChart.asc_setYAxis(me.txtYAxis);
-                    translateChart.asc_setSeries(me.txtSeries);
-                    me.api.asc_setChartTranslate(translateChart);
-
-                    var translateArt = new Asc.asc_TextArtTranslate();
-                    translateArt.asc_setDefaultText(me.txtArt);
-                    me.api.asc_setTextArtTranslate(translateArt);
-                }
-
                 if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram) {
                     me.api.asc_registerCallback('asc_onSendThemeColors', _.bind(me.onSendThemeColors, me));
                     me.api.asc_registerCallback('asc_onDownloadUrl',     _.bind(me.onDownloadUrl, me));
@@ -1364,7 +1374,29 @@ define([
             textClose: 'Close',
             textDone: 'Done',
             titleServerVersion: 'Editor updated',
-            errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.'
+            errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.',
+            txtAccent: 'Accent',
+            txtStyle_Normal: 'Normal',
+            txtStyle_Heading_1: 'Heading 1',
+            txtStyle_Heading_2: 'Heading 2',
+            txtStyle_Heading_3: 'Heading 3',
+            txtStyle_Heading_4: 'Heading 4',
+            txtStyle_Title: 'Title',
+            txtStyle_Neutral: 'Neutral',
+            txtStyle_Bad: 'Bad',
+            txtStyle_Good: 'Good',
+            txtStyle_Input: 'Input',
+            txtStyle_Output: 'Output',
+            txtStyle_Calculation: 'Calculation',
+            txtStyle_Check_Cell: 'Check Cell',
+            txtStyle_Explanatory_Text: 'Explanatory Text',
+            txtStyle_Note: 'Note',
+            txtStyle_Linked_Cell: 'Linked Cell',
+            txtStyle_Warning_Text: 'Warning Text',
+            txtStyle_Total: 'Total',
+            txtStyle_Currency: 'Currency',
+            txtStyle_Percent: 'Percent',
+            txtStyle_Comma: 'Comma'
         }
     })(), SSE.Controllers.Main || {}))
 });

apps/spreadsheeteditor/mobile/app/controller/add/AddChart.js

@@ -67,13 +67,6 @@ define([
 
             setApi: function (api) {
                 this.api = api;
-
-                var translateChart = new Asc.asc_CChartTranslate();
-                translateChart.asc_setTitle (this.txtDiagramTitle);
-                translateChart.asc_setXAxis (this.txtXAxis);
-                translateChart.asc_setYAxis (this.txtYAxis);
-                translateChart.asc_setSeries(this.txtSeries);
-                this.api.asc_setChartTranslate(translateChart);
             },
 
             onLaunch: function () {

apps/spreadsheeteditor/mobile/index.html

@@ -250,6 +250,18 @@
             window.sdk_dev_scrpipts.forEach(function(item){
                 document.write('<script type="text/javascript" src="' + item + '"><\/script>');
             });
+
+            window.requireTimeourError = function(){
+                var reqerr;
+
+                if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
+                else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
+                else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
+                else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+                else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
+
+                return reqerr;
+            };
         </script>
         <!-- application -->
         <script data-main="app-dev" src="../../../vendor/requirejs/require.js"></script>

apps/spreadsheeteditor/mobile/index.html.deploy

@@ -235,6 +235,30 @@
                     '<div class="loader-page-text-loading">' + loading + '</div>' +
                     '</div>' +
                 '</div>');
+
+            window.requireTimeourError = function(){
+                var reqerr;
+
+                if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
+                else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
+                else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
+                else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+                else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
+
+                return reqerr;
+            };
+
+            var requireTimeoutID = setTimeout(function(){
+                window.alert(window.requireTimeourError());
+                window.location.reload();
+            }, 30000);
+
+            var require = {
+                waitSeconds: 30,
+                callback: function(){
+                    clearTimeout(requireTimeoutID);
+                }
+            };
         </script>
 
         <div id="viewport"></div>

apps/spreadsheeteditor/mobile/locale/en.json

@@ -235,6 +235,28 @@
   "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.txtAccent": "Accent",
+  "SSE.Controllers.Main.txtStyle_Normal": "Normal",
+  "SSE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
+  "SSE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
+  "SSE.Controllers.Main.txtStyle_Heading_3": "Heading 3",
+  "SSE.Controllers.Main.txtStyle_Heading_4": "Heading 4",
+  "SSE.Controllers.Main.txtStyle_Title": "Title",
+  "SSE.Controllers.Main.txtStyle_Neutral": "Neutral",
+  "SSE.Controllers.Main.txtStyle_Bad": "Bad",
+  "SSE.Controllers.Main.txtStyle_Good": "Good",
+  "SSE.Controllers.Main.txtStyle_Input": "Input",
+  "SSE.Controllers.Main.txtStyle_Output": "Output",
+  "SSE.Controllers.Main.txtStyle_Calculation": "Calculation",
+  "SSE.Controllers.Main.txtStyle_Check_Cell": "Check Cell",
+  "SSE.Controllers.Main.txtStyle_Explanatory_Text": "Explanatory Text",
+  "SSE.Controllers.Main.txtStyle_Note": "Note",
+  "SSE.Controllers.Main.txtStyle_Linked_Cell": "Linked Cell",
+  "SSE.Controllers.Main.txtStyle_Warning_Text": "Warning Text",
+  "SSE.Controllers.Main.txtStyle_Total": "Total",
+  "SSE.Controllers.Main.txtStyle_Currency": "Currency",
+  "SSE.Controllers.Main.txtStyle_Percent": "Percent",
+  "SSE.Controllers.Main.txtStyle_Comma": "Comma",
   "SSE.Controllers.Search.textNoTextFound": "Text not found",
   "SSE.Controllers.Search.textReplaceAll": "Replace All",
   "SSE.Controllers.Settings.notcriticalErrorTitle": "Warning",

apps/spreadsheeteditor/mobile/locale/ru.json

@@ -235,6 +235,15 @@
   "SSE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.<br>Обновите лицензию, а затем обновите страницу.",
   "SSE.Controllers.Main.warnNoLicense": "Вы используете open source версию ONLYOFFICE. Эта версия имеет ограничения по количеству одновременных подключений к серверу документов (20 подключений одновременно).<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "SSE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
+  "SSE.Controllers.Main.txtAccent": "Акцент",
+  "SSE.Controllers.Main.txtStyle_Normal": "Обычный",
+  "SSE.Controllers.Main.txtStyle_Heading_1": "Заголовок 1",
+  "SSE.Controllers.Main.txtStyle_Heading_2": "Заголовок 2",
+  "SSE.Controllers.Main.txtStyle_Heading_3": "Заголовок 3",
+  "SSE.Controllers.Main.txtStyle_Heading_4": "Заголовок 4",
+  "SSE.Controllers.Main.txtStyle_Currency": "Денежный",
+  "SSE.Controllers.Main.txtStyle_Percent": "Процентный",
+  "SSE.Controllers.Main.txtStyle_Comma": "Финансовый",
   "SSE.Controllers.Search.textNoTextFound": "Текст не найден",
   "SSE.Controllers.Search.textReplaceAll": "Заменить все",
   "SSE.Controllers.Settings.notcriticalErrorTitle": "Внимание",

apps/spreadsheeteditor/mobile/locale/zh.json

@@ -0,0 +1,464 @@
+{
+  "Common.UI.ThemeColorPalette.textStandartColors": "标准颜色",
+  "Common.UI.ThemeColorPalette.textThemeColors": "主题颜色",
+  "Common.Utils.Metric.txtCm": "厘米",
+  "Common.Utils.Metric.txtPt": "像素",
+  "SSE.Controllers.AddChart.txtDiagramTitle": "图表标题",
+  "SSE.Controllers.AddChart.txtSeries": "系列",
+  "SSE.Controllers.AddChart.txtXAxis": "X轴",
+  "SSE.Controllers.AddChart.txtYAxis": "Y轴",
+  "SSE.Controllers.AddContainer.textChart": "图表",
+  "SSE.Controllers.AddContainer.textFormula": "功能",
+  "SSE.Controllers.AddContainer.textImage": "图片",
+  "SSE.Controllers.AddContainer.textOther": "其他",
+  "SSE.Controllers.AddContainer.textShape": "形状",
+  "SSE.Controllers.AddLink.textInvalidRange": "错误！单元格范围无效",
+  "SSE.Controllers.AddLink.txtNotUrl": "此字段应为格式为“http://www.example.com”的网址",
+  "SSE.Controllers.AddOther.textEmptyImgUrl": "您需要指定图像URL。",
+  "SSE.Controllers.AddOther.txtNotUrl": "此字段应为格式为“http://www.example.com”的网址",
+  "SSE.Controllers.DocumentHolder.menuAddLink": "增加链接",
+  "SSE.Controllers.DocumentHolder.menuCell": "元件",
+  "SSE.Controllers.DocumentHolder.menuCopy": "复制",
+  "SSE.Controllers.DocumentHolder.menuCut": "剪切",
+  "SSE.Controllers.DocumentHolder.menuDelete": "删除",
+  "SSE.Controllers.DocumentHolder.menuEdit": "编辑",
+  "SSE.Controllers.DocumentHolder.menuHide": "隐藏",
+  "SSE.Controllers.DocumentHolder.menuMerge": "合并",
+  "SSE.Controllers.DocumentHolder.menuMore": "更多",
+  "SSE.Controllers.DocumentHolder.menuOpenLink": "打开链接",
+  "SSE.Controllers.DocumentHolder.menuPaste": "粘贴",
+  "SSE.Controllers.DocumentHolder.menuShow": "显示",
+  "SSE.Controllers.DocumentHolder.menuUnmerge": "取消合并",
+  "SSE.Controllers.DocumentHolder.menuUnwrap": "展开",
+  "SSE.Controllers.DocumentHolder.menuWrap": "包裹",
+  "SSE.Controllers.DocumentHolder.sheetCancel": "取消",
+  "SSE.Controllers.DocumentHolder.warnMergeLostData": "操作可能会破坏所选单元格中的数据。<br>继续？",
+  "SSE.Controllers.EditCell.textAuto": "自动",
+  "SSE.Controllers.EditCell.textFonts": "字体",
+  "SSE.Controllers.EditCell.textPt": "像素",
+  "SSE.Controllers.EditChart.errorMaxRows": "错误！每个图表的最大数据系列数为255。",
+  "SSE.Controllers.EditChart.errorStockChart": "行顺序不正确建立股票图表将数据按照以下顺序放置在表格上：<br>开盘价，最高价格，最低价格，收盘价。",
+  "SSE.Controllers.EditChart.textAuto": "自动",
+  "SSE.Controllers.EditChart.textBetweenTickMarks": "刻度线之间",
+  "SSE.Controllers.EditChart.textBillions": "十亿",
+  "SSE.Controllers.EditChart.textBottom": "底部",
+  "SSE.Controllers.EditChart.textCenter": "中心",
+  "SSE.Controllers.EditChart.textCross": "交叉",
+  "SSE.Controllers.EditChart.textCustom": "自定义",
+  "SSE.Controllers.EditChart.textFit": "适合宽度",
+  "SSE.Controllers.EditChart.textFixed": "固定",
+  "SSE.Controllers.EditChart.textHigh": "高",
+  "SSE.Controllers.EditChart.textHorizontal": "水平的",
+  "SSE.Controllers.EditChart.textHundredMil": "100 000 000",
+  "SSE.Controllers.EditChart.textHundreds": "数以百计",
+  "SSE.Controllers.EditChart.textHundredThousands": "100 000",
+  "SSE.Controllers.EditChart.textIn": "在",
+  "SSE.Controllers.EditChart.textInnerBottom": "内底",
+  "SSE.Controllers.EditChart.textInnerTop": "内顶",
+  "SSE.Controllers.EditChart.textLeft": "左",
+  "SSE.Controllers.EditChart.textLeftOverlay": "左叠加",
+  "SSE.Controllers.EditChart.textLow": "低",
+  "SSE.Controllers.EditChart.textManual": "手动更改",
+  "SSE.Controllers.EditChart.textMaxValue": "最大值",
+  "SSE.Controllers.EditChart.textMillions": "百万",
+  "SSE.Controllers.EditChart.textMinValue": "最小值",
+  "SSE.Controllers.EditChart.textNextToAxis": "在轴旁边",
+  "SSE.Controllers.EditChart.textNone": "没有",
+  "SSE.Controllers.EditChart.textNoOverlay": "没有叠加",
+  "SSE.Controllers.EditChart.textOnTickMarks": "刻度标记",
+  "SSE.Controllers.EditChart.textOut": "退出",
+  "SSE.Controllers.EditChart.textOuterTop": "外顶",
+  "SSE.Controllers.EditChart.textOverlay": "覆盖",
+  "SSE.Controllers.EditChart.textRight": "右",
+  "SSE.Controllers.EditChart.textRightOverlay": "正确覆盖",
+  "SSE.Controllers.EditChart.textRotated": "旋转",
+  "SSE.Controllers.EditChart.textTenMillions": "10 000 000",
+  "SSE.Controllers.EditChart.textTenThousands": "10 000",
+  "SSE.Controllers.EditChart.textThousands": "成千上万",
+  "SSE.Controllers.EditChart.textTop": "顶部",
+  "SSE.Controllers.EditChart.textTrillions": "万亿",
+  "SSE.Controllers.EditChart.textValue": "值",
+  "SSE.Controllers.EditContainer.textCell": "元件",
+  "SSE.Controllers.EditContainer.textChart": "图表",
+  "SSE.Controllers.EditContainer.textHyperlink": "超链接",
+  "SSE.Controllers.EditContainer.textImage": "图片",
+  "SSE.Controllers.EditContainer.textSettings": "设置",
+  "SSE.Controllers.EditContainer.textShape": "形状",
+  "SSE.Controllers.EditContainer.textTable": "表格",
+  "SSE.Controllers.EditContainer.textText": "文本",
+  "SSE.Controllers.EditHyperlink.textDefault": "选择范围",
+  "SSE.Controllers.EditHyperlink.textEmptyImgUrl": "您需要指定图像URL。",
+  "SSE.Controllers.EditHyperlink.textExternalLink": "外部链接",
+  "SSE.Controllers.EditHyperlink.textInternalLink": "内部数据范围",
+  "SSE.Controllers.EditHyperlink.textInvalidRange": "无效的单元格范围",
+  "SSE.Controllers.EditHyperlink.txtNotUrl": "该字段应为“http://www.example.com”格式的URL",
+  "SSE.Controllers.Main.advCSVOptions": "选择CSV选项",
+  "SSE.Controllers.Main.advDRMEnterPassword": "输入密码：",
+  "SSE.Controllers.Main.advDRMOptions": "受保护的文件",
+  "SSE.Controllers.Main.advDRMPassword": "密码",
+  "SSE.Controllers.Main.applyChangesTextText": "数据加载中…",
+  "SSE.Controllers.Main.applyChangesTitleText": "数据加载中",
+  "SSE.Controllers.Main.convertationTimeoutText": "转换超时",
+  "SSE.Controllers.Main.criticalErrorExtText": "按“确定”返回文件列表",
+  "SSE.Controllers.Main.criticalErrorTitle": "错误:",
+  "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE电子表格编辑器",
+  "SSE.Controllers.Main.downloadErrorText": "下载失败",
+  "SSE.Controllers.Main.downloadMergeText": "下载中…",
+  "SSE.Controllers.Main.downloadMergeTitle": "下载中",
+  "SSE.Controllers.Main.downloadTextText": "正在下载文件...",
+  "SSE.Controllers.Main.downloadTitleText": "下载文件",
+  "SSE.Controllers.Main.errorAccessDeny": "您正在尝试执行您没有权限的操作。<br>请联系您的文档服务器管理员.",
+  "SSE.Controllers.Main.errorArgsRange": "一个错误的输入公式。< br >使用不正确的参数范围。",
+  "SSE.Controllers.Main.errorAutoFilterChange": "不允许操作，因为它正在尝试在工作表上的表格中移动单元格。",
+  "SSE.Controllers.Main.errorAutoFilterChangeFormatTable": "无法对所选单元格进行操作，因为您无法移动表格的一部分。<br>选择其他数据范围，以便整个表格被移动并重试。\n",
+  "SSE.Controllers.Main.errorAutoFilterDataRange": "所选单元格区域无法进行操作。<br>选择与现有单元格不同的统一数据范围，然后重试。",
+  "SSE.Controllers.Main.errorAutoFilterHiddenRange": "无法执行操作，因为该区域包含已过滤的单元格。<br>请取消隐藏已过滤的元素，然后重试。",
+  "SSE.Controllers.Main.errorBadImageUrl": "图片地址不正确",
+  "SSE.Controllers.Main.errorCoAuthoringDisconnect": "服务器连接丢失。该文档现在无法编辑",
+  "SSE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。< br >当你点击“OK”按钮,系统将提示您下载文档。< br > < br >找到更多信息连接文件服务器< a href = \" https://api.onlyoffice.com/editors/callback \" target = \"平等\" > < / >在这里",
+  "SSE.Controllers.Main.errorCopyMultiselectArea": "该命令不能与多个选择一起使用。<br>选择一个范围，然后重试。",
+  "SSE.Controllers.Main.errorCountArg": "一个错误的输入公式。< br >正确使用数量的参数。",
+  "SSE.Controllers.Main.errorCountArgExceed": "一个错误的输入公式。< br >超过数量的参数。",
+  "SSE.Controllers.Main.errorCreateDefName": "无法编辑现有的命名范围，因此无法在其中编辑新的范围。",
+  "SSE.Controllers.Main.errorDatabaseConnection": "外部错误。<br>数据库连接错误。如果错误仍然存​​在，请联系支持人员。",
+  "SSE.Controllers.Main.errorDataRange": "数据范围不正确",
+  "SSE.Controllers.Main.errorDefaultMessage": "错误代码：％1",
+  "SSE.Controllers.Main.errorFilePassProtect": "该文档受密码保护，无法打开。",
+  "SSE.Controllers.Main.errorFileRequest": "外部错误。<br>文件请求错误。如果错误仍然存​​在，请与支持部门联系。\n",
+  "SSE.Controllers.Main.errorFileVKey": "外部错误。<br>安全密钥不正确。如果错误仍然存​​在，请与支持部门联系。",
+  "SSE.Controllers.Main.errorFillRange": "无法填充所选范围的单元格。<br>所有合并的单元格的大小必须相同。",
+  "SSE.Controllers.Main.errorFormulaName": "一个错误的输入公式。< br >正确使用公式名称。",
+  "SSE.Controllers.Main.errorFormulaParsing": "解析公式时出现内部错误。",
+  "SSE.Controllers.Main.errorFrmlWrongReferences": "该功能是指不存在的工作表。<br>请检查数据，然后重试。\n",
+  "SSE.Controllers.Main.errorInvalidRef": "输入选择的正确名称或有效参考。",
+  "SSE.Controllers.Main.errorKeyEncrypt": "未知密钥描述",
+  "SSE.Controllers.Main.errorKeyExpire": "密钥过期",
+  "SSE.Controllers.Main.errorLockedAll": "由于工作表被其他用户锁定，因此无法进行操作。\n",
+  "SSE.Controllers.Main.errorLockedWorksheetRename": "此时由于其他用户重命名该表单，因此无法重命名该表",
+  "SSE.Controllers.Main.errorMailMergeLoadFile": "加载失败",
+  "SSE.Controllers.Main.errorMailMergeSaveFile": "合并失败",
+  "SSE.Controllers.Main.errorMoveRange": "不能改变合并单元的一部分",
+  "SSE.Controllers.Main.errorOpenWarning": "文件中的一个公式的长度超过了<br>允许的字符数，并被删除。\n",
+  "SSE.Controllers.Main.errorOperandExpected": "输入的函数语法不正确。请检查你是否缺少一个括号 - '（'或'）'。",
+  "SSE.Controllers.Main.errorPasteMaxRange": "复制和粘贴区域不匹配。<br>请选择相同尺寸的区域，或单击一行中的第一个单元格以粘贴复制的单元格。",
+  "SSE.Controllers.Main.errorPrintMaxPagesCount": "不幸的是，不能在当前的程序版本中一次打印超过1500页。<br>这个限制将在即将发布的版本中被删除。",
+  "SSE.Controllers.Main.errorProcessSaveResult": "保存失败",
+  "SSE.Controllers.Main.errorServerVersion": "该编辑版本已经更新。该页面将被重新加载以应用更改。",
+  "SSE.Controllers.Main.errorSessionAbsolute": "文档编辑会话已过期。请重新加载页面",
+  "SSE.Controllers.Main.errorSessionIdle": "该文件尚未编辑相当长的时间。请重新加载页面。",
+  "SSE.Controllers.Main.errorSessionToken": "与服务器的连接已中断。请重新加载页面。",
+  "SSE.Controllers.Main.errorStockChart": "行顺序不正确建立股票图表将数据按照以下顺序放置在表格上：<br>开盘价，最高价格，最低价格，收盘价。",
+  "SSE.Controllers.Main.errorToken": "文档安全令牌未正确形成。<br>请与您的文件服务器管理员联系。",
+  "SSE.Controllers.Main.errorTokenExpire": "文档安全令牌已过期。<br>请与您的文档服务器管理员联系。",
+  "SSE.Controllers.Main.errorUnexpectedGuid": "外部错误。<br>意外的GUID。如果错误仍然存​​在，请与支持部门联系。",
+  "SSE.Controllers.Main.errorUpdateVersion": "\n该文件版本已经改变了。该页面将被重新加载。",
+  "SSE.Controllers.Main.errorUserDrop": "该文件现在无法访问。",
+  "SSE.Controllers.Main.errorUsersExceed": "超过了定价计划允许的用户数",
+  "SSE.Controllers.Main.errorViewerDisconnect": "连接丢失。您仍然可以查看文档<br>，但在连接恢复之前无法下载或打印。",
+  "SSE.Controllers.Main.errorWrongBracketsCount": "一个错误的输入公式。< br >用括号打错了。",
+  "SSE.Controllers.Main.errorWrongOperator": "公式输入发生错误。操作不当，请改正！",
+  "SSE.Controllers.Main.leavePageText": "您在本文档中有未保存的更改。点击“留在这个页面”等待文档的自动保存。点击“离开此页面”以放弃所有未保存的更改。",
+  "SSE.Controllers.Main.loadFontsTextText": "数据加载中…",
+  "SSE.Controllers.Main.loadFontsTitleText": "数据加载中",
+  "SSE.Controllers.Main.loadFontTextText": "数据加载中…",
+  "SSE.Controllers.Main.loadFontTitleText": "数据加载中",
+  "SSE.Controllers.Main.loadImagesTextText": "图片加载中…",
+  "SSE.Controllers.Main.loadImagesTitleText": "图片加载中",
+  "SSE.Controllers.Main.loadImageTextText": "图片加载中…",
+  "SSE.Controllers.Main.loadImageTitleText": "图片加载中",
+  "SSE.Controllers.Main.loadingDocumentTextText": "文件加载中…",
+  "SSE.Controllers.Main.loadingDocumentTitleText": "文件加载中…",
+  "SSE.Controllers.Main.mailMergeLoadFileText": "原始数据加载中…",
+  "SSE.Controllers.Main.mailMergeLoadFileTitle": "原始数据加载中…",
+  "SSE.Controllers.Main.notcriticalErrorTitle": "警告中",
+  "SSE.Controllers.Main.openErrorText": "打开文件时发生错误",
+  "SSE.Controllers.Main.openTextText": "打开文件...",
+  "SSE.Controllers.Main.openTitleText": "正在打开文件",
+  "SSE.Controllers.Main.printTextText": "打印文件",
+  "SSE.Controllers.Main.printTitleText": "打印文件",
+  "SSE.Controllers.Main.reloadButtonText": "重新加载页面",
+  "SSE.Controllers.Main.requestEditFailedMessageText": "有人正在编辑此文档。请稍后再试。",
+  "SSE.Controllers.Main.requestEditFailedTitleText": "访问被拒绝",
+  "SSE.Controllers.Main.saveErrorText": "保存文件时发生错误",
+  "SSE.Controllers.Main.savePreparingText": "图像上传中……",
+  "SSE.Controllers.Main.savePreparingTitle": "正在保存，请稍候...",
+  "SSE.Controllers.Main.saveTextText": "保存文件",
+  "SSE.Controllers.Main.saveTitleText": "保存文件",
+  "SSE.Controllers.Main.sendMergeText": "任务合并",
+  "SSE.Controllers.Main.sendMergeTitle": "任务合并",
+  "SSE.Controllers.Main.textAnonymous": "匿名",
+  "SSE.Controllers.Main.textBack": "返回",
+  "SSE.Controllers.Main.textBuyNow": "访问网站",
+  "SSE.Controllers.Main.textCancel": "取消",
+  "SSE.Controllers.Main.textClose": "关闭",
+  "SSE.Controllers.Main.textContactUs": "联系销售",
+  "SSE.Controllers.Main.textDone": "完成",
+  "SSE.Controllers.Main.textLoadingDocument": "文件加载中…",
+  "SSE.Controllers.Main.textNoLicenseTitle": "NLYOFFICE开源版本",
+  "SSE.Controllers.Main.textOK": "确定",
+  "SSE.Controllers.Main.textPassword": "密码",
+  "SSE.Controllers.Main.textPreloader": "载入中……",
+  "SSE.Controllers.Main.textShape": "形状",
+  "SSE.Controllers.Main.textStrict": "严格模式",
+  "SSE.Controllers.Main.textTryUndoRedo": "对于快速的协同编辑模式，取消/重做功能是禁用的。< br >单击“严格模式”按钮切换到严格co-editing模式编辑该文件没有其他用户干扰和发送您的更改只后你拯救他们。您可以使用编辑器高级设置在编辑模式之间切换。",
+  "SSE.Controllers.Main.textUsername": "用户名",
+  "SSE.Controllers.Main.titleLicenseExp": "许可证过期",
+  "SSE.Controllers.Main.titleServerVersion": "编辑器已更新",
+  "SSE.Controllers.Main.titleUpdateVersion": "版本已变化",
+  "SSE.Controllers.Main.txtArt": "你的文本在此",
+  "SSE.Controllers.Main.txtBasicShapes": "基本形状",
+  "SSE.Controllers.Main.txtButtons": "按钮",
+  "SSE.Controllers.Main.txtCallouts": "标注",
+  "SSE.Controllers.Main.txtCharts": "图表",
+  "SSE.Controllers.Main.txtDelimiter": "字段分隔符",
+  "SSE.Controllers.Main.txtDiagramTitle": "图表标题",
+  "SSE.Controllers.Main.txtEditingMode": "设置编辑模式..",
+  "SSE.Controllers.Main.txtEncoding": "编码",
+  "SSE.Controllers.Main.txtErrorLoadHistory": "载入记录失败",
+  "SSE.Controllers.Main.txtFiguredArrows": "图形箭头",
+  "SSE.Controllers.Main.txtLines": "行",
+  "SSE.Controllers.Main.txtMath": "数学",
+  "SSE.Controllers.Main.txtRectangles": "矩形",
+  "SSE.Controllers.Main.txtSeries": "系列",
+  "SSE.Controllers.Main.txtSpace": "空格",
+  "SSE.Controllers.Main.txtStarsRibbons": "星星和丝带",
+  "SSE.Controllers.Main.txtTab": "标签",
+  "SSE.Controllers.Main.txtXAxis": "X轴",
+  "SSE.Controllers.Main.txtYAxis": "Y轴",
+  "SSE.Controllers.Main.unknownErrorText": "示知错误",
+  "SSE.Controllers.Main.unsupportedBrowserErrorText ": "你的浏览器不支持",
+  "SSE.Controllers.Main.uploadImageExtMessage": "未知图像格式",
+  "SSE.Controllers.Main.uploadImageFileCountMessage": "没有图片上传",
+  "SSE.Controllers.Main.uploadImageSizeMessage": "超过最大图像尺寸限制。",
+  "SSE.Controllers.Main.uploadImageTextText": "上传图片...",
+  "SSE.Controllers.Main.uploadImageTitleText": "图片上传中",
+  "SSE.Controllers.Main.warnLicenseExp": "您的许可证已过期。<br>请更新您的许可证并刷新页面。",
+  "SSE.Controllers.Main.warnNoLicense": "您正在使用ONLYOFFICE的开源版本。该版本对文档服务器的并发连接有限制（每次20个连接）。<br>如果需要更多请考虑购买商业许可证。",
+  "SSE.Controllers.Main.warnProcessRightsChange": "您被拒绝编辑文件的权限。",
+  "SSE.Controllers.Search.textNoTextFound": "文本没找到",
+  "SSE.Controllers.Search.textReplaceAll": "全部替换",
+  "SSE.Controllers.Settings.notcriticalErrorTitle": "警告中",
+  "SSE.Controllers.Settings.warnDownloadAs": "如果您继续以此格式保存，除文本之外的所有功能将丢失。<br>您确定要继续吗？",
+  "SSE.Controllers.Statusbar.errorLastSheet": "工作簿必须至少有一个可见的工作表",
+  "SSE.Controllers.Statusbar.errorRemoveSheet": "不能删除工作表。",
+  "SSE.Controllers.Statusbar.menuDelete": "删除选定的内容",
+  "SSE.Controllers.Statusbar.menuDuplicate": "复制",
+  "SSE.Controllers.Statusbar.menuHide": "隐藏",
+  "SSE.Controllers.Statusbar.menuUnhide": "取消隐藏",
+  "SSE.Controllers.Statusbar.strSheet": "表格",
+  "SSE.Controllers.Statusbar.textExternalLink": "外部链接",
+  "SSE.Controllers.Statusbar.warnDeleteSheet": "工作表可能有数据。继续操作？",
+  "SSE.Controllers.Toolbar.dlgLeaveMsgText": "您在本文档中有未保存的更改。点击“留在这个页面”等待文档的自动保存。点击“离开此页面”以放弃所有未保存的更改。",
+  "SSE.Controllers.Toolbar.dlgLeaveTitleText": "你退出应用程序",
+  "SSE.Controllers.Toolbar.leaveButtonText": "离开这个页面",
+  "SSE.Controllers.Toolbar.stayButtonText": "保持此页上",
+  "SSE.Views.AddFunction.sCatDateAndTime": "日期和时间",
+  "SSE.Views.AddFunction.sCatEngineering": "工程",
+  "SSE.Views.AddFunction.sCatFinancial": "金融",
+  "SSE.Views.AddFunction.sCatInformation": "信息",
+  "SSE.Views.AddFunction.sCatLogical": "合乎逻辑",
+  "SSE.Views.AddFunction.sCatLookupAndReference": "查找和参考",
+  "SSE.Views.AddFunction.sCatMathematic": "数学和三角学\n",
+  "SSE.Views.AddFunction.sCatStatistical": "统计",
+  "SSE.Views.AddFunction.sCatTextAndData": "文字和数据",
+  "SSE.Views.AddFunction.textBack": "返回",
+  "SSE.Views.AddFunction.textGroups": "分类",
+  "SSE.Views.AddLink.textAddLink": "增加链接",
+  "SSE.Views.AddLink.textAddress": "地址",
+  "SSE.Views.AddLink.textDisplay": "展示",
+  "SSE.Views.AddLink.textExternalLink": "外部链接",
+  "SSE.Views.AddLink.textInsert": "插入",
+  "SSE.Views.AddLink.textInternalLink": "内部数据范围",
+  "SSE.Views.AddLink.textLink": "链接",
+  "SSE.Views.AddLink.textLinkSettings": "链接设置",
+  "SSE.Views.AddLink.textLinkType": "链接类型",
+  "SSE.Views.AddLink.textRange": "范围",
+  "SSE.Views.AddLink.textRequired": "需要",
+  "SSE.Views.AddLink.textSheet": "表格",
+  "SSE.Views.AddLink.textTip": "屏幕提示",
+  "SSE.Views.AddOther.textAddress": "地址",
+  "SSE.Views.AddOther.textBack": "返回",
+  "SSE.Views.AddOther.textFilter": "筛选条件",
+  "SSE.Views.AddOther.textFromLibrary": "图库",
+  "SSE.Views.AddOther.textFromURL": "图片来自网络",
+  "SSE.Views.AddOther.textImageURL": "图片地址",
+  "SSE.Views.AddOther.textInsert": "插入",
+  "SSE.Views.AddOther.textInsertImage": "插入图像",
+  "SSE.Views.AddOther.textLink": "链接",
+  "SSE.Views.AddOther.textSort": "排序和过滤",
+  "SSE.Views.EditCell.textAccounting": "统计",
+  "SSE.Views.EditCell.textAlignBottom": "底部对齐",
+  "SSE.Views.EditCell.textAlignCenter": "居中对齐",
+  "SSE.Views.EditCell.textAlignLeft": "左对齐",
+  "SSE.Views.EditCell.textAlignMiddle": "对齐中间",
+  "SSE.Views.EditCell.textAlignRight": "右对齐",
+  "SSE.Views.EditCell.textAlignTop": "顶端对齐",
+  "SSE.Views.EditCell.textAllBorders": "所有边框",
+  "SSE.Views.EditCell.textBack": "返回",
+  "SSE.Views.EditCell.textBorderStyle": "边框风格",
+  "SSE.Views.EditCell.textBottomBorder": "底端边框",
+  "SSE.Views.EditCell.textCellStyle": "单元格样式",
+  "SSE.Views.EditCell.textColor": "颜色",
+  "SSE.Views.EditCell.textCurrency": "货币",
+  "SSE.Views.EditCell.textDate": "日期",
+  "SSE.Views.EditCell.textDiagDownBorder": "对角线下边界",
+  "SSE.Views.EditCell.textDiagUpBorder": "对角线上边界",
+  "SSE.Views.EditCell.textDollar": "美元",
+  "SSE.Views.EditCell.textEuro": "欧元",
+  "SSE.Views.EditCell.textFillColor": "填色",
+  "SSE.Views.EditCell.textFonts": "字体",
+  "SSE.Views.EditCell.textFormat": "格式",
+  "SSE.Views.EditCell.textGeneral": "常规",
+  "SSE.Views.EditCell.textInBorders": "内陆边界",
+  "SSE.Views.EditCell.textInHorBorder": "水平边框",
+  "SSE.Views.EditCell.textInteger": "整数",
+  "SSE.Views.EditCell.textInVertBorder": "内垂直边界",
+  "SSE.Views.EditCell.textJustified": "正当",
+  "SSE.Views.EditCell.textLeftBorder": "左边界",
+  "SSE.Views.EditCell.textMedium": "中",
+  "SSE.Views.EditCell.textNoBorder": "没有边界",
+  "SSE.Views.EditCell.textNumber": "数",
+  "SSE.Views.EditCell.textPercentage": "百分比",
+  "SSE.Views.EditCell.textPound": "磅",
+  "SSE.Views.EditCell.textRightBorder": "右边界",
+  "SSE.Views.EditCell.textRouble": "卢布",
+  "SSE.Views.EditCell.textScientific": "科学",
+  "SSE.Views.EditCell.textSize": "大小",
+  "SSE.Views.EditCell.textText": "文本",
+  "SSE.Views.EditCell.textTextColor": "文字颜色",
+  "SSE.Views.EditCell.textTextFormat": "文本格式",
+  "SSE.Views.EditCell.textThick": "厚",
+  "SSE.Views.EditCell.textThin": "瘦",
+  "SSE.Views.EditCell.textTime": "时间",
+  "SSE.Views.EditCell.textTopBorder": "顶级边界",
+  "SSE.Views.EditCell.textWrapText": "文字换行",
+  "SSE.Views.EditCell.textYen": "日元",
+  "SSE.Views.EditChart.textAuto": "自动",
+  "SSE.Views.EditChart.textAxisCrosses": "轴十字架",
+  "SSE.Views.EditChart.textAxisOptions": "轴的选择",
+  "SSE.Views.EditChart.textAxisPosition": "轴的位置",
+  "SSE.Views.EditChart.textAxisTitle": "轴题标",
+  "SSE.Views.EditChart.textBack": "返回",
+  "SSE.Views.EditChart.textBackward": "向后移动",
+  "SSE.Views.EditChart.textBorder": "边界",
+  "SSE.Views.EditChart.textBottom": "底部",
+  "SSE.Views.EditChart.textChart": "图表",
+  "SSE.Views.EditChart.textChartTitle": "图表标题",
+  "SSE.Views.EditChart.textColor": "颜色",
+  "SSE.Views.EditChart.textCrossesValue": "跨越价值",
+  "SSE.Views.EditChart.textDataLabels": "数据标签",
+  "SSE.Views.EditChart.textDesign": "设计",
+  "SSE.Views.EditChart.textDisplayUnits": "显示单位",
+  "SSE.Views.EditChart.textFill": "填满",
+  "SSE.Views.EditChart.textForward": "向前移动",
+  "SSE.Views.EditChart.textHorAxis": "横轴",
+  "SSE.Views.EditChart.textHorizontal": "水平的",
+  "SSE.Views.EditChart.textLabelOptions": "标签选项",
+  "SSE.Views.EditChart.textLabelPos": "标签位置",
+  "SSE.Views.EditChart.textLayout": "布局",
+  "SSE.Views.EditChart.textLeft": "左",
+  "SSE.Views.EditChart.textLeftOverlay": "左叠加",
+  "SSE.Views.EditChart.textLegend": "传说",
+  "SSE.Views.EditChart.textMajor": "主要",
+  "SSE.Views.EditChart.textMajorMinor": "主要和次要",
+  "SSE.Views.EditChart.textMajorType": "主要类型",
+  "SSE.Views.EditChart.textMaxValue": "最大值",
+  "SSE.Views.EditChart.textMinor": "次要",
+  "SSE.Views.EditChart.textMinorType": "次要类型",
+  "SSE.Views.EditChart.textMinValue": "最小值",
+  "SSE.Views.EditChart.textNone": "没有",
+  "SSE.Views.EditChart.textNoOverlay": "没有叠加",
+  "SSE.Views.EditChart.textOverlay": "覆盖",
+  "SSE.Views.EditChart.textRemoveChart": "删除图表",
+  "SSE.Views.EditChart.textReorder": "重新订购",
+  "SSE.Views.EditChart.textRight": "右",
+  "SSE.Views.EditChart.textRightOverlay": "正确覆盖",
+  "SSE.Views.EditChart.textRotated": "旋转",
+  "SSE.Views.EditChart.textSize": "大小",
+  "SSE.Views.EditChart.textStyle": "类型",
+  "SSE.Views.EditChart.textTickOptions": "勾选选项",
+  "SSE.Views.EditChart.textToBackground": "发送到背景",
+  "SSE.Views.EditChart.textToForeground": "放到最上面",
+  "SSE.Views.EditChart.textTop": "顶部",
+  "SSE.Views.EditChart.textType": "类型",
+  "SSE.Views.EditChart.textValReverseOrder": "值相反的顺序",
+  "SSE.Views.EditChart.textVerAxis": "垂直轴",
+  "SSE.Views.EditChart.textVertical": "垂直",
+  "SSE.Views.EditHyperlink.textBack": "返回",
+  "SSE.Views.EditHyperlink.textDisplay": "展示",
+  "SSE.Views.EditHyperlink.textEditLink": "编辑链接",
+  "SSE.Views.EditHyperlink.textExternalLink": "外部链接",
+  "SSE.Views.EditHyperlink.textInternalLink": "内部数据范围",
+  "SSE.Views.EditHyperlink.textLink": "链接",
+  "SSE.Views.EditHyperlink.textLinkType": "链接类型",
+  "SSE.Views.EditHyperlink.textRange": "范围",
+  "SSE.Views.EditHyperlink.textRemoveLink": "删除链接",
+  "SSE.Views.EditHyperlink.textScreenTip": "屏幕提示",
+  "SSE.Views.EditHyperlink.textSheet": "表格",
+  "SSE.Views.EditImage.textAddress": "地址",
+  "SSE.Views.EditImage.textBack": "返回",
+  "SSE.Views.EditImage.textBackward": "向后移动",
+  "SSE.Views.EditImage.textDefault": "默认大小",
+  "SSE.Views.EditImage.textForward": "向前移动",
+  "SSE.Views.EditImage.textFromLibrary": "图库",
+  "SSE.Views.EditImage.textFromURL": "图片来自网络",
+  "SSE.Views.EditImage.textImageURL": "图片地址",
+  "SSE.Views.EditImage.textLinkSettings": "链接设置",
+  "SSE.Views.EditImage.textRemove": "删除图片",
+  "SSE.Views.EditImage.textReorder": "重新订购",
+  "SSE.Views.EditImage.textReplace": "替换",
+  "SSE.Views.EditImage.textReplaceImg": "替换图像",
+  "SSE.Views.EditImage.textToBackground": "发送到背景",
+  "SSE.Views.EditImage.textToForeground": "放到最上面",
+  "SSE.Views.EditShape.textBack": "返回",
+  "SSE.Views.EditShape.textBackward": "向后移动",
+  "SSE.Views.EditShape.textBorder": "边界",
+  "SSE.Views.EditShape.textColor": "颜色",
+  "SSE.Views.EditShape.textEffects": "效果",
+  "SSE.Views.EditShape.textFill": "填满",
+  "SSE.Views.EditShape.textForward": "向前移动",
+  "SSE.Views.EditShape.textOpacity": "不透明度",
+  "SSE.Views.EditShape.textRemoveShape": "去除形状",
+  "SSE.Views.EditShape.textReorder": "重新订购",
+  "SSE.Views.EditShape.textReplace": "替换",
+  "SSE.Views.EditShape.textSize": "大小",
+  "SSE.Views.EditShape.textStyle": "类型",
+  "SSE.Views.EditShape.textToBackground": "发送到背景",
+  "SSE.Views.EditShape.textToForeground": "放到最上面",
+  "SSE.Views.EditText.textBack": "返回",
+  "SSE.Views.EditText.textFillColor": "填色",
+  "SSE.Views.EditText.textFonts": "字体",
+  "SSE.Views.EditText.textSize": "大小",
+  "SSE.Views.EditText.textTextColor": "文字颜色",
+  "SSE.Views.Search.textDone": "完成",
+  "SSE.Views.Search.textFind": "发现",
+  "SSE.Views.Search.textFindAndReplace": "查找和替换",
+  "SSE.Views.Search.textMatchCase": "相符",
+  "SSE.Views.Search.textMatchCell": "匹配单元格",
+  "SSE.Views.Search.textReplace": "替换",
+  "SSE.Views.Search.textSearch": "搜索",
+  "SSE.Views.Search.textSearchIn": "搜索",
+  "SSE.Views.Search.textSheet": "表格",
+  "SSE.Views.Search.textWorkbook": "工作簿",
+  "SSE.Views.Settings.textAbout": "关于",
+  "SSE.Views.Settings.textAddress": "地址",
+  "SSE.Views.Settings.textAuthor": "作者",
+  "SSE.Views.Settings.textBack": "返回",
+  "SSE.Views.Settings.textCreateDate": "创建日期",
+  "SSE.Views.Settings.textDocInfo": "电子表格信息",
+  "SSE.Views.Settings.textDocTitle": "电子表格标题",
+  "SSE.Views.Settings.textDone": "完成",
+  "SSE.Views.Settings.textDownload": "下载",
+  "SSE.Views.Settings.textDownloadAs": "下载为...",
+  "SSE.Views.Settings.textEditDoc": "编辑文档",
+  "SSE.Views.Settings.textEmail": "电子邮件",
+  "SSE.Views.Settings.textFind": "发现",
+  "SSE.Views.Settings.textFindAndReplace": "查找和替换",
+  "SSE.Views.Settings.textHelp": "帮助",
+  "SSE.Views.Settings.textLoading": "载入中……",
+  "SSE.Views.Settings.textSettings": "设置",
+  "SSE.Views.Settings.textTel": "电话",
+  "SSE.Views.Settings.textVersion": "版本",
+  "SSE.Views.Settings.unknownText": "未知",
+  "SSE.Views.Toolbar.textBack": "返回"
+}