diff --git a/apps/common/main/lib/controller/Chat.js b/apps/common/main/lib/controller/Chat.js
index 2132767a28..5731e47210 100644
--- a/apps/common/main/lib/controller/Chat.js
+++ b/apps/common/main/lib/controller/Chat.js
@@ -122,17 +122,7 @@ define([
this._isCoAuthoringStopped = true;
this.api.asc_coAuthoringDisconnect();
Common.NotificationCenter.trigger('api:disconnect');
- /*
- setTimeout(_.bind(function(){
- Common.UI.alert({
- closable: false,
- title: this.notcriticalErrorTitle,
- msg: this.textUserLimit,
- iconCls: 'warn',
- buttons: ['ok']
- });
- }, this), 100);
- */
+
return;
}
}
@@ -225,7 +215,6 @@ define([
}
},
- notcriticalErrorTitle: 'Warning',
- textUserLimit: 'You are using ONLYOFFICE Editors free version.
Only two users can co-edit the document simultaneously.
Want more? Consider buying ONLYOFFICE Editors Pro version.
Read more'
+ notcriticalErrorTitle: 'Warning'
}, Common.Controllers.Chat || {}));
});
\ No newline at end of file
diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js
index 999c40b604..09bd46d622 100644
--- a/apps/documenteditor/embed/js/ApplicationController.js
+++ b/apps/documenteditor/embed/js/ApplicationController.js
@@ -44,7 +44,7 @@ var ApplicationController = new(function(){
// Initialize analytics
// -------------------------
-// Common.Analytics.initialize('UA-12442749-13', 'Embedded ONLYOFFICE Document');
+// Common.Analytics.initialize('UA-12442749-13', 'Embedded Document Editor');
// Check browser
diff --git a/apps/documenteditor/main/app/view/FootnoteTip.js b/apps/documenteditor/main/app/view/FootnoteTip.js
index 9996fff39d..8c1956ff26 100644
--- a/apps/documenteditor/main/app/view/FootnoteTip.js
+++ b/apps/documenteditor/main/app/view/FootnoteTip.js
@@ -2,24 +2,32 @@
*
* (c) Copyright Ascensio System SIA 2010-2019
*
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
*
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
*
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
+ * The interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
*
- * Pursuant to Section 7 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
- * relevant author attributions when distributing the software. If the display of the logo in its graphic
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
- * in every copy of the program you distribute.
- * Pursuant to Section 7 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 7d393094fc..3d0c22fcc6 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -1,7 +1,7 @@
{
"Common.Controllers.Chat.notcriticalErrorTitle": "Warning",
"Common.Controllers.Chat.textEnterMessage": "Enter your message here",
- "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
Only two users can co-edit the document simultaneously.
Want more? Consider buying ONLYOFFICE Enterprise Edition.
Read more",
+ "del_Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
Only two users can co-edit the document simultaneously.
Want more? Consider buying ONLYOFFICE Enterprise Edition.
Read more",
"Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymous",
"Common.Controllers.ExternalDiagramEditor.textClose": "Close",
"Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.",
diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js
index e8625b6f51..17fc0dcea3 100644
--- a/apps/presentationeditor/embed/js/ApplicationController.js
+++ b/apps/presentationeditor/embed/js/ApplicationController.js
@@ -45,7 +45,7 @@ var ApplicationController = new(function(){
// Initialize analytics
// -------------------------
-// Common.Analytics.initialize('UA-12442749-13', 'Embedded ONLYOFFICE Presentation');
+// Common.Analytics.initialize('UA-12442749-13', 'Embedded Presentation Editor');
// Check browser
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 6894b22142..9cec69f441 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -1,7 +1,7 @@
{
"Common.Controllers.Chat.notcriticalErrorTitle": "Warning",
"Common.Controllers.Chat.textEnterMessage": "Enter your message here",
- "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
Only two users can co-edit the document simultaneously.
Want more? Consider buying ONLYOFFICE Enterprise Edition.
Read more",
+ "del_Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
Only two users can co-edit the document simultaneously.
Want more? Consider buying ONLYOFFICE Enterprise Edition.
Read more",
"Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymous",
"Common.Controllers.ExternalDiagramEditor.textClose": "Close",
"Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.",
diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js
index 0aaebd4391..edb9d1f5e5 100644
--- a/apps/spreadsheeteditor/embed/js/ApplicationController.js
+++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js
@@ -47,7 +47,7 @@ var ApplicationController = new(function(){
// Initialize analytics
// -------------------------
-// Common.Analytics.initialize('UA-12442749-13', 'Embedded ONLYOFFICE Spreadsheet');
+// Common.Analytics.initialize('UA-12442749-13', 'Embedded Spreadsheet Editor');
// Check browser
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 984b927ae0..3339833a57 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -2,7 +2,7 @@
"cancelButtonText": "Cancel",
"Common.Controllers.Chat.notcriticalErrorTitle": "Warning",
"Common.Controllers.Chat.textEnterMessage": "Enter your message here",
- "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
Only two users can co-edit the document simultaneously.
Want more? Consider buying ONLYOFFICE Enterprise Edition.
Read more",
+ "del_Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
Only two users can co-edit the document simultaneously.
Want more? Consider buying ONLYOFFICE Enterprise Edition.
Read more",
"Common.UI.ComboBorderSize.txtNoBorders": "No borders",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
"Common.UI.ComboDataView.emptyComboText": "No styles",