From eae0d9ade9d21e99750d11c96944924231c847ea Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 6 Jun 2017 11:29:30 +0300 Subject: [PATCH] Fix Bug 35065. --- .../main/app/view/DocumentHolder.js | 15 ++++++--------- apps/documenteditor/main/locale/en.json | 6 +++--- .../main/app/view/DocumentHolder.js | 15 ++++++--------- apps/presentationeditor/main/locale/en.json | 6 +++--- .../main/app/view/DocumentHolder.js | 2 +- apps/spreadsheeteditor/main/app/view/Toolbar.js | 2 +- apps/spreadsheeteditor/main/locale/en.json | 3 ++- 7 files changed, 22 insertions(+), 27 deletions(-) diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 8bb33735f..0811fcd0e 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -2339,21 +2339,21 @@ define([ menuAlign: 'tl-tr', items : [ me.menuTableCellTop = new Common.UI.MenuItem({ - caption : me.topCellText, + caption : me.textShapeAlignTop, toggleGroup : 'popuptablecellalign', checkable : true, checked : false, valign : Asc.c_oAscVertAlignJc.Top }).on('click', _.bind(tableCellsVAlign, me)), me.menuTableCellCenter = new Common.UI.MenuItem({ - caption : me.centerCellText, + caption : me.textShapeAlignMiddle, toggleGroup : 'popuptablecellalign', checkable : true, checked : false, valign : Asc.c_oAscVertAlignJc.Center }).on('click', _.bind(tableCellsVAlign, me)), me.menuTableCellBottom = new Common.UI.MenuItem({ - caption : me.bottomCellText, + caption : me.textShapeAlignBottom, toggleGroup : 'popuptablecellalign', checkable : true, checked : false, @@ -2855,21 +2855,21 @@ define([ menuAlign: 'tl-tr', items : [ me.menuParagraphTop = new Common.UI.MenuItem({ - caption : me.topCellText, + caption : me.textShapeAlignTop, checkable : true, checked : false, toggleGroup : 'popupparagraphvalign', valign : Asc.c_oAscVAlign.Top }).on('click', _.bind(paragraphVAlign, me)), me.menuParagraphCenter = new Common.UI.MenuItem({ - caption : me.centerCellText, + caption : me.textShapeAlignMiddle, checkable : true, checked : false, toggleGroup : 'popupparagraphvalign', valign : Asc.c_oAscVAlign.Center }).on('click', _.bind(paragraphVAlign, me)), me.menuParagraphBottom = new Common.UI.MenuItem({ - caption : me.bottomCellText, + caption : me.textShapeAlignBottom, checkable : true, checked : false, toggleGroup : 'popupparagraphvalign', @@ -3349,9 +3349,6 @@ define([ /** coauthoring begin **/ addCommentText : 'Add Comment', /** coauthoring end **/ - topCellText: 'Align Top', - centerCellText: 'Align Center', - bottomCellText: 'Align Bottom', cellAlignText: 'Cell Vertical Alignment', txtInline: 'Inline', txtSquare: 'Square', diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 67b8abd9d..314b0fd3d 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -695,11 +695,11 @@ "DE.Views.DocumentHolder.advancedText": "Advanced Settings", "DE.Views.DocumentHolder.alignmentText": "Alignment", "DE.Views.DocumentHolder.belowText": "Below", - "DE.Views.DocumentHolder.bottomCellText": "Align Bottom", + "del_DE.Views.DocumentHolder.bottomCellText": "Align Bottom", "DE.Views.DocumentHolder.breakBeforeText": "Page break before", "DE.Views.DocumentHolder.cellAlignText": "Cell Vertical Alignment", "DE.Views.DocumentHolder.cellText": "Cell", - "DE.Views.DocumentHolder.centerCellText": "Align Center", + "del_DE.Views.DocumentHolder.centerCellText": "Align Center", "DE.Views.DocumentHolder.centerText": "Center", "DE.Views.DocumentHolder.chartText": "Chart Advanced Settings", "DE.Views.DocumentHolder.columnText": "Column", @@ -773,7 +773,7 @@ "DE.Views.DocumentHolder.textShapeAlignTop": "Align Top", "DE.Views.DocumentHolder.textWrap": "Wrapping Style", "DE.Views.DocumentHolder.tipIsLocked": "This element is currently being edited by another user.", - "DE.Views.DocumentHolder.topCellText": "Align Top", + "del_DE.Views.DocumentHolder.topCellText": "Align Top", "DE.Views.DocumentHolder.txtAddBottom": "Add bottom border", "DE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar", "DE.Views.DocumentHolder.txtAddHor": "Add horizontal line", diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 020ddee7b..1bc42af9f 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -1973,19 +1973,19 @@ define([ menuAlign: 'tl-tr', items: [ me.menuTableCellTop = new Common.UI.MenuItem({ - caption : me.topCellText, + caption : me.textShapeAlignTop, checkable : true, toggleGroup : 'popuptablecellalign', value : Asc.c_oAscVertAlignJc.Top }).on('click', _.bind(onItemClick, me)), me.menuTableCellCenter = new Common.UI.MenuItem({ - caption : me.centerCellText, + caption : me.textShapeAlignMiddle, checkable : true, toggleGroup : 'popuptablecellalign', value : Asc.c_oAscVertAlignJc.Center }).on('click', _.bind(onItemClick, me)), me.menuTableCellBottom = new Common.UI.MenuItem({ - caption : me.bottomCellText, + caption : me.textShapeAlignBottom, checkable : true, toggleGroup : 'popuptablecellalign', value : Asc.c_oAscVertAlignJc.Bottom @@ -2496,19 +2496,19 @@ define([ menuAlign: 'tl-tr', items: [ me.menuParagraphTop = new Common.UI.MenuItem({ - caption : me.topCellText, + caption : me.textShapeAlignTop, checkable : true, toggleGroup : 'popupparagraphvalign', value : Asc.c_oAscVAlign.Top }).on('click', _.bind(onItemClick, me)), me.menuParagraphCenter = new Common.UI.MenuItem({ - caption : me.centerCellText, + caption : me.textShapeAlignMiddle, checkable : true, toggleGroup : 'popupparagraphvalign', value : Asc.c_oAscVAlign.Center }).on('click', _.bind(onItemClick, me)), me.menuParagraphBottom = new Common.UI.MenuItem({ - caption : me.bottomCellText, + caption : me.textShapeAlignBottom, checkable : true, toggleGroup : 'popupparagraphvalign', value : Asc.c_oAscVAlign.Bottom @@ -3143,9 +3143,6 @@ define([ txtDistribHor : 'Distribute Horizontally', txtDistribVert : 'Distribute Vertically', txtSlide : 'Slide', - topCellText : 'Align Top', - centerCellText : 'Align Center', - bottomCellText : 'Align Bottom', cellAlignText : 'Cell Vertical Alignment', advancedShapeText : 'Shape Advanced Settings', /** coauthoring begin **/ diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 39f965510..9ef2bf70a 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -625,10 +625,10 @@ "PE.Views.DocumentHolder.advancedTableText": "Table Advanced Settings", "PE.Views.DocumentHolder.alignmentText": "Alignment", "PE.Views.DocumentHolder.belowText": "Below", - "PE.Views.DocumentHolder.bottomCellText": "Align Bottom", + "del_PE.Views.DocumentHolder.bottomCellText": "Align Bottom", "PE.Views.DocumentHolder.cellAlignText": "Cell Vertical Alignment", "PE.Views.DocumentHolder.cellText": "Cell", - "PE.Views.DocumentHolder.centerCellText": "Align Center", + "del_PE.Views.DocumentHolder.centerCellText": "Align Center", "PE.Views.DocumentHolder.centerText": "Center", "PE.Views.DocumentHolder.columnText": "Column", "PE.Views.DocumentHolder.deleteColumnText": "Delete Column", @@ -683,7 +683,7 @@ "PE.Views.DocumentHolder.textShapeAlignTop": "Align Top", "PE.Views.DocumentHolder.textSlideSettings": "Slide Settings", "PE.Views.DocumentHolder.tipIsLocked": "This element is currently being edited by another user.", - "PE.Views.DocumentHolder.topCellText": "Align Top", + "del_PE.Views.DocumentHolder.topCellText": "Align Top", "PE.Views.DocumentHolder.txtAddBottom": "Add bottom border", "PE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar", "PE.Views.DocumentHolder.txtAddHor": "Add horizontal line", diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index 50f7def73..000161939 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -741,7 +741,7 @@ define([ txtUngroup: 'Ungroup', txtGroup: 'Group', topCellText: 'Align Top', - centerCellText: 'Align Center', + centerCellText: 'Align Middle', bottomCellText: 'Align Bottom', vertAlignText: 'Vertical Alignment', txtTextAdvanced: 'Text Advanced Settings', diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 3a1707a2d..dfc1e5532 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1125,7 +1125,7 @@ define([ value : 'top' }, { - caption : me.tipAlignCenter, + caption : me.tipAlignMiddle, iconCls : 'mnu-valign-middle', icls : 'btn-valign-middle', checkable : true, diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 4d2d8df16..129eaba30 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -949,7 +949,7 @@ "SSE.Views.DocumentHolder.advancedShapeText": "Shape Advanced Settings", "SSE.Views.DocumentHolder.bottomCellText": "Align Bottom", "SSE.Views.DocumentHolder.bulletsText": "Bullets and Numbering", - "SSE.Views.DocumentHolder.centerCellText": "Align Center", + "SSE.Views.DocumentHolder.centerCellText": "Align Middle", "SSE.Views.DocumentHolder.chartText": "Chart Advanced Settings", "SSE.Views.DocumentHolder.deleteColumnText": "Column", "SSE.Views.DocumentHolder.deleteRowText": "Row", @@ -1095,6 +1095,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Point", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.strResolvedComment": "Turn on display of the resolved comments", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "General", "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Page Settings", "SSE.Views.FormatSettingsDialog.textCancel": "Cancel",