diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index f3a5fab49..8f265e9c5 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -2347,21 +2347,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, @@ -2863,21 +2863,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', @@ -3357,9 +3357,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 f46a36bf2..627d70cea 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -677,11 +677,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", @@ -755,7 +755,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 e864272c1..8704cd7d8 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -1974,19 +1974,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 @@ -2497,19 +2497,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 @@ -3144,9 +3144,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 b699f144d..4bd9ac839 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -614,10 +614,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", @@ -672,7 +672,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 cf8975daf..b4ed35954 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1016,7 +1016,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 abdb07aec..c4f0cdf6e 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -942,7 +942,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", @@ -1088,6 +1088,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",