Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move chart data to common

Browse source
This commit is contained in:
Julia Radzhabova 2019-11-18 13:40:10 +03:00
parent 6ceb9a08ad
commit e47015cc18
14 changed files with 238 additions and 460 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
apps/common/main/lib/util/define.js
View file

@ -30,14 +30,15 @@
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
* *
*/ */
if (Common === undefined) { if (Common === undefined) {
var Common = {}; var Common = {};
} }
define(function(){ 'use strict'; if (Common.define === undefined) {
Common.define = {}; Common.define = {};
}
define(function(){ 'use strict';
Common.define.c_oAscMathMainType = { Common.define.c_oAscMathMainType = {
Symbol : 0x00, Symbol : 0x00,
@ -413,4 +414,86 @@ define(function(){ 'use strict';
Matrix_Flat_Round : 0x0b040000, Matrix_Flat_Round : 0x0b040000,
Matrix_Flat_Square : 0x0b040001 Matrix_Flat_Square : 0x0b040001
}; };
Common.define.chartData = _.extend( new(function() {
return {
textLine: 'Line',
textColumn: 'Column',
textBar: 'Bar',
textArea: 'Area',
textPie: 'Pie',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
textSurface: 'Surface',
textCharts: 'Charts',
textSparks: 'Sparklines',
textLineSpark: 'Line',
textColumnSpark: 'Column',
textWinLossSpark: 'Win/Loss',
getChartGroupData: function(headername) {
return [
{id: 'menu-chart-group-bar', caption: this.textColumn, headername: (headername) ? this.textCharts : undefined},
{id: 'menu-chart-group-line', caption: this.textLine},
{id: 'menu-chart-group-pie', caption: this.textPie},
{id: 'menu-chart-group-hbar', caption: this.textBar},
{id: 'menu-chart-group-area', caption: this.textArea, inline: true},
{id: 'menu-chart-group-scatter', caption: this.textPoint, inline: true},
{id: 'menu-chart-group-stock', caption: this.textStock, inline: true}
// {id: 'menu-chart-group-surface', caption: this.textSurface}
];
},
getChartData: function() {
return [
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'},
{ group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'},
{ group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'}
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'}
];
},
getSparkGroupData: function(headername) {
return [
{ id: 'menu-chart-group-sparkcolumn', inline: true, headername: (headername) ? this.textSparks : undefined },
{ id: 'menu-chart-group-sparkline', inline: true },
{ id: 'menu-chart-group-sparkwin', inline: true }
];
},
getSparkData: function() {
return [
{ group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column', tip: this.textColumnSpark},
{ group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line', tip: this.textLineSpark},
{ group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win', tip: this.textWinLossSpark}
];
}
}
})(), Common.define.chartData || {});
}); });

54
apps/documenteditor/main/app/view/ChartSettings.js
View file

@ -261,48 +261,8 @@ define([
el: $('#id-chart-menu-type'), el: $('#id-chart-menu-type'),
parentMenu: btn.menu, parentMenu: btn.menu,
restoreHeight: 421, restoreHeight: 421,
groups: new Common.UI.DataViewGroupStore([ groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()),
{ id: 'menu-chart-group-bar', caption: me.textColumn }, store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
{ id: 'menu-chart-group-line', caption: me.textLine },
{ id: 'menu-chart-group-pie', caption: me.textPie },
{ id: 'menu-chart-group-hbar', caption: me.textBar },
{ id: 'menu-chart-group-area', caption: me.textArea, inline: true },
{ id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true },
{ id: 'menu-chart-group-stock', caption: me.textStock, inline: true }
// { id: 'menu-chart-group-surface', caption: me.textSurface}
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'},
{ group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'},
{ group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'}
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
}); });
}); });
@ -538,15 +498,7 @@ define([
txtInFront: 'In front', txtInFront: 'In front',
textEditData: 'Edit Data', textEditData: 'Edit Data',
textChartType: 'Change Chart Type', textChartType: 'Change Chart Type',
textLine: 'Line', textStyle: 'Style'
textColumn: 'Column',
textBar: 'Bar',
textArea: 'Area',
textPie: 'Pie',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
textStyle: 'Style',
textSurface: 'Surface'
}, DE.Views.ChartSettings || {})); }, DE.Views.ChartSettings || {}));
}); });

53
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1674,48 +1674,8 @@ define([
parentMenu: menu, parentMenu: menu,
showLast: false, showLast: false,
restoreHeight: 421, restoreHeight: 421,
groups: new Common.UI.DataViewGroupStore([ groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData(true)),
{id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts}, store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
{id: 'menu-chart-group-line', caption: me.textLine},
{id: 'menu-chart-group-pie', caption: me.textPie},
{id: 'menu-chart-group-hbar', caption: me.textBar},
{id: 'menu-chart-group-area', caption: me.textArea, inline: true},
{id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true},
{id: 'menu-chart-group-stock', caption: me.textStock, inline: true}
// {id: 'menu-chart-group-surface', caption: me.textSurface}
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'},
{ group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'},
{ group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'}
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
}); });
picker.on('item:click', function (picker, item, record, e) { picker.on('item:click', function (picker, item, record, e) {
@ -2204,13 +2164,6 @@ define([
textNewColor: 'Add New Custom Color', textNewColor: 'Add New Custom Color',
textAutoColor: 'Automatic', textAutoColor: 'Automatic',
tipInsertChart: 'Insert Chart', tipInsertChart: 'Insert Chart',
textLine: 'Line',
textColumn: 'Column',
textBar: 'Bar',
textArea: 'Area',
textPie: 'Pie',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
tipColorSchemas: 'Change Color Scheme', tipColorSchemas: 'Change Color Scheme',
tipInsertText: 'Insert Text', tipInsertText: 'Insert Text',
tipInsertTextArt: 'Insert Text Art', tipInsertTextArt: 'Insert Text Art',
@ -2278,7 +2231,6 @@ define([
textPortrait: 'Portrait', textPortrait: 'Portrait',
textLandscape: 'Landscape', textLandscape: 'Landscape',
textInsertPageCount: 'Insert number of pages', textInsertPageCount: 'Insert number of pages',
textCharts: 'Charts',
tipChangeChart: 'Change Chart Type', tipChangeChart: 'Change Chart Type',
capBtnInsPagebreak: 'Page Break', capBtnInsPagebreak: 'Page Break',
capBtnInsImage: 'Image', capBtnInsImage: 'Image',
@ -2311,7 +2263,6 @@ define([
capImgWrapping: 'Wrapping', capImgWrapping: 'Wrapping',
capBtnComment: 'Comment', capBtnComment: 'Comment',
textColumnsCustom: 'Custom Columns', textColumnsCustom: 'Custom Columns',
textSurface: 'Surface',
textTabCollaboration: 'Collaboration', textTabCollaboration: 'Collaboration',
textTabProtect: 'Protection', textTabProtect: 'Protection',
textTabLinks: 'References', textTabLinks: 'References',

43
apps/documenteditor/main/locale/en.json
View file

@ -69,6 +69,15 @@
"Common.Controllers.ReviewChanges.textTabs": "Change tabs", "Common.Controllers.ReviewChanges.textTabs": "Change tabs",
"Common.Controllers.ReviewChanges.textUnderline": "Underline", "Common.Controllers.ReviewChanges.textUnderline": "Underline",
"Common.Controllers.ReviewChanges.textWidow": "Widow control", "Common.Controllers.ReviewChanges.textWidow": "Widow control",
"Common.define.chartData.textArea": "Area",
"Common.define.chartData.textBar": "Bar",
"Common.define.chartData.textCharts": "Charts",
"Common.define.chartData.textColumn": "Column",
"Common.define.chartData.textLine": "Line",
"Common.define.chartData.textPie": "Pie",
"Common.define.chartData.textPoint": "XY (Scatter)",
"Common.define.chartData.textStock": "Stock",
"Common.define.chartData.textSurface": "Surface",
"Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSize.txtNoBorders": "No borders",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
"Common.UI.ComboDataView.emptyComboText": "No styles", "Common.UI.ComboDataView.emptyComboText": "No styles",
@ -1056,20 +1065,20 @@
"DE.Views.CellsRemoveDialog.textRow": "Delete entire row", "DE.Views.CellsRemoveDialog.textRow": "Delete entire row",
"DE.Views.CellsRemoveDialog.textTitle": "Delete Cells", "DE.Views.CellsRemoveDialog.textTitle": "Delete Cells",
"DE.Views.ChartSettings.textAdvanced": "Show advanced settings", "DE.Views.ChartSettings.textAdvanced": "Show advanced settings",
"DE.Views.ChartSettings.textArea": "Area", "del_DE.Views.ChartSettings.textArea": "Area",
"DE.Views.ChartSettings.textBar": "Bar", "del_DE.Views.ChartSettings.textBar": "Bar",
"DE.Views.ChartSettings.textChartType": "Change Chart Type", "DE.Views.ChartSettings.textChartType": "Change Chart Type",
"DE.Views.ChartSettings.textColumn": "Column", "del_DE.Views.ChartSettings.textColumn": "Column",
"DE.Views.ChartSettings.textEditData": "Edit Data", "DE.Views.ChartSettings.textEditData": "Edit Data",
"DE.Views.ChartSettings.textHeight": "Height", "DE.Views.ChartSettings.textHeight": "Height",
"DE.Views.ChartSettings.textLine": "Line", "del_DE.Views.ChartSettings.textLine": "Line",
"DE.Views.ChartSettings.textOriginalSize": "Actual Size", "DE.Views.ChartSettings.textOriginalSize": "Actual Size",
"DE.Views.ChartSettings.textPie": "Pie", "del_DE.Views.ChartSettings.textPie": "Pie",
"DE.Views.ChartSettings.textPoint": "XY (Scatter)", "del_DE.Views.ChartSettings.textPoint": "XY (Scatter)",
"DE.Views.ChartSettings.textSize": "Size", "DE.Views.ChartSettings.textSize": "Size",
"DE.Views.ChartSettings.textStock": "Stock", "del_DE.Views.ChartSettings.textStock": "Stock",
"DE.Views.ChartSettings.textStyle": "Style", "DE.Views.ChartSettings.textStyle": "Style",
"DE.Views.ChartSettings.textSurface": "Surface", "del_DE.Views.ChartSettings.textSurface": "Surface",
"DE.Views.ChartSettings.textUndock": "Undock from panel", "DE.Views.ChartSettings.textUndock": "Undock from panel",
"DE.Views.ChartSettings.textWidth": "Width", "DE.Views.ChartSettings.textWidth": "Width",
"DE.Views.ChartSettings.textWrap": "Wrapping Style", "DE.Views.ChartSettings.textWrap": "Wrapping Style",
@ -2099,13 +2108,13 @@
"DE.Views.Toolbar.mniImageFromStorage": "Image from Storage", "DE.Views.Toolbar.mniImageFromStorage": "Image from Storage",
"DE.Views.Toolbar.mniImageFromUrl": "Image from URL", "DE.Views.Toolbar.mniImageFromUrl": "Image from URL",
"DE.Views.Toolbar.strMenuNoFill": "No Fill", "DE.Views.Toolbar.strMenuNoFill": "No Fill",
"DE.Views.Toolbar.textArea": "Area", "del_DE.Views.Toolbar.textArea": "Area",
"DE.Views.Toolbar.textAutoColor": "Automatic", "DE.Views.Toolbar.textAutoColor": "Automatic",
"DE.Views.Toolbar.textBar": "Bar", "del_DE.Views.Toolbar.textBar": "Bar",
"DE.Views.Toolbar.textBold": "Bold", "DE.Views.Toolbar.textBold": "Bold",
"DE.Views.Toolbar.textBottom": "Bottom: ", "DE.Views.Toolbar.textBottom": "Bottom: ",
"DE.Views.Toolbar.textCharts": "Charts", "del_DE.Views.Toolbar.textCharts": "Charts",
"DE.Views.Toolbar.textColumn": "Column", "del_DE.Views.Toolbar.textColumn": "Column",
"DE.Views.Toolbar.textColumnsCustom": "Custom Columns", "DE.Views.Toolbar.textColumnsCustom": "Custom Columns",
"DE.Views.Toolbar.textColumnsLeft": "Left", "DE.Views.Toolbar.textColumnsLeft": "Left",
"DE.Views.Toolbar.textColumnsOne": "One", "DE.Views.Toolbar.textColumnsOne": "One",
@ -2125,7 +2134,7 @@
"DE.Views.Toolbar.textItalic": "Italic", "DE.Views.Toolbar.textItalic": "Italic",
"DE.Views.Toolbar.textLandscape": "Landscape", "DE.Views.Toolbar.textLandscape": "Landscape",
"DE.Views.Toolbar.textLeft": "Left: ", "DE.Views.Toolbar.textLeft": "Left: ",
"DE.Views.Toolbar.textLine": "Line", "del_DE.Views.Toolbar.textLine": "Line",
"DE.Views.Toolbar.textMarginsLast": "Last Custom", "DE.Views.Toolbar.textMarginsLast": "Last Custom",
"DE.Views.Toolbar.textMarginsModerate": "Moderate", "DE.Views.Toolbar.textMarginsModerate": "Moderate",
"DE.Views.Toolbar.textMarginsNarrow": "Narrow", "DE.Views.Toolbar.textMarginsNarrow": "Narrow",
@ -2139,15 +2148,15 @@
"DE.Views.Toolbar.textOddPage": "Odd Page", "DE.Views.Toolbar.textOddPage": "Odd Page",
"DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
"DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
"DE.Views.Toolbar.textPie": "Pie", "del_DE.Views.Toolbar.textPie": "Pie",
"DE.Views.Toolbar.textPlainControl": "Insert plain text content control", "DE.Views.Toolbar.textPlainControl": "Insert plain text content control",
"DE.Views.Toolbar.textPoint": "XY (Scatter)", "del_DE.Views.Toolbar.textPoint": "XY (Scatter)",
"DE.Views.Toolbar.textPortrait": "Portrait", "DE.Views.Toolbar.textPortrait": "Portrait",
"DE.Views.Toolbar.textRemoveControl": "Remove content control", "DE.Views.Toolbar.textRemoveControl": "Remove content control",
"DE.Views.Toolbar.textRemWatermark": "Remove Watermark", "DE.Views.Toolbar.textRemWatermark": "Remove Watermark",
"DE.Views.Toolbar.textRichControl": "Insert rich text content control", "DE.Views.Toolbar.textRichControl": "Insert rich text content control",
"DE.Views.Toolbar.textRight": "Right: ", "DE.Views.Toolbar.textRight": "Right: ",
"DE.Views.Toolbar.textStock": "Stock", "del_DE.Views.Toolbar.textStock": "Stock",
"DE.Views.Toolbar.textStrikeout": "Strikethrough", "DE.Views.Toolbar.textStrikeout": "Strikethrough",
"DE.Views.Toolbar.textStyleMenuDelete": "Delete style", "DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
"DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles",
@ -2157,7 +2166,7 @@
"DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection", "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection",
"DE.Views.Toolbar.textSubscript": "Subscript", "DE.Views.Toolbar.textSubscript": "Subscript",
"DE.Views.Toolbar.textSuperscript": "Superscript", "DE.Views.Toolbar.textSuperscript": "Superscript",
"DE.Views.Toolbar.textSurface": "Surface", "del_DE.Views.Toolbar.textSurface": "Surface",
"DE.Views.Toolbar.textTabCollaboration": "Collaboration", "DE.Views.Toolbar.textTabCollaboration": "Collaboration",
"DE.Views.Toolbar.textTabFile": "File", "DE.Views.Toolbar.textTabFile": "File",
"DE.Views.Toolbar.textTabHome": "Home", "DE.Views.Toolbar.textTabHome": "Home",

9
apps/documenteditor/main/locale/ru.json
View file

@ -69,6 +69,15 @@
"Common.Controllers.ReviewChanges.textTabs": "Изменение табуляции", "Common.Controllers.ReviewChanges.textTabs": "Изменение табуляции",
"Common.Controllers.ReviewChanges.textUnderline": "Подчёркнутый", "Common.Controllers.ReviewChanges.textUnderline": "Подчёркнутый",
"Common.Controllers.ReviewChanges.textWidow": "Запрет висячих строк", "Common.Controllers.ReviewChanges.textWidow": "Запрет висячих строк",
"Common.define.chartData.textArea": "С областями",
"Common.define.chartData.textBar": "Линейчатая",
"Common.define.chartData.textCharts": "Диаграммы",
"Common.define.chartData.textColumn": "Гистограмма",
"Common.define.chartData.textLine": "График",
"Common.define.chartData.textPie": "Круговая",
"Common.define.chartData.textPoint": "Точечная",
"Common.define.chartData.textStock": "Биржевая",
"Common.define.chartData.textSurface": "Поверхность",
"Common.UI.ComboBorderSize.txtNoBorders": "Без границ", "Common.UI.ComboBorderSize.txtNoBorders": "Без границ",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ",
"Common.UI.ComboDataView.emptyComboText": "Без стилей", "Common.UI.ComboDataView.emptyComboText": "Без стилей",

53
apps/presentationeditor/main/app/view/ChartSettings.js
View file

@ -213,47 +213,8 @@ define([
el: $('#id-chart-menu-type'), el: $('#id-chart-menu-type'),
parentMenu: btn.menu, parentMenu: btn.menu,
restoreHeight: 421, restoreHeight: 421,
groups: new Common.UI.DataViewGroupStore([ groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()),
{ id: 'menu-chart-group-bar', caption: me.textColumn }, store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
{ id: 'menu-chart-group-line', caption: me.textLine },
{ id: 'menu-chart-group-pie', caption: me.textPie },
{ id: 'menu-chart-group-hbar', caption: me.textBar },
{ id: 'menu-chart-group-area', caption: me.textArea, inline: true },
{ id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true },
{ id: 'menu-chart-group-stock', caption: me.textStock, inline: true }
// { id: 'menu-chart-group-surface', caption: me.textSurface}
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'},
{ group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'},
{ group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'}
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
}); });
}); });
@ -534,15 +495,7 @@ define([
textHeight: 'Height', textHeight: 'Height',
textEditData: 'Edit Data', textEditData: 'Edit Data',
textChartType: 'Change Chart Type', textChartType: 'Change Chart Type',
textLine: 'Line',
textColumn: 'Column',
textBar: 'Bar',
textArea: 'Area',
textPie: 'Pie',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
textStyle: 'Style', textStyle: 'Style',
textAdvanced: 'Show advanced settings', textAdvanced: 'Show advanced settings'
textSurface: 'Surface'
}, PE.Views.ChartSettings || {})); }, PE.Views.ChartSettings || {}));
}); });

