diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 8e9bbeee4..fc8078b13 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 1282aa044..145dad9ad 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/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js index 89ae9038a..1157b7184 100644 --- a/apps/common/main/lib/view/OpenDialog.js +++ b/apps/common/main/lib/view/OpenDialog.js @@ -172,7 +172,8 @@ define([ }); } else { this.initCodePages(); - this.updatePreview(); + if (this.preview) + this.updatePreview(); this.onPrimary = function() { me._handleInput('ok'); return false; diff --git a/apps/common/main/lib/view/Protection.js b/apps/common/main/lib/view/Protection.js index d0bbf98be..71d7b0397 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/img/doc-formats/pdfa.svg b/apps/common/main/resources/img/doc-formats/pdfa.svg new file mode 100644 index 000000000..5690c604c --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/pdfa.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/common/main/resources/img/doc-formats/rtf.svg b/apps/common/main/resources/img/doc-formats/rtf.svg index cd8665cbe..2d7afb66a 100644 --- a/apps/common/main/resources/img/doc-formats/rtf.svg +++ b/apps/common/main/resources/img/doc-formats/rtf.svg @@ -1 +1 @@ -RTF \ No newline at end of file +RTF \ No newline at end of file diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 204b94faf..e4e1e461c 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -40,7 +40,6 @@ .extra { > section { - line-height: 20px; height: 100%; display: flex; } @@ -52,6 +51,7 @@ &.right { flex-grow: 1; min-width: 100px; + line-height: 20px; } .status-label { diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index ad6251bcf..5f4075f1f 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 @@ -413,7 +413,8 @@ define([ Asc.c_oAscFileType.ODT, Asc.c_oAscFileType.DOCX, Asc.c_oAscFileType.HTML, - Asc.c_oAscFileType.PDF + Asc.c_oAscFileType.PDF, + Asc.c_oAscFileType.PDFA ]; if ( !_format || _supported.indexOf(_format) < 0 ) @@ -993,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'); @@ -1014,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"); @@ -1088,7 +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.canProtect = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport(); + 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); this.appOptions.canHelp = !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.help===false); if ( this.appOptions.isLightVersion ) { @@ -1382,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; @@ -1403,6 +1418,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); @@ -2191,7 +2210,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.', @@ -2239,10 +2257,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 4c78a6a9e..f062fd10a 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -142,7 +142,8 @@ define([ Asc.c_oAscFileType.RTF, Asc.c_oAscFileType.ODT, Asc.c_oAscFileType.DOCX, - Asc.c_oAscFileType.HTML + Asc.c_oAscFileType.HTML, + Asc.c_oAscFileType.PDFA ]; if ( !_format || _supported.indexOf(_format) < 0 ) @@ -2725,7 +2726,7 @@ define([ me.toolbar.btnPaste.$el.detach().appendTo($box); me.toolbar.btnCopy.$el.removeClass('split'); - if ( config.isOffline ) { + if ( config.isProtectSupport && config.isOffline ) { tab = {action: 'protect', caption: me.toolbar.textTabProtect}; $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js index d3e281b30..eb8b53bca 100644 --- a/apps/documenteditor/main/app/view/ChartSettings.js +++ b/apps/documenteditor/main/app/view/ChartSettings.js @@ -501,7 +501,11 @@ define([ stylesStore.reset(stylearray, {silent: false}); } } + } else { + this.cmbChartStyle.menuPicker.store.reset(); + this.cmbChartStyle.clearComboView(); } + this.cmbChartStyle.setDisabled(!styles || styles.length<1 || this._locked); }, setLocked: function (locked) { 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/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 3819798c9..44dd732c1 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -54,6 +54,7 @@ define([ formats: [[ {name: 'DOCX', imgCls: 'docx', type: Asc.c_oAscFileType.DOCX}, {name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF}, + {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA}, {name: 'TXT', imgCls: 'txt', type: Asc.c_oAscFileType.TXT} ],[ // {name: 'DOC', imgCls: 'doc-format btn-doc', type: Asc.c_oAscFileType.DOC}, 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 d4cfb509e..cd80ec182 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -2002,6 +2002,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) { @@ -2215,7 +2217,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', @@ -2225,8 +2227,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', @@ -2317,7 +2319,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/index.html b/apps/documenteditor/main/index.html index ffaf58340..7aaa2df5d 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -264,6 +264,7 @@ + diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index c505b375c..32fdf0a44 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -285,6 +285,7 @@ + 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 01884da82..8b6242550 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", @@ -332,6 +332,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.", @@ -454,9 +455,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", @@ -1421,6 +1424,7 @@ "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.textPreset": "Preset", @@ -1753,7 +1757,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", @@ -1774,8 +1778,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", @@ -1873,7 +1877,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/main/resources/img/toolbar-menu.png b/apps/documenteditor/main/resources/img/toolbar-menu.png index 558dd83d4..7d8bad438 100644 Binary files a/apps/documenteditor/main/resources/img/toolbar-menu.png and b/apps/documenteditor/main/resources/img/toolbar-menu.png differ diff --git a/apps/documenteditor/main/resources/img/toolbar-menu@2x.png b/apps/documenteditor/main/resources/img/toolbar-menu@2x.png index 7f29f381c..b88f17f15 100644 Binary files a/apps/documenteditor/main/resources/img/toolbar-menu@2x.png and b/apps/documenteditor/main/resources/img/toolbar-menu@2x.png differ diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index a299312f8..c800db23b 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -271,6 +271,7 @@ .box-shadow(none); margin: 0; font-size: 12px; + float: none; &:not(.header-name) { &:hover, @@ -286,11 +287,12 @@ } .help-item-wrap { - padding: 7px 2px 7px 20px; + padding: 4px 2px 4px 20px; } .header-name { - padding: 7px 2px 7px 10px; + padding: 16px 2px 4px 10px; + font-size: 12px; } } } diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index c93f9d630..b12f014c4 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 @@ -583,17 +583,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'); @@ -606,22 +626,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 @@ -871,6 +877,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; @@ -891,6 +901,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); @@ -1287,7 +1301,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.', @@ -1328,8 +1341,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', + 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.', closeButtonText: 'Close File' } })(), DE.Controllers.Main || {})) 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 0d675ee08..1efcda4ba 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.Main.closeButtonText": "Close File", "DE.Controllers.Search.textNoTextFound": "Text not Found", 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/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 131868393..2107e270f 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 = []; @@ -385,7 +385,8 @@ define([ _supported = [ Asc.c_oAscFileType.PPTX, Asc.c_oAscFileType.ODP, - Asc.c_oAscFileType.PDF + Asc.c_oAscFileType.PDF, + Asc.c_oAscFileType.PDFA ]; if ( !_format || _supported.indexOf(_format) < 0 ) @@ -759,16 +760,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 +792,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 +861,8 @@ 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.canProtect = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport(); + 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.canHelp = !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.help===false); this.appOptions.canBranding = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object'); @@ -1126,6 +1136,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 +1163,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 +1995,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 +2027,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 +2039,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 0bc0bb058..2d2e92eb4 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -149,7 +149,8 @@ define([ var _supported = [ Asc.c_oAscFileType.PPTX, - Asc.c_oAscFileType.ODP + Asc.c_oAscFileType.ODP, + Asc.c_oAscFileType.PDFA ]; if ( !_format || _supported.indexOf(_format) < 0 ) @@ -2017,7 +2018,7 @@ define([ me.toolbar.btnPaste.$el.detach().appendTo($box); me.toolbar.btnCopy.$el.removeClass('split'); - if ( config.isOffline ) { + if ( config.isProtectSupport && config.isOffline ) { // 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/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js index 42c0a580d..6d208a271 100644 --- a/apps/presentationeditor/main/app/view/ChartSettings.js +++ b/apps/presentationeditor/main/app/view/ChartSettings.js @@ -430,7 +430,11 @@ define([ stylesStore.reset(stylearray, {silent: false}); } } + } else { + this.cmbChartStyle.menuPicker.store.reset(); + this.cmbChartStyle.clearComboView(); } + this.cmbChartStyle.setDisabled(!styles || styles.length<1 || this._locked); }, onWidthChange: function(field, newValue, oldValue, eOpts){ diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index e068aaaad..2e38b60dd 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -55,6 +55,7 @@ define([ formats: [[ {name: 'PPTX', imgCls: 'pptx', type: Asc.c_oAscFileType.PPTX}, {name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF}, + {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA}, {name: 'ODP', imgCls: 'odp', type: Asc.c_oAscFileType.ODP} ]], 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 3fc8010b3..49b7e3ebf 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1657,9 +1657,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', @@ -1732,7 +1732,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.html b/apps/presentationeditor/main/index.html index a75f2173c..340badc67 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -263,6 +263,7 @@ +