diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index bfc03f2cd..76c6f6ea1 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -322,7 +322,7 @@ } if (typeof _config.document.fileType === 'string' && _config.document.fileType != '') { - var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm)|(doc|docx|doct|odt|gdoc|txt|rtf|pdf|mht|htm|html|epub|djvu|xps|docm|dot|dotm|dotx))$/ + var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp)|(doc|docx|doct|odt|gdoc|txt|rtf|pdf|mht|htm|html|epub|djvu|xps|docm|dot|dotm|dotx|fodt))$/ .exec(_config.document.fileType); if (!type) { window.alert("The \"document.fileType\" parameter for the config object is invalid. Please correct it."); @@ -336,9 +336,6 @@ var type = /^(?:(pdf|djvu|xps))$/.exec(_config.document.fileType); if (type && typeof type[1] === 'string') { - if (!_config.document.permissions) - _config.document.permissions = {}; - _config.document.permissions.edit = _config.document.permissions.review = false; _config.editorConfig.canUseHistory = false; } @@ -659,7 +656,7 @@ app = appMap[config.documentType.toLowerCase()]; } else if (!!config.document && typeof config.document.fileType === 'string') { - var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm))$/ + var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp))$/ .exec(config.document.fileType); if (type) { if (typeof type[1] === 'string') app = appMap['spreadsheet']; else diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index f2f4e3a33..9a6cbef9e 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -842,17 +842,17 @@ define([ setResizable: function(resizable, minSize, maxSize) { if (resizable !== this.resizable) { if (resizable) { - var bordersTemplate = '
' + + var bordersTemplate = '
' + '
' + '
' + '
' + - '
' + + '
' + '
' + - '
' + + '
' + '
'; if (this.initConfig.header) - bordersTemplate += '
' + - '
'; + bordersTemplate += '
' + + '
'; this.$window.append(_.template(bordersTemplate)); diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index 5e544d17a..0acad9dcd 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -281,14 +281,14 @@ define([ this.api.asc_pluginRun(record.get('guid'), 0, ''); }, - onPluginShow: function(plugin, variationIndex) { + onPluginShow: function(plugin, variationIndex, frameId) { var variation = plugin.get_Variations()[variationIndex]; if (variation.get_Visual()) { var url = variation.get_Url(); url = ((plugin.get_BaseUrl().length == 0) ? url : plugin.get_BaseUrl()) + url; if (variation.get_InsideMode()) { - if (!this.panelPlugins.openInsideMode(plugin.get_Name(), url)) + if (!this.panelPlugins.openInsideMode(plugin.get_Name(), url, frameId)) this.api.asc_pluginButtonClick(-1); } else { var me = this, @@ -311,6 +311,7 @@ define([ width: size[0], // inner width height: size[1], // inner height url: url, + frameId : frameId, buttons: isCustomWindow ? undefined : newBtns, toolcallback: _.bind(this.onToolClose, this) }); diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js index d56222143..cdadc1bf8 100644 --- a/apps/common/main/lib/view/Plugins.js +++ b/apps/common/main/lib/view/Plugins.js @@ -194,7 +194,7 @@ define([ } }, - openInsideMode: function(name, url) { + openInsideMode: function(name, url, frameId) { if (!this.pluginsPanel) return false; this.pluginsPanel.toggleClass('hidden', true); @@ -203,7 +203,7 @@ define([ this.pluginName.text(name); if (!this.iframePlugin) { this.iframePlugin = document.createElement("iframe"); - this.iframePlugin.id = 'plugin_iframe'; + this.iframePlugin.id = (frameId === undefined) ? 'plugin_iframe' : frameId; this.iframePlugin.name = 'pluginFrameEditor'; this.iframePlugin.width = '100%'; this.iframePlugin.height = '100%'; @@ -372,6 +372,7 @@ define([ _options.tpl = _.template(this.template)(_options); this.url = options.url || ''; + this.frameId = options.frameId || 'plugin_iframe'; Common.UI.Window.prototype.initialize.call(this, _options); }, @@ -385,7 +386,7 @@ define([ this._headerFooterHeight += ((parseInt(this.$window.css('border-top-width')) + parseInt(this.$window.css('border-bottom-width')))); var iframe = document.createElement("iframe"); - iframe.id = 'plugin_iframe'; + iframe.id = this.frameId; iframe.name = 'pluginFrameEditor'; iframe.width = '100%'; iframe.height = '100%'; diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 6016df2bb..22b0216a8 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -90,13 +90,20 @@ var ApplicationController = new(function(){ if (docConfig) { permissions = $.extend(permissions, docConfig.permissions); - var docInfo = new Asc.asc_CDocInfo(); + var _permissions = $.extend({}, docConfig.permissions), + docInfo = new Asc.asc_CDocInfo(); docInfo.put_Id(docConfig.key); docInfo.put_Url(docConfig.url); docInfo.put_Title(docConfig.title); docInfo.put_Format(docConfig.fileType); docInfo.put_VKey(docConfig.vkey); docInfo.put_Token(docConfig.token); + docInfo.put_Permissions(_permissions); + + var type = /^(?:(pdf|djvu|xps))$/.exec(docConfig.fileType); + if (type && typeof type[1] === 'string') { + permissions.edit = permissions.review = false; + } if (api) { api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions); diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index 4b1ae3385..1d159a5a9 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -202,7 +202,7 @@ define([ if (this.mode.canUseHistory) this.leftMenu.setOptionsPanel('history', this.getApplication().getController('Common.Controllers.History').getView('Common.Views.History')); - this.mode.isTrial && this.leftMenu.setDeveloperMode(true); + this.mode.trialMode && this.leftMenu.setDeveloperMode(this.mode.trialMode); Common.util.Shortcuts.resumeEvents(); return this; @@ -214,7 +214,7 @@ define([ this.leftMenu.setOptionsPanel('plugins', this.getApplication().getController('Common.Controllers.Plugins').getView('Common.Views.Plugins')); } else this.leftMenu.btnPlugins.hide(); - this.mode.isTrial && this.leftMenu.setDeveloperMode(true); + this.mode.trialMode && this.leftMenu.setDeveloperMode(this.mode.trialMode); }, clickMenuFileItem: function(menu, action, isopts) { @@ -319,6 +319,11 @@ define([ // window["AscInputMethod"]["SogouPinyin"] = value; } + if (Common.Utils.isChrome) { + value = Common.localStorage.getBool("de-settings-inputsogou"); + this.api.setInputParams({"SogouPinyin" : value}); + } + /** coauthoring begin **/ if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring) { var fast_coauth = Common.localStorage.getBool("de-settings-coauthmode", true); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index a1653ddb6..6f1bc6702 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -317,7 +317,8 @@ define([ if (data.doc) { this.permissions = $.extend(this.permissions, data.doc.permissions); - var _user = new Asc.asc_CUserInfo(); + var _permissions = $.extend({}, data.doc.permissions), + _user = new Asc.asc_CUserInfo(); _user.put_Id(this.appOptions.user.id); _user.put_FullName(this.appOptions.user.fullname); @@ -331,8 +332,14 @@ define([ docInfo.put_UserInfo(_user); docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); docInfo.put_Token(data.doc.token); + docInfo.put_Permissions(_permissions); // docInfo.put_Review(this.permissions.review); // docInfo.put_OfflineApp(this.editorConfig.nativeApp === true); // used in sdk for testing + + var type = /^(?:(pdf|djvu|xps))$/.exec(data.doc.fileType); + if (type && typeof type[1] === 'string') { + this.permissions.edit = this.permissions.review = false; + } } this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this)); @@ -837,8 +844,8 @@ define([ if (Common.Utils.isChrome) { value = Common.localStorage.getBool("de-settings-inputsogou"); + me.api.setInputParams({"SogouPinyin" : value}); Common.Utils.InternalSettings.set("de-settings-inputsogou", value); - // window["AscInputMethod"]["SogouPinyin"] = value; } /** coauthoring begin **/ @@ -982,7 +989,7 @@ define([ primary: 'buynow', callback: function(btn) { if (btn == 'buynow') - window.open('http://www.onlyoffice.com/enterprise-edition.aspx', "_blank"); + window.open('https://www.onlyoffice.com', "_blank"); else if (btn == 'contact') window.open('mailto:sales@onlyoffice.com', "_blank"); } @@ -1046,7 +1053,7 @@ define([ this.appOptions.canForcesave = this.appOptions.isEdit && !this.appOptions.isOffline && (typeof (this.editorConfig.customization) == 'object' && !!this.editorConfig.customization.forcesave); this.appOptions.forcesave = this.appOptions.canForcesave; this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly); - this.appOptions.isTrial = params.asc_getTrial(); + this.appOptions.trialMode = params.asc_getLicenseMode(); this.appOptions.canProtect = this.appOptions.isDesktopApp && this.api.asc_isSignaturesSupport(); if ( this.appOptions.isLightVersion ) { @@ -1980,9 +1987,10 @@ define([ if (plugins) { var arr = [], arrUI = []; plugins.pluginsData.forEach(function(item){ - if (uiCustomize!==undefined && _.find(arr, function(arritem) { - return (arritem.get('baseUrl') == item.baseUrl || arritem.get('guid') == item.guid); - })) return; + if (_.find(arr, function(arritem) { + return (arritem.get('baseUrl') == item.baseUrl || arritem.get('guid') == item.guid); + }) || pluginStore.findWhere({baseUrl: item.baseUrl}) || pluginStore.findWhere({guid: item.guid})) + return; var variationsArr = [], pluginVisible = false; @@ -2021,7 +2029,7 @@ define([ this.UICustomizePlugins = arrUI; if ( !uiCustomize ) { - if (pluginStore) pluginStore.reset(arr); + if (pluginStore) pluginStore.add(arr); this.appOptions.canPlugins = !pluginStore.isEmpty(); } } else if (!uiCustomize){ diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index b12fb024c..0f0f68848 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -1748,6 +1748,8 @@ define([ }, onSelectChart: function(picker, item, record) { + if (!record) return; + var me = this, type = record.get('type'), chart = false; @@ -2341,8 +2343,10 @@ define([ shapePicker.on('item:click', function(picker, item, record, e) { if (me.api) { - me._addAutoshape(true, record.get('data').shapeType); - me._isAddingShape = true; + if (record) { + me._addAutoshape(true, record.get('data').shapeType); + me._isAddingShape = true; + } if (me.toolbar.btnInsertText.pressed) { me.toolbar.btnInsertText.toggle(false, true); @@ -2413,7 +2417,8 @@ define([ equationPicker.on('item:click', function(picker, item, record, e) { if (me.api) { - me.api.asc_AddMath(record.get('data').equationType); + if (record) + me.api.asc_AddMath(record.get('data').equationType); if (me.toolbar.btnInsertText.pressed) { me.toolbar.btnInsertText.toggle(false, true); @@ -2577,8 +2582,10 @@ define([ this.toolbar.mnuTextArtPicker.on('item:click', function(picker, item, record, e) { if (me.api) { - me.toolbar.fireEvent('inserttextart', me.toolbar); - me.api.AddTextArt(record.get('data')); + if (record) { + me.toolbar.fireEvent('inserttextart', me.toolbar); + me.api.AddTextArt(record.get('data')); + } if (me.toolbar.btnInsertShape.pressed) me.toolbar.btnInsertShape.toggle(false, true); diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js index 4d082d3cd..9670f0c5f 100644 --- a/apps/documenteditor/main/app/view/LeftMenu.js +++ b/apps/documenteditor/main/app/view/LeftMenu.js @@ -360,7 +360,7 @@ define([ if ( !this.$el.is(':visible') ) return; if (!this.developerHint) { - this.developerHint = $('
' + this.txtDeveloper + '
').appendTo(this.$el); + this.developerHint = $('
' + ((mode == Asc.c_oLicenseMode.Trial) ? this.txtTrial : this.txtDeveloper) + '
').appendTo(this.$el); this.devHeight = this.developerHint.outerHeight(); $(window).on('resize', _.bind(this.onWindowResize, this)); } @@ -382,6 +382,7 @@ define([ tipSupport : 'Feedback & Support', tipSearch : 'Search', tipPlugins : 'Plugins', - txtDeveloper: 'DEVELOPER MODE' + txtDeveloper: 'DEVELOPER MODE', + txtTrial: 'TRIAL MODE' }, DE.Views.LeftMenu || {})); }); diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 950efcc1a..1cf37d7d2 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -2485,7 +2485,7 @@ define([ textTabLayout: 'Page Layout', textTabReview: 'Review', capBtnInsShape: 'Shape', - capBtnInsTextbox: 'Text', + capBtnInsTextbox: 'Text Box', capBtnInsTextart: 'Text Art', capBtnInsDropcap: 'Drop Cap', capBtnInsFootnote: 'Footnotes', diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index 0b3f9dd9a..94ff4fb3c 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -179,6 +179,7 @@ "Common.Views.OpenDialog.cancelButtonText": "Abbrechen", "Common.Views.OpenDialog.okButtonText": "OK", "Common.Views.OpenDialog.txtEncoding": "Verschlüsselung ", + "Common.Views.OpenDialog.txtIncorrectPwd": "Kennwort ist falsch.", "Common.Views.OpenDialog.txtPassword": "Kennwort", "Common.Views.OpenDialog.txtTitle": "%1-Optionen wählen", "Common.Views.OpenDialog.txtTitleProtected": "Geschützte Datei", @@ -309,7 +310,7 @@ "DE.Controllers.Main.textCloseTip": "Klicken Sie, um den Tipp zu schließen", "DE.Controllers.Main.textContactUs": "Verkaufsteam kontaktieren", "DE.Controllers.Main.textLoadingDocument": "Dokument wird geladen...\t", - "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE Open Source Version", + "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE Verbindungsbeschränkung", "DE.Controllers.Main.textShape": "Form", "DE.Controllers.Main.textStrict": "Formaler Modus", "DE.Controllers.Main.textTryUndoRedo": "Undo/Redo Optionen sind für den halbformalen Zusammenbearbeitungsmodus deaktiviert.
Klicken Sie auf den Button \"Formaler Modus\", um den formalen Zusammenbearbeitungsmodus zu aktivieren, um die Datei, ohne Störungen anderer Benutzer zu bearbeiten und die Änderungen erst nachdem Sie sie gespeichert haben, zu senden. Sie können zwischen den Zusammenbearbeitungsmodi mit der Hilfe der erweiterten Einstellungen von Editor umschalten.", @@ -359,7 +360,7 @@ "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.warnLicenseExp": "Ihre Lizenz ist abgelaufen.
Bitte aktualisieren Sie Ihre Lizenz und laden Sie die Seite neu.", - "DE.Controllers.Main.warnNoLicense": "Sie nutzen die Open Source Version von ONLYOFFICE. Die Version hat gewisse Einschränkungen für gleichzeitige Verbindungen zu Dokumentenserver (20 Verbindungen in einer Zeit).
Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.", + "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.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.", "DE.Controllers.Statusbar.textHasChanges": "Neue Änderungen wurden zurückverfolgt", "DE.Controllers.Statusbar.textTrackChanges": "Das Dokument wird im Modus \"Nachverfolgen von Änderungen\" geöffnet. ", @@ -1523,7 +1524,7 @@ "DE.Views.Toolbar.capBtnInsShape": "Form", "DE.Views.Toolbar.capBtnInsTable": "Tabelle", "DE.Views.Toolbar.capBtnInsTextart": "Text Art", - "DE.Views.Toolbar.capBtnInsTextbox": "Text", + "DE.Views.Toolbar.capBtnInsTextbox": "Textfeld", "DE.Views.Toolbar.capBtnMargins": "Ränder", "DE.Views.Toolbar.capBtnPageOrient": "Orientierung", "DE.Views.Toolbar.capBtnPageSize": "Größe", diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 62a9e21ad..71a60fb10 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -349,7 +349,7 @@ "DE.Controllers.Main.textCloseTip": "Click to close the tip", "DE.Controllers.Main.textContactUs": "Contact sales", "DE.Controllers.Main.textLoadingDocument": "Loading document", - "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version", + "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE connection limitation", "DE.Controllers.Main.textShape": "Shape", "DE.Controllers.Main.textStrict": "Strict mode", "DE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.
Click the 'Strict mode' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.", @@ -410,7 +410,7 @@ "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.warnLicenseExp": "Your license has expired.
Please update your license and refresh the page.", - "DE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).
If you need more please consider purchasing a commercial license.", + "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.warnProcessRightsChange": "You have been denied the right to edit the file.", "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled", @@ -1203,6 +1203,7 @@ "DE.Views.LeftMenu.tipSupport": "Feedback & Support", "DE.Views.LeftMenu.tipTitles": "Titles", "DE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE", + "DE.Views.LeftMenu.txtTrial": "TRIAL MODE", "DE.Views.MailMergeEmailDlg.cancelButtonText": "Cancel", "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF", "DE.Views.MailMergeEmailDlg.okButtonText": "Send", @@ -1592,7 +1593,7 @@ "DE.Views.Toolbar.capBtnInsShape": "Shape", "DE.Views.Toolbar.capBtnInsTable": "Table", "DE.Views.Toolbar.capBtnInsTextart": "Text Art", - "DE.Views.Toolbar.capBtnInsTextbox": "Text", + "DE.Views.Toolbar.capBtnInsTextbox": "Text Box", "DE.Views.Toolbar.capBtnMargins": "Margins", "DE.Views.Toolbar.capBtnPageOrient": "Orientation", "DE.Views.Toolbar.capBtnPageSize": "Size", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index ecccd31f8..52b20e7eb 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -310,7 +310,7 @@ "DE.Controllers.Main.textCloseTip": "Щелкните, чтобы закрыть эту подсказку", "DE.Controllers.Main.textContactUs": "Связаться с отделом продаж", "DE.Controllers.Main.textLoadingDocument": "Загрузка документа", - "DE.Controllers.Main.textNoLicenseTitle": "Open source версия ONLYOFFICE", + "DE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений ONLYOFFICE", "DE.Controllers.Main.textShape": "Фигура", "DE.Controllers.Main.textStrict": "Строгий режим", "DE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.
Нажмите на кнопку 'Строгий режим' для переключения в Строгий режим совместного редактирования, чтобы редактировать файл без вмешательства других пользователей и отправлять изменения только после того, как вы их сохраните. Переключаться между режимами совместного редактирования можно с помощью Дополнительных параметров редактора.", @@ -362,7 +362,7 @@ "DE.Controllers.Main.warnBrowserIE9": "В IE9 приложение имеет низкую производительность. Используйте IE10 или более позднюю версию.", "DE.Controllers.Main.warnBrowserZoom": "Текущее значение масштаба страницы в браузере поддерживается не полностью. Вернитесь к масштабу по умолчанию, нажав Ctrl+0.", "DE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.
Обновите лицензию, а затем обновите страницу.", - "DE.Controllers.Main.warnNoLicense": "Вы используете open source версию ONLYOFFICE. Эта версия имеет ограничения по количеству одновременных подключений к серверу документов (20 подключений одновременно).
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", + "DE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.", "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", "DE.Controllers.Statusbar.textHasChanges": "Отслежены новые изменения", "DE.Controllers.Statusbar.textTrackChanges": "Документ открыт при включенном режиме отслеживания изменений", @@ -996,6 +996,7 @@ "DE.Views.FileMenuPanels.Settings.strFontRender": "Хинтинг шрифтов", "DE.Views.FileMenuPanels.Settings.strForcesave": "Всегда сохранять на сервере (в противном случае сохранять на сервере при закрытии документа)", "DE.Views.FileMenuPanels.Settings.strInputMode": "Включить иероглифы", + "DE.Views.FileMenuPanels.Settings.strInputSogou": "Включить метод ввода Sogou Pinyin", "DE.Views.FileMenuPanels.Settings.strLiveComment": "Включить отображение комментариев в тексте", "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Включить отображение решенных комментариев", "DE.Views.FileMenuPanels.Settings.strShowChanges": "Отображать изменения при совместной работе", @@ -1146,6 +1147,7 @@ "DE.Views.LeftMenu.tipSupport": "Обратная связь и поддержка", "DE.Views.LeftMenu.tipTitles": "Заголовки", "DE.Views.LeftMenu.txtDeveloper": "РЕЖИМ РАЗРАБОТЧИКА", + "DE.Views.LeftMenu.txtTrial": "ПРОБНЫЙ РЕЖИМ", "DE.Views.MailMergeEmailDlg.cancelButtonText": "Отмена", "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF", "DE.Views.MailMergeEmailDlg.okButtonText": "Отправить", @@ -1526,7 +1528,7 @@ "DE.Views.Toolbar.capBtnInsShape": "Фигура", "DE.Views.Toolbar.capBtnInsTable": "Таблица", "DE.Views.Toolbar.capBtnInsTextart": "Text Art", - "DE.Views.Toolbar.capBtnInsTextbox": "Текст", + "DE.Views.Toolbar.capBtnInsTextbox": "Надпись", "DE.Views.Toolbar.capBtnMargins": "Поля", "DE.Views.Toolbar.capBtnPageOrient": "Ориентация", "DE.Views.Toolbar.capBtnPageSize": "Размер", diff --git a/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertImages.htm b/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertImages.htm index 4161dc0db..6c7c409c3 100644 --- a/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertImages.htm +++ b/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertImages.htm @@ -33,7 +33,7 @@

Adjust image settings

Image Settings tabSome of the image settings can be altered using the Image settings tab of the right sidebar. To activate it click the image and choose the Image settings Image settings icon icon on the right. Here you can change the following properties:

diff --git a/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertTextObjects.htm b/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertTextObjects.htm index ea3794a2c..427c391c5 100644 --- a/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertTextObjects.htm +++ b/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertTextObjects.htm @@ -17,7 +17,7 @@
  • switch to the Insert tab of the top toolbar,
  • select the necessary text object type: