Merge branch 'develop' into feature/sse-separator

apps/api/documents/api.js

@@ -109,7 +109,8 @@
                     goback: {
                         url: 'http://...',
                         text: 'Go to London',
-                        blank: true
+                        blank: true,
+                        requestClose: false // if true - goback send onRequestClose event instead opening url
                     },
                     chat: true,
                     comments: true,
@@ -207,6 +208,7 @@
         _config.editorConfig.canRequestSaveAs = _config.events && !!_config.events.onRequestSaveAs;
         _config.editorConfig.canRequestInsertImage = _config.events && !!_config.events.onRequestInsertImage;
         _config.editorConfig.canRequestMailMergeRecipients = _config.events && !!_config.events.onRequestMailMergeRecipients;
+        _config.editorConfig.canRequestCompareFile = _config.events && !!_config.events.onRequestCompareFile;
         _config.frameEditorId = placeholderId;
 
         var onMouseUp = function (evt) {
@@ -576,6 +578,13 @@
             });
         };
 
+        var _setRevisedFile = function(data) {
+            _sendCommand({
+                command: 'setRevisedFile',
+                data: data
+            });
+        };
+
         var _processMouse = function(evt) {
             var r = iframe.getBoundingClientRect();
             var data = {
@@ -620,7 +629,8 @@
             showSharingSettings : _showSharingSettings,
             setSharingSettings  : _setSharingSettings,
             insertImage         : _insertImage,
-            setMailMergeRecipients: _setMailMergeRecipients
+            setMailMergeRecipients: _setMailMergeRecipients,
+            setRevisedFile      : _setRevisedFile
         }
     };
 
@@ -782,7 +792,14 @@
 
         if (config.frameEditorId)
             params += "&frameEditorId=" + config.frameEditorId;
-        
+
+        if (config.editorConfig && config.editorConfig.mode == 'view' ||
+            config.document && config.document.permissions && (config.document.permissions.edit === false && !config.document.permissions.review ))
+            params += "&mode=view";
+
+        if (config.editorConfig && config.editorConfig.customization && !!config.editorConfig.customization.compactHeader)
+            params += "&compact=true";
+
         return params;
     }
 

apps/common/Gateway.js

@@ -118,6 +118,10 @@ if (Common === undefined) {
 
             'setMailMergeRecipients': function(data) {
                 $me.trigger('setmailmergerecipients', data);
+            },
+
+            'setRevisedFile': function(data) {
+                $me.trigger('setrevisedfile', data);
             }
         };
 
@@ -308,6 +312,10 @@ if (Common === undefined) {
                 _postMessage({event:'onRequestMailMergeRecipients'})
             },
 
+            requestCompareFile:  function () {
+                _postMessage({event:'onRequestCompareFile'})
+            },
+
             on: function(event, handler){
                 var localHandler = function(event, data){
                     handler.call(me, data)

apps/common/main/lib/component/Calendar.js

@@ -0,0 +1,491 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+*/
+if (Common === undefined)
+    var Common = {};
+
+define([
+    'common/main/lib/component/BaseView',
+    'common/main/lib/util/utils'
+], function () {
+    'use strict';
+
+    Common.UI.Calendar = Common.UI.BaseView.extend(_.extend({
+
+        template    :
+            _.template([
+                '<div id="calendar" class="calendar-box">',
+                '<div class="calendar-header">',
+                '<div class="top-row">',
+                '<div id="prev-arrow"><button type="button"><i class="arrow-prev img-commonctrl">&nbsp;</i></button></div>',
+                '<div class="title"></div>',
+                '<div id="next-arrow"><button type="button"><i class="arrow-next img-commonctrl">&nbsp;</i></button></div>',
+                '</div>',
+                '<div class="bottom-row">',
+                '</div>',
+                '</div>',
+                '<div class="calendar-content"></div>',
+                '</div>'
+                ].join('')),
+
+        options: {
+            date: undefined,
+            firstday: 0 // 0 - sunday, 1 - monday
+        },
+
+        initialize : function(options) {
+            Common.UI.BaseView.prototype.initialize.call(this, options);
+
+            var me = this;
+
+            this.monthNames = [this.textJanuary, this.textFebruary, this.textMarch, this.textApril, this.textMay, this.textJune, this.textJuly, this.textAugust, this.textSeptember, this.textOctober, this.textNovember, this.textDecember];
+            this.dayNamesShort = [this.textShortSunday, this.textShortMonday, this.textShortTuesday, this.textShortWednesday, this.textShortThursday, this.textShortFriday, this.textShortSaturday];
+            this.monthShortNames = [this.textShortJanuary, this.textShortFebruary, this.textShortMarch, this.textShortApril, this.textShortMay, this.textShortJune, this.textShortJuly, this.textShortAugust, this.textShortSeptember, this.textShortOctober, this.textShortNovember, this.textShortDecember];
+
+            me.options.date = options.date;
+            if (!_.isUndefined(options.firstday) && (options.firstday === 0 || options.firstday === 1)) {
+                me.options.firstday = options.firstday;
+            }
+
+            me.enableKeyEvents= me.options.enableKeyEvents;
+
+            me._state = undefined; // 0 - month, 1 - months, 2 - years
+
+            me.render();
+        },
+
+        render: function () {
+            var me = this;
+            me.cmpEl = me.$el || $(this.el);
+            me.cmpEl.html(this.template());
+
+            me.currentDate = me.options.date || new Date();
+
+            me.btnPrev = new Common.UI.Button({
+                cls: '',
+                iconCls: 'arrow-prev img-commonctrl'
+            });
+            me.btnPrev.render(me.cmpEl.find('#prev-arrow'));
+            me.btnPrev.on('click', _.bind(me.onClickPrev, me));
+
+            me.btnNext = new Common.UI.Button({
+                cls: '',
+                iconCls: 'arrow-next img-commonctrl'
+            });
+            me.btnNext.render(me.cmpEl.find('#next-arrow'));
+            me.btnNext.on('click', _.bind(me.onClickNext, me));
+
+            me.cmpEl.on('keydown', function(e) {
+                me.trigger('calendar:keydown', me, e);
+            });
+
+            me.renderMonth(me.currentDate);
+
+            this.trigger('render:after', this);
+            return this;
+        },
+
+        onClickPrev: function () {
+            var me = this;
+            if (me._state === 0) {
+                var d = new Date(me.currentDate);
+                d.setMonth(d.getMonth() - 1);
+                if (d.getFullYear() > 0) {
+                    me.renderMonth(d);
+                }
+            } else if (me._state === 1) {
+                var d = new Date(me.currentDate);
+                d.setFullYear(d.getFullYear() - 1);
+                if (d.getFullYear() > 0) {
+                    me.renderMonths(d);
+                }
+            } else if (me._state === 2) {
+                var year = me.currentDate.getFullYear(),
+                    newYear;
+                if (year % 10 !== 0) {
+                    newYear = String(year);
+                    newYear = Number(newYear.slice(0, -1) + '0') - 1;
+                } else {
+                    newYear = year - 1;
+                }
+                if (newYear > 0) {
+                    me.currentDate.setFullYear(newYear);
+                    me.renderYears(newYear);
+                }
+            }
+        },
+
+        onClickNext: function () {
+            var me = this;
+            if (me._state === 0) {
+                var d = new Date(me.currentDate);
+                d.setMonth(d.getMonth() + 1);
+                if (d.getFullYear() > 0) {
+                    me.renderMonth(d);
+                }
+            } else if (me._state === 1) {
+                var d = new Date(me.currentDate);
+                d.setFullYear(d.getFullYear() + 1);
+                if (d.getFullYear() > 0) {
+                    me.renderMonths(d);
+                }
+            } else if (me._state === 2) {
+                var year = me.currentDate.getFullYear(),
+                    newYear;
+                if (year % 10 !== 9) {
+                    newYear = String(year);
+                    newYear = Number(newYear.slice(0, -1) + '9') + 1;
+                } else {
+                    newYear = year + 1;
+                }
+                if (newYear > 0) {
+                    me.currentDate.setFullYear(newYear);
+                    me.renderYears(newYear);
+                }
+            }
+        },
+
+        renderYears: function (year) {
+            var me = this,
+                year = _.isNumber(year) ? year : (me.currentDate ? me.currentDate.getFullYear() : new Date().getFullYear());
+
+            me._state = 2;
+
+            var firstYear = year,
+                lastYear = year;
+            if ((firstYear % 10) !== 0) {
+                var strYear = String(year);
+                firstYear = Number(strYear.slice(0, -1) + '0');
+            }
+            if ((lastYear % 10) !== 9) {
+                var strYear = String(year);
+                lastYear = Number(strYear.slice(0, -1) + '9');
+            }
+
+            me.topTitle = _.template([
+                '<label>' + firstYear + '-' + lastYear + '</label>'
+            ].join(''));
+            me.cmpEl.find('.calendar-header .title').html(me.topTitle);
+
+            me.bottomTitle = _.template([
+                '<label>' + me.textYears + '</label>'
+            ].join(''));
+            me.cmpEl.find('.calendar-header .bottom-row').html(me.bottomTitle);
+
+            var arrYears = [];
+            var tmpYear = firstYear - 3;
+
+            for (var i = 0; i < 16; i++) {
+                arrYears.push({
+                    year: (tmpYear > 0) ? tmpYear : '',
+                    isCurrentDecade: ((tmpYear >= firstYear) && (tmpYear <= lastYear)) ? true : false,
+                    disabled: (tmpYear > 0) ? false : true,
+                    selected: (_.isDate(me.selectedDate)) ?
+                        (tmpYear === me.selectedDate.getFullYear()) :
+                        (tmpYear === new Date().getFullYear())
+                });
+                tmpYear++;
+            }
+
+            if (!me.yearPicker) {
+                me.yearPicker = new Common.UI.DataView({
+                    el: me.cmpEl.find('.calendar-content'),
+                    store: new Common.UI.DataViewStore(arrYears),
+                    itemTemplate: _.template('<div class="name-year <% if (!isCurrentDecade) { %> no-current-decade <% } %>" data-year="<%= year %>"><%= year %></div>')
+                });
+                me.yearPicker.on('item:click', function (picker, item, record, e) {
+                    var year = record.get('year'),
+                        date = new Date();
+                    date.setFullYear(year);
+                    me.renderMonths(date);
+                });
+                me.enableKeyEvents && this.yearPicker.on('item:keydown', function(view, record, e) {
+                    if (e.keyCode==Common.UI.Keys.ESC) {
+                        Common.NotificationCenter.trigger('dataview:blur');
+                    }
+                });
+            } else
+                me.yearPicker.store.reset(arrYears);
+
+            me.enableKeyEvents && _.delay(function() {
+                me.monthPicker.cmpEl.find('.dataview').focus();
+            }, 10);
+        },
+
+        renderMonths: function (date) {
+            var me = this,
+                curDate = (_.isDate(date)) ? date : (me.currentDate ? me.currentDate : new Date()),
+                year = curDate.getFullYear();
+
+            me._state = 1;
+            me.currentDate = curDate;
+
+            // Number of year
+            me.topTitle = _.template([
+                '<div class="button"><label>' + year + '</label></div>'
+            ].join(''));
+            me.cmpEl.find('.calendar-header .title').html(me.topTitle);
+            me.cmpEl.find('.calendar-header .title').off();
+            me.cmpEl.find('.calendar-header .title').on('click', _.bind(me.renderYears, me));
+
+            me.bottomTitle = _.template([
+                '<label>' + me.textMonths + '</label>'
+            ].join(''));
+            me.cmpEl.find('.calendar-header .bottom-row').html(me.bottomTitle);
+
+            var arrMonths = [];
+            var today = new Date();
+
+            for (var ind = 0; ind < 12; ind++) {
+                arrMonths.push({
+                    indexMonth: ind,
+                    nameMonth: me.monthShortNames[ind],
+                    year: year,
+                    curYear: true,
+                    isCurrentMonth: (ind === curDate.getMonth()),
+                    selected: (_.isDate(me.selectedDate)) ?
+                        (ind === me.selectedDate.getMonth() && year === me.selectedDate.getFullYear()) :
+                        (ind === today.getMonth() && year === today.getFullYear())
+                });
+            }
+            year = year + 1;
+            for (var ind = 0; ind < 4; ind++) {
+                arrMonths.push({
+                    indexMonth: ind,
+                    nameMonth: me.monthShortNames[ind],
+                    year: year,
+                    curYear: false,
+                    selected: (_.isDate(me.selectedDate)) ?
+                        (ind === me.selectedDate.getMonth() && year === me.selectedDate.getFullYear()) :
+                        (ind === today.getMonth() && year === today.getFullYear())
+                });
+            }
+
+            if (!me.monthsPicker) {
+                me.monthsPicker = new Common.UI.DataView({
+                    el: me.cmpEl.find('.calendar-content'),
+                    store: new Common.UI.DataViewStore(arrMonths),
+                    itemTemplate: _.template('<div class="name-month <% if (!curYear) { %> no-cur-year <% } %>" data-month="<%= indexMonth %>" data-year="<%= year %>"><%= nameMonth %></div>')
+                });
+                me.monthsPicker.on('item:click', function (picker, item, record, e) {
+                    var month = record.get('indexMonth'),
+                        year = record.get('year'),
+                        date = new Date();
+                    date.setFullYear(year, month);
+                    me.renderMonth(date);
+                });
+                me.enableKeyEvents && this.monthsPicker.on('item:keydown', function(view, record, e) {
+                    if (e.keyCode==Common.UI.Keys.ESC) {
+                        Common.NotificationCenter.trigger('dataview:blur');
+                    }
+                });
+            } else
+                me.monthsPicker.store.reset(arrMonths);
+
+            me.enableKeyEvents && _.delay(function() {
+                me.monthPicker.cmpEl.find('.dataview').focus();
+            }, 10);
+        },
+
+        renderMonth: function (date) {
+            var me = this;
+            me._state = 0;
+            var firstDay = me.options.firstday;
+
+            // Current date
+            var curDate = date || new Date(),
+                curMonth = curDate.getMonth(),
+                curIndexDayInWeek = curDate.getDay(),
+                curNumberDayInMonth = curDate.getDate(),
+                curYear = curDate.getFullYear();
+
+            me.currentDate = curDate;
+
+            // Name month
+            me.topTitle = _.template([
+                '<div class="button">',
+                '<label>' + me.monthNames[curMonth] + ' ' + curYear + '</label>',
+                '</div>'
+            ].join(''));
+            me.cmpEl.find('.calendar-header .title').html(me.topTitle);
+            me.cmpEl.find('.calendar-header .title').off();
+            me.cmpEl.find('.calendar-header .title').on('click', _.bind(me.renderMonths, me));
+
+            // Name days of week
+            var dayNamesTemplate = '';
+            for (var i = firstDay; i < 7; i++) {
+                dayNamesTemplate += '<label>' + me.dayNamesShort[i] + '</label>';
+            }
+            if (firstDay > 0) {
+                dayNamesTemplate += '<label>' + me.dayNamesShort[0] + '</label>';
+            }
+            me.cmpEl.find('.calendar-header .bottom-row').html(_.template(dayNamesTemplate));
+
+            // Month
+            var rows = 6,
+                cols = 7;
+
+            var arrDays = [];
+
+            var d = new Date(curDate);
+            d.setDate(1);
+            var firstDayOfMonthIndex = d.getDay();
+
+            var daysInPrevMonth = me.daysInMonth(d.getTime() - (10 * 24 * 60 * 60 * 1000)),
+                numberDay,
+                month,
+                year;
+            if (firstDay === 0) {
+                numberDay = (firstDayOfMonthIndex > 0) ? (daysInPrevMonth - (firstDayOfMonthIndex - 1)) : 1;
+            } else {
+                if (firstDayOfMonthIndex === 0) {
+                    numberDay = daysInPrevMonth - 5;
+                } else {
+                    numberDay = daysInPrevMonth - (firstDayOfMonthIndex - 2);
+                }
+            }
+            if ((firstDayOfMonthIndex > 0 && firstDay === 0) || firstDay === 1) {
+                if (curMonth - 1 >= 0) {
+                    month = curMonth - 1;
+                    year = curYear;
+                } else {
+                    month = 11;
+                    year = curYear - 1;
+                }
+            } else {
+                month = curMonth;
+                year = curYear;
+            }
+
+            var tmp = new Date();
+            tmp.setFullYear(year, month, numberDay);
+            var today = new Date();
+
+            for(var r = 0; r < rows; r++) {
+                for(var c = 0; c < cols; c++) {
+                    var tmpDay = tmp.getDay(),
+                        tmpNumber = tmp.getDate(),
+                        tmpMonth = tmp.getMonth(),
+                        tmpYear = tmp.getFullYear();
+                    arrDays.push({
+                        indexInWeek: tmpDay,
+                        dayNumber: tmpNumber,
+                        month: tmpMonth,
+                        year: tmpYear,
+                        isCurrentMonth: tmpMonth === curMonth,
+                        selected: (_.isDate(me.selectedDate)) ?
+                            (tmpNumber === me.selectedDate.getDate() && tmpMonth === me.selectedDate.getMonth() && tmpYear === me.selectedDate.getFullYear()) :
+                            (tmpNumber === today.getDate() && tmpMonth === today.getMonth() && tmpYear === today.getFullYear())
+                    });
+                    tmp.setDate(tmpNumber + 1);
+                }
+            }
+
+            if (!me.monthPicker) {
+                me.monthPicker = new Common.UI.DataView({
+                    el: me.cmpEl.find('.calendar-content'),
+                    store: new Common.UI.DataViewStore(arrDays),
+                    itemTemplate: _.template('<div class="number-day<% if (indexInWeek === 6 || indexInWeek === 0) { %> weekend<% } %><% if (!isCurrentMonth) { %> no-current-month<% } %>" data-number="<%= dayNumber %>" data-month="<%= month %>" data-year="<%= year %>"><%= dayNumber %></div>')
+                });
+                me.monthPicker.on('item:click', function(picker, item, record, e) {
+                    var day = record.get('dayNumber'),
+                        month = record.get('month'),
+                        year = record.get('year');
+                    if (_.isUndefined(me.selectedDate)) {
+                        me.selectedDate = new Date();
+                    }
+                    me.selectedDate.setFullYear(year, month, day);
+                    me.trigger('date:click', me, me.selectedDate);
+                });
+                me.enableKeyEvents && this.monthPicker.on('item:keydown', function(view, record, e) {
+                    if (e.keyCode==Common.UI.Keys.ESC) {
+                        Common.NotificationCenter.trigger('dataview:blur');
+                    }
+                });
+            } else
+                me.monthPicker.store.reset(arrDays);
+
+            me.enableKeyEvents && _.delay(function() {
+                me.monthPicker.cmpEl.find('.dataview').focus();
+            }, 10);
+        },
+
+        daysInMonth: function (date) {
+            var d;
+            d = date ? new Date(date) : new Date();
+            var result = new Date();
+            result.setFullYear(d.getFullYear(), d.getMonth() + 1, 0);
+            return result.getDate();
+        },
+
+        setDate: function (date) {
+            if (_.isDate(date)) {
+                this.selectedDate = new Date(date);
+                this.renderMonth(this.selectedDate);
+            }
+        },
+
+        textJanuary: 'January',
+        textFebruary: 'February',
+        textMarch: 'March',
+        textApril: 'April',
+        textMay: 'May',
+        textJune: 'June',
+        textJuly: 'July',
+        textAugust: 'August',
+        textSeptember: 'September',
+        textOctober: 'October',
+        textNovember: 'November',
+        textDecember: 'December',
+        textShortJanuary: 'Jan',
+        textShortFebruary: 'Feb',
+        textShortMarch: 'Mar',
+        textShortApril: 'Apr',
+        textShortMay: 'May',
+        textShortJune: 'Jun',
+        textShortJuly: 'Jul',
+        textShortAugust: 'Aug',
+        textShortSeptember: 'Sep',
+        textShortOctober: 'Oct',
+        textShortNovember: 'Nov',
+        textShortDecember: 'Dec',
+        textShortSunday: 'Su',
+        textShortMonday: 'Mo',
+        textShortTuesday: 'Tu',
+        textShortWednesday: 'We',
+        textShortThursday: 'Th',
+        textShortFriday: 'Fr',
+        textShortSaturday: 'Sa',
+        textMonths: 'Months',
+        textYears: 'Years'
+    }, Common.UI.Calendar || {}));
+});

apps/common/main/lib/component/ComboBox.js

@@ -348,6 +348,8 @@ define([
                     this.onAfterHideMenu(e);
                     return false;
                 }  else if (this.search && e.keyCode > 64 && e.keyCode < 91 && e.key){
+                    if (typeof this._search !== 'object') return;
+
                     var me = this;
                     clearTimeout(this._search.timer);
                     this._search.timer = setTimeout(function () { me._search = {}; }, 1000);

apps/common/main/lib/component/DimensionPicker.js

@@ -47,31 +47,6 @@ define([
     'use strict';
 
     Common.UI.DimensionPicker = Common.UI.BaseView.extend((function(){
-        var me,
-            rootEl,
-            areaMouseCatcher,
-            areaUnHighLighted,
-            areaHighLighted,
-            areaStatus,
-            curColumns = 0,
-            curRows = 0;
-
-        var onMouseMove = function(event){
-            me.setTableSize(
-                Math.ceil((event.offsetX === undefined ? event.originalEvent.layerX : event.offsetX*Common.Utils.zoom()) / me.itemSize),
-                Math.ceil((event.offsetY === undefined ? event.originalEvent.layerY : event.offsetY*Common.Utils.zoom()) / me.itemSize),
-                event
-            );
-        };
-
-        var onMouseLeave = function(event){
-            me.setTableSize(0, 0, event);
-        };
-
-        var onHighLightedMouseClick = function(e){
-            me.trigger('select', me, curColumns, curRows, e);
-        };
-
         return {
             options: {
                 itemSize    : 18,
@@ -95,9 +70,13 @@ define([
             initialize : function(options) {
                 Common.UI.BaseView.prototype.initialize.call(this, options);
 
-                me = this;
+                var me = this;
 
-                rootEl = me.$el || $(this.el);
+                this.render();
+
+                this.cmpEl = me.$el || $(this.el);
+
+                var rootEl = this.cmpEl;
 
                 me.itemSize    = me.options.itemSize;
                 me.minRows     = me.options.minRows;
@@ -105,31 +84,48 @@ define([
                 me.maxRows     = me.options.maxRows;
                 me.maxColumns  = me.options.maxColumns;
 
-                this.render();
+                me.curColumns = 0;
+                me.curRows = 0;
+
+                var onMouseMove = function(event){
+                    me.setTableSize(
+                        Math.ceil((event.offsetX === undefined ? event.originalEvent.layerX : event.offsetX*Common.Utils.zoom()) / me.itemSize),
+                        Math.ceil((event.offsetY === undefined ? event.originalEvent.layerY : event.offsetY*Common.Utils.zoom()) / me.itemSize),
+                        event
+                    );
+                };
+
+                var onMouseLeave = function(event){
+                    me.setTableSize(0, 0, event);
+                };
+
+                var onHighLightedMouseClick = function(e){
+                    me.trigger('select', me, me.curColumns, me.curRows, e);
+                };
 
                 if (rootEl){
-                    areaMouseCatcher    = rootEl.find('.dimension-picker-mousecatcher');
-                    areaUnHighLighted   = rootEl.find('.dimension-picker-unhighlighted');
-                    areaHighLighted     = rootEl.find('.dimension-picker-highlighted');
-                    areaStatus          = rootEl.find('.dimension-picker-status');
+                    var areaMouseCatcher    = rootEl.find('.dimension-picker-mousecatcher');
+                    me.areaUnHighLighted   = rootEl.find('.dimension-picker-unhighlighted');
+                    me.areaHighLighted     = rootEl.find('.dimension-picker-highlighted');
+                    me.areaStatus          = rootEl.find('.dimension-picker-status');
 
                     rootEl.css({width: me.minColumns + 'em'});
                     areaMouseCatcher.css('z-index', 1);
                     areaMouseCatcher.width(me.maxColumns + 'em').height(me.maxRows + 'em');
-                    areaUnHighLighted.width(me.minColumns + 'em').height(me.minRows + 'em');
-                    areaStatus.html(curColumns + ' x ' + curRows);
-                    areaStatus.width(areaUnHighLighted.width());
-                }
+                    me.areaUnHighLighted.width(me.minColumns + 'em').height(me.minRows + 'em');
+                    me.areaStatus.html(me.curColumns + ' x ' + me.curRows);
+                    me.areaStatus.width(me.areaUnHighLighted.width());
 
-                areaMouseCatcher.on('mousemove', onMouseMove);
-                areaHighLighted.on('mousemove', onMouseMove);
-                areaUnHighLighted.on('mousemove', onMouseMove);
-                areaMouseCatcher.on('mouseleave', onMouseLeave);
-                areaHighLighted.on('mouseleave', onMouseLeave);
-                areaUnHighLighted.on('mouseleave', onMouseLeave);
-                areaMouseCatcher.on('click', onHighLightedMouseClick);
-                areaHighLighted.on('click', onHighLightedMouseClick);
-                areaUnHighLighted.on('click', onHighLightedMouseClick);
+                    areaMouseCatcher.on('mousemove', onMouseMove);
+                    me.areaHighLighted.on('mousemove', onMouseMove);
+                    me.areaUnHighLighted.on('mousemove', onMouseMove);
+                    areaMouseCatcher.on('mouseleave', onMouseLeave);
+                    me.areaHighLighted.on('mouseleave', onMouseLeave);
+                    me.areaUnHighLighted.on('mouseleave', onMouseLeave);
+                    areaMouseCatcher.on('click', onHighLightedMouseClick);
+                    me.areaHighLighted.on('click', onHighLightedMouseClick);
+                    me.areaUnHighLighted.on('click', onHighLightedMouseClick);
+                }
             },
 
             render: function() {
@@ -142,38 +138,38 @@ define([
                 if (columns > this.maxColumns)  columns = this.maxColumns;
                 if (rows > this.maxRows)        rows = this.maxRows;
 
-                if (curColumns != columns || curRows != rows){
-                    curColumns  = columns;
-                    curRows     = rows;
+                if (this.curColumns != columns || this.curRows != rows){
+                    this.curColumns  = columns;
+                    this.curRows     = rows;
 
-                    areaHighLighted.width(curColumns + 'em').height(curRows + 'em');
-                    areaUnHighLighted.width(
-                        ((curColumns < me.minColumns)
-                            ? me.minColumns
-                            : ((curColumns + 1 > me.maxColumns)
-                            ? me.maxColumns
-                            : curColumns + 1)) + 'em'
-                    ).height(((curRows < me.minRows)
-                            ? me.minRows
-                            : ((curRows + 1 > me.maxRows)
-                            ? me.maxRows
-                            : curRows + 1)) + 'em'
+                    this.areaHighLighted.width(this.curColumns + 'em').height(this.curRows + 'em');
+                    this.areaUnHighLighted.width(
+                        ((this.curColumns < this.minColumns)
+                            ? this.minColumns
+                            : ((this.curColumns + 1 > this.maxColumns)
+                            ? this.maxColumns
+                            : this.curColumns + 1)) + 'em'
+                    ).height(((this.curRows < this.minRows)
+                            ? this.minRows
+                            : ((this.curRows + 1 > this.maxRows)
+                            ? this.maxRows
+                            : this.curRows + 1)) + 'em'
                     );
 
-                    rootEl.width(areaUnHighLighted.width());
-                    areaStatus.html(curColumns + ' x ' + curRows);
-                    areaStatus.width(areaUnHighLighted.width());
+                    this.cmpEl.width(this.areaUnHighLighted.width());
+                    this.areaStatus.html(this.curColumns + ' x ' + this.curRows);
+                    this.areaStatus.width(this.areaUnHighLighted.width());
 
-                    me.trigger('change', me, curColumns, curRows, event);
+                    this.trigger('change', this, this.curColumns, this.curRows, event);
                 }
             },
 
             getColumnsCount: function() {
-                return curColumns;
+                return this.curColumns;
             },
 
             getRowsCount: function() {
-                return curRows;
+                return this.curRows;
             }
         }
     })())

apps/common/main/lib/component/Tab.js

@@ -52,7 +52,7 @@ define([
         this.label      = 'Tab';
         this.cls        = '';
         this.template   = _.template(['<li class="<% if(active){ %>active selected<% } %> <% if(cls.length){%><%= cls %><%}%>" data-label="<%= label %>">',
-                                            '<a><%- label %></a>',
+                                            '<a title="<%= label %>"><%- label %></a>',
                                         '</li>'].join(''));
 
         this.initialize.call(this, opts);

apps/common/main/lib/controller/ReviewChanges.js

@@ -78,7 +78,8 @@ define([
                     'reviewchange:reject':      _.bind(this.onRejectClick, this),
                     'reviewchange:delete':      _.bind(this.onDeleteClick, this),
                     'reviewchange:preview':     _.bind(this.onBtnPreviewClick, this),
-                    'reviewchanges:view':       _.bind(this.onReviewViewClick, this),
+                    'reviewchange:view':        _.bind(this.onReviewViewClick, this),
+                    'reviewchange:compare':     _.bind(this.onCompareClick, this),
                     'lang:document':            _.bind(this.onDocLanguage, this),
                     'collaboration:coauthmode': _.bind(this.onCoAuthMode, this)
                 },
@@ -99,7 +100,7 @@ define([
             this.collection     =   this.getApplication().getCollection('Common.Collections.ReviewChanges');
             this.userCollection =   this.getApplication().getCollection('Common.Collections.Users');
 
-            this._state = {posx: -1000, posy: -1000, popoverVisible: false, previewMode: false};
+            this._state = {posx: -1000, posy: -1000, popoverVisible: false, previewMode: false, compareSettings: null /*new AscCommon.CComparisonPr()*/};
 
             Common.NotificationCenter.on('reviewchanges:turn', this.onTurnPreview.bind(this));
             Common.NotificationCenter.on('spelling:turn', this.onTurnSpelling.bind(this));
@@ -127,8 +128,13 @@ define([
                 if (this.appConfig.canReview || this.appConfig.canViewReview) {
                     this.api.asc_registerCallback('asc_onShowRevisionsChange', _.bind(this.onApiShowChange, this));
                     this.api.asc_registerCallback('asc_onUpdateRevisionsChangesPosition', _.bind(this.onApiUpdateChangePosition, this));
+                    this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this));
+                    this.api.asc_registerCallback('asc_onParticipantsChanged',     _.bind(this.onAuthParticipantsChanged, this));
                 }
+                this.api.asc_registerCallback('asc_onAcceptChangesBeforeCompare',_.bind(this.onAcceptChangesBeforeCompare, this));
                 this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this));
+
+                Common.Gateway.on('setrevisedfile', _.bind(this.setRevisedFile, this));
             }
         },
 
@@ -568,6 +574,84 @@ define([
             Common.NotificationCenter.trigger('edit:complete', this.view);
         },
 
+        onCompareClick: function(item) {
+            if (this.api) {
+                var me = this;
+                if (!this._state.compareSettings) {
+                    this._state.compareSettings = new AscCommonWord.ComparisonOptions();
+                    this._state.compareSettings.putWords(!Common.localStorage.getBool("de-compare-char"));
+                }
+                if (item === 'file') {
+                    if (this.api)
+                        this.api.asc_CompareDocumentFile(this._state.compareSettings);
+                    Common.NotificationCenter.trigger('edit:complete', this.view);
+                } else if (item === 'url') {
+                    (new Common.Views.ImageFromUrlDialog({
+                        title: me.textUrl,
+                        handler: function(result, value) {
+                            if (result == 'ok') {
+                                if (me.api) {
+                                    var checkUrl = value.replace(/ /g, '');
+                                    if (!_.isEmpty(checkUrl)) {
+                                        me.api.asc_CompareDocumentUrl(checkUrl, me._state.compareSettings);
+                                    }
+                                }
+                                Common.NotificationCenter.trigger('edit:complete', me.view);
+                            }
+                        }
+                    })).show();
+                } else if (item === 'storage') {
+                    if (this.appConfig.canRequestCompareFile) {
+                        Common.Gateway.requestCompareFile();
+                    } else {
+                        (new Common.Views.SelectFileDlg({
+                            fileChoiceUrl: this.appConfig.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "DocumentsOnly")
+                        })).on('selectfile', function(obj, file){
+                            me.setRevisedFile(file, me._state.compareSettings);
+                        }).show();
+                    }
+                } else if (item === 'settings') {
+                    (new DE.Views.CompareSettingsDialog({
+                        props: me._state.compareSettings,
+                        handler: function(result, value) {
+                            if (result == 'ok') {
+                                me._state.compareSettings = value;
+                            }
+
+                            Common.NotificationCenter.trigger('edit:complete', me.toolbar);
+                        }
+                    })).show();
+                }
+            }
+            Common.NotificationCenter.trigger('edit:complete', this.view);
+        },
+
+        setRevisedFile: function(data) {
+            if (!this._state.compareSettings) {
+                this._state.compareSettings = new AscCommonWord.ComparisonOptions();
+                this._state.compareSettings.putWords(!Common.localStorage.getBool("de-compare-char"));
+            }
+            if (data && data.url) {
+                this.api.asc_CompareDocumentUrl(data.url, this._state.compareSettings, data.token);// for loading from storage
+            }
+        },
+
+        onAcceptChangesBeforeCompare: function(callback) {
+            var me = this;
+            Common.UI.warning({
+                width: 550,
+                msg: this.textAcceptBeforeCompare,
+                buttons: ['yes', 'no'],
+                primary: 'yes',
+                callback: function(result) {
+                    _.defer(function() {
+                        if (callback) callback(result=='yes');
+                    });
+                    Common.NotificationCenter.trigger('edit:complete', this.view);
+                }
+            });
+        },
+
         turnDisplayMode: function(mode) {
             if (this.api) {
                 if (mode === 'final')
@@ -780,6 +864,17 @@ define([
             });
         },
 
+        onAuthParticipantsChanged: function(users) {
+            if (this.view && this.view.btnCompare) {
+                var length = 0;
+                _.each(users, function(item){
+                    if (!item.asc_getView())
+                        length++;
+                });
+                this.view.btnCompare.setDisabled(length>1 || this.viewmode);
+            }
+        },
+
         commentsShowHide: function(mode) {
             if (!this.view) return;
             var value = Common.Utils.InternalSettings.get(this.view.appPrefix + "settings-livecomment");
@@ -844,6 +939,8 @@ define([
         textTableRowsDel: '<b>Table Rows Deleted<b/>',
         textParaMoveTo: '<b>Moved:</b>',
         textParaMoveFromUp: '<b>Moved Up:</b>',
-        textParaMoveFromDown: '<b>Moved Down:</b>'
+        textParaMoveFromDown: '<b>Moved Down:</b>',
+        textUrl: 'Paste a document URL',
+        textAcceptBeforeCompare: 'In order to compare documents all the tracked changes in them will be considered to have been accepted. Do you want to continue?'
     }, Common.Controllers.ReviewChanges || {}));
 });

apps/common/main/lib/view/ExternalDiagramEditor.js

@@ -88,6 +88,11 @@ define([
             this.$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this));
         },
 
+        show: function() {
+            this.setPlaceholder();
+            Common.UI.Window.prototype.show.apply(this, arguments);
+        },
+
         setChartData: function(data) {
             this._chartData = data;
             if (this._isExternalDocReady)
@@ -143,6 +148,14 @@ define([
             }
         },
 
+        setPlaceholder: function(placeholder) {
+            this._placeholder = placeholder;
+        },
+
+        getPlaceholder: function() {
+            return this._placeholder;
+        },
+
         textSave: 'Save & Exit',
         textClose: 'Close',
         textTitle: 'Chart Editor'

apps/common/main/lib/view/ImageFromUrlDialog.js

@@ -56,7 +56,7 @@ define([
             this.template = [
                 '<div class="box">',
                     '<div class="input-row">',
-                        '<label>' + this.textUrl + '</label>',
+                        '<label>' + (this.options.title || this.textUrl) + '</label>',
                     '</div>',
                     '<div id="id-dlg-url" class="input-row"></div>',
                 '</div>'

apps/common/main/lib/view/InsertTableDialog.js

@@ -110,8 +110,8 @@ define([
         onBtnClick: function(event) {
             if (this.options.handler) {
                 this.options.handler.call(this, event.currentTarget.attributes['result'].value, {
-                    columns : this.udColumns.getValue(),
-                    rows    : this.udRows.getValue()
+                    columns : this.udColumns.getNumberValue(),
+                    rows    : this.udRows.getNumberValue()
                 });
             }
 
@@ -121,8 +121,8 @@ define([
         onPrimary: function() {
             if (this.options.handler) {
                 this.options.handler.call(this, 'ok', {
-                    columns : this.udColumns.getValue(),
-                    rows    : this.udRows.getValue()
+                    columns : this.udColumns.getNumberValue(),
+                    rows    : this.udRows.getNumberValue()
                 });
             }
 

apps/common/main/lib/view/ListSettingsDialog.js

@@ -46,15 +46,16 @@ define([
     'common/main/lib/component/Window',
     'common/main/lib/component/MetricSpinner',
     'common/main/lib/component/ThemeColorPalette',
-    'common/main/lib/component/ColorButton'
+    'common/main/lib/component/ColorButton',
+    'common/main/lib/view/SymbolTableDialog'
 ], function () { 'use strict';
 
     Common.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({
         options: {
             type: 0, // 0 - markers, 1 - numbers
             width: 230,
-            height: 156,
-            style: 'min-width: 230px;',
+            height: 200,
+            style: 'min-width: 240px;',
             cls: 'modal-dlg',
             split: false,
             buttons: ['ok', 'cancel']
@@ -64,20 +65,25 @@ define([
             this.type = options.type || 0;
 
             _.extend(this.options, {
-                title: this.txtTitle,
-                height: this.type==1 ? 190 : 156
+                title: this.txtTitle
             }, options || {});
 
             this.template = [
                 '<div class="box">',
-                    '<div class="input-row">',
+                    '<div class="input-row" style="margin-bottom: 10px;">',
                     '<label class="text" style="width: 70px;">' + this.txtSize + '</label><div id="id-dlg-list-size"></div><label class="text" style="margin-left: 10px;">' + this.txtOfText + '</label>',
                     '</div>',
-                    '<div style="margin-top: 10px;">',
+                    '<div style="margin-bottom: 10px;">',
                     '<label class="text" style="width: 70px;">' + this.txtColor + '</label><div id="id-dlg-list-color" style="display: inline-block;"></div>',
                     '</div>',
+                    '<% if (type == 0) { %>',
+                    '<div class="input-row" style="margin-bottom: 10px;">',
+                    '<label class="text" style="width: 70px;vertical-align: top;">' + this.txtBullet + '</label>',
+                    '<button type="button" class="btn btn-text-default" id="id-dlg-list-edit" style="width:53px;display: inline-block;vertical-align: top;"></button>',
+                    '</div>',
+                    '<% } %>',
                     '<% if (type == 1) { %>',
-                    '<div class="input-row" style="margin-top: 10px;">',
+                    '<div class="input-row" style="margin-bottom: 10px;">',
                     '<label class="text" style="width: 70px;">' + this.txtStart + '</label><div id="id-dlg-list-start"></div>',
                     '</div>',
                     '<% } %>',
@@ -163,6 +169,13 @@ define([
                 }
             });
 
+            this.btnEdit = new Common.UI.Button({
+                el: $window.find('#id-dlg-list-edit'),
+                hint: this.tipChange
+            });
+            this.btnEdit.on('click', _.bind(this.onEditBullet, this));
+            this.btnEdit.cmpEl.css({'font-size': '12px'});
+
             this.afterRender();
         },
 
@@ -186,6 +199,36 @@ define([
             }
         },
 
+        onEditBullet: function() {
+            var me = this,
+                props = me.bulletProps,
+                handler = function(dlg, result, settings) {
+                    if (result == 'ok') {
+                        props.changed = true;
+                        props.code = settings.code;
+                        props.font = settings.font;
+                        props.symbol = settings.symbol;
+                        props.font && me.btnEdit.cmpEl.css('font-family', props.font);
+                        settings.symbol && me.btnEdit.setCaption(settings.symbol);
+                        if (me._changedProps) {
+                            me._changedProps.asc_putBulletFont(props.font);
+                            me._changedProps.asc_putBulletSymbol(props.symbol);
+                        }
+                    }
+                },
+                win = new Common.Views.SymbolTableDialog({
+                    api: me.options.api,
+                    lang: me.options.interfaceLang,
+                    modal: true,
+                    type: 0,
+                    font: props.font,
+                    symbol: props.symbol,
+                    handler: handler
+                });
+            win.show();
+            win.on('symbol:dblclick', handler);
+        },
+
         _handleInput: function(state) {
             if (this.options.handler) {
                 this.options.handler.call(this, state, this._changedProps);
@@ -228,6 +271,12 @@ define([
                     if (!isselected) this.colors.clearSelection();
                 } else
                     this.colors.select(color,true);
+
+                if (this.type==0) {
+                    this.bulletProps = {symbol: props.asc_getBulletSymbol(), font: props.asc_getBulletFont()};
+                    this.bulletProps.font && this.btnEdit.cmpEl.css('font-family', this.bulletProps.font);
+                    this.bulletProps.symbol && this.btnEdit.setCaption(this.bulletProps.symbol);
+                }
             }
             this._changedProps = new Asc.asc_CParagraphProperty();
         },
@@ -237,6 +286,8 @@ define([
         txtColor: 'Color',
         txtOfText: '% of text',
         textNewColor: 'Add New Custom Color',
-        txtStart: 'Start at'
+        txtStart: 'Start at',
+        txtBullet: 'Bullet',
+        tipChange: 'Change bullet'
     }, Common.Views.ListSettingsDialog || {}))
 });

apps/common/main/lib/view/ReviewChanges.js

@@ -80,6 +80,10 @@ define([
                     '<span id="btn-change-reject" class="btn-slot text x-huge"></span>' +
                 '</div>' +
                 '<div class="separator long review"/>' +
+                '<div class="group">' +
+                    '<span id="btn-compare" class="btn-slot text x-huge"></span>' +
+                '</div>' +
+                '<div class="separator long compare"/>' +
                 '<div class="group no-group-mask">' +
                     '<span id="slot-btn-chat" class="btn-slot text x-huge"></span>' +
                 '</div>' +
@@ -116,6 +120,16 @@ define([
                     me.fireEvent('reviewchange:reject', [menu, item]);
                 });
 
+                if (me.appConfig.canFeatureComparison) {
+                    this.btnCompare.on('click', function (e) {
+                        me.fireEvent('reviewchange:compare', ['file']);
+                    });
+
+                    this.btnCompare.menu.on('item:click', function (menu, item, e) {
+                        me.fireEvent('reviewchange:compare', [item.value]);
+                    });
+                }
+
                 this.btnsTurnReview.forEach(function (button) {
                     button.on('click', _click_turnpreview.bind(me));
                 });
@@ -130,7 +144,7 @@ define([
                 });
 
                 this.btnReviewView && this.btnReviewView.menu.on('item:click', function (menu, item, e) {
-                    me.fireEvent('reviewchanges:view', [menu, item]);
+                    me.fireEvent('reviewchange:view', [menu, item]);
                 });
             }
 
@@ -199,6 +213,14 @@ define([
                         iconCls: 'review-deny'
                     });
 
+                    if (this.appConfig.canFeatureComparison)
+                        this.btnCompare = new Common.UI.Button({
+                            cls         : 'btn-toolbar  x-huge icon-top',
+                            caption     : this.txtCompare,
+                            split       : true,
+                            iconCls: 'btn-compare'
+                        });
+
                     this.btnTurnOn = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'btn-ic-review',
@@ -368,6 +390,20 @@ define([
                         );
                         me.btnReject.updateHint([me.tipRejectCurrent, me.txtRejectChanges]);
 
+                        if (config.canFeatureComparison) {
+                            me.btnCompare.setMenu(new Common.UI.Menu({
+                                items: [
+                                    {caption: me.mniFromFile, value: 'file'},
+                                    {caption: me.mniFromUrl, value: 'url'},
+                                    {caption: me.mniFromStorage, value: 'storage'}
+                                    // ,{caption: '--'},
+                                    // {caption: me.mniSettings, value: 'settings'}
+                                ]
+                            }));
+                            me.btnCompare.menu.items[2].setVisible(me.appConfig.canRequestCompareFile || me.appConfig.fileChoiceUrl && me.appConfig.fileChoiceUrl.indexOf("{documentType}")>-1);
+                            me.btnCompare.updateHint(me.tipCompare);
+                        }
+
                         me.btnAccept.setDisabled(config.isReviewOnly);
                         me.btnReject.setDisabled(config.isReviewOnly);
                     }
@@ -442,6 +478,7 @@ define([
                     var separator_sharing = !(me.btnSharing || me.btnCoAuthMode) ? me.$el.find('.separator.sharing') : '.separator.sharing',
                         separator_comments = !(config.canComments && config.canCoAuthoring) ? me.$el.find('.separator.comments') : '.separator.comments',
                         separator_review = !(config.canReview || config.canViewReview) ? me.$el.find('.separator.review') : '.separator.review',
+                        separator_compare = !(config.canReview && config.canFeatureComparison) ? me.$el.find('.separator.compare') : '.separator.compare',
                         separator_chat = !me.btnChat ? me.$el.find('.separator.chat') : '.separator.chat',
                         separator_last;
 
@@ -460,6 +497,11 @@ define([
                     else
                         separator_last = separator_review;
 
+                    if (typeof separator_compare == 'object')
+                        separator_compare.hide().prev('.group').hide();
+                    else
+                        separator_last = separator_compare;
+
                     if (typeof separator_chat == 'object')
                         separator_chat.hide().prev('.group').hide();
                     else
@@ -480,6 +522,7 @@ define([
                 if ( this.appConfig.canReview ) {
                     this.btnAccept.render(this.$el.find('#btn-change-accept'));
                     this.btnReject.render(this.$el.find('#btn-change-reject'));
+                    this.appConfig.canFeatureComparison && this.btnCompare.render(this.$el.find('#btn-compare'));
                     this.btnTurnOn.render(this.$el.find('#btn-review-on'));
                 }
                 this.btnPrev && this.btnPrev.render(this.$el.find('#btn-change-prev'));
@@ -654,6 +697,12 @@ define([
             txtOriginalCap: 'Original',
             strFastDesc: 'Real-time co-editing. All changes are saved automatically.',
             strStrictDesc: 'Use the \'Save\' button to sync the changes you and others make.',
+            txtCompare: 'Compare',
+            tipCompare: 'Compare current document with another one',
+            mniFromFile: 'Document from File',
+            mniFromUrl: 'Document from URL',
+            mniFromStorage: 'Document from Storage',
+            mniSettings: 'Comparison Settings',
             txtCommentRemove: 'Remove',
             tipCommentRemCurrent: 'Remove current comments',
             tipCommentRem: 'Remove comments',

apps/common/main/lib/view/SymbolTableDialog.js

@@ -453,6 +453,15 @@ define([
             var init = (aFontSelects.length<1);
             init && this.initFonts();
 
+            if (options.font) {
+                for(var i = 0; i < aFontSelects.length; ++i){
+                    if(aFontSelects[i].displayValue === options.font){
+                        nCurrentFont = i;
+                        break;
+                    }
+                }
+            }
+
             if (nCurrentFont < 0)
                 nCurrentFont = 0;
 
@@ -477,6 +486,12 @@ define([
                 nCurrentSymbol = aRanges[0].Start;
             }
 
+            if (options.code) {
+                nCurrentSymbol = options.code;
+            } else if (options.symbol) {
+                nCurrentSymbol = this.fixedCharCodeAt(options.symbol, 0);
+            }
+
             if (init && this.options.lang && this.options.lang != 'en') {
                 var me = this;
                 loadTranslation(this.options.lang, function(){
@@ -536,6 +551,7 @@ define([
             for(i = 0; i < aFontSelects.length; ++i){
                 aFontSelects[i].value = i;
             }
+
             if(!oFontsByName[sInitFont]){
                 if(oFontsByName['Cambria Math']){
                     sInitFont = 'Cambria Math';

apps/common/main/resources/less/buttons.less

@@ -400,8 +400,10 @@
             }
         }
         .dropdown-menu {
-            li.disabled {
-                opacity: 0.65;
+            &.scale-menu {
+                li.disabled {
+                    opacity: 0.65;
+                }
             }
         }
     }

apps/common/main/resources/less/calendar.less

@@ -0,0 +1,128 @@
+@calendar-bg-color: @tabs-bg-color;
+
+.calendar-window {
+  border-radius: 0;
+  box-shadow: none;
+}
+.calendar-box {
+  width: 198px;
+  height: 220px;
+  border: 1px solid @calendar-bg-color;
+  .top-row {
+    padding: 0 5px;
+  }
+  .btn {
+    background-color: transparent;
+    border: none;
+    height: 20px;
+    width: 20px;
+    margin-top: 4px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .icon {
+      width: 16px;
+      height: 16px;
+      display: block;
+      position: relative;
+      &.arrow-prev {
+        background-position: -55px -96px;
+      }
+      &.arrow-next {
+        background-position: -52px -112px;
+      }
+    }
+    &:hover {
+      background-color: rgba(255,255,255,0.2);
+      cursor: pointer;
+    }
+  }
+  .calendar-header {
+    height: 50px;
+    background-color: @calendar-bg-color;
+    color: #FFFFFF;
+    .top-row {
+      display: flex;
+      justify-content: space-between;
+    }
+    .bottom-row {
+      display: flex;
+      justify-content: space-around;
+      padding: 0;
+    }
+    .title {
+      width: 100%;
+      margin: 4px 6px 3px 6px;
+      text-align: center;
+      font-size: 13px;
+      label {
+        padding: 2px 10px 0;
+        display: block;
+        font-weight: bold;
+        &:not(:last-of-type) {
+          margin-right: 6px;
+        }
+      }
+      .button {
+        height: 100%;
+        width: 100%;
+        &:hover {
+          background-color: rgba(255,255,255,0.2);
+          cursor: pointer;
+          label {
+            cursor: pointer;
+          }
+        }
+      }
+
+    }
+  }
+  .calendar-content {
+    .item {
+      margin: 0;
+      padding: 0;
+      height: auto;
+      width: auto;
+      box-shadow: none;
+      border: 1px solid #fff;
+      .name-month, .name-year {
+        height: 40px;
+        width: 47px;
+        background-color: #F1F1F1;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-size: 13px;
+      }
+      .number-day {
+        height: 26px;
+        width: 26px;
+        background-color: #F1F1F1;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      &.selected {
+        .number-day, .name-month, .name-year {
+          color: #fff;
+          background-color: #7D858C;
+        }
+      }
+      .weekend {
+        color: #D25252;
+      }
+      .no-current-month, .no-cur-year, .no-current-decade {
+        color: #A5A5A5;
+      }
+      &:not(.disabled):not(.selected) {
+        .number-day, .name-month, .name-year {
+          &:hover {
+            background-color: #D9D9D9;
+          }
+        }
+      }
+
+
+    }
+  }
+}

apps/common/main/resources/less/tabbar.less

@@ -27,6 +27,13 @@
             padding-top: 0;
             padding-bottom: 0;
             white-space: pre-wrap;
+            text-align: center;
+
+            &::after {
+                content: attr(title);
+                font-weight: bold;
+                display: block;
+            }
 
             &:hover, &:focus {
                 background-color: #7a7a7a;

apps/common/main/resources/less/toolbar.less

@@ -533,6 +533,7 @@
 .button-normal-icon(btn-caption,            76, @toolbar-big-icon-size);
 .button-normal-icon(btn-calculation,        80, @toolbar-big-icon-size);
 .button-normal-icon(btn-scale,              81, @toolbar-big-icon-size);
+.button-normal-icon(btn-compare,            82, @toolbar-big-icon-size);
 .button-normal-icon(btn-rem-comment,        83, @toolbar-big-icon-size);
 .button-normal-icon(btn-symbol,             84, @toolbar-big-icon-size);
 

apps/documenteditor/embed/js/ApplicationController.js

@@ -75,7 +75,7 @@ DE.ApplicationController = new(function(){
             $('#editor_sdk').addClass('top');
         }
 
-        if (config.canBackToFolder === false || !(config.customization && config.customization.goback && config.customization.goback.url)) {
+        if (config.canBackToFolder === false || !(config.customization && config.customization.goback && (config.customization.goback.url || config.customization.goback.requestClose && config.canRequestClose))) {
             $('#id-btn-close').hide();
 
             // Hide last separator
@@ -266,8 +266,12 @@ DE.ApplicationController = new(function(){
             });
 
         $('#id-btn-close').on('click', function(){
-            if (config.customization && config.customization.goback && config.customization.goback.url)
-                window.parent.location.href = config.customization.goback.url;
+            if (config.customization && config.customization.goback) {
+                if (config.customization.goback.requestClose && config.canRequestClose)
+                    Common.Gateway.requestClose();
+                else if (config.customization.goback.url)
+                    window.parent.location.href = config.customization.goback.url;
+            }
         });
 
         $('#id-btn-zoom-in').on('click', api.zoomIn.bind(this));

apps/documenteditor/main/app/controller/Links.js

@@ -41,6 +41,7 @@
 
 define([
     'core',
+    'common/main/lib/component/Calendar',
     'documenteditor/main/app/view/Links',
     'documenteditor/main/app/view/NoteSettingsDialog',
     'documenteditor/main/app/view/HyperlinkSettingsDialog',
@@ -129,7 +130,8 @@ define([
                 in_header = false,
                 in_equation = false,
                 in_image = false,
-                in_table = false;
+                in_table = false,
+                frame_pr = null;
 
             while (++i < selectedObjects.length) {
                 type = selectedObjects[i].get_ObjectType();
@@ -137,6 +139,7 @@ define([
 
                 if (type === Asc.c_oAscTypeSelectElement.Paragraph) {
                     paragraph_locked = pr.get_Locked();
+                    frame_pr = pr;
                 } else if (type === Asc.c_oAscTypeSelectElement.Header) {
                     header_locked = pr.get_Locked();
                     in_header = true;
@@ -153,12 +156,19 @@ define([
 
             var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
                 control_plain = (control_props) ? (control_props.get_ContentControlType()==Asc.c_oAscSdtLevelType.Inline) : false;
+            var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : true,
+                rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : true,
+                plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : true,
+                plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : true;
 
-            var need_disable = paragraph_locked || in_equation || in_image || in_header || control_plain;
+            var need_disable = paragraph_locked || in_equation || in_image || in_header || control_plain || rich_edit_lock || plain_edit_lock;
             this.view.btnsNotes.setDisabled(need_disable);
 
             need_disable = paragraph_locked || header_locked || in_header || control_plain;
             this.view.btnBookmarks.setDisabled(need_disable);
+
+            need_disable = in_header || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock;
+            this.view.btnsContents.setDisabled(need_disable);
         },
 
         onApiCanAddHyperlink: function(value) {
@@ -351,8 +361,9 @@ define([
             })).show();
         },
 
-        onShowContentControlsActions: function(action, x, y) {
-            var menu = (action==1) ? this.view.contentsUpdateMenu : this.view.contentsMenu,
+        onShowTOCActions: function(obj, x, y) {
+            var action = obj.button,
+                menu = (action==AscCommon.CCButtonType.Toc) ? this.view.contentsUpdateMenu : this.view.contentsMenu,
                 documentHolderView  = this.getApplication().getController('DocumentHolder').documentHolder,
                 menuContainer = documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)),
                 me = this;
@@ -391,6 +402,155 @@ define([
         onHideContentControlsActions: function() {
             this.view.contentsMenu && this.view.contentsMenu.hide();
             this.view.contentsUpdateMenu && this.view.contentsUpdateMenu.hide();
+            this.view.listControlMenu && this.view.listControlMenu.isVisible() && this.view.listControlMenu.hide();
+            var controlsContainer = this.getApplication().getController('DocumentHolder').documentHolder.cmpEl.find('#calendar-control-container');
+            if (controlsContainer.is(':visible'))
+                controlsContainer.hide();
+        },
+
+        onShowDateActions: function(obj, x, y) {
+            var props = obj.pr,
+                specProps = props.get_DateTimePr(),
+                documentHolderView  = this.getApplication().getController('DocumentHolder').documentHolder,
+                controlsContainer = documentHolderView.cmpEl.find('#calendar-control-container'),
+                me = this;
+
+            this._state.dateObj = props;
+
+            if (controlsContainer.length < 1) {
+                controlsContainer = $('<div id="calendar-control-container" style="position: absolute;z-index: 1000;"><div id="id-document-calendar-control" style="position: fixed; left: -1000px; top: -1000px;"></div></div>');
+                documentHolderView.cmpEl.append(controlsContainer);
+            }
+
+            Common.UI.Menu.Manager.hideAll();
+
+            controlsContainer.css({left: x, top : y});
+            controlsContainer.show();
+
+            if (!this.cmpCalendar) {
+                this.cmpCalendar = new Common.UI.Calendar({
+                    el: documentHolderView.cmpEl.find('#id-document-calendar-control'),
+                    enableKeyEvents: true,
+                    firstday: 1
+                });
+                this.cmpCalendar.on('date:click', function (cmp, date) {
+                    var props = me._state.dateObj,
+                        specProps = props.get_DateTimePr(),
+                        id = props.get_InternalId();
+                    specProps.put_FullDate(new  Date(date));
+                    me.api.asc_SetContentControlProperties(props, id);
+                    controlsContainer.hide();
+                    me.api.asc_UncheckContentControlButtons();
+                });
+                this.cmpCalendar.on('calendar:keydown', function (cmp, e) {
+                    if (e.keyCode==Common.UI.Keys.ESC) {
+                        controlsContainer.hide();
+                        me.api.asc_UncheckContentControlButtons();
+                    }
+                });
+            }
+            this.cmpCalendar.setDate(new Date(specProps ? specProps.get_FullDate() : undefined));
+
+            // align
+            var offset  = controlsContainer.offset(),
+                docW    = Common.Utils.innerWidth(),
+                docH    = Common.Utils.innerHeight() - 10, // Yep, it's magic number
+                menuW   = this.cmpCalendar.cmpEl.outerWidth(),
+                menuH   = this.cmpCalendar.cmpEl.outerHeight(),
+                buttonOffset = 22,
+                left = offset.left - menuW,
+                top  = offset.top;
+            if (top + menuH > docH) {
+                top = docH - menuH;
+                left -= buttonOffset;
+            }
+            if (top < 0)
+                top = 0;
+            if (left + menuW > docW)
+                left = docW - menuW;
+            this.cmpCalendar.cmpEl.css({left: left, top : top});
+
+            documentHolderView._preventClick = true;
+        },
+
+        onShowListActions: function(obj, x, y) {
+            var type = obj.type,
+                props = obj.pr,
+                specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr(),
+                menu = this.view.listControlMenu,
+                documentHolderView  = this.getApplication().getController('DocumentHolder').documentHolder,
+                menuContainer = menu ? documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null,
+                me = this;
+
+            this._state.listObj = props;
+
+            this._fromShowContentControls = true;
+            Common.UI.Menu.Manager.hideAll();
+
+            if (!menu) {
+                this.view.listControlMenu = menu = new Common.UI.Menu({
+                    menuAlign: 'tr-bl',
+                    items: []
+                });
+                menu.on('item:click', function(menu, item) {
+                    setTimeout(function(){
+                        me.api.asc_SelectContentControlListItem(item.value, me._state.listObj.get_InternalId());
+                    }, 1);
+                });
+
+                // Prepare menu container
+                if (!menuContainer || menuContainer.length < 1) {
+                    menuContainer = $(Common.Utils.String.format('<div id="menu-container-{0}" style="position: absolute; z-index: 10000;"><div class="dropdown-toggle" data-toggle="dropdown"></div></div>', menu.id));
+                    documentHolderView.cmpEl.append(menuContainer);
+                }
+
+                menu.render(menuContainer);
+                menu.cmpEl.attr({tabindex: "-1"});
+                menu.on('hide:after', function(){
+                    me.view.listControlMenu.removeAll();
+                    if (!me._fromShowContentControls)
+                        me.api.asc_UncheckContentControlButtons();
+                });
+            }
+            if (specProps) {
+                var count = specProps.get_ItemsCount();
+                for (var i=0; i<count; i++) {
+                    menu.addItem(new Common.UI.MenuItem({
+                        caption     : specProps.get_ItemDisplayText(i),
+                        value       : specProps.get_ItemValue(i)
+                    }));
+                }
+            }
+
+            menuContainer.css({left: x, top : y});
+            menuContainer.attr('data-value', 'prevent-canvas-click');
+            documentHolderView._preventClick = true;
+            menu.show();
+
+            menu.alignPosition();
+            _.delay(function() {
+                menu.cmpEl.focus();
+            }, 10);
+            this._fromShowContentControls = false;
+        },
+
+        onShowContentControlsActions: function(obj, x, y) {
+            var type = obj.type;
+            switch (type) {
+                case Asc.c_oAscContentControlSpecificType.TOC:
+                    this.onShowTOCActions(obj, x, y);
+                    break;
+                case Asc.c_oAscContentControlSpecificType.DateTime:
+                    this.onShowDateActions(obj, x, y);
+                    break;
+                case Asc.c_oAscContentControlSpecificType.Picture:
+                    this.api.asc_addImage(obj);
+                    break;
+                case Asc.c_oAscContentControlSpecificType.DropDownList:
+                case Asc.c_oAscContentControlSpecificType.ComboBox:
+                    this.onShowListActions(obj, x, y);
+                    break;
+            }
         }
 
     }, DE.Controllers.Links || {}));

apps/documenteditor/main/app/controller/Main.js

@@ -341,9 +341,10 @@ define([
                 this.appOptions.mergeFolderUrl  = this.editorConfig.mergeFolderUrl;
                 this.appOptions.saveAsUrl       = this.editorConfig.saveAsUrl;
                 this.appOptions.canAnalytics    = false;
+                this.appOptions.canRequestClose = this.editorConfig.canRequestClose;
                 this.appOptions.customization   = this.editorConfig.customization;
-                this.appOptions.canBackToFolder = (this.editorConfig.canBackToFolder!==false) && (typeof (this.editorConfig.customization) == 'object')
-                                                  && (typeof (this.editorConfig.customization.goback) == 'object') && !_.isEmpty(this.editorConfig.customization.goback.url);
+                this.appOptions.canBackToFolder = (this.editorConfig.canBackToFolder!==false) && (typeof (this.editorConfig.customization) == 'object') && (typeof (this.editorConfig.customization.goback) == 'object')
+                                                  && (!_.isEmpty(this.editorConfig.customization.goback.url) || this.editorConfig.customization.goback.requestClose && this.appOptions.canRequestClose);
                 this.appOptions.canBack         = this.appOptions.canBackToFolder === true;
                 this.appOptions.canPlugins      = false;
                 this.appOptions.canMakeActionLink = this.editorConfig.canMakeActionLink;
@@ -351,8 +352,10 @@ define([
                 this.appOptions.canRequestSendNotify = this.editorConfig.canRequestSendNotify;
                 this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs;
                 this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage;
+                this.appOptions.canRequestCompareFile = this.editorConfig.canRequestCompareFile;
                 this.appOptions.canRequestMailMergeRecipients = this.editorConfig.canRequestMailMergeRecipients;
                 this.appOptions.compatibleFeatures = (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compatibleFeatures;
+                this.appOptions.canFeatureComparison = !!this.api.asc_isSupportFeature("comparison");
 
                 appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header');
                 appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '')
@@ -598,7 +601,7 @@ define([
                                                 docId: version.key,
                                                 docIdPrev: docIdPrev,
                                                 selected: false,
-                                                canRestore: this.appOptions.canHistoryRestore,
+                                                canRestore: this.appOptions.canHistoryRestore && this.appOptions.canDownload,
                                                 isRevision: false,
                                                 isVisible: true,
                                                 serverVersion: version.serverVersion
@@ -648,11 +651,16 @@ define([
 
             goBack: function(current) {
                 if ( !Common.Controllers.Desktop.process('goback') ) {
-                    var href = this.appOptions.customization.goback.url;
-                    if (!current && this.appOptions.customization.goback.blank!==false) {
-                        window.open(href, "_blank");
+                    if (this.appOptions.customization.goback.requestClose && this.appOptions.canRequestClose) {
+                        Common.Gateway.requestClose();
+                        // Common.Controllers.Desktop.requestClose();
                     } else {
-                        parent.location.href = href;
+                        var href = this.appOptions.customization.goback.url;
+                        if (!current && this.appOptions.customization.goback.blank!==false) {
+                            window.open(href, "_blank");
+                        } else {
+                            parent.location.href = href;
+                        }
                     }
                 }
             },
@@ -1155,7 +1163,6 @@ define([
                 this.appOptions.isOffline      = this.api.asc_isOffline();
                 this.appOptions.isReviewOnly   = this.permissions.review === true && this.permissions.edit === false;
                 this.appOptions.canRequestEditRights = this.editorConfig.canRequestEditRights;
-                this.appOptions.canRequestClose = this.editorConfig.canRequestClose;
                 this.appOptions.canEdit        = (this.permissions.edit !== false || this.permissions.review === true) && // can edit or review
                                                  (this.editorConfig.canRequestEditRights || this.editorConfig.mode !== 'view') && // if mode=="view" -> canRequestEditRights must be defined
                                                  (!this.appOptions.isReviewOnly || this.appOptions.canLicense); // if isReviewOnly==true -> canLicense must be true
@@ -1387,6 +1394,18 @@ define([
                         config.msg = this.uploadImageFileCountMessage;
                         break;
 
+                    case Asc.c_oAscError.ID.UplDocumentSize:
+                        config.msg = this.uploadDocSizeMessage;
+                        break;
+
+                    case Asc.c_oAscError.ID.UplDocumentExt:
+                        config.msg = this.uploadDocExtMessage;
+                        break;
+
+                    case Asc.c_oAscError.ID.UplDocumentFileCount:
+                        config.msg = this.uploadDocFileCountMessage;
+                        break;
+
                     case Asc.c_oAscError.ID.SplitCellMaxRows:
                         config.msg = this.splitMaxRowsErrorText.replace('%1', errData.get_Value());
                         break;
@@ -2165,7 +2184,7 @@ define([
             uploadImageTextText: 'Uploading image...',
             savePreparingText: 'Preparing to save',
             savePreparingTitle: 'Preparing to save. Please wait...',
-            uploadImageSizeMessage: 'Maximium image size limit exceeded.',
+            uploadImageSizeMessage: 'Maximum image size limit exceeded.',
             uploadImageExtMessage: 'Unknown image format.',
             uploadImageFileCountMessage: 'No images uploaded.',
             reloadButtonText: 'Reload Page',
@@ -2481,6 +2500,9 @@ define([
             txtMainDocOnly: 'Error! Main Document Only.',
             txtNotValidBookmark: 'Error! Not a valid bookmark self-reference.',
             txtNoText: 'Error! No text of specified style in document.',
+            uploadDocSizeMessage: 'Maximum document size limit exceeded.',
+            uploadDocExtMessage: 'Unknown document format.',
+            uploadDocFileCountMessage: 'No documents uploaded.',
             errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.'
         }
     })(), DE.Controllers.Main || {}))

apps/documenteditor/main/app/controller/Toolbar.js

@@ -57,7 +57,8 @@ define([
     'documenteditor/main/app/controller/PageLayout',
     'documenteditor/main/app/view/CustomColumnsDialog',
     'documenteditor/main/app/view/ControlSettingsDialog',
-    'documenteditor/main/app/view/WatermarkSettingsDialog'
+    'documenteditor/main/app/view/WatermarkSettingsDialog',
+    'documenteditor/main/app/view/CompareSettingsDialog'
 ], function () {
     'use strict';
 
@@ -380,7 +381,10 @@ define([
                 this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this));
                 this.api.asc_registerCallback('asc_onShowParaMarks', _.bind(this.onShowParaMarks, this));
                 this.api.asc_registerCallback('asc_onChangeSdtGlobalSettings', _.bind(this.onChangeSdtGlobalSettings, this));
+                this.api.asc_registerCallback('asc_onTextLanguage',         _.bind(this.onTextLanguage, this));
                 Common.NotificationCenter.on('fonts:change',                _.bind(this.onApiChangeFont, this));
+                this.api.asc_registerCallback('asc_onTableDrawModeChanged', _.bind(this.onTableDraw, this));
+                this.api.asc_registerCallback('asc_onTableEraseModeChanged', _.bind(this.onTableErase, this));
             } else if (this.mode.isRestrictedEdit) {
                 this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObjectRestrictedEdit, this));
                 this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
@@ -736,7 +740,11 @@ define([
             if (sh)
                 this.onParagraphColor(sh);
 
-            var need_disable = paragraph_locked || header_locked;
+            var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : true,
+                rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : true,
+                plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : true,
+                plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : true;
+            var need_disable = paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock;
 
             if (this._state.prcontrolsdisable != need_disable) {
                 if (this._state.activated) this._state.prcontrolsdisable = need_disable;
@@ -750,15 +758,18 @@ define([
                 lock_type = (in_control&&control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked,
                 control_plain = (in_control&&control_props) ? (control_props.get_ContentControlType()==Asc.c_oAscSdtLevelType.Inline) : false;
             (lock_type===undefined) && (lock_type = Asc.c_oAscSdtLockType.Unlocked);
+            var content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked;
 
-            if (!paragraph_locked && !header_locked) {
-                toolbar.btnContentControls.menu.items[0].setDisabled(control_plain || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked);
-                toolbar.btnContentControls.menu.items[1].setDisabled(control_plain || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked);
-                toolbar.btnContentControls.menu.items[3].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked);
-                toolbar.btnContentControls.menu.items[5].setDisabled(!in_control);
+            toolbar.btnContentControls.setDisabled(paragraph_locked || header_locked);
+            if (!(paragraph_locked || header_locked)) {
+                var control_disable = control_plain || content_locked;
+                for (var i=0; i<7; i++)
+                    toolbar.btnContentControls.menu.items[i].setDisabled(control_disable);
+                toolbar.btnContentControls.menu.items[8].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked);
+                toolbar.btnContentControls.menu.items[10].setDisabled(!in_control);
             }
 
-            var need_text_disable = paragraph_locked || header_locked || in_chart;
+            var need_text_disable = paragraph_locked || header_locked || in_chart || rich_edit_lock || plain_edit_lock;
             if (this._state.textonlycontrolsdisable != need_text_disable) {
                 if (this._state.activated) this._state.textonlycontrolsdisable = need_text_disable;
                 if (!need_disable) {
@@ -766,7 +777,7 @@ define([
                         item.setDisabled(need_text_disable);
                     }, this);
                 }
-                toolbar.btnCopyStyle.setDisabled(need_text_disable);
+                // toolbar.btnCopyStyle.setDisabled(need_text_disable);
                 toolbar.btnClearStyle.setDisabled(need_text_disable);
             }
 
@@ -792,22 +803,22 @@ define([
             if ( !toolbar.btnDropCap.isDisabled() )
                 toolbar.mnuDropCapAdvanced.setDisabled(disable_dropcapadv);
 
-            need_disable = !can_add_table || header_locked || in_equation || control_plain;
+            need_disable = !can_add_table || header_locked || in_equation || control_plain || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock;
             toolbar.btnInsertTable.setDisabled(need_disable);
 
             need_disable = toolbar.mnuPageNumCurrentPos.isDisabled() && toolbar.mnuPageNumberPosPicker.isDisabled() || control_plain;
             toolbar.mnuInsertPageNum.setDisabled(need_disable);
 
             var in_footnote = this.api.asc_IsCursorInFootnote();
-            need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control;
+            need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control || rich_edit_lock || plain_edit_lock || rich_del_lock;
             toolbar.btnsPageBreak.setDisabled(need_disable);
             toolbar.btnBlankPage.setDisabled(need_disable);
 
-            need_disable = paragraph_locked || header_locked || in_equation || control_plain;
+            need_disable = paragraph_locked || header_locked || in_equation || control_plain || content_locked;
             toolbar.btnInsertShape.setDisabled(need_disable);
             toolbar.btnInsertText.setDisabled(need_disable);
 
-            need_disable = paragraph_locked || header_locked  || in_para && !can_add_image || in_equation || control_plain;
+            need_disable = paragraph_locked || header_locked  || in_para && !can_add_image || in_equation || control_plain || rich_del_lock || plain_del_lock || content_locked;
             toolbar.btnInsertImage.setDisabled(need_disable);
             toolbar.btnInsertTextArt.setDisabled(need_disable || in_footnote);
 
@@ -816,28 +827,28 @@ define([
                 this._state.in_chart = in_chart;
             }
 
-            need_disable = in_chart && image_locked || !in_chart && need_disable || control_plain;
+            need_disable = in_chart && image_locked || !in_chart && need_disable || control_plain || rich_del_lock || plain_del_lock || content_locked;
             toolbar.btnInsertChart.setDisabled(need_disable);
 
-            need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation || control_plain;
+            need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation || control_plain || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock;
             toolbar.btnInsertEquation.setDisabled(need_disable);
 
-            toolbar.btnInsertSymbol.setDisabled(!in_para || paragraph_locked || header_locked);
+            toolbar.btnInsertSymbol.setDisabled(!in_para || paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock);
 
-            need_disable = paragraph_locked || header_locked || in_equation;
+            need_disable = paragraph_locked || header_locked || in_equation || rich_edit_lock || plain_edit_lock;
             toolbar.btnSuperscript.setDisabled(need_disable);
             toolbar.btnSubscript.setDisabled(need_disable);
 
             toolbar.btnEditHeader.setDisabled(in_equation);
 
-            need_disable = paragraph_locked || header_locked || in_image || control_plain;
+            need_disable = paragraph_locked || header_locked || in_image || control_plain || rich_edit_lock || plain_edit_lock;
             if (need_disable != toolbar.btnColumns.isDisabled())
                 toolbar.btnColumns.setDisabled(need_disable);
 
             if (toolbar.listStylesAdditionalMenuItem && (frame_pr===undefined) !== toolbar.listStylesAdditionalMenuItem.isDisabled())
                 toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined);
 
-            need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked;
+            need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked || rich_del_lock || rich_edit_lock || plain_del_lock || plain_edit_lock;
             if (this.mode.compatibleFeatures) {
                 need_disable = need_disable || in_image;
             }
@@ -854,6 +865,13 @@ define([
             this.modeAlwaysSetStyle = false;
         },
 
+        onTableDraw: function(v) {
+            this.toolbar.mnuInsertTable && this.toolbar.mnuInsertTable.items[2].setChecked(!!v, true);
+        },
+        onTableErase: function(v) {
+            this.toolbar.mnuInsertTable && this.toolbar.mnuInsertTable.items[3].setChecked(!!v, true);
+        },
+
         onApiParagraphStyleChange: function(name) {
             if (this._state.prstyle != name) {
                 var listStyle = this.toolbar.listStyles,
@@ -1410,6 +1428,12 @@ define([
                         Common.NotificationCenter.trigger('edit:complete', me.toolbar);
                     }
                 })).show();
+            } else if (item.value == 'draw') {
+                item.isChecked() && menu.items[3].setChecked(false, true);
+                this.api.SetTableDrawMode(item.isChecked());
+            } else if (item.value == 'erase') {
+                item.isChecked() && menu.items[2].setChecked(false, true);
+                this.api.SetTableEraseMode(item.isChecked());
             }
         },
 
@@ -1733,6 +1757,8 @@ define([
                             (new DE.Views.ControlSettingsDialog({
                                 props: props,
                                 api: me.api,
+                                controlLang: me._state.lang,
+                                interfaceLang: me.mode.lang,
                                 handler: function(result, value) {
                                     if (result == 'ok') {
                                         me.api.asc_SetContentControlProperties(value, id);
@@ -1749,7 +1775,17 @@ define([
                     }
                 }
             } else {
-                this.api.asc_AddContentControl(item.value);
+                if (item.value == 'plain' || item.value == 'rich')
+                    this.api.asc_AddContentControl((item.value=='plain') ? Asc.c_oAscSdtLevelType.Inline : Asc.c_oAscSdtLevelType.Block);
+                else if (item.value == 'picture')
+                    this.api.asc_AddContentControlPicture();
+                else if (item.value == 'checkbox')
+                    this.api.asc_AddContentControlCheckBox();
+                else if (item.value == 'date')
+                    this.api.asc_AddContentControlDatePicker();
+                else if (item.value == 'combobox' || item.value == 'dropdown')
+                    this.api.asc_AddContentControlList(item.value == 'combobox');
+
                 Common.component.Analytics.trackEvent('ToolBar', 'Add Content Control');
             }
 
@@ -2952,6 +2988,10 @@ define([
             }
         },
 
+        onTextLanguage: function(langId) {
+            this._state.lang = langId;
+        },
+
         textEmptyImgUrl                            : 'You need to specify image URL.',
         textWarning                                : 'Warning',
         textFontSizeErr                            : 'The entered value is incorrect.<br>Please enter a numeric value between 1 and 100',

apps/documenteditor/main/app/template/ControlSettingsDialog.template

@@ -0,0 +1,151 @@
+<div id="id-adv-control-settings-general" class="settings-panel active">
+    <div class="inner-content">
+        <table cols="1" style="width: 100%;">
+            <tr>
+                <td class="padding-small">
+                    <label class="input-label"><%= scope.textName %></label>
+                    <div id="control-settings-txt-name"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-large">
+                    <label class="input-label"><%= scope.textTag %></label>
+                    <div id="control-settings-txt-tag"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-large">
+                    <div class="separator horizontal"></div>
+                </td>
+            </tr>
+        </table>
+        <table cols="2" style="width: auto;">
+            <tr>
+                <td class="padding-small" colspan="2">
+                    <label class="header"><%= scope.textAppearance %></label>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <label class="input-label" style="margin-right: 10px;"><%= scope.textShowAs %></label>
+                </td>
+                <td class="padding-small">
+                    <div id="control-settings-combo-show" class="input-group-nr" style="display: inline-block; width:120px;"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <label class="input-label" style="margin-right: 10px;"><%= scope.textColor %></label>
+                </td>
+                <td class="padding-small">
+                    <div id="control-settings-color-btn" style="display: inline-block;"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-large" colspan="2">
+                    <button type="button" class="btn btn-text-default auto" id="control-settings-btn-all" style="min-width: 98px;"><%= scope.textApplyAll %></button>
+                </td>
+            </tr>
+        </table>
+    </div>
+</div>
+<div id="id-adv-control-settings-lock" class="settings-panel active">
+    <div class="inner-content">
+        <table cols="1" style="width: 100%;">
+            <tr>
+                <td class="padding-small">
+                    <div id="control-settings-chb-lock-delete"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <div id="control-settings-chb-lock-edit"></div>
+                </td>
+            </tr>
+        </table>
+    </div>
+</div>
+<div id="id-adv-control-settings-list" class="settings-panel active">
+    <div class="inner-content">
+        <table cols="2" style="width: 100%;">
+            <tr>
+                <td>
+                    <label class="header" style="width: 99px;"><%= scope.textDisplayName %></label>
+                    <label class="header" style=""><%= scope.textValue %></label>
+                </td>
+                <td></td>
+            </tr>
+            <tr style="vertical-align: top;">
+                <td class="padding-small">
+                    <div id="control-settings-list" style="width:200px; height: 192px;margin-right: 10px;"></div>
+                </td>
+                <td class="padding-small">
+                    <button type="button" class="btn btn-text-default" id="control-settings-btn-add" style="min-width: 86px;margin-bottom: 5px;"><%= scope.textAdd %></button>
+                    <button type="button" class="btn btn-text-default" id="control-settings-btn-change" style="min-width: 86px;margin-bottom: 5px;"><%= scope.textChange %></button>
+                    <button type="button" class="btn btn-text-default" id="control-settings-btn-delete" style="min-width: 86px;margin-bottom: 5px;"><%= scope.textDelete %></button>
+                    <button type="button" class="btn btn-text-default" id="control-settings-btn-up" style="min-width: 86px;margin-bottom: 5px;"><%= scope.textUp %></button>
+                    <button type="button" class="btn btn-text-default" id="control-settings-btn-down" style="min-width: 86px;margin-bottom: 5px;"><%= scope.textDown %></button>
+                </td>
+            </tr>
+        </table>
+    </div>
+</div>
+<div id="id-adv-control-settings-date" class="settings-panel active">
+    <div class="inner-content">
+        <table cols="1" style="width: 100%;">
+            <tr>
+                <td>
+                    <label><%= scope.textFormat %></label>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <div id="control-settings-txt-format" style="width: 100%;"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <div id="control-settings-format" style="width: 100%; height: 165px;"></div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <label><%= scope.textLang %></label>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <div id="control-settings-lang"></div>
+                </td>
+            </tr>
+        </table>
+    </div>
+</div>
+<div id="id-adv-control-settings-checkbox" class="settings-panel">
+    <div class="inner-content">
+        <table cols="3" style="width: auto;">
+            <tr>
+                <td class="padding-small">
+                    <label class="input-label" style="margin-right: 10px;"><%= scope.textChecked %></label>
+                </td>
+                <td class="padding-small">
+                    <div id="control-settings-input-checked" style="margin-right: 10px;"></div>
+                </td>
+                <td class="padding-small">
+                    <button type="button" class="btn btn-text-default" id="control-settings-btn-checked-edit" style="min-width:86px;"><%= scope.textChange %></button>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <label class="input-label" style="margin-right: 10px;"><%= scope.textUnchecked %></label>
+                </td>
+                <td class="padding-small">
+                    <div id="control-settings-input-unchecked" style="margin-right: 10px;"></div>
+                </td>
+                <td class="padding-small">
+                    <button type="button" class="btn btn-text-default" id="control-settings-btn-unchecked-edit" style="min-width:86px;"><%= scope.textChange %></button>
+                </td>
+            </tr>
+        </table>
+    </div>
+</div>

apps/documenteditor/main/app/template/ImageSettings.template

@@ -14,17 +14,17 @@
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <button type="button" class="btn btn-text-default" id="image-button-original-size" style="width:100px;"><%= scope.textOriginalSize %></button>
+            <button type="button" class="btn btn-text-default" id="image-button-original-size" style="min-width:100px;width: auto;"><%= scope.textOriginalSize %></button>
         </td>
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <button type="button" class="btn btn-text-default" id="image-button-fit-margins" style="width:100px;"><%= scope.textFitMargins %></button>
+            <button type="button" class="btn btn-text-default" id="image-button-fit-margins" style="min-width:100px;width: auto;"><%= scope.textFitMargins %></button>
         </td>
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <div id="image-button-crop" style="width: 100px;"></div>
+            <div id="image-button-crop" style="min-width: 100px;"></div>
         </td>
     </tr>
     <tr>

apps/documenteditor/main/app/view/CompareSettingsDialog.js

@@ -0,0 +1,150 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  CompareSettingsDialog.js.js
+ *
+ *  Created by Julia Radzhabova on 14.08.2019
+ *  Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'common/main/lib/util/utils',
+    'common/main/lib/component/CheckBox',
+    'common/main/lib/component/InputField',
+    'common/main/lib/view/AdvancedSettingsWindow'
+], function () { 'use strict';
+
+    DE.Views.CompareSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
+        options: {
+            contentWidth: 220,
+            height: 160
+        },
+
+        initialize : function(options) {
+            var me = this;
+
+            _.extend(this.options, {
+                title: this.textTitle,
+                template: [
+                    '<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
+                        '<div class="content-panel" style="padding: 0 5px;"><div class="inner-content">',
+                            '<div class="settings-panel active">',
+                                '<table cols="1" style="width: 100%;">',
+                                '<tr>',
+                                    '<td class="padding-small">',
+                                        '<label class="header">', me.textShow, '</label>',
+                                    '</td>',
+                                '</tr>',
+                                '<tr>',
+                                    '<td class="padding-small">',
+                                        '<div id="compare-settings-radio-char"></div>',
+                                    '</td>',
+                                '</tr>',
+                                '<tr>',
+                                    '<td class="padding-small">',
+                                        '<div id="compare-settings-radio-word"></div>',
+                                    '</td>',
+                                '</tr>',
+                                '</table>',
+                            '</div></div>',
+                        '</div>',
+                    '</div>'
+                ].join('')
+            }, options);
+
+            this.handler    = options.handler;
+            this.props      = options.props;
+
+            Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
+        },
+
+        render: function() {
+            Common.Views.AdvancedSettingsWindow.prototype.render.call(this);
+            var me = this;
+
+            this.radioChar = new Common.UI.RadioBox({
+                el: $('#compare-settings-radio-char'),
+                labelText: this.textChar,
+                name: 'asc-radio-compare-show'
+            });
+
+            this.radioWord = new Common.UI.RadioBox({
+                el: $('#compare-settings-radio-word'),
+                labelText: this.textWord,
+                name: 'asc-radio-compare-show'
+            });
+
+            this.afterRender();
+        },
+
+        afterRender: function() {
+            this._setDefaults(this.props);
+        },
+
+        show: function() {
+            Common.Views.AdvancedSettingsWindow.prototype.show.apply(this, arguments);
+        },
+
+        _setDefaults: function (props) {
+            if (props) {
+                var value = props.getWords();
+                (value==false) ? this.radioChar.setValue(true, true) : this.radioWord.setValue(true, true);
+            }
+        },
+
+        getSettings: function () {
+            var props   = new AscCommonWord.ComparisonOptions();
+            props.putWords(this.radioWord.getValue());
+            return props;
+        },
+
+        onDlgBtnClick: function(event) {
+            var me = this;
+            var state = (typeof(event) == 'object') ? event.currentTarget.attributes['result'].value : event;
+            if (state == 'ok') {
+                this.handler && this.handler.call(this, state, this.getSettings());
+                Common.localStorage.setBool("de-compare-char", this.radioChar.getValue());
+            }
+
+            this.close();
+        },
+
+        textTitle:    'Comparison Settings',
+        textShow: 'Show changes at',
+        textChar: 'Character level',
+        textWord: 'Word level'
+
+    }, DE.Views.CompareSettingsDialog || {}))
+});

apps/documenteditor/main/app/view/ControlSettingsDialog.js

@@ -39,17 +39,21 @@
  *
  */
 
-define([
+define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
     'common/main/lib/util/utils',
     'common/main/lib/component/CheckBox',
     'common/main/lib/component/InputField',
-    'common/main/lib/view/AdvancedSettingsWindow'
-], function () { 'use strict';
+    'common/main/lib/view/AdvancedSettingsWindow',
+    'common/main/lib/view/SymbolTableDialog',
+    'documenteditor/main/app/view/EditListItemDialog'
+], function (contentTemplate) { 'use strict';
 
     DE.Views.ControlSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
         options: {
             contentWidth: 310,
-            height: 412
+            height: 392,
+            toggleGroup: 'control-adv-settings-group',
+            storageName: 'de-control-settings-adv-category'
         },
 
         initialize : function(options) {
@@ -57,83 +61,16 @@ define([
 
             _.extend(this.options, {
                 title: this.textTitle,
-                template: [
-                    '<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
-                        '<div class="content-panel" style="padding: 0 5px;"><div class="inner-content">',
-                            '<div class="settings-panel active">',
-                                '<table cols="1" style="width: 100%;">',
-                                '<tr>',
-                                    '<td class="padding-small">',
-                                        '<label class="input-label">', me.textName, '</label>',
-                                        '<div id="control-settings-txt-name"></div>',
-                                    '</td>',
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-large">',
-                                        '<label class="input-label">', me.textTag, '</label>',
-                                        '<div id="control-settings-txt-tag"></div>',
-                                    '</td>',
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-large">',
-                                        '<div class="separator horizontal"></div>',
-                                    '</td>',
-                                '</tr>',
-                                '</table>',
-                                '<table cols="2" style="width: auto;">',
-                                '<tr>',
-                                    '<td class="padding-small" colspan="2">',
-                                        '<label class="header">', me.textAppearance, '</label>',
-                                    '</td>',
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-small">',
-                                        '<label class="input-label" style="margin-right: 10px;">', me.textShowAs,'</label>',
-                                    '</td>',
-                                    '<td class="padding-small">',
-                                        '<div id="control-settings-combo-show" class="input-group-nr" style="display: inline-block; width:120px;"></div>',
-                                    '</td>',
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-small">',
-                                        '<label class="input-label" style="margin-right: 10px;">', me.textColor, '</label>',
-                                    '</td>',
-                                    '<td class="padding-small">',
-                                        '<div id="control-settings-color-btn" style="display: inline-block;"></div>',
-                                    '</td>',
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-large" colspan="2">',
-                                        '<button type="button" class="btn btn-text-default auto" id="control-settings-btn-all" style="min-width: 98px;">', me.textApplyAll,'</button>',
-                                    '</td>',
-                                '</tr>',
-                                '</table>',
-                                '<table cols="1" style="width: 100%;">',
-                                '<tr>',
-                                    '<td class="padding-large">',
-                                        '<div class="separator horizontal"></div>',
-                                    '</td>',
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-small">',
-                                        '<label class="header">', me.textLock, '</label>',
-                                    '</td>',
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-small">',
-                                        '<div id="control-settings-chb-lock-delete"></div>',
-                                    '</td>',
-                                '</tr>',
-                                '<tr>',
-                                    '<td class="padding-small">',
-                                        '<div id="control-settings-chb-lock-edit"></div>',
-                                    '</td>',
-                                '</tr>',
-                                '</table>',
-                            '</div></div>',
-                        '</div>',
-                    '</div>'
-                ].join('')
+                items: [
+                    {panelId: 'id-adv-control-settings-general', panelCaption: this.strGeneral},
+                    {panelId: 'id-adv-control-settings-lock',    panelCaption: this.textLock},
+                    {panelId: 'id-adv-control-settings-list',    panelCaption: this.textCombobox},
+                    {panelId: 'id-adv-control-settings-date',    panelCaption: this.textDate},
+                    {panelId: 'id-adv-control-settings-checkbox',panelCaption: this.textCheckbox}
+                ],
+                contentTemplate: _.template(contentTemplate)({
+                    scope: this
+                })
             }, options);
 
             this.handler    = options.handler;
@@ -222,6 +159,117 @@ define([
                 labelText: this.txtLockEdit
             });
 
+            // combobox & dropdown list
+            this.list = new Common.UI.ListView({
+                el: $('#control-settings-list', this.$window),
+                store: new Common.UI.DataViewStore(),
+                emptyText: '',
+                template: _.template(['<div class="listview inner" style=""></div>'].join('')),
+                itemTemplate: _.template([
+                    '<div id="<%= id %>" class="list-item" style="width: 100%;display:inline-block;">',
+                    '<div style="width:90px;display: inline-block;vertical-align: middle; overflow: hidden; text-overflow: ellipsis;white-space: pre;margin-right: 5px;"><%= name %></div>',
+                    '<div style="width:90px;display: inline-block;vertical-align: middle; overflow: hidden; text-overflow: ellipsis;white-space: pre;"><%= value %></div>',
+                    '</div>'
+                ].join(''))
+            });
+            this.list.on('item:select', _.bind(this.onSelectItem, this));
+
+            this.btnAdd = new Common.UI.Button({
+                el: $('#control-settings-btn-add')
+            });
+            this.btnAdd.on('click', _.bind(this.onAddItem, this));
+
+            this.btnChange = new Common.UI.Button({
+                el: $('#control-settings-btn-change')
+            });
+            this.btnChange.on('click', _.bind(this.onChangeItem, this));
+
+            this.btnDelete = new Common.UI.Button({
+                el: $('#control-settings-btn-delete')
+            });
+            this.btnDelete.on('click', _.bind(this.onDeleteItem, this));
+
+            this.btnUp = new Common.UI.Button({
+                el: $('#control-settings-btn-up')
+            });
+            this.btnUp.on('click', _.bind(this.onMoveItem, this, true));
+
+            this.btnDown = new Common.UI.Button({
+                el: $('#control-settings-btn-down')
+            });
+            this.btnDown.on('click', _.bind(this.onMoveItem, this, false));
+
+            // date picker
+            var data = [{ value: 0x042C }, { value: 0x0402 }, { value: 0x0405 }, { value: 0x0407 },  {value: 0x0807}, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A }, { value: 0x080A },
+                { value: 0x040B }, { value: 0x040C }, { value: 0x0410 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
+                { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }];
+            data.forEach(function(item) {
+                var langinfo = Common.util.LanguageInfo.getLocalLanguageName(item.value);
+                item.displayValue = langinfo[1];
+                item.langName = langinfo[0];
+            });
+
+            this.cmbLang = new Common.UI.ComboBox({
+                el          : $('#control-settings-lang'),
+                menuStyle   : 'min-width: 100%; max-height: 185px;',
+                cls         : 'input-group-nr',
+                editable    : false,
+                data        : data
+            });
+            this.cmbLang.setValue(0x0409);
+            this.cmbLang.on('selected',function(combo, record) {
+                me.updateFormats(record.value);
+            });
+
+            this.listFormats = new Common.UI.ListView({
+                el: $('#control-settings-format'),
+                store: new Common.UI.DataViewStore(),
+                scrollAlwaysVisible: true
+            });
+            this.listFormats.on('item:select', _.bind(this.onSelectFormat, this));
+
+            this.txtDate = new Common.UI.InputField({
+                el          : $('#control-settings-txt-format'),
+                allowBlank  : true,
+                validateOnChange: false,
+                validateOnBlur: false,
+                style       : 'width: 100%;',
+                value       : ''
+            });
+
+            // Check Box
+            this.txtChecked = new Common.UI.InputField({
+                el          : $('#control-settings-input-checked'),
+                allowBlank  : true,
+                validateOnChange: false,
+                validateOnBlur: false,
+                style       : 'width: 30px;',
+                value       : ''
+            });
+            this.txtChecked._input.attr('disabled', true);
+            this.txtChecked._input.css({'text-align': 'center', 'font-size': '16px'});
+
+            this.txtUnchecked = new Common.UI.InputField({
+                el          : $('#control-settings-input-unchecked'),
+                allowBlank  : true,
+                validateOnChange: false,
+                validateOnBlur: false,
+                style       : 'width: 30px;',
+                value       : ''
+            });
+            this.txtUnchecked._input.attr('disabled', true);
+            this.txtUnchecked._input.css({'text-align': 'center', 'font-size': '16px'});
+
+            this.btnEditChecked = new Common.UI.Button({
+                el: $('#control-settings-btn-checked-edit')
+            });
+            this.btnEditChecked.on('click', _.bind(this.onEditCheckbox, this, true));
+
+            this.btnEditUnchecked = new Common.UI.Button({
+                el: $('#control-settings-btn-unchecked-edit')
+            });
+            this.btnEditUnchecked.on('click', _.bind(this.onEditCheckbox, this, false));
+
             this.afterRender();
         },
 
@@ -252,6 +300,10 @@ define([
         afterRender: function() {
             this.updateThemeColors();
             this._setDefaults(this.props);
+            if (this.storageName) {
+                var value = Common.localStorage.getItem(this.storageName);
+                this.setActiveCategory((value!==null) ? parseInt(value) : 0);
+            }
         },
 
         show: function() {
@@ -286,6 +338,69 @@ define([
                 (val===undefined) && (val = Asc.c_oAscSdtLockType.Unlocked);
                 this.chLockDelete.setValue(val==Asc.c_oAscSdtLockType.SdtContentLocked || val==Asc.c_oAscSdtLockType.SdtLocked);
                 this.chLockEdit.setValue(val==Asc.c_oAscSdtLockType.SdtContentLocked || val==Asc.c_oAscSdtLockType.ContentLocked);
+
+                var type = props.get_SpecificType();
+
+                //for list controls
+                this.btnsCategory[2].setVisible(type == Asc.c_oAscContentControlSpecificType.ComboBox || type == Asc.c_oAscContentControlSpecificType.DropDownList);
+                if (type == Asc.c_oAscContentControlSpecificType.ComboBox || type == Asc.c_oAscContentControlSpecificType.DropDownList) {
+                    this.btnsCategory[2].setCaption(type == Asc.c_oAscContentControlSpecificType.ComboBox ? this.textCombobox : this.textDropDown);
+                    var specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr();
+                    if (specProps) {
+                        var count = specProps.get_ItemsCount();
+                        var arr = [];
+                        for (var i=0; i<count; i++) {
+                            arr.push({
+                                value: specProps.get_ItemValue(i),
+                                name: specProps.get_ItemDisplayText(i)
+                            });
+                        }
+                        this.list.store.reset(arr);
+                    }
+                    this.disableListButtons();
+                }
+
+                //for date picker
+                this.btnsCategory[3].setVisible(type == Asc.c_oAscContentControlSpecificType.DateTime);
+                if (type == Asc.c_oAscContentControlSpecificType.DateTime) {
+                    var specProps = props.get_DateTimePr();
+                    if (specProps) {
+                        this.datetime = specProps;
+                        var lang = specProps.get_LangId() || this.options.controlLang;
+                        if (lang) {
+                            var item = this.cmbLang.store.findWhere({value: lang});
+                            item = item ? item.get('value') : 0x0409;
+                            this.cmbLang.setValue(item);
+                        }
+                        this.updateFormats(this.cmbLang.getValue());
+                        var format = specProps.get_DateFormat();
+                        var rec = this.listFormats.store.findWhere({format: format});
+                        this.listFormats.selectRecord(rec);
+                        this.listFormats.scrollToRecord(rec);
+                        this.txtDate.setValue(format);
+                    }
+                }
+
+                // for check box
+                this.btnsCategory[4].setVisible(type == Asc.c_oAscContentControlSpecificType.CheckBox);
+                if (type == Asc.c_oAscContentControlSpecificType.CheckBox) {
+                    var specProps = props.get_CheckBoxPr();
+                    if (specProps) {
+                        var code = specProps.get_CheckedSymbol(),
+                            font = specProps.get_CheckedFont();
+                        font && this.txtChecked.cmpEl.css('font-family', font);
+                        code && this.txtChecked.setValue(String.fromCharCode(code));
+                        this.checkedBox = {code: code, font: font};
+
+                        code = specProps.get_UncheckedSymbol();
+                        font = specProps.get_UncheckedFont();
+                        font && this.txtUnchecked.cmpEl.css('font-family', font);
+                        code && this.txtUnchecked.setValue(String.fromCharCode(code));
+                        this.uncheckedBox = {code: code, font: font};
+                    }
+                }
+
+                this.type = type;
             }
         },
 
@@ -312,6 +427,39 @@ define([
                 lock = Asc.c_oAscSdtLockType.ContentLocked;
             props.put_Lock(lock);
 
+            // for list controls
+            if (this.type == Asc.c_oAscContentControlSpecificType.ComboBox || this.type == Asc.c_oAscContentControlSpecificType.DropDownList) {
+                var specProps = new AscCommon.CSdtComboBoxPr();
+                this.list.store.each(function (item, index) {
+                    specProps.add_Item(item.get('name'), item.get('value'));
+                });
+                (this.type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.put_ComboBoxPr(specProps) : props.put_DropDownListPr(specProps);
+            }
+
+            //for date picker
+            if (this.type == Asc.c_oAscContentControlSpecificType.DateTime) {
+                var specProps = new AscCommon.CSdtDatePickerPr();
+                specProps.put_DateFormat(this.txtDate.getValue());
+                specProps.put_LangId(this.cmbLang.getValue());
+                props.put_DateTimePr(specProps);
+            }
+
+            // for check box
+            if (this.type == Asc.c_oAscContentControlSpecificType.CheckBox) {
+                if (this.checkedBox && this.checkedBox.changed || this.uncheckedBox && this.uncheckedBox.changed) {
+                    var specProps = new AscCommon.CSdtCheckBoxPr();
+                    if (this.checkedBox) {
+                        specProps.put_CheckedSymbol(this.checkedBox.code);
+                        specProps.put_CheckedFont(this.checkedBox.font);
+                    }
+                    if (this.uncheckedBox) {
+                        specProps.put_UncheckedSymbol(this.uncheckedBox.code);
+                        specProps.put_UncheckedFont(this.uncheckedBox.font);
+                    }
+                    props.put_CheckBoxPr(specProps);
+                }
+            }
+
             return props;
         },
 
@@ -339,6 +487,147 @@ define([
             }
         },
 
+        onSelectItem: function(listView, itemView, record) {
+            this.disableListButtons(false);
+        },
+
+        disableListButtons: function(disabled) {
+            if (disabled===undefined)
+                disabled = !this.list.getSelectedRec();
+            this.btnChange.setDisabled(disabled);
+            this.btnDelete.setDisabled(disabled);
+            this.btnUp.setDisabled(disabled);
+            this.btnDown.setDisabled(disabled);
+        },
+
+        onAddItem: function() {
+            var me = this,
+                win = new DE.Views.EditListItemDialog({
+                    store: me.list.store,
+                    handler: function(result, name, value) {
+                        if (result == 'ok') {
+                            var rec = me.list.store.add({
+                                    value: value,
+                                    name: name
+                                });
+                            if (rec) {
+                                me.list.selectRecord(rec);
+                                me.list.scrollToRecord(rec);
+                                me.disableListButtons();
+                            }
+                        }
+                        me.list.cmpEl.find('.listview').focus();
+                    }
+                });
+            win.show();
+        },
+
+        onChangeItem: function() {
+            var me = this,
+                rec = this.list.getSelectedRec(),
+                win = new DE.Views.EditListItemDialog({
+                    store: me.list.store,
+                    handler: function(result, name, value) {
+                        if (result == 'ok') {
+                            if (rec) {
+                                rec.set({
+                                    value: value,
+                                    name: name
+                                });
+                            }
+                        }
+                        me.list.cmpEl.find('.listview').focus();
+                    }
+                });
+            rec && win.show();
+            rec && win.setSettings({name: rec.get('name'), value: rec.get('value')});
+        },
+
+        onDeleteItem: function(btn, eOpts){
+            var rec = this.list.getSelectedRec();
+            if (rec) {
+                var store = this.list.store;
+                var idx = _.indexOf(store.models, rec);
+                store.remove(rec);
+                if (idx>store.length-1) idx = store.length-1;
+                if (store.length>0) {
+                    this.list.selectByIndex(idx);
+                    this.list.scrollToRecord(store.at(idx));
+                }
+            }
+            this.disableListButtons();
+            this.list.cmpEl.find('.listview').focus();
+        },
+
+        onMoveItem: function(up) {
+            var store = this.list.store,
+                length = store.length,
+                rec = this.list.getSelectedRec();
+            if (rec) {
+                var index = store.indexOf(rec);
+                store.add(store.remove(rec), {at: up ? Math.max(0, index-1) : Math.min(length-1, index+1)});
+                this.list.selectRecord(rec);
+                this.list.scrollToRecord(rec);
+            }
+            this.list.cmpEl.find('.listview').focus();
+        },
+
+        updateFormats: function(lang) {
+            if (this.datetime) {
+                var props = this.datetime,
+                    formats = props.get_FormatsExamples(),
+                    arr = [];
+                for (var i = 0, len = formats.length; i < len; i++)
+                {
+                    props.get_String(formats[i], undefined, lang);
+                    var rec = new Common.UI.DataViewModel();
+                    rec.set({
+                        format: formats[i],
+                        value: props.get_String(formats[i], undefined, lang)
+                    });
+                    arr.push(rec);
+                }
+                this.listFormats.store.reset(arr);
+                this.listFormats.selectByIndex(0);
+                var rec = this.listFormats.getSelectedRec();
+                this.listFormats.scrollToRecord(rec);
+                this.txtDate.setValue(rec.get('format'));
+            }
+        },
+
+        onEditCheckbox: function(checked) {
+            if (this.api) {
+                var me = this,
+                    props = (checked) ? me.checkedBox : me.uncheckedBox,
+                    cmp = (checked) ? me.txtChecked : me.txtUnchecked,
+                    handler = function(dlg, result, settings) {
+                        if (result == 'ok') {
+                            props.changed = true;
+                            props.code = settings.code;
+                            props.font = settings.font;
+                            props.font && cmp.cmpEl.css('font-family', props.font);
+                            settings.symbol && cmp.setValue(settings.symbol);
+                        }
+                    },
+                    win = new Common.Views.SymbolTableDialog({
+                        api: me.api,
+                        lang: me.options.interfaceLang,
+                        modal: true,
+                        type: 0,
+                        font: props.font,
+                        code: props.code,
+                        handler: handler
+                    });
+                win.show();
+                win.on('symbol:dblclick', handler);
+            }
+        },
+
+        onSelectFormat: function(lisvView, itemView, record) {
+            if (!record) return;
+            this.txtDate.setValue(record.get('format'));
+        },
+
         textTitle:    'Content Control Settings',
         textName: 'Title',
         textTag: 'Tag',
@@ -352,7 +641,23 @@ define([
         textNewColor: 'Add New Custom Color',
         textApplyAll: 'Apply to All',
         textAppearance: 'Appearance',
-        textSystemColor: 'System'
+        textSystemColor: 'System',
+        strGeneral: 'General',
+        textAdd: 'Add',
+        textChange: 'Edit',
+        textDelete: 'Delete',
+        textUp: 'Up',
+        textDown: 'Down',
+        textCombobox: 'Combo box',
+        textDropDown: 'Drop-down list',
+        textDisplayName: 'Display name',
+        textValue: 'Value',
+        textDate: 'Date format',
+        textLang: 'Language',
+        textFormat: 'Display the date like this',
+        textCheckbox: 'Check box',
+        textChecked: 'Checked symbol',
+        textUnchecked: 'Unchecked symbol'
 
     }, DE.Views.ControlSettingsDialog || {}))
 });

apps/documenteditor/main/app/view/EditListItemDialog.js

@@ -0,0 +1,175 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  EditListItemDialog.js
+ *
+ *  Created by Julia Radzhabova on 05.11.2019
+ *  Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'common/main/lib/component/Window',
+    'common/main/lib/component/InputField'
+], function () { 'use strict';
+
+    DE.Views.EditListItemDialog = Common.UI.Window.extend(_.extend({
+        options: {
+            width: 330,
+            header: false,
+            cls: 'modal-dlg',
+            buttons: ['ok', 'cancel']
+        },
+
+        initialize : function(options) {
+            _.extend(this.options, options || {});
+
+            this.template = [
+                '<div class="box">',
+                '<div class="input-row">',
+                    '<label>' + this.textDisplayName + '</label>',
+                '</div>',
+                '<div id="id-dlg-label-name" class="input-row" style="margin-bottom: 8px;"></div>',
+                '<div class="input-row">',
+                '<label>' + this.textValue + '</label>',
+                '</div>',
+                '<div id="id-dlg-label-value" class="input-row"></div>',
+                '</div>'
+            ].join('');
+
+            this.options.tpl = _.template(this.template)(this.options);
+            Common.UI.Window.prototype.initialize.call(this, this.options);
+        },
+
+        render: function() {
+            Common.UI.Window.prototype.render.call(this);
+
+            var me = this;
+            me.inputName = new Common.UI.InputField({
+                el          : $('#id-dlg-label-name'),
+                allowBlank  : false,
+                blankError  : me.textNameError,
+                style       : 'width: 100%;',
+                validateOnBlur: false,
+                validation  : function(value) {
+                    return value ? true : '';
+                }
+            });
+            me.inputName._input.on('input', function (e) {
+                if (me.copyvalue==undefined && me.inputValue.getValue()==me.inputName.getValue()) {
+                    me.copyvalue = 1;
+                }
+                if (me.copyvalue==1)
+                    me.inputValue.setValue($(e.target).val());
+                else if (me.copyvalue==2)
+                    me.copyvalue = 0;
+            });
+
+            me.inputValue = new Common.UI.InputField({
+                el          : $('#id-dlg-label-value'),
+                style       : 'width: 100%;',
+                validateOnBlur: false,
+                validation  : function(value) {
+                    if (value!=='' && me.options.store) {
+                        var rec = me.options.store.findWhere({value: value});
+                        if (rec)
+                            return me.textValueError
+                    }
+                    return true;
+                }
+            });
+            me.inputValue._input.on('input', function (e) {
+                if (me.copyvalue==undefined && me.inputValue.getValue()==me.inputName.getValue()) {
+                    me.copyvalue = 2;
+                }
+                if (me.copyvalue==2)
+                    me.inputName.setValue($(e.target).val());
+                else if (me.copyvalue==1)
+                    me.copyvalue = 0;
+            });
+
+            var $window = this.getChild();
+            $window.find('.btn').on('click',     _.bind(this.onBtnClick, this));
+        },
+
+        show: function() {
+            Common.UI.Window.prototype.show.apply(this, arguments);
+
+            var me = this;
+            _.delay(function(){
+                me.inputName.cmpEl.find('input').focus();
+            },50);
+        },
+
+        onPrimary: function(event) {
+            this._handleInput('ok');
+            return false;
+        },
+
+        onBtnClick: function(event) {
+            this._handleInput(event.currentTarget.attributes['result'].value);
+        },
+
+        _handleInput: function(state) {
+            if (this.options.handler) {
+                if (state == 'ok') {
+                    if (this.inputName.checkValidate() !== true)  {
+                        this.inputName.cmpEl.find('input').focus();
+                        return;
+                    }
+                    if (this.inputValue.checkValidate() !== true)  {
+                        this.inputValue.cmpEl.find('input').focus();
+                        return;
+                    }
+                }
+
+                this.options.handler.call(this, state, this.inputName.getValue(), this.inputValue.getValue());
+            }
+
+            this.close();
+        },
+
+        setSettings: function (props) {
+            if (props) {
+                this.inputName.setValue(props.name || '');
+                this.inputValue.setValue(props.value || '');
+            }
+        },
+
+        textDisplayName: 'Display name',
+        textValue: 'Value',
+        textNameError: 'Display name must not be empty.',
+        textValueError: 'An item with the same value already exists.'
+    }, DE.Views.EditListItemDialog || {}));
+});

apps/documenteditor/main/app/view/ImageSettings.js

@@ -105,10 +105,10 @@ define([
 
         updateMetricUnit: function() {
             var value = Common.Utils.Metric.fnRecalcFromMM(this._state.Width);
-            this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+            this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
 
             value = Common.Utils.Metric.fnRecalcFromMM(this._state.Height);
-            this.labelHeight[0].innerHTML = this.textHeight + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+            this.labelHeight[0].innerHTML = this.textHeight + ': ' + value.toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
         },
 
         createDelayedControls: function() {
@@ -159,6 +159,10 @@ define([
             });
             this.lockedControls.push(this.btnFitMargins);
 
+            var w = Math.max(this.btnOriginalSize.cmpEl.width(), this.btnFitMargins.cmpEl.width());
+            this.btnOriginalSize.cmpEl.width(w);
+            this.btnFitMargins.cmpEl.width(w);
+
             this.btnInsertFromFile = new Common.UI.Button({
                 el: $('#image-button-from-file')
             });
@@ -229,6 +233,7 @@ define([
             this.btnFlipH.on('click', _.bind(this.onBtnFlipClick, this));
             this.lockedControls.push(this.btnFlipH);
 
+            var w = this.btnOriginalSize.cmpEl.outerWidth();
             this.btnCrop = new Common.UI.Button({
                 cls: 'btn-text-split-default',
                 caption: this.textCrop,
@@ -236,9 +241,9 @@ define([
                 enableToggle: true,
                 allowDepress: true,
                 pressed: this._state.cropMode,
-                width: 100,
+                width: w,
                 menu        : new Common.UI.Menu({
-                    style       : 'min-width: 100px;',
+                    style       : 'min-width:' + w + 'px;',
                     items: [
                         {
                             caption: this.textCrop,
@@ -311,13 +316,13 @@ define([
 
                 value = props.get_Width();
                 if ( Math.abs(this._state.Width-value)>0.001 ) {
-                    this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                    this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
                     this._state.Width = value;
                 }
 
                 value = props.get_Height();
                 if ( Math.abs(this._state.Height-value)>0.001 ) {
-                    this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                    this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
                     this._state.Height = value;
                 }
 
@@ -391,8 +396,8 @@ define([
                 var w = imgsize.get_ImageWidth();
                 var h = imgsize.get_ImageHeight();
 
-                this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
-                this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
 
                 var properties = new Asc.asc_CImgProperty();
                 properties.put_Width(w);
@@ -423,8 +428,8 @@ define([
                     h = pageh;
                 }
 
-                this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
-                this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
 
                 var properties = new Asc.asc_CImgProperty();
                 properties.put_Width(w);

apps/documenteditor/main/app/view/PageMarginsDialog.js

@@ -45,9 +45,9 @@ define([
 
     DE.Views.PageMarginsDialog = Common.UI.Window.extend(_.extend({
         options: {
-            width: 215,
+            width: 404,
             header: true,
-            style: 'min-width: 216px;',
+            style: 'min-width: 404px;',
             cls: 'modal-dlg',
             id: 'window-page-margins',
             buttons: ['ok', 'cancel']
@@ -59,31 +59,50 @@ define([
             }, options || {});
 
             this.template = [
-                '<div class="box" style="height: 85px;">',
-                    '<table cols="2" style="width: 100%;margin-bottom: 10px;">',
-                        '<tr>',
-                            '<td style="padding-right: 10px;padding-bottom: 8px;">',
+                '<div class="box" style="height: 245px;">',
+                    '<div style="float: left;">',
+                        '<label style="font-weight: bold;">' + this.textTitle + '</label>',
+                        '<div style="margin-top: 2px;">',
+                            '<div style="display: inline-block;">',
                                 '<label class="input-label">' + this.textTop + '</label>',
                                 '<div id="page-margins-spin-top"></div>',
-                            '</td>',
-                            '<td style="padding-bottom: 8px;">',
+                            '</div>',
+                            '<div style="display: inline-block; margin-left: 8px;">',
                                 '<label class="input-label">' + this.textBottom + '</label>',
                                 '<div id="page-margins-spin-bottom"></div>',
-                            '</td>',
-                        '</tr>',
-                        '<tr>',
-                            '<td class="padding-small" style="padding-right: 10px;">',
-                                '<label class="input-label">' + this.textLeft + '</label>',
+                            '</div>',
+                        '</div>',
+                        '<div style="margin-top: 4px;">',
+                            '<div style="display: inline-block;">',
+                                '<label class="input-label" id="margin-left-label">' + this.textLeft + '</label>',
                                 '<div id="page-margins-spin-left"></div>',
-                            '</td>',
-                            '<td class="padding-small">',
-                                '<label class="input-label">' + this.textRight + '</label>',
+                            '</div>',
+                            '<div style="display: inline-block; margin-left: 8px;">',
+                                '<label class="input-label" id="margin-right-label">' + this.textRight + '</label>',
                                 '<div id="page-margins-spin-right"></div>',
-                            '</td>',
-                        '</tr>',
-                    '</table>',
-                '</div>',
-                '<div class="separator horizontal"/>'
+                            '</div>',
+                        '</div>',
+                        '<div style="margin-top: 10px;">',
+                            '<label style="font-weight: bold;">' + this.textGutterPosition + '</label>',
+                            '<div>',
+                                '<div style="display: inline-block;" id="page-margins-spin-gutter"></div>',
+                                '<div style="display: inline-block; margin-left: 8px;" id="page-margins-spin-gutter-position"></div>',
+                            '</div>',
+                        '</div>',
+                        '<div style="margin-top: 10px;">',
+                            '<label style="font-weight: bold;">' + this.textOrientation + '</label>',
+                            '<div id="page-margins-cmb-orientation"></div>',
+                        '</div>',
+                        '<div style="margin-top: 10px;">',
+                            '<label style="font-weight: bold;">' + this.textMultiplePages + '</label>',
+                            '<div id="page-margins-cmb-multiple-pages"></div>',
+                        '</div>',
+                    '</div>',
+                    '<div style="float: right;">',
+                        '<label style="font-weight: bold;">' + this.textPreview + '</label>',
+                        '<div id="page-margins-preview" style="margin-top: 2px; height: 120px; width: 162px; border: 1px solid #cfcfcf;"></div>',
+                    '</div>',
+                '</div>'
             ].join('');
 
             this.options.tpl = _.template(this.template)(this.options);
@@ -107,6 +126,13 @@ define([
                 maxValue: 55.88,
                 minValue: -55.87
             });
+            this.spnTop.on('change', _.bind(function (field, newValue, oldValue) {
+                if (this.api) {
+                    this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+                    this.properties.put_TopMargin(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
+                    //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+                }
+            }, this));
             this.spinners.push(this.spnTop);
 
             this.spnBottom = new Common.UI.MetricSpinner({
@@ -118,6 +144,13 @@ define([
                 maxValue: 55.88,
                 minValue: -55.87
             });
+            this.spnBottom.on('change', _.bind(function (field, newValue, oldValue) {
+                if (this.api) {
+                    this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+                    this.properties.put_BottomMargin(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
+                    //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+                }
+            }, this));
             this.spinners.push(this.spnBottom);
 
             this.spnLeft = new Common.UI.MetricSpinner({
@@ -129,6 +162,13 @@ define([
                 maxValue: 55.88,
                 minValue: 0
             });
+            this.spnLeft.on('change', _.bind(function (field, newValue, oldValue) {
+                if (this.api) {
+                    this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+                    this.properties.put_LeftMargin(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
+                    //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+                }
+            }, this));
             this.spinners.push(this.spnLeft);
 
             this.spnRight = new Common.UI.MetricSpinner({
@@ -140,10 +180,102 @@ define([
                 maxValue: 55.88,
                 minValue: 0
             });
+            this.spnRight.on('change', _.bind(function (field, newValue, oldValue) {
+                if (this.api) {
+                    this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+                    this.properties.put_RightMargin(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
+                    //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+                }
+            }, this));
             this.spinners.push(this.spnRight);
 
-            var $window = this.getChild();
-            $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+            this.spnGutter = new Common.UI.MetricSpinner({
+                el: $('#page-margins-spin-gutter'),
+                step: .1,
+                width: 86,
+                defaultUnit : "cm",
+                value: '1 cm',
+                maxValue: 55.88,
+                minValue: 0
+            });
+            this.spnGutter.on('change', _.bind(function (field, newValue, oldValue) {
+                if (this.api) {
+                    this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+                    this.properties.put_Gutter(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
+                    //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+                }
+            }, this));
+            this.spinners.push(this.spnGutter);
+
+            this.cmbGutterPosition = new Common.UI.ComboBox({
+                el          : $('#page-margins-spin-gutter-position'),
+                menuStyle   : 'min-width: 86px;',
+                style       : 'width: 86px;',
+                editable    : false,
+                cls         : 'input-group-nr',
+                data        : [
+                    { value: 0, displayValue: this.textLeft },
+                    { value: 1, displayValue: this.textTop }
+                ]
+            });
+            this.cmbGutterPosition.on('selected', _.bind(function (combo, record) {
+                if (this.api) {
+                    this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+                    this.properties.put_GutterAtTop(record.value);
+                    //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+                }
+            }, this));
+
+            this.cmbOrientation = new Common.UI.ComboBox({
+                el          : $('#page-margins-cmb-orientation'),
+                menuStyle   : 'min-width: 180px;',
+                style       : 'width: 180px;',
+                editable    : false,
+                cls         : 'input-group-nr',
+                data        : [
+                    { value: 0, displayValue: this.textPortrait },
+                    { value: 1, displayValue: this.textLandscape }
+                ]
+            });
+            this.cmbOrientation.on('selected', _.bind(function (combo, record) {
+                if (this.api) {
+                    this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+                    this.properties.put_Orientation(record.value);
+                    //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+                }
+            }, this));
+
+            this.cmbMultiplePages = new Common.UI.ComboBox({
+                el          : $('#page-margins-cmb-multiple-pages'),
+                menuStyle   : 'min-width: 180px;',
+                style       : 'width: 180px;',
+                editable    : false,
+                cls         : 'input-group-nr',
+                data        : [
+                    { value: 0, displayValue: this.textNormal },
+                    { value: 1, displayValue: this.textMirrorMargins }
+                ]
+            });
+            this.cmbMultiplePages.on('selected', _.bind(function(combo, record) {
+                if (record.value === 0) {
+                    this.window.find('#margin-left-label').html(this.textLeft);
+                    this.window.find('#margin-right-label').html(this.textRight);
+                    this.cmbGutterPosition.setDisabled(false);
+                } else {
+                    this.window.find('#margin-left-label').html(this.textInside);
+                    this.window.find('#margin-right-label').html(this.textOutside);
+                    this.cmbGutterPosition.setValue(0);
+                    this.cmbGutterPosition.setDisabled(true);
+                }
+                if (this.api) {
+                    this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+                    this.properties.put_MirrorMargins(record.value);
+                    //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+                }
+            }, this));
+
+            this.window = this.getChild();
+            this.window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
 
             this.updateMetricUnit();
         },
@@ -181,6 +313,7 @@ define([
 
         setSettings: function (props) {
             if (props) {
+                this.properties = props;
                 this.maxMarginsH = Common.Utils.Metric.fnRecalcFromMM(props.get_H() - 2.6);
                 this.maxMarginsW = Common.Utils.Metric.fnRecalcFromMM(props.get_W() - 12.7);
                 this.spnTop.setMaxValue(this.maxMarginsH);
@@ -192,6 +325,23 @@ define([
                 this.spnBottom.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_BottomMargin()), true);
                 this.spnLeft.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_LeftMargin()), true);
                 this.spnRight.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_RightMargin()), true);
+                this.cmbOrientation.setValue(props.get_Orientation());
+
+                this.spnGutter.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_Gutter()), true);
+                this.cmbGutterPosition.setValue(props.get_GutterAtTop() ? 1 : 0);
+                var mirrorMargins = props.get_MirrorMargins();
+                this.cmbMultiplePages.setValue(mirrorMargins ? 1 : 0);
+
+                if (mirrorMargins) {
+                    this.window.find('#margin-left-label').html(this.textInside);
+                    this.window.find('#margin-right-label').html(this.textOutside);
+                    this.cmbGutterPosition.setValue(0);
+                }
+                this.cmbGutterPosition.setDisabled(mirrorMargins);
+
+                if (this.api) {
+                    //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+                }
             }
         },
 
@@ -201,6 +351,10 @@ define([
             props.put_BottomMargin(Common.Utils.Metric.fnRecalcToMM(this.spnBottom.getNumberValue()));
             props.put_LeftMargin(Common.Utils.Metric.fnRecalcToMM(this.spnLeft.getNumberValue()));
             props.put_RightMargin(Common.Utils.Metric.fnRecalcToMM(this.spnRight.getNumberValue()));
+            props.put_Orientation(this.cmbOrientation.getValue());
+            props.put_Gutter(Common.Utils.Metric.fnRecalcToMM(this.spnGutter.getNumberValue()));
+            props.put_GutterAtTop(this.cmbGutterPosition.getValue() ? true : false);
+            props.put_MirrorMargins(this.cmbMultiplePages.getValue() ? true : false);
             return props;
         },
 
@@ -221,6 +375,17 @@ define([
         textRight: 'Right',
         notcriticalErrorTitle: 'Warning',
         txtMarginsW: 'Left and right margins are too high for a given page wight',
-        txtMarginsH: 'Top and bottom margins are too high for a given page height'
+        txtMarginsH: 'Top and bottom margins are too high for a given page height',
+        textMultiplePages: 'Multiple pages',
+        textGutter: 'Gutter',
+        textGutterPosition: 'Gutter position',
+        textOrientation: 'Orientation',
+        textPreview: 'Preview',
+        textPortrait: 'Portrait',
+        textLandscape: 'Landscape',
+        textMirrorMargins: 'Mirror margins',
+        textNormal: 'Normal',
+        textInside: 'Inside',
+        textOutside: 'Outside'
     }, DE.Views.PageMarginsDialog || {}))
 });

apps/documenteditor/main/app/view/Toolbar.js

@@ -480,7 +480,9 @@ define([
                         menu: new Common.UI.Menu({
                             items: [
                                 {template: _.template('<div id="id-toolbar-menu-tablepicker" class="dimension-picker" style="margin: 5px 10px;"></div>')},
-                                {caption: this.mniCustomTable, value: 'custom'}
+                                {caption: this.mniCustomTable, value: 'custom'},
+                                {caption: this.mniDrawTable, value: 'draw', checkable: true},
+                                {caption: this.mniEraseTable, value: 'erase', checkable: true}
                             ]
                         })
                     });
@@ -638,18 +640,43 @@ define([
                             items: [
                                 {
                                     caption: this.textPlainControl,
-                                    iconCls: 'mnu-control-plain',
-                                    value: Asc.c_oAscSdtLevelType.Inline
+                                    // iconCls: 'mnu-control-plain',
+                                    value: 'plain'
                                 },
                                 {
                                     caption: this.textRichControl,
-                                    iconCls: 'mnu-control-rich',
-                                    value: Asc.c_oAscSdtLevelType.Block
+                                    // iconCls: 'mnu-control-rich',
+                                    value: 'rich'
+                                },
+                                {
+                                    caption: this.textPictureControl,
+                                    // iconCls: 'mnu-control-rich',
+                                    value: 'picture'
+                                },
+                                {
+                                    caption: this.textComboboxControl,
+                                    // iconCls: 'mnu-control-rich',
+                                    value: 'combobox'
+                                },
+                                {
+                                    caption: this.textDropdownControl,
+                                    // iconCls: 'mnu-control-rich',
+                                    value: 'dropdown'
+                                },
+                                {
+                                    caption: this.textDateControl,
+                                    // iconCls: 'mnu-control-rich',
+                                    value: 'date'
+                                },
+                                {
+                                    caption: this.textCheckboxControl,
+                                    // iconCls: 'mnu-control-rich',
+                                    value: 'checkbox'
                                 },
                                 {caption: '--'},
                                 {
                                     caption: this.textRemoveControl,
-                                    iconCls: 'mnu-control-remove',
+                                    // iconCls: 'mnu-control-remove',
                                     value: 'remove'
                                 },
                                 {caption: '--'},
@@ -677,7 +704,7 @@ define([
                             ]
                         })
                     });
-                    this.paragraphControls.push(this.btnContentControls);
+                    // this.paragraphControls.push(this.btnContentControls);
 
                     this.btnColumns = new Common.UI.Button({
                         id: 'tlbtn-columns',
@@ -1928,8 +1955,7 @@ define([
 
                 this.btnMailRecepients.setVisible(mode.canCoAuthoring == true && mode.canUseMailMerge);
                 this.listStylesAdditionalMenuItem.setVisible(mode.canEditStyles);
-                this.btnContentControls.menu.items[4].setVisible(mode.canEditContentControl);
-                this.btnContentControls.menu.items[5].setVisible(mode.canEditContentControl);
+                this.btnContentControls.menu.items[10].setVisible(mode.canEditContentControl);
                 this.mnuInsertImage.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
             },
 
@@ -2149,8 +2175,8 @@ define([
             tipBack: 'Back',
             tipInsertShape: 'Insert Autoshape',
             tipInsertEquation: 'Insert Equation',
-            mniImageFromFile: 'Image from file',
-            mniImageFromUrl: 'Image from url',
+            mniImageFromFile: 'Image from File',
+            mniImageFromUrl: 'Image from URL',
             mniCustomTable: 'Insert Custom Table',
             textTitleError: 'Error',
             textInsertPageNumber: 'Insert page number',
@@ -2286,9 +2312,16 @@ define([
             textEditWatermark: 'Custom Watermark',
             textRemWatermark: 'Remove Watermark',
             tipWatermark: 'Edit watermark',
+            textPictureControl: 'Picture',
+            textComboboxControl: 'Combo box',
+            textCheckboxControl: 'Check box',
+            textDropdownControl: 'Drop-down list',
+            textDateControl: 'Date',
             capBtnAddComment: 'Add Comment',
             capBtnInsSymbol: 'Symbol',
-            tipInsertSymbol: 'Insert symbol'
+            tipInsertSymbol: 'Insert symbol',
+            mniDrawTable: 'Draw table',
+            mniEraseTable: 'Erase table'
         }
     })(), DE.Views.Toolbar || {}));
 });

apps/documenteditor/main/index.html

@@ -18,7 +18,7 @@
             width: 100%;
             overflow: hidden;
             border: none;
-            background: #f1f1f1;
+            background: #e2e2e2;
             z-index: 1001;
         }
 
@@ -101,10 +101,10 @@
 
         .loadmask > .placeholder {
             background: #fbfbfb;
-            width: 796px;
+            width: 794px;
             margin: 46px auto;
             height: 100%;
-            border: 1px solid #dfdfdf;
+            border: 1px solid #bebebe;
             padding-top: 50px;
         }
 
@@ -223,10 +223,14 @@
 
     <script>
         var params = getUrlParams(),
+            compact = params["compact"] == 'true',
             view = params["mode"] == 'view';
 
-        if (view) {
+        if (compact || view) {
             document.querySelector('.brendpanel > :nth-child(2)').remove();
+            document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
+        }
+        if (view) {
             document.querySelector('.sktoolbar').remove();
         }
 

apps/documenteditor/main/index.html.deploy

@@ -19,7 +19,7 @@
             width: 100%;
             overflow: hidden;
             border: none;
-            background: #f1f1f1;
+            background: #e2e2e2;
             z-index: 1001;
         }
 
@@ -102,10 +102,10 @@
 
         .loadmask > .placeholder {
             background: #fbfbfb;
-            width: 796px;
+            width: 794px;
             margin: 46px auto;
             height: 100%;
-            border: 1px solid #dfdfdf;
+            border: 1px solid #bebebe;
             padding-top: 50px;
         }
 
@@ -209,11 +209,17 @@
 
     <script>
         var params = getUrlParams(),
+            compact = params["compact"] == 'true',
             view = params["mode"] == 'view';
-        if (view) {
+
+        if (compact || view) {
             document.querySelector('.brendpanel > :nth-child(2)').remove();
+            document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
+        }
+        if (view) {
             document.querySelector('.sktoolbar').remove();
         }
+
         if (stopLoading) {
             document.body.removeChild(document.getElementById('loading-mask'));
         } else {

apps/documenteditor/main/locale/bg.json

@@ -69,6 +69,15 @@
   "Common.Controllers.ReviewChanges.textTabs": "Промяна на разделите",
   "Common.Controllers.ReviewChanges.textUnderline": "Подчертавам",
   "Common.Controllers.ReviewChanges.textWidow": "Управление на вдовицата",
+  "Common.define.chartData.textArea": "Площ",
+  "Common.define.chartData.textBar": "Бар",
+  "Common.define.chartData.textColumn": "Колона",
+  "Common.define.chartData.textLine": "Линия",
+  "Common.define.chartData.textPie": "Кръгова",
+  "Common.define.chartData.textPoint": "XY (точкова)",
+  "Common.define.chartData.textStock": "Борсова",
+  "Common.define.chartData.textSurface": "Повърхност",
+  "Common.define.chartData.textCharts": "Диаграми",
   "Common.UI.ComboBorderSize.txtNoBorders": "Няма граници",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Няма граници",
   "Common.UI.ComboDataView.emptyComboText": "Няма стилове",
@@ -1000,20 +1009,12 @@
   "DE.Views.BookmarksDialog.textTitle": "Отбелязани",
   "DE.Views.BookmarksDialog.txtInvalidName": "Името на отметката може да съдържа само букви, цифри и долни черти и трябва да започва с буквата",
   "DE.Views.ChartSettings.textAdvanced": "Показване на разширените настройки",
-  "DE.Views.ChartSettings.textArea": "Площ",
-  "DE.Views.ChartSettings.textBar": "Бар",
   "DE.Views.ChartSettings.textChartType": "Промяна на типа на диаграмата",
-  "DE.Views.ChartSettings.textColumn": "Колона",
   "DE.Views.ChartSettings.textEditData": "Редактиране на данни",
   "DE.Views.ChartSettings.textHeight": "Височина",
-  "DE.Views.ChartSettings.textLine": "Линия",
   "DE.Views.ChartSettings.textOriginalSize": "Размер по подразбиране",
-  "DE.Views.ChartSettings.textPie": "Кръгова",
-  "DE.Views.ChartSettings.textPoint": "XY (точкова)",
   "DE.Views.ChartSettings.textSize": "Размер",
-  "DE.Views.ChartSettings.textStock": "Борсова",
   "DE.Views.ChartSettings.textStyle": "Стил",
-  "DE.Views.ChartSettings.textSurface": "Повърхност",
   "DE.Views.ChartSettings.textUndock": "Откачете от панела",
   "DE.Views.ChartSettings.textWidth": "Ширина",
   "DE.Views.ChartSettings.textWrap": "Стил на опаковане",
@@ -1994,13 +1995,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Изображение от хранилището",
   "DE.Views.Toolbar.mniImageFromUrl": "Изображение от URL адрес",
   "DE.Views.Toolbar.strMenuNoFill": "Без попълване",
-  "DE.Views.Toolbar.textArea": "Площ",
   "DE.Views.Toolbar.textAutoColor": "Автоматичен",
-  "DE.Views.Toolbar.textBar": "Бар",
   "DE.Views.Toolbar.textBold": "Получер",
   "DE.Views.Toolbar.textBottom": "Долу:",
-  "DE.Views.Toolbar.textCharts": "Диаграми",
-  "DE.Views.Toolbar.textColumn": "Колона",
   "DE.Views.Toolbar.textColumnsCustom": "Персонализирани графи",
   "DE.Views.Toolbar.textColumnsLeft": "Наляво",
   "DE.Views.Toolbar.textColumnsOne": "Един",
@@ -2019,7 +2016,6 @@
   "DE.Views.Toolbar.textItalic": "Курсив",
   "DE.Views.Toolbar.textLandscape": "Пейзаж",
   "DE.Views.Toolbar.textLeft": "Наляво: ",
-  "DE.Views.Toolbar.textLine": "Линия",
   "DE.Views.Toolbar.textMarginsLast": "Последно персонализирано",
   "DE.Views.Toolbar.textMarginsModerate": "Умерен",
   "DE.Views.Toolbar.textMarginsNarrow": "Тесен",
@@ -2033,14 +2029,11 @@
   "DE.Views.Toolbar.textOddPage": "Нечетна страница",
   "DE.Views.Toolbar.textPageMarginsCustom": "Персонализирани полета",
   "DE.Views.Toolbar.textPageSizeCustom": "Персонализиран размер на страницата",
-  "DE.Views.Toolbar.textPie": "Кръгова",
   "DE.Views.Toolbar.textPlainControl": "Вмъкване на контрол на съдържанието в обикновен текст",
-  "DE.Views.Toolbar.textPoint": "XY (точкова)",
   "DE.Views.Toolbar.textPortrait": "Портрет",
   "DE.Views.Toolbar.textRemoveControl": "Премахване на контрола на съдържанието",
   "DE.Views.Toolbar.textRichControl": "Вмъкване на контрол върху съдържанието на богатия текст",
   "DE.Views.Toolbar.textRight": "Дясно: ",
-  "DE.Views.Toolbar.textStock": "Борсова",
   "DE.Views.Toolbar.textStrikeout": "Зачеркнато",
   "DE.Views.Toolbar.textStyleMenuDelete": "Изтриване на стил",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Изтрийте всички персонализирани стилове",
@@ -2050,7 +2043,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Актуализация от избора",
   "DE.Views.Toolbar.textSubscript": "Долен",
   "DE.Views.Toolbar.textSuperscript": "Горен индекс",
-  "DE.Views.Toolbar.textSurface": "Повърхност",
   "DE.Views.Toolbar.textTabCollaboration": "Сътрудничество",
   "DE.Views.Toolbar.textTabFile": "Файл",
   "DE.Views.Toolbar.textTabHome": "У дома",

apps/documenteditor/main/locale/cs.json

@@ -63,6 +63,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Change tabs",
   "Common.Controllers.ReviewChanges.textUnderline": "Podtržené",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
+  "Common.define.chartData.textArea": "Plošný graf",
+  "Common.define.chartData.textBar": "Pruhový graf",
+  "Common.define.chartData.textColumn": "Sloupcový graf",
+  "Common.define.chartData.textLine": "Liniový graf",
+  "Common.define.chartData.textPie": "Kruhový diagram",
+  "Common.define.chartData.textPoint": "Bodový graf",
+  "Common.define.chartData.textStock": "Burzovní graf",
+  "Common.define.chartData.textSurface": "Povrch",
   "Common.UI.ComboBorderSize.txtNoBorders": "Bez ohraničení",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez ohraničení",
   "Common.UI.ComboDataView.emptyComboText": "Žádné styly",
@@ -689,20 +697,12 @@
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Ksí",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "DE.Views.ChartSettings.textAdvanced": "Zobrazit pokročilé nastavení",
-  "DE.Views.ChartSettings.textArea": "Plošný graf",
-  "DE.Views.ChartSettings.textBar": "Pruhový graf",
   "DE.Views.ChartSettings.textChartType": "Změnit typ grafu",
-  "DE.Views.ChartSettings.textColumn": "Sloupcový graf",
   "DE.Views.ChartSettings.textEditData": "Upravit data",
   "DE.Views.ChartSettings.textHeight": "Výška",
-  "DE.Views.ChartSettings.textLine": "Liniový graf",
   "DE.Views.ChartSettings.textOriginalSize": "Výchozí velikost",
-  "DE.Views.ChartSettings.textPie": "Kruhový diagram",
-  "DE.Views.ChartSettings.textPoint": "Bodový graf",
   "DE.Views.ChartSettings.textSize": "Velikost",
-  "DE.Views.ChartSettings.textStock": "Burzovní graf",
   "DE.Views.ChartSettings.textStyle": "Styl",
-  "DE.Views.ChartSettings.textSurface": "Povrch",
   "DE.Views.ChartSettings.textUndock": "Odepnout od panelu",
   "DE.Views.ChartSettings.textWidth": "Šířka",
   "DE.Views.ChartSettings.textWrap": "Obtékání textu",
@@ -1495,13 +1495,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "Obrázek ze souboru",
   "DE.Views.Toolbar.mniImageFromUrl": "Obrázek z adresy URL",
   "DE.Views.Toolbar.strMenuNoFill": "Bez výplně",
-  "DE.Views.Toolbar.textArea": "Plošný graf",
   "DE.Views.Toolbar.textAutoColor": "Automaticky",
-  "DE.Views.Toolbar.textBar": "Pruhový graf",
   "DE.Views.Toolbar.textBold": "Tučné",
   "DE.Views.Toolbar.textBottom": "Bottom: ",
-  "DE.Views.Toolbar.textCharts": "Grafy",
-  "DE.Views.Toolbar.textColumn": "Sloupcový graf",
   "DE.Views.Toolbar.textColumnsCustom": "Vlastní sloupce",
   "DE.Views.Toolbar.textColumnsLeft": "Left",
   "DE.Views.Toolbar.textColumnsOne": "One",
@@ -1520,7 +1516,6 @@
   "DE.Views.Toolbar.textItalic": "Kurzíva",
   "DE.Views.Toolbar.textLandscape": "Na šířku",
   "DE.Views.Toolbar.textLeft": "Left: ",
-  "DE.Views.Toolbar.textLine": "Liniový graf",
   "DE.Views.Toolbar.textMarginsLast": "Last Custom",
   "DE.Views.Toolbar.textMarginsModerate": "Moderate",
   "DE.Views.Toolbar.textMarginsNarrow": "Narrow",
@@ -1533,11 +1528,8 @@
   "DE.Views.Toolbar.textOddPage": "Lichá stránka",
   "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
   "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
-  "DE.Views.Toolbar.textPie": "Kruhový diagram",
-  "DE.Views.Toolbar.textPoint": "Bodový graf",
   "DE.Views.Toolbar.textPortrait": "Na výšku",
   "DE.Views.Toolbar.textRight": "Right: ",
-  "DE.Views.Toolbar.textStock": "Burzovní graf",
   "DE.Views.Toolbar.textStrikeout": "Přeškrtnout",
   "DE.Views.Toolbar.textStyleMenuDelete": "Odstranit styl",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Odstranit všechny vlastní styly",
@@ -1547,7 +1539,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Aktualizovat z výběru",
   "DE.Views.Toolbar.textSubscript": "Dolní index",
   "DE.Views.Toolbar.textSuperscript": "Horní index",
-  "DE.Views.Toolbar.textSurface": "Povrch",
   "DE.Views.Toolbar.textTabFile": "Soubor",
   "DE.Views.Toolbar.textTabHome": "Domů",
   "DE.Views.Toolbar.textTabInsert": "Vložit",

apps/documenteditor/main/locale/de.json

@@ -1995,13 +1995,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Bild aus dem Speicher",
   "DE.Views.Toolbar.mniImageFromUrl": "Bild aus URL",
   "DE.Views.Toolbar.strMenuNoFill": "Keine Füllung",
-  "DE.Views.Toolbar.textArea": "Fläche",
   "DE.Views.Toolbar.textAutoColor": "Automatisch",
-  "DE.Views.Toolbar.textBar": "Balken",
   "DE.Views.Toolbar.textBold": "Fett",
   "DE.Views.Toolbar.textBottom": "Unten: ",
-  "DE.Views.Toolbar.textCharts": "Diagramme",
-  "DE.Views.Toolbar.textColumn": "Spalte",
   "DE.Views.Toolbar.textColumnsCustom": "Benutzerdefinierte Spalten",
   "DE.Views.Toolbar.textColumnsLeft": "Links",
   "DE.Views.Toolbar.textColumnsOne": "Ein",
@@ -2020,7 +2016,6 @@
   "DE.Views.Toolbar.textItalic": "Kursiv",
   "DE.Views.Toolbar.textLandscape": "Querformat",
   "DE.Views.Toolbar.textLeft": "Links: ",
-  "DE.Views.Toolbar.textLine": "Linie",
   "DE.Views.Toolbar.textMarginsLast": " Benutzerdefiniert als letzte",
   "DE.Views.Toolbar.textMarginsModerate": "Mittelmäßig",
   "DE.Views.Toolbar.textMarginsNarrow": "Schmal",
@@ -2034,14 +2029,11 @@
   "DE.Views.Toolbar.textOddPage": "Ungerade Seite",
   "DE.Views.Toolbar.textPageMarginsCustom": "Benutzerdefinierte Seitenränder ",
   "DE.Views.Toolbar.textPageSizeCustom": "Benutzerdefiniertes Seitenformat",
-  "DE.Views.Toolbar.textPie": "Kreis",
   "DE.Views.Toolbar.textPlainControl": "Nur-Text-Inhaltssteuerelement einfügen",
-  "DE.Views.Toolbar.textPoint": "Punkt (XY)",
   "DE.Views.Toolbar.textPortrait": "Hochformat",
   "DE.Views.Toolbar.textRemoveControl": "Inhaltssteuerelement entfernen",
   "DE.Views.Toolbar.textRichControl": "Rich-Text-Inhaltssteuerelement einfügen",
   "DE.Views.Toolbar.textRight": "Rechts: ",
-  "DE.Views.Toolbar.textStock": "Kurs",
   "DE.Views.Toolbar.textStrikeout": "Durchgestrichen",
   "DE.Views.Toolbar.textStyleMenuDelete": "Stil löschen",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Alle benutzerdefinierte Stile löschen ",
@@ -2051,7 +2043,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Aus der Auswahl neu aktualisieren",
   "DE.Views.Toolbar.textSubscript": "Tiefgestellt",
   "DE.Views.Toolbar.textSuperscript": "Hochgestellt",
-  "DE.Views.Toolbar.textSurface": "Oberfläche",
   "DE.Views.Toolbar.textTabCollaboration": "Zusammenarbeit",
   "DE.Views.Toolbar.textTabFile": "Datei",
   "DE.Views.Toolbar.textTabHome": "Startseite",

apps/documenteditor/main/locale/en.json

@@ -69,6 +69,8 @@
   "Common.Controllers.ReviewChanges.textTabs": "Change tabs",
   "Common.Controllers.ReviewChanges.textUnderline": "Underline",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
+  "Common.Controllers.ReviewChanges.textUrl": "Paste a document URL",
+  "Common.Controllers.ReviewChanges.textAcceptBeforeCompare": "In order to compare documents all the tracked changes in them will be considered to have been accepted. Do you want to continue?",
   "Common.define.chartData.textArea": "Area",
   "Common.define.chartData.textBar": "Bar",
   "Common.define.chartData.textCharts": "Charts",
@@ -111,6 +113,39 @@
   "Common.UI.Window.textInformation": "Information",
   "Common.UI.Window.textWarning": "Warning",
   "Common.UI.Window.yesButtonText": "Yes",
+  "Common.UI.Calendar.textJanuary": "January",
+  "Common.UI.Calendar.textFebruary": "February",
+  "Common.UI.Calendar.textMarch": "March",
+  "Common.UI.Calendar.textApril": "April",
+  "Common.UI.Calendar.textMay": "May",
+  "Common.UI.Calendar.textJune": "June",
+  "Common.UI.Calendar.textJuly": "July",
+  "Common.UI.Calendar.textAugust": "August",
+  "Common.UI.Calendar.textSeptember": "September",
+  "Common.UI.Calendar.textOctober": "October",
+  "Common.UI.Calendar.textNovember": "November",
+  "Common.UI.Calendar.textDecember": "December",
+  "Common.UI.Calendar.textShortJanuary": "Jan",
+  "Common.UI.Calendar.textShortFebruary": "Feb",
+  "Common.UI.Calendar.textShortMarch": "Mar",
+  "Common.UI.Calendar.textShortApril": "Apr",
+  "Common.UI.Calendar.textShortMay": "May",
+  "Common.UI.Calendar.textShortJune": "Jun",
+  "Common.UI.Calendar.textShortJuly": "Jul",
+  "Common.UI.Calendar.textShortAugust": "Aug",
+  "Common.UI.Calendar.textShortSeptember": "Sep",
+  "Common.UI.Calendar.textShortOctober": "Oct",
+  "Common.UI.Calendar.textShortNovember": "Nov",
+  "Common.UI.Calendar.textShortDecember": "Dec",
+  "Common.UI.Calendar.textShortSunday": "Su",
+  "Common.UI.Calendar.textShortMonday": "Mo",
+  "Common.UI.Calendar.textShortTuesday": "Tu",
+  "Common.UI.Calendar.textShortWednesday": "We",
+  "Common.UI.Calendar.textShortThursday": "Th",
+  "Common.UI.Calendar.textShortFriday": "Fr",
+  "Common.UI.Calendar.textShortSaturday": "Sa",
+  "Common.UI.Calendar.textMonths": "Months",
+  "Common.UI.Calendar.textYears": "Years",
   "Common.Utils.Metric.txtCm": "cm",
   "Common.Utils.Metric.txtPt": "pt",
   "Common.Views.About.txtAddress": "address: ",
@@ -230,6 +265,8 @@
   "Common.Views.ReviewChanges.strStrictDesc": "Use the 'Save' button to sync the changes you and others make.",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "Accept current change",
   "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode",
+  "Common.Views.ReviewChanges.tipCommentRem": "Remove comments",
+  "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments",
   "Common.Views.ReviewChanges.tipHistory": "Show version history",
   "Common.Views.ReviewChanges.tipRejectCurrent": "Reject current change",
   "Common.Views.ReviewChanges.tipReview": "Track changes",
@@ -244,6 +281,11 @@
   "Common.Views.ReviewChanges.txtChat": "Chat",
   "Common.Views.ReviewChanges.txtClose": "Close",
   "Common.Views.ReviewChanges.txtCoAuthMode": "Co-editing Mode",
+  "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments",
+  "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments",
+  "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments",
+  "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments",
+  "Common.Views.ReviewChanges.txtCommentRemove": "Remove",
   "Common.Views.ReviewChanges.txtDocLang": "Language",
   "Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)",
   "Common.Views.ReviewChanges.txtFinalCap": "Final",
@@ -262,13 +304,12 @@
   "Common.Views.ReviewChanges.txtSpelling": "Spell Checking",
   "Common.Views.ReviewChanges.txtTurnon": "Track Changes",
   "Common.Views.ReviewChanges.txtView": "Display Mode",
-  "Common.Views.ReviewChanges.txtCommentRemove": "Remove",
-  "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments",
-  "Common.Views.ReviewChanges.tipCommentRem": "Remove comments",
-  "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments",
-  "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments",
-  "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments",
-  "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments",
+  "Common.Views.ReviewChanges.txtCompare": "Compare",
+  "Common.Views.ReviewChanges.tipCompare": "Compare current document with another one",
+  "Common.Views.ReviewChanges.mniFromFile": "Document from File",
+  "Common.Views.ReviewChanges.mniFromUrl": "Document from URL",
+  "Common.Views.ReviewChanges.mniFromStorage": "Document from Storage",
+  "Common.Views.ReviewChanges.mniSettings": "Comparison Settings",
   "Common.Views.ReviewChangesDialog.textTitle": "Review Changes",
   "Common.Views.ReviewChangesDialog.txtAccept": "Accept",
   "Common.Views.ReviewChangesDialog.txtAcceptAll": "Accept All Changes",
@@ -315,11 +356,11 @@
   "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line",
   "Common.Views.SignSettingsDialog.textTitle": "Signature Setup",
   "Common.Views.SignSettingsDialog.txtEmpty": "This field is required",
-  "Common.Views.SymbolTableDialog.textTitle": "Symbol",
+  "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value",
   "Common.Views.SymbolTableDialog.textFont": "Font",
   "Common.Views.SymbolTableDialog.textRange": "Range",
   "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols",
-  "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value",
+  "Common.Views.SymbolTableDialog.textTitle": "Symbol",
   "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document",
   "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
@@ -369,6 +410,7 @@
   "DE.Controllers.Main.errorToken": "The document security token is not correctly formed.<br>Please contact your Document Server administrator.",
   "DE.Controllers.Main.errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator.",
   "DE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
+  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
   "DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.",
   "DE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded",
   "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print it until the connection is restored and page is reloaded.",
@@ -657,6 +699,9 @@
   "DE.Controllers.Main.txtZeroDivide": "Zero Divide",
   "DE.Controllers.Main.unknownErrorText": "Unknown error.",
   "DE.Controllers.Main.unsupportedBrowserErrorText": "Your browser is not supported.",
+  "DE.Controllers.Main.uploadDocSizeMessage": "Maximum document size limit exceeded.",
+  "DE.Controllers.Main.uploadDocExtMessage": "Unknown document format.",
+  "DE.Controllers.Main.uploadDocFileCountMessage": "No documents uploaded.",
   "DE.Controllers.Main.uploadImageExtMessage": "Unknown image format.",
   "DE.Controllers.Main.uploadImageFileCountMessage": "No images uploaded.",
   "DE.Controllers.Main.uploadImageSizeMessage": "Maximum image size limit exceeded.",
@@ -671,7 +716,6 @@
   "DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
-  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
   "DE.Controllers.Navigation.txtBeginning": "Beginning of document",
   "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
   "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
@@ -686,6 +730,7 @@
   "DE.Controllers.Toolbar.textFontSizeErr": "The entered value is incorrect.<br>Please enter a numeric value between 1 and 100",
   "DE.Controllers.Toolbar.textFraction": "Fractions",
   "DE.Controllers.Toolbar.textFunction": "Functions",
+  "DE.Controllers.Toolbar.textInsert": "Insert",
   "DE.Controllers.Toolbar.textIntegral": "Integrals",
   "DE.Controllers.Toolbar.textLargeOperator": "Large Operators",
   "DE.Controllers.Toolbar.textLimitAndLog": "Limits And Logarithms",
@@ -1013,7 +1058,6 @@
   "DE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis",
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
-  "DE.Controllers.Toolbar.textInsert": "Insert",
   "DE.Controllers.Viewport.textFitPage": "Fit to Page",
   "DE.Controllers.Viewport.textFitWidth": "Fit to Width",
   "DE.Views.AddNewCaptionLabelDialog.textLabel": "Label:",
@@ -1065,20 +1109,12 @@
   "DE.Views.CellsRemoveDialog.textRow": "Delete entire row",
   "DE.Views.CellsRemoveDialog.textTitle": "Delete Cells",
   "DE.Views.ChartSettings.textAdvanced": "Show advanced settings",
-  "del_DE.Views.ChartSettings.textArea": "Area",
-  "del_DE.Views.ChartSettings.textBar": "Bar",
   "DE.Views.ChartSettings.textChartType": "Change Chart Type",
-  "del_DE.Views.ChartSettings.textColumn": "Column",
   "DE.Views.ChartSettings.textEditData": "Edit Data",
   "DE.Views.ChartSettings.textHeight": "Height",
-  "del_DE.Views.ChartSettings.textLine": "Line",
   "DE.Views.ChartSettings.textOriginalSize": "Actual Size",
-  "del_DE.Views.ChartSettings.textPie": "Pie",
-  "del_DE.Views.ChartSettings.textPoint": "XY (Scatter)",
   "DE.Views.ChartSettings.textSize": "Size",
-  "del_DE.Views.ChartSettings.textStock": "Stock",
   "DE.Views.ChartSettings.textStyle": "Style",
-  "del_DE.Views.ChartSettings.textSurface": "Surface",
   "DE.Views.ChartSettings.textUndock": "Undock from panel",
   "DE.Views.ChartSettings.textWidth": "Width",
   "DE.Views.ChartSettings.textWrap": "Wrapping Style",
@@ -1090,6 +1126,10 @@
   "DE.Views.ChartSettings.txtTight": "Tight",
   "DE.Views.ChartSettings.txtTitle": "Chart",
   "DE.Views.ChartSettings.txtTopAndBottom": "Top and bottom",
+  "DE.Views.CompareSettingsDialog.textTitle": "Comparison Settings",
+  "DE.Views.CompareSettingsDialog.textShow": "Show changes at",
+  "DE.Views.CompareSettingsDialog.textChar": "Character level",
+  "DE.Views.CompareSettingsDialog.textWord": "Word level",
   "DE.Views.ControlSettingsDialog.textAppearance": "Appearance",
   "DE.Views.ControlSettingsDialog.textApplyAll": "Apply to All",
   "DE.Views.ControlSettingsDialog.textBox": "Bounding box",
@@ -1104,6 +1144,22 @@
   "DE.Views.ControlSettingsDialog.textTitle": "Content Control Settings",
   "DE.Views.ControlSettingsDialog.txtLockDelete": "Content control cannot be deleted",
   "DE.Views.ControlSettingsDialog.txtLockEdit": "Contents cannot be edited",
+  "DE.Views.ControlSettingsDialog.strGeneral": "General",
+  "DE.Views.ControlSettingsDialog.textAdd": "Add",
+  "DE.Views.ControlSettingsDialog.textChange": "Edit",
+  "DE.Views.ControlSettingsDialog.textDelete": "Delete",
+  "DE.Views.ControlSettingsDialog.textUp": "Up",
+  "DE.Views.ControlSettingsDialog.textDown": "Down",
+  "DE.Views.ControlSettingsDialog.textCombobox": "Combo box",
+  "DE.Views.ControlSettingsDialog.textDropDown": "Drop-down list",
+  "DE.Views.ControlSettingsDialog.textDisplayName": "Display name",
+  "DE.Views.ControlSettingsDialog.textValue": "Value",
+  "DE.Views.ControlSettingsDialog.textDate": "Date format",
+  "DE.Views.ControlSettingsDialog.textLang": "Language",
+  "DE.Views.ControlSettingsDialog.textFormat": "Display the date like this",
+  "DE.Views.ControlSettingsDialog.textCheckbox": "Check box",
+  "DE.Views.ControlSettingsDialog.textChecked": "Checked symbol",
+  "DE.Views.ControlSettingsDialog.textUnchecked": "Unchecked symbol",
   "DE.Views.CustomColumnsDialog.textColumns": "Number of columns",
   "DE.Views.CustomColumnsDialog.textSeparator": "Column divider",
   "DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns",
@@ -1362,6 +1418,10 @@
   "DE.Views.DropcapSettingsAdvanced.textWidth": "Width",
   "DE.Views.DropcapSettingsAdvanced.tipFontName": "Font",
   "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "No borders",
+  "DE.Views.EditListItemDialog.textDisplayName": "Display name",
+  "DE.Views.EditListItemDialog.textValue": "Value",
+  "DE.Views.EditListItemDialog.textNameError": "Display name must not be empty.",
+  "DE.Views.EditListItemDialog.textValueError": "An item with the same value already exists.",
   "DE.Views.FileMenu.btnBackCaption": "Open file location",
   "DE.Views.FileMenu.btnCloseMenuCaption": "Close Menu",
   "DE.Views.FileMenu.btnCreateNewCaption": "Create New",
@@ -1712,6 +1772,17 @@
   "DE.Views.PageMarginsDialog.textTop": "Top",
   "DE.Views.PageMarginsDialog.txtMarginsH": "Top and bottom margins are too high for a given page height",
   "DE.Views.PageMarginsDialog.txtMarginsW": "Left and right margins are too wide for a given page width",
+  "DE.Views.PageMarginsDialog.textMultiplePages": "Multiple pages",
+  "DE.Views.PageMarginsDialog.textGutter": "Gutter",
+  "DE.Views.PageMarginsDialog.textGutterPosition": "Gutter position",
+  "DE.Views.PageMarginsDialog.textOrientation": "Orientation",
+  "DE.Views.PageMarginsDialog.textPreview": "Preview",
+  "DE.Views.PageMarginsDialog.textPortrait": "Portrait",
+  "DE.Views.PageMarginsDialog.textLandscape": "Landscape",
+  "DE.Views.PageMarginsDialog.textMirrorMargins": "Mirror margins",
+  "DE.Views.PageMarginsDialog.textNormal": "Normal",
+  "DE.Views.PageMarginsDialog.textInside": "Inside",
+  "DE.Views.PageMarginsDialog.textOutside": "Outside",
   "DE.Views.PageSizeDialog.textHeight": "Height",
   "DE.Views.PageSizeDialog.textPreset": "Preset",
   "DE.Views.PageSizeDialog.textTitle": "Page Size",
@@ -2084,6 +2155,7 @@
   "DE.Views.Toolbar.capBtnInsImage": "Image",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Breaks",
   "DE.Views.Toolbar.capBtnInsShape": "Shape",
+  "DE.Views.Toolbar.capBtnInsSymbol": "Symbol",
   "DE.Views.Toolbar.capBtnInsTable": "Table",
   "DE.Views.Toolbar.capBtnInsTextart": "Text Art",
   "DE.Views.Toolbar.capBtnInsTextbox": "Text Box",
@@ -2108,13 +2180,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Image from Storage",
   "DE.Views.Toolbar.mniImageFromUrl": "Image from URL",
   "DE.Views.Toolbar.strMenuNoFill": "No Fill",
-  "del_DE.Views.Toolbar.textArea": "Area",
   "DE.Views.Toolbar.textAutoColor": "Automatic",
-  "del_DE.Views.Toolbar.textBar": "Bar",
   "DE.Views.Toolbar.textBold": "Bold",
   "DE.Views.Toolbar.textBottom": "Bottom: ",
-  "del_DE.Views.Toolbar.textCharts": "Charts",
-  "del_DE.Views.Toolbar.textColumn": "Column",
   "DE.Views.Toolbar.textColumnsCustom": "Custom Columns",
   "DE.Views.Toolbar.textColumnsLeft": "Left",
   "DE.Views.Toolbar.textColumnsOne": "One",
@@ -2134,7 +2202,6 @@
   "DE.Views.Toolbar.textItalic": "Italic",
   "DE.Views.Toolbar.textLandscape": "Landscape",
   "DE.Views.Toolbar.textLeft": "Left: ",
-  "del_DE.Views.Toolbar.textLine": "Line",
   "DE.Views.Toolbar.textMarginsLast": "Last Custom",
   "DE.Views.Toolbar.textMarginsModerate": "Moderate",
   "DE.Views.Toolbar.textMarginsNarrow": "Narrow",
@@ -2148,15 +2215,12 @@
   "DE.Views.Toolbar.textOddPage": "Odd Page",
   "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
   "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
-  "del_DE.Views.Toolbar.textPie": "Pie",
-  "DE.Views.Toolbar.textPlainControl": "Insert plain text content control",
-  "del_DE.Views.Toolbar.textPoint": "XY (Scatter)",
+  "DE.Views.Toolbar.textPlainControl": "Plain text",
   "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRemoveControl": "Remove content control",
   "DE.Views.Toolbar.textRemWatermark": "Remove Watermark",
-  "DE.Views.Toolbar.textRichControl": "Insert rich text content control",
+  "DE.Views.Toolbar.textRichControl": "Rich text",
   "DE.Views.Toolbar.textRight": "Right: ",
-  "del_DE.Views.Toolbar.textStock": "Stock",
   "DE.Views.Toolbar.textStrikeout": "Strikethrough",
   "DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles",
@@ -2166,7 +2230,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection",
   "DE.Views.Toolbar.textSubscript": "Subscript",
   "DE.Views.Toolbar.textSuperscript": "Superscript",
-  "del_DE.Views.Toolbar.textSurface": "Surface",
   "DE.Views.Toolbar.textTabCollaboration": "Collaboration",
   "DE.Views.Toolbar.textTabFile": "File",
   "DE.Views.Toolbar.textTabHome": "Home",
@@ -2211,6 +2274,7 @@
   "DE.Views.Toolbar.tipInsertImage": "Insert image",
   "DE.Views.Toolbar.tipInsertNum": "Insert Page Number",
   "DE.Views.Toolbar.tipInsertShape": "Insert autoshape",
+  "DE.Views.Toolbar.tipInsertSymbol": "Insert symbol",
   "DE.Views.Toolbar.tipInsertTable": "Insert table",
   "DE.Views.Toolbar.tipInsertText": "Insert text box",
   "DE.Views.Toolbar.tipInsertTextArt": "Insert Text Art",
@@ -2262,8 +2326,13 @@
   "DE.Views.Toolbar.txtScheme7": "Equity",
   "DE.Views.Toolbar.txtScheme8": "Flow",
   "DE.Views.Toolbar.txtScheme9": "Foundry",
-  "DE.Views.Toolbar.capBtnInsSymbol": "Symbol",
-  "DE.Views.Toolbar.tipInsertSymbol": "Insert symbol",
+  "DE.Views.Toolbar.textPictureControl": "Picture",
+  "DE.Views.Toolbar.textComboboxControl": "Combo box",
+  "DE.Views.Toolbar.textCheckboxControl": "Check box",
+  "DE.Views.Toolbar.textDropdownControl": "Drop-down list",
+  "DE.Views.Toolbar.textDateControl": "Date",
+  "DE.Views.Toolbar.mniDrawTable": "Draw table",
+  "DE.Views.Toolbar.mniEraseTable": "Erase table",
   "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
   "DE.Views.WatermarkSettingsDialog.textBold": "Bold",
   "DE.Views.WatermarkSettingsDialog.textColor": "Text color",

apps/documenteditor/main/locale/es.json

@@ -69,6 +69,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Cambiar tabuladores",
   "Common.Controllers.ReviewChanges.textUnderline": "Subrayado",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
+  "Common.define.chartData.textArea": "Área",
+  "Common.define.chartData.textBar": "Barra",
+  "Common.define.chartData.textColumn": "Gráfico de columnas",
+  "Common.define.chartData.textLine": "Línea",
+  "Common.define.chartData.textPie": "Gráfico circular",
+  "Common.define.chartData.textPoint": "XY (Dispersión)",
+  "Common.define.chartData.textStock": "De cotizaciones",
+  "Common.define.chartData.textSurface": "Superficie",
   "Common.UI.ComboBorderSize.txtNoBorders": "Sin bordes",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sin bordes",
   "Common.UI.ComboDataView.emptyComboText": "Sin estilo",
@@ -1001,20 +1009,12 @@
   "DE.Views.BookmarksDialog.textTitle": "Marcadores",
   "DE.Views.BookmarksDialog.txtInvalidName": "Nombre de marcador sólo puede contener letras, dígitos y barras bajas y debe comenzar con la letra",
   "DE.Views.ChartSettings.textAdvanced": "Mostrar ajustes avanzados",
-  "DE.Views.ChartSettings.textArea": "Área",
-  "DE.Views.ChartSettings.textBar": "Barra",
   "DE.Views.ChartSettings.textChartType": "Cambiar tipo de gráfico",
-  "DE.Views.ChartSettings.textColumn": "Gráfico de columnas",
   "DE.Views.ChartSettings.textEditData": "Editar datos",
   "DE.Views.ChartSettings.textHeight": "Altura",
-  "DE.Views.ChartSettings.textLine": "Línea",
   "DE.Views.ChartSettings.textOriginalSize": "Tamaño Predeterminado",
-  "DE.Views.ChartSettings.textPie": "Gráfico circular",
-  "DE.Views.ChartSettings.textPoint": "XY (Dispersión)",
   "DE.Views.ChartSettings.textSize": "Tamaño",
-  "DE.Views.ChartSettings.textStock": "De cotizaciones",
   "DE.Views.ChartSettings.textStyle": "Estilo",
-  "DE.Views.ChartSettings.textSurface": "Superficie",
   "DE.Views.ChartSettings.textUndock": "Desacoplar de panel",
   "DE.Views.ChartSettings.textWidth": "Ancho",
   "DE.Views.ChartSettings.textWrap": "Ajuste de texto",
@@ -2005,13 +2005,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Imagen de Almacenamiento",
   "DE.Views.Toolbar.mniImageFromUrl": "Imagen de URL",
   "DE.Views.Toolbar.strMenuNoFill": "Sin relleno",
-  "DE.Views.Toolbar.textArea": "Área",
   "DE.Views.Toolbar.textAutoColor": "Automático",
-  "DE.Views.Toolbar.textBar": "Gráfico de barras",
   "DE.Views.Toolbar.textBold": "Negrita",
   "DE.Views.Toolbar.textBottom": "Inferior: ",
-  "DE.Views.Toolbar.textCharts": "Gráficos",
-  "DE.Views.Toolbar.textColumn": "Gráfico de columnas",
   "DE.Views.Toolbar.textColumnsCustom": "Columnas personalizadas",
   "DE.Views.Toolbar.textColumnsLeft": "Izquierdo",
   "DE.Views.Toolbar.textColumnsOne": "Uno",
@@ -2031,7 +2027,6 @@
   "DE.Views.Toolbar.textItalic": "Cursiva",
   "DE.Views.Toolbar.textLandscape": "Horizontal",
   "DE.Views.Toolbar.textLeft": "Izquierdo: ",
-  "DE.Views.Toolbar.textLine": "Gráfico de líneas",
   "DE.Views.Toolbar.textMarginsLast": "último personalizado",
   "DE.Views.Toolbar.textMarginsModerate": "Moderar",
   "DE.Views.Toolbar.textMarginsNarrow": "Estrecho",
@@ -2045,15 +2040,12 @@
   "DE.Views.Toolbar.textOddPage": "Página impar",
   "DE.Views.Toolbar.textPageMarginsCustom": "Márgenes personalizados",
   "DE.Views.Toolbar.textPageSizeCustom": "Tamaño de página personalizado",
-  "DE.Views.Toolbar.textPie": "Gráfico circular",
   "DE.Views.Toolbar.textPlainControl": "Introducir contenido de texto simple",
-  "DE.Views.Toolbar.textPoint": "XY (Dispersión)",
   "DE.Views.Toolbar.textPortrait": "Vertical",
   "DE.Views.Toolbar.textRemoveControl": "Elimine el control de contenido",
   "DE.Views.Toolbar.textRemWatermark": "Quitar marca de agua",
   "DE.Views.Toolbar.textRichControl": "Introducir contenido de texto rico",
   "DE.Views.Toolbar.textRight": "Derecho: ",
-  "DE.Views.Toolbar.textStock": "De cotizaciones",
   "DE.Views.Toolbar.textStrikeout": "Tachado",
   "DE.Views.Toolbar.textStyleMenuDelete": "Eliminar estilo",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Borrar todos los estilos personalizados",
@@ -2063,7 +2055,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Actualizar de la selección",
   "DE.Views.Toolbar.textSubscript": "Subíndice",
   "DE.Views.Toolbar.textSuperscript": "Sobreíndice",
-  "DE.Views.Toolbar.textSurface": "Superficie",
   "DE.Views.Toolbar.textTabCollaboration": "Colaboración",
   "DE.Views.Toolbar.textTabFile": "Archivo",
   "DE.Views.Toolbar.textTabHome": "Inicio",

apps/documenteditor/main/locale/fr.json

@@ -69,6 +69,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Changer les tabulations",
   "Common.Controllers.ReviewChanges.textUnderline": "Souligné",
   "Common.Controllers.ReviewChanges.textWidow": "Contrôle des veuves",
+  "Common.define.chartData.textArea": "En aires",
+  "Common.define.chartData.textBar": "En barre",
+  "Common.define.chartData.textColumn": "Colonne",
+  "Common.define.chartData.textLine": "Graphique en ligne",
+  "Common.define.chartData.textPie": "Graphiques à secteurs",
+  "Common.define.chartData.textPoint": "Nuages de points (XY)",
+  "Common.define.chartData.textStock": "Boursier",
+  "Common.define.chartData.textSurface": "Surface",
   "Common.UI.ComboBorderSize.txtNoBorders": "Pas de bordures",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Pas de bordures",
   "Common.UI.ComboDataView.emptyComboText": "Aucun style",
@@ -1013,20 +1021,12 @@
   "DE.Views.CellsRemoveDialog.textRow": "Supprimer la ligne entière",
   "DE.Views.CellsRemoveDialog.textTitle": "Supprimer les cellules",
   "DE.Views.ChartSettings.textAdvanced": "Afficher les paramètres avancés",
-  "DE.Views.ChartSettings.textArea": "En aires",
-  "DE.Views.ChartSettings.textBar": "En barre",
   "DE.Views.ChartSettings.textChartType": "Modifier le type de graphique",
-  "DE.Views.ChartSettings.textColumn": "Colonne",
   "DE.Views.ChartSettings.textEditData": "Modifier les données",
   "DE.Views.ChartSettings.textHeight": "Hauteur",
-  "DE.Views.ChartSettings.textLine": "Graphique en ligne",
   "DE.Views.ChartSettings.textOriginalSize": "Taille par défaut",
-  "DE.Views.ChartSettings.textPie": "Graphiques à secteurs",
-  "DE.Views.ChartSettings.textPoint": "Nuages de points (XY)",
   "DE.Views.ChartSettings.textSize": "Taille",
-  "DE.Views.ChartSettings.textStock": "Boursier",
   "DE.Views.ChartSettings.textStyle": "Style",
-  "DE.Views.ChartSettings.textSurface": "Surface",
   "DE.Views.ChartSettings.textUndock": "Détacher du panneau",
   "DE.Views.ChartSettings.textWidth": "Largeur",
   "DE.Views.ChartSettings.textWrap": "Style d'habillage",
@@ -2051,13 +2051,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Image de stockage",
   "DE.Views.Toolbar.mniImageFromUrl": "Image à partir d'une URL",
   "DE.Views.Toolbar.strMenuNoFill": "Pas de remplissage",
-  "DE.Views.Toolbar.textArea": "En aires",
   "DE.Views.Toolbar.textAutoColor": "Automatique",
-  "DE.Views.Toolbar.textBar": "En barre",
   "DE.Views.Toolbar.textBold": "Gras",
   "DE.Views.Toolbar.textBottom": "En bas: ",
-  "DE.Views.Toolbar.textCharts": "Graphiques",
-  "DE.Views.Toolbar.textColumn": "Colonne",
   "DE.Views.Toolbar.textColumnsCustom": "Colonnes personnalisées",
   "DE.Views.Toolbar.textColumnsLeft": "A gauche",
   "DE.Views.Toolbar.textColumnsOne": "Un",
@@ -2077,7 +2073,6 @@
   "DE.Views.Toolbar.textItalic": "Italique",
   "DE.Views.Toolbar.textLandscape": "Paysage",
   "DE.Views.Toolbar.textLeft": "À gauche:",
-  "DE.Views.Toolbar.textLine": "Graphique en ligne",
   "DE.Views.Toolbar.textMarginsLast": "Dernière mesure",
   "DE.Views.Toolbar.textMarginsModerate": "Modérer",
   "DE.Views.Toolbar.textMarginsNarrow": "Étroit",
@@ -2091,15 +2086,12 @@
   "DE.Views.Toolbar.textOddPage": "Page impaire",
   "DE.Views.Toolbar.textPageMarginsCustom": "Marges personnalisées",
   "DE.Views.Toolbar.textPageSizeCustom": "Taille personnalisée",
-  "DE.Views.Toolbar.textPie": "Graphiques à secteurs",
   "DE.Views.Toolbar.textPlainControl": "Insérer un contrôle de contenu en texte brut",
-  "DE.Views.Toolbar.textPoint": "Nuages de points (XY)",
   "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRemoveControl": "Supprimer le contrôle du contenu",
   "DE.Views.Toolbar.textRemWatermark": "Supprimer le filigrane",
   "DE.Views.Toolbar.textRichControl": "Insérer un contrôle de contenu en texte enrichi",
   "DE.Views.Toolbar.textRight": "A droite: ",
-  "DE.Views.Toolbar.textStock": "Boursier",
   "DE.Views.Toolbar.textStrikeout": "Barré",
   "DE.Views.Toolbar.textStyleMenuDelete": "Supprimer le style",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Supprimer tous les styles personnalisés",
@@ -2109,7 +2101,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Mettre à jour selon la sélection",
   "DE.Views.Toolbar.textSubscript": "Indice",
   "DE.Views.Toolbar.textSuperscript": "Exposant",
-  "DE.Views.Toolbar.textSurface": "Surface",
   "DE.Views.Toolbar.textTabCollaboration": "Collaboration",
   "DE.Views.Toolbar.textTabFile": "Fichier",
   "DE.Views.Toolbar.textTabHome": "Accueil",

apps/documenteditor/main/locale/hu.json

@@ -63,6 +63,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Lapok módosítása",
   "Common.Controllers.ReviewChanges.textUnderline": "Aláhúzott",
   "Common.Controllers.ReviewChanges.textWidow": "Özvegy sor",
+  "Common.define.chartData.textArea": "Terület",
+  "Common.define.chartData.textBar": "Sáv",
+  "Common.define.chartData.textColumn": "Oszlop",
+  "Common.define.chartData.textLine": "Vonal",
+  "Common.define.chartData.textPie": "Kör",
+  "Common.define.chartData.textPoint": "Pont",
+  "Common.define.chartData.textStock": "Részvény",
+  "Common.define.chartData.textSurface": "Felület",
   "Common.UI.ComboBorderSize.txtNoBorders": "Nincsenek szegélyek",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nincsenek szegélyek",
   "Common.UI.ComboDataView.emptyComboText": "Nincsenek stílusok",
@@ -923,20 +931,12 @@
   "DE.Views.BookmarksDialog.textTitle": "Könyvjelzők",
   "DE.Views.BookmarksDialog.txtInvalidName": "A könyvjelző neve kizárólag betűket, számokat és alulvonást tartalmazhat, és betűvel kezdődhet.",
   "DE.Views.ChartSettings.textAdvanced": "Speciális beállítások megjelenítése",
-  "DE.Views.ChartSettings.textArea": "Terület",
-  "DE.Views.ChartSettings.textBar": "Sáv",
   "DE.Views.ChartSettings.textChartType": "Diagramtípus módosítása",
-  "DE.Views.ChartSettings.textColumn": "Oszlop",
   "DE.Views.ChartSettings.textEditData": "Adat szerkesztése",
   "DE.Views.ChartSettings.textHeight": "Magasság",
-  "DE.Views.ChartSettings.textLine": "Vonal",
   "DE.Views.ChartSettings.textOriginalSize": "Alapértelmezett méret",
-  "DE.Views.ChartSettings.textPie": "Kör",
-  "DE.Views.ChartSettings.textPoint": "Pont",
   "DE.Views.ChartSettings.textSize": "Méret",
-  "DE.Views.ChartSettings.textStock": "Részvény",
   "DE.Views.ChartSettings.textStyle": "Stílus",
-  "DE.Views.ChartSettings.textSurface": "Felület",
   "DE.Views.ChartSettings.textUndock": "Eltávolít a panelről",
   "DE.Views.ChartSettings.textWidth": "Szélesség",
   "DE.Views.ChartSettings.textWrap": "Tördelés stílus",
@@ -1912,13 +1912,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Kép a tárolóból",
   "DE.Views.Toolbar.mniImageFromUrl": "Kép hivatkozásból",
   "DE.Views.Toolbar.strMenuNoFill": "Nincs kitöltés",
-  "DE.Views.Toolbar.textArea": "Terület",
   "DE.Views.Toolbar.textAutoColor": "Automatikus",
-  "DE.Views.Toolbar.textBar": "Sáv",
   "DE.Views.Toolbar.textBold": "Félkövér",
   "DE.Views.Toolbar.textBottom": "Alsó:",
-  "DE.Views.Toolbar.textCharts": "Diagramok",
-  "DE.Views.Toolbar.textColumn": "Oszlop",
   "DE.Views.Toolbar.textColumnsCustom": "Egyéni hasábok",
   "DE.Views.Toolbar.textColumnsLeft": "Bal",
   "DE.Views.Toolbar.textColumnsOne": "Egy",
@@ -1937,7 +1933,6 @@
   "DE.Views.Toolbar.textItalic": "Dőlt",
   "DE.Views.Toolbar.textLandscape": "Tájkép",
   "DE.Views.Toolbar.textLeft": "Bal:",
-  "DE.Views.Toolbar.textLine": "Vonal",
   "DE.Views.Toolbar.textMarginsLast": "Előző egyéni beállítások",
   "DE.Views.Toolbar.textMarginsModerate": "Mérsékelt",
   "DE.Views.Toolbar.textMarginsNarrow": "Keskeny",
@@ -1951,14 +1946,11 @@
   "DE.Views.Toolbar.textOddPage": "Páratlan oldal",
   "DE.Views.Toolbar.textPageMarginsCustom": "Egyéni margók",
   "DE.Views.Toolbar.textPageSizeCustom": "Egyéni lapméret",
-  "DE.Views.Toolbar.textPie": "Kör",
   "DE.Views.Toolbar.textPlainControl": "Egyszerű szöveg tartalomkezelő beillesztése",
-  "DE.Views.Toolbar.textPoint": "Pont",
   "DE.Views.Toolbar.textPortrait": "Portré",
   "DE.Views.Toolbar.textRemoveControl": "Tartalomkezelő eltávolítása",
   "DE.Views.Toolbar.textRichControl": "Rich text tartalomkezelő beillesztése",
   "DE.Views.Toolbar.textRight": "Jobb:",
-  "DE.Views.Toolbar.textStock": "Részvény",
   "DE.Views.Toolbar.textStrikeout": "Áthúzott",
   "DE.Views.Toolbar.textStyleMenuDelete": "Stílus törlése",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Minden egyéni stílus törlése",
@@ -1968,7 +1960,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Frissítés a kiválasztásból",
   "DE.Views.Toolbar.textSubscript": "Alsó index",
   "DE.Views.Toolbar.textSuperscript": "Felső index",
-  "DE.Views.Toolbar.textSurface": "Felület",
   "DE.Views.Toolbar.textTabCollaboration": "Együttműködés",
   "DE.Views.Toolbar.textTabFile": "Fájl",
   "DE.Views.Toolbar.textTabHome": "Kezdőlap",

apps/documenteditor/main/locale/it.json

@@ -69,6 +69,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Modifica Schede",
   "Common.Controllers.ReviewChanges.textUnderline": "Sottolineato",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
+  "Common.define.chartData.textArea": "Aerogramma",
+  "Common.define.chartData.textBar": "A barre",
+  "Common.define.chartData.textColumn": "Istogramma",
+  "Common.define.chartData.textLine": "A linee",
+  "Common.define.chartData.textPie": "A torta",
+  "Common.define.chartData.textPoint": "XY (A dispersione)",
+  "Common.define.chartData.textStock": "Azionario",
+  "Common.define.chartData.textSurface": "Superficie",
   "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo",
   "Common.UI.ComboDataView.emptyComboText": "Nessuno stile",
@@ -1002,21 +1010,18 @@
   "DE.Views.BookmarksDialog.textSort": "Ordina per",
   "DE.Views.BookmarksDialog.textTitle": "Segnalibri",
   "DE.Views.BookmarksDialog.txtInvalidName": "il nome del Segnalibro può contenere solo lettere, numeri e underscore, e dovrebbe iniziare con la lettera",
+  "DE.Views.CaptionDialog.textBefore": "Prima",
+  "DE.Views.CaptionDialog.textColon": "due punti",
+  "DE.Views.CaptionDialog.textSeparator": "Usa separatore",
+  "DE.Views.CellsAddDialog.textCol": "Colonne",
+  "DE.Views.CellsRemoveDialog.textTitle": "Elimina celle",
   "DE.Views.ChartSettings.textAdvanced": "Mostra impostazioni avanzate",
-  "DE.Views.ChartSettings.textArea": "Aerogramma",
-  "DE.Views.ChartSettings.textBar": "A barre",
   "DE.Views.ChartSettings.textChartType": "Cambia tipo grafico",
-  "DE.Views.ChartSettings.textColumn": "Istogramma",
   "DE.Views.ChartSettings.textEditData": "Modifica dati",
   "DE.Views.ChartSettings.textHeight": "Altezza",
-  "DE.Views.ChartSettings.textLine": "A linee",
   "DE.Views.ChartSettings.textOriginalSize": "Predefinita",
-  "DE.Views.ChartSettings.textPie": "A torta",
-  "DE.Views.ChartSettings.textPoint": "XY (A dispersione)",
   "DE.Views.ChartSettings.textSize": "Dimensione",
-  "DE.Views.ChartSettings.textStock": "Azionario",
   "DE.Views.ChartSettings.textStyle": "Stile",
-  "DE.Views.ChartSettings.textSurface": "Superficie",
   "DE.Views.ChartSettings.textUndock": "Disancora dal pannello",
   "DE.Views.ChartSettings.textWidth": "Larghezza",
   "DE.Views.ChartSettings.textWrap": "Stile di disposizione testo",
@@ -1119,6 +1124,7 @@
   "DE.Views.DocumentHolder.textArrangeBackward": "Porta indietro",
   "DE.Views.DocumentHolder.textArrangeForward": "Porta avanti",
   "DE.Views.DocumentHolder.textArrangeFront": "Porta in primo piano",
+  "DE.Views.DocumentHolder.textCells": "Celle",
   "DE.Views.DocumentHolder.textContentControls": "Controllo Contenuto",
   "DE.Views.DocumentHolder.textContinueNumbering": "Continua la numerazione",
   "DE.Views.DocumentHolder.textCopy": "Copia",
@@ -1321,6 +1327,7 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Crea un nuovo documento di testo vuoto che potrai formattare in seguito durante la modifica. Oppure scegli uno dei modelli per creare un documento di un certo tipo al quale sono già applicati certi stili.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nuovo documento di testo",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nessun modello",
+  "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Applica",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Aggiungi Autore",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Aggiungi testo",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Applicazione",
@@ -2032,13 +2039,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Immagine dallo spazio di archiviazione",
   "DE.Views.Toolbar.mniImageFromUrl": "Immagine da URL",
   "DE.Views.Toolbar.strMenuNoFill": "Nessun riempimento",
-  "DE.Views.Toolbar.textArea": "Aerogramma",
   "DE.Views.Toolbar.textAutoColor": "Automatico",
-  "DE.Views.Toolbar.textBar": "A barre",
   "DE.Views.Toolbar.textBold": "Grassetto",
   "DE.Views.Toolbar.textBottom": "Bottom: ",
-  "DE.Views.Toolbar.textCharts": "Grafici",
-  "DE.Views.Toolbar.textColumn": "Istogramma",
   "DE.Views.Toolbar.textColumnsCustom": "Colonne personalizzate",
   "DE.Views.Toolbar.textColumnsLeft": "Left",
   "DE.Views.Toolbar.textColumnsOne": "One",
@@ -2058,7 +2061,6 @@
   "DE.Views.Toolbar.textItalic": "Corsivo",
   "DE.Views.Toolbar.textLandscape": "Orizzontale",
   "DE.Views.Toolbar.textLeft": "Left: ",
-  "DE.Views.Toolbar.textLine": "A linee",
   "DE.Views.Toolbar.textMarginsLast": "Last Custom",
   "DE.Views.Toolbar.textMarginsModerate": "Moderare",
   "DE.Views.Toolbar.textMarginsNarrow": "Narrow",
@@ -2072,15 +2074,12 @@
   "DE.Views.Toolbar.textOddPage": "Pagina dispari",
   "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
   "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
-  "DE.Views.Toolbar.textPie": "A torta",
   "DE.Views.Toolbar.textPlainControl": "Inserisci il controllo del contenuto in testo normale",
-  "DE.Views.Toolbar.textPoint": "XY (A dispersione)",
   "DE.Views.Toolbar.textPortrait": "Verticale",
   "DE.Views.Toolbar.textRemoveControl": "Rimuovi il controllo del contenuto",
   "DE.Views.Toolbar.textRemWatermark": "Rimuovi filigrana",
   "DE.Views.Toolbar.textRichControl": "Inserisci il controllo del contenuto RTF",
   "DE.Views.Toolbar.textRight": "Right: ",
-  "DE.Views.Toolbar.textStock": "Azionario",
   "DE.Views.Toolbar.textStrikeout": "Barrato",
   "DE.Views.Toolbar.textStyleMenuDelete": "Elimina stile",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Elimina tutti gli stili personalizzati",
@@ -2090,7 +2089,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Aggiorna da selezione",
   "DE.Views.Toolbar.textSubscript": "Pedice",
   "DE.Views.Toolbar.textSuperscript": "Apice",
-  "DE.Views.Toolbar.textSurface": "Superficie",
   "DE.Views.Toolbar.textTabCollaboration": "Collaborazione",
   "DE.Views.Toolbar.textTabFile": "File",
   "DE.Views.Toolbar.textTabHome": "Home",

apps/documenteditor/main/locale/ja.json

@@ -63,6 +63,13 @@
   "Common.Controllers.ReviewChanges.textTabs": "タブの変更",
   "Common.Controllers.ReviewChanges.textUnderline": "下線",
   "Common.Controllers.ReviewChanges.textWidow": "改ページ時1行残して段落を区切らないを制御する。",
+  "Common.define.chartData.textArea": "面グラフ",
+  "Common.define.chartData.textBar": "横棒グラフ",
+  "Common.define.chartData.textColumn": "縦棒グラフ",
+  "Common.define.chartData.textLine": "折れ線グラフ",
+  "Common.define.chartData.textPie": "円グラフ",
+  "Common.define.chartData.textPoint": "点グラフ",
+  "Common.define.chartData.textStock": "株価チャート",
   "Common.UI.ComboBorderSize.txtNoBorders": "罫線なし",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "罫線なし",
   "Common.UI.ComboDataView.emptyComboText": "スタイルなし",
@@ -589,18 +596,11 @@
   "DE.Controllers.Toolbar.txtSymbol_xsi": "グザイ",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "ゼータ",
   "DE.Views.ChartSettings.textAdvanced": "詳細設定の表示",
-  "DE.Views.ChartSettings.textArea": "面グラフ",
-  "DE.Views.ChartSettings.textBar": "横棒グラフ",
   "DE.Views.ChartSettings.textChartType": "グラフの種類の変更",
-  "DE.Views.ChartSettings.textColumn": "縦棒グラフ",
   "DE.Views.ChartSettings.textEditData": "データの編集",
   "DE.Views.ChartSettings.textHeight": "高さ",
-  "DE.Views.ChartSettings.textLine": "折れ線グラフ",
   "DE.Views.ChartSettings.textOriginalSize": "既定のサイズ",
-  "DE.Views.ChartSettings.textPie": "円グラフ",
-  "DE.Views.ChartSettings.textPoint": "点グラフ",
   "DE.Views.ChartSettings.textSize": "サイズ",
-  "DE.Views.ChartSettings.textStock": "株価チャート",
   "DE.Views.ChartSettings.textStyle": "スタイル",
   "DE.Views.ChartSettings.textUndock": "パネルからのドッキング解除",
   "DE.Views.ChartSettings.textWidth": "幅",
@@ -1327,12 +1327,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "ファイルからの画像",
   "DE.Views.Toolbar.mniImageFromUrl": "ファイルからのURL",
   "DE.Views.Toolbar.strMenuNoFill": "塗りつぶしなし",
-  "DE.Views.Toolbar.textArea": "面グラフ",
   "DE.Views.Toolbar.textAutoColor": "自動",
-  "DE.Views.Toolbar.textBar": "横棒グラフ",
   "DE.Views.Toolbar.textBold": "太字",
   "DE.Views.Toolbar.textBottom": "下：",
-  "DE.Views.Toolbar.textColumn": "縦棒グラフ",
   "DE.Views.Toolbar.textColumnsLeft": "左",
   "DE.Views.Toolbar.textColumnsOne": "1",
   "DE.Views.Toolbar.textColumnsRight": "右に",
@@ -1348,7 +1345,6 @@
   "DE.Views.Toolbar.textInText": "テキスト",
   "DE.Views.Toolbar.textItalic": "斜体",
   "DE.Views.Toolbar.textLeft": "左：",
-  "DE.Views.Toolbar.textLine": "折れ線グラフ",
   "DE.Views.Toolbar.textMarginsLast": "最後に適用したユーザー",
   "DE.Views.Toolbar.textMarginsModerate": "標準",
   "DE.Views.Toolbar.textMarginsNarrow": "狭い",
@@ -1361,10 +1357,7 @@
   "DE.Views.Toolbar.textOddPage": "奇数ページから開始",
   "DE.Views.Toolbar.textPageMarginsCustom": "カスタム マージン",
   "DE.Views.Toolbar.textPageSizeCustom": "ユーザー設定のページ サイズ",
-  "DE.Views.Toolbar.textPie": "円グラフ",
-  "DE.Views.Toolbar.textPoint": "点グラフ",
   "DE.Views.Toolbar.textRight": "右：",
-  "DE.Views.Toolbar.textStock": "株価チャート",
   "DE.Views.Toolbar.textStrikeout": "取り消し線",
   "DE.Views.Toolbar.textStyleMenuDelete": "スタイルの削除",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "ユーザー設定のスタイルの削除",

apps/documenteditor/main/locale/ko.json

@@ -777,20 +777,12 @@
   "DE.Views.BookmarksDialog.textSort": "정렬",
   "DE.Views.BookmarksDialog.textTitle": "책갈피",
   "DE.Views.ChartSettings.textAdvanced": "고급 설정 표시",
-  "DE.Views.ChartSettings.textArea": "영역",
-  "DE.Views.ChartSettings.textBar": "Bar",
   "DE.Views.ChartSettings.textChartType": "차트 유형 변경",
-  "DE.Views.ChartSettings.textColumn": "열",
   "DE.Views.ChartSettings.textEditData": "데이터 편집",
   "DE.Views.ChartSettings.textHeight": "높이",
-  "DE.Views.ChartSettings.textLine": "Line",
   "DE.Views.ChartSettings.textOriginalSize": "기본 크기",
-  "DE.Views.ChartSettings.textPie": "파이",
-  "DE.Views.ChartSettings.textPoint": "XY (Scatter)",
   "DE.Views.ChartSettings.textSize": "크기",
-  "DE.Views.ChartSettings.textStock": "Stock",
   "DE.Views.ChartSettings.textStyle": "스타일",
-  "DE.Views.ChartSettings.textSurface": "표면",
   "DE.Views.ChartSettings.textUndock": "패널에서 도킹 해제",
   "DE.Views.ChartSettings.textWidth": "너비",
   "DE.Views.ChartSettings.textWrap": "포장 스타일",
@@ -1707,13 +1699,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "그림 파일에서",
   "DE.Views.Toolbar.mniImageFromUrl": "URL에서 그림",
   "DE.Views.Toolbar.strMenuNoFill": "채우기 없음",
-  "DE.Views.Toolbar.textArea": "Area",
   "DE.Views.Toolbar.textAutoColor": "자동",
-  "DE.Views.Toolbar.textBar": "Bar",
   "DE.Views.Toolbar.textBold": "Bold",
   "DE.Views.Toolbar.textBottom": "Bottom :",
-  "DE.Views.Toolbar.textCharts": "차트",
-  "DE.Views.Toolbar.textColumn": "Column",
   "DE.Views.Toolbar.textColumnsCustom": "사용자 정의 열",
   "DE.Views.Toolbar.textColumnsLeft": "왼쪽",
   "DE.Views.Toolbar.textColumnsOne": "하나",
@@ -1732,7 +1720,6 @@
   "DE.Views.Toolbar.textItalic": "Italic",
   "DE.Views.Toolbar.textLandscape": "Landscape",
   "DE.Views.Toolbar.textLeft": "왼쪽 :",
-  "DE.Views.Toolbar.textLine": "Line",
   "DE.Views.Toolbar.textMarginsLast": "마지막 사용자 정의",
   "DE.Views.Toolbar.textMarginsModerate": "보통",
   "DE.Views.Toolbar.textMarginsNarrow": "좁다",
@@ -1745,14 +1732,11 @@
   "DE.Views.Toolbar.textOddPage": "홀수 페이지",
   "DE.Views.Toolbar.textPageMarginsCustom": "사용자 정의 여백",
   "DE.Views.Toolbar.textPageSizeCustom": "사용자 정의 페이지 크기",
-  "DE.Views.Toolbar.textPie": "파이",
   "DE.Views.Toolbar.textPlainControl": "일반 텍스트 콘텐트 제어 삽입",
-  "DE.Views.Toolbar.textPoint": "XY (Scatter)",
   "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRemoveControl": "콘텐트 제어 삭제",
   "DE.Views.Toolbar.textRichControl": "리치 텍스트 콘텐트 제어 삽입",
   "DE.Views.Toolbar.textRight": "오른쪽 :",
-  "DE.Views.Toolbar.textStock": "Stock",
   "DE.Views.Toolbar.textStrikeout": "Strikeout",
   "DE.Views.Toolbar.textStyleMenuDelete": "스타일 삭제",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "모든 사용자 정의 스타일 삭제",
@@ -1762,7 +1746,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "선택 항목에서 업데이트",
   "DE.Views.Toolbar.textSubscript": "Subscript",
   "DE.Views.Toolbar.textSuperscript": "Superscript",
-  "DE.Views.Toolbar.textSurface": "Surface",
   "DE.Views.Toolbar.textTabCollaboration": "합치기",
   "DE.Views.Toolbar.textTabFile": "파일",
   "DE.Views.Toolbar.textTabHome": "집",

apps/documenteditor/main/locale/lv.json

@@ -774,20 +774,12 @@
   "DE.Views.BookmarksDialog.textSort": "Šķirot pēc",
   "DE.Views.BookmarksDialog.textTitle": "Grāmatzīmes",
   "DE.Views.ChartSettings.textAdvanced": "Show advanced settings",
-  "DE.Views.ChartSettings.textArea": "Area Chart",
-  "DE.Views.ChartSettings.textBar": "Bar Chart",
   "DE.Views.ChartSettings.textChartType": "Change Chart Type",
-  "DE.Views.ChartSettings.textColumn": "Column Chart",
   "DE.Views.ChartSettings.textEditData": "Edit Data",
   "DE.Views.ChartSettings.textHeight": "Height",
-  "DE.Views.ChartSettings.textLine": "Line Chart",
   "DE.Views.ChartSettings.textOriginalSize": "Default Size",
-  "DE.Views.ChartSettings.textPie": "Pie Chart",
-  "DE.Views.ChartSettings.textPoint": "XY (Scatter) Chart",
   "DE.Views.ChartSettings.textSize": "Size",
-  "DE.Views.ChartSettings.textStock": "Stock Chart",
   "DE.Views.ChartSettings.textStyle": "Style",
-  "DE.Views.ChartSettings.textSurface": "Virsma",
   "DE.Views.ChartSettings.textUndock": "Undock from panel",
   "DE.Views.ChartSettings.textWidth": "Width",
   "DE.Views.ChartSettings.textWrap": "Wrapping Style",
@@ -1704,13 +1696,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "Attēls no faila",
   "DE.Views.Toolbar.mniImageFromUrl": "Attēls no URL",
   "DE.Views.Toolbar.strMenuNoFill": "Bez aizpildījuma",
-  "DE.Views.Toolbar.textArea": "Area Chart",
   "DE.Views.Toolbar.textAutoColor": "Automatic",
-  "DE.Views.Toolbar.textBar": "Bar Chart",
   "DE.Views.Toolbar.textBold": "Treknraksts",
   "DE.Views.Toolbar.textBottom": "Bottom: ",
-  "DE.Views.Toolbar.textCharts": "Diagrammas",
-  "DE.Views.Toolbar.textColumn": "Column Chart",
   "DE.Views.Toolbar.textColumnsCustom": "Pielāgotās kolonnas",
   "DE.Views.Toolbar.textColumnsLeft": "Left",
   "DE.Views.Toolbar.textColumnsOne": "One",
@@ -1729,7 +1717,6 @@
   "DE.Views.Toolbar.textItalic": "Kursīvs",
   "DE.Views.Toolbar.textLandscape": "Ainava",
   "DE.Views.Toolbar.textLeft": "Left: ",
-  "DE.Views.Toolbar.textLine": "Line Chart",
   "DE.Views.Toolbar.textMarginsLast": "Last Custom",
   "DE.Views.Toolbar.textMarginsModerate": "Moderate",
   "DE.Views.Toolbar.textMarginsNarrow": "Narrow",
@@ -1742,14 +1729,11 @@
   "DE.Views.Toolbar.textOddPage": "Odd Page",
   "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
   "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
-  "DE.Views.Toolbar.textPie": "Pie Chart",
   "DE.Views.Toolbar.textPlainControl": "Ievietot parastā teksta satura kontroli",
-  "DE.Views.Toolbar.textPoint": "XY (Scatter) Chart",
   "DE.Views.Toolbar.textPortrait": "Portrets",
   "DE.Views.Toolbar.textRemoveControl": "Noņemt satura kontroles elementu",
   "DE.Views.Toolbar.textRichControl": "Ievietot formatētā teksta satura kontroli",
   "DE.Views.Toolbar.textRight": "Right: ",
-  "DE.Views.Toolbar.textStock": "Stock Chart",
   "DE.Views.Toolbar.textStrikeout": "Pārsvītrots",
   "DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles",
@@ -1759,7 +1743,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection",
   "DE.Views.Toolbar.textSubscript": "Apakšraksts",
   "DE.Views.Toolbar.textSuperscript": "Augšraksts",
-  "DE.Views.Toolbar.textSurface": "Virsma",
   "DE.Views.Toolbar.textTabCollaboration": "Sadarbība",
   "DE.Views.Toolbar.textTabFile": "Fails",
   "DE.Views.Toolbar.textTabHome": "Sākums",

apps/documenteditor/main/locale/nl.json

@@ -69,6 +69,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Tabs wijzigen",
   "Common.Controllers.ReviewChanges.textUnderline": "Onderstrepen",
   "Common.Controllers.ReviewChanges.textWidow": "Zwevende regels voorkomen",
+  "Common.define.chartData.textArea": "Vlak",
+  "Common.define.chartData.textBar": "Staaf",
+  "Common.define.chartData.textColumn": "Kolom",
+  "Common.define.chartData.textLine": "Lijn",
+  "Common.define.chartData.textPie": "Cirkel",
+  "Common.define.chartData.textPoint": "Spreiding",
+  "Common.define.chartData.textStock": "Voorraad",
+  "Common.define.chartData.textSurface": "Oppervlak",
   "Common.UI.ComboBorderSize.txtNoBorders": "Geen randen",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Geen randen",
   "Common.UI.ComboDataView.emptyComboText": "Geen stijlen",
@@ -874,20 +882,12 @@
   "DE.Views.BookmarksDialog.textSort": "Sorteren op",
   "DE.Views.BookmarksDialog.textTitle": "Bladwijzers",
   "DE.Views.ChartSettings.textAdvanced": "Geavanceerde instellingen tonen",
-  "DE.Views.ChartSettings.textArea": "Vlak",
-  "DE.Views.ChartSettings.textBar": "Staaf",
   "DE.Views.ChartSettings.textChartType": "Grafiektype wijzigen",
-  "DE.Views.ChartSettings.textColumn": "Kolom",
   "DE.Views.ChartSettings.textEditData": "Gegevens bewerken",
   "DE.Views.ChartSettings.textHeight": "Hoogte",
-  "DE.Views.ChartSettings.textLine": "Lijn",
   "DE.Views.ChartSettings.textOriginalSize": "Standaardgrootte",
-  "DE.Views.ChartSettings.textPie": "Cirkel",
-  "DE.Views.ChartSettings.textPoint": "Spreiding",
   "DE.Views.ChartSettings.textSize": "Grootte",
-  "DE.Views.ChartSettings.textStock": "Voorraad",
   "DE.Views.ChartSettings.textStyle": "Stijl",
-  "DE.Views.ChartSettings.textSurface": "Oppervlak",
   "DE.Views.ChartSettings.textUndock": "Loskoppelen van deelvenster",
   "DE.Views.ChartSettings.textWidth": "Breedte",
   "DE.Views.ChartSettings.textWrap": "Terugloopstijl",
@@ -1845,13 +1845,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "Afbeelding uit bestand",
   "DE.Views.Toolbar.mniImageFromUrl": "Afbeelding van URL",
   "DE.Views.Toolbar.strMenuNoFill": "Geen vulling",
-  "DE.Views.Toolbar.textArea": "Vlak",
   "DE.Views.Toolbar.textAutoColor": "Automatisch",
-  "DE.Views.Toolbar.textBar": "Staaf",
   "DE.Views.Toolbar.textBold": "Vet",
   "DE.Views.Toolbar.textBottom": "Onder:",
-  "DE.Views.Toolbar.textCharts": "Grafieken",
-  "DE.Views.Toolbar.textColumn": "Kolom",
   "DE.Views.Toolbar.textColumnsCustom": "Aangepaste kolommen",
   "DE.Views.Toolbar.textColumnsLeft": "Links",
   "DE.Views.Toolbar.textColumnsOne": "Eén",
@@ -1870,7 +1866,6 @@
   "DE.Views.Toolbar.textItalic": "Cursief",
   "DE.Views.Toolbar.textLandscape": "Liggend",
   "DE.Views.Toolbar.textLeft": "Links:",
-  "DE.Views.Toolbar.textLine": "Lijn",
   "DE.Views.Toolbar.textMarginsLast": "Laatste aangepaste",
   "DE.Views.Toolbar.textMarginsModerate": "Gemiddeld",
   "DE.Views.Toolbar.textMarginsNarrow": "Smal",
@@ -1883,14 +1878,11 @@
   "DE.Views.Toolbar.textOddPage": "Oneven pagina",
   "DE.Views.Toolbar.textPageMarginsCustom": "Aangepaste marges",
   "DE.Views.Toolbar.textPageSizeCustom": "Aangepast paginaformaat",
-  "DE.Views.Toolbar.textPie": "Cirkel",
   "DE.Views.Toolbar.textPlainControl": "Platte tekst inhoud beheer toevoegen",
-  "DE.Views.Toolbar.textPoint": "Spreiding",
   "DE.Views.Toolbar.textPortrait": "Staand",
   "DE.Views.Toolbar.textRemoveControl": "Inhoud beheer verwijderen",
   "DE.Views.Toolbar.textRichControl": "Uitgebreide tekst inhoud beheer toevoegen",
   "DE.Views.Toolbar.textRight": "Rechts:",
-  "DE.Views.Toolbar.textStock": "Voorraad",
   "DE.Views.Toolbar.textStrikeout": "Doorhalen",
   "DE.Views.Toolbar.textStyleMenuDelete": "Stijl verwijderen",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Alle aangepaste stijlen verwijderen",
@@ -1900,7 +1892,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Bijwerken op basis van selectie",
   "DE.Views.Toolbar.textSubscript": "Subscript",
   "DE.Views.Toolbar.textSuperscript": "Superscript",
-  "DE.Views.Toolbar.textSurface": "Oppervlak",
   "DE.Views.Toolbar.textTabCollaboration": "Samenwerking",
   "DE.Views.Toolbar.textTabFile": "Bestand",
   "DE.Views.Toolbar.textTabHome": "Home",

apps/documenteditor/main/locale/pl.json

@@ -67,6 +67,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Zmień zakładki",
   "Common.Controllers.ReviewChanges.textUnderline": "Podkreśl",
   "Common.Controllers.ReviewChanges.textWidow": "Kontrola okna",
+  "Common.define.chartData.textArea": "Obszar",
+  "Common.define.chartData.textBar": "Pasek",
+  "Common.define.chartData.textColumn": "Kolumna",
+  "Common.define.chartData.textLine": "Liniowy",
+  "Common.define.chartData.textPie": "Kołowe",
+  "Common.define.chartData.textPoint": "XY (Punktowy)",
+  "Common.define.chartData.textStock": "Zbiory",
+  "Common.define.chartData.textSurface": "Powierzchnia",
   "Common.UI.ComboBorderSize.txtNoBorders": "Bez krawędzi",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez krawędzi",
   "Common.UI.ComboDataView.emptyComboText": "Brak styli",
@@ -775,20 +783,12 @@
   "DE.Views.BookmarksDialog.textTitle": "Zakładki",
   "DE.Views.BookmarksDialog.txtInvalidName": "Nazwa zakładki powinna zaczynać się literą i zawierać może ona tylko litery, liczby i znaki podkreślenia ",
   "DE.Views.ChartSettings.textAdvanced": "Pokaż ustawienia zaawansowane",
-  "DE.Views.ChartSettings.textArea": "Obszar",
-  "DE.Views.ChartSettings.textBar": "Pasek",
   "DE.Views.ChartSettings.textChartType": "Zmień typ wykresu",
-  "DE.Views.ChartSettings.textColumn": "Kolumna",
   "DE.Views.ChartSettings.textEditData": "Edytuj dane",
   "DE.Views.ChartSettings.textHeight": "Wysokość",
-  "DE.Views.ChartSettings.textLine": "Liniowy",
   "DE.Views.ChartSettings.textOriginalSize": "Domyślny rozmiar",
-  "DE.Views.ChartSettings.textPie": "Kołowe",
-  "DE.Views.ChartSettings.textPoint": "XY (Punktowy)",
   "DE.Views.ChartSettings.textSize": "Rozmiar",
-  "DE.Views.ChartSettings.textStock": "Zbiory",
   "DE.Views.ChartSettings.textStyle": "Styl",
-  "DE.Views.ChartSettings.textSurface": "Powierzchnia",
   "DE.Views.ChartSettings.textUndock": "Odepnij od panelu",
   "DE.Views.ChartSettings.textWidth": "Szerokość",
   "DE.Views.ChartSettings.textWrap": "Styl zawijania",
@@ -1678,13 +1678,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "Obraz z pliku",
   "DE.Views.Toolbar.mniImageFromUrl": "Obraz z URL",
   "DE.Views.Toolbar.strMenuNoFill": "Brak wypełnienia",
-  "DE.Views.Toolbar.textArea": "Obszar",
   "DE.Views.Toolbar.textAutoColor": "Automatyczny",
-  "DE.Views.Toolbar.textBar": "Pasek",
   "DE.Views.Toolbar.textBold": "Pogrubienie",
   "DE.Views.Toolbar.textBottom": "Dół:",
-  "DE.Views.Toolbar.textCharts": "Wykresy",
-  "DE.Views.Toolbar.textColumn": "Kolumna",
   "DE.Views.Toolbar.textColumnsCustom": "Niestandardowe kolumny",
   "DE.Views.Toolbar.textColumnsLeft": "Lewy",
   "DE.Views.Toolbar.textColumnsOne": "Jeden",
@@ -1704,7 +1700,6 @@
   "DE.Views.Toolbar.textItalic": "Kursywa",
   "DE.Views.Toolbar.textLandscape": "Krajobraz",
   "DE.Views.Toolbar.textLeft": "Lewo:",
-  "DE.Views.Toolbar.textLine": "Wiersz",
   "DE.Views.Toolbar.textMarginsLast": "Ostatni niestandardowy",
   "DE.Views.Toolbar.textMarginsModerate": "Umiarkowany",
   "DE.Views.Toolbar.textMarginsNarrow": "Wąski",
@@ -1718,13 +1713,10 @@
   "DE.Views.Toolbar.textOddPage": "Nieparzysta strona",
   "DE.Views.Toolbar.textPageMarginsCustom": "Niestandardowe marginesy",
   "DE.Views.Toolbar.textPageSizeCustom": "Własny rozmiar strony",
-  "DE.Views.Toolbar.textPie": "Kołowe",
-  "DE.Views.Toolbar.textPoint": "XY (Punktowy)",
   "DE.Views.Toolbar.textPortrait": "Portret",
   "DE.Views.Toolbar.textRemoveControl": "Usuń kontrolę treści",
   "DE.Views.Toolbar.textRemWatermark": "Usuń znak wodny",
   "DE.Views.Toolbar.textRight": "Prawo:",
-  "DE.Views.Toolbar.textStock": "Zbiory",
   "DE.Views.Toolbar.textStrikeout": "Skreślenie",
   "DE.Views.Toolbar.textStyleMenuDelete": "Usuń styl",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Usuń wszystkie niestandardowe style",
@@ -1734,7 +1726,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Aktualizuj z wyboru",
   "DE.Views.Toolbar.textSubscript": "Indeks",
   "DE.Views.Toolbar.textSuperscript": "Indeks górny",
-  "DE.Views.Toolbar.textSurface": "Powierzchnia",
   "DE.Views.Toolbar.textTabCollaboration": "Współpraca",
   "DE.Views.Toolbar.textTabFile": "Plik",
   "DE.Views.Toolbar.textTabHome": "Narzędzia główne",

apps/documenteditor/main/locale/pt.json

@@ -63,6 +63,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Change tabs",
   "Common.Controllers.ReviewChanges.textUnderline": "Underline",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
+  "Common.define.chartData.textArea": "Área",
+  "Common.define.chartData.textBar": "Barra",
+  "Common.define.chartData.textColumn": "Coluna",
+  "Common.define.chartData.textLine": "Linha",
+  "Common.define.chartData.textPie": "Gráfico de pizza",
+  "Common.define.chartData.textPoint": "Gráfico de pontos",
+  "Common.define.chartData.textStock": "Gráfico de ações",
+  "Common.define.chartData.textSurface": "Superfície",
   "Common.UI.ComboBorderSize.txtNoBorders": "Sem bordas",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sem bordas",
   "Common.UI.ComboDataView.emptyComboText": "Sem estilos",
@@ -744,20 +752,12 @@
   "DE.Views.BookmarksDialog.textHidden": "Favoritos ocultos",
   "DE.Views.BookmarksDialog.textTitle": "Favoritos",
   "DE.Views.ChartSettings.textAdvanced": "Exibir configurações avançadas",
-  "DE.Views.ChartSettings.textArea": "Área",
-  "DE.Views.ChartSettings.textBar": "Barra",
   "DE.Views.ChartSettings.textChartType": "Alterar tipo de gráfico",
-  "DE.Views.ChartSettings.textColumn": "Coluna",
   "DE.Views.ChartSettings.textEditData": "Editar dados",
   "DE.Views.ChartSettings.textHeight": "Altura",
-  "DE.Views.ChartSettings.textLine": "Linha",
   "DE.Views.ChartSettings.textOriginalSize": "Tamanho padrão",
-  "DE.Views.ChartSettings.textPie": "Gráfico de pizza",
-  "DE.Views.ChartSettings.textPoint": "Gráfico de pontos",
   "DE.Views.ChartSettings.textSize": "Tamanho",
-  "DE.Views.ChartSettings.textStock": "Gráfico de ações",
   "DE.Views.ChartSettings.textStyle": "Estilo",
-  "DE.Views.ChartSettings.textSurface": "Superfície",
   "DE.Views.ChartSettings.textUndock": "Desencaixar do painel",
   "DE.Views.ChartSettings.textWidth": "Largura",
   "DE.Views.ChartSettings.textWrap": "Estilo da quebra automática",
@@ -1633,13 +1633,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "Imagem do arquivo",
   "DE.Views.Toolbar.mniImageFromUrl": "Imagem da URL",
   "DE.Views.Toolbar.strMenuNoFill": "Sem preenchimento",
-  "DE.Views.Toolbar.textArea": "Área",
   "DE.Views.Toolbar.textAutoColor": "Automático",
-  "DE.Views.Toolbar.textBar": "Barra",
   "DE.Views.Toolbar.textBold": "Negrito",
   "DE.Views.Toolbar.textBottom": "Inferior:",
-  "DE.Views.Toolbar.textCharts": "Gráficos",
-  "DE.Views.Toolbar.textColumn": "Coluna",
   "DE.Views.Toolbar.textColumnsCustom": "Personalizar colunas",
   "DE.Views.Toolbar.textColumnsLeft": "Esquerda",
   "DE.Views.Toolbar.textColumnsOne": "Uma",
@@ -1658,7 +1654,6 @@
   "DE.Views.Toolbar.textItalic": "Itálico",
   "DE.Views.Toolbar.textLandscape": "Paisagem",
   "DE.Views.Toolbar.textLeft": "Esquerda:",
-  "DE.Views.Toolbar.textLine": "Linha",
   "DE.Views.Toolbar.textMarginsLast": "Últimos personalizados",
   "DE.Views.Toolbar.textMarginsModerate": "Moderado",
   "DE.Views.Toolbar.textMarginsNarrow": "Estreito",
@@ -1671,14 +1666,11 @@
   "DE.Views.Toolbar.textOddPage": "Página ímpar",
   "DE.Views.Toolbar.textPageMarginsCustom": "Margens personalizadas",
   "DE.Views.Toolbar.textPageSizeCustom": "Tamanho de página personalizado",
-  "DE.Views.Toolbar.textPie": "Gráfico de pizza",
   "DE.Views.Toolbar.textPlainControl": "Adicionar Controle de Conteúdo de Texto sem formatação",
-  "DE.Views.Toolbar.textPoint": "Gráfico de pontos",
   "DE.Views.Toolbar.textPortrait": "Retrato ",
   "DE.Views.Toolbar.textRemoveControl": "Remover Controle de Conteúdo",
   "DE.Views.Toolbar.textRichControl": "Adicionar Controle de Conteúdo de Rich Text",
   "DE.Views.Toolbar.textRight": "Direita:",
-  "DE.Views.Toolbar.textStock": "Gráfico de ações",
   "DE.Views.Toolbar.textStrikeout": "Taxado",
   "DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles",
@@ -1688,7 +1680,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection",
   "DE.Views.Toolbar.textSubscript": "Subscrito",
   "DE.Views.Toolbar.textSuperscript": "Sobrescrito",
-  "DE.Views.Toolbar.textSurface": "Superfície",
   "DE.Views.Toolbar.textTabCollaboration": "Colaboração",
   "DE.Views.Toolbar.textTabFile": "Arquivo",
   "DE.Views.Toolbar.textTabHome": "Página Inicial",

apps/documenteditor/main/locale/ru.json

@@ -230,6 +230,8 @@
   "Common.Views.ReviewChanges.strStrictDesc": "Используйте кнопку 'Сохранить' для синхронизации изменений, вносимых вами и другими пользователями.",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "Принять текущее изменение",
   "Common.Views.ReviewChanges.tipCoAuthMode": "Задать режим совместного редактирования",
+  "Common.Views.ReviewChanges.tipCommentRem": "Удалить комментарии",
+  "Common.Views.ReviewChanges.tipCommentRemCurrent": "Удалить текущие комментарии",
   "Common.Views.ReviewChanges.tipHistory": "Показать историю версий",
   "Common.Views.ReviewChanges.tipRejectCurrent": "Отклонить текущее изменение",
   "Common.Views.ReviewChanges.tipReview": "Отслеживать изменения",
@@ -244,6 +246,11 @@
   "Common.Views.ReviewChanges.txtChat": "Чат",
   "Common.Views.ReviewChanges.txtClose": "Закрыть",
   "Common.Views.ReviewChanges.txtCoAuthMode": "Режим совместного редактирования",
+  "Common.Views.ReviewChanges.txtCommentRemAll": "Удалить все комментарии",
+  "Common.Views.ReviewChanges.txtCommentRemCurrent": "Удалить текущие комментарии",
+  "Common.Views.ReviewChanges.txtCommentRemMy": "Удалить мои комментарии",
+  "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Удалить мои текущие комментарии",
+  "Common.Views.ReviewChanges.txtCommentRemove": "Удалить",
   "Common.Views.ReviewChanges.txtDocLang": "Язык",
   "Common.Views.ReviewChanges.txtFinal": "Все изменения приняты (просмотр)",
   "Common.Views.ReviewChanges.txtFinalCap": "Измененный документ",
@@ -308,6 +315,11 @@
   "Common.Views.SignSettingsDialog.textShowDate": "Показывать дату подписи в строке подписи",
   "Common.Views.SignSettingsDialog.textTitle": "Настройка подписи",
   "Common.Views.SignSettingsDialog.txtEmpty": "Это поле необходимо заполнить",
+  "Common.Views.SymbolTableDialog.textCode": "Код знака из Юникод (шестн.)",
+  "Common.Views.SymbolTableDialog.textFont": "Шрифт",
+  "Common.Views.SymbolTableDialog.textRange": "Набор",
+  "Common.Views.SymbolTableDialog.textRecent": "Ранее использовавшиеся символы",
+  "Common.Views.SymbolTableDialog.textTitle": "Символ",
   "DE.Controllers.LeftMenu.leavePageText": "Все несохраненные изменения в этом документе будут потеряны.<br> Нажмите кнопку \"Отмена\", а затем нажмите кнопку \"Сохранить\", чтобы сохранить их. Нажмите кнопку \"OK\", чтобы сбросить все несохраненные изменения.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Документ без имени",
   "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Внимание",
@@ -357,6 +369,7 @@
   "DE.Controllers.Main.errorToken": "Токен безопасности документа имеет неправильный формат.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.Controllers.Main.errorTokenExpire": "Истек срок действия токена безопасности документа.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.",
+  "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.<br>Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.",
   "DE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.",
   "DE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей, разрешенных согласно тарифному плану",
   "DE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,<br>но не сможете скачать или напечатать его до восстановления подключения и обновления страницы.",
@@ -673,6 +686,7 @@
   "DE.Controllers.Toolbar.textFontSizeErr": "Введенное значение некорректно.<br>Введите числовое значение от 1 до 100",
   "DE.Controllers.Toolbar.textFraction": "Дроби",
   "DE.Controllers.Toolbar.textFunction": "Функции",
+  "DE.Controllers.Toolbar.textInsert": "Вставить",
   "DE.Controllers.Toolbar.textIntegral": "Интегралы",
   "DE.Controllers.Toolbar.textLargeOperator": "Крупные операторы",
   "DE.Controllers.Toolbar.textLimitAndLog": "Пределы и логарифмы",
@@ -1051,20 +1065,12 @@
   "DE.Views.CellsRemoveDialog.textRow": "Удалить всю строку",
   "DE.Views.CellsRemoveDialog.textTitle": "Удалить ячейки",
   "DE.Views.ChartSettings.textAdvanced": "Дополнительные параметры",
-  "DE.Views.ChartSettings.textArea": "С областями",
-  "DE.Views.ChartSettings.textBar": "Линейчатая",
   "DE.Views.ChartSettings.textChartType": "Изменить тип диаграммы",
-  "DE.Views.ChartSettings.textColumn": "Гистограмма",
   "DE.Views.ChartSettings.textEditData": "Изменить данные",
   "DE.Views.ChartSettings.textHeight": "Высота",
-  "DE.Views.ChartSettings.textLine": "График",
   "DE.Views.ChartSettings.textOriginalSize": "Реальный размер",
-  "DE.Views.ChartSettings.textPie": "Круговая",
-  "DE.Views.ChartSettings.textPoint": "Точечная",
   "DE.Views.ChartSettings.textSize": "Размер",
-  "DE.Views.ChartSettings.textStock": "Биржевая",
   "DE.Views.ChartSettings.textStyle": "Стиль",
-  "DE.Views.ChartSettings.textSurface": "Поверхность",
   "DE.Views.ChartSettings.textUndock": "Открепить от панели",
   "DE.Views.ChartSettings.textWidth": "Ширина",
   "DE.Views.ChartSettings.textWrap": "Стиль обтекания",
@@ -2058,6 +2064,7 @@
   "DE.Views.TextArtSettings.textTemplate": "Шаблон",
   "DE.Views.TextArtSettings.textTransform": "Трансформация",
   "DE.Views.TextArtSettings.txtNoBorders": "Без обводки",
+  "DE.Views.Toolbar.capBtnAddComment": "Добавить комментарий",
   "DE.Views.Toolbar.capBtnBlankPage": "Пустая страница",
   "DE.Views.Toolbar.capBtnColumns": "Колонки",
   "DE.Views.Toolbar.capBtnComment": "Комментарий",
@@ -2069,6 +2076,7 @@
   "DE.Views.Toolbar.capBtnInsImage": "Изображение",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Разрывы",
   "DE.Views.Toolbar.capBtnInsShape": "Фигура",
+  "DE.Views.Toolbar.capBtnInsSymbol": "Символ",
   "DE.Views.Toolbar.capBtnInsTable": "Таблица",
   "DE.Views.Toolbar.capBtnInsTextart": "Text Art",
   "DE.Views.Toolbar.capBtnInsTextbox": "Надпись",
@@ -2093,13 +2101,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Изображение из хранилища",
   "DE.Views.Toolbar.mniImageFromUrl": "Изображение по URL",
   "DE.Views.Toolbar.strMenuNoFill": "Без заливки",
-  "DE.Views.Toolbar.textArea": "С областями",
   "DE.Views.Toolbar.textAutoColor": "Автоматический",
-  "DE.Views.Toolbar.textBar": "Линейчатая",
   "DE.Views.Toolbar.textBold": "Полужирный",
   "DE.Views.Toolbar.textBottom": "Нижнее: ",
-  "DE.Views.Toolbar.textCharts": "Диаграммы",
-  "DE.Views.Toolbar.textColumn": "Гистограмма",
   "DE.Views.Toolbar.textColumnsCustom": "Настраиваемые колонки",
   "DE.Views.Toolbar.textColumnsLeft": "Слева",
   "DE.Views.Toolbar.textColumnsOne": "Одна",
@@ -2119,7 +2123,6 @@
   "DE.Views.Toolbar.textItalic": "Курсив",
   "DE.Views.Toolbar.textLandscape": "Альбомная",
   "DE.Views.Toolbar.textLeft": "Левое: ",
-  "DE.Views.Toolbar.textLine": "График",
   "DE.Views.Toolbar.textMarginsLast": "Последние настраиваемые",
   "DE.Views.Toolbar.textMarginsModerate": "Средние",
   "DE.Views.Toolbar.textMarginsNarrow": "Узкие",
@@ -2133,15 +2136,12 @@
   "DE.Views.Toolbar.textOddPage": "С нечетной страницы",
   "DE.Views.Toolbar.textPageMarginsCustom": "Настраиваемые поля",
   "DE.Views.Toolbar.textPageSizeCustom": "Особый размер страницы",
-  "DE.Views.Toolbar.textPie": "Круговая",
   "DE.Views.Toolbar.textPlainControl": "Вставить элемент управления \"Обычный текст\"",
-  "DE.Views.Toolbar.textPoint": "Точечная",
   "DE.Views.Toolbar.textPortrait": "Книжная",
   "DE.Views.Toolbar.textRemoveControl": "Удалить элемент управления содержимым",
   "DE.Views.Toolbar.textRemWatermark": "Удалить подложку",
   "DE.Views.Toolbar.textRichControl": "Вставить элемент управления \"Форматированный текст\"",
   "DE.Views.Toolbar.textRight": "Правое: ",
-  "DE.Views.Toolbar.textStock": "Биржевая",
   "DE.Views.Toolbar.textStrikeout": "Зачеркнутый",
   "DE.Views.Toolbar.textStyleMenuDelete": "Удалить стиль",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Удалить все пользовательские стили",
@@ -2151,7 +2151,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Обновить из выделенного фрагмента",
   "DE.Views.Toolbar.textSubscript": "Подстрочные знаки",
   "DE.Views.Toolbar.textSuperscript": "Надстрочные знаки",
-  "DE.Views.Toolbar.textSurface": "Поверхность",
   "DE.Views.Toolbar.textTabCollaboration": "Совместная работа",
   "DE.Views.Toolbar.textTabFile": "Файл",
   "DE.Views.Toolbar.textTabHome": "Главная",
@@ -2196,6 +2195,7 @@
   "DE.Views.Toolbar.tipInsertImage": "Вставить изображение",
   "DE.Views.Toolbar.tipInsertNum": "Вставить номер страницы",
   "DE.Views.Toolbar.tipInsertShape": "Вставить автофигуру",
+  "DE.Views.Toolbar.tipInsertSymbol": "Вставить символ",
   "DE.Views.Toolbar.tipInsertTable": "Вставить таблицу",
   "DE.Views.Toolbar.tipInsertText": "Вставить надпись",
   "DE.Views.Toolbar.tipInsertTextArt": "Вставить объект Text Art",

apps/documenteditor/main/locale/sk.json

@@ -63,6 +63,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Zmeniť tabuľky",
   "Common.Controllers.ReviewChanges.textUnderline": "Podčiarknuť",
   "Common.Controllers.ReviewChanges.textWidow": "Ovládanie okien",
+  "Common.define.chartData.textArea": "Plošný graf",
+  "Common.define.chartData.textBar": "Pruhový graf",
+  "Common.define.chartData.textColumn": "Stĺpec",
+  "Common.define.chartData.textLine": "Čiara/líniový graf",
+  "Common.define.chartData.textPie": "Koláčový graf",
+  "Common.define.chartData.textPoint": "Bodový graf",
+  "Common.define.chartData.textStock": "Akcie/burzový graf",
+  "Common.define.chartData.textSurface": "Povrch",
   "Common.UI.ComboBorderSize.txtNoBorders": "Bez orámovania",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez orámovania",
   "Common.UI.ComboDataView.emptyComboText": "Žiadne štýly",
@@ -747,20 +755,12 @@
   "DE.Views.BookmarksDialog.textDelete": "Vymazať",
   "DE.Views.BookmarksDialog.textTitle": "Záložky",
   "DE.Views.ChartSettings.textAdvanced": "Zobraziť pokročilé nastavenia",
-  "DE.Views.ChartSettings.textArea": "Plošný graf",
-  "DE.Views.ChartSettings.textBar": "Pruhový graf",
   "DE.Views.ChartSettings.textChartType": "Zmeniť typ grafu",
-  "DE.Views.ChartSettings.textColumn": "Stĺpec",
   "DE.Views.ChartSettings.textEditData": "Upravovať dáta",
   "DE.Views.ChartSettings.textHeight": "Výška",
-  "DE.Views.ChartSettings.textLine": "Čiara/líniový graf",
   "DE.Views.ChartSettings.textOriginalSize": "Predvolená veľkosť",
-  "DE.Views.ChartSettings.textPie": "Koláčový graf",
-  "DE.Views.ChartSettings.textPoint": "Bodový graf",
   "DE.Views.ChartSettings.textSize": "Veľkosť",
-  "DE.Views.ChartSettings.textStock": "Akcie/burzový graf",
   "DE.Views.ChartSettings.textStyle": "Štýl",
-  "DE.Views.ChartSettings.textSurface": "Povrch",
   "DE.Views.ChartSettings.textUndock": "Odpojiť z panelu",
   "DE.Views.ChartSettings.textWidth": "Šírka",
   "DE.Views.ChartSettings.textWrap": "Obtekanie textu",
@@ -1580,13 +1580,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "Obrázok zo súboru",
   "DE.Views.Toolbar.mniImageFromUrl": "Obrázok z URL adresy",
   "DE.Views.Toolbar.strMenuNoFill": "Bez výplne",
-  "DE.Views.Toolbar.textArea": "Plošný graf",
   "DE.Views.Toolbar.textAutoColor": "Automaticky",
-  "DE.Views.Toolbar.textBar": "Pruhový graf",
   "DE.Views.Toolbar.textBold": "Tučné",
   "DE.Views.Toolbar.textBottom": "Dole",
-  "DE.Views.Toolbar.textCharts": "Grafy",
-  "DE.Views.Toolbar.textColumn": "Stĺpec",
   "DE.Views.Toolbar.textColumnsCustom": "Vlastné stĺpce",
   "DE.Views.Toolbar.textColumnsLeft": "Vľavo",
   "DE.Views.Toolbar.textColumnsOne": "Jeden",
@@ -1605,7 +1601,6 @@
   "DE.Views.Toolbar.textItalic": "Kurzíva",
   "DE.Views.Toolbar.textLandscape": "Na šírku",
   "DE.Views.Toolbar.textLeft": "Vľavo:",
-  "DE.Views.Toolbar.textLine": "Čiara/líniový graf",
   "DE.Views.Toolbar.textMarginsLast": "Posledná úprava",
   "DE.Views.Toolbar.textMarginsModerate": "Primeraný/pomerne malý",
   "DE.Views.Toolbar.textMarginsNarrow": "Úzky",
@@ -1618,11 +1613,8 @@
   "DE.Views.Toolbar.textOddPage": "Nepárna strana",
   "DE.Views.Toolbar.textPageMarginsCustom": "Vlastné okraje",
   "DE.Views.Toolbar.textPageSizeCustom": "Vlastná veľkosť stránky",
-  "DE.Views.Toolbar.textPie": "Koláčový graf",
-  "DE.Views.Toolbar.textPoint": "Bodový graf",
   "DE.Views.Toolbar.textPortrait": "Na výšku",
   "DE.Views.Toolbar.textRight": "Vpravo:",
-  "DE.Views.Toolbar.textStock": "Akcie/burzový graf",
   "DE.Views.Toolbar.textStrikeout": "Prečiarknuť",
   "DE.Views.Toolbar.textStyleMenuDelete": "Odstrániť štýl",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Odstrániť všetky vlastné štýly",
@@ -1632,7 +1624,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Aktualizovať z výberu",
   "DE.Views.Toolbar.textSubscript": "Dolný index",
   "DE.Views.Toolbar.textSuperscript": "Horný index",
-  "DE.Views.Toolbar.textSurface": "Povrch",
   "DE.Views.Toolbar.textTabFile": "Súbor",
   "DE.Views.Toolbar.textTabHome": "Hlavná stránka",
   "DE.Views.Toolbar.textTabInsert": "Vložiť",

apps/documenteditor/main/locale/sl.json

@@ -63,6 +63,13 @@
   "Common.Controllers.ReviewChanges.textTabs": "Change tabs",
   "Common.Controllers.ReviewChanges.textUnderline": "Underline",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
+  "Common.define.chartData.textArea": "Ploščinski grafikon",
+  "Common.define.chartData.textBar": "Stolpični grafikon",
+  "Common.define.chartData.textColumn": "Stolpični grafikon",
+  "Common.define.chartData.textLine": "Vrstični grafikon",
+  "Common.define.chartData.textPie": "Tortni grafikon",
+  "Common.define.chartData.textPoint": "Točkovni grafikon",
+  "Common.define.chartData.textStock": "Založni grafikon",
   "Common.UI.ComboBorderSize.txtNoBorders": "Ni mej",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ni mej",
   "Common.UI.ComboDataView.emptyComboText": "Ni slogov",
@@ -586,18 +593,11 @@
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "DE.Views.ChartSettings.textAdvanced": "Prikaži napredne nastavitve",
-  "DE.Views.ChartSettings.textArea": "Ploščinski grafikon",
-  "DE.Views.ChartSettings.textBar": "Stolpični grafikon",
   "DE.Views.ChartSettings.textChartType": "Spremeni vrsto razpredelnice",
-  "DE.Views.ChartSettings.textColumn": "Stolpični grafikon",
   "DE.Views.ChartSettings.textEditData": "Uredi podatke",
   "DE.Views.ChartSettings.textHeight": "Višina",
-  "DE.Views.ChartSettings.textLine": "Vrstični grafikon",
   "DE.Views.ChartSettings.textOriginalSize": "Privzeta velikost",
-  "DE.Views.ChartSettings.textPie": "Tortni grafikon",
-  "DE.Views.ChartSettings.textPoint": "Točkovni grafikon",
   "DE.Views.ChartSettings.textSize": "Velikost",
-  "DE.Views.ChartSettings.textStock": "Založni grafikon",
   "DE.Views.ChartSettings.textStyle": "Slog",
   "DE.Views.ChartSettings.textUndock": "Odklopi s plošče",
   "DE.Views.ChartSettings.textWidth": "Širina",
@@ -1304,12 +1304,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "Slika z datoteke",
   "DE.Views.Toolbar.mniImageFromUrl": "Slika z URL",
   "DE.Views.Toolbar.strMenuNoFill": "Ni polnila",
-  "DE.Views.Toolbar.textArea": "Ploščinski grafikon",
   "DE.Views.Toolbar.textAutoColor": "Samodejen",
-  "DE.Views.Toolbar.textBar": "Stolpični grafikon",
   "DE.Views.Toolbar.textBold": "Krepko",
   "DE.Views.Toolbar.textBottom": "Bottom: ",
-  "DE.Views.Toolbar.textColumn": "Stolpični grafikon",
   "DE.Views.Toolbar.textColumnsLeft": "Left",
   "DE.Views.Toolbar.textColumnsOne": "One",
   "DE.Views.Toolbar.textColumnsRight": "Right",
@@ -1325,7 +1322,6 @@
   "DE.Views.Toolbar.textInText": "v Besedilu",
   "DE.Views.Toolbar.textItalic": "Poševno",
   "DE.Views.Toolbar.textLeft": "Left: ",
-  "DE.Views.Toolbar.textLine": "Vrstični grafikon",
   "DE.Views.Toolbar.textMarginsLast": "Last Custom",
   "DE.Views.Toolbar.textMarginsModerate": "Moderate",
   "DE.Views.Toolbar.textMarginsNarrow": "Narrow",
@@ -1337,10 +1333,7 @@
   "DE.Views.Toolbar.textOddPage": "Čudna stran",
   "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
   "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
-  "DE.Views.Toolbar.textPie": "Tortni grafikon",
-  "DE.Views.Toolbar.textPoint": "Točkovni grafikon",
   "DE.Views.Toolbar.textRight": "Right: ",
-  "DE.Views.Toolbar.textStock": "Založni grafikon",
   "DE.Views.Toolbar.textStrikeout": "Prečrtaj",
   "DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles",

apps/documenteditor/main/locale/tr.json

@@ -63,6 +63,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Change tabs",
   "Common.Controllers.ReviewChanges.textUnderline": "Underline",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
+  "Common.define.chartData.textArea": "Bölge Grafiği",
+  "Common.define.chartData.textBar": "Çubuk grafik",
+  "Common.define.chartData.textColumn": "Sütun grafik",
+  "Common.define.chartData.textLine": "Çizgi grafiği",
+  "Common.define.chartData.textPie": "Dilim grafik",
+  "Common.define.chartData.textPoint": "Nokta grafiği",
+  "Common.define.chartData.textStock": "Stok Grafiği",
+  "Common.define.chartData.textSurface": "Yüzey",
   "Common.UI.ComboBorderSize.txtNoBorders": "Sınır yok",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sınır yok",
   "Common.UI.ComboDataView.emptyComboText": "Stil yok",
@@ -722,20 +730,12 @@
   "DE.Views.BookmarksDialog.textDelete": "Sil",
   "DE.Views.BookmarksDialog.textName": "İsim",
   "DE.Views.ChartSettings.textAdvanced": "Gelişmiş ayarları göster",
-  "DE.Views.ChartSettings.textArea": "Bölge Grafiği",
-  "DE.Views.ChartSettings.textBar": "Çubuk grafik",
   "DE.Views.ChartSettings.textChartType": "Grafik Tipini Değiştir",
-  "DE.Views.ChartSettings.textColumn": "Sütun grafik",
   "DE.Views.ChartSettings.textEditData": "Veri düzenle",
   "DE.Views.ChartSettings.textHeight": "Yükseklik",
-  "DE.Views.ChartSettings.textLine": "Çizgi grafiği",
   "DE.Views.ChartSettings.textOriginalSize": "Varsayılan Boyut",
-  "DE.Views.ChartSettings.textPie": "Dilim grafik",
-  "DE.Views.ChartSettings.textPoint": "Nokta grafiği",
   "DE.Views.ChartSettings.textSize": "Boyut",
-  "DE.Views.ChartSettings.textStock": "Stok Grafiği",
   "DE.Views.ChartSettings.textStyle": "Stil",
-  "DE.Views.ChartSettings.textSurface": "Yüzey",
   "DE.Views.ChartSettings.textUndock": "Panelden çıkar",
   "DE.Views.ChartSettings.textWidth": "Genişlik",
   "DE.Views.ChartSettings.textWrap": "Kaydırma Stili",
@@ -1552,13 +1552,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "Dosyadan resim",
   "DE.Views.Toolbar.mniImageFromUrl": "URL'den resim",
   "DE.Views.Toolbar.strMenuNoFill": "Dolgu Yok",
-  "DE.Views.Toolbar.textArea": "Bölge Grafiği",
   "DE.Views.Toolbar.textAutoColor": "Otomatik",
-  "DE.Views.Toolbar.textBar": "Çubuk grafik",
   "DE.Views.Toolbar.textBold": "Kalın",
   "DE.Views.Toolbar.textBottom": "Bottom: ",
-  "DE.Views.Toolbar.textCharts": "Grafikler",
-  "DE.Views.Toolbar.textColumn": "Sütun grafik",
   "DE.Views.Toolbar.textColumnsCustom": "Özel Sütunlar",
   "DE.Views.Toolbar.textColumnsLeft": "Left",
   "DE.Views.Toolbar.textColumnsOne": "One",
@@ -1577,7 +1573,6 @@
   "DE.Views.Toolbar.textItalic": "İtalik",
   "DE.Views.Toolbar.textLandscape": "Yatay",
   "DE.Views.Toolbar.textLeft": "Left: ",
-  "DE.Views.Toolbar.textLine": "Çizgi grafiği",
   "DE.Views.Toolbar.textMarginsLast": "Last Custom",
   "DE.Views.Toolbar.textMarginsModerate": "Moderate",
   "DE.Views.Toolbar.textMarginsNarrow": "Narrow",
@@ -1590,11 +1585,8 @@
   "DE.Views.Toolbar.textOddPage": "Tek Sayfa",
   "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
   "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
-  "DE.Views.Toolbar.textPie": "Dilim grafik",
-  "DE.Views.Toolbar.textPoint": "Nokta grafiği",
   "DE.Views.Toolbar.textPortrait": "Dikey",
   "DE.Views.Toolbar.textRight": "Right: ",
-  "DE.Views.Toolbar.textStock": "Stok Grafiği",
   "DE.Views.Toolbar.textStrikeout": "Üstü çizili",
   "DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles",
@@ -1604,7 +1596,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection",
   "DE.Views.Toolbar.textSubscript": "Altsimge",
   "DE.Views.Toolbar.textSuperscript": "Üstsimge",
-  "DE.Views.Toolbar.textSurface": "Yüzey",
   "DE.Views.Toolbar.textTabFile": "Dosya",
   "DE.Views.Toolbar.textTabHome": "Ana Sayfa",
   "DE.Views.Toolbar.textTabInsert": "Ekle",

apps/documenteditor/main/locale/uk.json

@@ -63,6 +63,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Змінити вкладки",
   "Common.Controllers.ReviewChanges.textUnderline": "Підкреслений",
   "Common.Controllers.ReviewChanges.textWidow": "Контроль над",
+  "Common.define.chartData.textArea": "Площа",
+  "Common.define.chartData.textBar": "Вставити",
+  "Common.define.chartData.textColumn": "Колона",
+  "Common.define.chartData.textLine": "Лінія",
+  "Common.define.chartData.textPie": "Пиріг",
+  "Common.define.chartData.textPoint": "XY (розсіювання)",
+  "Common.define.chartData.textStock": "Запас",
+  "Common.define.chartData.textSurface": "Поверхня",
   "Common.UI.ComboBorderSize.txtNoBorders": "Немає кордонів",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Немає кордонів",
   "Common.UI.ComboDataView.emptyComboText": "Немає стилів",
@@ -689,20 +697,12 @@
   "DE.Controllers.Toolbar.txtSymbol_xsi": "ксі",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Зета",
   "DE.Views.ChartSettings.textAdvanced": "Показати додаткові налаштування",
-  "DE.Views.ChartSettings.textArea": "Площа",
-  "DE.Views.ChartSettings.textBar": "Вставити",
   "DE.Views.ChartSettings.textChartType": "Змінити тип діаграми",
-  "DE.Views.ChartSettings.textColumn": "Колона",
   "DE.Views.ChartSettings.textEditData": "Редагувати дату",
   "DE.Views.ChartSettings.textHeight": "Висота",
-  "DE.Views.ChartSettings.textLine": "Лінія",
   "DE.Views.ChartSettings.textOriginalSize": "За замовчуванням",
-  "DE.Views.ChartSettings.textPie": "Пиріг",
-  "DE.Views.ChartSettings.textPoint": "XY (розсіювання)",
   "DE.Views.ChartSettings.textSize": "Розмір",
-  "DE.Views.ChartSettings.textStock": "Запас",
   "DE.Views.ChartSettings.textStyle": "Стиль",
-  "DE.Views.ChartSettings.textSurface": "Поверхня",
   "DE.Views.ChartSettings.textUndock": "Скасувати з панелі",
   "DE.Views.ChartSettings.textWidth": "Ширина",
   "DE.Views.ChartSettings.textWrap": "Стиль упаковки",
@@ -1508,13 +1508,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "Картинка з файлу",
   "DE.Views.Toolbar.mniImageFromUrl": "Зображення з URL",
   "DE.Views.Toolbar.strMenuNoFill": "Немає заповнення",
-  "DE.Views.Toolbar.textArea": "Площа",
   "DE.Views.Toolbar.textAutoColor": "Автоматично",
-  "DE.Views.Toolbar.textBar": "Риска",
   "DE.Views.Toolbar.textBold": "Жирний",
   "DE.Views.Toolbar.textBottom": "Внизу:",
-  "DE.Views.Toolbar.textCharts": "Діаграми",
-  "DE.Views.Toolbar.textColumn": "Колона",
   "DE.Views.Toolbar.textColumnsCustom": "Спеціальні стовпці",
   "DE.Views.Toolbar.textColumnsLeft": "Лівий",
   "DE.Views.Toolbar.textColumnsOne": "Один",
@@ -1533,7 +1529,6 @@
   "DE.Views.Toolbar.textItalic": "Курсив",
   "DE.Views.Toolbar.textLandscape": "ландшафт",
   "DE.Views.Toolbar.textLeft": "Вліво:",
-  "DE.Views.Toolbar.textLine": "Лінія",
   "DE.Views.Toolbar.textMarginsLast": "Останній користувач",
   "DE.Views.Toolbar.textMarginsModerate": "Помірний",
   "DE.Views.Toolbar.textMarginsNarrow": "Вузький",
@@ -1546,11 +1541,8 @@
   "DE.Views.Toolbar.textOddPage": "Непарна сторінка",
   "DE.Views.Toolbar.textPageMarginsCustom": "Користувацькі поля",
   "DE.Views.Toolbar.textPageSizeCustom": "Спеціальний розмір сторінки",
-  "DE.Views.Toolbar.textPie": "Пиріг",
-  "DE.Views.Toolbar.textPoint": "XY (розсіювання)",
   "DE.Views.Toolbar.textPortrait": "Портрет",
   "DE.Views.Toolbar.textRight": "Право:",
-  "DE.Views.Toolbar.textStock": "Запас",
   "DE.Views.Toolbar.textStrikeout": "Викреслити",
   "DE.Views.Toolbar.textStyleMenuDelete": "Видалити стиль",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Видалити всі власні стилі",
@@ -1560,7 +1552,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Оновлення від вибору",
   "DE.Views.Toolbar.textSubscript": "Підрядковий",
   "DE.Views.Toolbar.textSuperscript": "Надрядковий",
-  "DE.Views.Toolbar.textSurface": "Поверхня",
   "DE.Views.Toolbar.textTabCollaboration": "Співпраця",
   "DE.Views.Toolbar.textTabFile": "Файл",
   "DE.Views.Toolbar.textTabHome": "Головна",

apps/documenteditor/main/locale/vi.json

@@ -63,6 +63,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "Thay đổi tab",
   "Common.Controllers.ReviewChanges.textUnderline": "Gạch chân",
   "Common.Controllers.ReviewChanges.textWidow": "Kiểm soát dòng lẻ cuối trang trước",
+  "Common.define.chartData.textArea": "Vùng",
+  "Common.define.chartData.textBar": "Gạch",
+  "Common.define.chartData.textColumn": "Cột",
+  "Common.define.chartData.textLine": "Đường kẻ",
+  "Common.define.chartData.textPie": "Hình bánh",
+  "Common.define.chartData.textPoint": "XY (Phân tán)",
+  "Common.define.chartData.textStock": "Cổ phiếu",
+  "Common.define.chartData.textSurface": "Bề mặt",
   "Common.UI.ComboBorderSize.txtNoBorders": "Không viền",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Không viền",
   "Common.UI.ComboDataView.emptyComboText": "Không có kiểu",
@@ -686,20 +694,12 @@
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "DE.Views.ChartSettings.textAdvanced": "Hiển thị Cài đặt Nâng cao",
-  "DE.Views.ChartSettings.textArea": "Vùng",
-  "DE.Views.ChartSettings.textBar": "Gạch",
   "DE.Views.ChartSettings.textChartType": "Thay đổi Loại biểu đồ",
-  "DE.Views.ChartSettings.textColumn": "Cột",
   "DE.Views.ChartSettings.textEditData": "Chỉnh sửa Dữ liệu",
   "DE.Views.ChartSettings.textHeight": "Chiều cao",
-  "DE.Views.ChartSettings.textLine": "Đường kẻ",
   "DE.Views.ChartSettings.textOriginalSize": "Kích thước mặc định",
-  "DE.Views.ChartSettings.textPie": "Hình bánh",
-  "DE.Views.ChartSettings.textPoint": "XY (Phân tán)",
   "DE.Views.ChartSettings.textSize": "Kích thước",
-  "DE.Views.ChartSettings.textStock": "Cổ phiếu",
   "DE.Views.ChartSettings.textStyle": "Kiểu",
-  "DE.Views.ChartSettings.textSurface": "Bề mặt",
   "DE.Views.ChartSettings.textUndock": "Tháo khỏi bảng điều khiển",
   "DE.Views.ChartSettings.textWidth": "Chiều rộng",
   "DE.Views.ChartSettings.textWrap": "Kiểu ngắt dòng",
@@ -1492,13 +1492,9 @@
   "DE.Views.Toolbar.mniImageFromFile": "Hình ảnh từ file",
   "DE.Views.Toolbar.mniImageFromUrl": "Hình ảnh từ URL",
   "DE.Views.Toolbar.strMenuNoFill": "Không đổ màu",
-  "DE.Views.Toolbar.textArea": "Vùng",
   "DE.Views.Toolbar.textAutoColor": "Tự động",
-  "DE.Views.Toolbar.textBar": "Gạch",
   "DE.Views.Toolbar.textBold": "Đậm",
   "DE.Views.Toolbar.textBottom": "Dưới cùng:",
-  "DE.Views.Toolbar.textCharts": "Biểu đồ",
-  "DE.Views.Toolbar.textColumn": "Cột",
   "DE.Views.Toolbar.textColumnsCustom": "Tùy chỉnh cột",
   "DE.Views.Toolbar.textColumnsLeft": "Trái",
   "DE.Views.Toolbar.textColumnsOne": "Một",
@@ -1517,7 +1513,6 @@
   "DE.Views.Toolbar.textItalic": "Nghiêng",
   "DE.Views.Toolbar.textLandscape": "Nằm ngang",
   "DE.Views.Toolbar.textLeft": "Trái:",
-  "DE.Views.Toolbar.textLine": "Đường kẻ",
   "DE.Views.Toolbar.textMarginsLast": "Tuỳ chỉnh cuối cùng",
   "DE.Views.Toolbar.textMarginsModerate": "Vừa phải",
   "DE.Views.Toolbar.textMarginsNarrow": "Thu hẹp",
@@ -1530,11 +1525,8 @@
   "DE.Views.Toolbar.textOddPage": "Trang lẻ",
   "DE.Views.Toolbar.textPageMarginsCustom": "Tùy chỉnh lề",
   "DE.Views.Toolbar.textPageSizeCustom": "Tùy chỉnh kích thước trang",
-  "DE.Views.Toolbar.textPie": "Hình bánh",
-  "DE.Views.Toolbar.textPoint": "XY (Phân tán)",
   "DE.Views.Toolbar.textPortrait": "Thẳng đứng",
   "DE.Views.Toolbar.textRight": "Bên phải:",
-  "DE.Views.Toolbar.textStock": "Cổ phiếu",
   "DE.Views.Toolbar.textStrikeout": "Gạch bỏ",
   "DE.Views.Toolbar.textStyleMenuDelete": "Xóa kiểu",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Xóa tất cả kiểu tùy chỉnh",
@@ -1544,7 +1536,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Cập nhật từ lựa chọn",
   "DE.Views.Toolbar.textSubscript": "Chỉ số dưới",
   "DE.Views.Toolbar.textSuperscript": "Chỉ số trên",
-  "DE.Views.Toolbar.textSurface": "Bề mặt",
   "DE.Views.Toolbar.textTabFile": "File",
   "DE.Views.Toolbar.textTabHome": "Trang chủ",
   "DE.Views.Toolbar.textTabInsert": "Chèn",

apps/documenteditor/main/locale/zh.json

@@ -69,6 +69,14 @@
   "Common.Controllers.ReviewChanges.textTabs": "更改选项卡",
   "Common.Controllers.ReviewChanges.textUnderline": "下划线",
   "Common.Controllers.ReviewChanges.textWidow": "视窗控制",
+  "Common.define.chartData.textArea": "区域",
+  "Common.define.chartData.textBar": "条",
+  "Common.define.chartData.textColumn": "列",
+  "Common.define.chartData.textLine": "线",
+  "Common.define.chartData.textPie": "派",
+  "Common.define.chartData.textPoint": "XY（散射）",
+  "Common.define.chartData.textStock": "股票",
+  "Common.define.chartData.textSurface": "平面",
   "Common.UI.ComboBorderSize.txtNoBorders": "没有边框",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "没有边框",
   "Common.UI.ComboDataView.emptyComboText": "没有风格",
@@ -1000,20 +1008,12 @@
   "DE.Views.BookmarksDialog.textTitle": "书签",
   "DE.Views.BookmarksDialog.txtInvalidName": "书签名称只能包含字母、数字和下划线，并且应以字母开头",
   "DE.Views.ChartSettings.textAdvanced": "显示高级设置",
-  "DE.Views.ChartSettings.textArea": "区域",
-  "DE.Views.ChartSettings.textBar": "条",
   "DE.Views.ChartSettings.textChartType": "更改图表类型",
-  "DE.Views.ChartSettings.textColumn": "列",
   "DE.Views.ChartSettings.textEditData": "编辑数据",
   "DE.Views.ChartSettings.textHeight": "高度",
-  "DE.Views.ChartSettings.textLine": "线",
   "DE.Views.ChartSettings.textOriginalSize": "默认大小",
-  "DE.Views.ChartSettings.textPie": "派",
-  "DE.Views.ChartSettings.textPoint": "XY（散射）",
   "DE.Views.ChartSettings.textSize": "大小",
-  "DE.Views.ChartSettings.textStock": "股票",
   "DE.Views.ChartSettings.textStyle": "类型",
-  "DE.Views.ChartSettings.textSurface": "平面",
   "DE.Views.ChartSettings.textUndock": "离开面板",
   "DE.Views.ChartSettings.textWidth": "宽度",
   "DE.Views.ChartSettings.textWrap": "包裹风格",
@@ -1994,13 +1994,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "图片来自存储",
   "DE.Views.Toolbar.mniImageFromUrl": "图片来自网络",
   "DE.Views.Toolbar.strMenuNoFill": "没有填充",
-  "DE.Views.Toolbar.textArea": "区域",
   "DE.Views.Toolbar.textAutoColor": "自动化的",
-  "DE.Views.Toolbar.textBar": "条",
   "DE.Views.Toolbar.textBold": "加粗",
   "DE.Views.Toolbar.textBottom": "底部： ",
-  "DE.Views.Toolbar.textCharts": "图表",
-  "DE.Views.Toolbar.textColumn": "列",
   "DE.Views.Toolbar.textColumnsCustom": "自定义列",
   "DE.Views.Toolbar.textColumnsLeft": "左",
   "DE.Views.Toolbar.textColumnsOne": "一",
@@ -2019,7 +2015,6 @@
   "DE.Views.Toolbar.textItalic": "斜体",
   "DE.Views.Toolbar.textLandscape": "横向",
   "DE.Views.Toolbar.textLeft": "左： ",
-  "DE.Views.Toolbar.textLine": "线",
   "DE.Views.Toolbar.textMarginsLast": "最后自定义",
   "DE.Views.Toolbar.textMarginsModerate": "中等",
   "DE.Views.Toolbar.textMarginsNarrow": "缩小",
@@ -2033,14 +2028,11 @@
   "DE.Views.Toolbar.textOddPage": "奇数页",
   "DE.Views.Toolbar.textPageMarginsCustom": "自定义边距",
   "DE.Views.Toolbar.textPageSizeCustom": "自定义页面大小",
-  "DE.Views.Toolbar.textPie": "派",
   "DE.Views.Toolbar.textPlainControl": "插入纯文本内容控件",
-  "DE.Views.Toolbar.textPoint": "XY (散点图)",
   "DE.Views.Toolbar.textPortrait": "肖像",
   "DE.Views.Toolbar.textRemoveControl": "删除内容控件",
   "DE.Views.Toolbar.textRichControl": "插入多信息文本内容控件",
   "DE.Views.Toolbar.textRight": "右： ",
-  "DE.Views.Toolbar.textStock": "股票",
   "DE.Views.Toolbar.textStrikeout": "加删除线",
   "DE.Views.Toolbar.textStyleMenuDelete": "删除样式",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "删除所有自定义样式",
@@ -2050,7 +2042,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "从选择更新",
   "DE.Views.Toolbar.textSubscript": "下标",
   "DE.Views.Toolbar.textSuperscript": "上标",
-  "DE.Views.Toolbar.textSurface": "平面",
   "DE.Views.Toolbar.textTabCollaboration": "协作",
   "DE.Views.Toolbar.textTabFile": "文件",
   "DE.Views.Toolbar.textTabHome": "主页",

apps/documenteditor/main/resources/less/app.less

@@ -118,6 +118,7 @@
 @import "../../../../common/main/resources/less/toolbar.less";
 @import "../../../../common/main/resources/less/language-dialog.less";
 @import "../../../../common/main/resources/less/winxp_fix.less";
+@import "../../../../common/main/resources/less/calendar.less";
 @import "../../../../common/main/resources/less/symboltable.less";
 
 // App
@@ -151,10 +152,10 @@
 
 .doc-placeholder {
     background: #fbfbfb;
-    width: 796px;
-    margin: 40px auto;
+    width: 794px;
+    margin: 46px auto;
     height: 100%;
-    border: 1px solid #dfdfdf;
+    border: 1px solid #bebebe;
     padding-top: 50px;
     position: absolute;
     left: 0;
@@ -163,11 +164,6 @@
     bottom: 0;
     z-index: 1;
 
-    -webkit-animation: flickerAnimation 2s infinite ease-in-out;
-    -moz-animation: flickerAnimation 2s infinite ease-in-out;
-    -o-animation: flickerAnimation 2s infinite ease-in-out;
-    animation: flickerAnimation 2s infinite ease-in-out;
-
     > .line {
         height: 15px;
         margin: 30px 80px;

apps/documenteditor/main/resources/less/layout.less

@@ -77,6 +77,10 @@ label {
     display: none;
 }
 
+#editor-container {
+    background: #e2e2e2;
+}
+
 #editor_sdk {
     width: 100%;
     height: 100%;

apps/documenteditor/mobile/app/controller/Main.js

@@ -210,9 +210,10 @@ define([
                 me.appOptions.fileChoiceUrl   = me.editorConfig.fileChoiceUrl;
                 me.appOptions.mergeFolderUrl  = me.editorConfig.mergeFolderUrl;
                 me.appOptions.canAnalytics    = false;
+                me.appOptions.canRequestClose = me.editorConfig.canRequestClose;
                 me.appOptions.customization   = me.editorConfig.customization;
-                me.appOptions.canBackToFolder = (me.editorConfig.canBackToFolder!==false) && (typeof (me.editorConfig.customization) == 'object')
-                    && (typeof (me.editorConfig.customization.goback) == 'object') && !_.isEmpty(me.editorConfig.customization.goback.url);
+                me.appOptions.canBackToFolder = (me.editorConfig.canBackToFolder!==false) && (typeof (me.editorConfig.customization) == 'object') && (typeof (me.editorConfig.customization.goback) == 'object')
+                                                && (!_.isEmpty(me.editorConfig.customization.goback.url) || me.editorConfig.customization.goback.requestClose && me.appOptions.canRequestClose);
                 me.appOptions.canBack         = me.appOptions.canBackToFolder === true;
                 me.appOptions.canPlugins      = false;
                 me.plugins                    = me.editorConfig.plugins;
@@ -335,11 +336,15 @@ define([
             },
 
             goBack: function(current) {
-                var href = this.appOptions.customization.goback.url;
-                if (!current && this.appOptions.customization.goback.blank!==false) {
-                    window.open(href, "_blank");
+                if (this.appOptions.customization.goback.requestClose && this.appOptions.canRequestClose) {
+                    Common.Gateway.requestClose();
                 } else {
-                    parent.location.href = href;
+                    var href = this.appOptions.customization.goback.url;
+                    if (!current && this.appOptions.customization.goback.blank!==false) {
+                        window.open(href, "_blank");
+                    } else {
+                        parent.location.href = href;
+                    }
                 }
             },
 
@@ -730,7 +735,6 @@ define([
                 me.appOptions.isOffline       = me.api.asc_isOffline();
                 me.appOptions.isReviewOnly    = (me.permissions.review === true) && (me.permissions.edit === false);
                 me.appOptions.canRequestEditRights = me.editorConfig.canRequestEditRights;
-                me.appOptions.canRequestClose = me.editorConfig.canRequestClose;
                 me.appOptions.canEdit         = (me.permissions.edit !== false || me.permissions.review === true) && // can edit or review
                     (me.editorConfig.canRequestEditRights || me.editorConfig.mode !== 'view') && // if mode=="view" -> canRequestEditRights must be defined
                     (!me.appOptions.isReviewOnly || me.appOptions.canLicense); // if isReviewOnly==true -> canLicense must be true

apps/documenteditor/mobile/app/controller/Toolbar.js

@@ -51,8 +51,7 @@ define([
 
     DE.Controllers.Toolbar = Backbone.Controller.extend(_.extend((function() {
         // private
-        var _backUrl,
-            stateDisplayMode = false;
+        var stateDisplayMode = false;
 
         return {
             models: [],
@@ -67,9 +66,7 @@ define([
 
             loadConfig: function (data) {
                 if (data && data.config && data.config.canBackToFolder !== false &&
-                    data.config.customization && data.config.customization.goback && data.config.customization.goback.url) {
-                    _backUrl = data.config.customization.goback.url;
-
+                    data.config.customization && data.config.customization.goback && (data.config.customization.goback.url || data.config.customization.goback.requestClose && data.config.canRequestClose)) {
                     $('#document-back').show().single('click', _.bind(this.onBack, this));
                 }
             },
@@ -116,7 +113,7 @@ define([
                             {
                                 text: me.leaveButtonText,
                                 onClick: function() {
-                                    window.parent.location.href = _backUrl;
+                                    Common.NotificationCenter.trigger('goback', true);
                                 }
                             },
                             {
@@ -126,7 +123,7 @@ define([
                         ]
                     });
                 } else {
-                    window.parent.location.href = _backUrl;
+                    Common.NotificationCenter.trigger('goback', true);
                 }
             },
 

apps/documenteditor/sdk_dev_scripts.js

@@ -171,7 +171,9 @@ var sdk_dev_scrpipts = [
 	"../../../../sdkjs/word/Drawing/mobileTouchManager.js",
     "../../../../sdkjs/word/apiCommon.js",
     "../../../../sdkjs/common/apiBase.js",
+	"../../../../sdkjs/common/apiBase_plugins.js",
     "../../../../sdkjs/word/api.js",
+	"../../../../sdkjs/word/api_plugins.js",
     "../../../../sdkjs/word/document/empty.js",
     "../../../../sdkjs/word/Editor/CollaborativeEditing.js",
     "../../../../sdkjs/word/Math/mathTypes.js",

apps/presentationeditor/embed/js/ApplicationController.js

@@ -76,7 +76,7 @@ PE.ApplicationController = new(function(){
             $('#editor_sdk').addClass('top');
         }
 
-        if (config.canBackToFolder === false || !(config.customization && config.customization.goback && config.customization.goback.url)) {
+        if (config.canBackToFolder === false || !(config.customization && config.customization.goback && (config.customization.goback.url || config.customization.goback.requestClose && config.canRequestClose))) {
             $('#id-btn-close').hide();
 
             // Hide last separator
@@ -310,8 +310,12 @@ PE.ApplicationController = new(function(){
         });
 
         $('#id-btn-close').on('click', function(){
-            if (config.customization && config.customization.goback && config.customization.goback.url)
-                window.parent.location.href = config.customization.goback.url;
+            if (config.customization && config.customization.goback) {
+                if (config.customization.goback.requestClose && config.canRequestClose)
+                    Common.Gateway.requestClose();
+                else if (config.customization.goback.url)
+                    window.parent.location.href = config.customization.goback.url;
+            }
         });
 
         $('#btn-left').on('click', function(){

apps/presentationeditor/main/app/controller/DocumentHolder.js

@@ -112,7 +112,7 @@ define([
                     if (this.api) {
                         ( diagramEditor.isEditMode() )
                             ? this.api.asc_editChartDrawingObject(data)
-                            : this.api.asc_addChartDrawingObject(data);
+                            : this.api.asc_addChartDrawingObject(data, diagramEditor.getPlaceholder());
                     }
                 }, this));
                 diagramEditor.on('hide', _.bind(function(cmp, message) {

apps/presentationeditor/main/app/controller/Main.js

@@ -310,9 +310,10 @@ define([
                 this.appOptions.saveAsUrl       = this.editorConfig.saveAsUrl;
                 this.appOptions.fileChoiceUrl   = this.editorConfig.fileChoiceUrl;
                 this.appOptions.canAnalytics    = false;
+                this.appOptions.canRequestClose = this.editorConfig.canRequestClose;
                 this.appOptions.customization   = this.editorConfig.customization;
-                this.appOptions.canBackToFolder = (this.editorConfig.canBackToFolder!==false) && (typeof (this.editorConfig.customization) == 'object')
-                                                  && (typeof (this.editorConfig.customization.goback) == 'object') && !_.isEmpty(this.editorConfig.customization.goback.url);
+                this.appOptions.canBackToFolder = (this.editorConfig.canBackToFolder!==false) && (typeof (this.editorConfig.customization) == 'object') && (typeof (this.editorConfig.customization.goback) == 'object')
+                                                  && (!_.isEmpty(this.editorConfig.customization.goback.url) || this.editorConfig.customization.goback.requestClose && this.appOptions.canRequestClose);
                 this.appOptions.canBack         = this.appOptions.canBackToFolder === true;
                 this.appOptions.canPlugins      = false;
                 this.appOptions.canRequestUsers = this.editorConfig.canRequestUsers;
@@ -447,11 +448,16 @@ define([
             goBack: function(current) {
                 var me = this;
                 if ( !Common.Controllers.Desktop.process('goback') ) {
-                    var href = me.appOptions.customization.goback.url;
-                    if (!current && me.appOptions.customization.goback.blank!==false) {
-                        window.open(href, "_blank");
+                    if (me.appOptions.customization.goback.requestClose && me.appOptions.canRequestClose) {
+                        Common.Gateway.requestClose();
+                        // Common.Controllers.Desktop.requestClose();
                     } else {
-                        parent.location.href = href;
+                        var href = me.appOptions.customization.goback.url;
+                        if (!current && me.appOptions.customization.goback.blank!==false) {
+                            window.open(href, "_blank");
+                        } else {
+                            parent.location.href = href;
+                        }
                     }
                 }
              },
@@ -899,7 +905,6 @@ define([
                 this.appOptions.canCoAuthoring = !this.appOptions.isLightVersion;
                 /** coauthoring end **/
                 this.appOptions.canRequestEditRights = this.editorConfig.canRequestEditRights;
-                this.appOptions.canRequestClose = this.editorConfig.canRequestClose;
                 this.appOptions.canEdit        = this.permissions.edit !== false && // can edit
                                                  (this.editorConfig.canRequestEditRights || this.editorConfig.mode !== 'view'); // if mode=="view" -> canRequestEditRights must be defined
                 this.appOptions.isEdit         = this.appOptions.canLicense && this.appOptions.canEdit && this.editorConfig.mode !== 'view';

apps/presentationeditor/main/app/controller/Toolbar.js

@@ -1126,8 +1126,10 @@ define([
             }
             if (props) {
                 (new Common.Views.ListSettingsDialog({
+                    api: me.api,
                     props: props,
                     type: type,
+                    interfaceLang: me.toolbar.mode.lang,
                     handler: function(result, value) {
                         if (result == 'ok') {
                             if (me.api) {

apps/presentationeditor/main/app/template/ImageSettings.template

@@ -14,17 +14,17 @@
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <button type="button" class="btn btn-text-default" id="image-button-original-size" style="width:100px;"><%= scope.textOriginalSize %></button>
+            <button type="button" class="btn btn-text-default" id="image-button-original-size" style="min-width:100px;width: auto;"><%= scope.textOriginalSize %></button>
         </td>
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <button type="button" class="btn btn-text-default" id="image-button-fit-slide" style="width:100px;"><%= scope.textFitSlide %></button>
+            <button type="button" class="btn btn-text-default" id="image-button-fit-slide" style="min-width:100px;width: auto;"><%= scope.textFitSlide %></button>
         </td>
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <div id="image-button-crop" style="width: 100px;"></div>
+            <div id="image-button-crop" style="min-width:100px;"></div>
         </td>
     </tr>
     <tr>

apps/presentationeditor/main/app/template/SlideSettings.template

@@ -11,7 +11,7 @@
     </tr>
     <tr class="padding-small">
         <td>
-            <div id="slide-panel-color-fill" class="settings-hidden padding-small" style="width: 100%;">
+            <div id="slide-panel-color-fill" class="padding-small" style="width: 100%;">
                 <div id="slide-back-color-btn" style=""></div>
             </div>
             <div id="slide-panel-image-fill" class="settings-hidden padding-small" style="width: 100%;">

apps/presentationeditor/main/app/view/DocumentHolder.js

@@ -325,7 +325,10 @@ define([
                     });
                     meEl.on('click', function(e){
                         if (e.target.localName == 'canvas') {
-                            meEl.focus();
+                            if (me._preventClick)
+                                me._preventClick = false;
+                            else
+                                meEl.focus();
                         }
                     });
                     meEl.on('mousedown', function(e){
@@ -675,18 +678,6 @@ define([
                 me.mode.isEdit = false;
             };
 
-            var onDoubleClickOnChart = function(chart) {
-                if (me.mode.isEdit && !me._isDisabled) {
-                    var diagramEditor = PE.getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor');
-
-                    if (diagramEditor && chart) {
-                        diagramEditor.setEditMode(true);
-                        diagramEditor.show();
-                        diagramEditor.setChartData(new Asc.asc_CChartBinary(chart));
-                    }
-                }
-            };
-
             var onTextLanguage = function(langid) {
                 me._currLang.id = langid;
             };
@@ -1581,12 +1572,18 @@ define([
 
                     if (me.mode.isEdit===true) {
                         me.api.asc_registerCallback('asc_onDialogAddHyperlink', _.bind(onDialogAddHyperlink, me));
-                        me.api.asc_registerCallback('asc_doubleClickOnChart', onDoubleClickOnChart);
+                        me.api.asc_registerCallback('asc_doubleClickOnChart', _.bind(me.editChartClick, me));
                         me.api.asc_registerCallback('asc_onSpellCheckVariantsFound',  _.bind(onSpellCheckVariantsFound, me));
                         me.api.asc_registerCallback('asc_onShowSpecialPasteOptions',  _.bind(onShowSpecialPasteOptions, me));
                         me.api.asc_registerCallback('asc_onHideSpecialPasteOptions',  _.bind(onHideSpecialPasteOptions, me));
                         me.api.asc_registerCallback('asc_ChangeCropState',            _.bind(onChangeCropState, me));
-
+                        me.api.asc_registerCallback('asc_onHidePlaceholderActions',   _.bind(me.onHidePlaceholderActions, me));
+                        me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Image, _.bind(me.onInsertImage, me, true));
+                        me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.ImageUrl, _.bind(me.onInsertImageUrl, me, true));
+                        me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Chart, _.bind(me.onClickPlaceholderChart, me));
+                        me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Table, _.bind(me.onClickPlaceholderTable, me));
+                        me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Video, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Video));
+                        me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Audio, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Audio));
                     }
                     me.api.asc_registerCallback('asc_onCoAuthoringDisconnect',  _.bind(onCoAuthoringDisconnect, me));
                     Common.NotificationCenter.on('api:disconnect',              _.bind(onCoAuthoringDisconnect, me));
@@ -1701,15 +1698,17 @@ define([
             }
         },
         /** coauthoring end **/
-        editChartClick: function(){
-            var diagramEditor = PE.getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor');
-            if (diagramEditor) {
-                diagramEditor.setEditMode(true);
-                diagramEditor.show();
+        editChartClick: function(chart, placeholder){
+            if (this.mode.isEdit && !this._isDisabled) {
+                var diagramEditor = PE.getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor');
 
-                var chart = this.api.asc_getChartObject();
-                if (chart) {
+                if (diagramEditor) {
+                    diagramEditor.setEditMode(chart===undefined || typeof chart == 'object'); //edit from doubleclick or context menu
+                    diagramEditor.show();
+                    if (typeof chart !== 'object')
+                        chart = this.api.asc_getChartObject(chart, placeholder);
                     diagramEditor.setChartData(new Asc.asc_CChartBinary(chart));
+                    diagramEditor.setPlaceholder(placeholder);
                 }
             }
         },
@@ -2662,7 +2661,7 @@ define([
 
             var menuChartEdit = new Common.UI.MenuItem({
                 caption     : me.editChartText
-            }).on('click', _.bind(me.editChartClick, me));
+            }).on('click', _.bind(me.editChartClick, me, undefined));
 
             var menuParagraphVAlign = new Common.UI.MenuItem({
                 caption     : me.vertAlignText,
@@ -2781,29 +2780,12 @@ define([
                             caption     : this.textFromFile
                         }).on('click', function(item) {
                             setTimeout(function(){
-                                if (me.api) me.api.ChangeImageFromFile();
-                                me.fireEvent('editcomplete', me);
+                                me.onInsertImage();
                             }, 10);
                         }),
                         new Common.UI.MenuItem({
                             caption     : this.textFromUrl
-                        }).on('click', function(item) {
-                            (new Common.Views.ImageFromUrlDialog({
-                                handler: function(result, value) {
-                                    if (result == 'ok') {
-                                        if (me.api) {
-                                            var checkUrl = value.replace(/ /g, '');
-                                            if (!_.isEmpty(checkUrl)) {
-                                                var props = new Asc.asc_CImgProperty();
-                                                props.put_ImageUrl(checkUrl);
-                                                me.api.ImgApply(props);
-                                            }
-                                        }
-                                    }
-                                    me.fireEvent('editcomplete', me);
-                                }
-                            })).show();
-                        })
+                        }).on('click', _.bind(me.onInsertImageUrl, me, false))
                     ]
                 })
             });
@@ -3432,6 +3414,164 @@ define([
             this._isDisabled = state;
         },
 
+        onInsertImage: function(placeholder, obj, x, y) {
+            if (this.api)
+                (placeholder) ? this.api.asc_addImage(obj) : this.api.ChangeImageFromFile();
+            this.fireEvent('editcomplete', this);
+        },
+
+        onInsertImageUrl: function(placeholder, obj, x, y) {
+            var me = this;
+            (new Common.Views.ImageFromUrlDialog({
+                handler: function(result, value) {
+                    if (result == 'ok') {
+                        if (me.api) {
+                            var checkUrl = value.replace(/ /g, '');
+                            if (!_.isEmpty(checkUrl)) {
+                                if (placeholder)
+                                    me.api.AddImageUrl(checkUrl, undefined, undefined, obj);
+                                else {
+                                    var props = new Asc.asc_CImgProperty();
+                                    props.put_ImageUrl(checkUrl);
+                                    me.api.ImgApply(props, obj);
+                                }
+                            }
+                        }
+                    }
+                    me.fireEvent('editcomplete', me);
+                }
+            })).show();
+        },
+
+        onClickPlaceholderChart: function(obj, x, y) {
+            if (!this.api) return;
+
+            this._state.placeholderObj = obj;
+            var menu = this.placeholderMenuChart,
+                menuContainer = menu ? this.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null,
+                me = this;
+            this._fromShowPlaceholder = true;
+            Common.UI.Menu.Manager.hideAll();
+
+            if (!menu) {
+                this.placeholderMenuChart = menu = new Common.UI.Menu({
+                    style: 'width: 435px;',
+                    items: [
+                        {template: _.template('<div id="id-placeholder-menu-chart" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>')}
+                    ]
+                });
+                // Prepare menu container
+                menuContainer = $(Common.Utils.String.format('<div id="menu-container-{0}" style="position: absolute; z-index: 10000;"><div class="dropdown-toggle" data-toggle="dropdown"></div></div>', menu.id));
+                this.cmpEl.append(menuContainer);
+                menu.render(menuContainer);
+                menu.cmpEl.attr({tabindex: "-1"});
+                menu.on('hide:after', function(){
+                    if (!me._fromShowPlaceholder)
+                        me.api.asc_uncheckPlaceholders();
+                });
+
+                var picker = new Common.UI.DataView({
+                    el: $('#id-placeholder-menu-chart'),
+                    parentMenu: menu,
+                    showLast: false,
+                    // restoreHeight: 421,
+                    groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()),
+                    store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
+                    itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
+                });
+                picker.on('item:click', function (picker, item, record, e) {
+                    me.editChartClick(record.get('type'), me._state.placeholderObj);
+                });
+            }
+            menuContainer.css({left: x, top : y});
+            menuContainer.attr('data-value', 'prevent-canvas-click');
+            this._preventClick = true;
+            menu.show();
+
+            menu.alignPosition();
+            _.delay(function() {
+                menu.cmpEl.focus();
+            }, 10);
+            this._fromShowPlaceholder = false;
+        },
+
+        onClickPlaceholderTable: function(obj, x, y) {
+            if (!this.api) return;
+
+            this._state.placeholderObj = obj;
+            var menu = this.placeholderMenuTable,
+                menuContainer = menu ? this.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null,
+                me = this;
+            this._fromShowPlaceholder = true;
+            Common.UI.Menu.Manager.hideAll();
+
+            if (!menu) {
+                this.placeholderMenuTable = menu = new Common.UI.Menu({
+                    items: [
+                        {template: _.template('<div id="id-placeholder-menu-tablepicker" class="dimension-picker" style="margin: 5px 10px;"></div>')},
+                        {caption: me.mniCustomTable, value: 'custom'}
+                    ]
+                });
+                // Prepare menu container
+                menuContainer = $(Common.Utils.String.format('<div id="menu-container-{0}" style="position: absolute; z-index: 10000;"><div class="dropdown-toggle" data-toggle="dropdown"></div></div>', menu.id));
+                this.cmpEl.append(menuContainer);
+                menu.render(menuContainer);
+                menu.cmpEl.attr({tabindex: "-1"});
+                menu.on('hide:after', function(){
+                    if (!me._fromShowPlaceholder)
+                        me.api.asc_uncheckPlaceholders();
+                });
+
+                var picker = new Common.UI.DimensionPicker({
+                    el: $('#id-placeholder-menu-tablepicker'),
+                    minRows: 8,
+                    minColumns: 10,
+                    maxRows: 8,
+                    maxColumns: 10
+                });
+                picker.on('select', function(picker, columns, rows){
+                    me.api.put_Table(columns, rows, me._state.placeholderObj);
+                    me.fireEvent('editcomplete', me);
+                });
+                menu.on('item:click', function(menu, item, e){
+                    if (item.value === 'custom') {
+                        (new Common.Views.InsertTableDialog({
+                            handler: function(result, value) {
+                                if (result == 'ok')
+                                    me.api.put_Table(value.columns, value.rows, me._state.placeholderObj);
+                                me.fireEvent('editcomplete', me);
+                            }
+                        })).show();
+                    }
+                });
+            }
+            menuContainer.css({left: x, top : y});
+            menuContainer.attr('data-value', 'prevent-canvas-click');
+            this._preventClick = true;
+            menu.show();
+
+            menu.alignPosition();
+            _.delay(function() {
+                menu.cmpEl.focus();
+            }, 10);
+            this._fromShowPlaceholder = false;
+        },
+
+        onHidePlaceholderActions: function() {
+            this.placeholderMenuChart && this.placeholderMenuChart.hide();
+            this.placeholderMenuTable && this.placeholderMenuTable.hide();
+        },
+
+        onClickPlaceholder: function(type, obj, x, y) {
+            if (!this.api) return;
+            if (type == AscCommon.PlaceholderButtonType.Video) {
+                // this.api.addVideo(obj);
+            } else if (type == AscCommon.PlaceholderButtonType.Audio) {
+                // this.api.addAudio(obj);
+            }
+            this.fireEvent('editcomplete', this);
+        },
+
         insertRowAboveText      : 'Row Above',
         insertRowBelowText      : 'Row Below',
         insertColumnLeftText    : 'Column Left',
@@ -3607,7 +3747,8 @@ define([
         toDictionaryText: 'Add to Dictionary',
         txtPrintSelection: 'Print Selection',
         addToLayoutText: 'Add to Layout',
-        txtResetLayout: 'Reset Slide'
+        txtResetLayout: 'Reset Slide',
+        mniCustomTable: 'Insert custom table'
 
     }, PE.Views.DocumentHolder || {}));
 });

apps/presentationeditor/main/app/view/HeaderFooterDialog.js

@@ -346,7 +346,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
             this.close();
         },
 
-        textTitle: 'Header/Footer Settings',
+        textTitle: 'Footer Settings',
         applyAllText: 'Apply to all',
         applyText: 'Apply',
         textLang: 'Language',

apps/presentationeditor/main/app/view/ImageSettings.js

@@ -102,10 +102,10 @@ define([
 
         updateMetricUnit: function() {
             var value = Common.Utils.Metric.fnRecalcFromMM(this._state.Width);
-            this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+            this.labelWidth[0].innerHTML = this.textWidth + ': ' + value.toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
 
             value = Common.Utils.Metric.fnRecalcFromMM(this._state.Height);
-            this.labelHeight[0].innerHTML = this.textHeight + ': ' + value.toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+            this.labelHeight[0].innerHTML = this.textHeight + ': ' + value.toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
         },
 
         createDelayedControls: function() {
@@ -143,6 +143,17 @@ define([
                 this.fireEvent('editcomplete', this);
             }, this));
 
+            this.btnFitSlide = new Common.UI.Button({
+                el: $('#image-button-fit-slide')
+            });
+            this.lockedControls.push(this.btnFitSlide);
+            this.btnFitSlide.on('click', _.bind(this.setFitSlide, this));
+
+            var w = Math.max(this.btnOriginalSize.cmpEl.width(), this.btnFitSlide.cmpEl.width());
+            this.btnOriginalSize.cmpEl.width(w);
+            this.btnFitSlide.cmpEl.width(w);
+
+            w = this.btnOriginalSize.cmpEl.outerWidth();
             this.btnCrop = new Common.UI.Button({
                 cls: 'btn-text-split-default',
                 caption: this.textCrop,
@@ -150,9 +161,9 @@ define([
                 enableToggle: true,
                 allowDepress: true,
                 pressed: this._state.cropMode,
-                width: 100,
+                width: w,
                 menu        : new Common.UI.Menu({
-                    style       : 'min-width: 100px;',
+                    style       : 'min-width:' + w + 'px;',
                     items: [
                         {
                             caption: this.textCrop,
@@ -176,12 +187,6 @@ define([
             this.btnCrop.menu.on('item:click', _.bind(this.onCropMenu, this));
             this.lockedControls.push(this.btnCrop);
 
-            this.btnFitSlide = new Common.UI.Button({
-                el: $('#image-button-fit-slide')
-            });
-            this.lockedControls.push(this.btnFitSlide);
-            this.btnFitSlide.on('click', _.bind(this.setFitSlide, this));
-
             this.btnRotate270 = new Common.UI.Button({
                 cls: 'btn-toolbar',
                 iconCls: 'rotate-270',
@@ -244,13 +249,13 @@ define([
 
                 var value = props.get_Width();
                 if ( Math.abs(this._state.Width-value)>0.001 ) {
-                    this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                    this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
                     this._state.Width = value;
                 }
 
                 value = props.get_Height();
                 if ( Math.abs(this._state.Height-value)>0.001 ) {
-                    this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                    this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(value).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
                     this._state.Height = value;
                 }
 
@@ -286,8 +291,8 @@ define([
                 var w = imgsize.get_ImageWidth();
                 var h = imgsize.get_ImageHeight();
 
-                this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
-                this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(1) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                this.labelWidth[0].innerHTML = this.textWidth + ': ' + Common.Utils.Metric.fnRecalcFromMM(w).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
+                this.labelHeight[0].innerHTML = this.textHeight + ': ' + Common.Utils.Metric.fnRecalcFromMM(h).toFixed(2) + ' ' + Common.Utils.Metric.getCurrentMetricName();
 
                 var properties = new Asc.asc_CImgProperty();
                 properties.put_Width(w);

apps/presentationeditor/main/app/view/SlideSettings.js

@@ -129,9 +129,23 @@ define([
                 data: this._arrFillSrc,
                 disabled: true
             });
-            this.cmbFillSrc.setValue('');
+            this.cmbFillSrc.setValue(Asc.c_oAscFill.FILL_TYPE_SOLID);
             this.cmbFillSrc.on('selected', _.bind(this.onFillSrcSelect, this));
 
+            this.btnBackColor = new Common.UI.ColorButton({
+                style: "width:45px;",
+                disabled: true,
+                menu        : new Common.UI.Menu({
+                    items: [
+                        { template: _.template('<div id="slide-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
+                        { template: _.template('<a id="slide-back-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
+                    ]
+                })
+            });
+            this.btnBackColor.render( $('#slide-back-color-btn'));
+            this.btnBackColor.setColor('ffffff');
+            this.FillItems.push(this.btnBackColor);
+
             this.FillColorContainer = $('#slide-panel-color-fill');
             this.FillImageContainer = $('#slide-panel-image-fill');
             this.FillPatternContainer = $('#slide-panel-pattern-fill');
@@ -1056,20 +1070,7 @@ define([
 
         UpdateThemeColors: function() {
             if (this._initSettings) return;
-            if (!this.btnBackColor) {
-                this.btnBackColor = new Common.UI.ColorButton({
-                    style: "width:45px;",
-                    disabled: true,
-                    menu        : new Common.UI.Menu({
-                        items: [
-                            { template: _.template('<div id="slide-back-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
-                            { template: _.template('<a id="slide-back-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
-                        ]
-                    })
-                });
-                this.btnBackColor.render( $('#slide-back-color-btn'));
-                this.btnBackColor.setColor('ffffff');
-                this.FillItems.push(this.btnBackColor);
+            if (!this.colorsBack) {
                 this.colorsBack = new Common.UI.ThemeColorPalette({
                     el: $('#slide-back-color-menu'),
                     value: 'ffffff',

apps/presentationeditor/main/app/view/Toolbar.js

@@ -1632,10 +1632,10 @@ define([
             mniImageFromStorage: 'Image from Storage',
             txtSlideAlign: 'Align to Slide',
             txtObjectsAlign: 'Align Selected Objects',
-            tipEditHeader: 'Edit header or footer',
+            tipEditHeader: 'Edit footer',
             tipSlideNum: 'Insert slide number',
             tipDateTime: 'Insert current date and time',
-            capBtnInsHeader: 'Header/Footer',
+            capBtnInsHeader: 'Footer',
             capBtnSlideNum: 'Slide Number',
             capBtnDateTime: 'Date & Time',
             textListSettings: 'List Settings',

apps/presentationeditor/main/index.html

@@ -252,10 +252,14 @@
 
     <script>
         var params = getUrlParams(),
+            compact = params["compact"] == 'true',
             view = params["mode"] == 'view';
 
-        if (view) {
+        if (compact || view) {
             document.querySelector('.brendpanel > :nth-child(2)').remove();
+            document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
+        }
+        if (view) {
             document.querySelector('.sktoolbar').remove();
         }
 

apps/presentationeditor/main/index.html.deploy

@@ -258,10 +258,14 @@
 
     <script>
         var params = getUrlParams(),
+            compact = params["compact"] == 'true',
             view = params["mode"] == 'view';
 
-        if (view) {
+        if (compact || view) {
             document.querySelector('.brendpanel > :nth-child(2)').remove();
+            document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
+        }
+        if (view) {
             document.querySelector('.sktoolbar').remove();
         }
 

apps/presentationeditor/main/locale/bg.json

@@ -5,6 +5,15 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "Затвори",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Обектът е деактивиран, а кой е редактиран от друг потребител.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Внимание",
+  "Common.define.chartData.textArea": "Площ",
+  "Common.define.chartData.textBar": "Бар",
+  "Common.define.chartData.textColumn": "Колона",
+  "Common.define.chartData.textLine": "Линия",
+  "Common.define.chartData.textPie": "Кръгова",
+  "Common.define.chartData.textPoint": "XY (точкова)",
+  "Common.define.chartData.textStock": "Борсова",
+  "Common.define.chartData.textSurface": "Повърхност",
+  "Common.define.chartData.textCharts": "Диаграми",
   "Common.UI.ComboBorderSize.txtNoBorders": "Няма граници",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Няма граници",
   "Common.UI.ComboDataView.emptyComboText": "Няма стилове",
@@ -901,20 +910,12 @@
   "PE.Controllers.Viewport.textFitPage": "Плъзгайте се",
   "PE.Controllers.Viewport.textFitWidth": "Поставя се в ширина",
   "PE.Views.ChartSettings.textAdvanced": "Показване на разширените настройки",
-  "PE.Views.ChartSettings.textArea": "Площ",
-  "PE.Views.ChartSettings.textBar": "Бар",
   "PE.Views.ChartSettings.textChartType": "Промяна на типа на диаграмата",
-  "PE.Views.ChartSettings.textColumn": "Колона",
   "PE.Views.ChartSettings.textEditData": "Редактиране на данни",
   "PE.Views.ChartSettings.textHeight": "Височина",
   "PE.Views.ChartSettings.textKeepRatio": "Постоянни пропорции",
-  "PE.Views.ChartSettings.textLine": "Линия",
-  "PE.Views.ChartSettings.textPie": "Кръгова",
-  "PE.Views.ChartSettings.textPoint": "XY (точкова)",
   "PE.Views.ChartSettings.textSize": "Размер",
-  "PE.Views.ChartSettings.textStock": "Борсова",
   "PE.Views.ChartSettings.textStyle": "Стил",
-  "PE.Views.ChartSettings.textSurface": "Повърхност",
   "PE.Views.ChartSettings.textWidth": "Ширина",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Алтернативен текст",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Описание",
@@ -1622,20 +1623,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "Подравнете текста към средата",
   "PE.Views.Toolbar.textAlignRight": "Подравняване на текста вдясно",
   "PE.Views.Toolbar.textAlignTop": "Подравняване на текста до върха",
-  "PE.Views.Toolbar.textArea": "Площ",
   "PE.Views.Toolbar.textArrangeBack": "Изпращане до фона",
   "PE.Views.Toolbar.textArrangeBackward": "Изпращане назад",
   "PE.Views.Toolbar.textArrangeForward": "Изведи напред",
   "PE.Views.Toolbar.textArrangeFront": "Доведете до преден план",
-  "PE.Views.Toolbar.textBar": "Бар",
   "PE.Views.Toolbar.textBold": "Получер",
-  "PE.Views.Toolbar.textCharts": "Диаграми",
-  "PE.Views.Toolbar.textColumn": "Колона",
   "PE.Views.Toolbar.textItalic": "Курсив",
-  "PE.Views.Toolbar.textLine": "Линия",
   "PE.Views.Toolbar.textNewColor": "Цвят по избор",
-  "PE.Views.Toolbar.textPie": "Кръгова",
-  "PE.Views.Toolbar.textPoint": "XY (точкова)",
   "PE.Views.Toolbar.textShapeAlignBottom": "Подравняване отдолу",
   "PE.Views.Toolbar.textShapeAlignCenter": "Подравняване на центъра",
   "PE.Views.Toolbar.textShapeAlignLeft": "Подравняване вляво",
@@ -1646,11 +1640,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Показване от текущата слайд",
   "PE.Views.Toolbar.textShowPresenterView": "Показване на изгледа на презентатора",
   "PE.Views.Toolbar.textShowSettings": "Покажи настройките",
-  "PE.Views.Toolbar.textStock": "Борсова",
   "PE.Views.Toolbar.textStrikeout": "Зачеркнато",
   "PE.Views.Toolbar.textSubscript": "Долен",
   "PE.Views.Toolbar.textSuperscript": "Горен индекс",
-  "PE.Views.Toolbar.textSurface": "Повърхност",
   "PE.Views.Toolbar.textTabCollaboration": "Сътрудничество",
   "PE.Views.Toolbar.textTabFile": "Файл",
   "PE.Views.Toolbar.textTabHome": "У дома",

apps/presentationeditor/main/locale/cs.json

@@ -5,6 +5,14 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "Zavřít",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je vypnut, protože je upravován jiným uživatelem.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Varování",
+  "Common.define.chartData.textArea": "Plošný graf",
+  "Common.define.chartData.textBar": "Pruhový graf",
+  "Common.define.chartData.textColumn": "Sloupcový graf",
+  "Common.define.chartData.textLine": "Liniový graf",
+  "Common.define.chartData.textPie": "Kruhový diagram",
+  "Common.define.chartData.textPoint": "Bodový graf",
+  "Common.define.chartData.textStock": "Burzovní graf",
+  "Common.define.chartData.textSurface": "Povrch",
   "Common.UI.ComboBorderSize.txtNoBorders": "Bez ohraničení",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez ohraničení",
   "Common.UI.ComboDataView.emptyComboText": "Žádné styly",
@@ -600,20 +608,12 @@
   "PE.Controllers.Toolbar.txtSymbol_xsi": "Ksí",
   "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "PE.Views.ChartSettings.textAdvanced": "Zobrazit pokročilé nastavení",
-  "PE.Views.ChartSettings.textArea": "Plošný graf",
-  "PE.Views.ChartSettings.textBar": "Vodorovná čárka",
   "PE.Views.ChartSettings.textChartType": "Změnit typ grafu",
-  "PE.Views.ChartSettings.textColumn": "Sloupec",
   "PE.Views.ChartSettings.textEditData": "Upravit data",
   "PE.Views.ChartSettings.textHeight": "Výška",
   "PE.Views.ChartSettings.textKeepRatio": "Konstantní rozměry",
-  "PE.Views.ChartSettings.textLine": "Čára",
-  "PE.Views.ChartSettings.textPie": "Kruhový diagram",
-  "PE.Views.ChartSettings.textPoint": "Bodový graf",
   "PE.Views.ChartSettings.textSize": "Velikost",
-  "PE.Views.ChartSettings.textStock": "Akcie",
   "PE.Views.ChartSettings.textStyle": "Styl",
-  "PE.Views.ChartSettings.textSurface": "Povrch",
   "PE.Views.ChartSettings.textWidth": "Šířka",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Alternativní text",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Popis",
@@ -1238,20 +1238,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "Zarovnat text doprostřed",
   "PE.Views.Toolbar.textAlignRight": "Zarovnat text doprava",
   "PE.Views.Toolbar.textAlignTop": "Zarovnat text nahoru",
-  "PE.Views.Toolbar.textArea": "Plošný graf",
   "PE.Views.Toolbar.textArrangeBack": "Přesunout do pozadí",
   "PE.Views.Toolbar.textArrangeBackward": "Odeslat zpět",
   "PE.Views.Toolbar.textArrangeForward": "Předložit",
   "PE.Views.Toolbar.textArrangeFront": "Přenést do popředí",
-  "PE.Views.Toolbar.textBar": "Vodorovná čárka",
   "PE.Views.Toolbar.textBold": "Tučně",
-  "PE.Views.Toolbar.textCharts": "Grafy",
-  "PE.Views.Toolbar.textColumn": "Sloupec",
   "PE.Views.Toolbar.textItalic": "Kurzíva",
-  "PE.Views.Toolbar.textLine": "Čára",
   "PE.Views.Toolbar.textNewColor": "Vlastní barva",
-  "PE.Views.Toolbar.textPie": "Kruhový diagram",
-  "PE.Views.Toolbar.textPoint": "Bodový graf",
   "PE.Views.Toolbar.textShapeAlignBottom": "Zarovnat dolů",
   "PE.Views.Toolbar.textShapeAlignCenter": "Zarovnat na střed",
   "PE.Views.Toolbar.textShapeAlignLeft": "Zarovnat vlevo",
@@ -1262,11 +1255,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Zobrazit od aktuálního snímku",
   "PE.Views.Toolbar.textShowPresenterView": "Ukázat zobrazení přednášejícího",
   "PE.Views.Toolbar.textShowSettings": "Zobrazit nastavení",
-  "PE.Views.Toolbar.textStock": "Akcie",
   "PE.Views.Toolbar.textStrikeout": "Přeškrtnout",
   "PE.Views.Toolbar.textSubscript": "Dolní index",
   "PE.Views.Toolbar.textSuperscript": "Horní index",
-  "PE.Views.Toolbar.textSurface": "Povrch",
   "PE.Views.Toolbar.textTabFile": "Soubor",
   "PE.Views.Toolbar.textTabHome": "Domů",
   "PE.Views.Toolbar.textTabInsert": "Vložit",

apps/presentationeditor/main/locale/de.json

@@ -910,20 +910,12 @@
   "PE.Controllers.Viewport.textFitPage": "Folie anpassen",
   "PE.Controllers.Viewport.textFitWidth": "Breite anpassen",
   "PE.Views.ChartSettings.textAdvanced": "Erweiterte Einstellungen anzeigen",
-  "PE.Views.ChartSettings.textArea": "Flächen",
-  "PE.Views.ChartSettings.textBar": "Balken",
   "PE.Views.ChartSettings.textChartType": "Diagrammtyp ändern",
-  "PE.Views.ChartSettings.textColumn": "Spalte",
   "PE.Views.ChartSettings.textEditData": "Daten ändern",
   "PE.Views.ChartSettings.textHeight": "Höhe",
   "PE.Views.ChartSettings.textKeepRatio": "Seitenverhältnis beibehalten",
-  "PE.Views.ChartSettings.textLine": "Linie",
-  "PE.Views.ChartSettings.textPie": "Kreis",
-  "PE.Views.ChartSettings.textPoint": "Punkt (XY)",
   "PE.Views.ChartSettings.textSize": "Größe",
-  "PE.Views.ChartSettings.textStock": "Bestand",
   "PE.Views.ChartSettings.textStyle": "Stil",
-  "PE.Views.ChartSettings.textSurface": "Oberfläche",
   "PE.Views.ChartSettings.textWidth": "Breite",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Der alternative Text",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Beschreibung",
@@ -1631,20 +1623,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "Text mittig ausrichten",
   "PE.Views.Toolbar.textAlignRight": "Text rechtsbündig ausrichten",
   "PE.Views.Toolbar.textAlignTop": "Text am oberen Rand ausrichten",
-  "PE.Views.Toolbar.textArea": "Flächen",
   "PE.Views.Toolbar.textArrangeBack": "In den Hintergrund",
   "PE.Views.Toolbar.textArrangeBackward": "Eine Ebene nach hinten",
   "PE.Views.Toolbar.textArrangeForward": "Eine Ebene nach vorne",
   "PE.Views.Toolbar.textArrangeFront": "In den Vordergrund ",
-  "PE.Views.Toolbar.textBar": "Balken",
   "PE.Views.Toolbar.textBold": "Fett",
-  "PE.Views.Toolbar.textCharts": "Diagramme",
-  "PE.Views.Toolbar.textColumn": "Spalte",
   "PE.Views.Toolbar.textItalic": "Kursiv",
-  "PE.Views.Toolbar.textLine": "Linie",
   "PE.Views.Toolbar.textNewColor": "Benutzerdefinierte Farbe",
-  "PE.Views.Toolbar.textPie": "Kreis",
-  "PE.Views.Toolbar.textPoint": "Punkt (XY)",
   "PE.Views.Toolbar.textShapeAlignBottom": "Unten ausrichten",
   "PE.Views.Toolbar.textShapeAlignCenter": "Zentriert ausrichten",
   "PE.Views.Toolbar.textShapeAlignLeft": "Links ausrichten",
@@ -1655,11 +1640,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Von aktueller Folie abschauen",
   "PE.Views.Toolbar.textShowPresenterView": "Referentenansicht",
   "PE.Views.Toolbar.textShowSettings": "Einstellungen anzeigen",
-  "PE.Views.Toolbar.textStock": "Bestand",
   "PE.Views.Toolbar.textStrikeout": "Durchgestrichen",
   "PE.Views.Toolbar.textSubscript": "Tiefgestellt",
   "PE.Views.Toolbar.textSuperscript": "Hochgestellt",
-  "PE.Views.Toolbar.textSurface": "Oberfläche",
   "PE.Views.Toolbar.textTabCollaboration": "Zusammenarbeit",
   "PE.Views.Toolbar.textTabFile": "Datei",
   "PE.Views.Toolbar.textTabHome": "Startseite",

apps/presentationeditor/main/locale/en.json

@@ -123,6 +123,8 @@
   "Common.Views.ListSettingsDialog.txtSize": "Size",
   "Common.Views.ListSettingsDialog.txtStart": "Start at",
   "Common.Views.ListSettingsDialog.txtTitle": "List Settings",
+  "Common.Views.ListSettingsDialog.txtBullet": "Bullet",
+  "Common.Views.ListSettingsDialog.tipChange": "Change bullet",
   "Common.Views.OpenDialog.closeButtonText": "Close File",
   "Common.Views.OpenDialog.txtEncoding": "Encoding ",
   "Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.",
@@ -161,6 +163,8 @@
   "Common.Views.ReviewChanges.strStrictDesc": "Use the 'Save' button to sync the changes you and others make.",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "Accept current change",
   "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode",
+  "Common.Views.ReviewChanges.tipCommentRem": "Remove comments",
+  "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments",
   "Common.Views.ReviewChanges.tipHistory": "Show version history",
   "Common.Views.ReviewChanges.tipRejectCurrent": "Reject current change",
   "Common.Views.ReviewChanges.tipReview": "Track changes",
@@ -175,6 +179,11 @@
   "Common.Views.ReviewChanges.txtChat": "Chat",
   "Common.Views.ReviewChanges.txtClose": "Close",
   "Common.Views.ReviewChanges.txtCoAuthMode": "Co-editing Mode",
+  "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments",
+  "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments",
+  "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments",
+  "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments",
+  "Common.Views.ReviewChanges.txtCommentRemove": "Remove",
   "Common.Views.ReviewChanges.txtDocLang": "Language",
   "Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)",
   "Common.Views.ReviewChanges.txtFinalCap": "Final",
@@ -193,13 +202,6 @@
   "Common.Views.ReviewChanges.txtSpelling": "Spell Checking",
   "Common.Views.ReviewChanges.txtTurnon": "Track Changes",
   "Common.Views.ReviewChanges.txtView": "Display Mode",
-  "Common.Views.ReviewChanges.txtCommentRemove": "Remove",
-  "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments",
-  "Common.Views.ReviewChanges.tipCommentRem": "Remove comments",
-  "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments",
-  "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments",
-  "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments",
-  "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments",
   "Common.Views.ReviewPopover.textAdd": "Add",
   "Common.Views.ReviewPopover.textAddReply": "Add Reply",
   "Common.Views.ReviewPopover.textCancel": "Cancel",
@@ -236,11 +238,11 @@
   "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line",
   "Common.Views.SignSettingsDialog.textTitle": "Signature Setup",
   "Common.Views.SignSettingsDialog.txtEmpty": "This field is required",
-  "Common.Views.SymbolTableDialog.textTitle": "Symbol",
+  "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value",
   "Common.Views.SymbolTableDialog.textFont": "Font",
   "Common.Views.SymbolTableDialog.textRange": "Range",
   "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols",
-  "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value",
+  "Common.Views.SymbolTableDialog.textTitle": "Symbol",
   "PE.Controllers.LeftMenu.newDocumentTitle": "Unnamed presentation",
   "PE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
   "PE.Controllers.LeftMenu.requestEditRightsText": "Requesting editing rights...",
@@ -281,6 +283,7 @@
   "PE.Controllers.Main.errorToken": "The document security token is not correctly formed.<br>Please contact your Document Server administrator.",
   "PE.Controllers.Main.errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator.",
   "PE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
+  "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
   "PE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.",
   "PE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded",
   "PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print it until the connection is restored and page is reloaded.",
@@ -595,7 +598,6 @@
   "PE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
   "PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
   "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
-  "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
   "PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
   "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
   "PE.Controllers.Toolbar.textAccent": "Accents",
@@ -604,6 +606,7 @@
   "PE.Controllers.Toolbar.textFontSizeErr": "The entered value is incorrect.<br>Please enter a numeric value between 1 and 100",
   "PE.Controllers.Toolbar.textFraction": "Fractions",
   "PE.Controllers.Toolbar.textFunction": "Functions",
+  "PE.Controllers.Toolbar.textInsert": "Insert",
   "PE.Controllers.Toolbar.textIntegral": "Integrals",
   "PE.Controllers.Toolbar.textLargeOperator": "Large Operators",
   "PE.Controllers.Toolbar.textLimitAndLog": "Limits And Logarithms",
@@ -929,24 +932,15 @@
   "PE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis",
   "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
-  "PE.Controllers.Toolbar.textInsert": "Insert",
   "PE.Controllers.Viewport.textFitPage": "Fit to Slide",
   "PE.Controllers.Viewport.textFitWidth": "Fit to Width",
   "PE.Views.ChartSettings.textAdvanced": "Show advanced settings",
-  "del_PE.Views.ChartSettings.textArea": "Area",
-  "del_PE.Views.ChartSettings.textBar": "Bar",
   "PE.Views.ChartSettings.textChartType": "Change Chart Type",
-  "del_PE.Views.ChartSettings.textColumn": "Column",
   "PE.Views.ChartSettings.textEditData": "Edit Data",
   "PE.Views.ChartSettings.textHeight": "Height",
   "PE.Views.ChartSettings.textKeepRatio": "Constant proportions",
-  "del_PE.Views.ChartSettings.textLine": "Line",
-  "del_PE.Views.ChartSettings.textPie": "Pie",
-  "del_PE.Views.ChartSettings.textPoint": "XY (Scatter)",
   "PE.Views.ChartSettings.textSize": "Size",
-  "del_PE.Views.ChartSettings.textStock": "Stock",
   "PE.Views.ChartSettings.textStyle": "Style",
-  "del_PE.Views.ChartSettings.textSurface": "Surface",
   "PE.Views.ChartSettings.textWidth": "Width",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Alternative Text",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Description",
@@ -1133,6 +1127,7 @@
   "PE.Views.DocumentHolder.txtUnderbar": "Bar under text",
   "PE.Views.DocumentHolder.txtUngroup": "Ungroup",
   "PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
+  "PE.Views.DocumentHolder.mniCustomTable": "Insert custom table",
   "PE.Views.DocumentPreview.goToSlideText": "Go to Slide",
   "PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}",
   "PE.Views.DocumentPreview.txtClose": "Close slideshow",
@@ -1247,7 +1242,7 @@
   "PE.Views.HeaderFooterDialog.textNotTitle": "Don't show on title slide",
   "PE.Views.HeaderFooterDialog.textPreview": "Preview",
   "PE.Views.HeaderFooterDialog.textSlideNum": "Slide number",
-  "PE.Views.HeaderFooterDialog.textTitle": "Header/Footer Settings",
+  "PE.Views.HeaderFooterDialog.textTitle": "Footer Settings",
   "PE.Views.HeaderFooterDialog.textUpdate": "Update automatically",
   "PE.Views.HyperlinkSettingsDialog.strDisplay": "Display",
   "PE.Views.HyperlinkSettingsDialog.strLinkTo": "Link To",
@@ -1315,6 +1310,11 @@
   "PE.Views.LeftMenu.tipTitles": "Titles",
   "PE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE",
   "PE.Views.LeftMenu.txtTrial": "TRIAL MODE",
+  "del_PE.Views.ListSettingsDialog.textNewColor": "Add New Custom Color",
+  "del_PE.Views.ListSettingsDialog.txtColor": "Color",
+  "del_PE.Views.ListSettingsDialog.txtOfText": "% of text",
+  "del_PE.Views.ListSettingsDialog.txtSize": "Size",
+  "del_PE.Views.ListSettingsDialog.txtTitle": "List Settings",
   "PE.Views.ParagraphSettings.strLineHeight": "Line Spacing",
   "PE.Views.ParagraphSettings.strParagraphSpacing": "Paragraph Spacing",
   "PE.Views.ParagraphSettings.strSpacingAfter": "After",
@@ -1691,7 +1691,8 @@
   "PE.Views.Toolbar.capBtnAddComment": "Add Comment",
   "PE.Views.Toolbar.capBtnComment": "Comment",
   "PE.Views.Toolbar.capBtnDateTime": "Date & Time",
-  "PE.Views.Toolbar.capBtnInsHeader": "Header/Footer",
+  "PE.Views.Toolbar.capBtnInsHeader": "Footer",
+  "PE.Views.Toolbar.capBtnInsSymbol": "Symbol",
   "PE.Views.Toolbar.capBtnSlideNum": "Slide Number",
   "PE.Views.Toolbar.capInsertChart": "Chart",
   "PE.Views.Toolbar.capInsertEquation": "Equation",
@@ -1717,21 +1718,14 @@
   "PE.Views.Toolbar.textAlignMiddle": "Align text to the middle",
   "PE.Views.Toolbar.textAlignRight": "Align text right",
   "PE.Views.Toolbar.textAlignTop": "Align text to the top",
-  "del_PE.Views.Toolbar.textArea": "Area",
   "PE.Views.Toolbar.textArrangeBack": "Send to Background",
   "PE.Views.Toolbar.textArrangeBackward": "Send Backward",
   "PE.Views.Toolbar.textArrangeForward": "Bring Forward",
   "PE.Views.Toolbar.textArrangeFront": "Bring to Foreground",
-  "del_PE.Views.Toolbar.textBar": "Bar",
   "PE.Views.Toolbar.textBold": "Bold",
-  "del_PE.Views.Toolbar.textCharts": "Charts",
-  "del_PE.Views.Toolbar.textColumn": "Column",
   "PE.Views.Toolbar.textItalic": "Italic",
-  "del_PE.Views.Toolbar.textLine": "Line",
   "PE.Views.Toolbar.textListSettings": "List Settings",
   "PE.Views.Toolbar.textNewColor": "Custom Color",
-  "del_PE.Views.Toolbar.textPie": "Pie",
-  "del_PE.Views.Toolbar.textPoint": "XY (Scatter)",
   "PE.Views.Toolbar.textShapeAlignBottom": "Align Bottom",
   "PE.Views.Toolbar.textShapeAlignCenter": "Align Center",
   "PE.Views.Toolbar.textShapeAlignLeft": "Align Left",
@@ -1742,11 +1736,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Show from Current Slide",
   "PE.Views.Toolbar.textShowPresenterView": "Show Presenter View",
   "PE.Views.Toolbar.textShowSettings": "Show Settings",
-  "del_PE.Views.Toolbar.textStock": "Stock",
   "PE.Views.Toolbar.textStrikeout": "Strikethrough",
   "PE.Views.Toolbar.textSubscript": "Subscript",
   "PE.Views.Toolbar.textSuperscript": "Superscript",
-  "del_PE.Views.Toolbar.textSurface": "Surface",
   "PE.Views.Toolbar.textTabCollaboration": "Collaboration",
   "PE.Views.Toolbar.textTabFile": "File",
   "PE.Views.Toolbar.textTabHome": "Home",
@@ -1764,7 +1756,7 @@
   "PE.Views.Toolbar.tipCopyStyle": "Copy style",
   "PE.Views.Toolbar.tipDateTime": "Insert current date and time",
   "PE.Views.Toolbar.tipDecPrLeft": "Decrease indent",
-  "PE.Views.Toolbar.tipEditHeader": "Edit header or footer",
+  "PE.Views.Toolbar.tipEditHeader": "Edit footer",
   "PE.Views.Toolbar.tipFontColor": "Font color",
   "PE.Views.Toolbar.tipFontName": "Font",
   "PE.Views.Toolbar.tipFontSize": "Font size",
@@ -1775,6 +1767,7 @@
   "PE.Views.Toolbar.tipInsertHyperlink": "Add hyperlink",
   "PE.Views.Toolbar.tipInsertImage": "Insert image",
   "PE.Views.Toolbar.tipInsertShape": "Insert autoshape",
+  "PE.Views.Toolbar.tipInsertSymbol": "Insert symbol",
   "PE.Views.Toolbar.tipInsertTable": "Insert table",
   "PE.Views.Toolbar.tipInsertText": "Insert text box",
   "PE.Views.Toolbar.tipInsertTextArt": "Insert Text Art",
@@ -1821,7 +1814,5 @@
   "PE.Views.Toolbar.txtScheme8": "Flow",
   "PE.Views.Toolbar.txtScheme9": "Foundry",
   "PE.Views.Toolbar.txtSlideAlign": "Align to Slide",
-  "PE.Views.Toolbar.txtUngroup": "Ungroup",
-  "PE.Views.Toolbar.capBtnInsSymbol": "Symbol",
-  "PE.Views.Toolbar.tipInsertSymbol": "Insert symbol"
+  "PE.Views.Toolbar.txtUngroup": "Ungroup"
 }

apps/presentationeditor/main/locale/es.json

@@ -5,6 +5,14 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "Cerrar",
   "Common.Controllers.ExternalDiagramEditor.warningText": "El objeto está desactivado porque se está editando por otro usuario.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Aviso",
+  "Common.define.chartData.textArea": "Área",
+  "Common.define.chartData.textBar": "Barra",
+  "Common.define.chartData.textColumn": "Gráfico de columnas",
+  "Common.define.chartData.textLine": "Línea",
+  "Common.define.chartData.textPie": "Gráfico circular",
+  "Common.define.chartData.textPoint": "XY (Dispersión)",
+  "Common.define.chartData.textStock": "De cotizaciones",
+  "Common.define.chartData.textSurface": "Superficie",
   "Common.UI.ComboBorderSize.txtNoBorders": "Sin bordes",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sin bordes",
   "Common.UI.ComboDataView.emptyComboText": "Sin estilo",
@@ -902,20 +910,12 @@
   "PE.Controllers.Viewport.textFitPage": "Ajustar a la diapositiva",
   "PE.Controllers.Viewport.textFitWidth": "Ajustar al ancho",
   "PE.Views.ChartSettings.textAdvanced": "Mostrar ajustes avanzados",
-  "PE.Views.ChartSettings.textArea": "Gráfico de área",
-  "PE.Views.ChartSettings.textBar": "Gráfico de barras",
   "PE.Views.ChartSettings.textChartType": "Cambiar tipo de gráfico",
-  "PE.Views.ChartSettings.textColumn": "Histograma",
   "PE.Views.ChartSettings.textEditData": "Editar datos",
   "PE.Views.ChartSettings.textHeight": "Altura",
   "PE.Views.ChartSettings.textKeepRatio": "Proporciones constantes",
-  "PE.Views.ChartSettings.textLine": "Línea",
-  "PE.Views.ChartSettings.textPie": "Gráfico circular",
-  "PE.Views.ChartSettings.textPoint": "XY (Dispersión)",
   "PE.Views.ChartSettings.textSize": "Tamaño",
-  "PE.Views.ChartSettings.textStock": "De cotizaciones",
   "PE.Views.ChartSettings.textStyle": "Estilo",
-  "PE.Views.ChartSettings.textSurface": "Superficie",
   "PE.Views.ChartSettings.textWidth": "Ancho",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Texto alternativo",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Descripción",
@@ -1653,20 +1653,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "Alinear texto al medio",
   "PE.Views.Toolbar.textAlignRight": "Alinear texto a la derecha",
   "PE.Views.Toolbar.textAlignTop": "Alinear texto en la parte superior",
-  "PE.Views.Toolbar.textArea": "Gráfico de área",
   "PE.Views.Toolbar.textArrangeBack": "Enviar al fondo",
   "PE.Views.Toolbar.textArrangeBackward": "Enviar atrás",
   "PE.Views.Toolbar.textArrangeForward": "Traer adelante",
   "PE.Views.Toolbar.textArrangeFront": "Traer al frente",
-  "PE.Views.Toolbar.textBar": "Gráfico de barras",
   "PE.Views.Toolbar.textBold": "Negrita",
-  "PE.Views.Toolbar.textCharts": "Gráficos",
-  "PE.Views.Toolbar.textColumn": "Histograma",
   "PE.Views.Toolbar.textItalic": "Cursiva",
-  "PE.Views.Toolbar.textLine": "Línea",
   "PE.Views.Toolbar.textNewColor": "Color personalizado",
-  "PE.Views.Toolbar.textPie": "Gráfico circular",
-  "PE.Views.Toolbar.textPoint": "XY (Dispersión)",
   "PE.Views.Toolbar.textShapeAlignBottom": "Alinear en la parte inferior",
   "PE.Views.Toolbar.textShapeAlignCenter": "Alinear al centro",
   "PE.Views.Toolbar.textShapeAlignLeft": "Alinear a la izquierda",
@@ -1677,11 +1670,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Mostrar desde la diapositiva actual",
   "PE.Views.Toolbar.textShowPresenterView": "Observar vista del presentador",
   "PE.Views.Toolbar.textShowSettings": "Mostrar los ajustes",
-  "PE.Views.Toolbar.textStock": "De cotizaciones",
   "PE.Views.Toolbar.textStrikeout": "Tachado",
   "PE.Views.Toolbar.textSubscript": "Subíndice",
   "PE.Views.Toolbar.textSuperscript": "Sobreíndice",
-  "PE.Views.Toolbar.textSurface": "Superficie",
   "PE.Views.Toolbar.textTabCollaboration": "Colaboración",
   "PE.Views.Toolbar.textTabFile": "Archivo",
   "PE.Views.Toolbar.textTabHome": "Inicio",

apps/presentationeditor/main/locale/fr.json

@@ -5,6 +5,14 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "Fermer",
   "Common.Controllers.ExternalDiagramEditor.warningText": "L'objet est désactivé car il est en cours d'être modifié par un autre utilisateur.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Avertissement",
+  "Common.define.chartData.textArea": "En aires",
+  "Common.define.chartData.textBar": "En barre",
+  "Common.define.chartData.textColumn": "Colonne",
+  "Common.define.chartData.textLine": "Graphique en ligne",
+  "Common.define.chartData.textPie": "Graphiques à secteurs",
+  "Common.define.chartData.textPoint": "Nuages de points (XY)",
+  "Common.define.chartData.textStock": "Boursier",
+  "Common.define.chartData.textSurface": "Surface",
   "Common.UI.ComboBorderSize.txtNoBorders": "Pas de bordures",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Pas de bordures",
   "Common.UI.ComboDataView.emptyComboText": "Aucun style",
@@ -903,20 +911,12 @@
   "PE.Controllers.Viewport.textFitPage": "Ajuster à la diapositive",
   "PE.Controllers.Viewport.textFitWidth": "Ajuster à la largeur",
   "PE.Views.ChartSettings.textAdvanced": "Afficher les paramètres avancés",
-  "PE.Views.ChartSettings.textArea": "En aires",
-  "PE.Views.ChartSettings.textBar": "À barres",
   "PE.Views.ChartSettings.textChartType": "Modifier le type de graphique",
-  "PE.Views.ChartSettings.textColumn": "Histogramme",
   "PE.Views.ChartSettings.textEditData": "Modifier les données",
   "PE.Views.ChartSettings.textHeight": "Hauteur",
   "PE.Views.ChartSettings.textKeepRatio": "Proportions constantes",
-  "PE.Views.ChartSettings.textLine": "En ligne",
-  "PE.Views.ChartSettings.textPie": "À secteurs",
-  "PE.Views.ChartSettings.textPoint": "Nuages de points (XY)",
   "PE.Views.ChartSettings.textSize": "Taille",
-  "PE.Views.ChartSettings.textStock": "Boursier",
   "PE.Views.ChartSettings.textStyle": "Style",
-  "PE.Views.ChartSettings.textSurface": "Surface",
   "PE.Views.ChartSettings.textWidth": "Largeur",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Texte de remplacement",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Description",
@@ -1681,20 +1681,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "Aligner le texte au milieu",
   "PE.Views.Toolbar.textAlignRight": "Aligner le texte à droite",
   "PE.Views.Toolbar.textAlignTop": "Aligner le texte en haut",
-  "PE.Views.Toolbar.textArea": "En aires",
   "PE.Views.Toolbar.textArrangeBack": "Mettre en arrière-plan",
   "PE.Views.Toolbar.textArrangeBackward": "Envoyer vers l'arrière.",
   "PE.Views.Toolbar.textArrangeForward": "Déplacer vers l'avant",
   "PE.Views.Toolbar.textArrangeFront": "Mettre au premier plan",
-  "PE.Views.Toolbar.textBar": "À barres",
   "PE.Views.Toolbar.textBold": "Gras",
-  "PE.Views.Toolbar.textCharts": "Graphiques",
-  "PE.Views.Toolbar.textColumn": "Histogramme",
   "PE.Views.Toolbar.textItalic": "Italique",
-  "PE.Views.Toolbar.textLine": "En ligne",
   "PE.Views.Toolbar.textNewColor": "Couleur personnalisée",
-  "PE.Views.Toolbar.textPie": "À secteurs",
-  "PE.Views.Toolbar.textPoint": "Nuages de points (XY)",
   "PE.Views.Toolbar.textShapeAlignBottom": "Aligner en bas",
   "PE.Views.Toolbar.textShapeAlignCenter": "Aligner au centre",
   "PE.Views.Toolbar.textShapeAlignLeft": "Aligner à gauche",
@@ -1705,11 +1698,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Afficher de la diapositive actuelle",
   "PE.Views.Toolbar.textShowPresenterView": "Afficher en mode présentateur",
   "PE.Views.Toolbar.textShowSettings": "Afficher les paramètres",
-  "PE.Views.Toolbar.textStock": "Boursier",
   "PE.Views.Toolbar.textStrikeout": "Barré",
   "PE.Views.Toolbar.textSubscript": "Indice",
   "PE.Views.Toolbar.textSuperscript": "Exposant",
-  "PE.Views.Toolbar.textSurface": "Surface",
   "PE.Views.Toolbar.textTabCollaboration": "Collaboration",
   "PE.Views.Toolbar.textTabFile": "Fichier",
   "PE.Views.Toolbar.textTabHome": "Accueil",

apps/presentationeditor/main/locale/hu.json

@@ -5,6 +5,14 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "Bezár",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Az objektum le van tiltva, mert azt egy másik felhasználó szerkeszti.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Figyelmeztetés",
+  "Common.define.chartData.textArea": "Terület",
+  "Common.define.chartData.textBar": "Sáv",
+  "Common.define.chartData.textColumn": "Oszlop",
+  "Common.define.chartData.textLine": "Vonal",
+  "Common.define.chartData.textPie": "Kör",
+  "Common.define.chartData.textPoint": "Pont",
+  "Common.define.chartData.textStock": "Részvény",
+  "Common.define.chartData.textSurface": "Felület",
   "Common.UI.ComboBorderSize.txtNoBorders": "Nincsenek szegélyek",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nincsenek szegélyek",
   "Common.UI.ComboDataView.emptyComboText": "Nincsenek stílusok",
@@ -843,20 +851,12 @@
   "PE.Controllers.Viewport.textFitPage": "A diához igazít",
   "PE.Controllers.Viewport.textFitWidth": "Szélességhez igazít",
   "PE.Views.ChartSettings.textAdvanced": "Speciális beállítások megjelenítése",
-  "PE.Views.ChartSettings.textArea": "Terület",
-  "PE.Views.ChartSettings.textBar": "Sáv",
   "PE.Views.ChartSettings.textChartType": "Diagramtípus módosítása",
-  "PE.Views.ChartSettings.textColumn": "Oszlop",
   "PE.Views.ChartSettings.textEditData": "Adat szerkesztése",
   "PE.Views.ChartSettings.textHeight": "Magasság",
   "PE.Views.ChartSettings.textKeepRatio": "Állandó arányok",
-  "PE.Views.ChartSettings.textLine": "Vonal",
-  "PE.Views.ChartSettings.textPie": "Kördiagram",
-  "PE.Views.ChartSettings.textPoint": "Gráf",
   "PE.Views.ChartSettings.textSize": "Méret",
-  "PE.Views.ChartSettings.textStock": "Állomány",
   "PE.Views.ChartSettings.textStyle": "Stílus",
-  "PE.Views.ChartSettings.textSurface": "Felület",
   "PE.Views.ChartSettings.textWidth": "Szélesség",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Alternatív szöveg",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Leírás",
@@ -1559,20 +1559,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "Szöveg középre rendezése",
   "PE.Views.Toolbar.textAlignRight": "Szöveg jobbra rendezése",
   "PE.Views.Toolbar.textAlignTop": "Szöveg felülre rendezése",
-  "PE.Views.Toolbar.textArea": "Terület",
   "PE.Views.Toolbar.textArrangeBack": "Háttérbe küld",
   "PE.Views.Toolbar.textArrangeBackward": "Visszafelé küld",
   "PE.Views.Toolbar.textArrangeForward": "Előre hoz",
   "PE.Views.Toolbar.textArrangeFront": "Előre hoz",
-  "PE.Views.Toolbar.textBar": "Sáv",
   "PE.Views.Toolbar.textBold": "Félkövér",
-  "PE.Views.Toolbar.textCharts": "Diagramok",
-  "PE.Views.Toolbar.textColumn": "Hasáb",
   "PE.Views.Toolbar.textItalic": "Dőlt",
-  "PE.Views.Toolbar.textLine": "Vonal",
   "PE.Views.Toolbar.textNewColor": "Egyéni szín",
-  "PE.Views.Toolbar.textPie": "Kördiagram",
-  "PE.Views.Toolbar.textPoint": "Gráf",
   "PE.Views.Toolbar.textShapeAlignBottom": "Alulra rendez",
   "PE.Views.Toolbar.textShapeAlignCenter": "Középre rendez",
   "PE.Views.Toolbar.textShapeAlignLeft": "Balra rendez",
@@ -1583,11 +1576,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Indítás az aktuális diától",
   "PE.Views.Toolbar.textShowPresenterView": "Megjelenítő nézet",
   "PE.Views.Toolbar.textShowSettings": "Beállítások megjelenítése",
-  "PE.Views.Toolbar.textStock": "Állomány",
   "PE.Views.Toolbar.textStrikeout": "Áthúzott",
   "PE.Views.Toolbar.textSubscript": "Alsó index",
   "PE.Views.Toolbar.textSuperscript": "Felső index",
-  "PE.Views.Toolbar.textSurface": "Felület",
   "PE.Views.Toolbar.textTabCollaboration": "Együttműködés",
   "PE.Views.Toolbar.textTabFile": "Fájl",
   "PE.Views.Toolbar.textTabHome": "Kezdőlap",

apps/presentationeditor/main/locale/it.json

@@ -5,6 +5,14 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "Chiudi",
   "Common.Controllers.ExternalDiagramEditor.warningText": "L'oggetto è disabilitato perché si sta modificando da un altro utente.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Avviso",
+  "Common.define.chartData.textArea": "Aerogramma",
+  "Common.define.chartData.textBar": "A barre",
+  "Common.define.chartData.textColumn": "Istogramma",
+  "Common.define.chartData.textLine": "A linee",
+  "Common.define.chartData.textPie": "A torta",
+  "Common.define.chartData.textPoint": "XY (A dispersione)",
+  "Common.define.chartData.textStock": "Azionario",
+  "Common.define.chartData.textSurface": "Superficie",
   "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo",
   "Common.UI.ComboDataView.emptyComboText": "Nessuno stile",
@@ -108,6 +116,8 @@
   "Common.Views.InsertTableDialog.txtTitle": "Dimensioni tabella",
   "Common.Views.InsertTableDialog.txtTitleSplit": "Dividi cella",
   "Common.Views.LanguageDialog.labelSelect": "Seleziona la lingua del documento",
+  "Common.Views.ListSettingsDialog.txtSize": "Dimensioni",
+  "Common.Views.ListSettingsDialog.txtStart": "Inizia da",
   "Common.Views.OpenDialog.closeButtonText": "Chiudi File",
   "Common.Views.OpenDialog.txtEncoding": "Codifica",
   "Common.Views.OpenDialog.txtIncorrectPwd": "Password errata",
@@ -904,20 +914,12 @@
   "PE.Controllers.Viewport.textFitPage": "Adatta alla diapositiva",
   "PE.Controllers.Viewport.textFitWidth": "Adatta alla larghezza",
   "PE.Views.ChartSettings.textAdvanced": "Mostra impostazioni avanzate",
-  "PE.Views.ChartSettings.textArea": "Area",
-  "PE.Views.ChartSettings.textBar": "Barra",
   "PE.Views.ChartSettings.textChartType": "Cambia tipo grafico",
-  "PE.Views.ChartSettings.textColumn": "Colonna",
   "PE.Views.ChartSettings.textEditData": "Modifica dati",
   "PE.Views.ChartSettings.textHeight": "Altezza",
   "PE.Views.ChartSettings.textKeepRatio": "Proporzioni costanti",
-  "PE.Views.ChartSettings.textLine": "Linea",
-  "PE.Views.ChartSettings.textPie": "Torta",
-  "PE.Views.ChartSettings.textPoint": "XY (A dispersione)",
   "PE.Views.ChartSettings.textSize": "Dimensione",
-  "PE.Views.ChartSettings.textStock": "Azionario",
   "PE.Views.ChartSettings.textStyle": "Style",
-  "PE.Views.ChartSettings.textSurface": "Superficie",
   "PE.Views.ChartSettings.textWidth": "Larghezza",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Testo alternativo",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Descrizione",
@@ -1283,6 +1285,7 @@
   "PE.Views.LeftMenu.tipTitles": "Titoli",
   "PE.Views.LeftMenu.txtDeveloper": "MODALITÀ SVILUPPATORE",
   "PE.Views.LeftMenu.txtTrial": "Modalità di prova",
+  "PE.Views.ListSettingsDialog.txtSize": "Dimensioni",
   "PE.Views.ParagraphSettings.strLineHeight": "Interlinea",
   "PE.Views.ParagraphSettings.strParagraphSpacing": "Spaziatura del paragrafo",
   "PE.Views.ParagraphSettings.strSpacingAfter": "Dopo",
@@ -1676,20 +1679,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "Allinea testo in mezzo",
   "PE.Views.Toolbar.textAlignRight": "Allinea testo a destra",
   "PE.Views.Toolbar.textAlignTop": "Allinea testo in alto",
-  "PE.Views.Toolbar.textArea": "Area",
   "PE.Views.Toolbar.textArrangeBack": "Porta in secondo piano",
   "PE.Views.Toolbar.textArrangeBackward": "Porta indietro",
   "PE.Views.Toolbar.textArrangeForward": "Porta avanti",
   "PE.Views.Toolbar.textArrangeFront": "Porta in primo piano",
-  "PE.Views.Toolbar.textBar": "Barra",
   "PE.Views.Toolbar.textBold": "Grassetto",
-  "PE.Views.Toolbar.textCharts": "Grafici",
-  "PE.Views.Toolbar.textColumn": "Colonna",
   "PE.Views.Toolbar.textItalic": "Corsivo",
-  "PE.Views.Toolbar.textLine": "Linea",
   "PE.Views.Toolbar.textNewColor": "Colore personalizzato",
-  "PE.Views.Toolbar.textPie": "Torta",
-  "PE.Views.Toolbar.textPoint": "XY (A dispersione)",
   "PE.Views.Toolbar.textShapeAlignBottom": "Allinea in basso",
   "PE.Views.Toolbar.textShapeAlignCenter": "Allinea al centro",
   "PE.Views.Toolbar.textShapeAlignLeft": "Allinea a sinistra",
@@ -1700,11 +1696,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Mostra dalla diapositiva corrente",
   "PE.Views.Toolbar.textShowPresenterView": "Mostra la visualizzazione del presenter",
   "PE.Views.Toolbar.textShowSettings": "Mostra Impostazioni",
-  "PE.Views.Toolbar.textStock": "Azionario",
   "PE.Views.Toolbar.textStrikeout": "Barrato",
   "PE.Views.Toolbar.textSubscript": "Pedice",
   "PE.Views.Toolbar.textSuperscript": "Apice",
-  "PE.Views.Toolbar.textSurface": "Superficie",
   "PE.Views.Toolbar.textTabCollaboration": "Collaborazione",
   "PE.Views.Toolbar.textTabFile": "File",
   "PE.Views.Toolbar.textTabHome": "Home",

apps/presentationeditor/main/locale/ja.json

@@ -5,6 +5,13 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "閉じる",
   "Common.Controllers.ExternalDiagramEditor.warningText": "他のユーザは編集しているのためオブジェクトが無効になります。",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": " 警告",
+  "Common.define.chartData.textArea": "面グラフ",
+  "Common.define.chartData.textBar": "横棒グラフ",
+  "Common.define.chartData.textColumn": "縦棒グラフ",
+  "Common.define.chartData.textLine": "折れ線グラフ",
+  "Common.define.chartData.textPie": "円グラフ",
+  "Common.define.chartData.textPoint": "点グラフ",
+  "Common.define.chartData.textStock": "株価チャート",
   "Common.UI.ComboBorderSize.txtNoBorders": "枠線なし",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "枠線なし",
   "Common.UI.ComboDataView.emptyComboText": "スタイルなし",
@@ -207,18 +214,11 @@
   "PE.Controllers.Toolbar.textEmptyImgUrl": "画像のURLを指定しなければなりません。",
   "PE.Controllers.Toolbar.textFontSizeErr": "入力された値が正しくありません。<br>1〜100の数値を入力してください。",
   "PE.Controllers.Toolbar.textWarning": " 警告",
-  "PE.Views.ChartSettings.textArea": "面グラフ",
-  "PE.Views.ChartSettings.textBar": "横棒グラフ",
   "PE.Views.ChartSettings.textChartType": "グラフの種類の変更",
-  "PE.Views.ChartSettings.textColumn": "縦棒グラフ",
   "PE.Views.ChartSettings.textEditData": "データの編集",
   "PE.Views.ChartSettings.textHeight": "高さ",
   "PE.Views.ChartSettings.textKeepRatio": "比例の定数",
-  "PE.Views.ChartSettings.textLine": "折れ線グラフ",
-  "PE.Views.ChartSettings.textPie": "円グラフ",
-  "PE.Views.ChartSettings.textPoint": "点グラフ",
   "PE.Views.ChartSettings.textSize": "サイズ",
-  "PE.Views.ChartSettings.textStock": "株価チャート",
   "PE.Views.ChartSettings.textStyle": "スタイル",
   "PE.Views.ChartSettings.textWidth": "幅",
   "PE.Views.DocumentHolder.aboveText": "上",
@@ -706,26 +706,19 @@
   "PE.Views.Toolbar.textAlignMiddle": "テキストを中央に揃えます",
   "PE.Views.Toolbar.textAlignRight": "テキストの右揃え",
   "PE.Views.Toolbar.textAlignTop": "テキストの上揃え",
-  "PE.Views.Toolbar.textArea": "面グラフ",
   "PE.Views.Toolbar.textArrangeBack": "背景へ移動",
   "PE.Views.Toolbar.textArrangeBackward": "背面へ移動",
   "PE.Views.Toolbar.textArrangeForward": "前面へ移動",
   "PE.Views.Toolbar.textArrangeFront": "前景に移動",
-  "PE.Views.Toolbar.textBar": "横棒グラフ",
   "PE.Views.Toolbar.textBold": "太字",
-  "PE.Views.Toolbar.textColumn": "縦棒グラフ",
   "PE.Views.Toolbar.textItalic": "斜体",
-  "PE.Views.Toolbar.textLine": "折れ線グラフ",
   "PE.Views.Toolbar.textNewColor": "ユーザー設定の色",
-  "PE.Views.Toolbar.textPie": "円グラフ",
-  "PE.Views.Toolbar.textPoint": "点グラフ",
   "PE.Views.Toolbar.textShapeAlignBottom": "下揃え",
   "PE.Views.Toolbar.textShapeAlignCenter": "中央揃え\t",
   "PE.Views.Toolbar.textShapeAlignLeft": "左揃え",
   "PE.Views.Toolbar.textShapeAlignMiddle": "上下中央揃え",
   "PE.Views.Toolbar.textShapeAlignRight": "右揃え",
   "PE.Views.Toolbar.textShapeAlignTop": "上揃え",
-  "PE.Views.Toolbar.textStock": "株価チャート",
   "PE.Views.Toolbar.textStrikeout": "取り消し線",
   "PE.Views.Toolbar.textSubscript": "下付き",
   "PE.Views.Toolbar.textSuperscript": "上付き文字",

apps/presentationeditor/main/locale/ko.json

@@ -696,20 +696,12 @@
   "PE.Controllers.Viewport.textFitPage": "슬라이드에 맞추기",
   "PE.Controllers.Viewport.textFitWidth": "너비에 맞춤",
   "PE.Views.ChartSettings.textAdvanced": "고급 설정 표시",
-  "PE.Views.ChartSettings.textArea": "영역",
-  "PE.Views.ChartSettings.textBar": "Bar",
   "PE.Views.ChartSettings.textChartType": "차트 유형 변경",
-  "PE.Views.ChartSettings.textColumn": "열",
   "PE.Views.ChartSettings.textEditData": "데이터 편집",
   "PE.Views.ChartSettings.textHeight": "높이",
   "PE.Views.ChartSettings.textKeepRatio": "일정 비율",
-  "PE.Views.ChartSettings.textLine": "Line",
-  "PE.Views.ChartSettings.textPie": "파이",
-  "PE.Views.ChartSettings.textPoint": "XY (분산 형)",
   "PE.Views.ChartSettings.textSize": "크기",
-  "PE.Views.ChartSettings.textStock": "Stock",
   "PE.Views.ChartSettings.textStyle": "스타일",
-  "PE.Views.ChartSettings.textSurface": "표면",
   "PE.Views.ChartSettings.textWidth": "너비",
   "PE.Views.ChartSettingsAdvanced.textAlt": "대체 텍스트",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "설명",
@@ -1372,20 +1364,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "중간에 텍스트 정렬",
   "PE.Views.Toolbar.textAlignRight": "텍스트 정렬",
   "PE.Views.Toolbar.textAlignTop": "텍스트를 상단에 정렬",
-  "PE.Views.Toolbar.textArea": "Area",
   "PE.Views.Toolbar.textArrangeBack": "배경에 보내기",
   "PE.Views.Toolbar.textArrangeBackward": "뒤로 이동",
   "PE.Views.Toolbar.textArrangeForward": "앞으로 이동",
   "PE.Views.Toolbar.textArrangeFront": "전경으로 가져 오기",
-  "PE.Views.Toolbar.textBar": "Bar",
   "PE.Views.Toolbar.textBold": "Bold",
-  "PE.Views.Toolbar.textCharts": "차트",
-  "PE.Views.Toolbar.textColumn": "Column",
   "PE.Views.Toolbar.textItalic": "Italic",
-  "PE.Views.Toolbar.textLine": "Line",
   "PE.Views.Toolbar.textNewColor": "사용자 정의 색상",
-  "PE.Views.Toolbar.textPie": "파이",
-  "PE.Views.Toolbar.textPoint": "XY (분산 형)",
   "PE.Views.Toolbar.textShapeAlignBottom": "아래쪽 정렬",
   "PE.Views.Toolbar.textShapeAlignCenter": "정렬 중심",
   "PE.Views.Toolbar.textShapeAlignLeft": "왼쪽 정렬",
@@ -1396,11 +1381,9 @@
   "PE.Views.Toolbar.textShowCurrent": "현재 슬라이드에서보기",
   "PE.Views.Toolbar.textShowPresenterView": "프리젠터뷰를 보기",
   "PE.Views.Toolbar.textShowSettings": "설정 표시",
-  "PE.Views.Toolbar.textStock": "Stock",
   "PE.Views.Toolbar.textStrikeout": "Strikeout",
   "PE.Views.Toolbar.textSubscript": "아래 첨자",
   "PE.Views.Toolbar.textSuperscript": "위첨자",
-  "PE.Views.Toolbar.textSurface": "Surface",
   "PE.Views.Toolbar.textTabCollaboration": "합치기",
   "PE.Views.Toolbar.textTabFile": "파일",
   "PE.Views.Toolbar.textTabHome": "집",

apps/presentationeditor/main/locale/lv.json

@@ -693,20 +693,12 @@
   "PE.Controllers.Viewport.textFitPage": "Saskaņot ar slaidu",
   "PE.Controllers.Viewport.textFitWidth": "Saskaņot ar platumu",
   "PE.Views.ChartSettings.textAdvanced": "Radīt papildu iestatījumus",
-  "PE.Views.ChartSettings.textArea": "Area Chart",
-  "PE.Views.ChartSettings.textBar": "Bar Chart",
   "PE.Views.ChartSettings.textChartType": "Change Chart Type",
-  "PE.Views.ChartSettings.textColumn": "Column Chart",
   "PE.Views.ChartSettings.textEditData": "Edit Data",
   "PE.Views.ChartSettings.textHeight": "Height",
   "PE.Views.ChartSettings.textKeepRatio": "Constant Proportions",
-  "PE.Views.ChartSettings.textLine": "Line Chart",
-  "PE.Views.ChartSettings.textPie": "Pie Chart",
-  "PE.Views.ChartSettings.textPoint": "XY (Scatter) Chart",
   "PE.Views.ChartSettings.textSize": "Size",
-  "PE.Views.ChartSettings.textStock": "Stock Chart",
   "PE.Views.ChartSettings.textStyle": "Style",
-  "PE.Views.ChartSettings.textSurface": "Virsma",
   "PE.Views.ChartSettings.textWidth": "Width",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Alternatīvs teksts",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Apraksts",
@@ -1369,20 +1361,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "Align text to the middle",
   "PE.Views.Toolbar.textAlignRight": "Align text right",
   "PE.Views.Toolbar.textAlignTop": "Align text to the top",
-  "PE.Views.Toolbar.textArea": "Area Chart",
   "PE.Views.Toolbar.textArrangeBack": "Send to Background",
   "PE.Views.Toolbar.textArrangeBackward": "Sūtīt atpakaļ",
   "PE.Views.Toolbar.textArrangeForward": "Pārnest uz priekšu",
   "PE.Views.Toolbar.textArrangeFront": "Bring To Foreground",
-  "PE.Views.Toolbar.textBar": "Bar Chart",
   "PE.Views.Toolbar.textBold": "Bold",
-  "PE.Views.Toolbar.textCharts": "Diagrammas",
-  "PE.Views.Toolbar.textColumn": "Column Chart",
   "PE.Views.Toolbar.textItalic": "Italic",
-  "PE.Views.Toolbar.textLine": "Line Chart",
   "PE.Views.Toolbar.textNewColor": "Custom Color",
-  "PE.Views.Toolbar.textPie": "Pie Chart",
-  "PE.Views.Toolbar.textPoint": "XY (Scatter) Chart",
   "PE.Views.Toolbar.textShapeAlignBottom": "Align Bottom",
   "PE.Views.Toolbar.textShapeAlignCenter": "Align Center",
   "PE.Views.Toolbar.textShapeAlignLeft": "Align Left",
@@ -1393,11 +1378,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Rādīt no šī slaida",
   "PE.Views.Toolbar.textShowPresenterView": "Rādīt prezentētāja režīmā",
   "PE.Views.Toolbar.textShowSettings": "Rādīt uzstādījumus",
-  "PE.Views.Toolbar.textStock": "Stock Chart",
   "PE.Views.Toolbar.textStrikeout": "Strikeout",
   "PE.Views.Toolbar.textSubscript": "Subscript",
   "PE.Views.Toolbar.textSuperscript": "Superscript",
-  "PE.Views.Toolbar.textSurface": "Virsma",
   "PE.Views.Toolbar.textTabCollaboration": "Sadarbība",
   "PE.Views.Toolbar.textTabFile": "Fails",
   "PE.Views.Toolbar.textTabHome": "Sākums",

apps/presentationeditor/main/locale/nl.json

@@ -5,6 +5,14 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "Sluiten",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Het object is gedeactiveerd omdat het wordt bewerkt door een andere gebruiker.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Waarschuwing",
+  "Common.define.chartData.textArea": "Vlak",
+  "Common.define.chartData.textBar": "Staaf",
+  "Common.define.chartData.textColumn": "Kolom",
+  "Common.define.chartData.textLine": "Lijn",
+  "Common.define.chartData.textPie": "Cirkel",
+  "Common.define.chartData.textPoint": "Spreiding",
+  "Common.define.chartData.textStock": "Voorraad",
+  "Common.define.chartData.textSurface": "Oppervlak",
   "Common.UI.ComboBorderSize.txtNoBorders": "Geen randen",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Geen randen",
   "Common.UI.ComboDataView.emptyComboText": "Geen stijlen",
@@ -702,20 +710,12 @@
   "PE.Controllers.Viewport.textFitPage": "Aanpassen aan dia",
   "PE.Controllers.Viewport.textFitWidth": "Aan breedte aanpassen",
   "PE.Views.ChartSettings.textAdvanced": "Geavanceerde instellingen tonen",
-  "PE.Views.ChartSettings.textArea": "Vlak",
-  "PE.Views.ChartSettings.textBar": "Staaf",
   "PE.Views.ChartSettings.textChartType": "Grafiektype wijzigen",
-  "PE.Views.ChartSettings.textColumn": "Kolom",
   "PE.Views.ChartSettings.textEditData": "Gegevens bewerken",
   "PE.Views.ChartSettings.textHeight": "Hoogte",
   "PE.Views.ChartSettings.textKeepRatio": "Constante verhoudingen",
-  "PE.Views.ChartSettings.textLine": "Lijn",
-  "PE.Views.ChartSettings.textPie": "Cirkel",
-  "PE.Views.ChartSettings.textPoint": "Spreiding",
   "PE.Views.ChartSettings.textSize": "Grootte",
-  "PE.Views.ChartSettings.textStock": "Voorraad",
   "PE.Views.ChartSettings.textStyle": "Stijl",
-  "PE.Views.ChartSettings.textSurface": "Oppervlak",
   "PE.Views.ChartSettings.textWidth": "Breedte",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Alternatieve tekst",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Beschrijving",
@@ -1378,20 +1378,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "Tekst centreren",
   "PE.Views.Toolbar.textAlignRight": "Tekst rechts uitlijnen",
   "PE.Views.Toolbar.textAlignTop": "Tekst bovenaan uitlijnen",
-  "PE.Views.Toolbar.textArea": "Vlak",
   "PE.Views.Toolbar.textArrangeBack": "Naar achtergrond sturen",
   "PE.Views.Toolbar.textArrangeBackward": "Naar achteren",
   "PE.Views.Toolbar.textArrangeForward": "Naar Voren Verplaatsen",
   "PE.Views.Toolbar.textArrangeFront": "Naar voorgrond brengen",
-  "PE.Views.Toolbar.textBar": "Staaf",
   "PE.Views.Toolbar.textBold": "Vet",
-  "PE.Views.Toolbar.textCharts": "Grafieken",
-  "PE.Views.Toolbar.textColumn": "Kolom",
   "PE.Views.Toolbar.textItalic": "Cursief",
-  "PE.Views.Toolbar.textLine": "Lijn",
   "PE.Views.Toolbar.textNewColor": "Aangepaste kleur",
-  "PE.Views.Toolbar.textPie": "Cirkel",
-  "PE.Views.Toolbar.textPoint": "Spreiding",
   "PE.Views.Toolbar.textShapeAlignBottom": "Onder uitlijnen",
   "PE.Views.Toolbar.textShapeAlignCenter": "Midden uitlijnen",
   "PE.Views.Toolbar.textShapeAlignLeft": "Links uitlijnen",
@@ -1402,11 +1395,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Vanaf huidige dia tonen",
   "PE.Views.Toolbar.textShowPresenterView": "Presentatieweergave tonen",
   "PE.Views.Toolbar.textShowSettings": "Instellingen tonen",
-  "PE.Views.Toolbar.textStock": "Voorraad",
   "PE.Views.Toolbar.textStrikeout": "Doorhalen",
   "PE.Views.Toolbar.textSubscript": "Subscript",
   "PE.Views.Toolbar.textSuperscript": "Superscript",
-  "PE.Views.Toolbar.textSurface": "Oppervlak",
   "PE.Views.Toolbar.textTabCollaboration": "Samenwerking",
   "PE.Views.Toolbar.textTabFile": "Bestand",
   "PE.Views.Toolbar.textTabHome": "Home",

apps/presentationeditor/main/locale/pl.json

@@ -5,6 +5,14 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "Zamknąć",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Obiekt jest wyłączony, ponieważ jest edytowany przez innego użytkownika.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Ostrzeżenie",
+  "Common.define.chartData.textArea": "Obszar",
+  "Common.define.chartData.textBar": "Pasek",
+  "Common.define.chartData.textColumn": "Kolumna",
+  "Common.define.chartData.textLine": "Liniowy",
+  "Common.define.chartData.textPie": "Kołowe",
+  "Common.define.chartData.textPoint": "XY (Punktowy)",
+  "Common.define.chartData.textStock": "Zbiory",
+  "Common.define.chartData.textSurface": "Powierzchnia",
   "Common.UI.ComboBorderSize.txtNoBorders": "Bez krawędzi",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez krawędzi",
   "Common.UI.ComboDataView.emptyComboText": "Brak styli",
@@ -598,20 +606,12 @@
   "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "PE.Views.ChartSettings.textAdvanced": "Pokaż ustawienia zaawansowane",
-  "PE.Views.ChartSettings.textArea": "Obszar",
-  "PE.Views.ChartSettings.textBar": "Pasek",
   "PE.Views.ChartSettings.textChartType": "Zmień typ wykresu",
-  "PE.Views.ChartSettings.textColumn": "Kolumna",
   "PE.Views.ChartSettings.textEditData": "Edytuj dane",
   "PE.Views.ChartSettings.textHeight": "Wysokość",
   "PE.Views.ChartSettings.textKeepRatio": "Stałe proporcje",
-  "PE.Views.ChartSettings.textLine": "Wykres",
-  "PE.Views.ChartSettings.textPie": "Kołowe",
-  "PE.Views.ChartSettings.textPoint": "XY (Punktowy)",
   "PE.Views.ChartSettings.textSize": "Rozmiar",
-  "PE.Views.ChartSettings.textStock": "Zbiory",
   "PE.Views.ChartSettings.textStyle": "Styl",
-  "PE.Views.ChartSettings.textSurface": "Powierzchnia",
   "PE.Views.ChartSettings.textWidth": "Szerokość",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Tekst alternatywny",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Opis",
@@ -1236,20 +1236,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "Wyrównaj tekst do środka",
   "PE.Views.Toolbar.textAlignRight": "Wyrównaj tekst do prawej",
   "PE.Views.Toolbar.textAlignTop": "Wyrównaj tekst do góry",
-  "PE.Views.Toolbar.textArea": "Obszar",
   "PE.Views.Toolbar.textArrangeBack": "Wyślij do tła",
   "PE.Views.Toolbar.textArrangeBackward": "Przenieś do tyłu",
   "PE.Views.Toolbar.textArrangeForward": "Przenieś do przodu",
   "PE.Views.Toolbar.textArrangeFront": "Przejdź na pierwszy plan",
-  "PE.Views.Toolbar.textBar": "Pasek",
   "PE.Views.Toolbar.textBold": "Pogrubione",
-  "PE.Views.Toolbar.textCharts": "Wykresy",
-  "PE.Views.Toolbar.textColumn": "Kolumna",
   "PE.Views.Toolbar.textItalic": "Kursywa",
-  "PE.Views.Toolbar.textLine": "Wykres",
   "PE.Views.Toolbar.textNewColor": "Własny kolor",
-  "PE.Views.Toolbar.textPie": "Kołowe",
-  "PE.Views.Toolbar.textPoint": "XY (Punktowy)",
   "PE.Views.Toolbar.textShapeAlignBottom": "Wyrównaj do dołu",
   "PE.Views.Toolbar.textShapeAlignCenter": "Wyrównaj do środka",
   "PE.Views.Toolbar.textShapeAlignLeft": "Wyrównaj do lewej",
@@ -1260,11 +1253,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Pokaż z aktualnego slajdu",
   "PE.Views.Toolbar.textShowPresenterView": "Pokaz slajdów w trybie prezentera",
   "PE.Views.Toolbar.textShowSettings": "Pokaż ustawienia",
-  "PE.Views.Toolbar.textStock": "Zbiory",
   "PE.Views.Toolbar.textStrikeout": "Skreślenie",
   "PE.Views.Toolbar.textSubscript": "Indeks dolny",
   "PE.Views.Toolbar.textSuperscript": "Indeks górny",
-  "PE.Views.Toolbar.textSurface": "Powierzchnia",
   "PE.Views.Toolbar.textTabCollaboration": "Współpraca",
   "PE.Views.Toolbar.textTabFile": "Plik",
   "PE.Views.Toolbar.textTabHome": "Narzędzia główne",

apps/presentationeditor/main/locale/pt.json

@@ -5,6 +5,14 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "Fechar",
   "Common.Controllers.ExternalDiagramEditor.warningText": "O objeto está desabilitado por que está sendo editado por outro usuário.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Aviso",
+  "Common.define.chartData.textArea": "Área",
+  "Common.define.chartData.textBar": "Barra",
+  "Common.define.chartData.textColumn": "Coluna",
+  "Common.define.chartData.textLine": "Linha",
+  "Common.define.chartData.textPie": "Gráfico de pizza",
+  "Common.define.chartData.textPoint": "Gráfico de pontos",
+  "Common.define.chartData.textStock": "Gráfico de ações",
+  "Common.define.chartData.textSurface": "Superfície",
   "Common.UI.ComboBorderSize.txtNoBorders": "Sem bordas",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sem bordas",
   "Common.UI.ComboDataView.emptyComboText": "Sem estilos",
@@ -597,20 +605,12 @@
   "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "PE.Views.ChartSettings.textAdvanced": "Exibir configurações avançadas",
-  "PE.Views.ChartSettings.textArea": "Gráfico de área",
-  "PE.Views.ChartSettings.textBar": "Gráfico de barras",
   "PE.Views.ChartSettings.textChartType": "Alterar tipo de gráfico",
-  "PE.Views.ChartSettings.textColumn": "Gráfico de coluna",
   "PE.Views.ChartSettings.textEditData": "Editar dados",
   "PE.Views.ChartSettings.textHeight": "Altura",
   "PE.Views.ChartSettings.textKeepRatio": "Proporções constantes",
-  "PE.Views.ChartSettings.textLine": "Gráfico de linha",
-  "PE.Views.ChartSettings.textPie": "Gráfico de pizza",
-  "PE.Views.ChartSettings.textPoint": "Gráfico de pontos",
   "PE.Views.ChartSettings.textSize": "Tamanho",
-  "PE.Views.ChartSettings.textStock": "Gráfico de ações",
   "PE.Views.ChartSettings.textStyle": "Estilo",
-  "PE.Views.ChartSettings.textSurface": "Superfície",
   "PE.Views.ChartSettings.textWidth": "Largura",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Texto Alternativo",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Descrição",
@@ -1235,20 +1235,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "Alinhar texto ao meio",
   "PE.Views.Toolbar.textAlignRight": "Alinhar texto à direita",
   "PE.Views.Toolbar.textAlignTop": "Alinhar texto à parte superior",
-  "PE.Views.Toolbar.textArea": "Gráfico de área",
   "PE.Views.Toolbar.textArrangeBack": "Enviar para plano de fundo",
   "PE.Views.Toolbar.textArrangeBackward": "Enviar para trás",
   "PE.Views.Toolbar.textArrangeForward": "Trazer para frente",
   "PE.Views.Toolbar.textArrangeFront": "Trazer para primeiro plano",
-  "PE.Views.Toolbar.textBar": "Gráfico de barras",
   "PE.Views.Toolbar.textBold": "Negrito",
-  "PE.Views.Toolbar.textCharts": "Gráficos",
-  "PE.Views.Toolbar.textColumn": "Gráfico de coluna",
   "PE.Views.Toolbar.textItalic": "Itálico",
-  "PE.Views.Toolbar.textLine": "Gráfico de linha",
   "PE.Views.Toolbar.textNewColor": "Cor personalizada",
-  "PE.Views.Toolbar.textPie": "Gráfico de pizza",
-  "PE.Views.Toolbar.textPoint": "Gráfico de pontos",
   "PE.Views.Toolbar.textShapeAlignBottom": "Alinhar à parte inferior",
   "PE.Views.Toolbar.textShapeAlignCenter": "Alinhar ao centro",
   "PE.Views.Toolbar.textShapeAlignLeft": "Alinhar à esquerda",
@@ -1259,11 +1252,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Mostrar a partir do slide atual",
   "PE.Views.Toolbar.textShowPresenterView": "Exibir vista de apresentador",
   "PE.Views.Toolbar.textShowSettings": "Exibir configurações",
-  "PE.Views.Toolbar.textStock": "Gráfico de ações",
   "PE.Views.Toolbar.textStrikeout": "Riscado",
   "PE.Views.Toolbar.textSubscript": "Subscrito",
   "PE.Views.Toolbar.textSuperscript": "Sobrescrito",
-  "PE.Views.Toolbar.textSurface": "Superfície",
   "PE.Views.Toolbar.textTabFile": "Arquivo",
   "PE.Views.Toolbar.textTabHome": "Página Inicial",
   "PE.Views.Toolbar.textTabInsert": "Inserir",

apps/presentationeditor/main/locale/ru.json

@@ -161,6 +161,8 @@
   "Common.Views.ReviewChanges.strStrictDesc": "Используйте кнопку 'Сохранить' для синхронизации изменений, вносимых вами и другими пользователями.",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "Принять текущее изменение",
   "Common.Views.ReviewChanges.tipCoAuthMode": "Задать режим совместного редактирования",
+  "Common.Views.ReviewChanges.tipCommentRem": "Удалить комментарии",
+  "Common.Views.ReviewChanges.tipCommentRemCurrent": "Удалить текущие комментарии",
   "Common.Views.ReviewChanges.tipHistory": "Показать историю версий",
   "Common.Views.ReviewChanges.tipRejectCurrent": "Отклонить текущее изменение",
   "Common.Views.ReviewChanges.tipReview": "Отслеживать изменения",
@@ -175,6 +177,11 @@
   "Common.Views.ReviewChanges.txtChat": "Чат",
   "Common.Views.ReviewChanges.txtClose": "Закрыть",
   "Common.Views.ReviewChanges.txtCoAuthMode": "Режим совместного редактирования",
+  "Common.Views.ReviewChanges.txtCommentRemAll": "Удалить все комментарии",
+  "Common.Views.ReviewChanges.txtCommentRemCurrent": "Удалить текущие комментарии",
+  "Common.Views.ReviewChanges.txtCommentRemMy": "Удалить мои комментарии",
+  "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Удалить мои текущие комментарии",
+  "Common.Views.ReviewChanges.txtCommentRemove": "Удалить",
   "Common.Views.ReviewChanges.txtDocLang": "Язык",
   "Common.Views.ReviewChanges.txtFinal": "Все изменения приняты (просмотр)",
   "Common.Views.ReviewChanges.txtFinalCap": "Измененный документ",
@@ -229,6 +236,11 @@
   "Common.Views.SignSettingsDialog.textShowDate": "Показывать дату подписи в строке подписи",
   "Common.Views.SignSettingsDialog.textTitle": "Настройка подписи",
   "Common.Views.SignSettingsDialog.txtEmpty": "Это поле необходимо заполнить",
+  "Common.Views.SymbolTableDialog.textCode": "Код знака из Юникод (шестн.)",
+  "Common.Views.SymbolTableDialog.textFont": "Шрифт",
+  "Common.Views.SymbolTableDialog.textRange": "Набор",
+  "Common.Views.SymbolTableDialog.textRecent": "Ранее использовавшиеся символы",
+  "Common.Views.SymbolTableDialog.textTitle": "Символ",
   "PE.Controllers.LeftMenu.newDocumentTitle": "Презентация без имени",
   "PE.Controllers.LeftMenu.notcriticalErrorTitle": "Внимание",
   "PE.Controllers.LeftMenu.requestEditRightsText": "Запрос прав на редактирование...",
@@ -269,6 +281,7 @@
   "PE.Controllers.Main.errorToken": "Токен безопасности документа имеет неправильный формат.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "PE.Controllers.Main.errorTokenExpire": "Истек срок действия токена безопасности документа.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "PE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.",
+  "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.<br>Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.",
   "PE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.",
   "PE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей, разрешенных согласно тарифному плану",
   "PE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,<br>но не сможете скачать или напечатать его до восстановления подключения и обновления страницы.",
@@ -591,6 +604,7 @@
   "PE.Controllers.Toolbar.textFontSizeErr": "Введенное значение некорректно.<br>Введите числовое значение от 1 до 100",
   "PE.Controllers.Toolbar.textFraction": "Дроби",
   "PE.Controllers.Toolbar.textFunction": "Функции",
+  "PE.Controllers.Toolbar.textInsert": "Вставить",
   "PE.Controllers.Toolbar.textIntegral": "Интегралы",
   "PE.Controllers.Toolbar.textLargeOperator": "Крупные операторы",
   "PE.Controllers.Toolbar.textLimitAndLog": "Пределы и логарифмы",
@@ -919,20 +933,12 @@
   "PE.Controllers.Viewport.textFitPage": "По размеру слайда",
   "PE.Controllers.Viewport.textFitWidth": "По ширине",
   "PE.Views.ChartSettings.textAdvanced": "Дополнительные параметры",
-  "PE.Views.ChartSettings.textArea": "С областями",
-  "PE.Views.ChartSettings.textBar": "Линейчатая",
   "PE.Views.ChartSettings.textChartType": "Изменить тип диаграммы",
-  "PE.Views.ChartSettings.textColumn": "Гистограмма",
   "PE.Views.ChartSettings.textEditData": "Изменить данные",
   "PE.Views.ChartSettings.textHeight": "Высота",
   "PE.Views.ChartSettings.textKeepRatio": "Сохранять пропорции",
-  "PE.Views.ChartSettings.textLine": "График",
-  "PE.Views.ChartSettings.textPie": "Круговая",
-  "PE.Views.ChartSettings.textPoint": "Точечная",
   "PE.Views.ChartSettings.textSize": "Размер",
-  "PE.Views.ChartSettings.textStock": "Биржевая",
   "PE.Views.ChartSettings.textStyle": "Стиль",
-  "PE.Views.ChartSettings.textSurface": "Поверхность",
   "PE.Views.ChartSettings.textWidth": "Ширина",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Альтернативный текст",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Описание",
@@ -1679,9 +1685,11 @@
   "PE.Views.TextArtSettings.txtPapyrus": "Папирус",
   "PE.Views.TextArtSettings.txtWood": "Дерево",
   "PE.Views.Toolbar.capAddSlide": "Добавить слайд",
+  "PE.Views.Toolbar.capBtnAddComment": "Добавить комментарий",
   "PE.Views.Toolbar.capBtnComment": "Комментарий",
   "PE.Views.Toolbar.capBtnDateTime": "Дата и время",
   "PE.Views.Toolbar.capBtnInsHeader": "Колонтитулы",
+  "PE.Views.Toolbar.capBtnInsSymbol": "Символ",
   "PE.Views.Toolbar.capBtnSlideNum": "Номер слайда",
   "PE.Views.Toolbar.capInsertChart": "Диаграмма",
   "PE.Views.Toolbar.capInsertEquation": "Уравнение",
@@ -1707,21 +1715,14 @@
   "PE.Views.Toolbar.textAlignMiddle": "Выравнивание текста по середине",
   "PE.Views.Toolbar.textAlignRight": "Выравнивание текста по правому краю",
   "PE.Views.Toolbar.textAlignTop": "Выравнивание текста по верхнему краю",
-  "PE.Views.Toolbar.textArea": "С областями",
   "PE.Views.Toolbar.textArrangeBack": "Перенести на задний план",
   "PE.Views.Toolbar.textArrangeBackward": "Перенести назад",
   "PE.Views.Toolbar.textArrangeForward": "Перенести вперед",
   "PE.Views.Toolbar.textArrangeFront": "Перенести на передний план",
-  "PE.Views.Toolbar.textBar": "Линейчатая",
   "PE.Views.Toolbar.textBold": "Полужирный",
-  "PE.Views.Toolbar.textCharts": "Диаграммы",
-  "PE.Views.Toolbar.textColumn": "Гистограмма",
   "PE.Views.Toolbar.textItalic": "Курсив",
-  "PE.Views.Toolbar.textLine": "График",
   "PE.Views.Toolbar.textListSettings": "Параметры списка",
   "PE.Views.Toolbar.textNewColor": "Пользовательский цвет",
-  "PE.Views.Toolbar.textPie": "Круговая",
-  "PE.Views.Toolbar.textPoint": "Точечная",
   "PE.Views.Toolbar.textShapeAlignBottom": "Выровнять по нижнему краю",
   "PE.Views.Toolbar.textShapeAlignCenter": "Выровнять по центру",
   "PE.Views.Toolbar.textShapeAlignLeft": "Выровнять по левому краю",
@@ -1732,11 +1733,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Показ слайдов с текущего слайда",
   "PE.Views.Toolbar.textShowPresenterView": "Показ слайдов в режиме докладчика",
   "PE.Views.Toolbar.textShowSettings": "Параметры показа слайдов",
-  "PE.Views.Toolbar.textStock": "Биржевая",
   "PE.Views.Toolbar.textStrikeout": "Зачеркнутый",
   "PE.Views.Toolbar.textSubscript": "Подстрочные знаки",
   "PE.Views.Toolbar.textSuperscript": "Надстрочные знаки",
-  "PE.Views.Toolbar.textSurface": "Поверхность",
   "PE.Views.Toolbar.textTabCollaboration": "Совместная работа",
   "PE.Views.Toolbar.textTabFile": "Файл",
   "PE.Views.Toolbar.textTabHome": "Главная",
@@ -1765,6 +1764,7 @@
   "PE.Views.Toolbar.tipInsertHyperlink": "Добавить гиперссылку",
   "PE.Views.Toolbar.tipInsertImage": "Вставить изображение",
   "PE.Views.Toolbar.tipInsertShape": "Вставить автофигуру",
+  "PE.Views.Toolbar.tipInsertSymbol": "Вставить символ",
   "PE.Views.Toolbar.tipInsertTable": "Вставить таблицу",
   "PE.Views.Toolbar.tipInsertText": "Вставить надпись",
   "PE.Views.Toolbar.tipInsertTextArt": "Вставить объект Text Art",

apps/presentationeditor/main/locale/sk.json

@@ -5,6 +5,14 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "Zatvoriť",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je blokovaný, pretože ho práve upravuje iný používateľ.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Upozornenie",
+  "Common.define.chartData.textArea": "Plošný graf",
+  "Common.define.chartData.textBar": "Pruhový graf",
+  "Common.define.chartData.textColumn": "Stĺpec",
+  "Common.define.chartData.textLine": "Čiara/líniový graf",
+  "Common.define.chartData.textPie": "Koláčový graf",
+  "Common.define.chartData.textPoint": "Bodový graf",
+  "Common.define.chartData.textStock": "Akcie/burzový graf",
+  "Common.define.chartData.textSurface": "Povrch",
   "Common.UI.ComboBorderSize.txtNoBorders": "Bez orámovania",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez orámovania",
   "Common.UI.ComboDataView.emptyComboText": "Žiadne štýly",
@@ -656,20 +664,12 @@
   "PE.Controllers.Viewport.textFitPage": "Prispôsobiť snímke",
   "PE.Controllers.Viewport.textFitWidth": "Prispôsobiť na šírku",
   "PE.Views.ChartSettings.textAdvanced": "Zobraziť pokročilé nastavenia",
-  "PE.Views.ChartSettings.textArea": "Plošný graf",
-  "PE.Views.ChartSettings.textBar": "Vodorovná čiarka",
   "PE.Views.ChartSettings.textChartType": "Zmeniť typ grafu",
-  "PE.Views.ChartSettings.textColumn": "Stĺpec",
   "PE.Views.ChartSettings.textEditData": "Upravovať dáta",
   "PE.Views.ChartSettings.textHeight": "Výška",
   "PE.Views.ChartSettings.textKeepRatio": "Konštantné rozmery",
-  "PE.Views.ChartSettings.textLine": "Čiara/líniový graf",
-  "PE.Views.ChartSettings.textPie": "Koláčový graf",
-  "PE.Views.ChartSettings.textPoint": "Bodový graf",
   "PE.Views.ChartSettings.textSize": "Veľkosť",
-  "PE.Views.ChartSettings.textStock": "Akcie/burzový graf",
   "PE.Views.ChartSettings.textStyle": "Štýl",
-  "PE.Views.ChartSettings.textSurface": "Povrch",
   "PE.Views.ChartSettings.textWidth": "Šírka",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Alternatívny text",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Popis",
@@ -1311,20 +1311,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "Zarovnať text na stred",
   "PE.Views.Toolbar.textAlignRight": "Zarovnať text doprava",
   "PE.Views.Toolbar.textAlignTop": "Zarovnať text nahor",
-  "PE.Views.Toolbar.textArea": "Plošný graf",
   "PE.Views.Toolbar.textArrangeBack": "Presunúť do pozadia",
   "PE.Views.Toolbar.textArrangeBackward": "Posunúť späť",
   "PE.Views.Toolbar.textArrangeForward": "Posunúť vpred",
   "PE.Views.Toolbar.textArrangeFront": "Premiestniť do popredia",
-  "PE.Views.Toolbar.textBar": "Pruhový graf",
   "PE.Views.Toolbar.textBold": "Tučné",
-  "PE.Views.Toolbar.textCharts": "Grafy",
-  "PE.Views.Toolbar.textColumn": "Stĺpec",
   "PE.Views.Toolbar.textItalic": "Kurzíva",
-  "PE.Views.Toolbar.textLine": "Čiara/líniový graf",
   "PE.Views.Toolbar.textNewColor": "Vlastná farba",
-  "PE.Views.Toolbar.textPie": "Koláčový graf",
-  "PE.Views.Toolbar.textPoint": "Bodový graf",
   "PE.Views.Toolbar.textShapeAlignBottom": "Zarovnať dole",
   "PE.Views.Toolbar.textShapeAlignCenter": "Centrovať",
   "PE.Views.Toolbar.textShapeAlignLeft": "Zarovnať doľava",
@@ -1335,11 +1328,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Zobraziť od aktuálnej snímky",
   "PE.Views.Toolbar.textShowPresenterView": "Zobraziť režim prezentácie",
   "PE.Views.Toolbar.textShowSettings": "Ukázať Nastavenia",
-  "PE.Views.Toolbar.textStock": "Akcie/burzový graf",
   "PE.Views.Toolbar.textStrikeout": "Prečiarknuť",
   "PE.Views.Toolbar.textSubscript": "Dolný index",
   "PE.Views.Toolbar.textSuperscript": "Horný index",
-  "PE.Views.Toolbar.textSurface": "Povrch",
   "PE.Views.Toolbar.textTabCollaboration": "Spolupráca",
   "PE.Views.Toolbar.textTabFile": "Súbor",
   "PE.Views.Toolbar.textTabHome": "Hlavná stránka",

apps/presentationeditor/main/locale/sl.json

@@ -5,6 +5,13 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "Zapri",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je onemogočen, saj ga ureja drug uporabnik.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Opozorilo",
+  "Common.define.chartData.textArea": "Ploščinski grafikon",
+  "Common.define.chartData.textBar": "Stolpični grafikon",
+  "Common.define.chartData.textColumn": "Stolpični grafikon",
+  "Common.define.chartData.textLine": "Vrstični grafikon",
+  "Common.define.chartData.textPie": "Tortni grafikon",
+  "Common.define.chartData.textPoint": "Točkovni grafikon",
+  "Common.define.chartData.textStock": "Založni grafikon",
   "Common.UI.ComboBorderSize.txtNoBorders": "Ni mej",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ni mej",
   "Common.UI.ComboDataView.emptyComboText": "Ni slogov",
@@ -203,18 +210,11 @@
   "PE.Controllers.Toolbar.textEmptyImgUrl": "Določiti morate URL slike.",
   "PE.Controllers.Toolbar.textFontSizeErr": "Vnesena vrednost je nepravilna.<br>Prosim vnesite numerično vrednost med 1 in 100",
   "PE.Controllers.Toolbar.textWarning": "Opozorilo",
-  "PE.Views.ChartSettings.textArea": "Ploščinski grafikon",
-  "PE.Views.ChartSettings.textBar": "Stolpični grafikon",
   "PE.Views.ChartSettings.textChartType": "Spremeni vrsto razpredelnice",
-  "PE.Views.ChartSettings.textColumn": "Stolpični grafikon",
   "PE.Views.ChartSettings.textEditData": "Uredi podatke",
   "PE.Views.ChartSettings.textHeight": "Višina",
   "PE.Views.ChartSettings.textKeepRatio": "Nenehna razmerja",
-  "PE.Views.ChartSettings.textLine": "Vrstični grafikon",
-  "PE.Views.ChartSettings.textPie": "Tortni grafikon",
-  "PE.Views.ChartSettings.textPoint": "Točkovni grafikon",
   "PE.Views.ChartSettings.textSize": "Velikost",
-  "PE.Views.ChartSettings.textStock": "Založni grafikon",
   "PE.Views.ChartSettings.textStyle": "Slog",
   "PE.Views.ChartSettings.textWidth": "Širina",
   "PE.Views.DocumentHolder.aboveText": "Nad",
@@ -698,26 +698,19 @@
   "PE.Views.Toolbar.textAlignMiddle": "Besedilo poravnaj na sredino",
   "PE.Views.Toolbar.textAlignRight": "Uskladi Besedilo Desno",
   "PE.Views.Toolbar.textAlignTop": "Besedilo poravnaj na vrh",
-  "PE.Views.Toolbar.textArea": "Ploščinski grafikon",
   "PE.Views.Toolbar.textArrangeBack": "Pošlji k ozadju",
   "PE.Views.Toolbar.textArrangeBackward": "Premakni nazaj",
   "PE.Views.Toolbar.textArrangeForward": "Premakni naprej",
   "PE.Views.Toolbar.textArrangeFront": "Premakni v ospredje",
-  "PE.Views.Toolbar.textBar": "Stolpični grafikon",
   "PE.Views.Toolbar.textBold": "Krepko",
-  "PE.Views.Toolbar.textColumn": "Stolpični grafikon",
   "PE.Views.Toolbar.textItalic": "Poševno",
-  "PE.Views.Toolbar.textLine": "Vrstični grafikon",
   "PE.Views.Toolbar.textNewColor": "Barva po meri",
-  "PE.Views.Toolbar.textPie": "Tortni grafikon",
-  "PE.Views.Toolbar.textPoint": "Točkovni grafikon",
   "PE.Views.Toolbar.textShapeAlignBottom": "Poravnaj dno",
   "PE.Views.Toolbar.textShapeAlignCenter": "Poravnaj središče",
   "PE.Views.Toolbar.textShapeAlignLeft": "Poravnaj levo",
   "PE.Views.Toolbar.textShapeAlignMiddle": "Poravnaj sredino",
   "PE.Views.Toolbar.textShapeAlignRight": "Poravnaj desno",
   "PE.Views.Toolbar.textShapeAlignTop": "Poravnaj vrh",
-  "PE.Views.Toolbar.textStock": "Založni grafikon",
   "PE.Views.Toolbar.textStrikeout": "Prečrtaj",
   "PE.Views.Toolbar.textSubscript": "Pripis",
   "PE.Views.Toolbar.textSuperscript": "Nadpis",

apps/presentationeditor/main/locale/tr.json

@@ -5,6 +5,14 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "Kapat",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Obje devre dışı bırakıldı, çünkü başka kullanıcı tarafından düzenleniyor.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Dikkat",
+  "Common.define.chartData.textArea": "Bölge Grafiği",
+  "Common.define.chartData.textBar": "Çubuk grafik",
+  "Common.define.chartData.textColumn": "Sütun grafik",
+  "Common.define.chartData.textLine": "Çizgi grafiği",
+  "Common.define.chartData.textPie": "Dilim grafik",
+  "Common.define.chartData.textPoint": "Nokta grafiği",
+  "Common.define.chartData.textStock": "Stok Grafiği",
+  "Common.define.chartData.textSurface": "Yüzey",
   "Common.UI.ComboBorderSize.txtNoBorders": "Sınır yok",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sınır yok",
   "Common.UI.ComboDataView.emptyComboText": "Stil yok",
@@ -624,20 +632,12 @@
   "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "PE.Views.ChartSettings.textAdvanced": "Gelişmiş Ayarları Göster",
-  "PE.Views.ChartSettings.textArea": "Bölge Grafiği",
-  "PE.Views.ChartSettings.textBar": "Çubuk grafik",
   "PE.Views.ChartSettings.textChartType": "Grafik Tipini Değiştir",
-  "PE.Views.ChartSettings.textColumn": "Sütun grafik",
   "PE.Views.ChartSettings.textEditData": "Veri düzenle",
   "PE.Views.ChartSettings.textHeight": "Yükseklik",
   "PE.Views.ChartSettings.textKeepRatio": "Sabit Orantılar",
-  "PE.Views.ChartSettings.textLine": "Çizgi grafiği",
-  "PE.Views.ChartSettings.textPie": "Dilim grafik",
-  "PE.Views.ChartSettings.textPoint": "Nokta grafiği",
   "PE.Views.ChartSettings.textSize": "Boyut",
-  "PE.Views.ChartSettings.textStock": "Stok Grafiği",
   "PE.Views.ChartSettings.textStyle": "Stil",
-  "PE.Views.ChartSettings.textSurface": "Yüzey",
   "PE.Views.ChartSettings.textWidth": "Genişlik",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Alternatif Metin",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Açıklama",
@@ -1267,20 +1267,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "Metni ortaya hizala",
   "PE.Views.Toolbar.textAlignRight": "Metni Sağa Hizala",
   "PE.Views.Toolbar.textAlignTop": "Metni yukarı hizala",
-  "PE.Views.Toolbar.textArea": "Bölge Grafiği",
   "PE.Views.Toolbar.textArrangeBack": "Arkaplana gönder",
   "PE.Views.Toolbar.textArrangeBackward": "Geri Gönder",
   "PE.Views.Toolbar.textArrangeForward": "İleri Taşı",
   "PE.Views.Toolbar.textArrangeFront": "Önplana Getir",
-  "PE.Views.Toolbar.textBar": "Çubuk grafik",
   "PE.Views.Toolbar.textBold": "Kalın",
-  "PE.Views.Toolbar.textCharts": "Grafikler",
-  "PE.Views.Toolbar.textColumn": "Sütun grafik",
   "PE.Views.Toolbar.textItalic": "İtalik",
-  "PE.Views.Toolbar.textLine": "Çizgi grafiği",
   "PE.Views.Toolbar.textNewColor": "Özel Renk",
-  "PE.Views.Toolbar.textPie": "Dilim grafik",
-  "PE.Views.Toolbar.textPoint": "Nokta grafiği",
   "PE.Views.Toolbar.textShapeAlignBottom": "Alta Hizala",
   "PE.Views.Toolbar.textShapeAlignCenter": "Ortaya Hizala",
   "PE.Views.Toolbar.textShapeAlignLeft": "Sola Hizala",
@@ -1291,11 +1284,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Mevcut slayttan itibaren göster",
   "PE.Views.Toolbar.textShowPresenterView": "Sunucu görünümüne geç",
   "PE.Views.Toolbar.textShowSettings": "Ayarları göster",
-  "PE.Views.Toolbar.textStock": "Stok Grafiği",
   "PE.Views.Toolbar.textStrikeout": "Üstü çizili",
   "PE.Views.Toolbar.textSubscript": "Altsimge",
   "PE.Views.Toolbar.textSuperscript": "Üstsimge",
-  "PE.Views.Toolbar.textSurface": "Yüzey",
   "PE.Views.Toolbar.textTabFile": "Dosya",
   "PE.Views.Toolbar.textTabHome": "Ana Sayfa",
   "PE.Views.Toolbar.textTabInsert": "Ekle",

apps/presentationeditor/main/locale/uk.json

@@ -5,6 +5,14 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "Закрити",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Об'єкт вимкнено, оскільки його редагує інший користувач.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Застереження",
+  "Common.define.chartData.textArea": "Площа",
+  "Common.define.chartData.textBar": "Вставити",
+  "Common.define.chartData.textColumn": "Колона",
+  "Common.define.chartData.textLine": "Лінія",
+  "Common.define.chartData.textPie": "Пиріг",
+  "Common.define.chartData.textPoint": "XY (розсіювання)",
+  "Common.define.chartData.textStock": "Запас",
+  "Common.define.chartData.textSurface": "Поверхня",
   "Common.UI.ComboBorderSize.txtNoBorders": "Немає кордонів",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Немає кордонів",
   "Common.UI.ComboDataView.emptyComboText": "Немає стилів",
@@ -600,20 +608,12 @@
   "PE.Controllers.Toolbar.txtSymbol_xsi": "ксі",
   "PE.Controllers.Toolbar.txtSymbol_zeta": "Зета",
   "PE.Views.ChartSettings.textAdvanced": "Показати додаткові налаштування",
-  "PE.Views.ChartSettings.textArea": "Площа",
-  "PE.Views.ChartSettings.textBar": "Вставити",
   "PE.Views.ChartSettings.textChartType": "Змінити тип діаграми",
-  "PE.Views.ChartSettings.textColumn": "Колона",
   "PE.Views.ChartSettings.textEditData": "Редагувати дату",
   "PE.Views.ChartSettings.textHeight": "Висота",
   "PE.Views.ChartSettings.textKeepRatio": "Сталі пропорції",
-  "PE.Views.ChartSettings.textLine": "Лінія",
-  "PE.Views.ChartSettings.textPie": "Пиріг",
-  "PE.Views.ChartSettings.textPoint": "XY (розсіювання)",
   "PE.Views.ChartSettings.textSize": "Розмір",
-  "PE.Views.ChartSettings.textStock": "Запас",
   "PE.Views.ChartSettings.textStyle": "Стиль",
-  "PE.Views.ChartSettings.textSurface": "Поверхня",
   "PE.Views.ChartSettings.textWidth": "Ширина",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Альтернативний текст",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Опис",
@@ -1248,20 +1248,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "Вирівняти текст по центру",
   "PE.Views.Toolbar.textAlignRight": "Вирівняти текст праворуч",
   "PE.Views.Toolbar.textAlignTop": "Вирівняти текст догори",
-  "PE.Views.Toolbar.textArea": "Площа",
   "PE.Views.Toolbar.textArrangeBack": "Надіслати до фону",
   "PE.Views.Toolbar.textArrangeBackward": "Відправити назад",
   "PE.Views.Toolbar.textArrangeForward": "Висувати",
   "PE.Views.Toolbar.textArrangeFront": "Перенести на передній план",
-  "PE.Views.Toolbar.textBar": "Вставити",
   "PE.Views.Toolbar.textBold": "Жирний",
-  "PE.Views.Toolbar.textCharts": "Діаграми",
-  "PE.Views.Toolbar.textColumn": "Колона",
   "PE.Views.Toolbar.textItalic": "Курсив",
-  "PE.Views.Toolbar.textLine": "Лінія",
   "PE.Views.Toolbar.textNewColor": "Власний колір",
-  "PE.Views.Toolbar.textPie": "Пиріг",
-  "PE.Views.Toolbar.textPoint": "XY (розсіювання)",
   "PE.Views.Toolbar.textShapeAlignBottom": "Вирівняти знизу",
   "PE.Views.Toolbar.textShapeAlignCenter": "Вирівняти центр",
   "PE.Views.Toolbar.textShapeAlignLeft": "Вирівняти зліва",
@@ -1272,11 +1265,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Показати з поточного слайда",
   "PE.Views.Toolbar.textShowPresenterView": "Показати представлення провідника",
   "PE.Views.Toolbar.textShowSettings": "Показати налаштування",
-  "PE.Views.Toolbar.textStock": "Запас",
   "PE.Views.Toolbar.textStrikeout": "Викреслити",
   "PE.Views.Toolbar.textSubscript": "Підрядковий",
   "PE.Views.Toolbar.textSuperscript": "Надрядковий",
-  "PE.Views.Toolbar.textSurface": "Поверхня",
   "PE.Views.Toolbar.textTabCollaboration": "Співпраця",
   "PE.Views.Toolbar.textTabFile": "Файл",
   "PE.Views.Toolbar.textTabHome": "Домашній",

apps/presentationeditor/main/locale/vi.json

@@ -5,6 +5,14 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "Đóng",
   "Common.Controllers.ExternalDiagramEditor.warningText": "Đối tượng bị vô hiệu vì nó đang được chỉnh sửa bởi một người dùng khác.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Cảnh báo",
+  "Common.define.chartData.textArea": "Vùng",
+  "Common.define.chartData.textBar": "Gạch",
+  "Common.define.chartData.textColumn": "Cột",
+  "Common.define.chartData.textLine": "Đường kẻ",
+  "Common.define.chartData.textPie": "Hình bánh",
+  "Common.define.chartData.textPoint": "XY (Phân tán)",
+  "Common.define.chartData.textStock": "Cổ phiếu",
+  "Common.define.chartData.textSurface": "Bề mặt",
   "Common.UI.ComboBorderSize.txtNoBorders": "Không viền",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Không viền",
   "Common.UI.ComboDataView.emptyComboText": "Không có kiểu",
@@ -597,20 +605,12 @@
   "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "PE.Views.ChartSettings.textAdvanced": "Hiển thị Cài đặt Nâng cao",
-  "PE.Views.ChartSettings.textArea": "Vùng",
-  "PE.Views.ChartSettings.textBar": "Cột",
   "PE.Views.ChartSettings.textChartType": "Thay đổi Loại biểu đồ",
-  "PE.Views.ChartSettings.textColumn": "Cột",
   "PE.Views.ChartSettings.textEditData": "Chỉnh sửa Dữ liệu",
   "PE.Views.ChartSettings.textHeight": "Chiều cao",
   "PE.Views.ChartSettings.textKeepRatio": "Tỷ lệ không đổi",
-  "PE.Views.ChartSettings.textLine": "Đường kẻ",
-  "PE.Views.ChartSettings.textPie": "Hình bánh",
-  "PE.Views.ChartSettings.textPoint": "XY (Phân tán)",
   "PE.Views.ChartSettings.textSize": "Kích thước",
-  "PE.Views.ChartSettings.textStock": "Cổ phiếu",
   "PE.Views.ChartSettings.textStyle": "Kiểu",
-  "PE.Views.ChartSettings.textSurface": "Bề mặt",
   "PE.Views.ChartSettings.textWidth": "Chiều rộng",
   "PE.Views.ChartSettingsAdvanced.textAlt": "Văn bản thay thế",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "Mô tả",
@@ -1235,20 +1235,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "Căn chỉnh văn bản vào giữa",
   "PE.Views.Toolbar.textAlignRight": "Căn chỉnh văn bản sang phải",
   "PE.Views.Toolbar.textAlignTop": "Căn chỉnh văn bản lên trên cùng",
-  "PE.Views.Toolbar.textArea": "Vùng",
   "PE.Views.Toolbar.textArrangeBack": "Gửi tới Nền",
   "PE.Views.Toolbar.textArrangeBackward": "Gửi về phía sau",
   "PE.Views.Toolbar.textArrangeForward": "Di chuyển tiến lên",
   "PE.Views.Toolbar.textArrangeFront": "Đưa lên Cận cảnh",
-  "PE.Views.Toolbar.textBar": "Cột",
   "PE.Views.Toolbar.textBold": "Đậm",
-  "PE.Views.Toolbar.textCharts": "Biểu đồ",
-  "PE.Views.Toolbar.textColumn": "Cột",
   "PE.Views.Toolbar.textItalic": "Nghiêng",
-  "PE.Views.Toolbar.textLine": "Đường kẻ",
   "PE.Views.Toolbar.textNewColor": "Màu tùy chỉnh",
-  "PE.Views.Toolbar.textPie": "Hình bánh",
-  "PE.Views.Toolbar.textPoint": "XY (Phân tán)",
   "PE.Views.Toolbar.textShapeAlignBottom": "Căn dưới cùng",
   "PE.Views.Toolbar.textShapeAlignCenter": "Căn trung tâm",
   "PE.Views.Toolbar.textShapeAlignLeft": "Căn trái",
@@ -1259,11 +1252,9 @@
   "PE.Views.Toolbar.textShowCurrent": "Hiển thị từ slide Hiện tại",
   "PE.Views.Toolbar.textShowPresenterView": "Hiển thị presenter view",
   "PE.Views.Toolbar.textShowSettings": "Hiển thị cài đặt",
-  "PE.Views.Toolbar.textStock": "Cổ phiếu",
   "PE.Views.Toolbar.textStrikeout": "Gạch bỏ",
   "PE.Views.Toolbar.textSubscript": "Chỉ số dưới",
   "PE.Views.Toolbar.textSuperscript": "Chỉ số trên",
-  "PE.Views.Toolbar.textSurface": "Bề mặt",
   "PE.Views.Toolbar.textTabFile": "File",
   "PE.Views.Toolbar.textTabHome": "Trang chủ",
   "PE.Views.Toolbar.textTabInsert": "Chèn",

apps/presentationeditor/main/locale/zh.json

@@ -5,6 +5,14 @@
   "Common.Controllers.ExternalDiagramEditor.textClose": "关闭",
   "Common.Controllers.ExternalDiagramEditor.warningText": "该对象被禁用，因为它被另一个用户编辑。",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "警告",
+  "Common.define.chartData.textArea": "区域",
+  "Common.define.chartData.textBar": "条",
+  "Common.define.chartData.textColumn": "列",
+  "Common.define.chartData.textLine": "线",
+  "Common.define.chartData.textPie": "派",
+  "Common.define.chartData.textPoint": "XY（散射）",
+  "Common.define.chartData.textStock": "股票",
+  "Common.define.chartData.textSurface": "平面",
   "Common.UI.ComboBorderSize.txtNoBorders": "没有边框",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "没有边框",
   "Common.UI.ComboDataView.emptyComboText": "没有风格",
@@ -901,20 +909,12 @@
   "PE.Controllers.Viewport.textFitPage": "适合幻灯片",
   "PE.Controllers.Viewport.textFitWidth": "适合宽度",
   "PE.Views.ChartSettings.textAdvanced": "显示高级设置",
-  "PE.Views.ChartSettings.textArea": "区域",
-  "PE.Views.ChartSettings.textBar": "条",
   "PE.Views.ChartSettings.textChartType": "更改图表类型",
-  "PE.Views.ChartSettings.textColumn": "列",
   "PE.Views.ChartSettings.textEditData": "编辑数据",
   "PE.Views.ChartSettings.textHeight": "高度",
   "PE.Views.ChartSettings.textKeepRatio": "不变比例",
-  "PE.Views.ChartSettings.textLine": "线",
-  "PE.Views.ChartSettings.textPie": "派",
-  "PE.Views.ChartSettings.textPoint": "XY（散射）",
   "PE.Views.ChartSettings.textSize": "大小",
-  "PE.Views.ChartSettings.textStock": "股票",
   "PE.Views.ChartSettings.textStyle": "类型",
-  "PE.Views.ChartSettings.textSurface": "平面",
   "PE.Views.ChartSettings.textWidth": "宽度",
   "PE.Views.ChartSettingsAdvanced.textAlt": "可选文本",
   "PE.Views.ChartSettingsAdvanced.textAltDescription": "描述",
@@ -1622,20 +1622,13 @@
   "PE.Views.Toolbar.textAlignMiddle": "将文本对齐到底部",
   "PE.Views.Toolbar.textAlignRight": "对齐文本",
   "PE.Views.Toolbar.textAlignTop": "将文本对齐到顶部",
-  "PE.Views.Toolbar.textArea": "区域",
   "PE.Views.Toolbar.textArrangeBack": "发送到背景",
   "PE.Views.Toolbar.textArrangeBackward": "向后移动",
   "PE.Views.Toolbar.textArrangeForward": "向前移动",
   "PE.Views.Toolbar.textArrangeFront": "放到最上面",
-  "PE.Views.Toolbar.textBar": "条",
   "PE.Views.Toolbar.textBold": "加粗",
-  "PE.Views.Toolbar.textCharts": "图表",
-  "PE.Views.Toolbar.textColumn": "列",
   "PE.Views.Toolbar.textItalic": "斜体",
-  "PE.Views.Toolbar.textLine": "线",
   "PE.Views.Toolbar.textNewColor": "自定义颜色",
-  "PE.Views.Toolbar.textPie": "派",
-  "PE.Views.Toolbar.textPoint": "XY（散射）",
   "PE.Views.Toolbar.textShapeAlignBottom": "底部对齐",
   "PE.Views.Toolbar.textShapeAlignCenter": "居中对齐",
   "PE.Views.Toolbar.textShapeAlignLeft": "左对齐",
@@ -1646,11 +1639,9 @@
   "PE.Views.Toolbar.textShowCurrent": "从当前幻灯片展示",
   "PE.Views.Toolbar.textShowPresenterView": "显示演示者视图",
   "PE.Views.Toolbar.textShowSettings": "显示设置",
-  "PE.Views.Toolbar.textStock": "股票",
   "PE.Views.Toolbar.textStrikeout": "加删除线",
   "PE.Views.Toolbar.textSubscript": "下标",
   "PE.Views.Toolbar.textSuperscript": "上标",
-  "PE.Views.Toolbar.textSurface": "平面",
   "PE.Views.Toolbar.textTabCollaboration": "协作",
   "PE.Views.Toolbar.textTabFile": "文件",
   "PE.Views.Toolbar.textTabHome": "主页",

apps/presentationeditor/mobile/app/controller/Main.js

@@ -209,9 +209,10 @@ define([
                 me.appOptions.fileChoiceUrl   = me.editorConfig.fileChoiceUrl;
                 me.appOptions.mergeFolderUrl  = me.editorConfig.mergeFolderUrl;
                 me.appOptions.canAnalytics    = false;
+                me.appOptions.canRequestClose = me.editorConfig.canRequestClose;
                 me.appOptions.customization   = me.editorConfig.customization;
-                me.appOptions.canBackToFolder = (me.editorConfig.canBackToFolder!==false) && (typeof (me.editorConfig.customization) == 'object')
-                    && (typeof (me.editorConfig.customization.goback) == 'object') && !_.isEmpty(me.editorConfig.customization.goback.url);
+                me.appOptions.canBackToFolder = (me.editorConfig.canBackToFolder!==false) && (typeof (me.editorConfig.customization) == 'object') && (typeof (me.editorConfig.customization.goback) == 'object')
+                    && (!_.isEmpty(me.editorConfig.customization.goback.url) || me.editorConfig.customization.goback.requestClose && me.appOptions.canRequestClose);
                 me.appOptions.canBack         = me.appOptions.canBackToFolder === true;
                 me.appOptions.canPlugins      = false;
                 me.plugins                    = me.editorConfig.plugins;
@@ -322,11 +323,15 @@ define([
             },
 
             goBack: function(current) {
-                var href = this.appOptions.customization.goback.url;
-                if (!current && this.appOptions.customization.goback.blank!==false) {
-                    window.open(href, "_blank");
+                if (this.appOptions.customization.goback.requestClose && this.appOptions.canRequestClose) {
+                    Common.Gateway.requestClose();
                 } else {
-                    parent.location.href = href;
+                    var href = this.appOptions.customization.goback.url;
+                    if (!current && this.appOptions.customization.goback.blank!==false) {
+                        window.open(href, "_blank");
+                    } else {
+                        parent.location.href = href;
+                    }
                 }
             },
 
@@ -662,7 +667,6 @@ define([
                 me.appOptions.isOffline       = me.api.asc_isOffline();
                 me.appOptions.isReviewOnly    = (me.permissions.review === true) && (me.permissions.edit === false);
                 me.appOptions.canRequestEditRights = me.editorConfig.canRequestEditRights;
-                me.appOptions.canRequestClose = me.editorConfig.canRequestClose;
                 me.appOptions.canEdit         = (me.permissions.edit !== false || me.permissions.review === true) && // can edit or review
                     (me.editorConfig.canRequestEditRights || me.editorConfig.mode !== 'view') && // if mode=="view" -> canRequestEditRights must be defined
                     (!me.appOptions.isReviewOnly || me.appOptions.canLicense); // if isReviewOnly==true -> canLicense must be true

apps/presentationeditor/mobile/app/controller/Toolbar.js

@@ -51,7 +51,6 @@ define([
 
     PE.Controllers.Toolbar = Backbone.Controller.extend(_.extend((function() {
         // private
-        var _backUrl;
 
         return {
             models: [],
@@ -66,9 +65,7 @@ define([
 
             loadConfig: function (data) {
                 if (data && data.config && data.config.canBackToFolder !== false &&
-                    data.config.customization && data.config.customization.goback && data.config.customization.goback.url) {
-                    _backUrl = data.config.customization.goback.url;
-
+                    data.config.customization && data.config.customization.goback && (data.config.customization.goback.url || data.config.customization.goback.requestClose && data.config.canRequestClose)) {
                     $('#document-back').show().single('click', _.bind(this.onBack, this));
                 }
             },
@@ -115,7 +112,7 @@ define([
                             {
                                 text: me.leaveButtonText,
                                 onClick: function() {
-                                    window.parent.location.href = _backUrl;
+                                    Common.NotificationCenter.trigger('goback', true);
                                 }
                             },
                             {
@@ -125,7 +122,7 @@ define([
                         ]
                     });
                 } else {
-                    window.parent.location.href = _backUrl;
+                    Common.NotificationCenter.trigger('goback', true);
                 }
             },
 

apps/presentationeditor/sdk_dev_scripts.js

@@ -151,6 +151,7 @@ var sdk_dev_scrpipts = [
 	"../../../../sdkjs/word/Editor/StructuredDocumentTags/SdtPrChanges.js",
     "../../../../sdkjs/slide/apiCommon.js",
     "../../../../sdkjs/common/apiBase.js",
+	"../../../../sdkjs/common/apiBase_plugins.js",
     "../../../../sdkjs/slide/api.js",
     "../../../../sdkjs/word/Editor/ParagraphContentBase.js",
     "../../../../sdkjs/word/Editor/Hyperlink.js",

apps/spreadsheeteditor/embed/js/ApplicationController.js

@@ -68,7 +68,7 @@ SSE.ApplicationController = new(function(){
 
         common.controller.modals.init(embedConfig);
 
-        if (config.canBackToFolder === false || !(config.customization && config.customization.goback && config.customization.goback.url))
+        if (config.canBackToFolder === false || !(config.customization && config.customization.goback && (config.customization.goback.url || config.customization.goback.requestClose && config.canRequestClose)))
             $('#id-btn-close').hide();
 
         // Docked toolbar
@@ -211,8 +211,12 @@ SSE.ApplicationController = new(function(){
             });
 
         $('#id-btn-close').on('click', function(){
-            if (config.customization && config.customization.goback && config.customization.goback.url)
-                window.parent.location.href = config.customization.goback.url;
+            if (config.customization && config.customization.goback) {
+                if (config.customization.goback.requestClose && config.canRequestClose)
+                    Common.Gateway.requestClose();
+                else if (config.customization.goback.url)
+                    window.parent.location.href = config.customization.goback.url;
+            }
         });
 
         $('#id-btn-zoom-in').on('click', function () {

apps/spreadsheeteditor/main/app/controller/DocumentHolder.js

@@ -763,8 +763,10 @@ define([
                     }
                     if (props) {
                         (new Common.Views.ListSettingsDialog({
+                            api: me.api,
                             props: props,
-                            type: this.api.asc_getCurrentListType().get_ListType(),
+                            type: me.api.asc_getCurrentListType().get_ListType(),
+                            interfaceLang: me.permissions.lang,
                             handler: function(result, value) {
                                 if (result == 'ok') {
                                     if (me.api) {
@@ -1687,10 +1689,12 @@ define([
                 var hyperinfo = cellinfo.asc_getHyperlink(),
                     can_add_hyperlink = this.api.asc_canAddShapeHyperlink();
 
+                documentHolder.menuParagraphBullets.setVisible(istextchartmenu!==true);
                 documentHolder.menuHyperlinkShape.setVisible(istextshapemenu && can_add_hyperlink!==false && hyperinfo);
                 documentHolder.menuAddHyperlinkShape.setVisible(istextshapemenu && can_add_hyperlink!==false && !hyperinfo);
                 documentHolder.menuParagraphVAlign.setVisible(istextchartmenu!==true && !isEquation); // убрать после того, как заголовок можно будет растягивать по вертикали!!
                 documentHolder.menuParagraphDirection.setVisible(istextchartmenu!==true && !isEquation); // убрать после того, как заголовок можно будет растягивать по вертикали!!
+                documentHolder.textInShapeMenu.items[3].setVisible(istextchartmenu!==true || istextshapemenu && can_add_hyperlink!==false);
                 documentHolder.pmiTextAdvanced.setVisible(documentHolder.pmiTextAdvanced.textInfo!==undefined);
 
                 _.each(documentHolder.textInShapeMenu.items, function(item) {
@@ -1829,6 +1833,8 @@ define([
                 documentHolder.menuParagraphDirection.setVisible(false); // убрать после того, как заголовок можно будет растягивать по вертикали!!
                 documentHolder.pmiTextAdvanced.setVisible(false);
                 documentHolder.textInShapeMenu.items[9].setVisible(false);
+                documentHolder.menuParagraphBullets.setVisible(false);
+                documentHolder.textInShapeMenu.items[3].setVisible(false);
                 documentHolder.pmiTextCopy.setDisabled(false);
                 if (showMenu) this.showPopupMenu(documentHolder.textInShapeMenu, {}, event);
             }

apps/spreadsheeteditor/main/app/controller/Main.js

@@ -326,9 +326,10 @@ define([
                 this.appOptions.fileChoiceUrl   = this.editorConfig.fileChoiceUrl;
                 this.appOptions.isEditDiagram   = this.editorConfig.mode == 'editdiagram';
                 this.appOptions.isEditMailMerge = this.editorConfig.mode == 'editmerge';
+                this.appOptions.canRequestClose = this.editorConfig.canRequestClose;
                 this.appOptions.customization   = this.editorConfig.customization;
-                this.appOptions.canBackToFolder = (this.editorConfig.canBackToFolder!==false) && (typeof (this.editorConfig.customization) == 'object')
-                                                  && (typeof (this.editorConfig.customization.goback) == 'object') && !_.isEmpty(this.editorConfig.customization.goback.url);
+                this.appOptions.canBackToFolder = (this.editorConfig.canBackToFolder!==false) && (typeof (this.editorConfig.customization) == 'object') && (typeof (this.editorConfig.customization.goback) == 'object')
+                                                  && (!_.isEmpty(this.editorConfig.customization.goback.url) || this.editorConfig.customization.goback.requestClose && this.appOptions.canRequestClose);
                 this.appOptions.canBack         = this.appOptions.canBackToFolder === true;
                 this.appOptions.canPlugins      = false;
                 this.appOptions.canRequestUsers = this.editorConfig.canRequestUsers;
@@ -477,11 +478,16 @@ define([
             goBack: function(current) {
                 var me = this;
                 if ( !Common.Controllers.Desktop.process('goback') ) {
-                    var href = me.appOptions.customization.goback.url;
-                    if (!current && me.appOptions.customization.goback.blank!==false) {
-                        window.open(href, "_blank");
+                    if (me.appOptions.customization.goback.requestClose && me.appOptions.canRequestClose) {
+                        Common.Gateway.requestClose();
+                        // Common.Controllers.Desktop.requestClose();
                     } else {
-                        parent.location.href = href;
+                        var href = me.appOptions.customization.goback.url;
+                        if (!current && me.appOptions.customization.goback.blank!==false) {
+                            window.open(href, "_blank");
+                        } else {
+                            parent.location.href = href;
+                        }
                     }
                 }
             },
@@ -950,7 +956,6 @@ define([
                     this.appOptions.canModifyFilter = true;
 
                 this.appOptions.canRequestEditRights = this.editorConfig.canRequestEditRights;
-                this.appOptions.canRequestClose = this.editorConfig.canRequestClose;
                 this.appOptions.canEdit        = this.permissions.edit !== false && // can edit
                                                  (this.editorConfig.canRequestEditRights || this.editorConfig.mode !== 'view'); // if mode=="view" -> canRequestEditRights must be defined
                 this.appOptions.isEdit         = (this.appOptions.canLicense || this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge) && this.permissions.edit !== false && this.editorConfig.mode !== 'view';

apps/spreadsheeteditor/main/app/template/CellSettings.template

@@ -29,30 +29,19 @@
             <div id="cell-panel-gradient-fill" class="settings-hidden padding-small" style="width: 100%;">
                 <div style="height:80px;">
                     <div style="display: inline-block;">
-                        <label class="input-label" style=""><%= scope.textStyle %></label>
-                        <div id="cell-combo-grad-type" style="width: 90px;"></div>
+                        <label class="input-label" style=""><%= scope.textAngle %></label>
+                        <div id="cell-spin-gradient-angle" style="width: 90px;"></div>
                     </div>
                     <div style="display: inline-block;float: right;">
                         <label class="input-label" style=""><%= scope.textDirection %></label>
                         <div id="cell-button-direction" style=""></div>
                     </div>
                 </div>
-                <div style="height: 28px;">
-                    <div style="display: inline-block;">
-                        <label class="input-label" style="width: 90px; padding-top: 3px;"><%= scope.textBorderColor + " 1" %></label>
-                    </div>
-                    <div style="display: inline-block;float: right;">
-                        <div id="cell-grad-btn-color-1" style=""></div>
-                    </div>
-                </div>
-                <div style="height: 28px;">
-                    <div style="display: inline-block;">
-                        <label class="input-label" style="width: 90px; padding-top: 3px;"><%= scope.textBorderColor + " 2" %></label>
-                    </div>
-                    <div style="display: inline-block;float: right;">
-                        <div id="cell-grad-btn-color-2" style=""></div>
-                    </div>
+                <label class="header" style="display:block;margin-bottom: 5px;"><%= scope.textGradient %></label>
+                <div style="display: inline-block; margin-top: 3px;">
+                    <div id="cell-slider-gradient" style="display: inline-block; vertical-align: middle;"></div>
                 </div>
+                <div id="cell-gradient-color-btn" style="display: inline-block;float: right;"></div>
             </div>
         </td>
     </tr>

apps/spreadsheeteditor/main/app/template/ImageSettings.template

@@ -21,12 +21,12 @@
 <table cols="2">
     <tr>
         <td class="padding-small" colspan=2>
-            <button type="button" class="btn btn-text-default" id="image-button-original-size" style="width:100px;"><%= scope.textOriginalSize %></button>
+            <button type="button" class="btn btn-text-default" id="image-button-original-size" style="min-width:100px;width: auto;"><%= scope.textOriginalSize %></button>
         </td>
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
-            <div id="image-button-crop" style="width: 100px;"></div>
+            <div id="image-button-crop" style="min-width:100px;"></div>
         </td>
     </tr>
     <tr>

apps/spreadsheeteditor/main/app/view/CellSettings.js

@@ -78,8 +78,7 @@ define([
                 FillType: Asc.c_oAscFill.FILL_TYPE_SOLID,
                 FGColor: '000000',
                 BGColor: 'ffffff',
-                GradColor1: '000000',
-                GradColor2: 'ffffff'
+                GradColor: '000000'
             };
             this.lockedControls = [];
             this._locked = true;
@@ -88,7 +87,7 @@ define([
             this.GradFillType = Asc.c_oAscFillGradType.GRAD_LINEAR;
             this.GradLinearDirectionType = 0;
             this.GradRadialDirectionIdx = 0;
-            this.GradColors = [];
+            this.GradColor = { values: [0, 100], colors: ['000000', 'ffffff'], currentIdx: 0};
 
             this.fillControls = [];
 
@@ -188,11 +187,25 @@ define([
                 editable: false,
                 data: this._arrFillSrc
             });
-            this.cmbFillSrc.setValue(this._arrFillSrc[0].value);
+            this.cmbFillSrc.setValue(Asc.c_oAscFill.FILL_TYPE_NOFILL);
             this.fillControls.push(this.cmbFillSrc);
             this.cmbFillSrc.on('selected', _.bind(this.onFillSrcSelect, this));
 
-            this._arrGradType = [
+            this.numGradientAngle = new Common.UI.MetricSpinner({
+                el: $('#cell-spin-gradient-angle'),
+                step: 1,
+                width: 90,
+                defaultUnit : "°",
+                value: '0 °',
+                allowDecimal: true,
+                maxValue: 359.9,
+                minValue: 0,
+                disabled: this._locked
+            });
+            this.lockedControls.push(this.numGradientAngle);
+            this.numGradientAngle.on('change', _.bind(this.onGradientAngleChange, this));
+
+            /*this._arrGradType = [
                 {displayValue: this.textLinear, value: Asc.c_oAscFillGradType.GRAD_LINEAR},
                 {displayValue: this.textRadial, value: Asc.c_oAscFillGradType.GRAD_PATH}
             ];
@@ -206,7 +219,7 @@ define([
             });
             this.cmbGradType.setValue(this._arrGradType[0].value);
             this.fillControls.push(this.cmbGradType);
-            this.cmbGradType.on('selected', _.bind(this.onGradTypeSelect, this));
+            this.cmbGradType.on('selected', _.bind(this.onGradTypeSelect, this));*/
 
             this._viewDataLinear = [
                 { offsetx: 0,   offsety: 0,   type:45,  subtype:-1, iconcls:'gradient-left-top' },
@@ -219,10 +232,6 @@ define([
                 { offsetx: 100, offsety: 100, type:225, subtype:7,  iconcls:'gradient-right-bottom'}
             ];
 
-            this._viewDataRadial = [
-                { offsetx: 100, offsety: 150, type:2, subtype:5, iconcls:'gradient-radial-center'}
-            ];
-
             this.btnDirection = new Common.UI.Button({
                 cls         : 'btn-large-dataview',
                 iconCls     : 'item-gradient gradient-left',
@@ -247,6 +256,48 @@ define([
             this.fillControls.push(this.btnDirection);
             this.mnuDirectionPicker.on('item:click', _.bind(this.onSelectGradient, this, this.btnDirection));
 
+            this.sldrGradient = new Common.UI.MultiSliderGradient({
+                el: $('#cell-slider-gradient'),
+                width: 125,
+                minValue: 0,
+                maxValue: 100,
+                values: [0, 100]
+            });
+            this.sldrGradient.on('change', _.bind(this.onGradientChange, this));
+            this.sldrGradient.on('changecomplete', _.bind(this.onGradientChangeComplete, this));
+            this.sldrGradient.on('thumbclick', function(cmp, index){
+                me.GradColor.currentIdx = index;
+                var color = me.GradColor.colors[me.GradColor.currentIdx];
+                me.btnGradColor.setColor(color);
+                me.colorsGrad.select(color,false);
+            });
+            this.sldrGradient.on('thumbdblclick', function(cmp){
+                me.btnGradColor.cmpEl.find('button').dropdown('toggle');
+            });
+            this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
+                var colors = [],
+                    currentIdx;
+                _.each (recalc_indexes, function(recalc_index, index) {
+                    colors.push(me.GradColor.colors[recalc_index]);
+                    if (me.GradColor.currentIdx == recalc_index)
+                        currentIdx = index;
+                });
+                me.OriginalFillType = null;
+                me.GradColor.colors = colors;
+                me.GradColor.currentIdx = currentIdx;
+            });
+            this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){
+                me.GradColor.colors[index] = me.GradColor.colors[nearIndex];
+                me.GradColor.currentIdx = index;
+                me.sldrGradient.addNewThumb(index, color);
+            });
+            this.sldrGradient.on('removethumb', function(cmp, index){
+                me.sldrGradient.removeThumb(index);
+                me.GradColor.values.splice(index, 1);
+                me.sldrGradient.changeGradientStyle();
+            });
+            this.fillControls.push(this.sldrGradient);
+
             this.cmbPattern = new Common.UI.ComboDataView({
                 itemWidth: 28,
                 itemHeight: 28,
@@ -418,8 +469,13 @@ define([
                         this.CellColor = {Value: 0, Color: 'transparent'};
                         this.FGColor = {Value: 1, Color: {color: '4f81bd', effectId: 24}};
                         this.BGColor = {Value: 1, Color: 'ffffff'};
-                        this.GradColors[0] = {Value: 1, Color: {color: '4f81bd', effectId: 24}, Position: 0};
-                        this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1};
+                        this.sldrGradient.setThumbs(2);
+                        this.GradColor.colors.length = 0;
+                        this.GradColor.values.length = 0;
+                        this.GradColor.colors[0] = {color: '4f81bd', effectId: 24};
+                        this.GradColor.colors[1] = 'ffffff';
+                        this.GradColor.values = [0, 100];
+                        this.GradColor.currentIdx = 0;
                     } else if (this.pattern !== null) {
                         if (this.pattern.asc_getType() === -1) {
                             var color = this.pattern.asc_getFgColor();
@@ -437,18 +493,19 @@ define([
                                     Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())
                                 };
                             }
-                            this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID;
                             this.FGColor = {
                                 Value: 1,
                                 Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color)
                             };
                             this.BGColor = {Value: 1, Color: 'ffffff'};
-                            this.GradColors[0] = {
-                                Value: 1,
-                                Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color),
-                                Position: 0
-                            };
-                            this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1};
+                            this.sldrGradient.setThumbs(2);
+                            this.GradColor.colors.length = 0;
+                            this.GradColor.values.length = 0;
+                            this.GradColor.values = [0, 100];
+                            this.GradColor.colors[0] = Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color);
+                            this.GradColor.colors[1] = 'ffffff';
+                            this.GradColor.currentIdx = 0;
+                            this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID;
                         } else {
                             this.PatternFillType = this.pattern.asc_getType();
                             if (this._state.PatternFillType !== this.PatternFillType) {
@@ -501,19 +558,20 @@ define([
                                 Value: 1,
                                 Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color)
                             };
-                            this.GradColors[0] = {
-                                Value: 1,
-                                Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color),
-                                Position: 0
-                            };
-                            this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1};
+                            this.sldrGradient.setThumbs(2);
+                            this.GradColor.colors.length = 0;
+                            this.GradColor.values.length = 0;
+                            this.GradColor.values = [0, 100];
+                            this.GradColor.colors[0] = Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color);
+                            this.GradColor.colors[1] = 'ffffff';
+                            this.GradColor.currentIdx = 0;
                             this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_PATT;
                         }
                     } else if (this.gradient !== null) {
                         var gradFillType = this.gradient.asc_getType();
                         if (this._state.GradFillType !== gradFillType || this.GradFillType !== gradFillType) {
                             this.GradFillType = gradFillType;
-                            rec = undefined;
+                            /*rec = undefined;
                             if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) {
                                 this.cmbGradType.setValue(this.GradFillType);
                                 rec = this.cmbGradType.store.findWhere({value: this.GradFillType});
@@ -521,7 +579,7 @@ define([
                             } else {
                                 this.cmbGradType.setValue('');
                                 this.btnDirection.setIconCls('');
-                            }
+                            }*/
                             this._state.GradFillType = this.GradFillType;
                         }
                         if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
@@ -534,45 +592,45 @@ define([
                                     this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
                                 else
                                     this.btnDirection.setIconCls('');
+                                this.numGradientAngle.setValue(value);
                             }
                         }
 
+                        var me = this;
+
+
                         var gradientStops;
-                        this.GradColors.length = 0;
                         gradientStops = this.gradient.asc_getGradientStops();
+                        var length = gradientStops.length;
+                        this.sldrGradient.setThumbs(length);
+                        this.GradColor.colors.length = 0;
+                        this.GradColor.values.length = 0;
                         gradientStops.forEach(function (color) {
                             var clr = color.asc_getColor(),
-                                position = color.asc_getPosition(),
-                                itemColor;
-                            if (clr.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
-                                itemColor = {
-                                    Value: 1,
-                                    Color: {
-                                        color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()),
-                                        effectValue: clr.asc_getValue()
-                                    },
-                                    Position: position
-                                };
-                            } else {
-                                itemColor = {
-                                    Value: 1,
-                                    Color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()),
-                                    Position: position
-                                };
-                            }
-                            me.GradColors.push(itemColor);
+                                position = color.asc_getPosition();
+                            me.GradColor.colors.push( clr.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME ?
+                                {color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()), effectValue: clr.asc_getValue()} :
+                                Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()));
+                            me.GradColor.values.push(position*100);
                         });
-                        this.GradColors = _.sortBy(this.GradColors, 'Position');
+                        for (var index=0; index<length; index++) {
+                            me.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(me.GradColor.colors[index]) == 'object') ? me.GradColor.colors[index].color : me.GradColor.colors[index]), index);
+                            me.sldrGradient.setValue(index, me.GradColor.values[index]);
+                        }
+                        if (_.isUndefined(me.GradColor.currentIdx) || me.GradColor.currentIdx >= me.GradColor.colors.length) {
+                            me.GradColor.currentIdx = 0;
+                        }
+                        me.sldrGradient.setActiveThumb(me.GradColor.currentIdx);
 
                         this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
                         this.FGColor = {
                             Value: 1,
-                            Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color)
+                            Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[0])
                         };
                         this.BGColor = {Value: 1, Color: 'ffffff'};
                         this.CellColor = {
                             Value: 1,
-                            Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color)
+                            Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColor.colors[0])
                         };
                     }
 
@@ -657,60 +715,29 @@ define([
                     }
 
                     // Gradient colors
-                    var gradColor1 = this.GradColors[0];
-                    if (!gradColor1) {
-                        gradColor1 = {Value: 1, Color: {color: '4f81bd', effectId: 24}};
-                    }
-                    type1 = typeof (gradColor1.Color);
-                    type2 = typeof (this._state.GradColor1);
+                    var gradColor = this.GradColor.colors[this.GradColor.currentIdx];
+                    type1 = typeof (gradColor);
+                    type2 = typeof (this._state.GradColor);
 
                     if ((type1 !== type2) || (type1 == 'object' &&
-                        (gradColor1.Color.effectValue !== this._state.GradColor1.effectValue || this._state.GradColor1.color.indexOf(gradColor1.Color.color) < 0)) ||
-                        (type1 != 'object' && this._state.GradColor1.indexOf(gradColor1.Color) < 0)) {
+                        (gradColor.effectValue !== this._state.GradColor.effectValue || this._state.GradColor.color.indexOf(gradColor.color) < 0)) ||
+                        (type1 != 'object' && this._state.GradColor.indexOf(gradColor) < 0)) {
 
-                        this.btnGradColor1.setColor(gradColor1.Color);
-                        if (typeof (gradColor1.Color) == 'object') {
+                        this.btnGradColor.setColor(gradColor);
+                        if (typeof (gradColor) == 'object') {
                             var isselected = false;
                             for (var i = 0; i < 10; i++) {
-                                if (Common.Utils.ThemeColor.ThemeValues[i] == gradColor1.Color.effectValue) {
-                                    this.colorsGrad1.select(gradColor1.Color, true);
+                                if (Common.Utils.ThemeColor.ThemeValues[i] == gradColor.effectValue) {
+                                    this.colorsGrad.select(gradColor, true);
                                     isselected = true;
                                     break;
                                 }
                             }
-                            if (!isselected) this.colorsGrad1.clearSelection();
+                            if (!isselected) this.colorsGrad.clearSelection();
                         } else
-                            this.colorsGrad1.select(gradColor1.Color, true);
+                            this.colorsGrad.select(gradColor, true);
 
-                        this._state.GradColor1 = gradColor1.Color;
-                    }
-
-                    var gradColor2 = this.GradColors[1];
-                    if (!gradColor2) {
-                        gradColor2 = {Value: 1, Color: 'ffffff'};
-                    }
-                    type1 = typeof (gradColor2.Color);
-                    type2 = typeof (this._state.GradColor2);
-
-                    if ((type1 !== type2) || (type1 == 'object' &&
-                        (gradColor2.Color.effectValue !== this._state.GradColor2.effectValue || this._state.GradColor2.color.indexOf(gradColor2.Color.color) < 0)) ||
-                        (type1 != 'object' && this._state.GradColor2.indexOf(gradColor2.Color) < 0)) {
-
-                        this.btnGradColor2.setColor(gradColor2.Color);
-                        if (typeof (gradColor2.Color) == 'object') {
-                            var isselected = false;
-                            for (var i = 0; i < 10; i++) {
-                                if (Common.Utils.ThemeColor.ThemeValues[i] == gradColor2.Color.effectValue) {
-                                    this.colorsGrad2.select(gradColor2.Color, true);
-                                    isselected = true;
-                                    break;
-                                }
-                            }
-                            if (!isselected) this.colorsGrad2.clearSelection();
-                        } else
-                            this.colorsGrad2.select(gradColor2.Color, true);
-
-                        this._state.GradColor2 = gradColor2.Color;
+                        this._state.GradColor = gradColor;
                     }
 
                     this._noApply = false;
@@ -747,43 +774,24 @@ define([
                  this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
                  this.fillControls.push(this.btnBackColor);
 
-                 this.btnGradColor1 = new Common.UI.ColorButton({
+                 this.btnGradColor = new Common.UI.ColorButton({
                      style: "width:45px;",
                      menu        : new Common.UI.Menu({
                          items: [
-                             { template: _.template('<div id="cell-gradient-color1-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
-                             { template: _.template('<a id="cell-gradient-color1-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
+                             { template: _.template('<div id="cell-gradient-color" style="width: 169px; height: 220px; margin: 10px;"></div>') },
+                             { template: _.template('<a id="cell-gradient-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
                          ]
                      })
                  });
-                 this.btnGradColor1.render( $('#cell-grad-btn-color-1'));
-                 this.btnGradColor1.setColor('000000');
-                 this.colorsGrad1 = new Common.UI.ThemeColorPalette({
-                     el: $('#cell-gradient-color1-menu'),
+                 this.btnGradColor.render( $('#cell-gradient-color-btn'));
+                 this.btnGradColor.setColor('000000');
+                 this.colorsGrad = new Common.UI.ThemeColorPalette({
+                     el: $('#cell-gradient-color'),
                      value: '000000'
                  });
-                 this.colorsGrad1.on('select', _.bind(this.onColorsGradientSelect, this));
-                 this.btnGradColor1.menu.items[1].on('click',  _.bind(this.addNewColor, this, this.colorsGrad1, this.btnGradColor1));
-                 this.fillControls.push(this.btnGradColor1);
-
-                 this.btnGradColor2 = new Common.UI.ColorButton({
-                     style: "width:45px;",
-                     menu        : new Common.UI.Menu({
-                         items: [
-                             { template: _.template('<div id="cell-gradient-color2-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
-                             { template: _.template('<a id="cell-gradient-color2-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
-                         ]
-                     })
-                 });
-                 this.btnGradColor2.render( $('#cell-grad-btn-color-2'));
-                 this.btnGradColor2.setColor('ffffff');
-                 this.colorsGrad2 = new Common.UI.ThemeColorPalette({
-                     el: $('#cell-gradient-color2-menu'),
-                     value: 'ffffff'
-                 });
-                 this.colorsGrad2.on('select', _.bind(this.onColorsGradientSelect, this));
-                 this.btnGradColor2.menu.items[1].on('click',  _.bind(this.addNewColor, this, this.colorsGrad2, this.btnGradColor2));
-                 this.fillControls.push(this.btnGradColor2);
+                 this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
+                 this.btnGradColor.menu.items[1].on('click',  _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
+                 this.fillControls.push(this.btnGradColor);
 
                  this.btnFGColor = new Common.UI.ColorButton({
                      style: "width:45px;",
@@ -826,8 +834,7 @@ define([
              this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
              this.borderColor.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
              this.btnBorderColor.setColor(this.borderColor.getColor());
-             this.colorsGrad1.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
-             this.colorsGrad2.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
+             this.colorsGrad.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
              this.colorsFG.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
              this.colorsBG.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
         },
@@ -889,21 +896,24 @@ define([
                             this.gradient.asc_setDegree(this.GradLinearDirectionType);
                         }
                         if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) {
-                            var HexColor0 = Common.Utils.ThemeColor.getRgbColor(this.GradColors[0].Color).get_color().get_hex(),
-                                HexColor1 = Common.Utils.ThemeColor.getRgbColor(this.GradColors[1].Color).get_color().get_hex();
-
-                            if (HexColor0 === 'ffffff' && HexColor1 === 'ffffff') {
-                                this.GradColors[0].Color = {color: '4f81bd', effectId: 24};    // color accent1
+                            this.GradColor.currentIdx = 0;
+                            if (this.GradColor.colors.length === 2) {
+                                var HexColor0 = Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[0]).get_color().get_hex(),
+                                    HexColor1 = Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[1]).get_color().get_hex();
+                                if (HexColor0 === 'ffffff' && HexColor1 === 'ffffff') {
+                                    this.GradColors.colors[0] = {color: '4f81bd', effectId: 24};    // color accent1
+                                }
                             }
                             var arrGradStop = [];
-                            this.GradColors.forEach(function (item) {
+                            this.GradColor.colors.forEach(function (item, index) {
                                 var gradientStop = new Asc.asc_CGradientStop();
-                                gradientStop.asc_setColor(Common.Utils.ThemeColor.getRgbColor(item.Color));
-                                gradientStop.asc_setPosition(item.Position);
+                                gradientStop.asc_setColor(Common.Utils.ThemeColor.getRgbColor(me.GradColor.colors[index]));
+                                gradientStop.asc_setPosition(me.GradColor.values[index]/100);
                                 arrGradStop.push(gradientStop);
                             });
                             this.gradient.asc_putGradientStops(arrGradStop);
                         }
+
                         this.fill.asc_setGradientFill(this.gradient);
                         this.api.asc_setCellFill(this.fill);
                     }
@@ -946,7 +956,7 @@ define([
             this.FillGradientContainer.toggleClass('settings-hidden', value !== Asc.c_oAscFill.FILL_TYPE_GRAD);
         },
 
-        onGradTypeSelect: function(combo, record) {
+        /*onGradTypeSelect: function(combo, record) {
             this.GradFillType = record.value;
 
             if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
@@ -994,7 +1004,7 @@ define([
             }
 
             Common.NotificationCenter.trigger('edit:complete', this);
-        },
+        },*/
 
         onSelectGradient: function(btn, picker, itemView, record) {
             var me = this;
@@ -1015,7 +1025,8 @@ define([
             }
 
             this.btnDirection.setIconCls('item-gradient ' + rawData.iconcls);
-            (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0;
+            this.GradLinearDirectionType = rawData.type;
+            this.numGradientAngle.setValue(rawData.type);
 
             if (this.api) {
                 if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
@@ -1023,10 +1034,10 @@ define([
                         this.gradient = new Asc.asc_CGradientFill();
                         this.gradient.asc_setType(this.GradFillType);
                         var arrGradStop = [];
-                        this.GradColors.forEach(function (item) {
+                        this.GradColor.values.forEach(function (item, index) {
                             var gradientStop = new Asc.asc_CGradientStop();
-                            gradientStop.asc_setColor(Common.Utils.ThemeColor.getRgbColor(item.Color));
-                            gradientStop.asc_setPosition(item.Position);
+                            gradientStop.asc_setColor(Common.Utils.ThemeColor.getRgbColor(me.GradColor.colors[index]));
+                            gradientStop.asc_setPosition(me.GradColor.values[index]/100);
                             arrGradStop.push(gradientStop);
                         });
                         this.gradient.asc_putGradientStops(arrGradStop);
@@ -1041,15 +1052,10 @@ define([
         },
 
         onColorsGradientSelect: function(picker, color) {
-            var me = this,
-                pickerId = picker.el.id;
-            if (pickerId === "cell-gradient-color1-menu") {
-                this.btnGradColor1.setColor(color);
-                this.GradColors[0].Color = color;
-            } else if (pickerId === "cell-gradient-color2-menu") {
-                this.btnGradColor2.setColor(color);
-                this.GradColors[1].Color = color;
-            }
+            var me = this;
+            this.btnGradColor.setColor(color);
+            this.GradColor.colors[this.GradColor.currentIdx] = color;
+            this.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(color) == 'object') ? color.color : color));
 
             if (this.api && !this._noApply) {
                 if (this.gradient == null) {
@@ -1060,10 +1066,10 @@ define([
                     }
                 }
                 var arrGradStop = [];
-                this.GradColors.forEach(function (item) {
+                this.GradColor.values.forEach(function (item, index) {
                     var gradientStop = new Asc.asc_CGradientStop();
-                    gradientStop.asc_setColor(Common.Utils.ThemeColor.getRgbColor(item.Color));
-                    gradientStop.asc_setPosition(item.Position);
+                    gradientStop.asc_setColor(Common.Utils.ThemeColor.getRgbColor(me.GradColor.colors[index]));
+                    gradientStop.asc_setPosition(me.GradColor.values[index]/100);
                     arrGradStop.push(gradientStop);
                 });
                 this.gradient.asc_putGradientStops(arrGradStop);
@@ -1074,6 +1080,63 @@ define([
             Common.NotificationCenter.trigger('edit:complete', this);
         },
 
+        onGradientAngleChange: function(field, newValue, oldValue, eOpts) {
+            if (this.api) {
+                if (this.gradient == null) {
+                    this.gradient = new Asc.asc_CGradientFill();
+                    this.gradient.asc_setType(this.GradFillType);
+                }
+                if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
+                    this.gradient.asc_setDegree(field.getNumberValue());
+                }
+                this.fill.asc_setGradientFill(this.gradient);
+                this.api.asc_setCellFill(this.fill);
+            }
+        },
+
+        onGradientChange: function(slider, newValue, oldValue) {
+            this.GradColor.values = slider.getValues();
+            this._sliderChanged = true;
+            if (this.api && !this._noApply) {
+                if (this._sendUndoPoint)  {
+                    this.api.setStartPointHistory();
+                    this._sendUndoPoint = false;
+                    this.updateslider = setInterval(_.bind(this._gradientApplyFunc, this), 100);
+                }
+            }
+        },
+
+        onGradientChangeComplete: function(slider, newValue, oldValue) {
+            clearInterval(this.updateslider);
+            this._sliderChanged = true;
+            if (!this._sendUndoPoint) { // start point was added
+                this.api.setEndPointHistory();
+                this._gradientApplyFunc();
+            }
+            this._sendUndoPoint = true;
+        },
+
+        _gradientApplyFunc: function() {
+            if (this._sliderChanged) {
+                var me = this;
+                if (this.gradient == null)
+                    this.gradient = new Asc.asc_CGradientFill();
+                var arrGradStop = [];
+                this.GradColor.colors.forEach(function (item, index) {
+                    var gradientStop = new Asc.asc_CGradientStop();
+                    gradientStop.asc_setColor(Common.Utils.ThemeColor.getRgbColor(me.GradColor.colors[index]));
+                    gradientStop.asc_setPosition(me.GradColor.values[index]/100);
+                    arrGradStop.push(gradientStop);
+                });
+                this.gradient.asc_putGradientStops(arrGradStop);
+
+                this.fill.asc_setGradientFill(this.gradient);
+                this.api.asc_setCellFill(this.fill);
+
+                this._sliderChanged = false;
+            }
+        },
+
         onPatternSelect: function(combo, record) {
             if (this.api && !this._noApply) {
                 this.PatternFillType = record.get('type');
@@ -1145,13 +1208,13 @@ define([
         textGradientFill:   'Gradient Fill',
         textPatternFill:    'Pattern',
         textColor:          'Color Fill',
-        textStyle:          'Style',
         textDirection:      'Direction',
         textLinear:         'Linear',
         textRadial:         'Radial',
         textPattern:        'Pattern',
         textForeground:     'Foreground color',
-        textBackground:     'Background color'
+        textBackground:     'Background color',
+        textGradient:       'Gradient'
 
     }, SSE.Views.CellSettings || {}));
 });