Merge branch 'release/v6.2.0' into develop

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

@@ -310,7 +310,18 @@ define([
                     Common.NotificationCenter.trigger('protect:signature', 'visible', !!parseInt(item.cmpEl.attr('data-value')), guid);// can edit settings for requested signature
                     break;
                 case 3:
-                    this.api.asc_RemoveSignature(guid);
+                    var me = this;
+                    Common.UI.warning({
+                        title: this.notcriticalErrorTitle,
+                        msg: this.txtRemoveWarning,
+                        buttons: ['ok', 'cancel'],
+                        primary: 'ok',
+                        callback: function(btn) {
+                            if (btn == 'ok') {
+                                me.api.asc_RemoveSignature(guid);
+                            }
+                        }
+                    });
                     break;
             }
         },
@@ -415,7 +426,8 @@ define([
         notcriticalErrorTitle: 'Warning',
         txtEditWarning: 'Editing will remove the signatures from the document.<br>Are you sure you want to continue?',
         strDelete: 'Remove Signature',
-        strSigner: 'Signer'
+        strSigner: 'Signer',
+        txtRemoveWarning: 'Are you sure you want to remove this signature?<br>This action cannot be undone.'
 
     }, DE.Views.SignatureSettings || {}));
 });

apps/documenteditor/main/locale/en.json

@@ -2271,6 +2271,7 @@
   "DE.Views.SignatureSettings.strValid": "Valid signatures",
   "DE.Views.SignatureSettings.txtContinueEditing": "Edit anyway",
   "DE.Views.SignatureSettings.txtEditWarning": "Editing will remove signatures from the document.<br>Continue?",
+  "DE.Views.SignatureSettings.txtRemoveWarning": "Are you sure you want to remove this signature?<br>This action cannot be undone.",
   "DE.Views.SignatureSettings.txtRequestedSignatures": "This document needs to be signed.",
   "DE.Views.SignatureSettings.txtSigned": "Valid signatures have been added to the document. The document is protected from editing.",
   "DE.Views.SignatureSettings.txtSignedInvalid": "Some of the digital signatures in the document are invalid or could not be verified. The document is protected from editing.",

apps/documenteditor/main/locale/ru.json

@@ -2271,6 +2271,7 @@
   "DE.Views.SignatureSettings.strValid": "Действительные подписи",
   "DE.Views.SignatureSettings.txtContinueEditing": "Все равно редактировать",
   "DE.Views.SignatureSettings.txtEditWarning": "При редактировании из документа будут удалены подписи.<br>Продолжить?",
+  "DE.Views.SignatureSettings.txtRemoveWarning": "Вы действительно хотите удалить эту подпись?<br> Это действие нельзя отменить.",
   "DE.Views.SignatureSettings.txtRequestedSignatures": "Этот документ требуется подписать.",
   "DE.Views.SignatureSettings.txtSigned": "В документ добавлены действительные подписи. Документ защищен от редактирования.",
   "DE.Views.SignatureSettings.txtSignedInvalid": "Некоторые из цифровых подписей в документе недействительны или их нельзя проверить. Документ защищен от редактирования.",

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

@@ -266,7 +266,18 @@ define([
                     this.api.asc_ViewCertificate(item.cmpEl.attr('data-value'));
                     break;
                 case 3:
-                    this.api.asc_RemoveSignature(guid);
+                    var me = this;
+                    Common.UI.warning({
+                        title: this.notcriticalErrorTitle,
+                        msg: this.txtRemoveWarning,
+                        buttons: ['ok', 'cancel'],
+                        primary: 'ok',
+                        callback: function(btn) {
+                            if (btn == 'ok') {
+                                me.api.asc_RemoveSignature(guid);
+                            }
+                        }
+                    });
                     break;
             }
         },
@@ -363,7 +374,8 @@ define([
         txtContinueEditing: 'Edit anyway',
         notcriticalErrorTitle: 'Warning',
         txtEditWarning: 'Editing will remove the signatures from the presentation.<br>Are you sure you want to continue?',
-        strDelete: 'Remove Signature'
+        strDelete: 'Remove Signature',
+        txtRemoveWarning: 'Are you sure you want to remove this signature?<br>This action cannot be undone.'
 
     }, PE.Views.SignatureSettings || {}));
 });

apps/presentationeditor/main/locale/en.json

@@ -1601,6 +1601,7 @@
   "PE.Views.SignatureSettings.strValid": "Valid signatures",
   "PE.Views.SignatureSettings.txtContinueEditing": "Edit anyway",
   "PE.Views.SignatureSettings.txtEditWarning": "Editing will remove signatures from the presentation.<br>Continue?",
