From 2ed9b0c93d22d17f3d24111939b812e9d234dfd6 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Thu, 5 May 2016 12:15:52 +0300
Subject: [PATCH] =?UTF-8?q?[DE]=20TableSettingsAdvanced:=20=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B3=20=D0=BF=D1=80=D0=B8=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=BC=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B8?=
 =?UTF-8?q?=20position->align=20=D0=B8=20wrapping->inline.=20=D0=98=D0=B7?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B5=D1=80?=
 =?UTF-8?q?=D1=81=D1=82=D0=BA=D0=B8=20=D0=B4=D0=BB=D1=8F=20Text=20Wrapping?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/app/template/TableSettingsAdvanced.template     | 3 ++-
 .../main/app/view/TableSettingsAdvanced.js               | 9 +++++----
 apps/documenteditor/main/locale/en.json                  | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/documenteditor/main/app/template/TableSettingsAdvanced.template b/apps/documenteditor/main/app/template/TableSettingsAdvanced.template
index f4960a6973..9888f0f5f6 100644
--- a/apps/documenteditor/main/app/template/TableSettingsAdvanced.template
+++ b/apps/documenteditor/main/app/template/TableSettingsAdvanced.template
@@ -146,10 +146,11 @@
 </div>
 <div id="id-adv-table-wrap" class="settings-panel">
     <div class="inner-content padding-large">
+        <label class="header padding-small" style="display: block;"><%= scope.textWrappingStyle %></label>
         <div id="tableadv-button-wrap-none" style="display: inline-block; margin-right:5px;"></div>
         <div id="tableadv-button-wrap-parallel" style="display: inline-block; margin-right:5px;"></div>
     </div>
-    <div class="separator horizontal padding-large"></div>
+    <div class="padding-small"></div>
     <div class="inner-content">
         <div id="tableadv-panel-align" style="width: 100%;">
             <label class="header padding-small"><%= scope.textAlign %></label>
diff --git a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js
index d4bc9c0ec3..3b2bf055a4 100644
--- a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js
+++ b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js
@@ -1473,11 +1473,11 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
             if (this._changedProps && btn.pressed) {
                 if (this._state.alignChanged) {
                     if (this._state.HAlignType===Asc.c_oAscXAlign.Left)
-                        this.btnAlignLeft.toggle(true, true);
+                        this.btnAlignLeft.toggle(true);
                     else if (this._state.HAlignType==Asc.c_oAscXAlign.Center)
-                        this.btnAlignCenter.toggle(true, true);
+                        this.btnAlignCenter.toggle(true);
                     else if (this._state.HAlignType==Asc.c_oAscXAlign.Right)
-                        this.btnAlignRight.toggle(true, true);
+                        this.btnAlignRight.toggle(true);
                     this._state.alignChanged = false;
                 }
 
@@ -2176,7 +2176,8 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
         textWrapText: 'Wrap text',
         textTable: 'Table',
         textTableSize: 'Table Size',
-        textTablePosition: 'Table Position'
+        textTablePosition: 'Table Position',
+        textWrappingStyle: 'Wrapping Style'
 
     }, DE.Views.TableSettingsAdvanced || {}));
 });
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index f06ab71020..466ce7943d 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -1355,6 +1355,7 @@
   "DE.Views.TableSettingsAdvanced.textWrap": "Text Wrapping",
   "DE.Views.TableSettingsAdvanced.textWrapNoneTooltip": "Inline table",
   "DE.Views.TableSettingsAdvanced.textWrapParallelTooltip": "Flow table",
+  "DE.Views.TableSettingsAdvanced.textWrappingStyle": "Wrapping Style",
   "DE.Views.TableSettingsAdvanced.tipAll": "Set Outer Border and All Inner Lines",
   "DE.Views.TableSettingsAdvanced.tipCellAll": "Set Borders for Inner Cells Only",
   "DE.Views.TableSettingsAdvanced.tipCellInner": "Set Vertical and Horizontal Lines for Inner Cells Only",