Merge branch 'develop' into feature/de-calendar

Readme.md

@@ -1,25 +1,29 @@
-[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](https://www.gnu.org/licenses/agpl-3.0.en.html)
-
-## web-apps
-
-The frontend for [ONLYOFFICE Document Server][2]. Builds the program interface and allows the user create, edit, save and export text, spreadsheet and presentation documents using the common interface of a document editor.
-
-## Project Information
-
-Official website: [http://www.onlyoffice.org](http://onlyoffice.org "http://www.onlyoffice.org")
-
-Code repository: [https://github.com/ONLYOFFICE/web-apps](https://github.com/ONLYOFFICE/web-apps "https://github.com/ONLYOFFICE/web-apps")
-
-SaaS version: [http://www.onlyoffice.com](http://www.onlyoffice.com "http://www.onlyoffice.com")
-
-## User Feedback and Support
-
-If you have any problems with or questions about [ONLYOFFICE Document Server][2], please visit our official forum to find answers to your questions: [dev.onlyoffice.org][1] or you can ask and answer ONLYOFFICE development questions on [Stack Overflow][3].
-
-  [1]: http://dev.onlyoffice.org
-  [2]: https://github.com/ONLYOFFICE/DocumentServer
-  [3]: http://stackoverflow.com/questions/tagged/onlyoffice
-
-## License
-
-web-apps is released under an GNU AGPL v3.0 license. See the LICENSE file for more information.
+[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](https://www.gnu.org/licenses/agpl-3.0.en.html)
+
+## web-apps
+
+The frontend for [ONLYOFFICE Document Server][2]. Builds the program interface and allows the user create, edit, save and export text, spreadsheet and presentation documents using the common interface of a document editor.
+
+## Previos versions
+
+Until 2019-10-23 the repository was called web-apps-pro
+
+## Project Information
+
+Official website: [http://www.onlyoffice.org](http://onlyoffice.org "http://www.onlyoffice.org")
+
+Code repository: [https://github.com/ONLYOFFICE/web-apps](https://github.com/ONLYOFFICE/web-apps "https://github.com/ONLYOFFICE/web-apps")
+
+SaaS version: [http://www.onlyoffice.com](http://www.onlyoffice.com "http://www.onlyoffice.com")
+
+## User Feedback and Support
+
+If you have any problems with or questions about [ONLYOFFICE Document Server][2], please visit our official forum to find answers to your questions: [dev.onlyoffice.org][1] or you can ask and answer ONLYOFFICE development questions on [Stack Overflow][3].
+
+  [1]: http://dev.onlyoffice.org
+  [2]: https://github.com/ONLYOFFICE/DocumentServer
+  [3]: http://stackoverflow.com/questions/tagged/onlyoffice
+
+## License
+
+web-apps is released under an GNU AGPL v3.0 license. See the LICENSE file for more information.

apps/api/documents/api.js

@@ -129,7 +129,8 @@
                     toolbarNoTabs: false,
                     toolbarHideFileName: false,
                     reviewDisplay: 'original',
-                    spellcheck: true
+                    spellcheck: true,
+                    compatibleFeatures: false
                 },
                 plugins: {
                     autostart: ['asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}'],
@@ -797,7 +798,8 @@
         iframe.allowFullscreen = true;
         iframe.setAttribute("allowfullscreen",""); // for IE11
         iframe.setAttribute("onmousewheel",""); // for Safari on Mac
-		
+        iframe.setAttribute("allow", "autoplay");
+        
 		if (config.type == "mobile")
 		{
 			iframe.style.position = "fixed";

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

@@ -710,7 +710,7 @@ define([
                 this.caption = caption;
 
                 if (this.rendered) {
-                    var captionNode = this.cmpEl.find('button:first > .caption').addBack().filter('button > .caption');
+                    var captionNode = this.cmpEl.find('.caption');
 
                     if (captionNode.length > 0) {
                         captionNode.text(caption);

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

@@ -159,11 +159,21 @@ define([
             me.changeSliderStyle();
         },
 
+        addNewThumb: function(index, color) {
+            var me = this;
+            me.thumbs[index].thumbcolor = me.thumbs[index].thumb.find('> div');
+            (index>0) && this.setColorValue(color, index);
+            me.sortThumbs();
+            me.changeSliderStyle();
+            me.changeGradientStyle();
+        },
+
         removeThumb: function(index) {
             if (index===undefined) index = this.thumbs.length-1;
-            if (index>0) {
+            if (this.thumbs.length > 2) {
                 this.thumbs[index].thumb.remove();
                 this.thumbs.splice(index, 1);
+                this.sortThumbs();
                 this.changeSliderStyle();
             }
         },

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

@@ -347,17 +347,28 @@ define([
                     pos = Math.max(0, Math.min(100, position)),
                     value = pos/me.delta + me.minValue;
 
-                me.setThumbPosition(index, pos);
-                me.thumbs[index].value = value;
+                if (me.isRemoveThumb) {
+                    if (me.thumbs.length < 3) {
+                        $(document).off('mouseup', me.binding.onMouseUp);
+                        $(document).off('mousemove', me.binding.onMouseMove);
+                        return;
+                    }
+                    me.trigger('removethumb', me, _.findIndex(me.thumbs, {index: index}));
+                    me.trigger('changecomplete', me, value, lastValue);
+                } else {
+                    me.setThumbPosition(index, pos);
+                    me.thumbs[index].value = value;
 
-                if (need_sort)
-                    me.sortThumbs();
+                    if (need_sort)
+                        me.sortThumbs();
+                }
 
                 $(document).off('mouseup', me.binding.onMouseUp);
                 $(document).off('mousemove', me.binding.onMouseMove);
 
                 me._dragstart = undefined;
-                me.trigger('changecomplete', me, value, lastValue);
+                !me.isRemoveThumb && me.trigger('changecomplete', me, value, lastValue);
+                me.isRemoveThumb = undefined;
             };
 
             var onMouseMove = function (e) {
@@ -382,6 +393,10 @@ define([
                 if (need_sort)
                     me.sortThumbs();
 
+                var positionY = e.pageY*Common.Utils.zoom() - me.cmpEl.offset().top;
+                me.isRemoveThumb = positionY > me.cmpEl.height() || positionY < 0;
+                me.setRemoveThumb(index, me.isRemoveThumb);
+
                 if (Math.abs(value-lastValue)>0.001)
                     me.trigger('change', me, value, lastValue);
             };
@@ -403,7 +418,25 @@ define([
                 $(document).on('mousemove', null, e.data, me.binding.onMouseMove);
             };
 
-            var onTrackMouseDown = function (e) {
+            var onTrackMouseUp = function (e) {
+                if ( me.disabled || !_.isUndefined(me._dragstart) || me.thumbs.length > 9) return;
+
+                var pos = Math.max(0, Math.min(100, (Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left) / me.width * 100)))),
+                    nearIndex = findThumb(pos),
+                    thumbColor = me.thumbs[nearIndex].colorValue,
+                    thumbValue = me.thumbs[nearIndex].value,
+                    value = pos/me.delta + me.minValue;
+                me.addThumb();
+                var index = me.thumbs.length - 1;
+                me.setThumbPosition(index, pos);
+                me.thumbs[index].value = value;
+                me.trigger('addthumb', me, index, nearIndex, thumbColor);
+
+                me.trigger('change', me);
+                me.trigger('changecomplete', me);
+            };
+
+            /*var onTrackMouseDown = function (e) {
                 if ( me.disabled ) return;
 
                 var pos = Math.max(0, Math.min(100, (Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left) / me.width * 100)))),
@@ -416,7 +449,7 @@ define([
 
                 me.trigger('change', me, value, lastValue);
                 me.trigger('changecomplete', me, value, lastValue);
-            };
+            };*/
 
             var findThumb = function(pos) {
                 var nearest = 100,
@@ -462,7 +495,8 @@ define([
             me.setActiveThumb(0, true);
 
             if (!me.rendered) {
-                el.on('mousedown', '.track', onTrackMouseDown);
+                /*el.on('mousedown', '.track', onTrackMouseDown);*/
+                el.on('mouseup', '.track', onTrackMouseUp);
             }
 
             me.rendered = true;
@@ -472,11 +506,23 @@ define([
 
         setActiveThumb: function(index, suspend) {
             this.currentThumb = index;
+            this.$thumbs = this.cmpEl.find('.thumb');
             this.$thumbs.removeClass('active');
             this.thumbs[index].thumb.addClass('active');
             if (suspend!==true) this.trigger('thumbclick', this, index);
         },
 
+        setRemoveThumb: function(index, remove) {
+            var ind = _.findIndex(this.thumbs, {index: index});
+            if (ind !== -1) {
+                if (remove && this.thumbs.length > 2) {
+                    this.$el.find('.active').addClass('remove');
+                } else {
+                    this.$el.find('.remove').removeClass('remove');
+                }
+            }
+        },
+
         setThumbPosition: function(index, x) {
             this.thumbs[index].position = x;
             this.thumbs[index].thumb.css({left: x + '%'});

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

@@ -103,6 +103,8 @@ define([
                     var me = this,
                         length = me.bar.tabs.length,
                         barBounds = me.bar.$bar.get(0).getBoundingClientRect();
+                    me.leftBorder = barBounds.left;
+                    me.rightBorder = barBounds.right;
 
                     if (barBounds) {
                         me.bounds       = [];
@@ -113,6 +115,8 @@ define([
                             this.bounds.push(me.bar.tabs[i].$el.get(0).getBoundingClientRect());
                         }
 
+                        me.lastTabRight = me.bounds[length - 1].right;
+
                         me.tabBarLeft   = me.bounds[0].left;
                         me.tabBarRight  = me.bounds[length - 1].right;
                         me.tabBarRight  = Math.min(me.tabBarRight, barBounds.right - 1);
@@ -322,18 +326,30 @@ define([
                     function dragMove (event) {
                         if (!_.isUndefined(me.drag)) {
                             me.drag.moveX = event.clientX*Common.Utils.zoom();
-                            if (me.drag.moveX > me.tabBarRight) {
+                           if (me.drag.moveX < me.leftBorder) {
+                                me.scrollLeft -= 20;
+                                me.bar.$bar.scrollLeft(me.scrollLeft);
+                                me.calculateBounds();
+                           } else if (me.drag.moveX < me.tabBarRight && me.drag.moveX > me.tabBarLeft) {
+                                var name = $(event.target).parent().data('label'),
+                                    currentTab = _.findIndex(bar.tabs, {label: name});
+                                if (currentTab === -1) {
+                                    bar.$el.find('li.mousemove').removeClass('mousemove right');
+                                    me.drag.place = undefined;
+                                } else if (me.bounds[currentTab].left - me.scrollLeft >= me.tabBarLeft) {
+                                    me.drag.place = currentTab;
+                                    $(event.target).parent().parent().find('li.mousemove').removeClass('mousemove right');
+                                    $(event.target).parent().addClass('mousemove');
+                                }
+                           } else if (me.drag.moveX > me.lastTabRight && Math.abs(me.tabBarRight - me.bounds[me.bar.tabs.length - 1].right) < 1) { //move to end of list, right border of the right tab is visible
+                                bar.$el.find('li.mousemove').removeClass('mousemove right');
                                 bar.tabs[bar.tabs.length - 1].$el.addClass('mousemove right');
                                 me.drag.place = bar.tabs.length;
-                            } else {
-                                $(event.target).parent().parent().find('li.mousemove').removeClass('mousemove right');
-                                $(event.target).parent().addClass('mousemove');
-                                var name = event.target.parentElement.dataset.label,
-                                    currentTab = _.findWhere(bar.tabs, {label: name});
-                                if (!_.isUndefined(currentTab)) {
-                                    me.drag.place = currentTab.sheetindex;
-                                }
-                            }
+                           } else if (me.drag.moveX - me.rightBorder > 3) {
+                               me.scrollLeft += 20;
+                               me.bar.$bar.scrollLeft(me.scrollLeft);
+                               me.calculateBounds();
+                           }
                         }
                     }
                     if (!_.isUndefined(bar) && !_.isUndefined(tabs) && bar.tabs.length > 1) {
@@ -357,7 +373,9 @@ define([
             click: $.proxy(function (event) {
                 if (!tab.disabled) {
                     if (event.ctrlKey || event.metaKey) {
-                        tab.changeState(true);
+                        if (!tab.isActive()) {
+                            tab.changeState(true);
+                        }
                     } else if (event.shiftKey) {
                         this.bar.$el.find('ul > li.selected').removeClass('selected');
                         this.bar.selectTabs.length = 0;
@@ -391,10 +409,12 @@ define([
             }, this.bar),
             mousedown: $.proxy(function (e) {
                 if (this.bar.options.draggable && !_.isUndefined(dragHelper) && (3 !== e.which)) {
-                    if (this.bar.selectTabs.length > 1) {
-                        dragHelper.setHookTabs(e, this.bar, this.bar.selectTabs);
-                    } else {
-                        dragHelper.setHook(e, this.bar, tab);
+                    if (!tab.isLockTheDrag) {
+                        if (this.bar.selectTabs.length > 1) {
+                            dragHelper.setHookTabs(e, this.bar, this.bar.selectTabs);
+                        } else {
+                            dragHelper.setHook(e, this.bar, tab);
+                        }
                     }
                 }
             }, this)

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

@@ -348,20 +348,11 @@ define([
                 maxwidth = (this.initConfig.maxwidth) ? this.initConfig.maxwidth : main_width,
                 maxheight = (this.initConfig.maxheight) ? this.initConfig.maxheight : main_height;
 
-            if (this.resizing.type[0]>0) {
-                this.resizing.maxx  = Math.min(main_width, left+maxwidth);
-                this.resizing.minx  = left+this.initConfig.minwidth;
-            } else if (this.resizing.type[0]<0) {
-                this.resizing.maxx  = left+this.resizing.initw-this.initConfig.minwidth;
-                this.resizing.minx  = Math.max(0, left+this.resizing.initw-maxwidth);
-            }
-            if (this.resizing.type[1]>0) {
-                this.resizing.maxy  = Math.min(main_height, top+maxheight);
-                this.resizing.miny  = top+this.initConfig.minheight;
-            } else if (this.resizing.type[1]<0) {
-                this.resizing.maxy  = top+this.resizing.inith-this.initConfig.minheight;
-                this.resizing.miny  = Math.max(0, top+this.resizing.inith-maxheight);
-            }
+            this.resizing.minw  = this.initConfig.minwidth;
+            this.resizing.maxw = (this.resizing.type[0]>0) ? Math.min(main_width-left, maxwidth) : Math.min(left+this.resizing.initw, maxwidth);
+
+            this.resizing.minh  = this.initConfig.minheight;
+            this.resizing.maxh  = (this.resizing.type[1]>0) ? Math.min(main_height-top, maxheight) : Math.min(top+this.resizing.inith, maxheight);
 
             $(document.body).css('cursor', el.css('cursor'));
             this.$window.find('.resize-border').addClass('resizing');
@@ -378,16 +369,34 @@ define([
                     zoom = (event instanceof jQuery.Event) ? Common.Utils.zoom() : 1,
                     pageX = event.pageX*zoom,
                     pageY = event.pageY*zoom;
-                if (this.resizing.type[0] && pageX<this.resizing.maxx && pageX>this.resizing.minx) {
+                if (this.resizing.type[0]) {
+                    var new_width = this.resizing.initw + (pageX - this.resizing.initpage_x) * this.resizing.type[0];
+                    if (new_width>this.resizing.maxw) {
+                        pageX = pageX - (new_width-this.resizing.maxw) * this.resizing.type[0];
+                        new_width = this.resizing.maxw;
+                    } else if (new_width<this.resizing.minw) {
+                        pageX = pageX - (new_width-this.resizing.minw) * this.resizing.type[0];
+                        new_width = this.resizing.minw;
+                    }
+
                     if (this.resizing.type[0]<0)
                         this.$window.css({left: pageX - this.resizing.initx});
-                    this.setWidth(this.resizing.initw + (pageX - this.resizing.initpage_x) * this.resizing.type[0]);
+                    this.setWidth(new_width);
                     resized = true;
                 }
-                if (this.resizing.type[1] && pageY<this.resizing.maxy && pageY>this.resizing.miny) {
+                if (this.resizing.type[1]) {
+                    var new_height = this.resizing.inith + (pageY - this.resizing.initpage_y) * this.resizing.type[1];
+                    if (new_height>this.resizing.maxh) {
+                        pageY = pageY - (new_height-this.resizing.maxh) * this.resizing.type[1];
+                        new_height = this.resizing.maxh;
+                    } else if (new_height<this.resizing.minh) {
+                        pageY = pageY - (new_height-this.resizing.minh) * this.resizing.type[1];
+                        new_height = this.resizing.minh;
+                    }
+
                     if (this.resizing.type[1]<0)
                         this.$window.css({top: pageY - this.resizing.inity});
-                    this.setHeight(this.resizing.inith + (pageY - this.resizing.initpage_y) * this.resizing.type[1]);
+                    this.setHeight(new_height);
                     resized = true;
                 }
                 if (resized) this.fireEvent('resizing');

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

@@ -126,6 +126,9 @@ define([
                     'comment:closeEditing':     _.bind(this.closeEditing, this),
                     'comment:disableHint':      _.bind(this.disableHint, this),
                     'comment:addDummyComment':  _.bind(this.onAddDummyComment, this)
+                },
+                'Common.Views.ReviewChanges': {
+                    'comment:removeComments':           _.bind(this.onRemoveComments, this)
                 }
             });
 
@@ -180,7 +183,7 @@ define([
                 this.api.asc_registerCallback('asc_onAddComments', _.bind(this.onApiAddComments, this));
                 this.api.asc_registerCallback('asc_onRemoveComment', _.bind(this.onApiRemoveComment, this));
                 this.api.asc_registerCallback('asc_onChangeComments', _.bind(this.onChangeComments, this));
-                this.api.asc_registerCallback('asc_onRemoveComments', _.bind(this.onRemoveComments, this));
+                this.api.asc_registerCallback('asc_onRemoveComments', _.bind(this.onApiRemoveComments, this));
                 this.api.asc_registerCallback('asc_onChangeCommentData', _.bind(this.onApiChangeCommentData, this));
                 this.api.asc_registerCallback('asc_onLockComment', _.bind(this.onApiLockComment, this));
                 this.api.asc_registerCallback('asc_onUnLockComment', _.bind(this.onApiUnLockComment, this));
@@ -233,6 +236,11 @@ define([
                 this.api.asc_removeComment(id);
             }
         },
+        onRemoveComments: function (type) {
+            if (this.api) {
+                this.api.asc_RemoveAllComments(type=='my' || !this.mode.canEditComments, type=='current');// 1 param = true if remove only my comments, 2 param - remove current comments
+            }
+        },
         onResolveComment: function (uid) {
             var t = this,
                 reply = null,
@@ -725,7 +733,7 @@ define([
 
             this.updateComments(true);
         },
-        onRemoveComments: function (data) {
+        onApiRemoveComments: function (data) {
             for (var i = 0; i < data.length; ++i) {
                 this.onApiRemoveComment(data[i], true);
             }
@@ -821,6 +829,7 @@ define([
             }
         },
         onApiShowComment: function (uids, posX, posY, leftX, opts, hint) {
+            var apihint = hint;
             var same_uids = (0 === _.difference(this.uids, uids).length) && (0 === _.difference(uids, this.uids).length);
             
             if (hint && this.isSelectedComment && same_uids && !this.isModeChanged) {
@@ -886,7 +895,7 @@ define([
                         this.animate = false;
                     }
 
-                    this.isSelectedComment = !hint || !this.hintmode;
+                    this.isSelectedComment = !apihint || !this.hintmode;
                     this.uids = _.clone(uids);
 
                     comments.push(comment);

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

@@ -177,7 +177,7 @@ define([
                 if (historyStore && data!==null) {
                     var rev, revisions = historyStore.findRevisions(data.version),
                         urlGetTime = new Date();
-                    var diff = (this.currentChangeId===undefined) ? null : opts.data.changesUrl, // if revision has changes, but serverVersion !== app.buildVersion -> hide revision changes
+                    var diff = (!opts.data.previous || this.currentChangeId===undefined) ? null : opts.data.changesUrl, // if revision has changes, but serverVersion !== app.buildVersion -> hide revision changes
                         url = (!_.isEmpty(diff) && opts.data.previous) ? opts.data.previous.url : opts.data.url,
                         docId = opts.data.key ? opts.data.key : this.currentDocId,
                         docIdPrev = opts.data.previous && opts.data.previous.key ? opts.data.previous.key : this.currentDocIdPrev,

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

@@ -69,6 +69,10 @@ define([
                 'FileMenu': {
                     'settings:apply': this.applySettings.bind(this)
                 },
+                'LeftMenu': {
+                    'comments:show': _.bind(this.commentsShowHide, this, 'show'),
+                    'comments:hide': _.bind(this.commentsShowHide, this, 'hide')
+                },
                 'Common.Views.ReviewChanges': {
                     'reviewchange:accept':      _.bind(this.onAcceptClick, this),
                     'reviewchange:reject':      _.bind(this.onRejectClick, this),
@@ -695,7 +699,9 @@ define([
                     if (state !== me.view.btnChat.pressed)
                         me.view.turnChat(state);
                 });
-
+            }
+            if (me.view && me.view.btnCommentRemove) {
+                me.view.btnCommentRemove.setDisabled(!Common.localStorage.getBool(me.view.appPrefix + "settings-livecomment", true));
             }
         },
 
@@ -774,6 +780,12 @@ define([
             });
         },
 
+        commentsShowHide: function(mode) {
+            if (!this.view) return;
+            var value = Common.Utils.InternalSettings.get(this.view.appPrefix + "settings-livecomment");
+            (value!==undefined) && this.view.btnCommentRemove && this.view.btnCommentRemove.setDisabled(mode != 'show' && !value);
+        },
+
         textInserted: '<b>Inserted:</b>',
         textDeleted: '<b>Deleted:</b>',
         textParaInserted: '<b>Paragraph Inserted</b> ',

apps/common/main/lib/util/define.js

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

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

@@ -559,9 +559,13 @@ define([
                 add = $('.new-comment-ct', this.el),
                 to = $('.add-link-ct', this.el),
                 msgs = $('.messages-ct', this.el);
-            msgs.toggleClass('stretch', !mode.canComments);
-            if (!mode.canComments) {
-                add.hide(); to.hide();
+            msgs.toggleClass('stretch', !mode.canComments || mode.compatibleFeatures);
+            if (!mode.canComments || mode.compatibleFeatures) {
+                if (mode.compatibleFeatures) {
+                    add.remove(); to.remove();
+                } else {
+                    add.hide(); to.hide();
+                }
                 this.layout.changeLayout([{el: msgs[0], rely: false, stretch: true}]);
             } else {
                 var container = $('#comments-box', this.el),

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

@@ -183,7 +183,7 @@ define([
 
         function onLostEditRights() {
             _readonlyRights = true;
-            $panelUsers.find('#tlb-change-rights').hide();
+            $panelUsers && $panelUsers.find('#tlb-change-rights').hide();
             $btnUsers && !$btnUsers.menu && $panelUsers.hide();
         }
 

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

@@ -47,8 +47,7 @@ define([
             width: 330,
             header: false,
             cls: 'modal-dlg',
-            buttons: ['ok', 'cancel'],
-            footerCls: 'right'
+            buttons: ['ok', 'cancel']
         },
 
         initialize : function(options) {

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

@@ -52,8 +52,7 @@ define([
         header: false,
         width: 350,
         cls: 'modal-dlg',
-        buttons: ['ok', 'cancel'],
-        footerCls: 'right'
+        buttons: ['ok', 'cancel']
     },
 
     template:   '<div class="box">' +

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

@@ -0,0 +1,242 @@
+/*
+ *
+ * (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
+ *
+ */
+
+/**
+ *  ListSettingsDialog.js
+ *
+ *  Created by Julia Radzhabova on 30.10.2019
+ *  Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+if (Common === undefined)
+    var Common = {};
+
+define([
+    'common/main/lib/component/Window',
+    'common/main/lib/component/MetricSpinner',
+    'common/main/lib/component/ThemeColorPalette',
+    'common/main/lib/component/ColorButton'
+], 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;',
+            cls: 'modal-dlg',
+            split: false,
+            buttons: ['ok', 'cancel']
+        },
+
+        initialize : function(options) {
+            this.type = options.type || 0;
+
+            _.extend(this.options, {
+                title: this.txtTitle,
+                height: this.type==1 ? 190 : 156
+            }, options || {});
+
+            this.template = [
+                '<div class="box">',
+                    '<div class="input-row">',
+                    '<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;">',
+                    '<label class="text" style="width: 70px;">' + this.txtColor + '</label><div id="id-dlg-list-color" style="display: inline-block;"></div>',
+                    '</div>',
+                    '<% if (type == 1) { %>',
+                    '<div class="input-row" style="margin-top: 10px;">',
+                    '<label class="text" style="width: 70px;">' + this.txtStart + '</label><div id="id-dlg-list-start"></div>',
+                    '</div>',
+                    '<% } %>',
+                '</div>'
+            ].join('');
+
+            this.props = options.props;
+            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,
+                $window = this.getChild();
+            $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+
+            this.spnSize = new Common.UI.MetricSpinner({
+                el          : $window.find('#id-dlg-list-size'),
+                step        : 1,
+                width       : 53,
+                value       : 100,
+                defaultUnit : '',
+                maxValue    : 400,
+                minValue    : 25,
+                allowDecimal: false
+            }).on('change', function(field, newValue, oldValue, eOpts){
+                if (me._changedProps) {
+                    me._changedProps.asc_putBulletSize(field.getNumberValue());
+                }
+            });
+
+            this.btnColor = new Common.UI.ColorButton({
+                style: "width:53px;",
+                menu        : new Common.UI.Menu({
+                    additionalAlign: this.menuAddAlign,
+                    items: [
+                        { template: _.template('<div id="id-dlg-list-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
+                        { template: _.template('<a id="id-dlg-list-color-new" style="padding-left:12px;">' + this.textNewColor + '</a>') }
+                    ]
+                })
+            });
+            this.btnColor.on('render:after', function(btn) {
+                me.colors = new Common.UI.ThemeColorPalette({
+                    el: $('#id-dlg-list-color-menu'),
+                    transparent: false
+                });
+                me.colors.on('select', _.bind(me.onColorsSelect, me));
+            });
+            this.btnColor.render($window.find('#id-dlg-list-color'));
+            $('#id-dlg-list-color-new').on('click', _.bind(this.addNewColor, this, this.colors));
+
+            this.menuAddAlign = function(menuRoot, left, top) {
+                var self = this;
+                if (!$window.hasClass('notransform')) {
+                    $window.addClass('notransform');
+                    menuRoot.addClass('hidden');
+                    setTimeout(function() {
+                        menuRoot.removeClass('hidden');
+                        menuRoot.css({left: left, top: top});
+                        self.options.additionalAlign = null;
+                    }, 300);
+                } else {
+                    menuRoot.css({left: left, top: top});
+                    self.options.additionalAlign = null;
+                }
+            };
+
+            this.spnStart = new Common.UI.MetricSpinner({
+                el          : $window.find('#id-dlg-list-start'),
+                step        : 1,
+                width       : 53,
+                value       : 1,
+                defaultUnit : '',
+                maxValue    : 32767,
+                minValue    : 1,
+                allowDecimal: false
+            }).on('change', function(field, newValue, oldValue, eOpts){
+                if (me._changedProps) {
+                    me._changedProps.put_NumStartAt(field.getNumberValue());
+                }
+            });
+
+            this.afterRender();
+        },
+
+        afterRender: function() {
+            this.updateThemeColors();
+            this._setDefaults(this.props);
+        },
+
+        updateThemeColors: function() {
+            this.colors.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
+        },
+
+        addNewColor: function(picker, btn) {
+            picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
+        },
+
+        onColorsSelect: function(picker, color) {
+            this.btnColor.setColor(color);
+            if (this._changedProps) {
+                this._changedProps.asc_putBulletColor(Common.Utils.ThemeColor.getRgbColor(color));
+            }
+        },
+
+        _handleInput: function(state) {
+            if (this.options.handler) {
+                this.options.handler.call(this, state, this._changedProps);
+            }
+            this.close();
+        },
+
+        onBtnClick: function(event) {
+            this._handleInput(event.currentTarget.attributes['result'].value);
+        },
+
+        onPrimary: function(event) {
+            this._handleInput('ok');
+            return false;
+        },
+
+        _setDefaults: function (props) {
+            if (props) {
+                this.spnSize.setValue(props.asc_getBulletSize() || '', true);
+                this.spnStart.setValue(props.get_NumStartAt() || '', true);
+                var color = props.asc_getBulletColor();
+                if (color) {
+                    if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
+                        color = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()};
+                    } else {
+                        color = Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b());
+                    }
+                } else
+                    color = 'transparent';
+                this.btnColor.setColor(color);
+                if ( typeof(color) == 'object' ) {
+                    var isselected = false;
+                    for (var i=0; i<10; i++) {
+                        if ( Common.Utils.ThemeColor.ThemeValues[i] == color.effectValue ) {
+                            this.colors.select(color,true);
+                            isselected = true;
+                            break;
+                        }
+                    }
+                    if (!isselected) this.colors.clearSelection();
+                } else
+                    this.colors.select(color,true);
+            }
+            this._changedProps = new Asc.asc_CParagraphProperty();
+        },
+
+        txtTitle: 'List Settings',
+        txtSize: 'Size',
+        txtColor: 'Color',
+        txtOfText: '% of text',
+        textNewColor: 'Add New Custom Color',
+        txtStart: 'Start at'
+    }, Common.Views.ListSettingsDialog || {}))
+});

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

@@ -48,8 +48,7 @@ define([
             header: false,
             cls: 'modal-dlg',
             filename: '',
-            buttons: ['ok', 'cancel'],
-            footerCls: 'right'
+            buttons: ['ok', 'cancel']
         },
 
         initialize : function(options) {

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

@@ -64,6 +64,7 @@ define([
                 '<div class="separator long sharing"/>' +
                 '<div class="group">' +
                     '<span class="btn-slot text x-huge slot-comment"></span>' +
+                    '<span class="btn-slot text x-huge" id="slot-comment-remove"></span>' +
                 '</div>' +
                 '<div class="separator long comments"/>' +
                 '<div class="group">' +
@@ -161,6 +162,16 @@ define([
             this.btnChat && this.btnChat.on('click', function (btn, e) {
                 me.fireEvent('collaboration:chat', [btn.pressed]);
             });
+
+            if (this.btnCommentRemove) {
+                this.btnCommentRemove.on('click', function (e) {
+                    me.fireEvent('comment:removeComments', ['current']);
+                });
+
+                this.btnCommentRemove.menu.on('item:click', function (menu, item, e) {
+                    me.fireEvent('comment:removeComments', [item.value]);
+                });
+            }
         }
 
         return {
@@ -291,6 +302,15 @@ define([
                     });
                 }
 
+                if ( this.appConfig.canCoAuthoring && this.appConfig.canComments ) {
+                    this.btnCommentRemove = new Common.UI.Button({
+                        cls: 'btn-toolbar x-huge icon-top',
+                        caption: this.txtCommentRemove,
+                        split: true,
+                        iconCls: 'btn-rem-comment'
+                    });
+                }
+
                 var filter = Common.localStorage.getKeysFilter();
                 this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
 
@@ -397,6 +417,28 @@ define([
                         me.turnCoAuthMode((value===null || parseInt(value) == 1) && !(config.isDesktopApp && config.isOffline) && config.canCoAuthoring);
                     }
 
+                    if (me.btnCommentRemove) {
+                        var items = [
+                            {
+                                caption: config.canEditComments ? me.txtCommentRemCurrent : me.txtCommentRemMyCurrent,
+                                value: 'current'
+                            },
+                            {
+                                caption: me.txtCommentRemMy,
+                                value: 'my'
+                            }
+                        ];
+                        if (config.canEditComments)
+                            items.push({
+                                caption: me.txtCommentRemAll,
+                                value: 'all'
+                            });
+                        me.btnCommentRemove.setMenu(
+                            new Common.UI.Menu({items: items})
+                        );
+                        me.btnCommentRemove.updateHint([me.tipCommentRemCurrent, me.tipCommentRem]);
+                    }
+
                     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',
@@ -426,7 +468,7 @@ define([
                     if (!me.btnHistory && separator_last)
                         me.$el.find(separator_last).hide();
 
-                    Common.NotificationCenter.trigger('tab:visible', 'review', config.isEdit || config.canViewReview);
+                    Common.NotificationCenter.trigger('tab:visible', 'review', config.isEdit || config.canViewReview || config.canCoAuthoring && config.canComments);
 
                     setEvents.call(me);
                 });
@@ -448,6 +490,7 @@ define([
                 this.btnCoAuthMode && this.btnCoAuthMode.render(this.$el.find('#slot-btn-coauthmode'));
                 this.btnHistory && this.btnHistory.render(this.$el.find('#slot-btn-history'));
                 this.btnChat && this.btnChat.render(this.$el.find('#slot-btn-chat'));
+                this.btnCommentRemove && this.btnCommentRemove.render(this.$el.find('#slot-comment-remove'));
 
                 return this.$el;
             },
@@ -561,6 +604,7 @@ define([
                     }
                 }, this);
                 this.btnChat && this.btnChat.setDisabled(state);
+                this.btnCommentRemove && this.btnCommentRemove.setDisabled(state);
             },
 
             onLostEditRights: function() {
@@ -609,7 +653,14 @@ define([
             txtFinalCap: 'Final',
             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.'
+            strStrictDesc: 'Use the \'Save\' button to sync the changes you and others make.',
+            txtCommentRemove: 'Remove',
+            tipCommentRemCurrent: 'Remove current comments',
+            tipCommentRem: 'Remove comments',
+            txtCommentRemCurrent: 'Remove Current Comments',
+            txtCommentRemMyCurrent: 'Remove My Current Comments',
+            txtCommentRemMy: 'Remove My Comments',
+            txtCommentRemAll: 'Remove All Comments'
         }
     }()), Common.Views.ReviewChanges || {}));
 

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

@@ -399,6 +399,11 @@
                 }
             }
         }
+        .dropdown-menu {
+            li.disabled {
+                opacity: 0.65;
+            }
+        }
     }
 
 @color-gray: @secondary;

apps/common/main/resources/less/multislider-gradient.less

@@ -40,6 +40,10 @@
         &.active .thumb-bottom {
             border-bottom-width: 2px;
         }
+
+        &.remove {
+            opacity: 0.5;
+        }
     }
 
     .track {

apps/common/main/resources/less/symboltable.less

@@ -0,0 +1,54 @@
+#symbol-table-scrollable-div, #symbol-table-recent {
+  div{
+    display: inline-block;
+    vertical-align: top;
+  }
+
+  .cell{
+    width: 31px;
+    height: 33px;
+    border-right: 1px solid @gray-soft;
+    border-bottom: 1px solid @gray-soft;
+    background: #ffffff;
+    align-content: center;
+    vertical-align: middle;
+    text-align: center;
+    font-size: 22px;
+    -khtml-user-select: none;
+    user-select: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    cursor: default;
+    overflow:hidden;
+    display: inline-block;
+  }
+
+  .cell-selected{
+    background-color: @gray-darker;
+    color: white;
+  }
+}
+
+#symbol-table-recent {
+  width: 100%;
+  height: 32px;
+  overflow: hidden;
+  border: @gray-soft solid 1px;
+}
+
+#symbol-table-scrollable-div {
+  #id-preview {
+    width: 100%;
+    height: 132px;
+    position:relative;
+    overflow:hidden;
+    border: @gray-soft solid 1px;
+  }
+
+  #id-preview-data {
+    width: 100%;
+    height: 132px;
+    position:relative;
+    overflow:hidden;
+  }
+}

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

@@ -533,6 +533,8 @@
 .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-rem-comment,        83, @toolbar-big-icon-size);
+.button-normal-icon(btn-symbol,             84, @toolbar-big-icon-size);
 
 [applang=ru] {
     .btn-toolbar {
@@ -582,3 +584,137 @@
     width: 20px;
     height: 20px;
 }
+
+// charts
+.menu-insertchart {
+    .group-description {
+        padding-left: 4px;
+    }
+
+    .group-items-container {
+        float: left;
+        position: relative;
+    }
+}
+
+.item-chartlist {
+    .background-ximage('@{common-image-path}/toolbar/charttypes.png', '@{common-image-path}/toolbar/charttypes@2x.png', 250px);
+    width: 50px;
+    height: 50px;
+}
+
+.line-normal {
+    background-position: 0 0;
+}
+
+.line-stack {
+    background-position: -50px 0;
+}
+
+.line-pstack {
+    background-position: -100px 0;
+}
+
+.line-3d {
+    background-position: -150px 0;
+}
+
+.column-normal {
+    background-position: 0 -50px;
+}
+
+.column-stack{
+    background-position: -50px -50px;
+}
+
+.column-pstack{
+    background-position: -100px -50px;
+}
+
+.column-3d-normal {
+    background-position: -150px -50px;
+}
+
+.column-3d-stack{
+    background-position: -200px -50px;
+}
+
+.column-3d-pstack{
+    background-position: -150px -100px;
+}
+
+.column-3d-normal-per{
+    background-position: -200px -100px;
+}
+
+.bar-normal {
+    background-position: 0 -100px;
+}
+
+.bar-stack{
+    background-position: -50px -100px;
+}
+
+.bar-pstack{
+    background-position: -100px -100px;
+}
+
+.bar-3d-normal {
+    background-position: -150px -150px;
+}
+
+.bar-3d-stack{
+    background-position: -200px -150px;
+}
+
+.bar-3d-pstack{
+    background-position: -150px -200px;
+}
+
+.area-normal {
+    background-position: 0 -150px;
+}
+
+.area-stack{
+    background-position: -50px -150px;
+}
+
+.area-pstack{
+    background-position: -100px -150px;
+}
+
+.pie-normal {
+    background-position: 0 -200px;
+}
+
+.pie-3d-normal {
+    background-position: -200px -200px;
+}
+
+.point-normal{
+    background-position: -50px -200px;
+}
+
+.stock-normal{
+    background-position: -100px -200px;
+}
+
+.pie-doughnut{
+    background-position: -200px 0;
+}
+
+.surface-normal{
+    background-position: 0px -300px;
+}
+
+.surface-wireframe{
+    background-position: -50px -300px;
+}
+
+.contour-normal{
+    background-position: -100px -300px;
+}
+
+.contour-wireframe{
+    background-position: -150px -300px;
+}

apps/common/main/resources/symboltable/ru.json

@@ -0,0 +1,275 @@
+{
+	"Basic Latin": "Основная латиница",
+	"Latin 1 Supplement": "Дополнительная латиница-1",
+	"Latin Extended A": "Расширенная латиница-A",
+	"Latin Extended B": "Расширенная латиница-B",
+	"IPA Extensions": "Международный фонетический алфавит",
+	"Spacing Modifier Letters": "Некомбинируемые протяжённые символы-модификаторы",
+	"Combining Diacritical Marks": "Комбинируемые диакритические знаки",
+	"Greek and Coptic": "Греческий и коптский алфавиты",
+	"Cyrillic": "Кириллица",
+	"Cyrillic Supplement": "Кириллица. Дополнительные символы",
+	"Armenian": "Армянский алфавит",
+	"Hebrew": "Иврит",
+	"Arabic": "Арабский",
+	"Syriac": "Сирийский",
+	"Arabic Supplement": "Дополнительные символы арабского письма",
+	"Thaana": "Тана",
+	"NKo": "Нко",
+	"Samaritan": "Самаритянское письмо",
+	"Mandaic": "Мандейский алфавит",
+	"Arabic Extended A": "Расширенный набор символов арабского письма-A",
+	"Devanagari": "Деванагари",
+	"Bengali": "Бенгальский",
+	"Gurmukhi": "Гурмукхи",
+	"Gujarati": "Гуджарати",
+	"Oriya": "Ория",
+	"Tamil": "Тамильская письменность",
+	"Telugu": "Телугу",
+	"Kannada": "Каннада",
+	"Malayalam": "Малаялам",
+	"Sinhala": "Сингальская письменность",
+	"Thai": "Тайская письменность",
+	"Lao": "Лаосская письменность",
+	"Tibetan": "Тибетская письменность",
+	"Myanmar": "Бирманский",
+	"Georgian": "Грузинский",
+	"Hangul Jamo": "Хангыль чамо",
+	"Ethiopic": "Эфиопская слоговая письменность",
+	"Ethiopic Supplement": "Дополнительные символы эфиопской письменности",
+	"Cherokee": "Письменность чероки",
+	"Unified Canadian Aboriginal Syllabics": "Канадское слоговое письмо",
+	"Ogham": "Огамическое письмо",
+	"Runic": "Руническая письменность",
+	"Tagalog": "Тагальская письменность. Байбайин",
+	"Hanunoo": "Хануноо",
+	"Buhid": "Бухид",
+	"Tagbanwa": "Тагбанва",
+	"Khmer": "Кхмерская письменность",
+	"Mongolian": "Старомонгольская письменность",
+	"Unified Canadian Aboriginal Syllabics Extended": "Расширенный набор символов канадского слогового письма",
+	"Limbu": "Письменность лимбу",
+	"Tai Le": "Письменность тай лы",
+	"New Tai Lue": "Новый алфавит тай лы",
+	"Khmer Symbols": "Кхмерские символы",
+	"Buginese": "Бугийская письменность. Лонтара",
+	"Tai Tham": "Тай Тхам",
+	"Combining Diacritical Marks Extended": "Комбинируемые диакритические знаки (расширение)",
+	"Balinese": "Балийское письмо",
+	"Sundanese": "Сунданское письмо",
+	"Batak": "Батакское письмо",
+	"Lepcha": "Письмо лепча",
+	"Ol Chiki": "Письменность Ол-чики",
+	"Cyrillic Extended C": "Расширенная кириллица C",
+	"Sundanese Supplement": "Сунданское расширенное письмо",
+	"Vedic Extensions": "Ведические символы",
+	"Phonetic Extensions": "Фонетические расширения",
+	"Phonetic Extensions Supplement": "Дополнительные фонетические расширения",
+	"Combining Diacritical Marks Supplement": "Дополнительные комбинируемые диакритические знаки",
+	"Latin Extended Additional": "Дополнительная расширенная латиница",
+	"Greek Extended": "Расширенный набор символов греческого алфавита",
+	"General Punctuation": "Знаки пунктуации",
+	"Superscripts and Subscripts": "Надстрочные и подстрочные знаки",
+	"Currency Symbols": "Символы валют",
+	"Combining Diacritical Marks for Symbols": "Комбинируемые диакритические знаки для символов",
+	"Letterlike Symbols": "Буквоподобные символы",
+	"Number Forms": "Числовые формы",
+	"Arrows": "Стрелки",
+	"Mathematical Operators": "Математические операторы",
+	"Miscellaneous Technical": "Разнообразные технические символы",
+	"Control Pictures": "Значки управляющих кодов",
+	"Optical Character Recognition": "Символы оптического распознавания",
+	"Enclosed Alphanumerics": "Вложенные буквы и цифры",
+	"Box Drawing": "Символы для рисования рамок",
+	"Block Elements": "Символы заполнения",
+	"Geometric Shapes": "Геометрические фигуры",
+	"Miscellaneous Symbols": "Разнообразные символы",
+	"Dingbats": "Дингбаты",
+	"Miscellaneous Mathematical Symbols A": "Разнообразные математические символы-A",
+	"Supplemental Arrows A": "Дополнительные стрелки-A",
+	"Braille Patterns": "Азбука Брайля",
+	"Supplemental Arrows B": "Дополнительные стрелки-B",
+	"Miscellaneous Mathematical Symbols B": "Разнообразные математические символы-B",
+	"Supplemental Mathematical Operators": "Дополнительные математические операторы",
+	"Miscellaneous Symbols and Arrows": "Разнообразные символы и стрелки",
+	"Glagolitic": "Глаголица",
+	"Latin Extended C": "Расширенная латиница C",
+	"Coptic": "Коптский алфавит",
+	"Georgian Supplement": "Дополнительные символы грузинского алфавита",
+	"Tifinagh": "Тифинаг (Древнеливийское письмо)",
+	"Ethiopic Extended": "Расширенный набор символов эфиопского письма",
+	"Cyrillic Extended A": "Расширенная кириллица A",
+	"Supplemental Punctuation": "Дополнительные знаки пунктуации",
+	"CJK Radicals Supplement": "Дополнительные иероглифические ключи ККЯ",
+	"Kangxi Radicals": "Иероглифические ключи словаря Канси",
+	"Ideographic Description Characters": "Символы описания иероглифов",
+	"CJK Symbols and Punctuation": "Символы и пунктуация ККЯ",
+	"Hiragana": "Хирагана",
+	"Katakana": "Катакана",
+	"Bopomofo": "Чжуинь. Бопомофо",
+	"Hangul Compatibility Jamo": "Комбинируемые чамо Хангыля",
+	"Kanbun": "Канбун(китайский)",
+	"Bopomofo Extended": "Расширенный набор символов бопомофо, чжуинь",
+	"CJK Strokes": "Черты ККЯ",
+	"Katakana Phonetic Extensions": "Фонетические расширения катаканы",
+	"Enclosed CJK Letters and Months": "Вложенные буквы и месяцы ККЯ",
+	"CJK Compatibility": "Знаки совместимости ККЯ",
+	"CJK Unified Ideographs Extension": "Унифицированные иероглифы ККЯ. Расширение А",
+	"Yijing Hexagram Symbols": "Гексаграммы И-Цзин",
+	"CJK Unified Ideographs": "Унифицированные иероглифы ККЯ",
+	"Yi Syllables": "Слоги. Письмо И",
+	"Yi Radicals": "Радикалы. Письмо И",
+	"Lisu": "Лису",
+	"Vai": "Слоговая письменность ваи",
+	"Cyrillic Extended B": "Расширенная кириллица-B",
+	"Bamum": "Письмо бамум",
+	"Modifier Tone Letters": "Символы изменения тона",
+	"Latin Extended D": "Расширенная латиница-D",
+	"Syloti Nagri": "Силоти нагри",
+	"Common Indic Number Forms": "Индийские числовые символы",
+	"Phags pa": "Квадратное письмо Пагба-ламы",
+	"Saurashtra": "Саураштра",
+	"Devanagari Extended": "Расширенный набор символов деванагари",
+	"Kayah Li": "Кайях Ли",
+	"Rejang": "Реджанг",
+	"Hangul Jamo Extended A": "Хангыль",
+	"Javanese": "Яванская письменность",
+	"Myanmar Extended B": "Расширенный бирманский-B",
+	"Cham": "Чамское письмо",
+	"Myanmar Extended A": "Мьянманская письменность. Расширение A",
+	"Tai Viet": "Письменность Тай Вьет",
+	"Meetei Mayek Extensions": "Мейтей расширенная",
+	"Ethiopic Extended A": "Набор расширенных символов эфиопского письма-А",
+	"Latin Extended E": "Расширенная латиница-E",
+	"Cherokee Supplement": "Письменность чероки (дополнение)",
+	"Meetei Mayek": "Мейтей (Манипури)",
+	"Hangul Syllables": "Слоги Хангыля",
+	"Hangul Jamo Extended B": "Расширенные хангыль чамо B",
+	"High Surrogates": "Верхняя часть суррогатных пар",
+	"High Private Use Surrogates": "Верхняя часть суррогатных пар для частного использования",
+	"Low Surrogates": "Нижняя часть суррогатных пар",
+	"Private Use Area": "Область для частного использования",
+	"CJK Compatibility Ideographs": "Совместимые иероглифы ККЯ",
+	"Alphabetic Presentation Forms": "Алфавитные формы представления",
+	"Arabic Presentation Forms A": "Формы представления арабских букв-A",
+	"Variation Selectors": "Селекторы вариантов начертания",
+	"Vertical Forms": "Вертикальные формы",
+	"Combining Half Marks": "Комбинируемые половинки символов",
+	"CJK Compatibility Forms": "Формы совместимости ККЯ",
+	"Small Form Variants": "Варианты малого размера",
+	"Arabic Presentation Forms B": "Формы представления арабских букв-B",
+	"Halfwidth and Fullwidth Forms": "Полуширинные и полноширинные формы",
+	"Specials": "Специальные символы",
+	"Linear B Syllabary": "Слоги линейного письма Б",
+	"Linear B Ideograms": "Идеограммы линейного письма Б",
+	"Aegean Numbers": "Эгейские цифры",
+	"Ancient Greek Numbers": "Древнегреческие единицы измерения",
+	"Ancient Symbols": "Древние символы",
+	"Phaistos Disc": "Символы фестского диска",
+	"Lycian": "Ликийский алфавит",
+	"Carian": "Алфавит карийского языка",
+	"Coptic Epact Numbers": "Коптские числа епакты",
+	"Old Italic": "Этрусский (староитальянский) алфавит",
+	"Gothic": "Готский алфавит",
+	"Old Permic": "Древнепермское письмо",
+	"Ugaritic": "Угаритский алфавит",
+	"Old Persian": "Древнеперсидский клинописный алфавит",
+	"Deseret": "Дезеретский алфавит",
+	"Shavian": "Алфавит Бернарда Шоу",
+	"Osmanya": "Османья (сомалийский алфавит)",
+	"Osage": "Оседж",
+	"Elbasan": "Эльбасанское письмо",
+	"Caucasian Albanian": "Агванское письмо (Кавказская Албания)",
+	"Linear A": "Линейное письмо А",
+	"Cypriot Syllabary": "Слоговая письменность острова Кипр",
+	"Imperial Aramaic": "Имперское арамейское письмо",
+	"Palmyrene": "Пальмирский алфавит",
+	"Nabataean": "Набатейское письмо",
+	"Hatran": "Хатран",
+	"Phoenician": "Финикийское письмо",
+	"Lydian": "Лидийский алфавит",
+	"Meroitic Hieroglyphs": "Лидийский алфавит",
+	"Meroitic Cursive": "Курсивное мероитское письмо",
+	"Kharoshthi": "Кхароштхи",
+	"Old South Arabian": "Старый южноаравийский алфавит",
+	"Old North Arabian": "Старый североаравийский алфавит",
+	"Manichaean": "Манихейское письмо",
+	"Avestan": "Авестийский алфавит",
+	"Inscriptional Parthian": "Пехлевийское письмо для парфянского языка",
+	"Inscriptional Pahlavi": "Эпиграфическое пехлевийское письмо",
+	"Psalter Pahlavi": "Псалтырь пехлеви",
+	"Old Turkic": "Древнетюркское руническое письмо",
+	"Old Hungarian": "Венгерские руны",
+	"Rumi Numeral Symbols": "Цифры системы руми",
+	"Brahmi": "Брахмическая письменность",
+	"Kaithi": "Кайтхи",
+	"Sora Sompeng": "Соранг сомпенг",
+	"Chakma": "Чакма",
+	"Mahajani": "Махаяни",
+	"Sharada": "Шарада",
+	"Sinhala Archaic Numbers": "Сингальские архаические цифры",
+	"Khojki": "Кходжики",
+	"Multani": "Мултани",
+	"Khudawadi": "Кхудабади",
+	"Grantha": "Грантха",
+	"Newa": "Нева",
+	"Tirhuta": "Тирхута",
+	"Siddham": "Сиддхаматрика",
+	"Modi": "Моди",
+	"Mongolian Supplement": "Монгольский (дополнение)",
+	"Takri": "Такри",
+	"Ahom": "Письмо ахом",
+	"Warang Citi": "Варанг-кшити",
+	"Pau Cin Hau": "Пау Цин Хау",
+	"Bhaiksuki": "Байсаки",
+	"Marchen": "Марчен",
+	"Cuneiform": "Клинопись",
+	"Cuneiform Numbers and Punctuation": "Клинописные цифры и знаки препинания",
+	"Early Dynastic Cuneiform": "Ранняя династическая клинопись",
+	"Egyptian Hieroglyphs": "Египетские иероглифы",
+	"Anatolian Hieroglyphs": "Анатолийские иероглифы",
+	"Bamum Supplement": "Письмо бамум (дополнение)",
+	"Mro": "Мру",
+	"Bassa Vah": "Письмо басса",
+	"Pahawh Hmong": "Пахау хмонг",
+	"Miao": "Письмо Полларда (миао)",
+	"Ideographic Symbols and Punctuation": "Идеографические символы и знаки препинания",
+	"Tangut": "Тангутское письмо",
+	"Tangut Components": "Компоненты тангутского письма",
+	"Kana Supplement": "Кана (дополнение)",
+	"Duployan": "Дюплойе",
+	"Shorthand Format Controls": "Форматирующие символы стенографии",
+	"Byzantine Musical Symbols": "Византийские музыкальные символы",
+	"Musical Symbols": "Музыкальные символы",
+	"Ancient Greek Musical Notation": "Древнегреческие музыкальные символы",
+	"Tai Xuan Jing Symbols": "Символы Тай Сюань Цзин",
+	"Counting Rod Numerals": "Счётные палочки",
+	"Mathematical Alphanumeric Symbols": "Математические буквенно-цифровые символы",
+	"Sutton SignWriting": "Жестовая письменность Саттон",
+	"Glagolitic Supplement": "Глаголица (расширение)",
+	"Mende Kikakui": "Письмо кикакуи для языка менде",
+	"Adlam": "Адлам",
+	"Arabic Mathematical Alphabetic Symbols": "Арабские математические буквенно-цифровые символы",
+	"Mahjong Tiles": "Кости для маджонга",
+	"Domino Tiles": "Кости для домино",
+	"Playing Cards": "Игральные карты",
+	"Enclosed Alphanumeric Supplement": "Вложенные буквенно-цифровые символы (дополнение)",
+	"Enclosed Ideographic Supplement": "Вложенные идеографические символы (дополнение)",
+	"Miscellaneous Symbols and Pictographs": "Различные символы и пиктограммы",
+	"Emoticons": "Эмотикон (эмоджи)",
+	"Ornamental Dingbats": "Элементы орнамента",
+	"Transport and Map Symbols": "Транспортные и картографические символы",
+	"Alchemical Symbols": "Алхимические символы",
+	"Geometric Shapes Extended": "Геометрические фигуры (расширение)",
+	"Supplemental Arrows C": "Дополнительные стрелки-С",
+	"Supplemental Symbols and Pictographs": "Символы и пиктограммы (дополнение)",
+	"CJK Unified Ideographs Extension B": "Унифицированные иероглифы ККЯ. Расширение B",
+	"CJK Unified Ideographs Extension C": "Унифицированные иероглифы ККЯ. Расширение C",
+	"CJK Unified Ideographs Extension D": "Унифицированные иероглифы ККЯ. Расширение D",
+	"CJK Unified Ideographs Extension E": "Унифицированные иероглифы ККЯ. Расширение E",
+	"CJK Compatibility Ideographs Supplement": "Унифицированные иероглифы ККЯ (дополнение)",
+	"Tags": "Теги",
+	"Variation Selectors Supplement": "Селекторы вариантов начертания (дополнение)",
+	"Supplementary Private Use Area A": "Дополнительная область для частного использования — A",
+	"Supplementary Private Use Area B": "Дополнительная область для частного использования — B"	
+}

apps/documenteditor/embed/js/ApplicationController.js

@@ -402,6 +402,10 @@ DE.ApplicationController = new(function(){
                 message = me.errorFileSizeExceed;
                 break;
 
+            case Asc.c_oAscError.ID.UpdateVersion:
+                message = me.errorUpdateVersionOnDisconnect;
+                break;
+
             default:
                 message = me.errorDefaultMessage.replace('%1', id);
                 break;
@@ -558,6 +562,7 @@ DE.ApplicationController = new(function(){
         waitText: 'Please, wait...',
         textLoadingDocument: 'Loading document',
         txtClose: 'Close',
-        errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
+        errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
+        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.'
     }
 })();

apps/documenteditor/embed/locale/en.json

@@ -22,6 +22,7 @@
   "DE.ApplicationController.unknownErrorText": "Unknown error.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
   "DE.ApplicationController.waitText": "Please, wait...",
+  "DE.ApplicationController.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.ApplicationView.txtDownload": "Download",
   "DE.ApplicationView.txtEmbed": "Embed",
   "DE.ApplicationView.txtFullScreen": "Full Screen",

apps/documenteditor/embed/locale/fr.json

@@ -12,6 +12,7 @@
   "DE.ApplicationController.errorAccessDeny": "Vous tentez d'exéсuter une action pour laquelle vous ne disposez pas des droits.<br>Veuillez contacter l'administrateur de Document Server.",
   "DE.ApplicationController.errorDefaultMessage": "Code d'erreur: %1",
   "DE.ApplicationController.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut pas être ouvert.",
+  "DE.ApplicationController.errorFileSizeExceed": "La taille du fichier dépasse les limites établies sur votre serveur.<br>Veuillez contacter votre administrateur de Document Server pour obtenir plus d'information.  ",
   "DE.ApplicationController.errorUserDrop": "Impossible d'accéder au fichier.",
   "DE.ApplicationController.notcriticalErrorTitle": "Avertissement",
   "DE.ApplicationController.scriptLoadError": "La connexion est trop lente, certains  éléments ne peuvent pas être chargés. Veuillez recharger la page.",

apps/documenteditor/embed/locale/it.json

@@ -12,6 +12,7 @@
   "DE.ApplicationController.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.<br>Si prega di contattare l'amministratore del Server dei Documenti.",
   "DE.ApplicationController.errorDefaultMessage": "Codice errore: %1",
   "DE.ApplicationController.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
+  "DE.ApplicationController.errorFileSizeExceed": "La dimensione del file supera la limitazione impostata per il tuo server.<br>Per i dettagli, contatta l'amministratore del Document server.",
   "DE.ApplicationController.errorUserDrop": "Impossibile accedere al file subito.",
   "DE.ApplicationController.notcriticalErrorTitle": "Avviso",
   "DE.ApplicationController.scriptLoadError": "La connessione è troppo lenta, alcuni componenti non possono essere caricati. Si prega di ricaricare la pagina.",

apps/documenteditor/embed/locale/ru.json

@@ -12,6 +12,7 @@
   "DE.ApplicationController.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.ApplicationController.errorDefaultMessage": "Код ошибки: %1",
   "DE.ApplicationController.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
+  "DE.ApplicationController.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.<br>Обратитесь к администратору Сервера документов для получения дополнительной информации.",
   "DE.ApplicationController.errorUserDrop": "В настоящий момент файл недоступен.",
   "DE.ApplicationController.notcriticalErrorTitle": "Внимание",
   "DE.ApplicationController.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.",

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

@@ -467,6 +467,7 @@ define([
             if (this.mode.canViewComments && this.leftMenu.panelComments.isVisible())
                 value = resolved = true;
             (value) ? this.api.asc_showComments(resolved) : this.api.asc_hideComments();
+            this.getApplication().getController('Common.Controllers.ReviewChanges').commentsShowHide(value ? 'show' : 'hide');
             /** coauthoring end **/
 
             value = Common.localStorage.getItem("de-settings-fontrender");

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

@@ -352,6 +352,7 @@ define([
                 this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs;
                 this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage;
                 this.appOptions.canRequestMailMergeRecipients = this.editorConfig.canRequestMailMergeRecipients;
+                this.appOptions.compatibleFeatures = (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compatibleFeatures;
 
                 appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header');
                 appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '')
@@ -365,7 +366,8 @@ define([
 
                 if (!( this.editorConfig.customization && ( this.editorConfig.customization.toolbarNoTabs ||
                     (this.editorConfig.targetApp!=='desktop') && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)))) {
-                    $('#editor_sdk').append('<div class="doc-placeholder">' + '<div class="line"></div>'.repeat(20) + '</div>');
+                    $('#editor-container').css('overflow', 'hidden');
+                    $('#editor-container').append('<div class="doc-placeholder">' + '<div class="line"></div>'.repeat(20) + '</div>');
                 }
 
                 Common.Controllers.Desktop.init(this.appOptions);
@@ -1054,6 +1056,7 @@ define([
                 $(document).on('contextmenu', _.bind(me.onContextMenu, me));
                 Common.Gateway.documentReady();
 
+                $('#editor-container').css('overflow', '');
                 $('.doc-placeholder').remove();
             },
 
@@ -1266,7 +1269,7 @@ define([
                     var toolbarController   = application.getController('Toolbar');
                     toolbarController   && toolbarController.setApi(me.api);
 
-                    if (this.appOptions.isRestrictedEdit) return;
+                    if (!this.appOptions.isEdit) return;
 
                     var rightmenuController = application.getController('RightMenu'),
                         fontsControllers    = application.getController('Common.Controllers.Fonts');
@@ -1447,7 +1450,7 @@ define([
                         break;
 
                     case Asc.c_oAscError.ID.Warning:
-                        config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
+                        config.msg = this.errorConnectToServer;
                         config.closable = false;
                         break;
 
@@ -1496,6 +1499,11 @@ define([
                         config.msg = this.errorFileSizeExceed;
                         break;
 
+                   case Asc.c_oAscError.ID.UpdateVersion:
+                        config.msg = this.errorUpdateVersionOnDisconnect;
+                        config.maxwidth = 600;
+                        break;
+
                     default:
                         config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -2217,15 +2225,14 @@ define([
             sendMergeTitle: 'Sending Merge',
             sendMergeText: 'Sending Merge...',
             txtArt: 'Your text here',
-            errorConnectToServer: 'The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>' +
-                                  'Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
+            errorConnectToServer: 'The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.',
             textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the \'Strict mode\' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.',
             textStrict: 'Strict mode',
             txtErrorLoadHistory: 'Loading history failed',
             textBuyNow: 'Visit website',
             textNoLicenseTitle: '%1 connection limitation',
             textContactUs: 'Contact sales',
-            errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.',
+            errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored and page is reloaded.',
             warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
             titleLicenseExp: 'License expired',
             openErrorText: 'An error has occurred while opening the file',
@@ -2473,7 +2480,8 @@ define([
             errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
             txtMainDocOnly: 'Error! Main Document Only.',
             txtNotValidBookmark: 'Error! Not a valid bookmark self-reference.',
-            txtNoText: 'Error! No text of specified style in document.'
+            txtNoText: 'Error! No text of specified style in document.',
+            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

@@ -47,6 +47,7 @@ define([
     'common/main/lib/view/ImageFromUrlDialog',
     'common/main/lib/view/InsertTableDialog',
     'common/main/lib/view/SelectFileDlg',
+    'common/main/lib/view/SymbolTableDialog',
     'common/main/lib/util/define',
     'documenteditor/main/app/view/Toolbar',
     'documenteditor/main/app/view/DropcapSettingsAdvanced',
@@ -324,6 +325,7 @@ define([
             toolbar.listStyles.on('contextmenu',                        _.bind(this.onListStyleContextMenu, this));
             toolbar.styleMenu.on('hide:before',                         _.bind(this.onListStyleBeforeHide, this));
             toolbar.btnInsertEquation.on('click',                       _.bind(this.onInsertEquationClick, this));
+            toolbar.btnInsertSymbol.on('click',                         _.bind(this.onInsertSymbolClick, this));
             toolbar.mnuNoControlsColor.on('click',                      _.bind(this.onNoControlsColor, this));
             toolbar.mnuControlsColorPicker.on('select',                 _.bind(this.onSelectControlsColor, this));
             Common.Gateway.on('insertimage',                            _.bind(this.insertImage, this));
@@ -378,6 +380,7 @@ 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));
             } else if (this.mode.isRestrictedEdit) {
                 this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObjectRestrictedEdit, this));
@@ -653,7 +656,8 @@ define([
             var i = -1, type,
                 paragraph_locked = false,
                 header_locked = false,
-                image_locked = false;
+                image_locked = false,
+                in_image = false;
 
             while (++i < selectedObjects.length) {
                 type = selectedObjects[i].get_ObjectType();
@@ -663,11 +667,15 @@ define([
                 } else if (type === Asc.c_oAscTypeSelectElement.Header) {
                     header_locked = selectedObjects[i].get_ObjectValue().get_Locked();
                 } else if (type === Asc.c_oAscTypeSelectElement.Image) {
+                    in_image = true;
                     image_locked = selectedObjects[i].get_ObjectValue().get_Locked();
                 }
             }
 
             var need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked;
+            if (this.mode.compatibleFeatures) {
+                need_disable = need_disable || in_image;
+            }
             if ( this.btnsComment && this.btnsComment.length > 0 )
                 this.btnsComment.setDisabled(need_disable);
         },
@@ -745,10 +753,11 @@ define([
             (lock_type===undefined) && (lock_type = Asc.c_oAscSdtLockType.Unlocked);
 
             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);
+                var control_disable = control_plain || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked;
+                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;
@@ -815,6 +824,8 @@ define([
             need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation || control_plain;
             toolbar.btnInsertEquation.setDisabled(need_disable);
 
+            toolbar.btnInsertSymbol.setDisabled(!in_para || paragraph_locked || header_locked);
+
             need_disable = paragraph_locked || header_locked || in_equation;
             toolbar.btnSuperscript.setDisabled(need_disable);
             toolbar.btnSubscript.setDisabled(need_disable);
@@ -829,6 +840,9 @@ define([
                 toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined);
 
             need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked;
+            if (this.mode.compatibleFeatures) {
+                need_disable = need_disable || in_image;
+            }
             if ( this.btnsComment && this.btnsComment.length > 0 )
                 this.btnsComment.setDisabled(need_disable);
 
@@ -1721,6 +1735,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);
@@ -1737,7 +1753,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');
             }
 
@@ -2462,6 +2488,31 @@ define([
             Common.NotificationCenter.trigger('edit:complete', this.toolbar, this.toolbar.btnInsertEquation);
         },
 
+        onInsertSymbolClick: function() {
+            if (this.dlgSymbolTable && this.dlgSymbolTable.isVisible()) return;
+
+            if (this.api) {
+                var me = this;
+                me.dlgSymbolTable = new Common.Views.SymbolTableDialog({
+                    api: me.api,
+                    lang: me.mode.lang,
+                    modal: false,
+                    type: 1,
+                    buttons: [{value: 'ok', caption: this.textInsert}, 'close'],
+                    handler: function(dlg, result, settings) {
+                        if (result == 'ok') {
+                            me.api.asc_insertSymbol(settings.font, settings.code);
+                        } else
+                            Common.NotificationCenter.trigger('edit:complete', me.toolbar);
+                    }
+                });
+                me.dlgSymbolTable.show();
+                me.dlgSymbolTable.on('symbol:dblclick', function(cmp, result, settings) {
+                    me.api.asc_insertSymbol(settings.font, settings.code);
+                });
+            }
+        },
+
         onApiMathTypes: function(equation) {
             this._equationTemp = equation;
             var me = this;
@@ -2827,45 +2878,43 @@ define([
                     compactview = true;
             }
 
-            setTimeout(function () {
-                me.toolbar.render(_.extend({isCompactView: compactview}, config));
+            me.toolbar.render(_.extend({isCompactView: compactview}, config));
 
-                var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
-                var $panel = me.application.getController('Common.Controllers.ReviewChanges').createToolbarPanel();
-                if ( $panel )
-                    me.toolbar.addTab(tab, $panel, 4);
+            var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
+            var $panel = me.application.getController('Common.Controllers.ReviewChanges').createToolbarPanel();
+            if ( $panel )
+                me.toolbar.addTab(tab, $panel, 4);
 
-                if ( config.isEdit ) {
-                    me.toolbar.setMode(config);
+            if ( config.isEdit ) {
+                me.toolbar.setMode(config);
 
-                    me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
+                me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
 
-                    if (!(config.customization && config.customization.compactHeader)) {
-                        // hide 'print' and 'save' buttons group and next separator
-                        me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
+                if (!(config.customization && config.customization.compactHeader)) {
+                    // hide 'print' and 'save' buttons group and next separator
+                    me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
 
-                        // hide 'undo' and 'redo' buttons and retrieve parent container
-                        var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent();
+                    // hide 'undo' and 'redo' buttons and retrieve parent container
+                    var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent();
 
-                        // move 'paste' button to the container instead of 'undo' and 'redo'
-                        me.toolbar.btnPaste.$el.detach().appendTo($box);
-                        me.toolbar.btnCopy.$el.removeClass('split');
-                    }
-
-                    if ( config.isDesktopApp ) {
-                        if ( config.canProtect ) {
-                            tab = {action: 'protect', caption: me.toolbar.textTabProtect};
-                            $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
-
-                            if ($panel) me.toolbar.addTab(tab, $panel, 5);
-                        }
-                    }
-
-                    var links = me.getApplication().getController('Links');
-                    links.setApi(me.api).setConfig({toolbar: me});
-                    Array.prototype.push.apply(me.toolbar.toolbarControls, links.getView('Links').getButtons());
+                    // move 'paste' button to the container instead of 'undo' and 'redo'
+                    me.toolbar.btnPaste.$el.detach().appendTo($box);
+                    me.toolbar.btnCopy.$el.removeClass('split');
                 }
-            }, 0);
+
+                if ( config.isDesktopApp ) {
+                    if ( config.canProtect ) {
+                        tab = {action: 'protect', caption: me.toolbar.textTabProtect};
+                        $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
+
+                        if ($panel) me.toolbar.addTab(tab, $panel, 5);
+                    }
+                }
+
+                var links = me.getApplication().getController('Links');
+                links.setApi(me.api).setConfig({toolbar: me});
+                Array.prototype.push.apply(me.toolbar.toolbarControls, links.getView('Links').getButtons());
+            }
         },
 
         onAppReady: function (config) {
@@ -2881,6 +2930,8 @@ define([
                         btn.on('click', function (btn, e) {
                             Common.NotificationCenter.trigger('app:comment:add', 'toolbar');
                         });
+                        if (btn.cmpEl.closest('#review-changes-panel').length>0)
+                            btn.setCaption(me.toolbar.capBtnAddComment);
                     }, this);
                 }
             }
@@ -2915,6 +2966,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',
@@ -3262,7 +3317,8 @@ define([
         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 device fonts, the saved font will be used when it is available.<br>Do you want to continue?',
         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',
+        textInsert: 'Insert'
 
     }, DE.Controllers.Toolbar || {}));
 });

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/Toolbar.template

@@ -108,6 +108,7 @@
                 <div class="separator long"></div>
                 <div class="group">
                     <span class="btn-slot text x-huge" id="slot-btn-insequation"></span>
+                    <span class="btn-slot text x-huge" id="slot-btn-inssymbol"></span>
                 </div>
                 <div class="separator long"></div>
                 <div class="group">

apps/documenteditor/main/app/template/Viewport.template

@@ -9,7 +9,7 @@
             <div id="viewport-hbox-layout" class="layout-ct hbox">
                 <div id="left-menu" class="layout-item" style="width: 40px;"></div>
                 <div id="about-menu-panel" class="left-menu-full-ct" style="display:none;"></div>
-                <div id="editor_sdk" class="layout-item"></div>
+                <div id="editor-container" class="layout-item"><div id="editor_sdk"></div></div>
                 <div id="right-menu" class="layout-item"></div>
                 <div id="left-panel-history" class="layout-item" />
             </div>

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

@@ -48,8 +48,7 @@ define([
             width: 330,
             header: false,
             cls: 'modal-dlg',
-            buttons: ['ok', 'cancel'],
-            footerCls: 'center'
+            buttons: ['ok', 'cancel']
         },
 
         initialize : function(options) {

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

@@ -110,7 +110,7 @@ define([
                             '</div></div>',
                         '</div>',
                     '</div>',
-                    '<div class="footer right">',
+                    '<div class="footer center">',
                     '<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + me.textClose + '</button>',
                     '</div>'
                 ].join('')

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

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

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/DocumentHolder.js

@@ -1995,10 +1995,13 @@ define([
             this.viewModeMenu = new Common.UI.Menu({
                 initMenu: function (value) {
                     var isInChart = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ChartProperties())),
+                        isInShape = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ShapeProperties())),
                         signGuid = (value.imgProps && value.imgProps.value && me.mode.isSignatureSupport) ? value.imgProps.value.asc_getSignatureId() : undefined,
                         signProps = (signGuid) ? me.api.asc_getSignatureSetup(signGuid) : null,
                         isInSign = !!signProps && me._canProtect,
                         canComment = !isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled;
+                    if (me.mode.compatibleFeatures)
+                        canComment = canComment && !isInShape;
 
                     menuViewUndo.setVisible(me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled);
                     menuViewUndo.setDisabled(!me.api.asc_getCanUndo() && !me._isDisabled);
@@ -3625,8 +3628,11 @@ define([
                         text = me.api.can_AddHyperlink();
                     }
                     /** coauthoring begin **/
-                    menuCommentSeparatorPara.setVisible(!isInChart && me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments);
-                    menuAddCommentPara.setVisible(!isInChart && me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments);
+                    var isVisible = !isInChart && me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments;
+                    if (me.mode.compatibleFeatures)
+                        isVisible = isVisible && !isInShape;
+                    menuCommentSeparatorPara.setVisible(isVisible);
+                    menuAddCommentPara.setVisible(isVisible);
                     menuAddCommentPara.setDisabled(value.paraProps && value.paraProps.locked === true);
                     /** coauthoring end **/
 
@@ -3976,7 +3982,7 @@ define([
         mergeCellsText          : 'Merge Cells',
         splitCellsText          : 'Split Cell...',
         splitCellTitleText      : 'Split Cell',
-        originalSizeText        : 'Default Size',
+        originalSizeText        : 'Actual Size',
         advancedText            : 'Advanced Settings',
         breakBeforeText         : 'Page break before',
         keepLinesText           : 'Keep lines together',

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/FileMenuPanels.js

@@ -1003,6 +1003,7 @@ define([
                     me.authors.push(item);
                 });
                 this.tblAuthor.find('.close').toggleClass('hidden', !this.mode.isEdit);
+                !this.mode.isEdit && this._ShowHideInfoItem(this.tblAuthor, !!this.authors.length);
             }
             this.SetDisabled();
         },
@@ -1047,6 +1048,12 @@ define([
             this.inputAuthor.setVisible(mode.isEdit);
             this.btnApply.setVisible(mode.isEdit);
             this.tblAuthor.find('.close').toggleClass('hidden', !mode.isEdit);
+            if (!mode.isEdit) {
+                this.inputTitle._input.attr('placeholder', '');
+                this.inputSubject._input.attr('placeholder', '');
+                this.inputComment._input.attr('placeholder', '');
+                this.inputAuthor._input.attr('placeholder', '');
+            }
             this.SetDisabled();
             return this;
         },

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

@@ -58,8 +58,7 @@ define([
             width: 350,
             style: 'min-width: 230px;',
             cls: 'modal-dlg',
-            buttons: ['ok', 'cancel'],
-            footerCls: 'right'
+            buttons: ['ok', 'cancel']
         },
 
         initialize : function(options) {

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

@@ -572,7 +572,7 @@ define([
         textWrap:       'Wraping Style',
         textWidth:      'Width',
         textHeight:     'Height',
-        textOriginalSize: 'Default Size',
+        textOriginalSize: 'Actual Size',
         textInsert:     'Replace Image',
         textFromUrl:    'From URL',
         textFromFile:   'From File',

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

@@ -2013,7 +2013,7 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
         textLeft:       'Left',
         textBottom:     'Bottom',
         textRight:      'Right',
-        textOriginalSize: 'Default Size',
+        textOriginalSize: 'Actual Size',
         textPosition:   'Position',
         textDistance:   'Distance From Text',
         textSize:       'Size',

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

@@ -124,9 +124,9 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             }
 
             this._arrTabAlign = [
-                { value: 1, displayValue: this.textTabLeft },
-                { value: 3, displayValue: this.textTabCenter },
-                { value: 2, displayValue: this.textTabRight }
+                { value: Asc.c_oAscTabType.Left, displayValue: this.textTabLeft },
+                { value: Asc.c_oAscTabType.Center, displayValue: this.textTabCenter },
+                { value: Asc.c_oAscTabType.Right, displayValue: this.textTabRight }
             ];
             this._arrKeyTabAlign = [];
             this._arrTabAlign.forEach(function(item) {
@@ -577,7 +577,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                 cls         : 'input-group-nr',
                 data        : this._arrTabAlign
             });
-            this.cmbAlign.setValue(1);
+            this.cmbAlign.setValue(Asc.c_oAscTabType.Left);
 
             this.cmbLeader = new Common.UI.ComboBox({
                 el          : $('#paraadv-cmb-leader'),

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

@@ -550,17 +550,16 @@ define([
                 });
                 fill.get_fill().put_positions(arr);
 
-                if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) {
-                    if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
-                        fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000);
-                        fill.get_fill().put_linear_scale(true);
-                    }
-                    arr = [];
-                    this.GradColor.colors.forEach(function(item){
-                        arr.push(Common.Utils.ThemeColor.getRgbColor(item));
-                    });
-                    fill.get_fill().put_colors(arr);
+                if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
+                    fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000);
+                    fill.get_fill().put_linear_scale(true);
                 }
+                arr = [];
+                this.GradColor.colors.forEach(function(item){
+                    arr.push(Common.Utils.ThemeColor.getRgbColor(item));
+                });
+                fill.get_fill().put_colors(arr);
+
                 props.put_fill(fill);
                 this.imgprops.put_ShapeProperties(props);
                 this.api.ImgApply(this.imgprops);
@@ -958,6 +957,10 @@ define([
                         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 >= this.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: this.GradColor.colors[0]};
                     this.BGColor = {Value: 1, Color: 'ffffff'};
@@ -1357,6 +1360,16 @@ define([
                 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.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

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

@@ -45,11 +45,9 @@ define([
     DE.Views.StyleTitleDialog = Common.UI.Window.extend(_.extend({
         options: {
             width: 350,
-            height: 200,
             style: 'min-width: 230px;',
             cls: 'modal-dlg',
-            buttons: ['ok', 'cancel'],
-            footerCls: 'right'
+            buttons: ['ok', 'cancel']
         },
 
             initialize : function(options) {

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

@@ -48,8 +48,7 @@ define([
             width: 300,
             style: 'min-width: 230px;',
             cls: 'modal-dlg',
-            buttons: ['ok', 'cancel'],
-            footerCls: 'right'
+            buttons: ['ok', 'cancel']
         },
 
         initialize : function(options) {

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

@@ -650,6 +650,10 @@ define([
                         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 >= this.GradColor.colors.length) {
+                        me.GradColor.currentIdx = 0;
+                    }
+                    me.sldrGradient.setActiveThumb(me.GradColor.currentIdx);
                     this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
                     this.ShapeColor = {Value: 1, Color: this.GradColor.colors[0]};
                 }
@@ -944,6 +948,16 @@ define([
                 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.lockedControls.push(this.sldrGradient);
 
             this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

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

@@ -583,6 +583,14 @@ define([
                     });
                     this.paragraphControls.push(this.btnInsertEquation);
 
+                    this.btnInsertSymbol = new Common.UI.Button({
+                        id: 'tlbtn-insertsymbol',
+                        cls: 'btn-toolbar x-huge icon-top',
+                        iconCls: 'btn-symbol',
+                        caption: me.capBtnInsSymbol
+                    });
+                    this.paragraphControls.push(this.btnInsertSymbol);
+
                     this.btnDropCap = new Common.UI.Button({
                         id: 'tlbtn-dropcap',
                         cls: 'btn-toolbar x-huge icon-top',
@@ -630,18 +638,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: '--'},
@@ -1309,6 +1342,7 @@ define([
                 _injectComponent('#slot-btn-blankpage', this.btnBlankPage);
                 _injectComponent('#slot-btn-insshape', this.btnInsertShape);
                 _injectComponent('#slot-btn-insequation', this.btnInsertEquation);
+                _injectComponent('#slot-btn-inssymbol', this.btnInsertSymbol);
                 _injectComponent('#slot-btn-pageorient', this.btnPageOrient);
                 _injectComponent('#slot-btn-pagemargins', this.btnPageMargins);
                 _injectComponent('#slot-btn-pagesize', this.btnPageSize);
@@ -1579,6 +1613,7 @@ define([
                 this.btnBlankPage.updateHint(this.tipBlankPage);
                 this.btnInsertShape.updateHint(this.tipInsertShape);
                 this.btnInsertEquation.updateHint(this.tipInsertEquation);
+                this.btnInsertSymbol.updateHint(this.tipInsertSymbol);
                 this.btnDropCap.updateHint(this.tipDropCap);
                 this.btnContentControls.updateHint(this.tipControls);
                 this.btnColumns.updateHint(this.tipColumns);
@@ -1664,48 +1699,8 @@ define([
                         parentMenu: menu,
                         showLast: false,
                         restoreHeight: 421,
-                        groups: new Common.UI.DataViewGroupStore([
-                            {id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts},
-                            {id: 'menu-chart-group-line', caption: me.textLine},
-                            {id: 'menu-chart-group-pie', caption: me.textPie},
-                            {id: 'menu-chart-group-hbar', caption: me.textBar},
-                            {id: 'menu-chart-group-area', caption: me.textArea, inline: true},
-                            {id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true},
-                            {id: 'menu-chart-group-stock', caption: me.textStock, inline: true}
-                            // {id: 'menu-chart-group-surface', caption: me.textSurface}
-                        ]),
-                        store: new Common.UI.DataViewStore([
-                            { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barNormal,          iconCls: 'column-normal'},
-                            { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStacked,         iconCls: 'column-stack'},
-                            { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStackedPer,      iconCls: 'column-pstack'},
-                            { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barNormal3d,        iconCls: 'column-3d-normal'},
-                            { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStacked3d,       iconCls: 'column-3d-stack'},
-                            { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barStackedPer3d,    iconCls: 'column-3d-pstack'},
-                            { group: 'menu-chart-group-bar',     type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective,    iconCls: 'column-3d-normal-per'},
-                            { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.lineNormal,         iconCls: 'line-normal'},
-                            { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.lineStacked,        iconCls: 'line-stack'},
-                            { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.lineStackedPer,     iconCls: 'line-pstack'},
-                            { group: 'menu-chart-group-line',    type: Asc.c_oAscChartTypeSettings.line3d,             iconCls: 'line-3d'},
-                            { group: 'menu-chart-group-pie',     type: Asc.c_oAscChartTypeSettings.pie,                iconCls: 'pie-normal'},
-                            { group: 'menu-chart-group-pie',     type: Asc.c_oAscChartTypeSettings.doughnut,           iconCls: 'pie-doughnut'},
-                            { group: 'menu-chart-group-pie',     type: Asc.c_oAscChartTypeSettings.pie3d,              iconCls: 'pie-3d-normal'},
-                            { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarNormal,         iconCls: 'bar-normal'},
-                            { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStacked,        iconCls: 'bar-stack'},
-                            { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStackedPer,     iconCls: 'bar-pstack'},
-                            { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarNormal3d,       iconCls: 'bar-3d-normal'},
-                            { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStacked3d,      iconCls: 'bar-3d-stack'},
-                            { group: 'menu-chart-group-hbar',    type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d,   iconCls: 'bar-3d-pstack'},
-                            { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaNormal,         iconCls: 'area-normal'},
-                            { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaStacked,        iconCls: 'area-stack'},
-                            { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaStackedPer,     iconCls: 'area-pstack'},
-                            { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter,            iconCls: 'point-normal'},
-                            { group: 'menu-chart-group-stock',   type: Asc.c_oAscChartTypeSettings.stock,              iconCls: 'stock-normal'}
-                            // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal,      iconCls: 'surface-normal'},
-                            // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe,   iconCls: 'surface-wireframe'},
-                            // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal,      iconCls: 'contour-normal'},
-                            // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe,   iconCls: 'contour-wireframe'}
-
-                        ]),
+                        groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData(true)),
+                        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) {
@@ -2194,13 +2189,6 @@ define([
             textNewColor: 'Add New Custom Color',
             textAutoColor: 'Automatic',
             tipInsertChart: 'Insert Chart',
-            textLine: 'Line',
-            textColumn: 'Column',
-            textBar: 'Bar',
-            textArea: 'Area',
-            textPie: 'Pie',
-            textPoint: 'XY (Scatter)',
-            textStock: 'Stock',
             tipColorSchemas: 'Change Color Scheme',
             tipInsertText: 'Insert Text',
             tipInsertTextArt: 'Insert Text Art',
@@ -2268,7 +2256,6 @@ define([
             textPortrait: 'Portrait',
             textLandscape: 'Landscape',
             textInsertPageCount: 'Insert number of pages',
-            textCharts: 'Charts',
             tipChangeChart: 'Change Chart Type',
             capBtnInsPagebreak: 'Page Break',
             capBtnInsImage: 'Image',
@@ -2301,7 +2288,6 @@ define([
             capImgWrapping: 'Wrapping',
             capBtnComment: 'Comment',
             textColumnsCustom: 'Custom Columns',
-            textSurface: 'Surface',
             textTabCollaboration: 'Collaboration',
             textTabProtect: 'Protection',
             textTabLinks: 'References',
@@ -2324,7 +2310,15 @@ define([
             capBtnWatermark: 'Watermark',
             textEditWatermark: 'Custom Watermark',
             textRemWatermark: 'Remove Watermark',
-            tipWatermark: 'Edit 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'
         }
     })(), DE.Views.Toolbar || {}));
 });

apps/documenteditor/main/index.html

@@ -18,7 +18,7 @@
             width: 100%;
             overflow: hidden;
             border: none;
-            background-color: #f4f4f4;
+            background: #f1f1f1;
             z-index: 1001;
         }
 
@@ -31,6 +31,7 @@
         .loadmask > .brendpanel > div {
             display: flex;
             align-items: center;
+            height: 28px;
         }
 
         .loadmask > .brendpanel .spacer {
@@ -50,15 +51,6 @@
             opacity: 0;
         }
 
-        .loadmask > .brendpanel .circle {
-            vertical-align: middle;
-            width: 20px;
-            height: 20px;
-            border-radius: 12px;
-            margin: 4px 10px;
-            background: rgba(255, 255, 255, 0.2);
-        }
-
         .loadmask > .brendpanel .rect {
             vertical-align: middle;
             width: 50px;
@@ -69,8 +61,8 @@
         }
 
         .loadmask > .sktoolbar {
-            background: #fafafa;
-            border-bottom: 1px solid #e2e2e2;
+            background: #f1f1f1;
+            border-bottom: 1px solid #cfcfcf;
             height: 46px;
             padding: 10px 12px;
             box-sizing: content-box;
@@ -130,24 +122,24 @@
         }
 
         @keyframes flickerAnimation {
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-o-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-moz-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-webkit-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
     </style>
 
@@ -217,7 +209,7 @@
 <body>
     <div id="loading-mask" class="loadmask">
         <div class="brendpanel">
-            <div><div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo@2x.png"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div><span class="circle"></span><span class="circle"></span><span class="circle"></span></div></div>
+            <div><div class="loading-logo"><img src="../../common/main/resources/img/header/header-logo@2x.png"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span></div></div>
         <div class="sktoolbar">
             <ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li><li class="fat"></li></ul>
             <ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li></ul>

apps/documenteditor/main/index.html.deploy

@@ -19,19 +19,20 @@
             width: 100%;
             overflow: hidden;
             border: none;
-            background-color: #f4f4f4;
+            background: #f1f1f1;
             z-index: 1001;
         }
 
         .loadmask > .brendpanel {
             width: 100%;
-            height: 56px;
+            min-height: 32px;
             background: #446995;
         }
 
         .loadmask > .brendpanel > div {
             display: flex;
             align-items: center;
+            height: 28px;
         }
 
         .loadmask > .brendpanel .spacer {
@@ -51,15 +52,6 @@
             opacity: 0;
         }
 
-        .loadmask > .brendpanel .circle {
-            vertical-align: middle;
-            width: 20px;
-            height: 20px;
-            border-radius: 12px;
-            margin: 4px 10px;
-            background: rgba(255, 255, 255, 0.2);
-        }
-
         .loadmask > .brendpanel .rect {
             vertical-align: middle;
             width: 50px;
@@ -70,8 +62,8 @@
         }
 
         .loadmask > .sktoolbar {
-            background: #fafafa;
-            border-bottom: 1px solid #e2e2e2;
+            background: #f1f1f1;
+            border-bottom: 1px solid #cfcfcf;
             height: 46px;
             padding: 10px 12px;
             box-sizing: content-box;
@@ -82,11 +74,6 @@
             padding: 0;
             white-space: nowrap;
             position: relative;
-
-            -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;
         }
 
         .loadmask > .sktoolbar li {
@@ -136,24 +123,24 @@
         }
 
         @keyframes flickerAnimation {
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-o-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-moz-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
         @-webkit-keyframes flickerAnimation{
-            0%   { opacity:0.1; }
+            0%   { opacity:0.5; }
             50%  { opacity:1; }
-            100% { opacity:0.1; }
+            100% { opacity:0.5; }
         }
     </style>
 
@@ -217,7 +204,7 @@
     <link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">
 </head>
 <body>
-    <div id="loading-mask" class="loadmask"><div class="brendpanel"><div><div class="loading-logo"><img src="../../../apps/documenteditor/main/resources/img/header/header-logo@2x.png"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="circle"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><div class="spacer"></div><span class="circle"></span><span class="circle"></span><span class="circle"></span></div></div><div class="sktoolbar"><ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li><li class="fat"></li></ul><ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li></ul></div><div class="placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
+    <div id="loading-mask" class="loadmask"><div class="brendpanel"><div><div class="loading-logo"><img src="../../../apps/documenteditor/main/resources/img/header/header-logo@2x.png"></div><div class="spacer"></div><div class="rect"></div></div><div><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span><span class="rect"></span></div></div><div class="sktoolbar"><ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li><li class="fat"></li></ul><ul><li></li><li class="space"></li><li style="width: 255px;"></li><li class="space"></li><li style="width: 180px;"></li><li class="space"></li><li style="width: 60px;"></li></ul></div><div class="placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
     <div id="viewport"></div>
 
     <script>

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": "Няма стилове",
@@ -321,7 +330,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Опитвате се да извършите действие, за което нямате права. <br> Моля, свържете се с администратора на сървъра за документи.",
   "DE.Controllers.Main.errorBadImageUrl": "URL адресът на изображението е неправилен",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Връзката със сървъра е загубена. Документът не може да бъде редактиран в момента.",
-  "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.<br>Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа. <br><br>Намерете повече информация за свързването на сървър за документи <a href=\"%1\" target=\"_blank\">тук</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.<br>Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа.",
   "DE.Controllers.Main.errorDatabaseConnection": "Външна грешка. <br> Грешка при свързване към база данни. Моля, свържете се с екипа за поддръжка, в случай че грешката продължава.",
   "DE.Controllers.Main.errorDataEncrypted": "Получени са криптирани промени, които не могат да бъдат дешифрирани.",
   "DE.Controllers.Main.errorDataRange": "Неправилен обхват от данни.",
@@ -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": "Стил на опаковане",
@@ -1982,7 +1983,7 @@
   "DE.Views.Toolbar.capImgForward": "Изведи напред",
   "DE.Views.Toolbar.capImgGroup": "Група",
   "DE.Views.Toolbar.capImgWrapping": "Опаковане",
-  "DE.Views.Toolbar.mniCustomTable": "Вмъкване на персонализирана таблица",
+  "DE.Views.Toolbar.mniCustomTable": "Персонализирана таблица",
   "DE.Views.Toolbar.mniEditControls": "Настройки за управление",
   "DE.Views.Toolbar.mniEditDropCap": "Пуснете настройките на капачката",
   "DE.Views.Toolbar.mniEditFooter": "Редактиране на долен колонтитул",
@@ -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",
@@ -237,7 +245,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.<br>Prosím, kontaktujte administrátora vašeho Dokumentového serveru.",
   "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávná",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Spojení se serverem ztraceno. Dokument nyní nelze upravovat.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.<br> Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.<br><br> Více informací o připojení najdete v Dokumentovém serveru <a href=\"%1\" target=\"_blank\">here</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.<br> Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externí chyba.<br>Chyba spojení s databází. Prosím kontaktujte podporu, pokud chyba přetrvává.",
   "DE.Controllers.Main.errorDataRange": "Nesprávný datový rozsah.",
   "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1",
@@ -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

@@ -69,6 +69,15 @@
   "Common.Controllers.ReviewChanges.textTabs": "Registerkarten ändern",
   "Common.Controllers.ReviewChanges.textUnderline": "Unterstrichen",
   "Common.Controllers.ReviewChanges.textWidow": "Widow Сontrol",
+  "Common.define.chartData.textArea": "Fläche",
+  "Common.define.chartData.textBar": "Balken",
+  "Common.define.chartData.textCharts": "Diagramme",
+  "Common.define.chartData.textColumn": "Spalte",
+  "Common.define.chartData.textLine": "Linie",
+  "Common.define.chartData.textPie": "Kreis",
+  "Common.define.chartData.textPoint": "Punkt (XY)",
+  "Common.define.chartData.textStock": "Kurs",
+  "Common.define.chartData.textSurface": "Oberfläche",
   "Common.UI.ComboBorderSize.txtNoBorders": "Keine Rahmen",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Keine Rahmen",
   "Common.UI.ComboDataView.emptyComboText": "Keine Formate",
@@ -321,7 +330,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Sie haben versucht die Änderungen im Dokument, zu dem Sie keine Berechtigungen haben, vorzunehemen.<br>Wenden Sie sich an Ihren Serveradministrator.",
   "DE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Das Dokument kann momentan nicht bearbeitet werden.",
-  "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.<br><br>Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie <a href=\"%1\" target=\"_blank\">hier</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Fehler beim Verbinden zur Datenbank. Bitte wenden Sie sich an den Kundendienst, falls der Fehler bestehen bleibt.",
   "DE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.",
   "DE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",
@@ -1000,20 +1009,12 @@
   "DE.Views.BookmarksDialog.textTitle": "Lesezeichen",
   "DE.Views.BookmarksDialog.txtInvalidName": "Der Name des Lesezeichens darf nur Buchstaben, Ziffern und Unterstriche enthalten und sollte mit dem Buchstaben beginnen",
   "DE.Views.ChartSettings.textAdvanced": "Erweiterte Einstellungen anzeigen",
-  "DE.Views.ChartSettings.textArea": "Fläche",
-  "DE.Views.ChartSettings.textBar": "Balken",
   "DE.Views.ChartSettings.textChartType": "Diagrammtyp ändern",
-  "DE.Views.ChartSettings.textColumn": "Spalte",
   "DE.Views.ChartSettings.textEditData": "Daten ändern",
   "DE.Views.ChartSettings.textHeight": "Höhe",
-  "DE.Views.ChartSettings.textLine": "Linie",
   "DE.Views.ChartSettings.textOriginalSize": "Standardgröße",
-  "DE.Views.ChartSettings.textPie": "Kreis",
-  "DE.Views.ChartSettings.textPoint": "Punkt (XY)",
   "DE.Views.ChartSettings.textSize": "Größe",
-  "DE.Views.ChartSettings.textStock": "Kurs",
   "DE.Views.ChartSettings.textStyle": "Stil",
-  "DE.Views.ChartSettings.textSurface": "Oberfläche",
   "DE.Views.ChartSettings.textUndock": "Seitenbereich abdocken",
   "DE.Views.ChartSettings.textWidth": "Breite",
   "DE.Views.ChartSettings.textWrap": "Textumbruch",
@@ -1994,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",
@@ -2019,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",
@@ -2033,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 ",
@@ -2050,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,15 @@
   "Common.Controllers.ReviewChanges.textTabs": "Change tabs",
   "Common.Controllers.ReviewChanges.textUnderline": "Underline",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
+  "Common.define.chartData.textArea": "Area",
+  "Common.define.chartData.textBar": "Bar",
+  "Common.define.chartData.textCharts": "Charts",
+  "Common.define.chartData.textColumn": "Column",
+  "Common.define.chartData.textLine": "Line",
+  "Common.define.chartData.textPie": "Pie",
+  "Common.define.chartData.textPoint": "XY (Scatter)",
+  "Common.define.chartData.textStock": "Stock",
+  "Common.define.chartData.textSurface": "Surface",
   "Common.UI.ComboBorderSize.txtNoBorders": "No borders",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
   "Common.UI.ComboDataView.emptyComboText": "No styles",
@@ -254,6 +263,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",
@@ -268,6 +279,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",
@@ -332,6 +348,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.textCode": "Unicode HEX value",
+  "Common.Views.SymbolTableDialog.textFont": "Font",
+  "Common.Views.SymbolTableDialog.textRange": "Range",
+  "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols",
+  "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",
@@ -381,9 +402,10 @@
   "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 until the connection is restored.",
+  "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.",
   "DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click \"Stay on This Page\", then \"Save\" to save them. Click \"Leave This Page\" to discard all the unsaved changes.",
   "DE.Controllers.Main.loadFontsTextText": "Loading data...",
   "DE.Controllers.Main.loadFontsTitleText": "Loading Data",
@@ -398,7 +420,7 @@
   "DE.Controllers.Main.mailMergeLoadFileText": "Loading Data Source...",
   "DE.Controllers.Main.mailMergeLoadFileTitle": "Loading Data Source",
   "DE.Controllers.Main.notcriticalErrorTitle": "Warning",
-  "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
+  "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file.",
   "DE.Controllers.Main.openTextText": "Opening document...",
   "DE.Controllers.Main.openTitleText": "Opening Document",
   "DE.Controllers.Main.printTextText": "Printing document...",
@@ -406,7 +428,7 @@
   "DE.Controllers.Main.reloadButtonText": "Reload Page",
   "DE.Controllers.Main.requestEditFailedMessageText": "Someone is editing this document right now. Please try again later.",
   "DE.Controllers.Main.requestEditFailedTitleText": "Access denied",
-  "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
+  "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file.",
   "DE.Controllers.Main.savePreparingText": "Preparing to save",
   "DE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...",
   "DE.Controllers.Main.saveTextText": "Saving document...",
@@ -455,12 +477,15 @@
   "DE.Controllers.Main.txtHyperlink": "Hyperlink",
   "DE.Controllers.Main.txtIndTooLarge": "Index Too Large",
   "DE.Controllers.Main.txtLines": "Lines",
+  "DE.Controllers.Main.txtMainDocOnly": "Error! Main Document Only.",
   "DE.Controllers.Main.txtMath": "Math",
   "DE.Controllers.Main.txtMissArg": "Missing Argument",
   "DE.Controllers.Main.txtMissOperator": "Missing Operator",
   "DE.Controllers.Main.txtNeedSynchronize": "You have updates",
   "DE.Controllers.Main.txtNoTableOfContents": "No table of contents entries found.",
+  "DE.Controllers.Main.txtNoText": "Error! No text of specified style in document.",
   "DE.Controllers.Main.txtNotInTable": "Is Not In Table",
+  "DE.Controllers.Main.txtNotValidBookmark": "Error! Not a valid bookmark self-reference.",
   "DE.Controllers.Main.txtOddPage": "Odd Page",
   "DE.Controllers.Main.txtOnPage": "on page",
   "DE.Controllers.Main.txtRectangles": "Rectangles",
@@ -680,9 +705,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.txtMainDocOnly": "Error! Main Document Only.",
-  "DE.Controllers.Main.txtNotValidBookmark": "Error! Not a valid bookmark self-reference.",
-  "DE.Controllers.Main.txtNoText": "Error! No text of specified style in document.",
   "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",
@@ -697,6 +719,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",
@@ -1041,28 +1064,28 @@
   "DE.Views.BookmarksDialog.textSort": "Sort by",
   "DE.Views.BookmarksDialog.textTitle": "Bookmarks",
   "DE.Views.BookmarksDialog.txtInvalidName": "Bookmark name can only contain letters, digits and underscores, and should begin with the letter",
-  "DE.Views.CaptionDialog.textTitle": "Insert Caption",
+  "DE.Views.CaptionDialog.textAdd": "Add label",
+  "DE.Views.CaptionDialog.textAfter": "After",
+  "DE.Views.CaptionDialog.textBefore": "Before",
   "DE.Views.CaptionDialog.textCaption": "Caption",
+  "DE.Views.CaptionDialog.textChapter": "Chapter starts with style",
+  "DE.Views.CaptionDialog.textChapterInc": "Include chapter number",
+  "DE.Views.CaptionDialog.textColon": "colon",
+  "DE.Views.CaptionDialog.textDash": "dash",
+  "DE.Views.CaptionDialog.textDelete": "Delete label",
+  "DE.Views.CaptionDialog.textEquation": "Equation",
+  "DE.Views.CaptionDialog.textExamples": "Examples: Table 2-A, Image 1.IV",
+  "DE.Views.CaptionDialog.textExclude": "Exclude label from caption",
+  "DE.Views.CaptionDialog.textFigure": "Figure",
+  "DE.Views.CaptionDialog.textHyphen": "hyphen",
   "DE.Views.CaptionDialog.textInsert": "Insert",
   "DE.Views.CaptionDialog.textLabel": "Label",
-  "DE.Views.CaptionDialog.textAdd": "Add label",
-  "DE.Views.CaptionDialog.textDelete": "Delete label",
-  "DE.Views.CaptionDialog.textNumbering": "Numbering",
-  "DE.Views.CaptionDialog.textChapterInc": "Include chapter number",
-  "DE.Views.CaptionDialog.textChapter": "Chapter starts with style",
-  "DE.Views.CaptionDialog.textSeparator": "Use separator",
-  "DE.Views.CaptionDialog.textExamples": "Examples: Table 2-A, Image 1.IV",
-  "DE.Views.CaptionDialog.textBefore": "Before",
-  "DE.Views.CaptionDialog.textAfter": "After",
-  "DE.Views.CaptionDialog.textHyphen": "hyphen",
-  "DE.Views.CaptionDialog.textPeriod": "period",
-  "DE.Views.CaptionDialog.textColon": "colon",
   "DE.Views.CaptionDialog.textLongDash": "long dash",
-  "DE.Views.CaptionDialog.textDash": "dash",
-  "DE.Views.CaptionDialog.textEquation": "Equation",
-  "DE.Views.CaptionDialog.textFigure": "Figure",
+  "DE.Views.CaptionDialog.textNumbering": "Numbering",
+  "DE.Views.CaptionDialog.textPeriod": "period",
+  "DE.Views.CaptionDialog.textSeparator": "Use separator",
   "DE.Views.CaptionDialog.textTable": "Table",
-  "DE.Views.CaptionDialog.textExclude": "Exclude label from caption",
+  "DE.Views.CaptionDialog.textTitle": "Insert Caption",
   "DE.Views.CellsAddDialog.textCol": "Columns",
   "DE.Views.CellsAddDialog.textDown": "Below the cursor",
   "DE.Views.CellsAddDialog.textLeft": "To the left",
@@ -1075,20 +1098,12 @@
   "DE.Views.CellsRemoveDialog.textRow": "Delete entire row",
   "DE.Views.CellsRemoveDialog.textTitle": "Delete Cells",
   "DE.Views.ChartSettings.textAdvanced": "Show advanced settings",
-  "DE.Views.ChartSettings.textArea": "Area",
-  "DE.Views.ChartSettings.textBar": "Bar",
   "DE.Views.ChartSettings.textChartType": "Change Chart Type",
-  "DE.Views.ChartSettings.textColumn": "Column",
   "DE.Views.ChartSettings.textEditData": "Edit Data",
   "DE.Views.ChartSettings.textHeight": "Height",
-  "DE.Views.ChartSettings.textLine": "Line",
-  "DE.Views.ChartSettings.textOriginalSize": "Default Size",
-  "DE.Views.ChartSettings.textPie": "Pie",
-  "DE.Views.ChartSettings.textPoint": "XY (Scatter)",
+  "DE.Views.ChartSettings.textOriginalSize": "Actual Size",
   "DE.Views.ChartSettings.textSize": "Size",
-  "DE.Views.ChartSettings.textStock": "Stock",
   "DE.Views.ChartSettings.textStyle": "Style",
-  "DE.Views.ChartSettings.textSurface": "Surface",
   "DE.Views.ChartSettings.textUndock": "Undock from panel",
   "DE.Views.ChartSettings.textWidth": "Width",
   "DE.Views.ChartSettings.textWrap": "Wrapping Style",
@@ -1114,6 +1129,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",
@@ -1164,7 +1195,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Merge Cells",
   "DE.Views.DocumentHolder.moreText": "More variants...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "No variants",
-  "DE.Views.DocumentHolder.originalSizeText": "Default Size",
+  "DE.Views.DocumentHolder.originalSizeText": "Actual Size",
   "DE.Views.DocumentHolder.paragraphText": "Paragraph",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Remove Hyperlink",
   "DE.Views.DocumentHolder.rightText": "Right",
@@ -1291,6 +1322,7 @@
   "DE.Views.DocumentHolder.txtInsertArgAfter": "Insert argument after",
   "DE.Views.DocumentHolder.txtInsertArgBefore": "Insert argument before",
   "DE.Views.DocumentHolder.txtInsertBreak": "Insert manual break",
+  "DE.Views.DocumentHolder.txtInsertCaption": "Insert Caption",
   "DE.Views.DocumentHolder.txtInsertEqAfter": "Insert equation after",
   "DE.Views.DocumentHolder.txtInsertEqBefore": "Insert equation before",
   "DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
@@ -1329,7 +1361,6 @@
   "DE.Views.DocumentHolder.txtUngroup": "Ungroup",
   "DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
   "DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
-  "DE.Views.DocumentHolder.txtInsertCaption": "Insert Caption",
   "DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
   "DE.Views.DropcapSettingsAdvanced.strDropcap": "Drop Cap",
   "DE.Views.DropcapSettingsAdvanced.strMargins": "Margins",
@@ -1372,6 +1403,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",
@@ -1524,7 +1559,7 @@
   "DE.Views.ImageSettings.textHintFlipH": "Flip Horizontally",
   "DE.Views.ImageSettings.textHintFlipV": "Flip Vertically",
   "DE.Views.ImageSettings.textInsert": "Replace Image",
-  "DE.Views.ImageSettings.textOriginalSize": "Default Size",
+  "DE.Views.ImageSettings.textOriginalSize": "Actual Size",
   "DE.Views.ImageSettings.textRotate90": "Rotate 90°",
   "DE.Views.ImageSettings.textRotation": "Rotation",
   "DE.Views.ImageSettings.textSize": "Size",
@@ -1576,7 +1611,7 @@
   "DE.Views.ImageSettingsAdvanced.textMiter": "Miter",
   "DE.Views.ImageSettingsAdvanced.textMove": "Move object with text",
   "DE.Views.ImageSettingsAdvanced.textOptions": "Options",
-  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Default Size",
+  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Actual Size",
   "DE.Views.ImageSettingsAdvanced.textOverlap": "Allow overlap",
   "DE.Views.ImageSettingsAdvanced.textPage": "Page",
   "DE.Views.ImageSettingsAdvanced.textParagraph": "Paragraph",
@@ -1981,14 +2016,14 @@
   "DE.Views.TableSettings.tipRight": "Set outer right border only",
   "DE.Views.TableSettings.tipTop": "Set outer top border only",
   "DE.Views.TableSettings.txtNoBorders": "No borders",
-  "DE.Views.TableSettings.txtTable_TableGrid": "Table Grid",
-  "DE.Views.TableSettings.txtTable_PlainTable": "Plain Table",
-  "DE.Views.TableSettings.txtTable_GridTable": "Grid Table",
-  "DE.Views.TableSettings.txtTable_ListTable": "List Table",
-  "DE.Views.TableSettings.txtTable_Light": "Light",
-  "DE.Views.TableSettings.txtTable_Dark": "Dark",
-  "DE.Views.TableSettings.txtTable_Colorful": "Colorful",
   "DE.Views.TableSettings.txtTable_Accent": "Accent",
+  "DE.Views.TableSettings.txtTable_Colorful": "Colorful",
+  "DE.Views.TableSettings.txtTable_Dark": "Dark",
+  "DE.Views.TableSettings.txtTable_GridTable": "Grid Table",
+  "DE.Views.TableSettings.txtTable_Light": "Light",
+  "DE.Views.TableSettings.txtTable_ListTable": "List Table",
+  "DE.Views.TableSettings.txtTable_PlainTable": "Plain Table",
+  "DE.Views.TableSettings.txtTable_TableGrid": "Table Grid",
   "DE.Views.TableSettingsAdvanced.textAlign": "Alignment",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Alignment",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Spacing between cells",
@@ -2082,6 +2117,7 @@
   "DE.Views.TextArtSettings.textTemplate": "Template",
   "DE.Views.TextArtSettings.textTransform": "Transform",
   "DE.Views.TextArtSettings.txtNoBorders": "No Line",
+  "DE.Views.Toolbar.capBtnAddComment": "Add Comment",
   "DE.Views.Toolbar.capBtnBlankPage": "Blank Page",
   "DE.Views.Toolbar.capBtnColumns": "Columns",
   "DE.Views.Toolbar.capBtnComment": "Comment",
@@ -2093,6 +2129,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",
@@ -2117,13 +2154,9 @@
   "DE.Views.Toolbar.mniImageFromStorage": "Image from Storage",
   "DE.Views.Toolbar.mniImageFromUrl": "Image from URL",
   "DE.Views.Toolbar.strMenuNoFill": "No Fill",
-  "DE.Views.Toolbar.textArea": "Area",
   "DE.Views.Toolbar.textAutoColor": "Automatic",
-  "DE.Views.Toolbar.textBar": "Bar",
   "DE.Views.Toolbar.textBold": "Bold",
   "DE.Views.Toolbar.textBottom": "Bottom: ",
-  "DE.Views.Toolbar.textCharts": "Charts",
-  "DE.Views.Toolbar.textColumn": "Column",
   "DE.Views.Toolbar.textColumnsCustom": "Custom Columns",
   "DE.Views.Toolbar.textColumnsLeft": "Left",
   "DE.Views.Toolbar.textColumnsOne": "One",
@@ -2143,7 +2176,6 @@
   "DE.Views.Toolbar.textItalic": "Italic",
   "DE.Views.Toolbar.textLandscape": "Landscape",
   "DE.Views.Toolbar.textLeft": "Left: ",
-  "DE.Views.Toolbar.textLine": "Line",
   "DE.Views.Toolbar.textMarginsLast": "Last Custom",
   "DE.Views.Toolbar.textMarginsModerate": "Moderate",
   "DE.Views.Toolbar.textMarginsNarrow": "Narrow",
@@ -2157,15 +2189,12 @@
   "DE.Views.Toolbar.textOddPage": "Odd Page",
   "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
   "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
-  "DE.Views.Toolbar.textPie": "Pie",
-  "DE.Views.Toolbar.textPlainControl": "Insert plain text content control",
-  "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: ",
-  "DE.Views.Toolbar.textStock": "Stock",
   "DE.Views.Toolbar.textStrikeout": "Strikethrough",
   "DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles",
@@ -2175,7 +2204,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection",
   "DE.Views.Toolbar.textSubscript": "Subscript",
   "DE.Views.Toolbar.textSuperscript": "Superscript",
-  "DE.Views.Toolbar.textSurface": "Surface",
   "DE.Views.Toolbar.textTabCollaboration": "Collaboration",
   "DE.Views.Toolbar.textTabFile": "File",
   "DE.Views.Toolbar.textTabHome": "Home",
@@ -2220,6 +2248,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",
@@ -2271,6 +2300,11 @@
   "DE.Views.Toolbar.txtScheme7": "Equity",
   "DE.Views.Toolbar.txtScheme8": "Flow",
   "DE.Views.Toolbar.txtScheme9": "Foundry",
+  "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.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",
@@ -322,7 +330,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Usted no tiene permisos para realizar la acción que está intentando hacer.<br> Por favor, contacte con el Administrador del Servidor de Documentos.",
   "DE.Controllers.Main.errorBadImageUrl": "URL de imagen es incorrecto",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Se ha perdido la conexión con servidor. El documento no puede ser editado ahora.",
-  "DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.<br>Al hacer clic en el botón 'OK' se le solicitará que descargue el documento.<br><br>Encuentre más información acerca de la conexión de Servidor de Documentos <a href=\"%1\" target=\"_blank\">aquí</a>",
+  "DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.<br>Al hacer clic en el botón 'OK' se le solicitará que descargue el documento.",
   "DE.Controllers.Main.errorDatabaseConnection": "Error externo.<br>Error de conexión de base de datos. Por favor póngase en contacto con soporte si el error se mantiene.",
   "DE.Controllers.Main.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.",
   "DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.",
@@ -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",
@@ -322,7 +330,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Vous tentez d'exéсuter une action pour laquelle vous ne disposez pas des droits.<br>Veuillez contacter l'administrateur de Document Server.",
   "DE.Controllers.Main.errorBadImageUrl": "L'URL de l'image est incorrecte",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Connexion au serveur perdue. Le document ne peut être modifié en ce moment.",
-  "DE.Controllers.Main.errorConnectToServer": "Impossible d'enregistrer le document. Veuillez vérifier vos paramètres de connexion ou contactez l'administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.<br><br>Trouvez plus d'informations sur la connexion au Serveur de Documents <a href=\"%1\" target=\"_blank\">ici</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Impossible d'enregistrer le document. Veuillez vérifier vos paramètres de connexion ou contactez l'administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.",
   "DE.Controllers.Main.errorDatabaseConnection": "Erreur externe.<br>Erreur de connexion à la base de données. Si l'erreur persiste veillez contactez l'assistance technique.",
   "DE.Controllers.Main.errorDataEncrypted": "Les modifications chiffrées ont été reçues, elle ne peuvent pas être déchiffrées.",
   "DE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
@@ -331,6 +339,7 @@
   "DE.Controllers.Main.errorEditingSaveas": "Une erreure s'est produite lors du travail avec le document.<br>Utilisez l'option 'Enregistrer comme...' pour enregistrer une copie de sauvegarde  sur le disque dur de votre ordinateur. ",
   "DE.Controllers.Main.errorEmailClient": "Pas de client messagerie trouvé",
   "DE.Controllers.Main.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut être ouvert.",
+  "DE.Controllers.Main.errorFileSizeExceed": "La taille du fichier dépasse les limites établies sur votre serveur.<br>Veuillez contacter votre administrateur de Document Server pour obtenir plus d'information.  ",
   "DE.Controllers.Main.errorForceSave": "Une erreur est survenue lors de l'enregistrement du fichier. Veuillez utiliser l'option «Télécharger en tant que» pour enregistrer le fichier sur le disque dur de votre ordinateur ou réessayer plus tard.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu",
   "DE.Controllers.Main.errorKeyExpire": "Descripteur clé a expiré",
@@ -1000,21 +1009,24 @@
   "DE.Views.BookmarksDialog.textSort": "Trier par",
   "DE.Views.BookmarksDialog.textTitle": "Signets",
   "DE.Views.BookmarksDialog.txtInvalidName": "Nom du signet ne peut pas contenir que des lettres, des  chiffres et des barres de soulignement et doit commencer avec une lettre",
+  "DE.Views.CellsAddDialog.textCol": "Colonnes",
+  "DE.Views.CellsAddDialog.textDown": "Au-dessous du curseur",
+  "DE.Views.CellsAddDialog.textLeft": "Vers la gauche",
+  "DE.Views.CellsAddDialog.textRight": "Vers la droite",
+  "DE.Views.CellsAddDialog.textRow": "Lignes",
+  "DE.Views.CellsAddDialog.textTitle": "Inserer Plusieurs",
+  "DE.Views.CellsAddDialog.textUp": "au-dessus du curseur",
+  "DE.Views.CellsRemoveDialog.textCol": "Supprimer la colonne entière",
+  "DE.Views.CellsRemoveDialog.textLeft": "Décaler les cellules vers la gauche",
+  "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",
@@ -1117,6 +1129,7 @@
   "DE.Views.DocumentHolder.textArrangeBackward": "Reculer",
   "DE.Views.DocumentHolder.textArrangeForward": "Avancer",
   "DE.Views.DocumentHolder.textArrangeFront": "Mettre au premier plan",
+  "DE.Views.DocumentHolder.textCells": "Cellules",
   "DE.Views.DocumentHolder.textContentControls": "Contrôle du contenu",
   "DE.Views.DocumentHolder.textContinueNumbering": "Continuer la numérotation",
   "DE.Views.DocumentHolder.textCopy": "Copier",
@@ -1148,6 +1161,7 @@
   "DE.Views.DocumentHolder.textRotate90": "Faire pivoter à droite de 90°",
   "DE.Views.DocumentHolder.textSeparateList": "Liste séparée",
   "DE.Views.DocumentHolder.textSettings": "Paramètres",
+  "DE.Views.DocumentHolder.textSeveral": "Plusieurs Lignes/Colonnes ",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Aligner en bas",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Aligner au centre",
   "DE.Views.DocumentHolder.textShapeAlignLeft": "Aligner à gauche",
@@ -1164,6 +1178,7 @@
   "DE.Views.DocumentHolder.textUpdateTOC": "Actualiser la table des matières",
   "DE.Views.DocumentHolder.textWrap": "Style d'habillage",
   "DE.Views.DocumentHolder.tipIsLocked": "Cet élément est en cours d'édition par un autre utilisateur.",
+  "DE.Views.DocumentHolder.toDictionaryText": "Ajouter au dictionnaire",
   "DE.Views.DocumentHolder.txtAddBottom": "Ajouter bordure inférieure",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Ajouter barre de fraction",
   "DE.Views.DocumentHolder.txtAddHor": "Ajouter une ligne horizontale",
@@ -1226,6 +1241,7 @@
   "DE.Views.DocumentHolder.txtOverwriteCells": "Remplacer les cellules",
   "DE.Views.DocumentHolder.txtPasteSourceFormat": "Garder la mise en forme source",
   "DE.Views.DocumentHolder.txtPressLink": "Appuyez sur Ctrl et cliquez sur le lien",
+  "DE.Views.DocumentHolder.txtPrintSelection": "Imprimer la sélection",
   "DE.Views.DocumentHolder.txtRemFractionBar": "Supprimer la barre de fraction",
   "DE.Views.DocumentHolder.txtRemLimit": "Supprimer la limite",
   "DE.Views.DocumentHolder.txtRemoveAccentChar": "Supprimer le caractère d'accent",
@@ -1317,6 +1333,7 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Créez un nouveau document texte vierge que vous serez en mesure de styliser et de formater après sa création au cours de la modification. Ou choisissez un des modèles où certains styles sont déjà pré-appliqués pour commencer un document d'un certain type ou objectif.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nouveau document texte ",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Pas de modèles",
+  "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Appliquer",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Ajouter un auteur",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Ajouter du texte",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Application",
@@ -1325,12 +1342,16 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Commentaire",
   "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Créé",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Chargement en cours...",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Dernière modification par",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Dernière modification",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Propriétaire",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Pages",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Paragraphes",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Emplacement",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Personnes qui ont des droits",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Symboles avec des espaces",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistiques",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Sujet",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Symboles",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titre du document",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Chargé",
@@ -1373,6 +1394,7 @@
   "DE.Views.FileMenuPanels.Settings.textAlignGuides": "Guides d'alignement",
   "DE.Views.FileMenuPanels.Settings.textAutoRecover": "Récupération automatique",
   "DE.Views.FileMenuPanels.Settings.textAutoSave": "Enregistrement automatique",
+  "DE.Views.FileMenuPanels.Settings.textCompatible": "Compatibilité",
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Désactivé",
   "DE.Views.FileMenuPanels.Settings.textForceSave": "Enregistrer sur le serveur",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Chaque minute",
@@ -1659,33 +1681,52 @@
   "DE.Views.ParagraphSettingsAdvanced.strBorders": "Bordures et remplissage",
   "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Saut de page avant",
   "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double barré",
+  "DE.Views.ParagraphSettingsAdvanced.strIndent": "Retraits",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "A gauche",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Interligne",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Niveau hiérarchique",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "A droite",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "Après",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Avant",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Spécial",
   "DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Lignes solidaires",
   "DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Paragraphes solidaires",
   "DE.Views.ParagraphSettingsAdvanced.strMargins": "Marges intérieures",
   "DE.Views.ParagraphSettingsAdvanced.strOrphan": "Éviter orphelines",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Police",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Retraits et emplacement",
+  "DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Enchaînements",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Emplacement",
   "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Petites majuscules",
+  "DE.Views.ParagraphSettingsAdvanced.strSomeParagraphSpace": "Ne pas ajouter d'intervalle entre paragraphes du même style",
+  "DE.Views.ParagraphSettingsAdvanced.strSpacing": "Espacement",
   "DE.Views.ParagraphSettingsAdvanced.strStrike": "Barré",
   "DE.Views.ParagraphSettingsAdvanced.strSubscript": "Indice",
   "DE.Views.ParagraphSettingsAdvanced.strSuperscript": "Exposant",
   "DE.Views.ParagraphSettingsAdvanced.strTabs": "Tabulation",
   "DE.Views.ParagraphSettingsAdvanced.textAlign": "Alignement",
+  "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "Au moins ",
+  "DE.Views.ParagraphSettingsAdvanced.textAuto": "Plusieurs",
   "DE.Views.ParagraphSettingsAdvanced.textBackColor": "Couleur d'arrière-plan",
+  "DE.Views.ParagraphSettingsAdvanced.textBodyText": "Texte simple",
   "DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Couleur",
   "DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Cliquez sur le diagramme ou utilisez les boutons pour sélectionner les bordures et appliquez le style choisi",
   "DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Taille de bordure",
   "DE.Views.ParagraphSettingsAdvanced.textBottom": "En bas",
+  "DE.Views.ParagraphSettingsAdvanced.textCentered": "Centré",
   "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Espacement des caractères",
   "DE.Views.ParagraphSettingsAdvanced.textDefault": "Par défaut",
   "DE.Views.ParagraphSettingsAdvanced.textEffects": "Effets",
+  "DE.Views.ParagraphSettingsAdvanced.textExact": "Exactement",
+  "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "Première ligne",
+  "DE.Views.ParagraphSettingsAdvanced.textHanging": "Suspendu",
+  "DE.Views.ParagraphSettingsAdvanced.textJustified": "Justifié",
   "DE.Views.ParagraphSettingsAdvanced.textLeader": "Guide",
   "DE.Views.ParagraphSettingsAdvanced.textLeft": "A gauche",
+  "DE.Views.ParagraphSettingsAdvanced.textLevel": "Niveau",
   "DE.Views.ParagraphSettingsAdvanced.textNewColor": "Couleur personnalisée",
   "DE.Views.ParagraphSettingsAdvanced.textNone": "Aucune",
+  "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(aucun)",
   "DE.Views.ParagraphSettingsAdvanced.textPosition": "Position",
   "DE.Views.ParagraphSettingsAdvanced.textRemove": "Supprimer",
   "DE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Supprimer tout",
@@ -1706,6 +1747,7 @@
   "DE.Views.ParagraphSettingsAdvanced.tipOuter": "Seulement bordure extérieure",
   "DE.Views.ParagraphSettingsAdvanced.tipRight": "Seulement bordure droite",
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Seulement bordure supérieure",
+  "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Pas de bordures",
   "DE.Views.RightMenu.txtChartSettings": "Paramètres du graphique",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Paramètres d'en-têtes et de pieds de page",
@@ -1873,6 +1915,14 @@
   "DE.Views.TableSettings.tipRight": "Seulement bordure extérieure droite",
   "DE.Views.TableSettings.tipTop": "Seulement bordure extérieure supérieure",
   "DE.Views.TableSettings.txtNoBorders": "Pas de bordures",
+  "DE.Views.TableSettings.txtTable_Accent": "Accentuation",
+  "DE.Views.TableSettings.txtTable_Colorful": "En couleurs",
+  "DE.Views.TableSettings.txtTable_Dark": "Foncé",
+  "DE.Views.TableSettings.txtTable_GridTable": "Table Grille",
+  "DE.Views.TableSettings.txtTable_Light": "Clair",
+  "DE.Views.TableSettings.txtTable_ListTable": "Tableau de listes",
+  "DE.Views.TableSettings.txtTable_PlainTable": "Tableau simple",
+  "DE.Views.TableSettings.txtTable_TableGrid": "Grille du tableau",
   "DE.Views.TableSettingsAdvanced.textAlign": "Alignement",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Alignement",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Espacement entre les cellules",
@@ -2001,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",
@@ -2027,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",
@@ -2041,14 +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",
@@ -2058,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",
@@ -2127,6 +2169,7 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Caractères non imprimables",
   "DE.Views.Toolbar.tipSynchronize": "Le document a été modifié par un autre utilisateur. Cliquez pour enregistrer vos modifications et recharger des mises à jour.",
   "DE.Views.Toolbar.tipUndo": "Annuler",
+  "DE.Views.Toolbar.tipWatermark": "Modifier le filigrane",
   "DE.Views.Toolbar.txtDistribHor": "Distribuer horizontalement",
   "DE.Views.Toolbar.txtDistribVert": "Distribuer verticalement",
   "DE.Views.Toolbar.txtMarginAlign": "Aligner par rapport à la marge",
@@ -2156,9 +2199,24 @@
   "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
   "DE.Views.WatermarkSettingsDialog.textBold": "Gras",
   "DE.Views.WatermarkSettingsDialog.textColor": "Couleur du texte",
+  "DE.Views.WatermarkSettingsDialog.textDiagonal": "Diagonale",
+  "DE.Views.WatermarkSettingsDialog.textFont": "Police",
+  "DE.Views.WatermarkSettingsDialog.textFromFile": "Depuis un fichier",
+  "DE.Views.WatermarkSettingsDialog.textFromUrl": "D'une URL",
+  "DE.Views.WatermarkSettingsDialog.textHor": "Horizontal",
+  "DE.Views.WatermarkSettingsDialog.textImageW": "Image en filigrane",
+  "DE.Views.WatermarkSettingsDialog.textItalic": "Italique",
+  "DE.Views.WatermarkSettingsDialog.textLanguage": "Langue",
+  "DE.Views.WatermarkSettingsDialog.textLayout": "Mise en page",
   "DE.Views.WatermarkSettingsDialog.textNewColor": "Ajouter une nouvelle couleur personnalisée",
+  "DE.Views.WatermarkSettingsDialog.textNone": "Aucun",
+  "DE.Views.WatermarkSettingsDialog.textScale": "Échelle",
+  "DE.Views.WatermarkSettingsDialog.textStrikeout": "Barré",
   "DE.Views.WatermarkSettingsDialog.textText": "Texte",
   "DE.Views.WatermarkSettingsDialog.textTextW": "Filigrane de texte",
   "DE.Views.WatermarkSettingsDialog.textTitle": "Paramètres de filigrane",
-  "DE.Views.WatermarkSettingsDialog.textUnderline": "Souligné"
+  "DE.Views.WatermarkSettingsDialog.textTransparency": "Semi-transparent",
+  "DE.Views.WatermarkSettingsDialog.textUnderline": "Souligné",
+  "DE.Views.WatermarkSettingsDialog.tipFontName": "Nom de la police",
+  "DE.Views.WatermarkSettingsDialog.tipFontSize": "Taille de police"
 }

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",
@@ -314,7 +322,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.<br>Vegye fel a kapcsolatot a Document Server adminisztrátorával.",
   "DE.Controllers.Main.errorBadImageUrl": "Hibás kép URL",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Elveszett a kapcsolat a szerverrel. A dokumentum jelenleg nem szerkeszthető.",
-  "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.<br>Ha az 'OK'-ra kattint letöltheti a dokumentumot.<br><br>Bővebb információk a Dokumentum Szerverhez kapcsolódásról <a href=\"%1\" target=\"_blank\">itt</a> találhat.",
+  "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.<br>Ha az 'OK'-ra kattint letöltheti a dokumentumot.",
   "DE.Controllers.Main.errorDatabaseConnection": "Külső hiba.<br>Adatbázis-kapcsolati hiba. Ha a hiba továbbra is fennáll, lépjen kapcsolatba a rendszer támogatással.",
   "DE.Controllers.Main.errorDataEncrypted": "Titkosított változások érkeztek, melyek feloldása sikertelen.",
   "DE.Controllers.Main.errorDataRange": "Hibás adattartomány.",
@@ -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",
@@ -324,7 +332,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.<br>Si prega di contattare l'amministratore del Server dei Documenti.",
   "DE.Controllers.Main.errorBadImageUrl": "URL dell'immagine non corretto",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Connessione al server persa. Impossibile modificare il documento.",
-  "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.<br><br>Per maggiori dettagli sulla connessione al Document Server  <a href=\"%1\" target=\"_blank\">clicca qui</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.",
   "DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.",
   "DE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.",
   "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
@@ -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": "スタイルなし",
@@ -173,7 +180,7 @@
   "DE.Controllers.Main.downloadTextText": "ドキュメントのダウンロード中...",
   "DE.Controllers.Main.downloadTitleText": "ドキュメントのダウンロード中",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "サーバーとの接続が失われました。今、文書を編集することができません。",
-  "DE.Controllers.Main.errorConnectToServer": "文書を保存できませんでした。接続設定を確認するか、管理者にお問い合わせください。<br>OKボタンをクリックするとドキュメントをダウンロードするように求められます。<br><br>ドキュメントサーバーの接続の詳細情報を見つけます:<a href=\"%1\" target=\"_blank\">ここに</a>",
+  "DE.Controllers.Main.errorConnectToServer": "文書を保存できませんでした。接続設定を確認するか、管理者にお問い合わせください。<br>OKボタンをクリックするとドキュメントをダウンロードするように求められます。",
   "DE.Controllers.Main.errorDatabaseConnection": "外部エラーです。<br>データベース接続エラーです。この問題は解決しない場合は、サポートにお問い合わせください。",
   "DE.Controllers.Main.errorDataRange": "データ範囲が正しくありません",
   "DE.Controllers.Main.errorDefaultMessage": "エラー コード:%1",
@@ -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

@@ -298,7 +298,7 @@
   "DE.Controllers.Main.errorAccessDeny": "권한이없는 작업을 수행하려고합니다. <br> 문서 관리자에게 문의하십시오.",
   "DE.Controllers.Main.errorBadImageUrl": "이미지 URL이 잘못되었습니다.",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "서버 연결이 끊어졌습니다. 지금 문서를 편집 할 수 없습니다.",
-  "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.<br>'확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.<br ><br>Document Server 연결에 대한 추가 정보 찾기 <a href=\"%1\" target=\"_blank\">여기</a> ",
+  "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.<br>'확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.",
   "DE.Controllers.Main.errorDatabaseConnection": "외부 오류. <br> 데이터베이스 연결 오류입니다. 오류가 계속 발생하면 지원부에 문의하십시오.",
   "DE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.",
   "DE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1",
@@ -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

@@ -295,7 +295,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Jūs mēģināt veikt darbību, kuru nedrīkstat veikt.<br>Lūdzu, sazinieties ar savu dokumentu servera administratoru.",
   "DE.Controllers.Main.errorBadImageUrl": "Nav pareizs attēla URL",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.<br>Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.<br><br>Uzziniet vairāk par dokumentu servera pieslēgšanu <a href=\"%1\" target=\"_blank\">šeit</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.<br>Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
   "DE.Controllers.Main.errorDataRange": "Incorrect data range.",
   "DE.Controllers.Main.errorDefaultMessage": "Kļūdas kods: %1",
@@ -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",
@@ -317,7 +325,7 @@
   "DE.Controllers.Main.errorAccessDeny": "U probeert een actie uit te voeren waarvoor u geen rechten hebt.<br>Neem contact op met de beheerder van de documentserver.",
   "DE.Controllers.Main.errorBadImageUrl": "URL afbeelding is onjuist",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbinding met server is verbroken. Het document kan op dit moment niet worden bewerkt.",
-  "DE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.<br>Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.<br><br>Meer informatie over verbindingen met de documentserver is <a href=\"%1\" target=\"_blank\">hier</a> te vinden.",
+  "DE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.<br>Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externe fout.<br>Fout in databaseverbinding. Neem contact op met Support als deze fout zich blijft voordoen.",
   "DE.Controllers.Main.errorDataRange": "Onjuist gegevensbereik.",
   "DE.Controllers.Main.errorDefaultMessage": "Foutcode: %1",
@@ -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",
@@ -272,7 +280,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Próbujesz wykonać działanie, na które nie masz uprawnień.<br>Proszę skontaktować się z administratorem serwera dokumentów.",
   "DE.Controllers.Main.errorBadImageUrl": "Adres URL obrazu jest błędny",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Połączenie z serwerem zostało utracone. Nie można teraz edytować dokumentu.",
-  "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.<br>Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.<br><br>Dowiedz się więcej o połączeniu serwera dokumentów <a href=\"%1\" target=\"_blank\">tutaj</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.<br>Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Błąd zewnętrzny.<br>Błąd połączenia z bazą danych. W przypadku wystąpienia błędu należy skontaktować się z pomocą techniczną.",
   "DE.Controllers.Main.errorDataRange": "Błędny zakres danych.",
   "DE.Controllers.Main.errorDefaultMessage": "Kod błędu: %1",
@@ -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",
@@ -274,7 +282,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Você está tentando executar uma ação que você não tem direitos. <br> Contate o administrador do Servidor de Documentos.",
   "DE.Controllers.Main.errorBadImageUrl": "URL de imagem está incorreta",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Conexão com servidor perdida. O documento não pode ser editado neste momento.",
-  "DE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador.<br>Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento. <br><br>Encontre mais informações sobre como conecta ao Document Server <a href=\"%1\" target=\"_blank\">aqui</a>",
+  "DE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador.<br>Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento.",
   "DE.Controllers.Main.errorDatabaseConnection": "Erro externo.<br>Erro de conexão ao banco de dados. Entre em contato com o suporte caso o erro persista.",
   "DE.Controllers.Main.errorDataRange": "Intervalo de dados incorreto.",
   "DE.Controllers.Main.errorDefaultMessage": "Código do erro: %1",
@@ -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

@@ -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.textCharts": "Диаграммы",
+  "Common.define.chartData.textColumn": "Гистограмма",
+  "Common.define.chartData.textLine": "График",
+  "Common.define.chartData.textPie": "Круговая",
+  "Common.define.chartData.textPoint": "Точечная",
+  "Common.define.chartData.textStock": "Биржевая",
+  "Common.define.chartData.textSurface": "Поверхность",
   "Common.UI.ComboBorderSize.txtNoBorders": "Без границ",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ",
   "Common.UI.ComboDataView.emptyComboText": "Без стилей",
@@ -221,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": "Отслеживать изменения",
@@ -235,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": "Измененный документ",
@@ -299,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": "Внимание",
@@ -324,7 +345,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.Controllers.Main.errorBadImageUrl": "Неправильный URL-адрес изображения",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Потеряно соединение с сервером. В данный момент нельзя отредактировать документ.",
-  "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.<br><br>Дополнительную информацию о подключении Сервера документов можно найти <a href=\"%1\" target=\"_blank\">здесь</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.",
   "DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.",
   "DE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.",
   "DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
@@ -333,6 +354,7 @@
   "DE.Controllers.Main.errorEditingSaveas": "В ходе работы с документом произошла ошибка.<br>Используйте опцию 'Сохранить как...', чтобы сохранить резервную копию файла на жесткий диск компьютера.",
   "DE.Controllers.Main.errorEmailClient": "Не найден почтовый клиент",
   "DE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
+  "DE.Controllers.Main.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.<br>Обратитесь к администратору Сервера документов для получения дополнительной информации.",
   "DE.Controllers.Main.errorForceSave": "При сохранении файла произошла ошибка. Используйте опцию 'Скачать как', чтобы сохранить файл на жестком диске компьютера или повторите попытку позже.",
   "DE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
   "DE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек",
@@ -347,9 +369,10 @@
   "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>но не сможете скачать или напечатать его до восстановления подключения.",
+  "DE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,<br>но не сможете скачать или напечатать его до восстановления подключения и обновления страницы.",
   "DE.Controllers.Main.leavePageText": "Документ содержит несохраненные изменения. Чтобы сохранить их, нажмите \"Остаться на этой странице\", затем \"Сохранить\". Нажмите \"Покинуть эту страницу\", чтобы сбросить все несохраненные изменения.",
   "DE.Controllers.Main.loadFontsTextText": "Загрузка данных...",
   "DE.Controllers.Main.loadFontsTitleText": "Загрузка данных",
@@ -364,7 +387,7 @@
   "DE.Controllers.Main.mailMergeLoadFileText": "Загрузка источника данных...",
   "DE.Controllers.Main.mailMergeLoadFileTitle": "Загрузка источника данных",
   "DE.Controllers.Main.notcriticalErrorTitle": "Предупреждение",
-  "DE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка",
+  "DE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка.",
   "DE.Controllers.Main.openTextText": "Открытие документа...",
   "DE.Controllers.Main.openTitleText": "Открытие документа",
   "DE.Controllers.Main.printTextText": "Печать документа...",
@@ -372,7 +395,7 @@
   "DE.Controllers.Main.reloadButtonText": "Обновить страницу",
   "DE.Controllers.Main.requestEditFailedMessageText": "В настоящее время документ редактируется. Пожалуйста, попробуйте позже.",
   "DE.Controllers.Main.requestEditFailedTitleText": "Доступ запрещён",
-  "DE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка",
+  "DE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка.",
   "DE.Controllers.Main.savePreparingText": "Подготовка к сохранению",
   "DE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...",
   "DE.Controllers.Main.saveTextText": "Сохранение документа...",
@@ -421,12 +444,15 @@
   "DE.Controllers.Main.txtHyperlink": "Гиперссылка",
   "DE.Controllers.Main.txtIndTooLarge": "Индекс слишком большой",
   "DE.Controllers.Main.txtLines": "Линии",
+  "DE.Controllers.Main.txtMainDocOnly": "Ошибка! Только основной документ.",
   "DE.Controllers.Main.txtMath": "Математические знаки",
   "DE.Controllers.Main.txtMissArg": "Отсутствует аргумент",
   "DE.Controllers.Main.txtMissOperator": "Отсутствует оператор",
   "DE.Controllers.Main.txtNeedSynchronize": "Есть обновления",
   "DE.Controllers.Main.txtNoTableOfContents": "Элементов оглавления не найдено.",
+  "DE.Controllers.Main.txtNoText": "Ошибка! В документе отсутствует текст указанного стиля.",
   "DE.Controllers.Main.txtNotInTable": "Не в таблице",
+  "DE.Controllers.Main.txtNotValidBookmark": "Ошибка! Неверная ссылка закладки.",
   "DE.Controllers.Main.txtOddPage": "Нечетная страница",
   "DE.Controllers.Main.txtOnPage": "на странице",
   "DE.Controllers.Main.txtRectangles": "Прямоугольники",
@@ -646,7 +672,6 @@
   "DE.Controllers.Main.warnNoLicense": "Эта версия редакторов %1 имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов %1 имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
   "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
-  "DE.Controllers.Main.txtNoText": "Ошибка! Текст указанного стиля в документе отсутствует.",
   "DE.Controllers.Navigation.txtBeginning": "Начало документа",
   "DE.Controllers.Navigation.txtGotoBeginning": "Перейти в начало документа",
   "DE.Controllers.Statusbar.textHasChanges": "Отслежены новые изменения",
@@ -661,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": "Пределы и логарифмы",
@@ -990,6 +1016,8 @@
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Дзета",
   "DE.Controllers.Viewport.textFitPage": "По размеру страницы",
   "DE.Controllers.Viewport.textFitWidth": "По ширине",
+  "DE.Views.AddNewCaptionLabelDialog.textLabel": "Подпись:",
+  "DE.Views.AddNewCaptionLabelDialog.textLabelError": "Подпись не должна быть пустой.",
   "DE.Views.BookmarksDialog.textAdd": "Добавить",
   "DE.Views.BookmarksDialog.textBookmarkName": "Имя закладки",
   "DE.Views.BookmarksDialog.textClose": "Закрыть",
@@ -1003,21 +1031,46 @@
   "DE.Views.BookmarksDialog.textSort": "Порядок",
   "DE.Views.BookmarksDialog.textTitle": "Закладки",
   "DE.Views.BookmarksDialog.txtInvalidName": "Имя закладки может содержать только буквы, цифры и знаки подчеркивания и должно начинаться с буквы.",
+  "DE.Views.CaptionDialog.textAdd": "Добавить подпись",
+  "DE.Views.CaptionDialog.textAfter": "После",
+  "DE.Views.CaptionDialog.textBefore": "Перед",
+  "DE.Views.CaptionDialog.textCaption": "Название",
+  "DE.Views.CaptionDialog.textChapter": "Начинается со стиля:",
+  "DE.Views.CaptionDialog.textChapterInc": "Включить номер главы",
+  "DE.Views.CaptionDialog.textColon": "двоеточие",
+  "DE.Views.CaptionDialog.textDash": "тире",
+  "DE.Views.CaptionDialog.textDelete": "Удалить подпись",
+  "DE.Views.CaptionDialog.textEquation": "Уравнение",
+  "DE.Views.CaptionDialog.textExamples": "Примеры: Таблица 2-A, Изображение 1.IV",
+  "DE.Views.CaptionDialog.textExclude": "Исключить подпись из названия",
+  "DE.Views.CaptionDialog.textFigure": "Рисунок",
+  "DE.Views.CaptionDialog.textHyphen": "дефис",
+  "DE.Views.CaptionDialog.textInsert": "Вставить",
+  "DE.Views.CaptionDialog.textLabel": "Подпись",
+  "DE.Views.CaptionDialog.textLongDash": "длинное тире",
+  "DE.Views.CaptionDialog.textNumbering": "Нумерация",
+  "DE.Views.CaptionDialog.textPeriod": "точка",
+  "DE.Views.CaptionDialog.textSeparator": "Использовать разделитель",
+  "DE.Views.CaptionDialog.textTable": "Таблица",
+  "DE.Views.CaptionDialog.textTitle": "Вставить название",
+  "DE.Views.CellsAddDialog.textCol": "Столбцы",
+  "DE.Views.CellsAddDialog.textDown": "Под курсором",
+  "DE.Views.CellsAddDialog.textLeft": "Слева",
+  "DE.Views.CellsAddDialog.textRight": "Справа",
+  "DE.Views.CellsAddDialog.textRow": "Строки",
+  "DE.Views.CellsAddDialog.textTitle": "Вставить несколько",
+  "DE.Views.CellsAddDialog.textUp": "Над курсором",
+  "DE.Views.CellsRemoveDialog.textCol": "Удалить весь столбец",
+  "DE.Views.CellsRemoveDialog.textLeft": "Ячейки со сдвигом влево",
+  "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.textOriginalSize": "Реальный размер",
   "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": "Стиль обтекания",
@@ -1093,7 +1146,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Объединить ячейки",
   "DE.Views.DocumentHolder.moreText": "Больше вариантов...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "Нет вариантов",
-  "DE.Views.DocumentHolder.originalSizeText": "Размер по умолчанию",
+  "DE.Views.DocumentHolder.originalSizeText": "Реальный размер",
   "DE.Views.DocumentHolder.paragraphText": "Абзац",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку",
   "DE.Views.DocumentHolder.rightText": "По правому краю",
@@ -1120,6 +1173,7 @@
   "DE.Views.DocumentHolder.textArrangeBackward": "Перенести назад",
   "DE.Views.DocumentHolder.textArrangeForward": "Перенести вперед",
   "DE.Views.DocumentHolder.textArrangeFront": "Перенести на передний план",
+  "DE.Views.DocumentHolder.textCells": "Ячейки",
   "DE.Views.DocumentHolder.textContentControls": "Элемент управления содержимым",
   "DE.Views.DocumentHolder.textContinueNumbering": "Продолжить нумерацию",
   "DE.Views.DocumentHolder.textCopy": "Копировать",
@@ -1151,6 +1205,7 @@
   "DE.Views.DocumentHolder.textRotate90": "Повернуть на 90° по часовой стрелке",
   "DE.Views.DocumentHolder.textSeparateList": "Разделить список",
   "DE.Views.DocumentHolder.textSettings": "Настройки",
+  "DE.Views.DocumentHolder.textSeveral": "Несколько строк/столбцов",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Выровнять по нижнему краю",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Выровнять по центру",
   "DE.Views.DocumentHolder.textShapeAlignLeft": "Выровнять по левому краю",
@@ -1218,6 +1273,7 @@
   "DE.Views.DocumentHolder.txtInsertArgAfter": "Вставить аргумент после",
   "DE.Views.DocumentHolder.txtInsertArgBefore": "Вставить аргумент перед",
   "DE.Views.DocumentHolder.txtInsertBreak": "Вставить принудительный разрыв",
+  "DE.Views.DocumentHolder.txtInsertCaption": "Вставить название",
   "DE.Views.DocumentHolder.txtInsertEqAfter": "Вставить уравнение после",
   "DE.Views.DocumentHolder.txtInsertEqBefore": "Вставить уравнение перед",
   "DE.Views.DocumentHolder.txtKeepTextOnly": "Сохранить только текст",
@@ -1322,6 +1378,7 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Создайте новый пустой текстовый документ, к которому Вы сможете применить стили и отформатировать при редактировании после того, как он создан. Или выберите один из шаблонов, чтобы создать документ определенного типа или предназначения, где уже предварительно применены некоторые стили.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Новый текстовый документ",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Шаблоны отсутствуют",
+  "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Применить",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Добавить автора",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Добавить текст",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Приложение",
@@ -1449,7 +1506,7 @@
   "DE.Views.ImageSettings.textHintFlipH": "Отразить слева направо",
   "DE.Views.ImageSettings.textHintFlipV": "Отразить сверху вниз",
   "DE.Views.ImageSettings.textInsert": "Заменить изображение",
-  "DE.Views.ImageSettings.textOriginalSize": "По умолчанию",
+  "DE.Views.ImageSettings.textOriginalSize": "Реальный размер",
   "DE.Views.ImageSettings.textRotate90": "Повернуть на 90°",
   "DE.Views.ImageSettings.textRotation": "Поворот",
   "DE.Views.ImageSettings.textSize": "Размер",
@@ -1501,7 +1558,7 @@
   "DE.Views.ImageSettingsAdvanced.textMiter": "Прямой",
   "DE.Views.ImageSettingsAdvanced.textMove": "Перемещать с текстом",
   "DE.Views.ImageSettingsAdvanced.textOptions": "Параметры",
-  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "По умолчанию",
+  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Реальный размер",
   "DE.Views.ImageSettingsAdvanced.textOverlap": "Разрешить перекрытие",
   "DE.Views.ImageSettingsAdvanced.textPage": "Страницы",
   "DE.Views.ImageSettingsAdvanced.textParagraph": "Абзаца",
@@ -1906,14 +1963,14 @@
   "DE.Views.TableSettings.tipRight": "Задать только внешнюю правую границу",
   "DE.Views.TableSettings.tipTop": "Задать только внешнюю верхнюю границу",
   "DE.Views.TableSettings.txtNoBorders": "Без границ",
-  "DE.Views.TableSettings.txtTable_TableGrid": "Сетка таблицы",
-  "DE.Views.TableSettings.txtTable_PlainTable": "Таблица простая",
-  "DE.Views.TableSettings.txtTable_GridTable": "Таблица-сетка",
-  "DE.Views.TableSettings.txtTable_ListTable": "Список-таблица",
-  "DE.Views.TableSettings.txtTable_Light": "светлая",
-  "DE.Views.TableSettings.txtTable_Dark": "темная",
-  "DE.Views.TableSettings.txtTable_Colorful": "цветная",
   "DE.Views.TableSettings.txtTable_Accent": "акцент",
+  "DE.Views.TableSettings.txtTable_Colorful": "цветная",
+  "DE.Views.TableSettings.txtTable_Dark": "темная",
+  "DE.Views.TableSettings.txtTable_GridTable": "Таблица-сетка",
+  "DE.Views.TableSettings.txtTable_Light": "светлая",
+  "DE.Views.TableSettings.txtTable_ListTable": "Список-таблица",
+  "DE.Views.TableSettings.txtTable_PlainTable": "Таблица простая",
+  "DE.Views.TableSettings.txtTable_TableGrid": "Сетка таблицы",
   "DE.Views.TableSettingsAdvanced.textAlign": "Выравнивание",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Выравнивание",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Интервалы между ячейками",
@@ -2007,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": "Комментарий",
@@ -2018,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": "Надпись",
@@ -2042,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": "Одна",
@@ -2068,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": "Узкие",
@@ -2082,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": "Удалить все пользовательские стили",
@@ -2100,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": "Главная",
@@ -2145,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",
@@ -276,7 +284,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Pokúšate sa vykonať akciu, na ktorú nemáte práva.<br>Prosím, kontaktujte svojho správcu dokumentového servera. ",
   "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávna",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Serverové pripojenie sa stratilo. Práve teraz nie je možné dokument upravovať.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.<br>Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.<br><br>Viac informácií o pripojení dokumentového servera nájdete <a href=\"%1\" target=\"_blank\">tu</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.<br>Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externá chyba.<br>Chyba spojenia databázy. Prosím, kontaktujte podporu ak chyba pretrváva. ",
   "DE.Controllers.Main.errorDataRange": "Nesprávny rozsah údajov.",
   "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1",
@@ -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",
@@ -170,7 +177,7 @@
   "DE.Controllers.Main.downloadTextText": "Prenašanje dokumenta...",
   "DE.Controllers.Main.downloadTitleText": "Prenašanje dokumenta",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Povezava s strežnikom izgubljena. Dokument v tem trenutku ne more biti urejen.",
-  "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
+  "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.",
   "DE.Controllers.Main.errorDatabaseConnection": "Zunanja napaka.<br>Napaka povezave baze podatkov. V primeru, da napaka ni odpravljena, prosim kontaktirajte ekipo za pomoč.",
   "DE.Controllers.Main.errorDataRange": "Nepravilen obseg podatkov.",
   "DE.Controllers.Main.errorDefaultMessage": "Koda napake: %1",
@@ -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",
@@ -251,7 +259,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Hakiniz olmayan bir eylem gerçekleştirmeye çalışıyorsunuz. <br> Lütfen Document Server yöneticinize başvurun.",
   "DE.Controllers.Main.errorBadImageUrl": "Resim URL'si yanlış",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Sunucu bağlantısı kesildi. Döküman şu an düzenlenemez.",
-  "DE.Controllers.Main.errorConnectToServer": "Belge kaydedilemedi. Lütfen internet bağlantınızı kontrol edin veya yöneticiniz ile iletişime geçin. <br>'TAMAM' tuşuna tıkladığınızda belgeyi indirebileceksiniz.<br><br>Belge Sunucusuna bağlanma konusunda daha fazla bilgi için <a href=\"%1\" target=\"_blank\">buraya</a> tıklayın",
+  "DE.Controllers.Main.errorConnectToServer": "Belge kaydedilemedi. Lütfen internet bağlantınızı kontrol edin veya yöneticiniz ile iletişime geçin. <br>'TAMAM' tuşuna tıkladığınızda belgeyi indirebileceksiniz.",
   "DE.Controllers.Main.errorDatabaseConnection": "Harci hata. <br>Veri tabanı bağlantı hatası. Hata devam ederse lütfen destek ile iletişime geçin.",
   "DE.Controllers.Main.errorDataRange": "Yanlış veri aralığı.",
   "DE.Controllers.Main.errorDefaultMessage": "Hata kodu: %1",
@@ -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

@@ -15,7 +15,7 @@
   "Common.Controllers.ReviewChanges.textBaseline": "Базова лінія",
   "Common.Controllers.ReviewChanges.textBold": "Жирний",
   "Common.Controllers.ReviewChanges.textBreakBefore": "розрив сторінки",
-  "Common.Controllers.ReviewChanges.textCaps": "Всі шапки",
+  "Common.Controllers.ReviewChanges.textCaps": "Усі великі",
   "Common.Controllers.ReviewChanges.textCenter": "Вирівняти центр",
   "Common.Controllers.ReviewChanges.textChart": "Діаграма",
   "Common.Controllers.ReviewChanges.textColor": "Колір шрифту",
@@ -53,7 +53,7 @@
   "Common.Controllers.ReviewChanges.textRight": "Вирівняти справа",
   "Common.Controllers.ReviewChanges.textShape": "Форма",
   "Common.Controllers.ReviewChanges.textShd": "Колір фону",
-  "Common.Controllers.ReviewChanges.textSmallCaps": "Малі шапки",
+  "Common.Controllers.ReviewChanges.textSmallCaps": "Зменшені великі",
   "Common.Controllers.ReviewChanges.textSpacing": "інтервал",
   "Common.Controllers.ReviewChanges.textSpacingAfter": "Інтервал після",
   "Common.Controllers.ReviewChanges.textSpacingBefore": "інтервал перед",
@@ -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": "Немає стилів",
@@ -145,6 +153,7 @@
   "Common.Views.Header.tipDownload": "Завантажити файл",
   "Common.Views.Header.tipGoEdit": "Редагувати поточний файл",
   "Common.Views.Header.tipPrint": "Роздрукувати файл",
+  "Common.Views.Header.tipViewSettings": "Налаштування перегляду",
   "Common.Views.Header.tipViewUsers": "Переглядайте користувачів та керуйте правами доступу до документів",
   "Common.Views.Header.txtAccessRights": "Змінити права доступу",
   "Common.Views.Header.txtRename": "Перейменувати",
@@ -192,9 +201,12 @@
   "Common.Views.ReviewChanges.txtClose": "Закрити",
   "Common.Views.ReviewChanges.txtDocLang": "Мова",
   "Common.Views.ReviewChanges.txtFinal": "Усі зміни прийняті (попередній перегляд)",
+  "Common.Views.ReviewChanges.txtFinalCap": "Фінальний",
   "Common.Views.ReviewChanges.txtMarkup": "Усі зміни (редагування)",
+  "Common.Views.ReviewChanges.txtMarkupCap": "Зміни",
   "Common.Views.ReviewChanges.txtNext": "Наступний",
   "Common.Views.ReviewChanges.txtOriginal": "Усі зміни відхилено (попередній перегляд)",
+  "Common.Views.ReviewChanges.txtOriginalCap": "Початковий",
   "Common.Views.ReviewChanges.txtPrev": "Попередній",
   "Common.Views.ReviewChanges.txtReject": "Відхилити",
   "Common.Views.ReviewChanges.txtRejectAll": "Відхилити усі зміни",
@@ -234,7 +246,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Ви намагаєтеся виконати дію, у якої у вас немає прав. <br> Будь ласка, зв'яжіться з адміністратором вашого Сервера документів.",
   "DE.Controllers.Main.errorBadImageUrl": "URL-адреса зображення невірна",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "З'єднання з сервером втрачено. Документ не можна редагувати прямо зараз.",
-  "DE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора.<br>Після натискання кнопки «ОК» вам буде запропоновано завантажити документ. <br><br>Більше інформації про підключення сервера документів <a href=\"%1\" target=\"_blank\">тут</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора.<br>Після натискання кнопки «ОК» вам буде запропоновано завантажити документ.",
   "DE.Controllers.Main.errorDatabaseConnection": "Зовнішня помилка. <br> Помилка підключення до бази даних. Будь ласка, зв'яжіться зі службою підтримки, якщо помилка не зникне.",
   "DE.Controllers.Main.errorDataRange": "Неправильний діапазон даних.",
   "DE.Controllers.Main.errorDefaultMessage": "Код помилки: %1 ",
@@ -685,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.textOriginalSize": "За замовчуванням",
   "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": "Стиль упаковки",
@@ -759,7 +763,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Об'єднати клітинки",
   "DE.Views.DocumentHolder.moreText": "Більше варіантів...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "Немає варіантів",
-  "DE.Views.DocumentHolder.originalSizeText": "Розмір за умовчанням",
+  "DE.Views.DocumentHolder.originalSizeText": "За замовчуванням",
   "DE.Views.DocumentHolder.paragraphText": "Параграф",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Видалити гіперпосилання",
   "DE.Views.DocumentHolder.rightText": "Право",
@@ -944,15 +948,21 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Створіть новий порожній текстовий документ, який ви зможете стильувати та форматувати після його створення під час редагування. Або виберіть один із шаблонів, щоб запустити документ певного типу або мети, де деякі стилі вже були попередньо застосовані.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Новий текстовий документ",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Немає шаблонів",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Додаток",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Змінити права доступу",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Коментар",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Створено",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Завантаження...",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Змінив",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Змінено",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Сторінки",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Параграфи",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Місцезнаходження",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Особи, які мають права",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Символи з пробілами",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Статистика",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Тема",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Символи",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Назва документу",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Слова",
@@ -1029,7 +1039,8 @@
   "DE.Views.ImageSettings.textFromUrl": "З URL",
   "DE.Views.ImageSettings.textHeight": "Висота",
   "DE.Views.ImageSettings.textInsert": "Замінити зображення",
-  "DE.Views.ImageSettings.textOriginalSize": "Розмір за умовчанням",
+  "DE.Views.ImageSettings.textOriginalSize": "За замовчуванням",
+  "DE.Views.ImageSettings.textRotation": "Поворот",
   "DE.Views.ImageSettings.textSize": "Розмір",
   "DE.Views.ImageSettings.textWidth": "Ширина",
   "DE.Views.ImageSettings.textWrap": "Стиль упаковки",
@@ -1047,6 +1058,7 @@
   "DE.Views.ImageSettingsAdvanced.textAltDescription": "Опис",
   "DE.Views.ImageSettingsAdvanced.textAltTip": "Альтернативне текстове представлення інформації про візуальний об'єкт, яке може бути прочитано людям із порушеннями зору або когнітивними дисфункціями, щоб вони могли краще зрозуміти, яка інформація знаходиться в зображенні, автошопі, діаграмі або таблиці.",
   "DE.Views.ImageSettingsAdvanced.textAltTitle": "Назва",
+  "DE.Views.ImageSettingsAdvanced.textAngle": "Нахил",
   "DE.Views.ImageSettingsAdvanced.textArrows": "Стрілки",
   "DE.Views.ImageSettingsAdvanced.textAspectRatio": "Блокування співвідношення сторін",
   "DE.Views.ImageSettingsAdvanced.textBeginSize": "Початковий розмір",
@@ -1064,8 +1076,10 @@
   "DE.Views.ImageSettingsAdvanced.textEndSize": "Кінець розміру",
   "DE.Views.ImageSettingsAdvanced.textEndStyle": "Кінець стилю",
   "DE.Views.ImageSettingsAdvanced.textFlat": "Площина",
+  "DE.Views.ImageSettingsAdvanced.textFlipped": "Віддзеркалено",
   "DE.Views.ImageSettingsAdvanced.textHeight": "Висота",
   "DE.Views.ImageSettingsAdvanced.textHorizontal": "Горізонтальний",
+  "DE.Views.ImageSettingsAdvanced.textHorizontally": "горизонтально",
   "DE.Views.ImageSettingsAdvanced.textJoinType": "Приєднати тип",
   "DE.Views.ImageSettingsAdvanced.textKeepRatio": "Сталі пропорції",
   "DE.Views.ImageSettingsAdvanced.textLeft": "Лівий",
@@ -1076,7 +1090,7 @@
   "DE.Views.ImageSettingsAdvanced.textMiter": "Мітер",
   "DE.Views.ImageSettingsAdvanced.textMove": "Перемістити об'єкт з текстом",
   "DE.Views.ImageSettingsAdvanced.textOptions": "Опції",
-  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Розмір за умовчанням",
+  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "За замовчуванням",
   "DE.Views.ImageSettingsAdvanced.textOverlap": "Дозволити перекриття",
   "DE.Views.ImageSettingsAdvanced.textPage": "Сторінка",
   "DE.Views.ImageSettingsAdvanced.textParagraph": "Параграф",
@@ -1087,6 +1101,7 @@
   "DE.Views.ImageSettingsAdvanced.textRight": "Право",
   "DE.Views.ImageSettingsAdvanced.textRightMargin": "праве поле",
   "DE.Views.ImageSettingsAdvanced.textRightOf": "праворуч від",
+  "DE.Views.ImageSettingsAdvanced.textRotation": "Поворот",
   "DE.Views.ImageSettingsAdvanced.textRound": "Круглий",
   "DE.Views.ImageSettingsAdvanced.textShape": "Параметри форми",
   "DE.Views.ImageSettingsAdvanced.textSize": "Розмір",
@@ -1097,6 +1112,7 @@
   "DE.Views.ImageSettingsAdvanced.textTop": "Верх",
   "DE.Views.ImageSettingsAdvanced.textTopMargin": "Верхнє поле",
   "DE.Views.ImageSettingsAdvanced.textVertical": "Вертикальний",
+  "DE.Views.ImageSettingsAdvanced.textVertically": "вертикально",
   "DE.Views.ImageSettingsAdvanced.textWeightArrows": "Ваги та стрілки",
   "DE.Views.ImageSettingsAdvanced.textWidth": "Ширина",
   "DE.Views.ImageSettingsAdvanced.textWrap": "Стиль упаковки",
@@ -1205,7 +1221,7 @@
   "DE.Views.ParagraphSettings.textNewColor": "Додати новий спеціальний колір",
   "DE.Views.ParagraphSettings.txtAutoText": "Авто",
   "DE.Views.ParagraphSettingsAdvanced.noTabs": "Вказані вкладки з'являться в цьому полі",
-  "DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Всі шапки",
+  "DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Усі великі",
   "DE.Views.ParagraphSettingsAdvanced.strBorders": "Межі та заповнення",
   "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Розрив сторінки перед",
   "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Подвійне перекреслення",
@@ -1218,7 +1234,7 @@
   "DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Шрифт",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Відступи та розміщення",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Розміщення",
-  "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Малі шапки",
+  "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Зменшені великі",
   "DE.Views.ParagraphSettingsAdvanced.strStrike": "Перекреслення",
   "DE.Views.ParagraphSettingsAdvanced.strSubscript": "Підрядковий",
   "DE.Views.ParagraphSettingsAdvanced.strSuperscript": "Надрядковий",
@@ -1288,6 +1304,7 @@
   "DE.Views.ShapeSettings.textNoFill": "Немає заповнення",
   "DE.Views.ShapeSettings.textPatternFill": "Візерунок",
   "DE.Views.ShapeSettings.textRadial": "Радіальний",
+  "DE.Views.ShapeSettings.textRotation": "Поворот",
   "DE.Views.ShapeSettings.textSelectTexture": "Обрати",
   "DE.Views.ShapeSettings.textStretch": "Розтягнути",
   "DE.Views.ShapeSettings.textStyle": "Стиль",
@@ -1491,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": "Один",
@@ -1516,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": "Вузький",
@@ -1529,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": "Видалити всі власні стилі",
@@ -1543,11 +1552,12 @@
   "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": "Головна",
   "DE.Views.Toolbar.textTabInsert": "Вставити",
   "DE.Views.Toolbar.textTabLayout": "Макет",
+  "DE.Views.Toolbar.textTabLinks": "Посилання",
   "DE.Views.Toolbar.textTabReview": "Перевірити",
   "DE.Views.Toolbar.textTitleError": "Помилка",
   "DE.Views.Toolbar.textToCurrent": "До поточної позиції",
@@ -1558,6 +1568,7 @@
   "DE.Views.Toolbar.tipAlignLeft": "Вирівняти зліва",
   "DE.Views.Toolbar.tipAlignRight": "Вирівняти справа",
   "DE.Views.Toolbar.tipBack": "Назад",
+  "DE.Views.Toolbar.tipBlankPage": "Вставити чисту сторінку",
   "DE.Views.Toolbar.tipChangeChart": "Змінити тип діаграми",
   "DE.Views.Toolbar.tipClearStyle": "Очистити стиль",
   "DE.Views.Toolbar.tipColorSchemas": "Змінити кольорову схему",
@@ -1567,7 +1578,7 @@
   "DE.Views.Toolbar.tipDecFont": "Зменшення розміру шрифту",
   "DE.Views.Toolbar.tipDecPrLeft": "Зменшити відступ",
   "DE.Views.Toolbar.tipDropCap": "Вставити буквицю",
-  "DE.Views.Toolbar.tipEditHeader": "Редагувати заголовок або нижній колонтитул",
+  "DE.Views.Toolbar.tipEditHeader": "Редагувати верхній або нижній колонтитул",
   "DE.Views.Toolbar.tipFontColor": "Колір шрифту",
   "DE.Views.Toolbar.tipFontName": "Шрифт",
   "DE.Views.Toolbar.tipFontSize": "Розмір шрифта",

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",
@@ -235,7 +243,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Bạn đang cố gắng thực hiện hành động mà bạn không có quyền.<br>Vui lòng liên hệ với quản trị viên Server Tài liệu của bạn.",
   "DE.Controllers.Main.errorBadImageUrl": "URL hình ảnh không chính xác",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Mất kết nối server. Không thể chỉnh sửa tài liệu ngay lúc này.",
-  "DE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.<br>Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.<br><br>Tìm thêm thông tin về kết nối Server Tài liệu <a href=\"%1\" target=\"_blank\">ở đây</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.<br>Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Lỗi bên ngoài.<br>Lỗi kết nối cơ sở dữ liệu. Vui lòng liên hệ bộ phận hỗ trợ trong trường hợp lỗi vẫn còn.",
   "DE.Controllers.Main.errorDataRange": "Phạm vi dữ liệu không chính xác.",
   "DE.Controllers.Main.errorDefaultMessage": "Mã lỗi: %1",
@@ -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": "没有风格",
@@ -321,7 +329,7 @@
   "DE.Controllers.Main.errorAccessDeny": "您正在尝试执行您没有权限的操作。<br>请联系您的文档服务器管理员.",
   "DE.Controllers.Main.errorBadImageUrl": "图片地址不正确",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "服务器连接丢失。该文档现在无法编辑",
-  "DE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。<br>当你点击“OK”按钮,系统将提示您下载文档。<br><br>找到更多信息连接文件服务器<a href=\"%1\" target=\"平等\">在这里</>",
+  "DE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。<br>当你点击“OK”按钮,系统将提示您下载文档。",
   "DE.Controllers.Main.errorDatabaseConnection": "外部错误。<br>数据库连接错误。如果错误仍然存​​在，请联系支持人员。",
   "DE.Controllers.Main.errorDataEncrypted": "加密更改已收到，无法对其解密。",
   "DE.Controllers.Main.errorDataRange": "数据范围不正确",
@@ -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/help/ru/callback.js

@@ -1,35 +1,3 @@
-/*
- *
- * (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
- *
-*/
 function onhyperlinkclick(element) {
     function _postMessage(msg) {
        if (window.parent && window.JSON) {

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

@@ -119,6 +119,7 @@
 @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,12 +152,17 @@
 
 .doc-placeholder {
     background: #fbfbfb;
-    width: 100%;
-    max-width: 796px;
+    width: 796px;
     margin: 40px auto;
     height: 100%;
     border: 1px solid #dfdfdf;
     padding-top: 50px;
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 1;
 
     -webkit-animation: flickerAnimation 2s infinite ease-in-out;
     -moz-animation: flickerAnimation 2s infinite ease-in-out;

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

@@ -75,4 +75,9 @@ label {
     width: 300px;
     height: 100%;
     display: none;
+}
+
+#editor_sdk {
+    width: 100%;
+    height: 100%;
 }

apps/documenteditor/main/resources/less/toolbar.less

@@ -157,140 +157,6 @@
     }
 }
 
-// charts
-.menu-insertchart {
-    .group-description {
-        padding-left: 4px;
-    }
-
-    .group-items-container {
-        float: left;
-        position: relative;
-    }
-}
-
-.item-chartlist {
-    .background-ximage('@{common-image-path}/toolbar/charttypes.png', '@{common-image-path}/toolbar/charttypes@2x.png', 250px);
-    width: 50px;
-    height: 50px;
-}
-
-.line-normal {
-    background-position: 0 0;
-}
-
-.line-stack {
-    background-position: -50px 0;
-}
-
-.line-pstack {
-    background-position: -100px 0;
-}
-
-.line-3d {
-    background-position: -150px 0;
-}
-
-.column-normal {
-    background-position: 0 -50px;
-}
-
-.column-stack{
-    background-position: -50px -50px;
-}
-
-.column-pstack{
-    background-position: -100px -50px;
-}
-
-.column-3d-normal {
-    background-position: -150px -50px;
-}
-
-.column-3d-stack{
-    background-position: -200px -50px;
-}
-
-.column-3d-pstack{
-    background-position: -150px -100px;
-}
-
-.column-3d-normal-per{
-    background-position: -200px -100px;
-}
-
-.bar-normal {
-    background-position: 0 -100px;
-}
-
-.bar-stack{
-    background-position: -50px -100px;
-}
-
-.bar-pstack{
-    background-position: -100px -100px;
-}
-
-.bar-3d-normal {
-    background-position: -150px -150px;
-}
-
-.bar-3d-stack{
-    background-position: -200px -150px;
-}
-
-.bar-3d-pstack{
-    background-position: -150px -200px;
-}
-
-.area-normal {
-    background-position: 0 -150px;
-}
-
-.area-stack{
-    background-position: -50px -150px;
-}
-
-.area-pstack{
-    background-position: -100px -150px;
-}
-
-.pie-normal {
-    background-position: 0 -200px;
-}
-
-.pie-3d-normal {
-    background-position: -200px -200px;
-}
-
-.point-normal{
-    background-position: -50px -200px;
-}
-
-.stock-normal{
-    background-position: -100px -200px;
-}
-
-.pie-doughnut{
-    background-position: -200px 0;
-}
-
-.surface-normal{
-    background-position: 0px -300px;
-}
-
-.surface-wireframe{
-    background-position: -50px -300px;
-}
-
-.contour-normal{
-    background-position: -100px -300px;
-}
-
-.contour-wireframe{
-    background-position: -150px -300px;
-}
-
 @toolbar-icon-size: 20px;
 .button-normal-icon(btn-align-center,     0, @toolbar-icon-size);
 .button-normal-icon(btn-align-just,       1, @toolbar-icon-size);

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

@@ -221,7 +221,7 @@ define([
                     me.api.asc_setLocale(me.editorConfig.lang);
 
                 if (!me.editorConfig.customization || !(me.editorConfig.customization.loaderName || me.editorConfig.customization.loaderLogo))
-                    $('#editor_sdk').append('<div class="doc-placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div>');
+                    $('#editor-container').append('<div class="doc-placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div>');
 
 //                if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
 //                    Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
@@ -948,7 +948,7 @@ define([
                         break;
 
                     case Asc.c_oAscError.ID.Warning:
-                        config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
+                        config.msg = this.errorConnectToServer;
                         break;
 
                     case Asc.c_oAscError.ID.UplImageUrl:
@@ -971,6 +971,10 @@ define([
                         config.msg = this.errorFileSizeExceed;
                         break;
 
+                    case Asc.c_oAscError.ID.UpdateVersion:
+                        config.msg = this.errorUpdateVersionOnDisconnect;
+                        break;
+
                     default:
                         config.msg = this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -1399,12 +1403,12 @@ define([
             sendMergeTitle: 'Sending Merge',
             sendMergeText: 'Sending Merge...',
             txtArt: 'Your text here',
-            errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
+            errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.',
             textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.',
             textBuyNow: 'Visit website',
             textNoLicenseTitle: '%1 open source version',
             textContactUs: 'Contact sales',
-            errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.',
+            errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored and page is reloaded.',
             warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
             titleLicenseExp: 'License expired',
             openErrorText: 'An error has occurred while opening the file',
@@ -1456,7 +1460,8 @@ define([
             textPaidFeature: 'Paid feature',
             textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.',
             waitText: 'Please, wait...',
-            errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.'
+            errorFileSizeExceed: 'The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.',
+            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/mobile/app/template/Editor.template

@@ -2,7 +2,7 @@
     <div class="view view-main">
         <div class="pages navbar-through">
             <div data-page="index" class="page">
-                <div id="editor_sdk" class="page-content no-fastclick"></div>
+                <div id="editor-container" class="page-content no-fastclick"><div id="editor_sdk" class="no-fastclick"></div></div>
             </div>
         </div>
     </div>

apps/documenteditor/mobile/app/view/edit/EditImage.js

@@ -159,7 +159,7 @@ define([
             textWrap: 'Wrap',
             textReplace: 'Replace',
             textReorder: 'Reorder',
-            textDefault: 'Default Size',
+            textDefault: 'Actual Size',
             textRemove: 'Remove Image',
             textBack: 'Back',
             textToForeground: 'Bring to Foreground',

apps/documenteditor/mobile/locale/bg.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Опитвате се да извършите действие, за което нямате права. <br> Моля, свържете се с администратора на сървъра за документи.",
   "DE.Controllers.Main.errorBadImageUrl": "URL адресът на изображението е неправилен",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Връзката със сървъра е загубена. Вече не можете да редактирате.",
-  "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.<br>Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа. <br><br>Намерете повече информация за свързването на сървър за документи <a href=\"%1\" target=\"_blank\">тук</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.<br>Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа.",
   "DE.Controllers.Main.errorDatabaseConnection": "Външна грешка. <br> Грешка при свързване към база данни. Моля, свържете се с екипа за поддръжка.",
   "DE.Controllers.Main.errorDataEncrypted": "Получени са криптирани промени, които не могат да се дефинират.",
   "DE.Controllers.Main.errorDataRange": "Неправилен обхват от данни.",

apps/documenteditor/mobile/locale/cs.json

@@ -56,7 +56,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.<br>Prosím, kontaktujte administrátora vašeho Dokumentového serveru.",
   "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávná",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Serverové připojení bylo ztraceno. Nadále nemůžete editovat.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.<br> Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.<br><br> Více informací o připojení najdete v Dokumentovém serveru <a href=\"%1\" target=\"_blank\">here</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.<br> Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externí chyba.<br>Chyba připojení k databázi. Prosím, kontaktujte podporu.",
   "DE.Controllers.Main.errorDataRange": "Nesprávný datový rozsah.",
   "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1",

apps/documenteditor/mobile/locale/de.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Sie versuchen die Änderungen vorzunehemen, für die Sie keine Berechtigungen haben.<br>Wenden Sie sich an Ihren Document Server Serveradministrator.",
   "DE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Sie können nicht mehr editieren.",
-  "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.<br><br>Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie <a href=\"%1\" target=\"_blank\">hier</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.",
   "DE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.",
   "DE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",

apps/documenteditor/mobile/locale/en.json

@@ -58,9 +58,9 @@
   "Common.Controllers.Collaboration.textTabs": "Change tabs",
   "Common.Controllers.Collaboration.textUnderline": "Underline",
   "Common.Controllers.Collaboration.textWidow": "Widow control",
+  "Common.UI.ThemeColorPalette.textCustomColors": "Custom Colors",
   "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
   "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
-  "Common.UI.ThemeColorPalette.textCustomColors": "Custom Colors",
   "Common.Utils.Metric.txtCm": "cm",
   "Common.Utils.Metric.txtPt": "pt",
   "Common.Views.Collaboration.textAcceptAllChanges": "Accept All Changes",
@@ -141,13 +141,14 @@
   "DE.Controllers.Main.errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
   "DE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. You can't edit anymore.",
-  "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>",
+  "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.",
   "DE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
   "DE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
   "DE.Controllers.Main.errorDataRange": "Incorrect data range.",
   "DE.Controllers.Main.errorDefaultMessage": "Error code: %1",
   "DE.Controllers.Main.errorEditingDownloadas": "An error occurred during the work with the document.<br>Use the 'Download' option to save the file backup copy to your computer hard drive.",
   "DE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
+  "DE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
   "DE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
   "DE.Controllers.Main.errorKeyExpire": "Key descriptor expired",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Loading failed",
@@ -158,7 +159,7 @@
   "DE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
   "DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.",
   "DE.Controllers.Main.errorUsersExceed": "The number of users was exceeded",
-  "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.",
+  "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download it until the connection is restored and page is reloaded.",
   "DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
   "DE.Controllers.Main.loadFontsTextText": "Loading data...",
   "DE.Controllers.Main.loadFontsTitleText": "Loading Data",
@@ -173,12 +174,12 @@
   "DE.Controllers.Main.mailMergeLoadFileText": "Loading Data Source...",
   "DE.Controllers.Main.mailMergeLoadFileTitle": "Loading Data Source",
   "DE.Controllers.Main.notcriticalErrorTitle": "Warning",
-  "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
+  "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file.",
   "DE.Controllers.Main.openTextText": "Opening document...",
   "DE.Controllers.Main.openTitleText": "Opening Document",
   "DE.Controllers.Main.printTextText": "Printing document...",
   "DE.Controllers.Main.printTitleText": "Printing Document",
-  "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
+  "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file.",
   "DE.Controllers.Main.savePreparingText": "Preparing to save",
   "DE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...",
   "DE.Controllers.Main.saveTextText": "Saving document...",
@@ -248,7 +249,7 @@
   "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.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
+  "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.Search.textNoTextFound": "Text not Found",
   "DE.Controllers.Search.textReplaceAll": "Replace All",
   "DE.Controllers.Settings.notcriticalErrorTitle": "Warning",
@@ -294,12 +295,14 @@
   "DE.Views.AddOther.textSectionBreak": "Section Break",
   "DE.Views.AddOther.textStartFrom": "Start At",
   "DE.Views.AddOther.textTip": "Screen Tip",
+  "DE.Views.EditChart.textAddCustomColor": "Add Custom Color",
   "DE.Views.EditChart.textAlign": "Align",
   "DE.Views.EditChart.textBack": "Back",
   "DE.Views.EditChart.textBackward": "Move Backward",
   "DE.Views.EditChart.textBehind": "Behind",
   "DE.Views.EditChart.textBorder": "Border",
   "DE.Views.EditChart.textColor": "Color",
+  "DE.Views.EditChart.textCustomColor": "Custom Color",
   "DE.Views.EditChart.textDistanceText": "Distance from Text",
   "DE.Views.EditChart.textFill": "Fill",
   "DE.Views.EditChart.textForward": "Move Forward",
@@ -319,8 +322,6 @@
   "DE.Views.EditChart.textTopBottom": "Top and Bottom",
   "DE.Views.EditChart.textType": "Type",
   "DE.Views.EditChart.textWrap": "Wrap",
-  "DE.Views.EditChart.textAddCustomColor": "Add Custom Color",
-  "DE.Views.EditChart.textCustomColor": "Custom Color",
   "DE.Views.EditHeader.textDiffFirst": "Different first page",
   "DE.Views.EditHeader.textDiffOdd": "Different odd and even pages",
   "DE.Views.EditHeader.textFrom": "Start at",
@@ -337,7 +338,7 @@
   "DE.Views.EditImage.textBack": "Back",
   "DE.Views.EditImage.textBackward": "Move Backward",
   "DE.Views.EditImage.textBehind": "Behind",
-  "DE.Views.EditImage.textDefault": "Default Size",
+  "DE.Views.EditImage.textDefault": "Actual Size",
   "DE.Views.EditImage.textDistanceText": "Distance from Text",
   "DE.Views.EditImage.textForward": "Move Forward",
   "DE.Views.EditImage.textFromLibrary": "Picture from Library",
@@ -359,6 +360,7 @@
   "DE.Views.EditImage.textToForeground": "Bring to Foreground",
   "DE.Views.EditImage.textTopBottom": "Top and Bottom",
   "DE.Views.EditImage.textWrap": "Wrap",
+  "DE.Views.EditParagraph.textAddCustomColor": "Add Custom Color",
   "DE.Views.EditParagraph.textAdvanced": "Advanced",
   "DE.Views.EditParagraph.textAdvSettings": "Advanced settings",
   "DE.Views.EditParagraph.textAfter": "After",
@@ -366,6 +368,7 @@
   "DE.Views.EditParagraph.textBack": "Back",
   "DE.Views.EditParagraph.textBackground": "Background",
   "DE.Views.EditParagraph.textBefore": "Before",
+  "DE.Views.EditParagraph.textCustomColor": "Custom Color",
   "DE.Views.EditParagraph.textFirstLine": "First Line",
   "DE.Views.EditParagraph.textFromText": "Distance from Text",
   "DE.Views.EditParagraph.textKeepLines": "Keep Lines Together",
@@ -374,14 +377,14 @@
   "DE.Views.EditParagraph.textPageBreak": "Page Break Before",
   "DE.Views.EditParagraph.textPrgStyles": "Paragraph styles",
   "DE.Views.EditParagraph.textSpaceBetween": "Space Between Paragraphs",
-  "DE.Views.EditParagraph.textAddCustomColor": "Add Custom Color",
-  "DE.Views.EditParagraph.textCustomColor": "Custom Color",
+  "DE.Views.EditShape.textAddCustomColor": "Add Custom Color",
   "DE.Views.EditShape.textAlign": "Align",
   "DE.Views.EditShape.textBack": "Back",
   "DE.Views.EditShape.textBackward": "Move Backward",
   "DE.Views.EditShape.textBehind": "Behind",
   "DE.Views.EditShape.textBorder": "Border",
   "DE.Views.EditShape.textColor": "Color",
+  "DE.Views.EditShape.textCustomColor": "Custom Color",
   "DE.Views.EditShape.textEffects": "Effects",
   "DE.Views.EditShape.textFill": "Fill",
   "DE.Views.EditShape.textForward": "Move Forward",
@@ -403,8 +406,7 @@
   "DE.Views.EditShape.textTopAndBottom": "Top and Bottom",
   "DE.Views.EditShape.textWithText": "Move with Text",
   "DE.Views.EditShape.textWrap": "Wrap",
-  "DE.Views.EditShape.textAddCustomColor": "Add Custom Color",
-  "DE.Views.EditShape.textCustomColor": "Custom Color",
+  "DE.Views.EditTable.textAddCustomColor": "Add Custom Color",
   "DE.Views.EditTable.textAlign": "Align",
   "DE.Views.EditTable.textBack": "Back",
   "DE.Views.EditTable.textBandedColumn": "Banded Column",
@@ -412,6 +414,7 @@
   "DE.Views.EditTable.textBorder": "Border",
   "DE.Views.EditTable.textCellMargins": "Cell Margins",
   "DE.Views.EditTable.textColor": "Color",
+  "DE.Views.EditTable.textCustomColor": "Custom Color",
   "DE.Views.EditTable.textFill": "Fill",
   "DE.Views.EditTable.textFirstColumn": "First Column",
   "DE.Views.EditTable.textFlow": "Flow",
@@ -430,8 +433,7 @@
   "DE.Views.EditTable.textTotalRow": "Total Row",
   "DE.Views.EditTable.textWithText": "Move with Text",
   "DE.Views.EditTable.textWrap": "Wrap",
-  "DE.Views.EditTable.textAddCustomColor": "Add Custom Color",
-  "DE.Views.EditTable.textCustomColor": "Custom Color",
+  "DE.Views.EditText.textAddCustomColor": "Add Custom Color",
   "DE.Views.EditText.textAdditional": "Additional",
   "DE.Views.EditText.textAdditionalFormat": "Additional Formatting",
   "DE.Views.EditText.textAllCaps": "All Caps",
@@ -442,6 +444,7 @@
   "DE.Views.EditText.textCharacterItalic": "I",
   "DE.Views.EditText.textCharacterStrikethrough": "S",
   "DE.Views.EditText.textCharacterUnderline": "U",
+  "DE.Views.EditText.textCustomColor": "Custom Color",
   "DE.Views.EditText.textDblStrikethrough": "Double Strikethrough",
   "DE.Views.EditText.textDblSuperscript": "Superscript",
   "DE.Views.EditText.textFontColor": "Font Color",
@@ -457,8 +460,6 @@
   "DE.Views.EditText.textSmallCaps": "Small Caps",
   "DE.Views.EditText.textStrikethrough": "Strikethrough",
   "DE.Views.EditText.textSubscript": "Subscript",
-  "DE.Views.EditText.textAddCustomColor": "Add Custom Color",
-  "DE.Views.EditText.textCustomColor": "Custom Color",
   "DE.Views.Search.textCase": "Case sensitive",
   "DE.Views.Search.textDone": "Done",
   "DE.Views.Search.textFind": "Find",

apps/documenteditor/mobile/locale/es.json

@@ -139,7 +139,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Usted no tiene permisos para realizar la acción que está intentando hacer.<br> Por favor, contacte con su Administrador del Servidor de Documentos.",
   "DE.Controllers.Main.errorBadImageUrl": "URL de imagen es incorrecto",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "La conexión al servidor se ha perdido. Usted ya no puede editar.",
-  "DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.<br>Al hacer clic en el botón 'OK' se le solicitará que descargue el documento.<br><br>Encuentre más información acerca de la conexión de Servidor de Documentos <a href=\"%1\" target=\"_blank\">aquí</a>",
+  "DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.<br>Al hacer clic en el botón 'OK' se le solicitará que descargue el documento.",
   "DE.Controllers.Main.errorDatabaseConnection": "Error externo.<br>Error de conexión a la base de datos. Por favor, contacte con el equipo de soporte técnico.",
   "DE.Controllers.Main.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.",
   "DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.",

apps/documenteditor/mobile/locale/fr.json

@@ -70,6 +70,7 @@
   "Common.Views.Collaboration.textEditUsers": "Utilisateurs",
   "Common.Views.Collaboration.textFinal": "Final",
   "Common.Views.Collaboration.textMarkup": "Balisage",
+  "Common.Views.Collaboration.textNoComments": "Il n'y a pas de commentaires dans ce document",
   "Common.Views.Collaboration.textOriginal": "Original",
   "Common.Views.Collaboration.textRejectAllChanges": "Refuser toutes les modifications ",
   "Common.Views.Collaboration.textReview": "Suivi des modifications",
@@ -139,13 +140,14 @@
   "DE.Controllers.Main.errorAccessDeny": "Vous tentez d'exéсuter une action pour laquelle vous ne disposez pas des droits.<br>Veuillez contacter l'administrateur de Document Server.",
   "DE.Controllers.Main.errorBadImageUrl": "L'URL de l'image est incorrecte",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "La connexion au serveur perdue. Désolé, vous ne pouvez plus modifier le document.",
-  "DE.Controllers.Main.errorConnectToServer": "Impossible d'enregistrer le document. Veuillez vérifier vos paramètres de connexion ou contactez l'administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.<br><br>Trouvez plus d'informations sur la connexion au Serveur de Documents <a href=\"%1\" target=\"_blank\">ici</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Impossible d'enregistrer le document. Veuillez vérifier vos paramètres de connexion ou contactez l'administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.",
   "DE.Controllers.Main.errorDatabaseConnection": "Erreur externe.<br>Erreur de connexion à la base de données.Contactez le support.",
   "DE.Controllers.Main.errorDataEncrypted": "Les modifications chiffrées ont été reçues, elle ne peuvent pas être déchiffrées.",
   "DE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
   "DE.Controllers.Main.errorDefaultMessage": "Code d'erreur: %1",
   "DE.Controllers.Main.errorEditingDownloadas": "Une erreure s'est produite lors du travail sur le document.<br>Utilisez l'option \"Télécharger\" pour enregistrer la copie de sauvegarde sur le disque dur de votre ordinateur.",
   "DE.Controllers.Main.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut être ouvert.",
+  "DE.Controllers.Main.errorFileSizeExceed": "La taille du fichier dépasse les limites établies sur votre serveur.<br>Veuillez contacter votre administrateur de Document Server pour obtenir plus d'information.  ",
   "DE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu",
   "DE.Controllers.Main.errorKeyExpire": "Descripteur de clés expiré",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Échec du chargement",
@@ -252,6 +254,7 @@
   "DE.Controllers.Settings.txtLoading": "Chargement en cours...",
   "DE.Controllers.Settings.unknownText": "Inconnu",
   "DE.Controllers.Settings.warnDownloadAs": "Si vous continuez à enregistrer dans ce format toutes les fonctions sauf le texte seront perdues.<br>Êtes-vous sûr de vouloir continuer ?",
+  "DE.Controllers.Settings.warnDownloadAsRTF": "Si vous continuer à sauvegarder dans ce format une partie de la mise en forme peut être supprimée <br>Êtes-vous sûr de vouloir continuer?",
   "DE.Controllers.Toolbar.dlgLeaveMsgText": "Vous avez des modifications non enregistrées dans ce document. Cliquez sur 'Rester sur cette Page' pour la sauvegarde automatique du document. Cliquez sur 'Quitter cette Page' pour ignorer toutes les modifications non enregistrées.",
   "DE.Controllers.Toolbar.dlgLeaveTitleText": "Vous quittez l'application",
   "DE.Controllers.Toolbar.leaveButtonText": "Quitter cette page",
@@ -455,14 +458,21 @@
   "DE.Views.Settings.textAbout": "A propos",
   "DE.Views.Settings.textAddress": "adresse",
   "DE.Views.Settings.textAdvancedSettings": "Paramètres de l'application",
+  "DE.Views.Settings.textApplication": "Application",
   "DE.Views.Settings.textAuthor": "Auteur",
   "DE.Views.Settings.textBack": "Retour",
   "DE.Views.Settings.textBottom": "En bas",
   "DE.Views.Settings.textCentimeter": "Centimètre",
+  "DE.Views.Settings.textCollaboration": "Collaboration",
   "DE.Views.Settings.textColorSchemes": "Jeux de couleurs",
+  "DE.Views.Settings.textComment": "Commentaire",
+  "DE.Views.Settings.textCommentingDisplay": "Affichage des commentaires ",
+  "DE.Views.Settings.textCreated": "Créé",
   "DE.Views.Settings.textCreateDate": "Date de création",
   "DE.Views.Settings.textCustom": "Personnalisé",
   "DE.Views.Settings.textCustomSize": "Taille personnalisée",
+  "DE.Views.Settings.textDisplayComments": "Commentaires",
+  "DE.Views.Settings.textDisplayResolvedComments": "Commentaires résolus",
   "DE.Views.Settings.textDocInfo": "Position actuelle",
   "DE.Views.Settings.textDocTitle": "Titre du document",
   "DE.Views.Settings.textDocumentFormats": "Formats de document",
@@ -479,11 +489,15 @@
   "DE.Views.Settings.textHiddenTableBorders": "Bordures du tableau cachées",
   "DE.Views.Settings.textInch": "Pouce",
   "DE.Views.Settings.textLandscape": "Paysage",
+  "DE.Views.Settings.textLastModified": "Date de dernière modification",
+  "DE.Views.Settings.textLastModifiedBy": "Dernière modification par",
   "DE.Views.Settings.textLeft": "A gauche",
   "DE.Views.Settings.textLoading": "Chargement en cours...",
+  "DE.Views.Settings.textLocation": "Emplacement",
   "DE.Views.Settings.textMargins": "Marges",
   "DE.Views.Settings.textNoCharacters": "Caractères non imprimables",
   "DE.Views.Settings.textOrientation": "Orientation",
+  "DE.Views.Settings.textOwner": "Propriétaire",
   "DE.Views.Settings.textPages": "Pages",
   "DE.Views.Settings.textParagraphs": "Paragraphes",
   "DE.Views.Settings.textPoint": "Point",
@@ -497,10 +511,13 @@
   "DE.Views.Settings.textSpaces": "Espaces",
   "DE.Views.Settings.textSpellcheck": "Vérification de l'orthographe",
   "DE.Views.Settings.textStatistic": "Statistique",
+  "DE.Views.Settings.textSubject": "Sujet",
   "DE.Views.Settings.textSymbols": "Symboles",
   "DE.Views.Settings.textTel": "Tél.",
+  "DE.Views.Settings.textTitle": "Titre",
   "DE.Views.Settings.textTop": "En haut",
   "DE.Views.Settings.textUnitOfMeasurement": "Unité de mesure",
+  "DE.Views.Settings.textUploaded": "Chargé",
   "DE.Views.Settings.textVersion": "Version",
   "DE.Views.Settings.textWords": "Mots",
   "DE.Views.Settings.unknownText": "Inconnu",

apps/documenteditor/mobile/locale/hu.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.<br>Vegye fel a kapcsolatot a Document Server adminisztrátorával.",
   "DE.Controllers.Main.errorBadImageUrl": "Hibás kép URL",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "A szerver elveszítette a kapcsolatot. A további szerkesztés nem lehetséges.",
-  "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.<br>Ha az 'OK'-ra kattint letöltheti a dokumentumot.<br><br>Bővebb információk a Dokumentum Szerverhez kapcsolódásról <a href=\"%1\" target=\"_blank\">itt</a> találhat.",
+  "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.<br>Ha az 'OK'-ra kattint letöltheti a dokumentumot.",
   "DE.Controllers.Main.errorDatabaseConnection": "Külső hiba.<br>Adatbázis kapcsolati hiba. Kérem vegye igénybe támogatásunkat.",
   "DE.Controllers.Main.errorDataEncrypted": "Titkosított változások érkeztek, melyek feloldása sikertelen.",
   "DE.Controllers.Main.errorDataRange": "Hibás adattartomány.",

apps/documenteditor/mobile/locale/it.json

@@ -138,13 +138,14 @@
   "DE.Controllers.Main.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.<br>Si prega di contattare l'amministratore del Server dei Documenti.",
   "DE.Controllers.Main.errorBadImageUrl": "URL dell'immagine non corretto",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Scollegato dal server. Non è possibile modificare.",
-  "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.<br><br>Per maggiori dettagli sulla connessione al Document Server  <a href=\"%1\" target=\"_blank\">clicca qui</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.",
   "DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione al database. Si prega di contattare il supporto.",
   "DE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.",
   "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
   "DE.Controllers.Main.errorDefaultMessage": "Codice errore: %1",
   "DE.Controllers.Main.errorEditingDownloadas": "Si è verificato un errore mentre si lavorava sul documento.<br> Utilizzare l'opzione 'Scarica' per salvare la copia di backup del file sul disco rigido del computer.",
   "DE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
+  "DE.Controllers.Main.errorFileSizeExceed": "La dimensione del file supera la limitazione impostata per il tuo server.<br>Per i dettagli, contatta l'amministratore del Document server.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descrittore di chiave sconosciuto",
   "DE.Controllers.Main.errorKeyExpire": "Descrittore di chiave scaduto",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Caricamento non riuscito",

apps/documenteditor/mobile/locale/ko.json

@@ -57,7 +57,7 @@
   "DE.Controllers.Main.downloadTitleText": "문서 다운로드 중",
   "DE.Controllers.Main.errorBadImageUrl": "이미지 URL이 잘못되었습니다.",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "서버 연결이 끊어졌습니다. 더 이상 편집 할 수 없습니다.",
-  "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.<br>'확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.<br ><br>Document Server 연결에 대한 추가 정보 찾기 <a href=\"%1\" target=\"_blank\">여기</a> ",
+  "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.<br>'확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.",
   "DE.Controllers.Main.errorDatabaseConnection": "외부 오류입니다. <br> 데이터베이스 연결 오류입니다. 지원팀에 문의하십시오.",
   "DE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.",
   "DE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1",

apps/documenteditor/mobile/locale/lv.json

@@ -53,7 +53,7 @@
   "DE.Controllers.Main.downloadTitleText": "Dokumenta lejupielāde",
   "DE.Controllers.Main.errorBadImageUrl": "Nav pareizs attēla URL",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Zudis servera savienojums. Jūs vairs nevarat rediģēt.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.<br>Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.<br><br>Uzziniet vairāk par dokumentu servera pieslēgšanu <a href=\"%1\" target=\"_blank\">šeit</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.<br>Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Ārējā kļūda.<br>Datubāzes piekļuves kļūda. Lūdzu, sazinieties ar atbalsta daļu.",
   "DE.Controllers.Main.errorDataRange": "Nepareizs datu diapazons",
   "DE.Controllers.Main.errorDefaultMessage": "Kļūdas kods: %1",

apps/documenteditor/mobile/locale/nl.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorAccessDeny": "U probeert een actie uit te voeren waarvoor u geen rechten hebt.<br>Neem contact op met de beheerder van de documentserver.",
   "DE.Controllers.Main.errorBadImageUrl": "URL afbeelding is onjuist",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbinding met server verbroken. U kunt niet doorgaan met bewerken.",
-  "DE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.<br>Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.<br><br>Meer informatie over verbindingen met de documentserver is <a href=\"%1\" target=\"_blank\">hier</a> te vinden.",
+  "DE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.<br>Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externe fout.<br>Fout in databaseverbinding. Neem contact op met Support.",
   "DE.Controllers.Main.errorDataEncrypted": "Versleutelde wijzigingen zijn ontvangen, deze kunnen niet ontcijferd worden.",
   "DE.Controllers.Main.errorDataRange": "Onjuist gegevensbereik",

apps/documenteditor/mobile/locale/pl.json

@@ -55,7 +55,7 @@
   "DE.Controllers.Main.downloadTitleText": "Pobieranie dokumentu",
   "DE.Controllers.Main.errorBadImageUrl": "Adres URL obrazu jest błędny",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Połączenie z serwerem zostało utracone. Nie możesz już edytować.",
-  "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.<br>Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.<br><br>Dowiedz się więcej o połączeniu serwera dokumentów <a href=\"%1\" target=\"_blank\">tutaj</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.<br>Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Zewnętrzny błąd.<br>Błąd połączenia z bazą danych. Proszę skontaktuj się z administratorem.",
   "DE.Controllers.Main.errorDataRange": "Błędny zakres danych.",
   "DE.Controllers.Main.errorDefaultMessage": "Kod błędu: %1",

apps/documenteditor/mobile/locale/pt.json

@@ -53,7 +53,7 @@
   "DE.Controllers.Main.downloadTitleText": "Baixando Documento",
   "DE.Controllers.Main.errorBadImageUrl": "URL de imagem está incorreta",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Conexão ao servidor perdida. Você não pode mais editar.",
-  "DE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador.<br>Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento. <br><br>Encontre mais informações sobre como conecta ao Document Server <a href=\"%1\" target=\"_blank\">aqui</a>",
+  "DE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador.<br>Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento.",
   "DE.Controllers.Main.errorDatabaseConnection": "Erro externo. <br> Erro de conexão do banco de dados. Entre em contato com o suporte.",
   "DE.Controllers.Main.errorDataRange": "Intervalo de dados incorreto.",
   "DE.Controllers.Main.errorDefaultMessage": "Código do Erro: %1",

apps/documenteditor/mobile/locale/ru.json

@@ -58,6 +58,7 @@
   "Common.Controllers.Collaboration.textTabs": "Изменение табуляции",
   "Common.Controllers.Collaboration.textUnderline": "Подчёркнутый",
   "Common.Controllers.Collaboration.textWidow": "Запрет висячих строк",
+  "Common.UI.ThemeColorPalette.textCustomColors": "Пользовательские цвета",
   "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета",
   "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы",
   "Common.Utils.Metric.txtCm": "см",
@@ -140,13 +141,14 @@
   "DE.Controllers.Main.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.Controllers.Main.errorBadImageUrl": "Неправильный URL-адрес изображения",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Подключение к серверу прервано. Редактирование недоступно.",
-  "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.<br><br>Дополнительную информацию о подключении Сервера документов можно найти <a href=\"%1\" target=\"_blank\">здесь</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.",
   "DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Пожалуйста, обратитесь в службу технической поддержки.",
   "DE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.",
   "DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
   "DE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
   "DE.Controllers.Main.errorEditingDownloadas": "В ходе работы с документом произошла ошибка.<br>Используйте опцию 'Скачать', чтобы сохранить резервную копию файла на жестком диске компьютера.",
   "DE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
+  "DE.Controllers.Main.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.<br>Обратитесь к администратору Сервера документов для получения дополнительной информации.",
   "DE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
   "DE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Сбой при загрузке",
@@ -157,7 +159,7 @@
   "DE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.",
   "DE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.",
   "DE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей",
-  "DE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,<br>но не сможете скачать его до восстановления подключения.",
+  "DE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,<br>но не сможете скачать его до восстановления подключения и обновления страницы.",
   "DE.Controllers.Main.leavePageText": "В документе есть несохраненные изменения. Нажмите 'Остаться на странице', чтобы дождаться автосохранения документа. Нажмите 'Уйти со страницы', чтобы сбросить все несохраненные изменения.",
   "DE.Controllers.Main.loadFontsTextText": "Загрузка данных...",
   "DE.Controllers.Main.loadFontsTitleText": "Загрузка данных",
@@ -172,12 +174,12 @@
   "DE.Controllers.Main.mailMergeLoadFileText": "Загрузка источника данных...",
   "DE.Controllers.Main.mailMergeLoadFileTitle": "Загрузка источника данных",
   "DE.Controllers.Main.notcriticalErrorTitle": "Внимание",
-  "DE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка",
+  "DE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка.",
   "DE.Controllers.Main.openTextText": "Открытие документа...",
   "DE.Controllers.Main.openTitleText": "Открытие документа",
   "DE.Controllers.Main.printTextText": "Печать документа...",
   "DE.Controllers.Main.printTitleText": "Печать документа",
-  "DE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка",
+  "DE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка.",
   "DE.Controllers.Main.savePreparingText": "Подготовка к сохранению",
   "DE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...",
   "DE.Controllers.Main.saveTextText": "Сохранение документа...",
@@ -292,12 +294,14 @@
   "DE.Views.AddOther.textSectionBreak": "Разрыв раздела",
   "DE.Views.AddOther.textStartFrom": "Начать с",
   "DE.Views.AddOther.textTip": "Подсказка",
+  "DE.Views.EditChart.textAddCustomColor": "Добавить пользовательский цвет",
   "DE.Views.EditChart.textAlign": "Выравнивание",
   "DE.Views.EditChart.textBack": "Назад",
   "DE.Views.EditChart.textBackward": "Перенести назад",
   "DE.Views.EditChart.textBehind": "За текстом",
   "DE.Views.EditChart.textBorder": "Граница",
   "DE.Views.EditChart.textColor": "Цвет",
+  "DE.Views.EditChart.textCustomColor": "Пользовательский цвет",
   "DE.Views.EditChart.textDistanceText": "Расстояние до текста",
   "DE.Views.EditChart.textFill": "Заливка",
   "DE.Views.EditChart.textForward": "Перенести вперед",
@@ -333,7 +337,7 @@
   "DE.Views.EditImage.textBack": "Назад",
   "DE.Views.EditImage.textBackward": "Перенести назад",
   "DE.Views.EditImage.textBehind": "За текстом",
-  "DE.Views.EditImage.textDefault": "Размер по умолчанию",
+  "DE.Views.EditImage.textDefault": "Реальный размер",
   "DE.Views.EditImage.textDistanceText": "Расстояние до текста",
   "DE.Views.EditImage.textForward": "Перенести вперед",
   "DE.Views.EditImage.textFromLibrary": "Изображение из библиотеки",
@@ -355,6 +359,7 @@
   "DE.Views.EditImage.textToForeground": "Перенести на передний план",
   "DE.Views.EditImage.textTopBottom": "Сверху и снизу",
   "DE.Views.EditImage.textWrap": "Стиль обтекания",
+  "DE.Views.EditParagraph.textAddCustomColor": "Добавить пользовательский цвет",
   "DE.Views.EditParagraph.textAdvanced": "Дополнительно",
   "DE.Views.EditParagraph.textAdvSettings": "Дополнительно",
   "DE.Views.EditParagraph.textAfter": "После",
@@ -362,6 +367,7 @@
   "DE.Views.EditParagraph.textBack": "Назад",
   "DE.Views.EditParagraph.textBackground": "Фон",
   "DE.Views.EditParagraph.textBefore": "Перед",
+  "DE.Views.EditParagraph.textCustomColor": "Пользовательский цвет",
   "DE.Views.EditParagraph.textFirstLine": "Первая строка",
   "DE.Views.EditParagraph.textFromText": "Расстояние до текста",
   "DE.Views.EditParagraph.textKeepLines": "Не разрывать абзац",
@@ -370,12 +376,14 @@
   "DE.Views.EditParagraph.textPageBreak": "С новой страницы",
   "DE.Views.EditParagraph.textPrgStyles": "Стили абзаца",
   "DE.Views.EditParagraph.textSpaceBetween": "Интервал между абзацами",
+  "DE.Views.EditShape.textAddCustomColor": "Добавить пользовательский цвет",
   "DE.Views.EditShape.textAlign": "Выравнивание",
   "DE.Views.EditShape.textBack": "Назад",
   "DE.Views.EditShape.textBackward": "Перенести назад",
   "DE.Views.EditShape.textBehind": "За текстом",
   "DE.Views.EditShape.textBorder": "Граница",
   "DE.Views.EditShape.textColor": "Цвет",
+  "DE.Views.EditShape.textCustomColor": "Пользовательский цвет",
   "DE.Views.EditShape.textEffects": "Эффекты",
   "DE.Views.EditShape.textFill": "Заливка",
   "DE.Views.EditShape.textForward": "Перенести вперед",
@@ -397,6 +405,7 @@
   "DE.Views.EditShape.textTopAndBottom": "Сверху и снизу",
   "DE.Views.EditShape.textWithText": "Перемещать с текстом",
   "DE.Views.EditShape.textWrap": "Стиль обтекания",
+  "DE.Views.EditTable.textAddCustomColor": "Добавить пользовательский цвет",
   "DE.Views.EditTable.textAlign": "Выравнивание",
   "DE.Views.EditTable.textBack": "Назад",
   "DE.Views.EditTable.textBandedColumn": "Чередовать столбцы",
@@ -404,6 +413,7 @@
   "DE.Views.EditTable.textBorder": "Граница",
   "DE.Views.EditTable.textCellMargins": "Поля ячейки",
   "DE.Views.EditTable.textColor": "Цвет",
+  "DE.Views.EditTable.textCustomColor": "Пользовательский цвет",
   "DE.Views.EditTable.textFill": "Заливка",
   "DE.Views.EditTable.textFirstColumn": "Первый столбец",
   "DE.Views.EditTable.textFlow": "Плавающая",
@@ -422,6 +432,7 @@
   "DE.Views.EditTable.textTotalRow": "Строка итогов",
   "DE.Views.EditTable.textWithText": "Перемещать с текстом",
   "DE.Views.EditTable.textWrap": "Стиль обтекания",
+  "DE.Views.EditText.textAddCustomColor": "Добавить пользовательский цвет",
   "DE.Views.EditText.textAdditional": "Дополнительно",
   "DE.Views.EditText.textAdditionalFormat": "Дополнительно",
   "DE.Views.EditText.textAllCaps": "Все прописные",
@@ -432,6 +443,7 @@
   "DE.Views.EditText.textCharacterItalic": "К",
   "DE.Views.EditText.textCharacterStrikethrough": "Т",
   "DE.Views.EditText.textCharacterUnderline": "Ч",
+  "DE.Views.EditText.textCustomColor": "Пользовательский цвет",
   "DE.Views.EditText.textDblStrikethrough": "Двойное зачёркивание",
   "DE.Views.EditText.textDblSuperscript": "Надстрочные",
   "DE.Views.EditText.textFontColor": "Цвет шрифта",

apps/documenteditor/mobile/locale/sk.json

@@ -54,7 +54,7 @@
   "DE.Controllers.Main.downloadTitleText": "Sťahovanie dokumentu",
   "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávna",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Spojenie so serverom sa stratilo. Už nemôžete upravovať.",
-  "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.<br>Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.<br><br>Viac informácií o pripojení dokumentového servera nájdete <a href=\"%1\" target=\"_blank\">tu</a>",
+  "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.<br>Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.",
   "DE.Controllers.Main.errorDatabaseConnection": "Externá chyba.<br>Chyba spojenia databázy. Obráťte sa prosím na podporu.",
   "DE.Controllers.Main.errorDataRange": "Nesprávny rozsah údajov.",
   "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1",