Update groups for table in documenteditor

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

@@ -780,8 +780,7 @@ define([
                 {id: 'menu-table-group-plain',              caption: self.txtGroupTable_Plain,              templates: []},
                 {id: 'menu-table-group-grid',               caption: self.txtGroupTable_Grid,               templates: []},
                 {id: 'menu-table-group-list',               caption: self.txtGroupTable_List,               templates: []},
-                {id: 'menu-table-group-lined',      caption: self.txtGroupTable_Lined,      templates: []},
+                {id: 'menu-table-group-bordered-and-lined', caption: self.txtGroupTable_BorderedAndLined,   templates: []},
-                {id: 'menu-table-group-bordered',   caption: self.txtGroupTable_Bordered,   templates: []},
                 {id: 'menu-table-group-no-name',            caption: '&nbsp',                               templates: []},
             ];
 
@@ -798,6 +797,9 @@ define([
                     if(new RegExp('Table Grid|Normal', 'i').test(tip)){
                         groupItem = 'menu-table-group-plain';
                     }
+                    else if(new RegExp('Lined|Bordered', 'i').test(tip)) {
+                        groupItem = 'menu-table-group-bordered-and-lined';
+                    }
                     else{
                         if(arr[0]){
                             groupItem = 'menu-table-group-' + arr[0].toLowerCase();
@@ -807,8 +809,8 @@ define([
                         }
                     }
 
-                    ['Table Grid', 'Plain Table', 'Grid Table', 'List Table', 'Light', 'Dark', 'Colorful', 'Accent'].forEach(function(item){
+                    ['Table Grid', 'Plain Table', 'Grid Table', 'List Table', 'Light', 'Dark', 'Colorful', 'Accent', 'Bordered & Lined', 'Bordered', 'Lined'].forEach(function(item){
-                        var str = 'txtTable_' + item.replace(' ', '');
+                        var str = 'txtTable_' + item.replace('&', 'And').replace(new RegExp(' ', 'g'), '');
                         if (self[str])
                             tip = tip.replace(item, self[str]);
                     });
@@ -1033,12 +1035,14 @@ define([
         txtTable_Dark: 'Dark',
         txtTable_Colorful: 'Colorful',
         txtTable_Accent: 'Accent',
+        txtTable_Lined: 'Lined',
+        txtTable_Bordered: 'Bordered',
+        txtTable_BorderedAndLined: 'Bordered & Lined',
         txtGroupTable_Custom: 'Custom',
         txtGroupTable_Plain: 'Plain Tables',
         txtGroupTable_Grid: 'Grid Tables',
         txtGroupTable_List: 'List Tables',
-        txtGroupTable_Lined: 'Lined Tables',
+        txtGroupTable_BorderedAndLined: 'Bordered & Lined Tables',
-        txtGroupTable_Bordered: 'Bordered Tables',
         textConvert: 'Convert Table to Text',
 
     }, DE.Views.TableSettings || {}));

apps/documenteditor/main/locale/en.json

@@ -2555,12 +2555,20 @@
   "DE.Views.TableSettings.txtNoBorders": "No borders",
   "DE.Views.TableSettings.txtTable_Accent": "Accent",
   "DE.Views.TableSettings.txtTable_Colorful": "Colorful",
+  "DE.Views.TableSettings.txtTable_Lined": "Lined",
+  "DE.Views.TableSettings.txtTable_Bordered": "Bordered",
+  "DE.Views.TableSettings.txtTable_BorderedAndLined": "Bordered & Lined",
   "DE.Views.TableSettings.txtTable_Dark": "Dark",
   "DE.Views.TableSettings.txtTable_GridTable": "Grid Table",
   "DE.Views.TableSettings.txtTable_Light": "Light",
   "DE.Views.TableSettings.txtTable_ListTable": "List Table",
   "DE.Views.TableSettings.txtTable_PlainTable": "Plain Table",
   "DE.Views.TableSettings.txtTable_TableGrid": "Table Grid",
+  "DE.Views.TableSettings.txtGroupTable_Custom": "Custom", 
+  "DE.Views.TableSettings.txtGroupTable_Plain": "Plain Tables", 
+  "DE.Views.TableSettings.txtGroupTable_Grid": "Grid Tables", 
+  "DE.Views.TableSettings.txtGroupTable_List": "List Tables", 
+  "DE.Views.TableSettings.txtGroupTable_BorderedAndLined": "Bordered & Lined Tables", 
   "DE.Views.TableSettingsAdvanced.textAlign": "Alignment",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Alignment",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Spacing between cells",

apps/documenteditor/main/locale/ru.json

@@ -2532,6 +2532,14 @@
   "DE.Views.TableSettings.txtTable_ListTable": "Список-таблица",
   "DE.Views.TableSettings.txtTable_PlainTable": "Таблица простая",
   "DE.Views.TableSettings.txtTable_TableGrid": "Сетка таблицы",
+  "DE.Views.TableSettings.txtTable_Lined": "C подкладкой",
+  "DE.Views.TableSettings.txtTable_Bordered": "C границей",
+  "DE.Views.TableSettings.txtTable_BorderedAndLined": "C границей и подкладкой",
+  "DE.Views.TableSettings.txtGroupTable_Custom": "Пользовательский", 
+  "DE.Views.TableSettings.txtGroupTable_Plain": "Таблицы простые", 
+  "DE.Views.TableSettings.txtGroupTable_Grid": "Таблицы сеткой", 
+  "DE.Views.TableSettings.txtGroupTable_List": "Таблицы списком", 
+  "DE.Views.TableSettings.txtGroupTable_BorderedAndLined": "Таблицы с границей и подкладкой", 
   "DE.Views.TableSettingsAdvanced.textAlign": "Выравнивание",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Выравнивание",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Интервалы между ячейками",