+  "PE.Views.SignatureSettings.txtRemoveWarning": "Are you sure you want to remove this signature?<br>This action cannot be undone.",
   "PE.Views.SignatureSettings.txtSigned": "Valid signatures has been added to the presentation. The presentation is protected from editing.",
   "PE.Views.SignatureSettings.txtSignedInvalid": "Some of the digital signatures in presentation are invalid or could not be verified. The presentation is protected from editing.",
   "PE.Views.SlideSettings.strBackground": "Background color",

apps/presentationeditor/main/locale/ru.json

@@ -1601,6 +1601,7 @@
   "PE.Views.SignatureSettings.strValid": "Действительные подписи",
   "PE.Views.SignatureSettings.txtContinueEditing": "Все равно редактировать",
   "PE.Views.SignatureSettings.txtEditWarning": "При редактировании из презентации будут удалены подписи.<br>Продолжить?",
+  "PE.Views.SignatureSettings.txtRemoveWarning": "Вы действительно хотите удалить эту подпись?<br> Это действие нельзя отменить.",
   "PE.Views.SignatureSettings.txtSigned": "В презентацию добавлены действительные подписи. Презентация защищена от редактирования.",
   "PE.Views.SignatureSettings.txtSignedInvalid": "Некоторые из цифровых подписей в презентации недействительны или их нельзя проверить. Презентация защищена от редактирования.",
   "PE.Views.SlideSettings.strBackground": "Цвет фона",

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

@@ -310,7 +310,18 @@ define([
                     Common.NotificationCenter.trigger('protect:signature', 'visible', !!parseInt(item.cmpEl.attr('data-value')), guid);// can edit settings for requested signature
                     break;
                 case 3:
-                    this.api.asc_RemoveSignature(guid);
+                    var me = this;
+                    Common.UI.warning({
+                        title: this.notcriticalErrorTitle,
+                        msg: this.txtRemoveWarning,
+                        buttons: ['ok', 'cancel'],
+                        primary: 'ok',
+                        callback: function(btn) {
+                            if (btn == 'ok') {
+                                me.api.asc_RemoveSignature(guid);
+                            }
+                        }
+                    });
                     break;
             }
         },
@@ -416,7 +427,8 @@ define([
         notcriticalErrorTitle: 'Warning',
         txtEditWarning: 'Editing will remove the signatures from the workbook.<br>Are you sure you want to continue?',
         strDelete: 'Remove Signature',
-        strSigner: 'Signer'
+        strSigner: 'Signer',
+        txtRemoveWarning: 'Are you sure you want to remove this signature?<br>This action cannot be undone.'
 
     }, SSE.Views.SignatureSettings || {}));
 });

apps/spreadsheeteditor/main/locale/en.json

@@ -2725,6 +2725,7 @@
   "SSE.Views.SignatureSettings.strValid": "Valid signatures",
   "SSE.Views.SignatureSettings.txtContinueEditing": "Edit anyway",
   "SSE.Views.SignatureSettings.txtEditWarning": "Editing will remove signatures from the spreadsheet.<br>Continue?",
+  "SSE.Views.SignatureSettings.txtRemoveWarning": "Are you sure you want to remove this signature?<br>This action cannot be undone.",
   "SSE.Views.SignatureSettings.txtRequestedSignatures": "This spreadsheet needs to be signed.",
   "SSE.Views.SignatureSettings.txtSigned": "Valid signatures has been added to the spreadsheet. The spreadsheet is protected from editing.",
   "SSE.Views.SignatureSettings.txtSignedInvalid": "Some of the digital signatures in spreadsheet are invalid or could not be verified. The spreadsheet is protected from editing.",

apps/spreadsheeteditor/main/locale/ru.json

@@ -2517,6 +2517,7 @@
   "SSE.Views.SignatureSettings.strValid": "Действительные подписи",
   "SSE.Views.SignatureSettings.txtContinueEditing": "Все равно редактировать",
   "SSE.Views.SignatureSettings.txtEditWarning": "При редактировании из электронной таблицы будут удалены подписи.<br>Продолжить?",
+  "SSE.Views.SignatureSettings.txtRemoveWarning": "Вы действительно хотите удалить эту подпись?<br> Это действие нельзя отменить.",
   "SSE.Views.SignatureSettings.txtRequestedSignatures": "Эту таблицу требуется подписать.",
   "SSE.Views.SignatureSettings.txtSigned": "В электронную таблицу добавлены действительные подписи. Таблица защищена от редактирования.",
   "SSE.Views.SignatureSettings.txtSignedInvalid": "Некоторые из цифровых подписей в электронной таблице недействительны или их нельзя проверить. Таблица защищена от редактирования.",