53
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -1117,48 +1117,8 @@ define([
parentMenu: menu, parentMenu: menu,
showLast: false, showLast: false,
restoreHeight: 421, restoreHeight: 421,
groups: new Common.UI.DataViewGroupStore([ groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData(true)),
{id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts}, store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
{id: 'menu-chart-group-line', caption: me.textLine},
{id: 'menu-chart-group-pie', caption: me.textPie},
{id: 'menu-chart-group-hbar', caption: me.textBar},
{id: 'menu-chart-group-area', caption: me.textArea, inline: true},
{id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true},
{id: 'menu-chart-group-stock', caption: me.textStock, inline: true}
// {id: 'menu-chart-group-surface', caption: me.textSurface}
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'},
{ group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'},
{ group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'}
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
}); });
picker.on('item:click', function (picker, item, record, e) { picker.on('item:click', function (picker, item, record, e) {
@ -1621,13 +1581,6 @@ define([
mniSlideAdvanced: 'Advanced Settings', mniSlideAdvanced: 'Advanced Settings',
tipSlideSize: 'Select Slide Size', tipSlideSize: 'Select Slide Size',
tipInsertChart: 'Insert Chart', tipInsertChart: 'Insert Chart',
textLine: 'Line',
textColumn: 'Column',
textBar: 'Bar',
textArea: 'Area',
textPie: 'Pie',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
tipSynchronize: 'The document has been changed by another user. Please click to save your changes and reload the updates.', tipSynchronize: 'The document has been changed by another user. Please click to save your changes and reload the updates.',
txtScheme1: 'Office', txtScheme1: 'Office',
txtScheme2: 'Grayscale', txtScheme2: 'Grayscale',
@ -1656,7 +1609,6 @@ define([
textShowCurrent: 'Show from Current slide', textShowCurrent: 'Show from Current slide',
textShowSettings: 'Show Settings', textShowSettings: 'Show Settings',
tipInsertEquation: 'Insert Equation', tipInsertEquation: 'Insert Equation',
textCharts: 'Charts',
tipChangeChart: 'Change Chart Type', tipChangeChart: 'Change Chart Type',
capInsertText: 'Text', capInsertText: 'Text',
capInsertTextArt: 'Text Art', capInsertTextArt: 'Text Art',
@ -1674,7 +1626,6 @@ define([
textTabFile: 'File', textTabFile: 'File',
textTabHome: 'Home', textTabHome: 'Home',
textTabInsert: 'Insert', textTabInsert: 'Insert',
textSurface: 'Surface',
textShowPresenterView: 'Show presenter view', textShowPresenterView: 'Show presenter view',
textTabCollaboration: 'Collaboration', textTabCollaboration: 'Collaboration',
textTabProtect: 'Protection', textTabProtect: 'Protection',

43
apps/presentationeditor/main/locale/en.json
View file

@ -5,6 +5,15 @@
"Common.Controllers.ExternalDiagramEditor.textClose": "Close", "Common.Controllers.ExternalDiagramEditor.textClose": "Close",
"Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.", "Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.",
"Common.Controllers.ExternalDiagramEditor.warningTitle": "Warning", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Warning",
"Common.define.chartData.textArea": "Area",
"Common.define.chartData.textBar": "Bar",
"Common.define.chartData.textCharts": "Charts",
"Common.define.chartData.textColumn": "Column",
"Common.define.chartData.textLine": "Line",
"Common.define.chartData.textPie": "Pie",
"Common.define.chartData.textPoint": "XY (Scatter)",
"Common.define.chartData.textStock": "Stock",
"Common.define.chartData.textSurface": "Surface",
"Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSize.txtNoBorders": "No borders",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
"Common.UI.ComboDataView.emptyComboText": "No styles", "Common.UI.ComboDataView.emptyComboText": "No styles",
@ -924,20 +933,20 @@
"PE.Controllers.Viewport.textFitPage": "Fit to Slide", "PE.Controllers.Viewport.textFitPage": "Fit to Slide",
"PE.Controllers.Viewport.textFitWidth": "Fit to Width", "PE.Controllers.Viewport.textFitWidth": "Fit to Width",
"PE.Views.ChartSettings.textAdvanced": "Show advanced settings", "PE.Views.ChartSettings.textAdvanced": "Show advanced settings",
"PE.Views.ChartSettings.textArea": "Area", "del_PE.Views.ChartSettings.textArea": "Area",
"PE.Views.ChartSettings.textBar": "Bar", "del_PE.Views.ChartSettings.textBar": "Bar",
"PE.Views.ChartSettings.textChartType": "Change Chart Type", "PE.Views.ChartSettings.textChartType": "Change Chart Type",
"PE.Views.ChartSettings.textColumn": "Column", "del_PE.Views.ChartSettings.textColumn": "Column",
"PE.Views.ChartSettings.textEditData": "Edit Data", "PE.Views.ChartSettings.textEditData": "Edit Data",
"PE.Views.ChartSettings.textHeight": "Height", "PE.Views.ChartSettings.textHeight": "Height",
"PE.Views.ChartSettings.textKeepRatio": "Constant proportions", "PE.Views.ChartSettings.textKeepRatio": "Constant proportions",
"PE.Views.ChartSettings.textLine": "Line", "del_PE.Views.ChartSettings.textLine": "Line",
"PE.Views.ChartSettings.textPie": "Pie", "del_PE.Views.ChartSettings.textPie": "Pie",
"PE.Views.ChartSettings.textPoint": "XY (Scatter)", "del_PE.Views.ChartSettings.textPoint": "XY (Scatter)",
"PE.Views.ChartSettings.textSize": "Size", "PE.Views.ChartSettings.textSize": "Size",
"PE.Views.ChartSettings.textStock": "Stock", "del_PE.Views.ChartSettings.textStock": "Stock",
"PE.Views.ChartSettings.textStyle": "Style", "PE.Views.ChartSettings.textStyle": "Style",
"PE.Views.ChartSettings.textSurface": "Surface", "del_PE.Views.ChartSettings.textSurface": "Surface",
"PE.Views.ChartSettings.textWidth": "Width", "PE.Views.ChartSettings.textWidth": "Width",
"PE.Views.ChartSettingsAdvanced.textAlt": "Alternative Text", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternative Text",
"PE.Views.ChartSettingsAdvanced.textAltDescription": "Description", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Description",
@ -1708,21 +1717,21 @@
"PE.Views.Toolbar.textAlignMiddle": "Align text to the middle", "PE.Views.Toolbar.textAlignMiddle": "Align text to the middle",
"PE.Views.Toolbar.textAlignRight": "Align text right", "PE.Views.Toolbar.textAlignRight": "Align text right",
"PE.Views.Toolbar.textAlignTop": "Align text to the top", "PE.Views.Toolbar.textAlignTop": "Align text to the top",
"PE.Views.Toolbar.textArea": "Area", "del_PE.Views.Toolbar.textArea": "Area",
"PE.Views.Toolbar.textArrangeBack": "Send to Background", "PE.Views.Toolbar.textArrangeBack": "Send to Background",
"PE.Views.Toolbar.textArrangeBackward": "Send Backward", "PE.Views.Toolbar.textArrangeBackward": "Send Backward",
"PE.Views.Toolbar.textArrangeForward": "Bring Forward", "PE.Views.Toolbar.textArrangeForward": "Bring Forward",
"PE.Views.Toolbar.textArrangeFront": "Bring to Foreground", "PE.Views.Toolbar.textArrangeFront": "Bring to Foreground",
"PE.Views.Toolbar.textBar": "Bar", "del_PE.Views.Toolbar.textBar": "Bar",
"PE.Views.Toolbar.textBold": "Bold", "PE.Views.Toolbar.textBold": "Bold",
"PE.Views.Toolbar.textCharts": "Charts", "del_PE.Views.Toolbar.textCharts": "Charts",
"PE.Views.Toolbar.textColumn": "Column", "del_PE.Views.Toolbar.textColumn": "Column",
"PE.Views.Toolbar.textItalic": "Italic", "PE.Views.Toolbar.textItalic": "Italic",
"PE.Views.Toolbar.textLine": "Line", "del_PE.Views.Toolbar.textLine": "Line",
"PE.Views.Toolbar.textListSettings": "List Settings", "PE.Views.Toolbar.textListSettings": "List Settings",
"PE.Views.Toolbar.textNewColor": "Custom Color", "PE.Views.Toolbar.textNewColor": "Custom Color",
"PE.Views.Toolbar.textPie": "Pie", "del_PE.Views.Toolbar.textPie": "Pie",
"PE.Views.Toolbar.textPoint": "XY (Scatter)", "del_PE.Views.Toolbar.textPoint": "XY (Scatter)",
"PE.Views.Toolbar.textShapeAlignBottom": "Align Bottom", "PE.Views.Toolbar.textShapeAlignBottom": "Align Bottom",
"PE.Views.Toolbar.textShapeAlignCenter": "Align Center", "PE.Views.Toolbar.textShapeAlignCenter": "Align Center",
"PE.Views.Toolbar.textShapeAlignLeft": "Align Left", "PE.Views.Toolbar.textShapeAlignLeft": "Align Left",
@ -1733,11 +1742,11 @@
"PE.Views.Toolbar.textShowCurrent": "Show from Current Slide", "PE.Views.Toolbar.textShowCurrent": "Show from Current Slide",
"PE.Views.Toolbar.textShowPresenterView": "Show Presenter View", "PE.Views.Toolbar.textShowPresenterView": "Show Presenter View",
"PE.Views.Toolbar.textShowSettings": "Show Settings", "PE.Views.Toolbar.textShowSettings": "Show Settings",
"PE.Views.Toolbar.textStock": "Stock", "del_PE.Views.Toolbar.textStock": "Stock",
"PE.Views.Toolbar.textStrikeout": "Strikethrough", "PE.Views.Toolbar.textStrikeout": "Strikethrough",
"PE.Views.Toolbar.textSubscript": "Subscript", "PE.Views.Toolbar.textSubscript": "Subscript",
"PE.Views.Toolbar.textSuperscript": "Superscript", "PE.Views.Toolbar.textSuperscript": "Superscript",
"PE.Views.Toolbar.textSurface": "Surface", "del_PE.Views.Toolbar.textSurface": "Surface",
"PE.Views.Toolbar.textTabCollaboration": "Collaboration", "PE.Views.Toolbar.textTabCollaboration": "Collaboration",
"PE.Views.Toolbar.textTabFile": "File", "PE.Views.Toolbar.textTabFile": "File",
"PE.Views.Toolbar.textTabHome": "Home", "PE.Views.Toolbar.textTabHome": "Home",

9
apps/presentationeditor/main/locale/ru.json
View file

@ -5,6 +5,15 @@
"Common.Controllers.ExternalDiagramEditor.textClose": "Закрыть", "Common.Controllers.ExternalDiagramEditor.textClose": "Закрыть",
"Common.Controllers.ExternalDiagramEditor.warningText": "Объект недоступен, так как редактируется другим пользователем.", "Common.Controllers.ExternalDiagramEditor.warningText": "Объект недоступен, так как редактируется другим пользователем.",
"Common.Controllers.ExternalDiagramEditor.warningTitle": "Предупреждение", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Предупреждение",
"Common.define.chartData.textArea": "С областями",
"Common.define.chartData.textBar": "Линейчатая",
"Common.define.chartData.textCharts": "Диаграммы",
"Common.define.chartData.textColumn": "Гистограмма",
"Common.define.chartData.textLine": "График",
"Common.define.chartData.textPie": "Круговая",
"Common.define.chartData.textPoint": "Точечная",
"Common.define.chartData.textStock": "Биржевая",
"Common.define.chartData.textSurface": "Поверхность",
"Common.UI.ComboBorderSize.txtNoBorders": "Без границ", "Common.UI.ComboBorderSize.txtNoBorders": "Без границ",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ",
"Common.UI.ComboDataView.emptyComboText": "Без стилей", "Common.UI.ComboDataView.emptyComboText": "Без стилей",

68
apps/spreadsheeteditor/main/app/view/ChartSettings.js
View file

@ -668,47 +668,8 @@ define([
el: $('#id-chart-menu-type'), el: $('#id-chart-menu-type'),
parentMenu: btn.menu, parentMenu: btn.menu,
restoreHeight: 421, restoreHeight: 421,
groups: new Common.UI.DataViewGroupStore([ groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()),
{ id: 'menu-chart-group-bar', caption: me.textColumn }, store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
{ id: 'menu-chart-group-line', caption: me.textLine },
{ id: 'menu-chart-group-pie', caption: me.textPie },
{ id: 'menu-chart-group-hbar', caption: me.textBar },
{ id: 'menu-chart-group-area', caption: me.textArea, inline: true },
{ id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true },
{ id: 'menu-chart-group-stock', caption: me.textStock, inline: true }
// { id: 'menu-chart-group-surface', caption: me.textSurface}
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'},
{ group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'},
{ group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'}
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
}); });
}); });
@ -781,16 +742,8 @@ define([
parentMenu: btn.menu, parentMenu: btn.menu,
restoreHeight: 120, restoreHeight: 120,
allowScrollbar: false, allowScrollbar: false,
groups: new Common.UI.DataViewGroupStore([ groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getSparkGroupData()),
{ id: 'menu-chart-group-sparkcolumn', inline: true }, store: new Common.UI.DataViewStore(Common.define.chartData.getSparkData()),
{ id: 'menu-chart-group-sparkline', inline: true },
{ id: 'menu-chart-group-sparkwin', inline: true }
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column', tip: me.textColumnSpark},
{ group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line', tip: me.textLineSpark},
{ group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win', tip: me.textWinLossSpark}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
}); });
}); });
@ -1324,22 +1277,12 @@ define([
textHeight: 'Height', textHeight: 'Height',
textEditData: 'Edit Data and Location', textEditData: 'Edit Data and Location',
textChartType: 'Change Chart Type', textChartType: 'Change Chart Type',
textLine: 'Line',
textColumn: 'Column',
textBar: 'Bar',
textArea: 'Area',
textPie: 'Pie',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
textStyle: 'Style', textStyle: 'Style',
textAdvanced: 'Show advanced settings', textAdvanced: 'Show advanced settings',
strSparkColor: 'Color', strSparkColor: 'Color',
strLineWeight: 'Line Weight', strLineWeight: 'Line Weight',
textMarkers: 'Markers', textMarkers: 'Markers',
textNewColor: 'Add New Custom Color', textNewColor: 'Add New Custom Color',
textLineSpark: 'Line',
textColumnSpark: 'Column',
textWinLossSpark: 'Win/Loss',
textHighPoint: 'High Point', textHighPoint: 'High Point',
textLowPoint: 'Low Point', textLowPoint: 'Low Point',
textNegativePoint: 'Negative Point', textNegativePoint: 'Negative Point',
@ -1350,8 +1293,7 @@ define([
textType: 'Type', textType: 'Type',
textSelectData: 'Select Data', textSelectData: 'Select Data',
textRanges: 'Data Range', textRanges: 'Data Range',
textBorderSizeErr: 'The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.', textBorderSizeErr: 'The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.'
textSurface: 'Surface'
}, SSE.Views.ChartSettings || {})); }, SSE.Views.ChartSettings || {}));
}); });

