diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 6a68577cc..304b365b3 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -45,6 +45,7 @@ changeHistory: , // default = false comment: // default = edit, modifyFilter: // default = true + modifyContentControl: // default = true } }, editorConfig: { diff --git a/apps/common/main/lib/controller/Protection.js b/apps/common/main/lib/controller/Protection.js index 8cf112051..3939ef431 100644 --- a/apps/common/main/lib/controller/Protection.js +++ b/apps/common/main/lib/controller/Protection.js @@ -110,8 +110,8 @@ define([ return this; }, - onDocumentPassword: function(hasPassword) { - this.view && this.view.onDocumentPassword(hasPassword); + onDocumentPassword: function(hasPassword, disabled) { + this.view && this.view.onDocumentPassword(hasPassword, disabled); }, SetDisabled: function(state, canProtect) { diff --git a/apps/common/main/lib/view/Protection.js b/apps/common/main/lib/view/Protection.js index 43623b50e..0f4683c37 100644 --- a/apps/common/main/lib/view/Protection.js +++ b/apps/common/main/lib/view/Protection.js @@ -111,7 +111,7 @@ define([ this.btnsDelPwd = []; this.btnsChangePwd = []; - this._state = {disabled: false, hasPassword: false}; + this._state = {disabled: false, hasPassword: false, disabledPassword: false}; var filter = Common.localStorage.getKeysFilter(); this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : ''; @@ -235,7 +235,7 @@ define([ cls: 'btn-text-default', style: 'width: 100%;', caption: this.txtAddPwd, - disabled: this._state.disabled, + disabled: this._state.disabled || this._state.disabledPassword, visible: !this._state.hasPassword }); this.btnsAddPwd.push(button); @@ -246,7 +246,7 @@ define([ cls: 'btn-text-default', style: 'width: 100%;', caption: this.txtDeletePwd, - disabled: this._state.disabled, + disabled: this._state.disabled || this._state.disabledPassword, visible: this._state.hasPassword }); this.btnsDelPwd.push(button); @@ -257,7 +257,7 @@ define([ cls: 'btn-text-default', style: 'width: 100%;', caption: this.txtChangePwd, - disabled: this._state.disabled, + disabled: this._state.disabled || this._state.disabledPassword, visible: this._state.hasPassword }); this.btnsChangePwd.push(button); @@ -279,21 +279,25 @@ define([ } this.btnsAddPwd.concat(this.btnsDelPwd, this.btnsChangePwd).forEach(function(button) { if ( button ) { - button.setDisabled(state); + button.setDisabled(state || this._state.disabledPassword); } }, this); }, - onDocumentPassword: function (hasPassword) { + onDocumentPassword: function (hasPassword, disabledPassword) { this._state.hasPassword = hasPassword; + this._state.disabledPassword = !!disabledPassword; + var disabled = this._state.disabledPassword || this._state.disabled; this.btnsAddPwd && this.btnsAddPwd.forEach(function(button) { if ( button ) { button.setVisible(!hasPassword); + button.setDisabled(disabled); } }, this); this.btnsDelPwd.concat(this.btnsChangePwd).forEach(function(button) { if ( button ) { button.setVisible(hasPassword); + button.setDisabled(disabled); } }, this); this.btnPwd.setVisible(hasPassword); diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 782457e60..4566602cc 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -134,13 +134,14 @@ #header-logo { max-width: 200px; height: 100%; - padding: 7px 24px 7px 12px; + padding: 6px 24px 6px 12px; i { cursor: pointer; width: 86px; height: 20px; - display: block; + display: inline-block; + vertical-align: middle; .background-ximage('@{common-image-path}/header/header-logo.png', '@{common-image-path}/header/header-logo@2x.png', 86px); } diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 3658c8c8d..964f1060f 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -108,7 +108,7 @@ define([ weakCompare : function(obj1, obj2){return obj1.type === obj2.type;} }); - this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false}; + this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false}; this.languages = null; this.translationTable = []; // Initialize viewport @@ -994,16 +994,27 @@ define([ onLicenseChanged: function(params) { var licType = params.asc_getLicenseType(); - if (licType !== undefined && (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount) && this.appOptions.canEdit && this.editorConfig.mode !== 'view') { - this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) ? this.warnNoLicense : this.warnNoLicenseUsers; - } + if (licType !== undefined && this.appOptions.canEdit && this.editorConfig.mode !== 'view' && + (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount || licType===Asc.c_oLicenseResult.ConnectionsOS || licType===Asc.c_oLicenseResult.UsersCountOS)) + this._state.licenseType = licType; if (this._isDocReady) this.applyLicense(); }, applyLicense: function() { - if (this._state.licenseWarning) { + if (this._state.licenseType) { + var license = this._state.licenseType, + buttons = ['ok'], + primary = 'ok'; + if (license===Asc.c_oLicenseResult.Connections || license===Asc.c_oLicenseResult.UsersCount) { + license = (license===Asc.c_oLicenseResult.Connections) ? this.warnLicenseExceeded : this.warnLicenseUsersExceeded; + } else { + license = (license===Asc.c_oLicenseResult.ConnectionsOS) ? this.warnNoLicense : this.warnNoLicenseUsers; + buttons = [{value: 'buynow', caption: this.textBuyNow}, {value: 'contact', caption: this.textContactUs}]; + primary = 'buynow'; + } + this.disableEditing(true); Common.NotificationCenter.trigger('api:disconnect'); @@ -1015,12 +1026,9 @@ define([ Common.UI.info({ width: 500, title: this.textNoLicenseTitle, - msg : this._state.licenseWarning, - buttons: [ - {value: 'buynow', caption: this.textBuyNow}, - {value: 'contact', caption: this.textContactUs} - ], - primary: 'buynow', + msg : license, + buttons: buttons, + primary: primary, callback: function(btn) { if (btn == 'buynow') window.open('https://www.onlyoffice.com', "_blank"); @@ -1089,8 +1097,9 @@ define([ this.appOptions.forcesave = this.appOptions.canForcesave; this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly); this.appOptions.trialMode = params.asc_getLicenseMode(); - this.appOptions.isProtectSupport = false; // remove in 5.2 + this.appOptions.isProtectSupport = true; // remove in 5.2 this.appOptions.canProtect = this.appOptions.isProtectSupport && this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport(); + this.appOptions.canEditContentControl = (this.permissions.modifyContentControl!==false); if ( this.appOptions.isLightVersion ) { this.appOptions.canUseHistory = @@ -1384,6 +1393,10 @@ define([ console.warn(config.msg); break; + case Asc.c_oAscError.ID.DataEncrypted: + config.msg = this.errorDataEncrypted; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -1404,6 +1417,10 @@ define([ Common.NotificationCenter.trigger('goback'); } } + if (id == Asc.c_oAscError.ID.DataEncrypted) { + this.api.asc_coAuthoringDisconnect(); + Common.NotificationCenter.trigger('api:disconnect'); + } } else { Common.Gateway.reportWarning(id, config.msg); @@ -2192,7 +2209,6 @@ define([ txtErrorLoadHistory: 'Loading history failed', textBuyNow: 'Visit website', textNoLicenseTitle: 'ONLYOFFICE open source version', - warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider upgrading your current license or purchasing a commercial one.', textContactUs: 'Contact sales', errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download or print until the connection is restored.', warnLicenseExp: 'Your license has expired.
Please update your license and refresh the page.', @@ -2240,10 +2256,14 @@ define([ txtOddPage: "Odd Page ", txtSameAsPrev: "Same as Previous", txtCurrentDocument: "Current Document", - warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.', txtNoTableOfContents: "No table of contents entries found.", txtTableOfContents: "Table of Contents", - errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later." + errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.", + warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.', + warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.', + warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index d2051f391..470e2a29b 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -2718,7 +2718,7 @@ define([ me.toolbar.btnPaste.$el.detach().appendTo($box); me.toolbar.btnCopy.$el.removeClass('split'); - if ( config.isProtectSupport && config.isOffline ) { + if ( config.isProtectSupport && config.isOffline && false ) { // don't add protect panel to toolbar tab = {action: 'protect', caption: me.toolbar.textTabProtect}; $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 6664619ad..415fd7d13 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -2862,6 +2862,7 @@ define([ var control_props = me.api.asc_GetContentControlProperties(), lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked; menuTableRemoveControl.setDisabled(lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); + menuTableControlSettings.setVisible(me.mode.canEditContentControl); } menuTableTOC.setVisible(in_toc); }, @@ -3402,7 +3403,7 @@ define([ var in_toc = me.api.asc_GetTableOfContentsPr(true), in_control = !in_toc && me.api.asc_IsContentControl() ; menuParaRemoveControl.setVisible(in_control); - menuParaControlSettings.setVisible(in_control); + menuParaControlSettings.setVisible(in_control && me.mode.canEditContentControl); menuParaControlSeparator.setVisible(in_control); if (in_control) { var control_props = me.api.asc_GetContentControlProperties(), diff --git a/apps/documenteditor/main/app/view/ParagraphSettings.js b/apps/documenteditor/main/app/view/ParagraphSettings.js index 8678f5172..422d7195e 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettings.js +++ b/apps/documenteditor/main/app/view/ParagraphSettings.js @@ -168,7 +168,6 @@ define([ this.cmbLineRule.on('selected', _.bind(this.onLineRuleSelect, this)); this.cmbLineRule.on('hide:after', _.bind(this.onHideMenus, this)); $(this.el).on('click', '#paragraph-advanced-link', _.bind(this.openAdvancedSettings, this)); - $(this.el).on('click', '#paragraph-color-new', _.bind(this.addNewColor, this)); this.TextOnlySettings = $('.text-only'); }, @@ -453,6 +452,7 @@ define([ transparent: true }); this.mnuColorPicker.on('select', _.bind(this.onColorPickerSelect, this)); + this.btnColor.menu.items[1].on('click', _.bind(this.addNewColor, this)); } this.mnuColorPicker.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); }, diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 600d1b249..9d303266c 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -1586,7 +1586,7 @@ define([ transparent: true }); this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this)); - $(this.el).on('click', '#shape-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); + this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); this.btnFGColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1605,7 +1605,7 @@ define([ value: '000000' }); this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this)); - $(this.el).on('click', '#shape-foreground-color-new', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor)); + this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor)); this.btnBGColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1624,7 +1624,7 @@ define([ value: 'ffffff' }); this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this)); - $(this.el).on('click', '#shape-background-color-new', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor)); + this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor)); this.btnGradColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1643,7 +1643,7 @@ define([ value: '000000' }); this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this)); - $(this.el).on('click', '#shape-gradient-color-new', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor)); + this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor)); this.btnBorderColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1662,7 +1662,7 @@ define([ value: '000000' }); this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this)); - $(this.el).on('click', '#shape-border-color-new', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor)); + this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor)); } this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js index cde71c953..591e11007 100644 --- a/apps/documenteditor/main/app/view/TableSettings.js +++ b/apps/documenteditor/main/app/view/TableSettings.js @@ -652,7 +652,7 @@ define([ el: $('#table-border-color-menu') }); this.borderColor.on('select', _.bind(this.onColorsBorderSelect, this)); - $(this.el).on('click', '#table-border-color-new', _.bind(this.addNewColor, this, this.borderColor, this.btnBorderColor)); + this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.borderColor, this.btnBorderColor)); this.btnBackColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -670,7 +670,7 @@ define([ transparent: true }); this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this)); - $(this.el).on('click', '#table-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor, this.btnBackColor)); + this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); } this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); this.borderColor.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js index 3e0e7cfde..8464ad152 100644 --- a/apps/documenteditor/main/app/view/TextArtSettings.js +++ b/apps/documenteditor/main/app/view/TextArtSettings.js @@ -1080,7 +1080,7 @@ define([ value: '000000' }); this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this)); - $(this.el).on('click', '#textart-border-color-new', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor)); + this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor)); this.btnGradColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1099,7 +1099,7 @@ define([ value: '000000' }); this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this)); - $(this.el).on('click', '#textart-gradient-color-new', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor)); + this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor)); this.btnBackColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1119,7 +1119,7 @@ define([ transparent: true }); this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this)); - $(this.el).on('click', '#textart-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); + this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); } this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index cc81c48d9..d957ecf9e 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1966,6 +1966,8 @@ define([ this.btnMailRecepients.setVisible(mode.canCoAuthoring == true && mode.canUseMailMerge); this.listStylesAdditionalMenuItem.setVisible(mode.canEditStyles); + this.btnContentControls.menu.items[4].setVisible(mode.canEditContentControl); + this.btnContentControls.menu.items[5].setVisible(mode.canEditContentControl); }, onSendThemeColorSchemes: function (schemas) { @@ -2179,7 +2181,7 @@ define([ tipLineSpace: 'Paragraph Line Spacing', tipPrColor: 'Background color', tipInsertTable: 'Insert Table', - tipInsertImage: 'Insert Picture', + tipInsertImage: 'Insert Image', tipPageBreak: 'Insert Page or Section break', tipInsertNum: 'Insert Page Number', tipClearStyle: 'Clear Style', @@ -2189,8 +2191,8 @@ define([ tipBack: 'Back', tipInsertShape: 'Insert Autoshape', tipInsertEquation: 'Insert Equation', - mniImageFromFile: 'Picture from file', - mniImageFromUrl: 'Picture from url', + mniImageFromFile: 'Image from file', + mniImageFromUrl: 'Image from url', mniCustomTable: 'Insert Custom Table', textTitleError: 'Error', textInsertPageNumber: 'Insert page number', @@ -2281,7 +2283,7 @@ define([ textCharts: 'Charts', tipChangeChart: 'Change Chart Type', capBtnInsPagebreak: 'Page Break', - capBtnInsImage: 'Picture', + capBtnInsImage: 'Image', capBtnInsTable: 'Table', capBtnInsChart: 'Chart', textTabFile: 'File', diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index 02ba6adb2..12bad3563 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -217,7 +217,7 @@ "Common.Views.Protection.txtEncrypt": "Verschlüsseln", "Common.Views.Protection.txtInvisibleSignature": "Fügen Sie eine digitale Signatur hinzu", "Common.Views.Protection.txtSignature": "Signatur", - "Common.Views.Protection.txtSignatureLine": "Signaturzeile", + "Common.Views.Protection.txtSignatureLine": "Signaturzeile hinzufügen", "Common.Views.RenameDialog.cancelButtonText": "Abbrechen", "Common.Views.RenameDialog.okButtonText": "OK", "Common.Views.RenameDialog.textName": "Dateiname", @@ -322,8 +322,9 @@ "DE.Controllers.Main.errorAccessDeny": "Sie haben versucht die Änderungen im Dokument, zu dem Sie keine Berechtigungen haben, vorzunehemen.
Wenden Sie sich an Ihren Serveradministrator.", "DE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Das Dokument kann momentan nicht bearbeitet werden.", - "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen, oder richten Sie an Ihren Administrator.
Wann Sie auf den Button \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

Mehr Information zur Verbindung des Dokument Servers finden Sie hier", + "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.
Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie hier", "DE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.
Fehler beim Verbinden zur Datenbank. Bitte wenden Sie sich an den Kundendienst, falls der Fehler bestehen bleibt.", + "DE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.", "DE.Controllers.Main.errorDataRange": "Falscher Datenbereich.", "DE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1", "DE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.", @@ -446,9 +447,11 @@ "DE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen", "DE.Controllers.Main.warnBrowserIE9": "Die Applkation hat geringte Fähigkeiten in IE9. Nutzen Sie IE10 oder höher.", "DE.Controllers.Main.warnBrowserZoom": "Die aktuelle Zoom-Einstellung Ihres Webbrowsers wird nicht völlig unterstützt. Bitte stellen Sie die Standardeinstellung mithilfe der Tastenkombination Strg+0 wieder her.", + "DE.Controllers.Main.warnLicenseExceeded": "Die Anzahl gleichzeitiger Verbindungen zum Document Server wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet.
Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.", "DE.Controllers.Main.warnLicenseExp": "Ihre Lizenz ist abgelaufen.
Bitte aktualisieren Sie Ihre Lizenz und laden Sie die Seite neu.", - "DE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zu Dokumentenserver.
Wenn Sie mehr Verbindungen benötigen, aktualisieren Sie diese Version oder erwerben Sie eine kommerzielle Lizenz.", - "DE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer.
Wenn Sie mehr Nutzer benötigen, achten Sie bitte darauf, dass Sie entweder Ihre derzeitige Lizenz aktualisieren oder eine kommerzielle erwerben müssen.", + "DE.Controllers.Main.warnLicenseUsersExceeded": "Die Anzahl der gleichzeitigen Benutzer wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet.
Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.", + "DE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zum Dokumentenserver.
Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.", + "DE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer.
Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.", "DE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.", "DE.Controllers.Navigation.txtBeginning": "Anfang des Dokuments", "DE.Controllers.Navigation.txtGotoBeginning": "Zum Anfang des Dokuments übergehnen", @@ -1413,8 +1416,10 @@ "DE.Views.PageSizeDialog.cancelButtonText": "Abbrechen", "DE.Views.PageSizeDialog.okButtonText": "Ok", "DE.Views.PageSizeDialog.textHeight": "Höhe", + "DE.Views.PageSizeDialog.textPreset": "Voreinstellung", "DE.Views.PageSizeDialog.textTitle": "Seitenformat", "DE.Views.PageSizeDialog.textWidth": "Breite", + "DE.Views.PageSizeDialog.txtCustom": "Benutzerdefinierte", "DE.Views.ParagraphSettings.strLineHeight": "Zeilenabstand", "DE.Views.ParagraphSettings.strParagraphSpacing": "Absatzabstand", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Kein Abstand zwischen Absätzen gleicher Formatierung", diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 92f0f2cfc..4e30f4f9d 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -217,7 +217,7 @@ "Common.Views.Protection.txtEncrypt": "Encrypt", "Common.Views.Protection.txtInvisibleSignature": "Add digital signature", "Common.Views.Protection.txtSignature": "Signature", - "Common.Views.Protection.txtSignatureLine": "Signature line", + "Common.Views.Protection.txtSignatureLine": "Add signature line", "Common.Views.RenameDialog.cancelButtonText": "Cancel", "Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.textName": "File name", @@ -324,6 +324,7 @@ "DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.", "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.

Find more information about connecting Document Server here", "DE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please contact support in case the error persists.", + "DE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "DE.Controllers.Main.errorDataRange": "Incorrect data range.", "DE.Controllers.Main.errorDefaultMessage": "Error code: %1", "DE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.", @@ -446,9 +447,11 @@ "DE.Controllers.Main.uploadImageTitleText": "Uploading Image", "DE.Controllers.Main.warnBrowserIE9": "The application has low capabilities on IE9. Use IE10 or higher", "DE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.", + "DE.Controllers.Main.warnLicenseExceeded": "The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.", "DE.Controllers.Main.warnLicenseExp": "Your license has expired.
Please update your license and refresh the page.", - "DE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider upgrading your current license or purchasing a commercial one.", - "DE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.", + "DE.Controllers.Main.warnLicenseUsersExceeded": "The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.", + "DE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", + "DE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.
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.Navigation.txtBeginning": "Beginning of document", "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document", @@ -1413,8 +1416,10 @@ "DE.Views.PageSizeDialog.cancelButtonText": "Cancel", "DE.Views.PageSizeDialog.okButtonText": "Ok", "DE.Views.PageSizeDialog.textHeight": "Height", + "DE.Views.PageSizeDialog.textPreset": "Preset", "DE.Views.PageSizeDialog.textTitle": "Page Size", "DE.Views.PageSizeDialog.textWidth": "Width", + "DE.Views.PageSizeDialog.txtCustom": "Custom", "DE.Views.ParagraphSettings.strLineHeight": "Line Spacing", "DE.Views.ParagraphSettings.strParagraphSpacing": "Paragraph Spacing", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Don't add interval between paragraphs of the same style", @@ -1743,7 +1748,7 @@ "DE.Views.Toolbar.capBtnInsDropcap": "Drop Cap", "DE.Views.Toolbar.capBtnInsEquation": "Equation", "DE.Views.Toolbar.capBtnInsHeader": "Header/Footer", - "DE.Views.Toolbar.capBtnInsImage": "Picture", + "DE.Views.Toolbar.capBtnInsImage": "Image", "DE.Views.Toolbar.capBtnInsPagebreak": "Breaks", "DE.Views.Toolbar.capBtnInsShape": "Shape", "DE.Views.Toolbar.capBtnInsTable": "Table", @@ -1764,8 +1769,8 @@ "DE.Views.Toolbar.mniEditHeader": "Edit Header", "DE.Views.Toolbar.mniHiddenBorders": "Hidden Table Borders", "DE.Views.Toolbar.mniHiddenChars": "Nonprinting Characters", - "DE.Views.Toolbar.mniImageFromFile": "Picture from File", - "DE.Views.Toolbar.mniImageFromUrl": "Picture from URL", + "DE.Views.Toolbar.mniImageFromFile": "Image from File", + "DE.Views.Toolbar.mniImageFromUrl": "Image from URL", "DE.Views.Toolbar.strMenuNoFill": "No Fill", "DE.Views.Toolbar.textArea": "Area", "DE.Views.Toolbar.textAutoColor": "Automatic", @@ -1863,7 +1868,7 @@ "DE.Views.Toolbar.tipIncPrLeft": "Increase indent", "DE.Views.Toolbar.tipInsertChart": "Insert chart", "DE.Views.Toolbar.tipInsertEquation": "Insert equation", - "DE.Views.Toolbar.tipInsertImage": "Insert picture", + "DE.Views.Toolbar.tipInsertImage": "Insert image", "DE.Views.Toolbar.tipInsertNum": "Insert Page Number", "DE.Views.Toolbar.tipInsertShape": "Insert autoshape", "DE.Views.Toolbar.tipInsertTable": "Insert table", diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json index 8898d503d..d9764a1b8 100644 --- a/apps/documenteditor/main/locale/es.json +++ b/apps/documenteditor/main/locale/es.json @@ -1406,6 +1406,7 @@ "DE.Views.PageSizeDialog.textHeight": "Altura", "DE.Views.PageSizeDialog.textTitle": "Tamaño de página", "DE.Views.PageSizeDialog.textWidth": "Ancho", + "DE.Views.PageSizeDialog.txtCustom": "Personalizado", "DE.Views.ParagraphSettings.strLineHeight": "Espaciado de línea", "DE.Views.ParagraphSettings.strParagraphSpacing": "Espaciado de Párafo ", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "No añadir intervalo entre párrafos del mismo estilo", diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json index 19052bff8..a9f0db815 100644 --- a/apps/documenteditor/main/locale/fr.json +++ b/apps/documenteditor/main/locale/fr.json @@ -1407,6 +1407,7 @@ "DE.Views.PageSizeDialog.textHeight": "Hauteur", "DE.Views.PageSizeDialog.textTitle": "Taille de la page", "DE.Views.PageSizeDialog.textWidth": "Largeur", + "DE.Views.PageSizeDialog.txtCustom": "Personnalisé", "DE.Views.ParagraphSettings.strLineHeight": "Interligne", "DE.Views.ParagraphSettings.strParagraphSpacing": "Espacement de paragraphe", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Ne pas ajouter d'intervalle entre paragraphes du même style", diff --git a/apps/documenteditor/main/locale/it.json b/apps/documenteditor/main/locale/it.json index 5a6450159..3302fb11e 100644 --- a/apps/documenteditor/main/locale/it.json +++ b/apps/documenteditor/main/locale/it.json @@ -7,14 +7,14 @@ "Common.Controllers.ExternalDiagramEditor.warningText": "L'oggetto è disabilitato perché si sta modificando da un altro utente.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Avviso", "Common.Controllers.ExternalMergeEditor.textAnonymous": "Anonimo", - "Common.Controllers.ExternalMergeEditor.textClose": "Close", + "Common.Controllers.ExternalMergeEditor.textClose": "Chiudi", "Common.Controllers.ExternalMergeEditor.warningText": "The object is disabled because it is being edited by another user.", "Common.Controllers.ExternalMergeEditor.warningTitle": "Warning", "Common.Controllers.History.notcriticalErrorTitle": "Warning", "Common.Controllers.ReviewChanges.textAtLeast": "almeno", "Common.Controllers.ReviewChanges.textAuto": "auto", "Common.Controllers.ReviewChanges.textBaseline": "Baseline", - "Common.Controllers.ReviewChanges.textBold": "Bold", + "Common.Controllers.ReviewChanges.textBold": "Grassetto", "Common.Controllers.ReviewChanges.textBreakBefore": "Page break before", "Common.Controllers.ReviewChanges.textCaps": "Maiuscole", "Common.Controllers.ReviewChanges.textCenter": "Align center", @@ -137,7 +137,7 @@ "Common.Views.ExternalDiagramEditor.textClose": "Chiudi", "Common.Views.ExternalDiagramEditor.textSave": "Salva ed esci", "Common.Views.ExternalDiagramEditor.textTitle": "Modifica grafico", - "Common.Views.ExternalMergeEditor.textClose": "Close", + "Common.Views.ExternalMergeEditor.textClose": "Chiudi", "Common.Views.ExternalMergeEditor.textSave": "Save & Exit", "Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients", "Common.Views.Header.labelCoUsersDescr": "È in corso la modifica del documento da parte di più utenti.", @@ -192,17 +192,18 @@ "Common.Views.OpenDialog.txtIncorrectPwd": "Password errata", "Common.Views.OpenDialog.txtPassword": "Password", "Common.Views.OpenDialog.txtPreview": "Anteprima", + "Common.Views.OpenDialog.txtProtected": "Una volta inserita la password e aperto il file, verrà ripristinata la password corrente sul file.", "Common.Views.OpenDialog.txtTitle": "Seleziona parametri %1", "Common.Views.OpenDialog.txtTitleProtected": "File protetto", "Common.Views.PasswordDialog.cancelButtonText": "Annulla", "Common.Views.PasswordDialog.okButtonText": "OK", - "Common.Views.PasswordDialog.txtDescription": "É richiesta la password per aprire il documento", + "Common.Views.PasswordDialog.txtDescription": "É richiesta la password per proteggere il documento", "Common.Views.PasswordDialog.txtIncorrectPwd": "la password di conferma non corrisponde", "Common.Views.PasswordDialog.txtPassword": "Password", "Common.Views.PasswordDialog.txtRepeat": "Ripeti password", "Common.Views.PasswordDialog.txtTitle": "Imposta password", "Common.Views.PluginDlg.textLoading": "Caricamento", - "Common.Views.Plugins.groupCaption": "Componenti Aggiuntivi", + "Common.Views.Plugins.groupCaption": "Plugin", "Common.Views.Plugins.strPlugins": "Plugin", "Common.Views.Plugins.textLoading": "Caricamento", "Common.Views.Plugins.textStart": "Avvio", @@ -241,7 +242,7 @@ "Common.Views.ReviewChanges.txtAcceptChanges": "Accetta modifiche", "Common.Views.ReviewChanges.txtAcceptCurrent": "Accetta la modifica corrente", "Common.Views.ReviewChanges.txtChat": "Chat", - "Common.Views.ReviewChanges.txtClose": "Close", + "Common.Views.ReviewChanges.txtClose": "Chiudi", "Common.Views.ReviewChanges.txtCoAuthMode": "Modalità di co-editing", "Common.Views.ReviewChanges.txtDocLang": "Lingua", "Common.Views.ReviewChanges.txtFinal": "Tutti i cambiamenti accettati (anteprima)", @@ -306,6 +307,7 @@ "DE.Controllers.LeftMenu.textReplaceSkipped": "La sostituzione è stata effettuata. {0} occorrenze sono state saltate.", "DE.Controllers.LeftMenu.textReplaceSuccess": "La ricerca è stata effettuata. Occorrenze sostituite: {0}", "DE.Controllers.LeftMenu.warnDownloadAs": "Se continua a salvare in questo formato tutte le caratteristiche tranne il testo saranno perse.
Sei sicuro di voler continuare?", + "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Se si continua a salvare in questo formato, parte della formattazione potrebbe andare persa.
Vuoi continuare?", "DE.Controllers.Main.applyChangesTextText": "Caricamento delle modifiche in corso...", "DE.Controllers.Main.applyChangesTitleText": "Caricamento delle modifiche", "DE.Controllers.Main.convertationTimeoutText": "E' stato superato il tempo limite della conversione.", @@ -322,6 +324,7 @@ "DE.Controllers.Main.errorCoAuthoringDisconnect": "Connessione al server persa. Impossibile modificare il documento.", "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.

Find more information about connecting Document Server here", "DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.
Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.", + "DE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.", "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.", "DE.Controllers.Main.errorDefaultMessage": "Codice errore: %1", "DE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.", @@ -363,7 +366,7 @@ "DE.Controllers.Main.printTitleText": "Stampa del documento", "DE.Controllers.Main.reloadButtonText": "Ricarica pagina", "DE.Controllers.Main.requestEditFailedMessageText": "Qualcuno sta modificando questo documento. Si prega di provare più tardi.", - "DE.Controllers.Main.requestEditFailedTitleText": "Accesso vietato", + "DE.Controllers.Main.requestEditFailedTitleText": "Accesso negato", "DE.Controllers.Main.saveErrorText": "Si è verificato un errore al salvataggio del file", "DE.Controllers.Main.savePreparingText": "Preparazione al salvataggio ", "DE.Controllers.Main.savePreparingTitle": "Preparazione al salvataggio. Si prega di aspettare...", @@ -444,10 +447,14 @@ "DE.Controllers.Main.uploadImageTitleText": "Caricamento dell'immagine", "DE.Controllers.Main.warnBrowserIE9": "L'applicazione è poco compatibile con IE9. Usa IE10 o più recente", "DE.Controllers.Main.warnBrowserZoom": "Le impostazioni correnti di zoom del tuo browser non sono completamente supportate. Per favore, ritorna allo zoom predefinito premendo Ctrl+0.", + "DE.Controllers.Main.warnLicenseExceeded": "Il numero di connessioni simultanee al server dei documenti è stato superato e il documento verrà aperto solo per la visualizzazione.
Contattare l'amministratore per ulteriori informazioni.", "DE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.
Si prega di aggiornare la licenza e ricaricare la pagina.", + "DE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione.
Per ulteriori informazioni, contattare l'amministratore.", "DE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.
Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.", - "DE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE Editors presenta alcune limitazioni per gli utenti simultanei.
Se hai bisogno di più, ti preghiamo di considerare l'aggiornamento della tua licenza attuale o l'acquisto di una licenza commerciale.", + "DE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.
Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.", "DE.Controllers.Main.warnProcessRightsChange": "Ci stato negato il diritto alla modifica del file.", + "DE.Controllers.Navigation.txtBeginning": "Inizio del documento", + "DE.Controllers.Navigation.txtGotoBeginning": "Vai all'inizio del documento", "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled", "DE.Controllers.Statusbar.tipReview": "Traccia cambiamenti", @@ -704,7 +711,7 @@ "DE.Controllers.Toolbar.txtSymbol_about": "Approssimativamente", "DE.Controllers.Toolbar.txtSymbol_additional": "Complement", "DE.Controllers.Toolbar.txtSymbol_aleph": "Alef", - "DE.Controllers.Toolbar.txtSymbol_alpha": "Alpha", + "DE.Controllers.Toolbar.txtSymbol_alpha": "Alfa", "DE.Controllers.Toolbar.txtSymbol_approx": "Quasi uguale a", "DE.Controllers.Toolbar.txtSymbol_ast": "Operatore asterisco", "DE.Controllers.Toolbar.txtSymbol_beta": "Beta", @@ -790,8 +797,11 @@ "DE.Controllers.Viewport.textFitPage": "Adatta alla pagina", "DE.Controllers.Viewport.textFitWidth": "Adatta alla larghezza", "DE.Views.BookmarksDialog.textAdd": "Aggiungi", + "DE.Views.BookmarksDialog.textBookmarkName": "Nome segnalibro", "DE.Views.BookmarksDialog.textClose": "Chiudi", "DE.Views.BookmarksDialog.textDelete": "Elimina", + "DE.Views.BookmarksDialog.textGoto": "Vai a", + "DE.Views.BookmarksDialog.textHidden": "Segnalibri nascosti", "DE.Views.BookmarksDialog.textLocation": "Percorso", "DE.Views.BookmarksDialog.textName": "Nome", "DE.Views.BookmarksDialog.textSort": "Ordina per", @@ -886,7 +896,7 @@ "DE.Views.DocumentHolder.removeHyperlinkText": "Elimina collegamento ipertestuale", "DE.Views.DocumentHolder.rightText": "A destra", "DE.Views.DocumentHolder.rowText": "Riga", - "DE.Views.DocumentHolder.saveStyleText": "Create new style", + "DE.Views.DocumentHolder.saveStyleText": "Crea nuovo stile", "DE.Views.DocumentHolder.selectCellText": "Seleziona cella", "DE.Views.DocumentHolder.selectColumnText": "Seleziona colonna", "DE.Views.DocumentHolder.selectRowText": "Seleziona riga", @@ -921,6 +931,7 @@ "DE.Views.DocumentHolder.textNextPage": "Pagina successiva", "DE.Views.DocumentHolder.textPaste": "Incolla", "DE.Views.DocumentHolder.textPrevPage": "Pagina precedente", + "DE.Views.DocumentHolder.textRefreshField": "Aggiorna campo", "DE.Views.DocumentHolder.textRemove": "Elimina", "DE.Views.DocumentHolder.textRemoveControl": "Rimuovi il controllo del contenuto", "DE.Views.DocumentHolder.textReplace": "Sostituisci immagine", @@ -932,6 +943,7 @@ "DE.Views.DocumentHolder.textShapeAlignRight": "Allinea a destra", "DE.Views.DocumentHolder.textShapeAlignTop": "Allinea in alto", "DE.Views.DocumentHolder.textTOC": "Sommario", + "DE.Views.DocumentHolder.textTOCSettings": "Impostazioni sommario", "DE.Views.DocumentHolder.textUndo": "Annulla", "DE.Views.DocumentHolder.textUpdateAll": "Aggiorna intera tabella", "DE.Views.DocumentHolder.textUpdatePages": "Aggiorna solo numeri di pagina", @@ -1080,7 +1092,7 @@ "DE.Views.FileMenu.btnRenameCaption": "Rinomina...", "DE.Views.FileMenu.btnReturnCaption": "Torna al documento", "DE.Views.FileMenu.btnRightsCaption": "Diritti di accesso...", - "DE.Views.FileMenu.btnSaveAsCaption": "Salva con", + "DE.Views.FileMenu.btnSaveAsCaption": "Salva con Nome", "DE.Views.FileMenu.btnSaveCaption": "Salva", "DE.Views.FileMenu.btnSettingsCaption": "Impostazioni avanzate...", "DE.Views.FileMenu.btnToEditCaption": "Modifica documento", @@ -1183,11 +1195,14 @@ "DE.Views.HyperlinkSettingsDialog.textDefault": "Testo selezionato", "DE.Views.HyperlinkSettingsDialog.textDisplay": "Visualizza", "DE.Views.HyperlinkSettingsDialog.textExternal": "Collegamento esterno", + "DE.Views.HyperlinkSettingsDialog.textInternal": "Inserisci nel documento", "DE.Views.HyperlinkSettingsDialog.textTitle": "Impostazioni collegamento ipertestuale", "DE.Views.HyperlinkSettingsDialog.textTooltip": "Testo del suggerimento", "DE.Views.HyperlinkSettingsDialog.textUrl": "Collega a", + "DE.Views.HyperlinkSettingsDialog.txtBeginning": "Inizio del documento", "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Segnalibri", "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Questo campo è richiesto", + "DE.Views.HyperlinkSettingsDialog.txtHeadings": "Intestazioni", "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Il formato URL richiesto è \"http://www.example.com\"", "DE.Views.ImageSettings.textAdvanced": "Mostra impostazioni avanzate", "DE.Views.ImageSettings.textEdit": "Modifica", @@ -1280,6 +1295,7 @@ "DE.Views.LeftMenu.tipAbout": "Informazioni su", "DE.Views.LeftMenu.tipChat": "Chat", "DE.Views.LeftMenu.tipComments": "Commenti", + "DE.Views.LeftMenu.tipNavigation": "Navigazione", "DE.Views.LeftMenu.tipPlugins": "Plugin", "DE.Views.LeftMenu.tipSearch": "Ricerca", "DE.Views.LeftMenu.tipSupport": "Feedback & Support", @@ -1300,6 +1316,7 @@ "DE.Views.Links.textGotoFootnote": "Passa alle note a piè di pagina", "DE.Views.Links.textUpdateAll": "Aggiorna intera tabella", "DE.Views.Links.textUpdatePages": "Aggiorna solo numeri di pagina", + "DE.Views.Links.tipBookmarks": "Crea un segnalibro", "DE.Views.Links.tipContents": "Inserisci Sommario", "DE.Views.Links.tipContentsUpdate": "Aggiorna Sommario", "DE.Views.Links.tipInsertHyperlink": "Aggiungi collegamento ipertestuale", @@ -1357,7 +1374,16 @@ "DE.Views.MailMergeSettings.txtUntitled": "Untitled", "DE.Views.MailMergeSettings.warnProcessMailMerge": "Starting merge failed", "DE.Views.Navigation.txtCollapse": "Comprimi tutto", + "DE.Views.Navigation.txtDemote": "Retrocedere", + "DE.Views.Navigation.txtEmpty": "Questo documento non contiene intestazioni", + "DE.Views.Navigation.txtEmptyItem": "Intestazione vuota", "DE.Views.Navigation.txtExpand": "Espandi tutto", + "DE.Views.Navigation.txtExpandToLevel": "Espandi al livello", + "DE.Views.Navigation.txtHeadingAfter": "Nuova intestazione dopo", + "DE.Views.Navigation.txtHeadingBefore": "Nuova intestazione prima", + "DE.Views.Navigation.txtNewHeading": "Nuovo sottotitolo", + "DE.Views.Navigation.txtPromote": "Promuovere", + "DE.Views.Navigation.txtSelect": "Scegli contenuto", "DE.Views.NoteSettingsDialog.textApply": "Applica", "DE.Views.NoteSettingsDialog.textApplyTo": "Applica modifiche a", "DE.Views.NoteSettingsDialog.textCancel": "Annulla", @@ -1390,8 +1416,10 @@ "DE.Views.PageSizeDialog.cancelButtonText": "Annulla", "DE.Views.PageSizeDialog.okButtonText": "Ok", "DE.Views.PageSizeDialog.textHeight": "Height", + "DE.Views.PageSizeDialog.textPreset": "Preimpostazione", "DE.Views.PageSizeDialog.textTitle": "Page Size", "DE.Views.PageSizeDialog.textWidth": "Width", + "DE.Views.PageSizeDialog.txtCustom": "Personalizzato", "DE.Views.ParagraphSettings.strLineHeight": "Interlinea", "DE.Views.ParagraphSettings.strParagraphSpacing": "Spaziatura del paragrafo", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Non aggiungere intervallo tra paragrafi dello stesso stile", @@ -1544,7 +1572,7 @@ "DE.Views.Statusbar.tipZoomIn": "Zoom avanti", "DE.Views.Statusbar.tipZoomOut": "Zoom indietro", "DE.Views.Statusbar.txtPageNumInvalid": "Numero pagina non valido", - "DE.Views.StyleTitleDialog.textHeader": "Create New Style", + "DE.Views.StyleTitleDialog.textHeader": "Crea nuovo stile", "DE.Views.StyleTitleDialog.textNextStyle": "Next paragraph style", "DE.Views.StyleTitleDialog.textTitle": "Title", "DE.Views.StyleTitleDialog.txtEmpty": "This field is required", @@ -1637,7 +1665,7 @@ "DE.Views.TableSettingsAdvanced.textBorderWidth": "Dimensioni bordo", "DE.Views.TableSettingsAdvanced.textBottom": "In basso", "DE.Views.TableSettingsAdvanced.textCellOptions": "Opzioni della cella", - "DE.Views.TableSettingsAdvanced.textCellProps": "Celle", + "DE.Views.TableSettingsAdvanced.textCellProps": "Cella", "DE.Views.TableSettingsAdvanced.textCellSize": "Dimensioni cella", "DE.Views.TableSettingsAdvanced.textCenter": "Al centro", "DE.Views.TableSettingsAdvanced.textCenterTooltip": "Al centro", @@ -1793,7 +1821,7 @@ "DE.Views.Toolbar.textStrikeout": "Barrato", "DE.Views.Toolbar.textStyleMenuDelete": "Delete style", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles", - "DE.Views.Toolbar.textStyleMenuNew": "New style from selection", + "DE.Views.Toolbar.textStyleMenuNew": "Nuovo stile da selezione", "DE.Views.Toolbar.textStyleMenuRestore": "Restore to default", "DE.Views.Toolbar.textStyleMenuRestoreAll": "Restore all to default styles", "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection", @@ -1805,6 +1833,7 @@ "DE.Views.Toolbar.textTabHome": "Home", "DE.Views.Toolbar.textTabInsert": "Inserisci", "DE.Views.Toolbar.textTabLayout": "Layout di Pagina", + "DE.Views.Toolbar.textTabLinks": "Riferimenti", "DE.Views.Toolbar.textTabProtect": "Protezione", "DE.Views.Toolbar.textTabReview": "Revisione", "DE.Views.Toolbar.textTitleError": "Errore", diff --git a/apps/documenteditor/main/locale/ko.json b/apps/documenteditor/main/locale/ko.json index af82cba5d..2a188425e 100644 --- a/apps/documenteditor/main/locale/ko.json +++ b/apps/documenteditor/main/locale/ko.json @@ -1406,6 +1406,7 @@ "DE.Views.PageSizeDialog.textHeight": "높이", "DE.Views.PageSizeDialog.textTitle": "페이지 크기", "DE.Views.PageSizeDialog.textWidth": "너비", + "DE.Views.PageSizeDialog.txtCustom": "사용자 정의", "DE.Views.ParagraphSettings.strLineHeight": "줄 간격", "DE.Views.ParagraphSettings.strParagraphSpacing": "단락 간격", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "같은 스타일의 단락 사이에 간격을 추가하지 마십시오.", diff --git a/apps/documenteditor/main/locale/lv.json b/apps/documenteditor/main/locale/lv.json index d98fb240c..932147c3c 100644 --- a/apps/documenteditor/main/locale/lv.json +++ b/apps/documenteditor/main/locale/lv.json @@ -1403,6 +1403,7 @@ "DE.Views.PageSizeDialog.textHeight": "Height", "DE.Views.PageSizeDialog.textTitle": "Page Size", "DE.Views.PageSizeDialog.textWidth": "Width", + "DE.Views.PageSizeDialog.txtCustom": "Personalizēts", "DE.Views.ParagraphSettings.strLineHeight": "Rindstarpas", "DE.Views.ParagraphSettings.strParagraphSpacing": "Atstatums", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Nepievienojiet intervālu starp rindkopam vienā stila", diff --git a/apps/documenteditor/main/locale/nl.json b/apps/documenteditor/main/locale/nl.json index cd93a1d63..fc34c10f6 100644 --- a/apps/documenteditor/main/locale/nl.json +++ b/apps/documenteditor/main/locale/nl.json @@ -1412,6 +1412,7 @@ "DE.Views.PageSizeDialog.textHeight": "Hoogte", "DE.Views.PageSizeDialog.textTitle": "Paginaformaat", "DE.Views.PageSizeDialog.textWidth": "Breedte", + "DE.Views.PageSizeDialog.txtCustom": "Aangepast", "DE.Views.ParagraphSettings.strLineHeight": "Regelafstand", "DE.Views.ParagraphSettings.strParagraphSpacing": "Afstand tussen alinea's", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Geen interval toevoegen tussen alinea's met dezelfde stijl", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index d87c40ed5..7b0f568f8 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -217,7 +217,7 @@ "Common.Views.Protection.txtEncrypt": "Шифровать", "Common.Views.Protection.txtInvisibleSignature": "Добавить цифровую подпись", "Common.Views.Protection.txtSignature": "Подпись", - "Common.Views.Protection.txtSignatureLine": "Строка подписи", + "Common.Views.Protection.txtSignatureLine": "Добавить строку подписи", "Common.Views.RenameDialog.cancelButtonText": "Отмена", "Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.textName": "Имя файла", @@ -324,6 +324,7 @@ "DE.Controllers.Main.errorCoAuthoringDisconnect": "Потеряно соединение с сервером. В данный момент нельзя отредактировать документ.", "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.
Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.

Дополнительную информацию о подключении Сервера документов можно найти здесь", "DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.
Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.", + "DE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.", "DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.", "DE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1", "DE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.", @@ -446,9 +447,11 @@ "DE.Controllers.Main.uploadImageTitleText": "Загрузка изображения", "DE.Controllers.Main.warnBrowserIE9": "В IE9 приложение имеет низкую производительность. Используйте IE10 или более позднюю версию.", "DE.Controllers.Main.warnBrowserZoom": "Текущее значение масштаба страницы в браузере поддерживается не полностью. Вернитесь к масштабу по умолчанию, нажав Ctrl+0.", + "DE.Controllers.Main.warnLicenseExceeded": "Превышено допустимое число одновременных подключений к серверу документов, и документ откроется только на просмотр.
Обратитесь к администратору за дополнительной информацией.", "DE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.
Обновите лицензию, а затем обновите страницу.", - "DE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.", - "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.
Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.", + "DE.Controllers.Main.warnLicenseUsersExceeded": "Превышено допустимое число одновременно работающих пользователей, и документ откроется только на просмотр.
Обратитесь к администратору за дополнительной информацией.", + "DE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", + "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", "DE.Controllers.Navigation.txtBeginning": "Начало документа", "DE.Controllers.Navigation.txtGotoBeginning": "Перейти в начало документа", @@ -1413,8 +1416,10 @@ "DE.Views.PageSizeDialog.cancelButtonText": "Отмена", "DE.Views.PageSizeDialog.okButtonText": "Ok", "DE.Views.PageSizeDialog.textHeight": "Высота", + "DE.Views.PageSizeDialog.textPreset": "Предустановка", "DE.Views.PageSizeDialog.textTitle": "Размер страницы", "DE.Views.PageSizeDialog.textWidth": "Ширина", + "DE.Views.PageSizeDialog.txtCustom": "Особый", "DE.Views.ParagraphSettings.strLineHeight": "Междустрочный интервал", "DE.Views.ParagraphSettings.strParagraphSpacing": "Интервал между абзацами", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Не добавлять интервал между абзацами одного стиля", diff --git a/apps/documenteditor/main/locale/zh.json b/apps/documenteditor/main/locale/zh.json index ad812584f..ecc0155db 100644 --- a/apps/documenteditor/main/locale/zh.json +++ b/apps/documenteditor/main/locale/zh.json @@ -268,7 +268,7 @@ "DE.Controllers.Main.textCloseTip": "点击关闭提示", "DE.Controllers.Main.textContactUs": "联系销售", "DE.Controllers.Main.textLoadingDocument": "文件加载中…", - "DE.Controllers.Main.textNoLicenseTitle": "NLYOFFICE开源版本", + "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE开源版本", "DE.Controllers.Main.textShape": "形状", "DE.Controllers.Main.textStrict": "严格模式", "DE.Controllers.Main.textTryUndoRedo": "对于快速的协同编辑模式，取消/重做功能是禁用的。< br >单击“严格模式”按钮切换到严格co-editing模式编辑该文件没有其他用户干扰和发送您的更改只后你拯救他们。您可以使用编辑器高级设置在编辑模式之间切换。", @@ -290,6 +290,22 @@ "DE.Controllers.Main.txtRectangles": "矩形", "DE.Controllers.Main.txtSeries": "系列", "DE.Controllers.Main.txtStarsRibbons": "星星和丝带", + "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_Intense_Quote": "直接引用", + "DE.Controllers.Main.txtStyle_List_Paragraph": "排列段落", + "DE.Controllers.Main.txtStyle_No_Spacing": "无空格", + "DE.Controllers.Main.txtStyle_Normal": "正常", + "DE.Controllers.Main.txtStyle_Quote": "引用", + "DE.Controllers.Main.txtStyle_Subtitle": "副标题", + "DE.Controllers.Main.txtStyle_Title": "标题", "DE.Controllers.Main.txtXAxis": "X轴", "DE.Controllers.Main.txtYAxis": "Y轴", "DE.Controllers.Main.unknownErrorText": "示知错误", @@ -667,6 +683,7 @@ "DE.Views.ChartSettings.txtTight": "紧", "DE.Views.ChartSettings.txtTitle": "图表", "DE.Views.ChartSettings.txtTopAndBottom": "上下", + "DE.Views.ControlSettingsDialog.textName": "标题", "DE.Views.DocumentHolder.aboveText": "以上", "DE.Views.DocumentHolder.addCommentText": "发表评论", "DE.Views.DocumentHolder.advancedFrameText": "框架高级设置", diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index bf1613b60..5daf5bfce 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -80,7 +80,7 @@ define([ usersCount : 1, fastCoauth : true, lostEditingRights : false, - licenseWarning : false + licenseType : false }; // Initialize viewport @@ -170,6 +170,18 @@ define([ Common.Gateway.on('showmessage', _.bind(me.onExternalMessage, me)); Common.Gateway.on('opendocument', _.bind(me.loadDocument, me)); Common.Gateway.appReady(); + + Common.Gateway.on('internalcommand', function(data) { + if (data.command=='hardBack') { + if ($('.modal-in').length>0) { + if ( !$(me.loadMask).hasClass('modal-in') ) + uiApp.closeModal(); + Common.Gateway.internalMessage('hardBack', false); + } else + Common.Gateway.internalMessage('hardBack', true); + } + }); + Common.Gateway.internalMessage('listenHardBack'); } }, @@ -568,17 +580,37 @@ define([ onLicenseChanged: function(params) { var licType = params.asc_getLicenseType(); - if (licType !== undefined && (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount) && this.appOptions.canEdit && this.editorConfig.mode !== 'view') { - this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) ? this.warnNoLicense : this.warnNoLicenseUsers; - } + if (licType !== undefined && this.appOptions.canEdit && this.editorConfig.mode !== 'view' && + (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount || licType===Asc.c_oLicenseResult.ConnectionsOS || licType===Asc.c_oLicenseResult.UsersCountOS)) + this._state.licenseType = licType; - if (this._isDocReady && this._state.licenseWarning) + if (this._isDocReady && this._state.licenseType) this.applyLicense(); }, applyLicense: function() { var me = this; - if (me._state.licenseWarning) { + if (this._state.licenseType) { + var license = this._state.licenseType, + buttons = [{text: 'OK'}]; + if (license===Asc.c_oLicenseResult.Connections || license===Asc.c_oLicenseResult.UsersCount) { + license = (license===Asc.c_oLicenseResult.Connections) ? this.warnLicenseExceeded : this.warnLicenseUsersExceeded; + } else { + license = (license===Asc.c_oLicenseResult.ConnectionsOS) ? this.warnNoLicense : this.warnNoLicenseUsers; + buttons = [{ + text: me.textBuyNow, + bold: true, + onClick: function() { + window.open('https://www.onlyoffice.com', "_blank"); + } + }, + { + text: me.textContactUs, + onClick: function() { + window.open('mailto:sales@onlyoffice.com', "_blank"); + } + }]; + } DE.getController('Toolbar').activateViewControls(); DE.getController('Toolbar').deactivateEditControls(); Common.NotificationCenter.trigger('api:disconnect'); @@ -591,22 +623,8 @@ define([ Common.localStorage.setItem("de-license-warning", now); uiApp.modal({ title: me.textNoLicenseTitle, - text : me._state.licenseWarning, - buttons: [ - { - text: me.textBuyNow, - bold: true, - onClick: function() { - window.open('https://www.onlyoffice.com', "_blank"); - } - }, - { - text: me.textContactUs, - onClick: function() { - window.open('mailto:sales@onlyoffice.com', "_blank"); - } - } - ] + text : license, + buttons: buttons }); } } else @@ -855,6 +873,10 @@ define([ config.msg = this.errorBadImageUrl; break; + case Asc.c_oAscError.ID.DataEncrypted: + config.msg = this.errorDataEncrypted; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -875,6 +897,10 @@ define([ Common.NotificationCenter.trigger('goback'); } } + if (id == Asc.c_oAscError.ID.DataEncrypted) { + this.api.asc_coAuthoringDisconnect(); + Common.NotificationCenter.trigger('api:disconnect'); + } } else { Common.Gateway.reportWarning(id, config.msg); @@ -1251,7 +1277,6 @@ define([ textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.', textBuyNow: 'Visit website', textNoLicenseTitle: 'ONLYOFFICE open source version', - warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider upgrading your current license or purchasing a commercial one.', textContactUs: 'Contact sales', errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.', warnLicenseExp: 'Your license has expired.
Please update your license and refresh the page.', @@ -1292,8 +1317,12 @@ define([ txtStyle_footnote_text: 'Footnote Text', txtHeader: "Header", txtFooter: "Footer", - warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.', - txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset' + txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset', + warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.', + warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.', + warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/de.json b/apps/documenteditor/mobile/locale/de.json index 6fddbdde1..cfc99d9bf 100644 --- a/apps/documenteditor/mobile/locale/de.json +++ b/apps/documenteditor/mobile/locale/de.json @@ -54,8 +54,9 @@ "DE.Controllers.Main.downloadTitleText": "Herunterladen des Dokuments", "DE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Sie können nicht mehr editieren.", - "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen, oder richten Sie an Ihren Administrator.
Wann Sie auf den Button \"OK\" klicken, werden Sie aufgefordert, das Dokument herunterzuladen.

Mehr Information zur Verbindung des Dokument Servers finden Sie hier", + "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.
Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie hier", "DE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.
Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.", + "DE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.", "DE.Controllers.Main.errorDataRange": "Falscher Datenbereich.", "DE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1", "DE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.", @@ -149,9 +150,11 @@ "DE.Controllers.Main.uploadImageSizeMessage": "Die maximal zulässige Bildgröße ist überschritten.", "DE.Controllers.Main.uploadImageTextText": "Bild wird hochgeladen...", "DE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen", + "DE.Controllers.Main.warnLicenseExceeded": "Die Anzahl gleichzeitiger Verbindungen zum Document Server wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet.
Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.", "DE.Controllers.Main.warnLicenseExp": "Ihre Lizenz ist abgelaufen.
Bitte aktualisieren Sie Ihre Lizenz und laden Sie die Seite neu.", - "DE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zu Dokumentenserver.
Wenn Sie mehr Verbindungen benötigen, aktualisieren Sie diese Version oder erwerben Sie eine kommerzielle Lizenz.", - "DE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer.
Wenn Sie mehr Nutzer benötigen, achten Sie bitte darauf, dass Sie entweder Ihre derzeitige Lizenz aktualisieren oder eine kommerzielle erwerben müssen.", + "DE.Controllers.Main.warnLicenseUsersExceeded": "Die Anzahl der gleichzeitigen Benutzer wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet.
Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.", + "DE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zum Dokumentenserver.
Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.", + "DE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer.
Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.", "DE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.", "DE.Controllers.Search.textNoTextFound": "Der Text wurde nicht gefunden.", "DE.Controllers.Search.textReplaceAll": "Alle ersetzen", diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 01490ed44..fa2f0994c 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -54,8 +54,9 @@ "DE.Controllers.Main.downloadTitleText": "Downloading Document", "DE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. You can't edit anymore.", - "DE.Controllers.Main.errorConnectToServer": " The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.

Find more information about connecting Document Server here", + "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.

Find more information about connecting Document Server here", "DE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please, contact support.", + "DE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "DE.Controllers.Main.errorDataRange": "Incorrect data range.", "DE.Controllers.Main.errorDefaultMessage": "Error code: %1", "DE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.", @@ -149,9 +150,11 @@ "DE.Controllers.Main.uploadImageSizeMessage": "Maximium image size limit exceeded.", "DE.Controllers.Main.uploadImageTextText": "Uploading image...", "DE.Controllers.Main.uploadImageTitleText": "Uploading Image", + "DE.Controllers.Main.warnLicenseExceeded": "The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.", "DE.Controllers.Main.warnLicenseExp": "Your license has expired.
Please update your license and refresh the page.", - "DE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider upgrading your current license or purchasing a commercial one.", - "DE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.", + "DE.Controllers.Main.warnLicenseUsersExceeded": "The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.", + "DE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", + "DE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", "DE.Controllers.Search.textNoTextFound": "Text not Found", "DE.Controllers.Search.textReplaceAll": "Replace All", diff --git a/apps/documenteditor/mobile/locale/it.json b/apps/documenteditor/mobile/locale/it.json index 0cd52b9fc..f70f5ede9 100644 --- a/apps/documenteditor/mobile/locale/it.json +++ b/apps/documenteditor/mobile/locale/it.json @@ -54,8 +54,9 @@ "DE.Controllers.Main.downloadTitleText": "Scaricamento del documento", "DE.Controllers.Main.errorBadImageUrl": "URL dell'immagine non corretto", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Scollegato dal server. Non è possibile modificare.", - "DE.Controllers.Main.errorConnectToServer": "Impossibile salvare il documento. Si prega di verificare i parametri di connessione o rivolgersi all'amministratore.
Una volta cliccato il pulsante 'OK', si verrà invitati a scaricare il documento.

Puoi trovare maggiori informazioni sulla connessione al Server dei Documenti qui", + "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.
Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.

Per maggiori dettagli sulla connessione al Document Server clicca qui", "DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.
Errore di connessione al database. Si prega di contattare il supporto.", + "DE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.", "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.", "DE.Controllers.Main.errorDefaultMessage": "Codice errore: %1", "DE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.", @@ -149,7 +150,9 @@ "DE.Controllers.Main.uploadImageSizeMessage": "È stata superata la dimensione massima per l'immagine.", "DE.Controllers.Main.uploadImageTextText": "Caricamento dell'immagine in corso...", "DE.Controllers.Main.uploadImageTitleText": "Caricamento dell'immagine", + "DE.Controllers.Main.warnLicenseExceeded": "Il numero di connessioni simultanee al server dei documenti è stato superato e il documento verrà aperto solo per la visualizzazione.
Contattare l'amministratore per ulteriori informazioni.", "DE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.
Si prega di aggiornare la licenza e ricaricare la pagina.", + "DE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione.
Per ulteriori informazioni, contattare l'amministratore.", "DE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.
Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.", "DE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE Editors presenta alcune limitazioni per gli utenti simultanei.
Se hai bisogno di più, ti preghiamo di considerare l'aggiornamento della tua licenza attuale o l'acquisto di una licenza commerciale.", "DE.Controllers.Main.warnProcessRightsChange": "Ti è stato negato il diritto di modificare il file.", @@ -343,7 +346,7 @@ "DE.Views.Search.textHighlight": "Evidenzia risultati", "DE.Views.Search.textReplace": "Sostituisci", "DE.Views.Search.textSearch": "Cerca", - "DE.Views.Settings.textAbout": "A proposito", + "DE.Views.Settings.textAbout": "Informazioni su", "DE.Views.Settings.textAddress": "indirizzo", "DE.Views.Settings.textAuthor": "Autore", "DE.Views.Settings.textBack": "Indietro", diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json index 9665962e1..af3b937cf 100644 --- a/apps/documenteditor/mobile/locale/ru.json +++ b/apps/documenteditor/mobile/locale/ru.json @@ -56,6 +56,7 @@ "DE.Controllers.Main.errorCoAuthoringDisconnect": "Подключение к серверу прервано. Редактирование недоступно.", "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.
Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.

Дополнительную информацию о подключении Сервера документов можно найти здесь", "DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.
Ошибка подключения к базе данных. Пожалуйста, обратитесь в службу технической поддержки.", + "DE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.", "DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.", "DE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1", "DE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.", @@ -149,9 +150,11 @@ "DE.Controllers.Main.uploadImageSizeMessage": "Превышен максимальный размер изображения.", "DE.Controllers.Main.uploadImageTextText": "Загрузка изображения...", "DE.Controllers.Main.uploadImageTitleText": "Загрузка изображения", + "DE.Controllers.Main.warnLicenseExceeded": "Превышено допустимое число одновременных подключений к серверу документов, и документ откроется только на просмотр.
Обратитесь к администратору за дополнительной информацией.", "DE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.
Обновите лицензию, а затем обновите страницу.", - "DE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.", - "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.
Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.", + "DE.Controllers.Main.warnLicenseUsersExceeded": "Превышено допустимое число одновременно работающих пользователей, и документ откроется только на просмотр.
Обратитесь к администратору за дополнительной информацией.", + "DE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", + "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", "DE.Controllers.Search.textNoTextFound": "Текст не найден", "DE.Controllers.Search.textReplaceAll": "Заменить все", @@ -338,7 +341,7 @@ "DE.Views.EditText.textSubscript": "Подстрочные", "DE.Views.Search.textCase": "С учетом регистра", "DE.Views.Search.textDone": "Готово", - "DE.Views.Search.textFind": "Найти", + "DE.Views.Search.textFind": "Поиск", "DE.Views.Search.textFindAndReplace": "Поиск и замена", "DE.Views.Search.textHighlight": "Выделить результаты", "DE.Views.Search.textReplace": "Заменить", @@ -359,7 +362,7 @@ "DE.Views.Settings.textDownloadAs": "Скачать как...", "DE.Views.Settings.textEditDoc": "Редактировать", "DE.Views.Settings.textEmail": "email", - "DE.Views.Settings.textFind": "Найти", + "DE.Views.Settings.textFind": "Поиск", "DE.Views.Settings.textFindAndReplace": "Поиск и замена", "DE.Views.Settings.textFormat": "Формат", "DE.Views.Settings.textHelp": "Справка", diff --git a/apps/documenteditor/mobile/locale/zh.json b/apps/documenteditor/mobile/locale/zh.json index 15bd31c64..937036cb5 100644 --- a/apps/documenteditor/mobile/locale/zh.json +++ b/apps/documenteditor/mobile/locale/zh.json @@ -107,7 +107,7 @@ "DE.Controllers.Main.textContactUs": "联系销售", "DE.Controllers.Main.textDone": "完成", "DE.Controllers.Main.textLoadingDocument": "文件加载中…", - "DE.Controllers.Main.textNoLicenseTitle": "NLYOFFICE开源版本", + "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE开源版本", "DE.Controllers.Main.textOK": "确定", "DE.Controllers.Main.textPassword": "密码", "DE.Controllers.Main.textPreloader": "载入中……", diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index 01f6efb39..382926833 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -6229,6 +6229,13 @@ textarea { -webkit-user-select: text; user-select: text; } +#editor-navbar.navbar .right { + padding-right: 4px; +} +#editor-navbar.navbar .right a.link, +#editor-navbar.navbar .left a.link { + padding: 0 13px; +} #editor_sdk { position: absolute; left: 0; diff --git a/apps/documenteditor/mobile/resources/less/app-material.less b/apps/documenteditor/mobile/resources/less/app-material.less index bb070fbd3..84ec924f9 100644 --- a/apps/documenteditor/mobile/resources/less/app-material.less +++ b/apps/documenteditor/mobile/resources/less/app-material.less @@ -68,6 +68,15 @@ input, textarea { user-select:text; } +// Main Toolbar +#editor-navbar.navbar .right { + padding-right: 4px; +} +#editor-navbar.navbar .right a.link, +#editor-navbar.navbar .left a.link { + padding: 0 13px; +} + // Top offset #editor_sdk { diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index cf238b519..bf5d12e62 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -102,7 +102,7 @@ define([ onLaunch: function() { var me = this; - this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false}; + this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false}; this.languages = null; this.translationTable = []; @@ -759,16 +759,27 @@ define([ onLicenseChanged: function(params) { var licType = params.asc_getLicenseType(); - if (licType !== undefined && (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount) && this.appOptions.canEdit && this.editorConfig.mode !== 'view') { - this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) ? this.warnNoLicense : this.warnNoLicenseUsers; - } + if (licType !== undefined && this.appOptions.canEdit && this.editorConfig.mode !== 'view' && + (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount || licType===Asc.c_oLicenseResult.ConnectionsOS || licType===Asc.c_oLicenseResult.UsersCountOS)) + this._state.licenseType = licType; if (this._isDocReady) this.applyLicense(); }, applyLicense: function() { - if (this._state.licenseWarning) { + if (this._state.licenseType) { + var license = this._state.licenseType, + buttons = ['ok'], + primary = 'ok'; + if (license===Asc.c_oLicenseResult.Connections || license===Asc.c_oLicenseResult.UsersCount) { + license = (license===Asc.c_oLicenseResult.Connections) ? this.warnLicenseExceeded : this.warnLicenseUsersExceeded; + } else { + license = (license===Asc.c_oLicenseResult.ConnectionsOS) ? this.warnNoLicense : this.warnNoLicenseUsers; + buttons = [{value: 'buynow', caption: this.textBuyNow}, {value: 'contact', caption: this.textContactUs}]; + primary = 'buynow'; + } + this.disableEditing(true); Common.NotificationCenter.trigger('api:disconnect'); @@ -780,12 +791,9 @@ define([ Common.UI.info({ width: 500, title: this.textNoLicenseTitle, - msg : this._state.licenseWarning, - buttons: [ - {value: 'buynow', caption: this.textBuyNow}, - {value: 'contact', caption: this.textContactUs} - ], - primary: 'buynow', + msg : license, + buttons: buttons, + primary: primary, callback: function(btn) { if (btn == 'buynow') window.open('https://www.onlyoffice.com', "_blank"); @@ -852,7 +860,7 @@ define([ this.appOptions.forcesave = this.appOptions.canForcesave; this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly); this.appOptions.trialMode = params.asc_getLicenseMode(); - this.appOptions.isProtectSupport = false; // remove in 5.2 + this.appOptions.isProtectSupport = true; // remove in 5.2 this.appOptions.canProtect = this.appOptions.isProtectSupport && this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport(); this.appOptions.canBranding = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object'); @@ -1127,6 +1135,10 @@ define([ console.warn(config.msg); break; + case Asc.c_oAscError.ID.DataEncrypted: + config.msg = this.errorDataEncrypted; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -1149,6 +1161,10 @@ define([ } } } + if (id == Asc.c_oAscError.ID.DataEncrypted) { + this.api.asc_coAuthoringDisconnect(); + Common.NotificationCenter.trigger('api:disconnect'); + } } else { Common.Gateway.reportWarning(id, config.msg); @@ -1977,7 +1993,6 @@ define([ textStrict: 'Strict mode', textBuyNow: 'Visit website', textNoLicenseTitle: 'ONLYOFFICE open source version', - warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider upgrading your current license or purchasing a commercial one.', textContactUs: 'Contact sales', errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download or print until the connection is restored.', warnLicenseExp: 'Your license has expired.
Please update your license and refresh the page.', @@ -2010,7 +2025,6 @@ define([ saveTextText: 'Saving document...', txtLoading: 'Loading...', txtAddNotes: 'Click to add notes', - warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.', errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.", txtAddFirstSlide: 'Click to add first slide', txtTheme_blank: 'Blank', @@ -2023,7 +2037,12 @@ define([ txtTheme_safari: 'Safari', txtTheme_dotted: 'Dotted', txtTheme_corner: 'Corner', - txtTheme_turtle: 'Turtle' + txtTheme_turtle: 'Turtle', + warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.', + warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.', + warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 8738dc0b7..60d102d4d 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -2009,7 +2009,7 @@ define([ me.toolbar.btnPaste.$el.detach().appendTo($box); me.toolbar.btnCopy.$el.removeClass('split'); - if ( config.isProtectSupport && config.isOffline ) { + if ( config.isProtectSupport && config.isOffline && false ) { // don't add protect panel to toolbar tab = {action: 'protect', caption: me.toolbar.textTabProtect}; $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); if ($panel) diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 8ce08cf99..ca5de8ee2 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1458,7 +1458,7 @@ define([ transparent: true }); this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this)); - $(this.el).on('click', '#shape-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); + this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); this.btnFGColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1477,7 +1477,7 @@ define([ value: '000000' }); this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this)); - $(this.el).on('click', '#shape-foreground-color-new', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor)); + this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor)); this.btnBGColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1496,7 +1496,7 @@ define([ value: 'ffffff' }); this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this)); - $(this.el).on('click', '#shape-background-color-new', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor)); + this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor)); this.btnGradColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1515,7 +1515,7 @@ define([ value: '000000' }); this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this)); - $(this.el).on('click', '#shape-gradient-color-new', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor)); + this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor)); this.btnBorderColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1534,7 +1534,7 @@ define([ value: '000000' }); this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this)); - $(this.el).on('click', '#shape-border-color-new', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor)); + this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor)); } this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index 7ea48c6d9..530e86113 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -1011,7 +1011,7 @@ define([ transparent: true }); this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this)); - $(this.el).on('click', '#slide-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); + this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); this.btnFGColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1030,7 +1030,7 @@ define([ value: '000000' }); this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this)); - $(this.el).on('click', '#slide-foreground-color-new', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor)); + this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor)); this.btnBGColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1049,7 +1049,7 @@ define([ value: 'ffffff' }); this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this)); - $(this.el).on('click', '#slide-background-color-new', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor)); + this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor)); this.btnGradColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1068,7 +1068,7 @@ define([ value: '000000' }); this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this)); - $(this.el).on('click', '#slide-gradient-color-new', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor)); + this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor)); } this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); diff --git a/apps/presentationeditor/main/app/view/TableSettings.js b/apps/presentationeditor/main/app/view/TableSettings.js index bfdae2128..8b0f4c512 100644 --- a/apps/presentationeditor/main/app/view/TableSettings.js +++ b/apps/presentationeditor/main/app/view/TableSettings.js @@ -628,7 +628,7 @@ define([ el: $('#table-border-color-menu') }); this.borderColor.on('select', _.bind(this.onColorsBorderSelect, this)); - $(this.el).on('click', '#table-border-color-new', _.bind(this.addNewColor, this, this.borderColor, this.btnBorderColor)); + this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.borderColor, this.btnBorderColor)); this.btnBackColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -646,7 +646,7 @@ define([ transparent: true }); this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this)); - $(this.el).on('click', '#table-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); + this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); } this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); this.borderColor.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index c59c829fa..1e4cb2cc9 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -1483,7 +1483,7 @@ define([ transparent: true }); this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this)); - $(this.el).on('click', '#textart-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); + this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); this.btnFGColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1502,7 +1502,7 @@ define([ value: '000000' }); this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this)); - $(this.el).on('click', '#textart-foreground-color-new', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor)); + this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor)); this.btnBGColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1521,7 +1521,7 @@ define([ value: 'ffffff' }); this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this)); - $(this.el).on('click', '#textart-background-color-new', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor)); + this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor)); this.btnGradColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1540,7 +1540,7 @@ define([ value: '000000' }); this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this)); - $(this.el).on('click', '#textart-gradient-color-new', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor)); + this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor)); this.btnBorderColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1559,7 +1559,7 @@ define([ value: '000000' }); this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this)); - $(this.el).on('click', '#textart-border-color-new', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor)); + this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor)); } this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 30e984843..b626b8856 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1621,9 +1621,9 @@ define([ tipIncPrLeft: 'Increase Indent', tipLineSpace: 'Line Spacing', tipInsertTable: 'Insert Table', - tipInsertImage: 'Insert Picture', - mniImageFromFile: 'Picture from file', - mniImageFromUrl: 'Picture from url', + tipInsertImage: 'Insert Image', + mniImageFromFile: 'Image from file', + mniImageFromUrl: 'Image from url', mniCustomTable: 'Insert Custom Table', tipInsertHyperlink: 'Add Hyperlink', tipInsertText: 'Insert Text', @@ -1696,7 +1696,7 @@ define([ tipChangeChart: 'Change Chart Type', capInsertText: 'Text', capInsertTextArt: 'Text Art', - capInsertImage: 'Picture', + capInsertImage: 'Image', capInsertShape: 'Shape', capInsertTable: 'Table', capInsertChart: 'Chart', diff --git a/apps/presentationeditor/main/index.reporter.html b/apps/presentationeditor/main/index.reporter.html index d6f5525b7..332a66b91 100644 --- a/apps/presentationeditor/main/index.reporter.html +++ b/apps/presentationeditor/main/index.reporter.html @@ -1,5 +1,5 @@ - + ONLYOFFICE Presentation Editor diff --git a/apps/presentationeditor/main/index.reporter.html.deploy b/apps/presentationeditor/main/index.reporter.html.deploy index 8f7fca68c..10d9bc0dd 100644 --- a/apps/presentationeditor/main/index.reporter.html.deploy +++ b/apps/presentationeditor/main/index.reporter.html.deploy @@ -1,5 +1,5 @@ - + ONLYOFFICE Presentation Editor diff --git a/apps/presentationeditor/main/locale/de.json b/apps/presentationeditor/main/locale/de.json index 7fb9725dc..65b5e3ea5 100644 --- a/apps/presentationeditor/main/locale/de.json +++ b/apps/presentationeditor/main/locale/de.json @@ -149,7 +149,7 @@ "Common.Views.Protection.txtEncrypt": "Verschlüsseln", "Common.Views.Protection.txtInvisibleSignature": "Fügen Sie eine digitale Signatur hinzu", "Common.Views.Protection.txtSignature": "Signatur", - "Common.Views.Protection.txtSignatureLine": "Signaturzeile", + "Common.Views.Protection.txtSignatureLine": "Signaturzeile hinzufügen", "Common.Views.RenameDialog.cancelButtonText": "Abbrechen", "Common.Views.RenameDialog.okButtonText": "OK", "Common.Views.RenameDialog.textName": "Dateiname", @@ -236,8 +236,9 @@ "PE.Controllers.Main.errorAccessDeny": "Sie haben versucht die Änderungen im Dokument, zu dem Sie keine Berechtigungen haben, vorzunehemen.
Wenden Sie sich an Ihren Serveradministrator.", "PE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server verloren. Das Dokument kann momentan nicht bearbeitet werden.", - "PE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen, oder richten Sie an Ihren Administrator.
Wann Sie auf den Button \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

Mehr Information zur Verbindung des Dokument Servers finden Sie hier", + "PE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.
Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie hier", "PE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.
Fehler beim Verbinden zur Datenbank. Bitte wenden Sie sich an den Kundendienst, falls der Fehler bestehen bleibt.", + "PE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.", "PE.Controllers.Main.errorDataRange": "Falscher Datenbereich.", "PE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1", "PE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.", @@ -385,9 +386,11 @@ "PE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen", "PE.Controllers.Main.warnBrowserIE9": "Die Anwendung hat geringe Fähigkeiten in IE9. Nutzen Sie IE10 oder höher.", "PE.Controllers.Main.warnBrowserZoom": "Die aktuelle Zoom-Einstellung Ihres Webbrowsers wird nicht völlig unterstützt. Bitte stellen Sie die Standardeinstellung mithilfe der Tastenkombination Strg+0 wieder her.", + "PE.Controllers.Main.warnLicenseExceeded": "Die Anzahl gleichzeitiger Verbindungen zum Document Server wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet.
Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.", "PE.Controllers.Main.warnLicenseExp": "Ihre Lizenz ist abgelaufen.
Bitte aktualisieren Sie Ihre Lizenz und laden Sie die Seite neu.", - "PE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zu Dokumentenserver.
Wenn Sie mehr Verbindungen benötigen, aktualisieren Sie diese Version oder erwerben Sie eine kommerzielle Lizenz.", - "PE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer.
Wenn Sie mehr Nutzer benötigen, achten Sie bitte darauf, dass Sie entweder Ihre derzeitige Lizenz aktualisieren oder eine kommerzielle erwerben müssen.", + "PE.Controllers.Main.warnLicenseUsersExceeded": "Die Anzahl der gleichzeitigen Benutzer wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet.
Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.", + "PE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zum Dokumentenserver.
Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.", + "PE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer.
Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.", "PE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "Die Schriftart, die Sie verwenden wollen, ist auf diesem Gerät nicht verfügbar.
Der Textstil wird mit einer der Systemschriften angezeigt, die gespeicherte Schriftart wird verwendet, wenn sie verfügbar ist.
Wollen Sie fortsetzen?", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 35972d0f1..6886aec02 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -149,7 +149,7 @@ "Common.Views.Protection.txtEncrypt": "Encrypt", "Common.Views.Protection.txtInvisibleSignature": "Add digital signature", "Common.Views.Protection.txtSignature": "Signature", - "Common.Views.Protection.txtSignatureLine": "Signature line", + "Common.Views.Protection.txtSignatureLine": "Add signature line", "Common.Views.RenameDialog.cancelButtonText": "Cancel", "Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.textName": "File name", @@ -238,6 +238,7 @@ "PE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.", "PE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.

Find more information about connecting Document Server here", "PE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please contact support in case the error persists.", + "PE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "PE.Controllers.Main.errorDataRange": "Incorrect data range.", "PE.Controllers.Main.errorDefaultMessage": "Error code: %1", "PE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.", @@ -385,9 +386,11 @@ "PE.Controllers.Main.uploadImageTitleText": "Uploading Image", "PE.Controllers.Main.warnBrowserIE9": "The application has low capabilities on IE9. Use IE10 or higher", "PE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.", + "PE.Controllers.Main.warnLicenseExceeded": "The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.", "PE.Controllers.Main.warnLicenseExp": "Your license has expired.
Please update your license and refresh the page.", - "PE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider upgrading your current license or purchasing a commercial one.", - "PE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.", + "PE.Controllers.Main.warnLicenseUsersExceeded": "The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.", + "PE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", + "PE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.
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.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
Do you want to continue?", @@ -1401,7 +1404,7 @@ "PE.Views.Toolbar.capInsertChart": "Chart", "PE.Views.Toolbar.capInsertEquation": "Equation", "PE.Views.Toolbar.capInsertHyperlink": "Hyperlink", - "PE.Views.Toolbar.capInsertImage": "Picture", + "PE.Views.Toolbar.capInsertImage": "Image", "PE.Views.Toolbar.capInsertShape": "Shape", "PE.Views.Toolbar.capInsertTable": "Table", "PE.Views.Toolbar.capInsertText": "Text Box", @@ -1409,8 +1412,8 @@ "PE.Views.Toolbar.capTabHome": "Home", "PE.Views.Toolbar.capTabInsert": "Insert", "PE.Views.Toolbar.mniCustomTable": "Insert Custom Table", - "PE.Views.Toolbar.mniImageFromFile": "Picture from File", - "PE.Views.Toolbar.mniImageFromUrl": "Picture from URL", + "PE.Views.Toolbar.mniImageFromFile": "Image from File", + "PE.Views.Toolbar.mniImageFromUrl": "Image from URL", "PE.Views.Toolbar.mniSlideAdvanced": "Advanced Settings", "PE.Views.Toolbar.mniSlideStandard": "Standard (4:3)", "PE.Views.Toolbar.mniSlideWide": "Widescreen (16:9)", @@ -1444,8 +1447,8 @@ "PE.Views.Toolbar.textShapeAlignRight": "Align Right", "PE.Views.Toolbar.textShapeAlignTop": "Align Top", "PE.Views.Toolbar.textShowBegin": "Show from Beginning", - "PE.Views.Toolbar.textShowCurrent": "Show from Current slide", - "PE.Views.Toolbar.textShowPresenterView": "Show presenter view", + "PE.Views.Toolbar.textShowCurrent": "Show from Current Slide", + "PE.Views.Toolbar.textShowPresenterView": "Show Presenter View", "PE.Views.Toolbar.textShowSettings": "Show Settings", "PE.Views.Toolbar.textStock": "Stock", "PE.Views.Toolbar.textStrikeout": "Strikethrough", @@ -1476,7 +1479,7 @@ "PE.Views.Toolbar.tipInsertChart": "Insert chart", "PE.Views.Toolbar.tipInsertEquation": "Insert equation", "PE.Views.Toolbar.tipInsertHyperlink": "Add hyperlink", - "PE.Views.Toolbar.tipInsertImage": "Insert picture", + "PE.Views.Toolbar.tipInsertImage": "Insert image", "PE.Views.Toolbar.tipInsertShape": "Insert autoshape", "PE.Views.Toolbar.tipInsertTable": "Insert table", "PE.Views.Toolbar.tipInsertText": "Insert text box", diff --git a/apps/presentationeditor/main/locale/it.json b/apps/presentationeditor/main/locale/it.json index 7ce63821a..fa04c432f 100644 --- a/apps/presentationeditor/main/locale/it.json +++ b/apps/presentationeditor/main/locale/it.json @@ -124,17 +124,18 @@ "Common.Views.OpenDialog.txtEncoding": "Codifica", "Common.Views.OpenDialog.txtIncorrectPwd": "Password errata", "Common.Views.OpenDialog.txtPassword": "Password", + "Common.Views.OpenDialog.txtProtected": "Una volta inserita la password e aperto il file, verrà ripristinata la password corrente sul file.", "Common.Views.OpenDialog.txtTitle": "Seleziona parametri %1", "Common.Views.OpenDialog.txtTitleProtected": "File protetto", "Common.Views.PasswordDialog.cancelButtonText": "Annulla", "Common.Views.PasswordDialog.okButtonText": "OK", - "Common.Views.PasswordDialog.txtDescription": "É richiesta la password per aprire il documento", + "Common.Views.PasswordDialog.txtDescription": "É richiesta la password per proteggere il documento", "Common.Views.PasswordDialog.txtIncorrectPwd": "la password di conferma non corrisponde", "Common.Views.PasswordDialog.txtPassword": "Password", "Common.Views.PasswordDialog.txtRepeat": "Ripeti password", "Common.Views.PasswordDialog.txtTitle": "Imposta password", "Common.Views.PluginDlg.textLoading": "Caricamento", - "Common.Views.Plugins.groupCaption": "Componenti Aggiuntivi", + "Common.Views.Plugins.groupCaption": "Plugin", "Common.Views.Plugins.strPlugins": "Plugin", "Common.Views.Plugins.textLoading": "Caricamento", "Common.Views.Plugins.textStart": "Avvio", @@ -237,6 +238,7 @@ "PE.Controllers.Main.errorCoAuthoringDisconnect": "Connessione al server persa. Impossibile modificare il documento.", "PE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.

Find more information about connecting Document Server here", "PE.Controllers.Main.errorDatabaseConnection": "Errore esterno.
Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.", + "PE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.", "PE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.", "PE.Controllers.Main.errorDefaultMessage": "Codice errore: %1", "PE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.", @@ -276,7 +278,7 @@ "PE.Controllers.Main.printTitleText": "Stampa della presentazione", "PE.Controllers.Main.reloadButtonText": "Ricarica pagina", "PE.Controllers.Main.requestEditFailedMessageText": "Qualcuno sta modificando questa presentazione. Si prega di provare più tardi.", - "PE.Controllers.Main.requestEditFailedTitleText": "Accesso vietato", + "PE.Controllers.Main.requestEditFailedTitleText": "Accesso negato", "PE.Controllers.Main.saveErrorText": "Si è verificato un errore al salvataggio del file", "PE.Controllers.Main.savePreparingText": "Preparazione al salvataggio ", "PE.Controllers.Main.savePreparingTitle": "Preparazione al salvataggio. Si prega di aspettare...", @@ -297,6 +299,7 @@ "PE.Controllers.Main.textTryUndoRedo": "Le funzioni Annulla/Ripristina sono disabilitate per la Modalità di Co-editing Veloce.
Clicca il pulsante 'Modalità Rigorosa' per passare alla Modalità di Co-editing Rigorosa per poter modificare il file senza l'interferenza di altri utenti e inviare le modifiche solamente dopo averle salvate. Puoi passare da una modalità all'altra di co-editing utilizzando le Impostazioni avanzate dell'editor.", "PE.Controllers.Main.titleLicenseExp": "La licenza è scaduta", "PE.Controllers.Main.titleServerVersion": "L'editor è stato aggiornato", + "PE.Controllers.Main.txtAddFirstSlide": "Fare click per aggiungere la prima diapositiva", "PE.Controllers.Main.txtAddNotes": "Clicca per aggiungere note", "PE.Controllers.Main.txtArt": "Your text here", "PE.Controllers.Main.txtBasicShapes": "Figure di base", @@ -363,9 +366,15 @@ "PE.Controllers.Main.txtStarsRibbons": "Stelle e nastri", "PE.Controllers.Main.txtTheme_blank": "Vuoto", "PE.Controllers.Main.txtTheme_classic": "Classico", + "PE.Controllers.Main.txtTheme_corner": "angolo", + "PE.Controllers.Main.txtTheme_dotted": "Punteggiato", "PE.Controllers.Main.txtTheme_green": "Verde", "PE.Controllers.Main.txtTheme_lines": "Linee", "PE.Controllers.Main.txtTheme_office": "Ufficio", + "PE.Controllers.Main.txtTheme_official": "Ufficiale", + "PE.Controllers.Main.txtTheme_pixel": "Pixel", + "PE.Controllers.Main.txtTheme_safari": "Safari", + "PE.Controllers.Main.txtTheme_turtle": "Turtle", "PE.Controllers.Main.txtXAxis": "Asse X", "PE.Controllers.Main.txtYAxis": "Asse Y", "PE.Controllers.Main.unknownErrorText": "Errore sconosciuto.", @@ -377,7 +386,9 @@ "PE.Controllers.Main.uploadImageTitleText": "Caricamento dell'immagine", "PE.Controllers.Main.warnBrowserIE9": "L'applicazione è poco compatibile con IE9. Usa IE10 o più recente", "PE.Controllers.Main.warnBrowserZoom": "Le impostazioni correnti di zoom del tuo browser non sono completamente supportate. Per favore, ritorna allo zoom predefinito premendo Ctrl+0.", + "PE.Controllers.Main.warnLicenseExceeded": "Il numero di connessioni simultanee al server dei documenti è stato superato e il documento verrà aperto solo per la visualizzazione.
Contattare l'amministratore per ulteriori informazioni.", "PE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.
Si prega di aggiornare la licenza e ricaricare la pagina.", + "PE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione.
Per ulteriori informazioni, contattare l'amministratore.", "PE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.
Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.", "PE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.
Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.", "PE.Controllers.Main.warnProcessRightsChange": "Ci stato negato il diritto alla modifica del file.", @@ -571,10 +582,10 @@ "PE.Controllers.Toolbar.txtLimitLog_LogBase": "Logaritmo", "PE.Controllers.Toolbar.txtLimitLog_Max": "Massimo", "PE.Controllers.Toolbar.txtLimitLog_Min": "Minimo", - "PE.Controllers.Toolbar.txtMatrix_1_2": "1x2 Matrice Vuota", - "PE.Controllers.Toolbar.txtMatrix_1_3": "1x3 Matrice Vuota", - "PE.Controllers.Toolbar.txtMatrix_2_1": "2x1 Matrice Vuota", - "PE.Controllers.Toolbar.txtMatrix_2_2": "2x2 Matrice Vuota", + "PE.Controllers.Toolbar.txtMatrix_1_2": "1x2 Matrice vuota", + "PE.Controllers.Toolbar.txtMatrix_1_3": "1x3 Matrice vuota", + "PE.Controllers.Toolbar.txtMatrix_2_1": "2x1 Matrice vuota", + "PE.Controllers.Toolbar.txtMatrix_2_2": "2x2 Matrice vuota", "PE.Controllers.Toolbar.txtMatrix_2_2_DLineBracket": "Matrice vuota con parentesi", "PE.Controllers.Toolbar.txtMatrix_2_2_LineBracket": "Matrice vuota con parentesi", "PE.Controllers.Toolbar.txtMatrix_2_2_RoundBracket": "Matrice vuota con parentesi", @@ -914,7 +925,7 @@ "PE.Views.DocumentPreview.txtPlay": "Avvia presentazione", "PE.Views.DocumentPreview.txtPrev": "Diapositiva precedente", "PE.Views.DocumentPreview.txtReset": "Reimposta", - "PE.Views.FileMenu.btnAboutCaption": "Informazioni sul programma", + "PE.Views.FileMenu.btnAboutCaption": "Informazioni su", "PE.Views.FileMenu.btnBackCaption": "Va' ai Documenti", "PE.Views.FileMenu.btnCloseMenuCaption": "Chiudi il menù", "PE.Views.FileMenu.btnCreateNewCaption": "Crea nuovo oggetto", @@ -927,7 +938,7 @@ "PE.Views.FileMenu.btnRenameCaption": "Rinomina...", "PE.Views.FileMenu.btnReturnCaption": "Torna alla presentazione", "PE.Views.FileMenu.btnRightsCaption": "Access Rights...", - "PE.Views.FileMenu.btnSaveAsCaption": "Salva con", + "PE.Views.FileMenu.btnSaveAsCaption": "Salva con Nome", "PE.Views.FileMenu.btnSaveCaption": "Salva", "PE.Views.FileMenu.btnSettingsCaption": "Impostazioni avanzate...", "PE.Views.FileMenu.btnToEditCaption": "Modifica presentazione", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index ac6cbe3bd..5e0afc390 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -149,7 +149,7 @@ "Common.Views.Protection.txtEncrypt": "Шифровать", "Common.Views.Protection.txtInvisibleSignature": "Добавить цифровую подпись", "Common.Views.Protection.txtSignature": "Подпись", - "Common.Views.Protection.txtSignatureLine": "Строка подписи", + "Common.Views.Protection.txtSignatureLine": "Добавить строку подписи", "Common.Views.RenameDialog.cancelButtonText": "Отмена", "Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.textName": "Имя файла", @@ -238,6 +238,7 @@ "PE.Controllers.Main.errorCoAuthoringDisconnect": "Потеряно соединение с сервером. В данный момент нельзя отредактировать документ.", "PE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.
Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.

Дополнительную информацию о подключении Сервера документов можно найти здесь", "PE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.
Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.", + "PE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.", "PE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.", "PE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1", "PE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.", @@ -385,9 +386,11 @@ "PE.Controllers.Main.uploadImageTitleText": "Загрузка изображения", "PE.Controllers.Main.warnBrowserIE9": "В IE9 приложение имеет низкую производительность. Используйте IE10 или более позднюю версию.", "PE.Controllers.Main.warnBrowserZoom": "Текущее значение масштаба страницы в браузере поддерживается не полностью. Вернитесь к масштабу по умолчанию, нажав Ctrl+0", + "PE.Controllers.Main.warnLicenseExceeded": "Превышено допустимое число одновременных подключений к серверу документов, и документ откроется только на просмотр.
Обратитесь к администратору за дополнительной информацией.", "PE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.
Обновите лицензию, а затем обновите страницу.", - "PE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.", - "PE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.
Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.", + "PE.Controllers.Main.warnLicenseUsersExceeded": "Превышено допустимое число одновременно работающих пользователей, и документ откроется только на просмотр.
Обратитесь к администратору за дополнительной информацией.", + "PE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", + "PE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", "PE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", "PE.Controllers.Statusbar.zoomText": "Масштаб {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "Шрифт, который вы хотите сохранить, недоступен на этом устройстве.
Стиль текста будет отображаться с помощью одного из системных шрифтов. Сохраненный шрифт будет использоваться, когда он станет доступен.
Вы хотите продолжить?", diff --git a/apps/presentationeditor/main/locale/zh.json b/apps/presentationeditor/main/locale/zh.json index 2cd1752f6..2a7109e0c 100644 --- a/apps/presentationeditor/main/locale/zh.json +++ b/apps/presentationeditor/main/locale/zh.json @@ -182,7 +182,7 @@ "PE.Controllers.Main.textCloseTip": "点击关闭提示", "PE.Controllers.Main.textContactUs": "联系销售", "PE.Controllers.Main.textLoadingDocument": "载入演示", - "PE.Controllers.Main.textNoLicenseTitle": "NLYOFFICE开源版本", + "PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE开源版本", "PE.Controllers.Main.textShape": "形状", "PE.Controllers.Main.textStrict": "严格模式", "PE.Controllers.Main.textTryUndoRedo": "对于快速的协同编辑模式，取消/重做功能是禁用的。< br >单击“严格模式”按钮切换到严格co-editing模式编辑该文件没有其他用户干扰和发送您的更改只后你拯救他们。您可以使用编辑器高级设置在编辑模式之间切换。", @@ -193,12 +193,20 @@ "PE.Controllers.Main.txtButtons": "按钮", "PE.Controllers.Main.txtCallouts": "标注", "PE.Controllers.Main.txtCharts": "图表", + "PE.Controllers.Main.txtClipArt": "剪贴画", + "PE.Controllers.Main.txtDateTime": "日期与时间", + "PE.Controllers.Main.txtDiagram": "SmartArt", "PE.Controllers.Main.txtDiagramTitle": "图表标题", "PE.Controllers.Main.txtEditingMode": "设置编辑模式..", "PE.Controllers.Main.txtFiguredArrows": "图形箭头", + "PE.Controllers.Main.txtFooter": "页脚", + "PE.Controllers.Main.txtHeader": "头", + "PE.Controllers.Main.txtImage": "图片", "PE.Controllers.Main.txtLines": "行", "PE.Controllers.Main.txtMath": "数学", + "PE.Controllers.Main.txtMedia": "媒体", "PE.Controllers.Main.txtNeedSynchronize": "你有更新", + "PE.Controllers.Main.txtPicture": "图片", "PE.Controllers.Main.txtRectangles": "矩形", "PE.Controllers.Main.txtSeries": "系列", "PE.Controllers.Main.txtSldLtTBlank": "空白", @@ -237,6 +245,10 @@ "PE.Controllers.Main.txtSldLtTVertTitleAndTx": "垂直标题和文字", "PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "垂直标题和文字在图表上", "PE.Controllers.Main.txtSldLtTVertTx": "垂直文本", + "PE.Controllers.Main.txtSlideNumber": "幻灯片编号", + "PE.Controllers.Main.txtSlideSubtitle": "幻灯片副标题", + "PE.Controllers.Main.txtSlideText": "幻灯片文本", + "PE.Controllers.Main.txtSlideTitle": "幻灯片标题", "PE.Controllers.Main.txtStarsRibbons": "星星和丝带", "PE.Controllers.Main.txtXAxis": "X轴", "PE.Controllers.Main.txtYAxis": "Y轴", @@ -734,6 +746,7 @@ "PE.Views.DocumentHolder.txtMatrixAlign": "矩阵对齐", "PE.Views.DocumentHolder.txtNewSlide": "新幻灯片", "PE.Views.DocumentHolder.txtOverbar": "文本上一条", + "PE.Views.DocumentHolder.txtPastePicture": "图片", "PE.Views.DocumentHolder.txtPressLink": "按CTRL并单击链接", "PE.Views.DocumentHolder.txtPreview": "开始幻灯片放映", "PE.Views.DocumentHolder.txtRemFractionBar": "删除分数栏", @@ -1214,6 +1227,7 @@ "PE.Views.TextArtSettings.txtNoBorders": "没有线", "PE.Views.TextArtSettings.txtPapyrus": "纸莎草", "PE.Views.TextArtSettings.txtWood": "木头", + "PE.Views.Toolbar.capInsertImage": "图片", "PE.Views.Toolbar.mniCustomTable": "插入自定义表", "PE.Views.Toolbar.mniImageFromFile": "图片文件", "PE.Views.Toolbar.mniImageFromUrl": "图片来自网络", diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index fd1ac443b..c46d969ce 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -80,7 +80,7 @@ define([ usersCount : 1, fastCoauth : true, lostEditingRights : false, - licenseWarning : false + licenseType : false }; // Initialize viewport @@ -169,6 +169,18 @@ define([ Common.Gateway.on('showmessage', _.bind(me.onExternalMessage, me)); Common.Gateway.on('opendocument', _.bind(me.loadDocument, me)); Common.Gateway.appReady(); + + Common.Gateway.on('internalcommand', function(data) { + if (data.command=='hardBack') { + if ($('.modal-in').length>0) { + if ( !$(me.loadMask).hasClass('modal-in') ) + uiApp.closeModal(); + Common.Gateway.internalMessage('hardBack', false); + } else + Common.Gateway.internalMessage('hardBack', true); + } + }); + Common.Gateway.internalMessage('listenHardBack'); } me.initNames(); @@ -523,17 +535,37 @@ define([ onLicenseChanged: function(params) { var licType = params.asc_getLicenseType(); - if (licType !== undefined && (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount) && this.appOptions.canEdit && this.editorConfig.mode !== 'view') { - this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) ? this.warnNoLicense : this.warnNoLicenseUsers; - } + if (licType !== undefined && this.appOptions.canEdit && this.editorConfig.mode !== 'view' && + (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount || licType===Asc.c_oLicenseResult.ConnectionsOS || licType===Asc.c_oLicenseResult.UsersCountOS)) + this._state.licenseType = licType; - if (this._isDocReady && this._state.licenseWarning) + if (this._isDocReady && this._state.licenseType) this.applyLicense(); }, applyLicense: function() { var me = this; - if (me._state.licenseWarning) { + if (this._state.licenseType) { + var license = this._state.licenseType, + buttons = [{text: 'OK'}]; + if (license===Asc.c_oLicenseResult.Connections || license===Asc.c_oLicenseResult.UsersCount) { + license = (license===Asc.c_oLicenseResult.Connections) ? this.warnLicenseExceeded : this.warnLicenseUsersExceeded; + } else { + license = (license===Asc.c_oLicenseResult.ConnectionsOS) ? this.warnNoLicense : this.warnNoLicenseUsers; + buttons = [{ + text: me.textBuyNow, + bold: true, + onClick: function() { + window.open('https://www.onlyoffice.com', "_blank"); + } + }, + { + text: me.textContactUs, + onClick: function() { + window.open('mailto:sales@onlyoffice.com', "_blank"); + } + }]; + } PE.getController('Toolbar').activateViewControls(); PE.getController('Toolbar').deactivateEditControls(); Common.NotificationCenter.trigger('api:disconnect'); @@ -546,22 +578,8 @@ define([ Common.localStorage.setItem("pe-license-warning", now); uiApp.modal({ title: me.textNoLicenseTitle, - text : me._state.licenseWarning, - buttons: [ - { - text: me.textBuyNow, - bold: true, - onClick: function() { - window.open('https://www.onlyoffice.com', "_blank"); - } - }, - { - text: me.textContactUs, - onClick: function() { - window.open('mailto:sales@onlyoffice.com', "_blank"); - } - } - ] + text : license, + buttons: buttons }); } } else @@ -806,6 +824,10 @@ define([ config.msg = this.errorBadImageUrl; break; + case Asc.c_oAscError.ID.DataEncrypted: + config.msg = this.errorDataEncrypted; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -826,6 +848,10 @@ define([ Common.NotificationCenter.trigger('goback'); } } + if (id == Asc.c_oAscError.ID.DataEncrypted) { + this.api.asc_coAuthoringDisconnect(); + Common.NotificationCenter.trigger('api:disconnect'); + } } else { Common.Gateway.reportWarning(id, config.msg); @@ -1252,7 +1278,6 @@ define([ textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.', textBuyNow: 'Visit website', textNoLicenseTitle: 'ONLYOFFICE open source version', - warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider upgrading your current license or purchasing a commercial one.', textContactUs: 'Contact sales', errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download or print until the connection is restored.', warnLicenseExp: 'Your license has expired.
Please update your license and refresh the page.', @@ -1285,8 +1310,12 @@ define([ txtSlideNumber: 'Slide number', txtSlideSubtitle: 'Slide subtitle', txtSlideTitle: 'Slide title', - warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.', - txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset' + txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset', + warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.', + warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.', + warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.' } })(), PE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/presentationeditor/mobile/locale/de.json b/apps/presentationeditor/mobile/locale/de.json index 3c624e5c2..5bca626ee 100644 --- a/apps/presentationeditor/mobile/locale/de.json +++ b/apps/presentationeditor/mobile/locale/de.json @@ -69,8 +69,9 @@ "PE.Controllers.Main.downloadTitleText": "Herunterladen des Dokuments", "PE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Sie können nicht mehr editieren.", - "PE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen, oder kontaktieren Sie Ihren Administrator.
Wann Sie auf den Button \"OK\" klicken, werden Sie aufgefordert, das Dokument herunterzuladen.

Mehr Information zur Verbindung des Dokument Servers finden Sie hier", + "PE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.
Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie hier", "PE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.
Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.", + "PE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.", "PE.Controllers.Main.errorDataRange": "Falscher Datenbereich.", "PE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1", "PE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.", @@ -203,9 +204,11 @@ "PE.Controllers.Main.uploadImageSizeMessage": "Die maximal zulässige Bildgröße ist überschritten.", "PE.Controllers.Main.uploadImageTextText": "Bild wird hochgeladen...", "PE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen", + "PE.Controllers.Main.warnLicenseExceeded": "Die Anzahl gleichzeitiger Verbindungen zum Document Server wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet.
Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.", "PE.Controllers.Main.warnLicenseExp": "Ihre Lizenz ist abgelaufen.
Bitte aktualisieren Sie Ihre Lizenz und laden Sie die Seite neu.", - "PE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zu Dokumentenserver.
Wenn Sie mehr Verbindungen benötigen, aktualisieren Sie diese Version oder erwerben Sie eine kommerzielle Lizenz.", - "PE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer.
Wenn Sie mehr Nutzer benötigen, achten Sie bitte darauf, dass Sie entweder Ihre derzeitige Lizenz aktualisieren oder eine kommerzielle erwerben müssen.", + "PE.Controllers.Main.warnLicenseUsersExceeded": "Die Anzahl der gleichzeitigen Benutzer wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet.
Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.", + "PE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zum Dokumentenserver.
Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.", + "PE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer.
Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.", "PE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.", "PE.Controllers.Search.textNoTextFound": "Der Text wurde nicht gefunden.", "PE.Controllers.Settings.notcriticalErrorTitle": "Achtung", diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 1b455190c..141d9692e 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -69,8 +69,9 @@ "PE.Controllers.Main.downloadTitleText": "Downloading Document", "PE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. You can't edit anymore.", - "PE.Controllers.Main.errorConnectToServer": " The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.

Find more information about connecting Document Server here", + "PE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.

Find more information about connecting Document Server here", "PE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please, contact support.", + "PE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "PE.Controllers.Main.errorDataRange": "Incorrect data range.", "PE.Controllers.Main.errorDefaultMessage": "Error code: %1", "PE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.", @@ -203,9 +204,11 @@ "PE.Controllers.Main.uploadImageSizeMessage": "Maximium image size limit exceeded.", "PE.Controllers.Main.uploadImageTextText": "Uploading image...", "PE.Controllers.Main.uploadImageTitleText": "Uploading Image", + "PE.Controllers.Main.warnLicenseExceeded": "The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.", "PE.Controllers.Main.warnLicenseExp": "Your license has expired.
Please update your license and refresh the page.", - "PE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider upgrading your current license or purchasing a commercial one.", - "PE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.", + "PE.Controllers.Main.warnLicenseUsersExceeded": "The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.", + "PE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", + "PE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", "PE.Controllers.Search.textNoTextFound": "Text not Found", "PE.Controllers.Settings.notcriticalErrorTitle": "Warning", diff --git a/apps/presentationeditor/mobile/locale/it.json b/apps/presentationeditor/mobile/locale/it.json index 1472fdda3..d7b6999f4 100644 --- a/apps/presentationeditor/mobile/locale/it.json +++ b/apps/presentationeditor/mobile/locale/it.json @@ -69,8 +69,9 @@ "PE.Controllers.Main.downloadTitleText": "Download del documento", "PE.Controllers.Main.errorBadImageUrl": "URL dell'immagine non corretto", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Scollegato dal server. Non è possibile modificare.", - "PE.Controllers.Main.errorConnectToServer": "Impossibile salvare il documento. Si prega di verificare i parametri di connessione o rivolgersi all'amministratore.
Una volta cliccato il pulsante 'OK', si verrà invitati a scaricare il documento.

Puoi trovare maggiori informazioni sulla connessione al Server dei Documenti qui", + "PE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.
Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.

Per maggiori dettagli sulla connessione al Document Server clicca qui", "PE.Controllers.Main.errorDatabaseConnection": "Errore esterno.
Errore di connessione al database. Si prega di contattare il supporto.", + "PE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.", "PE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.", "PE.Controllers.Main.errorDefaultMessage": "Codice errore: %1", "PE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.", @@ -203,9 +204,11 @@ "PE.Controllers.Main.uploadImageSizeMessage": "È stata superata la dimensione massima per l'immagine.", "PE.Controllers.Main.uploadImageTextText": "Caricamento dell'immagine in corso...", "PE.Controllers.Main.uploadImageTitleText": "Caricamento dell'immagine", + "PE.Controllers.Main.warnLicenseExceeded": "Il numero di connessioni simultanee al server dei documenti è stato superato e il documento verrà aperto solo per la visualizzazione.
Contattare l'amministratore per ulteriori informazioni.", "PE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.
Si prega di aggiornare la licenza e ricaricare la pagina.", + "PE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione.
Per ulteriori informazioni, contattare l'amministratore.", "PE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.
Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.", - "PE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.
Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.", + "PE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE Editors presenta alcune limitazioni per gli utenti simultanei.
Se hai bisogno di più, ti preghiamo di considerare l'aggiornamento della tua licenza attuale o l'acquisto di una licenza commerciale.", "PE.Controllers.Main.warnProcessRightsChange": "Ti è stato negato il diritto di modificare il file.", "PE.Controllers.Search.textNoTextFound": "Testo non trovato", "PE.Controllers.Settings.notcriticalErrorTitle": "Avviso", diff --git a/apps/presentationeditor/mobile/locale/ru.json b/apps/presentationeditor/mobile/locale/ru.json index 3f4120809..b7fb4a322 100644 --- a/apps/presentationeditor/mobile/locale/ru.json +++ b/apps/presentationeditor/mobile/locale/ru.json @@ -71,6 +71,7 @@ "PE.Controllers.Main.errorCoAuthoringDisconnect": "Подключение к серверу прервано. Редактирование недоступно.", "PE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.
Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.

Дополнительную информацию о подключении Сервера документов можно найти здесь", "PE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.
Ошибка подключения к базе данных. Пожалуйста, обратитесь в службу технической поддержки.", + "PE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.", "PE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.", "PE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1", "PE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.", @@ -203,9 +204,11 @@ "PE.Controllers.Main.uploadImageSizeMessage": "Превышен максимальный размер изображения.", "PE.Controllers.Main.uploadImageTextText": "Загрузка изображения...", "PE.Controllers.Main.uploadImageTitleText": "Загрузка изображения", + "PE.Controllers.Main.warnLicenseExceeded": "Превышено допустимое число одновременных подключений к серверу документов, и документ откроется только на просмотр.
Обратитесь к администратору за дополнительной информацией.", "PE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.
Обновите лицензию, а затем обновите страницу.", - "PE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.", - "PE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.
Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.", + "PE.Controllers.Main.warnLicenseUsersExceeded": "Превышено допустимое число одновременно работающих пользователей, и документ откроется только на просмотр.
Обратитесь к администратору за дополнительной информацией.", + "PE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", + "PE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", "PE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", "PE.Controllers.Search.textNoTextFound": "Текст не найден", "PE.Controllers.Settings.notcriticalErrorTitle": "Внимание", @@ -431,7 +434,7 @@ "PE.Views.Settings.textDownloadAs": "Скачать как...", "PE.Views.Settings.textEditPresent": "Редактировать", "PE.Views.Settings.textEmail": "email", - "PE.Views.Settings.textFind": "Найти", + "PE.Views.Settings.textFind": "Поиск", "PE.Views.Settings.textHelp": "Справка", "PE.Views.Settings.textLoading": "Загрузка...", "PE.Views.Settings.textPoweredBy": "Powered by", diff --git a/apps/presentationeditor/mobile/locale/zh.json b/apps/presentationeditor/mobile/locale/zh.json index 02ebf2b33..e05809b4c 100644 --- a/apps/presentationeditor/mobile/locale/zh.json +++ b/apps/presentationeditor/mobile/locale/zh.json @@ -122,7 +122,7 @@ "PE.Controllers.Main.textContactUs": "联系销售", "PE.Controllers.Main.textDone": "完成", "PE.Controllers.Main.textLoadingDocument": "载入演示", - "PE.Controllers.Main.textNoLicenseTitle": "NLYOFFICE开源版本", + "PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE开源版本", "PE.Controllers.Main.textOK": "确定", "PE.Controllers.Main.textPassword": "密码", "PE.Controllers.Main.textPreloader": "载入中…", diff --git a/apps/presentationeditor/mobile/resources/css/app-material.css b/apps/presentationeditor/mobile/resources/css/app-material.css index 0f45b26d4..c7f7f55e8 100644 --- a/apps/presentationeditor/mobile/resources/css/app-material.css +++ b/apps/presentationeditor/mobile/resources/css/app-material.css @@ -6250,6 +6250,13 @@ textarea { -webkit-user-select: text; user-select: text; } +#editor-navbar.navbar .right { + padding-right: 4px; +} +#editor-navbar.navbar .right a.link, +#editor-navbar.navbar .left a.link { + padding: 0 13px; +} #add-table .page, #add-shape .page { background-color: #fff; diff --git a/apps/presentationeditor/mobile/resources/less/app-material.less b/apps/presentationeditor/mobile/resources/less/app-material.less index ddc66ef07..a3e7bbf60 100644 --- a/apps/presentationeditor/mobile/resources/less/app-material.less +++ b/apps/presentationeditor/mobile/resources/less/app-material.less @@ -81,6 +81,15 @@ input, textarea { user-select:text; } +// Main Toolbar +#editor-navbar.navbar .right { + padding-right: 4px; +} +#editor-navbar.navbar .right a.link, +#editor-navbar.navbar .left a.link { + padding: 0 13px; +} + // Add Container #add-table, diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index f97db87d0..a989b5dff 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -107,7 +107,7 @@ define([ // $(document.body).css('position', 'absolute'); var me = this; - this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false}; + this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false}; this.translationTable = []; if (!Common.Utils.isBrowserSupported()){ @@ -786,16 +786,27 @@ define([ if (this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge) return; var licType = params.asc_getLicenseType(); - if (licType !== undefined && (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount) && this.appOptions.canEdit && this.editorConfig.mode !== 'view') { - this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) ? this.warnNoLicense : this.warnNoLicenseUsers; - } + if (licType !== undefined && this.appOptions.canEdit && this.editorConfig.mode !== 'view' && + (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount || licType===Asc.c_oLicenseResult.ConnectionsOS || licType===Asc.c_oLicenseResult.UsersCountOS)) + this._state.licenseType = licType; if (this._isDocReady) this.applyLicense(); }, applyLicense: function() { - if (this._state.licenseWarning) { + if (this._state.licenseType) { + var license = this._state.licenseType, + buttons = ['ok'], + primary = 'ok'; + if (license===Asc.c_oLicenseResult.Connections || license===Asc.c_oLicenseResult.UsersCount) { + license = (license===Asc.c_oLicenseResult.Connections) ? this.warnLicenseExceeded : this.warnLicenseUsersExceeded; + } else { + license = (license===Asc.c_oLicenseResult.ConnectionsOS) ? this.warnNoLicense : this.warnNoLicenseUsers; + buttons = [{value: 'buynow', caption: this.textBuyNow}, {value: 'contact', caption: this.textContactUs}]; + primary = 'buynow'; + } + this.disableEditing(true); Common.NotificationCenter.trigger('api:disconnect'); @@ -807,12 +818,9 @@ define([ Common.UI.info({ width: 500, title: this.textNoLicenseTitle, - msg : this._state.licenseWarning, - buttons: [ - {value: 'buynow', caption: this.textBuyNow}, - {value: 'contact', caption: this.textContactUs} - ], - primary: 'buynow', + msg : license, + buttons: buttons, + primary: primary, callback: function(btn) { if (btn == 'buynow') window.open('https://www.onlyoffice.com', "_blank"); @@ -896,7 +904,7 @@ define([ (typeof (this.editorConfig.customization) == 'object' && !!this.editorConfig.customization.forcesave); this.appOptions.forcesave = this.appOptions.canForcesave; this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly); - this.appOptions.isProtectSupport = false; // remove in 5.2 + this.appOptions.isProtectSupport = true; // remove in 5.2 this.appOptions.canProtect = this.appOptions.isProtectSupport && this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport() && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge); this.applyModeCommonElements(); @@ -1293,6 +1301,10 @@ define([ console.warn(config.msg); break; + case Asc.c_oAscError.ID.DataEncrypted: + config.msg = this.errorDataEncrypted; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -1313,6 +1325,10 @@ define([ } } } + if (id == Asc.c_oAscError.ID.DataEncrypted) { + this.api.asc_coAuthoringDisconnect(); + Common.NotificationCenter.trigger('api:disconnect'); + } } else { Common.Gateway.reportWarning(id, config.msg); @@ -2159,7 +2175,6 @@ define([ errorFrmlWrongReferences: 'The function refers to a sheet that does not exist.
Please check the data and try again.', textBuyNow: 'Visit website', textNoLicenseTitle: 'ONLYOFFICE open source version', - warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider upgrading your current license or purchasing a commercial one.', textContactUs: 'Contact sales', confirmPutMergeRange: 'The source data contains merged cells.
They will be unmerged before they are pasted into the table.', errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download or print until the connection is restored.', @@ -2200,9 +2215,13 @@ define([ txtStyle_Currency: 'Currency', txtStyle_Percent: 'Percent', txtStyle_Comma: 'Comma', - warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.', errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.", - errorMaxPoints: "The maximum number of points in series per chart is 4096." + errorMaxPoints: "The maximum number of points in series per chart is 4096.", + warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.', + warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.', + warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 893472db0..0a47b51d3 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2978,7 +2978,7 @@ define([ me.toolbar.btnPaste.$el.detach().appendTo($box); me.toolbar.btnCopy.$el.removeClass('split'); - if ( config.isProtectSupport && config.isOffline ) { + if ( config.isProtectSupport && config.isOffline && false ) { // don't add protect panel to toolbar tab = {action: 'protect', caption: me.toolbar.textTabProtect}; $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); if ($panel) diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index e6bdca933..f88f5344b 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -539,7 +539,7 @@ define([ value: '000000' }); this.colorsSpark.on('select', _.bind(this.onColorsSparkSelect, this)); - $(this.el).on('click', '#spark-color-new', _.bind(this.addNewColor, this, this.colorsSpark, this.btnSparkColor)); + this.btnSparkColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsSpark, this.btnSparkColor)); this.btnHighColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -554,7 +554,7 @@ define([ this.lockedControls.push(this.btnHighColor); this.colorsHigh = new Common.UI.ThemeColorPalette({ el: $('#spark-high-color-menu') }); this.colorsHigh.on('select', _.bind(this.onColorsPointSelect, this, 0, this.btnHighColor)); - $(this.el).on('click', '#spark-high-color-new', _.bind(this.addNewColor, this, this.colorsHigh, this.btnHighColor)); + this.btnHighColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsHigh, this.btnHighColor)); this.btnLowColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -569,7 +569,7 @@ define([ this.lockedControls.push(this.btnLowColor); this.colorsLow = new Common.UI.ThemeColorPalette({ el: $('#spark-low-color-menu') }); this.colorsLow.on('select', _.bind(this.onColorsPointSelect, this, 1, this.btnLowColor)); - $(this.el).on('click', '#spark-low-color-new', _.bind(this.addNewColor, this, this.colorsLow, this.btnLowColor)); + this.btnLowColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsLow, this.btnLowColor)); this.btnNegativeColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -584,7 +584,7 @@ define([ this.lockedControls.push(this.btnNegativeColor); this.colorsNegative = new Common.UI.ThemeColorPalette({ el: $('#spark-negative-color-menu') }); this.colorsNegative.on('select', _.bind(this.onColorsPointSelect, this, 2, this.btnNegativeColor)); - $(this.el).on('click', '#spark-negative-color-new', _.bind(this.addNewColor, this, this.colorsNegative, this.btnNegativeColor)); + this.btnNegativeColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsNegative, this.btnNegativeColor)); this.btnFirstColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -598,8 +598,8 @@ define([ this.lockedControls.push(this.btnFirstColor); this.colorsFirst = new Common.UI.ThemeColorPalette({ el: $('#spark-first-color-menu') }); this.colorsFirst.on('select', _.bind(this.onColorsPointSelect, this, 3, this.btnFirstColor)); - $(this.el).on('click', '#spark-first-color-new', _.bind(this.addNewColor, this, this.colorsFirst, this.btnFirstColor)); this.btnFirstColor.setColor(this.defColor.color); + this.btnFirstColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFirst, this.btnFirstColor)); this.btnLastColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -614,7 +614,7 @@ define([ this.lockedControls.push(this.btnLastColor); this.colorsLast = new Common.UI.ThemeColorPalette({ el: $('#spark-last-color-menu') }); this.colorsLast.on('select', _.bind(this.onColorsPointSelect, this, 4, this.btnLastColor)); - $(this.el).on('click', '#spark-last-color-new', _.bind(this.addNewColor, this, this.colorsLast, this.btnLastColor)); + this.btnLastColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsLast, this.btnLastColor)); this.btnMarkersColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -629,8 +629,7 @@ define([ this.lockedControls.push(this.btnMarkersColor); this.colorsMarkers = new Common.UI.ThemeColorPalette({ el: $('#spark-markers-color-menu') }); this.colorsMarkers.on('select', _.bind(this.onColorsPointSelect, this, 5, this.btnMarkersColor)); - $(this.el).on('click', '#spark-markers-color-new', _.bind(this.addNewColor, this, this.colorsMarkers, this.btnMarkersColor)); - + this.btnMarkersColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsMarkers, this.btnMarkersColor)); } this.colorsSpark.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); this.colorsHigh.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors(), defValue); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index ba3ec1843..f9a74e426 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -1483,7 +1483,7 @@ define([ transparent: true }); this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this)); - $(this.el).on('click', '#shape-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); + this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); this.btnBorderColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1502,7 +1502,7 @@ define([ value: '000000' }); this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this)); - $(this.el).on('click', '#shape-border-color-new', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor)); + this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor)); this.btnFGColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1521,7 +1521,7 @@ define([ value: '000000' }); this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this)); - $(this.el).on('click', '#shape-foreground-color-new', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor)); + this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor)); this.btnBGColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1540,7 +1540,7 @@ define([ value: 'ffffff' }); this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this)); - $(this.el).on('click', '#shape-background-color-new', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor)); + this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor)); this.btnGradColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1559,7 +1559,7 @@ define([ value: '000000' }); this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this)); - $(this.el).on('click', '#shape-gradient-color-new', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor)); + this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor)); } this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js index 53ff7d100..363a554a1 100644 --- a/apps/spreadsheeteditor/main/app/view/TableSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js @@ -85,6 +85,7 @@ define([ }; this.lockedControls = []; this._locked = false; + this.isEditCell = false; this._originalProps = null; this._noApply = false; @@ -177,6 +178,7 @@ define([ this.api = o; if (o) { this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this)); + this.api.asc_registerCallback('asc_onEditCell', this.onApiEditCell.bind(this)); } return this; }, @@ -510,14 +512,21 @@ define([ }); } }, - + + onApiEditCell: function(state) { + this.isEditCell = (state != Asc.c_oAscCellEditorState.editEnd); + if ( state == Asc.c_oAscCellEditorState.editStart || state == Asc.c_oAscCellEditorState.editEnd) + this.disableControls(this._locked); + }, + setLocked: function (locked) { this._locked = locked; }, disableControls: function(disable) { if (this._initSettings) return; - + disable = disable || this.isEditCell; + if (this._state.DisabledControls!==disable) { this._state.DisabledControls = disable; _.each(this.lockedControls, function(item) { diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index 8df9355d1..135ab162e 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -1487,7 +1487,7 @@ define([ value: '000000' }); this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this)); - $(this.el).on('click', '#textart-border-color-new', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor)); + this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor)); this.btnBackColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1507,7 +1507,7 @@ define([ transparent: true }); this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this)); - $(this.el).on('click', '#textart-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); + this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor)); this.btnFGColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1526,7 +1526,7 @@ define([ value: '000000' }); this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this)); - $(this.el).on('click', '#textart-foreground-color-new', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor)); + this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor)); this.btnBGColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1545,7 +1545,7 @@ define([ value: 'ffffff' }); this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this)); - $(this.el).on('click', '#textart-background-color-new', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor)); + this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor)); this.btnGradColor = new Common.UI.ColorButton({ style: "width:45px;", @@ -1564,7 +1564,7 @@ define([ value: '000000' }); this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this)); - $(this.el).on('click', '#textart-gradient-color-new', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor)); + this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor)); } this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 0721cd4d5..46748f052 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1890,7 +1890,7 @@ define([ tipIncDecimal: 'Increase Decimal', tipDecDecimal: 'Decrease Decimal', tipAutofilter: 'Set Autofilter', - tipInsertImage: 'Insert Picture', + tipInsertImage: 'Insert Image', tipInsertHyperlink: 'Add Hyperlink', tipSynchronize: 'The document has been changed by another user. Please click to save your changes and reload the updates.', tipIncFont: 'Increment font size', @@ -1919,8 +1919,8 @@ define([ txtFormula: 'Insert Function', txtNoBorders: 'No borders', txtAdditional: 'Additional', - mniImageFromFile: 'Picture from file', - mniImageFromUrl: 'Picture from url', + mniImageFromFile: 'Image from file', + mniImageFromUrl: 'Image from url', textNewColor: 'Add New Custom Color', tipInsertChart: 'Insert Chart', tipEditChart: 'Edit Chart', @@ -1989,7 +1989,7 @@ define([ textMoreFormats: 'More formats', capInsertText: 'Text', capInsertTextart: 'Text Art', - capInsertImage: 'Picture', + capInsertImage: 'Image', capInsertShape: 'Shape', capInsertChart: 'Chart', capInsertHyperlink: 'Hyperlink', diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json index 2169f3a49..1175d8c1a 100644 --- a/apps/spreadsheeteditor/main/locale/de.json +++ b/apps/spreadsheeteditor/main/locale/de.json @@ -139,7 +139,7 @@ "Common.Views.Protection.txtEncrypt": "Verschlüsseln", "Common.Views.Protection.txtInvisibleSignature": "Fügen Sie eine digitale Signatur hinzu", "Common.Views.Protection.txtSignature": "Signatur", - "Common.Views.Protection.txtSignatureLine": "Signaturzeile", + "Common.Views.Protection.txtSignatureLine": "Signaturzeile hinzufügen", "Common.Views.RenameDialog.cancelButtonText": "Abbrechen", "Common.Views.RenameDialog.okButtonText": "OK", "Common.Views.RenameDialog.textName": "Dateiname", @@ -363,12 +363,13 @@ "SSE.Controllers.Main.errorAutoFilterHiddenRange": "Die Operation kann nicht ausgeführt werden, weil der Bereich gefilterte Zellen enthält.
Bitte machen Sie die gefilterten Elemente sichtbar und versuchen Sie es erneut.", "SSE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Das Dokument kann momentan nicht bearbeitet werden.", - "SSE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen, oder richten Sie an Ihren Administrator.
Wann Sie auf die Taste \"OK\" klicken, werden Sie aufgefordert, das Dokument herunterzuladen.

Finden Sie mehr Information über Verbindung des Dokument Servers hier", + "SSE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.
Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie hier", "SSE.Controllers.Main.errorCopyMultiselectArea": "Bei einer Markierung von nicht angrenzenden Zellen ist die Ausführung dieses Befehls nicht möglich.
Wählen Sie nur einen einzelnen Bereich aus, und versuchen Sie es noch mal.", "SSE.Controllers.Main.errorCountArg": "Die eingegebene Formel enthält einen Fehler.
Falsche Anzahl an Argumenten wurde genutzt.", "SSE.Controllers.Main.errorCountArgExceed": "Die eingegebene Formel enthält einen Fehler.
Anzahl der Argumente wurde überschritten.", "SSE.Controllers.Main.errorCreateDefName": "Die bestehende benannte Bereiche können nicht bearbeitet werden und die neuen Bereiche können
im Moment nicht erstellt werden, weil einige von ihnen sind in Bearbeitung.", "SSE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.
Fehler beim Verbinden zur Datenbank. Bitte wenden Sie sich an den Kundendienst, falls der Fehler bestehen bleibt.", + "SSE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.", "SSE.Controllers.Main.errorDataRange": "Falscher Datenbereich.", "SSE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1", "SSE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.", @@ -494,9 +495,11 @@ "SSE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen", "SSE.Controllers.Main.warnBrowserIE9": "Die Anwendung hat geringe Fähigkeiten in IE9. Nutzen Sie IE10 oder höher.", "SSE.Controllers.Main.warnBrowserZoom": "Die aktuelle Zoom-Einstellung Ihres Webbrowsers wird nicht völlig unterstützt. Bitte stellen Sie die Standardeinstellung mithilfe der Tastenkombination STRG+0 wieder her.", + "SSE.Controllers.Main.warnLicenseExceeded": "Die Anzahl gleichzeitiger Verbindungen zum Document Server wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet.
Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.", "SSE.Controllers.Main.warnLicenseExp": "Ihre Lizenz ist abgelaufen.
Bitte aktualisieren Sie Ihre Lizenz und laden Sie die Seite neu.", - "SSE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zu Dokumentenserver.
Wenn Sie mehr Verbindungen benötigen, aktualisieren Sie diese Version oder erwerben Sie eine kommerzielle Lizenz.", - "SSE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer.
Wenn Sie mehr Nutzer benötigen, achten Sie bitte darauf, dass Sie entweder Ihre derzeitige Lizenz aktualisieren oder eine kommerzielle erwerben müssen.", + "SSE.Controllers.Main.warnLicenseUsersExceeded": "Die Anzahl der gleichzeitigen Benutzer wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet.
Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.", + "SSE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zum Dokumentenserver.
Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.", + "SSE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer.
Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.", "SSE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.", "SSE.Controllers.Print.strAllSheets": "Alle Blätter", "SSE.Controllers.Print.textWarning": "Achtung", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index d6e2cfd6f..c34a08b7a 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -139,7 +139,7 @@ "Common.Views.Protection.txtEncrypt": "Encrypt", "Common.Views.Protection.txtInvisibleSignature": "Add digital signature", "Common.Views.Protection.txtSignature": "Signature", - "Common.Views.Protection.txtSignatureLine": "Signature line", + "Common.Views.Protection.txtSignatureLine": "Add signature line", "Common.Views.RenameDialog.cancelButtonText": "Cancel", "Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.textName": "File name", @@ -369,6 +369,7 @@ "SSE.Controllers.Main.errorCountArgExceed": "An error in the entered formula.
Number of arguments is exceeded.", "SSE.Controllers.Main.errorCreateDefName": "The existing named ranges cannot be edited and the new ones cannot be created
at the moment as some of them are being edited.", "SSE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please contact support in case the error persists.", + "SSE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "SSE.Controllers.Main.errorDataRange": "Incorrect data range.", "SSE.Controllers.Main.errorDefaultMessage": "Error code: %1", "SSE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.", @@ -494,9 +495,11 @@ "SSE.Controllers.Main.uploadImageTitleText": "Uploading Image", "SSE.Controllers.Main.warnBrowserIE9": "The application has low capabilities on IE9. Use IE10 or higher", "SSE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.", + "SSE.Controllers.Main.warnLicenseExceeded": "The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.", "SSE.Controllers.Main.warnLicenseExp": "Your license has expired.
Please update your license and refresh the page.", - "SSE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider upgrading your current license or purchasing a commercial one.", - "SSE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.", + "SSE.Controllers.Main.warnLicenseUsersExceeded": "The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.", + "SSE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", + "SSE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.
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.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textWarning": "Warning", @@ -1770,12 +1773,12 @@ "SSE.Views.Toolbar.capInsertChart": "Chart", "SSE.Views.Toolbar.capInsertEquation": "Equation", "SSE.Views.Toolbar.capInsertHyperlink": "Hyperlink", - "SSE.Views.Toolbar.capInsertImage": "Picture", + "SSE.Views.Toolbar.capInsertImage": "Image", "SSE.Views.Toolbar.capInsertShape": "Shape", "SSE.Views.Toolbar.capInsertTable": "Table", "SSE.Views.Toolbar.capInsertText": "Text Box", - "SSE.Views.Toolbar.mniImageFromFile": "Picture from File", - "SSE.Views.Toolbar.mniImageFromUrl": "Picture from URL", + "SSE.Views.Toolbar.mniImageFromFile": "Image from File", + "SSE.Views.Toolbar.mniImageFromUrl": "Image from URL", "SSE.Views.Toolbar.textAlignBottom": "Align Bottom", "SSE.Views.Toolbar.textAlignCenter": "Align Center", "SSE.Views.Toolbar.textAlignJust": "Justified", @@ -1871,7 +1874,7 @@ "SSE.Views.Toolbar.tipInsertChartSpark": "Insert chart", "SSE.Views.Toolbar.tipInsertEquation": "Insert equation", "SSE.Views.Toolbar.tipInsertHyperlink": "Add hyperlink", - "SSE.Views.Toolbar.tipInsertImage": "Insert picture", + "SSE.Views.Toolbar.tipInsertImage": "Insert image", "SSE.Views.Toolbar.tipInsertOpt": "Insert cells", "SSE.Views.Toolbar.tipInsertShape": "Insert autoshape", "SSE.Views.Toolbar.tipInsertText": "Insert text box", diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json index 55fed1c65..5d7aced69 100644 --- a/apps/spreadsheeteditor/main/locale/es.json +++ b/apps/spreadsheeteditor/main/locale/es.json @@ -1654,7 +1654,7 @@ "SSE.Views.Statusbar.RenameDialog.errNameExists": "Hoja de cálculo con tal nombre existe ya.", "SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "El nombre de hoja no puede contener los caracteres siguientes: \\/*?[]:", "SSE.Views.Statusbar.RenameDialog.labelSheetName": "Nombre de hoja", - "SSE.Views.Statusbar.textAverage": "MEDIA", + "SSE.Views.Statusbar.textAverage": "PROMEDIO", "SSE.Views.Statusbar.textCount": "CONTAR", "SSE.Views.Statusbar.textNewColor": "Añadir Color Personalizado Nuevo", "SSE.Views.Statusbar.textNoColor": "Sin color", diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index 12a32d907..dc902a4a1 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -1360,12 +1360,12 @@ "SSE.Views.MainSettingsPrint.strPrint": "Imprimer", "SSE.Views.MainSettingsPrint.strRight": "A droite", "SSE.Views.MainSettingsPrint.strTop": "En haut", - "SSE.Views.MainSettingsPrint.textActualSize": "Taille actuelle", - "SSE.Views.MainSettingsPrint.textFitCols": "Monter toutes les colonnes sur une seule page", - "SSE.Views.MainSettingsPrint.textFitPage": "Monter le feuille sur une seule page", - "SSE.Views.MainSettingsPrint.textFitRows": "Monter toutes les lignes sur une page", + "SSE.Views.MainSettingsPrint.textActualSize": "Taille réelle", + "SSE.Views.MainSettingsPrint.textFitCols": "Ajuster toutes les colonnes à une page", + "SSE.Views.MainSettingsPrint.textFitPage": "Ajuster la feuille à une page", + "SSE.Views.MainSettingsPrint.textFitRows": "Ajuster toutes les lignes à une page", "SSE.Views.MainSettingsPrint.textPageOrientation": "Orientation de la page", - "SSE.Views.MainSettingsPrint.textPageScaling": "Ecaillage", + "SSE.Views.MainSettingsPrint.textPageScaling": "Mise à l'échelle", "SSE.Views.MainSettingsPrint.textPageSize": "Taille de la page", "SSE.Views.MainSettingsPrint.textPrintGrid": "Imprimer le quadrillage", "SSE.Views.MainSettingsPrint.textPrintHeadings": "Imprimer les titres de lignes et de colonnes ", @@ -1514,16 +1514,16 @@ "SSE.Views.PrintSettings.strRight": "A droite", "SSE.Views.PrintSettings.strShow": "Afficher", "SSE.Views.PrintSettings.strTop": "En haut", - "SSE.Views.PrintSettings.textActualSize": "Taille actuelle", + "SSE.Views.PrintSettings.textActualSize": "Taille réelle", "SSE.Views.PrintSettings.textAllSheets": "Toutes les feuilles", "SSE.Views.PrintSettings.textCurrentSheet": "Feuille actuel", - "SSE.Views.PrintSettings.textFitCols": "Monter toutes les colonnes sur une seule page", - "SSE.Views.PrintSettings.textFitPage": "Monter le feuille sur une seule page", - "SSE.Views.PrintSettings.textFitRows": "Monter toutes les lignes sur une page", + "SSE.Views.PrintSettings.textFitCols": "Ajuster toutes les colonnes à une page", + "SSE.Views.PrintSettings.textFitPage": "Ajuster la feuille à une page", + "SSE.Views.PrintSettings.textFitRows": "Ajuster toutes les lignes à une page", "SSE.Views.PrintSettings.textHideDetails": "Masquer détails", "SSE.Views.PrintSettings.textLayout": "Disposition", "SSE.Views.PrintSettings.textPageOrientation": "Orientation de la page", - "SSE.Views.PrintSettings.textPageScaling": "Ecaillage", + "SSE.Views.PrintSettings.textPageScaling": "Mise à l'échelle", "SSE.Views.PrintSettings.textPageSize": "Taille de la page", "SSE.Views.PrintSettings.textPrintGrid": "Imprimer le quadrillage", "SSE.Views.PrintSettings.textPrintHeadings": "Imprimer les titres de lignes et de colonnes ", diff --git a/apps/spreadsheeteditor/main/locale/it.json b/apps/spreadsheeteditor/main/locale/it.json index 92af50a36..258219775 100644 --- a/apps/spreadsheeteditor/main/locale/it.json +++ b/apps/spreadsheeteditor/main/locale/it.json @@ -111,6 +111,7 @@ "Common.Views.OpenDialog.txtOther": "Altro", "Common.Views.OpenDialog.txtPassword": "Password", "Common.Views.OpenDialog.txtPreview": "Anteprima", + "Common.Views.OpenDialog.txtProtected": "Una volta inserita la password e aperto il file, verrà ripristinata la password corrente sul file.", "Common.Views.OpenDialog.txtSemicolon": "Punto e virgola", "Common.Views.OpenDialog.txtSpace": "Spazio", "Common.Views.OpenDialog.txtTab": "Tabulazione", @@ -118,13 +119,13 @@ "Common.Views.OpenDialog.txtTitleProtected": "File protetto", "Common.Views.PasswordDialog.cancelButtonText": "Annulla", "Common.Views.PasswordDialog.okButtonText": "OK", - "Common.Views.PasswordDialog.txtDescription": "É richiesta la password per aprire il documento", + "Common.Views.PasswordDialog.txtDescription": "É richiesta la password per proteggere il documento", "Common.Views.PasswordDialog.txtIncorrectPwd": "la password di conferma non corrisponde", "Common.Views.PasswordDialog.txtPassword": "Password", "Common.Views.PasswordDialog.txtRepeat": "Ripeti password", "Common.Views.PasswordDialog.txtTitle": "Imposta password", "Common.Views.PluginDlg.textLoading": "Caricamento", - "Common.Views.Plugins.groupCaption": "Componenti Aggiuntivi", + "Common.Views.Plugins.groupCaption": "Plugin", "Common.Views.Plugins.strPlugins": "Plugin", "Common.Views.Plugins.textLoading": "Caricamento", "Common.Views.Plugins.textStart": "Avvio", @@ -368,6 +369,7 @@ "SSE.Controllers.Main.errorCountArgExceed": "Un errore nella formula inserita.
E' stato superato il numero di argomenti.", "SSE.Controllers.Main.errorCreateDefName": "The existing named ranges cannot be edited and the new ones cannot be created
at the moment as some of them are being edited.", "SSE.Controllers.Main.errorDatabaseConnection": "Errore esterno.
Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.", + "SSE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.", "SSE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.", "SSE.Controllers.Main.errorDefaultMessage": "Codice errore: %1", "SSE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.", @@ -424,7 +426,7 @@ "SSE.Controllers.Main.printTitleText": "Stampa in corso del foglio di calcolo", "SSE.Controllers.Main.reloadButtonText": "Ricarica pagina", "SSE.Controllers.Main.requestEditFailedMessageText": "Qualcuno sta modificando questo documento. Si prega di provare più tardi.", - "SSE.Controllers.Main.requestEditFailedTitleText": "Accesso vietato", + "SSE.Controllers.Main.requestEditFailedTitleText": "Accesso negato", "SSE.Controllers.Main.saveErrorText": "Si è verificato un errore al salvataggio del file", "SSE.Controllers.Main.savePreparingText": "Preparazione al salvataggio ", "SSE.Controllers.Main.savePreparingTitle": "Preparazione al salvataggio. Si prega di aspettare...", @@ -493,7 +495,9 @@ "SSE.Controllers.Main.uploadImageTitleText": "Caricamento dell'immagine", "SSE.Controllers.Main.warnBrowserIE9": "L'applicazione è poco compatibile con IE9. Usa IE10 o più recente", "SSE.Controllers.Main.warnBrowserZoom": "Le impostazioni correnti di zoom del tuo browser non sono completamente supportate. Per favore, ritorna allo zoom predefinito premendo Ctrl+0.", + "SSE.Controllers.Main.warnLicenseExceeded": "Il numero di connessioni simultanee al server dei documenti è stato superato e il documento verrà aperto solo per la visualizzazione.
Contattare l'amministratore per ulteriori informazioni.", "SSE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.
Si prega di aggiornare la licenza e ricaricare la pagina.", + "SSE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione.
Per ulteriori informazioni, contattare l'amministratore.", "SSE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.
Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.", "SSE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.
Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.", "SSE.Controllers.Main.warnProcessRightsChange": "Ci stato negato il diritto alla modifica del file.", @@ -1203,7 +1207,7 @@ "SSE.Views.FileMenu.btnRenameCaption": "Rinomina...", "SSE.Views.FileMenu.btnReturnCaption": "Torna al foglio di calcolo", "SSE.Views.FileMenu.btnRightsCaption": "Access Rights...", - "SSE.Views.FileMenu.btnSaveAsCaption": "Salva con", + "SSE.Views.FileMenu.btnSaveAsCaption": "Salva con Nome", "SSE.Views.FileMenu.btnSaveCaption": "Salva", "SSE.Views.FileMenu.btnSettingsCaption": "Impostazioni avanzate...", "SSE.Views.FileMenu.btnToEditCaption": "Modifica foglio di calcolo", @@ -1392,7 +1396,7 @@ "SSE.Views.NamedRangePasteDlg.okButtonText": "Ok", "SSE.Views.NamedRangePasteDlg.textNames": "Named Ranges", "SSE.Views.NamedRangePasteDlg.txtTitle": "Paste Name", - "SSE.Views.NameManagerDlg.closeButtonText": "Close", + "SSE.Views.NameManagerDlg.closeButtonText": "Chiudi", "SSE.Views.NameManagerDlg.guestText": "Guest", "SSE.Views.NameManagerDlg.okButtonText": "Ok", "SSE.Views.NameManagerDlg.textDataRange": "Data Range", @@ -1502,6 +1506,7 @@ "SSE.Views.PivotTable.txtCreate": "Inserisci tabella", "SSE.Views.PivotTable.txtRefresh": "Aggiorna", "SSE.Views.PivotTable.txtSelect": "Seleziona", + "SSE.Views.PrintSettings.btnDownload": "Salva e scarica", "SSE.Views.PrintSettings.btnPrint": "Salva e stampa", "SSE.Views.PrintSettings.cancelButtonText": "Annulla", "SSE.Views.PrintSettings.strBottom": "In basso", @@ -1531,7 +1536,10 @@ "SSE.Views.PrintSettings.textSelection": "Selezione", "SSE.Views.PrintSettings.textSettings": "Impostazioni Foglio", "SSE.Views.PrintSettings.textShowDetails": "Mostra dettagli", + "SSE.Views.PrintSettings.textShowGrid": "Mostra griglia", + "SSE.Views.PrintSettings.textShowHeadings": "Mostra intestazioni di righe e colonne", "SSE.Views.PrintSettings.textTitle": "Impostazioni stampa", + "SSE.Views.PrintSettings.textTitlePDF": "Impostazioni PDF", "SSE.Views.RightMenu.txtChartSettings": "Impostazioni grafico", "SSE.Views.RightMenu.txtImageSettings": "Impostazioni immagine", "SSE.Views.RightMenu.txtParagraphSettings": "Impostazioni testo", @@ -1908,7 +1916,7 @@ "SSE.Views.Toolbar.txtFranc": "CHF Franco svizzero", "SSE.Views.Toolbar.txtGeneral": "Generale", "SSE.Views.Toolbar.txtInteger": "Numero intero", - "SSE.Views.Toolbar.txtManageRange": "Name manager", + "SSE.Views.Toolbar.txtManageRange": "Nome manager", "SSE.Views.Toolbar.txtMergeAcross": "Unisci in ciascuna riga", "SSE.Views.Toolbar.txtMergeCells": "Unisci celle", "SSE.Views.Toolbar.txtMergeCenter": "Unisci e centra", @@ -1916,7 +1924,7 @@ "SSE.Views.Toolbar.txtNewRange": "Define Name", "SSE.Views.Toolbar.txtNoBorders": "Nessun bordo", "SSE.Views.Toolbar.txtNumber": "Numero", - "SSE.Views.Toolbar.txtPasteRange": "Paste name", + "SSE.Views.Toolbar.txtPasteRange": "Incolla Nome", "SSE.Views.Toolbar.txtPercentage": "Percentuale", "SSE.Views.Toolbar.txtPound": "£ Sterlina britannica", "SSE.Views.Toolbar.txtRouble": "₽ Rublo", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 24beb795f..5693b594b 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -139,7 +139,7 @@ "Common.Views.Protection.txtEncrypt": "Шифровать", "Common.Views.Protection.txtInvisibleSignature": "Добавить цифровую подпись", "Common.Views.Protection.txtSignature": "Подпись", - "Common.Views.Protection.txtSignatureLine": "Строка подписи", + "Common.Views.Protection.txtSignatureLine": "Добавить строку подписи", "Common.Views.RenameDialog.cancelButtonText": "Отмена", "Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.textName": "Имя файла", @@ -369,6 +369,7 @@ "SSE.Controllers.Main.errorCountArgExceed": "Ошибка во введенной формуле.
Превышено количество аргументов.", "SSE.Controllers.Main.errorCreateDefName": "В настоящий момент нельзя отредактировать существующие именованные диапазоны и создать новые,
так как некоторые из них редактируются.", "SSE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.
Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.", + "SSE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.", "SSE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.", "SSE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1", "SSE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.", @@ -494,9 +495,11 @@ "SSE.Controllers.Main.uploadImageTitleText": "Загрузка изображения", "SSE.Controllers.Main.warnBrowserIE9": "В IE9 приложение имеет низкую производительность. Используйте IE10 или более позднюю версию.", "SSE.Controllers.Main.warnBrowserZoom": "Текущее значение масштаба страницы в браузере поддерживается не полностью. Вернитесь к масштабу по умолчанию, нажав Ctrl+0", + "SSE.Controllers.Main.warnLicenseExceeded": "Превышено допустимое число одновременных подключений к серверу документов, и документ откроется только на просмотр.
Обратитесь к администратору за дополнительной информацией.", "SSE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.
Обновите лицензию, а затем обновите страницу.", - "SSE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.", - "SSE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.
Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.", + "SSE.Controllers.Main.warnLicenseUsersExceeded": "Превышено допустимое число одновременно работающих пользователей, и документ откроется только на просмотр.
Обратитесь к администратору за дополнительной информацией.", + "SSE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", + "SSE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", "SSE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", "SSE.Controllers.Print.strAllSheets": "Все листы", "SSE.Controllers.Print.textWarning": "Предупреждение", diff --git a/apps/spreadsheeteditor/main/locale/zh.json b/apps/spreadsheeteditor/main/locale/zh.json index b196bbd5c..58f15e442 100644 --- a/apps/spreadsheeteditor/main/locale/zh.json +++ b/apps/spreadsheeteditor/main/locale/zh.json @@ -81,6 +81,7 @@ "Common.Views.ImageFromUrlDialog.txtNotUrl": "该字段应该是“http://www.example.com”格式的URL", "Common.Views.OpenDialog.cancelButtonText": "取消", "Common.Views.OpenDialog.okButtonText": "确定", + "Common.Views.OpenDialog.txtComma": "逗号", "Common.Views.OpenDialog.txtDelimiter": "字段分隔符", "Common.Views.OpenDialog.txtEncoding": "编码", "Common.Views.OpenDialog.txtOther": "其他", @@ -319,7 +320,7 @@ "SSE.Controllers.Main.textContactUs": "联系销售", "SSE.Controllers.Main.textLoadingDocument": "加载电子表格", "SSE.Controllers.Main.textNo": "否", - "SSE.Controllers.Main.textNoLicenseTitle": "NLYOFFICE开源版本", + "SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE开源版本", "SSE.Controllers.Main.textPleaseWait": "该操作可能需要比预期的更多的时间。请稍候...", "SSE.Controllers.Main.textRecalcFormulas": "计算公式...", "SSE.Controllers.Main.textShape": "形状", @@ -342,6 +343,27 @@ "SSE.Controllers.Main.txtRectangles": "矩形", "SSE.Controllers.Main.txtSeries": "系列", "SSE.Controllers.Main.txtStarsRibbons": "星星和丝带", + "SSE.Controllers.Main.txtStyle_Bad": "差", + "SSE.Controllers.Main.txtStyle_Calculation": "计算", + "SSE.Controllers.Main.txtStyle_Check_Cell": "检查单元格", + "SSE.Controllers.Main.txtStyle_Comma": "逗号", + "SSE.Controllers.Main.txtStyle_Currency": "货币", + "SSE.Controllers.Main.txtStyle_Explanatory_Text": "说明文本", + "SSE.Controllers.Main.txtStyle_Good": "好", + "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_Input": "输入", + "SSE.Controllers.Main.txtStyle_Linked_Cell": "关联的单元格", + "SSE.Controllers.Main.txtStyle_Neutral": "中立", + "SSE.Controllers.Main.txtStyle_Normal": "正常", + "SSE.Controllers.Main.txtStyle_Note": "备注", + "SSE.Controllers.Main.txtStyle_Output": "输出", + "SSE.Controllers.Main.txtStyle_Percent": "百分比", + "SSE.Controllers.Main.txtStyle_Title": "标题", + "SSE.Controllers.Main.txtStyle_Total": "总数", + "SSE.Controllers.Main.txtStyle_Warning_Text": "警告文本", "SSE.Controllers.Main.txtXAxis": "X轴", "SSE.Controllers.Main.txtYAxis": "Y轴", "SSE.Controllers.Main.unknownErrorText": "示知错误", @@ -988,6 +1010,7 @@ "SSE.Views.DocumentHolder.txtColumn": "整列", "SSE.Views.DocumentHolder.txtColumnWidth": "设置列宽", "SSE.Views.DocumentHolder.txtCopy": "复制", + "SSE.Views.DocumentHolder.txtCurrency": "货币", "SSE.Views.DocumentHolder.txtCustomColumnWidth": "自定义列宽", "SSE.Views.DocumentHolder.txtCustomRowHeight": "自定义行高度", "SSE.Views.DocumentHolder.txtCut": "剪切", @@ -1004,6 +1027,7 @@ "SSE.Views.DocumentHolder.txtInsert": "插入", "SSE.Views.DocumentHolder.txtInsHyperlink": "超链接", "SSE.Views.DocumentHolder.txtPaste": "粘贴", + "SSE.Views.DocumentHolder.txtPercentage": "百分比", "SSE.Views.DocumentHolder.txtReapply": "Reapply", "SSE.Views.DocumentHolder.txtRow": "整行", "SSE.Views.DocumentHolder.txtRowHeight": "设置列宽", diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 9ff1c3a98..cc8293464 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -81,7 +81,7 @@ define([ usersCount : 1, fastCoauth : true, lostEditingRights : false, - licenseWarning : false + licenseType : false }; // Initialize viewport @@ -175,6 +175,18 @@ define([ Common.Gateway.on('showmessage', _.bind(me.onExternalMessage, me)); Common.Gateway.on('opendocument', _.bind(me.loadDocument, me)); Common.Gateway.appReady(); + + Common.Gateway.on('internalcommand', function(data) { + if (data.command=='hardBack') { + if ($('.modal-in').length>0) { + if ( !$(me.loadMask).hasClass('modal-in') ) + uiApp.closeModal(); + Common.Gateway.internalMessage('hardBack', false); + } else + Common.Gateway.internalMessage('hardBack', true); + } + }); + Common.Gateway.internalMessage('listenHardBack'); } }, @@ -552,17 +564,37 @@ define([ if (this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge) return; var licType = params.asc_getLicenseType(); - if (licType !== undefined && (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount) && this.appOptions.canEdit && this.editorConfig.mode !== 'view') { - this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) ? this.warnNoLicense : this.warnNoLicenseUsers; - } + if (licType !== undefined && this.appOptions.canEdit && this.editorConfig.mode !== 'view' && + (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount || licType===Asc.c_oLicenseResult.ConnectionsOS || licType===Asc.c_oLicenseResult.UsersCountOS)) + this._state.licenseType = licType; - if (this._isDocReady && this._state.licenseWarning) + if (this._isDocReady && this._state.licenseType) this.applyLicense(); }, applyLicense: function() { var me = this; - if (me._state.licenseWarning) { + if (this._state.licenseType) { + var license = this._state.licenseType, + buttons = [{text: 'OK'}]; + if (license===Asc.c_oLicenseResult.Connections || license===Asc.c_oLicenseResult.UsersCount) { + license = (license===Asc.c_oLicenseResult.Connections) ? this.warnLicenseExceeded : this.warnLicenseUsersExceeded; + } else { + license = (license===Asc.c_oLicenseResult.ConnectionsOS) ? this.warnNoLicense : this.warnNoLicenseUsers; + buttons = [{ + text: me.textBuyNow, + bold: true, + onClick: function() { + window.open('https://www.onlyoffice.com', "_blank"); + } + }, + { + text: me.textContactUs, + onClick: function() { + window.open('mailto:sales@onlyoffice.com', "_blank"); + } + }]; + } SSE.getController('Toolbar').activateViewControls(); SSE.getController('Toolbar').deactivateEditControls(); Common.NotificationCenter.trigger('api:disconnect'); @@ -575,22 +607,8 @@ define([ Common.localStorage.setItem("sse-license-warning", now); uiApp.modal({ title: me.textNoLicenseTitle, - text : me._state.licenseWarning, - buttons: [ - { - text: me.textBuyNow, - bold: true, - onClick: function() { - window.open('https://www.onlyoffice.com', "_blank"); - } - }, - { - text: me.textContactUs, - onClick: function() { - window.open('mailto:sales@onlyoffice.com', "_blank"); - } - } - ] + text : license, + buttons: buttons }); } } else @@ -950,6 +968,10 @@ define([ config.msg = this.errorAccessDeny; break; + case Asc.c_oAscError.ID.DataEncrypted: + config.msg = this.errorDataEncrypted; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -970,6 +992,10 @@ define([ Common.NotificationCenter.trigger('goback'); } } + if (id == Asc.c_oAscError.ID.DataEncrypted) { + this.api.asc_coAuthoringDisconnect(); + Common.NotificationCenter.trigger('api:disconnect'); + } } else { Common.Gateway.reportWarning(id, config.msg); @@ -1345,7 +1371,7 @@ define([ unsupportedBrowserErrorText : 'Your browser is not supported.', requestEditFailedTitleText: 'Access denied', requestEditFailedMessageText: 'Someone is editing this document right now. Please try again later.', - textLoadingDocument: 'Loading document', + textLoadingDocument: 'Loading spreadsheet', applyChangesTitleText: 'Loading Data', applyChangesTextText: 'Loading data...', errorKeyEncrypt: 'Unknown key descriptor', @@ -1364,8 +1390,8 @@ define([ txtLines: 'Lines', txtEditingMode: 'Set editing mode...', textAnonymous: 'Anonymous', - loadingDocumentTitleText: 'Loading document', - loadingDocumentTextText: 'Loading document...', + loadingDocumentTitleText: 'Loading spreadsheet', + loadingDocumentTextText: 'Loading spreadsheet...', warnProcessRightsChange: 'You have been denied the right to edit the file.', errorProcessSaveResult: 'Saving is failed.', textCloseTip: '\nClick to close the tip.', @@ -1396,7 +1422,6 @@ define([ txtErrorLoadHistory: 'Loading history failed', textBuyNow: 'Visit website', textNoLicenseTitle: 'ONLYOFFICE open source version', - warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider upgrading your current license or purchasing a commercial one.', textContactUs: 'Contact sales', errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.', warnLicenseExp: 'Your license has expired.
Please update your license and refresh the page.', @@ -1449,9 +1474,13 @@ define([ txtStyle_Currency: 'Currency', txtStyle_Percent: 'Percent', txtStyle_Comma: 'Comma', - warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.', errorMaxPoints: 'The maximum number of points in series per chart is 4096.', - txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset' + txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset', + warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.', + warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.', + warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', + errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.' } })(), SSE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/cs.json b/apps/spreadsheeteditor/mobile/locale/cs.json index e6ef2c96c..fbb275bb9 100644 --- a/apps/spreadsheeteditor/mobile/locale/cs.json +++ b/apps/spreadsheeteditor/mobile/locale/cs.json @@ -166,8 +166,8 @@ "SSE.Controllers.Main.loadImagesTitleText": "Načítání obrázků", "SSE.Controllers.Main.loadImageTextText": "Načítání obrázku...", "SSE.Controllers.Main.loadImageTitleText": "Načítání obrázku", - "SSE.Controllers.Main.loadingDocumentTextText": "Načítám dokument...", - "SSE.Controllers.Main.loadingDocumentTitleText": "Načítání dokumentu", + "SSE.Controllers.Main.loadingDocumentTextText": "Načítání sešitu...", + "SSE.Controllers.Main.loadingDocumentTitleText": "Načítání sešitu", "SSE.Controllers.Main.mailMergeLoadFileText": "Načítání datového zdroje...", "SSE.Controllers.Main.mailMergeLoadFileTitle": "Načítání datového zdroje", "SSE.Controllers.Main.notcriticalErrorTitle": "Varování", @@ -193,7 +193,7 @@ "SSE.Controllers.Main.textClose": "Zavřít", "SSE.Controllers.Main.textContactUs": "Kontaktujte prodejce", "SSE.Controllers.Main.textDone": "Hotovo", - "SSE.Controllers.Main.textLoadingDocument": "Načítání dokumentu", + "SSE.Controllers.Main.textLoadingDocument": "Načítání sešitu", "SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source verze", "SSE.Controllers.Main.textOK": "OK", "SSE.Controllers.Main.textPassword": "Heslo", diff --git a/apps/spreadsheeteditor/mobile/locale/de.json b/apps/spreadsheeteditor/mobile/locale/de.json index 502e00c84..0baaae747 100644 --- a/apps/spreadsheeteditor/mobile/locale/de.json +++ b/apps/spreadsheeteditor/mobile/locale/de.json @@ -115,12 +115,13 @@ "SSE.Controllers.Main.errorAutoFilterHiddenRange": "Die Operation kann nicht ausgeführt werden, weil der Bereich gefilterte Zellen enthält.
Bitte machen Sie die gefilterten Elemente sichtbar und versuchen Sie es erneut.", "SSE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Sie können nicht mehr editieren.", - "SSE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen, oder richten Sie an Ihren Administrator.
Wann Sie auf die Taste \"OK\" klicken, werden Sie aufgefordert, das Dokument herunterzuladen.

