From 09064a26e3fd4de54817ad69905335aa2f710e7d Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 8 Apr 2016 16:59:39 +0300
Subject: [PATCH] =?UTF-8?q?[SSE]=20=D0=9E=D0=B1=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D0=B4=D0=B8=D0=B0=D0=BF=D0=B0=D0=B7=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=BD=D0=BE=D0=B9=20=D1=82=D0=B0=D0=B1=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=86=D1=8B.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spreadsheeteditor/main/app/view/TableOptionsDialog.js | 8 +++++++-
 apps/spreadsheeteditor/main/locale/en.json                | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js b/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js
index a2c56790d..837ebca13 100644
--- a/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js
@@ -163,6 +163,10 @@ define([
             else {
                 if (isvalid == Asc.c_oAscError.ID.AutoFilterDataRangeError) {
                     Common.UI.warning({msg: this.errorAutoFilterDataRange});
+                } else if (isvalid == Asc.c_oAscError.ID.FTChangeTableRangeError) {
+                    Common.UI.warning({msg: this.errorFTChangeTableRangeError});
+                } if (isvalid == Asc.c_oAscError.ID.FTRangeIncludedOtherTables) {
+                    Common.UI.warning({msg: this.errorFTRangeIncludedOtherTables});
                 }
             }
             return false;
@@ -212,6 +216,8 @@ define([
         textCancel  : 'Cancel',
         txtEmpty    : 'This field is required',
         txtInvalidRange: 'ERROR! Invalid cells range',
-        errorAutoFilterDataRange: 'The operation could not be done for the selected range of cells.<br>Select a uniform data range inside or outside the table and try again.'
+        errorAutoFilterDataRange: 'The operation could not be done for the selected range of cells.<br>Select a uniform data range inside or outside the table and try again.',
+        errorFTChangeTableRangeError: 'Operation could not be completed for the selected cell range.<br>Select a range so that the first table row was on the same row<br>and the resulting table overlapped the current one.',
+        errorFTRangeIncludedOtherTables: 'Operation could not be completed for the selected cell range.<br>Select a range which does not include other tables.'
     }, SSE.Views.TableOptionsDialog || {}))
 });
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index af8c93ec8..d0488ed89 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -825,6 +825,8 @@
   "SSE.Views.TableOptionsDialog.txtFormat": "Create table",
   "SSE.Views.TableOptionsDialog.txtInvalidRange": "ERROR! Invalid cells range",
   "SSE.Views.TableOptionsDialog.txtTitle": "Title",
+  "SSE.Views.TableOptionsDialog.errorFTChangeTableRangeError": "Operation could not be completed for the selected cell range.<br>Select a range so that the first table row was on the same row<br>and the resulting table overlapped the current one.",
+  "SSE.Views.TableOptionsDialog.errorFTRangeIncludedOtherTables": "Operation could not be completed for the selected cell range.<br>Select a range which does not include other tables.",
   "SSE.Views.TextArtSettings.strBackground": "Background color",
   "SSE.Views.TextArtSettings.strColor": "Color",
   "SSE.Views.TextArtSettings.strFill": "Fill",