66
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
View file

@ -129,47 +129,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
el: $('#id-chart-dlg-menu-type'), el: $('#id-chart-dlg-menu-type'),
parentMenu: btn.menu, parentMenu: btn.menu,
restoreHeight: 421, restoreHeight: 421,
groups: new Common.UI.DataViewGroupStore([ groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()),
{ id: 'menu-chart-group-bar', caption: me.textColumn }, store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
{ id: 'menu-chart-group-line', caption: me.textLine },
{ id: 'menu-chart-group-pie', caption: me.textPie },
{ id: 'menu-chart-group-hbar', caption: me.textBar },
{ id: 'menu-chart-group-area', caption: me.textArea, inline: true },
{ id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true },
{ id: 'menu-chart-group-stock', caption: me.textStock, inline: true }
// { id: 'menu-chart-group-surface', caption: me.textSurface}
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'},
{ group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'},
{ group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'}
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
}); });
}); });
@ -790,16 +751,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
el: $('#id-spark-dlg-menu-type'), el: $('#id-spark-dlg-menu-type'),
parentMenu: btn.menu, parentMenu: btn.menu,
restoreHeight: 120, restoreHeight: 120,
groups: new Common.UI.DataViewGroupStore([ groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getSparkGroupData()),
{ id: 'menu-chart-group-sparkcolumn', inline: true }, store: new Common.UI.DataViewStore(Common.define.chartData.getSparkData()),
{ id: 'menu-chart-group-sparkline', inline: true },
{ id: 'menu-chart-group-sparkwin', inline: true }
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column', tip: me.textColumnSpark},
{ group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line', tip: me.textLineSpark},
{ group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win', tip: me.textWinLossSpark}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
}); });
}); });
@ -1680,13 +1633,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
textTitle: 'Chart - Advanced Settings', textTitle: 'Chart - Advanced Settings',
textShowValues: 'Display chart values', textShowValues: 'Display chart values',
textShowBorders: 'Display chart borders', textShowBorders: 'Display chart borders',
textLine: 'Line',
textColumn: 'Column',
textBar: 'Bar',
textArea: 'Area',
textPie: 'Pie',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
textDataRows: 'in rows', textDataRows: 'in rows',
textDataColumns: 'in columns', textDataColumns: 'in columns',
textDisplayLegend: 'Display Legend', textDisplayLegend: 'Display Legend',
@ -1797,9 +1743,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
textGaps: 'Gaps', textGaps: 'Gaps',
textZero: 'Zero', textZero: 'Zero',
textEmptyLine: 'Connect data points with line', textEmptyLine: 'Connect data points with line',
textLineSpark: 'Line',
textColumnSpark: 'Column',
textWinLossSpark: 'Win/Loss',
textShowSparkAxis: 'Show Axis', textShowSparkAxis: 'Show Axis',
textReverseOrder: 'Reverse order', textReverseOrder: 'Reverse order',
textAutoEach: 'Auto for Each', textAutoEach: 'Auto for Each',
@ -1809,7 +1752,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
textAltTitle: 'Title', textAltTitle: 'Title',
textAltDescription: 'Description', textAltDescription: 'Description',
textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.', textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.',
textSurface: 'Surface',
errorMaxPoints: 'ERROR! The maximum number of points in series per chart is 4096.', errorMaxPoints: 'ERROR! The maximum number of points in series per chart is 4096.',
textSnap: 'Cell Snapping', textSnap: 'Cell Snapping',
textAbsolute: 'Don\'t move or size with cells', textAbsolute: 'Don\'t move or size with cells',