Finden Sie mehr Information über Verbindung des Dokument Servers hier", + "SSE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.
Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie hier", "SSE.Controllers.Main.errorCopyMultiselectArea": "Dieser Befehl kann nicht bei Mehrfachauswahl verwendet werden
Wählen Sie nur einen einzelnen Bereich aus, und versuchen Sie es nochmal.", "SSE.Controllers.Main.errorCountArg": "Die eingegebene Formel enthält einen Fehler.
Es wurde falsche Anzahl an Argumenten benutzt.", "SSE.Controllers.Main.errorCountArgExceed": "Die eingegebene Formel enthält einen Fehler.
Anzahl der Argumente wurde überschritten.", "SSE.Controllers.Main.errorCreateDefName": "Die bestehende benannte Bereiche können nicht bearbeitet werden und neue Bereiche können
im Moment nicht erstellt werden, weil einige von ihnen sind in Bearbeitung.", "SSE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.
Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.", + "SSE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.", "SSE.Controllers.Main.errorDataRange": "Falscher Datenbereich.", "SSE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1", "SSE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.", @@ -167,14 +168,15 @@ "SSE.Controllers.Main.loadImagesTitleText": "Bilder werden geladen", "SSE.Controllers.Main.loadImageTextText": "Bild wird geladen...", "SSE.Controllers.Main.loadImageTitleText": "Bild wird geladen", - "SSE.Controllers.Main.loadingDocumentTextText": "Dokument wird geladen...", - "SSE.Controllers.Main.loadingDocumentTitleText": "Dokument wird geladen", + "SSE.Controllers.Main.loadingDocumentTextText": "Tabelle wird geladen...", + "SSE.Controllers.Main.loadingDocumentTitleText": "Tabelle wird geladen", "SSE.Controllers.Main.mailMergeLoadFileText": "Laden der Datenquellen...", "SSE.Controllers.Main.mailMergeLoadFileTitle": "Laden der Datenquellen", "SSE.Controllers.Main.notcriticalErrorTitle": "Warnung", "SSE.Controllers.Main.openErrorText": "Beim Öffnen dieser Datei ist ein Fehler aufgetreten", "SSE.Controllers.Main.openTextText": "Dokument wird geöffnet...", "SSE.Controllers.Main.openTitleText": "Das Dokument wird geöffnet", + "SSE.Controllers.Main.pastInMergeAreaError": "Es ist unmöglich, einen Teil der vereinigten Zelle zu ändern", "SSE.Controllers.Main.printTextText": "Dokument wird ausgedruckt...", "SSE.Controllers.Main.printTitleText": "Drucken des Dokuments", "SSE.Controllers.Main.reloadButtonText": "Seite neu laden", @@ -194,7 +196,7 @@ "SSE.Controllers.Main.textClose": "Schließen", "SSE.Controllers.Main.textContactUs": "Verkaufsteam kontaktieren", "SSE.Controllers.Main.textDone": "Fertig", - "SSE.Controllers.Main.textLoadingDocument": "Dokument wird geladen...", + "SSE.Controllers.Main.textLoadingDocument": "Tabelle wird geladen", "SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE Verbindungsbeschränkung", "SSE.Controllers.Main.textOK": "OK", "SSE.Controllers.Main.textPassword": "Kennwort", @@ -256,9 +258,11 @@ "SSE.Controllers.Main.uploadImageSizeMessage": "Die maximal zulässige Bildgröße ist überschritten.", "SSE.Controllers.Main.uploadImageTextText": "Bild wird hochgeladen...", "SSE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen", + "SSE.Controllers.Main.warnLicenseExceeded": "Die Anzahl gleichzeitiger Verbindungen zum Document Server wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet.
Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.", "SSE.Controllers.Main.warnLicenseExp": "Ihre Lizenz ist abgelaufen.
Bitte aktualisieren Sie Ihre Lizenz und laden Sie die Seite neu.", - "SSE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zu Dokumentenserver.
Wenn Sie mehr Verbindungen benötigen, aktualisieren Sie diese Version oder erwerben Sie eine kommerzielle Lizenz.", - "SSE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer.
Wenn Sie mehr Nutzer benötigen, achten Sie bitte darauf, dass Sie entweder Ihre derzeitige Lizenz aktualisieren oder eine kommerzielle erwerben müssen.", + "SSE.Controllers.Main.warnLicenseUsersExceeded": "Die Anzahl der gleichzeitigen Benutzer wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet.
Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.", + "SSE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zum Dokumentenserver.
Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.", + "SSE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer.
Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.", "SSE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.", "SSE.Controllers.Search.textNoTextFound": "Der Text wurde nicht gefunden.", "SSE.Controllers.Search.textReplaceAll": "Alle ersetzen", @@ -376,6 +380,7 @@ "SSE.Views.EditChart.textDisplayUnits": "Anzeigeeinheiten", "SSE.Views.EditChart.textFill": "Füllung", "SSE.Views.EditChart.textForward": "Vorwärts navigieren", + "SSE.Views.EditChart.textGridlines": "Gitternetzlinien ", "SSE.Views.EditChart.textHorAxis": "Horizontale Achse", "SSE.Views.EditChart.textHorizontal": "Horizontal", "SSE.Views.EditChart.textLabelOptions": "Beschriftungsoptionen", diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 6248bdd42..429ab0852 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -121,6 +121,7 @@ "SSE.Controllers.Main.errorCountArgExceed": "An error in the entered formula.
Number of arguments is exceeded.", "SSE.Controllers.Main.errorCreateDefName": "The existing named ranges cannot be edited and the new ones cannot be created
at the moment as some of them are being edited.", "SSE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please contact support in case the error persists.", + "SSE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "SSE.Controllers.Main.errorDataRange": "Incorrect data range.", "SSE.Controllers.Main.errorDefaultMessage": "Error code: %1", "SSE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.", @@ -167,14 +168,15 @@ "SSE.Controllers.Main.loadImagesTitleText": "Loading Images", "SSE.Controllers.Main.loadImageTextText": "Loading image...", "SSE.Controllers.Main.loadImageTitleText": "Loading Image", - "SSE.Controllers.Main.loadingDocumentTextText": "Loading document...", - "SSE.Controllers.Main.loadingDocumentTitleText": "Loading document", + "SSE.Controllers.Main.loadingDocumentTextText": "Loading spreadsheet...", + "SSE.Controllers.Main.loadingDocumentTitleText": "Loading spreadsheet", "SSE.Controllers.Main.mailMergeLoadFileText": "Loading Data Source...", "SSE.Controllers.Main.mailMergeLoadFileTitle": "Loading Data Source", "SSE.Controllers.Main.notcriticalErrorTitle": "Warning", "SSE.Controllers.Main.openErrorText": "An error has occurred while opening the file", "SSE.Controllers.Main.openTextText": "Opening document...", "SSE.Controllers.Main.openTitleText": "Opening Document", + "SSE.Controllers.Main.pastInMergeAreaError": "Cannot change part of a merged cell", "SSE.Controllers.Main.printTextText": "Printing document...", "SSE.Controllers.Main.printTitleText": "Printing Document", "SSE.Controllers.Main.reloadButtonText": "Reload Page", @@ -194,7 +196,7 @@ "SSE.Controllers.Main.textClose": "Close", "SSE.Controllers.Main.textContactUs": "Contact sales", "SSE.Controllers.Main.textDone": "Done", - "SSE.Controllers.Main.textLoadingDocument": "Loading document", + "SSE.Controllers.Main.textLoadingDocument": "Loading spreadsheet", "SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE connection limitation", "SSE.Controllers.Main.textOK": "OK", "SSE.Controllers.Main.textPassword": "Password", @@ -256,9 +258,11 @@ "SSE.Controllers.Main.uploadImageSizeMessage": "Maximum image size limit exceeded.", "SSE.Controllers.Main.uploadImageTextText": "Uploading image...", "SSE.Controllers.Main.uploadImageTitleText": "Uploading Image", + "SSE.Controllers.Main.warnLicenseExceeded": "The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.", "SSE.Controllers.Main.warnLicenseExp": "Your license has expired.
Please update your license and refresh the page.", - "SSE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider upgrading your current license or purchasing a commercial one.", - "SSE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.", + "SSE.Controllers.Main.warnLicenseUsersExceeded": "The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.", + "SSE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", + "SSE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.
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.Search.textNoTextFound": "Text not found", "SSE.Controllers.Search.textReplaceAll": "Replace All", @@ -376,6 +380,7 @@ "SSE.Views.EditChart.textDisplayUnits": "Display Units", "SSE.Views.EditChart.textFill": "Fill", "SSE.Views.EditChart.textForward": "Move Forward", + "SSE.Views.EditChart.textGridlines": "Gridlines", "SSE.Views.EditChart.textHorAxis": "Horizontal Axis", "SSE.Views.EditChart.textHorizontal": "Horizontal", "SSE.Views.EditChart.textLabelOptions": "Label Options", diff --git a/apps/spreadsheeteditor/mobile/locale/es.json b/apps/spreadsheeteditor/mobile/locale/es.json index adc13c878..90709a95d 100644 --- a/apps/spreadsheeteditor/mobile/locale/es.json +++ b/apps/spreadsheeteditor/mobile/locale/es.json @@ -167,14 +167,15 @@ "SSE.Controllers.Main.loadImagesTitleText": "Cargando imágenes", "SSE.Controllers.Main.loadImageTextText": "Cargando imagen...", "SSE.Controllers.Main.loadImageTitleText": "Cargando imagen", - "SSE.Controllers.Main.loadingDocumentTextText": "Cargando documento...", - "SSE.Controllers.Main.loadingDocumentTitleText": "Cargando documento", + "SSE.Controllers.Main.loadingDocumentTextText": "Cargando hoja de cálculo...", + "SSE.Controllers.Main.loadingDocumentTitleText": "Cargando hoja de cálculo", "SSE.Controllers.Main.mailMergeLoadFileText": "Cargando fuente de datos...", "SSE.Controllers.Main.mailMergeLoadFileTitle": "Cargando fuente de datos", "SSE.Controllers.Main.notcriticalErrorTitle": "Aviso", "SSE.Controllers.Main.openErrorText": "Se ha producido un error al abrir el archivo ", "SSE.Controllers.Main.openTextText": "Abriendo documento...", "SSE.Controllers.Main.openTitleText": "Abriendo documento", + "SSE.Controllers.Main.pastInMergeAreaError": "Es imposible cambiar una parte de la celda unida", "SSE.Controllers.Main.printTextText": "Imprimiendo documento...", "SSE.Controllers.Main.printTitleText": "Imprimiendo documento", "SSE.Controllers.Main.reloadButtonText": "Volver a cargar página", @@ -194,7 +195,7 @@ "SSE.Controllers.Main.textClose": "Cerrar", "SSE.Controllers.Main.textContactUs": "Contactar con equipo de ventas", "SSE.Controllers.Main.textDone": "Listo", - "SSE.Controllers.Main.textLoadingDocument": "Cargando documento", + "SSE.Controllers.Main.textLoadingDocument": "Cargando hoja de cálculo", "SSE.Controllers.Main.textNoLicenseTitle": "Limitación en conexiones a ONLYOFFICE", "SSE.Controllers.Main.textOK": "OK", "SSE.Controllers.Main.textPassword": "Contraseña", @@ -375,6 +376,7 @@ "SSE.Views.EditChart.textDisplayUnits": "Unidades de visualización", "SSE.Views.EditChart.textFill": "Relleno", "SSE.Views.EditChart.textForward": "Mover adelante", + "SSE.Views.EditChart.textGridlines": "Líneas de cuadrícula", "SSE.Views.EditChart.textHorAxis": "Eje horizontal", "SSE.Views.EditChart.textHorizontal": "Horizontal ", "SSE.Views.EditChart.textLabelOptions": "Parámetros de etiqueta", diff --git a/apps/spreadsheeteditor/mobile/locale/fr.json b/apps/spreadsheeteditor/mobile/locale/fr.json index b394a7180..5c644b048 100644 --- a/apps/spreadsheeteditor/mobile/locale/fr.json +++ b/apps/spreadsheeteditor/mobile/locale/fr.json @@ -167,14 +167,15 @@ "SSE.Controllers.Main.loadImagesTitleText": "Chargement des images", "SSE.Controllers.Main.loadImageTextText": "Chargement d'une image...", "SSE.Controllers.Main.loadImageTitleText": "Chargement d'une image", - "SSE.Controllers.Main.loadingDocumentTextText": "Chargement du document...", - "SSE.Controllers.Main.loadingDocumentTitleText": "Chargement du document", + "SSE.Controllers.Main.loadingDocumentTextText": "Chargement feuille de calcul...", + "SSE.Controllers.Main.loadingDocumentTitleText": "Chargement feuille de calcul", "SSE.Controllers.Main.mailMergeLoadFileText": "Chargement de la source des données...", "SSE.Controllers.Main.mailMergeLoadFileTitle": "Chargement de la source des données", "SSE.Controllers.Main.notcriticalErrorTitle": "Avertissement", "SSE.Controllers.Main.openErrorText": "Une erreur s’est produite lors de l’ouverture du fichier", "SSE.Controllers.Main.openTextText": "Ouverture du document...", "SSE.Controllers.Main.openTitleText": "Ouverture du document", + "SSE.Controllers.Main.pastInMergeAreaError": "Impossible de modifier une partie d'une cellule fusionnée", "SSE.Controllers.Main.printTextText": "Impression du document...", "SSE.Controllers.Main.printTitleText": "Impression du document", "SSE.Controllers.Main.reloadButtonText": "Recharger la page", @@ -194,7 +195,7 @@ "SSE.Controllers.Main.textClose": "Fermer", "SSE.Controllers.Main.textContactUs": "Contacter l'équipe de ventes", "SSE.Controllers.Main.textDone": "Terminé", - "SSE.Controllers.Main.textLoadingDocument": "Chargement du document", + "SSE.Controllers.Main.textLoadingDocument": "Chargement feuille de calcul", "SSE.Controllers.Main.textNoLicenseTitle": "Limitation de connexion ONLYOFFICE", "SSE.Controllers.Main.textOK": "OK", "SSE.Controllers.Main.textPassword": "Mot de passe", @@ -375,6 +376,7 @@ "SSE.Views.EditChart.textDisplayUnits": "Unités de l'affichage", "SSE.Views.EditChart.textFill": "Remplissage", "SSE.Views.EditChart.textForward": "Déplacer vers l'avant", + "SSE.Views.EditChart.textGridlines": "Quadrillage", "SSE.Views.EditChart.textHorAxis": "Axe horizontal", "SSE.Views.EditChart.textHorizontal": "Horizontal", "SSE.Views.EditChart.textLabelOptions": "Options d'étiquettes", diff --git a/apps/spreadsheeteditor/mobile/locale/it.json b/apps/spreadsheeteditor/mobile/locale/it.json index 50dcb5004..a97035f5e 100644 --- a/apps/spreadsheeteditor/mobile/locale/it.json +++ b/apps/spreadsheeteditor/mobile/locale/it.json @@ -121,6 +121,7 @@ "SSE.Controllers.Main.errorCountArgExceed": "Un errore nella formula inserita.
E' stato superato il numero di argomenti.", "SSE.Controllers.Main.errorCreateDefName": "Gli intervalli denominati esistenti non possono essere modificati e quelli nuovi non possono essere creati
al momento alcuni di essi sono in fase di modifica.", "SSE.Controllers.Main.errorDatabaseConnection": "Errore esterno.
Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.", + "SSE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.", "SSE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.", "SSE.Controllers.Main.errorDefaultMessage": "Codice errore: %1", "SSE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.", @@ -167,14 +168,15 @@ "SSE.Controllers.Main.loadImagesTitleText": "Caricamento delle immagini", "SSE.Controllers.Main.loadImageTextText": "Caricamento dell'immagine in corso...", "SSE.Controllers.Main.loadImageTitleText": "Caricamento dell'immagine", - "SSE.Controllers.Main.loadingDocumentTextText": "Caricamento del documento in corso...", - "SSE.Controllers.Main.loadingDocumentTitleText": "Caricamento del documento", + "SSE.Controllers.Main.loadingDocumentTextText": "Caricamento del foglio di calcolo...", + "SSE.Controllers.Main.loadingDocumentTitleText": "Caricamento del foglio di calcolo", "SSE.Controllers.Main.mailMergeLoadFileText": "Caricamento origine dati...", "SSE.Controllers.Main.mailMergeLoadFileTitle": "Caricamento origine dati", "SSE.Controllers.Main.notcriticalErrorTitle": "Avviso", "SSE.Controllers.Main.openErrorText": "Si è verificato un errore all'apertura del file", "SSE.Controllers.Main.openTextText": "Apertura del documento in corso...", "SSE.Controllers.Main.openTitleText": "Apertura del documento", + "SSE.Controllers.Main.pastInMergeAreaError": "Impossibile modificare una parte della cella unita", "SSE.Controllers.Main.printTextText": "Stampa del documento in corso...", "SSE.Controllers.Main.printTitleText": "Stampa del documento", "SSE.Controllers.Main.reloadButtonText": "Ricarica pagina", @@ -194,7 +196,7 @@ "SSE.Controllers.Main.textClose": "Chiudi", "SSE.Controllers.Main.textContactUs": "Contatta il reparto vendite.", "SSE.Controllers.Main.textDone": "Fatto", - "SSE.Controllers.Main.textLoadingDocument": "Caricamento del documento", + "SSE.Controllers.Main.textLoadingDocument": "Caricamento del foglio di calcolo", "SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE® limite connessione", "SSE.Controllers.Main.textOK": "OK", "SSE.Controllers.Main.textPassword": "Password", @@ -256,7 +258,9 @@ "SSE.Controllers.Main.uploadImageSizeMessage": "È stata superata la dimensione massima dell'immagine.", "SSE.Controllers.Main.uploadImageTextText": "Caricamento dell'immagine in corso...", "SSE.Controllers.Main.uploadImageTitleText": "Caricamento dell'immagine", + "SSE.Controllers.Main.warnLicenseExceeded": "Il numero di connessioni simultanee al server dei documenti è stato superato e il documento verrà aperto solo per la visualizzazione.
Contattare l'amministratore per ulteriori informazioni.", "SSE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.
Si prega di aggiornare la licenza e ricaricare la pagina.", + "SSE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione.
Per ulteriori informazioni, contattare l'amministratore.", "SSE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.
Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.", "SSE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE Editors presenta alcune limitazioni per gli utenti simultanei.
Se hai bisogno di più, ti preghiamo di considerare l'aggiornamento della tua licenza attuale o l'acquisto di una licenza commerciale.", "SSE.Controllers.Main.warnProcessRightsChange": "Ti è stato negato il diritto di modificare il file.", @@ -376,6 +380,7 @@ "SSE.Views.EditChart.textDisplayUnits": "Mostra unità", "SSE.Views.EditChart.textFill": "Riempimento", "SSE.Views.EditChart.textForward": "Sposta avanti", + "SSE.Views.EditChart.textGridlines": "Gridlines", "SSE.Views.EditChart.textHorAxis": "Asse orizzontale", "SSE.Views.EditChart.textHorizontal": "Orizzontale", "SSE.Views.EditChart.textLabelOptions": "Opzioni etichetta", diff --git a/apps/spreadsheeteditor/mobile/locale/ko.json b/apps/spreadsheeteditor/mobile/locale/ko.json index b8654cb0e..258968f62 100644 --- a/apps/spreadsheeteditor/mobile/locale/ko.json +++ b/apps/spreadsheeteditor/mobile/locale/ko.json @@ -167,14 +167,15 @@ "SSE.Controllers.Main.loadImagesTitleText": "이미지로드 중", "SSE.Controllers.Main.loadImageTextText": "이미지로드 중 ...", "SSE.Controllers.Main.loadImageTitleText": "이미지로드 중", - "SSE.Controllers.Main.loadingDocumentTextText": "문서로드 중 ...", - "SSE.Controllers.Main.loadingDocumentTitleText": "문서로드 중", + "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.pastInMergeAreaError": "병합 된 셀의 일부를 변경할 수 없습니다", "SSE.Controllers.Main.printTextText": "문서 인쇄 중 ...", "SSE.Controllers.Main.printTitleText": "문서 인쇄", "SSE.Controllers.Main.reloadButtonText": "Reload Page", @@ -194,7 +195,7 @@ "SSE.Controllers.Main.textClose": "닫기", "SSE.Controllers.Main.textContactUs": "영업 담당자에게 문의", "SSE.Controllers.Main.textDone": "완료", - "SSE.Controllers.Main.textLoadingDocument": "문서로드 중", + "SSE.Controllers.Main.textLoadingDocument": "스프레드 시트로드 중", "SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE 연결 제한", "SSE.Controllers.Main.textOK": "OK", "SSE.Controllers.Main.textPassword": "Password", @@ -375,6 +376,7 @@ "SSE.Views.EditChart.textDisplayUnits": "표시 단위", "SSE.Views.EditChart.textFill": "채우기", "SSE.Views.EditChart.textForward": "앞으로 이동", + "SSE.Views.EditChart.textGridlines": "눈금 선", "SSE.Views.EditChart.textHorAxis": "가로 축", "SSE.Views.EditChart.textHorizontal": "Horizontal", "SSE.Views.EditChart.textLabelOptions": "레이블 옵션", diff --git a/apps/spreadsheeteditor/mobile/locale/lv.json b/apps/spreadsheeteditor/mobile/locale/lv.json index b9108003e..c83e9d850 100644 --- a/apps/spreadsheeteditor/mobile/locale/lv.json +++ b/apps/spreadsheeteditor/mobile/locale/lv.json @@ -167,14 +167,15 @@ "SSE.Controllers.Main.loadImagesTitleText": "Ielādē attēlus", "SSE.Controllers.Main.loadImageTextText": "Ielādē attēlu...", "SSE.Controllers.Main.loadImageTitleText": "Ielādē attēlu", - "SSE.Controllers.Main.loadingDocumentTextText": "Ielādē dokumentu...", - "SSE.Controllers.Main.loadingDocumentTitleText": "Ielādē dokumentu", + "SSE.Controllers.Main.loadingDocumentTextText": "Ielādē izklājlapu...", + "SSE.Controllers.Main.loadingDocumentTitleText": "Ielādē izklājlapu", "SSE.Controllers.Main.mailMergeLoadFileText": "Ielādē datu avotu...", "SSE.Controllers.Main.mailMergeLoadFileTitle": "Ielādē datu avotu", "SSE.Controllers.Main.notcriticalErrorTitle": "Brīdinājums", "SSE.Controllers.Main.openErrorText": "Faila atvēršanas laikā radās kļūda", "SSE.Controllers.Main.openTextText": "Dokumenta atvēršana...", "SSE.Controllers.Main.openTitleText": "Dokumenta atvēršana", + "SSE.Controllers.Main.pastInMergeAreaError": "Nevar mainīt apvienotas šūnas daļu", "SSE.Controllers.Main.printTextText": "Drukā dokumentu...", "SSE.Controllers.Main.printTitleText": "Drukā dokumentu", "SSE.Controllers.Main.reloadButtonText": "Pārlādēt lapu", @@ -194,7 +195,7 @@ "SSE.Controllers.Main.textClose": "Aizvērt", "SSE.Controllers.Main.textContactUs": "Sazināties ar pārdošanas daļu", "SSE.Controllers.Main.textDone": "Gatavs", - "SSE.Controllers.Main.textLoadingDocument": "Ielādē dokumentu", + "SSE.Controllers.Main.textLoadingDocument": "Ielādē izklājlapu", "SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE pieslēguma ierobežojums", "SSE.Controllers.Main.textOK": "OK", "SSE.Controllers.Main.textPassword": "Parole", diff --git a/apps/spreadsheeteditor/mobile/locale/nl.json b/apps/spreadsheeteditor/mobile/locale/nl.json index 2bcbda937..841273407 100644 --- a/apps/spreadsheeteditor/mobile/locale/nl.json +++ b/apps/spreadsheeteditor/mobile/locale/nl.json @@ -167,14 +167,15 @@ "SSE.Controllers.Main.loadImagesTitleText": "Afbeeldingen worden geladen", "SSE.Controllers.Main.loadImageTextText": "Afbeelding wordt geladen...", "SSE.Controllers.Main.loadImageTitleText": "Afbeelding wordt geladen", - "SSE.Controllers.Main.loadingDocumentTextText": "Document wordt geladen...", - "SSE.Controllers.Main.loadingDocumentTitleText": "Document wordt geladen", + "SSE.Controllers.Main.loadingDocumentTextText": "Spreadsheet wordt geladen...", + "SSE.Controllers.Main.loadingDocumentTitleText": "Spreadsheet wordt geladen", "SSE.Controllers.Main.mailMergeLoadFileText": "Gegevensbron wordt geladen...", "SSE.Controllers.Main.mailMergeLoadFileTitle": "Gegevensbron wordt geladen", "SSE.Controllers.Main.notcriticalErrorTitle": "Waarschuwing", "SSE.Controllers.Main.openErrorText": "Er is een fout opgetreden bij het openen van het bestand", "SSE.Controllers.Main.openTextText": "Document wordt geopend...", "SSE.Controllers.Main.openTitleText": "Document wordt geopend", + "SSE.Controllers.Main.pastInMergeAreaError": "Een gedeelte van een samengevoegde cel kan niet worden gewijzigd", "SSE.Controllers.Main.printTextText": "Document wordt afgedrukt...", "SSE.Controllers.Main.printTitleText": "Document wordt afgedrukt ", "SSE.Controllers.Main.reloadButtonText": "Pagina opnieuw laden", @@ -194,7 +195,7 @@ "SSE.Controllers.Main.textClose": "Sluiten", "SSE.Controllers.Main.textContactUs": "Contact opnemen met Verkoop", "SSE.Controllers.Main.textDone": "Klaar", - "SSE.Controllers.Main.textLoadingDocument": "Document wordt geladen", + "SSE.Controllers.Main.textLoadingDocument": "Spreadsheet wordt geladen", "SSE.Controllers.Main.textNoLicenseTitle": "Open source-versie ONLYOFFICE", "SSE.Controllers.Main.textOK": "OK", "SSE.Controllers.Main.textPassword": "Wachtwoord", @@ -375,6 +376,7 @@ "SSE.Views.EditChart.textDisplayUnits": "Weergave-eenheden", "SSE.Views.EditChart.textFill": "Vulling", "SSE.Views.EditChart.textForward": "Naar voren verplaatsen", + "SSE.Views.EditChart.textGridlines": "Rasterlijnen", "SSE.Views.EditChart.textHorAxis": "Horizontale as", "SSE.Views.EditChart.textHorizontal": "Horizontaal", "SSE.Views.EditChart.textLabelOptions": "Labelopties", diff --git a/apps/spreadsheeteditor/mobile/locale/ru.json b/apps/spreadsheeteditor/mobile/locale/ru.json index c7c56d909..4bf7d07a6 100644 --- a/apps/spreadsheeteditor/mobile/locale/ru.json +++ b/apps/spreadsheeteditor/mobile/locale/ru.json @@ -121,6 +121,7 @@ "SSE.Controllers.Main.errorCountArgExceed": "Ошибка во введенной формуле.
Превышено количество аргументов.", "SSE.Controllers.Main.errorCreateDefName": "В настоящий момент нельзя отредактировать существующие именованные диапазоны и создать новые,
так как некоторые из них редактируются.", "SSE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.
Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.", + "SSE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.", "SSE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.", "SSE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1", "SSE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.", @@ -167,14 +168,15 @@ "SSE.Controllers.Main.loadImagesTitleText": "Загрузка изображений", "SSE.Controllers.Main.loadImageTextText": "Загрузка изображения...", "SSE.Controllers.Main.loadImageTitleText": "Загрузка изображения", - "SSE.Controllers.Main.loadingDocumentTextText": "Загрузка документа...", - "SSE.Controllers.Main.loadingDocumentTitleText": "Загрузка документа", + "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.pastInMergeAreaError": "Нельзя изменить часть объединенной ячейки", "SSE.Controllers.Main.printTextText": "Печать документа...", "SSE.Controllers.Main.printTitleText": "Печать документа", "SSE.Controllers.Main.reloadButtonText": "Обновить страницу", @@ -194,7 +196,7 @@ "SSE.Controllers.Main.textClose": "Закрыть", "SSE.Controllers.Main.textContactUs": "Связаться с отделом продаж", "SSE.Controllers.Main.textDone": "Готово", - "SSE.Controllers.Main.textLoadingDocument": "Загрузка документа", + "SSE.Controllers.Main.textLoadingDocument": "Загрузка таблицы", "SSE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений ONLYOFFICE", "SSE.Controllers.Main.textOK": "OK", "SSE.Controllers.Main.textPassword": "Пароль", @@ -256,9 +258,11 @@ "SSE.Controllers.Main.uploadImageSizeMessage": "Превышен максимальный размер изображения.", "SSE.Controllers.Main.uploadImageTextText": "Загрузка изображения...", "SSE.Controllers.Main.uploadImageTitleText": "Загрузка изображения", + "SSE.Controllers.Main.warnLicenseExceeded": "Превышено допустимое число одновременных подключений к серверу документов, и документ откроется только на просмотр.
Обратитесь к администратору за дополнительной информацией.", "SSE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.
Обновите лицензию, а затем обновите страницу.", - "SSE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.", - "SSE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.
Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.", + "SSE.Controllers.Main.warnLicenseUsersExceeded": "Превышено допустимое число одновременно работающих пользователей, и документ откроется только на просмотр.
Обратитесь к администратору за дополнительной информацией.", + "SSE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", + "SSE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", "SSE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", "SSE.Controllers.Search.textNoTextFound": "Текст не найден", "SSE.Controllers.Search.textReplaceAll": "Заменить все", @@ -376,6 +380,7 @@ "SSE.Views.EditChart.textDisplayUnits": "Единицы отображения", "SSE.Views.EditChart.textFill": "Заливка", "SSE.Views.EditChart.textForward": "Перенести вперед", + "SSE.Views.EditChart.textGridlines": "Линии сетки", "SSE.Views.EditChart.textHorAxis": "Горизонтальная ось", "SSE.Views.EditChart.textHorizontal": "По горизонтали", "SSE.Views.EditChart.textLabelOptions": "Параметры подписи", @@ -456,7 +461,7 @@ "SSE.Views.EditText.textSize": "Размер", "SSE.Views.EditText.textTextColor": "Цвет текста", "SSE.Views.Search.textDone": "Готово", - "SSE.Views.Search.textFind": "Найти", + "SSE.Views.Search.textFind": "Поиск", "SSE.Views.Search.textFindAndReplace": "Поиск и замена", "SSE.Views.Search.textMatchCase": "С учетом регистра", "SSE.Views.Search.textMatchCell": "Сопоставление ячеек", @@ -477,7 +482,7 @@ "SSE.Views.Settings.textDownloadAs": "Скачать как...", "SSE.Views.Settings.textEditDoc": "Редактировать", "SSE.Views.Settings.textEmail": "email", - "SSE.Views.Settings.textFind": "Найти", + "SSE.Views.Settings.textFind": "Поиск", "SSE.Views.Settings.textFindAndReplace": "Поиск и замена", "SSE.Views.Settings.textHelp": "Справка", "SSE.Views.Settings.textLoading": "Загрузка...", diff --git a/apps/spreadsheeteditor/mobile/locale/zh.json b/apps/spreadsheeteditor/mobile/locale/zh.json index 69df0f37c..118758dc3 100644 --- a/apps/spreadsheeteditor/mobile/locale/zh.json +++ b/apps/spreadsheeteditor/mobile/locale/zh.json @@ -194,7 +194,7 @@ "SSE.Controllers.Main.textContactUs": "联系销售", "SSE.Controllers.Main.textDone": "完成", "SSE.Controllers.Main.textLoadingDocument": "文件加载中…", - "SSE.Controllers.Main.textNoLicenseTitle": "NLYOFFICE开源版本", + "SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE开源版本", "SSE.Controllers.Main.textOK": "确定", "SSE.Controllers.Main.textPassword": "密码", "SSE.Controllers.Main.textPreloader": "载入中……", diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-material.css b/apps/spreadsheeteditor/mobile/resources/css/app-material.css index 4e5d59495..9e7b33479 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-material.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-material.css @@ -6676,6 +6676,13 @@ html.pixel-ratio-3 .box-tabs ul > li:after { .box-tabs .locked a { box-shadow: inset 0 2px #f00; } +#editor-navbar.navbar .right { + padding-right: 4px; +} +#editor-navbar.navbar .right a.link, +#editor-navbar.navbar .left a.link { + padding: 0 13px; +} #add-table .page, #add-shape .page { background-color: #fff; diff --git a/apps/spreadsheeteditor/mobile/resources/less/app-material.less b/apps/spreadsheeteditor/mobile/resources/less/app-material.less index 81c9018e1..9614d8ec2 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/app-material.less +++ b/apps/spreadsheeteditor/mobile/resources/less/app-material.less @@ -72,6 +72,14 @@ input, textarea { @import url('celleditor'); @import url('statusbar'); +// Main Toolbar +#editor-navbar.navbar .right { + padding-right: 4px; +} +#editor-navbar.navbar .right a.link, +#editor-navbar.navbar .left a.link { + padding: 0 13px; +} // Add Container