diff --git a/apps/spreadsheeteditor/main/app/view/FormulaTab.js b/apps/spreadsheeteditor/main/app/view/FormulaTab.js index efa80f017..7b89d3870 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaTab.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaTab.js @@ -223,7 +223,7 @@ define([ this.btnCalculate = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-cell-group', - caption: this.txtCalculate, + caption: this.txtCalculation, split: true, menu: true, disabled: true, @@ -247,11 +247,11 @@ define([ me.btnCalculate.updateHint([me.tipCalculateTheEntireWorkbook + Common.Utils.String.platformKey('F9'), me.tipCalculate]); var _menu = new Common.UI.Menu({ items: [ - {caption: me.textEntireWorkbook, value: Asc.c_oAscCalculateType.All}, - {caption: me.textCurrentSheet, value: Asc.c_oAscCalculateType.ActiveSheet}, + {caption: me.textCalculateWorkbook, value: Asc.c_oAscCalculateType.All}, + {caption: me.textCalculateCurrentSheet, value: Asc.c_oAscCalculateType.ActiveSheet}, //{caption: '--'}, - //{caption: me.textAutomatic, value: '', toggleGroup: 'menuCoauthMode', checkable: true, checked: true}, - //{caption: me.textManual, value: '', toggleGroup: 'menuCoauthMode', checkable: true, checked: false} + //{caption: me.textAutomatic, value: '', toggleGroup: 'menuCalcMode', checkable: true, checked: true}, + //{caption: me.textManual, value: '', toggleGroup: 'menuCalcMode', checkable: true, checked: false} ] }); me.btnCalculate.setMenu(_menu); @@ -510,10 +510,10 @@ define([ txtFormula: 'Function', txtFormulaTip: 'Insert function', txtMore: 'More functions', - txtCalculate: 'Calculate', + txtCalculation: 'Calculation', tipCalculate: 'Calculate', - textEntireWorkbook: 'Entire Workbook', - textCurrentSheet: 'Current Sheet', + textCalculateWorkbook: 'Calculate workbook', + textCalculateCurrentSheet: 'Calculate current sheet', textAutomatic: 'Automatic', textManual: 'Manual', tipCalculateTheEntireWorkbook: 'Calculate the entire workbook' diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 701afdd43..894f3aa36 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -1633,10 +1633,10 @@ "SSE.Views.FormulaTab.txtFormulaTip": "Insert function", "SSE.Views.FormulaTab.txtMore": "More functions", "SSE.Views.FormulaTab.txtRecent": "Recently used", - "SSE.Views.FormulaTab.txtCalculate": "Calculate", + "SSE.Views.FormulaTab.txtCalculation": "Calculation", "SSE.Views.FormulaTab.tipCalculate": "Calculate", - "SSE.Views.FormulaTab.textEntireWorkbook": "Entire Workbook", - "SSE.Views.FormulaTab.textCurrentSheet": "Current Sheet", + "SSE.Views.FormulaTab.textCalculateWorkbook": "Calculate workbook", + "SSE.Views.FormulaTab.textCalculateCurrentSheet": "Calculate current sheet", "SSE.Views.FormulaTab.textAutomatic": "Automatic", "SSE.Views.FormulaTab.textManual": "Manual", "SSE.Views.FormulaTab.tipCalculateTheEntireWorkbook": "Calculate the entire workbook",