62
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -1902,53 +1902,8 @@ define([
parentMenu: menu, parentMenu: menu,
showLast: false, showLast: false,
restoreHeight: 421, restoreHeight: 421,
groups: new Common.UI.DataViewGroupStore([ groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData(true)/*.concat(Common.define.chartData.getSparkGroupData(true))*/),
{id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts}, store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()/*.concat(Common.define.chartData.getSparkData())*/),
{id: 'menu-chart-group-line', caption: me.textLine},
{id: 'menu-chart-group-pie', caption: me.textPie},
{id: 'menu-chart-group-hbar', caption: me.textBar},
{id: 'menu-chart-group-area', caption: me.textArea, inline: true},
{id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true},
{id: 'menu-chart-group-stock', caption: me.textStock, inline: true}
// { id: 'menu-chart-group-surface', caption: me.textSurface}
// ,{ id: 'menu-chart-group-sparkcolumn', inline: true, headername: me.textSparks },
// { id: 'menu-chart-group-sparkline', inline: true },
// { id: 'menu-chart-group-sparkwin', inline: true }
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'},
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'},
{ group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'},
{ group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'},
{ group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'},
{ group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'},
{ group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'}
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'},
// { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'}
// ,{ group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column', tip: me.textColumnSpark},
// { group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line', tip: me.textLineSpark},
// { group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win', tip: me.textWinLossSpark}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
}); });
picker.on('item:click', function (picker, item, record, e) { picker.on('item:click', function (picker, item, record, e) {
@ -2448,19 +2403,7 @@ define([
txtManageRange: 'Name manager', txtManageRange: 'Name manager',
txtPasteRange: 'Paste name', txtPasteRange: 'Paste name',
textInsCharts: 'Charts', textInsCharts: 'Charts',
textLine: 'Line',
textColumn: 'Column',
textBar: 'Bar',
textArea: 'Area',
textPie: 'Pie',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
textLineSpark: 'Line',
textColumnSpark: 'Column',
textWinLossSpark: 'Win/Loss',
tipInsertEquation: 'Insert Equation', tipInsertEquation: 'Insert Equation',
textCharts: 'Charts',
textSparks: 'Sparklines',
tipInsertChartSpark: 'Insert Chart', tipInsertChartSpark: 'Insert Chart',
textMoreFormats: 'More formats', textMoreFormats: 'More formats',
capInsertText: 'Text', capInsertText: 'Text',
@ -2474,7 +2417,6 @@ define([
textTabFile: 'File', textTabFile: 'File',
textTabHome: 'Home', textTabHome: 'Home',
textTabInsert: 'Insert', textTabInsert: 'Insert',
textSurface: 'Surface',
tipChangeChart: 'Change Chart Type', tipChangeChart: 'Change Chart Type',
textTabCollaboration: 'Collaboration', textTabCollaboration: 'Collaboration',
textTabProtect: 'Protection', textTabProtect: 'Protection',

83
apps/spreadsheeteditor/main/locale/en.json
View file

@ -2,6 +2,19 @@
"cancelButtonText": "Cancel", "cancelButtonText": "Cancel",
"Common.Controllers.Chat.notcriticalErrorTitle": "Warning", "Common.Controllers.Chat.notcriticalErrorTitle": "Warning",
"Common.Controllers.Chat.textEnterMessage": "Enter your message here", "Common.Controllers.Chat.textEnterMessage": "Enter your message here",
"Common.define.chartData.textArea": "Area",
"Common.define.chartData.textBar": "Bar",
"Common.define.chartData.textCharts": "Charts",
"Common.define.chartData.textColumn": "Column",
"Common.define.chartData.textLine": "Line",
"Common.define.chartData.textPie": "Pie",
"Common.define.chartData.textPoint": "XY (Scatter)",
"Common.define.chartData.textStock": "Stock",
"Common.define.chartData.textSurface": "Surface",
"Common.define.chartData.textSparks": "Sparklines",
"Common.define.chartData.textColumnSpark": "Column",
"Common.define.chartData.textLineSpark": "Line",
"Common.define.chartData.textWinLossSpark": "Win/Loss",
"Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSize.txtNoBorders": "No borders",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
"Common.UI.ComboDataView.emptyComboText": "No styles", "Common.UI.ComboDataView.emptyComboText": "No styles",
@ -1192,36 +1205,36 @@
"SSE.Views.ChartSettings.strSparkColor": "Color", "SSE.Views.ChartSettings.strSparkColor": "Color",
"SSE.Views.ChartSettings.strTemplate": "Template", "SSE.Views.ChartSettings.strTemplate": "Template",
"SSE.Views.ChartSettings.textAdvanced": "Show advanced settings", "SSE.Views.ChartSettings.textAdvanced": "Show advanced settings",
"SSE.Views.ChartSettings.textArea": "Area", "del_SSE.Views.ChartSettings.textArea": "Area",
"SSE.Views.ChartSettings.textBar": "Bar", "del_SSE.Views.ChartSettings.textBar": "Bar",
"SSE.Views.ChartSettings.textBorderSizeErr": "The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.", "SSE.Views.ChartSettings.textBorderSizeErr": "The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.",
"SSE.Views.ChartSettings.textChartType": "Change Chart Type", "SSE.Views.ChartSettings.textChartType": "Change Chart Type",
"SSE.Views.ChartSettings.textColumn": "Column", "del_SSE.Views.ChartSettings.textColumn": "Column",
"SSE.Views.ChartSettings.textColumnSpark": "Column", "del_SSE.Views.ChartSettings.textColumnSpark": "Column",
"SSE.Views.ChartSettings.textEditData": "Edit Data and Location", "SSE.Views.ChartSettings.textEditData": "Edit Data and Location",
"SSE.Views.ChartSettings.textFirstPoint": "First Point", "SSE.Views.ChartSettings.textFirstPoint": "First Point",
"SSE.Views.ChartSettings.textHeight": "Height", "SSE.Views.ChartSettings.textHeight": "Height",
"SSE.Views.ChartSettings.textHighPoint": "High Point", "SSE.Views.ChartSettings.textHighPoint": "High Point",
"SSE.Views.ChartSettings.textKeepRatio": "Constant proportions", "SSE.Views.ChartSettings.textKeepRatio": "Constant proportions",
"SSE.Views.ChartSettings.textLastPoint": "Last Point", "SSE.Views.ChartSettings.textLastPoint": "Last Point",
"SSE.Views.ChartSettings.textLine": "Line", "del_SSE.Views.ChartSettings.textLine": "Line",
"SSE.Views.ChartSettings.textLineSpark": "Line", "del_SSE.Views.ChartSettings.textLineSpark": "Line",
"SSE.Views.ChartSettings.textLowPoint": "Low Point", "SSE.Views.ChartSettings.textLowPoint": "Low Point",
"SSE.Views.ChartSettings.textMarkers": "Markers", "SSE.Views.ChartSettings.textMarkers": "Markers",
"SSE.Views.ChartSettings.textNegativePoint": "Negative Point", "SSE.Views.ChartSettings.textNegativePoint": "Negative Point",
"SSE.Views.ChartSettings.textNewColor": "Add New Custom Color", "SSE.Views.ChartSettings.textNewColor": "Add New Custom Color",
"SSE.Views.ChartSettings.textPie": "Pie", "del_SSE.Views.ChartSettings.textPie": "Pie",
"SSE.Views.ChartSettings.textPoint": "XY (Scatter)", "del_SSE.Views.ChartSettings.textPoint": "XY (Scatter)",
"SSE.Views.ChartSettings.textRanges": "Data Range", "SSE.Views.ChartSettings.textRanges": "Data Range",
"SSE.Views.ChartSettings.textSelectData": "Select Data", "SSE.Views.ChartSettings.textSelectData": "Select Data",
"SSE.Views.ChartSettings.textShow": "Show", "SSE.Views.ChartSettings.textShow": "Show",
"SSE.Views.ChartSettings.textSize": "Size", "SSE.Views.ChartSettings.textSize": "Size",
"SSE.Views.ChartSettings.textStock": "Stock", "del_SSE.Views.ChartSettings.textStock": "Stock",
"SSE.Views.ChartSettings.textStyle": "Style", "SSE.Views.ChartSettings.textStyle": "Style",
"SSE.Views.ChartSettings.textSurface": "Surface", "del_SSE.Views.ChartSettings.textSurface": "Surface",
"SSE.Views.ChartSettings.textType": "Type", "SSE.Views.ChartSettings.textType": "Type",
"SSE.Views.ChartSettings.textWidth": "Width", "SSE.Views.ChartSettings.textWidth": "Width",
"SSE.Views.ChartSettings.textWinLossSpark": "Win/Loss", "del_SSE.Views.ChartSettings.textWinLossSpark": "Win/Loss",
"SSE.Views.ChartSettingsDlg.errorMaxPoints": "ERROR! The maximum number of points in series per chart is 4096.", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "ERROR! The maximum number of points in series per chart is 4096.",
"SSE.Views.ChartSettingsDlg.errorMaxRows": "ERROR! The maximum number of data series per chart is 255", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ERROR! The maximum number of data series per chart is 255",
"SSE.Views.ChartSettingsDlg.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.", "SSE.Views.ChartSettingsDlg.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.",
@ -1230,14 +1243,14 @@
"SSE.Views.ChartSettingsDlg.textAltDescription": "Description", "SSE.Views.ChartSettingsDlg.textAltDescription": "Description",
"SSE.Views.ChartSettingsDlg.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.", "SSE.Views.ChartSettingsDlg.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",
"SSE.Views.ChartSettingsDlg.textAltTitle": "Title", "SSE.Views.ChartSettingsDlg.textAltTitle": "Title",
"SSE.Views.ChartSettingsDlg.textArea": "Area", "del_SSE.Views.ChartSettingsDlg.textArea": "Area",
"SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAuto": "Auto",
"SSE.Views.ChartSettingsDlg.textAutoEach": "Auto for Each", "SSE.Views.ChartSettingsDlg.textAutoEach": "Auto for Each",
"SSE.Views.ChartSettingsDlg.textAxisCrosses": "Axis Crosses", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Axis Crosses",
"SSE.Views.ChartSettingsDlg.textAxisOptions": "Axis Options", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Axis Options",
"SSE.Views.ChartSettingsDlg.textAxisPos": "Axis Position", "SSE.Views.ChartSettingsDlg.textAxisPos": "Axis Position",
"SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings",
"SSE.Views.ChartSettingsDlg.textBar": "Bar", "del_SSE.Views.ChartSettingsDlg.textBar": "Bar",
"SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Between Tick Marks", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Between Tick Marks",
"SSE.Views.ChartSettingsDlg.textBillions": "Billions", "SSE.Views.ChartSettingsDlg.textBillions": "Billions",
"SSE.Views.ChartSettingsDlg.textBottom": "Bottom", "SSE.Views.ChartSettingsDlg.textBottom": "Bottom",
@ -1245,8 +1258,8 @@
"SSE.Views.ChartSettingsDlg.textCenter": "Center", "SSE.Views.ChartSettingsDlg.textCenter": "Center",
"SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Chart Elements &<br/>Chart Legend", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Chart Elements &<br/>Chart Legend",
"SSE.Views.ChartSettingsDlg.textChartTitle": "Chart Title", "SSE.Views.ChartSettingsDlg.textChartTitle": "Chart Title",
"SSE.Views.ChartSettingsDlg.textColumn": "Column", "del_SSE.Views.ChartSettingsDlg.textColumn": "Column",
"SSE.Views.ChartSettingsDlg.textColumnSpark": "Column", "del_SSE.Views.ChartSettingsDlg.textColumnSpark": "Column",
"SSE.Views.ChartSettingsDlg.textCross": "Cross", "SSE.Views.ChartSettingsDlg.textCross": "Cross",
"SSE.Views.ChartSettingsDlg.textCustom": "Custom", "SSE.Views.ChartSettingsDlg.textCustom": "Custom",
"SSE.Views.ChartSettingsDlg.textDataColumns": "in columns", "SSE.Views.ChartSettingsDlg.textDataColumns": "in columns",
@ -1287,9 +1300,9 @@
"SSE.Views.ChartSettingsDlg.textLegendPos": "Legend", "SSE.Views.ChartSettingsDlg.textLegendPos": "Legend",
"SSE.Views.ChartSettingsDlg.textLegendRight": "Right", "SSE.Views.ChartSettingsDlg.textLegendRight": "Right",
"SSE.Views.ChartSettingsDlg.textLegendTop": "Top", "SSE.Views.ChartSettingsDlg.textLegendTop": "Top",
"SSE.Views.ChartSettingsDlg.textLine": "Line Chart", "del_SSE.Views.ChartSettingsDlg.textLine": "Line Chart",
"SSE.Views.ChartSettingsDlg.textLines": "Lines ", "SSE.Views.ChartSettingsDlg.textLines": "Lines ",
"SSE.Views.ChartSettingsDlg.textLineSpark": "Line", "del_SSE.Views.ChartSettingsDlg.textLineSpark": "Line",
"SSE.Views.ChartSettingsDlg.textLocationRange": "Location Range", "SSE.Views.ChartSettingsDlg.textLocationRange": "Location Range",
"SSE.Views.ChartSettingsDlg.textLow": "Low", "SSE.Views.ChartSettingsDlg.textLow": "Low",
"SSE.Views.ChartSettingsDlg.textMajor": "Major", "SSE.Views.ChartSettingsDlg.textMajor": "Major",
@ -1311,8 +1324,8 @@
"SSE.Views.ChartSettingsDlg.textOut": "Out", "SSE.Views.ChartSettingsDlg.textOut": "Out",
"SSE.Views.ChartSettingsDlg.textOuterTop": "Outer Top", "SSE.Views.ChartSettingsDlg.textOuterTop": "Outer Top",
"SSE.Views.ChartSettingsDlg.textOverlay": "Overlay", "SSE.Views.ChartSettingsDlg.textOverlay": "Overlay",
"SSE.Views.ChartSettingsDlg.textPie": "Pie", "del_SSE.Views.ChartSettingsDlg.textPie": "Pie",
"SSE.Views.ChartSettingsDlg.textPoint": "XY (Scatter)", "del_SSE.Views.ChartSettingsDlg.textPoint": "XY (Scatter)",
"SSE.Views.ChartSettingsDlg.textReverse": "Values in reverse order", "SSE.Views.ChartSettingsDlg.textReverse": "Values in reverse order",
"SSE.Views.ChartSettingsDlg.textReverseOrder": "Reverse order", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Reverse order",
"SSE.Views.ChartSettingsDlg.textRight": "Right", "SSE.Views.ChartSettingsDlg.textRight": "Right",
@ -1334,10 +1347,10 @@
"SSE.Views.ChartSettingsDlg.textSmooth": "Smooth", "SSE.Views.ChartSettingsDlg.textSmooth": "Smooth",
"SSE.Views.ChartSettingsDlg.textSnap": "Cell Snapping", "SSE.Views.ChartSettingsDlg.textSnap": "Cell Snapping",
"SSE.Views.ChartSettingsDlg.textSparkRanges": "Sparkline Ranges", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Sparkline Ranges",
"SSE.Views.ChartSettingsDlg.textStock": "Stock", "del_SSE.Views.ChartSettingsDlg.textStock": "Stock",
"SSE.Views.ChartSettingsDlg.textStraight": "Straight", "SSE.Views.ChartSettingsDlg.textStraight": "Straight",
"SSE.Views.ChartSettingsDlg.textStyle": "Style", "SSE.Views.ChartSettingsDlg.textStyle": "Style",
"SSE.Views.ChartSettingsDlg.textSurface": "Surface", "del_SSE.Views.ChartSettingsDlg.textSurface": "Surface",
"SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000",
"SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000",
"SSE.Views.ChartSettingsDlg.textThousands": "Thousands", "SSE.Views.ChartSettingsDlg.textThousands": "Thousands",
@ -1355,7 +1368,7 @@
"SSE.Views.ChartSettingsDlg.textVertAxis": "Vertical Axis", "SSE.Views.ChartSettingsDlg.textVertAxis": "Vertical Axis",
"SSE.Views.ChartSettingsDlg.textVertGrid": "Vertical Gridlines", "SSE.Views.ChartSettingsDlg.textVertGrid": "Vertical Gridlines",
"SSE.Views.ChartSettingsDlg.textVertTitle": "Vertical Axis Title", "SSE.Views.ChartSettingsDlg.textVertTitle": "Vertical Axis Title",
"SSE.Views.ChartSettingsDlg.textWinLossSpark": "Win/Loss", "del_SSE.Views.ChartSettingsDlg.textWinLossSpark": "Win/Loss",
"SSE.Views.ChartSettingsDlg.textXAxisTitle": "X Axis Title", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X Axis Title",
"SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y Axis Title", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y Axis Title",
"SSE.Views.ChartSettingsDlg.textZero": "Zero", "SSE.Views.ChartSettingsDlg.textZero": "Zero",
@ -2244,20 +2257,20 @@
"SSE.Views.Toolbar.textAlignRight": "Align Right", "SSE.Views.Toolbar.textAlignRight": "Align Right",
"SSE.Views.Toolbar.textAlignTop": "Align Top", "SSE.Views.Toolbar.textAlignTop": "Align Top",
"SSE.Views.Toolbar.textAllBorders": "All Borders", "SSE.Views.Toolbar.textAllBorders": "All Borders",
"SSE.Views.Toolbar.textArea": "Area", "del_SSE.Views.Toolbar.textArea": "Area",
"SSE.Views.Toolbar.textAuto": "Auto", "SSE.Views.Toolbar.textAuto": "Auto",
"SSE.Views.Toolbar.textBar": "Bar", "del_SSE.Views.Toolbar.textBar": "Bar",
"SSE.Views.Toolbar.textBold": "Bold", "SSE.Views.Toolbar.textBold": "Bold",
"SSE.Views.Toolbar.textBordersColor": "Border Color", "SSE.Views.Toolbar.textBordersColor": "Border Color",
"SSE.Views.Toolbar.textBordersStyle": "Border Style", "SSE.Views.Toolbar.textBordersStyle": "Border Style",
"SSE.Views.Toolbar.textBottom": "Bottom: ", "SSE.Views.Toolbar.textBottom": "Bottom: ",
"SSE.Views.Toolbar.textBottomBorders": "Bottom Borders", "SSE.Views.Toolbar.textBottomBorders": "Bottom Borders",
"SSE.Views.Toolbar.textCenterBorders": "Inside Vertical Borders", "SSE.Views.Toolbar.textCenterBorders": "Inside Vertical Borders",
"SSE.Views.Toolbar.textCharts": "Charts", "del_SSE.Views.Toolbar.textCharts": "Charts",
"SSE.Views.Toolbar.textClearPrintArea": "Clear Print Area", "SSE.Views.Toolbar.textClearPrintArea": "Clear Print Area",
"SSE.Views.Toolbar.textClockwise": "Angle Clockwise", "SSE.Views.Toolbar.textClockwise": "Angle Clockwise",
"SSE.Views.Toolbar.textColumn": "Column", "del_SSE.Views.Toolbar.textColumn": "Column",
"SSE.Views.Toolbar.textColumnSpark": "Column", "del_SSE.Views.Toolbar.textColumnSpark": "Column",
"SSE.Views.Toolbar.textCounterCw": "Angle Counterclockwise", "SSE.Views.Toolbar.textCounterCw": "Angle Counterclockwise",
"SSE.Views.Toolbar.textDelLeft": "Shift Cells Left", "SSE.Views.Toolbar.textDelLeft": "Shift Cells Left",
"SSE.Views.Toolbar.textDelUp": "Shift Cells Up", "SSE.Views.Toolbar.textDelUp": "Shift Cells Up",
@ -2275,8 +2288,8 @@
"SSE.Views.Toolbar.textLandscape": "Landscape", "SSE.Views.Toolbar.textLandscape": "Landscape",
"SSE.Views.Toolbar.textLeft": "Left: ", "SSE.Views.Toolbar.textLeft": "Left: ",
"SSE.Views.Toolbar.textLeftBorders": "Left Borders", "SSE.Views.Toolbar.textLeftBorders": "Left Borders",
"SSE.Views.Toolbar.textLine": "Line", "del_SSE.Views.Toolbar.textLine": "Line",
"SSE.Views.Toolbar.textLineSpark": "Line", "del_SSE.Views.Toolbar.textLineSpark": "Line",
"SSE.Views.Toolbar.textManyPages": "pages", "SSE.Views.Toolbar.textManyPages": "pages",
"SSE.Views.Toolbar.textMarginsLast": "Last Custom", "SSE.Views.Toolbar.textMarginsLast": "Last Custom",
"SSE.Views.Toolbar.textMarginsNarrow": "Narrow", "SSE.Views.Toolbar.textMarginsNarrow": "Narrow",
@ -2290,8 +2303,8 @@
"SSE.Views.Toolbar.textOnePage": "page", "SSE.Views.Toolbar.textOnePage": "page",
"SSE.Views.Toolbar.textOutBorders": "Outside Borders", "SSE.Views.Toolbar.textOutBorders": "Outside Borders",
"SSE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "SSE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
"SSE.Views.Toolbar.textPie": "Pie", "del_SSE.Views.Toolbar.textPie": "Pie",
"SSE.Views.Toolbar.textPoint": "XY (Scatter)", "del_SSE.Views.Toolbar.textPoint": "XY (Scatter)",
"SSE.Views.Toolbar.textPortrait": "Portrait", "SSE.Views.Toolbar.textPortrait": "Portrait",
"SSE.Views.Toolbar.textPrint": "Print", "SSE.Views.Toolbar.textPrint": "Print",
"SSE.Views.Toolbar.textPrintOptions": "Print Settings", "SSE.Views.Toolbar.textPrintOptions": "Print Settings",
@ -2300,13 +2313,13 @@
"SSE.Views.Toolbar.textRotateDown": "Rotate Text Down", "SSE.Views.Toolbar.textRotateDown": "Rotate Text Down",
"SSE.Views.Toolbar.textRotateUp": "Rotate Text Up", "SSE.Views.Toolbar.textRotateUp": "Rotate Text Up",
"SSE.Views.Toolbar.textSetPrintArea": "Set Print Area", "SSE.Views.Toolbar.textSetPrintArea": "Set Print Area",
"SSE.Views.Toolbar.textSparks": "Sparklines", "del_SSE.Views.Toolbar.textSparks": "Sparklines",
"SSE.Views.Toolbar.textStock": "Stock", "del_SSE.Views.Toolbar.textStock": "Stock",
"SSE.Views.Toolbar.textStrikeout": "Strikeout", "SSE.Views.Toolbar.textStrikeout": "Strikeout",
"SSE.Views.Toolbar.textSubscript": "Subscript", "SSE.Views.Toolbar.textSubscript": "Subscript",
"SSE.Views.Toolbar.textSubSuperscript": "Subscript/Superscript", "SSE.Views.Toolbar.textSubSuperscript": "Subscript/Superscript",
"SSE.Views.Toolbar.textSuperscript": "Superscript", "SSE.Views.Toolbar.textSuperscript": "Superscript",
"SSE.Views.Toolbar.textSurface": "Surface", "del_SSE.Views.Toolbar.textSurface": "Surface",
"SSE.Views.Toolbar.textTabCollaboration": "Collaboration", "SSE.Views.Toolbar.textTabCollaboration": "Collaboration",
"SSE.Views.Toolbar.textTabData": "Data", "SSE.Views.Toolbar.textTabData": "Data",
"SSE.Views.Toolbar.textTabFile": "File", "SSE.Views.Toolbar.textTabFile": "File",
@ -2319,7 +2332,7 @@
"SSE.Views.Toolbar.textTopBorders": "Top Borders", "SSE.Views.Toolbar.textTopBorders": "Top Borders",
"SSE.Views.Toolbar.textUnderline": "Underline", "SSE.Views.Toolbar.textUnderline": "Underline",
"SSE.Views.Toolbar.textWidth": "Width", "SSE.Views.Toolbar.textWidth": "Width",
"SSE.Views.Toolbar.textWinLossSpark": "Win/Loss", "del_SSE.Views.Toolbar.textWinLossSpark": "Win/Loss",
"SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.textZoom": "Zoom",
"SSE.Views.Toolbar.tipAlignBottom": "Align bottom", "SSE.Views.Toolbar.tipAlignBottom": "Align bottom",
"SSE.Views.Toolbar.tipAlignCenter": "Align center", "SSE.Views.Toolbar.tipAlignCenter": "Align center",

13
apps/spreadsheeteditor/main/locale/ru.json
View file

@ -2,6 +2,19 @@
"cancelButtonText": "Отмена", "cancelButtonText": "Отмена",
"Common.Controllers.Chat.notcriticalErrorTitle": "Предупреждение", "Common.Controllers.Chat.notcriticalErrorTitle": "Предупреждение",
"Common.Controllers.Chat.textEnterMessage": "Введите здесь своё сообщение", "Common.Controllers.Chat.textEnterMessage": "Введите здесь своё сообщение",
"Common.define.chartData.textArea": "С областями",
"Common.define.chartData.textBar": "Линейчатая",
"Common.define.chartData.textCharts": "Диаграммы",
"Common.define.chartData.textColumn": "Гистограмма",
"Common.define.chartData.textLine": "График",
"Common.define.chartData.textPie": "Круговая",
"Common.define.chartData.textPoint": "Точечная",
"Common.define.chartData.textStock": "Биржевая",
"Common.define.chartData.textSurface": "Поверхность",
"Common.define.chartData.textSparks": "Спарклайны",
"Common.define.chartData.textColumnSpark": "Гистограмма",
"Common.define.chartData.textLineSpark": "График",
"Common.define.chartData.textWinLossSpark": "Выигрыш/проигрыш",
"Common.UI.ComboBorderSize.txtNoBorders": "Без границ", "Common.UI.ComboBorderSize.txtNoBorders": "Без границ",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ",
"Common.UI.ComboDataView.emptyComboText": "Без стилей", "Common.UI.ComboDataView.emptyComboText": "Без стилей",